public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-platform/, dev-java/netbeans-harness/, ...
@ 2015-10-16  9:05 Miroslav Šulc
  0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2015-10-16  9:05 UTC (permalink / raw
  To: gentoo-commits

commit:     1949f4d2ce70603088808289986143cfac2ec8bc
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 16 09:04:50 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Oct 16 09:04:50 2015 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=1949f4d2

netbeans: bumped to new nightly sources

Package-Manager: portage-2.2.23

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 6c91620..6e8cb1c 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201510090002-src.zip 208636938 SHA256 4aca1251fe6aa4
 DIST netbeans-trunk-nightly-201510120002-src.zip 208620253 SHA256 27fba7e135412fccea434d6c3682ec0d8103855f58e8f21038255e1c413d02d3 SHA512 b6cb66f87186220d50785fd57aa311e22982cf531246501620182a08e61de058da8584b45ea0ebb6651f877509492c74f98de5ccd64b5ea6bd2c80ac42d0aa34 WHIRLPOOL 4906908eb51d2d0d0c0c20a0f73433f2cbb76d4243335381c388882901756f26f460395990fd3a4a4316b4496a8330a792e9f1c8b5b20d3f1d542d1b31f99163
 DIST netbeans-trunk-nightly-201510140002-src.zip 208620278 SHA256 ec207e7f0ca45db66859688f6b23b44082e324f196f08ea4aec1d5aae467e0db SHA512 77aecf6fbfcc4b176b92b239217e333b0132f6274243779948394a33a78907a35e7e64454679129480167bb1b28910429eccdd9c7cba6aafcd7a823e84810518 WHIRLPOOL fd89d1fe5b98ad04ba306c0cf7d7918cb4f8f4a545e3ce2c1c14260ca143326db43d1298c94b206f7d8601c57c454debcad9858c20951229d1d41777923ebe0e
 DIST netbeans-trunk-nightly-201510150002-src.zip 208627914 SHA256 a7e2706439132b898453379d3fff80e13f5e36458e7b1c8fa11212b6c45028b9 SHA512 de7f0d786ebd952dc4031f27ff16d0f1988f47a18b2c235afab6171b18daa30348a42e85763d6c57cbc185dc2049605de0676e9de896c60898669252e3a223c6 WHIRLPOOL b57bca24b7473081f75820c3a5e425db95589000aacd1e77350c2f35de9eecc11afb41b700fa267f54149dd6e228e50693187b63d7573ce3c6d5ba6813361b81
+DIST netbeans-trunk-nightly-201510160002-src.zip 208629531 SHA256 6ebdf2274ef07d0a5200ce62c35a31f89265c8975ebfba25a47b8ad03e199df4 SHA512 d1fa286feb5e472d8003be3ca18101eb074a415910c88a58d8b2eb6785b3e9ef60a21264616fca6d8fe0b41b3862ed3692bdc87ae41e2f3ad88278e1c11725cf WHIRLPOOL 3301b0c0b4985650adc27e648e911bbf7bf0d5543152a5651a8d95c2db0917732644c8de13da1192ddb91dae1cd38e40c00e7dab4674cdc5f400d5c92767c670
 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
@@ -47,4 +48,5 @@ EBUILD netbeans-apisupport-9999_p20151009.ebuild 3384 SHA256 488bc80df59bf986c9c
 EBUILD netbeans-apisupport-9999_p20151012.ebuild 3384 SHA256 9ead1f6f4135b68d31e7581fdaa7c729ccaf17e45acec8ef1da5eb46600a7e64 SHA512 457131c024339d1dd7dd2bbd379dd96781feb0b4fffc9ed140e1742bc551f84e2b3f69d1b3aac51216cc826abb78fd3b1731454dcb8d98e79fb0d8d40f7b486f WHIRLPOOL 9c73131e6b96a28b692c61fcdf31a656ee0ffc82ad50c4c90fc48e20da1f4296716b8798fcff04f3f90c48ea09f49da74815b97feaadc384455516a4fa820350
 EBUILD netbeans-apisupport-9999_p20151014.ebuild 3384 SHA256 d895212abdeda6ed0690b68b542407e99ca8b1064f97119693148ca0d11a454d SHA512 9428a412a0d2a0336450e9f1dce68b41e007a78a56d6091dabf4b4957d10d64b47b093b8c58c2f44d52918e7345430b873e613018a757007362c3e2a0882822f WHIRLPOOL 94e2ad01ae80da4fa92acf5605e7db23c6c5ab42075640a2d5a783c4582f02430e1801fe468f45e6b1801514623a3739e684f13f27999b6c29c18ccb96605bdb
 EBUILD netbeans-apisupport-9999_p20151015.ebuild 3384 SHA256 a2c381308e5f45047a7a4705e602ab2f6c5fcc1b9ea8fd21d055d2b4db579a0d SHA512 89f43e4db25bfee3c98588245e58bf1919fee12a70b135c909126c5fab4fa258869be5b9f4ce6e55e628c2927c472a6eda925a16e06701b24e90cb6bd8fbad0d WHIRLPOOL efaafb3eabe28535e69210d28ae6047466d81f026600a2cd9181e2bb95cdbd24c9230e88c5590e1ebc357502889f2e6af6f8e85ebe0e9421b49497969763f5e4
+EBUILD netbeans-apisupport-9999_p20151016.ebuild 3384 SHA256 4744d6b18b501a5d691a4c6d5fe44ad5784547f0cb366269abdaa2f503483fe4 SHA512 c412d7f33ec7eac9d929ce85f2577f10156be1d3fbe72511d9de073c6c7fa68dd5988c04a558f86760a7687fb5ebc16666f9c1d63cc2ea6eea2b76ba63cf482f WHIRLPOOL 13d302a601f921ae8a7ed37a94000c49e5812551bea635902a3d20bbe0c824b3935e354fd4206a65d3000a2c5464ef78e6175e60bae99b4ae9e104077827b413
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20151016.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20151016.ebuild
new file mode 100644
index 0000000..f016bc3
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20151016.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-16_00-02-28/zip/netbeans-trunk-nightly-201510160002-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 af61a4b..2acea29 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -46,6 +46,7 @@ DIST netbeans-trunk-nightly-201510090002-src.zip 208636938 SHA256 4aca1251fe6aa4
 DIST netbeans-trunk-nightly-201510120002-src.zip 208620253 SHA256 27fba7e135412fccea434d6c3682ec0d8103855f58e8f21038255e1c413d02d3 SHA512 b6cb66f87186220d50785fd57aa311e22982cf531246501620182a08e61de058da8584b45ea0ebb6651f877509492c74f98de5ccd64b5ea6bd2c80ac42d0aa34 WHIRLPOOL 4906908eb51d2d0d0c0c20a0f73433f2cbb76d4243335381c388882901756f26f460395990fd3a4a4316b4496a8330a792e9f1c8b5b20d3f1d542d1b31f99163
 DIST netbeans-trunk-nightly-201510140002-src.zip 208620278 SHA256 ec207e7f0ca45db66859688f6b23b44082e324f196f08ea4aec1d5aae467e0db SHA512 77aecf6fbfcc4b176b92b239217e333b0132f6274243779948394a33a78907a35e7e64454679129480167bb1b28910429eccdd9c7cba6aafcd7a823e84810518 WHIRLPOOL fd89d1fe5b98ad04ba306c0cf7d7918cb4f8f4a545e3ce2c1c14260ca143326db43d1298c94b206f7d8601c57c454debcad9858c20951229d1d41777923ebe0e
 DIST netbeans-trunk-nightly-201510150002-src.zip 208627914 SHA256 a7e2706439132b898453379d3fff80e13f5e36458e7b1c8fa11212b6c45028b9 SHA512 de7f0d786ebd952dc4031f27ff16d0f1988f47a18b2c235afab6171b18daa30348a42e85763d6c57cbc185dc2049605de0676e9de896c60898669252e3a223c6 WHIRLPOOL b57bca24b7473081f75820c3a5e425db95589000aacd1e77350c2f35de9eecc11afb41b700fa267f54149dd6e228e50693187b63d7573ce3c6d5ba6813361b81
+DIST netbeans-trunk-nightly-201510160002-src.zip 208629531 SHA256 6ebdf2274ef07d0a5200ce62c35a31f89265c8975ebfba25a47b8ad03e199df4 SHA512 d1fa286feb5e472d8003be3ca18101eb074a415910c88a58d8b2eb6785b3e9ef60a21264616fca6d8fe0b41b3862ed3692bdc87ae41e2f3ad88278e1c11725cf WHIRLPOOL 3301b0c0b4985650adc27e648e911bbf7bf0d5543152a5651a8d95c2db0917732644c8de13da1192ddb91dae1cd38e40c00e7dab4674cdc5f400d5c92767c670
 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
@@ -69,4 +70,5 @@ EBUILD netbeans-cnd-9999_p20151009.ebuild 4790 SHA256 7e23d07a94400e5b69175a651d
 EBUILD netbeans-cnd-9999_p20151012.ebuild 4790 SHA256 c85d61c99c956ea519a86fd10acae12515dd61bed0fac444bf49ac9140c05669 SHA512 da27a27c94a8b6943d8a447f43f4b87e14971d642aa19296fc10451f6279128264994412108b8e046aa5fddcc2d9d17ee002fafaa6199f085abd6b026cbaf163 WHIRLPOOL 10e2c6790a5e2f22380cfaff627f08134e6e54383978a38017c4a6688c9f477a3dd7acf842e6944c70deebecc9793aa6d4b94b4e85c114152518767a50ad35f5
 EBUILD netbeans-cnd-9999_p20151014.ebuild 4790 SHA256 dbabbb0b8619ad85c0ad188ef3a237d09b21d51e49b4c6d54685964add2b8e24 SHA512 acbf232792c4d817c6251c58bff89e244a999f36baabd7db0679bec3506a7b3470779fe006fe60e957712e88ebbd8e3c6aac448e65c52c9056b59564edeb34ec WHIRLPOOL 8d163b71433db872187ba4c69d9a4286464804e0b7aff9e85f71106a732ce1ef580622706cfc9c2c8750013a19131d0320a50931a2f44355c0ee81fe6aeda6db
 EBUILD netbeans-cnd-9999_p20151015.ebuild 4790 SHA256 029a936f3145d3fa596cd3582db6209ae8259fd9dfc0929ec0ed5307ade35de9 SHA512 35cfed4c047b698e2bcc906cae403f35ddb8d5b30be4656d5f568953c9d213126853e8315448d258d68791e2bfb10a4e1c11ea6f23cb51abfaceb8b32e15e5aa WHIRLPOOL 0b41036d8b58e126df851ca90ce0b1867c6aca79274c68c664fcbb75be1b2f1e0045146ae429dd0a090a7f90ddc9e29cb65d27706b8b634ba0e8225ba0d21b2d
+EBUILD netbeans-cnd-9999_p20151016.ebuild 4790 SHA256 82ed66beeb6a32d62af237c63fd2cfbf96d396ef9f5ce22c40a4b98eed28d521 SHA512 c926d5ac7ca80a1089b44b8bbc1808609f1cab31d4302c74fc82d50c5c8f537434770867c1adba594473e1c773c9ba73b26502fd6f4bec3c29990f54d18f1da8 WHIRLPOOL 1fb232e182d9f309c38d471531cd02ef544aba43e4d5f6fb7cef58c390c791598d1188d3752c106308e0fea20d0891724edaac29ffecfe701411bbb394fd6126
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20151016.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20151016.ebuild
new file mode 100644
index 0000000..f1bd4f6
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20151016.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-16_00-02-28/zip/netbeans-trunk-nightly-201510160002-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/83D26AEF1BD40E89B6C61273F28AC4EB6AC11EDD-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}"/83D26AEF1BD40E89B6C61273F28AC4EB6AC11EDD-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 00ff2e3..0792461 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201510090002-src.zip 208636938 SHA256 4aca1251fe6aa4
 DIST netbeans-trunk-nightly-201510120002-src.zip 208620253 SHA256 27fba7e135412fccea434d6c3682ec0d8103855f58e8f21038255e1c413d02d3 SHA512 b6cb66f87186220d50785fd57aa311e22982cf531246501620182a08e61de058da8584b45ea0ebb6651f877509492c74f98de5ccd64b5ea6bd2c80ac42d0aa34 WHIRLPOOL 4906908eb51d2d0d0c0c20a0f73433f2cbb76d4243335381c388882901756f26f460395990fd3a4a4316b4496a8330a792e9f1c8b5b20d3f1d542d1b31f99163
 DIST netbeans-trunk-nightly-201510140002-src.zip 208620278 SHA256 ec207e7f0ca45db66859688f6b23b44082e324f196f08ea4aec1d5aae467e0db SHA512 77aecf6fbfcc4b176b92b239217e333b0132f6274243779948394a33a78907a35e7e64454679129480167bb1b28910429eccdd9c7cba6aafcd7a823e84810518 WHIRLPOOL fd89d1fe5b98ad04ba306c0cf7d7918cb4f8f4a545e3ce2c1c14260ca143326db43d1298c94b206f7d8601c57c454debcad9858c20951229d1d41777923ebe0e
 DIST netbeans-trunk-nightly-201510150002-src.zip 208627914 SHA256 a7e2706439132b898453379d3fff80e13f5e36458e7b1c8fa11212b6c45028b9 SHA512 de7f0d786ebd952dc4031f27ff16d0f1988f47a18b2c235afab6171b18daa30348a42e85763d6c57cbc185dc2049605de0676e9de896c60898669252e3a223c6 WHIRLPOOL b57bca24b7473081f75820c3a5e425db95589000aacd1e77350c2f35de9eecc11afb41b700fa267f54149dd6e228e50693187b63d7573ce3c6d5ba6813361b81
+DIST netbeans-trunk-nightly-201510160002-src.zip 208629531 SHA256 6ebdf2274ef07d0a5200ce62c35a31f89265c8975ebfba25a47b8ad03e199df4 SHA512 d1fa286feb5e472d8003be3ca18101eb074a415910c88a58d8b2eb6785b3e9ef60a21264616fca6d8fe0b41b3862ed3692bdc87ae41e2f3ad88278e1c11725cf WHIRLPOOL 3301b0c0b4985650adc27e648e911bbf7bf0d5543152a5651a8d95c2db0917732644c8de13da1192ddb91dae1cd38e40c00e7dab4674cdc5f400d5c92767c670
 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
@@ -50,4 +51,5 @@ EBUILD netbeans-dlight-9999_p20151009.ebuild 2968 SHA256 1501194b3ce181c484e4ab4
 EBUILD netbeans-dlight-9999_p20151012.ebuild 2968 SHA256 7bc24384abf5b64ba35cd2e03f2be477ad0d01c817b43395146e63b7519edf3e SHA512 c710f43a0807216a5bf19815fe16486a070e60855671627680cb6e5f5e1f02d032a3eda56d8d0bd4ce4bdc5432f76f34bfd3943636e0ee554dd84df95249ac3e WHIRLPOOL fb00e29a1c1ea39cdc09c56b610085d557173f991e315433d71a8f4a9c0ef3ed7626bdc4747b7453469dff68a951acc960746bdea4233079174ff5e5201e2bf3
 EBUILD netbeans-dlight-9999_p20151014.ebuild 2968 SHA256 4acdfbe07f4a0c7ad888f8b79f408e4485b7be2f0b1ce6094932f740de74cb90 SHA512 721e371626f8e0f0c6c8c792f49db8e6908e1b98f8cec3c478e14a553ebab68db75ce0914ef7115fd3714e04d1ba836ff3ea1e1b896ef35f57793ad2380845e1 WHIRLPOOL 88f53c2f51c75298be50e4d61cd1c1264ba323dd5f5d62165457acf6a4c6ad28a4a2d8998fc3999cbf806ef347f5427d571fecbd605a66b1120d3ca489f20bda
 EBUILD netbeans-dlight-9999_p20151015.ebuild 2968 SHA256 51376e7f74c4c61aca454aa585ee38107ba65af7e50b777a75972fd24738f572 SHA512 4a3117817d9b7bcf5ecc08813558b6f678754d820ba0334e2f4c5c4c25ae41de9b4fffe6bfb6ca018442214249de9a9714f39eac4d0ec6c64c26a857c0cce9b8 WHIRLPOOL 07a625a69895c25e4c8c0b02bf02e2c7f208dffde6cbcc076baa68fa8300052891a39d4f2f488084f6255c138cd77bd794f7e1ca72afdf381e11bb1e9194987c
+EBUILD netbeans-dlight-9999_p20151016.ebuild 2968 SHA256 aff768e2dd17c0cc1cd52e8e264703c8095797fdd89f751aa427cda099e035f8 SHA512 6eebff2f50382e2a83f5ac7672b4b74509946fa0423ba2fc36e4296ad6b95dfda1a79d54ee133aa6377ac3ade9d91ac28471447853c50d1f2871dc5489a0df53 WHIRLPOOL cf5eb66b5c4f2b0a1a306f25c18c6f9c60eb96a2065af32eeaef2fad7d95423874cab453e23b03fcf020535ae8fc1af6a899563006aef20823996f3e45edd2ee
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20151016.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20151016.ebuild
new file mode 100644
index 0000000..dd7da27
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20151016.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-16_00-02-28/zip/netbeans-trunk-nightly-201510160002-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 16fb033..7361c30 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -56,6 +56,7 @@ DIST netbeans-trunk-nightly-201510090002-src.zip 208636938 SHA256 4aca1251fe6aa4
 DIST netbeans-trunk-nightly-201510120002-src.zip 208620253 SHA256 27fba7e135412fccea434d6c3682ec0d8103855f58e8f21038255e1c413d02d3 SHA512 b6cb66f87186220d50785fd57aa311e22982cf531246501620182a08e61de058da8584b45ea0ebb6651f877509492c74f98de5ccd64b5ea6bd2c80ac42d0aa34 WHIRLPOOL 4906908eb51d2d0d0c0c20a0f73433f2cbb76d4243335381c388882901756f26f460395990fd3a4a4316b4496a8330a792e9f1c8b5b20d3f1d542d1b31f99163
 DIST netbeans-trunk-nightly-201510140002-src.zip 208620278 SHA256 ec207e7f0ca45db66859688f6b23b44082e324f196f08ea4aec1d5aae467e0db SHA512 77aecf6fbfcc4b176b92b239217e333b0132f6274243779948394a33a78907a35e7e64454679129480167bb1b28910429eccdd9c7cba6aafcd7a823e84810518 WHIRLPOOL fd89d1fe5b98ad04ba306c0cf7d7918cb4f8f4a545e3ce2c1c14260ca143326db43d1298c94b206f7d8601c57c454debcad9858c20951229d1d41777923ebe0e
 DIST netbeans-trunk-nightly-201510150002-src.zip 208627914 SHA256 a7e2706439132b898453379d3fff80e13f5e36458e7b1c8fa11212b6c45028b9 SHA512 de7f0d786ebd952dc4031f27ff16d0f1988f47a18b2c235afab6171b18daa30348a42e85763d6c57cbc185dc2049605de0676e9de896c60898669252e3a223c6 WHIRLPOOL b57bca24b7473081f75820c3a5e425db95589000aacd1e77350c2f35de9eecc11afb41b700fa267f54149dd6e228e50693187b63d7573ce3c6d5ba6813361b81
+DIST netbeans-trunk-nightly-201510160002-src.zip 208629531 SHA256 6ebdf2274ef07d0a5200ce62c35a31f89265c8975ebfba25a47b8ad03e199df4 SHA512 d1fa286feb5e472d8003be3ca18101eb074a415910c88a58d8b2eb6785b3e9ef60a21264616fca6d8fe0b41b3862ed3692bdc87ae41e2f3ad88278e1c11725cf WHIRLPOOL 3301b0c0b4985650adc27e648e911bbf7bf0d5543152a5651a8d95c2db0917732644c8de13da1192ddb91dae1cd38e40c00e7dab4674cdc5f400d5c92767c670
 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
@@ -79,4 +80,5 @@ EBUILD netbeans-enterprise-9999_p20151009.ebuild 15931 SHA256 91285184de85913fb8
 EBUILD netbeans-enterprise-9999_p20151012.ebuild 15931 SHA256 2a6a36b3973810ee9418d00d0b5dcb4603d6f7c87d8c7fce69a11d410048773d SHA512 91fe210620ae2dc874974e67056a610834b57ae5a17152803c8b68c512960a512a8757ada4c1842c804d6673b6b3a809b6d072bd465f42a54cfe786a9f6c0a8b WHIRLPOOL ef077b30afbd59ae4ffa117fa4689827aca7450f83809f38d41abe3a2b4ac4b808458f9721629daf0e3bb3431c3c45369e91f706cb246d9a8b701051160de787
 EBUILD netbeans-enterprise-9999_p20151014.ebuild 15931 SHA256 b90559bb22f7fbf454db61de85fc662f10de67ad27876405d4a959bd7fe982b2 SHA512 78b55a75293626f3eb45953b9765b9825b6e3c8cd06d08b15caa0a1565534db84c24202642086c3d5870ee0549615685a060cf04d2fe57f4ac50d459eeab268a WHIRLPOOL 50d23f429a4a0c101f3285bdb40e37301a274ff4a3324b4fef52214fc23435534658335edb30022f063550664c771245e2e3aa310f55e9128ab17746f6d8ff71
 EBUILD netbeans-enterprise-9999_p20151015.ebuild 15931 SHA256 d49654e0932246881dd0cfbdbc3b90ee99afa71353f85cfcf2d697c6fd45a493 SHA512 5c29edf1933a5b107333155e795c3357abae8377719329933a2f89a109f2f44dca84e65df1bf0086ca6168f4f3bfdc5b607d1c175ceeca54dd70a7893ed7eeff WHIRLPOOL 1d817037ad77083806dbaf493348e8306d8d7fc3957a8adf142ffb6010165109ca131eadfca03c45f9a54af7cb84bdf5b8f8572282df16b04fef77352b301ee7
+EBUILD netbeans-enterprise-9999_p20151016.ebuild 15931 SHA256 5a54f331e86c06409e981e644f23a2fd5dcf9650eaf4748f08fe1f647cdf5302 SHA512 e68b0dd57bc4f9148be1ceb5b17780e00f686408977d160891a4caa4cb937ca70d796a5eb7574776f23a80f86a50f0a68ddb189289a185ed184fd9c0a9c7b1ae WHIRLPOOL ee3419ad949f813a28b1f22663d13c369d5a5b6f727d05e1a06c837a55ca3617e487d5acea312151c9e9665ebdf114200fa347bdfdb062d3c932b87d973e838e
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20151016.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20151016.ebuild
new file mode 100644
index 0000000..56907bb
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20151016.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-16_00-02-28/zip/netbeans-trunk-nightly-201510160002-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 e8e8497..c67eb8c 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201510090002-src.zip 208636938 SHA256 4aca1251fe6aa4
 DIST netbeans-trunk-nightly-201510120002-src.zip 208620253 SHA256 27fba7e135412fccea434d6c3682ec0d8103855f58e8f21038255e1c413d02d3 SHA512 b6cb66f87186220d50785fd57aa311e22982cf531246501620182a08e61de058da8584b45ea0ebb6651f877509492c74f98de5ccd64b5ea6bd2c80ac42d0aa34 WHIRLPOOL 4906908eb51d2d0d0c0c20a0f73433f2cbb76d4243335381c388882901756f26f460395990fd3a4a4316b4496a8330a792e9f1c8b5b20d3f1d542d1b31f99163
 DIST netbeans-trunk-nightly-201510140002-src.zip 208620278 SHA256 ec207e7f0ca45db66859688f6b23b44082e324f196f08ea4aec1d5aae467e0db SHA512 77aecf6fbfcc4b176b92b239217e333b0132f6274243779948394a33a78907a35e7e64454679129480167bb1b28910429eccdd9c7cba6aafcd7a823e84810518 WHIRLPOOL fd89d1fe5b98ad04ba306c0cf7d7918cb4f8f4a545e3ce2c1c14260ca143326db43d1298c94b206f7d8601c57c454debcad9858c20951229d1d41777923ebe0e
 DIST netbeans-trunk-nightly-201510150002-src.zip 208627914 SHA256 a7e2706439132b898453379d3fff80e13f5e36458e7b1c8fa11212b6c45028b9 SHA512 de7f0d786ebd952dc4031f27ff16d0f1988f47a18b2c235afab6171b18daa30348a42e85763d6c57cbc185dc2049605de0676e9de896c60898669252e3a223c6 WHIRLPOOL b57bca24b7473081f75820c3a5e425db95589000aacd1e77350c2f35de9eecc11afb41b700fa267f54149dd6e228e50693187b63d7573ce3c6d5ba6813361b81
+DIST netbeans-trunk-nightly-201510160002-src.zip 208629531 SHA256 6ebdf2274ef07d0a5200ce62c35a31f89265c8975ebfba25a47b8ad03e199df4 SHA512 d1fa286feb5e472d8003be3ca18101eb074a415910c88a58d8b2eb6785b3e9ef60a21264616fca6d8fe0b41b3862ed3692bdc87ae41e2f3ad88278e1c11725cf WHIRLPOOL 3301b0c0b4985650adc27e648e911bbf7bf0d5543152a5651a8d95c2db0917732644c8de13da1192ddb91dae1cd38e40c00e7dab4674cdc5f400d5c92767c670
 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
@@ -47,4 +48,5 @@ EBUILD netbeans-ergonomics-9999_p20151009.ebuild 2913 SHA256 74d8160699fc071c224
 EBUILD netbeans-ergonomics-9999_p20151012.ebuild 2913 SHA256 553b35c1b7e382a4b2995f4cc559efd563f4ffd85f813864b50257dc8d2013bc SHA512 0eb5a4ec88eca62cf2afa89ad882b0461aa224c35767b368719f50bff55152c2fdb788990f9b412aac5f9816bcbcfec2a0208aec584af87097defb030c5c1bd1 WHIRLPOOL f208a7c49e2d9df9e7c4786d45e045c0ef2999f521365a65a79327d8285e9cfbcda1b814b1bdf95b994e6f2ac39eff3bafd2614e17a2dc479a004261859c86f3
 EBUILD netbeans-ergonomics-9999_p20151014.ebuild 2913 SHA256 6132b32acc49a8dd397eea7ed9c785a5fc07698b5ff9e41ee540228f123aab45 SHA512 ddc9b3cf02e1480bf23ecafe5262c04d88e8fc240b71278b8fddb6b8234c0335cb9a8d17caf0074b1d7ce42e27929dd8dcfc9881a3a3ffb97ebae1311b0a3d0d WHIRLPOOL 1ab424fcf28190952d584e16fa5a222aaddacf7c17a30f22073386302d96ca6d312562456ad06861b7087b9fdd4300d3e87d1ed27effda145010285cc0672f02
 EBUILD netbeans-ergonomics-9999_p20151015.ebuild 2913 SHA256 9b582788e33c744a9382b07e6fa229683d14b7e1eb840e0f771399063274657c SHA512 44a4915fc34f8134dd04df2b90df74a026cb1a388ff64210f3ae884c9ebfae899939e631a87475673360cb295f22f78f8c859b37099837f60e9b0eff8269e617 WHIRLPOOL 6729e88404165485f390f43c6e467b5b1d40c143a0457cd9edabd2640fa9c70030781e2eebd7c543d07184a09c4d1e49bea20d6b4d38c4a7ca45392b8b1407cc
+EBUILD netbeans-ergonomics-9999_p20151016.ebuild 2913 SHA256 a0b921eee233e4ad000e23a95175dcd10a067bec6d89f97058df1572b46309ce SHA512 7dcf12dc89cdc53eaf5296f495bdeed1b643efc87810779774ffa49d3f4b7a84aad9a6ca733c35d324a16847eace21e12dab82203977299f61098ca128c6f243 WHIRLPOOL 4ad0675be61bb703cadfbbfea7477f9e641283d9430874e7676285a8fdc35952046621f8c47c8e9ca56ecfec5667bf3d8f3a649eec07530ab741fa7305803785
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20151016.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20151016.ebuild
new file mode 100644
index 0000000..484f027
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20151016.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-16_00-02-28/zip/netbeans-trunk-nightly-201510160002-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 102099c..66d4939 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201510090002-src.zip 208636938 SHA256 4aca1251fe6aa4
 DIST netbeans-trunk-nightly-201510120002-src.zip 208620253 SHA256 27fba7e135412fccea434d6c3682ec0d8103855f58e8f21038255e1c413d02d3 SHA512 b6cb66f87186220d50785fd57aa311e22982cf531246501620182a08e61de058da8584b45ea0ebb6651f877509492c74f98de5ccd64b5ea6bd2c80ac42d0aa34 WHIRLPOOL 4906908eb51d2d0d0c0c20a0f73433f2cbb76d4243335381c388882901756f26f460395990fd3a4a4316b4496a8330a792e9f1c8b5b20d3f1d542d1b31f99163
 DIST netbeans-trunk-nightly-201510140002-src.zip 208620278 SHA256 ec207e7f0ca45db66859688f6b23b44082e324f196f08ea4aec1d5aae467e0db SHA512 77aecf6fbfcc4b176b92b239217e333b0132f6274243779948394a33a78907a35e7e64454679129480167bb1b28910429eccdd9c7cba6aafcd7a823e84810518 WHIRLPOOL fd89d1fe5b98ad04ba306c0cf7d7918cb4f8f4a545e3ce2c1c14260ca143326db43d1298c94b206f7d8601c57c454debcad9858c20951229d1d41777923ebe0e
 DIST netbeans-trunk-nightly-201510150002-src.zip 208627914 SHA256 a7e2706439132b898453379d3fff80e13f5e36458e7b1c8fa11212b6c45028b9 SHA512 de7f0d786ebd952dc4031f27ff16d0f1988f47a18b2c235afab6171b18daa30348a42e85763d6c57cbc185dc2049605de0676e9de896c60898669252e3a223c6 WHIRLPOOL b57bca24b7473081f75820c3a5e425db95589000aacd1e77350c2f35de9eecc11afb41b700fa267f54149dd6e228e50693187b63d7573ce3c6d5ba6813361b81
+DIST netbeans-trunk-nightly-201510160002-src.zip 208629531 SHA256 6ebdf2274ef07d0a5200ce62c35a31f89265c8975ebfba25a47b8ad03e199df4 SHA512 d1fa286feb5e472d8003be3ca18101eb074a415910c88a58d8b2eb6785b3e9ef60a21264616fca6d8fe0b41b3862ed3692bdc87ae41e2f3ad88278e1c11725cf WHIRLPOOL 3301b0c0b4985650adc27e648e911bbf7bf0d5543152a5651a8d95c2db0917732644c8de13da1192ddb91dae1cd38e40c00e7dab4674cdc5f400d5c92767c670
 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
@@ -49,4 +50,5 @@ EBUILD netbeans-extide-9999_p20151009.ebuild 3377 SHA256 f6b6f924223013691f26d73
 EBUILD netbeans-extide-9999_p20151012.ebuild 3377 SHA256 9945ab6cdd2753ea4bfa000a6ed16ae80d32374a5a28386488268a04ba4fa94a SHA512 96b42190cff141d0d46524ab0ffeddd96e00c0ea40ea15be9bf384e555a876a2e8ead4e1cd1e5a971cd43ff78ff33b130ab18eb30ac2cf73a6761b2b7e8c71bf WHIRLPOOL 700a16ca37f090e83797aaeff2febc163e818a01ba09a65abe14d5a552f684956312220fa6ce9ca5c9e1c121060b2eb45a677621b183050358432bd1527d195d
 EBUILD netbeans-extide-9999_p20151014.ebuild 3377 SHA256 cb37d6ecade983ca7cc8e75c06b7e063bfd73fa52ced143b2ecbd7b3f608d032 SHA512 fdffaa33d40ed322f95e5570bf5e058fdaae3bfaaf094e202b5978616378c9e5cc556ee675f89794675f09886eefd3b8fa429f4d363d3109c3cedfbaec92b562 WHIRLPOOL 7a423564b6875244574613d00b1a3ebe0e3e1582759f8ff66df0324c9020c1e28478d19120dcb0fe819347a0fa407fc1b8c82206cd51bf9c5a533983ad5a9197
 EBUILD netbeans-extide-9999_p20151015.ebuild 3377 SHA256 f5f86b41ec11b26ac9d49c1825ea61323631717688bcca285906232a6773fb54 SHA512 854bd914a002752dcaff2d8236b9412c60cd3586bc2ed8a7e1195e6505f34fab7c2b09ee2c43fd99e3898d84edb464e91de92ca0997f1930dc54e3ae435c20a1 WHIRLPOOL 57fd3240483e1d98f522261eff5ded5d199f6ac0fc52e51c62fe47658cf0a66725bd5fae5b67ea57688155168e8f1d4ae93aef10afd756a895501d65b65f22e3
+EBUILD netbeans-extide-9999_p20151016.ebuild 3377 SHA256 e62ffd16e009aff5219a93b3a04bb302c355ac7aa678b3a32587876ebb08d1c1 SHA512 fc819b1b3f4bdb5906961fca4e9f63c9a26271c0634fb552a0dfa48e5a4e40809e132bc39f2c449699b3c9c1c613b3dd5a9aefa9ffb1401a7b1a40b2f29e2420 WHIRLPOOL 6357fa21cb5c11c6cba6cd2b329b5e3b523f786f442f473ea6d15de78aa53014032d09a3d6227d0bb3ebf6234765ddfa33e2ba3a3f56f91bb8fd95364da193ea
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20151016.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20151016.ebuild
new file mode 100644
index 0000000..219ade8
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20151016.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-16_00-02-28/zip/netbeans-trunk-nightly-201510160002-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 e80d47f..012ec3c 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201510090002-src.zip 208636938 SHA256 4aca1251fe6aa4
 DIST netbeans-trunk-nightly-201510120002-src.zip 208620253 SHA256 27fba7e135412fccea434d6c3682ec0d8103855f58e8f21038255e1c413d02d3 SHA512 b6cb66f87186220d50785fd57aa311e22982cf531246501620182a08e61de058da8584b45ea0ebb6651f877509492c74f98de5ccd64b5ea6bd2c80ac42d0aa34 WHIRLPOOL 4906908eb51d2d0d0c0c20a0f73433f2cbb76d4243335381c388882901756f26f460395990fd3a4a4316b4496a8330a792e9f1c8b5b20d3f1d542d1b31f99163
 DIST netbeans-trunk-nightly-201510140002-src.zip 208620278 SHA256 ec207e7f0ca45db66859688f6b23b44082e324f196f08ea4aec1d5aae467e0db SHA512 77aecf6fbfcc4b176b92b239217e333b0132f6274243779948394a33a78907a35e7e64454679129480167bb1b28910429eccdd9c7cba6aafcd7a823e84810518 WHIRLPOOL fd89d1fe5b98ad04ba306c0cf7d7918cb4f8f4a545e3ce2c1c14260ca143326db43d1298c94b206f7d8601c57c454debcad9858c20951229d1d41777923ebe0e
 DIST netbeans-trunk-nightly-201510150002-src.zip 208627914 SHA256 a7e2706439132b898453379d3fff80e13f5e36458e7b1c8fa11212b6c45028b9 SHA512 de7f0d786ebd952dc4031f27ff16d0f1988f47a18b2c235afab6171b18daa30348a42e85763d6c57cbc185dc2049605de0676e9de896c60898669252e3a223c6 WHIRLPOOL b57bca24b7473081f75820c3a5e425db95589000aacd1e77350c2f35de9eecc11afb41b700fa267f54149dd6e228e50693187b63d7573ce3c6d5ba6813361b81
+DIST netbeans-trunk-nightly-201510160002-src.zip 208629531 SHA256 6ebdf2274ef07d0a5200ce62c35a31f89265c8975ebfba25a47b8ad03e199df4 SHA512 d1fa286feb5e472d8003be3ca18101eb074a415910c88a58d8b2eb6785b3e9ef60a21264616fca6d8fe0b41b3862ed3692bdc87ae41e2f3ad88278e1c11725cf WHIRLPOOL 3301b0c0b4985650adc27e648e911bbf7bf0d5543152a5651a8d95c2db0917732644c8de13da1192ddb91dae1cd38e40c00e7dab4674cdc5f400d5c92767c670
 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
@@ -48,4 +49,5 @@ EBUILD netbeans-groovy-9999_p20151009.ebuild 3416 SHA256 d5903fd0c18302ceeed5671
 EBUILD netbeans-groovy-9999_p20151012.ebuild 3416 SHA256 d6591730f31aa44648fca3df6e2468b2d15d68bb2799d6e31d1a310376e0a130 SHA512 01581e75a374747d63c00282272fa76d4f0ebe810c398f89d2d377944cca2a7a55dc88c299eb753b525d13f9a05e4651b78b3dd72751ff2c7a0668690e8f92b3 WHIRLPOOL 13dbc93c0aedf020fcac39259f64387b29223fe1b615bea532cdd3b0c1d111d3c0c9fac60f86f144aa1b4c0f027bdf47a80faf0ea21a13b979f0bd0cf3f383e3
 EBUILD netbeans-groovy-9999_p20151014.ebuild 3416 SHA256 903cd89e84389b5dbe269bbb35541d2f39134ed6b2afb060f5a9a6514485b7ff SHA512 17e8660a662bc46667a7779aebc29ba6a2d31d7deba846056d97b25b97bf6d3ba33ec9509e124d742530ae8019aefbc43e1d3fb18518059dcfb2fb6ab6315849 WHIRLPOOL 7bf7faa6bb0669f730008fec9862299071a23dc67d98a34bf02f4fa48e9c67b6405f897d9c232ce43c24667becd7338a798187f5975ff67ac8e97f030820cdc4
 EBUILD netbeans-groovy-9999_p20151015.ebuild 3416 SHA256 0e78f1a28fd555df3f993b1294b65492ddad595e9b24905f2f9622d0a3bc3ac1 SHA512 20cc0e50c50db55385ca8537825471c3265b8bf8bc9d6f7c96f81290526e996f52782c10ea8877066896e72d92b92bf2a69bf9cb9752ebb657bcaa885e107bf4 WHIRLPOOL 5b214a77b7790ab5662a1bdb420f74f77e6ab8ff265ec1ee43dd6b9283cf69c7e6c8c79d02da58cf623fde55360248fd927f5915adeb87508f498338f0bcd3f4
+EBUILD netbeans-groovy-9999_p20151016.ebuild 3416 SHA256 c0bd20c4da51c7e5b322774ca6d22737397536fa1344637103f42ae8f8be882b SHA512 b72516fcd6a8be8c813f98f1eb259c07562003d915c69b5ed88c35ae9bfea193a79c69b332098c6192231000165187f2451a3319161890cdc06cb7d97b13c2a2 WHIRLPOOL c33cc736b2af11bcca7ddba95089a2f257e975172325073354a077d3c2eaecc3da15a1bc92fdd0fb55731789d28b5f1b01fbd68835e455e408c8b3adb20bede2
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20151016.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20151016.ebuild
new file mode 100644
index 0000000..e0a8bc3
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20151016.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-16_00-02-28/zip/netbeans-trunk-nightly-201510160002-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 2a8c16e..90ec934 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201510090002-src.zip 208636938 SHA256 4aca1251fe6aa4
 DIST netbeans-trunk-nightly-201510120002-src.zip 208620253 SHA256 27fba7e135412fccea434d6c3682ec0d8103855f58e8f21038255e1c413d02d3 SHA512 b6cb66f87186220d50785fd57aa311e22982cf531246501620182a08e61de058da8584b45ea0ebb6651f877509492c74f98de5ccd64b5ea6bd2c80ac42d0aa34 WHIRLPOOL 4906908eb51d2d0d0c0c20a0f73433f2cbb76d4243335381c388882901756f26f460395990fd3a4a4316b4496a8330a792e9f1c8b5b20d3f1d542d1b31f99163
 DIST netbeans-trunk-nightly-201510140002-src.zip 208620278 SHA256 ec207e7f0ca45db66859688f6b23b44082e324f196f08ea4aec1d5aae467e0db SHA512 77aecf6fbfcc4b176b92b239217e333b0132f6274243779948394a33a78907a35e7e64454679129480167bb1b28910429eccdd9c7cba6aafcd7a823e84810518 WHIRLPOOL fd89d1fe5b98ad04ba306c0cf7d7918cb4f8f4a545e3ce2c1c14260ca143326db43d1298c94b206f7d8601c57c454debcad9858c20951229d1d41777923ebe0e
 DIST netbeans-trunk-nightly-201510150002-src.zip 208627914 SHA256 a7e2706439132b898453379d3fff80e13f5e36458e7b1c8fa11212b6c45028b9 SHA512 de7f0d786ebd952dc4031f27ff16d0f1988f47a18b2c235afab6171b18daa30348a42e85763d6c57cbc185dc2049605de0676e9de896c60898669252e3a223c6 WHIRLPOOL b57bca24b7473081f75820c3a5e425db95589000aacd1e77350c2f35de9eecc11afb41b700fa267f54149dd6e228e50693187b63d7573ce3c6d5ba6813361b81
+DIST netbeans-trunk-nightly-201510160002-src.zip 208629531 SHA256 6ebdf2274ef07d0a5200ce62c35a31f89265c8975ebfba25a47b8ad03e199df4 SHA512 d1fa286feb5e472d8003be3ca18101eb074a415910c88a58d8b2eb6785b3e9ef60a21264616fca6d8fe0b41b3862ed3692bdc87ae41e2f3ad88278e1c11725cf WHIRLPOOL 3301b0c0b4985650adc27e648e911bbf7bf0d5543152a5651a8d95c2db0917732644c8de13da1192ddb91dae1cd38e40c00e7dab4674cdc5f400d5c92767c670
 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
@@ -52,4 +53,5 @@ EBUILD netbeans-harness-9999_p20151009.ebuild 4125 SHA256 a73a8ac40c4ab936314406
 EBUILD netbeans-harness-9999_p20151012.ebuild 4125 SHA256 f381108f87470f476dbace762936088ef6f7a21b95765ac68e4646c01a058a29 SHA512 15e0f3f2ae8bfad65da467a8bb2c1d7e8c1889083c4ad9fadd6e7a9549fbae73e9827db82a2f95542d6aec9fed43affc3d37335290cac5b5be2f1d7802ad4112 WHIRLPOOL 9c9471ab6c774fbd79e05eb3680fbed830c02b0685e99e25092ea36da8da8db3790837bbd777cac80360c09c218fd002f3c3fc845af2c0ab908e8b7b9d91989a
 EBUILD netbeans-harness-9999_p20151014.ebuild 4125 SHA256 c19624482e4368d386a19bf0b2961e6abaa3d9ec1bc6d2fc7bf867b8240df6cd SHA512 217996d89232888fb24fe841f4264c9fed6293e34537eff9b79ef779dfb8b52c3d1b05da15aded094c2f3b9710df661d9bdbfc486ba0967b3e5a9276e7055176 WHIRLPOOL 2576066a7d9a4d11d4bd7704e375eb4507c6b9653ce4125191a4fbf03afdc384cde11717b090c77bcaca7de4c4fc19ecaf64df3d319c32fcd5cc541942da13dc
 EBUILD netbeans-harness-9999_p20151015.ebuild 4125 SHA256 5b1dff190ccfdc2afaecc30d07eff73e736d5663ef9bea38eb8056cfb91ba670 SHA512 3e979a02b68ccdb6630c433b18bfb95b071959f9e989c676a6b800bd68f53e263d08ca250d238bb381a1b95cc946989fb9e35b74711e50afb9febf2083425169 WHIRLPOOL 8425bce0529a046cc8fd8ec702b66909eb7303735cfd380d7b07231fd414c71ef57289e97c6959ee132888cb83dd33b36536461cdfb60b6276bb10072e7a5c43
+EBUILD netbeans-harness-9999_p20151016.ebuild 4125 SHA256 3dc76cbe6f39e09706d4a71d0d55ca31dc4245e4265f8053d8f441bbe4ab5a27 SHA512 aa01b510b89d4aa4ae3ffd564f66ca5688fff09bd0afe154ad100ffa22c24e52c99304306624876101f39e6a8c9c4bef881c7c492f61ded78cca1b45623dfe84 WHIRLPOOL a9a942aa67f40c35b6374b9518be4625d92849ec9cf794ee4ae5721a8d2108f51a47c1382c908c9e0eb087f1c7355e2f860736ff1f88946333211618f25e0bf4
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20151016.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20151016.ebuild
new file mode 100644
index 0000000..de91cab
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20151016.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-16_00-02-28/zip/netbeans-trunk-nightly-201510160002-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 34339b8..9e04221 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -130,6 +130,7 @@ DIST netbeans-trunk-nightly-201510090002-src.zip 208636938 SHA256 4aca1251fe6aa4
 DIST netbeans-trunk-nightly-201510120002-src.zip 208620253 SHA256 27fba7e135412fccea434d6c3682ec0d8103855f58e8f21038255e1c413d02d3 SHA512 b6cb66f87186220d50785fd57aa311e22982cf531246501620182a08e61de058da8584b45ea0ebb6651f877509492c74f98de5ccd64b5ea6bd2c80ac42d0aa34 WHIRLPOOL 4906908eb51d2d0d0c0c20a0f73433f2cbb76d4243335381c388882901756f26f460395990fd3a4a4316b4496a8330a792e9f1c8b5b20d3f1d542d1b31f99163
 DIST netbeans-trunk-nightly-201510140002-src.zip 208620278 SHA256 ec207e7f0ca45db66859688f6b23b44082e324f196f08ea4aec1d5aae467e0db SHA512 77aecf6fbfcc4b176b92b239217e333b0132f6274243779948394a33a78907a35e7e64454679129480167bb1b28910429eccdd9c7cba6aafcd7a823e84810518 WHIRLPOOL fd89d1fe5b98ad04ba306c0cf7d7918cb4f8f4a545e3ce2c1c14260ca143326db43d1298c94b206f7d8601c57c454debcad9858c20951229d1d41777923ebe0e
 DIST netbeans-trunk-nightly-201510150002-src.zip 208627914 SHA256 a7e2706439132b898453379d3fff80e13f5e36458e7b1c8fa11212b6c45028b9 SHA512 de7f0d786ebd952dc4031f27ff16d0f1988f47a18b2c235afab6171b18daa30348a42e85763d6c57cbc185dc2049605de0676e9de896c60898669252e3a223c6 WHIRLPOOL b57bca24b7473081f75820c3a5e425db95589000aacd1e77350c2f35de9eecc11afb41b700fa267f54149dd6e228e50693187b63d7573ce3c6d5ba6813361b81
+DIST netbeans-trunk-nightly-201510160002-src.zip 208629531 SHA256 6ebdf2274ef07d0a5200ce62c35a31f89265c8975ebfba25a47b8ad03e199df4 SHA512 d1fa286feb5e472d8003be3ca18101eb074a415910c88a58d8b2eb6785b3e9ef60a21264616fca6d8fe0b41b3862ed3692bdc87ae41e2f3ad88278e1c11725cf WHIRLPOOL 3301b0c0b4985650adc27e648e911bbf7bf0d5543152a5651a8d95c2db0917732644c8de13da1192ddb91dae1cd38e40c00e7dab4674cdc5f400d5c92767c670
 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
@@ -153,4 +154,5 @@ EBUILD netbeans-ide-9999_p20151009.ebuild 30334 SHA256 273323563051f39385d81eae5
 EBUILD netbeans-ide-9999_p20151012.ebuild 30334 SHA256 e8c6339a9bfc777a6fcedfde07666bc42f1c2b01e6b780b2e1fff60da0c93a5d SHA512 1174c10b035189e705bbc7ace3c21c9167a4a8787377d5805f9a83b5e57fda649de8e0e3b32a827c4cbfa85d0b759d78994304d7d18dc5c7cd65c36dfbc154f9 WHIRLPOOL c3582b90cb809971bd34e1d3368e4cb21a652c2464e12bc0b32eb587d57ea6ad62fa6a35787ba243074e0d8eadbd01fa43c9ade4a26f56f95adf193eb02cb6a8
 EBUILD netbeans-ide-9999_p20151014.ebuild 30334 SHA256 3e0c1170b505a5dd83da3562185a21d155585151356eb007eeddd96290926c60 SHA512 cacb088c9e087c1179e20bfa0e44919f051d8fc8e481600278d2c1d4ecd3e9477d536756d3de16304ad9772e2f1462ed385f4fdb531fb63ab4c2e61e68371c86 WHIRLPOOL 8ab7b54d017ca90be98af707395993151693078b5d81fbe9d1eda050ff37bb8f3c826609042cfaec522653d458f4fc49d696fa8b7b2b3fb9f9e816e78cf79850
 EBUILD netbeans-ide-9999_p20151015.ebuild 30334 SHA256 a07f9a47b8667c13ee9377b12f045e4e79ccfa8e5f5febd0e62c446845ca85c5 SHA512 f66d7dfdeb87262e2460ec09aefc0910511b3233e2bf0e508de14161942b46fd5c22f3b7b4ffb4eff8fc6cc890de3c24112e8531a31cc60b66ae3c3b1dfb8e9b WHIRLPOOL c36726dd923f840803867650ac18eeeec40c96c991d7f76564fbb1d9c8273dccd60dd77c3590034c93edf912fdfbb94d3e6ffad9d2fd25032db337aa57354915
+EBUILD netbeans-ide-9999_p20151016.ebuild 30334 SHA256 801bc102b6cb10215a151f5a19509493ed7adffe038bee4f7dccce59c454503a SHA512 1b70ac452184ffdb33ced5a47d01bf23513ba9e056d1d6d2fb56caf99434064e5b914e345646d83d207f52c56f39ca63ef6262c1b4fe04e064802fb8b7e2e4a4 WHIRLPOOL aea6ad5a0f3ee2347bfdcd1c81a8cac605407797c979affb86816e048075014513eff20a4adad5045b4e225cc9c24b12a4e37b33a457ff4522fcff2495571e7b
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20151016.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20151016.ebuild
new file mode 100644
index 0000000..393250e
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20151016.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-16_00-02-28/zip/netbeans-trunk-nightly-201510160002-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 4dffaeb..a47c30c 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -51,6 +51,7 @@ DIST netbeans-trunk-nightly-201510090002-src.zip 208636938 SHA256 4aca1251fe6aa4
 DIST netbeans-trunk-nightly-201510120002-src.zip 208620253 SHA256 27fba7e135412fccea434d6c3682ec0d8103855f58e8f21038255e1c413d02d3 SHA512 b6cb66f87186220d50785fd57aa311e22982cf531246501620182a08e61de058da8584b45ea0ebb6651f877509492c74f98de5ccd64b5ea6bd2c80ac42d0aa34 WHIRLPOOL 4906908eb51d2d0d0c0c20a0f73433f2cbb76d4243335381c388882901756f26f460395990fd3a4a4316b4496a8330a792e9f1c8b5b20d3f1d542d1b31f99163
 DIST netbeans-trunk-nightly-201510140002-src.zip 208620278 SHA256 ec207e7f0ca45db66859688f6b23b44082e324f196f08ea4aec1d5aae467e0db SHA512 77aecf6fbfcc4b176b92b239217e333b0132f6274243779948394a33a78907a35e7e64454679129480167bb1b28910429eccdd9c7cba6aafcd7a823e84810518 WHIRLPOOL fd89d1fe5b98ad04ba306c0cf7d7918cb4f8f4a545e3ce2c1c14260ca143326db43d1298c94b206f7d8601c57c454debcad9858c20951229d1d41777923ebe0e
 DIST netbeans-trunk-nightly-201510150002-src.zip 208627914 SHA256 a7e2706439132b898453379d3fff80e13f5e36458e7b1c8fa11212b6c45028b9 SHA512 de7f0d786ebd952dc4031f27ff16d0f1988f47a18b2c235afab6171b18daa30348a42e85763d6c57cbc185dc2049605de0676e9de896c60898669252e3a223c6 WHIRLPOOL b57bca24b7473081f75820c3a5e425db95589000aacd1e77350c2f35de9eecc11afb41b700fa267f54149dd6e228e50693187b63d7573ce3c6d5ba6813361b81
+DIST netbeans-trunk-nightly-201510160002-src.zip 208629531 SHA256 6ebdf2274ef07d0a5200ce62c35a31f89265c8975ebfba25a47b8ad03e199df4 SHA512 d1fa286feb5e472d8003be3ca18101eb074a415910c88a58d8b2eb6785b3e9ef60a21264616fca6d8fe0b41b3862ed3692bdc87ae41e2f3ad88278e1c11725cf WHIRLPOOL 3301b0c0b4985650adc27e648e911bbf7bf0d5543152a5651a8d95c2db0917732644c8de13da1192ddb91dae1cd38e40c00e7dab4674cdc5f400d5c92767c670
 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
@@ -74,4 +75,5 @@ EBUILD netbeans-java-9999_p20151009.ebuild 14818 SHA256 30525bf272973140fb843b72
 EBUILD netbeans-java-9999_p20151012.ebuild 14818 SHA256 79070a1feb49f0603e83ed6df20ee53b0ece47cdf2eec706ccb5ce7b7a273c42 SHA512 04a347805ab4a4e48f612bdb25978d0d94095fd12988c0ba3cf31e225e4fd1f6cdaf9456c53e936f30150e28cb57ff53de9e0c96a561263ab6b33de2cd1854aa WHIRLPOOL 6a7b286fe9f1bb96cce310e30f0ea87e4793c99091a8c8e7ed9f4fd8a28af8b25b48dc78f343b4f58b9abc5570965f130f40212cec154c5c5d598bfa1a3f2b9d
 EBUILD netbeans-java-9999_p20151014.ebuild 14818 SHA256 776fbf1d317e960fc799fd97a799ebbdd59a1e537d9690256c26079f9edfdfc4 SHA512 aa26fac614e98463d1f361258ebc9e9ee62b7e317d8304cd488fa269573f47da470d37cdeae3a6f6c0043c885d054718abfbc437932d438737c810e26f5a6153 WHIRLPOOL 27b1f9891b245d818704745a3ef240cd3ccbfd7fe40eaeebc54fb5e7faf23a964fbdbd2cb07c87e39131a5c05b273d57808eb289c485157d353f0d51a9b8319e
 EBUILD netbeans-java-9999_p20151015.ebuild 14818 SHA256 fca51cbe8b6d0b100b48aa26eefcfc75d1ebce6eb40d9c3f822ecf04cd33477f SHA512 efd841105b4606b47bbccc80ff128a4f6c1a303412802a96430c20a9c87c4adcdbde6ce7f653f6d813d6c35dcd8fca276df6283f6ae8b4cb09f0758ca36e74c6 WHIRLPOOL 8a694918bfa6246fbbeb305e33707bd63b457d998dfcb3b5dae1e8e35217b591991cd5244e7bf1f1517ee3429f9b9e4c99728ab1f904ce5cba8f9748ac3a2e65
+EBUILD netbeans-java-9999_p20151016.ebuild 14818 SHA256 2ed8212fd7a255a154a5a5495db6fef3f3924e6260bf6e0719dd2f602d46d14c SHA512 ef7fefbc6a136fee4648de4a629b43b2abea47beb986c7e1cc8076a14c16e9b6121841f875152b2f7b8edcf9717f8525a634707e07ce36db776809740f537023 WHIRLPOOL 62743942a782b8f8addd490635082a505d4215ad64cafda5774955adf2131292d37a5604a5f8c33ae518fc4ebdd642e50f2d87f4d8def7c05cd5e1846af0cb93
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index e6d96db..819ff6b 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201510090002-src.zip 208636938 SHA256 4aca1251fe6aa4
 DIST netbeans-trunk-nightly-201510120002-src.zip 208620253 SHA256 27fba7e135412fccea434d6c3682ec0d8103855f58e8f21038255e1c413d02d3 SHA512 b6cb66f87186220d50785fd57aa311e22982cf531246501620182a08e61de058da8584b45ea0ebb6651f877509492c74f98de5ccd64b5ea6bd2c80ac42d0aa34 WHIRLPOOL 4906908eb51d2d0d0c0c20a0f73433f2cbb76d4243335381c388882901756f26f460395990fd3a4a4316b4496a8330a792e9f1c8b5b20d3f1d542d1b31f99163
 DIST netbeans-trunk-nightly-201510140002-src.zip 208620278 SHA256 ec207e7f0ca45db66859688f6b23b44082e324f196f08ea4aec1d5aae467e0db SHA512 77aecf6fbfcc4b176b92b239217e333b0132f6274243779948394a33a78907a35e7e64454679129480167bb1b28910429eccdd9c7cba6aafcd7a823e84810518 WHIRLPOOL fd89d1fe5b98ad04ba306c0cf7d7918cb4f8f4a545e3ce2c1c14260ca143326db43d1298c94b206f7d8601c57c454debcad9858c20951229d1d41777923ebe0e
 DIST netbeans-trunk-nightly-201510150002-src.zip 208627914 SHA256 a7e2706439132b898453379d3fff80e13f5e36458e7b1c8fa11212b6c45028b9 SHA512 de7f0d786ebd952dc4031f27ff16d0f1988f47a18b2c235afab6171b18daa30348a42e85763d6c57cbc185dc2049605de0676e9de896c60898669252e3a223c6 WHIRLPOOL b57bca24b7473081f75820c3a5e425db95589000aacd1e77350c2f35de9eecc11afb41b700fa267f54149dd6e228e50693187b63d7573ce3c6d5ba6813361b81
+DIST netbeans-trunk-nightly-201510160002-src.zip 208629531 SHA256 6ebdf2274ef07d0a5200ce62c35a31f89265c8975ebfba25a47b8ad03e199df4 SHA512 d1fa286feb5e472d8003be3ca18101eb074a415910c88a58d8b2eb6785b3e9ef60a21264616fca6d8fe0b41b3862ed3692bdc87ae41e2f3ad88278e1c11725cf WHIRLPOOL 3301b0c0b4985650adc27e648e911bbf7bf0d5543152a5651a8d95c2db0917732644c8de13da1192ddb91dae1cd38e40c00e7dab4674cdc5f400d5c92767c670
 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
@@ -50,4 +51,5 @@ EBUILD netbeans-javacard-9999_p20151009.ebuild 4976 SHA256 76064c273b1c521940833
 EBUILD netbeans-javacard-9999_p20151012.ebuild 4976 SHA256 ba509d64878ed36bb76259e91bfe2aa2a6929e7e106b4af08fa7865f355446ee SHA512 7e000883bee6bfb76ca4bd853c020af3dedfb64842c542b5bc616553328a8ae0c6bdbd5936f907c741a8ea79dca4e85ae53fa2e64c6ac36fad0c005ee0f00234 WHIRLPOOL b9e01adcddf84a0dbc6cc6393ee31d5bee2099b00ae4b88c47339f05cf5753ef7e2e6078b07075e850faa51139074d457973337aa92a8de33047fad705d32aea
 EBUILD netbeans-javacard-9999_p20151014.ebuild 4976 SHA256 b81198093253a1d64c1e3851d99c943a5d17db5b68f98d943d42a26963865f5c SHA512 0a171fb2bfecd587910737fb8b080a93b49b6758a80d97082a202b57bb2dbc76583c1476d0276297e3e09a10efc6d28d1f03900075ed352ae8e93ae302d443e3 WHIRLPOOL 765255dbd9f70089e3274bb25fdca30c49f6ee032150e377ba02c6112be1850eb4b006a4bbdb9c92f34daa9a499544b33f0ca1ace29134be54d487abc428a15e
 EBUILD netbeans-javacard-9999_p20151015.ebuild 4976 SHA256 bdb73899b48704eb1975f39c5d83c9e8314d1a210be56a9d8bc43faaa6c71d0d SHA512 9ac5ce129dbd10076a13ed48298b57843fa704d2ac01133316a10a39222dd99629ae68d1f675ae882097932b9530ac3b7d0d726b6114345a7a714382ae86477a WHIRLPOOL ff2e59e91c4ee388d382e6e48b3d51be1bc31de46d539db11e8217100eb39ecfb872a27936b4f99ef825509346e8a87058c61db42879c2f39fa18e98af249bec
+EBUILD netbeans-javacard-9999_p20151016.ebuild 4976 SHA256 7d67dbdaa7144e448702a70dc1e4692ff0e160f944c3d5f3c8e054d1c24d3292 SHA512 8539ded521a831990ef8ed7ac45eee9ee5c54be65b66ca4c3319ed494b4dd2bf8f0b3ba6d7dc8187ab9bbca34a47f8d2396a1aeffaaabef9eb9ec9b9b06bb1d9 WHIRLPOOL fe6e4bf09f78b094a0ea530dc1b948438a64ad2986e8b955a63de5d5575106470446e793a7b47b47e41b60b93afd579837ff56eb2dff5549f54c6e919bfe9ccf
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20151016.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20151016.ebuild
new file mode 100644
index 0000000..eaa95a8
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20151016.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-16_00-02-28/zip/netbeans-trunk-nightly-201510160002-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 aeadef2..bac73e7 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201510090002-src.zip 208636938 SHA256 4aca1251fe6aa4
 DIST netbeans-trunk-nightly-201510120002-src.zip 208620253 SHA256 27fba7e135412fccea434d6c3682ec0d8103855f58e8f21038255e1c413d02d3 SHA512 b6cb66f87186220d50785fd57aa311e22982cf531246501620182a08e61de058da8584b45ea0ebb6651f877509492c74f98de5ccd64b5ea6bd2c80ac42d0aa34 WHIRLPOOL 4906908eb51d2d0d0c0c20a0f73433f2cbb76d4243335381c388882901756f26f460395990fd3a4a4316b4496a8330a792e9f1c8b5b20d3f1d542d1b31f99163
 DIST netbeans-trunk-nightly-201510140002-src.zip 208620278 SHA256 ec207e7f0ca45db66859688f6b23b44082e324f196f08ea4aec1d5aae467e0db SHA512 77aecf6fbfcc4b176b92b239217e333b0132f6274243779948394a33a78907a35e7e64454679129480167bb1b28910429eccdd9c7cba6aafcd7a823e84810518 WHIRLPOOL fd89d1fe5b98ad04ba306c0cf7d7918cb4f8f4a545e3ce2c1c14260ca143326db43d1298c94b206f7d8601c57c454debcad9858c20951229d1d41777923ebe0e
 DIST netbeans-trunk-nightly-201510150002-src.zip 208627914 SHA256 a7e2706439132b898453379d3fff80e13f5e36458e7b1c8fa11212b6c45028b9 SHA512 de7f0d786ebd952dc4031f27ff16d0f1988f47a18b2c235afab6171b18daa30348a42e85763d6c57cbc185dc2049605de0676e9de896c60898669252e3a223c6 WHIRLPOOL b57bca24b7473081f75820c3a5e425db95589000aacd1e77350c2f35de9eecc11afb41b700fa267f54149dd6e228e50693187b63d7573ce3c6d5ba6813361b81
+DIST netbeans-trunk-nightly-201510160002-src.zip 208629531 SHA256 6ebdf2274ef07d0a5200ce62c35a31f89265c8975ebfba25a47b8ad03e199df4 SHA512 d1fa286feb5e472d8003be3ca18101eb074a415910c88a58d8b2eb6785b3e9ef60a21264616fca6d8fe0b41b3862ed3692bdc87ae41e2f3ad88278e1c11725cf WHIRLPOOL 3301b0c0b4985650adc27e648e911bbf7bf0d5543152a5651a8d95c2db0917732644c8de13da1192ddb91dae1cd38e40c00e7dab4674cdc5f400d5c92767c670
 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
@@ -48,4 +49,5 @@ EBUILD netbeans-javadoc-9999_p20151009.ebuild 6228 SHA256 8daf46903e3b818d432281
 EBUILD netbeans-javadoc-9999_p20151012.ebuild 6228 SHA256 4a054db115d6acd4081cb5abf5dd13be027d0df305a61660a5ff998cd98f5f8c SHA512 41278bc29e63f791ff4ff2c4649a17c4e5797d8309b887921ed829ccf29c0310b8fa5c7aaebfb057f989c913524babeb22fb3f8f0203f5858749b8c29a5e4d1b WHIRLPOOL d072a3800cc901aa9039af77f1b87fb5cabfc6c2cb8aa613267670cdc90459e1da0d8a9b983bfdf0fcebd251dd1388b9ca551941ec3ef982ad4f05881374d9fc
 EBUILD netbeans-javadoc-9999_p20151014.ebuild 6228 SHA256 3e56e67e30927b185a43089c874ed18f6d79684e4da595983ec4b3bdb5e83186 SHA512 18b73ab15fa667119d60d499d0aa70a6340395ae81ad4c007e9ba50f1ec2c0d884dcbd8b04a44e9bacaa8e2256bd2392ba6a11dedf24d8e5bb5e68d5f4ff79f7 WHIRLPOOL e830363acd975ebe5c4ed80ef907807b3bed49ab17b097f67ac2c3613b140c003442b7b9ab90548398f5dde5b3e0ca662f74ed2cfce8af2925c2de36fcbe1cb9
 EBUILD netbeans-javadoc-9999_p20151015.ebuild 6228 SHA256 30a315089694444d644d5f4130b9ab78f7d7f8d5c7e8522aaf78d1a132981fde SHA512 82be0d96bfb36d6461598718d3e2f0d802ad5e2f61da893fbf9cbca94b883689d7fc985673a84eaca7fcc3bba7a059f01f7fe207a78e0d3163fb15e492336a18 WHIRLPOOL 505c2dc30f0b87f9dbd7107b39b06e18414a7092feee6626e98c0b476ccf5faf8533cfbed30679f4006eca152b7da704157794a666a483acdda9eadc19eca3e0
+EBUILD netbeans-javadoc-9999_p20151016.ebuild 6228 SHA256 fd888fcd719da51d0da0c95257c069c5b71e94c7bdbdc61c5c5122400a48b19c SHA512 c17648ffcf37db8be754ad002977d97f1fde24916903c18d4101271cf1f77e3b9a7d170ab746b520b491190ddcbcb078aa938ad43f145a76a936bc78498de225 WHIRLPOOL ee3a0be87ed4e3286844ff936d939aa3b04b50ea78ced4d4e17e351b4a746789927cc8c5cca554e1a4ae41f2b26f7c6da5b11bd0a0812b17d284f9e5375ac469
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20151016.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20151016.ebuild
new file mode 100644
index 0000000..1cd1d59
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20151016.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-16_00-02-28/zip/netbeans-trunk-nightly-201510160002-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 f728fa4..3da059f 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201510090002-src.zip 208636938 SHA256 4aca1251fe6aa4
 DIST netbeans-trunk-nightly-201510120002-src.zip 208620253 SHA256 27fba7e135412fccea434d6c3682ec0d8103855f58e8f21038255e1c413d02d3 SHA512 b6cb66f87186220d50785fd57aa311e22982cf531246501620182a08e61de058da8584b45ea0ebb6651f877509492c74f98de5ccd64b5ea6bd2c80ac42d0aa34 WHIRLPOOL 4906908eb51d2d0d0c0c20a0f73433f2cbb76d4243335381c388882901756f26f460395990fd3a4a4316b4496a8330a792e9f1c8b5b20d3f1d542d1b31f99163
 DIST netbeans-trunk-nightly-201510140002-src.zip 208620278 SHA256 ec207e7f0ca45db66859688f6b23b44082e324f196f08ea4aec1d5aae467e0db SHA512 77aecf6fbfcc4b176b92b239217e333b0132f6274243779948394a33a78907a35e7e64454679129480167bb1b28910429eccdd9c7cba6aafcd7a823e84810518 WHIRLPOOL fd89d1fe5b98ad04ba306c0cf7d7918cb4f8f4a545e3ce2c1c14260ca143326db43d1298c94b206f7d8601c57c454debcad9858c20951229d1d41777923ebe0e
 DIST netbeans-trunk-nightly-201510150002-src.zip 208627914 SHA256 a7e2706439132b898453379d3fff80e13f5e36458e7b1c8fa11212b6c45028b9 SHA512 de7f0d786ebd952dc4031f27ff16d0f1988f47a18b2c235afab6171b18daa30348a42e85763d6c57cbc185dc2049605de0676e9de896c60898669252e3a223c6 WHIRLPOOL b57bca24b7473081f75820c3a5e425db95589000aacd1e77350c2f35de9eecc11afb41b700fa267f54149dd6e228e50693187b63d7573ce3c6d5ba6813361b81
+DIST netbeans-trunk-nightly-201510160002-src.zip 208629531 SHA256 6ebdf2274ef07d0a5200ce62c35a31f89265c8975ebfba25a47b8ad03e199df4 SHA512 d1fa286feb5e472d8003be3ca18101eb074a415910c88a58d8b2eb6785b3e9ef60a21264616fca6d8fe0b41b3862ed3692bdc87ae41e2f3ad88278e1c11725cf WHIRLPOOL 3301b0c0b4985650adc27e648e911bbf7bf0d5543152a5651a8d95c2db0917732644c8de13da1192ddb91dae1cd38e40c00e7dab4674cdc5f400d5c92767c670
 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
@@ -54,4 +55,5 @@ EBUILD netbeans-javafx-9999_p20151009.ebuild 4717 SHA256 ea34461a5d6d5dcc22af875
 EBUILD netbeans-javafx-9999_p20151012.ebuild 4717 SHA256 ad051f69d2290298602b60a85f21ae8dbb8c79ad312293719b95d36bb84932f5 SHA512 365ba0b6d8458a2b81a24792f7291d2971a27c97aa401565b713f417289a9bfc863fd28a960e624d4df5543574be6c168123044b6e2833a3d05dbb51c89c43af WHIRLPOOL a8cf5205bb85a303ac0d97c8efd85b21fb9a8cb6de8ec24766e2b8fbea7bbd6985037c1ae468e33bdbeffe8bd1f7e184c359d9fe1f5d96828acfd54420e5e9c0
 EBUILD netbeans-javafx-9999_p20151014.ebuild 4717 SHA256 aad31ad8879efafc33f66de03e7b708e3c21637b383f5b2585069432e7a4a98b SHA512 6c5eef111b691725c9624e742132b099f03360e676a3d2a32f4e8472694ba18095f3dfc06c937172e7b0be9e0bc7377c8faf65cd3999796e98bdfeb441902952 WHIRLPOOL 2cf14df45c0084156f6fe096ad4d61da2d79670719fc78589fcb22c4c5f1873653f3657d8e20450f2a56ed0ee93321e66475bbbd2870b7e3d8af75db3ba8025d
 EBUILD netbeans-javafx-9999_p20151015.ebuild 4717 SHA256 ae427821e2bc703765e2cfdca94afdae5020f0c4f66092e09abee27f29d00b9c SHA512 7b0d9f39f0a2b1704d148124aa9216b2c5ab8e7757763f0ee36734538fcdd987a49a9958ad4a5190a4b9a8066d155eee1a9cd56c895461615005417352a02e60 WHIRLPOOL da62cf679b30fa67f59de9ec4b5af9d55e5c846148f98ca0ee361e7a364bc0df61bd30fa03567fcf2033dc0c1c775fb28b04f26c29b029cecf9782d1b06370cd
+EBUILD netbeans-javafx-9999_p20151016.ebuild 4717 SHA256 fc8f94790c620a7fedd04ce23532507db52c3f1d8cf829031096fc0502311b9e SHA512 3c0f0826ccf5179aa95527059983bed91b1c4f1ae89fcd5a61d791d61357fb12ea938749f25d65ccbcd7386006661a66cf27448a0809b537e463127fb4494797 WHIRLPOOL d17cd8a4a18072edb4e9775acc0eee53ad10c88cefac3fa078013d50628b27b811995c78de0b1d788a2b2f60a58481219586e5f8b72b2b9b37c72475a32ffaaa
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20151016.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20151016.ebuild
new file mode 100644
index 0000000..be7d37d
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20151016.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-16_00-02-28/zip/netbeans-trunk-nightly-201510160002-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 3a6d60c..86db406 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201510090002-src.zip 208636938 SHA256 4aca1251fe6aa4
 DIST netbeans-trunk-nightly-201510120002-src.zip 208620253 SHA256 27fba7e135412fccea434d6c3682ec0d8103855f58e8f21038255e1c413d02d3 SHA512 b6cb66f87186220d50785fd57aa311e22982cf531246501620182a08e61de058da8584b45ea0ebb6651f877509492c74f98de5ccd64b5ea6bd2c80ac42d0aa34 WHIRLPOOL 4906908eb51d2d0d0c0c20a0f73433f2cbb76d4243335381c388882901756f26f460395990fd3a4a4316b4496a8330a792e9f1c8b5b20d3f1d542d1b31f99163
 DIST netbeans-trunk-nightly-201510140002-src.zip 208620278 SHA256 ec207e7f0ca45db66859688f6b23b44082e324f196f08ea4aec1d5aae467e0db SHA512 77aecf6fbfcc4b176b92b239217e333b0132f6274243779948394a33a78907a35e7e64454679129480167bb1b28910429eccdd9c7cba6aafcd7a823e84810518 WHIRLPOOL fd89d1fe5b98ad04ba306c0cf7d7918cb4f8f4a545e3ce2c1c14260ca143326db43d1298c94b206f7d8601c57c454debcad9858c20951229d1d41777923ebe0e
 DIST netbeans-trunk-nightly-201510150002-src.zip 208627914 SHA256 a7e2706439132b898453379d3fff80e13f5e36458e7b1c8fa11212b6c45028b9 SHA512 de7f0d786ebd952dc4031f27ff16d0f1988f47a18b2c235afab6171b18daa30348a42e85763d6c57cbc185dc2049605de0676e9de896c60898669252e3a223c6 WHIRLPOOL b57bca24b7473081f75820c3a5e425db95589000aacd1e77350c2f35de9eecc11afb41b700fa267f54149dd6e228e50693187b63d7573ce3c6d5ba6813361b81
+DIST netbeans-trunk-nightly-201510160002-src.zip 208629531 SHA256 6ebdf2274ef07d0a5200ce62c35a31f89265c8975ebfba25a47b8ad03e199df4 SHA512 d1fa286feb5e472d8003be3ca18101eb074a415910c88a58d8b2eb6785b3e9ef60a21264616fca6d8fe0b41b3862ed3692bdc87ae41e2f3ad88278e1c11725cf WHIRLPOOL 3301b0c0b4985650adc27e648e911bbf7bf0d5543152a5651a8d95c2db0917732644c8de13da1192ddb91dae1cd38e40c00e7dab4674cdc5f400d5c92767c670
 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
@@ -47,4 +48,5 @@ EBUILD netbeans-mobility-9999_p20151009.ebuild 4412 SHA256 081771a3a298ac16ad002
 EBUILD netbeans-mobility-9999_p20151012.ebuild 4412 SHA256 39b34d320fe71cd6e2fb753491c844929552deeedee3bbb90a758f9f39fcdda9 SHA512 15ce7e5db20d729153b1ba89722d166f52695bfd8de971b7554576a70ee1fe98caea1eb65eacab5469fad464827f5c9585773990189b094fab9e2d7b956c5efd WHIRLPOOL a5f935ed47a1c5fe857a0c29c36356ed516136c80f67c8cbcd3457eea12b170747e72046071a2240ceaae357161865022527eb21a75161d17d2b137e1a8fc7ee
 EBUILD netbeans-mobility-9999_p20151014.ebuild 4412 SHA256 007d88247942bde57082fdbf433650555e079b6d7bea9aa4b38ef92c605880d2 SHA512 d1a69dca152dc14e40a192511f041e4c5757d93f7dc7dbf7a89b6140d1730f070c7a2313797da82fc8c18fb368a24ef26fb38f56903e04c57c85300db8a45454 WHIRLPOOL 6bfc0116c50da7f007864de6d549581c5613f4634f85199770709563909fdda0bfdedf0393d51efbb6accfbf36d8c0b92552b939369a7f26551f8d970ebc77a1
 EBUILD netbeans-mobility-9999_p20151015.ebuild 4412 SHA256 7a8320c433f5bf876089e29f6a62e9abb4345afa4ff44bb8e55c5f932ac07342 SHA512 6459c76adaff06f43855ef66af601a18e4a8ecda3704571c656cfe721a105eb2fff3dd2508f5371225245aa94658ab1b7e2c45c4b14f72b6c2e61b0fee7d1fd8 WHIRLPOOL 098df8e03172879f28dc7282391eca42a4cbaae24a52bb687b69184d55f9725fb19e10368370b4e540f2580e9e59a13ccfaecf6c9c4a83aa2b4f16cf44d67710
+EBUILD netbeans-mobility-9999_p20151016.ebuild 4412 SHA256 3a70896346f9e89b7c397a741c6198effa3eabec28682ca8710c20eab02e8f48 SHA512 59cbf10fa6b13f97b56c877069511e7663f4ff01ddc177ff8d206e388427107d568e3381f006bed8f9cfd63cf5a3433f7d58617020f514dd2f19ff996897cbab WHIRLPOOL a2862fb66958b9a0fb53ffa01894eb2abd9f7e260abf1a0c287e9202470c0f8b61e02641895157700cc6e9923d06633e95b589e32fdd1878079cd868d1ffd0ff
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20151016.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20151016.ebuild
new file mode 100644
index 0000000..8e0cba3
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20151016.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-16_00-02-28/zip/netbeans-trunk-nightly-201510160002-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 f9d3040..c73aac5 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201510090002-src.zip 208636938 SHA256 4aca1251fe6aa4
 DIST netbeans-trunk-nightly-201510120002-src.zip 208620253 SHA256 27fba7e135412fccea434d6c3682ec0d8103855f58e8f21038255e1c413d02d3 SHA512 b6cb66f87186220d50785fd57aa311e22982cf531246501620182a08e61de058da8584b45ea0ebb6651f877509492c74f98de5ccd64b5ea6bd2c80ac42d0aa34 WHIRLPOOL 4906908eb51d2d0d0c0c20a0f73433f2cbb76d4243335381c388882901756f26f460395990fd3a4a4316b4496a8330a792e9f1c8b5b20d3f1d542d1b31f99163
 DIST netbeans-trunk-nightly-201510140002-src.zip 208620278 SHA256 ec207e7f0ca45db66859688f6b23b44082e324f196f08ea4aec1d5aae467e0db SHA512 77aecf6fbfcc4b176b92b239217e333b0132f6274243779948394a33a78907a35e7e64454679129480167bb1b28910429eccdd9c7cba6aafcd7a823e84810518 WHIRLPOOL fd89d1fe5b98ad04ba306c0cf7d7918cb4f8f4a545e3ce2c1c14260ca143326db43d1298c94b206f7d8601c57c454debcad9858c20951229d1d41777923ebe0e
 DIST netbeans-trunk-nightly-201510150002-src.zip 208627914 SHA256 a7e2706439132b898453379d3fff80e13f5e36458e7b1c8fa11212b6c45028b9 SHA512 de7f0d786ebd952dc4031f27ff16d0f1988f47a18b2c235afab6171b18daa30348a42e85763d6c57cbc185dc2049605de0676e9de896c60898669252e3a223c6 WHIRLPOOL b57bca24b7473081f75820c3a5e425db95589000aacd1e77350c2f35de9eecc11afb41b700fa267f54149dd6e228e50693187b63d7573ce3c6d5ba6813361b81
+DIST netbeans-trunk-nightly-201510160002-src.zip 208629531 SHA256 6ebdf2274ef07d0a5200ce62c35a31f89265c8975ebfba25a47b8ad03e199df4 SHA512 d1fa286feb5e472d8003be3ca18101eb074a415910c88a58d8b2eb6785b3e9ef60a21264616fca6d8fe0b41b3862ed3692bdc87ae41e2f3ad88278e1c11725cf WHIRLPOOL 3301b0c0b4985650adc27e648e911bbf7bf0d5543152a5651a8d95c2db0917732644c8de13da1192ddb91dae1cd38e40c00e7dab4674cdc5f400d5c92767c670
 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
@@ -50,4 +51,5 @@ EBUILD netbeans-nb-9999_p20151009.ebuild 4997 SHA256 46bcd558eaa7247d86547a1ca2a
 EBUILD netbeans-nb-9999_p20151012.ebuild 4997 SHA256 4083b6eee0af033ed900e5a2760df21feb41e2aade1881e895a9ebbd879b1067 SHA512 214066c135344c3979601c1d0900d33faa9333e4e1888a6069d823ad5b58544adb667d68f242d7f8784cb4096cc90b40b2bea9d3f9f3f52792fb2e2b78ab2de4 WHIRLPOOL 92377f156608d4a7717540fd80e59cdfb9b08564dfc3eca4ae4571dd04397331efa623e324db4fe743d1db46899677f3c671d4a2b230e3d5e398ac45151420a8
 EBUILD netbeans-nb-9999_p20151014.ebuild 4997 SHA256 db1c281199491975455d25067c149af568cccd056432f0f1e3702f019cf38254 SHA512 831587af37f6026f554d6bb7a7e6beac862f865f8e12de52d908305e9d56581217df75029b70b386852f14631724cef9f9be05bbef7260ecac6b65b216bf16b4 WHIRLPOOL d260864e8fa0683b9b98c40e8bb8c743bf11cb41d6b681eb04e53c02bd61b7f33e92438b7eb4f5760ab19781fb9661cef198479e7ff9e5c9bcf4bfc23e9a66c8
 EBUILD netbeans-nb-9999_p20151015.ebuild 4997 SHA256 48ee21b951ada9d9068eff2d99ed6ba0c05aedd2b46da114717d62645dedf863 SHA512 9e72388237dc4884cd1d1b46d81545c88f58b2784ff9a30ba837ab5d2cea9b85d69edd950a76e1fa3c359d76ace1abf65b1bd3591a17c217cb1abc10ecfd5906 WHIRLPOOL 832132a436b6e1ebf30a9322de2072e91d835010d014fd293477f59e1112b525da0086c36b9829d796671546260fe99ae3e5e469590e5b06d98dab8de3323f74
+EBUILD netbeans-nb-9999_p20151016.ebuild 4997 SHA256 410108ddb4c8f5bbaa0e0dcc1696094cd579e44ea959af1018833487d5d80f05 SHA512 929b8a0a85ef265337cfe1823402d8317f1d6516890b9a58cadc7f5e60289c468bfc0cd2d69e3ac5ff1128dd53c4ecb3aef1cd6b1f5a6ce2769bea289a93610d WHIRLPOOL 0a220b5b1ad6fc5c92a5ca75efbc6b50872e228bbcb6c6df573c449e555a57a123cc1cea4d709f822e9d90073299e3fcc80c8ea97e1d6c0a31cdff2d697a6398
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20151016.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20151016.ebuild
new file mode 100644
index 0000000..6eda841
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20151016.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-16_00-02-28/zip/netbeans-trunk-nightly-201510160002-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 db04a66..284fc4f 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201510090002-src.zip 208636938 SHA256 4aca1251fe6aa4
 DIST netbeans-trunk-nightly-201510120002-src.zip 208620253 SHA256 27fba7e135412fccea434d6c3682ec0d8103855f58e8f21038255e1c413d02d3 SHA512 b6cb66f87186220d50785fd57aa311e22982cf531246501620182a08e61de058da8584b45ea0ebb6651f877509492c74f98de5ccd64b5ea6bd2c80ac42d0aa34 WHIRLPOOL 4906908eb51d2d0d0c0c20a0f73433f2cbb76d4243335381c388882901756f26f460395990fd3a4a4316b4496a8330a792e9f1c8b5b20d3f1d542d1b31f99163
 DIST netbeans-trunk-nightly-201510140002-src.zip 208620278 SHA256 ec207e7f0ca45db66859688f6b23b44082e324f196f08ea4aec1d5aae467e0db SHA512 77aecf6fbfcc4b176b92b239217e333b0132f6274243779948394a33a78907a35e7e64454679129480167bb1b28910429eccdd9c7cba6aafcd7a823e84810518 WHIRLPOOL fd89d1fe5b98ad04ba306c0cf7d7918cb4f8f4a545e3ce2c1c14260ca143326db43d1298c94b206f7d8601c57c454debcad9858c20951229d1d41777923ebe0e
 DIST netbeans-trunk-nightly-201510150002-src.zip 208627914 SHA256 a7e2706439132b898453379d3fff80e13f5e36458e7b1c8fa11212b6c45028b9 SHA512 de7f0d786ebd952dc4031f27ff16d0f1988f47a18b2c235afab6171b18daa30348a42e85763d6c57cbc185dc2049605de0676e9de896c60898669252e3a223c6 WHIRLPOOL b57bca24b7473081f75820c3a5e425db95589000aacd1e77350c2f35de9eecc11afb41b700fa267f54149dd6e228e50693187b63d7573ce3c6d5ba6813361b81
+DIST netbeans-trunk-nightly-201510160002-src.zip 208629531 SHA256 6ebdf2274ef07d0a5200ce62c35a31f89265c8975ebfba25a47b8ad03e199df4 SHA512 d1fa286feb5e472d8003be3ca18101eb074a415910c88a58d8b2eb6785b3e9ef60a21264616fca6d8fe0b41b3862ed3692bdc87ae41e2f3ad88278e1c11725cf WHIRLPOOL 3301b0c0b4985650adc27e648e911bbf7bf0d5543152a5651a8d95c2db0917732644c8de13da1192ddb91dae1cd38e40c00e7dab4674cdc5f400d5c92767c670
 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
@@ -51,4 +52,5 @@ EBUILD netbeans-php-9999_p20151009.ebuild 4417 SHA256 5a5a72a32a4135c721cd5e87dc
 EBUILD netbeans-php-9999_p20151012.ebuild 4417 SHA256 87be267f2a5eb4e2d173db1cdcd6ab26d8d93de553f54d74235f07be0241e551 SHA512 602aebcb2abed36c303c7eed206bfefbff71bf64db79d146ecf567cd1e4dfd40a5489a9d136ff8eba0f43e1db81af1951357844e24ecd48ee8fbaba623290ad1 WHIRLPOOL 98f5330b9a84e41eafa745310589a2af7dfb9d33ca70c95bbf3381fb28d5b0381e217334b4530682b2e3df049cbde2568f615251db3d01b3ed1574eeefb766ee
 EBUILD netbeans-php-9999_p20151014.ebuild 4417 SHA256 850be8c9942028f13c7f7faf527571e1b3dcee460d45ea1268f372651da731f8 SHA512 70250dbf9fbd7922ca6cf8db9564713130700f279081a87646a10e93e982c98a2d8ea7a10324979f2f15fc02343e78d5b631e2a1cfb5b696f7cafc47fc88d98e WHIRLPOOL b9e5bc0485526ae7f065ec0006518eb06898f436a0ce158f501d6b01a7c69ecf46287c2d3b017653600ee419a26af763eb194c89fa5ef3ffc985bc9eb087c20d
 EBUILD netbeans-php-9999_p20151015.ebuild 4417 SHA256 d0172f945159595ced4e3fb6bff584f32a4174e7e728680f7e1b78298b3b7066 SHA512 dd7fff48d50f4290ab10e7dc903d4e7c5ae03537f7e872f9a88789260eb055a3286ae5f63fd0fc288d0e136282a792b52ae85cc91405210750950e9ad7db5401 WHIRLPOOL f7648cbd9a5b1f0427ff16a5adfd05236b175b2a728baf1a444ffc78dd529148417cec9f9ee096f0b427aff8f7a7d1898fd2ebe5be79ec3f9fe66730751abdb0
+EBUILD netbeans-php-9999_p20151016.ebuild 4417 SHA256 7f2be214f2ea5c0a8169bbe1512629b9c1facddc46080b9aa8ccf293ac1d2441 SHA512 fd597b4a2138c446edf3926a567d1855ff1ab11c840c743a4b53b3f5cb376414cf779676e2253681e7864231294bafe4694472374f97762f81c2659d1067e1f3 WHIRLPOOL 1109cbb935956e0ee06a611bb15f2ed3a3befa6ecce6e186eef97abd40429aa51dde04919aa2c76516251ac730160e677a289b4870b2ab1a1edd83bafcdd47ea
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20151016.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20151016.ebuild
new file mode 100644
index 0000000..bea8eee
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20151016.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-16_00-02-28/zip/netbeans-trunk-nightly-201510160002-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 0e52459..c9d801c 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -48,6 +48,7 @@ DIST netbeans-trunk-nightly-201510090002-src.zip 208636938 SHA256 4aca1251fe6aa4
 DIST netbeans-trunk-nightly-201510120002-src.zip 208620253 SHA256 27fba7e135412fccea434d6c3682ec0d8103855f58e8f21038255e1c413d02d3 SHA512 b6cb66f87186220d50785fd57aa311e22982cf531246501620182a08e61de058da8584b45ea0ebb6651f877509492c74f98de5ccd64b5ea6bd2c80ac42d0aa34 WHIRLPOOL 4906908eb51d2d0d0c0c20a0f73433f2cbb76d4243335381c388882901756f26f460395990fd3a4a4316b4496a8330a792e9f1c8b5b20d3f1d542d1b31f99163
 DIST netbeans-trunk-nightly-201510140002-src.zip 208620278 SHA256 ec207e7f0ca45db66859688f6b23b44082e324f196f08ea4aec1d5aae467e0db SHA512 77aecf6fbfcc4b176b92b239217e333b0132f6274243779948394a33a78907a35e7e64454679129480167bb1b28910429eccdd9c7cba6aafcd7a823e84810518 WHIRLPOOL fd89d1fe5b98ad04ba306c0cf7d7918cb4f8f4a545e3ce2c1c14260ca143326db43d1298c94b206f7d8601c57c454debcad9858c20951229d1d41777923ebe0e
 DIST netbeans-trunk-nightly-201510150002-src.zip 208627914 SHA256 a7e2706439132b898453379d3fff80e13f5e36458e7b1c8fa11212b6c45028b9 SHA512 de7f0d786ebd952dc4031f27ff16d0f1988f47a18b2c235afab6171b18daa30348a42e85763d6c57cbc185dc2049605de0676e9de896c60898669252e3a223c6 WHIRLPOOL b57bca24b7473081f75820c3a5e425db95589000aacd1e77350c2f35de9eecc11afb41b700fa267f54149dd6e228e50693187b63d7573ce3c6d5ba6813361b81
+DIST netbeans-trunk-nightly-201510160002-src.zip 208629531 SHA256 6ebdf2274ef07d0a5200ce62c35a31f89265c8975ebfba25a47b8ad03e199df4 SHA512 d1fa286feb5e472d8003be3ca18101eb074a415910c88a58d8b2eb6785b3e9ef60a21264616fca6d8fe0b41b3862ed3692bdc87ae41e2f3ad88278e1c11725cf WHIRLPOOL 3301b0c0b4985650adc27e648e911bbf7bf0d5543152a5651a8d95c2db0917732644c8de13da1192ddb91dae1cd38e40c00e7dab4674cdc5f400d5c92767c670
 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
@@ -71,4 +72,5 @@ EBUILD netbeans-platform-9999_p20151009.ebuild 9382 SHA256 2b17b14cf575820d6bc62
 EBUILD netbeans-platform-9999_p20151012.ebuild 9382 SHA256 90231f4def8670365d111a45ee05d6dd3e2f1bfa64804a5993b5aa4acfd4e00e SHA512 f5ab98a7633761bcba8abc709c30f58dfe5e57e6314a8461cc9eb8241279dcc5e897372131141380e731494bbc3db87c3e5e48dbdfee251dcfb02dcc6260669b WHIRLPOOL 637af216dcade3dfc52bb9874e644d67c679913f1467dbba03de17af67e6407052d71755570d56be355d450d74ebae4cb8a621fd40e17bbcd2101c655f2fce22
 EBUILD netbeans-platform-9999_p20151014.ebuild 9382 SHA256 40c2cc850a8f185b141e61e33d65db96da85141a6ca732187dee784dad608e25 SHA512 2bc028cb3d74ba2cbc807a7239a5e206b9bd42753e30335f060b930e3d345be9400f3d668213eba6dea5ed17f9247d6c65db1445f36b0eadfffeba2652de4f16 WHIRLPOOL 275ad4998afb89cea3047223c700b06dc0bd6e0c20e8178706a59b6d53a9ccd537364dfa35795e2efc9840c8247a421326bf73b98cfb7e29d0282af0b7757e85
 EBUILD netbeans-platform-9999_p20151015.ebuild 9382 SHA256 022312d08e8c5d7ddb9ea031f8e71aac6ef1b4f175b99007739171a60ae29854 SHA512 57cb0281c93762d19848cf6b945f193bba81f7519618ad42f45b99728d77ccd216e60c8f3bf4d74611f2b043757fd914035c36db786a8e736267d847016224c7 WHIRLPOOL 81b132507608109f0b2d379cdc0fa28a6d256a5969248e65ed66142d3078309c4037021698c833d6969789db8499d2c32faa36c8f45dbeedf5f288a58b64f61d
+EBUILD netbeans-platform-9999_p20151016.ebuild 9382 SHA256 85cc4e6e134dcbf554e7a44b719cd425ba87762892540b0b88422312b5e1b40e SHA512 3d51695643a1d543ca3aea80fa280f82d8cf724587cd50a36d521df755a150b4579b01c857408b2c5f2abfa61cfe08a76bdab74048926280e08d525d433a9e3a WHIRLPOOL 5c7b1fa230f2b1a5e8ee3729a6f1419a9ba6d8c4c7beb272f54a9ce225f66696cdd28d5379c4ec287d11813519e45286527f64553ecff522214af545f93a84b8
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20151016.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20151016.ebuild
new file mode 100644
index 0000000..93c85b5
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20151016.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-16_00-02-28/zip/netbeans-trunk-nightly-201510160002-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 a3b8ac7..9cb293c 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201510090002-src.zip 208636938 SHA256 4aca1251fe6aa4
 DIST netbeans-trunk-nightly-201510120002-src.zip 208620253 SHA256 27fba7e135412fccea434d6c3682ec0d8103855f58e8f21038255e1c413d02d3 SHA512 b6cb66f87186220d50785fd57aa311e22982cf531246501620182a08e61de058da8584b45ea0ebb6651f877509492c74f98de5ccd64b5ea6bd2c80ac42d0aa34 WHIRLPOOL 4906908eb51d2d0d0c0c20a0f73433f2cbb76d4243335381c388882901756f26f460395990fd3a4a4316b4496a8330a792e9f1c8b5b20d3f1d542d1b31f99163
 DIST netbeans-trunk-nightly-201510140002-src.zip 208620278 SHA256 ec207e7f0ca45db66859688f6b23b44082e324f196f08ea4aec1d5aae467e0db SHA512 77aecf6fbfcc4b176b92b239217e333b0132f6274243779948394a33a78907a35e7e64454679129480167bb1b28910429eccdd9c7cba6aafcd7a823e84810518 WHIRLPOOL fd89d1fe5b98ad04ba306c0cf7d7918cb4f8f4a545e3ce2c1c14260ca143326db43d1298c94b206f7d8601c57c454debcad9858c20951229d1d41777923ebe0e
 DIST netbeans-trunk-nightly-201510150002-src.zip 208627914 SHA256 a7e2706439132b898453379d3fff80e13f5e36458e7b1c8fa11212b6c45028b9 SHA512 de7f0d786ebd952dc4031f27ff16d0f1988f47a18b2c235afab6171b18daa30348a42e85763d6c57cbc185dc2049605de0676e9de896c60898669252e3a223c6 WHIRLPOOL b57bca24b7473081f75820c3a5e425db95589000aacd1e77350c2f35de9eecc11afb41b700fa267f54149dd6e228e50693187b63d7573ce3c6d5ba6813361b81
+DIST netbeans-trunk-nightly-201510160002-src.zip 208629531 SHA256 6ebdf2274ef07d0a5200ce62c35a31f89265c8975ebfba25a47b8ad03e199df4 SHA512 d1fa286feb5e472d8003be3ca18101eb074a415910c88a58d8b2eb6785b3e9ef60a21264616fca6d8fe0b41b3862ed3692bdc87ae41e2f3ad88278e1c11725cf WHIRLPOOL 3301b0c0b4985650adc27e648e911bbf7bf0d5543152a5651a8d95c2db0917732644c8de13da1192ddb91dae1cd38e40c00e7dab4674cdc5f400d5c92767c670
 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
@@ -47,4 +48,5 @@ EBUILD netbeans-profiler-9999_p20151009.ebuild 3472 SHA256 c357462a203a039c82304
 EBUILD netbeans-profiler-9999_p20151012.ebuild 3472 SHA256 bfd4ce3aa0d215ca7505c90243e10a0fd0854b93bb0b3f898051f3ca1a19c4f2 SHA512 b61262a99efca801f926453d522c602baefc3ccf31d3f00b8ab9d634c1614ac87f9e2de9df542762d9bb0d6b51f60cbbfbdf712a89212c52732d49e9237518fe WHIRLPOOL 79e6c5f8f909c8876bde34711f2ba78a6fbcea48cdfbb194e53cd630635ea619129f45f278fc8d45e4d4ba5f9668b5ae27a0261e00cde6c167092ee3c9d09eeb
 EBUILD netbeans-profiler-9999_p20151014.ebuild 3472 SHA256 5bd1759c4d512cd8f680b0fc4b6477b09847b0f4891e8af93719b8c51c5bb076 SHA512 91fb4ed9dccf8bd241901d3044229310e66b4471ccca716f40d865a4e13bf6c5858d9a36ac4ed0aed4e9f95e1def4789b936bce34a4193fd487427868658927b WHIRLPOOL 3086790d31c2d7fd7db57a2ae49d575b2ca18bfa6627fadd1cc78d457839a8b9e08228020663903ea67553cb7e7beec1327cad1318b27b02ac91bd90e4a9668b
 EBUILD netbeans-profiler-9999_p20151015.ebuild 3472 SHA256 12f443c111c0e989fae0cb9936256df68de38c54122de7ccdcaa0d9a0186bf71 SHA512 e383106e56ebc23be0f61dd4b168f615da1669d62e68219cd934cf40d8b878ce9076f2f0bb0ce6c136e964273bcea00d28b5f55a47f67aea336baa58d8d85f2e WHIRLPOOL 154e592eed96fc3d4aafb5aa40b7b6601c6ec2336372bc32dd7b654e0b57e40cb18585778603c4c97c5c7c19dcca6801bb68770eb3fdf168901cd38703f6ab32
+EBUILD netbeans-profiler-9999_p20151016.ebuild 3472 SHA256 a4d48f59a31dfb1b0fe75732019f4a1ea4b0d16c8c0789e4ca7502f330af5ede SHA512 33bd5d229e28401c68eaffc1ec6d438742f80320436a7d3d185d645770171cf1a2a3e5229f63caf53c1b4886c38cf4675aa526429e9a08f919e9e5ec016589e6 WHIRLPOOL 21ffe8d087944e693f8228f385c4ebb4500cf20aa1935ebb8039b3201d8749f840529e464d55ef515eda4f32fd29b68667c934b782a4bf22bc7b173f3d8f079d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20151016.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20151016.ebuild
new file mode 100644
index 0000000..5782637
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20151016.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-16_00-02-28/zip/netbeans-trunk-nightly-201510160002-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 150a9f1..249feeb 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201510090002-src.zip 208636938 SHA256 4aca1251fe6aa4
 DIST netbeans-trunk-nightly-201510120002-src.zip 208620253 SHA256 27fba7e135412fccea434d6c3682ec0d8103855f58e8f21038255e1c413d02d3 SHA512 b6cb66f87186220d50785fd57aa311e22982cf531246501620182a08e61de058da8584b45ea0ebb6651f877509492c74f98de5ccd64b5ea6bd2c80ac42d0aa34 WHIRLPOOL 4906908eb51d2d0d0c0c20a0f73433f2cbb76d4243335381c388882901756f26f460395990fd3a4a4316b4496a8330a792e9f1c8b5b20d3f1d542d1b31f99163
 DIST netbeans-trunk-nightly-201510140002-src.zip 208620278 SHA256 ec207e7f0ca45db66859688f6b23b44082e324f196f08ea4aec1d5aae467e0db SHA512 77aecf6fbfcc4b176b92b239217e333b0132f6274243779948394a33a78907a35e7e64454679129480167bb1b28910429eccdd9c7cba6aafcd7a823e84810518 WHIRLPOOL fd89d1fe5b98ad04ba306c0cf7d7918cb4f8f4a545e3ce2c1c14260ca143326db43d1298c94b206f7d8601c57c454debcad9858c20951229d1d41777923ebe0e
 DIST netbeans-trunk-nightly-201510150002-src.zip 208627914 SHA256 a7e2706439132b898453379d3fff80e13f5e36458e7b1c8fa11212b6c45028b9 SHA512 de7f0d786ebd952dc4031f27ff16d0f1988f47a18b2c235afab6171b18daa30348a42e85763d6c57cbc185dc2049605de0676e9de896c60898669252e3a223c6 WHIRLPOOL b57bca24b7473081f75820c3a5e425db95589000aacd1e77350c2f35de9eecc11afb41b700fa267f54149dd6e228e50693187b63d7573ce3c6d5ba6813361b81
+DIST netbeans-trunk-nightly-201510160002-src.zip 208629531 SHA256 6ebdf2274ef07d0a5200ce62c35a31f89265c8975ebfba25a47b8ad03e199df4 SHA512 d1fa286feb5e472d8003be3ca18101eb074a415910c88a58d8b2eb6785b3e9ef60a21264616fca6d8fe0b41b3862ed3692bdc87ae41e2f3ad88278e1c11725cf WHIRLPOOL 3301b0c0b4985650adc27e648e911bbf7bf0d5543152a5651a8d95c2db0917732644c8de13da1192ddb91dae1cd38e40c00e7dab4674cdc5f400d5c92767c670
 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
@@ -56,4 +57,5 @@ EBUILD netbeans-webcommon-9999_p20151009.ebuild 4991 SHA256 ae2edbe56e17e97c629d
 EBUILD netbeans-webcommon-9999_p20151012.ebuild 4991 SHA256 c4ccb1942974abe0dd9ef9553bd7ea9c0cf0c47df6369ba6b67e7b42047c9ce4 SHA512 48f65de75c7a314681fa7c41b73564d5652f7cde6a09209373e76b7bbbde8210b710193cb485c24b49fea518c9d4ad86b050173278e1cdf364fa4e55dc5c7c23 WHIRLPOOL 6b5826e16262dbfef991e63d7d8a85dede6ebe93cdce5b25abeda04a4b74dd295f7d81c43bc03685a3393ad2893ace9d2c5aff08fe53f7c006165a75c1bfb230
 EBUILD netbeans-webcommon-9999_p20151014.ebuild 4991 SHA256 24f23cb320d08b4d52bd77350497c3ede18627ef962bb0d244f7fc121c168cd4 SHA512 5989052c5a774ae61dec3d3c9ff63a57b9534ab1d74ee55098988690c34b314f8ae2a2353f1999b103ec6fce55d53fda3b302c5b12f2d60f57a0e5f273915153 WHIRLPOOL b59de70ea986df692c06e808b76af1c67218f9ca5df4de0c6f303993a68f9998e582d41224c7fa08fffeca66b9192f4ff7fa7464b96c03d2ee3a1ba1c6563011
 EBUILD netbeans-webcommon-9999_p20151015.ebuild 4991 SHA256 5a95b892f110433978d31be3b1d26f8892fcd50a9a9a00723d5109ff05638078 SHA512 755c3e40f29292a04325c5d7c466d11917c4e0e4415a2c8b99f483e79a1a375b51c703cd23d17f93c2352b56ceeda19ea16e4eac07b18f530f0799b99a0ea575 WHIRLPOOL 5f4da2022f8f547a6fed449da3d59c2aada477ee5470724ce8ae7d616a75806a5fd12ee5d98b0ce30e32386f7efd5adb7442681c6baa5001479a84d7e0468c96
+EBUILD netbeans-webcommon-9999_p20151016.ebuild 4991 SHA256 ab8eae3339233170da669ee8a8142c5f42af71e8043278a33ff20571271206d4 SHA512 ef1213084fc694254b1cf1a181b2e3f01bea50ae0413118b3aab69f9a50f7803e6645dcd822110c2858df85ff4f922da87055d83cbcb2a1f220dc99dfc0e238c WHIRLPOOL baedf5d8bded41a19b07b664aa9c8516b5f6d410a75dc36dab81f65496f475cabe5a0effef046e2f9178fda847b0266241047a8741f2afd2d944e3b3ac113c03
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20151016.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20151016.ebuild
new file mode 100644
index 0000000..036c3c5
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20151016.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-16_00-02-28/zip/netbeans-trunk-nightly-201510160002-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 6a3bfaa..3863479 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201510090002-src.zip 208636938 SHA256 4aca1251fe6aa4
 DIST netbeans-trunk-nightly-201510120002-src.zip 208620253 SHA256 27fba7e135412fccea434d6c3682ec0d8103855f58e8f21038255e1c413d02d3 SHA512 b6cb66f87186220d50785fd57aa311e22982cf531246501620182a08e61de058da8584b45ea0ebb6651f877509492c74f98de5ccd64b5ea6bd2c80ac42d0aa34 WHIRLPOOL 4906908eb51d2d0d0c0c20a0f73433f2cbb76d4243335381c388882901756f26f460395990fd3a4a4316b4496a8330a792e9f1c8b5b20d3f1d542d1b31f99163
 DIST netbeans-trunk-nightly-201510140002-src.zip 208620278 SHA256 ec207e7f0ca45db66859688f6b23b44082e324f196f08ea4aec1d5aae467e0db SHA512 77aecf6fbfcc4b176b92b239217e333b0132f6274243779948394a33a78907a35e7e64454679129480167bb1b28910429eccdd9c7cba6aafcd7a823e84810518 WHIRLPOOL fd89d1fe5b98ad04ba306c0cf7d7918cb4f8f4a545e3ce2c1c14260ca143326db43d1298c94b206f7d8601c57c454debcad9858c20951229d1d41777923ebe0e
 DIST netbeans-trunk-nightly-201510150002-src.zip 208627914 SHA256 a7e2706439132b898453379d3fff80e13f5e36458e7b1c8fa11212b6c45028b9 SHA512 de7f0d786ebd952dc4031f27ff16d0f1988f47a18b2c235afab6171b18daa30348a42e85763d6c57cbc185dc2049605de0676e9de896c60898669252e3a223c6 WHIRLPOOL b57bca24b7473081f75820c3a5e425db95589000aacd1e77350c2f35de9eecc11afb41b700fa267f54149dd6e228e50693187b63d7573ce3c6d5ba6813361b81
+DIST netbeans-trunk-nightly-201510160002-src.zip 208629531 SHA256 6ebdf2274ef07d0a5200ce62c35a31f89265c8975ebfba25a47b8ad03e199df4 SHA512 d1fa286feb5e472d8003be3ca18101eb074a415910c88a58d8b2eb6785b3e9ef60a21264616fca6d8fe0b41b3862ed3692bdc87ae41e2f3ad88278e1c11725cf WHIRLPOOL 3301b0c0b4985650adc27e648e911bbf7bf0d5543152a5651a8d95c2db0917732644c8de13da1192ddb91dae1cd38e40c00e7dab4674cdc5f400d5c92767c670
 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
@@ -47,4 +48,5 @@ EBUILD netbeans-websvccommon-9999_p20151009.ebuild 2721 SHA256 2cc6b03a981afbddb
 EBUILD netbeans-websvccommon-9999_p20151012.ebuild 2721 SHA256 e6a812bf57bbc0977aeee94c21c168e5ce5e372045ebe0a52039c080445cca59 SHA512 2e26f0b4c90cf3870d08369656f8e77a13a570931e99771179f6abba88c40116cc30fc4439eeddcaf0cecd1ef12f9856d3a88c0127e14eb63934eba62f903f09 WHIRLPOOL 1a9ac3f25ff07768f1bcfda3345514922de3ad11c54498053b3ebebc38fe5f34462bdb9a00b43325f7f9ff7181b871d46f739282e330990430fcfe9b21b72ab4
 EBUILD netbeans-websvccommon-9999_p20151014.ebuild 2721 SHA256 82f9d4940410cb78c8d9220a496bf6cc836ba657897195221226e4a68a887af3 SHA512 12627c1ecfe9a98dbfc150467052226699407ab348e1e001ee31391cdc05fc770888f91dd5cc2a56b64ca5c91cb3884b4ac75fa2403df816c0b88c859c7b3a2e WHIRLPOOL 8bc506d15efb4bc9aa2dd6ba450379b71da5d9c2e8d1d2f8d1c892d16a787015681b1e93e451978b80e9f6ca5182c698a5088863947e7f45dc9ad10898b76a4d
 EBUILD netbeans-websvccommon-9999_p20151015.ebuild 2721 SHA256 ead1f2b7417227887de963c369748a388b64c2bef59418faff3fce21ad115a30 SHA512 e9b5fab4e0413ff101d5a885ccda4f5fee956fb3a5f1e2a44f6d16a2be7be05d125f9e0b87047f805d4259739e1cbddfa775b19f73572c2c1d5ef7402144aa56 WHIRLPOOL 210c3e70dd8bfe073d1a411a54d5e3cc52e8403759641ecd48769f98cb5f954b3d1d910187ff3d8f3de898a6785981090ee4a0820f42f825fec330c24a93fe74
+EBUILD netbeans-websvccommon-9999_p20151016.ebuild 2721 SHA256 862eb1b81f8edd412b3c54dd1f53d3fae90dbf40bd29f06d19a3d1fe47573234 SHA512 5b8abc9cdafd58c44c1a98018dc0a9f455fa5f110ccc2aafe6f34c6358224bf44f16015e147e6ef300113f399ad01e85d659398bfa350db301642f9f914efb9e WHIRLPOOL 4e4a61a4890f2faf216f2c0b21922ae9c1c39f2d4cdd04a11d3773840535f5418d6f85974f33edda9eae565abfd0fba3e600cc02a5ea1b95fdf5884205ab4c3e
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20151016.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20151016.ebuild
new file mode 100644
index 0000000..0af27fc
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20151016.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-16_00-02-28/zip/netbeans-trunk-nightly-201510160002-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 b9193a4..f924765 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201510090002-src.zip 208636938 SHA256 4aca1251fe6aa4
 DIST netbeans-trunk-nightly-201510120002-src.zip 208620253 SHA256 27fba7e135412fccea434d6c3682ec0d8103855f58e8f21038255e1c413d02d3 SHA512 b6cb66f87186220d50785fd57aa311e22982cf531246501620182a08e61de058da8584b45ea0ebb6651f877509492c74f98de5ccd64b5ea6bd2c80ac42d0aa34 WHIRLPOOL 4906908eb51d2d0d0c0c20a0f73433f2cbb76d4243335381c388882901756f26f460395990fd3a4a4316b4496a8330a792e9f1c8b5b20d3f1d542d1b31f99163
 DIST netbeans-trunk-nightly-201510140002-src.zip 208620278 SHA256 ec207e7f0ca45db66859688f6b23b44082e324f196f08ea4aec1d5aae467e0db SHA512 77aecf6fbfcc4b176b92b239217e333b0132f6274243779948394a33a78907a35e7e64454679129480167bb1b28910429eccdd9c7cba6aafcd7a823e84810518 WHIRLPOOL fd89d1fe5b98ad04ba306c0cf7d7918cb4f8f4a545e3ce2c1c14260ca143326db43d1298c94b206f7d8601c57c454debcad9858c20951229d1d41777923ebe0e
 DIST netbeans-trunk-nightly-201510150002-src.zip 208627914 SHA256 a7e2706439132b898453379d3fff80e13f5e36458e7b1c8fa11212b6c45028b9 SHA512 de7f0d786ebd952dc4031f27ff16d0f1988f47a18b2c235afab6171b18daa30348a42e85763d6c57cbc185dc2049605de0676e9de896c60898669252e3a223c6 WHIRLPOOL b57bca24b7473081f75820c3a5e425db95589000aacd1e77350c2f35de9eecc11afb41b700fa267f54149dd6e228e50693187b63d7573ce3c6d5ba6813361b81
+DIST netbeans-trunk-nightly-201510160002-src.zip 208629531 SHA256 6ebdf2274ef07d0a5200ce62c35a31f89265c8975ebfba25a47b8ad03e199df4 SHA512 d1fa286feb5e472d8003be3ca18101eb074a415910c88a58d8b2eb6785b3e9ef60a21264616fca6d8fe0b41b3862ed3692bdc87ae41e2f3ad88278e1c11725cf WHIRLPOOL 3301b0c0b4985650adc27e648e911bbf7bf0d5543152a5651a8d95c2db0917732644c8de13da1192ddb91dae1cd38e40c00e7dab4674cdc5f400d5c92767c670
 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
@@ -50,4 +51,5 @@ EBUILD netbeans-9999_p20151009.ebuild 7210 SHA256 00edfb10156e1c9b78344a8c464e5c
 EBUILD netbeans-9999_p20151012.ebuild 7210 SHA256 20c5306816f8efe37c01d9a81e15a6ce370e13c16c432868602e5c306c320ee7 SHA512 056626c8165f98285cd979a19d841829d41afbae8a9d25c6a6b44b69e659325f43f312ae672950261c44eb50613ab497e16d1cdd329ce6c3e5eb2d0910f9c7fa WHIRLPOOL 2e62379f61835aa0398ef6b07b90b4ef513d6d663cab440e3b03da628a2cb8e854a7a6d92460247becf39d449e637dfa8b14669762763f459c7034b441e6f419
 EBUILD netbeans-9999_p20151014.ebuild 7210 SHA256 a95b5ddc386ff86e89234cf69dd1a76b12516dc14af272e2b75a65251c8c1975 SHA512 944348e2a11707c9bbdd151609805c77df34f43d79fe13d279058558b8ee49c6cf6e921970a20549e20979593584a7ac5c366037d1e06f275e2398adbe22c3d5 WHIRLPOOL 3657a2a35558a090269e47355442524cdb397e7fe233ffb613ed7ab45fbf8bf647b16c7af1d748901680805f52439945aa39707cadbda20d14308d4437c025c2
 EBUILD netbeans-9999_p20151015.ebuild 7210 SHA256 b13e4f7e1f42d785b4269442719d4c195ada7b0dd62bd27d74ec4925944b2da4 SHA512 b3fedf83088d3fb1313e5385e2f8a806d7425cb1da7868557f3eb69facf88b6fb8c7b27b007d6651196a57ef0d077cea75fb1f1e0285c19567a703549fd4e01d WHIRLPOOL 57aff484459fe02faea2670a4f6c0436a9a1b412ef733ebf0c7a493013976685c50d3f52032d338e42672eb4c7201be830ea3275bceab807f193edf23fdf3037
+EBUILD netbeans-9999_p20151016.ebuild 7210 SHA256 1c968ee408d4e2222e8637cc844b1a84a6bf528c51ff4d3cf286702bbbbe3a90 SHA512 89a7ab70410a75ccde62c2b468194a7e1a142f10ad38de0e917d9e8c67715bab071116433971ff9378ad1ebe4643bcc0bba540613685822ab4d2c2e5ccb66050 WHIRLPOOL 814cf7018786ac73092174ced2c2491caba044994b7482171446757aef69b886f926ed2f68ea60f6c90d33a78d663466eda3d7de0c9178f287042246a8edbdfd
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

diff --git a/dev-util/netbeans/netbeans-9999_p20151016.ebuild b/dev-util/netbeans/netbeans-9999_p20151016.ebuild
new file mode 100644
index 0000000..4226753
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20151016.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-16_00-02-28/zip/netbeans-trunk-nightly-201510160002-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] 2+ messages in thread

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-platform/, dev-java/netbeans-harness/, ...
@ 2016-07-20  8:48 Miroslav Šulc
  0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2016-07-20  8:48 UTC (permalink / raw
  To: gentoo-commits

commit:     f08c24de60b8e7c31e69165bf4fe6da4d12d1c75
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 20 08:44:07 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Jul 20 08:44:07 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=f08c24de

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.3.0

 dev-java/netbeans-apisupport/Manifest              |   2 +
 .../netbeans-apisupport-9999_p20160720.ebuild      | 111 ++++++
 dev-java/netbeans-cnd/Manifest                     |   3 +
 .../netbeans-cnd-9999_p20160720.ebuild             | 127 +++++++
 dev-java/netbeans-dlight/Manifest                  |   2 +
 .../netbeans-dlight-9999_p20160720.ebuild          | 101 ++++++
 dev-java/netbeans-enterprise/Manifest              |   2 +
 .../netbeans-enterprise-9999_p20160720.ebuild      | 266 +++++++++++++++
 dev-java/netbeans-ergonomics/Manifest              |   2 +
 .../netbeans-ergonomics-9999_p20160720.ebuild      | 101 ++++++
 dev-java/netbeans-extide/Manifest                  |   2 +
 .../netbeans-extide-9999_p20160720.ebuild          | 108 ++++++
 dev-java/netbeans-groovy/Manifest                  |   2 +
 .../netbeans-groovy-9999_p20160720.ebuild          | 111 ++++++
 dev-java/netbeans-harness/Manifest                 |   2 +
 .../netbeans-harness-9999_p20160720.ebuild         | 114 +++++++
 dev-java/netbeans-ide/Manifest                     |   2 +
 .../netbeans-ide-9999_p20160720.ebuild             | 374 +++++++++++++++++++++
 dev-java/netbeans-java/Manifest                    |   2 +
 .../netbeans-java-9999_p20160720.ebuild            | 280 +++++++++++++++
 dev-java/netbeans-javacard/Manifest                |   2 +
 .../netbeans-javacard-9999_p20160720.ebuild        | 134 ++++++++
 dev-java/netbeans-javadoc/Manifest                 |   2 +
 .../netbeans-javadoc-9999_p20160720.ebuild         | 168 +++++++++
 dev-java/netbeans-javafx/Manifest                  |   2 +
 .../netbeans-javafx-9999_p20160720.ebuild          | 124 +++++++
 dev-java/netbeans-mobility/Manifest                |   2 +
 .../netbeans-mobility-9999_p20160720.ebuild        | 126 +++++++
 dev-java/netbeans-nb/Manifest                      |   2 +
 .../netbeans-nb/netbeans-nb-9999_p20160720.ebuild  | 128 +++++++
 dev-java/netbeans-php/Manifest                     |   2 +
 .../netbeans-php-9999_p20160720.ebuild             | 127 +++++++
 dev-java/netbeans-platform/Manifest                |   2 +
 .../netbeans-platform-9999_p20160720.ebuild        | 167 +++++++++
 dev-java/netbeans-profiler/Manifest                |   2 +
 .../netbeans-profiler-9999_p20160720.ebuild        | 121 +++++++
 dev-java/netbeans-webcommon/Manifest               |   2 +
 .../netbeans-webcommon-9999_p20160720.ebuild       | 132 ++++++++
 dev-java/netbeans-websvccommon/Manifest            |   2 +
 .../netbeans-websvccommon-9999_p20160720.ebuild    |  94 ++++++
 dev-util/netbeans/Manifest                         |   2 +
 dev-util/netbeans/netbeans-9999_p20160720.ebuild   | 254 ++++++++++++++
 42 files changed, 3311 insertions(+)

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 35e8812..9e07abd 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570
 DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
 DIST netbeans-trunk-nightly-201607190002-src.zip 216613749 SHA256 412763dc00b1c15d23dd85c94de76503155ad6f402ddb2fb6fc40bd162e72de9 SHA512 37efb5947aeeecf1567fed864a28a907f261a7c251ad4de882660980c76248560da9f0be91dc6763767ed8aea7f57a68c1a403d429fbe4c1af5e3f27c0f85d45 WHIRLPOOL 27edad2d71b76784b0fba98bc15b4649616e1462edc174dc850bbe1782d341efd704115d1af5c8cfc56faa14d37d294dc1ce831118a4bb9e74e48add3a341062
+DIST netbeans-trunk-nightly-201607200002-src.zip 216623678 SHA256 08e39cc20bb2eff32d9298541073e9dfebdabfd0878d00f88bb6f896632783a5 SHA512 f3796b3548b714b4207cff52c0e5516dec1e23f176dadb13ee5d4dfe44014bd0692f1f8019569e68e50cdf33905cd0d3623bd01f12a69cf1c7dedf452f289e23 WHIRLPOOL fbbeb6bb0331e2c60fb546394dba8c8e0d2a54e9c807b6c9b30f256f68e8ce9039c558800821d5f38bc8d2428d1f3732c4160d53fc075f1ecc57113776491cf8
 EBUILD netbeans-apisupport-8.0.2.ebuild 3314 SHA256 b68fe791f275fe4fcc8b00888688949b8927cb39db2cf9ad7860017c6d20adee SHA512 35c4bbcd34ec0eaef8a2de86c13333d2bf092db61af48558c3e173bb17dbf8fcd15001307bd7c498f4ccdbaa4277e1ee42ff0909af6170039165b547f646c383 WHIRLPOOL 206fe8d5f64e76827d3eb958a629ba087e8a16c2797752f5d9e62dff4166653677587a81be19e0a2c6adcf49292255d532e1f542c02550b1cf6ffd51467bde3c
 EBUILD netbeans-apisupport-8.1.ebuild 3338 SHA256 d249a09cd1a527bfc4f0dc87b1768aad9f05fc7fe7079fad0094c27d416d030c SHA512 47e5db58581625b23157ef7a7b6e340fce1327db85e015369ac32791178a0836af3348397ac6ff4439ab246170d3318c2062994c81019ff361084f00d432c9c8 WHIRLPOOL 8e379c9219b7730a15c10216bed00c3ec104f84b252d32da629f066095897398a4d8818e07cda5afdf94b115b97ead8de6a9529f38c81c1c41144067f119e54e
 EBUILD netbeans-apisupport-9999_p20160619.ebuild 3384 SHA256 62d7250742c2f06f4115d173a3e43389467575b08a45c01ea0f184e1a554e0ef SHA512 bcac6290b100d2c4816955fda39dcc8aef4775559db5971df90aa669a078708161fc8afbf5ad2f7b1c5c52d058ce52e7df4ccc445688e5eb4fae71f621ef09e4 WHIRLPOOL 8ee0d9caf9d18bf3a81319cb3f4ee6260a49f9ee57411dc05eb1591773edecec136d57a21808dc1c0a1f4de08aeef6e75df8b2270436b1e5553310c46a7c3d68
@@ -55,4 +56,5 @@ EBUILD netbeans-apisupport-9999_p20160716.ebuild 3384 SHA256 318b50a25638716101a
 EBUILD netbeans-apisupport-9999_p20160717.ebuild 3384 SHA256 4174464d10048e8856aafad202683a13224a5bbbf752f2b7bb1344c5c11489a5 SHA512 77a0804b986f3197dcbdfc454cae5e325d94660a15fc99803085c7c28e0dea516dae60a4552ff2aaa5f4fd265f56ef3b9474e4c45dbc2b0521f883511687cfae WHIRLPOOL 1a1ed092cca82d649d030f798acfa23fcfec54518403fb6586d6b77c35f280aa2ad1ba3f11c51b4797c747cd8967b07444a6c993e752580fc1ff9d69c6947356
 EBUILD netbeans-apisupport-9999_p20160718.ebuild 3384 SHA256 c214fafe112cb666e1cd676999dc8d8f58d3032d75e8a7150128511f31a6bbec SHA512 87472e62bae4b650cffe3f692a4883362261bc94efc763a5ec3ca01285b501f400879d3825a10b99b79a1cb3328ac9eafcce72ea91628451569145680f6aee0a WHIRLPOOL f4a9fe9c524a7739fb84c9c969d4680059d392f90ee35238795c305d5ce84ad1f17773f2f08327859aec82cdc8958e676878ec581d03666930b36bc9caa578a8
 EBUILD netbeans-apisupport-9999_p20160719.ebuild 3384 SHA256 7a4e16616c0d15066291690bcbb58f5fae2c4bddfc5eed4c249df4c5a31acb3d SHA512 82f189e5df6b5b6752b8a5cbc5cbfba05cf5cfc84d18cd1c7b59322493dfed3c3e4fb0ef92bc8fd294cf15922e4157017c3f0433705557762fe285a81081e2b7 WHIRLPOOL 1b67f6772326ed9b9de4f14a2f4492b28cb82501535f647a749e72057585887c86d626f6e3792bb290f3048346489340f6ec48872bec556ead1ed8ceabc60f4d
+EBUILD netbeans-apisupport-9999_p20160720.ebuild 3384 SHA256 cbde05fa60ebf92c09df5dfdc0a6a7d8d8f6ed85c4e648c3745b5167c046e942 SHA512 aec8c138a8865468e7ad56925cab3fe141ddfa089caa18d6f5e0f88ce85eb90abd45958ad80c883321236957f14ec76125b9dc11ca40070447733deafdf78752 WHIRLPOOL 2978a7315da6fdf41713c88b9624e8ede985fff311510801c8a30480744e4eb415460485479797f8a5217e70f8433a5e96c9d2e9d28284096c0d9e952e6c2978
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160720.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160720.ebuild
new file mode 100644
index 0000000..cfd0499
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160720.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2016 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/2016-07-20_00-02-33/zip/netbeans-trunk-nightly-201607200002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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-r16-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-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 12bfda6..08d66e4 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -6,6 +6,7 @@ DIST 4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar 164365 SHA25
 DIST 5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar 2388361 SHA256 9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7 SHA512 04be4dfba3a21f3ab9d9e439a64958bd8e844a9f151b798383bd9e0dd6ebc416783ae7cb1d1dbb27fb7288ab9756b13b8338cdb8ceb41a10949c852ad45ab1f2 WHIRLPOOL 488b7b9af1d1d06cca163d43e7be190730e2f0421796c21a26ace11196ee37a16b1bdeea78a1e2e64f8ca0e87f67a2aecd066af21505f3dd92dd76de40a94fa0
 DIST 5F62670605D036468D158D3D02FDCC6FBAB5D20F-clank_0.3.6.zip 8627894 SHA256 ace11db22fea550c6cdfc0199886008c71ff68b87dd3ec1ce84dc025bf0ba542 SHA512 46de2d1cd6c003ae1689a11aaba049b4e7359096225d2a20c6457f08e3c9c406be0809aa70174cb69415e028459fa4de629433d0fe7fb01af60f5d204f4f8c8c WHIRLPOOL c6e46d1eb0e4c674e9f53d9b04340fe1f1ce374b095852788cc677e1c728131b3b035d01c45da98aa3f836c8a27e3e68a226d6c7ecc1739ab94efe4a74e4f80e
 DIST 99529DC0E1426A102A98EF5494B6F6AA6E497F62-clank_0.3.6.zip 7930942 SHA256 ad9a64303fc4db833d2789a7d5b0be537ea7db55090189411e5778efff54a8a6 SHA512 46d91f0cbe86af186b87e6b972ecc9391f5b2a670eaf7238b60bb5399c0da40382c729338d1e2cf8ab94eb4ac64bfe9253da1cfad2ec900a87d56df4d299d707 WHIRLPOOL 52ab6b35eaa04d0e375bc4aaad43c4390021309da1956e81db6ba4fc8730da147f35eeceb8a02fa7e42e315296e8be3eb03d88d7d8987fdce30ec433ac5c407b
+DIST A22324F86EB1673E0D54D0FFF5C8047FAED4A2BA-clank_0.3.6.zip 11611624 SHA256 9aa63cf1ae6ba132858ca3f529ca8481e35efc7cb5b9b5177440ef13ccd31122 SHA512 cdf15d8a1df6c3df4f536fc962ec4a4dd6439fd4cfe5d68bf1cacf53378711454ba76c9398cbc3563f84e7be344de0715041cbf6d6e7c0e76523871ddafa4c02 WHIRLPOOL 53b2135b1b2203a8c568994efd8e2f95136833732e4799bef25077f5d73ad4c4f84b28abc17e39db7807de0484654caeb1004c5ec021bd654ffe9de45a64bc61
 DIST BB83D4F8047D608858154CB041054F5CAE35B903-cnd-rfs-1.0.zip 177647 SHA256 c92c3d3311b8f75883f4f9280fe8d6932b154c67c9dd1bd65a49beb45e578cd1 SHA512 c42e4f0c1b7efb24a45dc375180bfc8b0e02e74e01233665d3e74bf83a182c2b0bbe8b572a8eeb993d77312f6d118777d0576adfca4ea8f4c2cfe08892155345 WHIRLPOOL 41b573c7ca4b926333f28a9329a2423955055ff716e7be03b7a6f4714e7261e57574b16a0e89b96ae744dc0a36f9a4a72f8d948b11a6b8052159d42cbd40876a
 DIST BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip 31891 SHA256 dd9105ad309b56d22ef08573ec48a5f21baa2c50f8606df9c7b6245abd9dbe72 SHA512 288229a85536a45fbae6ba5a4dc085fa2053264259f14833cd435f64191a4b2f4b93c3e9981589087ec293afbb0fc76e97d2b5312a196e3b3fed11a605ab650a WHIRLPOOL 69379d331a68e1c4eb15aa8b1ff5256c9b98d9fad4688f2d306841973b151fd22ddbca25c5388af39b487b8810a2e521ffefbbb9775cf02271626179c3810c04
 DIST C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip 92177 SHA256 71e6d46d9c7e624bc83dbfa4edde20bfdcb47ae76dc2b19dd553d23f22b454e7 SHA512 64b15aa898a45c1dce0d9c58ec4ef8c3dc1a32e1213543d98002cbf5419d67b3caf4357c8a252e36951197f3edd70e34a226c989e5479ce3b2d1405783d3d530 WHIRLPOOL 675db7f81ecadcecfe52f18cf8bd465867c1dac12f818717248da9a7d071d45adeb3c6af2e6ac1863bb5ccca36ae9383722d2361c28af52e51e5f2ac34736e89
@@ -40,6 +41,7 @@ DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570
 DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
 DIST netbeans-trunk-nightly-201607190002-src.zip 216613749 SHA256 412763dc00b1c15d23dd85c94de76503155ad6f402ddb2fb6fc40bd162e72de9 SHA512 37efb5947aeeecf1567fed864a28a907f261a7c251ad4de882660980c76248560da9f0be91dc6763767ed8aea7f57a68c1a403d429fbe4c1af5e3f27c0f85d45 WHIRLPOOL 27edad2d71b76784b0fba98bc15b4649616e1462edc174dc850bbe1782d341efd704115d1af5c8cfc56faa14d37d294dc1ce831118a4bb9e74e48add3a341062
+DIST netbeans-trunk-nightly-201607200002-src.zip 216623678 SHA256 08e39cc20bb2eff32d9298541073e9dfebdabfd0878d00f88bb6f896632783a5 SHA512 f3796b3548b714b4207cff52c0e5516dec1e23f176dadb13ee5d4dfe44014bd0692f1f8019569e68e50cdf33905cd0d3623bd01f12a69cf1c7dedf452f289e23 WHIRLPOOL fbbeb6bb0331e2c60fb546394dba8c8e0d2a54e9c807b6c9b30f256f68e8ce9039c558800821d5f38bc8d2428d1f3732c4160d53fc075f1ecc57113776491cf8
 EBUILD netbeans-cnd-8.0.2.ebuild 4510 SHA256 0a9a4e58e28f395b5bcb017016b6ddb1b77afe393d0e5bd81cc05e3a32076c71 SHA512 2b1fedfe292fa140920fd11829e77127f9535e08b8307886accfa37e6d11195a1204e6b71b2640937da0711c3ce0bbf80c0eaa3c248a64fd61b6a3d99d5de14e WHIRLPOOL 10b1518360ade5d6f1f27c79a10f630b94a2ec5062e18df11f9828d4b374e6cbdea0b9f770e01c117ca90fa194dff9bd3be6a468075c2d35167fb78a7bb32794
 EBUILD netbeans-cnd-8.1.ebuild 4744 SHA256 e008e92761489558e039a07d4858b5a9745aa38c38c57668cba8b5f6a28dbd9b SHA512 724af3f292851fa1a04ccc95fe0a4f9d0fab5503ce31d2ff11be73779d67bd0f38835b334684f628f8eea2dde44543e6b872611b2bd6c01191ccfe26e69f4ec2 WHIRLPOOL 59ddd65a105dafeb8b783f457ec7a8c67a5a3aceb78ca60ac7c4f45f330b28b429ba6236a643ca0023189a9ebdb1ca0182ec0546943ec2494693859aa8f95515
 EBUILD netbeans-cnd-9999_p20160619.ebuild 4790 SHA256 bad9a5191965dd8ce7f73f8a87a0cea2bedf32775b93d9c110bb8be6c31d5b0b SHA512 8b843cda21bdc47091ae05b531f3a5c2b953b05030f57f520cc963cdbd53422a18f4a4276f040fda4bd21bfc4722454d68a4400caf10532d7d74c2d46c9ecea4 WHIRLPOOL 6452dfd59f1f46eb96d1e7f365bd3235c81df6640129c834edb8f4f27b07dc9951e35c54f0fd8a852fd5108fe2e8c7029831ecd8e775f0a1f3a201cb4c3c73be
@@ -67,4 +69,5 @@ EBUILD netbeans-cnd-9999_p20160716.ebuild 4790 SHA256 d0d07c3122deed6ce365cfcae7
 EBUILD netbeans-cnd-9999_p20160717.ebuild 4790 SHA256 0d81342f64c5b124fecfe586c95eb8a5cbc4c78d502cfe02b47115a4bd07173a SHA512 8b0461f10a7b547f07c2a4e7d9325f3612e2e4462128c20dc141fb42a4930d1c7c769646e1927cf40952eb1bfb763bbd6d9de8d1340247dd235c61301893ef39 WHIRLPOOL 717a3a8f269ece85b7a94769ff56fb585db747d5ee644aec5b13ccde360f172aaaad80cfa745c1bb51854e09324791af465f38b1fc3016daa758eefb71ce51af
 EBUILD netbeans-cnd-9999_p20160718.ebuild 4790 SHA256 e81149c3c4d0cbb98867b65ce3606b974b9729774dd546253605775018a52d9d SHA512 49120fb2b215cb057a4c4b859192d1af140b2b9958b4247d60845c07a8d75cf354e9dc7a6f9af2c2861f7ad84f5b50a6bcada11cb4e615385ae7b4bb670a20ae WHIRLPOOL 3578671e0a3aaf2a9fc6edf552d54fa1f5dbb83390163d99e418f9c41f612de5fe73d74dc43ee4784c14477f999d1a5742efc3de982d3fc48ee618deed38b52d
 EBUILD netbeans-cnd-9999_p20160719.ebuild 4790 SHA256 75aa358c41858d73b577bc8070465c70be02daab27019750e4dc2c3b38131c7a SHA512 82f07278bab0967806a83f62c7acd49d38853fdb1ecf35a75a8b275767855cb5e0b68b3efef593d108e97c7f36fe767422eb1e5dd9c274674270d6a8c6a338f7 WHIRLPOOL 15e24943a09967af801bdc1b8023cb2648094605a3354724a86b3174c0214644cf703113096c893adaa156e6814b2f341090b6e8df1cfc9a797ad919f418d0d7
+EBUILD netbeans-cnd-9999_p20160720.ebuild 4790 SHA256 817af01d4b078972fe206b1bf26eed1ae9db7572b209d1f3246061ff2d0b7b70 SHA512 742956e96afea8f440f2acde4dfcf4009de4119b84012f42356b0bda01ec3a21f1515c7d425c7c649ac431db4ff2a5da1ceb1ebba85766a03c348d0193af7c24 WHIRLPOOL 67afc2fe695fd02743075afa4c6b248f4a3f1a5d881442600cd1f114adac5c9f7fd97b4bf2e295acabe431e217e22253cd8412d3fb8792b94d74b83c06030655
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160720.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160720.ebuild
new file mode 100644
index 0000000..e309476
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160720.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2016 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/2016-07-20_00-02-33/zip/netbeans-trunk-nightly-201607200002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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/A22324F86EB1673E0D54D0FFF5C8047FAED4A2BA-clank_0.3.6.zip
+	http://hg.netbeans.org/binaries/43A82EB3CE61B9B0B1C60586C7D84729BD5BE3E0-cnd-build-trace-1.0.zip
+	http://hg.netbeans.org/binaries/E59851B0E49C05D728D5C653E52750FA5B6A8F0E-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-r16-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}"/A22324F86EB1673E0D54D0FFF5C8047FAED4A2BA-clank_0.3.6.zip libs.clank/external/clank_0.3.6.zip || die
+	ln -s "${DISTDIR}"/43A82EB3CE61B9B0B1C60586C7D84729BD5BE3E0-cnd-build-trace-1.0.zip cnd.discovery/external/cnd-build-trace-1.0.zip || die
+	ln -s "${DISTDIR}"/E59851B0E49C05D728D5C653E52750FA5B6A8F0E-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-r16-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.2.2.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 5270e3e..fe5fb43 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570
 DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
 DIST netbeans-trunk-nightly-201607190002-src.zip 216613749 SHA256 412763dc00b1c15d23dd85c94de76503155ad6f402ddb2fb6fc40bd162e72de9 SHA512 37efb5947aeeecf1567fed864a28a907f261a7c251ad4de882660980c76248560da9f0be91dc6763767ed8aea7f57a68c1a403d429fbe4c1af5e3f27c0f85d45 WHIRLPOOL 27edad2d71b76784b0fba98bc15b4649616e1462edc174dc850bbe1782d341efd704115d1af5c8cfc56faa14d37d294dc1ce831118a4bb9e74e48add3a341062
+DIST netbeans-trunk-nightly-201607200002-src.zip 216623678 SHA256 08e39cc20bb2eff32d9298541073e9dfebdabfd0878d00f88bb6f896632783a5 SHA512 f3796b3548b714b4207cff52c0e5516dec1e23f176dadb13ee5d4dfe44014bd0692f1f8019569e68e50cdf33905cd0d3623bd01f12a69cf1c7dedf452f289e23 WHIRLPOOL fbbeb6bb0331e2c60fb546394dba8c8e0d2a54e9c807b6c9b30f256f68e8ce9039c558800821d5f38bc8d2428d1f3732c4160d53fc075f1ecc57113776491cf8
 EBUILD netbeans-dlight-8.0.2.ebuild 2898 SHA256 08402481b573b90396431be03bda45904b2dd29f0086e09a111fe362e310c3f7 SHA512 3f6d6c9ea0043382562fbe47ad16e3273032407a74cb44ec7ff26736f96483835af4be8674361e910912a550b9fe592cc5a28c2b93b6b993076553195c35eac5 WHIRLPOOL 9d8706ccbc0d97b0f5d64ebf22c36316b08d8fbccd57408119ca5f5faef08c7f82677bf67488ff611eabeaa730e4c9a730c50966d94d738cfe79330ac147863d
 EBUILD netbeans-dlight-8.1.ebuild 2922 SHA256 f003a099e3f82f5ab53dcc56d86c00a662c98f47480feacac2a77ffea90ccd0f SHA512 94706ac4d8570deb8860236300cfeddfb2c3cbfd385ecb438a039991deeb018f292f6dbb2267d7c701b7f1b5b88d200f2c25696fb3204fcf205c15155b26d1fc WHIRLPOOL 1e44f40c8e2c03b7aa7385ef20a3247ea15a4d4705ce4b5f860bffe236eb578ab3d912f2cc2457e5906158ae747edc3b6b92463336c69af9cd58eca3fccb223d
 EBUILD netbeans-dlight-9999_p20160619.ebuild 2968 SHA256 aa29f6e3e86b05ec8ae1b794f8d29c9c58bda4ca6c3e45142b4a3912ec1f3233 SHA512 66a4f1a5b3787b20e0fbad6bde2011fb106aa2b38dca8e3542b260ded852968dde1ec277fcd31fea3efe5fbe355dfb1e3f7274ca1d1186cd5763edd390ee9a0d WHIRLPOOL 047b83b1497ed9c97bd1fad6577b8eb049f38c2fa55e40622e0150154e8cb296c9d4f001ac8995c668aa6bb7846ea841ce4e5af264ba6b0228182fac1dcd84ff
@@ -58,4 +59,5 @@ EBUILD netbeans-dlight-9999_p20160716.ebuild 2968 SHA256 50e296b783a01fa2b5f45eb
 EBUILD netbeans-dlight-9999_p20160717.ebuild 2968 SHA256 a9585c80567052a2dcd624548c5205f9c821967a92aa4faa8ef4b0b94cabfe22 SHA512 87bb7356eae2c64e5ca35381da57d2c37ad84df2a3cf05df59559cce0a4af58a99e65b1635c91f10661b9ced5df25d7d039d6daa5350bd302cf7a1fdd0c33190 WHIRLPOOL 8b53e3008878d567464d904b35221405cd878d71000e60c87510fde522056ad59fc10bf75e48113cba71f0da8858d973e97c6066f9c4e4aaa962212007b31558
 EBUILD netbeans-dlight-9999_p20160718.ebuild 2968 SHA256 29ea8d0f4d7734f8eea1baee1f05614b67095abcc4fe57f08fadefe103e303f7 SHA512 a1f33faa521f7cabc7c496bab931e60d89c5e31193b3444f3421803443f44df4235d7f99c98eabdc4a38d479c99e74fcdd605e8ae9b4f4f6a356775d2ca8da1d WHIRLPOOL 54ae990fc10897fd3570759747b2d4f11c053ae22c55285871b933905390004355a6256ba1d2513c77c976ffed93e9f44d63b1debc0919f1c3b3a81d0eb835dd
 EBUILD netbeans-dlight-9999_p20160719.ebuild 2968 SHA256 ac486e7793151af738fa02d3e1a45ba5e0bb287de3deb74cba5de20ec6eb90f0 SHA512 b7ad20c19a5cda4e9c9f19963adf849964579958d1c9a052f293d22e7518b74f04ca2e5a8bd5a80090c7f53d395510275aa049d96d1f0a290f8a100d9213b5ce WHIRLPOOL 06104c6bd0b66934a80a07a44cb5e400861232c8cc9408b3e17a849254b80a069cc245e83e989310ec04db9565fe9f553d12379e425eb4dc830b106f7f5dfcf2
+EBUILD netbeans-dlight-9999_p20160720.ebuild 2968 SHA256 6444ab091eb7dbff9e4bbb373fab829c0647fd10040dc8b7e4b09642001b45fe SHA512 1b5dab51603bb5f7a7ba2c6787abe16b883a58c59e6958cea360bfb3a01dc18aa29563b77260304fe10dd1772c4539e7d07deca9f7485ce09d56d32044abc360 WHIRLPOOL 291d1fd566aeddffa995c7f8b496083422bc77f51a0988b3b054c32960d20a42ec04404c24f7e01feece8eb468639a6cff61d188847df5d57c0ab2869436d813
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160720.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160720.ebuild
new file mode 100644
index 0000000..53eed0c
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160720.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2016 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/2016-07-20_00-02-33/zip/netbeans-trunk-nightly-201607200002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/0F89C62CA701D20BA9A9A526D4D017888C3B5A65-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-r16-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/0F89C62CA701D20BA9A9A526D4D017888C3B5A65-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-r16-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 e3e37ff..64949d1 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -60,6 +60,7 @@ DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570
 DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
 DIST netbeans-trunk-nightly-201607190002-src.zip 216613749 SHA256 412763dc00b1c15d23dd85c94de76503155ad6f402ddb2fb6fc40bd162e72de9 SHA512 37efb5947aeeecf1567fed864a28a907f261a7c251ad4de882660980c76248560da9f0be91dc6763767ed8aea7f57a68c1a403d429fbe4c1af5e3f27c0f85d45 WHIRLPOOL 27edad2d71b76784b0fba98bc15b4649616e1462edc174dc850bbe1782d341efd704115d1af5c8cfc56faa14d37d294dc1ce831118a4bb9e74e48add3a341062
+DIST netbeans-trunk-nightly-201607200002-src.zip 216623678 SHA256 08e39cc20bb2eff32d9298541073e9dfebdabfd0878d00f88bb6f896632783a5 SHA512 f3796b3548b714b4207cff52c0e5516dec1e23f176dadb13ee5d4dfe44014bd0692f1f8019569e68e50cdf33905cd0d3623bd01f12a69cf1c7dedf452f289e23 WHIRLPOOL fbbeb6bb0331e2c60fb546394dba8c8e0d2a54e9c807b6c9b30f256f68e8ce9039c558800821d5f38bc8d2428d1f3732c4160d53fc075f1ecc57113776491cf8
 EBUILD netbeans-enterprise-8.0.2-r1.ebuild 15075 SHA256 41d376117ad1d8d59c8194debfd29dc42f5fd4de70aee12a2134ec143a604dda SHA512 4cd9de88e9a401cc0be88e3e2605abc411c47307818376b2bcc00f9ae570b21324f2bf00fd83e819bfa076da0fb07811fa1f0f9362a6cd0ee05b63221a199000 WHIRLPOOL 73f4518c14430fe7aa3614ebf1b11a06ba0e9bce7479af2770db3a114f149d575a16a655218f757ed416b5149228ac56dac700f5a8d5e034cc838bfa4092e636
 EBUILD netbeans-enterprise-8.1-r1.ebuild 15888 SHA256 d4c04ccfee01a46819020cb7cf8fd8297618f3c0431ae2d9dd7eec8131f988ab SHA512 6c7c39c378cb79d3f382cb80d07710a8c5233aaf0df8fb58889ee6aa6bde73624efa6aa49b43f84105685094a7aff89e4b6367ffd1fd113da27b42d50d07e983 WHIRLPOOL e678e2a6957e428c1b6e51469c0e7cc6a08da2c797f1575b6bb660a7f3281c00f071179de459e27c983304915b005baaf94ad4fae0a4c08162f218bf53b7d821
 EBUILD netbeans-enterprise-9999_p20160619.ebuild 15825 SHA256 8aa66ace0e3d555df5d838047d3399909fb2c8463fb7ee5c91041ab297dfd677 SHA512 b956046db574db9e871e50a89986dd9f4a8e59c98e2989c30d660979b2ee061b4f51c700feb9b016d26785b8240ffd3dd388ce9b310cffd5e93d709da66c7fcd WHIRLPOOL 6c5fdd9f5edcfe5b17eac1352b3866230a01e44bd619bdb625f8700b5548d30e3a531561dfc05dfc9d5e3f0dd8733d5e029f75819a3913f3707d1d816b8c584a
@@ -87,4 +88,5 @@ EBUILD netbeans-enterprise-9999_p20160716.ebuild 15825 SHA256 55d879123b6a613e7a
 EBUILD netbeans-enterprise-9999_p20160717.ebuild 15825 SHA256 6f265fe58c8252107ce4c86f337fd1903c5de552c4ca3a9c54de665a84ebafc6 SHA512 8aaaca1a4be98b54537088d6f7d8fd9dc985e1a85b6ce974af5557aa35a02576219d89cd923b92660b1dee84f956a261da0f4d3e85d11362952d83a0e6b10ce8 WHIRLPOOL 9c0d0742d2d54ba348dea2ef47b902d11831ed6ec387f3c6b2992c790bea3de4f303493b92297bc63299ca3ffebbe0096fe548d92e4ba2ccc97911c6cbd20680
 EBUILD netbeans-enterprise-9999_p20160718.ebuild 15825 SHA256 1a10b9ba8c620bbce7f5a95006c34e152add7c03f7cbc7dd9c116e64d0e10545 SHA512 1864b9431d785257d613d04ce76296abe59c4dc3329d5d28e79e8c1ff53e4a9fddfe07b4baa63b557d2936ed11978583a6dbea566a46f997409d36044ed45c82 WHIRLPOOL 888c37f5da6042b533e95f3aaab1a1fe7d77c0770c7041ab6928e7ed0a904bc0799088ba09c54d4800e76c1a7e2d1726b21c6823b3a6e3b1e03430caa023c103
 EBUILD netbeans-enterprise-9999_p20160719.ebuild 15825 SHA256 560886c041c1c6968aea83fff543ef0b7837e9e117fcecf16df2bdb25afd6465 SHA512 1ea56ee2ea133aa65e5ee4653ee5899bc8e3396fbd758531f02a29b8ae2e9734dbc6514345864009e561c5eb374a46278c65f6c563305d2abf2c42c9d56aeb10 WHIRLPOOL a8c148eb5ed008ba51c647db2f0a727f950405a52413fcb65747657d91c02da14b209adba325613ec0a8d3b7a078bf38eb531009d287f9b74f9189813dec1336
+EBUILD netbeans-enterprise-9999_p20160720.ebuild 15825 SHA256 ecff0454745d17ec38c51f0c4c38ad41b73a57781f67d459842544ef5a4ec8a4 SHA512 eb31ec92469b5d29f6189e37cb91c668c9fc808af9c8f72dfaab765ae760d2877ba0467df7e59c110da184453dfe327d7706e84b79493253887b87325865e754 WHIRLPOOL 2f9c8033eb88445f70a06cd7efebb7aa3d2ee31b41906d09701ef8e7e3326174800c2ec20e221320013fa5c502fc5e13c229764f48636fe99b64f8e55c7a31ae
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160720.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160720.ebuild
new file mode 100644
index 0000000..644f0cb
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160720.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2016 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/2016-07-20_00-02-33/zip/netbeans-trunk-nightly-201607200002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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
+	dev-java/jsr181:0"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	>=dev-java/junit-4.4:4
+	dev-java/tomcat-servlet-api:2.3"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}
+	>=dev-java/antlr-2.7.7-r7:0
+	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-r16-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-r16-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 --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="${D}"/${INSTALL_DIR}/modules/ext
+	pushd "${instdir}" >/dev/null || die
+	rm commons-fileupload-1.3.jar && java-pkg_jar-from --into "${instdir}" commons-fileupload commons-fileupload.jar commons-fileupload-1.3.jar
+	rm jsr88javax.jar && java-pkg_jar-from --into "${instdir}" glassfish-deployment-api-1.2 glassfish-deployment-api.jar jsr88javax.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/aws-sdk
+	pushd "${instdir}" >/dev/null || die
+	rm commons-codec-1.3.jar && java-pkg_jar-from --into "${instdir}" commons-codec commons-codec.jar commons-codec-1.3.jar
+	rm commons-logging-1.1.1.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar commons-logging-1.1.1.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/javaee7-endorsed
+	pushd "${instdir}" >/dev/null || die
+	rm jsr181-api.jar && java-pkg_jar-from --into "${instdir}" jsr181 jsr181.jar jsr181-api.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jersey2/ext
+	pushd "${instdir}" >/dev/null || die
+	rm cglib-2.2.0-b21.jar && java-pkg_jar-from --into "${instdir}" cglib-3 cglib.jar cglib-2.2.0-b21.jar
+	rm guava-14.0.1.jar && java-pkg_jar-from --into "${instdir}" guava-14 guava.jar guava-14.0.1.jar
+	rm org.osgi.core-4.2.0.jar && java-pkg_jar-from --into "${instdir}" osgi-core-api osgi-core-api.jar org.osgi.core-4.2.0.jar
+	rm persistence-api-1.0.jar && java-pkg_jar-from --into "${instdir}" glassfish-persistence glassfish-persistence.jar persistence-api-1.0.jar
+	rm validation-api-1.1.0.Final.jar && java-pkg_jar-from --into "${instdir}" validation-api-1.0 validation-api.jar validation-api-1.1.0.Final.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jsf-1_2
+	pushd "${instdir}" >/dev/null || die
+	rm commons-beanutils.jar && java-pkg_jar-from --into "${instdir}" commons-beanutils-1.7 commons-beanutils.jar
+	rm commons-collections.jar && java-pkg_jar-from --into "${instdir}" commons-collections commons-collections.jar
+	rm commons-digester.jar && java-pkg_jar-from --into "${instdir}" commons-digester commons-digester.jar
+	rm commons-logging.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/struts
+	pushd "${instdir}" >/dev/null || die
+	rm antlr-2.7.2.jar && java-pkg_jar-from --into "${instdir}" antlr antlr.jar antlr-2.7.2.jar
+	rm bsf-2.3.0.jar && java-pkg_jar-from --into "${instdir}" bsf-2.3 bsf.jar bsf-2.3.0.jar
+	rm commons-beanutils-1.8.0.jar && java-pkg_jar-from --into "${instdir}" commons-beanutils-1.7 commons-beanutils.jar commons-beanutils-1.8.0.jar
+	rm commons-digester-1.8.jar && java-pkg_jar-from --into "${instdir}" commons-digester commons-digester.jar commons-digester-1.8.jar
+	rm commons-fileupload-1.1.1.jar && java-pkg_jar-from --into "${instdir}" commons-fileupload commons-fileupload.jar commons-fileupload-1.1.1.jar
+	rm commons-io-1.1.jar && java-pkg_jar-from --into "${instdir}" commons-io-1 commons-io.jar commons-io-1.1.jar
+	rm commons-logging-1.0.4.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar commons-logging-1.0.4.jar
+	rm commons-validator-1.3.1.jar && java-pkg_jar-from --into "${instdir}" commons-validator commons-validator.jar commons-validator-1.3.1.jar
+	rm oro-2.0.8.jar && java-pkg_jar-from --into "${instdir}" jakarta-oro-2.0 jakarta-oro.jar oro-2.0.8.jar
+	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 79521d9..7a19018 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570
 DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
 DIST netbeans-trunk-nightly-201607190002-src.zip 216613749 SHA256 412763dc00b1c15d23dd85c94de76503155ad6f402ddb2fb6fc40bd162e72de9 SHA512 37efb5947aeeecf1567fed864a28a907f261a7c251ad4de882660980c76248560da9f0be91dc6763767ed8aea7f57a68c1a403d429fbe4c1af5e3f27c0f85d45 WHIRLPOOL 27edad2d71b76784b0fba98bc15b4649616e1462edc174dc850bbe1782d341efd704115d1af5c8cfc56faa14d37d294dc1ce831118a4bb9e74e48add3a341062
+DIST netbeans-trunk-nightly-201607200002-src.zip 216623678 SHA256 08e39cc20bb2eff32d9298541073e9dfebdabfd0878d00f88bb6f896632783a5 SHA512 f3796b3548b714b4207cff52c0e5516dec1e23f176dadb13ee5d4dfe44014bd0692f1f8019569e68e50cdf33905cd0d3623bd01f12a69cf1c7dedf452f289e23 WHIRLPOOL fbbeb6bb0331e2c60fb546394dba8c8e0d2a54e9c807b6c9b30f256f68e8ce9039c558800821d5f38bc8d2428d1f3732c4160d53fc075f1ecc57113776491cf8
 EBUILD netbeans-ergonomics-8.0.2.ebuild 2843 SHA256 f9262f6ee7f2aed1fab9bf4cf756f565272e9894afa50b349735e39961e7acc3 SHA512 f158c27640541f7aef31da050e0811c07a251ae4797cc663b95a074a47eaf9d6bb7a9aa11ba38ea55e75c185f7dba74629ba6716a819e8ad68eb3db9ada71451 WHIRLPOOL 4fe9634fb673fb05dbba25996efc3a212ef3bb23ab6e7c732cb75de076feb930735e3901806fd9c801abc7ee8aa8eb800718065325d415371255a886474061d4
 EBUILD netbeans-ergonomics-8.1.ebuild 2867 SHA256 6d2c0b7221d47b64c77b243c8c5232c6d8c24d3199eae5799adafeac609b2e2a SHA512 6302c8c13d43ec51048e8b0439916746a01bb67f14e7cd21be95b4179df6106dcff1d3973b9191f7a36cf6f29d53b1d2308864f5f64d9f87f980ea264b1a97c0 WHIRLPOOL 63ceaad04323d9085dfb90d1e5075ad13f6e14e8991b13aafaf3fc174440152054f32498ac8d03f57917744887db3bc1efdfc30b473b8d1a33b514ec4960ea6f
 EBUILD netbeans-ergonomics-9999_p20160619.ebuild 2913 SHA256 895a2f0d66ca9fc0fd9e034320052d8b58e6148d87a43bd347f2ca26d38c522a SHA512 372439cb2f326dd38e8dda1692ade104628b4735e3a3b5d07736afb6ad701e37c8d6f322a4ca9dea70573ef4cba01a5f020a8f9e27447f682fed15481e6c9173 WHIRLPOOL a79e80bfac86cd7c1b102a50d67a27c99818e0abe65783243e8bf7e74d6ed38116fb1ed9301cbb5f4948e204f01ce3031e7bee4046e0637a87e16a684ce2a640
@@ -55,4 +56,5 @@ EBUILD netbeans-ergonomics-9999_p20160716.ebuild 2913 SHA256 f85c5186e583a6ed686
 EBUILD netbeans-ergonomics-9999_p20160717.ebuild 2913 SHA256 ae66c3fbb8da6a7dcaeeb397b54aae6a4b8abb8f5fde2ae34812b8551e2a28cd SHA512 4ba19510bcbe55baa0464d79b0ed3f52b6561c1d186eaab51f4ebf3291d3f5485684e14ad580a9e2fe931bf38c3cd9a5fd23d88d5b7cb03387a71cf146be2ca8 WHIRLPOOL 2c6c24750c6b8661c876b683809af4075739738c3104be7287ec6d1f738da0aba23d74b0d49641f42308d702a23ce6535d6e5183ee3f58e2bfe5804fb7808b4f
 EBUILD netbeans-ergonomics-9999_p20160718.ebuild 2913 SHA256 32f0ca7b8419bee9bfab9717309fcf88a656a66d62c3059d3c167aa99fabcd1e SHA512 91af39c0e9418ad4e2eaceb88529e7b3e1dce7bccf825a6e7f2c32b158698ed95bccc38d4c100f8c647798dd1e9d94ae18ff6a82a233dfa707a905d5e40d255c WHIRLPOOL dfacad331cbf414d39be119594d3e9f31d8578d8df2e3b83b2d4fd7964f3bf0ed6df1f358cefe5ec988d0a16b64a3654acb14fa5ce8b8ef06bddad27a7117fc1
 EBUILD netbeans-ergonomics-9999_p20160719.ebuild 2913 SHA256 9cb732fefd5483356ead9c2fd14b685c64bcbda5ad2f83683db4f31f2e0f820f SHA512 bb3baa9a4515450e0c146360e8fb252d0064cf5064960e4aa52531b0b010afec4e1b6642fc50c6a81ed7e80a82ce70ead4b63357b92bfee30e4a1e25d8dcc0e9 WHIRLPOOL 8eb0e59f3b238c05d2e3de1961d0ff192b85948e5e37c2667bfeff0ecb87d407dac43033e2a359348d859fa23729e6cc039741708dd3922d22a67e9ecbee6223
+EBUILD netbeans-ergonomics-9999_p20160720.ebuild 2913 SHA256 5eea037b15c4b0c5ae710c13e2174d46336fb00eae9a8c19ceb9a26a8ea29d5b SHA512 a04ab8004de87ab65b616f5fe2ed22913e48b299eb5c3f3c1e2e1690c349e00037b53fbab4a7a2a1490eab141b1ed2aa55f1b97b559250f7c1c930dccb113e07 WHIRLPOOL 3608b01b47a42a54026aa2f824a54b16f89c9051a2d309676f60dd7ee42bb6d4e55d6967a1a25cfb7aaf0b7a0519627146b68c5d978ab482c2af471038bc6545
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160720.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160720.ebuild
new file mode 100644
index 0000000..2268c1f
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160720.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2016 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/2016-07-20_00-02-33/zip/netbeans-trunk-nightly-201607200002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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-r16-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-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 432823f..39fcf46 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -32,6 +32,7 @@ DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570
 DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
 DIST netbeans-trunk-nightly-201607190002-src.zip 216613749 SHA256 412763dc00b1c15d23dd85c94de76503155ad6f402ddb2fb6fc40bd162e72de9 SHA512 37efb5947aeeecf1567fed864a28a907f261a7c251ad4de882660980c76248560da9f0be91dc6763767ed8aea7f57a68c1a403d429fbe4c1af5e3f27c0f85d45 WHIRLPOOL 27edad2d71b76784b0fba98bc15b4649616e1462edc174dc850bbe1782d341efd704115d1af5c8cfc56faa14d37d294dc1ce831118a4bb9e74e48add3a341062
+DIST netbeans-trunk-nightly-201607200002-src.zip 216623678 SHA256 08e39cc20bb2eff32d9298541073e9dfebdabfd0878d00f88bb6f896632783a5 SHA512 f3796b3548b714b4207cff52c0e5516dec1e23f176dadb13ee5d4dfe44014bd0692f1f8019569e68e50cdf33905cd0d3623bd01f12a69cf1c7dedf452f289e23 WHIRLPOOL fbbeb6bb0331e2c60fb546394dba8c8e0d2a54e9c807b6c9b30f256f68e8ce9039c558800821d5f38bc8d2428d1f3732c4160d53fc075f1ecc57113776491cf8
 EBUILD netbeans-extide-8.0.2.ebuild 3307 SHA256 084e952eae1708b0fab785fd34313985e864dbc74a8531a0d5cdcf906e88f85a SHA512 ade8dc37aa932d7ec20966199e521311716061c23df08d02635f78efd2776f1d7bf040b0f9c9488b947bbbdfb3e33fa764723e3dfffa2214892bc6d685428f6f WHIRLPOOL ad2c26b005675ebca7d902ff1e6caa28552f3fda6795e327cc3584cf109f0ad6efad6516e15af5e70d689be236298b0948003e09a3da4991b3e29a1c85607b2f
 EBUILD netbeans-extide-8.1.ebuild 3331 SHA256 7d81adb3cba102e13678052bfe288e8417753ebceb69f69ce528ede3fedcef04 SHA512 ae445552036799069f31b40c145879ac55cf0964e168f328ac84f2d434171de8c4848e3416ad7425563e8565c09f798c9520bb3cb7511348f5d6a7522b878e40 WHIRLPOOL 44142233d4d3047ebb5c152992b484e5fef1fddd04cf274cc370f00beece5a75a986e5fadedd4bc18a01559c4f6cb58289cefbfc24d8d098d70056707e8b8f57
 EBUILD netbeans-extide-9999_p20160619.ebuild 3377 SHA256 8218ece1f0dfc76088617f60dc1389b5833dd952901a3d4796cbfe9439834395 SHA512 a5773c99fc8a3546ed2a080f2342503a4bc2ba985b9a1ec549cd126da4df72cd0b8ec7c7b436caf1dd5e7306a5a4897943b2545305aea183426e551dac61e302 WHIRLPOOL 1ac9f80566d306ed1df60833007ac3c6bc1c46283aa3532b43e16553d0ec0a6287bbeb582a9ac014001985683656d292717b11fafc1b79b0942b0c18978ba4f4
@@ -59,4 +60,5 @@ EBUILD netbeans-extide-9999_p20160716.ebuild 3377 SHA256 6b03c3caa06d985643574bd
 EBUILD netbeans-extide-9999_p20160717.ebuild 3377 SHA256 ab26b07b05a58b23549b5087c7894145d409a3d7e77776fb402d3edf1a7c2210 SHA512 610627b5f47b2da7fbf073c0073156d038db0c62697e2cb385cacce0563f9f872b91fa56bbc1ec7bf9a439e3fc0ffa7db3a524e335ad8732aa97554174e13071 WHIRLPOOL 05b1cc8602f17e3becdff52d2afcacd2b3156b9fe1294012b671b51d566467c2970a93c33bca0f793a52d04e12526ca4be56832e318321f47a3f8c5277622017
 EBUILD netbeans-extide-9999_p20160718.ebuild 3377 SHA256 ffc49c7dd3ac8fdeacdc662e39255435e6ae8c565d9f6ad2f5ef23f823eafc8e SHA512 a1a58d086327277daf40593dbbaf78753d3eb20148c729647bc1262047e007790e2908a66399f0dd696519b19b3528178628bb5a628e7519d49e644309a18e17 WHIRLPOOL aba437852a1bbd5330502807173be09c30ae011e49075b3b56caf8dc30a449272c699baa8c0d35fe057b519d3f642b471bc20ace76db66ef14d6987b4ce5bd1e
 EBUILD netbeans-extide-9999_p20160719.ebuild 3377 SHA256 ad1335c8865b44e9b1b9e3d11cd7fd6683fcc3d0daf737296d2ccc52e4f5ddc3 SHA512 3832ad37b91456f28b5db727cfb9e6973522dc418cf2dcb94ee3e1af6a40dff7418e7b2554da0411723c76c338e97e8d469056a49363b309c36e918b1e75a724 WHIRLPOOL 24c886bd85ac541640da0fae1bf7b1c8b5cb5b1e08f6c98f62b31b8ba78f41608cac0bd18e9f8e268f04beba505338a6f3cd7bd11cbafcd34022ff5b5c084343
+EBUILD netbeans-extide-9999_p20160720.ebuild 3377 SHA256 b062748a0a1228518cccda42fba068adcffb90a36ebf7adea8adf1102e75c79d SHA512 c3587fadb74b07b1d489b7cbdb75e7cbd303f1c7cbf22e18e798ab1b7625253087c201c15b9f93b3b06485ad7c063edecec29145b3d2f9c751cbe6f9dbd0e4af WHIRLPOOL 3227f0e6b96a618c7dac79c4829a730eae794471f7e0b690a0b473099cbbb2ffdb5a94ea4c0322130cdb2282b7e8e30822d8f12930f719f411f1849f55b01921
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160720.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160720.ebuild
new file mode 100644
index 0000000..8880ea7
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20160720.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2016 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/2016-07-20_00-02-33/zip/netbeans-trunk-nightly-201607200002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip
+	http://hg.netbeans.org/binaries/545E2B7AB1BD579CC76E3836055877982C5CD0C6-ant-misc-1.9.7.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-r16-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip o.apache.tools.ant.module/external/ant-libs-1.9.7.zip || die
+	ln -s "${DISTDIR}"/545E2B7AB1BD579CC76E3836055877982C5CD0C6-ant-misc-1.9.7.zip o.apache.tools.ant.module/external/ant-misc-1.9.7.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-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 d345cfe..a6cdc70 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570
 DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
 DIST netbeans-trunk-nightly-201607190002-src.zip 216613749 SHA256 412763dc00b1c15d23dd85c94de76503155ad6f402ddb2fb6fc40bd162e72de9 SHA512 37efb5947aeeecf1567fed864a28a907f261a7c251ad4de882660980c76248560da9f0be91dc6763767ed8aea7f57a68c1a403d429fbe4c1af5e3f27c0f85d45 WHIRLPOOL 27edad2d71b76784b0fba98bc15b4649616e1462edc174dc850bbe1782d341efd704115d1af5c8cfc56faa14d37d294dc1ce831118a4bb9e74e48add3a341062
+DIST netbeans-trunk-nightly-201607200002-src.zip 216623678 SHA256 08e39cc20bb2eff32d9298541073e9dfebdabfd0878d00f88bb6f896632783a5 SHA512 f3796b3548b714b4207cff52c0e5516dec1e23f176dadb13ee5d4dfe44014bd0692f1f8019569e68e50cdf33905cd0d3623bd01f12a69cf1c7dedf452f289e23 WHIRLPOOL fbbeb6bb0331e2c60fb546394dba8c8e0d2a54e9c807b6c9b30f256f68e8ce9039c558800821d5f38bc8d2428d1f3732c4160d53fc075f1ecc57113776491cf8
 EBUILD netbeans-groovy-8.0.2.ebuild 3346 SHA256 907e6cd11c222f15c826494b44929483803f0e4249de0d54db51e6855b574148 SHA512 8bb37121e7e32621959318d109b1d982e2c705a9deb7171f5fef1dcaed55fc5718b0bc9e6bbb2592cdaa5e96d874bb6e6bfa96d06fe09f14d5250c1485eb1da5 WHIRLPOOL d5e09fa1e975835f05c6132c091fee4ae9fc9dd671af9f5f88a9195d5cd4a93804f96687ed3f2bd741117fa65773f2c464b3cfd6697425039cc51a940efa2a31
 EBUILD netbeans-groovy-8.1.ebuild 3370 SHA256 ca32569d438060704e4d5d5e46be2ebf20bffdb0ae2471d8718ada8676f32082 SHA512 40555d2ffa0ddab1e55ca514eddbd98c6e721caa230cd174050fb56f144def46f389b0ac018068c9f509936c83235b2d3423cae8676db7c96e8782b0da73e4ad WHIRLPOOL 7b2b021581db21aa8ff90ea188ddeea0974ec84fdb064cf367a56a6fa53487affe89edb1880a83934a2cf0c586060a9192838687ffebf33b55e79d9ddc7ac986
 EBUILD netbeans-groovy-9999_p20160619.ebuild 3416 SHA256 b99f21addf291e4d4e197d424f37322f16ea656df1b39cb1d435a0f224d0d698 SHA512 a2a68139e97d1cb61f0996b63daae1d7ac74039c06d2a287085f66bcd73a16b0b0e745abce478b7f49f8b3146ec7dd9aca1cd44c17ad84e35770a0fb2dab6bc4 WHIRLPOOL 71519ff4e6e6fc14c760c753948294eaf201e5bf67918629cd51293367ede03f62f30dcf86386eefdf0ca8d29ae773656ee27d60f2b0b707dda111e745dcfdd4
@@ -57,4 +58,5 @@ EBUILD netbeans-groovy-9999_p20160716.ebuild 3416 SHA256 6e5767c909aeba1ce22a278
 EBUILD netbeans-groovy-9999_p20160717.ebuild 3416 SHA256 7b05aa2637a21e64889dabeac2149951db5779a4efe21df2b06d21ba84c514d2 SHA512 dba6e3b94b813c476cfd2976a840207d8472c78a70d8c9f6cf677e8d3c9d9f30b687a04d84239bbe61b05ce76b4cb2cdf12d0fdf6c6ae0f7d3e83e37786b15de WHIRLPOOL c81b0b1ddf9bf155003d0151d1a8ec63b7423694238e0a848c3d0016e1ee5dd44a2dc9f82a3eb74d39ac59ce5b8631254464b98e4b9e4b3e8f180297534e1446
 EBUILD netbeans-groovy-9999_p20160718.ebuild 3416 SHA256 9daed92e913019b7499bd9efdd6b2a4ae49baaa4b17ff41a6a7102832aadd438 SHA512 7487949ae8209a0471418ab2bbeeb25d7385ef03ebe86842483ba7dd387a5811d96c1085a8e5f598d70ada57277b37b7b76d9e2a2b5f13fe1b551c04be780220 WHIRLPOOL 5bd6715eeaa05ef4db0bee0f46c9ab8f0b02e70721af572fa234bacc23182d33d586246b25abae1b002ced01fdc9079847b5cc296b1c594283754ba691e74dc9
 EBUILD netbeans-groovy-9999_p20160719.ebuild 3416 SHA256 9fdbfc1257fb7a88a0d4a6c6534c283e2c2ef74d87efc7f8d1ccca3e7ee7bed1 SHA512 44e4d4b11680dc058e2a47aa973e78f95cbdab0c1880c5f6e1385b748918883c332c0e742e4675d78c1136a1b5c9455e65ca5d3170ee89f06d2acff66e5b9dab WHIRLPOOL d7e87a51a80d3879013a025ab6768e885eae6836a266be15aad54eafb6a0ff97814db5db98b5579f28bf1e46c2245b6f2410a7dcccc4317e5065ba183355ef96
+EBUILD netbeans-groovy-9999_p20160720.ebuild 3416 SHA256 dd59827c8836288e852259b6d0a55c73f1d7077f42de330fb76da8144fc2d5a8 SHA512 c743a97d6491e204318caf9f83e24386fcd2f60eea0adbbaf56d58335a16ba1325357e220dfa5f1e1dd07f14c56639feaac515b33acd5f0c1e9534c34bfa37d0 WHIRLPOOL 046ce82ead2ae38af4ff632e2650441c38d042c070bccf71aa3a51c254d95443eab1cf44ee9b51333069e12d4afd00bc4679c1a94c99f981309b6c7c9a44cee7
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160720.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160720.ebuild
new file mode 100644
index 0000000..f54c6d7
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160720.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2016 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/2016-07-20_00-02-33/zip/netbeans-trunk-nightly-201607200002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/01730F61E9C9E59FD1B814371265334D7BE0B8D2-groovy-all-2.4.5.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-r16-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/01730F61E9C9E59FD1B814371265334D7BE0B8D2-groovy-all-2.4.5.jar libs.groovy/external/groovy-all-2.4.5.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-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 f057435..d412720 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570
 DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
 DIST netbeans-trunk-nightly-201607190002-src.zip 216613749 SHA256 412763dc00b1c15d23dd85c94de76503155ad6f402ddb2fb6fc40bd162e72de9 SHA512 37efb5947aeeecf1567fed864a28a907f261a7c251ad4de882660980c76248560da9f0be91dc6763767ed8aea7f57a68c1a403d429fbe4c1af5e3f27c0f85d45 WHIRLPOOL 27edad2d71b76784b0fba98bc15b4649616e1462edc174dc850bbe1782d341efd704115d1af5c8cfc56faa14d37d294dc1ce831118a4bb9e74e48add3a341062
+DIST netbeans-trunk-nightly-201607200002-src.zip 216623678 SHA256 08e39cc20bb2eff32d9298541073e9dfebdabfd0878d00f88bb6f896632783a5 SHA512 f3796b3548b714b4207cff52c0e5516dec1e23f176dadb13ee5d4dfe44014bd0692f1f8019569e68e50cdf33905cd0d3623bd01f12a69cf1c7dedf452f289e23 WHIRLPOOL fbbeb6bb0331e2c60fb546394dba8c8e0d2a54e9c807b6c9b30f256f68e8ce9039c558800821d5f38bc8d2428d1f3732c4160d53fc075f1ecc57113776491cf8
 EBUILD netbeans-harness-8.0.2.ebuild 4055 SHA256 2674d562adc57648c82cac9f714f74f9d29dd7b7ff7fa7f0ef37c43ef0975489 SHA512 7d72bed5b955b2365a4c11fcd97a2d6f2372ab939fb9a03b3ff7915053f24d695373c1aa154f6e6916d37ef3ace7b38864d575419460382760500576dae52e49 WHIRLPOOL 72f54a6cb83f282a75f0abb073109414a7b8bcd4e9263466281e68ff34148a7343ed3bd78ebdc8afd109b6b9f5b9f15bfd0e250f418fcaa4986a7c886b57b9f6
 EBUILD netbeans-harness-8.1.ebuild 4079 SHA256 116b90d6e6fd1b1ad8ce99c81104262a416a485b3a3110beed70e9381333cec2 SHA512 77ca4bbaf078adf6e13c0fea0a8e673262aaed60dd799ec161584589fb4c791d9bd758c87f4272297d863d3992b54a66b77b7bf05135cada530d111e1c428e68 WHIRLPOOL d385cd6292f31a5817a2c096f960330186a68242b51ed26e4272f33a690a98175e0b622a5d5309e1e6a72ff824662964785b7d235cf3a73ba4d715cd19e89dbb
 EBUILD netbeans-harness-9999_p20160619.ebuild 4126 SHA256 fa85ceff556cf477ff9e03abaa0efa3914a4999fed15849b2566d2049091b68d SHA512 acd36f4e9d684e03f1fe4fd36a054dadd58d75e209a619d3fcbc422f4029a8558d48a67a73af1748010e55d8e9ebca7a74b57b3f42e3008ed3279acd20c1e5af WHIRLPOOL 7f680cd3a1113af287495b71fcb09099476d787527b0ec73a8e40b823c520c6dfb5151442b93a6fcf143b8b07df7e03c0baa86cfdbcf012658f7821c43331793
@@ -60,4 +61,5 @@ EBUILD netbeans-harness-9999_p20160716.ebuild 4126 SHA256 f28c3517705795aed249b1
 EBUILD netbeans-harness-9999_p20160717.ebuild 4126 SHA256 bf0875a3b8dc58b69add80c569c93d9a68864f258cf54ff2b0680b5871fb1e38 SHA512 1546e99ed7f9e5d4a1af1d921b6f63664ea35c7c61baffc598ba0c851429f5d61776b055acc89c018de262ad0f703ad5d12d2a052e65e8c2b3b64d55907bb681 WHIRLPOOL 0188144a6491042dcc31a57ad31e5547f4adab74ef032c1922405384b32b536b5fd0c54ca6b3171824e7c5f8b312c4cde63e120fc519a7aaca76925a63fd7639
 EBUILD netbeans-harness-9999_p20160718.ebuild 4126 SHA256 8400b79625bf5c8e64d1823c2ae120929e6062bff1071a14b7eeffb5463f0932 SHA512 be2d7ebb929506c00c6e100bf927dfdbbc51418fde77b34cb17a06fa73daba788ee8ee1cde72727241e5aa1f44856230bc16ec161e1169cd351b7187ac6e8015 WHIRLPOOL 3a9a4f947e1712f0bb6fd3a125bc2c05eda7628073902ad3c17499eec0a3b659e38ac94bf47ffee0e3db71dca003ae167d7352444050cb855d98b7856dde4cc0
 EBUILD netbeans-harness-9999_p20160719.ebuild 4126 SHA256 11ccc50937fbd8b4ed084e6064dcf2d82727a948a62caf97f0317f0364203865 SHA512 5469dab736a0e23e4b36857ca14d4c57af0c3a6b604a1af3e0656c6e6179d68f4ff39ecd1f52961763a3078f862ffa1215a81a7c31e4de92dc005f32292da6a0 WHIRLPOOL a845885b3943e65c2f82aadeefbbf22fc564220f2e138a652f502a765dc0467093995a3fdcd7d220cc935d0734770a3ddb5eda998630783844f93f391411f8a3
+EBUILD netbeans-harness-9999_p20160720.ebuild 4126 SHA256 61dd9a7ebd9e1b46a9f81b81198987e569bafd49e3503943b079bf1b688b9974 SHA512 8eb54ca9d00789af0fabadb66435c8fd442f511bedd333afd61adbab40ff219d2eaba398ed8837bc7f8d0f21ccabefde73e0c0df93014aeac883fa75502dcd7d WHIRLPOOL 5a09b1c6406dde7fb7c8d20534d2af0e2bc9d9c78f2474e8b955fd5e036cdeb55a8ec106f8746ba3ec5e3b8b7bf7363e3837aafa2e0e56701b64d81832de564f
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160720.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160720.ebuild
new file mode 100644
index 0000000..a0efd87
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20160720.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2016 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/2016-07-20_00-02-33/zip/netbeans-trunk-nightly-201607200002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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-r16-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-r16-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="${D}"/${INSTALL_DIR}/antlib
+	pushd "${instdir}" >/dev/null || die
+	rm jsearch-2.0_05.jar && java-pkg_jar-from --into "${instdir}" javahelp jsearch.jar jsearch-2.0_05.jar
+	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 213ccf9..3c9753d 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -167,6 +167,7 @@ DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570
 DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
 DIST netbeans-trunk-nightly-201607190002-src.zip 216613749 SHA256 412763dc00b1c15d23dd85c94de76503155ad6f402ddb2fb6fc40bd162e72de9 SHA512 37efb5947aeeecf1567fed864a28a907f261a7c251ad4de882660980c76248560da9f0be91dc6763767ed8aea7f57a68c1a403d429fbe4c1af5e3f27c0f85d45 WHIRLPOOL 27edad2d71b76784b0fba98bc15b4649616e1462edc174dc850bbe1782d341efd704115d1af5c8cfc56faa14d37d294dc1ce831118a4bb9e74e48add3a341062
+DIST netbeans-trunk-nightly-201607200002-src.zip 216623678 SHA256 08e39cc20bb2eff32d9298541073e9dfebdabfd0878d00f88bb6f896632783a5 SHA512 f3796b3548b714b4207cff52c0e5516dec1e23f176dadb13ee5d4dfe44014bd0692f1f8019569e68e50cdf33905cd0d3623bd01f12a69cf1c7dedf452f289e23 WHIRLPOOL fbbeb6bb0331e2c60fb546394dba8c8e0d2a54e9c807b6c9b30f256f68e8ce9039c558800821d5f38bc8d2428d1f3732c4160d53fc075f1ecc57113776491cf8
 EBUILD netbeans-ide-8.0.2-r2.ebuild 29330 SHA256 4822cbe26fc19685164c35d69e75bc20578ca8a5ce3394fe97bde6acc721fd2d SHA512 552f35cb1aa5429beb70c72a0cd2a3aa3a006f5870ec4084e88632a39e2ccdc05d0b2b15a87f26c72cdffb3c9a6fa0a124a8d501edeef9aa9580396922071e8d WHIRLPOOL 4c9bce3ca21d5ae61ef9392b9282c2dff9de7f82f2e83d2944a2906ca2180ef0ffab59489bdbb6afc7ba88d5143d77b47a0cf6b219a5a4d385b68afcacd3fe6d
 EBUILD netbeans-ide-8.1-r2.ebuild 30301 SHA256 892f20531352d85b5b72b1c85352eefa444917b515b0b564f04c4f91d1e654f9 SHA512 50af4873fd3ea7755b0d33b086be7e07766b6c009a46ec3954a67a1da9930378bcf9da6d18b7e60078b31af4b36ccf060f22378a8ef26b3829ccf30a529dd023 WHIRLPOOL 1024af16e7cae7f4728dd37f88031be33253b7c62548a095d3e827abeccb6c183d34ce312bd1a0f808f0d107aff217e4b81b7a17eecc6842e1d914d7061df2c9
 EBUILD netbeans-ide-9999_p20160619.ebuild 29867 SHA256 72ddc326ea660a16eab2730a23e574c7299e7c950400b03d88b67f9112a80fae SHA512 28b30a234da4b930cd64b3fe7c94cdad5ba5f0c60aef4b4824fd13b2acf67b96473502e619b191ad1f7860b4249efe85518f19db0a19e06c6d526f227ea031db WHIRLPOOL e08860541343c964a569b0b4a53f657b476cbb693ddf6ad34f74878f500fbfae58cabc626c4b1eb389c2fee7d08eb6c0cd19bcaed7ca2fa48ce2cba1550bcae2
@@ -194,4 +195,5 @@ EBUILD netbeans-ide-9999_p20160716.ebuild 29867 SHA256 17cf83fecba626caf6dd00392
 EBUILD netbeans-ide-9999_p20160717.ebuild 29867 SHA256 b8427180790446c73c44eeed52e0dd98ffceb675af44dd22585af7dc5b3a5aef SHA512 5ad67cf2c97070e7180cee5fbf80066de0afafd41b495ce89660dffddd22db6af1e28f8835f16fffe194ede13305689ebe2d53ebc588be8352316484ed99f0e4 WHIRLPOOL 4fa7d59bd7bbace808896dd21db6e7ebdc0284d6df7e9ded76cde17bc01c4b98fd07ad24628e4cc51dcfc46b889e1b04e1ce7a20532310ea83f26f5e46d9e1ca
 EBUILD netbeans-ide-9999_p20160718.ebuild 29867 SHA256 13efa12ef84fd94cc662d80182f32bf510ba572421416137090ee1443d1cca33 SHA512 eef604c63f2ad53d36ecd1f123714cca30f6790ee386c43c6e4ffda8bd184ee6288e75eca4aa3644ec2b31b9706ae3035c421d384a35c9e65083242d6265fc99 WHIRLPOOL c828d4a89504789328b3bffc93a5c4237d709db7a09cc5bd78ace311fd20eedcd26853bac3d01a4405d8e3bfcdc6ade4aeeed7ab70a5e3f440d58a5bd86ea6b4
 EBUILD netbeans-ide-9999_p20160719.ebuild 29867 SHA256 f90b8f22c281695cec6443712a6d83906127c544934bee87941d1a4515ebf8e0 SHA512 ccfa574fc5c69f11d1f811a03e8ef2da175649ac7196d4bea837b3c061b95f83c48a8ad4277c7a61c85c774831945ae75b45cb736a9ca3c3f777aebd94addb4b WHIRLPOOL 275937f9a4a1a31b995d49b5703ac43582cb8088e348e269cc73783923e5a5313e30891d5ad028add43529be170ae4f0a8ea2b4370f7b4580dff89c9af946f4d
+EBUILD netbeans-ide-9999_p20160720.ebuild 29867 SHA256 6ad09e0ecb1106691f533a6afbd3933154ae477974a046c1e26963127d4137a1 SHA512 b990922493ad6bf2f95b4c5b8c0cabdeebcae90e3ed352c0f9cdae436720176136e89315ca628ee0c575b7eefcf7d8e8cf57c0fed16a5e9077b9d0df7d7be32b WHIRLPOOL 313745c1e95abd332b8a0a605edeb35dd99b22989cf86fca12c9d0827a53fd90c04b243f25a659579d2750ab95a5b94e08ad6638882ef3373399a522c9cacafb
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160720.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160720.ebuild
new file mode 100644
index 0000000..e39370b
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20160720.ebuild
@@ -0,0 +1,374 @@
+# Copyright 1999-2016 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/2016-07-20_00-02-33/zip/netbeans-trunk-nightly-201607200002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
+	http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
+	http://hg.netbeans.org/binaries/DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8-com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar
+	http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar
+	http://hg.netbeans.org/binaries/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.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/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar
+	http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
+	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/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/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/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar
+	http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
+	http://hg.netbeans.org/binaries/AA2671239EBB762FEEE8B908E9F35473A72AFE1B-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar
+	http://hg.netbeans.org/binaries/1605B38BB28EAE32C11EAB8F9E238A497754A5B8-org.eclipse.core.jobs-3.5.101_nosignature.jar
+	http://hg.netbeans.org/binaries/20800206EB8B490F3CE5BB8AC8A7C3B9E8004A30-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar
+	http://hg.netbeans.org/binaries/D2D2105B1E3C9E2FA6240AD088237A57590DDA8D-org.eclipse.core.runtime-3.7.0_nosignature.jar
+	http://hg.netbeans.org/binaries/16507EAFDC2B95121AA718895BDB54D616EE4B0F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar
+	http://hg.netbeans.org/binaries/BD55836AABD558DC643A7844B78866AD990544BC-org.eclipse.equinox.app-1.3.100_nosignature.jar
+	http://hg.netbeans.org/binaries/4EE275AE73A140A403903D7E4DBA68C8FBB07001-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar
+	http://hg.netbeans.org/binaries/B7001D9CC2E2AC4E167D22A13063F0350C71AAA9-org.eclipse.equinox.preferences-3.4.2_nosignature.jar
+	http://hg.netbeans.org/binaries/C647079E36A4EB7A24AED2C545E4F0F94194C4D1-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar
+	http://hg.netbeans.org/binaries/9267CF311F979078211A70C1B19AF8A8EE71DC8E-org.eclipse.equinox.security-1.1.1_nosignature.jar
+	http://hg.netbeans.org/binaries/B580E446B543A8DD2F5AA368B07F9C4C9C2E7029-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar
+	http://hg.netbeans.org/binaries/244560B99152F3F9BC75DF2D6FAFA8A5216B06B6-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar
+	http://hg.netbeans.org/binaries/8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar
+	http://hg.netbeans.org/binaries/D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar
+	http://hg.netbeans.org/binaries/4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar
+	http://hg.netbeans.org/binaries/8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar
+	http://hg.netbeans.org/binaries/50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar
+	http://hg.netbeans.org/binaries/4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar
+	http://hg.netbeans.org/binaries/11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar
+	http://hg.netbeans.org/binaries/A3FEF6144ED1622E4CDD506B9D745527CC675D8D-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar
+	http://hg.netbeans.org/binaries/825DC870D1D423E347F4F8229A211A2C297BB15D-org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar
+	http://hg.netbeans.org/binaries/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar
+	http://hg.netbeans.org/binaries/17C0C8D6DEBF5EBE734881C131888D8088BD9E7D-org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar
+	http://hg.netbeans.org/binaries/6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar
+	http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar
+	http://hg.netbeans.org/binaries/DAAEFA7A5F3AF75FE4CDC86A1B5904C9F3B5BBF8-svnClientAdapter-javahl-1.10.12.jar
+	http://hg.netbeans.org/binaries/C47ED3BCD8CEAECDE3BDEEB7D8D14B577B26F9C8-svnClientAdapter-main-1.10.12.jar
+	http://hg.netbeans.org/binaries/AD4A88D99AB7C5B64C8893CA2FF2CBCFCEFC51C8-svnClientAdapter-svnkit-1.10.12.jar
+	http://hg.netbeans.org/binaries/5C47A97F05F761F190D87ED5FCBB08D1E05A7FB5-svnjavahl-1.9.3.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/15ACB06E2E3A70FC188782BA51369CA81ACFE860-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/antlr:4
+	dev-java/commons-compress:0
+	dev-java/commons-httpclient:3
+	dev-java/commons-logging:0
+	dev-java/icu4j:55
+	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/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/commons-lang:2.1 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/freemarker:2.3
+#	dev-java/guava:15 fails with "Missing manifest tag OpenIDE-Module"
+#	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/jzlib:0 fails with "Missing manifest tag OpenIDE-Module"
+#	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
+	dev-java/jna: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-r16-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}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die
+	ln -s "${DISTDIR}"/DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8-com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.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}"/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar o.apache.commons.lang/external/commons-lang-2.6.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}"/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar c.google.guava/external/guava-15.0.jar || die
+	ln -s "${DISTDIR}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || 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}"/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}"/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}"/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar c.jcraft.jzlib/external/jzlib-1.0.7.jar || die
+	ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.process/external/libpam4j-1.1.jar || die
+	ln -s "${DISTDIR}"/AA2671239EBB762FEEE8B908E9F35473A72AFE1B-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}"/1605B38BB28EAE32C11EAB8F9E238A497754A5B8-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}"/20800206EB8B490F3CE5BB8AC8A7C3B9E8004A30-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}"/D2D2105B1E3C9E2FA6240AD088237A57590DDA8D-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}"/16507EAFDC2B95121AA718895BDB54D616EE4B0F-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}"/BD55836AABD558DC643A7844B78866AD990544BC-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}"/4EE275AE73A140A403903D7E4DBA68C8FBB07001-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}"/B7001D9CC2E2AC4E167D22A13063F0350C71AAA9-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}"/C647079E36A4EB7A24AED2C545E4F0F94194C4D1-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}"/9267CF311F979078211A70C1B19AF8A8EE71DC8E-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}"/B580E446B543A8DD2F5AA368B07F9C4C9C2E7029-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}"/244560B99152F3F9BC75DF2D6FAFA8A5216B06B6-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}"/8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar || die
+	ln -s "${DISTDIR}"/D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar || die
+	ln -s "${DISTDIR}"/4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar || die
+	ln -s "${DISTDIR}"/8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar o.eclipse.mylyn.commons.repositories.core/external/org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar || die
+	ln -s "${DISTDIR}"/50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar || die
+	ln -s "${DISTDIR}"/4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar || die
+	ln -s "${DISTDIR}"/11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.confluence.core/external/org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar || die
+	ln -s "${DISTDIR}"/A3FEF6144ED1622E4CDD506B9D745527CC675D8D-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar || die
+	ln -s "${DISTDIR}"/825DC870D1D423E347F4F8229A211A2C297BB15D-org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.markdown.core/external/org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar || die
+	ln -s "${DISTDIR}"/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.textile.core/external/org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar || die
+	ln -s "${DISTDIR}"/17C0C8D6DEBF5EBE734881C131888D8088BD9E7D-org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar || die
+	ln -s "${DISTDIR}"/6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar extexecution.process/external/processtreekiller-1.0.7.jar || die
+	ln -s "${DISTDIR}"/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar libs.svnClientAdapter.svnkit/external/svnkit_1.7.8.r9538_v20130107_2001.jar || die
+	ln -s "${DISTDIR}"/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar o.apache.xml.resolver/external/resolver-1.2.jar || die
+	ln -s "${DISTDIR}"/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar libs.svnClientAdapter.svnkit/external/sqljet-1.1.10.jar || die
+	ln -s "${DISTDIR}"/DAAEFA7A5F3AF75FE4CDC86A1B5904C9F3B5BBF8-svnClientAdapter-javahl-1.10.12.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-javahl-1.10.12.jar || die
+	ln -s "${DISTDIR}"/C47ED3BCD8CEAECDE3BDEEB7D8D14B577B26F9C8-svnClientAdapter-main-1.10.12.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.10.12.jar || die
+	ln -s "${DISTDIR}"/AD4A88D99AB7C5B64C8893CA2FF2CBCFCEFC51C8-svnClientAdapter-svnkit-1.10.12.jar libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.10.12.jar || die
+	ln -s "${DISTDIR}"/5C47A97F05F761F190D87ED5FCBB08D1E05A7FB5-svnjavahl-1.9.3.jar libs.svnClientAdapter.javahl/external/svnjavahl-1.9.3.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}"/15ACB06E2E3A70FC188782BA51369CA81ACFE860-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-r16-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 c.jcraft.jsch/external jsch jsch.jar jsch-0.1.53.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-55 icu4j.jar icu4j-4_4_2.jar
+	java-pkg_jar-from --into html.validation/external iso-relax iso-relax.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 --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.antlr4.runtime/external antlr-4 antlr-runtime.jar antlr-runtime-4.5.3.jar
+	java-pkg_jar-from --into libs.commons_compress/external commons-compress commons-compress.jar commons-compress-1.8.1.jar
+	# java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.19.jar
+	java-pkg_jar-from --build-only --into libs.jna/external jna jna.jar jna-4.2.2.jar
+	java-pkg_jar-from --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.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.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
+
+	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-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="${D}"/${INSTALL_DIR}/modules
+	pushd "${instdir}" >/dev/null || die
+	rm com-jcraft-jsch.jar && java-pkg_jar-from --into "${instdir}" jsch jsch.jar com-jcraft-jsch.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext
+	pushd "${instdir}" >/dev/null || die
+	rm antlr-runtime-4.5.3.jar && java-pkg_jar-from --into "${instdir}" antlr-4 antlr-runtime.jar antlr-runtime-4.5.3.jar
+	rm commons-compress-1.8.1.jar && java-pkg_jar-from --into "${instdir}" commons-compress commons-compress.jar commons-compress-1.8.1.jar
+	# 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 && java-pkg_jar-from --into "${instdir}" icu4j-55 icu4j.jar icu4j-4_4_2.jar
+	rm isorelax.jar && java-pkg_jar-from --into "${instdir}" iso-relax iso-relax.jar isorelax.jar
+	rm json-simple-1.1.1.jar && java-pkg_jar-from --into "${instdir}" json-simple json-simple.jar json-simple-1.1.1.jar
+	rm jvyamlb-0.2.7.jar && java-pkg_jar-from --into "${instdir}" jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
+	rm log4j-1.2.15.jar && java-pkg_jar-from --into "${instdir}" log4j log4j.jar log4j-1.2.15.jar
+	rm lucene-core-3.5.0.jar && java-pkg_jar-from --into "${instdir}" lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
+	rm mysql-connector-java-5.1.23-bin.jar && java-pkg_jar-from --into "${instdir}" jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
+	rm postgresql-9.2-1002.jdbc4.jar && java-pkg_jar-from --into "${instdir}" jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar
+	rm saxon9B.jar && java-pkg_jar-from --into "${instdir}" saxon-9 saxon.jar saxon9B.jar
+	rm servlet-2.2.jar && java-pkg_jar-from --into "${instdir}" tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
+	rm smack.jar && java-pkg_jar-from --into "${instdir}" smack-2.2 smack.jar
+	rm smackx.jar && java-pkg_jar-from --into "${instdir}" smack-2.2 smackx.jar
+	# rm svnjavahl.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl.jar || die
+	rm xerces-2.8.0.jar && java-pkg_jar-from --into "${instdir}" xerces-2 xercesImpl.jar xerces-2.8.0.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxb
+	pushd "${instdir}" >/dev/null || die
+	rm activation.jar && java-pkg_jar-from --into "${instdir}" sun-jaf activation.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxb/api
+	pushd "${instdir}" >/dev/null || die
+	rm jsr173_1.0_api.jar && java-pkg_jar-from --into "${instdir}" jsr173 jsr173.jar jsr173_1.0_api.jar
+	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 86a5c5d..ec47ce5 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -62,6 +62,7 @@ DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570
 DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
 DIST netbeans-trunk-nightly-201607190002-src.zip 216613749 SHA256 412763dc00b1c15d23dd85c94de76503155ad6f402ddb2fb6fc40bd162e72de9 SHA512 37efb5947aeeecf1567fed864a28a907f261a7c251ad4de882660980c76248560da9f0be91dc6763767ed8aea7f57a68c1a403d429fbe4c1af5e3f27c0f85d45 WHIRLPOOL 27edad2d71b76784b0fba98bc15b4649616e1462edc174dc850bbe1782d341efd704115d1af5c8cfc56faa14d37d294dc1ce831118a4bb9e74e48add3a341062
+DIST netbeans-trunk-nightly-201607200002-src.zip 216623678 SHA256 08e39cc20bb2eff32d9298541073e9dfebdabfd0878d00f88bb6f896632783a5 SHA512 f3796b3548b714b4207cff52c0e5516dec1e23f176dadb13ee5d4dfe44014bd0692f1f8019569e68e50cdf33905cd0d3623bd01f12a69cf1c7dedf452f289e23 WHIRLPOOL fbbeb6bb0331e2c60fb546394dba8c8e0d2a54e9c807b6c9b30f256f68e8ce9039c558800821d5f38bc8d2428d1f3732c4160d53fc075f1ecc57113776491cf8
 EBUILD netbeans-java-8.0.2-r4.ebuild 13298 SHA256 d4172dfdec5afecb1cd099e18a21aa872c7822bff40b192b5f4ec4d35e6e0ef8 SHA512 48ae6f7141117fbf58123ded750d76f2e7311211a6be3b62bd491349817460da11f781ec5694da91584315547c32008f568fac3bfb406dbdb5ed7fd825ff694e WHIRLPOOL 73fb68aec003707c14b2b390c2de80f24e1e5413cf7e16cf7e661af47c908e2d559214580379e45e21d316767987ac906b5a119a61ae39f03c3d01dafad49b7c
 EBUILD netbeans-java-8.1-r2.ebuild 14814 SHA256 1f49212c90fcaa9a6483f19bb60c963520f20aa08c2a509aa19cc7fda12e4564 SHA512 2d6b225f5d32f0ce1801124808b0cc2101f16a703540877c4818be06694742cfa262c3a2e7018761254f9244a7992eb7fe9bc15cdb20f6f4cb83958789c0ef42 WHIRLPOOL 8557163a46ea91a47efec3c272b8a8a0f2acbf9eaa8f6c280d0ddaac6dd8b2185f06716ab12ebf76fb87fe6c05ab1a14bfd281875ebef586f1304d2162e5f2dc
 EBUILD netbeans-java-9999_p20160619.ebuild 15656 SHA256 3bd997ea34c3a2730eec6737f828a40937d2bb1324f03c04b7f42f5d50c02da7 SHA512 25e233c71bbc75697c71ce5fa0e86e77af2e76a1a5a4ce8602d20d6833d54b72882d38958325de4e8d31b9a5a0622eb2a1b25fac543d20f4c8f4c1673af55815 WHIRLPOOL 34b056b95c30d25525e2e83d22df79a006bfb47e4ba706c80d06ec0375c8b521dd7b265a01c0def667453ce523254046ca54c2a6ba7548f97de75167813ff8f2
@@ -89,4 +90,5 @@ EBUILD netbeans-java-9999_p20160716.ebuild 15656 SHA256 a3c0873f6f871b8e84215e61
 EBUILD netbeans-java-9999_p20160717.ebuild 15656 SHA256 ecf2234a5d3f6dad96eb51de1785af556dc2f7111104564dc175344afac0d4f0 SHA512 279741717d2c2f265315be722cdbf0ff773f0d576e444854ee7149ebd922145beb89181bc12782f8a46f9674b8ace5de7b33ba0dc5b16a47e181425a123e4d8e WHIRLPOOL 9f37b0156619c16b5e0d467a22dc3ada6a162fc4e5831f51ee3b998578829a31a8db5637169d85d79af29fd74edfd33c6fdf1182153acf86ca511a638d276a53
 EBUILD netbeans-java-9999_p20160718.ebuild 15656 SHA256 2a657854974f3af8949dffe4ce8625047483d8d7638e3aa21dfeb3f45a63a176 SHA512 8397e1561a591368974d1a9475a0cc641b3429c7bed700c151f0ce844ce0f796fa68231e486932ebc82076e9d4f9f96770f5faed251d32b69cc5a62e1f693c18 WHIRLPOOL 757fdd91854e97ea1b8c3a23066324685d2109401288b504a95afa78590bd0780c41530f770dfd722a74d022ffe8baf4f77747f0bf00416767e36c8da30631f8
 EBUILD netbeans-java-9999_p20160719.ebuild 15656 SHA256 06738fd2004b48ba9e7e32e16b82b3fe6bac2d940f73e99afc7dfe3f3a3b8970 SHA512 8b94f0aa904d2e7df52d83261abfcee82424b61ee090ebc25084ff818623460840f11e551a5bca706587cb3f427ca3e6f847d8333bcc76cd0ad9b4b523c9245f WHIRLPOOL 0c8e5df74c41ab2b1d6244dc31d8d39c6bf328ee9707127f9a8c48d71bef7ceb744ee693b6e7ea2a9753e024f301b25d76f0dfccb9e39991b9632592a9723e8f
+EBUILD netbeans-java-9999_p20160720.ebuild 15656 SHA256 66533c1b722ef1d87f04ca05b6d75bca31dcd6c66295182d477ee9dd0868effe SHA512 5b40e60b456b130344a84f0f9f702a2927a1c3958fd9ad0817d9509b379a6d048a0b8b51013119b5a43ff1d27ba38a500a3b98e55b711ad2f8aaf2e41d380c62 WHIRLPOOL 2694bec79c454ed78f8c5e43cfd6ff7972f68010f0e20a76f12dd450ce93e9612a0ade12b977eed18bd419ccb7c570f5d03303f95f8a48109d4fe08336de5a6b
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160720.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160720.ebuild
new file mode 100644
index 0000000..700cbb9
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20160720.ebuild
@@ -0,0 +1,280 @@
+# Copyright 1999-2016 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/2016-07-20_00-02-33/zip/netbeans-trunk-nightly-201607200002-src.zip"
+# jarjar-1.4 contains also asm libraries
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar
+	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/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar
+	http://hg.netbeans.org/binaries/D803BEB75E912EB3C2F2E042B808AC0263C066DC-nb-javac-impl.jar
+	http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
+	http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar
+	http://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip
+	http://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip
+	http://hg.netbeans.org/binaries/BFCC4C322190D6E3DD2FA9F191C0359D380D87C5-wagon-file-2.10.jar
+	http://hg.netbeans.org/binaries/4EF309C09ABB5F8B2D0C6A4010205DB185729CDC-wagon-http-2.10-shaded.jar
+	http://hg.netbeans.org/binaries/3B96251214DF697E902C849EB0B4A0EFA2CD1A53-wagon-http-shared-2.10.jar
+	http://hg.netbeans.org/binaries/0CD9CDDE3F56BB5250D87C54592F04CBC24F03BF-wagon-provider-api-2.10.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-2.7.7-r7:0
+	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-1: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-r16-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar maven/external/aether-api-1.0.2.v20150114.jar || 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}"/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
+	ln -s "${DISTDIR}"/D803BEB75E912EB3C2F2E042B808AC0263C066DC-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}"/BFCC4C322190D6E3DD2FA9F191C0359D380D87C5-wagon-file-2.10.jar maven.embedder/external/wagon-file-2.10.jar || die
+	ln -s "${DISTDIR}"/4EF309C09ABB5F8B2D0C6A4010205DB185729CDC-wagon-http-2.10-shaded.jar maven.embedder/external/wagon-http-2.10-shaded.jar || die
+	ln -s "${DISTDIR}"/3B96251214DF697E902C849EB0B4A0EFA2CD1A53-wagon-http-shared-2.10.jar maven.embedder/external/wagon-http-shared-2.10.jar || die
+	ln -s "${DISTDIR}"/0CD9CDDE3F56BB5250D87C54592F04CBC24F03BF-wagon-provider-api-2.10.jar maven.embedder/external/wagon-provider-api-2.10.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-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="${D}"/${INSTALL_DIR}/maven/lib
+	pushd "${instdir}" >/dev/null || die
+	rm commons-cli-1.2.jar && java-pkg_jar-from --into "${instdir}" commons-cli-1 commons-cli.jar commons-cli-1.2.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext
+	pushd "${instdir}" >/dev/null || die
+	rm AbsoluteLayout.jar  && java-pkg_jar-from --into "${instdir}" absolutelayout absolutelayout.jar AbsoluteLayout.jar
+	rm beansbinding-1.2.1.jar && java-pkg_jar-from --into "${instdir}" beansbinding beansbinding.jar beansbinding-1.2.1.jar
+	rm cglib-2.2.jar && java-pkg_jar-from --into "${instdir}" cglib-3 cglib.jar cglib-2.2.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/hibernate4
+	pushd "${instdir}" >/dev/null || die
+	rm antlr-2.7.7.jar && java-pkg_jar-from --into "${instdir}" antlr antlr.jar antlr-2.7.7.jar
+	rm c3p0-0.9.2.1.jar && java-pkg_jar-from --into "${instdir}" c3p0 c3p0.jar c3p0-0.9.2.1.jar
+	rm cglib-2.2.jar && java-pkg_jar-from --into "${instdir}" cglib-3 cglib.jar cglib-2.2.jar
+	rm commons-collections-3.2.1.jar && java-pkg_jar-from --into "${instdir}" commons-collections commons-collections.jar commons-collections-3.2.1.jar
+	rm dom4j-1.6.1.jar && java-pkg_jar-from --into "${instdir}" dom4j-1 dom4j.jar dom4j-1.6.1.jar
+	rm javassist-3.18.1-GA.jar && java-pkg_jar-from --into "${instdir}" javassist-3 javassist.jar javassist-3.18.1-GA.jar
+	rm jboss-logging-3.1.3.GA.jar && java-pkg_jar-from --into "${instdir}" jboss-logging jboss-logging.jar jboss-logging-3.1.3.GA.jar
+	rm jboss-transaction-api_1.2_spec-1.0.0.Final.jar && java-pkg_jar-from --into "${instdir}" glassfish-transaction-api jta.jar jboss-transaction-api_1.2_spec-1.0.0.Final.jar
+	rm jtidy-r8-20060801.jar && java-pkg_jar-from --into "${instdir}" jtidy jtidy.jar jtidy-r8-20060801.jar
+	rm log4j-1.2.12.jar && java-pkg_jar-from --into "${instdir}" log4j log4j.jar log4j-1.2.12.jar
+	rm slf4j-api-1.6.1.jar && java-pkg_jar-from --into "${instdir}" slf4j-api slf4j-api.jar slf4j-api-1.6.1.jar
+	rm slf4j-log4j12-1.6.1.jar && java-pkg_jar-from --into "${instdir}" slf4j-log4j12 slf4j-log4j12.jar slf4j-log4j12-1.6.1.jar
+	rm slf4j-simple-1.6.1.jar && java-pkg_jar-from --into "${instdir}" slf4j-simple slf4j-simple.jar slf4j-simple-1.6.1.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxws22
+	pushd "${instdir}" >/dev/null || die
+	rm FastInfoset.jar && java-pkg_jar-from --into "${instdir}" fastinfoset fastinfoset.jar FastInfoset.jar
+	rm javax.mail_1.4.jar && java-pkg_jar-from --into "${instdir}" oracle-javamail mail.jar javax.mail_1.4.jar
+	rm mimepull.jar && java-pkg_jar-from --into "${instdir}" mimepull mimepull.jar
+	rm saaj-impl.jar && java-pkg_jar-from --into "${instdir}" saaj saaj.jar saaj-impl.jar
+	rm stax-ex.jar && java-pkg_jar-from --into "${instdir}" stax-ex stax-ex.jar
+	rm stax2-api.jar && java-pkg_jar-from --into "${instdir}" stax2-api stax2-api.jar
+	rm streambuffer.jar && java-pkg_jar-from --into "${instdir}" xmlstreambuffer xmlstreambuffer.jar streambuffer.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxws22/api
+	pushd "${instdir}" >/dev/null || die
+	rm jsr181-api.jar && java-pkg_jar-from --into "${instdir}" jsr181 jsr181.jar jsr181-api.jar
+	rm saaj-api.jar && java-pkg_jar-from --into "${instdir}" jsr67 jsr67.jar saaj-api.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/maven
+	pushd "${instdir}" >/dev/null || die
+	rm jdom-1.0.jar && java-pkg_jar-from --into "${instdir}" jdom jdom.jar jdom-1.0.jar
+	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 c1ad3fc..33ad8ad 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570
 DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
 DIST netbeans-trunk-nightly-201607190002-src.zip 216613749 SHA256 412763dc00b1c15d23dd85c94de76503155ad6f402ddb2fb6fc40bd162e72de9 SHA512 37efb5947aeeecf1567fed864a28a907f261a7c251ad4de882660980c76248560da9f0be91dc6763767ed8aea7f57a68c1a403d429fbe4c1af5e3f27c0f85d45 WHIRLPOOL 27edad2d71b76784b0fba98bc15b4649616e1462edc174dc850bbe1782d341efd704115d1af5c8cfc56faa14d37d294dc1ce831118a4bb9e74e48add3a341062
+DIST netbeans-trunk-nightly-201607200002-src.zip 216623678 SHA256 08e39cc20bb2eff32d9298541073e9dfebdabfd0878d00f88bb6f896632783a5 SHA512 f3796b3548b714b4207cff52c0e5516dec1e23f176dadb13ee5d4dfe44014bd0692f1f8019569e68e50cdf33905cd0d3623bd01f12a69cf1c7dedf452f289e23 WHIRLPOOL fbbeb6bb0331e2c60fb546394dba8c8e0d2a54e9c807b6c9b30f256f68e8ce9039c558800821d5f38bc8d2428d1f3732c4160d53fc075f1ecc57113776491cf8
 EBUILD netbeans-javacard-8.0.2.ebuild 4906 SHA256 944fee40d693c2c287e748f70ba565f3cd84bb7c19110f8be716134ec20694a7 SHA512 1f66cd2756effbfde7d43f9da7d8d93cb6252c58a02ee3d821f6faeaf63bf3c63e28f80c6eb44689e3aa954452a2f3893c65e75de84158dff1da0d94cafea14a WHIRLPOOL 88197e03008b8acb1ce62f72783bb096d9a3fc2a289b83367841a8adbee2bf822031f9bd6051831515ee44b1d5d2a109c5646f98ca723506f27c874301fb4189
 EBUILD netbeans-javacard-8.1.ebuild 4930 SHA256 5342d0d3f4207da3d36eb19f0fa78015f33b4a6e6435fcf43b7f568afabb9d02 SHA512 5275ae0fd617e26cd8580f6256a766bdd9cc0299f5a488be5a97744ec6abddf262e5fb1db358b9ac00203bbedfe7ac152828b174856d9cf6fa06e1e2128e219b WHIRLPOOL 427bfed5b61a421340acf7ec0cfb5e88a8b4a68cb546b9d0546b7c69ab0e29700d03e2bf58641bde63a2a43579b0521c028cf57dbf25af280fb0732565a30617
 EBUILD netbeans-javacard-9999_p20160619.ebuild 4971 SHA256 da2b8a275b12e9f6f7918b161ba774af404273911eb844373f57856d81a410a5 SHA512 02291d90b6dc7666da421ff44aefb37d536a11113b3a631ad0cd16c3b0f210804240a4d540e823d5f78ce5d2b952557db92f1aa119f06cd20b48a44d8ace88ea WHIRLPOOL 3deb5220853462938a593d9cd8819e3c7de12b5e3ccbb2d4340ae691218f1c2512d8854c3bb70d506f65fb5ba1da24b47acd31b0b587363f820d75198b1197d8
@@ -58,4 +59,5 @@ EBUILD netbeans-javacard-9999_p20160716.ebuild 4971 SHA256 d51d9eb7d5e69dd46fb8f
 EBUILD netbeans-javacard-9999_p20160717.ebuild 4971 SHA256 191d88d9b85ca0901a0122d608195620b4deb3f2505fce77b0e0e78944fbbc66 SHA512 4a1477363cb176cd2d9e9d2122a8c852ab1d8dad7ddad4d3a891a08c2c769cb2872d1b00721661e0a4fc92cb1907e579c8baea9fa59b111f2c0b9d4d72f3796a WHIRLPOOL 9f35a26ddfae9cf9a717c90108140039f470c17d94c88f6a1cb1a4d751535a0972c20843f264f408949be40b56d6a207b8b4535b2aaa55712135460cae40ba98
 EBUILD netbeans-javacard-9999_p20160718.ebuild 4971 SHA256 98f13fba044070d0dcca1f8156a4a005c6c72f0fd5f93ad07bcd32d038823a05 SHA512 d5478fb13198dfca9706d3d61aeb623a3b5e7098e6b60b3dc5cb8b382ddc11ef300513cb234d8344313bb571ab883261651ca7a3c842b9576c4cff68c793f325 WHIRLPOOL 5ae970b3df09cda9782db6a9544e736a859811e2bc5814a8534ca2250a0ee00964c35b56f283a9daec6d551dd4ccf8879665ef0a5013bab1247222626880b169
 EBUILD netbeans-javacard-9999_p20160719.ebuild 4971 SHA256 a71983b85bfcd03706e7aced1ac53e39b2123dc5472857742a7a30aff2e944cc SHA512 f978cb1bdd84e43dd6d4f5fd3f777caa5fd36f6f232b29347659f7d080e335eb206ead6bd17bbb7712f4563164ddb3dd3ac101a1074959e71be767ff0d3559ed WHIRLPOOL bf59cb7ed378616f421905cb7ac49712edc9e2715383ccdb67ea1c390daf6e9b4881e2196114b5e231e152910cd51cf30e88aab8207a10073be99a6c6ce68005
+EBUILD netbeans-javacard-9999_p20160720.ebuild 4971 SHA256 efd983e371adfddd07839d9c5a16a38caa9fb600c9ab57686ce9253cb4b72496 SHA512 ff3b0e3cb9a155f5a789c189322f533a650a8596b938203e86e6abc1dc38072ba4a6abbb21128ea11b9e85feed0f60954e88a1f53ebe1bfdc60ef031bc44e53b WHIRLPOOL 68bcb8935ce661b6d5b1329f458467e0804291d73cc8216c880b924535f7f07ed01a5cd52ae480db5304422fdbee13c2bf0f0c9d5002653f713713a5f471c6bb
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160720.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160720.ebuild
new file mode 100644
index 0000000..5953914
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160720.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2016 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/2016-07-20_00-02-33/zip/netbeans-trunk-nightly-201607200002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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-r16-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-r16-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="${D}"/${INSTALL_DIR}/JCDK3.0.2_ConnectedEdition/lib
+	pushd "${instdir}" >/dev/null || die
+	rm ant-contrib-1.0b3.jar && java-pkg_jar-from --into "${instdir}" ant-contrib ant-contrib.jar ant-contrib-1.0b3.jar
+	rm asm-all-3.1.jar && java-pkg_jar-from --into "${instdir}" asm-3 asm.jar asm-all-3.1.jar
+	rm bcel-5.2.jar && java-pkg_jar-from --into "${instdir}" bcel bcel.jar bcel-5.2.jar
+	rm commons-cli-1.0.jar && java-pkg_jar-from --into "${instdir}" commons-cli-1 commons-cli.jar commons-cli-1.0.jar
+	rm commons-codec-1.3.jar && java-pkg_jar-from --into "${instdir}" commons-codec commons-codec.jar commons-codec-1.3.jar
+	rm commons-httpclient-3.0.jar && java-pkg_jar-from --into "${instdir}" commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.0.jar
+	rm commons-logging-1.1.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar commons-logging-1.1.jar
+	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 6cee251..ac0a715 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570
 DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
 DIST netbeans-trunk-nightly-201607190002-src.zip 216613749 SHA256 412763dc00b1c15d23dd85c94de76503155ad6f402ddb2fb6fc40bd162e72de9 SHA512 37efb5947aeeecf1567fed864a28a907f261a7c251ad4de882660980c76248560da9f0be91dc6763767ed8aea7f57a68c1a403d429fbe4c1af5e3f27c0f85d45 WHIRLPOOL 27edad2d71b76784b0fba98bc15b4649616e1462edc174dc850bbe1782d341efd704115d1af5c8cfc56faa14d37d294dc1ce831118a4bb9e74e48add3a341062
+DIST netbeans-trunk-nightly-201607200002-src.zip 216623678 SHA256 08e39cc20bb2eff32d9298541073e9dfebdabfd0878d00f88bb6f896632783a5 SHA512 f3796b3548b714b4207cff52c0e5516dec1e23f176dadb13ee5d4dfe44014bd0692f1f8019569e68e50cdf33905cd0d3623bd01f12a69cf1c7dedf452f289e23 WHIRLPOOL fbbeb6bb0331e2c60fb546394dba8c8e0d2a54e9c807b6c9b30f256f68e8ce9039c558800821d5f38bc8d2428d1f3732c4160d53fc075f1ecc57113776491cf8
 EBUILD netbeans-javadoc-8.0.2.ebuild 5993 SHA256 baf9da38d87b86eb8ed10ef46017361f36ca8583dd90885c9d1667a51851bc52 SHA512 892bc25b30dc26e3ee7c8be9aaf8542c00a7fa1d1d8f883d82bebb816edfa93e1ee9abeac1b0c47ecc8b4169bcaded56c5c71f18151fdc22fe241fcee0fd4521 WHIRLPOOL 2012f28f3ba5074b4d262b20e9a1c8ddf590ce444339ec1a404c890867c1271e38f9f9e09717d0648fae061553f5c8da3d97a70c35c8e853fe4894fb6fd4ec96
 EBUILD netbeans-javadoc-8.1.ebuild 6247 SHA256 5f0ab01cbea85353ac471a46e341750785f4889732c9da111d77b87bbd1bcc2d SHA512 4a4636f4f58a9baba9d9f5bac4ee7d4f57c0e07d6790902d34974383660f2926c4c4b16a27bacc2a3a7a0a6d5b7699caae90bb2ac513ac8e0535e46d11ec345e WHIRLPOOL 9cbac0234b9f1a8122df116512d5154b7e85561fd9541e0a77dc5c2b5863cf3238400ac17d05499e950705309faa97caace6da00c912ea07d6a74b0076f683ed
 EBUILD netbeans-javadoc-9999_p20160619.ebuild 6293 SHA256 e4fd24198b55e0e7e6513655178c5cf0543c13bf1eef1bea66da2a58f1fd4e48 SHA512 8baf00c3d0779adaa3e3bb495e239498637d71b55dde2b06fae72591ef05e40389da597114c8706e218c890a58ce7805d7da3a2bbaab018b51f60a72c5935afa WHIRLPOOL 2523655dd9f19bbf20c62768b66c15892ab7f7d24d00a48051a5226de2648985ad6c65b931ab8de4864ad8b95951a09347e88452ffa1d0b94c80c8f0e4ffdd78
@@ -57,4 +58,5 @@ EBUILD netbeans-javadoc-9999_p20160716.ebuild 6293 SHA256 8d294b83ff623343d453c4
 EBUILD netbeans-javadoc-9999_p20160717.ebuild 6293 SHA256 3135b0769bc56bb6754e5911e8d94bee8eb5b827f6356433638dcb1f07ddadf9 SHA512 e7d5cc0b7c96a060b8f9728694331cca4699023ffd0db7bdf206e45f58b1f405ac340c0815ae5e51e1a7d86008893428526222c21721415e0ca7579eb9e2e06c WHIRLPOOL dd81408e028eec410e4b1f1e155d06be29ff7639cbe5821c9b97c482468fa9c0c4ae742fc4b87200434c82970bb2e7edc991abb6c87c4acf0d52500b34d49645
 EBUILD netbeans-javadoc-9999_p20160718.ebuild 6293 SHA256 62b444faa8f5eb04280cacf1e0e753b03e6bda938787a3203ceb01f390836d0d SHA512 39cc041b1126262738bb1c1c1e74ae3d877d747035123c138cbf445268d6a70e906f9e4aa5af951e75d26b234ac4edca2ebcaf2df9df1e95b23d6b374de6d665 WHIRLPOOL 5f7a82bf0f94c1938789a553f446586825bc575dd284a6b4bf23739c1eb721eec423cda5f5b2e9798cb34aa227d6738c27693f832a14e03548c6d83476fc868f
 EBUILD netbeans-javadoc-9999_p20160719.ebuild 6293 SHA256 1e94315d1ce62f78fd3b6871493af345bed5f8cc31ad33e7146a51bc89788bb6 SHA512 1908124c25565223946b903e27aada0f7783f55eb7e6ad59d161736d4ca32bc6643741772c5892a0e343c696f4b11d6391e4c9216f372a11c520b3dcd04b811a WHIRLPOOL 85ac8c7b1839a1dcaa1755899e475bd070ab4e2227a2a48ad38d270fcbc5fc1e7afe0ea8a858b0f0198d62d1cfe04be74102e0f05392542e0756113ecbd40afd
+EBUILD netbeans-javadoc-9999_p20160720.ebuild 6293 SHA256 22de0b21407c5d510ed71843aa8a3186999e178eb5792cf304042b341bdfee04 SHA512 38c48ff82002f342c18577ec0a46ad92d3fce7e6c48a554aa74d2d3ce7a88b70b8daac53b5b32e5c5add5d053bc808210fde615f1a682a1a272209f04e6fecf5 WHIRLPOOL f21467521066dc1610d30f0f1b6650f7575057bc59d664253ee4bdb96a5d748f532ffb87025dda6002868d575406cc9b5650ebfafba2f9c9632dc83299bd3c9e
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160720.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160720.ebuild
new file mode 100644
index 0000000..d4c9f16
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160720.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2016 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/2016-07-20_00-02-33/zip/netbeans-trunk-nightly-201607200002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+# oracle-jdk-bin is needed because of javafx which is not currently packaged separately
+DEPEND="dev-java/oracle-jdk-bin:1.8[javafx]
+	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.8"
+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-r16-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip o.apache.tools.ant.module/external/ant-libs-1.9.7.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-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 -Dpermit.jdk8.builds=true -f nbbuild/build.xml bootstrap || die
+	ANT_OPTS="-Xmx1536m" eant -Dpermit.jdk8.builds=true -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 68cacea..ca561f7 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570
 DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
 DIST netbeans-trunk-nightly-201607190002-src.zip 216613749 SHA256 412763dc00b1c15d23dd85c94de76503155ad6f402ddb2fb6fc40bd162e72de9 SHA512 37efb5947aeeecf1567fed864a28a907f261a7c251ad4de882660980c76248560da9f0be91dc6763767ed8aea7f57a68c1a403d429fbe4c1af5e3f27c0f85d45 WHIRLPOOL 27edad2d71b76784b0fba98bc15b4649616e1462edc174dc850bbe1782d341efd704115d1af5c8cfc56faa14d37d294dc1ce831118a4bb9e74e48add3a341062
+DIST netbeans-trunk-nightly-201607200002-src.zip 216623678 SHA256 08e39cc20bb2eff32d9298541073e9dfebdabfd0878d00f88bb6f896632783a5 SHA512 f3796b3548b714b4207cff52c0e5516dec1e23f176dadb13ee5d4dfe44014bd0692f1f8019569e68e50cdf33905cd0d3623bd01f12a69cf1c7dedf452f289e23 WHIRLPOOL fbbeb6bb0331e2c60fb546394dba8c8e0d2a54e9c807b6c9b30f256f68e8ce9039c558800821d5f38bc8d2428d1f3732c4160d53fc075f1ecc57113776491cf8
 EBUILD netbeans-javafx-8.0.2.ebuild 4647 SHA256 15e5e0b1c4729852dd55e5bfb2dcb520ba7c959bd9927d315c0abcb3f94e4ecc SHA512 520c60264fee67b0ccfd50ced0cc8586d5653d5186fa75c6b7cd8b400aae834de446b7e6145ad38df7e68207391fb360ef4834140e096d48add568fed387ac98 WHIRLPOOL 416a56ceb2ba85e3923ada0c8ef485cdd6fa16b3423b8fd0de523fa54dd082cbaedee5da4f1a92b50e440195f9256376f50e99a850d70ccdcb8c0ff370007f7c
 EBUILD netbeans-javafx-8.1.ebuild 4671 SHA256 2a12bebaca0ddbb03b84c33de7f5933f76a8381db3c40013fc4014687ded6cd4 SHA512 ff410f96e808c414e3e9485461866239080098e46e843ee771a78a0afffddc1c776697dccb276daf7f87dadf915a212bfe9c2a07b3a8a9057cb3ea19b77163fb WHIRLPOOL 51729142255a16d4cd949d4bf5f3b681d36bc83f30dad39aad9d1dd56f7dcec0dae4377817350e7947d518129a74eec7f227c3cb1600ac168ea90d056b87d195
 EBUILD netbeans-javafx-9999_p20160619.ebuild 4717 SHA256 d4b6d29310536b5dac6b03087b40f8722308608487aecad11cd037b1303b7a33 SHA512 58a789051b4c644ba58e9fe1b29a980ca904b9b16b00b0ee4de0886360e41748dd5f06825c43b18226c1b2f4bb7a8e7984213a045b2426ef61fc7e2c855beea7 WHIRLPOOL 0203b08c2c7a115b1bd2c80b1486e826e141be1671677da97fa5a556e704e6284c77b386bdba2e25b29dd63cea30a223f4de71ddd0c41f0356e61fff56466165
@@ -63,4 +64,5 @@ EBUILD netbeans-javafx-9999_p20160716.ebuild 4717 SHA256 54d965847895fae2142187c
 EBUILD netbeans-javafx-9999_p20160717.ebuild 4717 SHA256 0f65fdce06426559412a854623ed39a08eade81bbe1676142ee5a9cbc46f4e10 SHA512 77765eaf48ca28cc181be0ab4fbc6f617e94f1be57e2c862d35a0ab996adeaf71775156e1744567e1831765fb3febaf91bc4461bf183f40d4cb4357889159f15 WHIRLPOOL 6db931aed455dac3954d7aebe46bcbe0cbd824fd87966ec41306160be43b0817643b27ed12d5faa8faece507da6a00092830bbf74cc0fb059be404ae6b611140
 EBUILD netbeans-javafx-9999_p20160718.ebuild 4717 SHA256 54454f6035322095ba1b566c894eed7a6d354b88021eddcff15a7bb981cf534a SHA512 a3a40de8ca145664db25fc2a589a382cb2ce3fc610f5199d766d786b86fcc3436b0c91d9c281fe809288645df99df8ca2029873f8d5ee305f8d555228622df6b WHIRLPOOL f14bab15b00c5ed84c80e6a63c651030323598eb995b88b1cbb17847ad89d69af272681cd7645c3b275f58ea33428baad1d1eb356d57ba6247bd2b14105bbefa
 EBUILD netbeans-javafx-9999_p20160719.ebuild 4717 SHA256 4a163419ead035e24ef3870e0cf95cc73fae79622f6b201261b2d0fe2d3e98f7 SHA512 22abc09b34bb4eaa3c8c9343c213472e6eefda3f06057aabdd51e6af09659e62ae6f6436804e0fb87a9baf8ed5bfb59f2537d63fd17680a51b2563a44d568054 WHIRLPOOL fa4e4145fb4c43284e5f781ec1bcf0c5426ff7cb55e49934d2f36f84adfa82840c782236d49bb52f6ed06281a79c513eaacb6e3d990a0b226954b720b0d27973
+EBUILD netbeans-javafx-9999_p20160720.ebuild 4717 SHA256 222573eb9fe710e6d64f3d7a29eb0b35b41ee1c70ef59cd1bf8b34d161f34cb9 SHA512 3b9baa05c1b7551dd150cca012447a426c02cef12a9387672e37ab8e6c2e0315f795b36abc53706ae97e68e9692415f6d43cb84204e01c3465e6b9d28888804a WHIRLPOOL 20fcd66d79382ae03d174133524ff582eb896872f44ddd0da42e26cc38d4a0e0e43f7ad90027c1aa5ba8c36fd7936a4c96ee59ab51067d0b28cb9d9341e95048
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160720.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160720.ebuild
new file mode 100644
index 0000000..446ea20
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160720.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2016 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/2016-07-20_00-02-33/zip/netbeans-trunk-nightly-201607200002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-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-r16-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}"/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-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-r16-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 bd19738..8b0b764 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570
 DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
 DIST netbeans-trunk-nightly-201607190002-src.zip 216613749 SHA256 412763dc00b1c15d23dd85c94de76503155ad6f402ddb2fb6fc40bd162e72de9 SHA512 37efb5947aeeecf1567fed864a28a907f261a7c251ad4de882660980c76248560da9f0be91dc6763767ed8aea7f57a68c1a403d429fbe4c1af5e3f27c0f85d45 WHIRLPOOL 27edad2d71b76784b0fba98bc15b4649616e1462edc174dc850bbe1782d341efd704115d1af5c8cfc56faa14d37d294dc1ce831118a4bb9e74e48add3a341062
+DIST netbeans-trunk-nightly-201607200002-src.zip 216623678 SHA256 08e39cc20bb2eff32d9298541073e9dfebdabfd0878d00f88bb6f896632783a5 SHA512 f3796b3548b714b4207cff52c0e5516dec1e23f176dadb13ee5d4dfe44014bd0692f1f8019569e68e50cdf33905cd0d3623bd01f12a69cf1c7dedf452f289e23 WHIRLPOOL fbbeb6bb0331e2c60fb546394dba8c8e0d2a54e9c807b6c9b30f256f68e8ce9039c558800821d5f38bc8d2428d1f3732c4160d53fc075f1ecc57113776491cf8
 EBUILD netbeans-mobility-8.0.2.ebuild 4342 SHA256 e9b4ff8fe38904346bc21a82219696e97322bf9df4e9d4cad2259b6f08bbe7f9 SHA512 338711fe61c469cee80e499ddf8c3ad70a3a38e6658311afcd1d24edd1a99b87566fafcbd392bb958b589796e0913d2574b07570870c8d3382a91a324227082f WHIRLPOOL 855b2817c36bea67c8fb368a0740be18b71dbebb2b98a154552f002a56eaff34f54eee2698379d7200a6042c1de699df23e7717b5b6c532776852d8757b74cb0
 EBUILD netbeans-mobility-8.1.ebuild 4366 SHA256 fe10d103a284b8f82b67179ea52d51d57b43cfc4a4084b97e3f9650526621497 SHA512 36bdf0948b41bfe4f9c66fe093030d5f27b90f5a89be94dfbd176e3887b249d5aa3eb9b0924df142291f0d693f274eef840ed3a7f658106847327befd0374710 WHIRLPOOL f9dd44e6401367b2df73c5f1428bff53547ac012068297667666d0241c29310aed4413a368e5350a996af37ad026e875325467b1a165cba6953d99a5da3a0d76
 EBUILD netbeans-mobility-9999_p20160619.ebuild 4412 SHA256 efc0216499f91514fe2cd70b64071a93548275acb68fd489a16278b178b36957 SHA512 464084eed61bf2595c51e3ccfe7069cb4c73f0c82feb5793e102a55820401e265e4932bd7a022f12c6d2f7ec10c37d926ceb1fdd6ba203a5b35d8baf2094a774 WHIRLPOOL 5d7f3f7849980405d94dabe56092d37008aff55202a7565123f3e6d97abe55d3a1addd6e91e7704590184ef77557789490969f06e94de75ed243b7fd09ae763a
@@ -55,4 +56,5 @@ EBUILD netbeans-mobility-9999_p20160716.ebuild 4412 SHA256 f2f3bf9adc3d923a7103d
 EBUILD netbeans-mobility-9999_p20160717.ebuild 4412 SHA256 9875dd3e26d88b3c7bc43c09dc28e2b9b86a29fb19501f57cdbb33e659e6045b SHA512 654bf97176ccc3e20c14dd3948227fce0f8b9c0ce4840ebe9ae8d64670848c6255ac467591cdb591bb91ac0c47f597ff11c88c93b73c9bc34a58260b2fcebe74 WHIRLPOOL 6c9d22fb45601071e5dca0636f26dcaae0464b689c32869c934e270a58f9a057cf247ba9bbe8ff0b6fdcc66df9298c8c79b395772fccb21f3b763d49023feb87
 EBUILD netbeans-mobility-9999_p20160718.ebuild 4412 SHA256 64a35f93019b49179ac7cda280bd9d86ddc2302bd37ed5b43078edf21b950f0e SHA512 6883c112f3840ee518756be54e3713e48f0500f07ac1d3a0be426a993c4fa57234838c7cbcc9f19802e9b79604066ac5303bb897071ab13df0016f3abc7b5905 WHIRLPOOL 45c329a470d8e446a3f64dc241d30f7d2b43775bc8b1357bbed527fa667827ef5adaeb92202457183e500f0fe720ba181dd1aeeafa44085316744b9127f8061e
 EBUILD netbeans-mobility-9999_p20160719.ebuild 4412 SHA256 108141c07609008d0bfd35f55524386aef7312d084a4c27ea3d288a4b0241c6a SHA512 c909b8627d45e007dd713f7dba749b686e2bd51c145cadb21ab2f10d0249d222d18ad70471901ffcf77d07a38b2ede26b69f6814511933c4f7c9952e642f0a22 WHIRLPOOL 1a5b3c84817149c39ba4a1391d81ccc20e2009b1d5ddc707ff44116e89225dc06c58f818dcff69692ad41ea7026ff8e3f42bcfb143507514029d93a8e584d0ec
+EBUILD netbeans-mobility-9999_p20160720.ebuild 4412 SHA256 cfa210e4b8cde0cdf39866021464b70763c1bc7e8f37dde023cbe567552a0a16 SHA512 136b7d36cc6f5acb5e6dad46d7c28da9f2659321e7ad99e766ccfaf6365c3ebfe7e6af21d4f8ff84e0a3901f50b33c64e8ffa5faab0403f8a22edf9c253c36e4 WHIRLPOOL c334199b79be66c728d2995f4f3857128b17df70e34d3a94ac1a58b81f5ad5df8aa578b56cf15216a6fc1a7f02ad667782ba8b7dee462195c681f00ac3a7a6c4
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160720.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160720.ebuild
new file mode 100644
index 0000000..265e203
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160720.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2016 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/2016-07-20_00-02-33/zip/netbeans-trunk-nightly-201607200002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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-r16-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-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 be86e7d..fbf285e 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570
 DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
 DIST netbeans-trunk-nightly-201607190002-src.zip 216613749 SHA256 412763dc00b1c15d23dd85c94de76503155ad6f402ddb2fb6fc40bd162e72de9 SHA512 37efb5947aeeecf1567fed864a28a907f261a7c251ad4de882660980c76248560da9f0be91dc6763767ed8aea7f57a68c1a403d429fbe4c1af5e3f27c0f85d45 WHIRLPOOL 27edad2d71b76784b0fba98bc15b4649616e1462edc174dc850bbe1782d341efd704115d1af5c8cfc56faa14d37d294dc1ce831118a4bb9e74e48add3a341062
+DIST netbeans-trunk-nightly-201607200002-src.zip 216623678 SHA256 08e39cc20bb2eff32d9298541073e9dfebdabfd0878d00f88bb6f896632783a5 SHA512 f3796b3548b714b4207cff52c0e5516dec1e23f176dadb13ee5d4dfe44014bd0692f1f8019569e68e50cdf33905cd0d3623bd01f12a69cf1c7dedf452f289e23 WHIRLPOOL fbbeb6bb0331e2c60fb546394dba8c8e0d2a54e9c807b6c9b30f256f68e8ce9039c558800821d5f38bc8d2428d1f3732c4160d53fc075f1ecc57113776491cf8
 EBUILD netbeans-nb-8.0.2.ebuild 4927 SHA256 7531e50c4d76608bf925efdba4f54f522de3a8ceeef4d48807fb4ee48bfabdf6 SHA512 925734f331cf228066c5c9e614f48b756af31cac8b559cfe756347b6a2cb0ce362c7c41489a25084f2ed3f2e415baefd148a54f39fc00269fb14179efe056cb9 WHIRLPOOL e3224c5f22bb8e4792a5f98bbe819e071ff18c99533ce05a3fc1c5898ddcca1e3ce34487ba78159bb4d60155acdf15ae4fe81189ff2d5b1bc77ffd9ee4e20aca
 EBUILD netbeans-nb-8.1.ebuild 4065 SHA256 c1bfd704ecaa1fd62b149114b7391b4633a90a8a1d87645b833731920aa6efbb SHA512 56bda99c3d05522d5becb032177e4b4411d862d18a069e2d4343ddc8b08d05ed6c3199588e28aece7e583ccc9f95517621780a246bdd65c7d3edf072a61ef1cb WHIRLPOOL b9a43e6b4ada929bcf2aaed0bffe9cdfe0b9dbbf001e8ee4f2ab3cf8a08e27d318ea435d0580c80fd23cf921d261ca9b54d54a2b2e7a53173f955bde03aa0a12
 EBUILD netbeans-nb-9999_p20160619.ebuild 4111 SHA256 ff3b55348cd8c24c7edc1be9b698a3c4e7b2c53f0e8218b3f39ada013d6e994b SHA512 d201de03963aa3d7196193a87bde1d112ea5034212ef0e5a5fece5cc71432f579fb0b3367da5c1da937fbd611124d715c97bdb02e708e896b3244f85810d27e9 WHIRLPOOL 445f10d9f4e19125ee9757d3e24c027ec6a6cc58b7eebf81afe67c804931798d063bea65b1604bce83cc24d53e840f3f114d6138d0bbf31650d82a883fa1a7eb
@@ -58,4 +59,5 @@ EBUILD netbeans-nb-9999_p20160716.ebuild 4111 SHA256 46bbb3e1fca18aad791b7cfc20c
 EBUILD netbeans-nb-9999_p20160717.ebuild 4111 SHA256 44a0d82084a38bbbe204144c277963858eb54bd3e3e6dc9fba7eb127053dde99 SHA512 ab2d69dcb56a54c8332d960adb89cd78c6432c698f8265438e3536e4d14257fc274e37ee371213872281edd8980484d9c5de3480fad2b318bda1de5b56ebc2cf WHIRLPOOL 1b6b8e942d071a90c22c5359521e1ee7a5f5accaeeb7ea514f75df66b3a9aa95c42ac6da65aa6a7f8e67b8eff91997a12c000ad9900c7c7190619e0ae6d83499
 EBUILD netbeans-nb-9999_p20160718.ebuild 4111 SHA256 27361fbce4072d55f9911f533707a504c51e41bf3896302fe629e85aac550f55 SHA512 ec25644ca7bbdae22ad5603aad0b344c03fece8593e7096c3b5731006e8894593237bb9481b9046e308c6c5f9d5ae35514424399d0b24201b84881c8d06556e3 WHIRLPOOL 1eaacd853ce131ae88ef2dfe92c6525fea9a9d9c02a473dfd8b1edfae8846ceb1955d9ebe3586ca66ac2798cedf09344f731281ea7934dec48ad5cea7ca3cdc2
 EBUILD netbeans-nb-9999_p20160719.ebuild 4111 SHA256 73a3e1616efcfad39c542a5c76bbca35537f749bba9079be9d3aa401cbf406ef SHA512 ebe6ce4fd28207619cc872deea9cd4ad1e18005de9aba150af8c9ee9a86ecd06a4eef4db20004d6f873c32fe7be94cf31fc227a4a55e6eebe986e6d195799472 WHIRLPOOL eb0a5c10dc2b039988d20ca2e1e1feaaa8a6a211f9f1a740298cb337e6522070bbbecaa34fe00f7bda2874da747f9f54666e14feab1d568159bcf63fcc35336a
+EBUILD netbeans-nb-9999_p20160720.ebuild 4111 SHA256 191e189d9ff8f88f89b1f6ec21ee7772539a5a0f58143d43e26556fd8966ab53 SHA512 0c7330d65166d0b5ce740d1741df627337ee4abea32fa1127ad95d857d5600daa4c9c05782e2833c912f9856dba894d3a04917c19ab89a987406fd1d569d2553 WHIRLPOOL a6f227be1c6187040b32529067e3c95b40342f1a4e0faed89708f6751726e9b9fc6c4fa7342b8887bd99b757933c13b9df01df96e8c7892ae0d9654436b576a7
 MISC metadata.xml 392 SHA256 01cdbcc83099b97486bd7b8e813e5b19c1138eb0d8d3e8a5683aafd579820435 SHA512 4d2f9160baa022d6a48b61d5f42e71cfd411d244e7a36436629bc5ee4036e4ce19079134d9a6c704ebe942306c2e0199d0591c1e54f92f8f3c8835147e639246 WHIRLPOOL c1131764e1cec66c56b977ebe36014b29e5a68e35ccc326c0cbadd050a6c625cf191c85c212e0a733661c008dab0d99f9a4cdc4c4ae0cc9d775ba1de554795a9

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160720.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160720.ebuild
new file mode 100644
index 0000000..83f4e85
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20160720.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2016 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/2016-07-20_00-02-33/zip/netbeans-trunk-nightly-201607200002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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=""
+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}"
+
+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-r16-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-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-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
+}

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index e4f30ea..e82edfd 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570
 DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
 DIST netbeans-trunk-nightly-201607190002-src.zip 216613749 SHA256 412763dc00b1c15d23dd85c94de76503155ad6f402ddb2fb6fc40bd162e72de9 SHA512 37efb5947aeeecf1567fed864a28a907f261a7c251ad4de882660980c76248560da9f0be91dc6763767ed8aea7f57a68c1a403d429fbe4c1af5e3f27c0f85d45 WHIRLPOOL 27edad2d71b76784b0fba98bc15b4649616e1462edc174dc850bbe1782d341efd704115d1af5c8cfc56faa14d37d294dc1ce831118a4bb9e74e48add3a341062
+DIST netbeans-trunk-nightly-201607200002-src.zip 216623678 SHA256 08e39cc20bb2eff32d9298541073e9dfebdabfd0878d00f88bb6f896632783a5 SHA512 f3796b3548b714b4207cff52c0e5516dec1e23f176dadb13ee5d4dfe44014bd0692f1f8019569e68e50cdf33905cd0d3623bd01f12a69cf1c7dedf452f289e23 WHIRLPOOL fbbeb6bb0331e2c60fb546394dba8c8e0d2a54e9c807b6c9b30f256f68e8ce9039c558800821d5f38bc8d2428d1f3732c4160d53fc075f1ecc57113776491cf8
 EBUILD netbeans-php-8.0.2.ebuild 4347 SHA256 585b2488d748f3d0f87c17c951870e167aac7bf10847428add786e4a8a446583 SHA512 1431305d4f340cb0a2c7c896c54d45f6f02ef82a4201f82053278b98511a5a4a68210317530e9cdf5cf1f495996d3a3f9c4b2c3c479aa407abd375072ab3182f WHIRLPOOL af8476f2ff2d119f2657e6be03cfea1160f86e41bd791f40609f1bc8a8aada46ba1081e4f2417b0fddde931fa4e43d20956c0fe1d4fdf3617b78d01afd23f9b4
 EBUILD netbeans-php-8.1.ebuild 4371 SHA256 a9e7565a8cbcc5dfca4d9449f43b959911c47ad8da59648e383ecce55c4b0064 SHA512 67d43532ea43abf007adce73e7da2345d9cc42229189ba90d254d7764e19e3fd3c86b990ea2fe08cf52e49422def481046fe6e0e447fdc1de1680ac59f51d9d3 WHIRLPOOL 433275570fd81db477180e58909ebd50b83cde03bd5df807cc9ee213e2f3a44f65f3ec4877851aa6322e7752969aa72313ee7b35b8ee07446e8c22be4321d536
 EBUILD netbeans-php-9999_p20160619.ebuild 4418 SHA256 53e05c163c65dca14ea563179c50dbe9b39c0538e22b24658ba3ee1d5b07544e SHA512 d7754a50c1ea296f22ec0c9472d94aeb14d2913a185020a30f179cf2613ade4595e6cd1fcbc4f155ee26e247b01ef288b91a3b2df488af561a77dc94d15acdbe WHIRLPOOL 46c37aaae176ddf638c3f25a6dae2eaaf10193f5bafea257dd6260f332171734646b5421189b7bfe133024f714fa52f8d4760b049c10961977f032fc0ab3f578
@@ -60,4 +61,5 @@ EBUILD netbeans-php-9999_p20160716.ebuild 4418 SHA256 25ddbf01cc46026f080b095088
 EBUILD netbeans-php-9999_p20160717.ebuild 4418 SHA256 8d2a0c51ebefe4b3f582e31021b799613dfde87cff55553ea1807b8332da03bc SHA512 4d37b7f8ac213b9a0a23b39a2551f22e82afe7b0ee76e19f0a5154e749b56ff282b0c2f80af68dbf9c5fa79dd4de1f3877a7f52b2628ad4a736d696185049b0b WHIRLPOOL 7207355781d8769e1ef6e333e34fe814974556aae771e0a8cc1a0eff8dbc600e4a580ab31b844a40b6cbccb7e01127d3c0713bbdf4da72c6512f8beccea6a5e5
 EBUILD netbeans-php-9999_p20160718.ebuild 4418 SHA256 32e3421519f34969dfdd91bc8d2d337d7ddb3c1335da16615f7a4433a2bdaa80 SHA512 128662633c52dfff7193102504890e47e195d6caab1101a94420baedaf821e7d72898216a93856a6b46e2aa758caa704753483e173960eea25dd3f21f24158bb WHIRLPOOL 921d7fcffa0e9f3f806c4b02631fc390fe7a497667327415796d60df88efb1931016bec0fbb8d7243cb14e413240354aa10d18de07d0f0d0324b38b2708c0bdb
 EBUILD netbeans-php-9999_p20160719.ebuild 4418 SHA256 f2651e5970f528722ce2be216c40056ae9864fe070c4b427d7321791d3475a6c SHA512 b42a126bff1df5e1c79f90c7a45dfb8b6883990eeb542a0d671bc7a95fa5fdd7f00e7ff8e2f72d3b2f4656f6ad2f553c3d7747ff56532af68011aa42ec6bf4d2 WHIRLPOOL df89edf803a5287410b9701047fa5d85dfefef47c3ef6085ecad5d17a0e09aaaf6dfe749a2f2bf7b09f0ddf6cd45b3def02d95ff532e6b08693c33d9c662f872
+EBUILD netbeans-php-9999_p20160720.ebuild 4418 SHA256 22f7de42ee0fbfe933bc2f6a004a2d29d472e09630f253d96e42ad03c86c4414 SHA512 53877c459b214f930c5f98b3cfd06235e772a854d3046ae2771f58fd72acd0611131d3c7ff9fd6421084213322fa6bb2ede004441ddc5c05f0d192f009842e3d WHIRLPOOL 3a4724402415ee4dd365b17e457b11a988577fa21b27209b7dd2d539992b14ca83dcf95b79d1381aeee08bb8d036cc131be28465fe99b94a5f0333712c52e190
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160720.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160720.ebuild
new file mode 100644
index 0000000..b826ea7
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20160720.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2016 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/2016-07-20_00-02-33/zip/netbeans-trunk-nightly-201607200002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip
+	http://hg.netbeans.org/binaries/472A52636BE09823B4E5F707071B31FB990A7375-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-r16-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}"/472A52636BE09823B4E5F707071B31FB990A7375-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-r16-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="${D}"/${INSTALL_DIR}/modules/ext
+	pushd "${instdir}" >/dev/null || die
+	rm java-cup-11a.jar && java-pkg_jar-from --into "${instdir}" javacup javacup.jar java-cup-11a.jar
+	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 3957646..4763fae 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -54,6 +54,7 @@ DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570
 DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
 DIST netbeans-trunk-nightly-201607190002-src.zip 216613749 SHA256 412763dc00b1c15d23dd85c94de76503155ad6f402ddb2fb6fc40bd162e72de9 SHA512 37efb5947aeeecf1567fed864a28a907f261a7c251ad4de882660980c76248560da9f0be91dc6763767ed8aea7f57a68c1a403d429fbe4c1af5e3f27c0f85d45 WHIRLPOOL 27edad2d71b76784b0fba98bc15b4649616e1462edc174dc850bbe1782d341efd704115d1af5c8cfc56faa14d37d294dc1ce831118a4bb9e74e48add3a341062
+DIST netbeans-trunk-nightly-201607200002-src.zip 216623678 SHA256 08e39cc20bb2eff32d9298541073e9dfebdabfd0878d00f88bb6f896632783a5 SHA512 f3796b3548b714b4207cff52c0e5516dec1e23f176dadb13ee5d4dfe44014bd0692f1f8019569e68e50cdf33905cd0d3623bd01f12a69cf1c7dedf452f289e23 WHIRLPOOL fbbeb6bb0331e2c60fb546394dba8c8e0d2a54e9c807b6c9b30f256f68e8ce9039c558800821d5f38bc8d2428d1f3732c4160d53fc075f1ecc57113776491cf8
 EBUILD netbeans-platform-8.0.2.ebuild 5406 SHA256 98e9861da45ead0d2d975a0527315df5282870b2d7e71a089724d91c18852e81 SHA512 cadbe66132d3ad81f6d149e20731b558c11c529e2ec15b1fe47ff97d99a3f4b4612fa5c98c435c4ff979eaefab6702721db009a03162202c96b4b411cf9f872a WHIRLPOOL 9552948e8bbad308f4379eaae69d8c214da9fbfab87d75226949b69ddca3e68c2d36c4d05738196073e5b959ab0b764064c9186d421198937122aa4bdc4988dc
 EBUILD netbeans-platform-8.1.ebuild 9320 SHA256 4a03fc6a399aaab949edb3df7c629da5bc7ce6288d44dbc848097352c2b4ae3a SHA512 7015cb042dd4e371cdcad49838eb2e4109d1ec505ac618f3a6f98d4dce328ab34be90a3cb0820896bd75337a180a1bd9c91c842a143fdffdf033696d5f496402 WHIRLPOOL 8c5311df396a374bf9d8c994b37c5c9fe6aa3c82a9e9e0824a5caefb0006fd9b44f4fdddd387ee12da48592929d5c4dd7e7fb2d866c9ddaf76acf5b3adbe310e
 EBUILD netbeans-platform-9999_p20160619.ebuild 9520 SHA256 2bea95f0cf80a2f2f9d4063051704f828876b778ca9a0f4035d13f62a98ed19f SHA512 52efd3b75e7944200a54dbdaf70f449d84323f836393c34917570e1cadf938dee225e1396c5ae86f1f3f92de9dd0b9619338d51f61d5127b9c09d67076fd0a7f WHIRLPOOL 5b00e32a4a57a4f7d375239beabf897cd65ac9e4c00e10a45b26e6c9c1ff6beeeb4697bedf0e11b1bac5db0f4dbc1d9284cc922ec843d89688b64c9c8821f2d8
@@ -81,4 +82,5 @@ EBUILD netbeans-platform-9999_p20160716.ebuild 9520 SHA256 beead83e2a67d041641e0
 EBUILD netbeans-platform-9999_p20160717.ebuild 9520 SHA256 27288bd56f3cebc554e4b8790e3bd5607e8bb32771365bdba788df7dcdc65330 SHA512 e7ab57eac6b422f986c9f32d7f7d68ebb3eecf642c6e30b4110269972791bcbd0ecb27c30b72a960b13da39e0ede6a5a7255e51c731464d6bbddfb61b7ec8b3d WHIRLPOOL a1d1c7cfb60d2e114b227bab18a35f01e0b555b5c879444136935c34de829e512045e9ea813f34084515615fc11df536940a630190e26c8a8b9cc73f6676efd9
 EBUILD netbeans-platform-9999_p20160718.ebuild 9520 SHA256 88c120ae45fd0a1cfe2ebda9ddeafc6908f5cc7d876993fcd19b7a55b1ab5cc5 SHA512 635d836c864c6fd13626c2304562cd0ac2276bf8d4ccb88b8b3719cacf5f9ca8504ac090b48696616b0f3e3f4f5ad76af4844d996192aada6532c83003652b64 WHIRLPOOL 16f68d3443b7fcc76421bf359728902f638139a02197debd8cb59332ce9cc84021fb19160b0e19aa966c991f6d1d547b238215e56fcd7dd0a29f06b6383f339d
 EBUILD netbeans-platform-9999_p20160719.ebuild 9520 SHA256 18b0dcae2c73d3051d12b44595dc43743cdf907afa4192a9cd60046a40b9c9b2 SHA512 5558fe1df0af1e07d1f47077f37554ca90ac447cef05e79252428979a47770a14ba54ab2d4bac454b941f64f05feb7fb6c93a529d2f9d8718287839cd99e56f8 WHIRLPOOL 4a7cd25bde3e6cf546a4fd94e088594baba7e6aedbb0e7fe097c15e35faf48dd0e0c8fbf59a88f8db1a1eb04bcce437b16ef3d82b759ba028705243f9904de52
+EBUILD netbeans-platform-9999_p20160720.ebuild 9520 SHA256 ef3e5838a78f6911a7020f5ff45375429b61177547eaa783a44a14126e43724d SHA512 634a0d7e7d0ba78bab07c676efda1569c3a76d310f67b1653092c4707835b4552bb8144387cde63d0188fd0d86d0a08ef9ec12d4ceb2edb48e96405ff08287e7 WHIRLPOOL 007cf27cd4c2f49835af4e73a75c4207af624496114d4fc06f0a10c920bc64da19166e6a74629702801879efa34baf8df3eb89719534b70c0d89099bc7de5c9c
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160720.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160720.ebuild
new file mode 100644
index 0000000..5d18973
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20160720.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2016 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/2016-07-20_00-02-33/zip/netbeans-trunk-nightly-201607200002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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/771CDCA0A3F2F3CE818E20CC2D707A3592422485-ko4j-1.3.jar
+	http://hg.netbeans.org/binaries/A3085BAA78C8EE7F55081E70C79ABE04CA38CE93-net.java.html-1.3.jar
+	http://hg.netbeans.org/binaries/7FC91530F4395FA0D58F9539F3B40858E766BFA3-net.java.html.boot-1.3.jar
+	http://hg.netbeans.org/binaries/5C992BAEC0111EE293BD44173140A9D8EC860765-net.java.html.boot.fx-1.3.jar
+	http://hg.netbeans.org/binaries/BF6C9BB0FFB78A6B846ECAEB880C460D883B4F72-net.java.html.boot.script-1.3.jar
+	http://hg.netbeans.org/binaries/10E4214A89082C70FCF9F721953001C0932037BA-net.java.html.geo-1.3.jar
+	http://hg.netbeans.org/binaries/D97314CE1869DD3B8B8942256A70673E2991C9DD-net.java.html.json-1.3.jar
+	http://hg.netbeans.org/binaries/6BDCE8349F83CD02F2942D4FBFA86A81A129F42A-net.java.html.sound-1.3.jar
+	http://hg.netbeans.org/binaries/E5DDC5E827D3D62E7BE9F7E32927CA01F2839971-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
+	http://hg.netbeans.org/binaries/CEC2829EC391CB404AD32EB2D08F879C418B745B-xhr4j-1.3.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+# oracle-jdk-bin is needed for now because of javafx which is not packaged separately yet
+# [parseprojectxml] Distilling /var/tmp/portage/dev-java/netbeans-platform-9999_p20151108/work/nbbuild/build/public-package-jars/org-netbeans-libs-javafx.jar from [/var/tmp/portage/dev-java/netbeans-platform-9999_p20151108/work/nbbuild/netbeans/platform/modules/org-netbeans-libs-javafx.jar, /usr/lib64/icedtea8/jre/lib/ext/jfxrt.jar]
+# [parseprojectxml] Classpath entry /usr/lib64/icedtea8/jre/lib/ext/jfxrt.jar does not exist; skipping
+#  [nbmerge] Failed to build target: all-api.htmlui
+
+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"
+DEPEND="dev-java/oracle-jdk-bin:1.8[javafx]
+	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.8"
+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-r16-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}"/771CDCA0A3F2F3CE818E20CC2D707A3592422485-ko4j-1.3.jar o.n.html.ko4j/external/ko4j-1.3.jar || die
+	ln -s "${DISTDIR}"/A3085BAA78C8EE7F55081E70C79ABE04CA38CE93-net.java.html-1.3.jar net.java.html/external/net.java.html-1.3.jar || die
+	ln -s "${DISTDIR}"/7FC91530F4395FA0D58F9539F3B40858E766BFA3-net.java.html.boot-1.3.jar net.java.html.boot/external/net.java.html.boot-1.3.jar || die
+	ln -s "${DISTDIR}"/5C992BAEC0111EE293BD44173140A9D8EC860765-net.java.html.boot.fx-1.3.jar net.java.html.boot.fx/external/net.java.html.boot.fx-1.3.jar || die
+	ln -s "${DISTDIR}"/BF6C9BB0FFB78A6B846ECAEB880C460D883B4F72-net.java.html.boot.script-1.3.jar net.java.html.boot.script/external/net.java.html.boot.script-1.3.jar || die
+	ln -s "${DISTDIR}"/10E4214A89082C70FCF9F721953001C0932037BA-net.java.html.geo-1.3.jar net.java.html.geo/external/net.java.html.geo-1.3.jar || die
+	ln -s "${DISTDIR}"/D97314CE1869DD3B8B8942256A70673E2991C9DD-net.java.html.json-1.3.jar net.java.html.json/external/net.java.html.json-1.3.jar || die
+	ln -s "${DISTDIR}"/6BDCE8349F83CD02F2942D4FBFA86A81A129F42A-net.java.html.sound-1.3.jar net.java.html.sound/external/net.java.html.sound-1.3.jar || die
+	ln -s "${DISTDIR}"/E5DDC5E827D3D62E7BE9F7E32927CA01F2839971-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
+	ln -s "${DISTDIR}"/CEC2829EC391CB404AD32EB2D08F879C418B745B-xhr4j-1.3.jar o.n.html.xhr4j/external/xhr4j-1.3.jar || 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-r16-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 javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.jna/external jna jna.jar jna-4.2.2.jar
+	java-pkg_jar-from --into libs.jna.platform/external jna platform.jar jna-platform-4.2.2.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="${D}"/${INSTALL_DIR}/modules/ext
+	pushd "${instdir}" >/dev/null || die
+	rm hamcrest-core-1.3.jar && java-pkg_jar-from --into "${instdir}" hamcrest-core-1.3 hamcrest-core.jar hamcrest-core-1.3.jar
+	rm jhall-2.0_05.jar && java-pkg_jar-from --into "${instdir}" javahelp jhall.jar jhall-2.0_05.jar
+	rm jna-4.2.2.jar && java-pkg_jar-from --into "${instdir}" jna jna.jar jna-4.2.2.jar
+	rm jna-platform-4.2.2.jar && java-pkg_jar-from --into "${instdir}" jna platform.jar jna-platform-4.2.2.jar
+	rm junit-4.12.jar && java-pkg_jar-from --into "${instdir}" junit-4 junit.jar junit-4.12.jar
+	rm osgi.cmpn-4.2.jar && java-pkg_jar-from --into "${instdir}" osgi-compendium osgi-compendium.jar osgi.cmpn-4.2.jar
+	rm osgi.core-5.0.0.jar && java-pkg_jar-from --into "${instdir}" osgi-core-api osgi-core-api.jar osgi.core-5.0.0.jar
+	rm swing-layout-1.0.4.jar && java-pkg_jar-from --into "${instdir}" swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
+	rm testng-6.8.1-dist.jar && java-pkg_jar-from --into "${instdir}" testng testng.jar testng-6.8.1-dist.jar
+	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 86ae1dd..9ede6f2 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570
 DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
 DIST netbeans-trunk-nightly-201607190002-src.zip 216613749 SHA256 412763dc00b1c15d23dd85c94de76503155ad6f402ddb2fb6fc40bd162e72de9 SHA512 37efb5947aeeecf1567fed864a28a907f261a7c251ad4de882660980c76248560da9f0be91dc6763767ed8aea7f57a68c1a403d429fbe4c1af5e3f27c0f85d45 WHIRLPOOL 27edad2d71b76784b0fba98bc15b4649616e1462edc174dc850bbe1782d341efd704115d1af5c8cfc56faa14d37d294dc1ce831118a4bb9e74e48add3a341062
+DIST netbeans-trunk-nightly-201607200002-src.zip 216623678 SHA256 08e39cc20bb2eff32d9298541073e9dfebdabfd0878d00f88bb6f896632783a5 SHA512 f3796b3548b714b4207cff52c0e5516dec1e23f176dadb13ee5d4dfe44014bd0692f1f8019569e68e50cdf33905cd0d3623bd01f12a69cf1c7dedf452f289e23 WHIRLPOOL fbbeb6bb0331e2c60fb546394dba8c8e0d2a54e9c807b6c9b30f256f68e8ce9039c558800821d5f38bc8d2428d1f3732c4160d53fc075f1ecc57113776491cf8
 EBUILD netbeans-profiler-8.0.2.ebuild 3402 SHA256 8021dea620d1bc26214ff0ec285f8061c24693dd28a62a97a48ac3223707e920 SHA512 2660390337a973256b1aac3a02b14e16782c230fa2714ae695213b0cabc0eb60621c6a1ae234f9e57259a19de22a87447f9a89ab846bd59bcedd2be313c35072 WHIRLPOOL 5d1053ded03143b2de05b64cfbe59b515cb786d60bfa65566be795567bfaf5feb88a2f8e7161a05da512fafd523f871778d5ddeb3c6b89fc95885096e379f65d
 EBUILD netbeans-profiler-8.1.ebuild 3426 SHA256 81f8b3b135f021a2dbe7b5ccb53fc7fcf79908ab83ef14ca0e912732b7fb4b53 SHA512 210bc0c5214aa8f79f559cccf69f1ed885dd2d14dc55cd17bd89c8a7f04f1a76de5b414426337b2ba6e99576850f0753f13e41e0f424b3f0adc58001dffc217a WHIRLPOOL 293d12a03294532dc9ce10503b030282cb636f08af6300ea796885eb6a3fe36c9d37c2a07138d03e9c4d45b31352ce160901a96f659f26d50a0fe5caee3bf0fa
 EBUILD netbeans-profiler-9999_p20160619.ebuild 3472 SHA256 19af1b1244f0e3ffb19c71bdf9eaf6a3c73793f70ea79e2822d3574fc9a3ed0f SHA512 2e503b285d681f996ee71bf7b9edee711566a8c30a6c7df68984c08ae33058215fd2df41df4667f4c9714a68d039fcf743c57722f6974658bc469b226688efc8 WHIRLPOOL 27138ef985f80a5b6ea94e127e7b00c693c8002912202c623e337c121a2cad02cb9380a503872e08623db6ae72c9f3aa32b4e63be2ebe2a2de593dc62298fe26
@@ -55,4 +56,5 @@ EBUILD netbeans-profiler-9999_p20160716.ebuild 3472 SHA256 86e23ce300ec6573cb114
 EBUILD netbeans-profiler-9999_p20160717.ebuild 3472 SHA256 ca94edf54cb5dcc24aa4736c13c9d31eeb64b27014cc84e5369b45fe329113be SHA512 88f7013c3e3181a998be8bc5bf1a77af2f392d6efa4b5b65c47a167b241255eec57b159fbf355e6570c01c2aceb56bb1e6e92f3689a6031e4915194b4a7c3a91 WHIRLPOOL 35095660c2403e167bf207bb8d277c2a1ca31ca36b18ac442dac9565576962ae5b89c687661d409132d336737810fb08f420166fed4008be0bf62d35f991a626
 EBUILD netbeans-profiler-9999_p20160718.ebuild 3472 SHA256 72318a0ec7774e39ca877fd154c64dbd09eb7db5967d21a0a7d124169541eae3 SHA512 acb5ea7e404f23030f5a09e52beee7f397b9182b04071e78020f91d034ef8c4c8a30b64cd168a3732401c6f4d4879991e8e26a8a89304ce3af30097e4d51653c WHIRLPOOL 2da7ee55f5b50d11363cd0294e74e2adf00e084190b784d080d95d0adf14c139cddc58d7e7bc3c974f105c4af3a3effa9a8e3451c31c52252218a3942dc7155f
 EBUILD netbeans-profiler-9999_p20160719.ebuild 3472 SHA256 c02ee61d3eb4910ba1ed825913bc7b99d9b049a183b960cf7db52713d10ef398 SHA512 5a75167fe2db54467d06b7da3c9954c670cb12d7310d68c5a6fc3318f1a0528374466399fcf43899ffdc52e30fad6e68e1db2dafce012419669c88a6d6fc1bed WHIRLPOOL a6b9744a5a2825dd2a3349af3a4d5d529aea8a728faa8b8138298546ac95803dbe2185b8ea47cfbc2353f69ede544c9de34f5af5d5aa34acb9c4a7e7a8097af0
+EBUILD netbeans-profiler-9999_p20160720.ebuild 3472 SHA256 480f46ebacfb513a42cadca73b37fc3bed4f90e9126b69fe686403ca75ca1612 SHA512 0d1558a1048f5a5ad7e020c62bcc0e415ac09483c0a88c69e42a8b78ecc31e3422c59d539680f2eb0c13d4b5124f0ae30eca471985dfb6a8d1f05d64eb1c252d WHIRLPOOL 98305cee23dc82c43a1c41fdd84f5037ef3207a8fce205e3454901a349ef3d12664b9ff607d4c18028c6abe77862bd9c9e99fe34e8765df112368ebbefcb48e9
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160720.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160720.ebuild
new file mode 100644
index 0000000..838d41c
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160720.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2016 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/2016-07-20_00-02-33/zip/netbeans-trunk-nightly-201607200002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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-r16-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-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 3b4ffd2..63a0147 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -53,6 +53,7 @@ DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570
 DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
 DIST netbeans-trunk-nightly-201607190002-src.zip 216613749 SHA256 412763dc00b1c15d23dd85c94de76503155ad6f402ddb2fb6fc40bd162e72de9 SHA512 37efb5947aeeecf1567fed864a28a907f261a7c251ad4de882660980c76248560da9f0be91dc6763767ed8aea7f57a68c1a403d429fbe4c1af5e3f27c0f85d45 WHIRLPOOL 27edad2d71b76784b0fba98bc15b4649616e1462edc174dc850bbe1782d341efd704115d1af5c8cfc56faa14d37d294dc1ce831118a4bb9e74e48add3a341062
+DIST netbeans-trunk-nightly-201607200002-src.zip 216623678 SHA256 08e39cc20bb2eff32d9298541073e9dfebdabfd0878d00f88bb6f896632783a5 SHA512 f3796b3548b714b4207cff52c0e5516dec1e23f176dadb13ee5d4dfe44014bd0692f1f8019569e68e50cdf33905cd0d3623bd01f12a69cf1c7dedf452f289e23 WHIRLPOOL fbbeb6bb0331e2c60fb546394dba8c8e0d2a54e9c807b6c9b30f256f68e8ce9039c558800821d5f38bc8d2428d1f3732c4160d53fc075f1ecc57113776491cf8
 EBUILD netbeans-webcommon-8.0.2.ebuild 4723 SHA256 e2ba39cb6f22c990acf9a492eac5707f130382d56f9bc1e3636e82cbe4d61938 SHA512 61955d38f829b3ed54bc5cb9a71da07f05676a2bf7219fa8073aeee0f0e2d0e73f7aa6ec1636be39fb071d3d2b9de7ceb813a247a61961874f4cc78697d4e568 WHIRLPOOL 1a272650fc2394716a790b79cb85a9322929c7cc96ea4776cc639fb869c5b536140dbdc632b1a8aa9cb1fc8e740050125c2ebe9390de7a8f4207e88e24924206
 EBUILD netbeans-webcommon-8.1.ebuild 4945 SHA256 55c57b638481134d659763154a7820467a9866707112cba0e60dbd9ba8cd2840 SHA512 a98987535f60b533bf0df701f83693a58584dfa9a10d5c8646186165d884fb7e8a3348ec77cbf25d1a8cc8cfd947bf54cdb30d251ae1a3fffb74947070d76579 WHIRLPOOL 36fe1b7b9b34a02fcda227aaeebed8a33562e6fe4a014c78e9a464d709bf5120322a35bd54a0ffa15c4dd4f3ae605cf6fc2d35c5652f7162ae646c61ad69210a
 EBUILD netbeans-webcommon-9999_p20160619.ebuild 6242 SHA256 81033852b76d0de2e2031c3dc1cc4bc1149a297b12d53a871a715bbb77e58c72 SHA512 9fc9deb4ba086076c38c75bf4edeed787fd851e5cd6f9dee53d57dda5f63ba7a6f5b295c7f81e9408fa674817901c51c4a22089eef5f483ae8f9499cbfe422d3 WHIRLPOOL c8c3c187f5668db4bc1fb3445e11e706ffc6a32f912f6b98f4d2a3f4b90aa6f7c50d8a03a1386683215716b2bf01dc03b1be2872eda891921a73a1d058c909b8
@@ -80,4 +81,5 @@ EBUILD netbeans-webcommon-9999_p20160716.ebuild 6242 SHA256 71af932f532f66cb2098
 EBUILD netbeans-webcommon-9999_p20160717.ebuild 6242 SHA256 ee7200046af66189d8efd1eaa7b3aaa858dc481fc84d14821f33719b6c2a5c24 SHA512 06db68d025dd8a5fcf3a4779154893a3d174d282d157f7b5edd6802a28c405c2890814b39b7b18061093b40675ded4ddf6cad35610ed116b3719228cfe879aea WHIRLPOOL 251b4db4fcbd939a0f5a017333e33a5635cfc7baf46a0eccbfd8f3071a53aaac4497d04286f213375b8daa0a8daed375c21d86dda477c84f2065453cefefd530
 EBUILD netbeans-webcommon-9999_p20160718.ebuild 6242 SHA256 29ef334501203f367873de14ff1f88326f5cae0311f6f44d61a7569f670a4650 SHA512 9cac5c9ff7e8e1afc69e4ff73891e5dd9a9c8858a50a35f45226f03e024c3ec73818977dc54a672c21b41b1c7b097700c5e7046504276b40740f0543399a3127 WHIRLPOOL 6645c07da4d3c9496f44f5843374d81b3747f5491faa424b01c23e344ab30ae888958bcfae41222dfe4ee555a9e434c6535c0fa0009a8faf40b6d38fd6814269
 EBUILD netbeans-webcommon-9999_p20160719.ebuild 6242 SHA256 51b9e60cf60236e28558683374493c26b397ebf14035294466433a7f701a8b2d SHA512 21d4386331b70a1fa40eeb937dca104f1df0d0e07157ce89000065360fe1f288ce35dfd986260e64c0c239c960bef8495badc8f21d0441f1869f659e8c32124c WHIRLPOOL d721d1e487569b0040ff47d6a5a869e691fef486bdf3fe97ed5bbc94dde66b26efeb66850e8a0fce9c157a54f301532e1b294c69d310251fa316802f8879fe49
+EBUILD netbeans-webcommon-9999_p20160720.ebuild 6242 SHA256 a0b41d32e6530fa4704f3c98f10d52a95aab58b752b6813b1f34ad49d6684044 SHA512 6127b3fddbdfc9251fc4ab5ce2323adf9ce776101779944e57b47bf808f7e41a356371787ea3c25e875f4ad9152878c41aa4ccec7af675119e2832f109f653ce WHIRLPOOL 635f82637ba1020b8e51ab2c65d58df3c207e49b6231d97ae02b43b6e9d348df2baf941d26d597778f97af3c186df452640e6a7aade64aec17474de0f0d223d8
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160720.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160720.ebuild
new file mode 100644
index 0000000..ca5097b
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160720.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2016 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/2016-07-20_00-02-33/zip/netbeans-trunk-nightly-201607200002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/49154F217F990DBE818AFC30642D1AC1A2E6CE89-com.oracle.js.parser.jar
+	http://hg.netbeans.org/binaries/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar
+	http://hg.netbeans.org/binaries/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim
+	http://hg.netbeans.org/binaries/C8EEAB10E4539BEAF97476EBA252BD4B40377FA9-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/0929AC5F40B5A8667021408748D64F30F77B3165-libiDeviceNativeBinding.dylib
+	http://hg.netbeans.org/binaries/2A38DA3DB5D36DBBDC0B03990B46810F72430D5E-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/C1BB9FF4232248B0054E5A26A33474A251EA19CB-libusbmuxd.2.dylib
+	http://hg.netbeans.org/binaries/D4BD3F62EADB61216A47EF96B3152EDD35A56005-ojetdocs-1_0_0.zip
+	http://hg.netbeans.org/binaries/1EFED55F8C442E4DB1C2338A5C35D494364F9ECD-ojetdocs-1_1_2.zip
+	http://hg.netbeans.org/binaries/CA8F6968FED0BE20E786C70CF9B603F4D7B66C68-ojetdocs-2_0_0.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	dev-java/jna: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-r16-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/49154F217F990DBE818AFC30642D1AC1A2E6CE89-com.oracle.js.parser.jar libs.nashorn/external/com.oracle.js.parser.jar || 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}"/C8EEAB10E4539BEAF97476EBA252BD4B40377FA9-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}"/0929AC5F40B5A8667021408748D64F30F77B3165-libiDeviceNativeBinding.dylib cordova.platforms.ios/external/libiDeviceNativeBinding.dylib || die
+	ln -s "${DISTDIR}"/2A38DA3DB5D36DBBDC0B03990B46810F72430D5E-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}"/C1BB9FF4232248B0054E5A26A33474A251EA19CB-libusbmuxd.2.dylib cordova.platforms.ios/external/libusbmuxd.2.dylib || die
+	ln -s "${DISTDIR}"/D4BD3F62EADB61216A47EF96B3152EDD35A56005-ojetdocs-1_0_0.zip html.ojet/external/ojetdocs-1_0_0.zip || die
+	ln -s "${DISTDIR}"/1EFED55F8C442E4DB1C2338A5C35D494364F9ECD-ojetdocs-1_1_2.zip html.ojet/external/ojetdocs-1_1_2.zip || die
+	ln -s "${DISTDIR}"/CA8F6968FED0BE20E786C70CF9B603F4D7B66C68-ojetdocs-2_0_0.zip html.ojet/external/ojetdocs-2_0_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-r16-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.2.2.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/webcommon >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+	grep -E "/webcommon$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/webcommon
+}

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index eb98d93..0a0650c 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570
 DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
 DIST netbeans-trunk-nightly-201607190002-src.zip 216613749 SHA256 412763dc00b1c15d23dd85c94de76503155ad6f402ddb2fb6fc40bd162e72de9 SHA512 37efb5947aeeecf1567fed864a28a907f261a7c251ad4de882660980c76248560da9f0be91dc6763767ed8aea7f57a68c1a403d429fbe4c1af5e3f27c0f85d45 WHIRLPOOL 27edad2d71b76784b0fba98bc15b4649616e1462edc174dc850bbe1782d341efd704115d1af5c8cfc56faa14d37d294dc1ce831118a4bb9e74e48add3a341062
+DIST netbeans-trunk-nightly-201607200002-src.zip 216623678 SHA256 08e39cc20bb2eff32d9298541073e9dfebdabfd0878d00f88bb6f896632783a5 SHA512 f3796b3548b714b4207cff52c0e5516dec1e23f176dadb13ee5d4dfe44014bd0692f1f8019569e68e50cdf33905cd0d3623bd01f12a69cf1c7dedf452f289e23 WHIRLPOOL fbbeb6bb0331e2c60fb546394dba8c8e0d2a54e9c807b6c9b30f256f68e8ce9039c558800821d5f38bc8d2428d1f3732c4160d53fc075f1ecc57113776491cf8
 EBUILD netbeans-websvccommon-8.0.2.ebuild 2651 SHA256 a195b307847c466dbb5f46eb04240358ce3c92cadeecb8fda1562304de46820f SHA512 933626bd2073f58e3508180c042e237b9e61ba6f3c992cf37ea43978ac2fc972d2dcc3ef0b5c390b3867296e197ed2605c43452c98e36acf0982e7338b6d1eb7 WHIRLPOOL c3db8f0b50116d0129f50778e1961166e76601d8c165e20e73d75c91b02c8a095067e0f13e18178d849dd29adcedaeee7d3e0e62f99be592d7ce159fd6af632e
 EBUILD netbeans-websvccommon-8.1.ebuild 2675 SHA256 c9ff3d598c5f76c2b69dd5488a80c63025acc3cd0cc99321a0e84a493502df36 SHA512 89daec44b860aa8011d9e5533230f89dad7bcc50a119664122d2718db3e53501d1319ae4b27eac1d71596671e9a7c21315a641346e6cbab22edb3c7232bf5ce3 WHIRLPOOL 521521094b396c98687e2054742e4c019023045f19b01a6cc3a5f826f4cabe9448254db8b834448f3b33368c76dd667942554e1bae459c55de2c571bb5cfb4f5
 EBUILD netbeans-websvccommon-9999_p20160619.ebuild 2721 SHA256 b3ea72eea2daee4050d15be4651ff7737eaefb858c8377a6e0157f771c99cf0f SHA512 84eedceb57c9426e208bf963849c1c795518f3226374b74e112c34f37027b9927a91d7ece6ee519f92bc2feed8620acd74447d8255df180d61780d2d068bbea7 WHIRLPOOL c902df360ecbab629270ca75265d2358af4276d2500f3af92333503d123512fff1467ff4d34dc135d38180e73367968c2a289fda058348c8728f7625d86b3da2
@@ -55,4 +56,5 @@ EBUILD netbeans-websvccommon-9999_p20160716.ebuild 2721 SHA256 25201748f1c41c55c
 EBUILD netbeans-websvccommon-9999_p20160717.ebuild 2721 SHA256 1a6d30ed67c610f79628c86c79bb73657dd57949bbb12201a01442a2deff867f SHA512 8aa2594ac7ff48e41c21cc884e4b2eb751cf915e5f7aa08a1cfaa5859649efccd2418e85a3e1f428b94b72a3d218144094bf8226aec4d54fd91fd002d246ec81 WHIRLPOOL b5372ebbb32502083aacd1c5fbe7512c2722ca7ed12f39ec9cad62f95a4aa86ba6f0478d6a151377596716a7b15f03558fd36d72b89573af3e93b975a562decf
 EBUILD netbeans-websvccommon-9999_p20160718.ebuild 2721 SHA256 8bf6f2b49e2dcd05969d9f616ff18f8c926ad705e8b9e72de65d229122e847fe SHA512 944033374ebd5203c7bb96495bd16e869e53089db6380e25f9a358c25315cf6bf7e4e7c4060ca4c45c42bd1a99f4d91f1be041405025d5b8689ec22fe77f840b WHIRLPOOL ec6f3d388d07930a81500da52dc135059eb6cdd698cb24ee63bc4d7d52801302dc13426f22662737d387883f6d06e95b831cdb1c723096db9968d2ae65d1264b
 EBUILD netbeans-websvccommon-9999_p20160719.ebuild 2721 SHA256 20b2ca9b244271635f2dfbd6bc795cd59d16ae5184c47756ff09eb2259ef85d9 SHA512 6f57cf7eb5b53f1c20b338e7cdccbcc2cb6c4c97f550900c1997792f6c65c04596651cf9d039321b1e63e48b18dbea069046f020e5c0e5b23a0f57beedf9d8bc WHIRLPOOL cc8b6300f397a7e9040be07682b29e022df39ad5d1f3000ff76784821df782b80d700da03e50b172f517371fd47b7a523836483a1d2c5a00764e02b871948ae3
+EBUILD netbeans-websvccommon-9999_p20160720.ebuild 2721 SHA256 8d21dc980ae62bdb156b500e0c36371210dc5bd9d7e54a2f19e5ee69a79847f9 SHA512 1c9caa402be2bc95bc2e146b1cb6e813daa659e54e95d761437e0ded9d7cc078aaecf2165b817096ecec807b77aa739452b8ff9c99efe9c139b72b637902823e WHIRLPOOL 823964ca169f52cf428b69a7d547bf905da689ced4aa6edc8d8d81a83310f1369f2fac6791d7b453eea4084c13ddf9a9476ba440dfe8d40ad2bae10dea883046
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160720.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160720.ebuild
new file mode 100644
index 0000000..18bbf44
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160720.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2016 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/2016-07-20_00-02-33/zip/netbeans-trunk-nightly-201607200002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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-r16-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-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 314f555..5387261 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201607160002-src.zip 216593228 SHA256 5536b9fc1af570
 DIST netbeans-trunk-nightly-201607170002-src.zip 216594095 SHA256 0bf43d18cc7b83958473239a4137757a5d3d590bf97d02fc56753fd02c61b96e SHA512 47019181dd37264023ffb953a3d8cdbbd603b1a93d84e7ee19321f5453ecefa06950d82d7bbaf528c7fb60faa1e6b05fe4d75edba4c5e0ed393da5118bc7c89d WHIRLPOOL 6c7e46ce0538fb82bb536850e62a449c09c122d801fe3686d270931391b027eb120baabc794bd61b90aefd42f1fee709a0a4f6552de2a75e0a9f2376aa810c72
 DIST netbeans-trunk-nightly-201607180002-src.zip 216594114 SHA256 28eaaf75149f3263b789473a795793a6e3e065248f746ff989843e9799f1568e SHA512 97bd9d87142bfc4cf4803d60083591e6cd95aecd0096394df2a69e807ef889e55910ff05637d42f7bd85317b96e2758bc581153e1b367e94c68b29d6783f0d70 WHIRLPOOL aa2ae749038a4f8e94f795203c5a0be9a8118c751db9ee04041b402d6533e78fe48659d36f754ef5868cca1fa4fe86c1d42298b5d0de2def3bbb2ece24c7d271
 DIST netbeans-trunk-nightly-201607190002-src.zip 216613749 SHA256 412763dc00b1c15d23dd85c94de76503155ad6f402ddb2fb6fc40bd162e72de9 SHA512 37efb5947aeeecf1567fed864a28a907f261a7c251ad4de882660980c76248560da9f0be91dc6763767ed8aea7f57a68c1a403d429fbe4c1af5e3f27c0f85d45 WHIRLPOOL 27edad2d71b76784b0fba98bc15b4649616e1462edc174dc850bbe1782d341efd704115d1af5c8cfc56faa14d37d294dc1ce831118a4bb9e74e48add3a341062
+DIST netbeans-trunk-nightly-201607200002-src.zip 216623678 SHA256 08e39cc20bb2eff32d9298541073e9dfebdabfd0878d00f88bb6f896632783a5 SHA512 f3796b3548b714b4207cff52c0e5516dec1e23f176dadb13ee5d4dfe44014bd0692f1f8019569e68e50cdf33905cd0d3623bd01f12a69cf1c7dedf452f289e23 WHIRLPOOL fbbeb6bb0331e2c60fb546394dba8c8e0d2a54e9c807b6c9b30f256f68e8ce9039c558800821d5f38bc8d2428d1f3732c4160d53fc075f1ecc57113776491cf8
 EBUILD netbeans-8.0.2.ebuild 7167 SHA256 80e31382a0ceb680c2a055dc5c78c1dce8edf32c50bbae6a1c14a2c568492519 SHA512 0ab466ca247ec953896ef0ab3b01b43ffea3a9f37e9bcdacecfc0476226d45cef35e4ddf27f2b85628d9512ed304e6cc6cfe963a5e547217d08cad400eefc4b9 WHIRLPOOL d09668e669f4f8d7987ab02cf26104fc6e54ba29b8b497fe0013cc8816a2d7560c99e6e1b02db77ead872d5240b84c09e3fabbc3465587d1d1ca7d6fcae114c1
 EBUILD netbeans-8.1.ebuild 6891 SHA256 22a19f05bdcea85475c0451df867367b69363bfbc6280f78b087248d9f8e9513 SHA512 812b6cdae3e5feaf37db5ca8b5efa1b374d5492f11cfa1df2adbd3617986cdca6a79d2d4dffd024c8c48492fc8a21704190242f5741c5699b12070620cea2c87 WHIRLPOOL baf5f750574c01effa0d02c72194139fb2757be932054f4900ceb0534607064af10f2b5b38063ff2cca34e75ab5be23d00c7e5d90d1c724339666d20f1bb10d3
 EBUILD netbeans-9999_p20160619.ebuild 6939 SHA256 da8991b33d26229f4c62b77cdbe12cf66306c2d891c109f7c471857248cecf62 SHA512 d5ef59d47f653b5fc5484c834d5571fded1d98645d0364790b6bce2e0f11f86133aa2649c7ffd8089769e6d2e2fff32025f8fd60cfd5385bc03d731321d00a43 WHIRLPOOL 3c55665ad0770d827d63709124f4bd70d61b7c3e099acba84fcdebff685427cb118322750d175baaaeb0a376e5251bdef7df2b935bd6640eebae4db52dac496c
@@ -58,4 +59,5 @@ EBUILD netbeans-9999_p20160716.ebuild 6939 SHA256 140c1597f86de88607f46d0182bf60
 EBUILD netbeans-9999_p20160717.ebuild 6939 SHA256 d5fd90c55429197f77bedf0badf303301cf5f03d9add4aab004b400a0c7cfb4d SHA512 d227f40bbc923f37d593ba7845027b4c3d1f1faf4dfc57b788d7ec9a0cf9535b49ed4dbecfcc05faf415828f7ad26165ee4fdb2b3b67829187e8532815666993 WHIRLPOOL 03ed806129b4f038798a2afd4242a3e0d1a6cd28f79b18ac0de8500f523a02598746b1b703829a3c1509451edd5cacd21d1ab4e4c2a20e5d50ef489e4e12a5eb
 EBUILD netbeans-9999_p20160718.ebuild 6939 SHA256 a10ebfc28899d769c6d6a3837f9c48b193a553e1dafe530eb1019bb3d25e48f7 SHA512 56ce24913ba114c730acbad124fc37ca729c812affde20500397276edbee0ebc0124f57115ded653dc51e81cd5a706dfd470d9c2c5406f5cc4f5f1b341bd6a54 WHIRLPOOL 63f15c10b004a59eb538d086be71d53610905e41ee9b6620cff814d361e3eb22335ca7f6e95740c7ca6742676e33a6d3de294e82c0a573c3e2a810026334c028
 EBUILD netbeans-9999_p20160719.ebuild 6939 SHA256 f220fa90e2c05001b4692c1a5d97a0ee9aa268aba9e9f3a8284fa7a6a384c8d4 SHA512 f7b5f237231ee0b9267dac841349f767c61a3b9fa783a6273056a45cfc6c9f8f002a799a729ac85101f631fa6ac3b4e0bbfdbdc0b0914b60af7945f3b5d5245a WHIRLPOOL 827a8190f3b49c8f9f7714ac76596c46ca93cd0f41360a68825fc83b251d313caf5bad5b9f1595136f42e2ece14b79053b448f9f87b0dd8ebb7fc242dc023835
+EBUILD netbeans-9999_p20160720.ebuild 6939 SHA256 798afa2ad73f1e2146c097d4f8e4392131d22e928aa6de0fa03097ef080c1df0 SHA512 9cd879c98f960087e7c9d095a5024f856aaf6906f7f34178f3db8f2b18cf728158f442bbda3b758e2a727d0b4f51788c4eff4e9cb95d0188ae79c158100edc81 WHIRLPOOL c7c6271433c0ab8fc9dc75eb1a0cd6fec247463a0cb06c2d987c75c9d307e89a8ac942a40da3c8a6c500dee78ce18874b5bb0d9d2335e18d4d35112a8c5f02ac
 MISC metadata.xml 329 SHA256 8aeaf2a0228f15c2e4140f401b30f083509bd99d0a578873069f3595cd8555f3 SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640 WHIRLPOOL 799a9b79b1b447bda9631f67e2dfaf722376740e1d2037796528a05f9745eeed00d9990a74a65ce09f74bc5e1d60a887abde540c3c62487d7dd49b8377c15834

diff --git a/dev-util/netbeans/netbeans-9999_p20160720.ebuild b/dev-util/netbeans/netbeans-9999_p20160720.ebuild
new file mode 100644
index 0000000..f64d186
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20160720.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2016 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/2016-07-20_00-02-33/zip/netbeans-trunk-nightly-201607200002-src.zip"
+PATCHES_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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_ar_SA? ( ${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_es_CO? ( ${ALL_URLS} )
+	linguas_fil? ( ${ALL_URLS} )
+	linguas_fr? ( ${ALL_URLS} )
+	linguas_gl? ( ${ALL_URLS} )
+	linguas_hi_IN? ( ${ALL_URLS} )
+	linguas_id_ID? ( ${ALL_URLS} )
+	linguas_it? ( ${ALL_URLS} )
+	linguas_ja? ( ${ALL_URLS} )
+	linguas_ko? ( ${ALL_URLS} )
+	linguas_lt? ( ${ALL_URLS} )
+	linguas_nl_BE? ( ${ALL_URLS} )
+	linguas_nl_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_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_ar_SA
+	linguas_bg
+	linguas_ca
+	linguas_cs
+	linguas_de
+	linguas_el
+	linguas_es
+	linguas_es_CO
+	linguas_fil
+	linguas_fr
+	linguas_gl
+	linguas_hi_IN
+	linguas_id_ID
+	linguas_it
+	linguas_ja
+	linguas_ko
+	linguas_lt
+	linguas_nl_BE
+	linguas_nl_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_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}" = "fil" ]] ; then
+			lang="fil_PH"
+		elif [[ "${lang}" = "gl" ]] ; then
+			lang="gl_ES"
+		elif [[ "${lang}" = "id_ID" ]] ; then
+			lang="in_ID"
+		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-r16-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-r16-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_id_ID ; then
+		einfo
+		einfo "You selected Indonesian locale which has locale code in:ID in Netbeans."
+	fi
+}


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

end of thread, other threads:[~2016-07-20  8:51 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-16  9:05 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-platform/, dev-java/netbeans-harness/, Miroslav Šulc
  -- strict thread matches above, loose matches on Subject: below --
2016-07-20  8:48 Miroslav Šulc

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