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

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

* [gentoo-commits] dev/fordfrog:master commit in: dev-util/netbeans/, dev-java/netbeans-harness/, dev-java/netbeans-extide/, ...
@ 2016-09-16  9:21 Miroslav Šulc
  0 siblings, 0 replies; only message in thread
From: Miroslav Šulc @ 2016-09-16  9:21 UTC (permalink / raw
  To: gentoo-commits

commit:     d217781d6e97036a23c3b30f8511b1961657bc4c
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 16 09:20:09 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Sep 16 09:20:09 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=d217781d

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.3.0

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index d774caf..862c9d9 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201609120002-src.zip 218010356 SHA256 265ec87ec62f15
 DIST netbeans-trunk-nightly-201609130002-src.zip 218011897 SHA256 40cb0d7c2dba73fa2d3dcddcbc1cf6a1bef06b551cf0a5ff9d6ce9ff12ea007d SHA512 26e5b258261386437534b6b8748a69c7fb7e9332e67584de9723ff7cf9067d20e5cb6d4e86eaf0c611378be0bef9517dd563ca824499efc4f1a89056860ac856 WHIRLPOOL 3b4bd5894c4f65d638a070084267814f00819936c9e4cf7ca758eb04f5500280daf16caa36137700659c10717738d98558b9c5e090c4df82e2d9247308a1f1d3
 DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318bfe333cedd1fbd81a4c6b870e0025f9f4f3ea3d6926bc18cb1c SHA512 81af61f842b23dd51b5610d4c1f9a7113f82e4ceaee2af4a4f4392b56f38b9ec92655c1e413e9b58a808207b308dc68ea8b94c24ef636db8d8ea81275f867470 WHIRLPOOL 8cc8b87bbf8299ab97e24ee64b1d982dfb942cb60a8d8a110b38207807c05b8a7f1c2a2a4d5df52a80c12eaa9ae08440e8f7e333e6a519d83759d2b50c42d015
 DIST netbeans-trunk-nightly-201609150002-src.zip 218016283 SHA256 90b7a4a97f9328512ad9388caab30b88290338dcd87e90d7b20c1568b679a11e SHA512 bc398e865c55547752f8ac05ed2de3c22eff9d5b7c204f28ecd30d1a1d11bda9276454d505d12f5a951d88c40a160a1dad15fc62ab39a6d350d0ba45af4df299 WHIRLPOOL 283749fe3c678341d9489fea580e7af7bec404507be57bd264d4a3673b8b5660a729c5a3f96da2adbeee1fa10fe3205e486c6186f01dcb5fa05f93627bc646de
+DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72fbb6102c07095a61e6cc10066c5fff94a3abfebe2852484e31e SHA512 e41d80df015b84f2faf8811a8fd242f85c72e39867161d236ef0242062568c6fd163bf46a623f4a14779e9d89a49b6a2d88691487a5ec785eece6c7f70459ffa WHIRLPOOL e42fac6f885c4fd1c2bc030cf47aa82ec4e35f66d305e8dd06d6a439ca958074ce57ae761b7ee16e4612dc5f94bedd7fe4655463ab4a7c095e03f41d4fc686f1
 EBUILD netbeans-apisupport-8.0.2.ebuild 3314 SHA256 b68fe791f275fe4fcc8b00888688949b8927cb39db2cf9ad7860017c6d20adee SHA512 35c4bbcd34ec0eaef8a2de86c13333d2bf092db61af48558c3e173bb17dbf8fcd15001307bd7c498f4ccdbaa4277e1ee42ff0909af6170039165b547f646c383 WHIRLPOOL 206fe8d5f64e76827d3eb958a629ba087e8a16c2797752f5d9e62dff4166653677587a81be19e0a2c6adcf49292255d532e1f542c02550b1cf6ffd51467bde3c
 EBUILD netbeans-apisupport-8.1.ebuild 3338 SHA256 d249a09cd1a527bfc4f0dc87b1768aad9f05fc7fe7079fad0094c27d416d030c SHA512 47e5db58581625b23157ef7a7b6e340fce1327db85e015369ac32791178a0836af3348397ac6ff4439ab246170d3318c2062994c81019ff361084f00d432c9c8 WHIRLPOOL 8e379c9219b7730a15c10216bed00c3ec104f84b252d32da629f066095897398a4d8818e07cda5afdf94b115b97ead8de6a9529f38c81c1c41144067f119e54e
 EBUILD netbeans-apisupport-9999_p20160815.ebuild 3384 SHA256 77fe42ecc1d845fb3d66d513dfbb7900c66032a4a307eba8054fe910f3bb4419 SHA512 da12e4688c116b52ce34a16e54e4fa73c7e1aa0a7cbc84ce2d208ecc8d25a01ec26c539ed2b58a67564eb709dff5cd780512e0f5175b909955ffe6db7744edb3 WHIRLPOOL 629474ca2d8a94fd81ae5a6faf573dd427e280938f3642cdc1bc0188d00007d4cac542094ed720a54b943e1cc13add533a2975106fb2867674ddb5247c05541f
@@ -61,4 +62,5 @@ EBUILD netbeans-apisupport-9999_p20160912.ebuild 3384 SHA256 5bda5ba0ef1ff041ad7
 EBUILD netbeans-apisupport-9999_p20160913.ebuild 3384 SHA256 262e90a4ea88784e7c2ef7f1d1bc21206d9e99b98ee7f3b0ed5c2d6201b4c926 SHA512 bc3f12cac67952d29764218d7017d3ef679956431521b30f5c68fbdb016a56b7008e770cfb9e132a2db299467236f88109da55f0046905af44ad38b9a955b67e WHIRLPOOL 5c5cbe7c741a0a841b80267ad1ce207b1f5145ac2eee956646080bfe4b4da556f7693f3942203f1c0c529af8434f26469ffaffab9407fda55a2f7826369c5c54
 EBUILD netbeans-apisupport-9999_p20160914.ebuild 3384 SHA256 4537e6cfee06dc9a578a2dac51b0319ecb41319411c1cd2c47eb6f6041e5ad21 SHA512 f070e51122b5599cd890faa157fd13f6abef4e7f867473ba9d00f51b00f941617bff689b0d7dc7a4209c1b13c6dabc10112e47f3dc53156e88dcfd939418035c WHIRLPOOL 1ef3fbd8427af2b1073321cee1b244403da79958cc0ab26e518bb19a8c2dcd0438cd6d80e05b42b400d0fae743f9e81e3878eea8b87179a400f36b4e864c5245
 EBUILD netbeans-apisupport-9999_p20160915.ebuild 3384 SHA256 aed29e4d1d8f81085aa769f4cac54ec863a96abd448243215356f51ec1b06c3a SHA512 811077f6630288c9c2cd0db91a2f0ac2ae1cf445e3f46ffe3ff60bb30b0a2599dcdf2a101aa68a14b3e70cd445db6b15bdca307aef0ec7404ba11fb0a13c8a29 WHIRLPOOL 405a5b317abee07646a317c66e448a3a7177b1ed264883032ec72e8ef81d0fb984173d47e0c1da18ca54b802480245b75ae1ca9fada8c518c0d1590aa4de6a0e
+EBUILD netbeans-apisupport-9999_p20160916.ebuild 3384 SHA256 3889204ea270ade6c09602136094ed819c25293a329c90010e0d34b94cf424c7 SHA512 7e31e9800d0b9ca39222d282b8944a494df33d3966f80d5d5141872126ad3e9b826a5a773cb9c6032a12783f0e3e7294f9460aa823ac4d6e1568b1aaab2cdc07 WHIRLPOOL 2dc79881999b33c33bdf5ad514a0a958cc85cf113686dc3835ddcde9ea4ac714932a62cd8b59de91500c770590fffb2bdd9f00883c08a7ac69016df5cf5b9be3
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index 672c64d..55209c6 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -46,6 +46,7 @@ DIST netbeans-trunk-nightly-201609120002-src.zip 218010356 SHA256 265ec87ec62f15
 DIST netbeans-trunk-nightly-201609130002-src.zip 218011897 SHA256 40cb0d7c2dba73fa2d3dcddcbc1cf6a1bef06b551cf0a5ff9d6ce9ff12ea007d SHA512 26e5b258261386437534b6b8748a69c7fb7e9332e67584de9723ff7cf9067d20e5cb6d4e86eaf0c611378be0bef9517dd563ca824499efc4f1a89056860ac856 WHIRLPOOL 3b4bd5894c4f65d638a070084267814f00819936c9e4cf7ca758eb04f5500280daf16caa36137700659c10717738d98558b9c5e090c4df82e2d9247308a1f1d3
 DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318bfe333cedd1fbd81a4c6b870e0025f9f4f3ea3d6926bc18cb1c SHA512 81af61f842b23dd51b5610d4c1f9a7113f82e4ceaee2af4a4f4392b56f38b9ec92655c1e413e9b58a808207b308dc68ea8b94c24ef636db8d8ea81275f867470 WHIRLPOOL 8cc8b87bbf8299ab97e24ee64b1d982dfb942cb60a8d8a110b38207807c05b8a7f1c2a2a4d5df52a80c12eaa9ae08440e8f7e333e6a519d83759d2b50c42d015
 DIST netbeans-trunk-nightly-201609150002-src.zip 218016283 SHA256 90b7a4a97f9328512ad9388caab30b88290338dcd87e90d7b20c1568b679a11e SHA512 bc398e865c55547752f8ac05ed2de3c22eff9d5b7c204f28ecd30d1a1d11bda9276454d505d12f5a951d88c40a160a1dad15fc62ab39a6d350d0ba45af4df299 WHIRLPOOL 283749fe3c678341d9489fea580e7af7bec404507be57bd264d4a3673b8b5660a729c5a3f96da2adbeee1fa10fe3205e486c6186f01dcb5fa05f93627bc646de
+DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72fbb6102c07095a61e6cc10066c5fff94a3abfebe2852484e31e SHA512 e41d80df015b84f2faf8811a8fd242f85c72e39867161d236ef0242062568c6fd163bf46a623f4a14779e9d89a49b6a2d88691487a5ec785eece6c7f70459ffa WHIRLPOOL e42fac6f885c4fd1c2bc030cf47aa82ec4e35f66d305e8dd06d6a439ca958074ce57ae761b7ee16e4612dc5f94bedd7fe4655463ab4a7c095e03f41d4fc686f1
 EBUILD netbeans-cnd-8.0.2.ebuild 4510 SHA256 0a9a4e58e28f395b5bcb017016b6ddb1b77afe393d0e5bd81cc05e3a32076c71 SHA512 2b1fedfe292fa140920fd11829e77127f9535e08b8307886accfa37e6d11195a1204e6b71b2640937da0711c3ce0bbf80c0eaa3c248a64fd61b6a3d99d5de14e WHIRLPOOL 10b1518360ade5d6f1f27c79a10f630b94a2ec5062e18df11f9828d4b374e6cbdea0b9f770e01c117ca90fa194dff9bd3be6a468075c2d35167fb78a7bb32794
 EBUILD netbeans-cnd-8.1.ebuild 4744 SHA256 e008e92761489558e039a07d4858b5a9745aa38c38c57668cba8b5f6a28dbd9b SHA512 724af3f292851fa1a04ccc95fe0a4f9d0fab5503ce31d2ff11be73779d67bd0f38835b334684f628f8eea2dde44543e6b872611b2bd6c01191ccfe26e69f4ec2 WHIRLPOOL 59ddd65a105dafeb8b783f457ec7a8c67a5a3aceb78ca60ac7c4f45f330b28b429ba6236a643ca0023189a9ebdb1ca0182ec0546943ec2494693859aa8f95515
 EBUILD netbeans-cnd-9999_p20160815.ebuild 4790 SHA256 1badc35f8ce00bfc07b451457809d57ab7254632834a9c1ce6c55c0a73087b36 SHA512 cc11dce99e0460b057abe62c14cc11cd5b137bb30404ae91ab5ca048d379228361806c164b4ee47b651897dc8bc300600f2652099ea189ce6cb83e6976702432 WHIRLPOOL 9939e5e75ae7e49f854f9cb5b5f21c8efa54827e68b2f6c1d752306465e5e9d9e39edd8e95a6370b97ce8d60ea858a3fcef158d556a7decbfd9cf42cfcb76d12
@@ -76,4 +77,5 @@ EBUILD netbeans-cnd-9999_p20160912.ebuild 4790 SHA256 47efe4c327c3f92b94bb0d0670
 EBUILD netbeans-cnd-9999_p20160913.ebuild 4790 SHA256 7b14a07b9dcb3196f70f8bb68048aee999c1b8a814e3c2bdb23b98b9a039719d SHA512 b04e2ac4a9dbc6d4a587b412de723a35fbebff68a4ba778c43e11d0e0d9317a079bf3c9fe2c12b29a22fe747ae31a11e602301e3bc3dae81959bba84d5812afd WHIRLPOOL 36a2b3bcd90e56f3d118049bae2cf0538918eb70078a96f5e4961708da3905f751bc7524be99271fbcd4f743ce5b98b1625d399c6cf81149bb33ac8d88950b65
 EBUILD netbeans-cnd-9999_p20160914.ebuild 4790 SHA256 b510ebf0cbb0c05ddd00d1d628b3852f530420991cdc9c1c07f0405747a512fb SHA512 dbb9e79682d20b6ee807496a022f3bead6a8946a3d0a7d7154a16f329ab1b7f0787430efc6b2e79715e8bc79bbe03b26681e10c670f6c0ca5b29c53139d16da4 WHIRLPOOL c794d60f1e230c92656e24b0822ea286c967372cc665adb668d9700efa98655b45871e0f8bb0ea98505b6546e8b9128dc455f4b6aec6f29f3cf99bd843456ed2
 EBUILD netbeans-cnd-9999_p20160915.ebuild 4790 SHA256 cf96614d95d6f6db17b622f13460846d133bdd23e2a2b6ab3a548721bac2548d SHA512 b04a36e9fb6e16c5fda9ed8e582bf6bea38521200af9ed82438f6493c261108dbcfc448c2109ffb7e189405a3ed2844c13111e80dca64e9fc4aa2f28dba5ab47 WHIRLPOOL cc48361d8fd145b090fe035a36c80ac1d49f6c9a85e38594d4e5fce49a77595aed337c94f50d2a8d6a8b8ddcfb777b18a08931ef6797bbbde7f8c7ef33e9d009
+EBUILD netbeans-cnd-9999_p20160916.ebuild 4790 SHA256 d25ea0c2be63b12e629d0563636b43d52136995f3965233081a905aeb2edb578 SHA512 e23212e59722eb46cc133da77d124e1f842ccac6d496effe88d3a55ce3ec85583594b6f6197b144f1548e37634830fa62a0cfeff538a430bb6843f357b2a3061 WHIRLPOOL 3c3befa6f7dfe21151aeb43c2ac10facb988db6175b3a6995f126b661c7c2fa14516e5998244a893cebc4d1b8980bcf43976dc9321d44f3a22bfdc7eab885ff2
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 9422f9e..41f0482 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201609120002-src.zip 218010356 SHA256 265ec87ec62f15
 DIST netbeans-trunk-nightly-201609130002-src.zip 218011897 SHA256 40cb0d7c2dba73fa2d3dcddcbc1cf6a1bef06b551cf0a5ff9d6ce9ff12ea007d SHA512 26e5b258261386437534b6b8748a69c7fb7e9332e67584de9723ff7cf9067d20e5cb6d4e86eaf0c611378be0bef9517dd563ca824499efc4f1a89056860ac856 WHIRLPOOL 3b4bd5894c4f65d638a070084267814f00819936c9e4cf7ca758eb04f5500280daf16caa36137700659c10717738d98558b9c5e090c4df82e2d9247308a1f1d3
 DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318bfe333cedd1fbd81a4c6b870e0025f9f4f3ea3d6926bc18cb1c SHA512 81af61f842b23dd51b5610d4c1f9a7113f82e4ceaee2af4a4f4392b56f38b9ec92655c1e413e9b58a808207b308dc68ea8b94c24ef636db8d8ea81275f867470 WHIRLPOOL 8cc8b87bbf8299ab97e24ee64b1d982dfb942cb60a8d8a110b38207807c05b8a7f1c2a2a4d5df52a80c12eaa9ae08440e8f7e333e6a519d83759d2b50c42d015
 DIST netbeans-trunk-nightly-201609150002-src.zip 218016283 SHA256 90b7a4a97f9328512ad9388caab30b88290338dcd87e90d7b20c1568b679a11e SHA512 bc398e865c55547752f8ac05ed2de3c22eff9d5b7c204f28ecd30d1a1d11bda9276454d505d12f5a951d88c40a160a1dad15fc62ab39a6d350d0ba45af4df299 WHIRLPOOL 283749fe3c678341d9489fea580e7af7bec404507be57bd264d4a3673b8b5660a729c5a3f96da2adbeee1fa10fe3205e486c6186f01dcb5fa05f93627bc646de
+DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72fbb6102c07095a61e6cc10066c5fff94a3abfebe2852484e31e SHA512 e41d80df015b84f2faf8811a8fd242f85c72e39867161d236ef0242062568c6fd163bf46a623f4a14779e9d89a49b6a2d88691487a5ec785eece6c7f70459ffa WHIRLPOOL e42fac6f885c4fd1c2bc030cf47aa82ec4e35f66d305e8dd06d6a439ca958074ce57ae761b7ee16e4612dc5f94bedd7fe4655463ab4a7c095e03f41d4fc686f1
 EBUILD netbeans-dlight-8.0.2.ebuild 2898 SHA256 08402481b573b90396431be03bda45904b2dd29f0086e09a111fe362e310c3f7 SHA512 3f6d6c9ea0043382562fbe47ad16e3273032407a74cb44ec7ff26736f96483835af4be8674361e910912a550b9fe592cc5a28c2b93b6b993076553195c35eac5 WHIRLPOOL 9d8706ccbc0d97b0f5d64ebf22c36316b08d8fbccd57408119ca5f5faef08c7f82677bf67488ff611eabeaa730e4c9a730c50966d94d738cfe79330ac147863d
 EBUILD netbeans-dlight-8.1.ebuild 2922 SHA256 f003a099e3f82f5ab53dcc56d86c00a662c98f47480feacac2a77ffea90ccd0f SHA512 94706ac4d8570deb8860236300cfeddfb2c3cbfd385ecb438a039991deeb018f292f6dbb2267d7c701b7f1b5b88d200f2c25696fb3204fcf205c15155b26d1fc WHIRLPOOL 1e44f40c8e2c03b7aa7385ef20a3247ea15a4d4705ce4b5f860bffe236eb578ab3d912f2cc2457e5906158ae747edc3b6b92463336c69af9cd58eca3fccb223d
 EBUILD netbeans-dlight-9999_p20160815.ebuild 2968 SHA256 8e385ffa07f0af7470769acaba590a397ce27eacba46d3582a148fe1ab330d92 SHA512 abb9eb228a09d445737afd9142e1d1f475664b91f7ce3fd379830b54f522bf7f0ca7f7ac52e4fc46bb4a4b3e308cd815ff50d0fe7a5b48ad31e1f44d4dc8d05f WHIRLPOOL 45a778544c131a32be2a0a3bdda9633fc7171038b7918da91928bb934479f10596f2860c325df491e689d984e6979f24d4d5bf9f3e039158e3565a32f1cc3f8f
@@ -66,4 +67,5 @@ EBUILD netbeans-dlight-9999_p20160912.ebuild 2968 SHA256 cc3a89a8905ee467e8a8ad5
 EBUILD netbeans-dlight-9999_p20160913.ebuild 2968 SHA256 dbab2a5482cca5883a21e84f4b29c6ab670a2d7fa968aee980e260406881e1c2 SHA512 3d5ac62a2ac422cfb26938a53e6e1262675881b252e475abc4a68f39417833c12ab99adc5b2b6eeecb70d90643d93bb601941a5e15411817b66b81a3a8d2fee1 WHIRLPOOL e0b8fa22efa110f811d12d1939457f987faa199c71224cae59e25fa094dda99e33dd6a10eae9b28ce34281ffb87c48562563c924eba79b5889313417c6cf3266
 EBUILD netbeans-dlight-9999_p20160914.ebuild 2968 SHA256 072e43985e31ca09e34d5aa442471ace1ac51f114b65aad4df531b582dc06736 SHA512 9d60e54745901a56726c8ff565e0957027792f06c59cfc843508fec437096ac6d8107e8510c231daf132764b237ab0fac7bd04e1506a4eb971cfb8189fa9e9ec WHIRLPOOL bc85a5b9eabd689039eaf7ea8e912f89b030a9fb5b865237a7fb3415364845277eb852544d16c80333b09978471dc66a4b1a7d349ac71e51b14550869e060fe5
 EBUILD netbeans-dlight-9999_p20160915.ebuild 2968 SHA256 dca99b70790183cea4149fed0864b1aaac3dcd95dddb02eccea960d8c9604765 SHA512 d6afa671a26ceb31bd7f877df9942f783b6d2c322cee8be35a18b48227fa748062436381fef8347347e90d1a806e24c2a400018c93d166fd75f129f074005605 WHIRLPOOL d66fbe2a91ec249f697e0fea3e099d61f8e08ee5352c7ead10c12c1571bb9cf646ee9a4da9884c9e9b61382e6626c958613bc3c25f568f00be144e35f56ba00a
+EBUILD netbeans-dlight-9999_p20160916.ebuild 2968 SHA256 8e252c6856e0f8b68d44bfd785f6588974ba79dfd52f10ec3e8f6516fc044faf SHA512 1618f85689b552992b632286ae6189147ef198afdbc109bbb2e0289535604b77c48c7899ebfa4b41e7c7d725898b34a56ff1e31c233134b185e2dc34596db152 WHIRLPOOL 8806afd784fe0a4ead3d18fcb47a23ffffb16d1ed5f0493d7d2840145c73b40106f00af5b229b9b7588a2c109d8c90bc497ae41f5d63017fad1e2ca9441331f9
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160916.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160916.ebuild
new file mode 100644
index 0000000..040aa8a
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160916.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans D-Light Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-09-16_00-02-33/zip/netbeans-trunk-nightly-201609160002-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
+	${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
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/dlight >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/dlight$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/dlight
+}

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 16bddb3..2212aa8 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -63,6 +63,7 @@ DIST netbeans-trunk-nightly-201609120002-src.zip 218010356 SHA256 265ec87ec62f15
 DIST netbeans-trunk-nightly-201609130002-src.zip 218011897 SHA256 40cb0d7c2dba73fa2d3dcddcbc1cf6a1bef06b551cf0a5ff9d6ce9ff12ea007d SHA512 26e5b258261386437534b6b8748a69c7fb7e9332e67584de9723ff7cf9067d20e5cb6d4e86eaf0c611378be0bef9517dd563ca824499efc4f1a89056860ac856 WHIRLPOOL 3b4bd5894c4f65d638a070084267814f00819936c9e4cf7ca758eb04f5500280daf16caa36137700659c10717738d98558b9c5e090c4df82e2d9247308a1f1d3
 DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318bfe333cedd1fbd81a4c6b870e0025f9f4f3ea3d6926bc18cb1c SHA512 81af61f842b23dd51b5610d4c1f9a7113f82e4ceaee2af4a4f4392b56f38b9ec92655c1e413e9b58a808207b308dc68ea8b94c24ef636db8d8ea81275f867470 WHIRLPOOL 8cc8b87bbf8299ab97e24ee64b1d982dfb942cb60a8d8a110b38207807c05b8a7f1c2a2a4d5df52a80c12eaa9ae08440e8f7e333e6a519d83759d2b50c42d015
 DIST netbeans-trunk-nightly-201609150002-src.zip 218016283 SHA256 90b7a4a97f9328512ad9388caab30b88290338dcd87e90d7b20c1568b679a11e SHA512 bc398e865c55547752f8ac05ed2de3c22eff9d5b7c204f28ecd30d1a1d11bda9276454d505d12f5a951d88c40a160a1dad15fc62ab39a6d350d0ba45af4df299 WHIRLPOOL 283749fe3c678341d9489fea580e7af7bec404507be57bd264d4a3673b8b5660a729c5a3f96da2adbeee1fa10fe3205e486c6186f01dcb5fa05f93627bc646de
+DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72fbb6102c07095a61e6cc10066c5fff94a3abfebe2852484e31e SHA512 e41d80df015b84f2faf8811a8fd242f85c72e39867161d236ef0242062568c6fd163bf46a623f4a14779e9d89a49b6a2d88691487a5ec785eece6c7f70459ffa WHIRLPOOL e42fac6f885c4fd1c2bc030cf47aa82ec4e35f66d305e8dd06d6a439ca958074ce57ae761b7ee16e4612dc5f94bedd7fe4655463ab4a7c095e03f41d4fc686f1
 EBUILD netbeans-enterprise-8.0.2-r1.ebuild 15075 SHA256 41d376117ad1d8d59c8194debfd29dc42f5fd4de70aee12a2134ec143a604dda SHA512 4cd9de88e9a401cc0be88e3e2605abc411c47307818376b2bcc00f9ae570b21324f2bf00fd83e819bfa076da0fb07811fa1f0f9362a6cd0ee05b63221a199000 WHIRLPOOL 73f4518c14430fe7aa3614ebf1b11a06ba0e9bce7479af2770db3a114f149d575a16a655218f757ed416b5149228ac56dac700f5a8d5e034cc838bfa4092e636
 EBUILD netbeans-enterprise-8.1-r1.ebuild 15888 SHA256 d4c04ccfee01a46819020cb7cf8fd8297618f3c0431ae2d9dd7eec8131f988ab SHA512 6c7c39c378cb79d3f382cb80d07710a8c5233aaf0df8fb58889ee6aa6bde73624efa6aa49b43f84105685094a7aff89e4b6367ffd1fd113da27b42d50d07e983 WHIRLPOOL e678e2a6957e428c1b6e51469c0e7cc6a08da2c797f1575b6bb660a7f3281c00f071179de459e27c983304915b005baaf94ad4fae0a4c08162f218bf53b7d821
 EBUILD netbeans-enterprise-9999_p20160815.ebuild 15825 SHA256 886e0440d5093ba8fa7291f85382deb276faa118ba1294f4679dced47bdc7bfc SHA512 a3b5ce01be733d7bdccddaa7dce46b4331a33b3b899828eb43daabe34f5678a39259a718ee5126cdb2b59b118200a70404c1ac3a43d225e9ce3602bc8450e778 WHIRLPOOL 830f4bff4f2d66c0074aab1ada00c142edddc6561364fdb722cbced77e8443abc6e1f638e96e8f9e7297823114a6cf019bffacc06dfb866815591ee073758494
@@ -93,4 +94,5 @@ EBUILD netbeans-enterprise-9999_p20160912.ebuild 15825 SHA256 6f7d4e0af40d3fded1
 EBUILD netbeans-enterprise-9999_p20160913.ebuild 15825 SHA256 c6ddb5a9669bf9e8eb87199414d74f6b5d06f9c7cc5bf53efbf1f0dc99fa4ad3 SHA512 3726d00308e805d09aeda5a765aae4e799b46eba597a54be6c67b84fbf0d44abf969fbca3af7710a0cfa86f18f0ddfbff1be71702a18d28fa9d3465d7a4d0eed WHIRLPOOL 55173838159b371d6eb4cb207452ad55acbdb7dce79893133983714a576f62fcb68c8bcf47774052c99e328e60c15c2d04ad5ade5368bc964129edbd89bd0496
 EBUILD netbeans-enterprise-9999_p20160914.ebuild 15825 SHA256 4722d9a985c9d7bf58f08db99ae040828ade3ee342db36bccea0688e28e46003 SHA512 4f4a5a137aedf8ad5b0ac5d9ef134f15263a1997fc6083904ffd3d06161ee4d6482b9393c580b8392e5b887e455a68afa191040456d0cd3680db2b6a06073c0c WHIRLPOOL 7034f8b9c6f7d6bedb98ee56f92ed04c28b593e7937443d005864771964b86b8c52ea1c079f1d7d05c7c47f7fba4cd63a50fc3f48d293f11aaab46a3db72bdca
 EBUILD netbeans-enterprise-9999_p20160915.ebuild 15825 SHA256 5414838dbe7088dd34ad12b971fef3a1c78da638b2f24ddc36a468bc7ab9ed52 SHA512 d1e89c30f234e04c33d6f851fe2659e9f57aab3bb17a32036d9854d4486a6ebc3d7b6afaf77a83f19f79dadf488886719332975108faeff4cdd0aaca9ba3f5cc WHIRLPOOL f86e3a30a7c40232fc9594f4703a11c54136f70108a5030547095e1ca1558643822ea718a333d6781323859c424c52c5426416c53c944a5bafca74ff17982ac3
+EBUILD netbeans-enterprise-9999_p20160916.ebuild 15825 SHA256 19455e1cb76add7c4d05072ad33b0d1a1381addd1f9bc99d2c34540d0104612a SHA512 592fac9697b0ebb382b3eb9e1d45ff5a18ecf30b4c7f715ba710f7937352a0205235c5cd31430c82134682d5411f4a66d320086301dcaf152976499077c4169b WHIRLPOOL 521b9f36584b51c16697b9d200c162497bd08f3279d3550d7cbb5353bcd29888322d48bbbec50ce1e38c830f33bbd67460d1c5d9defeb442907375b06ab4093b
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 5d843d3..30329ca 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201609120002-src.zip 218010356 SHA256 265ec87ec62f15
 DIST netbeans-trunk-nightly-201609130002-src.zip 218011897 SHA256 40cb0d7c2dba73fa2d3dcddcbc1cf6a1bef06b551cf0a5ff9d6ce9ff12ea007d SHA512 26e5b258261386437534b6b8748a69c7fb7e9332e67584de9723ff7cf9067d20e5cb6d4e86eaf0c611378be0bef9517dd563ca824499efc4f1a89056860ac856 WHIRLPOOL 3b4bd5894c4f65d638a070084267814f00819936c9e4cf7ca758eb04f5500280daf16caa36137700659c10717738d98558b9c5e090c4df82e2d9247308a1f1d3
 DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318bfe333cedd1fbd81a4c6b870e0025f9f4f3ea3d6926bc18cb1c SHA512 81af61f842b23dd51b5610d4c1f9a7113f82e4ceaee2af4a4f4392b56f38b9ec92655c1e413e9b58a808207b308dc68ea8b94c24ef636db8d8ea81275f867470 WHIRLPOOL 8cc8b87bbf8299ab97e24ee64b1d982dfb942cb60a8d8a110b38207807c05b8a7f1c2a2a4d5df52a80c12eaa9ae08440e8f7e333e6a519d83759d2b50c42d015
 DIST netbeans-trunk-nightly-201609150002-src.zip 218016283 SHA256 90b7a4a97f9328512ad9388caab30b88290338dcd87e90d7b20c1568b679a11e SHA512 bc398e865c55547752f8ac05ed2de3c22eff9d5b7c204f28ecd30d1a1d11bda9276454d505d12f5a951d88c40a160a1dad15fc62ab39a6d350d0ba45af4df299 WHIRLPOOL 283749fe3c678341d9489fea580e7af7bec404507be57bd264d4a3673b8b5660a729c5a3f96da2adbeee1fa10fe3205e486c6186f01dcb5fa05f93627bc646de
+DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72fbb6102c07095a61e6cc10066c5fff94a3abfebe2852484e31e SHA512 e41d80df015b84f2faf8811a8fd242f85c72e39867161d236ef0242062568c6fd163bf46a623f4a14779e9d89a49b6a2d88691487a5ec785eece6c7f70459ffa WHIRLPOOL e42fac6f885c4fd1c2bc030cf47aa82ec4e35f66d305e8dd06d6a439ca958074ce57ae761b7ee16e4612dc5f94bedd7fe4655463ab4a7c095e03f41d4fc686f1
 EBUILD netbeans-ergonomics-8.0.2.ebuild 2843 SHA256 f9262f6ee7f2aed1fab9bf4cf756f565272e9894afa50b349735e39961e7acc3 SHA512 f158c27640541f7aef31da050e0811c07a251ae4797cc663b95a074a47eaf9d6bb7a9aa11ba38ea55e75c185f7dba74629ba6716a819e8ad68eb3db9ada71451 WHIRLPOOL 4fe9634fb673fb05dbba25996efc3a212ef3bb23ab6e7c732cb75de076feb930735e3901806fd9c801abc7ee8aa8eb800718065325d415371255a886474061d4
 EBUILD netbeans-ergonomics-8.1.ebuild 2867 SHA256 6d2c0b7221d47b64c77b243c8c5232c6d8c24d3199eae5799adafeac609b2e2a SHA512 6302c8c13d43ec51048e8b0439916746a01bb67f14e7cd21be95b4179df6106dcff1d3973b9191f7a36cf6f29d53b1d2308864f5f64d9f87f980ea264b1a97c0 WHIRLPOOL 63ceaad04323d9085dfb90d1e5075ad13f6e14e8991b13aafaf3fc174440152054f32498ac8d03f57917744887db3bc1efdfc30b473b8d1a33b514ec4960ea6f
 EBUILD netbeans-ergonomics-9999_p20160815.ebuild 2913 SHA256 8d354df1c3a2fb8a623988d0ebc61a03f230ade3a2992de6fd8fb4af9c1aef4d SHA512 3e8cdbc801d19a4e9ed9782484ef9ffb015526813c5496a9f90da49338ff7e0d81c24ad6f015ba7d766f212cca1afc6738c6f371d8aa01db8e66bde244a900fa WHIRLPOOL 0fea1059d1ec2f7f42d062ce0f977dd8e0739604cde9353d60dd30f91b8cc6156f59e928e98d1fb653bd07b47bebd49ad5753396d6e116ccbc2e8afbd834af7a
@@ -61,4 +62,5 @@ EBUILD netbeans-ergonomics-9999_p20160912.ebuild 2913 SHA256 da1229763b4096f6cd6
 EBUILD netbeans-ergonomics-9999_p20160913.ebuild 2913 SHA256 f22aae4507ff7d219ecb5d5cfdc86b6a1b015fc139ddc19f09fdf4d390256c63 SHA512 4a86ade99aeacad772aa007c70da2b71e25b4952f8c32bf68f7021d846b64f08e0f1504c2147646d7814e39fd501c9f76f555538211b3594303d4541b7feea64 WHIRLPOOL 3151065fd167fdfda002109af34569f658d0af4b977bb1ff10e49a3b1ac17a10a9065acb699a2ca39e12ca3f447fe2731528c5a522020f5eb79e9ab496b8c3fd
 EBUILD netbeans-ergonomics-9999_p20160914.ebuild 2913 SHA256 bbfa27ae0ddaf8e30c66cca591d77d2c109b99862dd453a3c582e23f118012a9 SHA512 ff34476b30638c5a9eb6a038894ef8748716607678b11b3e406902f054946ae1fc9d938ef57b384449dd47364d7e540e860ff2a0405fca5e16febbfb8d3217d3 WHIRLPOOL 79546536e25ccae470277fd4db9d5b55d4ed54975dc68703789cb88feb89e5bf0e81eb2273587cef6594a09fe63364b9266cef3134f8791e0f890ee9e10b5a3d
 EBUILD netbeans-ergonomics-9999_p20160915.ebuild 2913 SHA256 01df73a77390625456d9416923bf153ea1020d6d6bea03e9566ccd032a4ac582 SHA512 1579cfd769478b66e6806ab863d57a57a8dba9ed8f638764819c9f62f1ad0d883d7f754989fa70881fd4f0224eb71271eb7240e984a4bcf4cfcf770487c5138b WHIRLPOOL c62b5fc6fe346b443d7970afef256218c7ddecd6cc0db05a0af3aa2651c774c10ff9f5150657672c45625c8ba8586e8d84321f7e9283989130793d31d0cf0d70
+EBUILD netbeans-ergonomics-9999_p20160916.ebuild 2913 SHA256 1055b0a883604ccee294e092b21cc0a92c90bce01395ae5ba69f3d3bb71cce2d SHA512 e1bd56c4831e21084677e48db35080e3c11e3689da2151f00dd00c16d2179d04a8cc0b6d26a891b687cc37c90b4776b62240b2109363b34cbd86922b120a5b06 WHIRLPOOL 9f41b7a84188986b8322fc2ee5c18c1b69daa866a969370612fcec12429c68ba03d6376fbf824e6a82722ebe0a823c362f38ecfa073a4c484902d039d4e2167b
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index 159e15e..a56f08d 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201609120002-src.zip 218010356 SHA256 265ec87ec62f15
 DIST netbeans-trunk-nightly-201609130002-src.zip 218011897 SHA256 40cb0d7c2dba73fa2d3dcddcbc1cf6a1bef06b551cf0a5ff9d6ce9ff12ea007d SHA512 26e5b258261386437534b6b8748a69c7fb7e9332e67584de9723ff7cf9067d20e5cb6d4e86eaf0c611378be0bef9517dd563ca824499efc4f1a89056860ac856 WHIRLPOOL 3b4bd5894c4f65d638a070084267814f00819936c9e4cf7ca758eb04f5500280daf16caa36137700659c10717738d98558b9c5e090c4df82e2d9247308a1f1d3
 DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318bfe333cedd1fbd81a4c6b870e0025f9f4f3ea3d6926bc18cb1c SHA512 81af61f842b23dd51b5610d4c1f9a7113f82e4ceaee2af4a4f4392b56f38b9ec92655c1e413e9b58a808207b308dc68ea8b94c24ef636db8d8ea81275f867470 WHIRLPOOL 8cc8b87bbf8299ab97e24ee64b1d982dfb942cb60a8d8a110b38207807c05b8a7f1c2a2a4d5df52a80c12eaa9ae08440e8f7e333e6a519d83759d2b50c42d015
 DIST netbeans-trunk-nightly-201609150002-src.zip 218016283 SHA256 90b7a4a97f9328512ad9388caab30b88290338dcd87e90d7b20c1568b679a11e SHA512 bc398e865c55547752f8ac05ed2de3c22eff9d5b7c204f28ecd30d1a1d11bda9276454d505d12f5a951d88c40a160a1dad15fc62ab39a6d350d0ba45af4df299 WHIRLPOOL 283749fe3c678341d9489fea580e7af7bec404507be57bd264d4a3673b8b5660a729c5a3f96da2adbeee1fa10fe3205e486c6186f01dcb5fa05f93627bc646de
+DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72fbb6102c07095a61e6cc10066c5fff94a3abfebe2852484e31e SHA512 e41d80df015b84f2faf8811a8fd242f85c72e39867161d236ef0242062568c6fd163bf46a623f4a14779e9d89a49b6a2d88691487a5ec785eece6c7f70459ffa WHIRLPOOL e42fac6f885c4fd1c2bc030cf47aa82ec4e35f66d305e8dd06d6a439ca958074ce57ae761b7ee16e4612dc5f94bedd7fe4655463ab4a7c095e03f41d4fc686f1
 EBUILD netbeans-extide-8.0.2.ebuild 3307 SHA256 084e952eae1708b0fab785fd34313985e864dbc74a8531a0d5cdcf906e88f85a SHA512 ade8dc37aa932d7ec20966199e521311716061c23df08d02635f78efd2776f1d7bf040b0f9c9488b947bbbdfb3e33fa764723e3dfffa2214892bc6d685428f6f WHIRLPOOL ad2c26b005675ebca7d902ff1e6caa28552f3fda6795e327cc3584cf109f0ad6efad6516e15af5e70d689be236298b0948003e09a3da4991b3e29a1c85607b2f
 EBUILD netbeans-extide-8.1.ebuild 3331 SHA256 7d81adb3cba102e13678052bfe288e8417753ebceb69f69ce528ede3fedcef04 SHA512 ae445552036799069f31b40c145879ac55cf0964e168f328ac84f2d434171de8c4848e3416ad7425563e8565c09f798c9520bb3cb7511348f5d6a7522b878e40 WHIRLPOOL 44142233d4d3047ebb5c152992b484e5fef1fddd04cf274cc370f00beece5a75a986e5fadedd4bc18a01559c4f6cb58289cefbfc24d8d098d70056707e8b8f57
 EBUILD netbeans-extide-9999_p20160815.ebuild 3377 SHA256 d8f0d718652104be115e3ed9229d81956ff23c40b38ea6f1f70d761126f9d868 SHA512 bd40f8bce0363848b846c89497357f213fd1ecdc9ef0204d52f1e75283ab41183c8364b9a090bc00dc6c0fb113e05d45ecb3af346ce854841e383da0ea85e8b9 WHIRLPOOL badcb4ad4a1cd407f41e749cdadf9731ab4de7a7c817760305b7a327ed408de2b9aec31e4aa5314b90158a829ba2145378e0845cd81f09c8e42b835ecb924cf2
@@ -65,4 +66,5 @@ EBUILD netbeans-extide-9999_p20160912.ebuild 3377 SHA256 11e51f49b981eb23e72f539
 EBUILD netbeans-extide-9999_p20160913.ebuild 3377 SHA256 5744befe62317cae4e3799eebe48b0cb03ae281afaf02121c852c4efeb2fefd5 SHA512 b027b13c6ef97126f7bcc3cd9dc57646c39fb8baa7d71cbfd51d434750d56b6b5524f0b01f33c4dd47a1547134608cb0ed0b91d6512ef5a68c91113130b38133 WHIRLPOOL 0b40930d48062a8fd7a2f350b4bc3aaf17a836b11955dcb039cea6528f7ac22a4b91e0fe34002418cd80ef0d9bd8c8087912081e301497a59cbf164250ec6fd0
 EBUILD netbeans-extide-9999_p20160914.ebuild 3377 SHA256 3b2a494b5f54f9e5df538dbce5ccd44cb5495718e08ba039f2bffc7f90e604f6 SHA512 ed8017aa18c79527ce263b4c05005b3f5c5ea014ff8bf53dfcfd3a77811fe146955af42c8d2822b9cf633ca46c5167336573cf69f3e3699729ed8752b92e76cd WHIRLPOOL 4e2c1938e2b4ba14c802dcd0126ea1243bf89fb6e8993b9175690876db18a31b370247cf500ab76b1f69f5aa1a3839b85e8dd546bb65bc65a05cb9be1236125e
 EBUILD netbeans-extide-9999_p20160915.ebuild 3377 SHA256 1974bcf01de6fa122c4eb227494e4ccfbbc2fc143278e00fc9de2f149e5b0c01 SHA512 4af70e7ca81f129d82b1e4297945eb9a66cfa3ab4a84dff2600d515bb787de640d22ffb1b6d5e44c0bca91532c7486e507e7c62ac29553539713a1c8641d59fd WHIRLPOOL 178f41358f2a83aceef63d9257c277238ba3eb38a13f090b5730f6cb109ea5e17f37513cf01981873f43bc3f41728e06e4ae17940fc7729bb1dcfd2071dae31e
+EBUILD netbeans-extide-9999_p20160916.ebuild 3377 SHA256 8e2402cee3ac258b39799884c083a6587791003ccf4abb9da521c51d60ac245d SHA512 8019447f595b0e4a3c3e2def928eced2d34ab9a5720ab29a97534c8be4fafbdbc8de080acc7e8a89a0b014defda5d3240f2b2c0149526a73cc1dbe4ba7803e40 WHIRLPOOL 5a94644d42d4269473679d16e64aebb22a0086f7f687cffd92998038155f7b3a46e65fb54cda0508815f446b4a6440e1dc82f23d93fae7141a95680da4828c4f
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index 7dfc57f..3484033 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201609120002-src.zip 218010356 SHA256 265ec87ec62f15
 DIST netbeans-trunk-nightly-201609130002-src.zip 218011897 SHA256 40cb0d7c2dba73fa2d3dcddcbc1cf6a1bef06b551cf0a5ff9d6ce9ff12ea007d SHA512 26e5b258261386437534b6b8748a69c7fb7e9332e67584de9723ff7cf9067d20e5cb6d4e86eaf0c611378be0bef9517dd563ca824499efc4f1a89056860ac856 WHIRLPOOL 3b4bd5894c4f65d638a070084267814f00819936c9e4cf7ca758eb04f5500280daf16caa36137700659c10717738d98558b9c5e090c4df82e2d9247308a1f1d3
 DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318bfe333cedd1fbd81a4c6b870e0025f9f4f3ea3d6926bc18cb1c SHA512 81af61f842b23dd51b5610d4c1f9a7113f82e4ceaee2af4a4f4392b56f38b9ec92655c1e413e9b58a808207b308dc68ea8b94c24ef636db8d8ea81275f867470 WHIRLPOOL 8cc8b87bbf8299ab97e24ee64b1d982dfb942cb60a8d8a110b38207807c05b8a7f1c2a2a4d5df52a80c12eaa9ae08440e8f7e333e6a519d83759d2b50c42d015
 DIST netbeans-trunk-nightly-201609150002-src.zip 218016283 SHA256 90b7a4a97f9328512ad9388caab30b88290338dcd87e90d7b20c1568b679a11e SHA512 bc398e865c55547752f8ac05ed2de3c22eff9d5b7c204f28ecd30d1a1d11bda9276454d505d12f5a951d88c40a160a1dad15fc62ab39a6d350d0ba45af4df299 WHIRLPOOL 283749fe3c678341d9489fea580e7af7bec404507be57bd264d4a3673b8b5660a729c5a3f96da2adbeee1fa10fe3205e486c6186f01dcb5fa05f93627bc646de
+DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72fbb6102c07095a61e6cc10066c5fff94a3abfebe2852484e31e SHA512 e41d80df015b84f2faf8811a8fd242f85c72e39867161d236ef0242062568c6fd163bf46a623f4a14779e9d89a49b6a2d88691487a5ec785eece6c7f70459ffa WHIRLPOOL e42fac6f885c4fd1c2bc030cf47aa82ec4e35f66d305e8dd06d6a439ca958074ce57ae761b7ee16e4612dc5f94bedd7fe4655463ab4a7c095e03f41d4fc686f1
 EBUILD netbeans-groovy-8.0.2.ebuild 3346 SHA256 907e6cd11c222f15c826494b44929483803f0e4249de0d54db51e6855b574148 SHA512 8bb37121e7e32621959318d109b1d982e2c705a9deb7171f5fef1dcaed55fc5718b0bc9e6bbb2592cdaa5e96d874bb6e6bfa96d06fe09f14d5250c1485eb1da5 WHIRLPOOL d5e09fa1e975835f05c6132c091fee4ae9fc9dd671af9f5f88a9195d5cd4a93804f96687ed3f2bd741117fa65773f2c464b3cfd6697425039cc51a940efa2a31
 EBUILD netbeans-groovy-8.1.ebuild 3370 SHA256 ca32569d438060704e4d5d5e46be2ebf20bffdb0ae2471d8718ada8676f32082 SHA512 40555d2ffa0ddab1e55ca514eddbd98c6e721caa230cd174050fb56f144def46f389b0ac018068c9f509936c83235b2d3423cae8676db7c96e8782b0da73e4ad WHIRLPOOL 7b2b021581db21aa8ff90ea188ddeea0974ec84fdb064cf367a56a6fa53487affe89edb1880a83934a2cf0c586060a9192838687ffebf33b55e79d9ddc7ac986
 EBUILD netbeans-groovy-9999_p20160815.ebuild 3416 SHA256 83b0dc95444db539feefcc7ff462a7386eaf98dcc45d5bc8ecdcde0fb497ab0a SHA512 0adaa2174e08650114f95ceb267179ad23e94398ec5015304ea5313d95e99092802ceff05aac01106df87db77534529ccfe17e5bf0220bf8e3266e4b5ce45595 WHIRLPOOL 724278402b9e9879c766f4b047d9a7e749230725e948fd4aba4c12ee48dae6763928a41e5e367d12b44d73e92e40cf96148be9a172bc1f8bfe5968ee0482e384
@@ -63,4 +64,5 @@ EBUILD netbeans-groovy-9999_p20160912.ebuild 3416 SHA256 115aa71318d43a6ad90a373
 EBUILD netbeans-groovy-9999_p20160913.ebuild 3416 SHA256 4717643f73540735e6106dd23f74f0bd263cd79345e698f2decc7662fd30fb40 SHA512 56d948c4d3b41228193b681b51538153304a9681401d566836e6ebdc74122a225a3d1cb4f6aa297daa5e74c454bf2b77c05f6539b36c72a88af8867e622bb2be WHIRLPOOL bdf1d02990d6027c5ad09b61ace49e330699a1793dc17ec499409674f38e850eff68c68eb074a3a9089dc6c6654a6fd967bbaa6b71830503fee07f6e47206c15
 EBUILD netbeans-groovy-9999_p20160914.ebuild 3416 SHA256 8adebe84045dc0ec277c1ed81718a5200a16f95150faf992f954544aa8b36bc4 SHA512 9da0d481f3c69006dd4237d51e8730fc2c0a0ad8fb3c99343252a312da4d1e1130c92049f892ab33ef7047096cb510ac5ddef22af76d44033dfb895a9f698dad WHIRLPOOL 605d3a01c52c9534101264b96dc9770f4e9656c8fc3050e270f7fd6c840db87e4c339e3afeca61763b813905b5a827cf8246b15cbf4758dda7f5085b1cba1cbc
 EBUILD netbeans-groovy-9999_p20160915.ebuild 3416 SHA256 e2fe01b0fd62f651aeabe0e48ceed9c617f5fa11c40faea528b571889708dfe5 SHA512 6b655b03d76c959656af346b1e0e111d56157152aec79ce9ca2113bb4b2604715a5dab82abfbed601f770b4ae37daa7a175e2fafeb2717520f6f907760c2346e WHIRLPOOL e9ffed9e7d8fb23add1fdfaba08937d4b79396ccfc1dc9428938094cc0888ab08d2075eeccd224f35050fbb15f21589ad72645e3f8320d24f0ddc1d5c1378092
+EBUILD netbeans-groovy-9999_p20160916.ebuild 3416 SHA256 85716f2d27d5229abad1558a5cefa0c37b58dafcc348b854d1002a0ff5c8a45a SHA512 ad09d3295b2ee12c54c67b944b89e7d21ec0b6f3d8bc89f8e72e43dcc02e8ae2f55df5d0bfdf9e1bdf951c8cb886e37c8a5d107610cdd73dad878a946a6e5607 WHIRLPOOL 4a8ba5b1517d7cca22fa041a846de9b74d510a8ac9882ad3227b06cf00c0a9b6a41a90769347c7f4942160ef84b029edaa2347281c52fabe0c0bd5e8b663c418
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index c78505e..10ec8439 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201609120002-src.zip 218010356 SHA256 265ec87ec62f15
 DIST netbeans-trunk-nightly-201609130002-src.zip 218011897 SHA256 40cb0d7c2dba73fa2d3dcddcbc1cf6a1bef06b551cf0a5ff9d6ce9ff12ea007d SHA512 26e5b258261386437534b6b8748a69c7fb7e9332e67584de9723ff7cf9067d20e5cb6d4e86eaf0c611378be0bef9517dd563ca824499efc4f1a89056860ac856 WHIRLPOOL 3b4bd5894c4f65d638a070084267814f00819936c9e4cf7ca758eb04f5500280daf16caa36137700659c10717738d98558b9c5e090c4df82e2d9247308a1f1d3
 DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318bfe333cedd1fbd81a4c6b870e0025f9f4f3ea3d6926bc18cb1c SHA512 81af61f842b23dd51b5610d4c1f9a7113f82e4ceaee2af4a4f4392b56f38b9ec92655c1e413e9b58a808207b308dc68ea8b94c24ef636db8d8ea81275f867470 WHIRLPOOL 8cc8b87bbf8299ab97e24ee64b1d982dfb942cb60a8d8a110b38207807c05b8a7f1c2a2a4d5df52a80c12eaa9ae08440e8f7e333e6a519d83759d2b50c42d015
 DIST netbeans-trunk-nightly-201609150002-src.zip 218016283 SHA256 90b7a4a97f9328512ad9388caab30b88290338dcd87e90d7b20c1568b679a11e SHA512 bc398e865c55547752f8ac05ed2de3c22eff9d5b7c204f28ecd30d1a1d11bda9276454d505d12f5a951d88c40a160a1dad15fc62ab39a6d350d0ba45af4df299 WHIRLPOOL 283749fe3c678341d9489fea580e7af7bec404507be57bd264d4a3673b8b5660a729c5a3f96da2adbeee1fa10fe3205e486c6186f01dcb5fa05f93627bc646de
+DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72fbb6102c07095a61e6cc10066c5fff94a3abfebe2852484e31e SHA512 e41d80df015b84f2faf8811a8fd242f85c72e39867161d236ef0242062568c6fd163bf46a623f4a14779e9d89a49b6a2d88691487a5ec785eece6c7f70459ffa WHIRLPOOL e42fac6f885c4fd1c2bc030cf47aa82ec4e35f66d305e8dd06d6a439ca958074ce57ae761b7ee16e4612dc5f94bedd7fe4655463ab4a7c095e03f41d4fc686f1
 EBUILD netbeans-harness-8.0.2.ebuild 4055 SHA256 2674d562adc57648c82cac9f714f74f9d29dd7b7ff7fa7f0ef37c43ef0975489 SHA512 7d72bed5b955b2365a4c11fcd97a2d6f2372ab939fb9a03b3ff7915053f24d695373c1aa154f6e6916d37ef3ace7b38864d575419460382760500576dae52e49 WHIRLPOOL 72f54a6cb83f282a75f0abb073109414a7b8bcd4e9263466281e68ff34148a7343ed3bd78ebdc8afd109b6b9f5b9f15bfd0e250f418fcaa4986a7c886b57b9f6
 EBUILD netbeans-harness-8.1.ebuild 4079 SHA256 116b90d6e6fd1b1ad8ce99c81104262a416a485b3a3110beed70e9381333cec2 SHA512 77ca4bbaf078adf6e13c0fea0a8e673262aaed60dd799ec161584589fb4c791d9bd758c87f4272297d863d3992b54a66b77b7bf05135cada530d111e1c428e68 WHIRLPOOL d385cd6292f31a5817a2c096f960330186a68242b51ed26e4272f33a690a98175e0b622a5d5309e1e6a72ff824662964785b7d235cf3a73ba4d715cd19e89dbb
 EBUILD netbeans-harness-9999_p20160815.ebuild 4126 SHA256 7b3f095d9426c6363b8e14749130bf356326e8115e40e00e9ae0a9f1fcf2c0d1 SHA512 52985c2b5b75548f538d5b355bf51ad053afd9fa0281e365605bc8a7643c84f3c2f35dab4f1440cae070c0ef1255dedd5b2322ef809e78449143c1089296cd89 WHIRLPOOL 41528cc3cf57d83eefaba51409925ddc82cd5d79d53a0444227713f56601e74ed737b1b5014f5baa82fa447ac92c05252adc6ee4781b81a2f7b67ae70449f56c
@@ -66,4 +67,5 @@ EBUILD netbeans-harness-9999_p20160912.ebuild 4126 SHA256 725c19938cf906efc3ba90
 EBUILD netbeans-harness-9999_p20160913.ebuild 4126 SHA256 c4a300931202435e2e407f28f77e7e1141e3c8b810d30ce3b2cb5a46938fccd5 SHA512 326effdab41d6b756ebff36e6018565d9cbad16522d9d713c10f73a0fef541477ec8b91cc47578e6d975324f819a4f17d15acbc42fef8cfd82c66935d7f21eda WHIRLPOOL 066d7f8bb7cf71873b08fef2bf865071ee2ff0d9f34d70cdb57044aabed380cf32aed15259ac9bae2f10c8274b738b59ed9a032a271baab59ad881d2f7183d61
 EBUILD netbeans-harness-9999_p20160914.ebuild 4126 SHA256 3b48a48dbdf06755ba760558beb406c142c97af007236dbc20b2dbf9eeea6a1f SHA512 5ea91f7532845b0e9ac5379d8d0537d9eff1d30949a3440fabd002a6977cabba41902dbd3a0e469e6eee5d77e93999b0d868a44144ac249f4cf4faff6b22b02d WHIRLPOOL 1af3086530f740e2e01fbbb58c4b238ee12fe01b4b449bdf22b24c7b3c3c13b2475b20e957a0212263c9633bdd13c89a9ccfc64b8001395c6de0fcfe593ab815
 EBUILD netbeans-harness-9999_p20160915.ebuild 4126 SHA256 cdda67e6320506785cce5db74f94bcca258a5ab2216cf6bb1c4ed55f3397756d SHA512 3d1b6f3b78ac23d2cacf4750e1df8fbee7b94acd5eeb19cfbcc023e5c6a635abe4e421c716a8a1d3c4ffec0cf8d4b93870907bc9a1c19cbc3fc10742ea165223 WHIRLPOOL c3217683b803da55f1ac51ad28a6be6310fc3299c3bf682d8e541b5e41a64934fee8cf33e0f12bd18154431af41ba40c856d8b7fc3912fcda78a7759072cacb1
+EBUILD netbeans-harness-9999_p20160916.ebuild 4126 SHA256 1a9666e921080563ddb59892f87d62fe2cca482a3cde9bfb6a3dd12518c5740b SHA512 5654aa2f3192fcbff6f516b29dc5f6263ee49a1ced0d25000bec6137e9dd415429825cd03e278c4af0d86aa437a829d14d2db3756f6a609461f99ab86896eeac WHIRLPOOL 3f5285caa8e012a5314de953a889d5baa1a9ed4b88642c19357308ff23842d47c39bec6e677da8d692388bb3be8216ae7b64ec6e0ead583a3d329d8aa4ede2cb
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 5ae43e1..243fc45 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -170,6 +170,7 @@ DIST netbeans-trunk-nightly-201609120002-src.zip 218010356 SHA256 265ec87ec62f15
 DIST netbeans-trunk-nightly-201609130002-src.zip 218011897 SHA256 40cb0d7c2dba73fa2d3dcddcbc1cf6a1bef06b551cf0a5ff9d6ce9ff12ea007d SHA512 26e5b258261386437534b6b8748a69c7fb7e9332e67584de9723ff7cf9067d20e5cb6d4e86eaf0c611378be0bef9517dd563ca824499efc4f1a89056860ac856 WHIRLPOOL 3b4bd5894c4f65d638a070084267814f00819936c9e4cf7ca758eb04f5500280daf16caa36137700659c10717738d98558b9c5e090c4df82e2d9247308a1f1d3
 DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318bfe333cedd1fbd81a4c6b870e0025f9f4f3ea3d6926bc18cb1c SHA512 81af61f842b23dd51b5610d4c1f9a7113f82e4ceaee2af4a4f4392b56f38b9ec92655c1e413e9b58a808207b308dc68ea8b94c24ef636db8d8ea81275f867470 WHIRLPOOL 8cc8b87bbf8299ab97e24ee64b1d982dfb942cb60a8d8a110b38207807c05b8a7f1c2a2a4d5df52a80c12eaa9ae08440e8f7e333e6a519d83759d2b50c42d015
 DIST netbeans-trunk-nightly-201609150002-src.zip 218016283 SHA256 90b7a4a97f9328512ad9388caab30b88290338dcd87e90d7b20c1568b679a11e SHA512 bc398e865c55547752f8ac05ed2de3c22eff9d5b7c204f28ecd30d1a1d11bda9276454d505d12f5a951d88c40a160a1dad15fc62ab39a6d350d0ba45af4df299 WHIRLPOOL 283749fe3c678341d9489fea580e7af7bec404507be57bd264d4a3673b8b5660a729c5a3f96da2adbeee1fa10fe3205e486c6186f01dcb5fa05f93627bc646de
+DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72fbb6102c07095a61e6cc10066c5fff94a3abfebe2852484e31e SHA512 e41d80df015b84f2faf8811a8fd242f85c72e39867161d236ef0242062568c6fd163bf46a623f4a14779e9d89a49b6a2d88691487a5ec785eece6c7f70459ffa WHIRLPOOL e42fac6f885c4fd1c2bc030cf47aa82ec4e35f66d305e8dd06d6a439ca958074ce57ae761b7ee16e4612dc5f94bedd7fe4655463ab4a7c095e03f41d4fc686f1
 EBUILD netbeans-ide-8.0.2-r2.ebuild 29330 SHA256 4822cbe26fc19685164c35d69e75bc20578ca8a5ce3394fe97bde6acc721fd2d SHA512 552f35cb1aa5429beb70c72a0cd2a3aa3a006f5870ec4084e88632a39e2ccdc05d0b2b15a87f26c72cdffb3c9a6fa0a124a8d501edeef9aa9580396922071e8d WHIRLPOOL 4c9bce3ca21d5ae61ef9392b9282c2dff9de7f82f2e83d2944a2906ca2180ef0ffab59489bdbb6afc7ba88d5143d77b47a0cf6b219a5a4d385b68afcacd3fe6d
 EBUILD netbeans-ide-8.1-r2.ebuild 30301 SHA256 892f20531352d85b5b72b1c85352eefa444917b515b0b564f04c4f91d1e654f9 SHA512 50af4873fd3ea7755b0d33b086be7e07766b6c009a46ec3954a67a1da9930378bcf9da6d18b7e60078b31af4b36ccf060f22378a8ef26b3829ccf30a529dd023 WHIRLPOOL 1024af16e7cae7f4728dd37f88031be33253b7c62548a095d3e827abeccb6c183d34ce312bd1a0f808f0d107aff217e4b81b7a17eecc6842e1d914d7061df2c9
 EBUILD netbeans-ide-9999_p20160815.ebuild 29867 SHA256 47897dd9dbb208f54919252af1efc96d1ea2ca744c4d291b87b1884e855ef778 SHA512 13e907e9d51c36eecc6fb33ca5d3578d9fcaf9d8cff4842f1b57d6dfc00b351773ae9801a1c1d6fee2c82ebec9fa39b2c757dbc9104a169a03ac8860d9c844e9 WHIRLPOOL f259f25f48ee5dcaa0bdc90ccaf5b7f17c695e2b87272779bf43ba96df2826ec49314ebf4fca299fcbbd87a08dea8dfadbbffa38e298fd17b29049e372d4b969
@@ -200,4 +201,5 @@ EBUILD netbeans-ide-9999_p20160912.ebuild 29849 SHA256 20b52065b165661e4483a5c2e
 EBUILD netbeans-ide-9999_p20160913.ebuild 29849 SHA256 1eed580697c6a9fb26879f423b458ed60a3b5e42d5c60fce67b1f6ae5aa8c190 SHA512 f45a6865319919bdb504f33cc6f18c191bffc488c6f6d497c081bc2d7df18ad4a6f1d2eb29fe94ed663252c3ceb661c25cc9faac2936cbf50c8c6affe03987ec WHIRLPOOL 2ef48ba0e6b8aaff6f5a5af16900389c2393622cd075713f3c94fba94ce488511e44193b2d3024f666ae31f545f67b6640cfdcf82ca178e324a4e09b29ef801c
 EBUILD netbeans-ide-9999_p20160914.ebuild 29849 SHA256 a2f4788195b6723aa8262eae7ff6a1b148b540cf23d719bd4f688a90889a4a0f SHA512 9a2557d5423b7b5bdf9c2a910368621c5509b87af0056be24cb7d1b11ef7498c2ff505454277b92f0d5afe998f9ff6c5222e088cb1954daf028374beb9bb5fdd WHIRLPOOL a670c60689f2d9581e3b00ea001e56448b6e1bc74712003f4ca773f818e02c57662e66778b6b68c40e10addfe0db7547a14411086c0b91fb442eca8f55e64011
 EBUILD netbeans-ide-9999_p20160915.ebuild 29849 SHA256 5b03f076eb77aede16e1be078041901d5abe1496aea7ca4d8961c48ff16b8092 SHA512 507ddac31ebab3dece5705d835a6465e43d990fc6220c91a7c8f97e324a61a8d25f178c97eacd097c0c702493cd95ef32a8fd2779080d10e03b7c960d984b37e WHIRLPOOL 4088b0cedb084fc6d7eb92d96e3e00745b1aedc233bc6aaf1aed96a333c56a89b636e925ade400ded395191876d30467045d9529f5d22f66ee9c15c8def22c13
+EBUILD netbeans-ide-9999_p20160916.ebuild 29849 SHA256 cdeb37a41342d68dab93a04b796eda522c69eb2b26d89f2ad13298fdb871a2ff SHA512 f6e29c04854dba6dd25f6dfccd77237a2b51185d0cc80bbc1c0e09d02d70f5e4dc6cd7cdeb96b79a2fc505cd6247cdb2dd2627f1d477fb6471db1af6ce8a82e3 WHIRLPOOL ce6a3ba92c538dbb9b904314015f9e0c16ab2b00ba2542712eb973cc7feb81d24de64100b9efb7ede5ad3e741a6e765bfb5e7f5abd88bc9dc1cad454a7a5a54f
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160916.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160916.ebuild
new file mode 100644
index 0000000..57a8d81
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20160916.ebuild
@@ -0,0 +1,374 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-09-16_00-02-33/zip/netbeans-trunk-nightly-201609160002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
+	http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
+	http://hg.netbeans.org/binaries/DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8-com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar
+	http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar
+	http://hg.netbeans.org/binaries/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar
+	http://hg.netbeans.org/binaries/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar
+	http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip
+	http://hg.netbeans.org/binaries/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip
+	http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip
+	http://hg.netbeans.org/binaries/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip
+	http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar
+	http://hg.netbeans.org/binaries/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar
+	http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
+	http://hg.netbeans.org/binaries/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip
+	http://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar
+	http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar
+	http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar
+	http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip
+	http://hg.netbeans.org/binaries/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar
+	http://hg.netbeans.org/binaries/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar
+	http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip
+	http://hg.netbeans.org/binaries/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar
+	http://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar
+	http://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar
+	http://hg.netbeans.org/binaries/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar
+	http://hg.netbeans.org/binaries/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar
+	http://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar
+	http://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar
+	http://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar
+	http://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar
+	http://hg.netbeans.org/binaries/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar
+	http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
+	http://hg.netbeans.org/binaries/AA2671239EBB762FEEE8B908E9F35473A72AFE1B-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar
+	http://hg.netbeans.org/binaries/1605B38BB28EAE32C11EAB8F9E238A497754A5B8-org.eclipse.core.jobs-3.5.101_nosignature.jar
+	http://hg.netbeans.org/binaries/20800206EB8B490F3CE5BB8AC8A7C3B9E8004A30-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar
+	http://hg.netbeans.org/binaries/D2D2105B1E3C9E2FA6240AD088237A57590DDA8D-org.eclipse.core.runtime-3.7.0_nosignature.jar
+	http://hg.netbeans.org/binaries/16507EAFDC2B95121AA718895BDB54D616EE4B0F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar
+	http://hg.netbeans.org/binaries/BD55836AABD558DC643A7844B78866AD990544BC-org.eclipse.equinox.app-1.3.100_nosignature.jar
+	http://hg.netbeans.org/binaries/4EE275AE73A140A403903D7E4DBA68C8FBB07001-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar
+	http://hg.netbeans.org/binaries/B7001D9CC2E2AC4E167D22A13063F0350C71AAA9-org.eclipse.equinox.preferences-3.4.2_nosignature.jar
+	http://hg.netbeans.org/binaries/C647079E36A4EB7A24AED2C545E4F0F94194C4D1-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar
+	http://hg.netbeans.org/binaries/9267CF311F979078211A70C1B19AF8A8EE71DC8E-org.eclipse.equinox.security-1.1.1_nosignature.jar
+	http://hg.netbeans.org/binaries/B580E446B543A8DD2F5AA368B07F9C4C9C2E7029-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar
+	http://hg.netbeans.org/binaries/244560B99152F3F9BC75DF2D6FAFA8A5216B06B6-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar
+	http://hg.netbeans.org/binaries/8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar
+	http://hg.netbeans.org/binaries/D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar
+	http://hg.netbeans.org/binaries/4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar
+	http://hg.netbeans.org/binaries/8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar
+	http://hg.netbeans.org/binaries/50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar
+	http://hg.netbeans.org/binaries/4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar
+	http://hg.netbeans.org/binaries/11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar
+	http://hg.netbeans.org/binaries/A3FEF6144ED1622E4CDD506B9D745527CC675D8D-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar
+	http://hg.netbeans.org/binaries/825DC870D1D423E347F4F8229A211A2C297BB15D-org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar
+	http://hg.netbeans.org/binaries/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar
+	http://hg.netbeans.org/binaries/17C0C8D6DEBF5EBE734881C131888D8088BD9E7D-org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar
+	http://hg.netbeans.org/binaries/6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar
+	http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar
+	http://hg.netbeans.org/binaries/DAAEFA7A5F3AF75FE4CDC86A1B5904C9F3B5BBF8-svnClientAdapter-javahl-1.10.12.jar
+	http://hg.netbeans.org/binaries/C47ED3BCD8CEAECDE3BDEEB7D8D14B577B26F9C8-svnClientAdapter-main-1.10.12.jar
+	http://hg.netbeans.org/binaries/AD4A88D99AB7C5B64C8893CA2FF2CBCFCEFC51C8-svnClientAdapter-svnkit-1.10.12.jar
+	http://hg.netbeans.org/binaries/5C47A97F05F761F190D87ED5FCBB08D1E05A7FB5-svnjavahl-1.9.3.jar
+	http://hg.netbeans.org/binaries/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar
+	http://hg.netbeans.org/binaries/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar
+	http://hg.netbeans.org/binaries/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar
+	http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar
+	http://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar
+	http://hg.netbeans.org/binaries/15ACB06E2E3A70FC188782BA51369CA81ACFE860-validator.jar
+	http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar
+	http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar
+	http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar
+	http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-platform-${PV}
+	dev-java/antlr:4
+	dev-java/commons-compress:0
+	dev-java/commons-httpclient:3
+	dev-java/commons-logging:0
+	dev-java/icu4j:55
+	dev-java/iso-relax:0
+	dev-java/jdbc-mysql:0
+	dev-java/jdbc-postgresql:0
+	>=dev-java/jsch-0.1.46:0
+	>=dev-java/json-simple-1.1:0
+	dev-java/jsr173:0
+	dev-java/jvyamlb:0
+	dev-java/log4j:0
+	dev-java/lucene:3.5
+	dev-java/rhino:1.6
+	dev-java/saxon:9
+	dev-java/smack:2.2
+	dev-java/sun-jaf:0
+	dev-java/tomcat-servlet-api:2.2
+	dev-java/ws-commons-util:0
+	dev-java/xerces:2"
+#	dev-vcs/subversion>=1.8.4:0[java] missing from the tree
+#	app-text/jing:0 our version is probably too old
+#	dev-java/commons-io:1 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/commons-lang:2.1 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/freemarker:2.3
+#	dev-java/guava:15 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/ini4j:0 our version is too old
+#	dev-java/jaxb:2 upstream version contains more stuff so websvccommon does not compile with ours
+#	dev-java/jzlib:0 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/trilead-ssh2:0 in overlay
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	dev-java/commons-codec:0
+	${CDEPEND}
+	dev-java/javacc:0
+	dev-java/javahelp:0
+	dev-java/jna:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ide -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+JAVA_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r16-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
+	ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die
+	ln -s "${DISTDIR}"/DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8-com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar || die
+	ln -s "${DISTDIR}"/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar o.apache.commons.io/external/commons-io-1.4.jar || die
+	ln -s "${DISTDIR}"/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar o.apache.commons.lang/external/commons-lang-2.6.jar || die
+	ln -s "${DISTDIR}"/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar libs.commons_net/external/commons-net-3.3.jar || die
+	ln -s "${DISTDIR}"/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip css.editor/external/css21-spec.zip || die
+	ln -s "${DISTDIR}"/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip css.editor/external/css3-spec.zip || die
+	ln -s "${DISTDIR}"/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip derby/external/derbysampledb.zip || die
+	ln -s "${DISTDIR}"/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip dlight.nativeexecution/external/exechlp-1.0.zip || die
+	ln -s "${DISTDIR}"/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar libs.freemarker/external/freemarker-2.3.19.jar || die
+	ln -s "${DISTDIR}"/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar c.google.guava/external/guava-15.0.jar || die
+	ln -s "${DISTDIR}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || die
+	ln -s "${DISTDIR}"/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip html.parser/external/html5doc.zip || die
+	ln -s "${DISTDIR}"/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar html.parser/external/htmlparser-1.2.1.jar || die
+	ln -s "${DISTDIR}"/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar libs.ini4j/external/ini4j-0.5.1.jar || die
+	ln -s "${DISTDIR}"/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar html.validation/external/iri.jar || die
+	ln -s "${DISTDIR}"/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip spellchecker.dictionary_en/external/ispell-enwl-3.1.20.zip || die
+	ln -s "${DISTDIR}"/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar c.googlecode.javaewah.JavaEWAH/external/JavaEWAH-0.7.9.jar || die
+	ln -s "${DISTDIR}"/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar xml.jaxb.api/external/jaxb-api.jar || die
+	ln -s "${DISTDIR}"/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip libs.jaxb/external/jaxb-api-doc.zip || die
+	ln -s "${DISTDIR}"/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar libs.jaxb/external/jaxb-impl.jar || die
+	ln -s "${DISTDIR}"/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar libs.jaxb/external/jaxb-xjc.jar || die
+	ln -s "${DISTDIR}"/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar libs.jaxb/external/jaxb1-impl.jar || die
+	ln -s "${DISTDIR}"/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar libs.javafx/external/jfxrt.jar || die
+	ln -s "${DISTDIR}"/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar html.validation/external/jing.jar || die
+	ln -s "${DISTDIR}"/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.core-0.0.7.jar || die
+	ln -s "${DISTDIR}"/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.sshagent-0.0.7.jar || die
+	ln -s "${DISTDIR}"/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.pageant-0.0.7.jar || die
+	ln -s "${DISTDIR}"/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.usocket-jna-0.0.7.jar || die
+	ln -s "${DISTDIR}"/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar c.jcraft.jzlib/external/jzlib-1.0.7.jar || die
+	ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.process/external/libpam4j-1.1.jar || die
+	ln -s "${DISTDIR}"/AA2671239EBB762FEEE8B908E9F35473A72AFE1B-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar o.eclipse.core.contenttype/external/org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar || die
+	ln -s "${DISTDIR}"/1605B38BB28EAE32C11EAB8F9E238A497754A5B8-org.eclipse.core.jobs-3.5.101_nosignature.jar o.eclipse.core.jobs/external/org.eclipse.core.jobs-3.5.101_nosignature.jar || die
+	ln -s "${DISTDIR}"/20800206EB8B490F3CE5BB8AC8A7C3B9E8004A30-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar o.eclipse.core.net/external/org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar || die
+	ln -s "${DISTDIR}"/D2D2105B1E3C9E2FA6240AD088237A57590DDA8D-org.eclipse.core.runtime-3.7.0_nosignature.jar o.eclipse.core.runtime/external/org.eclipse.core.runtime-3.7.0_nosignature.jar || die
+	ln -s "${DISTDIR}"/16507EAFDC2B95121AA718895BDB54D616EE4B0F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar o.eclipse.core.runtime.compatibility.auth/external/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar || die
+	ln -s "${DISTDIR}"/BD55836AABD558DC643A7844B78866AD990544BC-org.eclipse.equinox.app-1.3.100_nosignature.jar o.eclipse.equinox.app/external/org.eclipse.equinox.app-1.3.100_nosignature.jar || die
+	ln -s "${DISTDIR}"/4EE275AE73A140A403903D7E4DBA68C8FBB07001-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar o.eclipse.equinox.common/external/org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar || die
+	ln -s "${DISTDIR}"/B7001D9CC2E2AC4E167D22A13063F0350C71AAA9-org.eclipse.equinox.preferences-3.4.2_nosignature.jar o.eclipse.equinox.preferences/external/org.eclipse.equinox.preferences-3.4.2_nosignature.jar || die
+	ln -s "${DISTDIR}"/C647079E36A4EB7A24AED2C545E4F0F94194C4D1-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar o.eclipse.equinox.registry/external/org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar || die
+	ln -s "${DISTDIR}"/9267CF311F979078211A70C1B19AF8A8EE71DC8E-org.eclipse.equinox.security-1.1.1_nosignature.jar o.eclipse.equinox.security/external/org.eclipse.equinox.security-1.1.1_nosignature.jar || die
+	ln -s "${DISTDIR}"/B580E446B543A8DD2F5AA368B07F9C4C9C2E7029-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit/external/org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar || die
+	ln -s "${DISTDIR}"/244560B99152F3F9BC75DF2D6FAFA8A5216B06B6-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit.java7/external/org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar || die
+	ln -s "${DISTDIR}"/8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar || die
+	ln -s "${DISTDIR}"/D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar || die
+	ln -s "${DISTDIR}"/4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar || die
+	ln -s "${DISTDIR}"/8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar o.eclipse.mylyn.commons.repositories.core/external/org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar || die
+	ln -s "${DISTDIR}"/50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar || die
+	ln -s "${DISTDIR}"/4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar || die
+	ln -s "${DISTDIR}"/11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.confluence.core/external/org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar || die
+	ln -s "${DISTDIR}"/A3FEF6144ED1622E4CDD506B9D745527CC675D8D-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar || die
+	ln -s "${DISTDIR}"/825DC870D1D423E347F4F8229A211A2C297BB15D-org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.markdown.core/external/org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar || die
+	ln -s "${DISTDIR}"/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.textile.core/external/org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar || die
+	ln -s "${DISTDIR}"/17C0C8D6DEBF5EBE734881C131888D8088BD9E7D-org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar || die
+	ln -s "${DISTDIR}"/6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar extexecution.process/external/processtreekiller-1.0.7.jar || die
+	ln -s "${DISTDIR}"/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar libs.svnClientAdapter.svnkit/external/svnkit_1.7.8.r9538_v20130107_2001.jar || die
+	ln -s "${DISTDIR}"/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar o.apache.xml.resolver/external/resolver-1.2.jar || die
+	ln -s "${DISTDIR}"/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar libs.svnClientAdapter.svnkit/external/sqljet-1.1.10.jar || die
+	ln -s "${DISTDIR}"/DAAEFA7A5F3AF75FE4CDC86A1B5904C9F3B5BBF8-svnClientAdapter-javahl-1.10.12.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-javahl-1.10.12.jar || die
+	ln -s "${DISTDIR}"/C47ED3BCD8CEAECDE3BDEEB7D8D14B577B26F9C8-svnClientAdapter-main-1.10.12.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.10.12.jar || die
+	ln -s "${DISTDIR}"/AD4A88D99AB7C5B64C8893CA2FF2CBCFCEFC51C8-svnClientAdapter-svnkit-1.10.12.jar libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.10.12.jar || die
+	ln -s "${DISTDIR}"/5C47A97F05F761F190D87ED5FCBB08D1E05A7FB5-svnjavahl-1.9.3.jar libs.svnClientAdapter.javahl/external/svnjavahl-1.9.3.jar || die
+	ln -s "${DISTDIR}"/3B91269E9055504778F57744D24F505856698602-svnkit-1.7.0-beta4-20120316.233307-1.jar libs.svnClientAdapter.svnkit/external/svnkit-1.7.0-beta4-20120316.233307-1.jar || die
+	ln -s "${DISTDIR}"/015525209A02BD74254930FF844C7C13498B7FB9-svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar libs.svnClientAdapter.svnkit/external/svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar || die
+	ln -s "${DISTDIR}"/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar libs.swingx/external/swingx-all-1.6.4.jar || die
+	ln -s "${DISTDIR}"/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar httpserver/external/tomcat-webserver-3.2.jar || die
+	ln -s "${DISTDIR}"/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar swing.validation/external/ValidationAPI.jar || die
+	ln -s "${DISTDIR}"/15ACB06E2E3A70FC188782BA51369CA81ACFE860-validator.jar html.validation/external/validator.jar || die
+	ln -s "${DISTDIR}"/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar extexecution.process/external/winp-1.14-patched.jar || die
+	ln -s "${DISTDIR}"/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar o.apache.xmlrpc/external/xmlrpc-client-3.0.jar || die
+	ln -s "${DISTDIR}"/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar o.apache.xmlrpc/external/xmlrpc-common-3.0.jar || die
+	ln -s "${DISTDIR}"/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar o.apache.xmlrpc/external/xmlrpc-server-3.0.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.53.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-postgresql jdbc-postgresql.jar postgresql-9.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
+}
+
+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 81b06a9..b3ee389 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -68,6 +68,7 @@ DIST netbeans-trunk-nightly-201609120002-src.zip 218010356 SHA256 265ec87ec62f15
 DIST netbeans-trunk-nightly-201609130002-src.zip 218011897 SHA256 40cb0d7c2dba73fa2d3dcddcbc1cf6a1bef06b551cf0a5ff9d6ce9ff12ea007d SHA512 26e5b258261386437534b6b8748a69c7fb7e9332e67584de9723ff7cf9067d20e5cb6d4e86eaf0c611378be0bef9517dd563ca824499efc4f1a89056860ac856 WHIRLPOOL 3b4bd5894c4f65d638a070084267814f00819936c9e4cf7ca758eb04f5500280daf16caa36137700659c10717738d98558b9c5e090c4df82e2d9247308a1f1d3
 DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318bfe333cedd1fbd81a4c6b870e0025f9f4f3ea3d6926bc18cb1c SHA512 81af61f842b23dd51b5610d4c1f9a7113f82e4ceaee2af4a4f4392b56f38b9ec92655c1e413e9b58a808207b308dc68ea8b94c24ef636db8d8ea81275f867470 WHIRLPOOL 8cc8b87bbf8299ab97e24ee64b1d982dfb942cb60a8d8a110b38207807c05b8a7f1c2a2a4d5df52a80c12eaa9ae08440e8f7e333e6a519d83759d2b50c42d015
 DIST netbeans-trunk-nightly-201609150002-src.zip 218016283 SHA256 90b7a4a97f9328512ad9388caab30b88290338dcd87e90d7b20c1568b679a11e SHA512 bc398e865c55547752f8ac05ed2de3c22eff9d5b7c204f28ecd30d1a1d11bda9276454d505d12f5a951d88c40a160a1dad15fc62ab39a6d350d0ba45af4df299 WHIRLPOOL 283749fe3c678341d9489fea580e7af7bec404507be57bd264d4a3673b8b5660a729c5a3f96da2adbeee1fa10fe3205e486c6186f01dcb5fa05f93627bc646de
+DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72fbb6102c07095a61e6cc10066c5fff94a3abfebe2852484e31e SHA512 e41d80df015b84f2faf8811a8fd242f85c72e39867161d236ef0242062568c6fd163bf46a623f4a14779e9d89a49b6a2d88691487a5ec785eece6c7f70459ffa WHIRLPOOL e42fac6f885c4fd1c2bc030cf47aa82ec4e35f66d305e8dd06d6a439ca958074ce57ae761b7ee16e4612dc5f94bedd7fe4655463ab4a7c095e03f41d4fc686f1
 EBUILD netbeans-java-8.0.2-r4.ebuild 13298 SHA256 d4172dfdec5afecb1cd099e18a21aa872c7822bff40b192b5f4ec4d35e6e0ef8 SHA512 48ae6f7141117fbf58123ded750d76f2e7311211a6be3b62bd491349817460da11f781ec5694da91584315547c32008f568fac3bfb406dbdb5ed7fd825ff694e WHIRLPOOL 73fb68aec003707c14b2b390c2de80f24e1e5413cf7e16cf7e661af47c908e2d559214580379e45e21d316767987ac906b5a119a61ae39f03c3d01dafad49b7c
 EBUILD netbeans-java-8.1-r2.ebuild 14814 SHA256 1f49212c90fcaa9a6483f19bb60c963520f20aa08c2a509aa19cc7fda12e4564 SHA512 2d6b225f5d32f0ce1801124808b0cc2101f16a703540877c4818be06694742cfa262c3a2e7018761254f9244a7992eb7fe9bc15cdb20f6f4cb83958789c0ef42 WHIRLPOOL 8557163a46ea91a47efec3c272b8a8a0f2acbf9eaa8f6c280d0ddaac6dd8b2185f06716ab12ebf76fb87fe6c05ab1a14bfd281875ebef586f1304d2162e5f2dc
 EBUILD netbeans-java-9999_p20160815.ebuild 15656 SHA256 c0fa32d4d73f057c7123d0f2d5c0f908cf25057b48e42c1354b22174771e4636 SHA512 18dd7ba3b2dcfee7f2df67e2204924ab5d94c910e47ccb7c4b82368a36aeb679461a48d53508b0944beb9ff6ec787757515d305f9fb166624feb4fa2c8bf5282 WHIRLPOOL db59df9359fa2f159586a2bd760c123ace10c05174230ab0ac39487cec874c57b964e95833b0da64f10316fee810064b9aa61291fdc8d4482fffccdfb9a6bee9
@@ -98,4 +99,5 @@ EBUILD netbeans-java-9999_p20160912.ebuild 15656 SHA256 0666b2876cc4aafa024de8fe
 EBUILD netbeans-java-9999_p20160913.ebuild 15656 SHA256 eab588fddc92a77f3c2748b4663175347871e1b4fab75a77a69f633234b94d31 SHA512 8bf19a6ea2014dc03581ffa6e65e871bcc7ed2d997c61e371ac4052b435db2a897972b2cfc337b1224d4f0e0c271f514f5c0eed57984a01dc76f517bf5d91a71 WHIRLPOOL 81acf64c40c3cafbd51eb9efae452b359dde3d9145ce75c68b0681afbc2605dfcce6e33628563b0a86c8030b3aa099be0bedbd5dad57bb63d107f135da0d7102
 EBUILD netbeans-java-9999_p20160914.ebuild 15656 SHA256 9782e4efa747b476364b378b6e9e5ed140a699c387f68b6c542255e875a114a3 SHA512 05c6da3860e1bfbc1aef1cb226815beb4fe4f38a801ceb30e020d9a35a179628067380774528c3d550c982b85c7e6fde2fa0ae6552566e50872783019b8a6878 WHIRLPOOL c676d9b87fd9d1313e259270f68273ef981fe88d06dc620a28daa65a2104444620a9fabfcae48e59e8ab8a446aef2dd17c666f0cb3e5e67db103fa7abed04d95
 EBUILD netbeans-java-9999_p20160915.ebuild 15656 SHA256 4019c652296eb078c6f4d18021a66ca1d1b2b3d3c1eb8bdc6a32544abcc717c0 SHA512 4fca7c319d743a75f7999677d7e59c5c475be922838b648356d0a1a0beec81de84d4f8e6c8608a65a7368accc69a87dde0ca7da48fa8b1b26b5e69be3e442e29 WHIRLPOOL 8997fc07847c3a2d2e58bff9953a885cf5226934718df396985a12b438254996fc03de2bbe99399f6a2e8898ed1a0d7352f55cf2c5163d6e7823873407daec39
+EBUILD netbeans-java-9999_p20160916.ebuild 15656 SHA256 035d4fe4e912e7c4bff500db6e1831110c020380bda09bb452e6116fad26a704 SHA512 95ef862af41dff03636249a22f3d8d5944e0b3c9635a02afa29bdb5e8540f4ed08c181132d58a3c86b2ac926ffadbaa88b4d8ecd04d158959d6bd6fbc86377fd WHIRLPOOL e4fc212884de03368d0c6e86677b879c27cb88fbac6edcbfd13dec93529763283e71151df6e415be6581b2f809fa27aa695d319b1d8b0a1ce74cfcdca23c98ef
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160916.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160916.ebuild
new file mode 100644
index 0000000..0f337b8
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20160916.ebuild
@@ -0,0 +1,280 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+# Maven cannot be unbundled because it depends on exact maven version and exact content of maven directory
+
+DESCRIPTION="Netbeans Java Cluster"
+HOMEPAGE="http://netbeans.org/projects/java"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-09-16_00-02-33/zip/netbeans-trunk-nightly-201609160002-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
+	${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
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.cglib/external cglib-3 cglib.jar cglib-2.2.jar
+	java-pkg_jar-from --build-only --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+	java-pkg_jar-from --into maven.embedder/external jdom jdom.jar jdom-1.0.jar
+	java-pkg_jar-from --into o.jdesktop.beansbinding/external beansbinding beansbinding.jar beansbinding-1.2.1.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/java >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+	grep -E "/java$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	chmod 755 "${D}"/${INSTALL_DIR}/maven/bin/mvn* || die
+	rm -fr "${D}"/${INSTALL_DIR}/maven/bin/*.bat || die
+
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/maven/lib
+	pushd "${instdir}" >/dev/null || die
+	rm commons-cli-1.2.jar && java-pkg_jar-from --into "${instdir}" commons-cli-1 commons-cli.jar commons-cli-1.2.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext
+	pushd "${instdir}" >/dev/null || die
+	rm AbsoluteLayout.jar  && java-pkg_jar-from --into "${instdir}" absolutelayout absolutelayout.jar AbsoluteLayout.jar
+	rm beansbinding-1.2.1.jar && java-pkg_jar-from --into "${instdir}" beansbinding beansbinding.jar beansbinding-1.2.1.jar
+	rm cglib-2.2.jar && java-pkg_jar-from --into "${instdir}" cglib-3 cglib.jar cglib-2.2.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/hibernate4
+	pushd "${instdir}" >/dev/null || die
+	rm antlr-2.7.7.jar && java-pkg_jar-from --into "${instdir}" antlr antlr.jar antlr-2.7.7.jar
+	rm c3p0-0.9.2.1.jar && java-pkg_jar-from --into "${instdir}" c3p0 c3p0.jar c3p0-0.9.2.1.jar
+	rm cglib-2.2.jar && java-pkg_jar-from --into "${instdir}" cglib-3 cglib.jar cglib-2.2.jar
+	rm commons-collections-3.2.1.jar && java-pkg_jar-from --into "${instdir}" commons-collections commons-collections.jar commons-collections-3.2.1.jar
+	rm dom4j-1.6.1.jar && java-pkg_jar-from --into "${instdir}" dom4j-1 dom4j.jar dom4j-1.6.1.jar
+	rm javassist-3.18.1-GA.jar && java-pkg_jar-from --into "${instdir}" javassist-3 javassist.jar javassist-3.18.1-GA.jar
+	rm jboss-logging-3.1.3.GA.jar && java-pkg_jar-from --into "${instdir}" jboss-logging jboss-logging.jar jboss-logging-3.1.3.GA.jar
+	rm jboss-transaction-api_1.2_spec-1.0.0.Final.jar && java-pkg_jar-from --into "${instdir}" glassfish-transaction-api jta.jar jboss-transaction-api_1.2_spec-1.0.0.Final.jar
+	rm jtidy-r8-20060801.jar && java-pkg_jar-from --into "${instdir}" jtidy jtidy.jar jtidy-r8-20060801.jar
+	rm log4j-1.2.12.jar && java-pkg_jar-from --into "${instdir}" log4j log4j.jar log4j-1.2.12.jar
+	rm slf4j-api-1.6.1.jar && java-pkg_jar-from --into "${instdir}" slf4j-api slf4j-api.jar slf4j-api-1.6.1.jar
+	rm slf4j-log4j12-1.6.1.jar && java-pkg_jar-from --into "${instdir}" slf4j-log4j12 slf4j-log4j12.jar slf4j-log4j12-1.6.1.jar
+	rm slf4j-simple-1.6.1.jar && java-pkg_jar-from --into "${instdir}" slf4j-simple slf4j-simple.jar slf4j-simple-1.6.1.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxws22
+	pushd "${instdir}" >/dev/null || die
+	rm FastInfoset.jar && java-pkg_jar-from --into "${instdir}" fastinfoset fastinfoset.jar FastInfoset.jar
+	rm javax.mail_1.4.jar && java-pkg_jar-from --into "${instdir}" oracle-javamail mail.jar javax.mail_1.4.jar
+	rm mimepull.jar && java-pkg_jar-from --into "${instdir}" mimepull mimepull.jar
+	rm saaj-impl.jar && java-pkg_jar-from --into "${instdir}" saaj saaj.jar saaj-impl.jar
+	rm stax-ex.jar && java-pkg_jar-from --into "${instdir}" stax-ex stax-ex.jar
+	rm stax2-api.jar && java-pkg_jar-from --into "${instdir}" stax2-api stax2-api.jar
+	rm streambuffer.jar && java-pkg_jar-from --into "${instdir}" xmlstreambuffer xmlstreambuffer.jar streambuffer.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxws22/api
+	pushd "${instdir}" >/dev/null || die
+	rm jsr181-api.jar && java-pkg_jar-from --into "${instdir}" jsr181 jsr181.jar jsr181-api.jar
+	rm saaj-api.jar && java-pkg_jar-from --into "${instdir}" jsr67 jsr67.jar saaj-api.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/maven
+	pushd "${instdir}" >/dev/null || die
+	rm jdom-1.0.jar && java-pkg_jar-from --into "${instdir}" jdom jdom.jar jdom-1.0.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java
+}

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index 2e48edb..0b0cca8 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201609120002-src.zip 218010356 SHA256 265ec87ec62f15
 DIST netbeans-trunk-nightly-201609130002-src.zip 218011897 SHA256 40cb0d7c2dba73fa2d3dcddcbc1cf6a1bef06b551cf0a5ff9d6ce9ff12ea007d SHA512 26e5b258261386437534b6b8748a69c7fb7e9332e67584de9723ff7cf9067d20e5cb6d4e86eaf0c611378be0bef9517dd563ca824499efc4f1a89056860ac856 WHIRLPOOL 3b4bd5894c4f65d638a070084267814f00819936c9e4cf7ca758eb04f5500280daf16caa36137700659c10717738d98558b9c5e090c4df82e2d9247308a1f1d3
 DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318bfe333cedd1fbd81a4c6b870e0025f9f4f3ea3d6926bc18cb1c SHA512 81af61f842b23dd51b5610d4c1f9a7113f82e4ceaee2af4a4f4392b56f38b9ec92655c1e413e9b58a808207b308dc68ea8b94c24ef636db8d8ea81275f867470 WHIRLPOOL 8cc8b87bbf8299ab97e24ee64b1d982dfb942cb60a8d8a110b38207807c05b8a7f1c2a2a4d5df52a80c12eaa9ae08440e8f7e333e6a519d83759d2b50c42d015
 DIST netbeans-trunk-nightly-201609150002-src.zip 218016283 SHA256 90b7a4a97f9328512ad9388caab30b88290338dcd87e90d7b20c1568b679a11e SHA512 bc398e865c55547752f8ac05ed2de3c22eff9d5b7c204f28ecd30d1a1d11bda9276454d505d12f5a951d88c40a160a1dad15fc62ab39a6d350d0ba45af4df299 WHIRLPOOL 283749fe3c678341d9489fea580e7af7bec404507be57bd264d4a3673b8b5660a729c5a3f96da2adbeee1fa10fe3205e486c6186f01dcb5fa05f93627bc646de
+DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72fbb6102c07095a61e6cc10066c5fff94a3abfebe2852484e31e SHA512 e41d80df015b84f2faf8811a8fd242f85c72e39867161d236ef0242062568c6fd163bf46a623f4a14779e9d89a49b6a2d88691487a5ec785eece6c7f70459ffa WHIRLPOOL e42fac6f885c4fd1c2bc030cf47aa82ec4e35f66d305e8dd06d6a439ca958074ce57ae761b7ee16e4612dc5f94bedd7fe4655463ab4a7c095e03f41d4fc686f1
 EBUILD netbeans-javacard-8.0.2.ebuild 4906 SHA256 944fee40d693c2c287e748f70ba565f3cd84bb7c19110f8be716134ec20694a7 SHA512 1f66cd2756effbfde7d43f9da7d8d93cb6252c58a02ee3d821f6faeaf63bf3c63e28f80c6eb44689e3aa954452a2f3893c65e75de84158dff1da0d94cafea14a WHIRLPOOL 88197e03008b8acb1ce62f72783bb096d9a3fc2a289b83367841a8adbee2bf822031f9bd6051831515ee44b1d5d2a109c5646f98ca723506f27c874301fb4189
 EBUILD netbeans-javacard-8.1.ebuild 4930 SHA256 5342d0d3f4207da3d36eb19f0fa78015f33b4a6e6435fcf43b7f568afabb9d02 SHA512 5275ae0fd617e26cd8580f6256a766bdd9cc0299f5a488be5a97744ec6abddf262e5fb1db358b9ac00203bbedfe7ac152828b174856d9cf6fa06e1e2128e219b WHIRLPOOL 427bfed5b61a421340acf7ec0cfb5e88a8b4a68cb546b9d0546b7c69ab0e29700d03e2bf58641bde63a2a43579b0521c028cf57dbf25af280fb0732565a30617
 EBUILD netbeans-javacard-9999_p20160815.ebuild 4971 SHA256 c3171e102bc70f222519c1c267040629acc23dd7f9cbe98d86f32f3c794999c8 SHA512 10bb942d5db385efbb80a89e8dfa0d00fdbebf3dc6a30e9d9b90b7e99b08fcccdda159d357346cbd62ca6b2683e53b994f16be24086dcac15be7f122f3938bc2 WHIRLPOOL b2a653e87ed2108a88d1b721d65d51f682dadf9a9fbe406b6937426351691bd327c8d18516190ea9ad52af3424fd8d59c7b777f5aaaeaf9c255102afb9d920ed
@@ -64,4 +65,5 @@ EBUILD netbeans-javacard-9999_p20160912.ebuild 4971 SHA256 4a9e93da796cd23f5a72f
 EBUILD netbeans-javacard-9999_p20160913.ebuild 4971 SHA256 4c1617be9912c70a3b244ffadcc415d629467e3f916d72190d4c61ad686db040 SHA512 e52650012d1b8b8c75fde54def08e28b3a0d2ce69375807afc404c9972e9a763eae2387ce7cf08ac0faaf849bf1a82558d2f13980d63ecbbb61588069e811d25 WHIRLPOOL 89958f67d358340254d62d4c6b36f66fe25ae0ad98910fe1ad8e3b1443f39826e1db15b836f7a3dd989815c0d8622a8e32eef72ba634794d5894a89d9964d7b7
 EBUILD netbeans-javacard-9999_p20160914.ebuild 4971 SHA256 26a702399b61b8424ed52b4fc1e145c8c2d9d5be1421a9a4ea4463a51ef8e3bf SHA512 1afeff9df24443d6fe97bde91f1be0d0fb480b5319fc4a6aa500909c4763125e29ee0c2dee1b6bbf15a890b8e129c53a2ce6e4349b15d4614d199343c5704eee WHIRLPOOL aa80f8f5ac41efac53f763cc7849162a5aa44f8c60a1a22ef7fbb1749cf3876f546516cc3694b20653c448091607a21047731ad3c7c7ccad6bf0ae9f368b1028
 EBUILD netbeans-javacard-9999_p20160915.ebuild 4971 SHA256 02449f078357a6d2d8efa4cf583912baf31361dedaef1de0ae5d694bfa127d6c SHA512 bad1e3013c1d64e3b8d0eccb3bcd6fd8628f8b2674a036ad530b6404229b98b436c6700a3784165488ded469e4d5f60358ee4cdd6f6ae60506f3580c9f7db63b WHIRLPOOL 03f9be102a5fa3e9de928b6963809ea0ef27bb398a7e46efbb6b1c3ec7126f5a303032e01405c5999fa9fb6857a0b6c6f37162501990fd6ecf1491a491e044e8
+EBUILD netbeans-javacard-9999_p20160916.ebuild 4971 SHA256 136fab8897b9605d0cb475800348bb9f8326a683745756769241e6a7768c8681 SHA512 b88d5e3d9a208de83d82c6e486cc367a6f9e97df1cb62010914e84d1519da1660058ac7cca1f7aef20925be8dbba21d2d89144e7342d1abe1a17f4532f7d07a3 WHIRLPOOL 1a33b0908c2d4788e8a301a8444416250dd5bfdac6c2366f44fc54aa51e0d57fa848af4085379fc166398192f8173d54ed180129653cad2ce4464ca57096fad6
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index 6cb7253..67e64a1 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201609120002-src.zip 218010356 SHA256 265ec87ec62f15
 DIST netbeans-trunk-nightly-201609130002-src.zip 218011897 SHA256 40cb0d7c2dba73fa2d3dcddcbc1cf6a1bef06b551cf0a5ff9d6ce9ff12ea007d SHA512 26e5b258261386437534b6b8748a69c7fb7e9332e67584de9723ff7cf9067d20e5cb6d4e86eaf0c611378be0bef9517dd563ca824499efc4f1a89056860ac856 WHIRLPOOL 3b4bd5894c4f65d638a070084267814f00819936c9e4cf7ca758eb04f5500280daf16caa36137700659c10717738d98558b9c5e090c4df82e2d9247308a1f1d3
 DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318bfe333cedd1fbd81a4c6b870e0025f9f4f3ea3d6926bc18cb1c SHA512 81af61f842b23dd51b5610d4c1f9a7113f82e4ceaee2af4a4f4392b56f38b9ec92655c1e413e9b58a808207b308dc68ea8b94c24ef636db8d8ea81275f867470 WHIRLPOOL 8cc8b87bbf8299ab97e24ee64b1d982dfb942cb60a8d8a110b38207807c05b8a7f1c2a2a4d5df52a80c12eaa9ae08440e8f7e333e6a519d83759d2b50c42d015
 DIST netbeans-trunk-nightly-201609150002-src.zip 218016283 SHA256 90b7a4a97f9328512ad9388caab30b88290338dcd87e90d7b20c1568b679a11e SHA512 bc398e865c55547752f8ac05ed2de3c22eff9d5b7c204f28ecd30d1a1d11bda9276454d505d12f5a951d88c40a160a1dad15fc62ab39a6d350d0ba45af4df299 WHIRLPOOL 283749fe3c678341d9489fea580e7af7bec404507be57bd264d4a3673b8b5660a729c5a3f96da2adbeee1fa10fe3205e486c6186f01dcb5fa05f93627bc646de
+DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72fbb6102c07095a61e6cc10066c5fff94a3abfebe2852484e31e SHA512 e41d80df015b84f2faf8811a8fd242f85c72e39867161d236ef0242062568c6fd163bf46a623f4a14779e9d89a49b6a2d88691487a5ec785eece6c7f70459ffa WHIRLPOOL e42fac6f885c4fd1c2bc030cf47aa82ec4e35f66d305e8dd06d6a439ca958074ce57ae761b7ee16e4612dc5f94bedd7fe4655463ab4a7c095e03f41d4fc686f1
 EBUILD netbeans-javadoc-8.0.2.ebuild 5993 SHA256 baf9da38d87b86eb8ed10ef46017361f36ca8583dd90885c9d1667a51851bc52 SHA512 892bc25b30dc26e3ee7c8be9aaf8542c00a7fa1d1d8f883d82bebb816edfa93e1ee9abeac1b0c47ecc8b4169bcaded56c5c71f18151fdc22fe241fcee0fd4521 WHIRLPOOL 2012f28f3ba5074b4d262b20e9a1c8ddf590ce444339ec1a404c890867c1271e38f9f9e09717d0648fae061553f5c8da3d97a70c35c8e853fe4894fb6fd4ec96
 EBUILD netbeans-javadoc-8.1.ebuild 6247 SHA256 5f0ab01cbea85353ac471a46e341750785f4889732c9da111d77b87bbd1bcc2d SHA512 4a4636f4f58a9baba9d9f5bac4ee7d4f57c0e07d6790902d34974383660f2926c4c4b16a27bacc2a3a7a0a6d5b7699caae90bb2ac513ac8e0535e46d11ec345e WHIRLPOOL 9cbac0234b9f1a8122df116512d5154b7e85561fd9541e0a77dc5c2b5863cf3238400ac17d05499e950705309faa97caace6da00c912ea07d6a74b0076f683ed
 EBUILD netbeans-javadoc-9999_p20160815.ebuild 6293 SHA256 5051e3bc10a14672749e76f695c1f488ff42587fe00fa8a63658221cda1225e3 SHA512 99570b402de8679a2f30f23e7c9ff0669b9ec1fd2082965e37b97277e265f56b5ae14f90eb2d43d8b136b46839180f357d467a497ed368f75e6cb9c0f9cac215 WHIRLPOOL ce2db64336dcb60cece746afea382e223c59f49ac721ea89e27e762505e9dfad4adc875438c5056c4b5fd01911c31dfd7187427f8b98c25c9aee759fa8e41f87
@@ -63,4 +64,5 @@ EBUILD netbeans-javadoc-9999_p20160912.ebuild 6293 SHA256 154ce48a31dd9ad2161c68
 EBUILD netbeans-javadoc-9999_p20160913.ebuild 6293 SHA256 f21125ac58d69a8335c8329441ce7680a96eb35db5dbf9147cca584e9259ac6a SHA512 f122f77c28a9baa9fc36f1ae96090002e0c11e2646bb2ee876c6cd402a56c05d18ab2637b1dc817c103559f4e47f9e1dbb562465df6ec7bdb9575927f0772200 WHIRLPOOL d777e3718e75e0edc3c86b42d84b830766876c432e257227901749d83505c0e9df1910c4ca71d8095ee52d86bed2e0e70bd40f225f20135e90279933a4e65232
 EBUILD netbeans-javadoc-9999_p20160914.ebuild 6293 SHA256 01431a401ca40330656342d13f3228d1097eee3486051bfe06feb95d16f0bffb SHA512 6ae7a9a936c7659c299f407f3520fe607ff9fe439159437cf09375a418c4d2b16a76b42ac1eb82a7f87028dd685f61e1003f2f4b59f35106f4e87885404dd8cb WHIRLPOOL 6014382042adb7cb8f2dda71cc917efa4e95b83660fca86648e349cb0fa1721d9302751b0c59acb9289eaec11124197b2077be8294310881147b643c92a375a4
 EBUILD netbeans-javadoc-9999_p20160915.ebuild 6293 SHA256 8dfa150ae7eed2796583433b3cc75464cfd96a9521c3a33de6ef34460e087b72 SHA512 0eb72f777b20297558a893f899871327ab9c5c8836d9d293b5eb1eb19ca284b948859c882915a029841df4af301f369c3d2ceca6c209174b0e815c5b5724b2c9 WHIRLPOOL 85ee4756c8639c2b13a6189542086f43c348966895adb5d9d37a3dfcd6b92d39a4b79ff90b24c15e62102f9dff38284b4d2f6d462ab08d7b0bab7cce7104d4a2
+EBUILD netbeans-javadoc-9999_p20160916.ebuild 6293 SHA256 d1bdff3abcbe080bdce1450ca7b780d21e3ea6d3a9c1efe626d3ca1c57e5434d SHA512 f148c955538272746325090987fe897ff86ce73c85ca0f15e8248ee7c5fabc07a8c1996ec1a33b0653730431272cf017661cfcefb6808805171e2e644174bfa8 WHIRLPOOL 35a2745011098a73fdd5db4ca572a11526e1e4ea18cfbe8d6b36fa7d76e0d9e4c197f406ceaf6ea335ae9f24aea28fd1a554a84f3c2735dc764f9c1d64bf49cf
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index 3bcd79e..be03ee1 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201609120002-src.zip 218010356 SHA256 265ec87ec62f15
 DIST netbeans-trunk-nightly-201609130002-src.zip 218011897 SHA256 40cb0d7c2dba73fa2d3dcddcbc1cf6a1bef06b551cf0a5ff9d6ce9ff12ea007d SHA512 26e5b258261386437534b6b8748a69c7fb7e9332e67584de9723ff7cf9067d20e5cb6d4e86eaf0c611378be0bef9517dd563ca824499efc4f1a89056860ac856 WHIRLPOOL 3b4bd5894c4f65d638a070084267814f00819936c9e4cf7ca758eb04f5500280daf16caa36137700659c10717738d98558b9c5e090c4df82e2d9247308a1f1d3
 DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318bfe333cedd1fbd81a4c6b870e0025f9f4f3ea3d6926bc18cb1c SHA512 81af61f842b23dd51b5610d4c1f9a7113f82e4ceaee2af4a4f4392b56f38b9ec92655c1e413e9b58a808207b308dc68ea8b94c24ef636db8d8ea81275f867470 WHIRLPOOL 8cc8b87bbf8299ab97e24ee64b1d982dfb942cb60a8d8a110b38207807c05b8a7f1c2a2a4d5df52a80c12eaa9ae08440e8f7e333e6a519d83759d2b50c42d015
 DIST netbeans-trunk-nightly-201609150002-src.zip 218016283 SHA256 90b7a4a97f9328512ad9388caab30b88290338dcd87e90d7b20c1568b679a11e SHA512 bc398e865c55547752f8ac05ed2de3c22eff9d5b7c204f28ecd30d1a1d11bda9276454d505d12f5a951d88c40a160a1dad15fc62ab39a6d350d0ba45af4df299 WHIRLPOOL 283749fe3c678341d9489fea580e7af7bec404507be57bd264d4a3673b8b5660a729c5a3f96da2adbeee1fa10fe3205e486c6186f01dcb5fa05f93627bc646de
+DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72fbb6102c07095a61e6cc10066c5fff94a3abfebe2852484e31e SHA512 e41d80df015b84f2faf8811a8fd242f85c72e39867161d236ef0242062568c6fd163bf46a623f4a14779e9d89a49b6a2d88691487a5ec785eece6c7f70459ffa WHIRLPOOL e42fac6f885c4fd1c2bc030cf47aa82ec4e35f66d305e8dd06d6a439ca958074ce57ae761b7ee16e4612dc5f94bedd7fe4655463ab4a7c095e03f41d4fc686f1
 EBUILD netbeans-javafx-8.0.2.ebuild 4647 SHA256 15e5e0b1c4729852dd55e5bfb2dcb520ba7c959bd9927d315c0abcb3f94e4ecc SHA512 520c60264fee67b0ccfd50ced0cc8586d5653d5186fa75c6b7cd8b400aae834de446b7e6145ad38df7e68207391fb360ef4834140e096d48add568fed387ac98 WHIRLPOOL 416a56ceb2ba85e3923ada0c8ef485cdd6fa16b3423b8fd0de523fa54dd082cbaedee5da4f1a92b50e440195f9256376f50e99a850d70ccdcb8c0ff370007f7c
 EBUILD netbeans-javafx-8.1.ebuild 4671 SHA256 2a12bebaca0ddbb03b84c33de7f5933f76a8381db3c40013fc4014687ded6cd4 SHA512 ff410f96e808c414e3e9485461866239080098e46e843ee771a78a0afffddc1c776697dccb276daf7f87dadf915a212bfe9c2a07b3a8a9057cb3ea19b77163fb WHIRLPOOL 51729142255a16d4cd949d4bf5f3b681d36bc83f30dad39aad9d1dd56f7dcec0dae4377817350e7947d518129a74eec7f227c3cb1600ac168ea90d056b87d195
 EBUILD netbeans-javafx-9999_p20160815.ebuild 4717 SHA256 e6b21fe1cfd2a49c9f9ba59cd911261fb38752892765085629080821ef5b3b4e SHA512 bf66c725ddefa021995e1feb76a0b3b08645f8d468c8599554d444ecf66fce0a97de9cbf85af3562ac2be7e200315f194bdf3f7fa42bdfffa8d03b3eea300989 WHIRLPOOL 539a822142a58f7cae57be0b9ca5a629cf5353d6788f8fd515c43afa2f1f7dc7d4e2b5b42965ddb100aef91419ec037e27c2b4d7bed33475d14dffed853e8571
@@ -69,4 +70,5 @@ EBUILD netbeans-javafx-9999_p20160912.ebuild 4717 SHA256 32431b7a39a30809f019393
 EBUILD netbeans-javafx-9999_p20160913.ebuild 4717 SHA256 a07adfa4c6089ca5fd4c50ac871ff2cfd068b48b3d4573d62e79bec1e1dda16c SHA512 5940b85ce811db4c61626c2162665ce02a5c2538b7360daece96e781a9bfc7a50bfef7d309c6038be2ec7a8b6925a4984627beb6a8b418ce2284293c145f451b WHIRLPOOL 8c5d709df0d50157e91700251480ca248d546cbf7232cad726edb798df2c46b8dfa68c1f61015182e4923b91d9bbe72ae05f0a662b3bd7b40056e368475aa63d
 EBUILD netbeans-javafx-9999_p20160914.ebuild 4717 SHA256 2f9b6b6b9aa26d29226132a91d810450c1ea9985a2b66aa6fb51e38695e0f323 SHA512 7df4d7344d253a5ac8658a2b7a63703b0310e7982c3c4578cb33398ef3972a71311a70ad050ab0ff69c1afda396f14c2efd814e24cf9adafa3b60fb9ed13ddf3 WHIRLPOOL 14001729c7519acdb7f4e70aa8e9c32bd885d76ab58a0f55a44e12ff399b1022d71f8a255636c074cf843fa2bee351d8a300d6ccdb2fe5aa8d2dbfd3be7b91dc
 EBUILD netbeans-javafx-9999_p20160915.ebuild 4717 SHA256 24f123c9e823e5a73b4dc3c622eba32b56c3c3e26e7f0764c10c96ed7a31666a SHA512 aa0318c318933c0e60b4d12608dfd3b162350a0b4f431ea4797657bf99e00e65512a48100d30fca8286bb43c9e8f179fef9795baed8c21230dfe2371bfe538c6 WHIRLPOOL a254aa6119d7857217e38b9a6189a01817d7ce9cf61183ca37b0cabbc83e3d37a6cb5d4d67a9b1f7371b5e78b485e0b5e5cf09eed1c0cdc3dd2e79568d59cc01
+EBUILD netbeans-javafx-9999_p20160916.ebuild 4717 SHA256 18ea95a8a642d3cfafbe46455faf147f85539fad306a31a88069074687a03431 SHA512 b01c013638f74e079bf965e75cb41ec79d702084ea7e417afcb51a9de73dddc10f80b16dcf6f2163e3f6dd37d3400edeab2ccb2eb23cd3985d74b784b85f775a WHIRLPOOL 016eb0acc2bcbdd7a9e8c4642895bb9e83775f60eb1ba860eec057d3c67d786ee4a9fa0a4b749f7386895cbbf7495b130f5c8eea219e791fd9e493c662ca8ebc
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index e02f189..6837878 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201609120002-src.zip 218010356 SHA256 265ec87ec62f15
 DIST netbeans-trunk-nightly-201609130002-src.zip 218011897 SHA256 40cb0d7c2dba73fa2d3dcddcbc1cf6a1bef06b551cf0a5ff9d6ce9ff12ea007d SHA512 26e5b258261386437534b6b8748a69c7fb7e9332e67584de9723ff7cf9067d20e5cb6d4e86eaf0c611378be0bef9517dd563ca824499efc4f1a89056860ac856 WHIRLPOOL 3b4bd5894c4f65d638a070084267814f00819936c9e4cf7ca758eb04f5500280daf16caa36137700659c10717738d98558b9c5e090c4df82e2d9247308a1f1d3
 DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318bfe333cedd1fbd81a4c6b870e0025f9f4f3ea3d6926bc18cb1c SHA512 81af61f842b23dd51b5610d4c1f9a7113f82e4ceaee2af4a4f4392b56f38b9ec92655c1e413e9b58a808207b308dc68ea8b94c24ef636db8d8ea81275f867470 WHIRLPOOL 8cc8b87bbf8299ab97e24ee64b1d982dfb942cb60a8d8a110b38207807c05b8a7f1c2a2a4d5df52a80c12eaa9ae08440e8f7e333e6a519d83759d2b50c42d015
 DIST netbeans-trunk-nightly-201609150002-src.zip 218016283 SHA256 90b7a4a97f9328512ad9388caab30b88290338dcd87e90d7b20c1568b679a11e SHA512 bc398e865c55547752f8ac05ed2de3c22eff9d5b7c204f28ecd30d1a1d11bda9276454d505d12f5a951d88c40a160a1dad15fc62ab39a6d350d0ba45af4df299 WHIRLPOOL 283749fe3c678341d9489fea580e7af7bec404507be57bd264d4a3673b8b5660a729c5a3f96da2adbeee1fa10fe3205e486c6186f01dcb5fa05f93627bc646de
+DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72fbb6102c07095a61e6cc10066c5fff94a3abfebe2852484e31e SHA512 e41d80df015b84f2faf8811a8fd242f85c72e39867161d236ef0242062568c6fd163bf46a623f4a14779e9d89a49b6a2d88691487a5ec785eece6c7f70459ffa WHIRLPOOL e42fac6f885c4fd1c2bc030cf47aa82ec4e35f66d305e8dd06d6a439ca958074ce57ae761b7ee16e4612dc5f94bedd7fe4655463ab4a7c095e03f41d4fc686f1
 EBUILD netbeans-mobility-8.0.2.ebuild 4342 SHA256 e9b4ff8fe38904346bc21a82219696e97322bf9df4e9d4cad2259b6f08bbe7f9 SHA512 338711fe61c469cee80e499ddf8c3ad70a3a38e6658311afcd1d24edd1a99b87566fafcbd392bb958b589796e0913d2574b07570870c8d3382a91a324227082f WHIRLPOOL 855b2817c36bea67c8fb368a0740be18b71dbebb2b98a154552f002a56eaff34f54eee2698379d7200a6042c1de699df23e7717b5b6c532776852d8757b74cb0
 EBUILD netbeans-mobility-8.1.ebuild 4366 SHA256 fe10d103a284b8f82b67179ea52d51d57b43cfc4a4084b97e3f9650526621497 SHA512 36bdf0948b41bfe4f9c66fe093030d5f27b90f5a89be94dfbd176e3887b249d5aa3eb9b0924df142291f0d693f274eef840ed3a7f658106847327befd0374710 WHIRLPOOL f9dd44e6401367b2df73c5f1428bff53547ac012068297667666d0241c29310aed4413a368e5350a996af37ad026e875325467b1a165cba6953d99a5da3a0d76
 EBUILD netbeans-mobility-9999_p20160815.ebuild 4412 SHA256 7bad402af277783974d35c680898cd283040135ef33a68dab2d0ea76b4ce4a3f SHA512 28f8f4de391f64098a6fa4bded635c3abcc3278456d983f9d4079f6f4388bfa0f969c1ec0fc53d552bbfe4da6aefbb878fab1a78c5b78e386d12b450d330d392 WHIRLPOOL 9ee924b4acef285093d93828acae105dbf1e0cc72dd096ec850618f2f4446180822736df6ca1ad340c556b6a4842b8660b26bcda41e2101424e1ff4539cda43e
@@ -61,4 +62,5 @@ EBUILD netbeans-mobility-9999_p20160912.ebuild 4412 SHA256 13006780d5ff78454c018
 EBUILD netbeans-mobility-9999_p20160913.ebuild 4412 SHA256 980fb708d9e715af482164231906902d4b42a82007b8d3162aedd498b992b54e SHA512 720662f25b212e1e36c12315480c1a7fe91d5e47407e88fd6930abc5a2b9bc27c5ec973c8f57aea32127637d2ebfe85662b96c08631af3b144b3145756816ebb WHIRLPOOL 6e8a5098105594796cd6feb68875d4029994909a1374bc9cf5225bdecd92a1a2eae1f600f6ab88c00678d41c2141003c4cba74078e9afed6b74a6d527296827e
 EBUILD netbeans-mobility-9999_p20160914.ebuild 4412 SHA256 8b53bc6e01395594dd2b4df14466cccf14868fb41c9e5eb6fedc49818a459a8f SHA512 06fc4251176b1c5d31e3cc6289d0b89678f2b4bc19cfc42e38a8a273fe817be9b46bb0b8a1da53546c28658d43c642897893a2efc531eda0cc2b385cc244278e WHIRLPOOL f771192907479fd074f623bc23c5ec40d1834f7322ed5f4f9ecd400de0c28353bdd1f6692e156aa58304f6f9c473af53a2535a491a68ef5855a36cfbf86f03d3
 EBUILD netbeans-mobility-9999_p20160915.ebuild 4412 SHA256 9ba508305df8c1f80633f95f79cc8122760378e8a72bd7c375a3d58d4d2f2dfb SHA512 634daddd00667dde16f98f7d3c706a2f0c37872ce4d0c51060d79085a145ee66549ad649cf530b0060b3a4cc189ee9f679f757b2c23d1a5f8f08dbb6f22e8d7d WHIRLPOOL 3c6f18f041474e8c8d9b654f771597cb89d98ce9522ae048106e4d044ff998b5744b3f8e22fc6547c8cf45ebf1c5d4fc69663132c6cff1a90a586e81b0017fe9
+EBUILD netbeans-mobility-9999_p20160916.ebuild 4412 SHA256 5c3099c3f96c618122fe1ef3e29f72b582a0fe5d064afbf82e1e5c20d4fb6744 SHA512 78b72173cd8fbe5269ff381a88380d30556b503982320edb310ffb8db67089d3f210a92d3b0515b0c50135912cb5c4f8cd4db306c9079500812aeda93b725827 WHIRLPOOL db58d0f74520edb4c2046b171e73e57d85be8f692df780da1797f3ce1a8a7f8c911fa4beab09a2596e23eda72fa3ad13b46511523f2167f0af2a73e71a4594b2
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index 67a33a6..191af87 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201609120002-src.zip 218010356 SHA256 265ec87ec62f15
 DIST netbeans-trunk-nightly-201609130002-src.zip 218011897 SHA256 40cb0d7c2dba73fa2d3dcddcbc1cf6a1bef06b551cf0a5ff9d6ce9ff12ea007d SHA512 26e5b258261386437534b6b8748a69c7fb7e9332e67584de9723ff7cf9067d20e5cb6d4e86eaf0c611378be0bef9517dd563ca824499efc4f1a89056860ac856 WHIRLPOOL 3b4bd5894c4f65d638a070084267814f00819936c9e4cf7ca758eb04f5500280daf16caa36137700659c10717738d98558b9c5e090c4df82e2d9247308a1f1d3
 DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318bfe333cedd1fbd81a4c6b870e0025f9f4f3ea3d6926bc18cb1c SHA512 81af61f842b23dd51b5610d4c1f9a7113f82e4ceaee2af4a4f4392b56f38b9ec92655c1e413e9b58a808207b308dc68ea8b94c24ef636db8d8ea81275f867470 WHIRLPOOL 8cc8b87bbf8299ab97e24ee64b1d982dfb942cb60a8d8a110b38207807c05b8a7f1c2a2a4d5df52a80c12eaa9ae08440e8f7e333e6a519d83759d2b50c42d015
 DIST netbeans-trunk-nightly-201609150002-src.zip 218016283 SHA256 90b7a4a97f9328512ad9388caab30b88290338dcd87e90d7b20c1568b679a11e SHA512 bc398e865c55547752f8ac05ed2de3c22eff9d5b7c204f28ecd30d1a1d11bda9276454d505d12f5a951d88c40a160a1dad15fc62ab39a6d350d0ba45af4df299 WHIRLPOOL 283749fe3c678341d9489fea580e7af7bec404507be57bd264d4a3673b8b5660a729c5a3f96da2adbeee1fa10fe3205e486c6186f01dcb5fa05f93627bc646de
+DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72fbb6102c07095a61e6cc10066c5fff94a3abfebe2852484e31e SHA512 e41d80df015b84f2faf8811a8fd242f85c72e39867161d236ef0242062568c6fd163bf46a623f4a14779e9d89a49b6a2d88691487a5ec785eece6c7f70459ffa WHIRLPOOL e42fac6f885c4fd1c2bc030cf47aa82ec4e35f66d305e8dd06d6a439ca958074ce57ae761b7ee16e4612dc5f94bedd7fe4655463ab4a7c095e03f41d4fc686f1
 EBUILD netbeans-nb-8.0.2.ebuild 4927 SHA256 7531e50c4d76608bf925efdba4f54f522de3a8ceeef4d48807fb4ee48bfabdf6 SHA512 925734f331cf228066c5c9e614f48b756af31cac8b559cfe756347b6a2cb0ce362c7c41489a25084f2ed3f2e415baefd148a54f39fc00269fb14179efe056cb9 WHIRLPOOL e3224c5f22bb8e4792a5f98bbe819e071ff18c99533ce05a3fc1c5898ddcca1e3ce34487ba78159bb4d60155acdf15ae4fe81189ff2d5b1bc77ffd9ee4e20aca
 EBUILD netbeans-nb-8.1.ebuild 4065 SHA256 c1bfd704ecaa1fd62b149114b7391b4633a90a8a1d87645b833731920aa6efbb SHA512 56bda99c3d05522d5becb032177e4b4411d862d18a069e2d4343ddc8b08d05ed6c3199588e28aece7e583ccc9f95517621780a246bdd65c7d3edf072a61ef1cb WHIRLPOOL b9a43e6b4ada929bcf2aaed0bffe9cdfe0b9dbbf001e8ee4f2ab3cf8a08e27d318ea435d0580c80fd23cf921d261ca9b54d54a2b2e7a53173f955bde03aa0a12
 EBUILD netbeans-nb-9999_p20160815.ebuild 4111 SHA256 6c6e4df97b242dd399c47f42d25b2d9a8ff840a2bdfa39924dbd249124cf2043 SHA512 e51deedd5a7b7f1fd7a70810ade81908ee5092519e3a0b688b9d2df3a4ea3589fe376c79ce1bcf644860b2437b644e21f710a68a7660682773c43b221d06d4aa WHIRLPOOL a7451f0fd2acaa3acf2698e4684b8955f641ccba01c65f22f5cbf7eaf6a6163346115bb37b7a117b9680b1fd1633410e462dd2aa3544b69f58bc8da8d846ee18
@@ -64,4 +65,5 @@ EBUILD netbeans-nb-9999_p20160912.ebuild 4111 SHA256 f03932123ba0b2f07ea5fcfff7b
 EBUILD netbeans-nb-9999_p20160913.ebuild 4111 SHA256 877007143042199ea36b09d1ec3f04bdf36dd8a723c2590559f9d10dd065a2fd SHA512 5e6c27b23befc7972e715450b167cbcf5a1635aa83dfab777038ee465a70b8349e7f33fa6f3ef2e6c526ef6fab13d6f9b07a9a6f632effcc7cbc01ace87d8fe3 WHIRLPOOL 78cf76ef23e4b3f50ab38cc94085839c1088074f0a7da4104ad2f3dcbe871aae6bc35dd0f642ef7c1586adc45169cc6f66b760c2abfe9afb983588ed29f91b19
 EBUILD netbeans-nb-9999_p20160914.ebuild 4111 SHA256 a30a30fdec2907e201c782b9056fab39ad668593f149a43c2998789b64d95c3a SHA512 7647b495d2c3bf48db1c821705b9280491c5c746a3e009d926f265bb1e4a963410e96089fca400fc8e01121299e57ff854dbc333a033defb8b13baa9aa9c9407 WHIRLPOOL fb99ee7416697d0fcbc0afc9f037c1330334dfd0ee92714c0566014dec01b9a5ead6faddb3a7b54b85db95ba50b88b648e9cdd59e02bfce91b828649acc11244
 EBUILD netbeans-nb-9999_p20160915.ebuild 4111 SHA256 2db78372b304889b80c07bd1c7b430585d491608a00f3a56f3eb4c951e4f02fe SHA512 ed545db6f4779bb23754e458de8e2a8d987cf28a4cd17c6e117ac3ba0af06957e10d5568ffdf3ee9ef48be1b06dd0bd809c886bd1b4191c3ce6305f922b242c6 WHIRLPOOL 03b3cfecbf37c7465f777d8e0bb636efd8f823896f5a48aa4b8500d0f7d798aafd3acba7a013ca2215fa041ff4bb6af51884f8f751f8371ad30f1f3bfd001569
+EBUILD netbeans-nb-9999_p20160916.ebuild 4111 SHA256 7ef421a178eb1e2e598a0ef7476c073601d29c1c66d240440e73e45fd723ad89 SHA512 ce7bbd3c8761e7911a069e1b8134cac6ad1475c06991e26363e67d2aa5e2f1b1ba688b377da2d6c585dcb9e634dedcbaed6dc3734968482e6d6e193cd8e5b7cc WHIRLPOOL fbcaa28cdeaacecce1cbdce6216741203132462811aa790c9426c9cae55cc1e16c6c85d4d76e3822fd2647f4c1e707357dc6326130483ec40feed81369ee7cfb
 MISC metadata.xml 392 SHA256 01cdbcc83099b97486bd7b8e813e5b19c1138eb0d8d3e8a5683aafd579820435 SHA512 4d2f9160baa022d6a48b61d5f42e71cfd411d244e7a36436629bc5ee4036e4ce19079134d9a6c704ebe942306c2e0199d0591c1e54f92f8f3c8835147e639246 WHIRLPOOL c1131764e1cec66c56b977ebe36014b29e5a68e35ccc326c0cbadd050a6c625cf191c85c212e0a733661c008dab0d99f9a4cdc4c4ae0cc9d775ba1de554795a9

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160916.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160916.ebuild
new file mode 100644
index 0000000..1ab2344
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20160916.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Branding"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-09-16_00-02-33/zip/netbeans-trunk-nightly-201609160002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0.png"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster create-netbeans-import finish-build"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.nb -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r16-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans >/dev/null || die
+
+	insinto ${INSTALL_DIR}/nb
+
+	grep -E "/nb$" moduleCluster.properties > "${D}"/${INSTALL_DIR}/nb/moduleCluster.properties || die
+
+	insinto ${INSTALL_DIR}
+	doins -r nb
+	dodoc *.txt
+	dohtml *.html *.css
+
+	insinto ${INSTALL_DIR}/bin
+	doins bin/netbeans
+	dosym ${INSTALL_DIR}/bin/netbeans /usr/bin/netbeans-${SLOT}
+	fperms 755 ${INSTALL_DIR}/bin/netbeans
+
+	insinto /etc/netbeans-${SLOT}
+	doins etc/*
+	dosym /etc/netbeans-${SLOT} ${INSTALL_DIR}/etc
+
+	# fix paths per bug# 163483
+	if [[ -e "${D}"/${INSTALL_DIR}/bin/netbeans ]]; then
+		sed -i -e "s:\"\$progdir\"/../etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans
+		sed -i -e "s:\"\${userdir}\"/etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans
+	fi
+
+	dodir /usr/share/icons/hicolor/32x32/apps
+	dosym ${INSTALL_DIR}/nb/netbeans.png /usr/share/icons/hicolor/32x32/apps/netbeans-${SLOT}.png
+	dodir /usr/share/icons/hicolor/128x128/apps
+	cp "${DISTDIR}"/netbeans-7.0.png "${D}"/usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png || die
+	dosym /usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png /usr/share/pixmaps/netbeans-${SLOT}.png
+
+	popd >/dev/null || die
+
+	make_desktop_entry netbeans-${SLOT} "Netbeans ${PV}" netbeans-${SLOT} Development
+
+	mkdir -p  "${D}"/${INSTALL_DIR}/nb/config || die
+	echo "NBGNT" > "${D}"/${INSTALL_DIR}/nb/config/productid || die
+}

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index b997413..037a106 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201609120002-src.zip 218010356 SHA256 265ec87ec62f15
 DIST netbeans-trunk-nightly-201609130002-src.zip 218011897 SHA256 40cb0d7c2dba73fa2d3dcddcbc1cf6a1bef06b551cf0a5ff9d6ce9ff12ea007d SHA512 26e5b258261386437534b6b8748a69c7fb7e9332e67584de9723ff7cf9067d20e5cb6d4e86eaf0c611378be0bef9517dd563ca824499efc4f1a89056860ac856 WHIRLPOOL 3b4bd5894c4f65d638a070084267814f00819936c9e4cf7ca758eb04f5500280daf16caa36137700659c10717738d98558b9c5e090c4df82e2d9247308a1f1d3
 DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318bfe333cedd1fbd81a4c6b870e0025f9f4f3ea3d6926bc18cb1c SHA512 81af61f842b23dd51b5610d4c1f9a7113f82e4ceaee2af4a4f4392b56f38b9ec92655c1e413e9b58a808207b308dc68ea8b94c24ef636db8d8ea81275f867470 WHIRLPOOL 8cc8b87bbf8299ab97e24ee64b1d982dfb942cb60a8d8a110b38207807c05b8a7f1c2a2a4d5df52a80c12eaa9ae08440e8f7e333e6a519d83759d2b50c42d015
 DIST netbeans-trunk-nightly-201609150002-src.zip 218016283 SHA256 90b7a4a97f9328512ad9388caab30b88290338dcd87e90d7b20c1568b679a11e SHA512 bc398e865c55547752f8ac05ed2de3c22eff9d5b7c204f28ecd30d1a1d11bda9276454d505d12f5a951d88c40a160a1dad15fc62ab39a6d350d0ba45af4df299 WHIRLPOOL 283749fe3c678341d9489fea580e7af7bec404507be57bd264d4a3673b8b5660a729c5a3f96da2adbeee1fa10fe3205e486c6186f01dcb5fa05f93627bc646de
+DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72fbb6102c07095a61e6cc10066c5fff94a3abfebe2852484e31e SHA512 e41d80df015b84f2faf8811a8fd242f85c72e39867161d236ef0242062568c6fd163bf46a623f4a14779e9d89a49b6a2d88691487a5ec785eece6c7f70459ffa WHIRLPOOL e42fac6f885c4fd1c2bc030cf47aa82ec4e35f66d305e8dd06d6a439ca958074ce57ae761b7ee16e4612dc5f94bedd7fe4655463ab4a7c095e03f41d4fc686f1
 EBUILD netbeans-php-8.0.2.ebuild 4347 SHA256 585b2488d748f3d0f87c17c951870e167aac7bf10847428add786e4a8a446583 SHA512 1431305d4f340cb0a2c7c896c54d45f6f02ef82a4201f82053278b98511a5a4a68210317530e9cdf5cf1f495996d3a3f9c4b2c3c479aa407abd375072ab3182f WHIRLPOOL af8476f2ff2d119f2657e6be03cfea1160f86e41bd791f40609f1bc8a8aada46ba1081e4f2417b0fddde931fa4e43d20956c0fe1d4fdf3617b78d01afd23f9b4
 EBUILD netbeans-php-8.1.ebuild 4371 SHA256 a9e7565a8cbcc5dfca4d9449f43b959911c47ad8da59648e383ecce55c4b0064 SHA512 67d43532ea43abf007adce73e7da2345d9cc42229189ba90d254d7764e19e3fd3c86b990ea2fe08cf52e49422def481046fe6e0e447fdc1de1680ac59f51d9d3 WHIRLPOOL 433275570fd81db477180e58909ebd50b83cde03bd5df807cc9ee213e2f3a44f65f3ec4877851aa6322e7752969aa72313ee7b35b8ee07446e8c22be4321d536
 EBUILD netbeans-php-9999_p20160815.ebuild 4418 SHA256 845f1a6d21694d25ec4169020ca4a0f0138d4d965a12fd838f193124a239f7aa SHA512 fa3daf73f340fadfee8c288efac67a6a16850236f2c89d57da70c1c40834cd2ea8bea8c62fd01f7def9e8e59f91d4bffa35da88cbc24581f4e9cd6dac5df7e35 WHIRLPOOL 4a54b4ca54cbe2f5dc3eddd2494381e6ca6502da0391067eabee51292db896cbd8b5b72015d333e6a622ae54a84b0721d54986260e5b7435e50f356e0d46f9ad
@@ -66,4 +67,5 @@ EBUILD netbeans-php-9999_p20160912.ebuild 4418 SHA256 a1322facdf33b1c6d2e8deb0b8
 EBUILD netbeans-php-9999_p20160913.ebuild 4418 SHA256 c16ac61307aabf2e7c1a20b39cb404f37ea50f9bea210c100067b580f248f557 SHA512 9a97c81e3e4d9978f63de9206fbe5ec9f48c1eaece44c6e8f402065ecf501f0c25ee0a57d9e919d267e95b2a23e7fda7d16215fe6f18dfc0abead9a3141cea56 WHIRLPOOL bafac45565b44927d10f5e8c319a8dcd863571b08f7af6e09fd82d7ede2798545ecee2b677cf2ca54f5476ed3cf55c4d77d6dbcd1cdaa4ec2e354309caa14cd6
 EBUILD netbeans-php-9999_p20160914.ebuild 4418 SHA256 201ba61bf634cf1b165ea10504c20d5944aee3774fe647cdc4072f184499fc90 SHA512 ec51241f4cff01fe1a788de5f5f801e177e1240e4e4693c1c3b48329520269ae94ab5d6c4f79e01c784a613e15bad2a5ee814f69f68fbd54ea7bb5979b6d0b5b WHIRLPOOL 540e8559b42d14d33530227b8790efff993dc73ea8e1e2e6ff107b567e81002517451d83422e324e6ba32f7a2e034cce754df887b4e807b8f2cf847ec3f6599c
 EBUILD netbeans-php-9999_p20160915.ebuild 4418 SHA256 c3d47bfa48d8a40ba4b56a4c1774ec56daf3f3e754e3cc1c14f21791feab4e69 SHA512 e9b77fc3b4882f27222dcc4653614344003cba987c7b8ccd4a491d636e6bcc6f49d2fe12cbf498daf7f4d962789b2c3aa7c9fd631a8f42c95972cc6d7ab0d087 WHIRLPOOL ae04c3de70bd438b88fe8141156ea698c90b4465ce709cd23cb03880324d83dec496c5b16be18d59b4576bb5132b1cf3750db402a8ad01704793b5583ed3c45f
+EBUILD netbeans-php-9999_p20160916.ebuild 4418 SHA256 5ea660dc7e6fe8685c878fb3f151721a5d95a5bbb22edcf8a081836d5f5bf8b9 SHA512 4ee6fa0a8dd10b93cfc262874eb0928289d089d8b915c72513018a01a206b0c8a5c53efc84a32140afe0c463129d6f823b207a429e8dfb17cc9bca9066908097 WHIRLPOOL 899abafbc5a763dcd94dd4a37458800695c4fe79e888c3c8f240429ea18bd6dcf01f0eb1403c97b8530c930c0a775ee0ebc4b5502871c491fc70f1dbbca7774a
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index 242c070..01646ac 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -57,6 +57,7 @@ DIST netbeans-trunk-nightly-201609120002-src.zip 218010356 SHA256 265ec87ec62f15
 DIST netbeans-trunk-nightly-201609130002-src.zip 218011897 SHA256 40cb0d7c2dba73fa2d3dcddcbc1cf6a1bef06b551cf0a5ff9d6ce9ff12ea007d SHA512 26e5b258261386437534b6b8748a69c7fb7e9332e67584de9723ff7cf9067d20e5cb6d4e86eaf0c611378be0bef9517dd563ca824499efc4f1a89056860ac856 WHIRLPOOL 3b4bd5894c4f65d638a070084267814f00819936c9e4cf7ca758eb04f5500280daf16caa36137700659c10717738d98558b9c5e090c4df82e2d9247308a1f1d3
 DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318bfe333cedd1fbd81a4c6b870e0025f9f4f3ea3d6926bc18cb1c SHA512 81af61f842b23dd51b5610d4c1f9a7113f82e4ceaee2af4a4f4392b56f38b9ec92655c1e413e9b58a808207b308dc68ea8b94c24ef636db8d8ea81275f867470 WHIRLPOOL 8cc8b87bbf8299ab97e24ee64b1d982dfb942cb60a8d8a110b38207807c05b8a7f1c2a2a4d5df52a80c12eaa9ae08440e8f7e333e6a519d83759d2b50c42d015
 DIST netbeans-trunk-nightly-201609150002-src.zip 218016283 SHA256 90b7a4a97f9328512ad9388caab30b88290338dcd87e90d7b20c1568b679a11e SHA512 bc398e865c55547752f8ac05ed2de3c22eff9d5b7c204f28ecd30d1a1d11bda9276454d505d12f5a951d88c40a160a1dad15fc62ab39a6d350d0ba45af4df299 WHIRLPOOL 283749fe3c678341d9489fea580e7af7bec404507be57bd264d4a3673b8b5660a729c5a3f96da2adbeee1fa10fe3205e486c6186f01dcb5fa05f93627bc646de
+DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72fbb6102c07095a61e6cc10066c5fff94a3abfebe2852484e31e SHA512 e41d80df015b84f2faf8811a8fd242f85c72e39867161d236ef0242062568c6fd163bf46a623f4a14779e9d89a49b6a2d88691487a5ec785eece6c7f70459ffa WHIRLPOOL e42fac6f885c4fd1c2bc030cf47aa82ec4e35f66d305e8dd06d6a439ca958074ce57ae761b7ee16e4612dc5f94bedd7fe4655463ab4a7c095e03f41d4fc686f1
 EBUILD netbeans-platform-8.0.2.ebuild 5406 SHA256 98e9861da45ead0d2d975a0527315df5282870b2d7e71a089724d91c18852e81 SHA512 cadbe66132d3ad81f6d149e20731b558c11c529e2ec15b1fe47ff97d99a3f4b4612fa5c98c435c4ff979eaefab6702721db009a03162202c96b4b411cf9f872a WHIRLPOOL 9552948e8bbad308f4379eaae69d8c214da9fbfab87d75226949b69ddca3e68c2d36c4d05738196073e5b959ab0b764064c9186d421198937122aa4bdc4988dc
 EBUILD netbeans-platform-8.1.ebuild 9320 SHA256 4a03fc6a399aaab949edb3df7c629da5bc7ce6288d44dbc848097352c2b4ae3a SHA512 7015cb042dd4e371cdcad49838eb2e4109d1ec505ac618f3a6f98d4dce328ab34be90a3cb0820896bd75337a180a1bd9c91c842a143fdffdf033696d5f496402 WHIRLPOOL 8c5311df396a374bf9d8c994b37c5c9fe6aa3c82a9e9e0824a5caefb0006fd9b44f4fdddd387ee12da48592929d5c4dd7e7fb2d866c9ddaf76acf5b3adbe310e
 EBUILD netbeans-platform-9999_p20160815.ebuild 9520 SHA256 cfa9fb212460bfacbfe3c9dd041ffb825d0f405cb4ed1148c921878218d5dfcb SHA512 6676c8d32a87fc07da0976cb3090783798fd83be1e37e7b7e7558bdb93396fee5a2670e0cae5075595ce34c964d57c0f2a7f8dab336e45fdcd5ce1156ad86a74 WHIRLPOOL 9110ec1cca4735bb0a0a281ce1ecce0fafe533e2dbf801c5edb5e67ef63edb3414e043976416fafcdee7ce645f8cc7061ea4f802cc067d71b7cd26eb22793a3a
@@ -87,4 +88,5 @@ EBUILD netbeans-platform-9999_p20160912.ebuild 9520 SHA256 05b4825e4324788fb087b
 EBUILD netbeans-platform-9999_p20160913.ebuild 9520 SHA256 125a999f2882b2e2e392cc2e5a777204c196778787016644306a4b2451255579 SHA512 bd65c7197f331f34dfe5608d20d08a3613a06fa754384bd3bdec68eb58e16807237840902d8697df0e8b5f6013988c9e27ff891d4f8ec8cfe4414a8f257869ce WHIRLPOOL e5953b92379f645214e9c1d71c7b3dc22b84bbfd7852dfe2a133fc22c7b6de85b99db77f9be87278726ac51b191c4c4745cb76235516c6e04326da6934f9832e
 EBUILD netbeans-platform-9999_p20160914.ebuild 9520 SHA256 6c8459e287602ff8536d9ad3906c19b5a9a4bfc7ba1108d1ccd402ac864d1fd4 SHA512 df17cd2e14344f0ae55587e9e1d587afd44c4f43cdfed74e71d47a3be94a5aaa46bf2cc8fb7f612ff30f14dd6aca29611c3405c26425c1fb0b04161b7fd9d5b4 WHIRLPOOL 335f660b213c973e072f00cf8accc48572781575b81916a2cc1071656c9e36de28049ce7193f16ab459b1760c7955503aa8415ae7cb2178b200d0bd6891b31d0
 EBUILD netbeans-platform-9999_p20160915.ebuild 9520 SHA256 f020a9af2f54e7ae7118262d5beac24ac22ac4154d47e6d808165fbfadad0d84 SHA512 0791323e17d0ad066c7960ee43974201a6c43e3ca4bef60fe681a97c62b71401cc48d3b4d5abf6af3cbb6852fe179771213585a339cccebeb217123c252ff709 WHIRLPOOL 872f42ea603e9add94d2ff885ab5e3ec920b789e5a6bd5d53767e9e6e54d1ebd23d81f48ce62aaa23bd433edc667dd79b0a030e6a692799e57af952835bd2448
+EBUILD netbeans-platform-9999_p20160916.ebuild 9520 SHA256 67113458e022e0e5eaaf86cb03f43b6a98c1dca9bc73ea41654effd1df692af9 SHA512 c940c53846ed31dbe78efdf22993044c4d2232791ca027c6a843c36d1cb1e4eb6f27e59ed6f0fc8414a9ebd987a4732710d408e7f9786201579c2486f0529e61 WHIRLPOOL bb1f2ab9d7b354121f92ea5d65dd71f14882f5518c7fa9c438183a88288f2a35bf8c54c369fd725fc0f768d271026611621736a7c0b803a65417b196ebdf87f6
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 6fca35c..5bac58f 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201609120002-src.zip 218010356 SHA256 265ec87ec62f15
 DIST netbeans-trunk-nightly-201609130002-src.zip 218011897 SHA256 40cb0d7c2dba73fa2d3dcddcbc1cf6a1bef06b551cf0a5ff9d6ce9ff12ea007d SHA512 26e5b258261386437534b6b8748a69c7fb7e9332e67584de9723ff7cf9067d20e5cb6d4e86eaf0c611378be0bef9517dd563ca824499efc4f1a89056860ac856 WHIRLPOOL 3b4bd5894c4f65d638a070084267814f00819936c9e4cf7ca758eb04f5500280daf16caa36137700659c10717738d98558b9c5e090c4df82e2d9247308a1f1d3
 DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318bfe333cedd1fbd81a4c6b870e0025f9f4f3ea3d6926bc18cb1c SHA512 81af61f842b23dd51b5610d4c1f9a7113f82e4ceaee2af4a4f4392b56f38b9ec92655c1e413e9b58a808207b308dc68ea8b94c24ef636db8d8ea81275f867470 WHIRLPOOL 8cc8b87bbf8299ab97e24ee64b1d982dfb942cb60a8d8a110b38207807c05b8a7f1c2a2a4d5df52a80c12eaa9ae08440e8f7e333e6a519d83759d2b50c42d015
 DIST netbeans-trunk-nightly-201609150002-src.zip 218016283 SHA256 90b7a4a97f9328512ad9388caab30b88290338dcd87e90d7b20c1568b679a11e SHA512 bc398e865c55547752f8ac05ed2de3c22eff9d5b7c204f28ecd30d1a1d11bda9276454d505d12f5a951d88c40a160a1dad15fc62ab39a6d350d0ba45af4df299 WHIRLPOOL 283749fe3c678341d9489fea580e7af7bec404507be57bd264d4a3673b8b5660a729c5a3f96da2adbeee1fa10fe3205e486c6186f01dcb5fa05f93627bc646de
+DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72fbb6102c07095a61e6cc10066c5fff94a3abfebe2852484e31e SHA512 e41d80df015b84f2faf8811a8fd242f85c72e39867161d236ef0242062568c6fd163bf46a623f4a14779e9d89a49b6a2d88691487a5ec785eece6c7f70459ffa WHIRLPOOL e42fac6f885c4fd1c2bc030cf47aa82ec4e35f66d305e8dd06d6a439ca958074ce57ae761b7ee16e4612dc5f94bedd7fe4655463ab4a7c095e03f41d4fc686f1
 EBUILD netbeans-profiler-8.0.2.ebuild 3402 SHA256 8021dea620d1bc26214ff0ec285f8061c24693dd28a62a97a48ac3223707e920 SHA512 2660390337a973256b1aac3a02b14e16782c230fa2714ae695213b0cabc0eb60621c6a1ae234f9e57259a19de22a87447f9a89ab846bd59bcedd2be313c35072 WHIRLPOOL 5d1053ded03143b2de05b64cfbe59b515cb786d60bfa65566be795567bfaf5feb88a2f8e7161a05da512fafd523f871778d5ddeb3c6b89fc95885096e379f65d
 EBUILD netbeans-profiler-8.1.ebuild 3426 SHA256 81f8b3b135f021a2dbe7b5ccb53fc7fcf79908ab83ef14ca0e912732b7fb4b53 SHA512 210bc0c5214aa8f79f559cccf69f1ed885dd2d14dc55cd17bd89c8a7f04f1a76de5b414426337b2ba6e99576850f0753f13e41e0f424b3f0adc58001dffc217a WHIRLPOOL 293d12a03294532dc9ce10503b030282cb636f08af6300ea796885eb6a3fe36c9d37c2a07138d03e9c4d45b31352ce160901a96f659f26d50a0fe5caee3bf0fa
 EBUILD netbeans-profiler-9999_p20160815.ebuild 3472 SHA256 ca75cb1092968a126c89027d64cd1d32785fc67d6fa983f7ab12554d8356eef4 SHA512 172d4a51dcec2a8973e4fa772b43d968be01d4a67aa63b04f37ecf238547963db521735b537752a7202e6dbd3b7bd6138eff830948db45efcce941a6f052d4fd WHIRLPOOL 33dc27d4d3b3f7f4a1e5f5d6f17bed8e9796aaf3d1ec5d8cda8e3cb695e2e1741745a895a9cedecb6105870b399ffabe27bd57cb6cd9a99e49f9ca4fb3836ce3
@@ -61,4 +62,5 @@ EBUILD netbeans-profiler-9999_p20160912.ebuild 3472 SHA256 afaec82cc3fb3c93a0eff
 EBUILD netbeans-profiler-9999_p20160913.ebuild 3472 SHA256 97c643a06c987ef2ed569e8d61434acdde1bbbf88a80cc55f9375716aeeb9649 SHA512 dedbd1ee842c51ea78e8e4913aad72f8a1734de25cfbaeb361489adfed5c858c18a1ad1530c3f88e08975a99bc364f5a11dc2427e85f6ae762a9c1cab395eb0d WHIRLPOOL d483986d079e4d2fad871b90120634fc456847e6664a76a56b33b81f6733c1f2846f9a8b69e5c51b36e2ff0d193599b675261d28f816e4bdd5d056572cf49a10
 EBUILD netbeans-profiler-9999_p20160914.ebuild 3472 SHA256 b4d694770d5f8b6bba320afd0fbafc636f04588fe98d5ce9cac21e9726bf7024 SHA512 e79906dc5f50e28e310ae223de8906397a013f6c916591baf1acd29c34c30301ec59e4ca20ae42dba2b5cd59cecf9e1172a69684c267e348d0cd6f27a8f22805 WHIRLPOOL 53bd8aae1068add12e82fc7cf6f03e37861bcb9a6fe6e01840631823cab967dea5bdc0137ef6f81b61a5cf42db233fb77a6d011a7f1c25b685233f1bfb191809
 EBUILD netbeans-profiler-9999_p20160915.ebuild 3472 SHA256 8d0c28e57c5c058ff166b514951be420eb2b43dd40767ef2baf2569b19af84ca SHA512 a55c79f652b3581d302692676146695f53713bd5d4844bbda59aa762c418550d1df1bb2a4b62e80063281dc194c954c982502f25a98cfbb4b56ed3fb0a2fe1a2 WHIRLPOOL 6c1966ee52fb140516f7d66a1728577a370c6cb50e1e87d34b801a52c956da060eb44e4d1cb5acb0acd50a5148af4987062af07edb82f489faba7c606ec5df8a
+EBUILD netbeans-profiler-9999_p20160916.ebuild 3472 SHA256 e3b7337297dcf5bb81ae73e384507646384faa730877e57e633d85ad866ac56c SHA512 42fe76145df9840ec17fdde1799c1fd5ac9ed9d812f73f8351005291a48dad92e4ef97aa43879b45b6db823ddcc767a209a7a9cea487a1563ebbf929f744a3e3 WHIRLPOOL abfba7f92b9000947dac7c244b64878ba42f538c28d4dc0d6c22ac1ee6058f07a5073b6aeb0e0604c5973735bcfeb855a96e2b7f953dfb604c436cb0aa10453c
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index d32b514..0fd3e6b 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -50,6 +50,7 @@ DIST netbeans-trunk-nightly-201609120002-src.zip 218010356 SHA256 265ec87ec62f15
 DIST netbeans-trunk-nightly-201609130002-src.zip 218011897 SHA256 40cb0d7c2dba73fa2d3dcddcbc1cf6a1bef06b551cf0a5ff9d6ce9ff12ea007d SHA512 26e5b258261386437534b6b8748a69c7fb7e9332e67584de9723ff7cf9067d20e5cb6d4e86eaf0c611378be0bef9517dd563ca824499efc4f1a89056860ac856 WHIRLPOOL 3b4bd5894c4f65d638a070084267814f00819936c9e4cf7ca758eb04f5500280daf16caa36137700659c10717738d98558b9c5e090c4df82e2d9247308a1f1d3
 DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318bfe333cedd1fbd81a4c6b870e0025f9f4f3ea3d6926bc18cb1c SHA512 81af61f842b23dd51b5610d4c1f9a7113f82e4ceaee2af4a4f4392b56f38b9ec92655c1e413e9b58a808207b308dc68ea8b94c24ef636db8d8ea81275f867470 WHIRLPOOL 8cc8b87bbf8299ab97e24ee64b1d982dfb942cb60a8d8a110b38207807c05b8a7f1c2a2a4d5df52a80c12eaa9ae08440e8f7e333e6a519d83759d2b50c42d015
 DIST netbeans-trunk-nightly-201609150002-src.zip 218016283 SHA256 90b7a4a97f9328512ad9388caab30b88290338dcd87e90d7b20c1568b679a11e SHA512 bc398e865c55547752f8ac05ed2de3c22eff9d5b7c204f28ecd30d1a1d11bda9276454d505d12f5a951d88c40a160a1dad15fc62ab39a6d350d0ba45af4df299 WHIRLPOOL 283749fe3c678341d9489fea580e7af7bec404507be57bd264d4a3673b8b5660a729c5a3f96da2adbeee1fa10fe3205e486c6186f01dcb5fa05f93627bc646de
+DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72fbb6102c07095a61e6cc10066c5fff94a3abfebe2852484e31e SHA512 e41d80df015b84f2faf8811a8fd242f85c72e39867161d236ef0242062568c6fd163bf46a623f4a14779e9d89a49b6a2d88691487a5ec785eece6c7f70459ffa WHIRLPOOL e42fac6f885c4fd1c2bc030cf47aa82ec4e35f66d305e8dd06d6a439ca958074ce57ae761b7ee16e4612dc5f94bedd7fe4655463ab4a7c095e03f41d4fc686f1
 EBUILD netbeans-webcommon-8.0.2.ebuild 4723 SHA256 e2ba39cb6f22c990acf9a492eac5707f130382d56f9bc1e3636e82cbe4d61938 SHA512 61955d38f829b3ed54bc5cb9a71da07f05676a2bf7219fa8073aeee0f0e2d0e73f7aa6ec1636be39fb071d3d2b9de7ceb813a247a61961874f4cc78697d4e568 WHIRLPOOL 1a272650fc2394716a790b79cb85a9322929c7cc96ea4776cc639fb869c5b536140dbdc632b1a8aa9cb1fc8e740050125c2ebe9390de7a8f4207e88e24924206
 EBUILD netbeans-webcommon-8.1.ebuild 4945 SHA256 55c57b638481134d659763154a7820467a9866707112cba0e60dbd9ba8cd2840 SHA512 a98987535f60b533bf0df701f83693a58584dfa9a10d5c8646186165d884fb7e8a3348ec77cbf25d1a8cc8cfd947bf54cdb30d251ae1a3fffb74947070d76579 WHIRLPOOL 36fe1b7b9b34a02fcda227aaeebed8a33562e6fe4a014c78e9a464d709bf5120322a35bd54a0ffa15c4dd4f3ae605cf6fc2d35c5652f7162ae646c61ad69210a
 EBUILD netbeans-webcommon-9999_p20160815.ebuild 6242 SHA256 e6d0cf000ce88ad6d3340d553bcc656c1232ccc1830bd6a7e6dd6b84d322f3ed SHA512 ac8c15dcdd6af9838e2b69ec56cc0c4bbb1b22e1495da293b8e2ed617fb14c19323ff253964a9cf8cb7cf4b8bed3d096e003afa967bb21d713c10207fb27af34 WHIRLPOOL 85481d42c0527341b79351900fc5cf1b0095f120f2555ac8f41085a624debede5c2b05ec714bfb1d984e1dc635b3aff32715657b963b3fa3a94a8bd66b151ada
@@ -80,4 +81,5 @@ EBUILD netbeans-webcommon-9999_p20160912.ebuild 6242 SHA256 98c075489a2294f4b89b
 EBUILD netbeans-webcommon-9999_p20160913.ebuild 6242 SHA256 96dfdfb397df0355f2d7702ddc6962954a0c2459915de8d43cae65e535f6569c SHA512 b6137451a1d52c854b464e9d81f230cb41167089381090d203f0665b81015beaabdfe16a368c355832afda8a86e0b3da089800f0baf9a741045674ad46b5c25d WHIRLPOOL ebc6d519b0020a8bb677b3277fc6fc46ea2672f566f34c1e24c1e9e46f03ceff9deef086475086b56ac728f3a4a30be5855342531914ec945548aea724b783cb
 EBUILD netbeans-webcommon-9999_p20160914.ebuild 6242 SHA256 df8cddb3912ba6bf004b9d2e34182bfa4461f11b94d4f1b6066d4db7c18ad2d4 SHA512 df677e2ea55c9007c2f9bf88f0f6ddba4785c1d4eaecf8f990dd6c852802450520fe846cfdb2aa089e79e5fc9eb5f6488704ba9d90593613902a0c77db1080e2 WHIRLPOOL aea45a833664c72b9d4efac5641eaa89a9e6fc97923189360c888f75fe3088328ceb77be7ee1b0ffa53baf7273643b90eebc4f26fb201f7514617c7e5e21b62f
 EBUILD netbeans-webcommon-9999_p20160915.ebuild 6242 SHA256 01eebd9963d6c7ac3c165ac5eb7183b49e04add149809504fbf585d844802aac SHA512 7d29c4baeb96f3ad615aae2f9496ed8f346c8740c1a63c0d3f4eb70e67ef84d284ba461f60b3f28179263672aee8f7b51d15c6ebefbfc341a0f695dfbb8bda33 WHIRLPOOL 362fc6b4c4901096a65abed0e3cf11cd49efa4d46e5644640437e3a9ae3a770311c6c66caef999a68b1a043e889d42981ed8f27cb2937864137e9d8ed4262294
+EBUILD netbeans-webcommon-9999_p20160916.ebuild 6242 SHA256 d173be339ab585e07fa62d608ac15be18b203f0a25851d22b080271ba869ca19 SHA512 eb3675bf3489ffab2bcb198db6ced46b8a854d04c76b4d83d073d48206b9ba460b66e56518a1ef266ce836849eda5baf2bf493900e36b0bb4e96d9635a5c9176 WHIRLPOOL 83341d648612efc872de8b311e443c54cc447ca0eaa4d94910ab8c9e2814a48942c697d0fa303c9c5d1907b0a9d3a098b5c33858b25190f877549931599a7c8a
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160916.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160916.ebuild
new file mode 100644
index 0000000..1b2dd28
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160916.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-09-16_00-02-33/zip/netbeans-trunk-nightly-201609160002-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
+	${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
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.jna/external jna jna.jar jna-4.2.2.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/webcommon >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+	grep -E "/webcommon$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/webcommon
+}

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 9d8e982..666e4de 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201609120002-src.zip 218010356 SHA256 265ec87ec62f15
 DIST netbeans-trunk-nightly-201609130002-src.zip 218011897 SHA256 40cb0d7c2dba73fa2d3dcddcbc1cf6a1bef06b551cf0a5ff9d6ce9ff12ea007d SHA512 26e5b258261386437534b6b8748a69c7fb7e9332e67584de9723ff7cf9067d20e5cb6d4e86eaf0c611378be0bef9517dd563ca824499efc4f1a89056860ac856 WHIRLPOOL 3b4bd5894c4f65d638a070084267814f00819936c9e4cf7ca758eb04f5500280daf16caa36137700659c10717738d98558b9c5e090c4df82e2d9247308a1f1d3
 DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318bfe333cedd1fbd81a4c6b870e0025f9f4f3ea3d6926bc18cb1c SHA512 81af61f842b23dd51b5610d4c1f9a7113f82e4ceaee2af4a4f4392b56f38b9ec92655c1e413e9b58a808207b308dc68ea8b94c24ef636db8d8ea81275f867470 WHIRLPOOL 8cc8b87bbf8299ab97e24ee64b1d982dfb942cb60a8d8a110b38207807c05b8a7f1c2a2a4d5df52a80c12eaa9ae08440e8f7e333e6a519d83759d2b50c42d015
 DIST netbeans-trunk-nightly-201609150002-src.zip 218016283 SHA256 90b7a4a97f9328512ad9388caab30b88290338dcd87e90d7b20c1568b679a11e SHA512 bc398e865c55547752f8ac05ed2de3c22eff9d5b7c204f28ecd30d1a1d11bda9276454d505d12f5a951d88c40a160a1dad15fc62ab39a6d350d0ba45af4df299 WHIRLPOOL 283749fe3c678341d9489fea580e7af7bec404507be57bd264d4a3673b8b5660a729c5a3f96da2adbeee1fa10fe3205e486c6186f01dcb5fa05f93627bc646de
+DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72fbb6102c07095a61e6cc10066c5fff94a3abfebe2852484e31e SHA512 e41d80df015b84f2faf8811a8fd242f85c72e39867161d236ef0242062568c6fd163bf46a623f4a14779e9d89a49b6a2d88691487a5ec785eece6c7f70459ffa WHIRLPOOL e42fac6f885c4fd1c2bc030cf47aa82ec4e35f66d305e8dd06d6a439ca958074ce57ae761b7ee16e4612dc5f94bedd7fe4655463ab4a7c095e03f41d4fc686f1
 EBUILD netbeans-websvccommon-8.0.2.ebuild 2651 SHA256 a195b307847c466dbb5f46eb04240358ce3c92cadeecb8fda1562304de46820f SHA512 933626bd2073f58e3508180c042e237b9e61ba6f3c992cf37ea43978ac2fc972d2dcc3ef0b5c390b3867296e197ed2605c43452c98e36acf0982e7338b6d1eb7 WHIRLPOOL c3db8f0b50116d0129f50778e1961166e76601d8c165e20e73d75c91b02c8a095067e0f13e18178d849dd29adcedaeee7d3e0e62f99be592d7ce159fd6af632e
 EBUILD netbeans-websvccommon-8.1.ebuild 2675 SHA256 c9ff3d598c5f76c2b69dd5488a80c63025acc3cd0cc99321a0e84a493502df36 SHA512 89daec44b860aa8011d9e5533230f89dad7bcc50a119664122d2718db3e53501d1319ae4b27eac1d71596671e9a7c21315a641346e6cbab22edb3c7232bf5ce3 WHIRLPOOL 521521094b396c98687e2054742e4c019023045f19b01a6cc3a5f826f4cabe9448254db8b834448f3b33368c76dd667942554e1bae459c55de2c571bb5cfb4f5
 EBUILD netbeans-websvccommon-9999_p20160815.ebuild 2721 SHA256 3e7f9ca2bc7cf2c3c35f3b89fa2889b77efd9213f5291293b4bd7df85d062d7b SHA512 8c405b61832551bb73ad21d2c3768077002dccee8cd8fb1bff7e8f2a1d9c7a92abe7db9941b3e4eab112b97119cf1d18ba07cbce924f3917ec4353c61d53878d WHIRLPOOL 9781c597f3cc4336e41f1e4becc8b76290c9633c17c90c8a68bc965ce6e7d5bb51215a38773d3a48ec7c7f10f0908ed3a5a316f99ee2cde17dad70cbf2de6701
@@ -61,4 +62,5 @@ EBUILD netbeans-websvccommon-9999_p20160912.ebuild 2721 SHA256 64e370535db4e85ed
 EBUILD netbeans-websvccommon-9999_p20160913.ebuild 2721 SHA256 e2e40ab0364838c83e0a7f2bd9ed8fdfc157d92b074749aa3b9a85ca5c2eac53 SHA512 47cee26bebe06e54b57813d7f564d46b85e4ca582a6196b533d85938b3ac79ec6c62c0465718481e03eb191f8b30813cb2bf23b9b8a1541d8f6fcfdd8ca20f2f WHIRLPOOL b9ec7ee6f1678bcb0fd838c9f83155d86de86ed388b43fbaadb98b21d9cfaca0c5c5965e0d1f59963fb36525c60f3bd1951d68fb8a9820c6c78f811a496bb12c
 EBUILD netbeans-websvccommon-9999_p20160914.ebuild 2721 SHA256 820f0bd55b811671183f23af23413c4389de2ee74fa42183bdb58f9fb22f592c SHA512 540efb377593f832cacde82571a2cff1013f793e9a6806a9b5dbd7196ba19ae21a9df036127bac3de4a18ce5ae1102afbf76edc407576e709d6e372edcc0f3ed WHIRLPOOL 13af5110b70ab8e2e7c6c3b70199f46b1293ecdcd3e69d6ae46e4dc1a6bd93385ba7d1d107295efce9ebea005e72e57e038e08f295ae6fdeff5ccabc50e59f45
 EBUILD netbeans-websvccommon-9999_p20160915.ebuild 2721 SHA256 c4ca2158f326add4df2eebf8df33980c710e5b0f1a6c85c14a4d43a3bb6fe5b2 SHA512 0a76c936326075ecc90ef87321450632a155e7974ca3fa47312720e219cf2fbf26754b305f75cf7a573566bcae6a0a5c22f4532a33043e62ef39241f681bb61a WHIRLPOOL b8acc5587c88580150d8623f9b5b08cdb6c8067ccd15cd22e480a9353a340a663d636a081c80827f100870cef3cab52862212e84719b3cf2e5c50df122da845e
+EBUILD netbeans-websvccommon-9999_p20160916.ebuild 2721 SHA256 6f9e3fc28118bc6faeddeda2eb076399ec1c3b57ae564517c667bb510fc487f1 SHA512 ef6b57534ebe4a9428369b8b9f2f1defc6e1698028ab013b671ddb9a44fc429cec6dff645f2f109b68e82bae222ac735904ab7be358a648b839f3c416a8b01d1 WHIRLPOOL 254a4401de9bacf6f821f25625769b5f95e948f6f412fb662b4299eebc0456f55c71352e5cce12be2da24dac2f82f6b5753d542e143a182d03c3cc71947af853
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 42873ed..59fd37c 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201609120002-src.zip 218010356 SHA256 265ec87ec62f15
 DIST netbeans-trunk-nightly-201609130002-src.zip 218011897 SHA256 40cb0d7c2dba73fa2d3dcddcbc1cf6a1bef06b551cf0a5ff9d6ce9ff12ea007d SHA512 26e5b258261386437534b6b8748a69c7fb7e9332e67584de9723ff7cf9067d20e5cb6d4e86eaf0c611378be0bef9517dd563ca824499efc4f1a89056860ac856 WHIRLPOOL 3b4bd5894c4f65d638a070084267814f00819936c9e4cf7ca758eb04f5500280daf16caa36137700659c10717738d98558b9c5e090c4df82e2d9247308a1f1d3
 DIST netbeans-trunk-nightly-201609140002-src.zip 218011801 SHA256 27520da323318bfe333cedd1fbd81a4c6b870e0025f9f4f3ea3d6926bc18cb1c SHA512 81af61f842b23dd51b5610d4c1f9a7113f82e4ceaee2af4a4f4392b56f38b9ec92655c1e413e9b58a808207b308dc68ea8b94c24ef636db8d8ea81275f867470 WHIRLPOOL 8cc8b87bbf8299ab97e24ee64b1d982dfb942cb60a8d8a110b38207807c05b8a7f1c2a2a4d5df52a80c12eaa9ae08440e8f7e333e6a519d83759d2b50c42d015
 DIST netbeans-trunk-nightly-201609150002-src.zip 218016283 SHA256 90b7a4a97f9328512ad9388caab30b88290338dcd87e90d7b20c1568b679a11e SHA512 bc398e865c55547752f8ac05ed2de3c22eff9d5b7c204f28ecd30d1a1d11bda9276454d505d12f5a951d88c40a160a1dad15fc62ab39a6d350d0ba45af4df299 WHIRLPOOL 283749fe3c678341d9489fea580e7af7bec404507be57bd264d4a3673b8b5660a729c5a3f96da2adbeee1fa10fe3205e486c6186f01dcb5fa05f93627bc646de
+DIST netbeans-trunk-nightly-201609160002-src.zip 218003184 SHA256 8dc0967840b72fbb6102c07095a61e6cc10066c5fff94a3abfebe2852484e31e SHA512 e41d80df015b84f2faf8811a8fd242f85c72e39867161d236ef0242062568c6fd163bf46a623f4a14779e9d89a49b6a2d88691487a5ec785eece6c7f70459ffa WHIRLPOOL e42fac6f885c4fd1c2bc030cf47aa82ec4e35f66d305e8dd06d6a439ca958074ce57ae761b7ee16e4612dc5f94bedd7fe4655463ab4a7c095e03f41d4fc686f1
 EBUILD netbeans-8.0.2.ebuild 7167 SHA256 80e31382a0ceb680c2a055dc5c78c1dce8edf32c50bbae6a1c14a2c568492519 SHA512 0ab466ca247ec953896ef0ab3b01b43ffea3a9f37e9bcdacecfc0476226d45cef35e4ddf27f2b85628d9512ed304e6cc6cfe963a5e547217d08cad400eefc4b9 WHIRLPOOL d09668e669f4f8d7987ab02cf26104fc6e54ba29b8b497fe0013cc8816a2d7560c99e6e1b02db77ead872d5240b84c09e3fabbc3465587d1d1ca7d6fcae114c1
 EBUILD netbeans-8.1.ebuild 6891 SHA256 22a19f05bdcea85475c0451df867367b69363bfbc6280f78b087248d9f8e9513 SHA512 812b6cdae3e5feaf37db5ca8b5efa1b374d5492f11cfa1df2adbd3617986cdca6a79d2d4dffd024c8c48492fc8a21704190242f5741c5699b12070620cea2c87 WHIRLPOOL baf5f750574c01effa0d02c72194139fb2757be932054f4900ceb0534607064af10f2b5b38063ff2cca34e75ab5be23d00c7e5d90d1c724339666d20f1bb10d3
 EBUILD netbeans-9999_p20160815.ebuild 6939 SHA256 833d7d07b0341cd9594291fb2a60485db106d05d932d5c7d380821e68f513850 SHA512 8cf5cb63d0fb4d92819666c45d7dda3eed768487592490299d3a0c5ebb570bf4b5cff5e31f447e5889544f4e101352daf9a01cc7f2d81f608fdd97aae7f06ab5 WHIRLPOOL 6dea2ce229f703ed5703d60254c2dd581f88b74813ad595627d34cc4958a37f7b4023e6ac97211d1fe1bb978a9a52eb3b34f12ee1f1c667eed4ecbbd4e77e623
@@ -64,4 +65,5 @@ EBUILD netbeans-9999_p20160912.ebuild 6939 SHA256 47f774a735de114b080a8111a9e844
 EBUILD netbeans-9999_p20160913.ebuild 6939 SHA256 f3fe079db17f7e2242fa2453e6069aebcd9535465bdc497aec4adaa3fde45ace SHA512 4a84287411511a55b14a21e130f64a2fcc86865aa6ecea57af280f5685a1dbfac266af882715e738f0cb10fb7a50c77550841e0f104960e02692277ad13b9f50 WHIRLPOOL 566bebc8ad23318d7c41f337fa2af22d5ab2051007d1402775b30818196873efe9c70489ca89521d3269fee7fe943831bd708c563dbc140f693cce168dccfc07
 EBUILD netbeans-9999_p20160914.ebuild 6939 SHA256 d4d81599df1c37a73c58788d302714e1ada867675ac8478c5f07172b0116e06e SHA512 ee4a6b30f5f3dcbe713743273279c125e593d5d18dde094dde72cbd4e7c620d6f80ecfec0804336c2e3c884e1cf9e038e54515612b5142edbd511a53095186de WHIRLPOOL c9512e44433bb03e75a76319a15a3e7783b5d1671bb640933b7dfd17000711d3e54162dbaf3be17096993b08d1c78b7c1a0bf2750ce4d9605b32a5fa823a3621
 EBUILD netbeans-9999_p20160915.ebuild 6939 SHA256 dd35f8be80fbc793c34d666be6604059577c25835bbe070b7da64f156d251250 SHA512 ebae8c4b55ea65ad9086561cf883c8202c2f978502e243c6da7c64f5aa895944fc5a33414ac8462d1aea73b43ec37c669fda9c38506ce99ad216a8c855144f1d WHIRLPOOL bd80c0fd2a720fc17b5a66305833351d581b352526d32755e5f39cee03fadbf50df77e03326537ea17e1d7b3b99cd579f8084f0f1eecf0ad58fbce4c97f40c80
+EBUILD netbeans-9999_p20160916.ebuild 6939 SHA256 7c49048223ccbb191d0f5417e2e46d85040040f8b055ca54fb1f88549f1e145e SHA512 d9e60419a9e13c746bde4c55ef9b2f7ffed3d302b47872bf7191a17c28a406ae20cc191ddcedf5211f50f2ce4de8e767968e50e245ca0db79ba2346155b0e574 WHIRLPOOL 76d194f1af6a2cd47233742d35dea2257ec25832cf9a35d52d7eb333fc6857fc3547fd79603e53326167776933c8b94e5e33a1eedf16b444a6ba93a586dc60e6
 MISC metadata.xml 329 SHA256 8aeaf2a0228f15c2e4140f401b30f083509bd99d0a578873069f3595cd8555f3 SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640 WHIRLPOOL 799a9b79b1b447bda9631f67e2dfaf722376740e1d2037796528a05f9745eeed00d9990a74a65ce09f74bc5e1d60a887abde540c3c62487d7dd49b8377c15834

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


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

only message in thread, other threads:[~2016-09-16  9:21 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-16  9:21 [gentoo-commits] dev/fordfrog:master commit in: dev-util/netbeans/, dev-java/netbeans-harness/, dev-java/netbeans-extide/, Miroslav Šulc

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