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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-groovy/, dev-java/netbeans-webcommon/, dev-java/netbeans-nb/, ...
@ 2015-10-22  9:34 Miroslav Šulc
  0 siblings, 0 replies; only message in thread
From: Miroslav Šulc @ 2015-10-22  9:34 UTC (permalink / raw
  To: gentoo-commits

commit:     0ede06ae52eb49ff54de46a53080b453c9fb874d
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 22 09:03:29 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Oct 22 09:03:29 2015 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=0ede06ae

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.2.23

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 2e7738f..f833e0f 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201510180002-src.zip 208635309 SHA256 d0e1daa5c4efe5
 DIST netbeans-trunk-nightly-201510190002-src.zip 208635309 SHA256 ec26fab3d6ab196510089a32f1324b69dbb9a51938c09b619feb5e46dab2d706 SHA512 9417d43e0c089d5ddbacef844be18a625ae1a1ef717abbe157c2245b1952b9852eb288e24257340a06c5ebecbca8e11b3c3bec3e2b0e0f7daef58b71f374869b WHIRLPOOL f708735c1d7bf0ff65d41cdf3df23563530236627f676b4da7e355697d297c4d07779813ed3043a7303f3b371e6da0460c63f5321042f87af36b3bbc60b210d5
 DIST netbeans-trunk-nightly-201510200002-src.zip 208646929 SHA256 58578f52d853065ed01442ec329d3a91610faaaea3f83253aeb4db125be71442 SHA512 8c0715828885c513dc12d391a202f1f3ccfdba9107dae60752754568369d68670ff088aaa5b550d7ef9f45a97048de5ffcc80cbcb4b59fbf9e8aba0a710a6bf9 WHIRLPOOL f36c658d37b39d0d9149ffaf3c4266a3fda14644b950216733054fa16a219ae16dc41355c44142cb14158aac60f205d29ce795e790a1ae01964847fb8e926678
 DIST netbeans-trunk-nightly-201510210002-src.zip 208641929 SHA256 b523c444d1fe7afb064c64225138aa795ad8ac9c0c25fef7d02bb534d2c54d4f SHA512 eed12ef2835ce6dcfb725bbacbebfde24c1893f7a67ebbb27a52e1ac907634cc562263de47e0115f620f45ca47874c833853965f3732569e65cc0213221a6fde WHIRLPOOL 0b8259848754750bc130a187e6e930effd66f765f6903fe7adab68e37be8b1048043bbe2cfcdf443ef58bd4d325d270b6900621678e3b1a730f3e41ae7294746
+DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e6871bf9e3601ea50113d123546decc916b02a832c876a07c6395 SHA512 413872ad9ca4ce3806db91c5c5dc137d031e1fa942f8382b02d86f97cf7e51892dfbfafe1751ff49bb76af3b4da10788ef5f46155eb1bd48f0d9110b5e72286e WHIRLPOOL 5b4ad028004e312be5602b1ef201ec9945320bc1345b4674c730f9af8cbbbf6da6f78dcffc1b4c71ffa7c0f8e13414f57c16a976418784aa0fa3d5825f56c572
 EBUILD netbeans-apisupport-8.0.2.ebuild 3314 SHA256 b68fe791f275fe4fcc8b00888688949b8927cb39db2cf9ad7860017c6d20adee SHA512 35c4bbcd34ec0eaef8a2de86c13333d2bf092db61af48558c3e173bb17dbf8fcd15001307bd7c498f4ccdbaa4277e1ee42ff0909af6170039165b547f646c383 WHIRLPOOL 206fe8d5f64e76827d3eb958a629ba087e8a16c2797752f5d9e62dff4166653677587a81be19e0a2c6adcf49292255d532e1f542c02550b1cf6ffd51467bde3c
 EBUILD netbeans-apisupport-8.1_rc2.ebuild 3339 SHA256 a5952c7ca966bb14f072fd1ad4b92464f12e1d9ef04ee18616b1ba4de33f016e SHA512 bf26818a2701f01dd4340d73f479fe38e4b8f7b94da83ff0d90a779ece651474fd353730c518b5dba5c7164f2b62f8c2f49df5e3e7b9dc9ae292b6648875fec9 WHIRLPOOL ee1e8769b8656dc81059a91673be35f43aeda9cb1ed43c1b3379508b4d62ea10bdce7423499046567f0d61c6410f3c26faaafc288cc41aef3ded36086e2d715f
 EBUILD netbeans-apisupport-9999_p20150914.ebuild 3384 SHA256 f310c45396c4b7495748d6399c113b3baaf9e7f72ab557ef838928e0809ffafa SHA512 ff390780810d61728b83d5143131c26b3cc4d0461bab9714ac91dda5b7974f5a16410bbca4b20313f5249aa158b631fcda68420824d2e218394d83b01d64ba33 WHIRLPOOL d5b0651cd5390a81b73053ae02efbec5b9261ffb4cfab8e73e8853518dd79b8e10f82665399f9092480a3a4359c0b08fd669e2e44e85cd24e60ff01aa607daa9
@@ -57,4 +58,5 @@ EBUILD netbeans-apisupport-9999_p20151018.ebuild 3384 SHA256 0b2efdc3128f207fa3f
 EBUILD netbeans-apisupport-9999_p20151019.ebuild 3384 SHA256 c134a692a536794832476382e1e61bed6cb78b45fc7da6463061e8cc6c47cac3 SHA512 c07349366bd6e29efca64d58a6aa35764cede9bb6e8876bb16f212698d5823e1f583825a2c2474fc3108b14d7223cbe28c13c49f6183805ca7ec940ca6da37cc WHIRLPOOL 6bcde49368f1706ebfbcbf8a96744eeebb9be29ca583b0058677b3436155b4d3e805f48d7e9498f6778cea066c4a5ff0cf81f085793df7943e83e7e0e9ed3428
 EBUILD netbeans-apisupport-9999_p20151020.ebuild 3384 SHA256 a802a8f7ce9dacc6fff9450f9a1d23cf585e9fab6216a9cdd4d82155175e2c80 SHA512 dad537659fb7a12ee11ba7f902d516f74ecdaec8b12c22a3a5519ffe83581aea0f29c6c6cfd79c6385614f4f553f797a72d385a8f21d37354c40d3f21bb9f1a9 WHIRLPOOL 2ef2db6c7eddd9ffbc37285ecfb44ede5c9dab9f45f802c254ddae1d557aa65a38054f1284a23537a8a6617a1d7b1d31c5542025dc28d4c9a239c3ca2e957a35
 EBUILD netbeans-apisupport-9999_p20151021.ebuild 3384 SHA256 8180b30fce116176d454d8753d0dfcc95f5fc3d02a7170642a96f951fb2ece76 SHA512 bd4aaf03514786cafad52b694f263f555d2171d2812e363ee77c5ab9602095663cb0d87390c0c58bfe0860f0460f4f40878ccefd2684b5d08add0ee6d5069966 WHIRLPOOL e2cdc423ef3e773dd57494c11654e53a7f39fd32f46ac60c5399296eae21a59f4da7cb9b99b4071cd8f64697052a29880d689c9d1406740508ff9dabf9f1afc0
+EBUILD netbeans-apisupport-9999_p20151022.ebuild 3384 SHA256 38235791b80ca0e5c7eb9560cac729e16c5e1f28d0d9a586c79f22e28a9426a6 SHA512 98a26431e8a0da598fb9fcf37d82f9b9e37bd20d925fa36f967d0c231f8c6ae512db42a41261918d2765a776c36e68bd534c6af3d8b582a6e15ad1f234cac945 WHIRLPOOL 3620ee7fed60886be28516d147b1dde754271119025eeff52e7f8abbe811c1d4d7d44151fd3161b8979ee2424bae917fbe403db8ee3e742c7c9653482b630c12
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20151022.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20151022.ebuild
new file mode 100644
index 0000000..2d9f1fc
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20151022.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-22_00-02-28/zip/netbeans-trunk-nightly-201510220002-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 b45b002..b90f9e5 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -6,6 +6,7 @@ DIST 1D4EAF7EC4687B3AB3C2636B10DF0E8683429286-clank_0.3.6.zip 8563036 SHA256 baa
 DIST 24C58A1D3C410AD3E23CD828871630C17068B238-cnd-build-trace-1.0.zip 28980 SHA256 205a14a41fb7232c2a20779278ee1e303e6d3dedb3c84496b370ae397a7767b5 SHA512 0e570745cfb163cb54ac8b6b0f6feb6c76e3c414f03eab213f93637dc84471c0bb5b786af096acdd6265383474bf26db763ebda066add398efe601e5749a51b9 WHIRLPOOL 2d0042e180eba66269d4ccdf6279dcd166b4a34947406b5f7279b0017ebed27b2ea95f1565e57908e3567b303fb69d2cb5ca6504653126611ced84f103650a0c
 DIST 266E6F59C67F78B1044BD8E026D2940DE322904E-clank_0.3.6.zip 7522214 SHA256 c70dccfe70362a94e4e0ef76d4fecfb7fa9b7c933f50052511c108503dc0e94e SHA512 f4cc763cf585b406f5370f6d85dad3077c23978f33ddcc3a417a8f1b215a68db4fed546992588c85220347dffb22153f081ccd44c4e1929106ecdce1d7211c8f WHIRLPOOL ee7f59f7d30e0f1c35ad223ab82256be7752d81693038e1eb362345ed23ff01bb6c0dcadd261320052c8019be6c0fb98536db4c10b359d25b80a1e92b0c02bb6
 DIST 2BCF2047382FB68A2F275677745C80E79B4046AB-cnd-rfs-1.0.zip 152701 SHA256 ee454c52dab7af01a0c292bbbd9bd5fa62e07480d4284a34e38746aba4bb501b SHA512 222ae7d6fc8a1f5610a107264fd249180a7a865094979dd5426fb266b94e1d24ef421199cdcb923ab58577c292a183863c45a1434b4dcb35bd67dbdcde945e54 WHIRLPOOL 821c0e5e9534955ee9b4200476fa1fe65b453520551cb71a71a225bb96ac69ba6c408e9d59b5df7008ec1b8d173035e76358172cf3ebafbbd50d0971db3a8983
+DIST 2F4C7072A9AAC358270D2682E3DF89473FC4DEDE-clank_0.3.6.zip 7839786 SHA256 59fb821b72a24242563fd5ffa97948c70bc33ae83cdc4b1f1ead6349a4c0e87b SHA512 52520f3800f9b4e92adc02de98bc39d540ae8fe1deda61d8cf836ca9b366f4fefb14406c42ba5674fcd7399795cc79fd971dc6e37b2c28422d7f818f743af98e WHIRLPOOL 61c8e39d14201f70fb26b711a7bdf8bf80847858caae2bb5ee79507fb0733ed0156ddbe062c2c52cfd21633d85a71644920dac219a7dc7c48130498202ce7138
 DIST 36E4640519B7F44D81F3DAE57DE7B4407C09A382-clank_0.3.6.zip 8562464 SHA256 fbca7b3eef20d4eb2e8d87bfdfc10e434449ce60d60f9158c6a75dadb60a8b9e SHA512 31867a01d17ed6ae080c1c946141f031332538c49d7472002abbf2699834a7f065a83e7b527a59eb861dfdb99637c4680e9bc2ccafc27af0fa25b961d6570db2 WHIRLPOOL f7f68c49320cbfb64b985e6aad48c3e8edae6a0d5eaadd1a41b4273b1257b226d753c6c00a7526fcb04ec633521aac96f147a801f6aa918c5493c6425fa13542
 DIST 4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar 164365 SHA256 8633aa79a2566f51a089195e09a4581af3ee71bfc13eb234af5e0cf6383078b4 SHA512 f1300e2d1e47659f6113a0a3dcc953766b5a8ab32f13bedf4d6ac652ffcf828c17474d47edec08d7ad9039d7abb8570770b48fa53b8ff6b47a028836490777bc WHIRLPOOL 765c87803d9cf622ae7936cb922ad9bff8823a09baf01a6c8b4a81df8ba5fd7cd17b513b36da9910b75349de45185f4641680f35be8335e08b9c30283b6d3345
 DIST 5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar 2388361 SHA256 9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7 SHA512 04be4dfba3a21f3ab9d9e439a64958bd8e844a9f151b798383bd9e0dd6ebc416783ae7cb1d1dbb27fb7288ab9756b13b8338cdb8ceb41a10949c852ad45ab1f2 WHIRLPOOL 488b7b9af1d1d06cca163d43e7be190730e2f0421796c21a26ace11196ee37a16b1bdeea78a1e2e64f8ca0e87f67a2aecd066af21505f3dd92dd76de40a94fa0
@@ -51,6 +52,7 @@ DIST netbeans-trunk-nightly-201510180002-src.zip 208635309 SHA256 d0e1daa5c4efe5
 DIST netbeans-trunk-nightly-201510190002-src.zip 208635309 SHA256 ec26fab3d6ab196510089a32f1324b69dbb9a51938c09b619feb5e46dab2d706 SHA512 9417d43e0c089d5ddbacef844be18a625ae1a1ef717abbe157c2245b1952b9852eb288e24257340a06c5ebecbca8e11b3c3bec3e2b0e0f7daef58b71f374869b WHIRLPOOL f708735c1d7bf0ff65d41cdf3df23563530236627f676b4da7e355697d297c4d07779813ed3043a7303f3b371e6da0460c63f5321042f87af36b3bbc60b210d5
 DIST netbeans-trunk-nightly-201510200002-src.zip 208646929 SHA256 58578f52d853065ed01442ec329d3a91610faaaea3f83253aeb4db125be71442 SHA512 8c0715828885c513dc12d391a202f1f3ccfdba9107dae60752754568369d68670ff088aaa5b550d7ef9f45a97048de5ffcc80cbcb4b59fbf9e8aba0a710a6bf9 WHIRLPOOL f36c658d37b39d0d9149ffaf3c4266a3fda14644b950216733054fa16a219ae16dc41355c44142cb14158aac60f205d29ce795e790a1ae01964847fb8e926678
 DIST netbeans-trunk-nightly-201510210002-src.zip 208641929 SHA256 b523c444d1fe7afb064c64225138aa795ad8ac9c0c25fef7d02bb534d2c54d4f SHA512 eed12ef2835ce6dcfb725bbacbebfde24c1893f7a67ebbb27a52e1ac907634cc562263de47e0115f620f45ca47874c833853965f3732569e65cc0213221a6fde WHIRLPOOL 0b8259848754750bc130a187e6e930effd66f765f6903fe7adab68e37be8b1048043bbe2cfcdf443ef58bd4d325d270b6900621678e3b1a730f3e41ae7294746
+DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e6871bf9e3601ea50113d123546decc916b02a832c876a07c6395 SHA512 413872ad9ca4ce3806db91c5c5dc137d031e1fa942f8382b02d86f97cf7e51892dfbfafe1751ff49bb76af3b4da10788ef5f46155eb1bd48f0d9110b5e72286e WHIRLPOOL 5b4ad028004e312be5602b1ef201ec9945320bc1345b4674c730f9af8cbbbf6da6f78dcffc1b4c71ffa7c0f8e13414f57c16a976418784aa0fa3d5825f56c572
 EBUILD netbeans-cnd-8.0.2.ebuild 4510 SHA256 0a9a4e58e28f395b5bcb017016b6ddb1b77afe393d0e5bd81cc05e3a32076c71 SHA512 2b1fedfe292fa140920fd11829e77127f9535e08b8307886accfa37e6d11195a1204e6b71b2640937da0711c3ce0bbf80c0eaa3c248a64fd61b6a3d99d5de14e WHIRLPOOL 10b1518360ade5d6f1f27c79a10f630b94a2ec5062e18df11f9828d4b374e6cbdea0b9f770e01c117ca90fa194dff9bd3be6a468075c2d35167fb78a7bb32794
 EBUILD netbeans-cnd-8.1_rc2.ebuild 4745 SHA256 b1c5a9a27ec1c22ea6eda555bce70adc6735c02d0eb47ebe676bffba4a2c3db7 SHA512 d50cb168b724476bbcb280e0e78a5ca3659721639f8e678be20523f0a491e2edbd78759cdbbeb86cc5ab039af7e46a92eebcabba5aeb366a5592fd3ed53d57a7 WHIRLPOOL a395a72b1acf8156dcb0185c5236986d40e01e1fec475f629c7a54f1e0cec2754a3d2de1883bf17e08264059d3d3009c54de019c4b5f156c1c884252b7240081
 EBUILD netbeans-cnd-9999_p20150914.ebuild 4790 SHA256 50932d2b0cb6a9edb4cd69bde82d3b68a05f423f3b2da10de6cd7a6228793c51 SHA512 0b3a4d72ae37ecc08c48201ff9129c67b1c70c9175a077630b0480d1bcf60c629a6ac53f81e1f7efbb79ca4aacaaa1be56bbab42ebd0970658ac183fdfa4e58c WHIRLPOOL 909af5ae85c91bf317a984c2601da50aeb3acd8f56d12384b929ffe99cb131bf7e814db8aa4836195953b3cd8ed031813193abc0654b3802e5a7ad63d165b422
@@ -79,4 +81,5 @@ EBUILD netbeans-cnd-9999_p20151018.ebuild 4790 SHA256 489ea3e9b355800bf8ad24695e
 EBUILD netbeans-cnd-9999_p20151019.ebuild 4790 SHA256 e7fd3e2dd0e907f6b5a3d458977650ce9b4c703834ff92b5f9abb54eefcf32b8 SHA512 b4fb59e74c0f7bf6bd1ac9d93cac8a5b3da5dcac28f574e8462c2f0a03d46d47da5b23ac3c401be95872d20eb8d47dc56ff341ad25027603e005069930eb1c13 WHIRLPOOL 8a7361baa6ca550bac219e140a3701c19172acc72522f702f8e3772a0508b58a17cbd48d9db95cecf3472f1a8d82cdca181383c1835faf4d03286a05a52faba4
 EBUILD netbeans-cnd-9999_p20151020.ebuild 4790 SHA256 66315a81faa064377f614b4891799849b7c08b6e6da3dbd947313942d191bed0 SHA512 2008d230f3fb0b8d3665949e6015c768fd35aecc11b2847abcc7acf76a62d2e6b642d56d595acec6de81a2bead1e4feb948e4f2bbae183ad4d85935a48432c37 WHIRLPOOL 61f64490b827d42ac383ab6151db645d8bcf0589c90c8c31d8c55ddf71d7f723f219884d916c48b42fb63aa8faa534f3b0664cdcb498a36346f283302498ed09
 EBUILD netbeans-cnd-9999_p20151021.ebuild 4790 SHA256 3f91826649fd4a3c3788c9bccbf1254657bc8d9fe2e057a1f7bcba850bf80ab4 SHA512 bbb630dd578e5076f883182b93927f5eade7f6a7170b59b8600a1bcf734d51b6519d3f6d4e725b2e46390f69fe7a77054dea828a6e51b04a6b1d863e12b645e1 WHIRLPOOL 8af542176b14a589093d24f955c505295babffa003850da789d7617935f3edcc5a70b81ce5c7817179ba9d1a47e8659dcc2d26f62b8d40f8e62dba0a6b834ac4
+EBUILD netbeans-cnd-9999_p20151022.ebuild 4790 SHA256 b61fe394eb1ce8a9ad7ab895558721e3d9c1dd1e053c7dc4f8fcd433f3465b63 SHA512 8bfa722afe360ebfa5eb1b1acd3a2552f6d0862cc802d0256868983284c60f76657e287cd51c2ffa05abf35ffc2554c24222bf375d21921731382e8d6c66631c WHIRLPOOL 059f95a570528c96799220d7bcae2f1685cda0c62c40fc8ff240a51082995d01770e66d48320f6d7e0f5498bb214fa830479dc472db4a89ec06bee80af2730ce
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20151022.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20151022.ebuild
new file mode 100644
index 0000000..62d8d27
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20151022.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-22_00-02-28/zip/netbeans-trunk-nightly-201510220002-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/2F4C7072A9AAC358270D2682E3DF89473FC4DEDE-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}"/2F4C7072A9AAC358270D2682E3DF89473FC4DEDE-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 96b9116..5d8ddd8 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -32,6 +32,7 @@ DIST netbeans-trunk-nightly-201510180002-src.zip 208635309 SHA256 d0e1daa5c4efe5
 DIST netbeans-trunk-nightly-201510190002-src.zip 208635309 SHA256 ec26fab3d6ab196510089a32f1324b69dbb9a51938c09b619feb5e46dab2d706 SHA512 9417d43e0c089d5ddbacef844be18a625ae1a1ef717abbe157c2245b1952b9852eb288e24257340a06c5ebecbca8e11b3c3bec3e2b0e0f7daef58b71f374869b WHIRLPOOL f708735c1d7bf0ff65d41cdf3df23563530236627f676b4da7e355697d297c4d07779813ed3043a7303f3b371e6da0460c63f5321042f87af36b3bbc60b210d5
 DIST netbeans-trunk-nightly-201510200002-src.zip 208646929 SHA256 58578f52d853065ed01442ec329d3a91610faaaea3f83253aeb4db125be71442 SHA512 8c0715828885c513dc12d391a202f1f3ccfdba9107dae60752754568369d68670ff088aaa5b550d7ef9f45a97048de5ffcc80cbcb4b59fbf9e8aba0a710a6bf9 WHIRLPOOL f36c658d37b39d0d9149ffaf3c4266a3fda14644b950216733054fa16a219ae16dc41355c44142cb14158aac60f205d29ce795e790a1ae01964847fb8e926678
 DIST netbeans-trunk-nightly-201510210002-src.zip 208641929 SHA256 b523c444d1fe7afb064c64225138aa795ad8ac9c0c25fef7d02bb534d2c54d4f SHA512 eed12ef2835ce6dcfb725bbacbebfde24c1893f7a67ebbb27a52e1ac907634cc562263de47e0115f620f45ca47874c833853965f3732569e65cc0213221a6fde WHIRLPOOL 0b8259848754750bc130a187e6e930effd66f765f6903fe7adab68e37be8b1048043bbe2cfcdf443ef58bd4d325d270b6900621678e3b1a730f3e41ae7294746
+DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e6871bf9e3601ea50113d123546decc916b02a832c876a07c6395 SHA512 413872ad9ca4ce3806db91c5c5dc137d031e1fa942f8382b02d86f97cf7e51892dfbfafe1751ff49bb76af3b4da10788ef5f46155eb1bd48f0d9110b5e72286e WHIRLPOOL 5b4ad028004e312be5602b1ef201ec9945320bc1345b4674c730f9af8cbbbf6da6f78dcffc1b4c71ffa7c0f8e13414f57c16a976418784aa0fa3d5825f56c572
 EBUILD netbeans-dlight-8.0.2.ebuild 2898 SHA256 08402481b573b90396431be03bda45904b2dd29f0086e09a111fe362e310c3f7 SHA512 3f6d6c9ea0043382562fbe47ad16e3273032407a74cb44ec7ff26736f96483835af4be8674361e910912a550b9fe592cc5a28c2b93b6b993076553195c35eac5 WHIRLPOOL 9d8706ccbc0d97b0f5d64ebf22c36316b08d8fbccd57408119ca5f5faef08c7f82677bf67488ff611eabeaa730e4c9a730c50966d94d738cfe79330ac147863d
 EBUILD netbeans-dlight-8.1_rc2.ebuild 2923 SHA256 70d3c3729f4e669f1f2a2c7d71f4abd2f171402c95290546e0f34413ccdf9bcc SHA512 641b633b048dca1b1d94d212de023f5977c08d9aa8bb25bf2047255698135e0ad0ea7173360d9deac09a25b9f0844dea192a378adc164aa62dfa4d52a8ce2b80 WHIRLPOOL 0c2abb5028cbc0717e54601a125a016d7c208694adf8cadcae274096b8c7e200de13a0ede6c0815dc38c16c63633a3974fca6051b64156aa839155e31604f380
 EBUILD netbeans-dlight-9999_p20150914.ebuild 2968 SHA256 80b05f9d601f411f2211eab2c61e1329d5c27a4f8fe4dec4993723b7f467b571 SHA512 b979693d6a0a0780194296a5a602f912c8c0002206d41077312689b629c0f40cd26af2eebe92c872d96c0d6af8a941576bcd697055df5f4d2065e518a1944a73 WHIRLPOOL 35eb43a94541843b0ce8067b31b710c25c8c9fdd8597c7409c9b2608d24f6972148c46a4c6d013dfd2f47b044ff6afce349bd2df903639436c4e68bd22dfdac8
@@ -60,4 +61,5 @@ EBUILD netbeans-dlight-9999_p20151018.ebuild 2968 SHA256 d1f5e9ee832c993d8c736ba
 EBUILD netbeans-dlight-9999_p20151019.ebuild 2968 SHA256 38278b338a5ffb6fcdc37a493f6f71c73433f1295411bebce7895f0456bbf5cc SHA512 0c6f5557205770fd1fbbb04b7b25365ccbc9998b4235c1b262a5dcf55c4f70b02e320c0988336595c9c69f0a6f36d933211ccbbdf56290208057fe74a9a74f62 WHIRLPOOL cc5972ab3da3602d554ce85762bc544dc8c4d9569a7f5e2f7aa54d813872c7b9d3969ab199499533f7daedf3cd08d3647f6e49207b2d63c5cc89562ccd89ce8f
 EBUILD netbeans-dlight-9999_p20151020.ebuild 2968 SHA256 a65fcfda2248cf3e4d1f8f812a8205ebed17738be5f49c0446bd6a4047b3707c SHA512 f8cd1aeed5e0bb0bb83784c6179b799420f997830f11f452026cc4c17b7329eb7ba8a6c9a04cb230bbfe90468ece35ce3125c68caea71a094e469a549639a929 WHIRLPOOL 6f3109f29a5a3d9b9fc8cb355f3feb4c8bf1d0d895fd03dd17dd44502aa36f0f571fc35102854e56acf0a8c46ad0e05356ed08aa81540bf978a2ab0cc0cbf638
 EBUILD netbeans-dlight-9999_p20151021.ebuild 2968 SHA256 1ba7298de9cc2ecab062cc036ae5fd219a92adab1ea84d20b02c4ffbbf668509 SHA512 310cd0c5951d2fe796c17e0919e2200e954b520acebd7dea49f8480d42d4e7929db709cdf4f74fa30b494c4d15a12d6183ffb009c0082ccd9040018a2d47542e WHIRLPOOL 1a686d59235cd943aebcbe2890f5f5732c8fc1cd7a7f317624922b69bd4e78c6971a753c1fdeb1d1c142cbed244e211e5e7a3157f6ea36c80ca31e5218e8efc7
+EBUILD netbeans-dlight-9999_p20151022.ebuild 2968 SHA256 d1c935681cb5808863a2f034b84bc3c134bb0cdccddd71a4c452e15a52335284 SHA512 3bdd4e4b64e09ec2afd6cb0a2fd73ccd3a5665e19b380916790da07e7eccaecea226cd80fd1e47c38c0dfc2e694387b41213ec551e2bd39bbc6c0e3d8b8b2d8e WHIRLPOOL 919485d806915fe246ee52393e892e4166b0997b353eda23eff62c9b8d3c8fd04b92ab5f9c465263c866227c8ce4a5b5ca720e0c7b257101417242520400af14
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 13b254e..4c797f1 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -61,6 +61,7 @@ DIST netbeans-trunk-nightly-201510180002-src.zip 208635309 SHA256 d0e1daa5c4efe5
 DIST netbeans-trunk-nightly-201510190002-src.zip 208635309 SHA256 ec26fab3d6ab196510089a32f1324b69dbb9a51938c09b619feb5e46dab2d706 SHA512 9417d43e0c089d5ddbacef844be18a625ae1a1ef717abbe157c2245b1952b9852eb288e24257340a06c5ebecbca8e11b3c3bec3e2b0e0f7daef58b71f374869b WHIRLPOOL f708735c1d7bf0ff65d41cdf3df23563530236627f676b4da7e355697d297c4d07779813ed3043a7303f3b371e6da0460c63f5321042f87af36b3bbc60b210d5
 DIST netbeans-trunk-nightly-201510200002-src.zip 208646929 SHA256 58578f52d853065ed01442ec329d3a91610faaaea3f83253aeb4db125be71442 SHA512 8c0715828885c513dc12d391a202f1f3ccfdba9107dae60752754568369d68670ff088aaa5b550d7ef9f45a97048de5ffcc80cbcb4b59fbf9e8aba0a710a6bf9 WHIRLPOOL f36c658d37b39d0d9149ffaf3c4266a3fda14644b950216733054fa16a219ae16dc41355c44142cb14158aac60f205d29ce795e790a1ae01964847fb8e926678
 DIST netbeans-trunk-nightly-201510210002-src.zip 208641929 SHA256 b523c444d1fe7afb064c64225138aa795ad8ac9c0c25fef7d02bb534d2c54d4f SHA512 eed12ef2835ce6dcfb725bbacbebfde24c1893f7a67ebbb27a52e1ac907634cc562263de47e0115f620f45ca47874c833853965f3732569e65cc0213221a6fde WHIRLPOOL 0b8259848754750bc130a187e6e930effd66f765f6903fe7adab68e37be8b1048043bbe2cfcdf443ef58bd4d325d270b6900621678e3b1a730f3e41ae7294746
+DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e6871bf9e3601ea50113d123546decc916b02a832c876a07c6395 SHA512 413872ad9ca4ce3806db91c5c5dc137d031e1fa942f8382b02d86f97cf7e51892dfbfafe1751ff49bb76af3b4da10788ef5f46155eb1bd48f0d9110b5e72286e WHIRLPOOL 5b4ad028004e312be5602b1ef201ec9945320bc1345b4674c730f9af8cbbbf6da6f78dcffc1b4c71ffa7c0f8e13414f57c16a976418784aa0fa3d5825f56c572
 EBUILD netbeans-enterprise-8.0.2.ebuild 15071 SHA256 84621e3bb946cfa254bb70ca3c3f61202882a7e6d631769ad2f0f4639b0de875 SHA512 6ad38e840764661e6bc5b89b5925e9665871009ba0b640c0a78c555ec104214dbee1200a93cb48e655bc620e07bb6e4d8932b23a00fe458f8a5e9e5c3200d79d WHIRLPOOL b2c2bbf2ff72f8cd9b4cdbe039fdbf7cd074b0fdc20f634aa0b6f79f5c639be358c61fab30854a6e3ab9714a285d9461ac4e39e94e10c14c5068422d6c873c56
 EBUILD netbeans-enterprise-8.1_rc2.ebuild 15886 SHA256 ffb03c95fbd05cc80ffd8d1590037ec6fd4e607a22160b986a0614edc7de0ba7 SHA512 f58ce52ccb40d5079502a1a43c3ac49b1b0607875d88c50f03295f78e0b6e586f5f52c809cfa8e9d803d07b351a2b75eefc91a0d5d4cd310b549b7a5e4b0f508 WHIRLPOOL 0b5550062f4a527614a107094a81e1e26492395a60190d50c0a76f0ce166f10153f37683344aab0c6b11741299e28fdc6d35eb91618f679dc4ce0df0e5ff6555
 EBUILD netbeans-enterprise-9999_p20150914.ebuild 15931 SHA256 9101e110b3d92415c5c316c94265682f2aa856e04cf2ea35a58895e51a17dd31 SHA512 98cc5ffd25d12b0d6b9829b2ba7c5c465ba34b283ae07424ac56ec87312b644cdf497e1be11bd997a0ac6a2666796953903b1e4bb2f6eb9e2dd5204e87c68ec4 WHIRLPOOL 0262e3566d8cdec8250eba494a669c60f90c01493eb5aa4828692d541b1e15c0b11b332e96fb1d937be24d6fa6c00b1e8ab216f8a937d97c698444b19a5f0ae3
@@ -89,4 +90,5 @@ EBUILD netbeans-enterprise-9999_p20151018.ebuild 15931 SHA256 ed58878106400c5626
 EBUILD netbeans-enterprise-9999_p20151019.ebuild 15931 SHA256 db6f4874f27c87b19d807e5f89ae374a412f9376d28026fb9265c849a305d98c SHA512 5b643609005eea1d7e9a26a4c21d48b4acc345f790571af49c2b1c10ab88f323107fbd337dffaf59a79ecfdc7b275c4a15254e5dda95a96f3036950af1837945 WHIRLPOOL 109a2a21a3410096ea21d77503827423f66315d8e6462c56d30950faa1d195f3b8a0334b84cfbd05894c70bd867cfda2ca105052e05c92df9ced41c383805949
 EBUILD netbeans-enterprise-9999_p20151020.ebuild 15931 SHA256 e1b6fcfb1ed4f4645675540de7806a6ba0c25c493ac37d0b55cb713a25408e63 SHA512 2052dca8b87bcf9571d3aab7dc97cb1c954368e47a9eaca1a35f88222c584f74856ec7eb1a54d91c4fbc0b191cc6070c9c44dcc713cfbbff97fa7b2188e73289 WHIRLPOOL 32c6cc8a6d364ce2828fcce4226c6b567d8928445158efd9c5804424005e4c820115024bd3c5a1eb7399702c9a4e196bb6429f53be337722ec5003fd5829a70f
 EBUILD netbeans-enterprise-9999_p20151021.ebuild 15931 SHA256 4bcaa3e57a1b1ad788f058080a0d4f0750ba382c684f6a9503f446aabb5abebd SHA512 358be6956440ec87d99a7b8f972c166047f6df8ee196bc8997507a2083fdbb346d594667fa4503424ff6b28ca55388b36e26dff5670550dea24eec66660e6853 WHIRLPOOL 062c03c6e053226453c3435d605a97663c7aa4804ec0b38288462551f9ed089222d941f383d177c60e65d8b218cb4810c319b93ba57a939df0206fb4f013a698
+EBUILD netbeans-enterprise-9999_p20151022.ebuild 15931 SHA256 097ef498bbba60ad201765e4fbcd22e64854f64e0275d4ad00ff652569400a9d SHA512 20bab2b7214074635889173772557499b6ee18395a33209d9f18d5276f6bc9021314da812bb18b2c4c007f57efe78346b5b4350ab0851e1567a6b07833bc8996 WHIRLPOOL e098d110c3d7be8631d51ccdb37bc3c7edcd959f6d84b9aba88874d297da499c4aa4b1b52d7ca3d96a81dbdc791d027a3000e9f5cbadf122f29a6f05d826865c
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20151022.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20151022.ebuild
new file mode 100644
index 0000000..91faf10
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20151022.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-22_00-02-28/zip/netbeans-trunk-nightly-201510220002-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 1ec487d..791b332 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201510180002-src.zip 208635309 SHA256 d0e1daa5c4efe5
 DIST netbeans-trunk-nightly-201510190002-src.zip 208635309 SHA256 ec26fab3d6ab196510089a32f1324b69dbb9a51938c09b619feb5e46dab2d706 SHA512 9417d43e0c089d5ddbacef844be18a625ae1a1ef717abbe157c2245b1952b9852eb288e24257340a06c5ebecbca8e11b3c3bec3e2b0e0f7daef58b71f374869b WHIRLPOOL f708735c1d7bf0ff65d41cdf3df23563530236627f676b4da7e355697d297c4d07779813ed3043a7303f3b371e6da0460c63f5321042f87af36b3bbc60b210d5
 DIST netbeans-trunk-nightly-201510200002-src.zip 208646929 SHA256 58578f52d853065ed01442ec329d3a91610faaaea3f83253aeb4db125be71442 SHA512 8c0715828885c513dc12d391a202f1f3ccfdba9107dae60752754568369d68670ff088aaa5b550d7ef9f45a97048de5ffcc80cbcb4b59fbf9e8aba0a710a6bf9 WHIRLPOOL f36c658d37b39d0d9149ffaf3c4266a3fda14644b950216733054fa16a219ae16dc41355c44142cb14158aac60f205d29ce795e790a1ae01964847fb8e926678
 DIST netbeans-trunk-nightly-201510210002-src.zip 208641929 SHA256 b523c444d1fe7afb064c64225138aa795ad8ac9c0c25fef7d02bb534d2c54d4f SHA512 eed12ef2835ce6dcfb725bbacbebfde24c1893f7a67ebbb27a52e1ac907634cc562263de47e0115f620f45ca47874c833853965f3732569e65cc0213221a6fde WHIRLPOOL 0b8259848754750bc130a187e6e930effd66f765f6903fe7adab68e37be8b1048043bbe2cfcdf443ef58bd4d325d270b6900621678e3b1a730f3e41ae7294746
+DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e6871bf9e3601ea50113d123546decc916b02a832c876a07c6395 SHA512 413872ad9ca4ce3806db91c5c5dc137d031e1fa942f8382b02d86f97cf7e51892dfbfafe1751ff49bb76af3b4da10788ef5f46155eb1bd48f0d9110b5e72286e WHIRLPOOL 5b4ad028004e312be5602b1ef201ec9945320bc1345b4674c730f9af8cbbbf6da6f78dcffc1b4c71ffa7c0f8e13414f57c16a976418784aa0fa3d5825f56c572
 EBUILD netbeans-ergonomics-8.0.2.ebuild 2843 SHA256 f9262f6ee7f2aed1fab9bf4cf756f565272e9894afa50b349735e39961e7acc3 SHA512 f158c27640541f7aef31da050e0811c07a251ae4797cc663b95a074a47eaf9d6bb7a9aa11ba38ea55e75c185f7dba74629ba6716a819e8ad68eb3db9ada71451 WHIRLPOOL 4fe9634fb673fb05dbba25996efc3a212ef3bb23ab6e7c732cb75de076feb930735e3901806fd9c801abc7ee8aa8eb800718065325d415371255a886474061d4
 EBUILD netbeans-ergonomics-8.1_rc2.ebuild 2868 SHA256 7d268bf5a12b5937222eea504fe2cb34afbceaa9b04c4a34a098bc4d6868c1ac SHA512 739350bd2dea25d5e40096e33818bdb9a21f80ef90699cbaf0c5010d0b3986b5b642da343c3fd9a85fb66367fe086898554e928bf0496293e93900591df3dc04 WHIRLPOOL 068204fe9949561b5a4b4e5271c465ff6adbbeef19041cbbcadc345ab5fbd639fb32e99267a59b17b5541016cf464b1a0cc301f6d2858591a2cb7a4340e30a38
 EBUILD netbeans-ergonomics-9999_p20150914.ebuild 2913 SHA256 48e1d1f1f682f53c1524d8aa790a653a644fb959a002b14173814e7d4d61bc76 SHA512 91551f3350562d318a9dfa662ba63a04682187df219e9d1cc04f3fa26782233858fabe0ee98f080e228a676084b39c377922f9ee99487eb608aa2aa659eac8f5 WHIRLPOOL 77d4ad318a910ea6e6971b2cb4798edc331d1d4966a05197cba33346109bf05807ec7119f714d6b35f58b06f467efab07406db9bb1f2059578ae250aade6017d
@@ -57,4 +58,5 @@ EBUILD netbeans-ergonomics-9999_p20151018.ebuild 2913 SHA256 93d7b6c0e31aa9c7fe3
 EBUILD netbeans-ergonomics-9999_p20151019.ebuild 2913 SHA256 4e1ab0db95ede7200cabda08637de49899c7ee449cc1c63685ec23038a92bb5c SHA512 373beb724aa62f3515b817240771f8af17d8b1704a5b66eadbebdebb2341984302a1686014693b59c7af1b1f3ba7ea36a73a14e44796adc9563b09262571a510 WHIRLPOOL 4c869ff3f36040c3817476bc0d9cdad5d45c3034efcf72ef83b676c222f1cc05cb747252cffa6210cdfb5f5efef68427b781fc5be1de8d47b4706c13bb48b162
 EBUILD netbeans-ergonomics-9999_p20151020.ebuild 2913 SHA256 c427771eaed07707482008965ee7ab7a073165a1b5291ba7b7defde74b2b042e SHA512 cd21b3e42b03617836e91a78ea80fd864e5f6bba688dfb88d241528038bd598f6d0395a5ecc986eb285e18f4fff9103df5be6acd97a7e9475f8aa8abd05c5bd8 WHIRLPOOL 252962555c37479949e70d5fb0fc201fe540e5aa7f51ff1821db82bd96fa8ac047c788263bda06e0640e7590f007c0c213e834e4b2d39fbe44f0b906167ac7ba
 EBUILD netbeans-ergonomics-9999_p20151021.ebuild 2913 SHA256 31d4d32482d5610e2a7bed6bd644a5f19c3f6029d3f5a7234d5ff1f2b06f30eb SHA512 144b4e7a7d58bf843e65ca8ef31f0ca46e33cd7362103f4d2abfca685f2c61715597c4cf1db7cb5cbf59a9dae515f4e2115e11b77a0f1ea1adddeddc5a942cde WHIRLPOOL 938ad34a7e3f4e748917f506a1b4a2e6809d79966a0f23eb0251148a3994f87ff05d84753094987dfd7510b71d4083b457982f98d89588d6c1afacc401e41b59
+EBUILD netbeans-ergonomics-9999_p20151022.ebuild 2913 SHA256 493ed0397216d919708b33f9de2b043a5ef4165f2f5be40b7a48a94d71bcb525 SHA512 fdf00751a676a5e4c1bcb80a99378088398ee5a1b02cdd3aa729a94108d400bf2ea1cfc6c961404cb3ca29b051fb756bab3b16e366556d73a09964752bd0f512 WHIRLPOOL 38913fb4bfe612f0023b3ebe2b1e855218ab1ba8a0a28591d0ad448002db4cebb4f82d1cf18d983ce0f43a1576bd5c48f07fd30af5c3368bcbec20fe7bb6ff71
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20151022.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20151022.ebuild
new file mode 100644
index 0000000..18f2f6e
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20151022.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-22_00-02-28/zip/netbeans-trunk-nightly-201510220002-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 608af1b..f558ee5 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201510180002-src.zip 208635309 SHA256 d0e1daa5c4efe5
 DIST netbeans-trunk-nightly-201510190002-src.zip 208635309 SHA256 ec26fab3d6ab196510089a32f1324b69dbb9a51938c09b619feb5e46dab2d706 SHA512 9417d43e0c089d5ddbacef844be18a625ae1a1ef717abbe157c2245b1952b9852eb288e24257340a06c5ebecbca8e11b3c3bec3e2b0e0f7daef58b71f374869b WHIRLPOOL f708735c1d7bf0ff65d41cdf3df23563530236627f676b4da7e355697d297c4d07779813ed3043a7303f3b371e6da0460c63f5321042f87af36b3bbc60b210d5
 DIST netbeans-trunk-nightly-201510200002-src.zip 208646929 SHA256 58578f52d853065ed01442ec329d3a91610faaaea3f83253aeb4db125be71442 SHA512 8c0715828885c513dc12d391a202f1f3ccfdba9107dae60752754568369d68670ff088aaa5b550d7ef9f45a97048de5ffcc80cbcb4b59fbf9e8aba0a710a6bf9 WHIRLPOOL f36c658d37b39d0d9149ffaf3c4266a3fda14644b950216733054fa16a219ae16dc41355c44142cb14158aac60f205d29ce795e790a1ae01964847fb8e926678
 DIST netbeans-trunk-nightly-201510210002-src.zip 208641929 SHA256 b523c444d1fe7afb064c64225138aa795ad8ac9c0c25fef7d02bb534d2c54d4f SHA512 eed12ef2835ce6dcfb725bbacbebfde24c1893f7a67ebbb27a52e1ac907634cc562263de47e0115f620f45ca47874c833853965f3732569e65cc0213221a6fde WHIRLPOOL 0b8259848754750bc130a187e6e930effd66f765f6903fe7adab68e37be8b1048043bbe2cfcdf443ef58bd4d325d270b6900621678e3b1a730f3e41ae7294746
+DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e6871bf9e3601ea50113d123546decc916b02a832c876a07c6395 SHA512 413872ad9ca4ce3806db91c5c5dc137d031e1fa942f8382b02d86f97cf7e51892dfbfafe1751ff49bb76af3b4da10788ef5f46155eb1bd48f0d9110b5e72286e WHIRLPOOL 5b4ad028004e312be5602b1ef201ec9945320bc1345b4674c730f9af8cbbbf6da6f78dcffc1b4c71ffa7c0f8e13414f57c16a976418784aa0fa3d5825f56c572
 EBUILD netbeans-extide-8.0.2.ebuild 3307 SHA256 084e952eae1708b0fab785fd34313985e864dbc74a8531a0d5cdcf906e88f85a SHA512 ade8dc37aa932d7ec20966199e521311716061c23df08d02635f78efd2776f1d7bf040b0f9c9488b947bbbdfb3e33fa764723e3dfffa2214892bc6d685428f6f WHIRLPOOL ad2c26b005675ebca7d902ff1e6caa28552f3fda6795e327cc3584cf109f0ad6efad6516e15af5e70d689be236298b0948003e09a3da4991b3e29a1c85607b2f
 EBUILD netbeans-extide-8.1_rc2.ebuild 3332 SHA256 43580bab7453f294442683c85e5b1ba58d212977551240bb22c24627a4b442db SHA512 83e55ac4d2a424aad4685a2f77ce3e4944fab7330ca09fd6b6635bfec30895eaa09af60dd03a67bc4d66d0b387f4481787f9a6297e1c9382550bae894805cce3 WHIRLPOOL 10d30dfe7d188a67ab1d5afcb408064272fa68180c126d6bab5500c2726afd253f32db043b91e531c89841d8b857053a7fe250c5b8aed1e85506c42b7e2df7d8
 EBUILD netbeans-extide-9999_p20150914.ebuild 3377 SHA256 77f2909564d529ada9bfd65450c492a4a8e40ed17b043aa937749a1654194f99 SHA512 6274e8158a874de68a7ad374c629c98e4637f3a9304e6da9d017a2586f606ba8a5d1aca316fa854db86d2b03b694dbb292f670850debfad388d64399ec789a65 WHIRLPOOL da730ad9cf8c9961c7fde8e6cfecdeb7bbde12073957fcba3900ce4dc058bfe6894a4779f9a5a6c03c511b43ede152b692a5ac5db2840c4a871322d73a0db5f3
@@ -59,4 +60,5 @@ EBUILD netbeans-extide-9999_p20151018.ebuild 3377 SHA256 ce39e35937aa6b43509c49e
 EBUILD netbeans-extide-9999_p20151019.ebuild 3377 SHA256 d862d79d9816d538e66ea683610bad34785681b34b7df4f91dbf266ef53dd79b SHA512 2e6ac70b88a581d5cf3a0471db924fe1368b22626d8992829bd2914d687e6907c58bbbb2f0a385824fd86910e6ba0eb507336dca22ba4b9188e9d96c38bff5db WHIRLPOOL 5baf9ea4aedf299f5eda778f9e00939af80f473c05a7c55643b8d0ec026ebf8f821056681734318dca619f7f29578f2fe780356e2dc0c68f5b88497c96a493ed
 EBUILD netbeans-extide-9999_p20151020.ebuild 3377 SHA256 ae85904a27ed01ac4da2317415479c02bcfc53365cc80752b075caee00b98ff3 SHA512 6b206c3d29d731efb7a3b13c78fe199404b459296b43c2f4a6bcbbe4a01dba20e4e366ab4027e2390c92fc513a577f1c7dbb8bea1371952bdd989d6d37bd4942 WHIRLPOOL b57e3a64badedbe927a3313e5e90461d4433ef120a802bacaac0abc2cce7fa45c931e609e93c4340966960807073133d4ff1b3fb348f33a8491dade4729840da
 EBUILD netbeans-extide-9999_p20151021.ebuild 3377 SHA256 0739b41f0e002f5cc2aaecc54236508e91e1fc9076b0c0000116c2a41f6ae812 SHA512 1ee5b366e45b6ca95807593815ab92f3cfe1681cb54bbd5f7274bc04bcf3a1294abbf66ac8ccd52b9f36b2e3d3867302f556fb34fa5a665bbbb680226f6257c6 WHIRLPOOL 7dad8df184640c7476afaecbea2c9f2af3c95e88f0aed054fa976cfb56b4d8814650f434fbe9987497dd886d57db4cc7d14b2bd1d0f2166b8c0094fe8591c0c9
+EBUILD netbeans-extide-9999_p20151022.ebuild 3377 SHA256 5f4c64b9e644bcc85eef630ddb3c448c0faee378580604223d11c39b3b8b9814 SHA512 1afd5de7c73a58d2d1c01f9a81e97b9e0b7b2004ad180e9c58a197049abe60e3a716605fd3a2373b81b827a6dc250b6ebee6079b88ed24f8e541e37664d4f40a WHIRLPOOL 816e5e5fe6841cb472cf8a07404be93f87d5ebf009a66f44d0b68c6d9d3941090274a6c0d7296c9f902f4079b2ea82842cb185ab287c9b63fd2d759680d89ea4
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20151022.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20151022.ebuild
new file mode 100644
index 0000000..6f7735a
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20151022.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-22_00-02-28/zip/netbeans-trunk-nightly-201510220002-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 5e74130..2b64919 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201510180002-src.zip 208635309 SHA256 d0e1daa5c4efe5
 DIST netbeans-trunk-nightly-201510190002-src.zip 208635309 SHA256 ec26fab3d6ab196510089a32f1324b69dbb9a51938c09b619feb5e46dab2d706 SHA512 9417d43e0c089d5ddbacef844be18a625ae1a1ef717abbe157c2245b1952b9852eb288e24257340a06c5ebecbca8e11b3c3bec3e2b0e0f7daef58b71f374869b WHIRLPOOL f708735c1d7bf0ff65d41cdf3df23563530236627f676b4da7e355697d297c4d07779813ed3043a7303f3b371e6da0460c63f5321042f87af36b3bbc60b210d5
 DIST netbeans-trunk-nightly-201510200002-src.zip 208646929 SHA256 58578f52d853065ed01442ec329d3a91610faaaea3f83253aeb4db125be71442 SHA512 8c0715828885c513dc12d391a202f1f3ccfdba9107dae60752754568369d68670ff088aaa5b550d7ef9f45a97048de5ffcc80cbcb4b59fbf9e8aba0a710a6bf9 WHIRLPOOL f36c658d37b39d0d9149ffaf3c4266a3fda14644b950216733054fa16a219ae16dc41355c44142cb14158aac60f205d29ce795e790a1ae01964847fb8e926678
 DIST netbeans-trunk-nightly-201510210002-src.zip 208641929 SHA256 b523c444d1fe7afb064c64225138aa795ad8ac9c0c25fef7d02bb534d2c54d4f SHA512 eed12ef2835ce6dcfb725bbacbebfde24c1893f7a67ebbb27a52e1ac907634cc562263de47e0115f620f45ca47874c833853965f3732569e65cc0213221a6fde WHIRLPOOL 0b8259848754750bc130a187e6e930effd66f765f6903fe7adab68e37be8b1048043bbe2cfcdf443ef58bd4d325d270b6900621678e3b1a730f3e41ae7294746
+DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e6871bf9e3601ea50113d123546decc916b02a832c876a07c6395 SHA512 413872ad9ca4ce3806db91c5c5dc137d031e1fa942f8382b02d86f97cf7e51892dfbfafe1751ff49bb76af3b4da10788ef5f46155eb1bd48f0d9110b5e72286e WHIRLPOOL 5b4ad028004e312be5602b1ef201ec9945320bc1345b4674c730f9af8cbbbf6da6f78dcffc1b4c71ffa7c0f8e13414f57c16a976418784aa0fa3d5825f56c572
 EBUILD netbeans-groovy-8.0.2.ebuild 3346 SHA256 907e6cd11c222f15c826494b44929483803f0e4249de0d54db51e6855b574148 SHA512 8bb37121e7e32621959318d109b1d982e2c705a9deb7171f5fef1dcaed55fc5718b0bc9e6bbb2592cdaa5e96d874bb6e6bfa96d06fe09f14d5250c1485eb1da5 WHIRLPOOL d5e09fa1e975835f05c6132c091fee4ae9fc9dd671af9f5f88a9195d5cd4a93804f96687ed3f2bd741117fa65773f2c464b3cfd6697425039cc51a940efa2a31
 EBUILD netbeans-groovy-8.1_rc2.ebuild 3371 SHA256 6ace63d0b75118b4e82bc5fcd42fcff4af16aa94909f6b7ce53901f9df92117c SHA512 12f629d795a38c2d5220ed1c1b1d15db2446c464a3713fef2fa8c95d3c41365f346dabd6d408b899997c618d39e759e319d1cdc63c02c3a07994877ca75d9ecc WHIRLPOOL 5fa0e845cb4597c5a7a24dd19e464e491ec99b7be5b9040fd98ad4f12a399dc08f4707b046bb02bd4e04e0bef4f39a23f040816d5559edb7f782f397dd3007a8
 EBUILD netbeans-groovy-9999_p20150914.ebuild 3416 SHA256 cfeac72b47716cfbdd3088db781ee75e7b8b7af226af3eb3db85309db251ea6a SHA512 eeb0c02e56a5f349c6b23a8fe7bb5456eed83af8d413034eb8e20e4851a3b6d12a952d9816bd7011926154212f86689800f12e38d21248b555fd65f1434ed7df WHIRLPOOL 2172c53e64f60003dfec846bad6179a37302109bf4c065b87779db2139bc83946a4e85dd8567a752d26595eb88219be26b88838cf9950b50140a9f4659d0e321
@@ -58,4 +59,5 @@ EBUILD netbeans-groovy-9999_p20151018.ebuild 3416 SHA256 9c4b110557d9945e68275ca
 EBUILD netbeans-groovy-9999_p20151019.ebuild 3416 SHA256 13a2961a362adca75a87584a8577398b1e658aac37c420a4d710cd5a75144e03 SHA512 6a9f9aafaa3b96bd06a3be1cbcb2ea8e3f7a166377e3d89faa9ebfed8b11be18f1862541913997211f91703de5000ebf55f45d8cc6df34d2801154d74b0faa6f WHIRLPOOL 7c6f8a4330bf382af9e2a8bc18f2e04adc35dce25edc8d9bff0818b4e1aaeae2dece5e91f9036e7a09c2ccac6b2360db1555207f86cf9ea89755f19fb0bc10c6
 EBUILD netbeans-groovy-9999_p20151020.ebuild 3416 SHA256 e6656b24da8b8d6a7a5af50e93115a6076290e8df249db67906e0f815c3c9640 SHA512 82b2dfb7b9ba64c1da6f1801b2763bf53dad6b8ee5e73d1d833752be3c6f09df4ebf4c553e6b36ba6154e22bba2f8fd5e93f55c5d284d17e0854bda979f87dbd WHIRLPOOL b86d8797a030c2e95323a27ec0ce3e350895911ce42678c1c9ec836abf2cb44a60de951ef80f9d372ff6426ef758d5f6ba80bce14977805959587310ee8f41d6
 EBUILD netbeans-groovy-9999_p20151021.ebuild 3416 SHA256 b2c1a601df3a7ab4a34b37cd9aa16a0211d009a03431073313268fe09987992b SHA512 b21a5eb26165f56611f86944e2d7a3c74ad1b6eeeac6b738cd3c691a109b9ef8ef3a3dcf3debd78038933b681deb0ed35dc4d54e17610e9302c6b4f683b105c5 WHIRLPOOL 2f22eb772cc5fffd0c85605b99a87ee5552842c61ddf8205cd780a37ecbc70ee47f6af5884cadfb49a27af33fc3bb2831fc8f2080028221df1de07ed036aa593
+EBUILD netbeans-groovy-9999_p20151022.ebuild 3416 SHA256 188648c47c280020dd1c8d9d43e6cbf2715c9e686bd98f89eb547ccc794bfd1b SHA512 c5e58ccc41cb51547b35e5fae4f2f9d1881f79f4490f962c53895a0064a0e2e26057be284b7bfd4626cd172901a04246b36202ceaef4822d476dfa4010777547 WHIRLPOOL 7b094d7a0f59d3152b9b4b04acfee94817a1513fa3b8ac46c474b4e0bc6c1781d71c8c1cbd76a3314e4927cf9ecb9312553626bdc526eb88e72fbafb1999fa40
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20151022.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20151022.ebuild
new file mode 100644
index 0000000..17289e4
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20151022.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-22_00-02-28/zip/netbeans-trunk-nightly-201510220002-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 3440c1e..f4e3420 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201510180002-src.zip 208635309 SHA256 d0e1daa5c4efe5
 DIST netbeans-trunk-nightly-201510190002-src.zip 208635309 SHA256 ec26fab3d6ab196510089a32f1324b69dbb9a51938c09b619feb5e46dab2d706 SHA512 9417d43e0c089d5ddbacef844be18a625ae1a1ef717abbe157c2245b1952b9852eb288e24257340a06c5ebecbca8e11b3c3bec3e2b0e0f7daef58b71f374869b WHIRLPOOL f708735c1d7bf0ff65d41cdf3df23563530236627f676b4da7e355697d297c4d07779813ed3043a7303f3b371e6da0460c63f5321042f87af36b3bbc60b210d5
 DIST netbeans-trunk-nightly-201510200002-src.zip 208646929 SHA256 58578f52d853065ed01442ec329d3a91610faaaea3f83253aeb4db125be71442 SHA512 8c0715828885c513dc12d391a202f1f3ccfdba9107dae60752754568369d68670ff088aaa5b550d7ef9f45a97048de5ffcc80cbcb4b59fbf9e8aba0a710a6bf9 WHIRLPOOL f36c658d37b39d0d9149ffaf3c4266a3fda14644b950216733054fa16a219ae16dc41355c44142cb14158aac60f205d29ce795e790a1ae01964847fb8e926678
 DIST netbeans-trunk-nightly-201510210002-src.zip 208641929 SHA256 b523c444d1fe7afb064c64225138aa795ad8ac9c0c25fef7d02bb534d2c54d4f SHA512 eed12ef2835ce6dcfb725bbacbebfde24c1893f7a67ebbb27a52e1ac907634cc562263de47e0115f620f45ca47874c833853965f3732569e65cc0213221a6fde WHIRLPOOL 0b8259848754750bc130a187e6e930effd66f765f6903fe7adab68e37be8b1048043bbe2cfcdf443ef58bd4d325d270b6900621678e3b1a730f3e41ae7294746
+DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e6871bf9e3601ea50113d123546decc916b02a832c876a07c6395 SHA512 413872ad9ca4ce3806db91c5c5dc137d031e1fa942f8382b02d86f97cf7e51892dfbfafe1751ff49bb76af3b4da10788ef5f46155eb1bd48f0d9110b5e72286e WHIRLPOOL 5b4ad028004e312be5602b1ef201ec9945320bc1345b4674c730f9af8cbbbf6da6f78dcffc1b4c71ffa7c0f8e13414f57c16a976418784aa0fa3d5825f56c572
 EBUILD netbeans-harness-8.0.2.ebuild 4055 SHA256 2674d562adc57648c82cac9f714f74f9d29dd7b7ff7fa7f0ef37c43ef0975489 SHA512 7d72bed5b955b2365a4c11fcd97a2d6f2372ab939fb9a03b3ff7915053f24d695373c1aa154f6e6916d37ef3ace7b38864d575419460382760500576dae52e49 WHIRLPOOL 72f54a6cb83f282a75f0abb073109414a7b8bcd4e9263466281e68ff34148a7343ed3bd78ebdc8afd109b6b9f5b9f15bfd0e250f418fcaa4986a7c886b57b9f6
 EBUILD netbeans-harness-8.1_rc2.ebuild 4080 SHA256 93049f23b2ad31b40c784de1a3abb7b8332f59e5203e6058f6ada092e45fd01a SHA512 9cf8e85f62a03d1fd5c43a8ff746229d0d8e91f10a67a08b5634cef2c6d7e3c31a2f309b53c158fb5580ea1334fe3e0e5f84d555f07a5c3174e78c58e6a14cba WHIRLPOOL 40cf8d1fb75674c49e1af12292f7bace10d74724d1b034b6cd1ecc9c4a816b4a711ed9c49e6b0719dfec638349ab9669685e605d0e481c8b62958a9c82231ef9
 EBUILD netbeans-harness-9999_p20150914.ebuild 4125 SHA256 44bcecb8562b2e40d845b081f8a464447599a4d45e512f9b390dea97fea4e8c9 SHA512 1598fb8ed5b8317638ef150ab940e51d30b2225ab78b263290a409c801feb816adf8459659c25db29d27de0cefef490a4024bf646d22857547578322166fc9ad WHIRLPOOL a863567647c7e790e2b332a53c95822465e1040aec58171c3207c80397cdb4b9257e3a7e6f3bc438f936644e4de3ccdedb2d8735b3beaf43725a77c194b317bd
@@ -62,4 +63,5 @@ EBUILD netbeans-harness-9999_p20151018.ebuild 4125 SHA256 6f9891290aaec2405de5b5
 EBUILD netbeans-harness-9999_p20151019.ebuild 4125 SHA256 70f552997945558daf1078d9537f74639ce62bdf41f66a9ebcb687add70222ef SHA512 0091f88ed989a0adc76e5a62d488124be5331200f6febef51f50d15d1a4dc3ab0baddbf2f37da8dad668c17b71dc94593bda432b31b911aeb793424885c7eda0 WHIRLPOOL 32b5851bff8704a72bf7f35855b5674f25526514208ab983e797d1f300dad0c4bcd53c45a227be021b23a543fd204565924d51715e7c1a1d9297ad7b24c9f567
 EBUILD netbeans-harness-9999_p20151020.ebuild 4125 SHA256 a2353178bb8fbb9ab606abc0255a5865df100d47ec8daa4dc39e0634f5304a7b SHA512 86ca298b06278505df877f2fdbf7f210808d6d2d5dfe1a523b0414026b8dde1a2e3c9d008c8052b628f9373036ff3300d8c12e100b45ece94fe1e7763fe3036c WHIRLPOOL d7f2648646ed5a1fefe9858fc1a2da28a5781d340578fe9004f9b3415ce4d6d6bca83bcf707f9715d1d1c7aa1f786af86c8f4d9a8ca95dbac24ccd8ddd15f82a
 EBUILD netbeans-harness-9999_p20151021.ebuild 4125 SHA256 349bd3dca2a82b4f1a3afe1aa586550863c18cd774a560419b6ec3fa7820a6d1 SHA512 e6b208566274f47633962cae96e791aeb31c19962ea96926d65d9a6860833dbd58df662a55cc4cb9824b1a7ed575becb9ec64c3ed1940707d9d3ae44403a53dd WHIRLPOOL a013264743a8ddf52c0a96ae166d4af620825fbd1bc7763e68af370856dd2cdef30c99d048e664f04c86fa65e4157bbdb086fa0b3cd7cae46b196988a2303b73
+EBUILD netbeans-harness-9999_p20151022.ebuild 4125 SHA256 6736ff80eaf28da59c4f11903cf06a581073541d9441dcfa8955379f43c8b66d SHA512 7a609e462c8b7848cc06bbecc06a4c880c38495d23bb06fad2dc29db7424752bc5cc94cd74537db1d727594a0a24683c17261ef157f0deb1482942c05f233ec8 WHIRLPOOL 6ba1a448293e7fb7ba1586860985916ee405da5e982014035fdf89bf0dd6e2dd7dd889a33fc072a0d5acee83e9b78e3dcde4876dce52749969461610b4f1480d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20151022.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20151022.ebuild
new file mode 100644
index 0000000..4e0d414
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20151022.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-22_00-02-28/zip/netbeans-trunk-nightly-201510220002-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 08c01c7..d62509a 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -135,6 +135,7 @@ DIST netbeans-trunk-nightly-201510180002-src.zip 208635309 SHA256 d0e1daa5c4efe5
 DIST netbeans-trunk-nightly-201510190002-src.zip 208635309 SHA256 ec26fab3d6ab196510089a32f1324b69dbb9a51938c09b619feb5e46dab2d706 SHA512 9417d43e0c089d5ddbacef844be18a625ae1a1ef717abbe157c2245b1952b9852eb288e24257340a06c5ebecbca8e11b3c3bec3e2b0e0f7daef58b71f374869b WHIRLPOOL f708735c1d7bf0ff65d41cdf3df23563530236627f676b4da7e355697d297c4d07779813ed3043a7303f3b371e6da0460c63f5321042f87af36b3bbc60b210d5
 DIST netbeans-trunk-nightly-201510200002-src.zip 208646929 SHA256 58578f52d853065ed01442ec329d3a91610faaaea3f83253aeb4db125be71442 SHA512 8c0715828885c513dc12d391a202f1f3ccfdba9107dae60752754568369d68670ff088aaa5b550d7ef9f45a97048de5ffcc80cbcb4b59fbf9e8aba0a710a6bf9 WHIRLPOOL f36c658d37b39d0d9149ffaf3c4266a3fda14644b950216733054fa16a219ae16dc41355c44142cb14158aac60f205d29ce795e790a1ae01964847fb8e926678
 DIST netbeans-trunk-nightly-201510210002-src.zip 208641929 SHA256 b523c444d1fe7afb064c64225138aa795ad8ac9c0c25fef7d02bb534d2c54d4f SHA512 eed12ef2835ce6dcfb725bbacbebfde24c1893f7a67ebbb27a52e1ac907634cc562263de47e0115f620f45ca47874c833853965f3732569e65cc0213221a6fde WHIRLPOOL 0b8259848754750bc130a187e6e930effd66f765f6903fe7adab68e37be8b1048043bbe2cfcdf443ef58bd4d325d270b6900621678e3b1a730f3e41ae7294746
+DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e6871bf9e3601ea50113d123546decc916b02a832c876a07c6395 SHA512 413872ad9ca4ce3806db91c5c5dc137d031e1fa942f8382b02d86f97cf7e51892dfbfafe1751ff49bb76af3b4da10788ef5f46155eb1bd48f0d9110b5e72286e WHIRLPOOL 5b4ad028004e312be5602b1ef201ec9945320bc1345b4674c730f9af8cbbbf6da6f78dcffc1b4c71ffa7c0f8e13414f57c16a976418784aa0fa3d5825f56c572
 EBUILD netbeans-ide-8.0.2.ebuild 29317 SHA256 42218788ab0fc7c7cd1bb42a8b0c72a66543a3260b752aa55365833c355bcc63 SHA512 c712b66b6bee654390a45e5c616479df2be624bb770f3838d4fcce875f71a8d165703dffd55c4fd7d30e19c392784203e5fe01e2404907d88c935d439efaf578 WHIRLPOOL 67763e4a36215ac002fd321556ce2269affc15ba48ad5069d7ccc746d918179994f174e09305a9d9ddadddbea690778c2769e0ea1993eafc09e01580485e2292
 EBUILD netbeans-ide-8.1_rc2.ebuild 30289 SHA256 601a026a6ded95edde37912caab8d873aba2fd1466d3d5ac66fb33df95df3e9f SHA512 d1cdd2be0baf271f53978da38a9d7198074b2c91d84671aa1919cc03374715697c13fa182515010377e4773517fe560960d28a50db62e0d19f038baa06e91bec WHIRLPOOL f73fae56638de9ab520f428b82954212ddd22e55e4958b5c43252768985e5cc0358854237e0318a384fdf828ba2395754bed1fe3aedfcb1efa999b75e5c64bd4
 EBUILD netbeans-ide-9999_p20150914.ebuild 30334 SHA256 4c3267a9fe8092d970cd132a24f268402faa9fce9b0f80b9981d163d3faf8bb3 SHA512 2bc8699ddc6b588cd6e83a8bacad1f7ef9cab9c1a7b482862f0a537a12502078b01fffe5841d6161ebde0ccdfc2ffc9b355aca4d07573a8aa436baa21b187134 WHIRLPOOL 744458c4d2103007c06b97675567d135c385863a6d6b186ce23fa32a91f317c0f1e85fda8ad22688770f53fec33a6001fd5c60a3c58f4aeb27a2eef3a612ffa8
@@ -163,4 +164,5 @@ EBUILD netbeans-ide-9999_p20151018.ebuild 30334 SHA256 ab969803a843d0d2c5c4475b7
 EBUILD netbeans-ide-9999_p20151019.ebuild 30334 SHA256 3c3bd64b2b2985868e96932672ec3018117907702d59341aba4d85ff330db118 SHA512 595a2ffced65d20ce87d9b76a8373d877be223733412948473ef928cb9660bcf6c462899131c0518bb5010eff7465c0745ef53536bea0cf45cb3c66ed2720a6b WHIRLPOOL 70075882146ee06b0f23cba4cfbc69c750dbc99907808598da720fdc500ae60a388b19da722793fcf9084ac0e37f9571f27b0487a8cc90846b9e45d8e69faaa8
 EBUILD netbeans-ide-9999_p20151020.ebuild 30334 SHA256 72d4045e01c0b9adb6b431f84f4c300b303e9ea6474df0149296202990811eb4 SHA512 9dbfe097d94f29368a251d851982df5990ed2dfb0dd6537d344e992d1a022e169a860413c7b459fbda6261f38bb1026b43ddba78a5a062bf55150647c5ac134d WHIRLPOOL 82a3f22970d024e8af5d0fba4fbb2dccc00759f98705264f5765f0a1c0cfda03a018bfaf406221a1cb251ce2e73a45acfb376ebe3f8152dfd69a0c706014a445
 EBUILD netbeans-ide-9999_p20151021.ebuild 30334 SHA256 084bad7ede24a5d26a4e91e71195cdd38fbaee886ad70421b838f070047c3fba SHA512 0bb75b12d2300d89f56e04915ed0bb6874a83ef69a6cc3eef028d1aef745ac90c4474ad61051f3d96873eb98a0eddc2bdb018b5b5c2b0bfc1b76807f5b3c8b24 WHIRLPOOL a76dc283dfd48058cbd9a98828678b23838d5639508f447479f1d7e71a581c7c9eb103d96f38cdbe4663a2de29e5770a54d1665272149f3db78de0417a76aa8d
+EBUILD netbeans-ide-9999_p20151022.ebuild 30334 SHA256 271c83431ca06beebf6261f927ab83899f80f405059a24116e0199c491f93e2d SHA512 8a1899efa9b1b8622bc7dfb7b8b719f8367bfcd3ea046d8bea7e07f6fea70b86946d9acea582c15d5bc022ad1a766d25426346e2821a34b9627ea3fb17edc04b WHIRLPOOL 741c585cc42725bed6103fed98cab81fcea2f30d11f9cb78e3281a1afb04b9e8591f0b21ad099ec9a7aeb0c944ff73dc387dc6327e26be1fa92d4669127ce7f1
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20151022.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20151022.ebuild
new file mode 100644
index 0000000..e162be7
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20151022.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-22_00-02-28/zip/netbeans-trunk-nightly-201510220002-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 8198b0f..1485c3e 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -25,6 +25,7 @@ DIST E5579EF3B0C1EF2F43562DD0C3B32F8E1F603B49-nb-javac-api.jar 173813 SHA256 39f
 DIST E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar 227553 SHA256 2884a6c80cb647199c9edf9d00c5b709502aa63092279b93b9a50ba1578bfc32 SHA512 5ff83f5925fa4250ecb46e08f7f064ccf5d637bff14edadf16abbcd0d6a6203cedd07a64cc5718656249d18b17a1016f7152094da3f8ed13fdbee9afbdfcd926 WHIRLPOOL d80fbd65b3aefa48361b4bafaf179e8076caf97cc7b2a4b5f7437a14f30ea568aa86b699fb2dcc1fb6a4042b131702c87e37d8cf04591f8669414b89d0acc185
 DIST F210CBE1FA591EDAFD64E6076E926A0A9A30F129-nb-javac-impl.jar 2766774 SHA256 c98d5b8ca1ed96a18e2a3746573c4993f60276dac4695458e10ca39b6a93bd80 SHA512 4b86bea06aeb814148463db5b038da6b47ae10bb7cac438c1573a0de240546d7c7655511c8302c019b8d44e2d94da61d42b4ad389292800789bd2b0211e19337 WHIRLPOOL b818358911892eaae9dbf85f11052b753a777f34edea10c4c8761c8e9c90d7b227a3feef646b6724681370f36b89845c08484b787e718eb18cbbcc81e0e6ad1b
 DIST F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip 930828 SHA256 5f41fe1ef8a7607bafbc04baa7814aecaf72b90a6fa796adec0846f50f8ac7f0 SHA512 0a65813cf76e997b362a0ce48ec55ac180907a7af6062c6f86f96448775164c2bf67c147920f2bfa6a8eb24c14046acf66d0ee9a5481bd7b9b251774a86a7db6 WHIRLPOOL edd56a338e08e788a307849794387069a60b1873a3a8fa29e1e7045fbf8a2f1ff175e68579df3789fdf6af8f7f94de2430560a89de48d64c22e76b1fe95b6505
+DIST FBC85B83A93F76A159C8C0D782F02AF7E68E8ECF-nb-javac-impl.jar 2766800 SHA256 cd65bd26b26b7823fc8a00ec84d951532403f8c665f114ac7704ec5f9b90af22 SHA512 164a438eb6b55534037705505cb3adda39dc4e813535f0108ff6cf65e9f39db58069a22678c2484a22e2da1b1d70063b5a56e55f8c56a51f8d9953c1791c17ec WHIRLPOOL e551a60bc8d10869fe35c558dff3d3249f18922ebc32ea9a170b468e025762fe31d154a6dd1239c390c70c9cbd70639a98532492b108d9acf69e07419a818f6e
 DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
 DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
@@ -56,6 +57,7 @@ DIST netbeans-trunk-nightly-201510180002-src.zip 208635309 SHA256 d0e1daa5c4efe5
 DIST netbeans-trunk-nightly-201510190002-src.zip 208635309 SHA256 ec26fab3d6ab196510089a32f1324b69dbb9a51938c09b619feb5e46dab2d706 SHA512 9417d43e0c089d5ddbacef844be18a625ae1a1ef717abbe157c2245b1952b9852eb288e24257340a06c5ebecbca8e11b3c3bec3e2b0e0f7daef58b71f374869b WHIRLPOOL f708735c1d7bf0ff65d41cdf3df23563530236627f676b4da7e355697d297c4d07779813ed3043a7303f3b371e6da0460c63f5321042f87af36b3bbc60b210d5
 DIST netbeans-trunk-nightly-201510200002-src.zip 208646929 SHA256 58578f52d853065ed01442ec329d3a91610faaaea3f83253aeb4db125be71442 SHA512 8c0715828885c513dc12d391a202f1f3ccfdba9107dae60752754568369d68670ff088aaa5b550d7ef9f45a97048de5ffcc80cbcb4b59fbf9e8aba0a710a6bf9 WHIRLPOOL f36c658d37b39d0d9149ffaf3c4266a3fda14644b950216733054fa16a219ae16dc41355c44142cb14158aac60f205d29ce795e790a1ae01964847fb8e926678
 DIST netbeans-trunk-nightly-201510210002-src.zip 208641929 SHA256 b523c444d1fe7afb064c64225138aa795ad8ac9c0c25fef7d02bb534d2c54d4f SHA512 eed12ef2835ce6dcfb725bbacbebfde24c1893f7a67ebbb27a52e1ac907634cc562263de47e0115f620f45ca47874c833853965f3732569e65cc0213221a6fde WHIRLPOOL 0b8259848754750bc130a187e6e930effd66f765f6903fe7adab68e37be8b1048043bbe2cfcdf443ef58bd4d325d270b6900621678e3b1a730f3e41ae7294746
+DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e6871bf9e3601ea50113d123546decc916b02a832c876a07c6395 SHA512 413872ad9ca4ce3806db91c5c5dc137d031e1fa942f8382b02d86f97cf7e51892dfbfafe1751ff49bb76af3b4da10788ef5f46155eb1bd48f0d9110b5e72286e WHIRLPOOL 5b4ad028004e312be5602b1ef201ec9945320bc1345b4674c730f9af8cbbbf6da6f78dcffc1b4c71ffa7c0f8e13414f57c16a976418784aa0fa3d5825f56c572
 EBUILD netbeans-java-8.0.2-r3.ebuild 13294 SHA256 4abac657cff75400e92b1f2b19bca696113cdc37611c8c0f49dfa8c82fec4296 SHA512 32e41d7acc3aca026993e5edc791f1314f2bfda47413538af655b0335973c4fe50d998c67f129307b164075c3e0503280b4c1729d700431644ca6610d7f0f635 WHIRLPOOL d7f99c13421d08529b54085138fcffd2959a3c3f97d94a1dbe6e726a6dbc2cded69ec0bf97e1458b56847ac121954e8f173c1adde0703fd2969defa53ac37c51
 EBUILD netbeans-java-8.1_rc2.ebuild 14773 SHA256 4028adb2993d8a7cd8a4434afb5bc4d2a29bc2812c7ffda3131f2bfe3d4a6b8f SHA512 373ea3bb9175ef0cb4b74c67af69ea0409bbf364220f4b690cc628769cc748594e518efa9a35f890c1da952830b4dc7a1d316e7c020f2f1d704ce6973dd13859 WHIRLPOOL a8adc3fd9e2e9459ebe06d32939d92f5eb2cad81521d2f7f08445d8d000d34fd6f6bb7b69a274e60499637c866ec4654f789fa431382393db5538e5f57090f69
 EBUILD netbeans-java-9999_p20150914.ebuild 14818 SHA256 0b3ea17a460bed5d409d466392b7b8868b5f11d2227cad477a9887c6166fc7b9 SHA512 069cf42315117a89beb7255f42ca56643cbc4bfde90e55a8aba611284a2cabdda89ed736c243930b19856cbe1df472dba605ffed2b5baa8de6f90c13aee0e448 WHIRLPOOL 4dcab901e6f83addcd969657bfa0c5f6c5a33c36160c4fb96dabb023cd65dc1b5388e6c8c3060a72187c74167b98ca26f8f32fb9a0fa6736437004909670c4af
@@ -84,4 +86,5 @@ EBUILD netbeans-java-9999_p20151018.ebuild 14818 SHA256 581bfd660c0a69332aa04ee1
 EBUILD netbeans-java-9999_p20151019.ebuild 14818 SHA256 f6e17f998a0631030e0256540678f7f44b18a32acf437ca839426105435cfa6d SHA512 9519667ac1a804ecd610b13230e21cbd94761796cab2d8af756090bd8273e173b7de12e42f5ac6bb468f1858563f4797a8e9b4e4134f1887e1b9db1334e67e39 WHIRLPOOL 0ba7a8868a2f2ee8641114d4d0da9e017d40641322e3026725e89920f2749979046b22d2c551d071e1af134fe4c4221770cbbc868ac321fa48a9572e01cef5fe
 EBUILD netbeans-java-9999_p20151020.ebuild 14818 SHA256 8429447d697e0d2c5f6c169937b73ba3e061943bd1ccef44d4ec4676a4e175c6 SHA512 cf9d81fb87a1b5ae5d687023b244ed5d213a8860a0a46a3b8ea98f898b7abd4e07b2a69560f5d042160146c7047370dd132aad45914beb7cd30ab31de0abedad WHIRLPOOL 6a8be8b421801914af952de8bb88e416f451893a72fd123e731b58286bcf475015941c667d794f7372364a627324caf4e79dbd7451ef144d14df6a47d850aa65
 EBUILD netbeans-java-9999_p20151021.ebuild 14818 SHA256 777e781e5a006b2fa4d7a384a014e07121bf5ed56b13d26addb9aec240d61eed SHA512 a6b93c90bdcd51ec115ff179b3b59f589595f785c47acfa8bcf3cf169e726e092bd6f767747305a7ae92d3036456cf13f8cbf4e89a1fbe128b61478d10c95849 WHIRLPOOL aad57979d2eec8ea3ffbb631b303f4bee159ca27507d204f3908ad72c3664867ad70071ab6549315c32e6f432d9bb0b2d3abf9a2787486d7a26ed1c31c99004a
+EBUILD netbeans-java-9999_p20151022.ebuild 14818 SHA256 d94b61e944caff9edb0ff9867a35578586eef230df4a181b316f0b4c6487ff62 SHA512 367f611e540801617aa05b5c09dc9a2cc04864f7b4e016a1786cf9156111ca2b71569e0eabd00c7d8224d46dfac810abec664a3afbe644ecb8795eb67551097f WHIRLPOOL 893a722aefa75c8d257eb0ed7466394c5e5967807c4d54e07e78a18f29bac7cc980f7ebbcbb1b6c8d5822f0af35a1b8077b24049661a1355aec7a98410d10580
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index bce75d6..5b97b87 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -32,6 +32,7 @@ DIST netbeans-trunk-nightly-201510180002-src.zip 208635309 SHA256 d0e1daa5c4efe5
 DIST netbeans-trunk-nightly-201510190002-src.zip 208635309 SHA256 ec26fab3d6ab196510089a32f1324b69dbb9a51938c09b619feb5e46dab2d706 SHA512 9417d43e0c089d5ddbacef844be18a625ae1a1ef717abbe157c2245b1952b9852eb288e24257340a06c5ebecbca8e11b3c3bec3e2b0e0f7daef58b71f374869b WHIRLPOOL f708735c1d7bf0ff65d41cdf3df23563530236627f676b4da7e355697d297c4d07779813ed3043a7303f3b371e6da0460c63f5321042f87af36b3bbc60b210d5
 DIST netbeans-trunk-nightly-201510200002-src.zip 208646929 SHA256 58578f52d853065ed01442ec329d3a91610faaaea3f83253aeb4db125be71442 SHA512 8c0715828885c513dc12d391a202f1f3ccfdba9107dae60752754568369d68670ff088aaa5b550d7ef9f45a97048de5ffcc80cbcb4b59fbf9e8aba0a710a6bf9 WHIRLPOOL f36c658d37b39d0d9149ffaf3c4266a3fda14644b950216733054fa16a219ae16dc41355c44142cb14158aac60f205d29ce795e790a1ae01964847fb8e926678
 DIST netbeans-trunk-nightly-201510210002-src.zip 208641929 SHA256 b523c444d1fe7afb064c64225138aa795ad8ac9c0c25fef7d02bb534d2c54d4f SHA512 eed12ef2835ce6dcfb725bbacbebfde24c1893f7a67ebbb27a52e1ac907634cc562263de47e0115f620f45ca47874c833853965f3732569e65cc0213221a6fde WHIRLPOOL 0b8259848754750bc130a187e6e930effd66f765f6903fe7adab68e37be8b1048043bbe2cfcdf443ef58bd4d325d270b6900621678e3b1a730f3e41ae7294746
+DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e6871bf9e3601ea50113d123546decc916b02a832c876a07c6395 SHA512 413872ad9ca4ce3806db91c5c5dc137d031e1fa942f8382b02d86f97cf7e51892dfbfafe1751ff49bb76af3b4da10788ef5f46155eb1bd48f0d9110b5e72286e WHIRLPOOL 5b4ad028004e312be5602b1ef201ec9945320bc1345b4674c730f9af8cbbbf6da6f78dcffc1b4c71ffa7c0f8e13414f57c16a976418784aa0fa3d5825f56c572
 EBUILD netbeans-javacard-8.0.2.ebuild 4906 SHA256 944fee40d693c2c287e748f70ba565f3cd84bb7c19110f8be716134ec20694a7 SHA512 1f66cd2756effbfde7d43f9da7d8d93cb6252c58a02ee3d821f6faeaf63bf3c63e28f80c6eb44689e3aa954452a2f3893c65e75de84158dff1da0d94cafea14a WHIRLPOOL 88197e03008b8acb1ce62f72783bb096d9a3fc2a289b83367841a8adbee2bf822031f9bd6051831515ee44b1d5d2a109c5646f98ca723506f27c874301fb4189
 EBUILD netbeans-javacard-8.1_rc2.ebuild 4931 SHA256 e97ff379323330f47a1f1e13d0492b4308e4c377008b4e203d24988a7e412bab SHA512 48dd7e817df729322de3ee165e4cadebc2bb23e8a6831d9084d298ca01f456c2035c96808080a7b62021154146924dbe98af5ed862271701f25fa07e4fe40e9c WHIRLPOOL cb81b1c27069e86f45acc87bfd1191e876b44ff676333ccc73320311f6f8de5923d7f052029f42bfc614b93f1aabe6489ddf76f4c788224140878c6081938f4d
 EBUILD netbeans-javacard-9999_p20150914.ebuild 4976 SHA256 a88bcaa47f91d1526fdbed8a323a939fb94a7a7ea78483644852c9cfb376243c SHA512 a47471278379d1e264f1cce3a33d7b27a084cec57a3d98558a230107fd1fe9dc457ac9848e80d759e90bc8a7728d28d71ca7ddf0bc95f5bb8dcf05a981ba172e WHIRLPOOL efeeffd5f2a4ee1c81b0874afb09a1005f1d32b748b9031cf9d86a628ecfa776a5259a614eeef788287af254ec9717ba394349b76ec56578333d78f5fa61bc94
@@ -60,4 +61,5 @@ EBUILD netbeans-javacard-9999_p20151018.ebuild 4976 SHA256 61616e810e2a808c58197
 EBUILD netbeans-javacard-9999_p20151019.ebuild 4976 SHA256 b4a8e4a331c61ded18fc33981e1d90aecde92e7fcbd7993c5b9a91bc59835fc4 SHA512 33148e6e5311af24ce7f9800b2ff1cc88a9575de14aefd597e3ce6b87c3f61ddc3d5205095bb04dd4fcea48d0d7bd53be8c523b2086d83a70eeef37094bba0ec WHIRLPOOL 9fa36029add1cbf0a08c459f4f68d61ba58204cdc2cc7217ddba58e2f38294c9f861eb41396bd50fd28d17ab0011be809ccb02defa117e60b6c7323da6ba0808
 EBUILD netbeans-javacard-9999_p20151020.ebuild 4976 SHA256 3fa86c840916b7cdbdad3ca01c01fc90d92d83e48570872e597fb1e195baa738 SHA512 198643bd7c1e2d724d51c03399456cb52aa976351acb9ae40da5fd6b87ebeb5b4790e939227e5e885f0422a5d53162258480d471fd8c00d698ce52838ca3f859 WHIRLPOOL d733b45a36ef3cedb5c8327b5a8b89bf76270f4347d51a702ac869687f24a65dfb85a4388e00aa81aebd04397ec8e555a2e9abed08c32f276fd8c5ae3e2cc8f9
 EBUILD netbeans-javacard-9999_p20151021.ebuild 4976 SHA256 6f89e15cba20992bcc753c2b30528ec01f252a375caef66957137d126fc61aef SHA512 1da01480b9c39dd0015598ced53b967b41af109b2fe415c3e630bcf8cb0fb07f504798cf1959e8778524587117275007a3d57c541ae36eb78632cba21d8c1155 WHIRLPOOL d072aebdce8fdbef17f4db01361bde811eaafd938c3c7a91068e657bdc17109a6e95b922dc63782ca66833ef63029dc239c98d72e28291385d6f9c5c09de2f2d
+EBUILD netbeans-javacard-9999_p20151022.ebuild 4976 SHA256 24603bc67e1689171486392d388ee593a230a938c672e0bf4e7a2f68c90f801a SHA512 50610482380a179244616d97104f60149bbfb63b36565bf73abf06df8a35edbfee1549a6fdb180b8d8ce64153943c4bce6f6ab0ebbd6ecad537578fe647f22cb WHIRLPOOL 63a866f42d85ac7064dbdf7be7862d0212e4bf45f9125a3ec5c340bfe3c7fd6b29d929c639ae99db690a320612b9e7a83b584cc8603445508f841869073e0fb2
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20151022.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20151022.ebuild
new file mode 100644
index 0000000..b83bb1f
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20151022.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-22_00-02-28/zip/netbeans-trunk-nightly-201510220002-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 08fff80..4cced51 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201510180002-src.zip 208635309 SHA256 d0e1daa5c4efe5
 DIST netbeans-trunk-nightly-201510190002-src.zip 208635309 SHA256 ec26fab3d6ab196510089a32f1324b69dbb9a51938c09b619feb5e46dab2d706 SHA512 9417d43e0c089d5ddbacef844be18a625ae1a1ef717abbe157c2245b1952b9852eb288e24257340a06c5ebecbca8e11b3c3bec3e2b0e0f7daef58b71f374869b WHIRLPOOL f708735c1d7bf0ff65d41cdf3df23563530236627f676b4da7e355697d297c4d07779813ed3043a7303f3b371e6da0460c63f5321042f87af36b3bbc60b210d5
 DIST netbeans-trunk-nightly-201510200002-src.zip 208646929 SHA256 58578f52d853065ed01442ec329d3a91610faaaea3f83253aeb4db125be71442 SHA512 8c0715828885c513dc12d391a202f1f3ccfdba9107dae60752754568369d68670ff088aaa5b550d7ef9f45a97048de5ffcc80cbcb4b59fbf9e8aba0a710a6bf9 WHIRLPOOL f36c658d37b39d0d9149ffaf3c4266a3fda14644b950216733054fa16a219ae16dc41355c44142cb14158aac60f205d29ce795e790a1ae01964847fb8e926678
 DIST netbeans-trunk-nightly-201510210002-src.zip 208641929 SHA256 b523c444d1fe7afb064c64225138aa795ad8ac9c0c25fef7d02bb534d2c54d4f SHA512 eed12ef2835ce6dcfb725bbacbebfde24c1893f7a67ebbb27a52e1ac907634cc562263de47e0115f620f45ca47874c833853965f3732569e65cc0213221a6fde WHIRLPOOL 0b8259848754750bc130a187e6e930effd66f765f6903fe7adab68e37be8b1048043bbe2cfcdf443ef58bd4d325d270b6900621678e3b1a730f3e41ae7294746
+DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e6871bf9e3601ea50113d123546decc916b02a832c876a07c6395 SHA512 413872ad9ca4ce3806db91c5c5dc137d031e1fa942f8382b02d86f97cf7e51892dfbfafe1751ff49bb76af3b4da10788ef5f46155eb1bd48f0d9110b5e72286e WHIRLPOOL 5b4ad028004e312be5602b1ef201ec9945320bc1345b4674c730f9af8cbbbf6da6f78dcffc1b4c71ffa7c0f8e13414f57c16a976418784aa0fa3d5825f56c572
 EBUILD netbeans-javadoc-8.0.2.ebuild 5993 SHA256 baf9da38d87b86eb8ed10ef46017361f36ca8583dd90885c9d1667a51851bc52 SHA512 892bc25b30dc26e3ee7c8be9aaf8542c00a7fa1d1d8f883d82bebb816edfa93e1ee9abeac1b0c47ecc8b4169bcaded56c5c71f18151fdc22fe241fcee0fd4521 WHIRLPOOL 2012f28f3ba5074b4d262b20e9a1c8ddf590ce444339ec1a404c890867c1271e38f9f9e09717d0648fae061553f5c8da3d97a70c35c8e853fe4894fb6fd4ec96
 EBUILD netbeans-javadoc-8.1_rc2.ebuild 6183 SHA256 160de5384af53a4ff95958ba30c1d3d0b3dbcf4e8f8209c67ff2447d504108c8 SHA512 cd7d0ecc527dc8c6a7ac59f27a39c332500ff60dd59b5c26d2579258adf75cff762083727b18172607d494a597143261423c97faa7f705015c372bff1a54908d WHIRLPOOL 39a55f84ccb43df6537b1276406d46d70cdc9e5b5c428aec33eeed091f5e580c752557319cbab5f6d6325de1509c87d8913f6c1b8712e72e148fb1883c684d76
 EBUILD netbeans-javadoc-9999_p20150914.ebuild 6228 SHA256 55dd9bf613c5bf6c5998afcdc3fd8194e58492ed3acd3897223bc8eaea80cfb8 SHA512 aeb46693635b14b92659b2f7f913aa2bc198098803e5653c8226822b84bde4e0a37212e32c3cfbbfc6307d49e778b7d1a7048e09e8c7f590b1a88b2fd4861e98 WHIRLPOOL 1c56c5b63744fd251f5f7c5264ee30011f0d067a70891211892bb195b32aa078f1cee5fcb4fc9522fd74a79acd1933d0360c07086b9e5c197161904b7d136351
@@ -58,4 +59,5 @@ EBUILD netbeans-javadoc-9999_p20151018.ebuild 6228 SHA256 c1304b137bdd5da5ee8973
 EBUILD netbeans-javadoc-9999_p20151019.ebuild 6228 SHA256 1b46a4f83150969b16a457cf82c6d9175831018bdf914b985a4e30d3b7eaeaf0 SHA512 3dfd2ee77e96e46f9195db4e4b91a070ec828be00bfef1164da9e5318f37d5b94a253459ad672802b8645bdff48e7e849ba54be0292929dfca07fb9610575eae WHIRLPOOL 11abbbac47d0da787929fc68d759dadae18c4684fc0aeae98122742c7cf62af7675fa6827c70e09f395d04a721dd51b21f1a918975bd851703b0556b5ccbc399
 EBUILD netbeans-javadoc-9999_p20151020.ebuild 6228 SHA256 dc223ff5c029585a18f5e15773ad43b6ee99773eaf61133e915d638b4b80a432 SHA512 3a4fc7a669aefec1454c261ec6d151ecfb47ff4615029619ba9817c284a6acd9c0444da9113d9bc494b8722a85034b102307797936886c0c9817ef87565eb903 WHIRLPOOL 1741f79478c96b3aec92750444759bca60a84914c64bdf8cd6b28a0c4d0afa33391df02c31da9337d2e52ab81f5f563b44da330c18d265b8f5e7e0e167f338e3
 EBUILD netbeans-javadoc-9999_p20151021.ebuild 6228 SHA256 536b88593cc4708143c8136999c88a9a48d1015578314c34de9884f807b5a08f SHA512 f398d5684d3c08c8172137417d48ea912a3dcb1855dcc78d5bf7ec66f484a96153e6c5adf5fb53b34606a5b1d5aeca15abd60aad8cb744ecec04caa83245835d WHIRLPOOL 8b03543bb4a31cd7b2723cf740255f4df88c97aa1ed18d7edc4de44a595de768a4784e55827e025d54d0f9da982ef06d258b5786d65323f5fb33c30507d9c966
+EBUILD netbeans-javadoc-9999_p20151022.ebuild 6228 SHA256 8fdf6ffbbb93cf146c379a837c35bb77b68f96bb6f9e1c555b42f12345ee71ad SHA512 f4897e1aa3260f6186eb1ef39c5778e0701ccb8791b4e77cb6d9d1c107df8d2e042bf99d4e48d34c18f37784179ec17f2dd29896e0e02c43a20634f55f6cc17c WHIRLPOOL 7fe77b458beaba8173cab0ed1662573a1204e79ae85bf149356f22b5e739466670831b91da6976516d235e56cefae96cf528146df60407bf1b57a648a9fb8269
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20151022.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20151022.ebuild
new file mode 100644
index 0000000..e5bb63e
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20151022.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-22_00-02-28/zip/netbeans-trunk-nightly-201510220002-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 b54a357..0c1b647 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201510180002-src.zip 208635309 SHA256 d0e1daa5c4efe5
 DIST netbeans-trunk-nightly-201510190002-src.zip 208635309 SHA256 ec26fab3d6ab196510089a32f1324b69dbb9a51938c09b619feb5e46dab2d706 SHA512 9417d43e0c089d5ddbacef844be18a625ae1a1ef717abbe157c2245b1952b9852eb288e24257340a06c5ebecbca8e11b3c3bec3e2b0e0f7daef58b71f374869b WHIRLPOOL f708735c1d7bf0ff65d41cdf3df23563530236627f676b4da7e355697d297c4d07779813ed3043a7303f3b371e6da0460c63f5321042f87af36b3bbc60b210d5
 DIST netbeans-trunk-nightly-201510200002-src.zip 208646929 SHA256 58578f52d853065ed01442ec329d3a91610faaaea3f83253aeb4db125be71442 SHA512 8c0715828885c513dc12d391a202f1f3ccfdba9107dae60752754568369d68670ff088aaa5b550d7ef9f45a97048de5ffcc80cbcb4b59fbf9e8aba0a710a6bf9 WHIRLPOOL f36c658d37b39d0d9149ffaf3c4266a3fda14644b950216733054fa16a219ae16dc41355c44142cb14158aac60f205d29ce795e790a1ae01964847fb8e926678
 DIST netbeans-trunk-nightly-201510210002-src.zip 208641929 SHA256 b523c444d1fe7afb064c64225138aa795ad8ac9c0c25fef7d02bb534d2c54d4f SHA512 eed12ef2835ce6dcfb725bbacbebfde24c1893f7a67ebbb27a52e1ac907634cc562263de47e0115f620f45ca47874c833853965f3732569e65cc0213221a6fde WHIRLPOOL 0b8259848754750bc130a187e6e930effd66f765f6903fe7adab68e37be8b1048043bbe2cfcdf443ef58bd4d325d270b6900621678e3b1a730f3e41ae7294746
+DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e6871bf9e3601ea50113d123546decc916b02a832c876a07c6395 SHA512 413872ad9ca4ce3806db91c5c5dc137d031e1fa942f8382b02d86f97cf7e51892dfbfafe1751ff49bb76af3b4da10788ef5f46155eb1bd48f0d9110b5e72286e WHIRLPOOL 5b4ad028004e312be5602b1ef201ec9945320bc1345b4674c730f9af8cbbbf6da6f78dcffc1b4c71ffa7c0f8e13414f57c16a976418784aa0fa3d5825f56c572
 EBUILD netbeans-javafx-8.0.2.ebuild 4647 SHA256 15e5e0b1c4729852dd55e5bfb2dcb520ba7c959bd9927d315c0abcb3f94e4ecc SHA512 520c60264fee67b0ccfd50ced0cc8586d5653d5186fa75c6b7cd8b400aae834de446b7e6145ad38df7e68207391fb360ef4834140e096d48add568fed387ac98 WHIRLPOOL 416a56ceb2ba85e3923ada0c8ef485cdd6fa16b3423b8fd0de523fa54dd082cbaedee5da4f1a92b50e440195f9256376f50e99a850d70ccdcb8c0ff370007f7c
 EBUILD netbeans-javafx-8.1_rc2.ebuild 4672 SHA256 95e0fd3db7cd71b95d3b1a0be1ec35e8b4f0ee2ef8e37e5defcdfb81c8a8ee4b SHA512 0dbdb39db83521ad87f5536c491a8f94d1d6261f1cebc5a80e943128f33364adf04a4a0a23898617eb0b12f770200f0a7df9c7bb8e5cac65aca4b50737a05b2b WHIRLPOOL 0ef3c1159df5dc25474beb8106b65133951ff48699c265d6be1a929e9537a30db8a125740f37a0295ed0e6267141cd1a7be9f5ec5d4412e0221f9734d6625b3b
 EBUILD netbeans-javafx-9999_p20150914.ebuild 4717 SHA256 c94fb1e23128e30fa73bbb32f64b5b253a06a3ec1d824d84ff6712d7ece8551d SHA512 416f91922ba69496cc1de0720559c933b053487bbe1587fe3cff56c640ec836eba6f9b4e7697c489b13c69a39b226ac41bb2108511b26a16c84f017ac8b37369 WHIRLPOOL 936e030931b83ead8beba2d397f24b049e189c0faabf27aa7ef36de371ec6d294f40070834d6b5e05d76fe790726b3d0253a3a8fcc91e202f2a2d2b405f939b0
@@ -64,4 +65,5 @@ EBUILD netbeans-javafx-9999_p20151018.ebuild 4717 SHA256 9f7b908822a8a2f9fa07d7f
 EBUILD netbeans-javafx-9999_p20151019.ebuild 4717 SHA256 d87a5dce318596ab9c03ea210efc4db9b4424d81e8e1282d0ab54459386e7bb2 SHA512 49f17fb0b686bd7bd066d5fa0d4478bf647b7bca20959cee3b66a61c5c2ef0ae778f7d63d84bb92153d624910503c0c4a79f45c9460c25b36bacf534f2ed1fee WHIRLPOOL 5912de521a15eac2e2cb41c44af15d852a6fdb2147841d240bccf5c4f3be5721cd2358a3f2b62e964e0175938066286c9c4e6b539219d256ac8ff909646cdc7a
 EBUILD netbeans-javafx-9999_p20151020.ebuild 4717 SHA256 9283235fe5544df58cb5962dced7108a333d8ba68124cabf6399a08435557670 SHA512 68f866b745bcbca8090a92896c0b5c29812eee41fe05a41c3f962f76a7026b98c6ca18ee441d394af0b11aab59a14bc9be50f5b4f87d257784ad3f2397e44dd5 WHIRLPOOL c35b1b34da5a61f3984a89dd10caa875c4bbe117964565de4c05a2417253c4fe311c5fee7c16f2c146004844007e0d90ecef359858cd89c3b9ec4357fba8d4cf
 EBUILD netbeans-javafx-9999_p20151021.ebuild 4717 SHA256 c47d7f400900c07d0d0e109eea6ac82602503243f545a7295d8a7641951804fa SHA512 8516c4f4eed684ba6927243a3f8088c7e3422f0b284fe31205c44fdf3b98d1bb4a67e36ec873e3fd955ce2951ac0d0052fc834b62a22a6f61dcb188aa7c29fbf WHIRLPOOL cda6d3bd92366f82b27550a4de1b628b65f14ef01dfe880ca638a3c55a6862e9fd89e97551dc49592723d9a1598fc8ac04a94f249db3214eefd9dd5d44c1a09a
+EBUILD netbeans-javafx-9999_p20151022.ebuild 4717 SHA256 1a6ce3036dbec321ce24697911fcb3ad3908cb64c51b3c4aaa7b64a46d1f9096 SHA512 2b3bb3d9f6e23ac6ae424481b4de62054751d0ae9c67d17c06358c3334033ad690153d359413b60f64e735967b7853c3a1d1ef212a4227b5c5cbb0f091e2f910 WHIRLPOOL 665235f06f9cb6008138cabb41d99088bf1f2b5e16c03d8e9076be3030d10ed73c09724357579528334b3b92c36f76bad501651f32e522f5866e64f26e6cd7d6
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20151022.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20151022.ebuild
new file mode 100644
index 0000000..16123e6
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20151022.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-22_00-02-28/zip/netbeans-trunk-nightly-201510220002-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 159dc83..2419c00 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201510180002-src.zip 208635309 SHA256 d0e1daa5c4efe5
 DIST netbeans-trunk-nightly-201510190002-src.zip 208635309 SHA256 ec26fab3d6ab196510089a32f1324b69dbb9a51938c09b619feb5e46dab2d706 SHA512 9417d43e0c089d5ddbacef844be18a625ae1a1ef717abbe157c2245b1952b9852eb288e24257340a06c5ebecbca8e11b3c3bec3e2b0e0f7daef58b71f374869b WHIRLPOOL f708735c1d7bf0ff65d41cdf3df23563530236627f676b4da7e355697d297c4d07779813ed3043a7303f3b371e6da0460c63f5321042f87af36b3bbc60b210d5
 DIST netbeans-trunk-nightly-201510200002-src.zip 208646929 SHA256 58578f52d853065ed01442ec329d3a91610faaaea3f83253aeb4db125be71442 SHA512 8c0715828885c513dc12d391a202f1f3ccfdba9107dae60752754568369d68670ff088aaa5b550d7ef9f45a97048de5ffcc80cbcb4b59fbf9e8aba0a710a6bf9 WHIRLPOOL f36c658d37b39d0d9149ffaf3c4266a3fda14644b950216733054fa16a219ae16dc41355c44142cb14158aac60f205d29ce795e790a1ae01964847fb8e926678
 DIST netbeans-trunk-nightly-201510210002-src.zip 208641929 SHA256 b523c444d1fe7afb064c64225138aa795ad8ac9c0c25fef7d02bb534d2c54d4f SHA512 eed12ef2835ce6dcfb725bbacbebfde24c1893f7a67ebbb27a52e1ac907634cc562263de47e0115f620f45ca47874c833853965f3732569e65cc0213221a6fde WHIRLPOOL 0b8259848754750bc130a187e6e930effd66f765f6903fe7adab68e37be8b1048043bbe2cfcdf443ef58bd4d325d270b6900621678e3b1a730f3e41ae7294746
+DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e6871bf9e3601ea50113d123546decc916b02a832c876a07c6395 SHA512 413872ad9ca4ce3806db91c5c5dc137d031e1fa942f8382b02d86f97cf7e51892dfbfafe1751ff49bb76af3b4da10788ef5f46155eb1bd48f0d9110b5e72286e WHIRLPOOL 5b4ad028004e312be5602b1ef201ec9945320bc1345b4674c730f9af8cbbbf6da6f78dcffc1b4c71ffa7c0f8e13414f57c16a976418784aa0fa3d5825f56c572
 EBUILD netbeans-mobility-8.0.2.ebuild 4342 SHA256 e9b4ff8fe38904346bc21a82219696e97322bf9df4e9d4cad2259b6f08bbe7f9 SHA512 338711fe61c469cee80e499ddf8c3ad70a3a38e6658311afcd1d24edd1a99b87566fafcbd392bb958b589796e0913d2574b07570870c8d3382a91a324227082f WHIRLPOOL 855b2817c36bea67c8fb368a0740be18b71dbebb2b98a154552f002a56eaff34f54eee2698379d7200a6042c1de699df23e7717b5b6c532776852d8757b74cb0
 EBUILD netbeans-mobility-8.1_rc2.ebuild 4367 SHA256 9b9490b5e2515bf38f69aee76ad664271a0296f68b88d4a005ab12d9048c61d8 SHA512 7eccdf31e705ae6f738995fdcb930c03cf779f02ed64d5e3ee97f1f9a9f6912a2ff56e1c839ddc2b71b9051fcd02ed410d85fff0c706b6ca84f3578c0aa2447d WHIRLPOOL 8d4657fc21b171bf050a272597e7b0567dac5ad480a8822fdcdf76b88b4537aaf8b45a3b1317dd34cef3beee417515a521b7e076e7776b845c0383066503ba3f
 EBUILD netbeans-mobility-9999_p20150914.ebuild 4412 SHA256 318aaed2311c749e72dc270361abfd97a8be75dd6fe5295688b69c82cea84ca4 SHA512 54768745327eb30abd6316d9b5b89e542542d0999fcf73155dfcb70b2a18e59e7a89a1fcf9e0fae3be2523ce68bb4ee5a2731d9c98263db66a4e6970b6c663c6 WHIRLPOOL 4d57661356f650fe83588f05d3cfcf5c374c90ee1232f053ee56d3253bdb9443c07589cdf25706b00c8b5564d660083ee160358b5741d4b6fd96ca5de7dc1cbd
@@ -57,4 +58,5 @@ EBUILD netbeans-mobility-9999_p20151018.ebuild 4412 SHA256 3d70f262e9a82d42956bb
 EBUILD netbeans-mobility-9999_p20151019.ebuild 4412 SHA256 031e3b2d35529eb701dc31b1c79f9260a6d2d07583781a5b179c9adf13cc503c SHA512 1de1a07b57a4091161bf575d057f65ae3f3f533fd415730d0f6326d52c791930db158e6cf82f905944beb80bbc9bc01210cfba8ce3529b7acc3804f7bd15f353 WHIRLPOOL c7ea91c5bdd1dad0ab7a85dcc2c1ed91a3e1a7525741b10313fa3f4f6e935078a28b2b295dd5ca18c3be87434e26cb605fbee488d22fb919f3414227f2c35632
 EBUILD netbeans-mobility-9999_p20151020.ebuild 4412 SHA256 1d8ef002e80070069c10a8f22e7f9ca36c3b42853cb5c703a8fce60f083d1323 SHA512 7034bc012801d98a05a011b2802d9afed49c382e120b6b09f4dfed83fa5f4a0c2532192ef3f436e6e579800f8302c4993f1c2892178f5959ad5fbda80f0c0aa7 WHIRLPOOL 503a6d3c20d7786ea062933e1dda16b596aa37f7744bbe40085981de931b6175b43589398e40e54ba9870073d3884a7315098766412e949cfe955497a575b549
 EBUILD netbeans-mobility-9999_p20151021.ebuild 4412 SHA256 df6d3be68d04956c7f3865ddc4ef8b0a26fd7b8dccfa3f7a0a64af16776cd264 SHA512 f72ab38f30043b6c9ee59141ea95547e5b46d7582c942bfa996d265766adbb6f09a8597b473426910fb87a91b7465cff5aa4b19a36895d166b165792b76487d0 WHIRLPOOL f80bf08281201c3cb5bfc7c33fadc7df8697bab60aae16bb8e0f90c48552f116c155f814dee18f62732a91d84cfc79491ff8569b10be3cb0b97e5e956d807776
+EBUILD netbeans-mobility-9999_p20151022.ebuild 4412 SHA256 39124bd89f53f7b3c28999fe76077da5cdde0489360ba3785f407ab2b52616fc SHA512 43bf5692f86d4cf5227d2a8270dc95801cf572cbb685ecfc72d95a131123147db059e91d6f3ad49dc212f28b58bde9236315820148c10fb3da9aba71285fdcc0 WHIRLPOOL 16b87a4dab31cd8fecee6beb315c6e2807dffac044cad1f3141d18dedfd6302d1db101f890f19b5618a9eb5069a5d57d2c47d69ddf2dcc9f7e58522d5ae0efcf
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20151022.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20151022.ebuild
new file mode 100644
index 0000000..f80b276
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20151022.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-22_00-02-28/zip/netbeans-trunk-nightly-201510220002-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 f3d9f79..fc521e7 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -32,6 +32,7 @@ DIST netbeans-trunk-nightly-201510180002-src.zip 208635309 SHA256 d0e1daa5c4efe5
 DIST netbeans-trunk-nightly-201510190002-src.zip 208635309 SHA256 ec26fab3d6ab196510089a32f1324b69dbb9a51938c09b619feb5e46dab2d706 SHA512 9417d43e0c089d5ddbacef844be18a625ae1a1ef717abbe157c2245b1952b9852eb288e24257340a06c5ebecbca8e11b3c3bec3e2b0e0f7daef58b71f374869b WHIRLPOOL f708735c1d7bf0ff65d41cdf3df23563530236627f676b4da7e355697d297c4d07779813ed3043a7303f3b371e6da0460c63f5321042f87af36b3bbc60b210d5
 DIST netbeans-trunk-nightly-201510200002-src.zip 208646929 SHA256 58578f52d853065ed01442ec329d3a91610faaaea3f83253aeb4db125be71442 SHA512 8c0715828885c513dc12d391a202f1f3ccfdba9107dae60752754568369d68670ff088aaa5b550d7ef9f45a97048de5ffcc80cbcb4b59fbf9e8aba0a710a6bf9 WHIRLPOOL f36c658d37b39d0d9149ffaf3c4266a3fda14644b950216733054fa16a219ae16dc41355c44142cb14158aac60f205d29ce795e790a1ae01964847fb8e926678
 DIST netbeans-trunk-nightly-201510210002-src.zip 208641929 SHA256 b523c444d1fe7afb064c64225138aa795ad8ac9c0c25fef7d02bb534d2c54d4f SHA512 eed12ef2835ce6dcfb725bbacbebfde24c1893f7a67ebbb27a52e1ac907634cc562263de47e0115f620f45ca47874c833853965f3732569e65cc0213221a6fde WHIRLPOOL 0b8259848754750bc130a187e6e930effd66f765f6903fe7adab68e37be8b1048043bbe2cfcdf443ef58bd4d325d270b6900621678e3b1a730f3e41ae7294746
+DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e6871bf9e3601ea50113d123546decc916b02a832c876a07c6395 SHA512 413872ad9ca4ce3806db91c5c5dc137d031e1fa942f8382b02d86f97cf7e51892dfbfafe1751ff49bb76af3b4da10788ef5f46155eb1bd48f0d9110b5e72286e WHIRLPOOL 5b4ad028004e312be5602b1ef201ec9945320bc1345b4674c730f9af8cbbbf6da6f78dcffc1b4c71ffa7c0f8e13414f57c16a976418784aa0fa3d5825f56c572
 EBUILD netbeans-nb-8.0.2.ebuild 4927 SHA256 7531e50c4d76608bf925efdba4f54f522de3a8ceeef4d48807fb4ee48bfabdf6 SHA512 925734f331cf228066c5c9e614f48b756af31cac8b559cfe756347b6a2cb0ce362c7c41489a25084f2ed3f2e415baefd148a54f39fc00269fb14179efe056cb9 WHIRLPOOL e3224c5f22bb8e4792a5f98bbe819e071ff18c99533ce05a3fc1c5898ddcca1e3ce34487ba78159bb4d60155acdf15ae4fe81189ff2d5b1bc77ffd9ee4e20aca
 EBUILD netbeans-nb-8.1_rc2.ebuild 4952 SHA256 7e7fd653bb309c4acbc812e3e4659e0f3f67f943ceaebfdea0e9ff75c2e71174 SHA512 59da938007782e139e0946ef8da1fcb49d2d6d993953222cd2540b0506981279c0f3ad6b9ccaba89af185f4fc9eb7ed23ec16e66c066c22541fe371384eab59b WHIRLPOOL 2be8f9f9cc42829865f393f4a641b73053d460da5c3bbe45bdf470ffd0c519e76af9e4712f0142d0c018801d003c347bcfb4fa99ff1e3a95bfebe8f1e0f02f2d
 EBUILD netbeans-nb-9999_p20150914.ebuild 4997 SHA256 b732bb9b9e9f525270f0f99f8975a6dcb82c07a6eb04ef2056c5afc387256bb7 SHA512 9275d710948861173aed8f0e37b5195684a7322a8ae4a21ff5b53647ce3e742b9d7c3eb3d1ae2562de2f72c6c948f3fb4f3da69f8ebac3acb3118422c03cd076 WHIRLPOOL 202450d4b7ab806dfe7e89958f9b2c998f189f48eb327532522f922040b38eee747351d055c97c29448cecfa674ab3332edbde40b15dd1ce741b8ab36697d5d3
@@ -60,4 +61,5 @@ EBUILD netbeans-nb-9999_p20151018.ebuild 4997 SHA256 e955ce319e2bf6c36fb0716f9b4
 EBUILD netbeans-nb-9999_p20151019.ebuild 4997 SHA256 aae5a9e0c85307179cf1a93f656d19bee53a56f3ba36084f8d498ea5487564f4 SHA512 27360e645cae24f6ccd396afc75d1195eb361d3bd5966a4879c8db36bbf00a5fc1ed32d9d0ddf524a4bf3b4af83e210abb1d4cf5e9f398c011cf5d10144a8bc7 WHIRLPOOL 3da80666bad91ba043e61e9aa51f8ade30c061055a224930782fb0bab8810440871f741bd1570f243e9b50bd2919293c3c729ddbea62d3480e445f7a112e2ea1
 EBUILD netbeans-nb-9999_p20151020.ebuild 4997 SHA256 9de1dc3e412e0221882d29d7c5fe185864b7cd18da96967de4c0548f8382c0b8 SHA512 e60354e81cd6278f54d71eecb07ad618cd8f9cc67e477bd4b4147ade941bb1316d39f05803dcd5e0ec559f075f2e1322909193bccc814722eeacdc5e074f3c33 WHIRLPOOL 04317326c50a78e843c281a4abd0e53cf1183fda10035a9ae3e120500a20b9a0a201ba990b184004635608a6fbccf6ef54a3ba0eb9fb3109b5c54a677405ed06
 EBUILD netbeans-nb-9999_p20151021.ebuild 4997 SHA256 18d9c7664c8a0426a3acdc46631c7830871e4582f4a869665c52522a12935a34 SHA512 0e04722f14fa109387d872adb91632819c5c16c91423e1d2fd656b24983e06ea3e144753f57c487559cbc536c2697aeefa3af56c73f5ea6b88e80148733edba8 WHIRLPOOL 9f4cfcbb2153b7a33866351e78151d74722db8af1a43ac52bff1470847a8e8d895036ab8c4ff0dda609d5ad0772f8686643b5df5af5f08f1af0f7edab94a75d4
+EBUILD netbeans-nb-9999_p20151022.ebuild 4997 SHA256 89df804a96cdef9701d3897bc135ec3d013e11d8153ca4a2a722511085709904 SHA512 debdddb74f9f74b303093ef594d78999a949b7793928a4830b1e3bd8a2b2ae17103b59a01376d10a4d094490bb99f9e158c39d3eb730c5bd14c17c790ea1b89e WHIRLPOOL 440fbc7759cac4c402b3132b9f72b04d6f956821f65ab659c55a20b56fd146574dc8aae3406a87fbdfe763eb0d73ed8ceda1bd2538e18478b17b9e44aa9c9119
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20151022.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20151022.ebuild
new file mode 100644
index 0000000..e5f76d7
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20151022.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-22_00-02-28/zip/netbeans-trunk-nightly-201510220002-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 65097c1..a73dda1 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201510180002-src.zip 208635309 SHA256 d0e1daa5c4efe5
 DIST netbeans-trunk-nightly-201510190002-src.zip 208635309 SHA256 ec26fab3d6ab196510089a32f1324b69dbb9a51938c09b619feb5e46dab2d706 SHA512 9417d43e0c089d5ddbacef844be18a625ae1a1ef717abbe157c2245b1952b9852eb288e24257340a06c5ebecbca8e11b3c3bec3e2b0e0f7daef58b71f374869b WHIRLPOOL f708735c1d7bf0ff65d41cdf3df23563530236627f676b4da7e355697d297c4d07779813ed3043a7303f3b371e6da0460c63f5321042f87af36b3bbc60b210d5
 DIST netbeans-trunk-nightly-201510200002-src.zip 208646929 SHA256 58578f52d853065ed01442ec329d3a91610faaaea3f83253aeb4db125be71442 SHA512 8c0715828885c513dc12d391a202f1f3ccfdba9107dae60752754568369d68670ff088aaa5b550d7ef9f45a97048de5ffcc80cbcb4b59fbf9e8aba0a710a6bf9 WHIRLPOOL f36c658d37b39d0d9149ffaf3c4266a3fda14644b950216733054fa16a219ae16dc41355c44142cb14158aac60f205d29ce795e790a1ae01964847fb8e926678
 DIST netbeans-trunk-nightly-201510210002-src.zip 208641929 SHA256 b523c444d1fe7afb064c64225138aa795ad8ac9c0c25fef7d02bb534d2c54d4f SHA512 eed12ef2835ce6dcfb725bbacbebfde24c1893f7a67ebbb27a52e1ac907634cc562263de47e0115f620f45ca47874c833853965f3732569e65cc0213221a6fde WHIRLPOOL 0b8259848754750bc130a187e6e930effd66f765f6903fe7adab68e37be8b1048043bbe2cfcdf443ef58bd4d325d270b6900621678e3b1a730f3e41ae7294746
+DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e6871bf9e3601ea50113d123546decc916b02a832c876a07c6395 SHA512 413872ad9ca4ce3806db91c5c5dc137d031e1fa942f8382b02d86f97cf7e51892dfbfafe1751ff49bb76af3b4da10788ef5f46155eb1bd48f0d9110b5e72286e WHIRLPOOL 5b4ad028004e312be5602b1ef201ec9945320bc1345b4674c730f9af8cbbbf6da6f78dcffc1b4c71ffa7c0f8e13414f57c16a976418784aa0fa3d5825f56c572
 EBUILD netbeans-php-8.0.2.ebuild 4347 SHA256 585b2488d748f3d0f87c17c951870e167aac7bf10847428add786e4a8a446583 SHA512 1431305d4f340cb0a2c7c896c54d45f6f02ef82a4201f82053278b98511a5a4a68210317530e9cdf5cf1f495996d3a3f9c4b2c3c479aa407abd375072ab3182f WHIRLPOOL af8476f2ff2d119f2657e6be03cfea1160f86e41bd791f40609f1bc8a8aada46ba1081e4f2417b0fddde931fa4e43d20956c0fe1d4fdf3617b78d01afd23f9b4
 EBUILD netbeans-php-8.1_rc2.ebuild 4372 SHA256 76dac153b77fd368c61ae61aedbda5d9bffd3e713520cfb6e8c6923c6443fd2f SHA512 7a62423b8a60734d337ab08f5a84513ef8246bf2e807b0f88acce1bb64add72cde91739289aa968bd1eecff64a78f4c5947f6e722af7509fb3c9d93f57ee72ac WHIRLPOOL 1effeb1eba78584a32d4b763804cca16383715029247bfc3569ee3e06135dc03cc65425a8769b0ffa259672fd20909699bda99833a9024a924b408c93f4befb1
 EBUILD netbeans-php-9999_p20150914.ebuild 4417 SHA256 62e159a5b5c0c29209b706551be320ca84450dc78e29154daf8edb484976b8d1 SHA512 e52ce209b828467b94ca3436c94bfdb120bb214aa49c598f6f296cfbca0a7e21572e9982d450725d9d851a089dcbbf9d19b33bb358aacdcf7d0e5a21a2a55078 WHIRLPOOL b82b7d0d8c002a4a61e67f8061e49e1900462a73126513c47016ee20ead9aec304db025eeeb10c425a49ce0ae0d422f43af78c014ff17c113c33e5aa1b61167f
@@ -61,4 +62,5 @@ EBUILD netbeans-php-9999_p20151018.ebuild 4417 SHA256 86a2751a59a2973232ebc58dcf
 EBUILD netbeans-php-9999_p20151019.ebuild 4417 SHA256 134c67ccb6d4a4f117eca9e7f423aa7b6d523a21809b808477c53bf9775603b3 SHA512 34596524d4627c8229dfcb1698da74a27d791a3046386e6eaac004128a2336e2a786fa0d8e9e946b2db68f77a383524085eb62e6197d0143183f7cb52a278dbb WHIRLPOOL f61c26bdaee16b1dce5ee9ea3965aae7e289c14103f9daf2ceab600b1e7b1cbcc0bef3832430db41df785968b63d02a195a8240da33da9bd67000c083eeb4338
 EBUILD netbeans-php-9999_p20151020.ebuild 4417 SHA256 208c7fa12dd52de0ce78d242a9f427ba5b41adfca6cb259fad7fc4ace2df820d SHA512 3f73c670d6dfe34c28379c6e107588c293bd283b5de32089c83f8c7770baf9b1e53a284ad62c82b96df9590e08b8f45653a679603326a005063242bbf510b1ff WHIRLPOOL 7014632a49417d2062092a771c83b140d31b2eb6586673af3c766fff1d8afbca1b749b1866a407378f9757621ccce816c19a08eb12a50d52891ec1c6fc3776fb
 EBUILD netbeans-php-9999_p20151021.ebuild 4417 SHA256 b24ce936662554673be3aff8ea5336e6fdab67b224387562f745e83b0db07c0a SHA512 925de49261031fcf5746b890b978a6c14fe33a8b9a4505fa32dd8db8667f7000ecf7e68aa507619b7bc96020167295f4b878798b69675cd91702142ac09e3f8b WHIRLPOOL e3ba0851bbf8eab5d9a0007beed75e16943721d30db70c2ef2aa7c2bd8e99ed2d45844ef4bac9c53e6e069a205772563abaf0e242c3fce56e42b24d41b7a3def
+EBUILD netbeans-php-9999_p20151022.ebuild 4417 SHA256 eecba5b3b17ecc48e5d37ed05da4c746b8b89447ee52ed6de0539b2ca40e3162 SHA512 28c76bdac0036e20abdcb72d3584c8cf598a51a2e5edb0f6ec76140ab41ca1a71e8dfeea002a55a4e7a3e4d778cd035cee876e5d5424b8f3adafe6b5a22aedfc WHIRLPOOL 6e5fdc4553d72deb8a695a3457c8b4963e92f0c502db34532f6483ed183bc01c31398770a743500e59d3fa2a82ae0c3695018756788976d434aa25b2afaade0c
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20151022.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20151022.ebuild
new file mode 100644
index 0000000..b14758f
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20151022.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-22_00-02-28/zip/netbeans-trunk-nightly-201510220002-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 2935325..8e662eb 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -53,6 +53,7 @@ DIST netbeans-trunk-nightly-201510180002-src.zip 208635309 SHA256 d0e1daa5c4efe5
 DIST netbeans-trunk-nightly-201510190002-src.zip 208635309 SHA256 ec26fab3d6ab196510089a32f1324b69dbb9a51938c09b619feb5e46dab2d706 SHA512 9417d43e0c089d5ddbacef844be18a625ae1a1ef717abbe157c2245b1952b9852eb288e24257340a06c5ebecbca8e11b3c3bec3e2b0e0f7daef58b71f374869b WHIRLPOOL f708735c1d7bf0ff65d41cdf3df23563530236627f676b4da7e355697d297c4d07779813ed3043a7303f3b371e6da0460c63f5321042f87af36b3bbc60b210d5
 DIST netbeans-trunk-nightly-201510200002-src.zip 208646929 SHA256 58578f52d853065ed01442ec329d3a91610faaaea3f83253aeb4db125be71442 SHA512 8c0715828885c513dc12d391a202f1f3ccfdba9107dae60752754568369d68670ff088aaa5b550d7ef9f45a97048de5ffcc80cbcb4b59fbf9e8aba0a710a6bf9 WHIRLPOOL f36c658d37b39d0d9149ffaf3c4266a3fda14644b950216733054fa16a219ae16dc41355c44142cb14158aac60f205d29ce795e790a1ae01964847fb8e926678
 DIST netbeans-trunk-nightly-201510210002-src.zip 208641929 SHA256 b523c444d1fe7afb064c64225138aa795ad8ac9c0c25fef7d02bb534d2c54d4f SHA512 eed12ef2835ce6dcfb725bbacbebfde24c1893f7a67ebbb27a52e1ac907634cc562263de47e0115f620f45ca47874c833853965f3732569e65cc0213221a6fde WHIRLPOOL 0b8259848754750bc130a187e6e930effd66f765f6903fe7adab68e37be8b1048043bbe2cfcdf443ef58bd4d325d270b6900621678e3b1a730f3e41ae7294746
+DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e6871bf9e3601ea50113d123546decc916b02a832c876a07c6395 SHA512 413872ad9ca4ce3806db91c5c5dc137d031e1fa942f8382b02d86f97cf7e51892dfbfafe1751ff49bb76af3b4da10788ef5f46155eb1bd48f0d9110b5e72286e WHIRLPOOL 5b4ad028004e312be5602b1ef201ec9945320bc1345b4674c730f9af8cbbbf6da6f78dcffc1b4c71ffa7c0f8e13414f57c16a976418784aa0fa3d5825f56c572
 EBUILD netbeans-platform-8.0.2.ebuild 5406 SHA256 98e9861da45ead0d2d975a0527315df5282870b2d7e71a089724d91c18852e81 SHA512 cadbe66132d3ad81f6d149e20731b558c11c529e2ec15b1fe47ff97d99a3f4b4612fa5c98c435c4ff979eaefab6702721db009a03162202c96b4b411cf9f872a WHIRLPOOL 9552948e8bbad308f4379eaae69d8c214da9fbfab87d75226949b69ddca3e68c2d36c4d05738196073e5b959ab0b764064c9186d421198937122aa4bdc4988dc
 EBUILD netbeans-platform-8.1_rc2.ebuild 9337 SHA256 3c257f2aa4574f4ec2cdcfee98008ed97c8ad08acaf27e4a19a11d6728154bec SHA512 d09eaa53c2a8f7162335ee24832b41c3a5d044f2415e694b895253baab7ced21300cb1eaf509720b261070401fbe71c2f629545705bb4bd41512f12cb432bc4f WHIRLPOOL d36468c532d27fea2d4718a3780175e81e1d2f5df2a6e1bf9a4bad6ee6b2c1f7a7e845a23128d3a5354031970fd6bc2eaa683fe3033b847ec966e9b8db0c4aeb
 EBUILD netbeans-platform-9999_p20150914.ebuild 9382 SHA256 d7484e54be1695327a998c284835af5647524c0faf30647e203482bfc2b42a9f SHA512 d2437197848e0cb0cb15ac5162d3d8118d84596e2029bd6856f22b0632a084c96744493c5f6e21ee6538b6673ee5a98fc776935c0db4c832ebae72053d46adbf WHIRLPOOL ddcaf68172239149f7587eb6f0958103bf1f81888b3e2564c8efe5ae78683b812add70312c84c0e8252daebd6f6d60daebf462db111e2932618f60ef06f5fed8
@@ -81,4 +82,5 @@ EBUILD netbeans-platform-9999_p20151018.ebuild 9382 SHA256 2e7c7c99e1dacb14d36c2
 EBUILD netbeans-platform-9999_p20151019.ebuild 9382 SHA256 3709e97a9fc66b35cfc999e68d76d834ee8160b893a5ca60e43af03341195561 SHA512 2d7094d4b084585479721dfab2682735f42a2ac5fea1ae7ec9e4cfa853599c8818ec8a44bcf19cd02d6bb01bf88f8fe07f3082f2526ca2f472e53ad90469a2c0 WHIRLPOOL 70f183498d51471b0a51dfd569457573b41a9b8d3058a0de4e2ebf31e04cdb6560e9d881f530890c25b8f07addec8956a034265be41bae78f86d08b2b338dbd8
 EBUILD netbeans-platform-9999_p20151020.ebuild 9382 SHA256 db617dafb475e4324a21b071b145e661f9a79d786e95e7f396234d29308dc595 SHA512 5fcebabf4c0035b7ab436ca6da2ddf63a19a3d1f91e87193a0dc806b25d03c0f4e406b43232460bc4f54155a741d975b77dbeb2ec621a300276dae0b1b2f3033 WHIRLPOOL ec49b99816e734a41606e73d3d5bfbcdddfb9bbe73e667b5596919696f683ea37bbe8fcfc118ab63be48029de4708d4315944c38e98891a07e635634de7c8e0a
 EBUILD netbeans-platform-9999_p20151021.ebuild 9382 SHA256 d9742a3110a5b22b89e4329b9412db78682613b582e782a2a9813768948604e4 SHA512 fc2fe7c58772ce0ade11802e35e777bf91318e3a6b1d10dc66378e36fe310d36db8c51c575b6830eaf5876b2e6fee8a86b19e57ee6e9f1d2dd106f50ab4a8c78 WHIRLPOOL 21ec9e4973de328392a4b7ab8e850f3389ffdc642f120749ba35cb0ba80d5c7db08c8f7f378e97bdf6460c0e14d39a05b638af66b72e6422855cedf4131261b7
+EBUILD netbeans-platform-9999_p20151022.ebuild 9382 SHA256 1eb19a322dfc7d6dc8f1bb971253b41957503406af7c41eeb24c68b675fb7106 SHA512 4eca2fce825c4c4b6153c3808b68772c50c4f4e665d37ccab33b81b95cecad54b2d1979252c8b77ce8fc91599421bc974e995dd7a03af4e633d110254da13337 WHIRLPOOL a0f1a07c99ccee9cea1282657c855fee70aeef72487816d23f5f4874795ad27d188987f0babda4f74dbf5bdd5db8f1a3ff5056aa709d62f2a04bfe2758dfde9f
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20151022.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20151022.ebuild
new file mode 100644
index 0000000..35933b9
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20151022.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-22_00-02-28/zip/netbeans-trunk-nightly-201510220002-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 e285467..2079215 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201510180002-src.zip 208635309 SHA256 d0e1daa5c4efe5
 DIST netbeans-trunk-nightly-201510190002-src.zip 208635309 SHA256 ec26fab3d6ab196510089a32f1324b69dbb9a51938c09b619feb5e46dab2d706 SHA512 9417d43e0c089d5ddbacef844be18a625ae1a1ef717abbe157c2245b1952b9852eb288e24257340a06c5ebecbca8e11b3c3bec3e2b0e0f7daef58b71f374869b WHIRLPOOL f708735c1d7bf0ff65d41cdf3df23563530236627f676b4da7e355697d297c4d07779813ed3043a7303f3b371e6da0460c63f5321042f87af36b3bbc60b210d5
 DIST netbeans-trunk-nightly-201510200002-src.zip 208646929 SHA256 58578f52d853065ed01442ec329d3a91610faaaea3f83253aeb4db125be71442 SHA512 8c0715828885c513dc12d391a202f1f3ccfdba9107dae60752754568369d68670ff088aaa5b550d7ef9f45a97048de5ffcc80cbcb4b59fbf9e8aba0a710a6bf9 WHIRLPOOL f36c658d37b39d0d9149ffaf3c4266a3fda14644b950216733054fa16a219ae16dc41355c44142cb14158aac60f205d29ce795e790a1ae01964847fb8e926678
 DIST netbeans-trunk-nightly-201510210002-src.zip 208641929 SHA256 b523c444d1fe7afb064c64225138aa795ad8ac9c0c25fef7d02bb534d2c54d4f SHA512 eed12ef2835ce6dcfb725bbacbebfde24c1893f7a67ebbb27a52e1ac907634cc562263de47e0115f620f45ca47874c833853965f3732569e65cc0213221a6fde WHIRLPOOL 0b8259848754750bc130a187e6e930effd66f765f6903fe7adab68e37be8b1048043bbe2cfcdf443ef58bd4d325d270b6900621678e3b1a730f3e41ae7294746
+DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e6871bf9e3601ea50113d123546decc916b02a832c876a07c6395 SHA512 413872ad9ca4ce3806db91c5c5dc137d031e1fa942f8382b02d86f97cf7e51892dfbfafe1751ff49bb76af3b4da10788ef5f46155eb1bd48f0d9110b5e72286e WHIRLPOOL 5b4ad028004e312be5602b1ef201ec9945320bc1345b4674c730f9af8cbbbf6da6f78dcffc1b4c71ffa7c0f8e13414f57c16a976418784aa0fa3d5825f56c572
 EBUILD netbeans-profiler-8.0.2.ebuild 3402 SHA256 8021dea620d1bc26214ff0ec285f8061c24693dd28a62a97a48ac3223707e920 SHA512 2660390337a973256b1aac3a02b14e16782c230fa2714ae695213b0cabc0eb60621c6a1ae234f9e57259a19de22a87447f9a89ab846bd59bcedd2be313c35072 WHIRLPOOL 5d1053ded03143b2de05b64cfbe59b515cb786d60bfa65566be795567bfaf5feb88a2f8e7161a05da512fafd523f871778d5ddeb3c6b89fc95885096e379f65d
 EBUILD netbeans-profiler-8.1_rc2.ebuild 3427 SHA256 a142e156521746287b96e62a067e8a1fa3c6d1545a5528e2fd210e1b9c703906 SHA512 e2c864258c2dee2cf734ba2654c88c80c7a4f5a141a12370dae16c9a90609e0e84a0469ccab6925edb809e2bd192974372d5d4dcb69f3caeaf184a9c47fe0262 WHIRLPOOL 92fcf803213ad769fcf9df2bc8fc801423b222a727bf95bfabff28f38c8d1ef76c4a3193fae5f5a2b64d9a043e5bd5f42dd0cef165067ba94e8dc5fc9aec0312
 EBUILD netbeans-profiler-9999_p20150914.ebuild 3472 SHA256 70e6661ae19b9266a061eeae848bfc222db8ce83c0e63637938067ff772faaf6 SHA512 9a453a6ddb59beeff6c76e35cfd583c9d96aa0a6cb3ffa76bcc954289dd10b37e8217c06e5098b0b7caebf839ae6f3e6cc8debd0965f0ed465add1a4ff0b952c WHIRLPOOL d9716e833060942bb6ed623db92d0c8e4d9b7a0ba3a469202a2231cf3e284ebcaf3b003e267a51a515e302bb230a342341d34445690e2402a02584f71c7d2e05
@@ -57,4 +58,5 @@ EBUILD netbeans-profiler-9999_p20151018.ebuild 3472 SHA256 8ced5e95622467c3fe974
 EBUILD netbeans-profiler-9999_p20151019.ebuild 3472 SHA256 eace79d3de272258ef9009a3c4283d9fa701041260025c287263b34b6f072b1d SHA512 bd2467fb53675302480acaedcbc2534289b8b186bd2c258953cc250ce78e8611316836718ae1319504f881ed8df2e3f37538d6c88c62116c617e3eac65fb813c WHIRLPOOL f059f18d280038e6d11f4fd25572d079ec40ede9b5f045dcf0607083b9a2fa908c632c812d40a81910a577aa7dcff199ada3afd561d049c80733df2e8b0f12dc
 EBUILD netbeans-profiler-9999_p20151020.ebuild 3472 SHA256 2b1993d329fe5afdea67c7e24a85fafff444cd7c28b57c9caf5c62b1ecde78f1 SHA512 db24778ecdb2490041c2ec371f94bbe417d1e2712ee1cd43b39b069f3dec7d87b23c494fbfe85408f7d202caa8c3e8761346070d07bb51233d75c24cc623b206 WHIRLPOOL 48caf83a0980a80af45609c9067e4c7f3df4f78f405fe2b545a14a63abf3fad1f316181767f1da3f5b945eaf0bf566ead544ad18516604c5fdc2099a493b7f04
 EBUILD netbeans-profiler-9999_p20151021.ebuild 3472 SHA256 03f58d3f6e992c1274fdcc0025c4fa32f718075f0e5225589a6873a0a2d64c7b SHA512 963d342afd85e0451a1bfcc72f94fd77b3f166bd38bb1b03f1bf414640aaa901167fbccc622d71a6c3708cd1eec278501acebe5271352ff65b0a6c3b8c5fa11e WHIRLPOOL e976cace69d324d27c8fa2ce56239d884d2a673c4c341aec1748a7743f8712c6395c9bdc7121750a62f6751d37c194207b08dc644540aa4e0fd0a59f90c47289
+EBUILD netbeans-profiler-9999_p20151022.ebuild 3472 SHA256 f33a9e9eb1f2a2dce32855a61ec417a3ff6c835b011492d83c66fa884c0f0179 SHA512 740a39b644677e35195cdc9e83afeacafe8ea0e76a4e8e8c4d3fcbbdcadaf675a4e99e8ff713892587cd3fb0e7d7e06e207b17a3abb39914b4e32cdb7a1d37c2 WHIRLPOOL b25ef4c55c9305654175af0bb700c3796858dc836f3868f3a6ade3b7455f643c46819534170e90a82efffcdf98ff37f33827f8e556a3641343bd46f162c8f228
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20151022.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20151022.ebuild
new file mode 100644
index 0000000..7b8d2c4
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20151022.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-22_00-02-28/zip/netbeans-trunk-nightly-201510220002-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 3527a2c..c6a31d5 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201510180002-src.zip 208635309 SHA256 d0e1daa5c4efe5
 DIST netbeans-trunk-nightly-201510190002-src.zip 208635309 SHA256 ec26fab3d6ab196510089a32f1324b69dbb9a51938c09b619feb5e46dab2d706 SHA512 9417d43e0c089d5ddbacef844be18a625ae1a1ef717abbe157c2245b1952b9852eb288e24257340a06c5ebecbca8e11b3c3bec3e2b0e0f7daef58b71f374869b WHIRLPOOL f708735c1d7bf0ff65d41cdf3df23563530236627f676b4da7e355697d297c4d07779813ed3043a7303f3b371e6da0460c63f5321042f87af36b3bbc60b210d5
 DIST netbeans-trunk-nightly-201510200002-src.zip 208646929 SHA256 58578f52d853065ed01442ec329d3a91610faaaea3f83253aeb4db125be71442 SHA512 8c0715828885c513dc12d391a202f1f3ccfdba9107dae60752754568369d68670ff088aaa5b550d7ef9f45a97048de5ffcc80cbcb4b59fbf9e8aba0a710a6bf9 WHIRLPOOL f36c658d37b39d0d9149ffaf3c4266a3fda14644b950216733054fa16a219ae16dc41355c44142cb14158aac60f205d29ce795e790a1ae01964847fb8e926678
 DIST netbeans-trunk-nightly-201510210002-src.zip 208641929 SHA256 b523c444d1fe7afb064c64225138aa795ad8ac9c0c25fef7d02bb534d2c54d4f SHA512 eed12ef2835ce6dcfb725bbacbebfde24c1893f7a67ebbb27a52e1ac907634cc562263de47e0115f620f45ca47874c833853965f3732569e65cc0213221a6fde WHIRLPOOL 0b8259848754750bc130a187e6e930effd66f765f6903fe7adab68e37be8b1048043bbe2cfcdf443ef58bd4d325d270b6900621678e3b1a730f3e41ae7294746
+DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e6871bf9e3601ea50113d123546decc916b02a832c876a07c6395 SHA512 413872ad9ca4ce3806db91c5c5dc137d031e1fa942f8382b02d86f97cf7e51892dfbfafe1751ff49bb76af3b4da10788ef5f46155eb1bd48f0d9110b5e72286e WHIRLPOOL 5b4ad028004e312be5602b1ef201ec9945320bc1345b4674c730f9af8cbbbf6da6f78dcffc1b4c71ffa7c0f8e13414f57c16a976418784aa0fa3d5825f56c572
 EBUILD netbeans-webcommon-8.0.2.ebuild 4723 SHA256 e2ba39cb6f22c990acf9a492eac5707f130382d56f9bc1e3636e82cbe4d61938 SHA512 61955d38f829b3ed54bc5cb9a71da07f05676a2bf7219fa8073aeee0f0e2d0e73f7aa6ec1636be39fb071d3d2b9de7ceb813a247a61961874f4cc78697d4e568 WHIRLPOOL 1a272650fc2394716a790b79cb85a9322929c7cc96ea4776cc639fb869c5b536140dbdc632b1a8aa9cb1fc8e740050125c2ebe9390de7a8f4207e88e24924206
 EBUILD netbeans-webcommon-8.1_rc2.ebuild 4946 SHA256 62c9421fd1f005d264d6c6f4eb6a0da4ba51fab3b6367b8128e543f24ef10242 SHA512 d38f9ca1f9a6671f7404a456544e2ea85f9261d6f011edcbee25c0ed829cfc751dd4a62a46db8081f23ad2bb82be1af2b0885d5863e6cd0f2be94073d2bc7547 WHIRLPOOL 6cc61860487ab3ed2b7db33ac73ce4df96dcbb739316f5b2cd0d0135be4ec9f5d4f3f8025dedf62a612b23dd7403d9fc9366848b8b8fe9311e8c2425099d1eab
 EBUILD netbeans-webcommon-9999_p20150914.ebuild 4991 SHA256 effe63f53cba64c97aa72a551076e34370fc9c828dd714532f49d53de98236d6 SHA512 b9387c353e55afff01908a5215806a4ea00d84523f61dd61d546c62a3eb2cf16b23d9b55558dd3bf5d2afdc789c79ad92329189bfd8f6a61c2578ba70444d5f5 WHIRLPOOL 7f86faa1190f131fa6496a2ddfb3fa8ace8b59f76a834f6b5aafe991530ebc6326c67610f605888d490894a47908a627ffaf5126fd7f23b896732add9a26f3ed
@@ -66,4 +67,5 @@ EBUILD netbeans-webcommon-9999_p20151018.ebuild 4991 SHA256 5fa424f30ff9800d517e
 EBUILD netbeans-webcommon-9999_p20151019.ebuild 4991 SHA256 2adcbca8db36c998c90f1e828ae175af1aa4d1b3bb685edb31e0624921c90063 SHA512 86635481d4f7b0ff07ad0faaf82d30392a2a7970cb14d685f8a2fffa0612046fbb882f9c85ab7540abeacb99f9ab7994a1a6714d85f69a5365fc1b11008835f9 WHIRLPOOL 92e4a9c50fb586335b71641d0516ebef5c7034aadae6ce3aade0e89216275dd78413429310ab645b4355df5939e0baa500f121ee7732d81c01fb35231ed49dad
 EBUILD netbeans-webcommon-9999_p20151020.ebuild 4991 SHA256 d0ec398501285ef079063a9136b13a1cd191a422b54a035e2c3dfc4ba7603b31 SHA512 480a3b051ef36de88a023d53f764b522dee66ec02d1acb730d43cf4e8dc7f3f66690ce847fb3ce37a2f8b0234a0fc9fef3e6683ca40f858cd2dd0df1eda15687 WHIRLPOOL bc2873d5be22616d0327e9f40bc721549b75f4bb4d2288ab415ce3a5ec18c77ba0c1e8d9dde7524d0efac71142f95fc68fb951c0a786eb40dc22fec52991d4cc
 EBUILD netbeans-webcommon-9999_p20151021.ebuild 4991 SHA256 e1bcd977700d48aa2bb75b738ecff755fc24723d4152d0acc832a2b8c2d7311f SHA512 26df77097e720f8fa8cda7b666f64998f0851eb5cc4d7763974b4a09e863a59827efe68f76fef434685ffae7b5f21c7367d5713d3318547efc588606b4595b64 WHIRLPOOL 7d54f163d3939bba0ddcd256ec91addbe063101cc8d8b1dcfd7e08d586d52cd9b0a2e19d08db316d916ba97066b6989772e2231c0c73f67fbb57434b14f95a7f
+EBUILD netbeans-webcommon-9999_p20151022.ebuild 4991 SHA256 b1a14475ee0025e7b750d8779915750c7b30d1bbd79513f536a21fecd237eadf SHA512 dadc81d7405fd4bee1249583ce4102a1193c959825e261372a8ce561a6b6415712dac13b1a78ac3f808d45a771a362c1c8944769ad191fbaa333e1e0d235f7f9 WHIRLPOOL 24a20915e017bad651b8bcab44e107e2ff5ca74925fa5975400f8b94f9339d97cf9ead5e2af7b36bc67fb0e2a01d7a7a1d613a84a2e222bebfe4aec5fe25035c
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20151022.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20151022.ebuild
new file mode 100644
index 0000000..f846ace
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20151022.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-22_00-02-28/zip/netbeans-trunk-nightly-201510220002-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 789d4d2..1ac5744 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201510180002-src.zip 208635309 SHA256 d0e1daa5c4efe5
 DIST netbeans-trunk-nightly-201510190002-src.zip 208635309 SHA256 ec26fab3d6ab196510089a32f1324b69dbb9a51938c09b619feb5e46dab2d706 SHA512 9417d43e0c089d5ddbacef844be18a625ae1a1ef717abbe157c2245b1952b9852eb288e24257340a06c5ebecbca8e11b3c3bec3e2b0e0f7daef58b71f374869b WHIRLPOOL f708735c1d7bf0ff65d41cdf3df23563530236627f676b4da7e355697d297c4d07779813ed3043a7303f3b371e6da0460c63f5321042f87af36b3bbc60b210d5
 DIST netbeans-trunk-nightly-201510200002-src.zip 208646929 SHA256 58578f52d853065ed01442ec329d3a91610faaaea3f83253aeb4db125be71442 SHA512 8c0715828885c513dc12d391a202f1f3ccfdba9107dae60752754568369d68670ff088aaa5b550d7ef9f45a97048de5ffcc80cbcb4b59fbf9e8aba0a710a6bf9 WHIRLPOOL f36c658d37b39d0d9149ffaf3c4266a3fda14644b950216733054fa16a219ae16dc41355c44142cb14158aac60f205d29ce795e790a1ae01964847fb8e926678
 DIST netbeans-trunk-nightly-201510210002-src.zip 208641929 SHA256 b523c444d1fe7afb064c64225138aa795ad8ac9c0c25fef7d02bb534d2c54d4f SHA512 eed12ef2835ce6dcfb725bbacbebfde24c1893f7a67ebbb27a52e1ac907634cc562263de47e0115f620f45ca47874c833853965f3732569e65cc0213221a6fde WHIRLPOOL 0b8259848754750bc130a187e6e930effd66f765f6903fe7adab68e37be8b1048043bbe2cfcdf443ef58bd4d325d270b6900621678e3b1a730f3e41ae7294746
+DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e6871bf9e3601ea50113d123546decc916b02a832c876a07c6395 SHA512 413872ad9ca4ce3806db91c5c5dc137d031e1fa942f8382b02d86f97cf7e51892dfbfafe1751ff49bb76af3b4da10788ef5f46155eb1bd48f0d9110b5e72286e WHIRLPOOL 5b4ad028004e312be5602b1ef201ec9945320bc1345b4674c730f9af8cbbbf6da6f78dcffc1b4c71ffa7c0f8e13414f57c16a976418784aa0fa3d5825f56c572
 EBUILD netbeans-websvccommon-8.0.2.ebuild 2651 SHA256 a195b307847c466dbb5f46eb04240358ce3c92cadeecb8fda1562304de46820f SHA512 933626bd2073f58e3508180c042e237b9e61ba6f3c992cf37ea43978ac2fc972d2dcc3ef0b5c390b3867296e197ed2605c43452c98e36acf0982e7338b6d1eb7 WHIRLPOOL c3db8f0b50116d0129f50778e1961166e76601d8c165e20e73d75c91b02c8a095067e0f13e18178d849dd29adcedaeee7d3e0e62f99be592d7ce159fd6af632e
 EBUILD netbeans-websvccommon-8.1_rc2.ebuild 2676 SHA256 9c17f1d8da5dc2d0f744317b9e5e29069ae4a51c6cb08ae5ab3a76d4739f96dd SHA512 a02ca061aedf144a6f7a5dc86371125d7abed807c0e47393de18d4164309d4d5733d869c4ee9577924af1949b95418518e6e8dd1f4bec2938507d6f68ab202b8 WHIRLPOOL 7e07a5d125295dae0cc1d38e162b8225e46e7d668fd8255e74d05a0739bc8204ffd9f192c5a9e043ee1e856057441a2cb7424f2f9b512e659740e27c5ef532a7
 EBUILD netbeans-websvccommon-9999_p20150914.ebuild 2721 SHA256 41de18c1c6beef6483dd0059ae110ab4daef1a6072695a9e6076567a603d0ab1 SHA512 43f23cd5773be7a6e3d2859ce4218271510bb6318adce194edb90fa342e96d89221bb5edd381985dd7dc1ab5d7c3cee02cf0cb72c4c840191fb59c9ab77b2352 WHIRLPOOL e09384741bbe250f95b231eff35d645d77788a7c425909261db2fdf780267d2c92d45fe63583e37f4b086c767a32b1ada38e28c3884b5c4a7e84d8bb2d76c5b4
@@ -57,4 +58,5 @@ EBUILD netbeans-websvccommon-9999_p20151018.ebuild 2721 SHA256 580a129a1160ab01e
 EBUILD netbeans-websvccommon-9999_p20151019.ebuild 2721 SHA256 443153a696ca5d85c4e1be5a42f4de77677c884e050820af80fffce32bc5fa1d SHA512 dfedd19c47fb32e5f5cbbbb43856492bdc0800d3e3300dbb95c8fe5e936ce9e5b475ec8b6266169199ac8c82897ec0d22fa99f69ebc4ab389551c5a470bca92e WHIRLPOOL 43491118eee9eb10b5f9fb538ddd304c5d96bf505e1d5cbd9289773b04d3ce592bfd8e2f6a2ba609db6773609f2e120770d411fc02d4e78c311360c0049429d8
 EBUILD netbeans-websvccommon-9999_p20151020.ebuild 2721 SHA256 115ff09c7ff247c8b9ef65d7452406d05c17a740ee65c47948d9930276f6a565 SHA512 27ade14dda248dc3af18dd95798bf50b1bb777decc2c7c19757bac3a23fd6da256cce671acbd5c17c46c3c0ee2713f6ea1a901f5e48e2af74bc5a4c141686666 WHIRLPOOL d663e9681d67ce23e5147ffff7215a00c11a2ea3414ac04d27d7f4a94fb4853a1a51c48005a1cd78aaaf0cb788850315982b39d640cda5d6ad80a69bd6906bdb
 EBUILD netbeans-websvccommon-9999_p20151021.ebuild 2721 SHA256 ce046ae9846e58b532e79316ebb273b4d664408658b4f587f237af3b7028dd45 SHA512 f252fa6dd9b9bb9da91f8d53076fc4784be036b375cf0e6ab58accd5472b90096aec06a7a4e5072dee259b5a6bf7045589c2e54ba23a04480cf5d3e293ebcd09 WHIRLPOOL cee236130568ed4089c9d439794453fcba3a75370b7c82b0d7d4754d2d92a19ca2bc673e18e06723baa4938068d3b514a7811f16be278f4db2466099810a0603
+EBUILD netbeans-websvccommon-9999_p20151022.ebuild 2721 SHA256 81a6b38dc99d0293d3403c66340e6bbe1542382bd4be3a4849d77948dc7f72d7 SHA512 178c75337decbe611cae1d3456fcf5c92cfa16ec554ed841c97ad84e462af8db33ea488fe21cd8fe9db41483fdb3808a808de3f5a512dece8c5c3fd0d3b982c5 WHIRLPOOL b737fa34d4babc81e05fe98cbc2611758803f303a5b28f366d1bdd9ac0b1d769ac25c440652363e412b4637f671457f653ae2747542d80d94c3fc479a9b402d0
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20151022.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20151022.ebuild
new file mode 100644
index 0000000..12e4759
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20151022.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-22_00-02-28/zip/netbeans-trunk-nightly-201510220002-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 17c95ee..dadf78b 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -32,6 +32,7 @@ DIST netbeans-trunk-nightly-201510180002-src.zip 208635309 SHA256 d0e1daa5c4efe5
 DIST netbeans-trunk-nightly-201510190002-src.zip 208635309 SHA256 ec26fab3d6ab196510089a32f1324b69dbb9a51938c09b619feb5e46dab2d706 SHA512 9417d43e0c089d5ddbacef844be18a625ae1a1ef717abbe157c2245b1952b9852eb288e24257340a06c5ebecbca8e11b3c3bec3e2b0e0f7daef58b71f374869b WHIRLPOOL f708735c1d7bf0ff65d41cdf3df23563530236627f676b4da7e355697d297c4d07779813ed3043a7303f3b371e6da0460c63f5321042f87af36b3bbc60b210d5
 DIST netbeans-trunk-nightly-201510200002-src.zip 208646929 SHA256 58578f52d853065ed01442ec329d3a91610faaaea3f83253aeb4db125be71442 SHA512 8c0715828885c513dc12d391a202f1f3ccfdba9107dae60752754568369d68670ff088aaa5b550d7ef9f45a97048de5ffcc80cbcb4b59fbf9e8aba0a710a6bf9 WHIRLPOOL f36c658d37b39d0d9149ffaf3c4266a3fda14644b950216733054fa16a219ae16dc41355c44142cb14158aac60f205d29ce795e790a1ae01964847fb8e926678
 DIST netbeans-trunk-nightly-201510210002-src.zip 208641929 SHA256 b523c444d1fe7afb064c64225138aa795ad8ac9c0c25fef7d02bb534d2c54d4f SHA512 eed12ef2835ce6dcfb725bbacbebfde24c1893f7a67ebbb27a52e1ac907634cc562263de47e0115f620f45ca47874c833853965f3732569e65cc0213221a6fde WHIRLPOOL 0b8259848754750bc130a187e6e930effd66f765f6903fe7adab68e37be8b1048043bbe2cfcdf443ef58bd4d325d270b6900621678e3b1a730f3e41ae7294746
+DIST netbeans-trunk-nightly-201510220002-src.zip 208656535 SHA256 4251fc616c0e6871bf9e3601ea50113d123546decc916b02a832c876a07c6395 SHA512 413872ad9ca4ce3806db91c5c5dc137d031e1fa942f8382b02d86f97cf7e51892dfbfafe1751ff49bb76af3b4da10788ef5f46155eb1bd48f0d9110b5e72286e WHIRLPOOL 5b4ad028004e312be5602b1ef201ec9945320bc1345b4674c730f9af8cbbbf6da6f78dcffc1b4c71ffa7c0f8e13414f57c16a976418784aa0fa3d5825f56c572
 EBUILD netbeans-8.0.2.ebuild 7167 SHA256 80e31382a0ceb680c2a055dc5c78c1dce8edf32c50bbae6a1c14a2c568492519 SHA512 0ab466ca247ec953896ef0ab3b01b43ffea3a9f37e9bcdacecfc0476226d45cef35e4ddf27f2b85628d9512ed304e6cc6cfe963a5e547217d08cad400eefc4b9 WHIRLPOOL d09668e669f4f8d7987ab02cf26104fc6e54ba29b8b497fe0013cc8816a2d7560c99e6e1b02db77ead872d5240b84c09e3fabbc3465587d1d1ca7d6fcae114c1
 EBUILD netbeans-8.1_rc2.ebuild 6892 SHA256 aea23cb4a7170da766bbc225c6b58e671a5ab08e095044ebdf36b195d86610fa SHA512 77a9c3d1c82648a0a5b9b335f577132013724ac37e29f99bb732653321e861f5628c9a8689d4f9196f3ebae1cc4cad569dc3b1a7f4c7a127f363ca82099439f7 WHIRLPOOL 023da0938e5f8b74062bbcabb1b0e659d093f5860f8e82322339546299a154d7b57c78f1bb4f28403a6a5ca45d0bf1f1dcf1fa2669423cba465a68ab6c08008c
 EBUILD netbeans-9999_p20150914.ebuild 7210 SHA256 97559b1aa14f762847a1866723d6fba2265203b61f390e3481c0cd68bb0a654a SHA512 12555ef853b5f47fb74f6c1974bb2f894f3d82897d980ca5fa5d1ea17273a52db382cccf3b1b0b80a97f870c5622d750f0dcc4da30b87153749630bba797eeab WHIRLPOOL 30cd5c2fcfca12b002115631d708dac0330ded807dfdfb5fb38d5dda9a275d204e5dab59745fbf95aec218acdcadf95b9408fda9e440405d4c10a90e1961137c
@@ -60,4 +61,5 @@ EBUILD netbeans-9999_p20151018.ebuild 7210 SHA256 76b9a0d3a074e58583999673562c34
 EBUILD netbeans-9999_p20151019.ebuild 7210 SHA256 5a6cbfec486deb344c00375590458eca79d5c9dc1c6adbe4c4d28687d7f8894a SHA512 ae8fa6063dae8cff095206c4c6aadeb79d14f49146d9770680b465f3e0dac755aee6a5241ced447075d49521ce8abe32c9cec0dbb1740f20d8f57854445c5958 WHIRLPOOL b6fad6c170a446af18b586ab0fef63ef1a795b21afbb47c4df2236cd33d901621d776d0f799261d709f7079da85ab663df3acde9885e737ddc78cbd7f239ea0b
 EBUILD netbeans-9999_p20151020.ebuild 7210 SHA256 a6b6f167d3b234a13eda7a8e03cf567afed94db4b32b53507640ed566e476909 SHA512 5f58a49a0d4ef7bb7dec98279eac950a88aa9f58f6c4f0a15b50c1b894211eceac8a4e1bca24d38ac6a1c1932678b73041a86d6818057afa24d0fbd503ce2546 WHIRLPOOL fd11fe87d841ecab50b36276d770a2e4b52566d6346cb92a69f22d606f9519c6a7cd244185e288dd9bc76ca08a2aef383576ff397df62d9085aeb2c09f0f573e
 EBUILD netbeans-9999_p20151021.ebuild 7210 SHA256 225a9d7b7600ee198486923f2b80170effa1c05ec5bd1a7aefb10e2deae73317 SHA512 9713857940ebee5a03afcb484763ed83fa2748961b7560eda427ef2b1814bbe8ee556a6dae348078c29f9573ad28166f6abdb16268ab6a30e65c9464d5a2c0c7 WHIRLPOOL 3eb5986ee7273d958e8610cfa8d81911c540e38e3a9c1f66c9e63a5fec62c67aee616071390fdc3e3643e8f8ccba23657e4dc4d9ccdad655c69b9028a6d3cc0a
+EBUILD netbeans-9999_p20151022.ebuild 7210 SHA256 cbf3546da7aa887c4d4a63d35c24bd6fddf63ebce42f3283b78c4c0fc92ae1c2 SHA512 20ac86f818714ac1c4b2e4f09d3b1ddb8b062d16505cc4b91ab826521509986193643f0b1db81254dc3b39d2d9687448d361bf565123153e9d9db3b45f966c41 WHIRLPOOL 4b73a12dc9742d515e5c1cf79c4d276f3dea57576f0143c542a4b04d3f4d386ffec2ed8383c17b2297d43a89d1b861f0a288e20f843be30c749b5f2a9c31be41
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

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


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2015-10-22  9:34 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-22  9:34 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-groovy/, dev-java/netbeans-webcommon/, dev-java/netbeans-nb/, Miroslav Šulc

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