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

[Miroslav Šulc]

commit:     0183a9c7818d1e5fd544222b33d0e9b7bffe5f2e
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  6 08:28:04 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Oct  6 08:28:04 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=0183a9c7

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.3.1

 dev-java/netbeans-apisupport/Manifest              |   2 +
 .../netbeans-apisupport-9999_p20161006.ebuild      |  99 ++++++
 dev-java/netbeans-cnd/Manifest                     |   2 +
 .../netbeans-cnd-9999_p20161006.ebuild             | 115 +++++++
 dev-java/netbeans-dlight/Manifest                  |   2 +
 .../netbeans-dlight-9999_p20161006.ebuild          |  89 +++++
 dev-java/netbeans-enterprise/Manifest              |   2 +
 .../netbeans-enterprise-9999_p20161006.ebuild      | 254 +++++++++++++++
 dev-java/netbeans-ergonomics/Manifest              |   2 +
 .../netbeans-ergonomics-9999_p20161006.ebuild      |  89 +++++
 dev-java/netbeans-extide/Manifest                  |   2 +
 .../netbeans-extide-9999_p20161006.ebuild          |  96 ++++++
 dev-java/netbeans-groovy/Manifest                  |   2 +
 .../netbeans-groovy-9999_p20161006.ebuild          |  99 ++++++
 dev-java/netbeans-harness/Manifest                 |   2 +
 .../netbeans-harness-9999_p20161006.ebuild         | 102 ++++++
 dev-java/netbeans-ide/Manifest                     |   2 +
 .../netbeans-ide-9999_p20161006.ebuild             | 362 +++++++++++++++++++++
 dev-java/netbeans-java/Manifest                    |   2 +
 .../netbeans-java-9999_p20161006.ebuild            | 268 +++++++++++++++
 dev-java/netbeans-javacard/Manifest                |   2 +
 .../netbeans-javacard-9999_p20161006.ebuild        | 122 +++++++
 dev-java/netbeans-javadoc/Manifest                 |   2 +
 .../netbeans-javadoc-9999_p20161006.ebuild         | 156 +++++++++
 dev-java/netbeans-javafx/Manifest                  |   2 +
 .../netbeans-javafx-9999_p20161006.ebuild          | 112 +++++++
 dev-java/netbeans-mobility/Manifest                |   2 +
 .../netbeans-mobility-9999_p20161006.ebuild        | 114 +++++++
 dev-java/netbeans-nb/Manifest                      |   2 +
 .../netbeans-nb/netbeans-nb-9999_p20161006.ebuild  | 116 +++++++
 dev-java/netbeans-php/Manifest                     |   2 +
 .../netbeans-php-9999_p20161006.ebuild             | 115 +++++++
 dev-java/netbeans-platform/Manifest                |   2 +
 .../netbeans-platform-9999_p20161006.ebuild        | 155 +++++++++
 dev-java/netbeans-profiler/Manifest                |   2 +
 .../netbeans-profiler-9999_p20161006.ebuild        | 109 +++++++
 dev-java/netbeans-webcommon/Manifest               |   2 +
 .../netbeans-webcommon-9999_p20161006.ebuild       | 120 +++++++
 dev-java/netbeans-websvccommon/Manifest            |   2 +
 .../netbeans-websvccommon-9999_p20161006.ebuild    |  82 +++++
 dev-util/netbeans/Manifest                         |   2 +
 dev-util/netbeans/netbeans-9999_p20161006.ebuild   | 235 +++++++++++++
 42 files changed, 3051 insertions(+)

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 3bb7a02..33c0164 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201610010002-src.zip 218005875 SHA256 48da168fb46d76
 DIST netbeans-trunk-nightly-201610020002-src.zip 218005806 SHA256 3d0a3bfc28fa0597d9bd6f1f548040d2e224ebb86ad92d9fc23aaaee6d196ce9 SHA512 6126a08059dc1a52c991f478c7dbb0a2664db4af11b0e7138f215768acb898672877aa88c48c2d2f7ce5292b13927361aac328d83392e1a325acf72605b1db44 WHIRLPOOL 6f02e97282714ff98885532eaad2c8597c66a83fd188f17c7b14969fd054b5e77d53d94716276b76487c65f818b3f755e023ffcdee5ad2c60f32a526db674f4d
 DIST netbeans-trunk-nightly-201610030002-src.zip 218005806 SHA256 54f1b4f61b69379600dfa69adaee9457fd056548646d21e026dac1cb69719549 SHA512 0ae6c8ade2eeae51795d75d44394cdb1972e4113c07e5f573bdafef84ecfba76373e4f78ac1e1737a91d60c8eeb801c1c09f724a9fa99a3ab423b1f02df1e95d WHIRLPOOL ba04e61ec0d8d14aef1882aac28e0853ce0fea5ce42c3cb5ef388ae29e955634e4cdc88846836139d0e4074b87ee624c73f14cea463b706a224c706c991db044
 DIST netbeans-trunk-nightly-201610040002-src.zip 218005877 SHA256 1fc20d6350860af54a1f4ee88ce0bdf22e9fe62f849a6ad6919f30634a3c175b SHA512 c7b5d237f51cdf65ceee75b5c07625cbbcb22af7dfec8b599e2a809330a22ef91ee4f74dacf37a02c9f094503e1c5f3c83dd2d51c36e47fe3971e0704b00283b WHIRLPOOL cedbdc75b157f98cd0224c401a05ab42d9cec28c9bcff0dfdd9e528a12b124362de639308c7f480fc0a8d4ccbb4267472b33d7452dfd72762c3fb8b3db39869f
+DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 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-8.2.ebuild 3359 SHA256 43725f011ccccb65488a1a9e5f25965d818df25bcad278a9b3453d945c6736dc SHA512 4cface820ad78195197baed3b788d9317200198295ce455beadf6699f6b121fdfe273d4a8a0f1b514186e77343abd9a1877421853db12821e5e1319498768bb6 WHIRLPOOL 623fba6046b28a1de71ee820bf6194519ea76141c6d4a50421ba87691f0ad5faa278e076f4deeb3c913f5b82788aa3afacc4931775fb6e9fcc7361855e0d8d50
@@ -66,4 +67,5 @@ EBUILD netbeans-apisupport-9999_p20161001.ebuild 3384 SHA256 9c77e6403e823b0789c
 EBUILD netbeans-apisupport-9999_p20161002.ebuild 3384 SHA256 e2da1aad4287937b6284d49ec1d9af5b401dd5dd318c36b61f00ffc532f7ae0b SHA512 93fa48223d857ae98fc00be39a0ab3a21ee3fb067474a0338b5af2beadb6ba05b86d0f566793d3e46cbb1ce55692e59360bfd28e5418ce35f78f3bd1440c11ec WHIRLPOOL f959924deeb0324fc0bfac50aa497e21a0d0275dac78104fb1a40b59bc3b83118eac39886ccdb8dc98d995377b9a65972ac40352a57d2c66faa99eb8e677f7d0
 EBUILD netbeans-apisupport-9999_p20161003.ebuild 3384 SHA256 9e77ceabebb0c169aa62216b03ceae65d805fbad643abab3149501c7fdcfe96c SHA512 d24e9501918e1ba646bfde790a3d17b9329dabf1f70b7bdfe86a4134209e09a334d8f633875710878e8e3a2537e1e8a04193338e13eb23df443a8d07fb6c4d94 WHIRLPOOL db00f4a02686ee82a180f2d3ae4dd6e11ef4d52305beb63e576d0036420fd2ba67a5fea9d9619aa593335c5f00c93707af69d9b9d3bb1f361a7bff6df2953f98
 EBUILD netbeans-apisupport-9999_p20161004.ebuild 3384 SHA256 0d7ec3716e6a8e3d2ecec8387c4ff1d6d4ba4cb9a70376fb7e10fa2862c8c3e6 SHA512 cc46df74584628a0a58a7bbd0d5e63ddf98c27a21b09bba7c3c5475c647e16b68efaf4d55a4045c9a123a2de7157187ebcdf69323b3c8e7ece2db029f9cc6adc WHIRLPOOL 2fab6f529fbb45b49427f86baabc67b307358b94073e79afc8fb260dd414b84837e2d0df1428cd64ea2ad3be88924ff08612b98cc8a2efec3683d69c502d349f
+EBUILD netbeans-apisupport-9999_p20161006.ebuild 3105 SHA256 1ac7c89afa52a654ce234f4a14a01ef76fcca77294fc566c5e98eec04aa49d0d SHA512 905708e6bd95cfe9803a8973ac66818ad3a34c8ef7f005e3e71ea12e5718fe11f89198dc97a8e2eb941c131ef1f0dea523ae48e24ccb0f4a0391f87466cf18a6 WHIRLPOOL 3b90d9028722343b51cca150ff12374bfc367b0e91eb707fbb9dc57a3a038dcaf4da82fc5ba7758a4bfb337db56c9417145a8c71b8b3a83d381e401aba5a4ddb
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20161006.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20161006.ebuild
new file mode 100644
index 0000000..20c2741
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20161006.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+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-10-06_00-02-33/zip/netbeans-trunk-nightly-201610060002-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 virtual/jdk:1.8 )
+	${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
+
+	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
+	default
+}
+
+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 f785dd2..f7e79db 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -48,6 +48,7 @@ DIST netbeans-trunk-nightly-201610010002-src.zip 218005875 SHA256 48da168fb46d76
 DIST netbeans-trunk-nightly-201610020002-src.zip 218005806 SHA256 3d0a3bfc28fa0597d9bd6f1f548040d2e224ebb86ad92d9fc23aaaee6d196ce9 SHA512 6126a08059dc1a52c991f478c7dbb0a2664db4af11b0e7138f215768acb898672877aa88c48c2d2f7ce5292b13927361aac328d83392e1a325acf72605b1db44 WHIRLPOOL 6f02e97282714ff98885532eaad2c8597c66a83fd188f17c7b14969fd054b5e77d53d94716276b76487c65f818b3f755e023ffcdee5ad2c60f32a526db674f4d
 DIST netbeans-trunk-nightly-201610030002-src.zip 218005806 SHA256 54f1b4f61b69379600dfa69adaee9457fd056548646d21e026dac1cb69719549 SHA512 0ae6c8ade2eeae51795d75d44394cdb1972e4113c07e5f573bdafef84ecfba76373e4f78ac1e1737a91d60c8eeb801c1c09f724a9fa99a3ab423b1f02df1e95d WHIRLPOOL ba04e61ec0d8d14aef1882aac28e0853ce0fea5ce42c3cb5ef388ae29e955634e4cdc88846836139d0e4074b87ee624c73f14cea463b706a224c706c991db044
 DIST netbeans-trunk-nightly-201610040002-src.zip 218005877 SHA256 1fc20d6350860af54a1f4ee88ce0bdf22e9fe62f849a6ad6919f30634a3c175b SHA512 c7b5d237f51cdf65ceee75b5c07625cbbcb22af7dfec8b599e2a809330a22ef91ee4f74dacf37a02c9f094503e1c5f3c83dd2d51c36e47fe3971e0704b00283b WHIRLPOOL cedbdc75b157f98cd0224c401a05ab42d9cec28c9bcff0dfdd9e528a12b124362de639308c7f480fc0a8d4ccbb4267472b33d7452dfd72762c3fb8b3db39869f
+DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 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-8.2.ebuild 4765 SHA256 ea96bb104315ad9114e5f24368989af82cb3bc9e61d1f8356d80a4c72e498fa4 SHA512 29938bb22c25eb48cbb69b3da635b2bba8ad80b033a4a35baebe9860ba2e72cbdb15e871f2776e1fedbb1b4a85d00a68edb1caaa2932a6ebb2ba1eb7eda60a8d WHIRLPOOL 15b3111838b826feef9a0baee2b48af6990e292fcd07d09716ac4ea93fab51d7d1a169804b9a6f9d97c53e0b1098d6b2beb6c8e521c0026b93ddf830fa51fc2c
@@ -80,4 +81,5 @@ EBUILD netbeans-cnd-9999_p20161001.ebuild 4790 SHA256 6231f80e9b7cb8f3618db3935c
 EBUILD netbeans-cnd-9999_p20161002.ebuild 4790 SHA256 389611c5d219e189f0373735afb3c4dc05d1f4f036342563cc54fe9f1c5d44f1 SHA512 268cd50bb21e88d31706b2ed14cef802d45a5f002ee46adaa6dd526bbc6a7522d9b97b1fc7568941f6f31053c2c9a04ad753780e402a95caa0c4af523130b6bc WHIRLPOOL 9391ddf5c0e162cfda25650241427e1ddcb34ee483933b93b05f32a962bef4a13146bd69d88b7dc19a3199c705d882e87f2a92b88ab9147600daa17f682a9f20
 EBUILD netbeans-cnd-9999_p20161003.ebuild 4790 SHA256 416cabb95417c2eb0bb823cbd45455e78dc60e706cd17f531059c2e719aa8f64 SHA512 414cf06c313e32624fe4f6e6f18037c29b698bd7fda1ff34352316fcd849e223d1da7490392b275a1243239cf267791cd96a031f9eae4215913646879081a459 WHIRLPOOL 7ac3f6abd54e0e7e087d15788d9fb1937daa5aef23631a9746dfbf6d770870867c473c18a044634ed4b1e260daf46ff300208d205c14949efbdc5dcc61d1ad0a
 EBUILD netbeans-cnd-9999_p20161004.ebuild 4790 SHA256 86646f54d44bcf974e94935043d7296efd6828195d7bbc1612e1f8e4e61311b8 SHA512 09e809505c88b6c21320b5e6614bd223643a0ada8caec4e319591feef4702d19c7619b8cc422009332dd39bba0070927039241052c9583a46be8878ebce80b67 WHIRLPOOL 2f0d54611eb47056c26c320f19298c4fa7df1af913b39686804a14a8601152a244e47b602f31773e63bead5d60c223d41f9f3bcc53433b05d6b55886350b6289
+EBUILD netbeans-cnd-9999_p20161006.ebuild 4511 SHA256 83075be1bd13fc71c0d1cb9bce7e5fdb0e4c554bac1e6348c47ed5f78d969045 SHA512 3df147c827a4ec82e3079aa31b1cc1eec7edf1b50c88b089d5f7ee2b8b6023ca291ac644295fcea5ab5831d13a7f1ab2fce8a751a7cb49247c2d0765bc8dda24 WHIRLPOOL 072c7593db0c3e659bbae13846f50e220de5b35ba19aea43e853bf608ced84600d96e824ed9cbb87e4ce86b50de375e332999d794abd1034bb7121e588162de2
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20161006.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20161006.ebuild
new file mode 100644
index 0000000..6c575fc
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20161006.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+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-10-06_00-02-33/zip/netbeans-trunk-nightly-201610060002-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/F20EEEDF4FE6B93B180387576FB780EED9F79C66-clank_0.3.9.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 virtual/jdk:1.8 )
+	${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}"/F20EEEDF4FE6B93B180387576FB780EED9F79C66-clank_0.3.9.zip libs.clank/external/clank_0.3.9.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
+
+	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
+	default
+}
+
+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 ee76af8..07d635e 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201610010002-src.zip 218005875 SHA256 48da168fb46d76
 DIST netbeans-trunk-nightly-201610020002-src.zip 218005806 SHA256 3d0a3bfc28fa0597d9bd6f1f548040d2e224ebb86ad92d9fc23aaaee6d196ce9 SHA512 6126a08059dc1a52c991f478c7dbb0a2664db4af11b0e7138f215768acb898672877aa88c48c2d2f7ce5292b13927361aac328d83392e1a325acf72605b1db44 WHIRLPOOL 6f02e97282714ff98885532eaad2c8597c66a83fd188f17c7b14969fd054b5e77d53d94716276b76487c65f818b3f755e023ffcdee5ad2c60f32a526db674f4d
 DIST netbeans-trunk-nightly-201610030002-src.zip 218005806 SHA256 54f1b4f61b69379600dfa69adaee9457fd056548646d21e026dac1cb69719549 SHA512 0ae6c8ade2eeae51795d75d44394cdb1972e4113c07e5f573bdafef84ecfba76373e4f78ac1e1737a91d60c8eeb801c1c09f724a9fa99a3ab423b1f02df1e95d WHIRLPOOL ba04e61ec0d8d14aef1882aac28e0853ce0fea5ce42c3cb5ef388ae29e955634e4cdc88846836139d0e4074b87ee624c73f14cea463b706a224c706c991db044
 DIST netbeans-trunk-nightly-201610040002-src.zip 218005877 SHA256 1fc20d6350860af54a1f4ee88ce0bdf22e9fe62f849a6ad6919f30634a3c175b SHA512 c7b5d237f51cdf65ceee75b5c07625cbbcb22af7dfec8b599e2a809330a22ef91ee4f74dacf37a02c9f094503e1c5f3c83dd2d51c36e47fe3971e0704b00283b WHIRLPOOL cedbdc75b157f98cd0224c401a05ab42d9cec28c9bcff0dfdd9e528a12b124362de639308c7f480fc0a8d4ccbb4267472b33d7452dfd72762c3fb8b3db39869f
+DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 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-8.2.ebuild 2943 SHA256 cb9b660d6eacdef291ab38c2880e288860e03c3cddfb96bcc7045690a15648a5 SHA512 ae5c5d51727582621ace5333dbf54de87e5e1054b5080b75ecd290b6e0af39ddf93d365111682e64a7c0029971efd5126a6b15aac40788d967de7fb942a0ebb2 WHIRLPOOL 6d56edce6c187f17db89130f998fb639d16fb75e1238deb2eb1ef71977cfa7fa2becd4197d0c9b8265ea1491a5df3c853d703191131f5f33ec90d958387d1779
@@ -70,4 +71,5 @@ EBUILD netbeans-dlight-9999_p20161001.ebuild 2968 SHA256 eb3f7f2053bd03cd200549a
 EBUILD netbeans-dlight-9999_p20161002.ebuild 2968 SHA256 c7f0d6ad80262e4e0177b4f8d777ca086ff875e945652215d71798289f2f7387 SHA512 f8ceff060039e050331daa92ac67c5f36da7a28725bd64658d11fddaed9edc280ae8cad738188198bcb0b4307f41694c440a9dd1491cf850df92b1731b314055 WHIRLPOOL 0b57afb397143161f0d82bd3ad4158448bf5e850c0b457faa4d92adfae70a007465ca3232fa6ab031754f70020456170fd04fbc8bd21752d818bb191336a4d6a
 EBUILD netbeans-dlight-9999_p20161003.ebuild 2968 SHA256 bf06c77423e570c1d3acc50bb1cae4c7468bff369cd3d9ef8c558dc2300a8365 SHA512 e44f6286ce76286c0e9e75d7117dcba739b81d9dbf7c0f775dcd635279e2ac345cda42ae97f4ab7a289e9ed62f1dee9a0d46e292a3ab8ee01e1e4bf945c8ccb9 WHIRLPOOL 704da522ab9c0ea87487784aeabfb04e1b365f4548b429bb7e55d8670ba718f89678524886b4ee3cfbf1c6cfc2f35a8f86bf5117602cf16f86d4f253ffe38fa4
 EBUILD netbeans-dlight-9999_p20161004.ebuild 2968 SHA256 0b5b630c5d89dca5f865d852eed85b3ec043d40ccaa457a8c43ae3901e39a2a6 SHA512 c8e350da39fc5de6ec78c51e174a90c40e6f12e4aeaaeb244f2ba4fc4c0e570cd34c69c0cbeb3abf853ae4ebb57fb7cbe51a5f4b4785e85b4c12696df823a990 WHIRLPOOL f3bcdedd5174baeebc85ff2ee78be35d57c505213f31755a9fb7a1777d24af9f21d30595a702d7db15ab067a5c1f8d0b9e3ce30dc619a93885b7338de431da54
+EBUILD netbeans-dlight-9999_p20161006.ebuild 2689 SHA256 12b67c54e0bcbc6877763416f87d93b5b28337c4abf3180d5391cc945c4a8dbe SHA512 d05ccb2529066755ca7188cef251e840ff25e192ce9b6ff80115e7497e10e6f1bdd272c8338b5f855557d3e7251de6d04cc48d58cf82281365ab0857dcea4f9c WHIRLPOOL 4b9c71d2cc0718e2bf8b506b6167acf6d54c7cac485d21b9faac9cb680f1b7e89ea033058e13a8d6c45e4bfcaf27036d6c45d273826e53b17f4b04e4198df89c
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20161006.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20161006.ebuild
new file mode 100644
index 0000000..9d1fe4e
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20161006.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+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-10-06_00-02-33/zip/netbeans-trunk-nightly-201610060002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/18E39A0D10357B72EDB76F2070E27019317792F1-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 virtual/jdk:1.8 )
+	${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}"/18E39A0D10357B72EDB76F2070E27019317792F1-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
+
+	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
+	default
+}
+
+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 d2201ac..156af4a 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -66,6 +66,7 @@ DIST netbeans-trunk-nightly-201610010002-src.zip 218005875 SHA256 48da168fb46d76
 DIST netbeans-trunk-nightly-201610020002-src.zip 218005806 SHA256 3d0a3bfc28fa0597d9bd6f1f548040d2e224ebb86ad92d9fc23aaaee6d196ce9 SHA512 6126a08059dc1a52c991f478c7dbb0a2664db4af11b0e7138f215768acb898672877aa88c48c2d2f7ce5292b13927361aac328d83392e1a325acf72605b1db44 WHIRLPOOL 6f02e97282714ff98885532eaad2c8597c66a83fd188f17c7b14969fd054b5e77d53d94716276b76487c65f818b3f755e023ffcdee5ad2c60f32a526db674f4d
 DIST netbeans-trunk-nightly-201610030002-src.zip 218005806 SHA256 54f1b4f61b69379600dfa69adaee9457fd056548646d21e026dac1cb69719549 SHA512 0ae6c8ade2eeae51795d75d44394cdb1972e4113c07e5f573bdafef84ecfba76373e4f78ac1e1737a91d60c8eeb801c1c09f724a9fa99a3ab423b1f02df1e95d WHIRLPOOL ba04e61ec0d8d14aef1882aac28e0853ce0fea5ce42c3cb5ef388ae29e955634e4cdc88846836139d0e4074b87ee624c73f14cea463b706a224c706c991db044
 DIST netbeans-trunk-nightly-201610040002-src.zip 218005877 SHA256 1fc20d6350860af54a1f4ee88ce0bdf22e9fe62f849a6ad6919f30634a3c175b SHA512 c7b5d237f51cdf65ceee75b5c07625cbbcb22af7dfec8b599e2a809330a22ef91ee4f74dacf37a02c9f094503e1c5f3c83dd2d51c36e47fe3971e0704b00283b WHIRLPOOL cedbdc75b157f98cd0224c401a05ab42d9cec28c9bcff0dfdd9e528a12b124362de639308c7f480fc0a8d4ccbb4267472b33d7452dfd72762c3fb8b3db39869f
+DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 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-8.2.ebuild 15800 SHA256 5ee32c4eac34e289026abf0e8742bf2da773a7974541d79b9666ad05b7804b34 SHA512 6ece642638f82a980b1c8da82d6c62225230eab26cc3889554b8b4219f061cd6845aa9ced518fd919439c6447821bcb592c89a166f76c8f13a2c12736d7c125f WHIRLPOOL 084b7fe773ac98531d9019100aa4ca36fb7d1477cf6bf68573986f5c0c54e18ba626a212cd515b729a97471faa4ed25496df63e130474651e8ea858a78eeeff8
@@ -98,4 +99,5 @@ EBUILD netbeans-enterprise-9999_p20161001.ebuild 15825 SHA256 7d97c098b476ee8de6
 EBUILD netbeans-enterprise-9999_p20161002.ebuild 15825 SHA256 e8a8200283468f0bb55233a849642957e7f8503f7a6d58fba9f4952bf8e30f47 SHA512 f0a80fbb6ae079efbe9331e4059d095ed512f7d4ec1e8fc939887d7a2b0cc148721be8c7ff7ad3705b89c914a9ed1c920d4fe8db08aab02ea5fc600330113559 WHIRLPOOL 97aa8f47388db5234ad8655a1eaec70ebecb0679526ea3ae44ec0e7aadfa3a7f842eb512e4f0542d3deb26f61027a1253c0f3f9f8e47328b4e277787ec6e55bc
 EBUILD netbeans-enterprise-9999_p20161003.ebuild 15825 SHA256 42bcfd5ec2a21dcadf1395f0a33fd028cc49ef32a257a70bee46acb9ff00626a SHA512 e963a2454765f255d950abc19d763fe9999da4a7241dbd3ecd52a42d860375fe4277e7f52d2c91f4847f1b4f73fbd89b569c4870d05a754eee6d519aabe33f3f WHIRLPOOL dac8b9c38701083823f37166760f501857c12f3e5dc62bd7f5181b9f9fe259d015ed0d65935dae4f62b71147208d6207c8c3e5375682b73870ef8099f9539437
 EBUILD netbeans-enterprise-9999_p20161004.ebuild 15825 SHA256 04560ed286999bfac51b3bd08c9ae05cb08e6d1f44f067362a854c65a6125ee0 SHA512 209bf7998b09451e84140be98e9e5a7f7dd0be18911c04eaa0e004fa99e4999108bf5949d8335de6c3e4ea9cb9c2ff094fdf2f7e1ad95613c0542ea4380b5e36 WHIRLPOOL 1cf72957eaf9ea23c00381a04b1996d91031916ba9012bc75daca62b28085da0c6562e9fe1168df368ded0310210c6f19522d90adcda6357ce8932dc716dcde3
+EBUILD netbeans-enterprise-9999_p20161006.ebuild 15546 SHA256 925bedd046d59eaddb0b9eab21776812db9ac00a713c4032b0576458be354333 SHA512 81928edf65a13ec6a85c850f24e2a0d188e5a23f5ec3b0c5a0d99e57602318ff97439b52be71be9eb2c6f09d3bd2c2589b2a9d5fd19a09ede61e5beea45e7eeb WHIRLPOOL f8649e41faae0349164e336ee35377e58da8ca23df4326b016d319676f644fa598050aa79e06dc2746392a20b5dae857dbeab4083bb8a2fcb0df238fd1b72111
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20161006.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20161006.ebuild
new file mode 100644
index 0000000..69ca28f
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20161006.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+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-10-06_00-02-33/zip/netbeans-trunk-nightly-201610060002-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 virtual/jdk:1.8 )
+	${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
+
+	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
+	default
+}
+
+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 ea67ea1..a22e811 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201610010002-src.zip 218005875 SHA256 48da168fb46d76
 DIST netbeans-trunk-nightly-201610020002-src.zip 218005806 SHA256 3d0a3bfc28fa0597d9bd6f1f548040d2e224ebb86ad92d9fc23aaaee6d196ce9 SHA512 6126a08059dc1a52c991f478c7dbb0a2664db4af11b0e7138f215768acb898672877aa88c48c2d2f7ce5292b13927361aac328d83392e1a325acf72605b1db44 WHIRLPOOL 6f02e97282714ff98885532eaad2c8597c66a83fd188f17c7b14969fd054b5e77d53d94716276b76487c65f818b3f755e023ffcdee5ad2c60f32a526db674f4d
 DIST netbeans-trunk-nightly-201610030002-src.zip 218005806 SHA256 54f1b4f61b69379600dfa69adaee9457fd056548646d21e026dac1cb69719549 SHA512 0ae6c8ade2eeae51795d75d44394cdb1972e4113c07e5f573bdafef84ecfba76373e4f78ac1e1737a91d60c8eeb801c1c09f724a9fa99a3ab423b1f02df1e95d WHIRLPOOL ba04e61ec0d8d14aef1882aac28e0853ce0fea5ce42c3cb5ef388ae29e955634e4cdc88846836139d0e4074b87ee624c73f14cea463b706a224c706c991db044
 DIST netbeans-trunk-nightly-201610040002-src.zip 218005877 SHA256 1fc20d6350860af54a1f4ee88ce0bdf22e9fe62f849a6ad6919f30634a3c175b SHA512 c7b5d237f51cdf65ceee75b5c07625cbbcb22af7dfec8b599e2a809330a22ef91ee4f74dacf37a02c9f094503e1c5f3c83dd2d51c36e47fe3971e0704b00283b WHIRLPOOL cedbdc75b157f98cd0224c401a05ab42d9cec28c9bcff0dfdd9e528a12b124362de639308c7f480fc0a8d4ccbb4267472b33d7452dfd72762c3fb8b3db39869f
+DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 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-8.2.ebuild 2888 SHA256 73a3323408c5ea7f5bfb2432c59b350395f96bb52ac4fbdda9fe7cdef9540a44 SHA512 f24e93d6bbe4088610b2e308f443e44decf1bdc75762275bb209fcd183a64489e0a633596e9374c338b8351222c11417e3e7d708dd7069b8c7119b8422dc0644 WHIRLPOOL f075437231db088e5b8f3b81c501cb8ffc752c8b2dfc2dd96983b77c8a4a5c774d7b855af63a1e8ea5ae6ced158ef1debec8a7df79a2887e0520d8dd7ea42104
@@ -66,4 +67,5 @@ EBUILD netbeans-ergonomics-9999_p20161001.ebuild 2913 SHA256 98c3153e5569443ec8e
 EBUILD netbeans-ergonomics-9999_p20161002.ebuild 2913 SHA256 736b76ca1a024592d2b62298b9b4a389d6db9bf22802f1a047df833c7e872550 SHA512 c5c339945a028711699e32a0a3b460e8ac6a19b726b55e3916f91ee9b92dd9e8c2ac0e82eab0cb8f3c26fdce3e5351ad1b040b15e578ed99bf067f9f94c6fbe1 WHIRLPOOL 9ca868bbe0d2662f8ee7f10a6e2ec0cbed515b18b869586c382c0b0de5e8e6f66b13a69dcc3f7fcbd9c8c93e4771600b39a0d9e2005fd05b90c39fd8808f3419
 EBUILD netbeans-ergonomics-9999_p20161003.ebuild 2913 SHA256 e27bf86a550db668abab4d95f6926c7dc6b08b8ff3380931bbf263c4ff85c191 SHA512 157739cf7c26bd244928a723f6ddbf2c01d8a165c0d1aa1d0a5b3ec7b38e4ae0b4dc9f7cdeda26edd0b75db89e16e3f85b1fa0acdf2e90f750395e5b25f226a2 WHIRLPOOL 667461b64f1ac79640470e8e44c146cd4260b6e0cad76ad703ea74e681b415b32976986aed446b4408ff1769d9f6829f85f5f94121ff46734660200fc17b98da
 EBUILD netbeans-ergonomics-9999_p20161004.ebuild 2913 SHA256 05b6a80b1ecbc47ecb6bf8e9f2ebca77bbc702279d25924ce92fae630f750d46 SHA512 7c8d1a00f021e7f92b64a33807c5e0e1915a2676a9e8dddbbd4e059ff9be93acced6885567baeb329ebe69572da26884c0025140e82f3fb55f3a975f3842c8d1 WHIRLPOOL 64a6d264b5b6b76c770dbc64699723a2a167423ad7b80ea45f650699d4b6f5b9af18eca626b3d47d0f4ec795a1e23729f6de5bb5eb3e73383854d6fadcd85496
+EBUILD netbeans-ergonomics-9999_p20161006.ebuild 2634 SHA256 bcf311d8f3a1f5d7eba689ce02a9d926f4ae362d8adcd0dd1c6733da9936ddb5 SHA512 abc40268f926164154ed0265e5c06a2697fb323f8891ea259419457fea7cf86a2144705c9e95179b485c5280aba5712d1149f66490fc746849886a499f71d23d WHIRLPOOL 9dba8e24fcfa701b3b6741e5f06070244a382ad07149c21ca8b37e87c16c5611e7ed841703956cf16fac0f8c980c465d599b17207a43d861bffeb9acb69983cc
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20161006.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20161006.ebuild
new file mode 100644
index 0000000..7bbb7f4
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20161006.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+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-10-06_00-02-33/zip/netbeans-trunk-nightly-201610060002-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 virtual/jdk:1.8 )
+	${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
+
+	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
+	default
+}
+
+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 8f7687a..7db3ceb 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201610010002-src.zip 218005875 SHA256 48da168fb46d76
 DIST netbeans-trunk-nightly-201610020002-src.zip 218005806 SHA256 3d0a3bfc28fa0597d9bd6f1f548040d2e224ebb86ad92d9fc23aaaee6d196ce9 SHA512 6126a08059dc1a52c991f478c7dbb0a2664db4af11b0e7138f215768acb898672877aa88c48c2d2f7ce5292b13927361aac328d83392e1a325acf72605b1db44 WHIRLPOOL 6f02e97282714ff98885532eaad2c8597c66a83fd188f17c7b14969fd054b5e77d53d94716276b76487c65f818b3f755e023ffcdee5ad2c60f32a526db674f4d
 DIST netbeans-trunk-nightly-201610030002-src.zip 218005806 SHA256 54f1b4f61b69379600dfa69adaee9457fd056548646d21e026dac1cb69719549 SHA512 0ae6c8ade2eeae51795d75d44394cdb1972e4113c07e5f573bdafef84ecfba76373e4f78ac1e1737a91d60c8eeb801c1c09f724a9fa99a3ab423b1f02df1e95d WHIRLPOOL ba04e61ec0d8d14aef1882aac28e0853ce0fea5ce42c3cb5ef388ae29e955634e4cdc88846836139d0e4074b87ee624c73f14cea463b706a224c706c991db044
 DIST netbeans-trunk-nightly-201610040002-src.zip 218005877 SHA256 1fc20d6350860af54a1f4ee88ce0bdf22e9fe62f849a6ad6919f30634a3c175b SHA512 c7b5d237f51cdf65ceee75b5c07625cbbcb22af7dfec8b599e2a809330a22ef91ee4f74dacf37a02c9f094503e1c5f3c83dd2d51c36e47fe3971e0704b00283b WHIRLPOOL cedbdc75b157f98cd0224c401a05ab42d9cec28c9bcff0dfdd9e528a12b124362de639308c7f480fc0a8d4ccbb4267472b33d7452dfd72762c3fb8b3db39869f
+DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 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-8.2.ebuild 3352 SHA256 7b1ed39ca8d2d23cb510b3cd0c32875d1d635abb48a5830dad95c391b84cea9f SHA512 e157ca8a0468c4fd27995ff7a287f5dc57902fde615cb6995db18392a10e0a269c054c561770d421318b0913223ea54ef901cf2841838d6368adfb916efaa36e WHIRLPOOL ceb1b46733ef1bed29ce9d5851a2dd3294defa7423b0d6f85bc308575239d2720903ece19c2c631cb2b47c9c8b93b9697b0889491ef444c966b4758970ab0a1f
@@ -70,4 +71,5 @@ EBUILD netbeans-extide-9999_p20161001.ebuild 3377 SHA256 263fd4b8a4c3dd88e7ddc24
 EBUILD netbeans-extide-9999_p20161002.ebuild 3377 SHA256 617168f38da94077431012666fcc0f87779e5b24397d16b8e883826d10abed12 SHA512 442835491b22ae6cbf7394f1358e0cc6ccc0cd967d2b50e51aeabaf526bdf20b01c2cb24b0e035a8d4d410c66de02d20bd03c28fed4bbbca99584716cf97fa5b WHIRLPOOL 92ebdc3f4bb97b73c0257a9f62cf472541f6b40fa04d863bdfa64998cbfbdb133d8ca1dcc08b31a515d6c634723298d75f4f666c73072ffef10c7539b0834646
 EBUILD netbeans-extide-9999_p20161003.ebuild 3377 SHA256 5aca866ee1eb0be7fafcb596a59e7c4eaedffd03d9036cae142abc952ca89f1b SHA512 75c8de423093ce33cbc499a4993b3548bc5c099a3db1ac1b8fa82a4b43015ec3d2316b6a812b9e9925d1f4e1da6e928cc041544188429b4be9fcc21fe71a3ffe WHIRLPOOL 168cf97a216e78b151d847bae505d94436f3d5e89ac28293fdc5fd859351f8bf62412fa4f232f587d3da13460d0ad0a9e7cfeb2e377b63144c83f7db60f3e86e
 EBUILD netbeans-extide-9999_p20161004.ebuild 3377 SHA256 76251d09add49bf2b7251ad79e74b9e11ef34bf3ae5f255b188fcc76d11dc255 SHA512 4c09df5e73ef878329b57d5e8a00b91baba96e51afa2104bb617a0b96cf089a1f7e5e81b6eb407215e9f0f21eb17fe633922ec0a47689d1701376e04869fc3f8 WHIRLPOOL 4f232511a25c3c07d2f1a8f04464210ec48cd77b1e3f10b43af20c0c101be22678834d9cafea9ed1b0bd3181852994e975bf891db437fe200755cf26bfc3db54
+EBUILD netbeans-extide-9999_p20161006.ebuild 3098 SHA256 cafea0726625b95205e4192e4821db46f80b6a99abe539e9123294f5161a8056 SHA512 db4cf046c1413cd35471b44b22df34b641344b10e86b6c0273ced50fe74befb6a0251b4dd0424697c3d75663395a93452862904727daf2cc9c80784bc4e3ff66 WHIRLPOOL 5a8ba2065cc071bfeafebfaea3149f632c62788550046fd9513738fb2bb1615de86df58c50da364bdeceee88074ad1d017b4cba95ba9a7572f1b097e947c6d66
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20161006.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20161006.ebuild
new file mode 100644
index 0000000..2017f25
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20161006.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+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-10-06_00-02-33/zip/netbeans-trunk-nightly-201610060002-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 virtual/jdk:1.8 )
+	${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
+
+	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
+	default
+}
+
+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 10f2079..2703d27 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201610010002-src.zip 218005875 SHA256 48da168fb46d76
 DIST netbeans-trunk-nightly-201610020002-src.zip 218005806 SHA256 3d0a3bfc28fa0597d9bd6f1f548040d2e224ebb86ad92d9fc23aaaee6d196ce9 SHA512 6126a08059dc1a52c991f478c7dbb0a2664db4af11b0e7138f215768acb898672877aa88c48c2d2f7ce5292b13927361aac328d83392e1a325acf72605b1db44 WHIRLPOOL 6f02e97282714ff98885532eaad2c8597c66a83fd188f17c7b14969fd054b5e77d53d94716276b76487c65f818b3f755e023ffcdee5ad2c60f32a526db674f4d
 DIST netbeans-trunk-nightly-201610030002-src.zip 218005806 SHA256 54f1b4f61b69379600dfa69adaee9457fd056548646d21e026dac1cb69719549 SHA512 0ae6c8ade2eeae51795d75d44394cdb1972e4113c07e5f573bdafef84ecfba76373e4f78ac1e1737a91d60c8eeb801c1c09f724a9fa99a3ab423b1f02df1e95d WHIRLPOOL ba04e61ec0d8d14aef1882aac28e0853ce0fea5ce42c3cb5ef388ae29e955634e4cdc88846836139d0e4074b87ee624c73f14cea463b706a224c706c991db044
 DIST netbeans-trunk-nightly-201610040002-src.zip 218005877 SHA256 1fc20d6350860af54a1f4ee88ce0bdf22e9fe62f849a6ad6919f30634a3c175b SHA512 c7b5d237f51cdf65ceee75b5c07625cbbcb22af7dfec8b599e2a809330a22ef91ee4f74dacf37a02c9f094503e1c5f3c83dd2d51c36e47fe3971e0704b00283b WHIRLPOOL cedbdc75b157f98cd0224c401a05ab42d9cec28c9bcff0dfdd9e528a12b124362de639308c7f480fc0a8d4ccbb4267472b33d7452dfd72762c3fb8b3db39869f
+DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 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-8.2.ebuild 3391 SHA256 7e0843b06ea2f64af89c46e58515313724df5e68def321831a967b3ae90f3533 SHA512 a92811889c64eac1c728c3537778cfdd093ff756ec95d0c0c59c02114f876b73c1d06f632a55e29fba099c8d70c59c99692e8a94e952a26ee1251f47c4f524f2 WHIRLPOOL 1eba2454eb5acbfc505d0b4f8b340db86708d80d0a9efdd99bdf89a0ee789a5ae81ff030bf526c27c8c0b8601d700ab510b28dc71fa2cd9d69d3727c2251b03f
@@ -68,4 +69,5 @@ EBUILD netbeans-groovy-9999_p20161001.ebuild 3416 SHA256 e8711a9ae3bc2227fe4257c
 EBUILD netbeans-groovy-9999_p20161002.ebuild 3416 SHA256 59373c6ad49ab28a242d058465f924a5277f85fa13a32fe9e371ab77c01352d7 SHA512 260cc1af3634a241c15df697f99414ea96b694c53182768e5bc6188c10ee611aa28ec169b0ffd887826de0a08423897288aa9932b81ad2485da7497aa343208d WHIRLPOOL 88d31a3bc33a7ef3d4ade949dde1c37c63f49547aa7e22615f4188562f99c69eceedbdc669ee8c57e60bb2ca2d3bcc2c4cb74e80cd994d795f49376fad452434
 EBUILD netbeans-groovy-9999_p20161003.ebuild 3416 SHA256 f2befe7a281b55414c517cfe99181e5c0f732a02df538f84151dcacbd4e378fb SHA512 9cc343fb137124ef08b4b3b20631ded9797d121a36bebacb7d83d34b8420d742ea7ec10bade24f3a5176cc4710891e17aaa86370166efc23883e4f5959c24480 WHIRLPOOL 35e280fadbe3aeaabe2cd854b8a5ec8926c8f492ab451fb30b46c3a44d624d030baa7b58693d9493454bddf024f57454fffc80ab47876c48aa0a77bb1cf5889b
 EBUILD netbeans-groovy-9999_p20161004.ebuild 3416 SHA256 95bfe7a9995b197994536524e3edba28b8b430aa86360e22aaced3263d4b84f9 SHA512 8e96094523e15adb71b45e2265930fada155a142569c700c1198eb2aaa775d5bbf700fe19f97b469b03839394da29a907ac5666f3b2e95982adfcb46c58f1685 WHIRLPOOL e23e213ec22719e28dbf275f65b4e9fcb0dcb55eb37ab26cee1e94bc0ef736ab1d5da942a0f4385d3901de451830cf086ee2ae1d17a707619bb95f94cb8b8b22
+EBUILD netbeans-groovy-9999_p20161006.ebuild 3137 SHA256 5c831902537d50fa2c864fb652f1d9a6c21ce6580fb467314d46f5b9c9b41110 SHA512 8439b9303ab845cd2872c034b774d71872178c23af015d1a5c18b28107c46f054afebca6e37f28b79177625f0cf58819011256d260d2312af91eee53e0b1b2bf WHIRLPOOL 1da619ea307df31ec4c981e01b4db75609793d40d7745e611af686b2b2e377f4a435468167ecab1594345379103a18df34cb6cd9c5d9fecb6d2d8a305c9b472a
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20161006.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20161006.ebuild
new file mode 100644
index 0000000..d891172
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20161006.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+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-10-06_00-02-33/zip/netbeans-trunk-nightly-201610060002-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 virtual/jdk:1.8 )
+	${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
+
+	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
+	default
+}
+
+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 2d922f1..63bbdd2 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201610010002-src.zip 218005875 SHA256 48da168fb46d76
 DIST netbeans-trunk-nightly-201610020002-src.zip 218005806 SHA256 3d0a3bfc28fa0597d9bd6f1f548040d2e224ebb86ad92d9fc23aaaee6d196ce9 SHA512 6126a08059dc1a52c991f478c7dbb0a2664db4af11b0e7138f215768acb898672877aa88c48c2d2f7ce5292b13927361aac328d83392e1a325acf72605b1db44 WHIRLPOOL 6f02e97282714ff98885532eaad2c8597c66a83fd188f17c7b14969fd054b5e77d53d94716276b76487c65f818b3f755e023ffcdee5ad2c60f32a526db674f4d
 DIST netbeans-trunk-nightly-201610030002-src.zip 218005806 SHA256 54f1b4f61b69379600dfa69adaee9457fd056548646d21e026dac1cb69719549 SHA512 0ae6c8ade2eeae51795d75d44394cdb1972e4113c07e5f573bdafef84ecfba76373e4f78ac1e1737a91d60c8eeb801c1c09f724a9fa99a3ab423b1f02df1e95d WHIRLPOOL ba04e61ec0d8d14aef1882aac28e0853ce0fea5ce42c3cb5ef388ae29e955634e4cdc88846836139d0e4074b87ee624c73f14cea463b706a224c706c991db044
 DIST netbeans-trunk-nightly-201610040002-src.zip 218005877 SHA256 1fc20d6350860af54a1f4ee88ce0bdf22e9fe62f849a6ad6919f30634a3c175b SHA512 c7b5d237f51cdf65ceee75b5c07625cbbcb22af7dfec8b599e2a809330a22ef91ee4f74dacf37a02c9f094503e1c5f3c83dd2d51c36e47fe3971e0704b00283b WHIRLPOOL cedbdc75b157f98cd0224c401a05ab42d9cec28c9bcff0dfdd9e528a12b124362de639308c7f480fc0a8d4ccbb4267472b33d7452dfd72762c3fb8b3db39869f
+DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 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-8.2.ebuild 4101 SHA256 2035244819e51fcb0f6d425f06943760eb961c07c34937afb076732c44463dec SHA512 220328646f289c693614124c1dabff6317c34110a3359218689d18da35bf3771c6b5e840d1f0bf2cbc9d26f3288460be9b7f0df73c49c2d3766253b07a688463 WHIRLPOOL fa1823f151a2df29a79f063a406620be5bd786d5eb1f72698b40802fe5491174b09c159b0b899af0170d2f43a435ba1bc9450d7f4021fd247cfa49ac4b84a5f8
@@ -71,4 +72,5 @@ EBUILD netbeans-harness-9999_p20161001.ebuild 4126 SHA256 579b129499d86df785a71a
 EBUILD netbeans-harness-9999_p20161002.ebuild 4126 SHA256 86c356a97e54d554f89fe4404631cf819620454bd65e8d1137470a114b0e5615 SHA512 575e333883e20d552f5f8b21f0e6dd742ce651aebc4c931a1f35f6ecc6309c1922355520a6dea89f465e83478ba5f7ac933cc5d6450436687dbdc30b0335c9cd WHIRLPOOL 1c26daea8b5f7c4775d4c12ea1a3ae8005c9dad61e9b835dbc26fe4c0b099d709f2f2ff1d999af6981ac3912b8544737278508e57d958fd71bf46270162f4497
 EBUILD netbeans-harness-9999_p20161003.ebuild 4126 SHA256 726e89bf5c16fea2c53736fa30fc4889a7e668e3149d6d12df67260fe30dab7a SHA512 8c67d1cde66e16db645c3bbb1ba1b1f8b1aaf68c6241703ccddd5494b6cab5ca2256397ec2f4985f6478ea1794d73504f812e8fdac6a55744505d434f3fcb646 WHIRLPOOL bd5307d74c2e74a99c0224e94d0c06285e17158f50e9069d9a6b6e39d24afecc0cb3491ab53b168cd49485cb123ca31c887a657455e90a8bcb1fc6b518938ad1
 EBUILD netbeans-harness-9999_p20161004.ebuild 4126 SHA256 d2c6481f0d13c824ae14230f30a96b3495884367c2ed2ef20f81df15f0854052 SHA512 f8d3413c0e0c84940a113cfc8d33fab8871562a9f5e8d98a207f9777afedfa4982a93021d8fe885ee04ecae85cc481caef4281b98be9ebbd1ca6ebdae30c65f5 WHIRLPOOL cc2ed668afd264da70ea13d9b5a9f9d70ff35380deaa231b23cda90916a3aff24c136b244b147dad6b7e7524c9314576f758f574362ee0d72426d56e75942027
+EBUILD netbeans-harness-9999_p20161006.ebuild 3847 SHA256 5a1abb64ce82a846720fe11048588ea32d7eb18df5d905a6b4e2186b9d9cd587 SHA512 922c79d28e71abe5781f0cf512aa831c0817d6771b365abc1e0d4786ea8ae1540b943577dcb5b0ae380dbb80e61be43137f22403d20692eec13e7a5a241e8c89 WHIRLPOOL ad4ac665f55799ca9cbd46d224c2c55184ad9bf9188117eb86b025e35396093e37742f363a0213a1220e3a7c6e7f6dac637b78710b16d8ab288cc58a6834c14c
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20161006.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20161006.ebuild
new file mode 100644
index 0000000..c89ea09
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20161006.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+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-10-06_00-02-33/zip/netbeans-trunk-nightly-201610060002-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 virtual/jdk:1.8 )
+	${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
+
+	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
+	default
+}
+
+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 1788a69..ec8d8fe 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -173,6 +173,7 @@ DIST netbeans-trunk-nightly-201610010002-src.zip 218005875 SHA256 48da168fb46d76
 DIST netbeans-trunk-nightly-201610020002-src.zip 218005806 SHA256 3d0a3bfc28fa0597d9bd6f1f548040d2e224ebb86ad92d9fc23aaaee6d196ce9 SHA512 6126a08059dc1a52c991f478c7dbb0a2664db4af11b0e7138f215768acb898672877aa88c48c2d2f7ce5292b13927361aac328d83392e1a325acf72605b1db44 WHIRLPOOL 6f02e97282714ff98885532eaad2c8597c66a83fd188f17c7b14969fd054b5e77d53d94716276b76487c65f818b3f755e023ffcdee5ad2c60f32a526db674f4d
 DIST netbeans-trunk-nightly-201610030002-src.zip 218005806 SHA256 54f1b4f61b69379600dfa69adaee9457fd056548646d21e026dac1cb69719549 SHA512 0ae6c8ade2eeae51795d75d44394cdb1972e4113c07e5f573bdafef84ecfba76373e4f78ac1e1737a91d60c8eeb801c1c09f724a9fa99a3ab423b1f02df1e95d WHIRLPOOL ba04e61ec0d8d14aef1882aac28e0853ce0fea5ce42c3cb5ef388ae29e955634e4cdc88846836139d0e4074b87ee624c73f14cea463b706a224c706c991db044
 DIST netbeans-trunk-nightly-201610040002-src.zip 218005877 SHA256 1fc20d6350860af54a1f4ee88ce0bdf22e9fe62f849a6ad6919f30634a3c175b SHA512 c7b5d237f51cdf65ceee75b5c07625cbbcb22af7dfec8b599e2a809330a22ef91ee4f74dacf37a02c9f094503e1c5f3c83dd2d51c36e47fe3971e0704b00283b WHIRLPOOL cedbdc75b157f98cd0224c401a05ab42d9cec28c9bcff0dfdd9e528a12b124362de639308c7f480fc0a8d4ccbb4267472b33d7452dfd72762c3fb8b3db39869f
+DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 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-8.2.ebuild 29824 SHA256 cc702f44c0f1e3919e764b0c5feae1bbf2e6798538c2a65e78c1058252815b04 SHA512 8b198b9c9e43876afbc172a6242dc8561114a050660472d58bd160478e7ed85388342070261c3808a4d2809db6d5475b606bc77eb66d6a301dcca666aa14c865 WHIRLPOOL 962e2f5d3edd333d03ce67f436179823589aca9ac3592adddc763ab3ac76533ca771d1299d99fef9715e55b184ee26bec0a5e0523a51a27c627c9c944551d87b
@@ -205,4 +206,5 @@ EBUILD netbeans-ide-9999_p20161001.ebuild 29849 SHA256 e25df63a1ccff83720ebac2a3
 EBUILD netbeans-ide-9999_p20161002.ebuild 29849 SHA256 2d90e1fb1af8e4442a576e99a4ade3cadd057e52e48a47509a5d2e81259f0248 SHA512 446f782225a0659d5227444d9bdcd71cbe8082d4b0ca7deddc1dd3f3e6e4a5304f5d0ca6fbeedd2fa5d8c0e94d6b52fa499356ae68e8d7b8fd2dd3d9835168a1 WHIRLPOOL 1cffd19c9f9a69c0da18341a4f4359da82f9b792d2d23e8a45ae2eebc1b99360cb9e3499cf3efc49fafa0ffddf5ecc51a7c5e1125c4b33de0e7648254bdd4466
 EBUILD netbeans-ide-9999_p20161003.ebuild 29849 SHA256 586bfa642127334c03507ea0e83914d24001fc212ecd21e308833813a56f9b5c SHA512 ee4cd6db7d9373dd836cdaa171a93cd2b228500fbb89eac4710597834aa731b700c0428b9dc457363d4c5e90f33ab61788f3bddf6fbc8119376a9745c2479f65 WHIRLPOOL 76d7b6a16e97a2a11a012c7d1240ed584b283e0a40000f291bd9b782e44a1dad1e519584c23c550b96842c2b0a7bce2307f954efae5cafa2f14609293822407c
 EBUILD netbeans-ide-9999_p20161004.ebuild 29849 SHA256 90d5915fe3933fe017e19108bda199fca0a88e4a57323cb26a5c741beb9de738 SHA512 64f02802c4fd42152f9b2558537af67dad1d2e014c697c2a39d24a3e4fe768fd4c4e10c5ca4e2ec48566b52a27fb90e9d5771a7290d18763a89ba5114a5b458e WHIRLPOOL 2082ae39b9757e9fbcd1cc20853b6a67963b744385aa2a69085d0ecce0eda9e69f78f35dcc0e9b55fe9a713ce6058346f46a03dad7be4156b79659d93c864c64
+EBUILD netbeans-ide-9999_p20161006.ebuild 29570 SHA256 dac8d3d7ddf78d28ae2a5ca6ad326c6993abe92800f999c65798b0bd708d5671 SHA512 4d33fb475ad15c005c90d154e7911a25830cd1b63066b83e6ec8b01a9acbaf54ec861519d93553d0cef6d4845bc4922190b28bb44dc76f41e7e222af8ad8b19b WHIRLPOOL d9713010f8fd8190792c835b1aa1ee465bf5aece25906929b7f5da2f13d7a61a17a60a9c87417300010ad56ff7931561a9e56b14534566d59da116c0e80f1267
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20161006.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20161006.ebuild
new file mode 100644
index 0000000..e7f1668
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20161006.ebuild
@@ -0,0 +1,362 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+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-10-06_00-02-33/zip/netbeans-trunk-nightly-201610060002-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 virtual/jdk:1.8 )
+	${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
+
+	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.4.1209.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
+	default
+}
+
+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.4.1209.jar && java-pkg_jar-from --into "${instdir}" jdbc-postgresql jdbc-postgresql.jar postgresql-9.4.1209.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 c1f8124..96f5662 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -69,6 +69,7 @@ DIST netbeans-trunk-nightly-201610010002-src.zip 218005875 SHA256 48da168fb46d76
 DIST netbeans-trunk-nightly-201610020002-src.zip 218005806 SHA256 3d0a3bfc28fa0597d9bd6f1f548040d2e224ebb86ad92d9fc23aaaee6d196ce9 SHA512 6126a08059dc1a52c991f478c7dbb0a2664db4af11b0e7138f215768acb898672877aa88c48c2d2f7ce5292b13927361aac328d83392e1a325acf72605b1db44 WHIRLPOOL 6f02e97282714ff98885532eaad2c8597c66a83fd188f17c7b14969fd054b5e77d53d94716276b76487c65f818b3f755e023ffcdee5ad2c60f32a526db674f4d
 DIST netbeans-trunk-nightly-201610030002-src.zip 218005806 SHA256 54f1b4f61b69379600dfa69adaee9457fd056548646d21e026dac1cb69719549 SHA512 0ae6c8ade2eeae51795d75d44394cdb1972e4113c07e5f573bdafef84ecfba76373e4f78ac1e1737a91d60c8eeb801c1c09f724a9fa99a3ab423b1f02df1e95d WHIRLPOOL ba04e61ec0d8d14aef1882aac28e0853ce0fea5ce42c3cb5ef388ae29e955634e4cdc88846836139d0e4074b87ee624c73f14cea463b706a224c706c991db044
 DIST netbeans-trunk-nightly-201610040002-src.zip 218005877 SHA256 1fc20d6350860af54a1f4ee88ce0bdf22e9fe62f849a6ad6919f30634a3c175b SHA512 c7b5d237f51cdf65ceee75b5c07625cbbcb22af7dfec8b599e2a809330a22ef91ee4f74dacf37a02c9f094503e1c5f3c83dd2d51c36e47fe3971e0704b00283b WHIRLPOOL cedbdc75b157f98cd0224c401a05ab42d9cec28c9bcff0dfdd9e528a12b124362de639308c7f480fc0a8d4ccbb4267472b33d7452dfd72762c3fb8b3db39869f
+DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 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-8.2.ebuild 15631 SHA256 26703214fdb4695b55d82f5e79bbb61cef095e46a9b1ae1552a1fba981db31a1 SHA512 74178fb52ab2ec91b3619d00f027e381b2a1b29e8cfbdaacb1cd02d3124fd6fec3d942c8e3641cd5197c0941eb98c02dea618e8f02bd28ea068e0d36c3598aae WHIRLPOOL f659e62e7b0119c5974e28649556094969133a17d62b5b2a8676eb214c1699a3bff7e57639934a1ed3732278cbea5402497b79121a60e65f925be0ea847e5483
@@ -101,4 +102,5 @@ EBUILD netbeans-java-9999_p20161001.ebuild 15656 SHA256 f5598014c65a6c63d167f637
 EBUILD netbeans-java-9999_p20161002.ebuild 15656 SHA256 09463e8020da8010a85c59b9537587553204e4ccbac57d6054ef64506e045f04 SHA512 0b2ae0fdaa9a30ca58c9e83d9ee2525f0084c2c7c4d9357c6180c4db2d0d13b60f45f7b34f9893d22c1d9bc5397cac8cbf61a9c95a24b7ac3b69e3f8af8bcc63 WHIRLPOOL ac502634d638c0852a6eddf660c69f540c1110ad9fa231f6088da813c292d830c0f2a2a47a193c65734e39ff9c0a3a7952a7cb38104ca13f7c5e676ae57a03a1
 EBUILD netbeans-java-9999_p20161003.ebuild 15656 SHA256 3519ad9368cc1cb87c5b89b85e86bba62681e813627a719d0dcce876df059d05 SHA512 60596136600335a1b9fe49ad0a9a5b297174b1eb27e6923a2b550369cee02545dfe31292902b6d7c3d3374d76d86fa316ee71444a42ace0d2e073f7af865eda8 WHIRLPOOL ec979af061b73718f3d239e90f79b787873fcc27488fcc502bf1e0c32d76e7471d6827e1b4d213cdf5c3d995f0269f1439fa8540122d33248ea203520411d497
 EBUILD netbeans-java-9999_p20161004.ebuild 15656 SHA256 607264cc7ecfb9f3208312470c4fe13bbd4d501bdc7cf2e5dc7dae3cfb468fee SHA512 f8d1664d96d65f502bca3fea3e1dd44e3e78acb9b9d74cc30664e97dce1042d310442e5d409ba84602d9beff7f2619f90711d9abe4ef56e388785f384fd84f80 WHIRLPOOL f92cf9a0d5eb46376e8683eff2e964a86302d000d106c71fae5d4a4371e8612c06bbf4f416062b4864c83686df13cc0409ec8159969780e4b0440025d7c174e7
+EBUILD netbeans-java-9999_p20161006.ebuild 15377 SHA256 cfb710c4224b96bfe2473d84a619fdbb189cd0aa0745323fe6500b9155ddf766 SHA512 de86238e990c88e1e93f0c0b494435da9061eed36dc3c8e045690ffb621803229f4a9b60f17f0e3da2fa43252890f387c142e456a7aea82c834f80ea75992a06 WHIRLPOOL 6c5554de75b2ba99e10750eeb270b2a59374447fc21c016b80d9f0d3c133e59cd737e780aa311816200c0a5148f0adad112136fadc2625755acedaed8e69b805
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20161006.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20161006.ebuild
new file mode 100644
index 0000000..f004e5f
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20161006.ebuild
@@ -0,0 +1,268 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+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-10-06_00-02-33/zip/netbeans-trunk-nightly-201610060002-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/5968566A351B28623DE4720B0ACB1E40338074D0-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 virtual/jdk:1.8 )
+	${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}"/5968566A351B28623DE4720B0ACB1E40338074D0-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
+
+	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
+	default
+}
+
+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 7845c45..590563e 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -37,6 +37,7 @@ DIST netbeans-trunk-nightly-201610010002-src.zip 218005875 SHA256 48da168fb46d76
 DIST netbeans-trunk-nightly-201610020002-src.zip 218005806 SHA256 3d0a3bfc28fa0597d9bd6f1f548040d2e224ebb86ad92d9fc23aaaee6d196ce9 SHA512 6126a08059dc1a52c991f478c7dbb0a2664db4af11b0e7138f215768acb898672877aa88c48c2d2f7ce5292b13927361aac328d83392e1a325acf72605b1db44 WHIRLPOOL 6f02e97282714ff98885532eaad2c8597c66a83fd188f17c7b14969fd054b5e77d53d94716276b76487c65f818b3f755e023ffcdee5ad2c60f32a526db674f4d
 DIST netbeans-trunk-nightly-201610030002-src.zip 218005806 SHA256 54f1b4f61b69379600dfa69adaee9457fd056548646d21e026dac1cb69719549 SHA512 0ae6c8ade2eeae51795d75d44394cdb1972e4113c07e5f573bdafef84ecfba76373e4f78ac1e1737a91d60c8eeb801c1c09f724a9fa99a3ab423b1f02df1e95d WHIRLPOOL ba04e61ec0d8d14aef1882aac28e0853ce0fea5ce42c3cb5ef388ae29e955634e4cdc88846836139d0e4074b87ee624c73f14cea463b706a224c706c991db044
 DIST netbeans-trunk-nightly-201610040002-src.zip 218005877 SHA256 1fc20d6350860af54a1f4ee88ce0bdf22e9fe62f849a6ad6919f30634a3c175b SHA512 c7b5d237f51cdf65ceee75b5c07625cbbcb22af7dfec8b599e2a809330a22ef91ee4f74dacf37a02c9f094503e1c5f3c83dd2d51c36e47fe3971e0704b00283b WHIRLPOOL cedbdc75b157f98cd0224c401a05ab42d9cec28c9bcff0dfdd9e528a12b124362de639308c7f480fc0a8d4ccbb4267472b33d7452dfd72762c3fb8b3db39869f
+DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 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-8.2.ebuild 4946 SHA256 4c8acd24dddc0686c80e64d7ece95e65497492796b2445be3b5bad8c0a2cab3d SHA512 4068f7f82dd8c99bcf3aa185d49c6222dec0deb2af017ec2073515fc744fb4133431d106e4eb19a63a0dba3edf3fbd251b563737548c063ff96cc7cc1da5c5cb WHIRLPOOL 777fa38a8be32f1b4cc7e34d2947632b9dde7321e059bb02b38d4805b401aa4b3ee9ba2fa48add3315728859c578fe2749195613fbaf1064a6ab480f9244f185
@@ -69,4 +70,5 @@ EBUILD netbeans-javacard-9999_p20161001.ebuild 4971 SHA256 8651978964d9e9a8d6a7e
 EBUILD netbeans-javacard-9999_p20161002.ebuild 4971 SHA256 d19c43f8e973fe8450fc53904006b58f8021b9379516592c397ac52839b0ddb7 SHA512 cee0a9fa1c87de6a8bf0f46eea7595a230dd80e314025373f5a0ce8c15fe63c430dedbcd7702d0076192c8a03a7b8a9ac43a372a0e8b0657b8cdf45b99a7bb81 WHIRLPOOL c7c99afb5fc229e05661805f447ca169253f920fe34aa9f11178025b57e97a13734b4e88526f7c3d9b1f1830992b3070dae110562f87026756aa87663ed2f162
 EBUILD netbeans-javacard-9999_p20161003.ebuild 4971 SHA256 778a951b088e1f9442579a3c559b68559e76e6174eaec17e102afede7f1204fb SHA512 e1b836ae08037d75ee715125be7418cce295a470abebcc1cfde0ea2e150f14b9a691ebfc7c4fdd215cb1b444f94ce7f48c5f17cc9f6d0d956fdab6888a9a377c WHIRLPOOL bc595f64bcec4fcb0ac7e8107b35c0d38dafae2e2b30058cab3c384affb1c8f15dc76ba8c684c8b3eb44facb0813b3297eac3be2531bb4564d7b55d12dab3f69
 EBUILD netbeans-javacard-9999_p20161004.ebuild 4971 SHA256 c2d69600d0e476dd10ae50a3847f5f0c5d633604fe3901c5fc261317f0dc7d8d SHA512 6b5d83de6c5615407a4c825136eb14f1fc82655413f27c56ed6c1f824f274354b6b2b622fa578cb95b9a6de6772760f80fc353498788e795e1b25aa8a3ca6e9e WHIRLPOOL d1fc4b97f647d6903ec4541c4cfb870ea8898a8fb3138b3a2c08f45761a87dc1cf2ba5cb73c64a40363180552cd35c76a02e16d44b8fa76e9e29a2a59b08cc8d
+EBUILD netbeans-javacard-9999_p20161006.ebuild 4692 SHA256 9e5430c079d6bba27666d3eded9ebacd0acce266b164fedc89ff762ed0328552 SHA512 7a3e24f8ead71943581f771ab568c9f95744cb80dd66e93e566ced426b3029c5ce49bcb0e777f17007fca43164dce02e450457a7011b68a7735531bc1802cdfd WHIRLPOOL b0fb17aa5d7b25d8142e81e9fffd17e0fc0555a1979d070b6da7c8e9147563605b5bfdf438ea17b070619dbcca90449d349d401b68a05c0801ed6381ecbfa966
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20161006.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20161006.ebuild
new file mode 100644
index 0000000..530f332
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20161006.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+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-10-06_00-02-33/zip/netbeans-trunk-nightly-201610060002-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 virtual/jdk:1.8 )
+	${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
+
+	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
+	default
+}
+
+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 663afc2..de16e26 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201610010002-src.zip 218005875 SHA256 48da168fb46d76
 DIST netbeans-trunk-nightly-201610020002-src.zip 218005806 SHA256 3d0a3bfc28fa0597d9bd6f1f548040d2e224ebb86ad92d9fc23aaaee6d196ce9 SHA512 6126a08059dc1a52c991f478c7dbb0a2664db4af11b0e7138f215768acb898672877aa88c48c2d2f7ce5292b13927361aac328d83392e1a325acf72605b1db44 WHIRLPOOL 6f02e97282714ff98885532eaad2c8597c66a83fd188f17c7b14969fd054b5e77d53d94716276b76487c65f818b3f755e023ffcdee5ad2c60f32a526db674f4d
 DIST netbeans-trunk-nightly-201610030002-src.zip 218005806 SHA256 54f1b4f61b69379600dfa69adaee9457fd056548646d21e026dac1cb69719549 SHA512 0ae6c8ade2eeae51795d75d44394cdb1972e4113c07e5f573bdafef84ecfba76373e4f78ac1e1737a91d60c8eeb801c1c09f724a9fa99a3ab423b1f02df1e95d WHIRLPOOL ba04e61ec0d8d14aef1882aac28e0853ce0fea5ce42c3cb5ef388ae29e955634e4cdc88846836139d0e4074b87ee624c73f14cea463b706a224c706c991db044
 DIST netbeans-trunk-nightly-201610040002-src.zip 218005877 SHA256 1fc20d6350860af54a1f4ee88ce0bdf22e9fe62f849a6ad6919f30634a3c175b SHA512 c7b5d237f51cdf65ceee75b5c07625cbbcb22af7dfec8b599e2a809330a22ef91ee4f74dacf37a02c9f094503e1c5f3c83dd2d51c36e47fe3971e0704b00283b WHIRLPOOL cedbdc75b157f98cd0224c401a05ab42d9cec28c9bcff0dfdd9e528a12b124362de639308c7f480fc0a8d4ccbb4267472b33d7452dfd72762c3fb8b3db39869f
+DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 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-8.2.ebuild 6247 SHA256 305336d634a2072768fae37bbdff581e861e57a6f2dfe8401acc17f3d8224b0c SHA512 1f8bd99b91e008aff64a6119a6977ae3809a116c643e194a2b01a6ecfe47b3ff1e9a5001962284a9978e39a8c2cf5d3b84d6b682e6e5180af2f81340cf4d05fa WHIRLPOOL fa411b431648071fd463cc9caa51e3c6ed56d9cd383b85986a3a3dfaf58ef83b52ae1d819694970f7c86506d0af46dd8e9f54f65fe2a7ca9f45666d471b48774
@@ -68,4 +69,5 @@ EBUILD netbeans-javadoc-9999_p20161001.ebuild 6293 SHA256 8ed8e0a59aca649d5e2a74
 EBUILD netbeans-javadoc-9999_p20161002.ebuild 6293 SHA256 e7d753e3264e0624d6173a6c93a96a191b2340941d5c3874d121779a2255b486 SHA512 7d2691e135c5419ae384086eeb37d48d6e2794be0e9d10bb28065753ccf7c57cd8b3457249f1a201041b4356e1e964f74d842f741d0bdab38c5f082de36c95dd WHIRLPOOL 2bafdf03c99cebdb4cc43534d4fa17d8d797d01c92ebc06cce2da754aa4fe15c908cdb52d589fce8a38b3976eb2d4ed9f9627bce4a5ed52992216e765adb09bf
 EBUILD netbeans-javadoc-9999_p20161003.ebuild 6293 SHA256 fae2c29fbd2f5a890ad33fdbc5370a0cda8ea3f49850a204f4dca1f2a8040974 SHA512 e8ec357f749466e487d8330fd75fb0bd30ed56281d79af2d1cdd75b1b93cf82e64ead70465f42dfea20674471e8d221733dc748b74911c624ee2859b1a88ee2e WHIRLPOOL b5f9b2783dfbd049a67d5923c10f0257ff79023669a3a9134aeb773229f9d09a6a328d7124fbda0631834d025bf5dc6722c51ba1441c95d35906edf63be17cf4
 EBUILD netbeans-javadoc-9999_p20161004.ebuild 6293 SHA256 f67a7c1cbd348d9b94a6d88f80f8ddaa351dd1419ed75895f3ecc8f020aaafe3 SHA512 5ab6b55e13bd73ee6f15281f02dc64f45d8040142d985d74f93afaa7317e077e43496b4cd9a271922a8c81ee164ae9bf1e1068024c2cdfc5a271a7af4ef11c34 WHIRLPOOL 7b6f4229e0220f941187648984a9e35f400b795b3669881de65183ff1e534e6ca6a7b6402a24ee166224497a0f1ea08dbdeff1d8a2b8c5c05c434e13166cb210
+EBUILD netbeans-javadoc-9999_p20161006.ebuild 5993 SHA256 7d9da2c94a963126765c29f8cc1028717cc0956647e151125218bc338ca67741 SHA512 7db4872f0506335261dab3fdf5d499fad0abfb712118f9cdd3eda4942a05b5070966cc46b706cd3244e87cf60e5a5bb42aa52c1f04f8395214d21383e58c8a39 WHIRLPOOL c1dc2fe5e881a8613a51f5d380ff7553c228d6e4038294a4fdae2ec50b8bf8d66d0920113ff92ccb8dd593864c8fc59d7baf7963135410f34cb0a9e0aa6819f4
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20161006.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20161006.ebuild
new file mode 100644
index 0000000..c920c6e
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20161006.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+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-10-06_00-02-33/zip/netbeans-trunk-nightly-201610060002-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
+
+	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
+	default
+}
+
+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 4f3a6ce..ed965a2 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -42,6 +42,7 @@ DIST netbeans-trunk-nightly-201610010002-src.zip 218005875 SHA256 48da168fb46d76
 DIST netbeans-trunk-nightly-201610020002-src.zip 218005806 SHA256 3d0a3bfc28fa0597d9bd6f1f548040d2e224ebb86ad92d9fc23aaaee6d196ce9 SHA512 6126a08059dc1a52c991f478c7dbb0a2664db4af11b0e7138f215768acb898672877aa88c48c2d2f7ce5292b13927361aac328d83392e1a325acf72605b1db44 WHIRLPOOL 6f02e97282714ff98885532eaad2c8597c66a83fd188f17c7b14969fd054b5e77d53d94716276b76487c65f818b3f755e023ffcdee5ad2c60f32a526db674f4d
 DIST netbeans-trunk-nightly-201610030002-src.zip 218005806 SHA256 54f1b4f61b69379600dfa69adaee9457fd056548646d21e026dac1cb69719549 SHA512 0ae6c8ade2eeae51795d75d44394cdb1972e4113c07e5f573bdafef84ecfba76373e4f78ac1e1737a91d60c8eeb801c1c09f724a9fa99a3ab423b1f02df1e95d WHIRLPOOL ba04e61ec0d8d14aef1882aac28e0853ce0fea5ce42c3cb5ef388ae29e955634e4cdc88846836139d0e4074b87ee624c73f14cea463b706a224c706c991db044
 DIST netbeans-trunk-nightly-201610040002-src.zip 218005877 SHA256 1fc20d6350860af54a1f4ee88ce0bdf22e9fe62f849a6ad6919f30634a3c175b SHA512 c7b5d237f51cdf65ceee75b5c07625cbbcb22af7dfec8b599e2a809330a22ef91ee4f74dacf37a02c9f094503e1c5f3c83dd2d51c36e47fe3971e0704b00283b WHIRLPOOL cedbdc75b157f98cd0224c401a05ab42d9cec28c9bcff0dfdd9e528a12b124362de639308c7f480fc0a8d4ccbb4267472b33d7452dfd72762c3fb8b3db39869f
+DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 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-8.2.ebuild 4692 SHA256 c686435fc11ca5968078f5769d6ce8876eb8731615d09574a4831d22418b9db6 SHA512 073803d7be4df460360dfd0a0ff00a13e81823d1879e13379e161c57f5660c4f6a76f66e5ece051de9e6ab8f6fbb38386b66af7e25e5faa3e8be641ddb6276c9 WHIRLPOOL 9a2b0778a9fd2ae5293752110ad1ac9e97035ddb5bf6d87ef55639324033bbbbb56b4ea76db840c6047b791f42d0cdf7bd5c1fa63d706624745fc88d09eb36c3
@@ -74,4 +75,5 @@ EBUILD netbeans-javafx-9999_p20161001.ebuild 4717 SHA256 c5ad035bf2657afdebb1b62
 EBUILD netbeans-javafx-9999_p20161002.ebuild 4717 SHA256 c68aed568b8506525930317a7c42f842db97ebf40295fd37e83bcdd8cc1a0a42 SHA512 9fb787c3c81463ca192245261a04d8f20d51820e8b899991f79ec0b5142ba413b24fdaebcaf795cc7ce3b8b1759733f50df820e99b3d56e820bdf5a586fa68d3 WHIRLPOOL f172da70711c2d6588a9cdbbab7c5842aa0220e5799178dff1bc41278767d3fc8716b4c4974c2b64e7bd5507613668831e55eca02df2b9dbc4142cfc62effa25
 EBUILD netbeans-javafx-9999_p20161003.ebuild 4717 SHA256 8677f2d0c0904324d4632959b47ea2201b8f358f3ad9fc432db0fd3f023e68fe SHA512 b73c121bd343be41578e0784cfc1c309a53c85f2dd3e25f76da03e9f0f9b1095b52d9fb3d840d7448b3330a005b9869e8589dce0b2c39a9e710fe37eb24f0343 WHIRLPOOL 7608e056db01e76d8981b79656160a51cba61910865f95cd2e329afeeb6906d7a0cdcd3256ffc490d8fd2dc597beb6db10e5a618c5832c5d5fb02db9bb7365df
 EBUILD netbeans-javafx-9999_p20161004.ebuild 4717 SHA256 d76fc7f7fe05dde8bb778943feb23cc19ec6e55260070d65d1d3a300d41c3cf3 SHA512 b4c7dd4ff35768a69a892c9e41260521ac9cf3d3c78e1a128e3e1ca8e3f2374eb8fdf9156218a8851b07ff484638dba69a91ad3d1c33ae666ac10d428743859f WHIRLPOOL cbe33b055284cc3843285c255e1c32c83e04e72d75c81c219dcbed6aec1802e9b30ff71f8364e29d59996a60bc0b5a1e70cd68a12ce9e70156d574cf30a47fc2
+EBUILD netbeans-javafx-9999_p20161006.ebuild 4438 SHA256 7bcc3fdf49723f026f063b4c4eb781e31ba146c6cdd7bf4eb74493ef04a90308 SHA512 5e0b2144f42d8fd3f65d7fe3aa24cd63637ebaae01a7a7ebbfd0702ded9f0184b7222018105b13bbc7508c2c7b34085a0a1bbb0578aa636fcd5d25ca8635fcca WHIRLPOOL 716336a54fbce9fba739c11c9a345fda2d1dfc70abae9fb1a97fb31b1b092664b29e2c4dbc6c05dbf2a9111daa20c412785b4b3ed2f6ff0d63befe67fa33a9fb
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20161006.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20161006.ebuild
new file mode 100644
index 0000000..b4acf0a
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20161006.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+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-10-06_00-02-33/zip/netbeans-trunk-nightly-201610060002-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 virtual/jdk:1.8 )
+	${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
+
+	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
+	default
+}
+
+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 8a4d33a..50e2a35 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201610010002-src.zip 218005875 SHA256 48da168fb46d76
 DIST netbeans-trunk-nightly-201610020002-src.zip 218005806 SHA256 3d0a3bfc28fa0597d9bd6f1f548040d2e224ebb86ad92d9fc23aaaee6d196ce9 SHA512 6126a08059dc1a52c991f478c7dbb0a2664db4af11b0e7138f215768acb898672877aa88c48c2d2f7ce5292b13927361aac328d83392e1a325acf72605b1db44 WHIRLPOOL 6f02e97282714ff98885532eaad2c8597c66a83fd188f17c7b14969fd054b5e77d53d94716276b76487c65f818b3f755e023ffcdee5ad2c60f32a526db674f4d
 DIST netbeans-trunk-nightly-201610030002-src.zip 218005806 SHA256 54f1b4f61b69379600dfa69adaee9457fd056548646d21e026dac1cb69719549 SHA512 0ae6c8ade2eeae51795d75d44394cdb1972e4113c07e5f573bdafef84ecfba76373e4f78ac1e1737a91d60c8eeb801c1c09f724a9fa99a3ab423b1f02df1e95d WHIRLPOOL ba04e61ec0d8d14aef1882aac28e0853ce0fea5ce42c3cb5ef388ae29e955634e4cdc88846836139d0e4074b87ee624c73f14cea463b706a224c706c991db044
 DIST netbeans-trunk-nightly-201610040002-src.zip 218005877 SHA256 1fc20d6350860af54a1f4ee88ce0bdf22e9fe62f849a6ad6919f30634a3c175b SHA512 c7b5d237f51cdf65ceee75b5c07625cbbcb22af7dfec8b599e2a809330a22ef91ee4f74dacf37a02c9f094503e1c5f3c83dd2d51c36e47fe3971e0704b00283b WHIRLPOOL cedbdc75b157f98cd0224c401a05ab42d9cec28c9bcff0dfdd9e528a12b124362de639308c7f480fc0a8d4ccbb4267472b33d7452dfd72762c3fb8b3db39869f
+DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 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-8.2.ebuild 4387 SHA256 70b4cb6d45a0c2082396fc23cc6a33ede2fc68ae458787a275eb5a442f9f9360 SHA512 7ad71d2521c02f683175f679b73e35f31e16aec2edaf12c93d8acbfaf7ca0ad189ecdb1a6ca3da36d977306b5a3d2bea66c3797910afa30e7da63d573f6581c5 WHIRLPOOL 00e76ba0a0346ccf9766849c15b776b9aedea8c2d10eb99c55281a626f529d5ade16a7eb733d89e1c92c172c4d79231f06b78a5c4c0217a737c0a77df4de5c4d
@@ -66,4 +67,5 @@ EBUILD netbeans-mobility-9999_p20161001.ebuild 4412 SHA256 b4a08a0ed71d9c5c653b5
 EBUILD netbeans-mobility-9999_p20161002.ebuild 4412 SHA256 d09cef03636ae82512dad41bd73cb29afa7aab86d00c299ab40d680c1bcf9339 SHA512 1c3436b154fe7740d2bc33bad04fa60cc0b2418853e36b9712600bde741b2e747cab88f73f8070b6df63152c0fa63c2a612191ab8aec86c98c8a124db474d17a WHIRLPOOL f3b89917c249c8830d2ea2de65213fd53b0195140f985601a854fe189babcaa6e620a2afd952be3291c6fe2f78b3d2c0f6a7aa4866e1e76a80297206fd2b1817
 EBUILD netbeans-mobility-9999_p20161003.ebuild 4412 SHA256 2006c93378260e4564039c212a7cb57eb12c53fc9a3cc260864a4a59512967f5 SHA512 7389a433695ca3f5abba43fee9a4cdf34e78f7dc42ba5cdf4f628f562d6cd33f9e9f6a8d3d4aaac2a33c68e6cb662b1c2c28a08c14230ab22db5c4e7613df5e9 WHIRLPOOL 5199597a4c6d129329cb2ced9cb28c3dcc2d2581b9397bb2e8b6dfbeb07c54503d538aa3f9a27a3e74ec5a5c89a86b34ddebbc702a5b7432fcd21acdc3442044
 EBUILD netbeans-mobility-9999_p20161004.ebuild 4412 SHA256 88b4bdb962d71591873777fc94fa620919c7da094ea851f5b04324b98e087afe SHA512 7e4c729d5a509ea485565242016f0c629e526f46395d96e5fa5750e1586fab3ff2423419eda309d1f00e4b0bba1be8ebf86ecfe7fb5c5d8ed89d9e4eb278d7dc WHIRLPOOL 80cd8579943da24b9715386b7f1d30d595fa02dd25fed26dd98f305d8470b293bafc13456f0734d4c8a83f0be31ece089b16e2b35b688658b99e31269f025267
+EBUILD netbeans-mobility-9999_p20161006.ebuild 4133 SHA256 252c993249cb9b7df0019bb92e35c6078a0a7ee552d4f2343f1feb6c6a91de9c SHA512 7bfd5e272cc80d99b4b0c1dc7608de96fab7e998d9c42446ec4f8f80fe43f9484dd32c73b1bc5bf76ad0925ad77ce3c4f6a138b941db39bae6a6c7e5e5e15ff9 WHIRLPOOL dc581fbe43bddddc2302523fc3cfa1a7b4c8ae075fdfe34dcb2c084b5a65c86b07689c168b569e067133bf52c35e479b32d653d61b0b0a3d59ae2da9611b614a
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20161006.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20161006.ebuild
new file mode 100644
index 0000000..724e932
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20161006.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+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-10-06_00-02-33/zip/netbeans-trunk-nightly-201610060002-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 virtual/jdk:1.8 )
+	${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
+
+	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
+	default
+}
+
+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 2258f31..fc19058 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -37,6 +37,7 @@ DIST netbeans-trunk-nightly-201610010002-src.zip 218005875 SHA256 48da168fb46d76
 DIST netbeans-trunk-nightly-201610020002-src.zip 218005806 SHA256 3d0a3bfc28fa0597d9bd6f1f548040d2e224ebb86ad92d9fc23aaaee6d196ce9 SHA512 6126a08059dc1a52c991f478c7dbb0a2664db4af11b0e7138f215768acb898672877aa88c48c2d2f7ce5292b13927361aac328d83392e1a325acf72605b1db44 WHIRLPOOL 6f02e97282714ff98885532eaad2c8597c66a83fd188f17c7b14969fd054b5e77d53d94716276b76487c65f818b3f755e023ffcdee5ad2c60f32a526db674f4d
 DIST netbeans-trunk-nightly-201610030002-src.zip 218005806 SHA256 54f1b4f61b69379600dfa69adaee9457fd056548646d21e026dac1cb69719549 SHA512 0ae6c8ade2eeae51795d75d44394cdb1972e4113c07e5f573bdafef84ecfba76373e4f78ac1e1737a91d60c8eeb801c1c09f724a9fa99a3ab423b1f02df1e95d WHIRLPOOL ba04e61ec0d8d14aef1882aac28e0853ce0fea5ce42c3cb5ef388ae29e955634e4cdc88846836139d0e4074b87ee624c73f14cea463b706a224c706c991db044
 DIST netbeans-trunk-nightly-201610040002-src.zip 218005877 SHA256 1fc20d6350860af54a1f4ee88ce0bdf22e9fe62f849a6ad6919f30634a3c175b SHA512 c7b5d237f51cdf65ceee75b5c07625cbbcb22af7dfec8b599e2a809330a22ef91ee4f74dacf37a02c9f094503e1c5f3c83dd2d51c36e47fe3971e0704b00283b WHIRLPOOL cedbdc75b157f98cd0224c401a05ab42d9cec28c9bcff0dfdd9e528a12b124362de639308c7f480fc0a8d4ccbb4267472b33d7452dfd72762c3fb8b3db39869f
+DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 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-8.2.ebuild 4086 SHA256 7c3268600d15d059bc87878a90ff34442c57eb5b2fc7fe2f32577432563d81f3 SHA512 d4442242ee0b4ead75f2781b3f04e20ef7ca78ce726283c77ee7290b95b5b567c1294ff6e03ab658139828ca542a9827112ff168420ddb3e0e28616cb4c7d3b2 WHIRLPOOL 4f1b732fad4835a9426536f6d2b6210a3c5f00cd64c0cbc60ea543ba573c3422eea175ca2d9f8d7792f43a05b4f2817b4855d6bd25d5df1780372dd15ed7b9e9
@@ -69,4 +70,5 @@ EBUILD netbeans-nb-9999_p20161001.ebuild 4111 SHA256 d9d76419dd8228b18154a464dd9
 EBUILD netbeans-nb-9999_p20161002.ebuild 4111 SHA256 4f2bb0d363b8be272ed808a291a04950d319fa7e97527d9eecc019a887a45d8f SHA512 58e866a32af1f2d2f01d135e9dfd392d054a99f4dbcb174038e6a4a314db5dd8db61d656403375776e3739c1129d865e3914cd294b80129036f156ea10523f48 WHIRLPOOL 935bc8115e58f2644e6850c4e7437a8fdf304e925078c86e7e9c1576cc2d3f2da7f02f396b53428197e979530b6c86950cc17afe4feacf2ceba1f88117c3e2f3
 EBUILD netbeans-nb-9999_p20161003.ebuild 4111 SHA256 563179374cd16b33a1e36e0b8bfcbc31bb4037f0db7f3070aa7aed5a21616477 SHA512 d991515625214ddb0305cf86972d8f91fddb38f23d8d8a9dfb73f58196e589b677f01718d4449bb94ef62f69c618bc62b584ca1d8ac9536cebe29494b08a72d4 WHIRLPOOL 23786719623ebf6c41879cda1b620003b796fabb791b21206ecac6095529feae74594e3d64c3e9fcc3a97c6517625181bccc16be51cf05d426e3794a74158aab
 EBUILD netbeans-nb-9999_p20161004.ebuild 4111 SHA256 c74d80f5b66db9c30ee71a8948d76499cff390499571eefce6aaf26771692ce3 SHA512 19f1cd278af12eab53598477e4848cfedd7330a7045fe42b9e956625206646d2980dfd3b86ad1cb20611f7aedef0e7551d9de4260a0aceb40771ccfb0a46d129 WHIRLPOOL 4d1a1a1e67a40ccb8aa9dc091e87e17ad4cf28ffd9577064aae9fa4ba08ff12a22761bb65c5759e105864de8d78e4cc35da9df9dd3acf5cda559e076119b8beb
+EBUILD netbeans-nb-9999_p20161006.ebuild 3832 SHA256 14ac3542836d93698f5a5056a30fbd393f57edb4654b0407c48625c122dcc3fd SHA512 9f88f56346f1286169e42e115d414ad90a56783624177466f9a62ff4458f335e863bf6b6f040c84b23b1827a40a53867232efba9f6a716fc717d80e1819b57cd WHIRLPOOL a5df4170559afce6fbc00da10966dc293f07fa47204ad87c760d2508e05d70ecfb6703832b73e4d7c22ad417f19e561b472d3a8efc0576de9c23ab3d92a8c2b5
 MISC metadata.xml 392 SHA256 01cdbcc83099b97486bd7b8e813e5b19c1138eb0d8d3e8a5683aafd579820435 SHA512 4d2f9160baa022d6a48b61d5f42e71cfd411d244e7a36436629bc5ee4036e4ce19079134d9a6c704ebe942306c2e0199d0591c1e54f92f8f3c8835147e639246 WHIRLPOOL c1131764e1cec66c56b977ebe36014b29e5a68e35ccc326c0cbadd050a6c625cf191c85c212e0a733661c008dab0d99f9a4cdc4c4ae0cc9d775ba1de554795a9

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20161006.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20161006.ebuild
new file mode 100644
index 0000000..3e30d7d
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20161006.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+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-10-06_00-02-33/zip/netbeans-trunk-nightly-201610060002-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 virtual/jdk:1.8 )
+	${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
+
+	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
+	default
+}
+
+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 4c3d609..54e88d0 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201610010002-src.zip 218005875 SHA256 48da168fb46d76
 DIST netbeans-trunk-nightly-201610020002-src.zip 218005806 SHA256 3d0a3bfc28fa0597d9bd6f1f548040d2e224ebb86ad92d9fc23aaaee6d196ce9 SHA512 6126a08059dc1a52c991f478c7dbb0a2664db4af11b0e7138f215768acb898672877aa88c48c2d2f7ce5292b13927361aac328d83392e1a325acf72605b1db44 WHIRLPOOL 6f02e97282714ff98885532eaad2c8597c66a83fd188f17c7b14969fd054b5e77d53d94716276b76487c65f818b3f755e023ffcdee5ad2c60f32a526db674f4d
 DIST netbeans-trunk-nightly-201610030002-src.zip 218005806 SHA256 54f1b4f61b69379600dfa69adaee9457fd056548646d21e026dac1cb69719549 SHA512 0ae6c8ade2eeae51795d75d44394cdb1972e4113c07e5f573bdafef84ecfba76373e4f78ac1e1737a91d60c8eeb801c1c09f724a9fa99a3ab423b1f02df1e95d WHIRLPOOL ba04e61ec0d8d14aef1882aac28e0853ce0fea5ce42c3cb5ef388ae29e955634e4cdc88846836139d0e4074b87ee624c73f14cea463b706a224c706c991db044
 DIST netbeans-trunk-nightly-201610040002-src.zip 218005877 SHA256 1fc20d6350860af54a1f4ee88ce0bdf22e9fe62f849a6ad6919f30634a3c175b SHA512 c7b5d237f51cdf65ceee75b5c07625cbbcb22af7dfec8b599e2a809330a22ef91ee4f74dacf37a02c9f094503e1c5f3c83dd2d51c36e47fe3971e0704b00283b WHIRLPOOL cedbdc75b157f98cd0224c401a05ab42d9cec28c9bcff0dfdd9e528a12b124362de639308c7f480fc0a8d4ccbb4267472b33d7452dfd72762c3fb8b3db39869f
+DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 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-8.2.ebuild 4393 SHA256 bae91d08e705f4a0d8eacba551418b35fd1c37f19ca0e761b9cf973334abdd16 SHA512 7f2d6017f8406fc2ff33a05509f98f1ea83024d7a0bcb8620ba0c49d3daadf4002db85d4a88ad51ab64b75c54ec1ea2acba993db2ca3a0981126ec9ceaa368f4 WHIRLPOOL ceb66938cf55f479decb49e9889cab95d8dfc8a9d5269c60e7463b68dfe0f50229c3f7cafeca2ca046796a04c0025cf8e117538cbf4fe779f4b65a70f10afe50
@@ -71,4 +72,5 @@ EBUILD netbeans-php-9999_p20161001.ebuild 4418 SHA256 4691f66a5b2f81022d0785fc84
 EBUILD netbeans-php-9999_p20161002.ebuild 4418 SHA256 5d807aff4d48a9e24bff26e373664c061232949418afa89c4d78e9df3217745b SHA512 53fe8ce51e8f55dd740f0c4e5cade524a5df63587b2195d1da60233fc3fdb45f38cb3f21d58797b573ca48017320dedf07092ec512ff0336621795dd6b89f7c1 WHIRLPOOL 0cda9104ee4e57bb738f79f426139b73754f8b21ba18850d26b57ad7341716adc0126909bb69447c64a826e35eb73587951e8f144e1f5756b40c50654686e76b
 EBUILD netbeans-php-9999_p20161003.ebuild 4418 SHA256 dfcc278a3c19f9e6ecdb7ca064f610ead7ff14413a3bf33505526c3603998f28 SHA512 f41fd0d14d0304a306c977afaa3766ec11f1ca8d93445541931c45435e41b404921f53cc950770a4515ed9a5f503985c6a68e569754fa09600694f1017328797 WHIRLPOOL aa8d55279a94729899b26f1a813907bb1aa96ddc51c5f889030cf9ffdb28d72043aa1c2d0e7ecfe5e8d9d2606bfe06ec8f316167177128339edeec99062c5978
 EBUILD netbeans-php-9999_p20161004.ebuild 4418 SHA256 b1ff334d109eda4d2367961ec15ffed1825d324427f76577455d9d0557a8cdd6 SHA512 e878d74bc775f72f79474a64239550ce589309882f234360d0cc15424d0ba004735611e8f62770c3cce9cfe9d00d276799b84169ebf6184aad14a2936b59b62d WHIRLPOOL a59a6b22aa49bf914335e6ab1cdce3b1a0df2acb0a302d2bd1945c794c9df9d8a5bcf59f4cf13ac5752195698bd57c542e9fb8f1d9c5dee7fe7409e9052a6546
+EBUILD netbeans-php-9999_p20161006.ebuild 4139 SHA256 fe65a8263647b2786fa2988a45c03893d275dfd111eca77e1a3bfcf496e66543 SHA512 e8c8263a0c0d2d7713d555d7402fbfc7e2192a4f2a3d86adfe646308121a0ab396c08a1577577546df2fff5bf2a9f7a4e38a11aa91273562cb06192c297a276f WHIRLPOOL cb2a3cb18c43f580e94380e9f5a853515ec70906c49059ae863e5d1759816c7f4ebd7617ab263e29dbc512aa01b1fb04710eed97940bb1d72406047acbaaee06
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20161006.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20161006.ebuild
new file mode 100644
index 0000000..9941c5c
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20161006.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+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-10-06_00-02-33/zip/netbeans-trunk-nightly-201610060002-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 virtual/jdk:1.8 )
+	${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
+
+	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
+	default
+}
+
+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 a98a1d3..a7e7068 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -60,6 +60,7 @@ DIST netbeans-trunk-nightly-201610010002-src.zip 218005875 SHA256 48da168fb46d76
 DIST netbeans-trunk-nightly-201610020002-src.zip 218005806 SHA256 3d0a3bfc28fa0597d9bd6f1f548040d2e224ebb86ad92d9fc23aaaee6d196ce9 SHA512 6126a08059dc1a52c991f478c7dbb0a2664db4af11b0e7138f215768acb898672877aa88c48c2d2f7ce5292b13927361aac328d83392e1a325acf72605b1db44 WHIRLPOOL 6f02e97282714ff98885532eaad2c8597c66a83fd188f17c7b14969fd054b5e77d53d94716276b76487c65f818b3f755e023ffcdee5ad2c60f32a526db674f4d
 DIST netbeans-trunk-nightly-201610030002-src.zip 218005806 SHA256 54f1b4f61b69379600dfa69adaee9457fd056548646d21e026dac1cb69719549 SHA512 0ae6c8ade2eeae51795d75d44394cdb1972e4113c07e5f573bdafef84ecfba76373e4f78ac1e1737a91d60c8eeb801c1c09f724a9fa99a3ab423b1f02df1e95d WHIRLPOOL ba04e61ec0d8d14aef1882aac28e0853ce0fea5ce42c3cb5ef388ae29e955634e4cdc88846836139d0e4074b87ee624c73f14cea463b706a224c706c991db044
 DIST netbeans-trunk-nightly-201610040002-src.zip 218005877 SHA256 1fc20d6350860af54a1f4ee88ce0bdf22e9fe62f849a6ad6919f30634a3c175b SHA512 c7b5d237f51cdf65ceee75b5c07625cbbcb22af7dfec8b599e2a809330a22ef91ee4f74dacf37a02c9f094503e1c5f3c83dd2d51c36e47fe3971e0704b00283b WHIRLPOOL cedbdc75b157f98cd0224c401a05ab42d9cec28c9bcff0dfdd9e528a12b124362de639308c7f480fc0a8d4ccbb4267472b33d7452dfd72762c3fb8b3db39869f
+DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 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-8.2.ebuild 9495 SHA256 abd72cefd9df569c179a84453a8d3c6bcf3ab2ec371d7f828501080ad81a162f SHA512 74b17d4572c4d92d8e9370f0c1c9331e5e217ecd7e9e7356961e37b5529df3524ca1bced979783f5a040455344a699ce45bfac97d98797b2c7e7cf0bd0c4d306 WHIRLPOOL d826af2d1dd0e2b4bac7d6d89988c3a181bce0764513c94088ebf94fc84608236af886f89b21bf72ded064ab4d7aef7da7d7d0c020ab7b371d2cd65a558aa44e
@@ -92,4 +93,5 @@ EBUILD netbeans-platform-9999_p20161001.ebuild 9520 SHA256 9686f9ffdb3c95c25aa50
 EBUILD netbeans-platform-9999_p20161002.ebuild 9520 SHA256 170156cad4785e928c35f05a04ffa8ed081663ccbce306199928d1c11775afc2 SHA512 caf6c898ec1b535e13a73ab9464793cd467b6e0865cfcf3ba5b49620005290849c11e19ce7bdf27830ffb21710985c285f77993eb1de3df1d85ec75832f661ee WHIRLPOOL b8b4cd8279cd20f20132aca95b6da3d9eb1078352a82ed06e7dc13c16f40de85e04428e9f5c2a967aadd3de7a2fd586bbc70912243facd39a2045d8529a4367f
 EBUILD netbeans-platform-9999_p20161003.ebuild 9520 SHA256 258afc9daaa19607aa680d31bd662f4e629657a9c095f336dfe5fc0538681dbc SHA512 127dc440a8d4b09c6ff75c25fc768fafa1f2fc638db6390053aa4aab21cf34f349ebaf97a31af409067f2c697d18cfbd31ad3e271b8e3768a84276d86952bf50 WHIRLPOOL 1cd58451c2e667046fe9588f085d5f3d04c217f3b493632a1e39019a5e2f21ffb09512cfae215b386f79cce5e005329aa6ffdf18f4eabe4a89230383c4f36a1a
 EBUILD netbeans-platform-9999_p20161004.ebuild 9520 SHA256 b5a02febb0ff4f8abbb79ba1e656527a87243ff7a01e224b0a27cfe28a67356c SHA512 bd6fd34ed795bab1ff433d63684522bbb86a64afae73912fc14f1f2679b4c541f31d459f674c481f6717559903300a7db09eb6c51d53f631dd4dfc6f91aa6058 WHIRLPOOL d337b00a4447bda9b26ab112384879390ef3ab5d69d9532de152d3a74534a521199b3ccd14810340811c114cd0bf91910b22a8d36244d10dbc035f963123c401
+EBUILD netbeans-platform-9999_p20161006.ebuild 9241 SHA256 6347d9914cbef5b608788f5d336ad8cf1a6994b8fa0f8eabe234ce455a20208e SHA512 2fd10a4a68fc4f2c96bf9a9415768764876a5a38be784f829a0d05cd5a752b8a84e0ed47d06ba0b828fd8302d7c191c68e122a343c243be9dace07b1544d40bb WHIRLPOOL e7f606c904b620093cf9f530322adb91723ea6eb3cdb987bc6830f7adebfd7e24a0da7211659eb6404decef9e476d37a516fb5c94a2a02ba21a05b415811359f
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20161006.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20161006.ebuild
new file mode 100644
index 0000000..73827b8
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20161006.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+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-10-06_00-02-33/zip/netbeans-trunk-nightly-201610060002-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 virtual/jdk:1.8 )
+	${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
+
+	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
+	default
+}
+
+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 dcff3b5..fbe3d07 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201610010002-src.zip 218005875 SHA256 48da168fb46d76
 DIST netbeans-trunk-nightly-201610020002-src.zip 218005806 SHA256 3d0a3bfc28fa0597d9bd6f1f548040d2e224ebb86ad92d9fc23aaaee6d196ce9 SHA512 6126a08059dc1a52c991f478c7dbb0a2664db4af11b0e7138f215768acb898672877aa88c48c2d2f7ce5292b13927361aac328d83392e1a325acf72605b1db44 WHIRLPOOL 6f02e97282714ff98885532eaad2c8597c66a83fd188f17c7b14969fd054b5e77d53d94716276b76487c65f818b3f755e023ffcdee5ad2c60f32a526db674f4d
 DIST netbeans-trunk-nightly-201610030002-src.zip 218005806 SHA256 54f1b4f61b69379600dfa69adaee9457fd056548646d21e026dac1cb69719549 SHA512 0ae6c8ade2eeae51795d75d44394cdb1972e4113c07e5f573bdafef84ecfba76373e4f78ac1e1737a91d60c8eeb801c1c09f724a9fa99a3ab423b1f02df1e95d WHIRLPOOL ba04e61ec0d8d14aef1882aac28e0853ce0fea5ce42c3cb5ef388ae29e955634e4cdc88846836139d0e4074b87ee624c73f14cea463b706a224c706c991db044
 DIST netbeans-trunk-nightly-201610040002-src.zip 218005877 SHA256 1fc20d6350860af54a1f4ee88ce0bdf22e9fe62f849a6ad6919f30634a3c175b SHA512 c7b5d237f51cdf65ceee75b5c07625cbbcb22af7dfec8b599e2a809330a22ef91ee4f74dacf37a02c9f094503e1c5f3c83dd2d51c36e47fe3971e0704b00283b WHIRLPOOL cedbdc75b157f98cd0224c401a05ab42d9cec28c9bcff0dfdd9e528a12b124362de639308c7f480fc0a8d4ccbb4267472b33d7452dfd72762c3fb8b3db39869f
+DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 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-8.2.ebuild 3447 SHA256 d72baffd8c47022d9a1cb9cab0ab1020f888c5bc4480d0946ff8d2ee0ded480c SHA512 96b165928f0a6af76b1401051deeffc0338197a47cd4d88b4c7b72707b143457e3170a7ed8fcabaa2b32973392352aabcdb6348374b90abd90ae1a57bf4acde7 WHIRLPOOL d43354d606b7d5d56e3ab6e2675717d1f9d53c35e43a32971e74235248786c710729d9d0a0cf5cf8b0bc5c7df3eaadc755ac0cf663955fa850cb087827e4e126
@@ -66,4 +67,5 @@ EBUILD netbeans-profiler-9999_p20161001.ebuild 3472 SHA256 b30a70117c15abc4d7982
 EBUILD netbeans-profiler-9999_p20161002.ebuild 3472 SHA256 bdb0033ecb46109464cbbd1592921ff58a0b5f67182b87245564cc34dc2c178d SHA512 841e07219f74d4b390d6fdc35337081b507e9e1260708b74a9a54d310aa29d969ecd56801434dba658506bb92c1a5c699eac959ff883b32e35096d75384436e9 WHIRLPOOL 6869829aafee744b5940d1d1c07fb3f2c6cd8afcfaab5cbdba55fd17e60e42b9d2531e6771ba02ba727e0b9e6a75377dff2974ba5ddab533a7aa36654ecbed1a
 EBUILD netbeans-profiler-9999_p20161003.ebuild 3472 SHA256 1dda308aae21f2775b3f7d763a0b88151c1ed0b847560b0207f50064dda05a80 SHA512 af81de30375d4456e51b61ac3ae7cc53d371b3fdf0312c2d7250a960d6e75542f1db12f84f43b36be669fc16a3a66c99731277f60ee1ece99197cfadfabdd17e WHIRLPOOL 18bb788228d14a59330c23937c584dd3335d978aff0044cf23c277718b1aae0bb68a90353451a502b8d827978ac2c5056932ab4ddae13863cf6825dd20d0fab8
 EBUILD netbeans-profiler-9999_p20161004.ebuild 3472 SHA256 fbda9d5383b13dfe57c54b7a525a54e10dc7e202bc7626c8e6f86d38e722a9b0 SHA512 546254ad3369816189aa3bb70c6447b3e8da89d2ab99fb0b39fdea7aeb35f830cea627c7311af28a8c0f8a6790fc0fa26155f767bc3c9c852f5551c4dde97632 WHIRLPOOL 8305076dcb0f789a6fe69ae555785b6d6a458a4438369d6676b3c2e99da32da98fc63a3f488e4c5c993515e26d0bed1bf4a649c0390d2bd24bc9576e7ba22c7f
+EBUILD netbeans-profiler-9999_p20161006.ebuild 3193 SHA256 1c305129332f3058f83877a119e87a05d7a53e91daff0a38082153f70c91d06d SHA512 057d2c60959893f7ece4d9fceaf0875585759c887fa239d4623772227abffefa1b0a0937c546c51de0ca1e0e999393dc70dceba9432475d88e8d50894cf6e73b WHIRLPOOL d2a6a4acce503a808fef75678f6d5c5f35f8abbd72f49e3aed2be83ebef2642e53bf7b0456922cb0ecc8098d228095b22186ef984f70b500234be68a1e1a76ab
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20161006.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20161006.ebuild
new file mode 100644
index 0000000..a669da5
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20161006.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+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-10-06_00-02-33/zip/netbeans-trunk-nightly-201610060002-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 virtual/jdk:1.8 )
+	${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
+
+	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
+	default
+}
+
+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 28b2285..d9dbf82 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -53,6 +53,7 @@ DIST netbeans-trunk-nightly-201610010002-src.zip 218005875 SHA256 48da168fb46d76
 DIST netbeans-trunk-nightly-201610020002-src.zip 218005806 SHA256 3d0a3bfc28fa0597d9bd6f1f548040d2e224ebb86ad92d9fc23aaaee6d196ce9 SHA512 6126a08059dc1a52c991f478c7dbb0a2664db4af11b0e7138f215768acb898672877aa88c48c2d2f7ce5292b13927361aac328d83392e1a325acf72605b1db44 WHIRLPOOL 6f02e97282714ff98885532eaad2c8597c66a83fd188f17c7b14969fd054b5e77d53d94716276b76487c65f818b3f755e023ffcdee5ad2c60f32a526db674f4d
 DIST netbeans-trunk-nightly-201610030002-src.zip 218005806 SHA256 54f1b4f61b69379600dfa69adaee9457fd056548646d21e026dac1cb69719549 SHA512 0ae6c8ade2eeae51795d75d44394cdb1972e4113c07e5f573bdafef84ecfba76373e4f78ac1e1737a91d60c8eeb801c1c09f724a9fa99a3ab423b1f02df1e95d WHIRLPOOL ba04e61ec0d8d14aef1882aac28e0853ce0fea5ce42c3cb5ef388ae29e955634e4cdc88846836139d0e4074b87ee624c73f14cea463b706a224c706c991db044
 DIST netbeans-trunk-nightly-201610040002-src.zip 218005877 SHA256 1fc20d6350860af54a1f4ee88ce0bdf22e9fe62f849a6ad6919f30634a3c175b SHA512 c7b5d237f51cdf65ceee75b5c07625cbbcb22af7dfec8b599e2a809330a22ef91ee4f74dacf37a02c9f094503e1c5f3c83dd2d51c36e47fe3971e0704b00283b WHIRLPOOL cedbdc75b157f98cd0224c401a05ab42d9cec28c9bcff0dfdd9e528a12b124362de639308c7f480fc0a8d4ccbb4267472b33d7452dfd72762c3fb8b3db39869f
+DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 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-8.2.ebuild 6217 SHA256 7a650c0efdc957b580ba1c74037dca4c7406351106f9aff0384390edd065b15a SHA512 9d0e33f0373fc9f48ad94e8e957ea511ac158cbe13f875a820c0e4cb55afb9bb34903be9e14817ad5d6d3db889a785b287dc208410a2012eaba18f63c5695502 WHIRLPOOL 4c580d11229f25f52727eb8390f1e8c6fd3a50ff4b9ba4e68f0194aeba78f4d682daae0c3736cc410d4b1d767e1d1e2c5fbca2cbd9b94a8b957392978842c009
@@ -85,4 +86,5 @@ EBUILD netbeans-webcommon-9999_p20161001.ebuild 6242 SHA256 ef58e3768e814d59d89c
 EBUILD netbeans-webcommon-9999_p20161002.ebuild 6242 SHA256 6f03ffb8d15de6c62a8f2ba3f974dbd0383a93cecdcf12eb8170c01b97a93962 SHA512 1a900247eae0e1776e4d2a42dc9dd5323850bab2d8d07f8e54cee4c53fc04afbcdb3a568900cceb04568b0260bca23ec9b4f7e53fe8d5fdf5cc169b94f0d48fe WHIRLPOOL 83653a8831544fa6c761db20552db698aa4825e19b1c698333ac9d71ca65c76ad387266bfdc16880d62205c1c0da2a4e17fca9622c1bc318b0a80ef01f0b15be
 EBUILD netbeans-webcommon-9999_p20161003.ebuild 6242 SHA256 a2ded8a52535851721215782dabcfa59669ea2237a41d7705c9d09dab1645ba5 SHA512 1fa6b80640e2e083072758557a13ed5980b9f78bb9fb242ecdbecbe0f3d31be133e46c8388227337fae60a9932c2218308dcd442ae9e25b8752fd42151497238 WHIRLPOOL f1634ace58a84891e65d6fafba34158d7ccf9e86cc5d04fd1c02a4b732f9e1d64effe7e3878921499c23a1db23e0556fc8a0bf17d3526b94f36acf50e3d4abed
 EBUILD netbeans-webcommon-9999_p20161004.ebuild 6242 SHA256 05f9b656ab5a98772e4f153ed8c97c9b110821c4d91d06c4767d322b86c91cfb SHA512 8f317e166d426462e992d61a6ffb729e42bf50407517feee1da271e03277f84918d88add10bdb31010159c78bdd8b7496196d574b5c723414577e17122dee7b5 WHIRLPOOL 9d4afc4ce1663c3ca780e11b76a96b03750631d8140347a93c7be2e09843c36ed692002bdb08171c382cc1dfdbc7c58af8a9656aeb1d57ee940b8110147db485
+EBUILD netbeans-webcommon-9999_p20161006.ebuild 5963 SHA256 e27a04bcde516695ce649e109fec386a84d0b214b112a011b7d013ee5ffe280f SHA512 a74abd50b15cf10eb4238133defcd0ab1b40ac1951f33dfc7d89f82a2f908cbef7a8eaa2ad574bb850f9d87c08fbc4d9010c86ec47cefe6794eed9ece5289ec6 WHIRLPOOL aee85e2369d28b40002612f64f24d84dc447c9b2d752a22a53d99b68ccf36024c5ae2fb7545ec1188085ed45dcdb3aeec42927933ccef8baa2ac72e5963a6b0a
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20161006.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20161006.ebuild
new file mode 100644
index 0000000..2e6d171
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20161006.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+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-10-06_00-02-33/zip/netbeans-trunk-nightly-201610060002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/7CA13589F586F659BB0E1561719A91CA47BF1897-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 virtual/jdk:1.8 )
+	${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}"/7CA13589F586F659BB0E1561719A91CA47BF1897-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
+
+	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
+	default
+}
+
+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 1e62e3e..6b18184 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201610010002-src.zip 218005875 SHA256 48da168fb46d76
 DIST netbeans-trunk-nightly-201610020002-src.zip 218005806 SHA256 3d0a3bfc28fa0597d9bd6f1f548040d2e224ebb86ad92d9fc23aaaee6d196ce9 SHA512 6126a08059dc1a52c991f478c7dbb0a2664db4af11b0e7138f215768acb898672877aa88c48c2d2f7ce5292b13927361aac328d83392e1a325acf72605b1db44 WHIRLPOOL 6f02e97282714ff98885532eaad2c8597c66a83fd188f17c7b14969fd054b5e77d53d94716276b76487c65f818b3f755e023ffcdee5ad2c60f32a526db674f4d
 DIST netbeans-trunk-nightly-201610030002-src.zip 218005806 SHA256 54f1b4f61b69379600dfa69adaee9457fd056548646d21e026dac1cb69719549 SHA512 0ae6c8ade2eeae51795d75d44394cdb1972e4113c07e5f573bdafef84ecfba76373e4f78ac1e1737a91d60c8eeb801c1c09f724a9fa99a3ab423b1f02df1e95d WHIRLPOOL ba04e61ec0d8d14aef1882aac28e0853ce0fea5ce42c3cb5ef388ae29e955634e4cdc88846836139d0e4074b87ee624c73f14cea463b706a224c706c991db044
 DIST netbeans-trunk-nightly-201610040002-src.zip 218005877 SHA256 1fc20d6350860af54a1f4ee88ce0bdf22e9fe62f849a6ad6919f30634a3c175b SHA512 c7b5d237f51cdf65ceee75b5c07625cbbcb22af7dfec8b599e2a809330a22ef91ee4f74dacf37a02c9f094503e1c5f3c83dd2d51c36e47fe3971e0704b00283b WHIRLPOOL cedbdc75b157f98cd0224c401a05ab42d9cec28c9bcff0dfdd9e528a12b124362de639308c7f480fc0a8d4ccbb4267472b33d7452dfd72762c3fb8b3db39869f
+DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 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-8.2.ebuild 2696 SHA256 804a8ac57613a04f55b9723060477e476199b34095c450a93628ef993f191230 SHA512 2d3a64a19f23e8fd56540fa1a9583332a1fed9065337749a98a836214b7c634997b32c99fd40e89f938154bdc4c28acb806d4050df9dac69716e6d6e96379f1a WHIRLPOOL 95310f441f2e0f7546bf3423e13d162f2d1683ee6aaf9de956401320ec85ce2c8c0b1020a85fc8ae9a1f6dc79169e4e29d34b2b4d80c76d3b18f19477c5637e6
@@ -66,4 +67,5 @@ EBUILD netbeans-websvccommon-9999_p20161001.ebuild 2721 SHA256 a74160c3c564d6a67
 EBUILD netbeans-websvccommon-9999_p20161002.ebuild 2721 SHA256 511fec8cd9d91a5a89076eac54380f0d5211a0f4b1e9e7eec096bb18872c9229 SHA512 955acba0ecfa1e773769c5e03b371f699ba41427b68e087742e7672c5df82f6effa9917c7886fa93aa9d2345dac298eeedf11aa81d312e7848daf9ebabb6a00e WHIRLPOOL c7faa0f32f140242ed5cd087eb849f28016837de77a8c88804ce17565c7d8f7d2fd2dce98ace636a1e71aafef398eba9cb2588c5716f7a09df2150b7075c13d0
 EBUILD netbeans-websvccommon-9999_p20161003.ebuild 2721 SHA256 a6648c57b6d0dd1916e28e7129205e1aa56459248260d7a72a948e90f638fa87 SHA512 6991c72ff79af229ed461e6a88ba8428c6c1d5ba40eab13d4c784914342bea2e1a631857c64e992751431e24f22ef1c0779a7cd8843aa509d8630c4fab5ec851 WHIRLPOOL 6569a5f815d440912c496b2ac7ab643bea3b997994eb6b958aba6479e1112d6ac4052825d32e11446ded4d50237fbcdc081556838fdea654bc2ef48dd1ca987e
 EBUILD netbeans-websvccommon-9999_p20161004.ebuild 2721 SHA256 2b5b36ea49bc5917f00642d7c3c3d49fdeaecb5c127da37e7e09d4843cc5588e SHA512 87851234c9bb7d020d2698d1bc9ba563c54eafbb928a8762b8061c6563febae5d37fce34cee94c1fb9f480e3d02d61d45999404ef767ebcee3bcceb1f081313e WHIRLPOOL 451bae0ae42312e921e6e991c27c2055ed513efcb469afbe680568dea113ffee597da970457070a775befd893e7d9e7ec00343162483f71fb1bdf6bda8523da5
+EBUILD netbeans-websvccommon-9999_p20161006.ebuild 2442 SHA256 3d28d9be054e5a74c324dff3c4b79780887c4f6bd05b24a99d25c8f0de7aaee2 SHA512 b1c4a836ede1b6e8bee947652e3b99713be9308525338d61d83adee5100558d670319ab0b9ec09c5a6ea436b994e5c8622893616a09c17b4865eda380191c830 WHIRLPOOL 380cb4c4750cca7d806320fac45a7684fb489a45934dbd5dcdcad89c3b565241720c6f2a0ff1f3943df93ebc63c3fba5b2004cb86ad83eb3e89d14b069e14169
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20161006.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20161006.ebuild
new file mode 100644
index 0000000..418979e
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20161006.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+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-10-06_00-02-33/zip/netbeans-trunk-nightly-201610060002-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 virtual/jdk:1.8 )
+	${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
+
+	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
+	default
+}
+
+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 31616e2..0910fd6 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201610010002-src.zip 218005875 SHA256 48da168fb46d76
 DIST netbeans-trunk-nightly-201610020002-src.zip 218005806 SHA256 3d0a3bfc28fa0597d9bd6f1f548040d2e224ebb86ad92d9fc23aaaee6d196ce9 SHA512 6126a08059dc1a52c991f478c7dbb0a2664db4af11b0e7138f215768acb898672877aa88c48c2d2f7ce5292b13927361aac328d83392e1a325acf72605b1db44 WHIRLPOOL 6f02e97282714ff98885532eaad2c8597c66a83fd188f17c7b14969fd054b5e77d53d94716276b76487c65f818b3f755e023ffcdee5ad2c60f32a526db674f4d
 DIST netbeans-trunk-nightly-201610030002-src.zip 218005806 SHA256 54f1b4f61b69379600dfa69adaee9457fd056548646d21e026dac1cb69719549 SHA512 0ae6c8ade2eeae51795d75d44394cdb1972e4113c07e5f573bdafef84ecfba76373e4f78ac1e1737a91d60c8eeb801c1c09f724a9fa99a3ab423b1f02df1e95d WHIRLPOOL ba04e61ec0d8d14aef1882aac28e0853ce0fea5ce42c3cb5ef388ae29e955634e4cdc88846836139d0e4074b87ee624c73f14cea463b706a224c706c991db044
 DIST netbeans-trunk-nightly-201610040002-src.zip 218005877 SHA256 1fc20d6350860af54a1f4ee88ce0bdf22e9fe62f849a6ad6919f30634a3c175b SHA512 c7b5d237f51cdf65ceee75b5c07625cbbcb22af7dfec8b599e2a809330a22ef91ee4f74dacf37a02c9f094503e1c5f3c83dd2d51c36e47fe3971e0704b00283b WHIRLPOOL cedbdc75b157f98cd0224c401a05ab42d9cec28c9bcff0dfdd9e528a12b124362de639308c7f480fc0a8d4ccbb4267472b33d7452dfd72762c3fb8b3db39869f
+DIST netbeans-trunk-nightly-201610060002-src.zip 218005795 SHA256 1aff56080e142a7f921385a5d2f36603b3dfb6528d96fc769ee98a05cebf4f71 SHA512 fa854865078d1ba2dc229243f90304c8cd839e8516559f04a0aa1345f0911ce1647a2f819ad7046d77f92fbee64d1bf440c293ad5b4a71a71d3e505e0ccdf0e3 WHIRLPOOL c7fcde5a8a71df1f3ccaf41ba370d7e613efce990bf0f350a8e43b474a07d8f4c54e136b884e75120edf9705d7c88f7f58a558eddd3dee1ea3d917aec1ad4910
 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-8.2.ebuild 6664 SHA256 e9379c0414f1c15d1a8750692cb3d8b9bfea789698c0dd382a02f1541593848a SHA512 aa5bf30160d0e917f874e9eef2a8302d47232cfbe18e86f892dc8eadd3f5575e185d76db58b5ef3019af9cb1463b0406a901bc7f790896adf32bb5e6bb272e78 WHIRLPOOL 6f2019949f087a602ffcbafd3d93e9fdd3fdf3de5b243ec9a7a43f85285af537d812d4d2352a8fb37d2b1c8314ee4658a2a3f80453f8cb6d9d9a98f418881aeb
@@ -71,4 +72,5 @@ EBUILD netbeans-9999_p20161001.ebuild 6939 SHA256 8da2108defec70e60e9478e11492f4
 EBUILD netbeans-9999_p20161002.ebuild 6939 SHA256 cff7a29699ff709aedf8a05736eabfff563825d61a13f4cac09711e2ae5bf36e SHA512 4fc1b43610dea2c7b661609b9fe5aa68a04363b087aea1e82125b3e1050344f8486ddee96062d489a2ab854fcc4310ef757e5671590f46d075429a3b220e6645 WHIRLPOOL b4fa838903770ea332deedd4c72a428ca0af47ee09ae61feac1c2dd27d000624882aec62448aed6fdce803a2e309734e905b4deaf8f7cb584d9d9ce65ac80560
 EBUILD netbeans-9999_p20161003.ebuild 6939 SHA256 8b9ca9ba7adaa5c451245a68a0cf6fdb6aabd327d84f95a16cad517c1de27b6c SHA512 278931546dd1600618f337f7f08c0b27f7b30dfbf978e4305308011f393b66eb02ddc5258ebef041f1f687c2c293d1477cf676596f27bb3210fe7d2696fa9937 WHIRLPOOL 496276e1b8c8fa386a43e204c44923c9194ba6d313ca1f7e4279664c6c46132c8fc796ac413eba8887a830caee2e3b4aedf16d6544cb7085b05b1ee20caf9543
 EBUILD netbeans-9999_p20161004.ebuild 6690 SHA256 a60833a04deb677aba2341fefe7d1da3f11f4268037a092aedb23281ba54476b SHA512 dd61ff09d998b21d1e8cf5b2f09028e407492e1fd614b3780bdbe86d6804e884aac4bb3b57058aa0d204d1139170969072e4c2155e7b7f7b30a8c4c58a10fa5d WHIRLPOOL 1fd9ddc67948f90ee9c212e4088b317c9de0a806985f10543f92a8a71b02ee5c089ee0a23dd9c9220c246aac8e27a6e6c9c5ae8eaf495f1ee2d42b9ce48cd453
+EBUILD netbeans-9999_p20161006.ebuild 6199 SHA256 e66c59f5b14b51f32e7324ee331278f1a42b85524c2b4d8044bd188b1c2cb05d SHA512 ce2fb3cf184897af145ce978f182472ab025987b8ac29417c588ce2169ea5f6f78fab53c899352d9f69ce6e44d3c06e2bb4c27d73d8f195de620562e73a72535 WHIRLPOOL 268c3e5ff43f7b49770895dbccad53908645be09e8d3d163b62b9080a391572d85aabb8f718ae93f576a464705cbda105e3986f01e10a2229e4115f7bad7eda2
 MISC metadata.xml 329 SHA256 8aeaf2a0228f15c2e4140f401b30f083509bd99d0a578873069f3595cd8555f3 SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640 WHIRLPOOL 799a9b79b1b447bda9631f67e2dfaf722376740e1d2037796528a05f9745eeed00d9990a74a65ce09f74bc5e1d60a887abde540c3c62487d7dd49b8377c15834

diff --git a/dev-util/netbeans/netbeans-9999_p20161006.ebuild b/dev-util/netbeans/netbeans-9999_p20161006.ebuild
new file mode 100644
index 0000000..cc781bd
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20161006.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+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-10-06_00-02-33/zip/netbeans-trunk-nightly-201610060002-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-20160920.tar.bz2"
+ALL_URLS="${SOURCE_URL} ${PATCHES_URL} ${L10N_URL}"
+SRC_URI="l10n_af? ( ${ALL_URLS} )
+	l10n_ar? ( ${ALL_URLS} )
+	l10n_bg? ( ${ALL_URLS} )
+	l10n_ca? ( ${ALL_URLS} )
+	l10n_cs? ( ${ALL_URLS} )
+	l10n_de? ( ${ALL_URLS} )
+	l10n_el? ( ${ALL_URLS} )
+	l10n_es? ( ${ALL_URLS} )
+	l10n_fil? ( ${ALL_URLS} )
+	l10n_fr? ( ${ALL_URLS} )
+	l10n_gl? ( ${ALL_URLS} )
+	l10n_hi? ( ${ALL_URLS} )
+	l10n_id? ( ${ALL_URLS} )
+	l10n_it? ( ${ALL_URLS} )
+	l10n_ja? ( ${ALL_URLS} )
+	l10n_ko? ( ${ALL_URLS} )
+	l10n_lt? ( ${ALL_URLS} )
+	l10n_nl? ( ${ALL_URLS} )
+	l10n_pl? ( ${ALL_URLS} )
+	l10n_pt-BR? ( ${ALL_URLS} )
+	l10n_pt-PT? ( ${ALL_URLS} )
+	l10n_ro? ( ${ALL_URLS} )
+	l10n_ru? ( ${ALL_URLS} )
+	l10n_si? ( ${ALL_URLS} )
+	l10n_sq? ( ${ALL_URLS} )
+	l10n_sr? ( ${ALL_URLS} )
+	l10n_sv? ( ${ALL_URLS} )
+	l10n_ta? ( ${ALL_URLS} )
+	l10n_tr? ( ${ALL_URLS} )
+	l10n_vi? ( ${ALL_URLS} )
+	l10n_zh-CN? ( ${ALL_URLS} )
+	l10n_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_L10N="
+	l10n_af
+	l10n_ar
+	l10n_bg
+	l10n_ca
+	l10n_cs
+	l10n_de
+	l10n_el
+	l10n_es
+	l10n_fil
+	l10n_fr
+	l10n_gl
+	l10n_hi
+	l10n_id
+	l10n_it
+	l10n_ja
+	l10n_ko
+	l10n_lt
+	l10n_nl
+	l10n_pl
+	l10n_pt-BR
+	l10n_pt-PT
+	l10n_ro
+	l10n_ru
+	l10n_si
+	l10n_sq
+	l10n_sr
+	l10n_sv
+	l10n_ta
+	l10n_tr
+	l10n_vi
+	l10n_zh-CN
+	l10n_zh-TW"
+IUSE="doc ${IUSE_NETBEANS_MODULES} ${IUSE_L10N}"
+S="${WORKDIR}"
+
+DEPEND=">=virtual/jdk-1.7
+	dev-java/javahelp:0"
+RDEPEND="|| ( virtual/jdk:1.7 virtual/jdk:1.8 )
+	~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_L10N} ; do
+		if use ${lingua} ; then
+			local lang=${lingua/l10n_/}
+			lang=${lang/-/_}
+
+			case ${lang} in
+				ar)  lang="ar_EG,ar_SA" ;;
+				es)  lang="es,es_CO"    ;;
+				fil) lang="fil_PH"	;;
+				gl)  lang="gl_ES"	;;
+				hi)  lang="hi_IN"	;;
+				id)  lang="in_ID"	;;
+				nl)  lang="nl_BE,nl_NL" ;;
+				ta)  lang="ta_IN"	;;
+			esac
+
+			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
+
+		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
+	default
+}
+
+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
+
+		make_desktop_entry "netbeans-${SLOT} --locale en" "Netbeans ${PV} en" netbeans-${SLOT} Development
+
+		for lingua in ${IUSE_L10N}; do
+			if use ${lingua} ; then
+				local locales=${lingua/l10n_/}
+				locales=${locales/-/:}
+
+				case ${locales} in
+					ar)  lang="ar:EG ar:SA" ;;
+					es)  lang="es es:CO"    ;;
+					fil) lang="fil:PH"	;;
+					gl)  lang="gl:ES"	;;
+					hi)  lang="hi:IN"	;;
+					id)  lang="in:ID"	;;
+					nl)  lang="nl:BE nl:NL" ;;
+					ta)  lang="ta:IN"	;;
+				esac
+
+				for locale in ${locales}; do
+					make_desktop_entry "netbeans-${SLOT} --locale ${locale}" "Netbeans ${PV} ${locale}" netbeans-${SLOT} Development
+				done
+			fi
+		done
+	fi
+}