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

[Miroslav Šulc]

commit:     b2bc34987547c42cd5645f3e37a0effb9e8188e4
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  4 07:12:26 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Sep  4 07:12:26 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=b2bc3498

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.3.0

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 29f46d2..b8ffe65 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
 DIST netbeans-trunk-nightly-201609020002-src.zip 217296178 SHA256 6632afeb1d3fb3cf91648945d03703b474ac9ee5d6855f6a4732bd6c711c1d9b SHA512 bb9f63963e2895c46a0869fd48e401c5d14325e63cea951ddc6385f88dd6fef8385783432f094315d521fcf8795f28997a13fea249e957949f1cc021827152b7 WHIRLPOOL 64aeace6080e9fdfef49484fbf32665a1dee2bd0c597dcbe0d22e5aaf486d45e7f1919cb826b0273dfca780b80d9e19de616b638ac775190b1493a262c269d81
 DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0ecac361b9c3fde36c0680843b36b13edee0c77c82ce82de1fcb SHA512 4da03b4ec722bd3ce3453e1e9e9753f1d7ecf48bb15b3550270eff8748e74765c1dfe3af9e5eef7fec036d352d513797b0619042d76537b8670b55e29f52340f WHIRLPOOL 8d036a278c24075565fdaa6791f04a2cd413f5370c77688a225dd618bfa14c4a8926639b9077c5526084edfdf35de9aac4126fa62af633306e4e15b4985d0065
+DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 3384 SHA256 f0e45793d8d2a56949aff7f0239c9f63dcedec497450d521037281b52c699ee4 SHA512 ef21d03f27c1df2f86d7d8fd2bc08d4e98d13daa6f14d4ddff305c608901b810612d83247c737a2bd7b961c63d9c803801c29f2db67b7537a9b34cc1bebb4013 WHIRLPOOL 501c684661f3b3aea7935b3435d79566fbcab25b2320ab85e9221ce8bee620f5afc04b000de1ed0a465981f1514418e79523be9c7e807257ddc8a162e426dced
@@ -53,4 +54,5 @@ EBUILD netbeans-apisupport-9999_p20160829.ebuild 3384 SHA256 6945ea971f3d7a987f0
 EBUILD netbeans-apisupport-9999_p20160901.ebuild 3384 SHA256 510bf247897091f2ad67b95928d5a23f8288a94f876cd96fa4ffb0526aac2ef5 SHA512 67f635482ff8cdcabe3e5e2f41f6ff3f4222de79ef4cc9dae6603ee4ae047728350baaaa35c056ef7de960178c9f73cbcebe377fff5a5afc8feaefb27b4cda53 WHIRLPOOL f3b2c08334b0a0c0c0d1653ee3f62a4de7093c81d54c77d1ccb47c992b9f9664542da94007fbd2210aa32f0f1656f577b1359b64985786ce72add2268700b3bb
 EBUILD netbeans-apisupport-9999_p20160902.ebuild 3384 SHA256 ea015bfc03cd3451c658cb88cf408524edf5f2370f5b703c1085b0ad078b3b0e SHA512 31030438909a57054a5a368ddf8618da0ca6fdc31cc21ced82498c97acfc762968e018fb8de1433e9d954ece83741ef8ed17570b3cb5199e8ff06116fd5784e2 WHIRLPOOL cdcb4ecded324d70590998d2bed8ea62219692079b55081331424621d3cb5a44d1052cf7cf75f905f0197612828bebd8d084cd15b38faf7ec57e68377767e3c8
 EBUILD netbeans-apisupport-9999_p20160903.ebuild 3384 SHA256 e8c8f4daa3ddd7732589c198bc58f5282d00d79e28807f66df664656d1ade517 SHA512 83e97b6ce7a61f33d590dcae7d1155f1c46e435a7a236c4c072c8e81e14247e65abe3e6f3ebec50c6bf4656f7fae8b6f1d49fdca3271278f0416b53aa6d6f4e0 WHIRLPOOL c3845c95696added615ad78ad19b40d8db5c5cf2a44fb158aea79f50050dfff2a5c0f3197f19cbbd60469b52381405d26d7e0a4bcf4885707b19fbfcda60e379
+EBUILD netbeans-apisupport-9999_p20160904.ebuild 3384 SHA256 16b8a6404d905a2f737494832645bcdf76498f0d5c9f43b8f6774a691be8de10 SHA512 84b187c7521843e4f3f3a0340e0e7c880e8ad5bc1b7ef0dfeb44700d9be19112d28c2d1c1f9c482bd33f182dd2c3aef245cf77814efca00269809a89952bbad8 WHIRLPOOL 99f9b4c9afb1b82c9cf98330b19fc55d0d00d1d658ccdf51e7b628abc00d90f6d7ab53cb9d8dcd43a24eb26307d4961f0efc07622687cc6353527d15a93f891d
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160904.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160904.ebuild
new file mode 100644
index 0000000..30ad011
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160904.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-04_00-02-33/zip/netbeans-trunk-nightly-201609040002-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 cadec67..516b169 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -4,6 +4,7 @@ DIST 371AD978F940F80738D147BA611D646BF82538A5-clank_0.3.6.zip 11434036 SHA256 e9
 DIST 43A82EB3CE61B9B0B1C60586C7D84729BD5BE3E0-cnd-build-trace-1.0.zip 38904 SHA256 d97735f723292f9fe534d0821841370ee3a14a577c3fc959078ae865c16201d4 SHA512 ae3b1865e32403c09354fe9bda5092f88bdfc9bf36c18f21dbf4cccbbb2874881aee3cadea039860a3ddc5770b9ba95201faeb13ebcdfe5a403fee12e8935852 WHIRLPOOL 8a5f7ff0b4b94054a0fcd7366d37f6cc34f3c5e90d94172447993b9bc06753e13d57fbb2d2c14fe2a4ca5b15285b5165fc7f66b6012710669878cea67c6463e8
 DIST 4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar 164365 SHA256 8633aa79a2566f51a089195e09a4581af3ee71bfc13eb234af5e0cf6383078b4 SHA512 f1300e2d1e47659f6113a0a3dcc953766b5a8ab32f13bedf4d6ac652ffcf828c17474d47edec08d7ad9039d7abb8570770b48fa53b8ff6b47a028836490777bc WHIRLPOOL 765c87803d9cf622ae7936cb922ad9bff8823a09baf01a6c8b4a81df8ba5fd7cd17b513b36da9910b75349de45185f4641680f35be8335e08b9c30283b6d3345
 DIST 5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar 2388361 SHA256 9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7 SHA512 04be4dfba3a21f3ab9d9e439a64958bd8e844a9f151b798383bd9e0dd6ebc416783ae7cb1d1dbb27fb7288ab9756b13b8338cdb8ceb41a10949c852ad45ab1f2 WHIRLPOOL 488b7b9af1d1d06cca163d43e7be190730e2f0421796c21a26ace11196ee37a16b1bdeea78a1e2e64f8ca0e87f67a2aecd066af21505f3dd92dd76de40a94fa0
+DIST 5E0E2BDEFE842E63FE33F0AE4E877426CBBF306B-clank_0.3.6.zip 10988320 SHA256 7cc09c58251da83b29f70dc0601a561c8278e12b33dc741c3cad7e5b1e74bf3a SHA512 6712aebe0037f0fc96ded9ae948ca63c06de7a2c23e4c60eaaad78ff71fa89e9a70f374d94cdec08a7915df0f7e8b7ea2fbfb0aa71a1feac96d36e65284ced90 WHIRLPOOL da464c2e4063fead2465da36e5248606cda13ccbc562526044c1aae3806107b78be2688b8277c0c49b036c19e04981e213a5de2ca5b13b17c27a5e8368bcd2e6
 DIST 99529DC0E1426A102A98EF5494B6F6AA6E497F62-clank_0.3.6.zip 7930942 SHA256 ad9a64303fc4db833d2789a7d5b0be537ea7db55090189411e5778efff54a8a6 SHA512 46d91f0cbe86af186b87e6b972ecc9391f5b2a670eaf7238b60bb5399c0da40382c729338d1e2cf8ab94eb4ac64bfe9253da1cfad2ec900a87d56df4d299d707 WHIRLPOOL 52ab6b35eaa04d0e375bc4aaad43c4390021309da1956e81db6ba4fc8730da147f35eeceb8a02fa7e42e315296e8be3eb03d88d7d8987fdce30ec433ac5c407b
 DIST A22324F86EB1673E0D54D0FFF5C8047FAED4A2BA-clank_0.3.6.zip 11611624 SHA256 9aa63cf1ae6ba132858ca3f529ca8481e35efc7cb5b9b5177440ef13ccd31122 SHA512 cdf15d8a1df6c3df4f536fc962ec4a4dd6439fd4cfe5d68bf1cacf53378711454ba76c9398cbc3563f84e7be344de0715041cbf6d6e7c0e76523871ddafa4c02 WHIRLPOOL 53b2135b1b2203a8c568994efd8e2f95136833732e4799bef25077f5d73ad4c4f84b28abc17e39db7807de0484654caeb1004c5ec021bd654ffe9de45a64bc61
 DIST BB83D4F8047D608858154CB041054F5CAE35B903-cnd-rfs-1.0.zip 177647 SHA256 c92c3d3311b8f75883f4f9280fe8d6932b154c67c9dd1bd65a49beb45e578cd1 SHA512 c42e4f0c1b7efb24a45dc375180bfc8b0e02e74e01233665d3e74bf83a182c2b0bbe8b572a8eeb993d77312f6d118777d0576adfca4ea8f4c2cfe08892155345 WHIRLPOOL 41b573c7ca4b926333f28a9329a2423955055ff716e7be03b7a6f4714e7261e57574b16a0e89b96ae744dc0a36f9a4a72f8d948b11a6b8052159d42cbd40876a
@@ -39,6 +40,7 @@ DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
 DIST netbeans-trunk-nightly-201609020002-src.zip 217296178 SHA256 6632afeb1d3fb3cf91648945d03703b474ac9ee5d6855f6a4732bd6c711c1d9b SHA512 bb9f63963e2895c46a0869fd48e401c5d14325e63cea951ddc6385f88dd6fef8385783432f094315d521fcf8795f28997a13fea249e957949f1cc021827152b7 WHIRLPOOL 64aeace6080e9fdfef49484fbf32665a1dee2bd0c597dcbe0d22e5aaf486d45e7f1919cb826b0273dfca780b80d9e19de616b638ac775190b1493a262c269d81
 DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0ecac361b9c3fde36c0680843b36b13edee0c77c82ce82de1fcb SHA512 4da03b4ec722bd3ce3453e1e9e9753f1d7ecf48bb15b3550270eff8748e74765c1dfe3af9e5eef7fec036d352d513797b0619042d76537b8670b55e29f52340f WHIRLPOOL 8d036a278c24075565fdaa6791f04a2cd413f5370c77688a225dd618bfa14c4a8926639b9077c5526084edfdf35de9aac4126fa62af633306e4e15b4985d0065
+DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 4790 SHA256 3f49046069953d4fb2f708fe39dd5e779d94084591413fc1e14adfb1b41ae8f8 SHA512 31a7baefa4beab6f131652c482160bb97d5fe24e1ac5da2caa5d6ac665ce32a2047d140143d8f4e1a2ebf8ecd85958ad8b1057ae2aefcfc7c42aa0f10cb40430 WHIRLPOOL 1fd17c62a11782e5937093b01b327883e7ded5ae4d6e5d8df562dd1a98f69501d0ea4650da53dfdf171719aff53fb95ca84b2295f0b56fc53ad746f104097d1d
@@ -65,4 +67,5 @@ EBUILD netbeans-cnd-9999_p20160829.ebuild 4790 SHA256 f7746423ecd033715e809822b1
 EBUILD netbeans-cnd-9999_p20160901.ebuild 4790 SHA256 10294fbb52396e0c50d7fa3e91583141798e0193b4ddf2e3a4b888ddb3bfed3e SHA512 bc12f02584a4f4cdb9d9b134f7c0b6233b714134316149555349afca3c7f14532321029175c6c185ff997a69f17eab40b794489c4c5b2fba2189b9006ebfeed6 WHIRLPOOL e1f4d41c146f3663a612dcfea0e2d325240bf86f7928ae994d9fdf5e73972c2802eaa0fdb4b7c4fa4d0d98a7c391218716158f4cb6cedcaad8e11bd42960995e
 EBUILD netbeans-cnd-9999_p20160902.ebuild 4790 SHA256 7508ad02d49f67929fccbf31f15a1bc0f711edacdec9d5f9597575c62edd18d3 SHA512 60b61a8874f34349594cbcd8542596de1127703d1e993918042195c5253c954d346e77eff211fa1e7ea8ba78a9ffb5362c678df4c8851b60ec6c96f7a0149df4 WHIRLPOOL c5badf22cf9c37f48b20b3cea2b2b66bca90dcec5771f1ea625ddffddbeaffde6c7fdaa6b0b4e977860d2f3492667040885e36c24fd19a118a11fe11b18ac18f
 EBUILD netbeans-cnd-9999_p20160903.ebuild 4790 SHA256 cab4797f73f63341309b8131384c49088410d2700f2299802745f4187b65d55d SHA512 4d82487340faf575203d41901f438825357c08c7de4e847a0e3af23dd7d98f93b37cad15bc248b3a227cd1bdee86af90812706c86e40766673c8311e478d1688 WHIRLPOOL af97ecd2c765f4f29aedc334f16ce47b3e2c66493b385a52f82afdaafb3afa19e87a554ba5b8c24957c7b7d76c772504d185d85882d6ca155285f44b80444b74
+EBUILD netbeans-cnd-9999_p20160904.ebuild 4790 SHA256 101ef2bfda8e2f6e447157190d188fd58c47ac54e7b519e0a55a31c065d4d3e0 SHA512 81aa4b3040721c0395886f14ab1c451dc2b37f4b543943a66c58278e5c3652622dc97a977247f0b1b509c663799caca89738ebba21a811f2de841690f34393a9 WHIRLPOOL 1eb2b91f3bab71b743d3fc52fd530a90d8153cfbdde32905a733f0be7f9e42a0c17c228acb00681ed694528374ec2f975ca53df1fb83ad3acb68ee1d58d101cc
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160904.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160904.ebuild
new file mode 100644
index 0000000..51e4552
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160904.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-04_00-02-33/zip/netbeans-trunk-nightly-201609040002-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/5E0E2BDEFE842E63FE33F0AE4E877426CBBF306B-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}"/5E0E2BDEFE842E63FE33F0AE4E877426CBBF306B-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 0f9009b..42fc92f 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -1,6 +1,7 @@
 DIST 0F89C62CA701D20BA9A9A526D4D017888C3B5A65-fs_server-1.0.zip 469579 SHA256 2673ebd340ac69ad5dfed6f63376394cab2cfb094f249552092c0bb46e093367 SHA512 0a73753c62b44b5f1af14d9e25086fd3420129b4ce31bab0c3786a91ac180af23dbe93e13ed3368e968076933a9a4e5d242ac7a911a7b39da3f3e4da40876b2c WHIRLPOOL bc74461dac822bfbc947b9ea3cb8e4183f026954d9f82d7b38feb8bd24c5302784d567373871a72d4177f6e9ec84018624e9069c9b49105eae848e1eb2eb5375
 DIST 457A4C66AE33D1D5887BB1F359EEA41A10EBB2AB-fs_server-1.0.zip 283369 SHA256 2da5ca58d9960bb19f3b573709c0f73a408cbd94a19e89abfcc261b85decf9d2 SHA512 60a742dad5967c2eb5350d62cfc39925a4413fc4dc904ebdf1e6a04849a4f659dc75ff6166189957854d1241badc0bc0925aa868509d96495f41f4d91565a545 WHIRLPOOL 27e8e1219ee65f87b4cf0a24ac9955bbf65e33d4cd2315bfc9c157b170b6b9eba1d703a72a4a1a2ae05462b6c8c99b82b1e908362d65bfc36685e2c1ccb75b5f
 DIST 51AC4960C19CF4C2CCA636765BFBC09A5029BFC5-fs_server-1.0.zip 453773 SHA256 9b339678aac261dd2353a4938be897eebff43c34a532263cc0c827743cd4c1b9 SHA512 ea965ed488fabe8bcb93e4b95d3c7e6f546cd8a30ec57b0268645e8270097308be9eaabeb524c4401baa78922d6a782021b46042bd44236e19ae8c94ae2e3a02 WHIRLPOOL 9044f2eb2cca1205266b065f6bf086140a33acc33b833b9e367b5f888952fa786a58bb29cf0947a863caf3c00b60fe418b8a248a06064197703d230c2374b358
+DIST C9EE1ACA53AA71183590274D658ABD0A6AD6B2BE-fs_server-1.0.zip 474895 SHA256 1fe42f73ce252cac72f7b73f381390398b7c86ea904ae12750e73dd9f4ad9923 SHA512 2d870d280eeab161c941a63a3b9fd43237ed83e4bfdd9076195685d6e7f7c1c72472e2b16141498e5ce18e0df4ca5924e9986cfc774ada2d703461f6e2226ca7 WHIRLPOOL ad0727596b8efe9b9e702fd2a2373529a2c350745681a2a237a8293ccda5592aa2366bd83504a83ba24407493d115b6f13b73ef231a68b94c11a4ff097e227a6
 DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
 DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
@@ -30,6 +31,7 @@ DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
 DIST netbeans-trunk-nightly-201609020002-src.zip 217296178 SHA256 6632afeb1d3fb3cf91648945d03703b474ac9ee5d6855f6a4732bd6c711c1d9b SHA512 bb9f63963e2895c46a0869fd48e401c5d14325e63cea951ddc6385f88dd6fef8385783432f094315d521fcf8795f28997a13fea249e957949f1cc021827152b7 WHIRLPOOL 64aeace6080e9fdfef49484fbf32665a1dee2bd0c597dcbe0d22e5aaf486d45e7f1919cb826b0273dfca780b80d9e19de616b638ac775190b1493a262c269d81
 DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0ecac361b9c3fde36c0680843b36b13edee0c77c82ce82de1fcb SHA512 4da03b4ec722bd3ce3453e1e9e9753f1d7ecf48bb15b3550270eff8748e74765c1dfe3af9e5eef7fec036d352d513797b0619042d76537b8670b55e29f52340f WHIRLPOOL 8d036a278c24075565fdaa6791f04a2cd413f5370c77688a225dd618bfa14c4a8926639b9077c5526084edfdf35de9aac4126fa62af633306e4e15b4985d0065
+DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 2968 SHA256 c4fd510f32e35649b9e5a73979905ffdd65d28a5d2d0c355f8980423a6566795 SHA512 3012d48de23e892ca1cf372d7531ee8b8a13b329de7a6890b9995d2610b9390798689233c4946f9a835fe5c5d5d31b076e953ddbce1cc82b2f1a8bcf4dcbf41f WHIRLPOOL eedd4a62f3b46c6823dc3c14f74bf90524062f7829002d563f4f7f6e8715b3f577783d74bc9c6a3bd33c1876032fe86327e0b3364627a6155af2ec51cf64ca6d
@@ -56,4 +58,5 @@ EBUILD netbeans-dlight-9999_p20160829.ebuild 2968 SHA256 a98a009495c7fce4f058deb
 EBUILD netbeans-dlight-9999_p20160901.ebuild 2968 SHA256 d0b5fb71275970b2c852bd12c4216e7b07ca17920924aff5b7a009db73a8e18c SHA512 3229515011cc8336648deaa46e20fc16973cb2c10dbe4cb9d53d911d96dee22c68da598d8e1cbc128690accde68e025b052a23ff3bb0cc66c46b72cdfb02d138 WHIRLPOOL 93ecb0b678d5f9efb4eb18d7ae1a1a352816e8c798daf3f265dfc40c2585a45150f6d3d194fb58e283a9e6f7b85d3eb7e205b4d140c9be7559e4a514f16c146d
 EBUILD netbeans-dlight-9999_p20160902.ebuild 2968 SHA256 cdaeef3c2f0cdefb577acd208bccd82b2d09775113261411516b9476ef3fb8a8 SHA512 c0ce614c72034d23fe5eb041da1a008dd83535ee873bc02eec6c52ad0dbdb3634676950206d8953e967bda7ccf7a006b2a2b0e381a55ecda455a88c01a76d947 WHIRLPOOL 4b500bebc75e097cb45ebef363613413bec6a44cf526d39806ee580ca5c8619d7c8f0d2aa771782fc4334980c2c9e6977bbf1c5dde24c0a058099bf4d23eefbf
 EBUILD netbeans-dlight-9999_p20160903.ebuild 2968 SHA256 c17d080f5673dfd3d49d3bd9b2d8265b440224a00639630276e9c9b860826c26 SHA512 d901fd5c2835042c31b60eb0a1b4c72714e56ca480adfdb110640793b67577fa56433c6e00326b6114ac4ce97b251ba8ca1bf1f4b24ea0813f74aec69365552d WHIRLPOOL 580f1a070606831c05885fadfd015f20de558ab6bc4326bf63225bbfd7b4dc00cf0fb5db1cffe4109b618ddfe5eaa7cca3bfa8ddbeba3cd6eedcee687a18796e
+EBUILD netbeans-dlight-9999_p20160904.ebuild 2968 SHA256 7de137f4b6c437ae3e55d6fccf0fafd7f6595f46af319d13d07e5a211510768b SHA512 b3e79c8aebed2927d0d8d70db3c22c0926e93d44e132023c608f31b52cb4fcdae3cb4c0665b2cf765b6626b9051f53c8c9a6faebc4aba5b9072346e1bd4382fd WHIRLPOOL 212c53ccb30441647a31625e50272a93cfbbabbf726faa102c3e5301f3a5e42d3f54c5a69a19be42a95188f0ab1641e5183198246df39f11528167eceeda7bde
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160904.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160904.ebuild
new file mode 100644
index 0000000..f4501e8
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160904.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-04_00-02-33/zip/netbeans-trunk-nightly-201609040002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/C9EE1ACA53AA71183590274D658ABD0A6AD6B2BE-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}"/C9EE1ACA53AA71183590274D658ABD0A6AD6B2BE-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 fd88732..dc61ff4 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -59,6 +59,7 @@ DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
 DIST netbeans-trunk-nightly-201609020002-src.zip 217296178 SHA256 6632afeb1d3fb3cf91648945d03703b474ac9ee5d6855f6a4732bd6c711c1d9b SHA512 bb9f63963e2895c46a0869fd48e401c5d14325e63cea951ddc6385f88dd6fef8385783432f094315d521fcf8795f28997a13fea249e957949f1cc021827152b7 WHIRLPOOL 64aeace6080e9fdfef49484fbf32665a1dee2bd0c597dcbe0d22e5aaf486d45e7f1919cb826b0273dfca780b80d9e19de616b638ac775190b1493a262c269d81
 DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0ecac361b9c3fde36c0680843b36b13edee0c77c82ce82de1fcb SHA512 4da03b4ec722bd3ce3453e1e9e9753f1d7ecf48bb15b3550270eff8748e74765c1dfe3af9e5eef7fec036d352d513797b0619042d76537b8670b55e29f52340f WHIRLPOOL 8d036a278c24075565fdaa6791f04a2cd413f5370c77688a225dd618bfa14c4a8926639b9077c5526084edfdf35de9aac4126fa62af633306e4e15b4985d0065
+DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 15825 SHA256 e4824e152bd518440ca8e09ea452519a3888f4f5868ac466596b138c5b2f61ba SHA512 c1ef3b8c2cd54238ad1c5b77d2c0f7d530c9f2e2194a372879eef06d37a7e23df087f98a529e598270ca6bd8e3a78c5e52a08e8c1085e0a6c5b46b433f3c9496 WHIRLPOOL 2a39dfaf18a3225e2c7050573f4c38897057b11ef1e62c85aa147760a840c20442ba8e1e6901f00606ca96c50dade0713596820f1453c2cb9c826ab7bb37cb3d
@@ -85,4 +86,5 @@ EBUILD netbeans-enterprise-9999_p20160829.ebuild 15825 SHA256 d948ea9be53b33a5a2
 EBUILD netbeans-enterprise-9999_p20160901.ebuild 15825 SHA256 09a619ebd3bb9b72c41c7e06d0d55addad3d3a912bd12da537182e03900396b6 SHA512 213021feb7f6676d989c37c5c7495e94e0101a3c3694ac8980f897923c5d2373661f616521d34d5995f08b8ad7024e39bcd93346eb79f14647b4e0408f7a6e21 WHIRLPOOL a108e1734dd563ca2fdb910db89f7b4e21c98f6a0bffcfaae653d9d6af93f54cbd4d8c4460df0ea1dd98db03cbd40612adf7e6115bb00384121d58a33102d6dc
 EBUILD netbeans-enterprise-9999_p20160902.ebuild 15825 SHA256 0c199fe7a098b3818c3f837d833a73560fc26330c1fae2a2692bc82fc84bd9eb SHA512 372c04f9a2e5f62f444ebe18b78cddf1f22fa2a6ca3623793450b1e55024c8f8d5288935f6243b309526d963114252b06f1a10b2144ee1b2f674bba74fc655d7 WHIRLPOOL 2468a0a10d2b118b25df4d169c3be5d16847cda62d759e6321f48e3e9b28701e4b315e9abc219059a85f120a0c1778cdbe5349087a698e344f9abc875bcf68f8
 EBUILD netbeans-enterprise-9999_p20160903.ebuild 15825 SHA256 cf8d76c19046036572477ddafe99b79f94acb2fbee9b39990c02b82df3356e78 SHA512 490e5d2e4930f5fe3b98a7accd04814ef298ef06910d02e037085a5c51dc69b67211b9e17cee974d07ac2ef8feec8b89da36dc719781cea1cd3cb460d85e363c WHIRLPOOL 7b013941e1e56a3d366bd7197ca72575291c5e0c45877f7472d56e690fe18193a50b6248aba7d07013f7cb8b31fb9a39b47444f7266c7f3b4b415fed9c001622
+EBUILD netbeans-enterprise-9999_p20160904.ebuild 15825 SHA256 3d45f3fee523e66385c3e2b0922cac6500df6d2efab8b93c70affab4aa851898 SHA512 93b16231d4cbb2bcf8848673dff9dad3317446bab3695982616fee5cdbee3005c0a2d08ed483d3478bbfce4a151e53c0ff1488381d169325b7c6abbb7c82eefc WHIRLPOOL 1f5c87371055672569821724cd99f375eb7d394c8b246fe8bfec899128ebfd076ed384e138e82301649e830d3103647c82f21a40d6574a583e4bb10d9c9392d6
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160904.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160904.ebuild
new file mode 100644
index 0000000..1e34ad9
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160904.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-04_00-02-33/zip/netbeans-trunk-nightly-201609040002-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 e56bc6a..391c558 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
 DIST netbeans-trunk-nightly-201609020002-src.zip 217296178 SHA256 6632afeb1d3fb3cf91648945d03703b474ac9ee5d6855f6a4732bd6c711c1d9b SHA512 bb9f63963e2895c46a0869fd48e401c5d14325e63cea951ddc6385f88dd6fef8385783432f094315d521fcf8795f28997a13fea249e957949f1cc021827152b7 WHIRLPOOL 64aeace6080e9fdfef49484fbf32665a1dee2bd0c597dcbe0d22e5aaf486d45e7f1919cb826b0273dfca780b80d9e19de616b638ac775190b1493a262c269d81
 DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0ecac361b9c3fde36c0680843b36b13edee0c77c82ce82de1fcb SHA512 4da03b4ec722bd3ce3453e1e9e9753f1d7ecf48bb15b3550270eff8748e74765c1dfe3af9e5eef7fec036d352d513797b0619042d76537b8670b55e29f52340f WHIRLPOOL 8d036a278c24075565fdaa6791f04a2cd413f5370c77688a225dd618bfa14c4a8926639b9077c5526084edfdf35de9aac4126fa62af633306e4e15b4985d0065
+DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 2913 SHA256 0f64221b065daf4e7ec4a250e2306ea2e9e1906418bdf15a74bf2f62ac91726d SHA512 e42fcb525d3d92fcc84778ca8e6a06288516b92117a5e587e7c3fb18ed87e9ae0359a47b196283175a7badc4e17bf8819356cf4de74a53e55c9a2ed93be8e295 WHIRLPOOL c867c8722300351c3a8ea7193f4693860ebc1d8c88d6f95db7ff5d3c005c221de639bc9225f83e683ee0830208e14c6d841ec97fdc7c4f875017397b0aaa16a3
@@ -53,4 +54,5 @@ EBUILD netbeans-ergonomics-9999_p20160829.ebuild 2913 SHA256 ec8672e62b3c57e3b9b
 EBUILD netbeans-ergonomics-9999_p20160901.ebuild 2913 SHA256 8efe7cf5c02e556106330c243ea525b618176cb83a9a7628e90fce30fbb13804 SHA512 8becc42d5249dd48752a77c8bfcaee83046b992d450d13c938352ef30e7e59f4db45df34403723e900f1136ff4d0fd46cfd817505424ad7ff86c8f3a0de99fc6 WHIRLPOOL 633a4624ecbb75c3addd5529bba726f32340ef5d1cc38d539cab0551af01a2b0b6c7f30ee85fd23bd4c773fbacd5f63cc8c813b0d8983f97371e057169b9b178
 EBUILD netbeans-ergonomics-9999_p20160902.ebuild 2913 SHA256 674b38a2c2710fffd0472a53788075365a2048982f8d265e28deccf1facef9de SHA512 927fdd54593c2f2738d5573f3b3af1873c8019e653d4374d3abf3c3844978a025d947069c325723bfbe40211e0a20b3e29b253b816f4525b7e941889a39a723e WHIRLPOOL 1ad9b68e586a6ad93b675b4a4896857ab5c41ef90b61ff411644f58644606b95ae8f81a5d4f08a2bb3b548837a15880b0ea8665ab4d545af1328fb6b2b61d935
 EBUILD netbeans-ergonomics-9999_p20160903.ebuild 2913 SHA256 b2354fef560329d6ccafc0030550f47fa211da536a6b67815f167ec7d210b620 SHA512 be8467a6ba42ac39b899ad334ac008d7580a6e299c25033740b9313030ae1acc3030ad5615268307ccda02d7960ae0bf844f226739a81a976bd13598df807511 WHIRLPOOL f09f5555ed8cacc445b62f03fe1aba89538a9e959af96c31cfc820992c78e0b3e5c625be9eb7be8fff1fea44dd80df30345d2796f66ab741d49767283c3e03f5
+EBUILD netbeans-ergonomics-9999_p20160904.ebuild 2913 SHA256 c4e141ce7ee413c484eee1538b8bc3064fae12ecc7a333be8489dd904bcbf40d SHA512 d55f470422d51c8f3b2fe59557a80fd0a33d059d1dbbb0e6387a77592f0fbd391647c24fc38d6ce1186b370d97b0a442965b19d13452e0450f41042657a0b2ec WHIRLPOOL 486d06bbebacbea523c47babaae691bd4cb400d512e8e561154ce20dcfaa346b9216cf533d0989b36968dc5881583fefd5360e98c2f3de803b3bce397909b697
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160904.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160904.ebuild
new file mode 100644
index 0000000..4fe26f8
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160904.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-04_00-02-33/zip/netbeans-trunk-nightly-201609040002-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 68cb143..2c88c87 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
 DIST netbeans-trunk-nightly-201609020002-src.zip 217296178 SHA256 6632afeb1d3fb3cf91648945d03703b474ac9ee5d6855f6a4732bd6c711c1d9b SHA512 bb9f63963e2895c46a0869fd48e401c5d14325e63cea951ddc6385f88dd6fef8385783432f094315d521fcf8795f28997a13fea249e957949f1cc021827152b7 WHIRLPOOL 64aeace6080e9fdfef49484fbf32665a1dee2bd0c597dcbe0d22e5aaf486d45e7f1919cb826b0273dfca780b80d9e19de616b638ac775190b1493a262c269d81
 DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0ecac361b9c3fde36c0680843b36b13edee0c77c82ce82de1fcb SHA512 4da03b4ec722bd3ce3453e1e9e9753f1d7ecf48bb15b3550270eff8748e74765c1dfe3af9e5eef7fec036d352d513797b0619042d76537b8670b55e29f52340f WHIRLPOOL 8d036a278c24075565fdaa6791f04a2cd413f5370c77688a225dd618bfa14c4a8926639b9077c5526084edfdf35de9aac4126fa62af633306e4e15b4985d0065
+DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 3377 SHA256 b45f733134cc75997718dbfbf6a3d02e3c6eab38bf4b23ea84c1a29281e419dd SHA512 03514caddb6f8e9fb04c85c8f2a3e47fb4718a248f082119ecfa1c541e53123c0bc08f9524263de0905ba340108ae53da3ecff1f91cb200af71374b0d52a1bfc WHIRLPOOL 5f377c28e81ccddb3da0e84cd019b54c30c08ac87ce8780cca0786e985cc347ba32495cb118832865fc257df0f967aa9b61e306c1f765ce7989d1617d3ff9200
@@ -57,4 +58,5 @@ EBUILD netbeans-extide-9999_p20160829.ebuild 3377 SHA256 626ced6297160a5a078e2dd
 EBUILD netbeans-extide-9999_p20160901.ebuild 3377 SHA256 044a6d90a3bbc5b2ea976a60626d163646258b8f9b607f48807c9e5fc205eacc SHA512 7299576b1232e56bc56eaf961a225e5d01bc16d45ac89640b8547c31c1342b77714c9fa9733c6a81d06e51cbad5422a896f101fcd80ccde50365c4d6adaebef6 WHIRLPOOL 7c638df833b0c52fc9bd3d47bdb324bffd3ff898ef849d472187328fb79b6cc5511e2eed7592762903439ef51863e809b001eb3df56d06d318f29fc1bb672faf
 EBUILD netbeans-extide-9999_p20160902.ebuild 3377 SHA256 e4994db02b0bb825d5697336d23354466786b2b6cfb874e339f9b13e11e27049 SHA512 ea31d255619ae9b5ae3461ef2402ec34172462c740def7ce0d647c0eb8a7bb8df3435580227e906ae1ae544e66bd807380d3777d432e659a75197e7efb4d3f84 WHIRLPOOL 3705d0abc0c66799fb693fcee57a32c7646e517fe9f737d989a9c65123b732ad448fd81566246c13b64086d6602c7e13e03505ed6d769016e8c240a0f71a0c68
 EBUILD netbeans-extide-9999_p20160903.ebuild 3377 SHA256 944daec79d07686fe13753a33c1da2eed19ca6e5f25a7e688bbe6941fd6ad40e SHA512 48a464ee6e3190a4c941bc86f488750e5ac54eaf2c9b3755bcebfdc7551e97feabf558a3e8f8a259f9333fbdd4404d6c024edd78ee452bc76e51256e871ac6c8 WHIRLPOOL a06aea9ddead43acd4661f3ece115e0bd12851d3502f8b03b49e4c01e54da0d0b7413ba2ea1b51dec9ab595271be8a8edfbaf8b651aa0d731e77d7cbedd237df
+EBUILD netbeans-extide-9999_p20160904.ebuild 3377 SHA256 df8c650659cc11e0fb43bf4e00ad59e1d0a7e20b64db9b0e84004373c0068423 SHA512 bda4468c0d3c36fc0fa2e2e85ffe92d21d4b1fb0faee8268e19383f090be4db2f61b180a2140df67e22e57585324fe684322bdbec14142c70ff2ce1fe45998f7 WHIRLPOOL 5a42702b5ef84ace97ea6963311928966f0bd21abc795acdb09b225521f2ed56d3c7592d249ab80cc1d4d1d3b38b25779842360169fd3dada37bf74669082b50
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160904.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160904.ebuild
new file mode 100644
index 0000000..fd1f80f
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20160904.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-04_00-02-33/zip/netbeans-trunk-nightly-201609040002-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 ec5ffb6..3b7a485 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
 DIST netbeans-trunk-nightly-201609020002-src.zip 217296178 SHA256 6632afeb1d3fb3cf91648945d03703b474ac9ee5d6855f6a4732bd6c711c1d9b SHA512 bb9f63963e2895c46a0869fd48e401c5d14325e63cea951ddc6385f88dd6fef8385783432f094315d521fcf8795f28997a13fea249e957949f1cc021827152b7 WHIRLPOOL 64aeace6080e9fdfef49484fbf32665a1dee2bd0c597dcbe0d22e5aaf486d45e7f1919cb826b0273dfca780b80d9e19de616b638ac775190b1493a262c269d81
 DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0ecac361b9c3fde36c0680843b36b13edee0c77c82ce82de1fcb SHA512 4da03b4ec722bd3ce3453e1e9e9753f1d7ecf48bb15b3550270eff8748e74765c1dfe3af9e5eef7fec036d352d513797b0619042d76537b8670b55e29f52340f WHIRLPOOL 8d036a278c24075565fdaa6791f04a2cd413f5370c77688a225dd618bfa14c4a8926639b9077c5526084edfdf35de9aac4126fa62af633306e4e15b4985d0065
+DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 3416 SHA256 4a5078fdb207606b04792b824fb6f76f7e6e8b6bebf806ec6eca22998feecfb5 SHA512 4c20436c57537ea3adc9c9697053c5fb45e257c7c69ddb0b00024d5858d8fce3833318fdcaa286ab1f32972fddd9a1c94ea5cd28e935cbe626c7ad759d3fbb4d WHIRLPOOL f6b82e7f117578a24b3bf718ebc90e8ae3962f8d3c55c172f5326cd07133848b7b594dbeb1a3e888e10c7d2bd7bb1e5de17b86bc8ed10bfca5c5739a294206ef
@@ -55,4 +56,5 @@ EBUILD netbeans-groovy-9999_p20160829.ebuild 3416 SHA256 915f8dbcbe1387e92c2a8a2
 EBUILD netbeans-groovy-9999_p20160901.ebuild 3416 SHA256 46be5790e675abd9d835ef7863d357674bb0769ffbb1c4cba45ecf8610e4fca1 SHA512 e3719edef1d6820f322b928f4d99b363a4610cd9909f2d6b599f810af4b4f166c75612ffa9dd0627959d59fd96d773b958744ce314e97e9e43f8ae0d8d80321d WHIRLPOOL decd91bb91b98a18c6f7a7a49d3864db0f710cf09f8c1dfeaa31032481c80659e702d1096558ca298dd482dd48c350ffd3cab774f2645e6cb59d7e573695c34d
 EBUILD netbeans-groovy-9999_p20160902.ebuild 3416 SHA256 0a64f3dd949950ccb8d723fc2e5773ae82f468439767e7c765f9e751191e51c0 SHA512 1549afde9bbd920b2117e4509ed4dc33a507cbba90e7e373320a71f9d875335fed7b18d23cdda93079714575274d98ed77cef8b03cd380a0a474fc3ce9d093a7 WHIRLPOOL 28e9692d2f4d9792c60620348ae88590c01bfb8869511701af39384e21296cda1993e2f928886c1b235d7ca5fe4e056fb5760a2aa38008ab9b2ae50c50b84737
 EBUILD netbeans-groovy-9999_p20160903.ebuild 3416 SHA256 e162d66c6879491bcecce280bc35fc774828cdb01f1f7dd3da5326a92e51b7f4 SHA512 a57e4ed3080442f6c395b5583eb2ed78dd1a8f2103d9f70849f0af9e950985843522720503ac68b7a4a5d6c4e8872b0e442ecf928566b3a2e7b20212ce6b3639 WHIRLPOOL bca4eb4160f36ede0520ac4e6c42941cf3dab52d1f29f12c56ebc87d81c54d2a998f8a13258db582ced378cc94423a5f1859b4427ba10c7d9f3f7c1982d411f6
+EBUILD netbeans-groovy-9999_p20160904.ebuild 3416 SHA256 a64a8eaae9b083620908a959d429ba34153a72ee53c287248a8a6c20dba50da9 SHA512 fa115d9fd7f95d4a92301c5e29ee7d5bc97ad5be73226c0b5207563f434e6d87f7c75a0a39743e3115092d5937d4a2af79c31ef26b94255d11518f5acca9d7a6 WHIRLPOOL 2521869c21e204c0b76fb2ccfefaa8224e94f1e2e7e3fe47f5b11833526e5af4b1be22914a50f3374aac04b554252fae7e95ef2d8518069b3cdc4789f3e2de04
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160904.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160904.ebuild
new file mode 100644
index 0000000..91c1402
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160904.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-04_00-02-33/zip/netbeans-trunk-nightly-201609040002-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 1ac7222..6d44f51 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -32,6 +32,7 @@ DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
 DIST netbeans-trunk-nightly-201609020002-src.zip 217296178 SHA256 6632afeb1d3fb3cf91648945d03703b474ac9ee5d6855f6a4732bd6c711c1d9b SHA512 bb9f63963e2895c46a0869fd48e401c5d14325e63cea951ddc6385f88dd6fef8385783432f094315d521fcf8795f28997a13fea249e957949f1cc021827152b7 WHIRLPOOL 64aeace6080e9fdfef49484fbf32665a1dee2bd0c597dcbe0d22e5aaf486d45e7f1919cb826b0273dfca780b80d9e19de616b638ac775190b1493a262c269d81
 DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0ecac361b9c3fde36c0680843b36b13edee0c77c82ce82de1fcb SHA512 4da03b4ec722bd3ce3453e1e9e9753f1d7ecf48bb15b3550270eff8748e74765c1dfe3af9e5eef7fec036d352d513797b0619042d76537b8670b55e29f52340f WHIRLPOOL 8d036a278c24075565fdaa6791f04a2cd413f5370c77688a225dd618bfa14c4a8926639b9077c5526084edfdf35de9aac4126fa62af633306e4e15b4985d0065
+DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 4126 SHA256 063a865a89d4d4c566d53ae77a754a61c74d9837cd982e203d276008b8c7e7dc SHA512 1824c591a18d713347f1ca4f3bafc945ea9c54fdab7d3fbf6ef5b8550535e8e4d6965b997cc6b3cdf311fd8fcd4495810477a39aff8520cd2cc486993e1f6924 WHIRLPOOL 9b5f3d910228fce6268b06f55285100f033ef3de9c344d4f3f7f24cbc7ad871cf8b3771abec2e6362d515918d73b6475e5943b20d4f6472a5f7513e3815eb696
@@ -58,4 +59,5 @@ EBUILD netbeans-harness-9999_p20160829.ebuild 4126 SHA256 f0db647af3fa24d48fc764
 EBUILD netbeans-harness-9999_p20160901.ebuild 4126 SHA256 7df8b62ce9b8e8d1f051aa05ffbc0b7e9f0dcb427983b01a14a114bf6e243400 SHA512 d5dbecf2dfbf2bfeedbc886c5abb76a81deeb8d5c1fe8b6d0bc9bbecad070c52eed91817361c620bf24a1c7b32b6420e8a296f153cdcda7f64f029e154d6eb3c WHIRLPOOL f2300981e99f99f11319d24c62249b064bb526b88650e6defeac73dfe4e3f142ed27d79a13fe1ba30f621eb1a87867d8f62c1a053daa2543a1177a0af6166d89
 EBUILD netbeans-harness-9999_p20160902.ebuild 4126 SHA256 77910ac8156b6bd7a7cbc6cab01b0b880558f285eed31541b02b9f3163a961b0 SHA512 88c051e0f7165c4dd276e50d07ba7b7c750a6aeb925bfaf56c80422cd5556f6a127b57526496c71185d576ee48f5f1ce9935b7912db05f3d7e256ef04f9d1d7d WHIRLPOOL 04f0fd95c7b1ee9083d24548be7835a5fa2c03ea684b4518557d4db0af96f202843691a9f7768aef5afa87f88723873e503293e003a7f446cce46a4ba06c3ee1
 EBUILD netbeans-harness-9999_p20160903.ebuild 4126 SHA256 daa9bec98a2541afd4888796e9f24fde7c25d53d89b4b67f77c68de258d3ed3f SHA512 679886a78cb4838c134fc8def7d7dea7a4b24d14a540c4879e3a6330b5b96270a63900710305ae1dd830aeec0e7342d51610965d0768290f73578f2268aea502 WHIRLPOOL ce8d7bf33fdabf064cbd8fb3533dcca3394238d9663663849172d116879ca84947a96e79ea5e658d1a270192af75caf6f9fab9ddaeb38eee7a56d806a4655279
+EBUILD netbeans-harness-9999_p20160904.ebuild 4126 SHA256 4200557b0e31af9b40369100bfec9335ef58f1b8948dafbeb4ef2f00d013b493 SHA512 bf4836b51e6df852846c4d833c933f3fe88bdf2ac5da223b54c6e2e0eb00e1c4a9a3f355707b85141e0d1f9838337c18c5af12349a863d4028a9826e3d7372eb WHIRLPOOL 2424f7445fb0b783ba7adf91af05be3f030263db78546565b380ae35992b818c3d45183b5b131acc3c9e6cbf1a2239828a969047100938e9bca27eeed231fa7f
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160904.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160904.ebuild
new file mode 100644
index 0000000..6e8e27a
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20160904.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-04_00-02-33/zip/netbeans-trunk-nightly-201609040002-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 27a03c8..0869c0b 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -166,6 +166,7 @@ DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
 DIST netbeans-trunk-nightly-201609020002-src.zip 217296178 SHA256 6632afeb1d3fb3cf91648945d03703b474ac9ee5d6855f6a4732bd6c711c1d9b SHA512 bb9f63963e2895c46a0869fd48e401c5d14325e63cea951ddc6385f88dd6fef8385783432f094315d521fcf8795f28997a13fea249e957949f1cc021827152b7 WHIRLPOOL 64aeace6080e9fdfef49484fbf32665a1dee2bd0c597dcbe0d22e5aaf486d45e7f1919cb826b0273dfca780b80d9e19de616b638ac775190b1493a262c269d81
 DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0ecac361b9c3fde36c0680843b36b13edee0c77c82ce82de1fcb SHA512 4da03b4ec722bd3ce3453e1e9e9753f1d7ecf48bb15b3550270eff8748e74765c1dfe3af9e5eef7fec036d352d513797b0619042d76537b8670b55e29f52340f WHIRLPOOL 8d036a278c24075565fdaa6791f04a2cd413f5370c77688a225dd618bfa14c4a8926639b9077c5526084edfdf35de9aac4126fa62af633306e4e15b4985d0065
+DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 29867 SHA256 8869ab05195b271f6778d85766fa3f9fd961e0c083dd46b3a053101e0ab05c96 SHA512 6fec085ea686b0542eb98875716958a899b4058abda539f883b2ad701d8805ac8c74486a783e0ff11ceebc996e5eeff744f429d8f36c361ab9c6d334c55e7e66 WHIRLPOOL 3f1bc01d0fc4d54f176ee1f8115080447b739749f1e2fafc3e1db7648e9d8ff2e661979490020d43c1d7e24ad51d32a7bca5ed1b0b2b4a39d2c95a449b12112f
@@ -192,4 +193,5 @@ EBUILD netbeans-ide-9999_p20160829.ebuild 29849 SHA256 a6f7fab5c9676f4258ba58360
 EBUILD netbeans-ide-9999_p20160901.ebuild 29849 SHA256 c1cbbcf929e5d8d7b4308f18929032c82a75de4cf674a52b44aa029a0e33fd7f SHA512 f70b98cb010431cf8389e111e023695abf8689721560252df25b9679d584f08dece3583327ea078404eea481bcee38d136d3221f93f766735cc6fc24170f2dcf WHIRLPOOL 448b751ab2996d8dc1989ad4211dd9a20a7e6d31e7a3cc2889994726ecd21df1417329f410810c918695f605117fafe89b123881ff5ef5c010ee42408ed71945
 EBUILD netbeans-ide-9999_p20160902.ebuild 29849 SHA256 49237219eaf86408a7ce442bba18cf8c197585e0e4020572ca5d58b4a9082ac6 SHA512 72511d62d0c4109b9ace099ecf7f9c2e4f6224c8a703d779566b6547db197dd7e264e257a149933b44cbb8ff1030e5604bd1130098dea06726f981eda4e36878 WHIRLPOOL b5222460569d4a1886b31c615e9d31770544dd9047fc48da39d3652d1744fd8d6a4dc4adafde9078261a59ba4a6cba97553d6dfdbd5c6f76d54e277e4c98be94
 EBUILD netbeans-ide-9999_p20160903.ebuild 29849 SHA256 a118013a0233d23f25f45f444bda8cd233898a29a7d986fbffc24816e164d63c SHA512 b108637a3958c68ecb83517e18d93e01ebc8b97c934723e12aac30ce0373491165db0e5cdbf7ca670e24920e385564fb1a092f57d40e54b054a2eb74b0116c8b WHIRLPOOL 7591e7fc9083b7b95271084c9caebccfda1ed9697c92efc3a50ce23e489413fd2ce998dd2040148ff5e9c273c0eede0432dc5544d33de81b700cb4d89b25bfe2
+EBUILD netbeans-ide-9999_p20160904.ebuild 29849 SHA256 9da555106fc05b372faa641edf69b94e483a4e04e07d9221ea3007f52ed7303a SHA512 6e8f93dd510e4e353bdc04496354692911de0e64d61bdd82779a3169e6cc5a8f0d4c2738fc325d2cd18ae5ded8c95d751e1b9418ab0dfaef0b8859b6ab961443 WHIRLPOOL 6ed7f674b36d23597bdb76d818591673ea3b3bb76eb56261653408202d6ad7c4379d57303c610ddc16ea0814cfcd9b7ef25f9aa5850d43cdae439bdc15146c9b
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160904.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160904.ebuild
new file mode 100644
index 0000000..f2e8a1a
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20160904.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-04_00-02-33/zip/netbeans-trunk-nightly-201609040002-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 8b460f8..401969b 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -62,6 +62,7 @@ DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
 DIST netbeans-trunk-nightly-201609020002-src.zip 217296178 SHA256 6632afeb1d3fb3cf91648945d03703b474ac9ee5d6855f6a4732bd6c711c1d9b SHA512 bb9f63963e2895c46a0869fd48e401c5d14325e63cea951ddc6385f88dd6fef8385783432f094315d521fcf8795f28997a13fea249e957949f1cc021827152b7 WHIRLPOOL 64aeace6080e9fdfef49484fbf32665a1dee2bd0c597dcbe0d22e5aaf486d45e7f1919cb826b0273dfca780b80d9e19de616b638ac775190b1493a262c269d81
 DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0ecac361b9c3fde36c0680843b36b13edee0c77c82ce82de1fcb SHA512 4da03b4ec722bd3ce3453e1e9e9753f1d7ecf48bb15b3550270eff8748e74765c1dfe3af9e5eef7fec036d352d513797b0619042d76537b8670b55e29f52340f WHIRLPOOL 8d036a278c24075565fdaa6791f04a2cd413f5370c77688a225dd618bfa14c4a8926639b9077c5526084edfdf35de9aac4126fa62af633306e4e15b4985d0065
+DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 15656 SHA256 b4bdbaa284e5081e64dac110f95a1798350cd821e5bddc210957c8852918559e SHA512 82e0b5329cecfa0f3ed1dbdc16319592c2b71c3fe4b93503e1ed02bef7f18a91d8cef91b44d242b418e437a329db30127357d965bc6d578797245afdd05b4e38 WHIRLPOOL 02782938a01df4ecdfcd9bc99d1aa9853ff91b5c81507189e1ac7a66ec5dae657aeb32c3bcf99f91ec0f38e1f65da097d5c783eb84fdb5766dd5be2c3d2349f6
@@ -88,4 +89,5 @@ EBUILD netbeans-java-9999_p20160829.ebuild 15656 SHA256 bc83101c53e23a1d651468ba
 EBUILD netbeans-java-9999_p20160901.ebuild 15656 SHA256 5147b0072c79f93d2afa3d9e38f9d5a5c03f6517431d20599b1c524e571efec5 SHA512 7c3c9b9e5e9e403dd6ee876d55984aa6352d117205134d5233534e3b74dec57b6925809e46e4a40843990eaeda124c33796633c28efc731dcede63a7b5107c4c WHIRLPOOL d04a1868162cfa5c869c1827ec4fb194d2c1cecc2c307fc4a618280c1aab484e3d6125b0ff9064627c965787ca66c75803aafbd1ac8e93c7a9afd5d2cdd2c73a
 EBUILD netbeans-java-9999_p20160902.ebuild 15656 SHA256 06ee2a2c07fbc252dfc4128f07feea0b6a3803afec1a0452ea1f814c8ea75434 SHA512 5932a5819df8e440a4ced9abf2c20d2ec175b2dbbcc209dca76d75d5003ac8df4d0550e4ac4ed9dc1b1a561ff1ddd52cc83e37ef9f11f7d754f3a39147c0e973 WHIRLPOOL 5e74022f99f7e3a9e6fb7f534d292d5692df2b4630b00550d740d9e9b9ac851a29647c32f23e8ec3f018db111004382948e925d57414761f68324f113f83f346
 EBUILD netbeans-java-9999_p20160903.ebuild 15656 SHA256 75f17635df93b12e82ce2a79f86a925045b2dcecb9206c36b0952419e7cb6212 SHA512 4e33ff56fd83d3297f2c594d270e7953c24194de2439f8796ee474c376729fe0ce9d4b4247e6c3766720d460cf885d608b7c91a6820940a2f91285de6f215c33 WHIRLPOOL 40200ea35dbf01d8da216591d9181461379a54ce613f778753eb29a96d34046806e5b99fd82bf738aa2fb7d22d0950f8c9b66cef4b7215badbd189f847769dae
+EBUILD netbeans-java-9999_p20160904.ebuild 15656 SHA256 d0e9a1132ad4cdf2772df87b7127fa6c3929b9b18dc98f6a5e2a807bf7e523bb SHA512 92808d4f68558072f554cbe09ccbd9543a922223d798c0de735c826820fbf3af8a254c21e0817fec749d30e11b0a1c21ed72094cda8d3b36a8d53afb64ba767c WHIRLPOOL a667b0d23228dad04e887817ba4ce5c70e559c4f8819a1c23a858d1806be974856b0a851a337a396af9423c880d47ad1583970da4de310da1c1d9835796c0b56
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160904.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160904.ebuild
new file mode 100644
index 0000000..3f5fda3
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20160904.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-04_00-02-33/zip/netbeans-trunk-nightly-201609040002-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/99A1BD1870E7A06AF2E525ECE3DDEC7F4E5E54E4-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}"/99A1BD1870E7A06AF2E525ECE3DDEC7F4E5E54E4-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 06685e6..4499034 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
 DIST netbeans-trunk-nightly-201609020002-src.zip 217296178 SHA256 6632afeb1d3fb3cf91648945d03703b474ac9ee5d6855f6a4732bd6c711c1d9b SHA512 bb9f63963e2895c46a0869fd48e401c5d14325e63cea951ddc6385f88dd6fef8385783432f094315d521fcf8795f28997a13fea249e957949f1cc021827152b7 WHIRLPOOL 64aeace6080e9fdfef49484fbf32665a1dee2bd0c597dcbe0d22e5aaf486d45e7f1919cb826b0273dfca780b80d9e19de616b638ac775190b1493a262c269d81
 DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0ecac361b9c3fde36c0680843b36b13edee0c77c82ce82de1fcb SHA512 4da03b4ec722bd3ce3453e1e9e9753f1d7ecf48bb15b3550270eff8748e74765c1dfe3af9e5eef7fec036d352d513797b0619042d76537b8670b55e29f52340f WHIRLPOOL 8d036a278c24075565fdaa6791f04a2cd413f5370c77688a225dd618bfa14c4a8926639b9077c5526084edfdf35de9aac4126fa62af633306e4e15b4985d0065
+DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 4971 SHA256 ea2d1f4a305aeefea537b23c11d9b8b59ca31798d2819bd6cd06a4e2354bcec1 SHA512 5995560a03a6486a93282c4bfc01295a065ec8f2f6566ed486fe2f2f4c69bcd43c44fecdc4f90e9a2c62a78a1ddbeafc9c990c73f01734a4d8ce373754c3b735 WHIRLPOOL aee5fb419748f2659c34ec3cbf0b6e300bd544cf8f88b897d59452bfe0f2232a5d4ea421e26c98fe88afdfaaad61c389cee702cc17e7fac154459f7b0f8a8925
@@ -56,4 +57,5 @@ EBUILD netbeans-javacard-9999_p20160829.ebuild 4971 SHA256 6ee1fd71a7bacf2aac756
 EBUILD netbeans-javacard-9999_p20160901.ebuild 4971 SHA256 771e34db8c9fb8270fed4124ae9e3f9bcd968415afc1d62e6f53fb8e6ebfae80 SHA512 c5330952122e0cb95d56ffa19bd51216177179a3d9396bea5563b064b8f6392534a4415c4e2184c45f7fe6e1124ef718e5690b781328efd7b3f48f427e861256 WHIRLPOOL e876f88b48f8c06d81e0404158a3f688c03f409d89df3ed015a3cb709c9cf0dd68170f905c29f959df1024b416fd8853173b09ce7c2b3650cb98f55f8e7460ef
 EBUILD netbeans-javacard-9999_p20160902.ebuild 4971 SHA256 15b67aa32a5cbc39353e7ee0fbd41a688a77d29331e4fbfe46eeef12ed6e06df SHA512 36e5414253aedb27e5d4b421301d1f32c26259113bb4a925f1c149c17cad3eb7c93b73c5bcacc72c1357330892cf7299c299be58812f37f3e6178695ca18e496 WHIRLPOOL be91fc0e2c0870cd5eee05a5917f3bad275ba89576957eee9ca708ef5feea28b2d6544f55a7c9ed3b115fee0cb17d649561b3256c962de6530b833491cc9cca0
 EBUILD netbeans-javacard-9999_p20160903.ebuild 4971 SHA256 a510dc5155388a24795895a09b84925ff3d33ebe658374196ab646c5d283247c SHA512 2689c3c9bfc6d15ebfd8208e6ada7f67c66759cd0c4f7e0c315690bea48fb4d68c5d2f08690c26d22779f93c0ab01f23661ed8b73112c160cfad0ca72b3c8d4e WHIRLPOOL 8c84a0abdd34f20c6611aae0566ef3aa3d034b3399f3e70cf56a0d9607dee55f7e75c0cff81bf68bb0ce91e2260d01a34407efd7367f882248b7c3bfd75eae9f
+EBUILD netbeans-javacard-9999_p20160904.ebuild 4971 SHA256 f80314766ccbee3e18757bf759dba5ff918863d4f892c073b0c03399cdb17c46 SHA512 4b27a14d93bb4ddee05c406de6577ca0150fbe04e2324f870fa3061fbae6148d9a4d886197d0d3ac75dad263e2a52fc92f5d30ee89858fc136d5903079ee02c2 WHIRLPOOL a1faa9e162c3a6efa742cba385676beba35616574980caacca83eec742c730f6f5bad68e2de8e5c988ab2d6f3a7a784210d3881136e765f1c5fd8ead1345bb17
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160904.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160904.ebuild
new file mode 100644
index 0000000..ec18e86
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160904.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-04_00-02-33/zip/netbeans-trunk-nightly-201609040002-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 b55fdd3..8b94634 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
 DIST netbeans-trunk-nightly-201609020002-src.zip 217296178 SHA256 6632afeb1d3fb3cf91648945d03703b474ac9ee5d6855f6a4732bd6c711c1d9b SHA512 bb9f63963e2895c46a0869fd48e401c5d14325e63cea951ddc6385f88dd6fef8385783432f094315d521fcf8795f28997a13fea249e957949f1cc021827152b7 WHIRLPOOL 64aeace6080e9fdfef49484fbf32665a1dee2bd0c597dcbe0d22e5aaf486d45e7f1919cb826b0273dfca780b80d9e19de616b638ac775190b1493a262c269d81
 DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0ecac361b9c3fde36c0680843b36b13edee0c77c82ce82de1fcb SHA512 4da03b4ec722bd3ce3453e1e9e9753f1d7ecf48bb15b3550270eff8748e74765c1dfe3af9e5eef7fec036d352d513797b0619042d76537b8670b55e29f52340f WHIRLPOOL 8d036a278c24075565fdaa6791f04a2cd413f5370c77688a225dd618bfa14c4a8926639b9077c5526084edfdf35de9aac4126fa62af633306e4e15b4985d0065
+DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 6293 SHA256 4cb1aa813d16116f1b4606ade20a77bba7950ba86d680149d17b5c6641342342 SHA512 2b16a76c082c76431c3622e215801c1c133e455b7f2a4b15fd075a78c166cd6b5f30f40745f53be9ff0cb5a24d4832f0562278ac42f2f266b76611a3289b01de WHIRLPOOL dcd7d717e90178dd04a1a8ebb79bbd23f3e8316c8a66abadb3a4f66a48c3a889147155dd650be168bffd0a38fed627ef3821d9a1148ab84dcf5cd878518746cd
@@ -55,4 +56,5 @@ EBUILD netbeans-javadoc-9999_p20160829.ebuild 6293 SHA256 87ddccfa705ea33c6371f5
 EBUILD netbeans-javadoc-9999_p20160901.ebuild 6293 SHA256 df11758b565df7b1870cccb82ca013f95107c10a8bcfea17d24f66d87402187b SHA512 8a9390acec77716d1cf5d346d76158a28ef9ad26d08d7809a11a76979f6b0ed14a5920fb70d6f8616c00207d535e11d7aab90bbd7a79d12d85448e97f90a604c WHIRLPOOL 8dc1ba9f260910815ec9e1d878a96c0a0a622cd6fb076eb5527d97aaff0487d8d017955463ec556ba8c29c01db1b0a32b19911649ab1d08f0130846d948e3b6a
 EBUILD netbeans-javadoc-9999_p20160902.ebuild 6293 SHA256 1a34e7a5bc09c51e6959d57d4b0578ef3ce61b11477b18bb0ac0515cc3975e65 SHA512 99b0f16289a9aff45eb44d85039a003868f1b5b471c569bf510467cb3b4aa7a6e1c43351e1d7952b66121619a5bb1f290dd338c30ea49663e2131fc7691d4f17 WHIRLPOOL fc71f31fc1cd7db5a821144bb46184bb7b94eb4b7678341dccc251c91fe98c4236685ccd216eedf244dcf0fdb8038afbc487a1cb221ed5c29828124c257c7145
 EBUILD netbeans-javadoc-9999_p20160903.ebuild 6293 SHA256 6861d4defd395f89d0a0a8bd406eb8235c3fc9559222e9db046f05a1e911a6ad SHA512 577f7b03bf3d3b69be5983b0579db115af75c47d41e0dfee65630dff1b243ff12450cc492a918b970d5085b92c40ffbaaaebfd5de6fe31edee4c6ff1e1d2ad38 WHIRLPOOL 211fdffa70c25fb279cadb3d5b3a987ec2f246508641caa931a485da3af8c65e3293e71b47bc852563b7c415104b6f7663fe9dde7241394cf42ba7f0dd38cafe
+EBUILD netbeans-javadoc-9999_p20160904.ebuild 6293 SHA256 160f0def8dea91d16273198991f519dbcdcb4cc895a1bd23ec51a29907bd5234 SHA512 ee9ad5de586e784f021931f474bceee28014931d37ccb221a29bc491e2e55ad6cd9d2fe2858d59ce97c5fe29a66b1b594f546e99f4229009da860deda45d3592 WHIRLPOOL abd502e1cbf90052f4d5b07742dc74ac90e79d652eaafa82f4173b11c22cbfee44f53c292771e3e0a67386a028b4ab258822fb1dc75eef20f23e465113ca509b
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160904.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160904.ebuild
new file mode 100644
index 0000000..8715a79
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160904.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-04_00-02-33/zip/netbeans-trunk-nightly-201609040002-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 3f5d7c7..70efadc 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
 DIST netbeans-trunk-nightly-201609020002-src.zip 217296178 SHA256 6632afeb1d3fb3cf91648945d03703b474ac9ee5d6855f6a4732bd6c711c1d9b SHA512 bb9f63963e2895c46a0869fd48e401c5d14325e63cea951ddc6385f88dd6fef8385783432f094315d521fcf8795f28997a13fea249e957949f1cc021827152b7 WHIRLPOOL 64aeace6080e9fdfef49484fbf32665a1dee2bd0c597dcbe0d22e5aaf486d45e7f1919cb826b0273dfca780b80d9e19de616b638ac775190b1493a262c269d81
 DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0ecac361b9c3fde36c0680843b36b13edee0c77c82ce82de1fcb SHA512 4da03b4ec722bd3ce3453e1e9e9753f1d7ecf48bb15b3550270eff8748e74765c1dfe3af9e5eef7fec036d352d513797b0619042d76537b8670b55e29f52340f WHIRLPOOL 8d036a278c24075565fdaa6791f04a2cd413f5370c77688a225dd618bfa14c4a8926639b9077c5526084edfdf35de9aac4126fa62af633306e4e15b4985d0065
+DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 4717 SHA256 6186231ec60cc3e9352ef6aac6744b45d6ec096b9208c766b2f208edfd044f5e SHA512 b1d322976745d28065ee76a62c65231b4890715c38b143508d7b81c99d25c65298bb564f1c8e45c37db5b1b4255d9aa9d5ec0b090d9f63f1e0b9b453fc489f14 WHIRLPOOL 49b587b41efcfa7853ca98d5e6b18608428492396bbbe4c2f52b6840d7aeb3d68deccd306a0a92e03917ef7eab0710edc8fbdd010aaf25597f839622171371ff
@@ -61,4 +62,5 @@ EBUILD netbeans-javafx-9999_p20160829.ebuild 4717 SHA256 7f01aa38f26cbf900524180
 EBUILD netbeans-javafx-9999_p20160901.ebuild 4717 SHA256 afda23e506ad84f0c3b9faaa6f239f36b07e16eba600086efb7ebd2bf5a6f739 SHA512 1f8192151c037eb1ea1df568cd13ad3ccd92928ad5c4000de1a4f142c868fddcb72e23a78dd91bec1e9c6cdd049d55816d5af538def5221c628a80aae536a53a WHIRLPOOL 9b22ac91892e92287033d245ad630b0f03df805989fa0380b0254f1acc6693301553edaf074f70261ee2adde8de0f8898a18dca281b0d0fde7b80d47c509a09c
 EBUILD netbeans-javafx-9999_p20160902.ebuild 4717 SHA256 2680bda4d3faff0b54ebe79d3b979bfdcddfe24c9ed3a060f20f7f1f9b2dd273 SHA512 43ef1b89d8222e1186567012258c1fcd07dea49dc6f7a3c0220700ddb4b6d986cce5c65f38aa9279c50be491a13f38e976ed98cf1e1cff167e3c04b3235c857a WHIRLPOOL df09f4f8bf5e6d1040d68990dbef13af74b83ae673853dca716d112baa950e4611431e5a7418c7d6166a09bb1e3bc62d754c746493911ee741d87991e065896a
 EBUILD netbeans-javafx-9999_p20160903.ebuild 4717 SHA256 6097b7e592b621c4dda9d7add22f1b55ee3db94930de2d443a24e73f924b1a58 SHA512 6de7a16d5bb0eb35d9965669b6722ed3f533d0b3b4c8a9292cb85abdfdaa05af90616fcda5154d03b55401e935f2c9adee0500fcca4c283c5e03901a6086f3eb WHIRLPOOL 3428df131878f6ce57a0570c8819e56a9972262f1837cc52397659bbc3a092e9dda9bc49f4ed82686aa6f736e89aee64aadc53ee2812463493f4adfb4ce17976
+EBUILD netbeans-javafx-9999_p20160904.ebuild 4717 SHA256 9092e11874999e4514242e3e96b39301c82bd78e5926e6ca89d291b7d0d68305 SHA512 e2aa4601b909577c1ba2c48dde6b9108d48dfa1410b02c139990e852f6e323fbdb12e37bb0ce36aa3aeb484994078e89259bbfdddfdd9a6e86f744eccf34dba3 WHIRLPOOL 07ddac8fc9edd09a9dd13a1bdfb5d147ce0e61a71d1f7d7cd14fcb8e6e477b94854d5e64bae0abf56d0e3c6369092f01a5f697c7eba0acd643b4fd9bed8e18ca
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160904.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160904.ebuild
new file mode 100644
index 0000000..d86e1b4
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160904.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-04_00-02-33/zip/netbeans-trunk-nightly-201609040002-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 96dd81d..ff52674 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
 DIST netbeans-trunk-nightly-201609020002-src.zip 217296178 SHA256 6632afeb1d3fb3cf91648945d03703b474ac9ee5d6855f6a4732bd6c711c1d9b SHA512 bb9f63963e2895c46a0869fd48e401c5d14325e63cea951ddc6385f88dd6fef8385783432f094315d521fcf8795f28997a13fea249e957949f1cc021827152b7 WHIRLPOOL 64aeace6080e9fdfef49484fbf32665a1dee2bd0c597dcbe0d22e5aaf486d45e7f1919cb826b0273dfca780b80d9e19de616b638ac775190b1493a262c269d81
 DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0ecac361b9c3fde36c0680843b36b13edee0c77c82ce82de1fcb SHA512 4da03b4ec722bd3ce3453e1e9e9753f1d7ecf48bb15b3550270eff8748e74765c1dfe3af9e5eef7fec036d352d513797b0619042d76537b8670b55e29f52340f WHIRLPOOL 8d036a278c24075565fdaa6791f04a2cd413f5370c77688a225dd618bfa14c4a8926639b9077c5526084edfdf35de9aac4126fa62af633306e4e15b4985d0065
+DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 4412 SHA256 3f56c4dca782b3bc27f5b6e0ba6d786091db3f8f7e736cd78e2dd8ea38f76ff3 SHA512 7a55fb8c75cacdd59827b50c10308a08beeedae9a3a09342d18e84cb432c0db0f6b3c052db336ca0114b14c440253022fa5c06b3a3d8a4f3645188a92c0ae1e3 WHIRLPOOL eceb99365cdc47692b74bf170ba0488f1089b59ab577bec1ecd2f2c229c237b5ce669e62a68fe1f37df956ad53d05cac87646599139fca6e24e8a60ff3cad07a
@@ -53,4 +54,5 @@ EBUILD netbeans-mobility-9999_p20160829.ebuild 4412 SHA256 1c18d11fb3069006a7c1f
 EBUILD netbeans-mobility-9999_p20160901.ebuild 4412 SHA256 f89bb05601b815be0214a46e4b2f9e7629653fbb24d7c47fe8346dfc05805876 SHA512 5936e4e719ea10a3bd3469bf058dd18ea82a767868a238340d5cb38612db9e91ed02dec4ea89be94a523e0a4fcab44a2c056d0c8a6304ee263d19cebf0492986 WHIRLPOOL 6c7dba0c13eb79fd596efd755084072dd13e3a9a51d0fd48943f30ca00aa38b0b84416e013a67385690f03dc9fb347941864bbfca4ed093625149428281d5624
 EBUILD netbeans-mobility-9999_p20160902.ebuild 4412 SHA256 b56842e619c9aea9af10758ecb11edbdf4f1a05fef718082aa4c48d9c414d60c SHA512 28849bc3d76c099f535e2ec1bb19a2c2040c352064afa92bd27af043df83704746a070c58c902b678c056ce236492e56a669bac5498e57ee5c1fb5b7f6ff2cb3 WHIRLPOOL e8a13a1db5f270013896120b302ca6b8a2ee86f3f641f4f21bdba2e5d88434874a1f7b569739c89e21338afa625f04c7364f3b7d6306ec60d064c0b4329ae5ea
 EBUILD netbeans-mobility-9999_p20160903.ebuild 4412 SHA256 c679fc835f9c23a539c36bf23c60da60b42e00e96ac4f632d868f087162cbbf0 SHA512 ef197b823078ca47d602da175b6837e3e2a4b13a8fef903ac13d4760008c0ea7c2b5907887d3f5d994a31007c2a3aab8f8697808ce1c1a4d0186499bc2f0deb9 WHIRLPOOL 9ffef32a8f1f397c86d55db439799624205d478879f3303e8d6736eca30649b1f4ecb13efa2cfebd1d0b5c800b3cb89c20e3538c7aeae22751c09ae73de95ac2
+EBUILD netbeans-mobility-9999_p20160904.ebuild 4412 SHA256 d43f731d120fa8a04686e71c90554f2610012510676f4c3c320f744001f5d28a SHA512 24629e38f462371fa94464aca41bff28ab3f1f79c20458582dc923f2e7095007d1df6cb816acb215a465db8fe8a7a871302269ad76311051304c56c5a2f5d098 WHIRLPOOL 3a38e2a1c20d132eb3729e66428632a876f3897b2c8456b3fd5da24ab7e61c0356f1dd5859d9fbe7e6cfc5839df76eaf1a84442c105f47e593e14414b9b798f7
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160904.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160904.ebuild
new file mode 100644
index 0000000..1cdf720
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160904.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-04_00-02-33/zip/netbeans-trunk-nightly-201609040002-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 6a06b9b..333f72d 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
 DIST netbeans-trunk-nightly-201609020002-src.zip 217296178 SHA256 6632afeb1d3fb3cf91648945d03703b474ac9ee5d6855f6a4732bd6c711c1d9b SHA512 bb9f63963e2895c46a0869fd48e401c5d14325e63cea951ddc6385f88dd6fef8385783432f094315d521fcf8795f28997a13fea249e957949f1cc021827152b7 WHIRLPOOL 64aeace6080e9fdfef49484fbf32665a1dee2bd0c597dcbe0d22e5aaf486d45e7f1919cb826b0273dfca780b80d9e19de616b638ac775190b1493a262c269d81
 DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0ecac361b9c3fde36c0680843b36b13edee0c77c82ce82de1fcb SHA512 4da03b4ec722bd3ce3453e1e9e9753f1d7ecf48bb15b3550270eff8748e74765c1dfe3af9e5eef7fec036d352d513797b0619042d76537b8670b55e29f52340f WHIRLPOOL 8d036a278c24075565fdaa6791f04a2cd413f5370c77688a225dd618bfa14c4a8926639b9077c5526084edfdf35de9aac4126fa62af633306e4e15b4985d0065
+DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 4111 SHA256 914fc806c0c6dabe5b4b1ebc0b7f013e17fb042de587811b8410b46da9e39dfe SHA512 1eb08797e5e261912e0be656928324dfbddcecf60f7c849ba3f0952ed034cee39cf68a75ec76ea9257a0542529ac629849338ab5aa672763f350fe9f030113b1 WHIRLPOOL 19bc4171859d690450e3eca42c4e98c5b5a8814932b44571358c1349d34bd9e0a2866e5523bc2562df67d81926f61ba050fbf49425e53a48eff92e28843eb74b
@@ -56,4 +57,5 @@ EBUILD netbeans-nb-9999_p20160829.ebuild 4111 SHA256 3a140e3e604be1da27633011843
 EBUILD netbeans-nb-9999_p20160901.ebuild 4111 SHA256 ac43a3847c3a425129a9762b672638648e0adb1ead273f370f422ac8a40c5a00 SHA512 a9cdbf5243d3f0c99e35fe16384b23fbb3e678adf8e1adf3dc19a0e0befc653924d0b2d5b81f1d94cdb3c4de817544df1ce013569cc13f18851273da3c1d8509 WHIRLPOOL 72ab9db58379041a80fe899b6ca25a37194536ed2c0bd76ab43092d65817dff300cb03ff709e4765daec65be6745a6297844b7678b64185a4497309310bb9207
 EBUILD netbeans-nb-9999_p20160902.ebuild 4111 SHA256 c2bf444f66647328c55216168b2204ac355470292269a8d8125ee5c9f74b62a9 SHA512 51137098a857c2587a906f83f7687600413cf08f22cf303dae69f55b18fcf3e17bfeb4053a74c541481bfdd66f2fac49f6ca1d982a74884a3a05b0eb04b71f0b WHIRLPOOL 3a58494bbe8414f9460c93d9bb3a8bb537b06ad50844b1e15706ad9b94c14446609c3581a89d42e189af69206743e5ef9544712663e163de586bbcaa2d53d12a
 EBUILD netbeans-nb-9999_p20160903.ebuild 4111 SHA256 a7d284fa1e53b7b70944aa09538924e77529422fc64bbdb283ac58fe6c7224e8 SHA512 4ca9f520a3a98fd6cbe3e6c06f621f8b361f4d898476830cc0d0adaec228cec3b4c3c475bdafb8af3528d00f599efe8b9c7ae9a69d87393881b53d59df67e458 WHIRLPOOL b5b5f8cf90dfbc7e4848187db3165eee5f3c78933f53c52236d8be02a6860e3f2821f681523879be6f4c32b74a7055290e156ea3a89eec2b668a6e8401917553
+EBUILD netbeans-nb-9999_p20160904.ebuild 4111 SHA256 13905c43a2c31a16574baf7f6e3804b4be13bc6af7661c9cb47ce3c2a4484a6b SHA512 c9f046eb96b1840600023153590d02579b8b0f546c79a6d0515803658713ea719aa629fbe7412c0e8a576877e506470b5e341880ead6ee1bf7c4e8615dd25295 WHIRLPOOL 3bd9570835d4cc8f5f8e7931edf85e3c05a6d5bf1f3a43a84c11b619b1733c868bb9c9cd7bd1250678740fc323857682b095bab5eefb937162cc3e4dddf98cdb
 MISC metadata.xml 392 SHA256 01cdbcc83099b97486bd7b8e813e5b19c1138eb0d8d3e8a5683aafd579820435 SHA512 4d2f9160baa022d6a48b61d5f42e71cfd411d244e7a36436629bc5ee4036e4ce19079134d9a6c704ebe942306c2e0199d0591c1e54f92f8f3c8835147e639246 WHIRLPOOL c1131764e1cec66c56b977ebe36014b29e5a68e35ccc326c0cbadd050a6c625cf191c85c212e0a733661c008dab0d99f9a4cdc4c4ae0cc9d775ba1de554795a9

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160904.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160904.ebuild
new file mode 100644
index 0000000..aa6eceb
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20160904.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-04_00-02-33/zip/netbeans-trunk-nightly-201609040002-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 2ff7adb..4298230 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -32,6 +32,7 @@ DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
 DIST netbeans-trunk-nightly-201609020002-src.zip 217296178 SHA256 6632afeb1d3fb3cf91648945d03703b474ac9ee5d6855f6a4732bd6c711c1d9b SHA512 bb9f63963e2895c46a0869fd48e401c5d14325e63cea951ddc6385f88dd6fef8385783432f094315d521fcf8795f28997a13fea249e957949f1cc021827152b7 WHIRLPOOL 64aeace6080e9fdfef49484fbf32665a1dee2bd0c597dcbe0d22e5aaf486d45e7f1919cb826b0273dfca780b80d9e19de616b638ac775190b1493a262c269d81
 DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0ecac361b9c3fde36c0680843b36b13edee0c77c82ce82de1fcb SHA512 4da03b4ec722bd3ce3453e1e9e9753f1d7ecf48bb15b3550270eff8748e74765c1dfe3af9e5eef7fec036d352d513797b0619042d76537b8670b55e29f52340f WHIRLPOOL 8d036a278c24075565fdaa6791f04a2cd413f5370c77688a225dd618bfa14c4a8926639b9077c5526084edfdf35de9aac4126fa62af633306e4e15b4985d0065
+DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 4418 SHA256 521f26a4aaf11c9f8c83ec8579139f3e7602cad7d305610f7c39b9e928231f69 SHA512 67b56b4c640b26ecc4b5dac146a07490944c8139da84a129259b88461fa8e6d3268f1b39becff6da3e49aa86b8da666dc7a1a52de02ff3a7188f0930f6f59480 WHIRLPOOL 9e017f383407056f3b242db533162cce5adfb83c7bcb731f54bde9637a3f5a0915abcb5a4cda1e7abcc30879e39d656105b6fd45e7a83f043ee4a2d66f82b89f
@@ -58,4 +59,5 @@ EBUILD netbeans-php-9999_p20160829.ebuild 4418 SHA256 8271d2a5823efb1756378ff76a
 EBUILD netbeans-php-9999_p20160901.ebuild 4418 SHA256 4c21387443b8257d5598bff2323ea12ee5f59bcbbece9aade5176ef8649bfc72 SHA512 92d4305f2a4260652df7ac8bde324305eab2d89f5061f91aab5b946d0c739cc832c08475a21c745aeb2999a8bb19508dec63cda7fd46b1beead680c81290b77d WHIRLPOOL 37b231db271985e5b1f187c7b51530f740159c0af14444adaa03bef9d1f39d440d3ea8195502c8c8de771a0af6ef89e593633ac52b3f476ea510ee302aec6da9
 EBUILD netbeans-php-9999_p20160902.ebuild 4418 SHA256 7eb52f802b8565a63f235db9a36e3451d065a403ec40915184624abcf3a4d7d0 SHA512 f56f6af07f84b84c832482dca39fa794cb36acdf28f32e1ae9762429e31a23046163b3ea1d7bb8d776399b3a19ce2a43961a8ba8ec92ab14577dcd7a23ebe070 WHIRLPOOL 5a1cab69434820eb7f042c1fb1d85c3c48a66f6815149b95c95bb4fb4f7e353f31a86830f86933156ce8891bdcdd03b89a7d229ceee7e856021aa4f9f080dd1f
 EBUILD netbeans-php-9999_p20160903.ebuild 4418 SHA256 c0da03da74ad432614935a2c5178114b6a50ff9e005da1e03578d34b3ab12a18 SHA512 1cc5e1aadef55aea4e0d17f4b4e97ade49c091b14cae0740d6282373432d4f682b2e091fb32efdc20586afc3e74f3bc70f9592994f1ac2150e451e9d6d338599 WHIRLPOOL b6c9f0b2519165a73a212976a45fa5a02762fa1cfe784534ab07f87c3579b9151aa389700af9437489262effbb3c84f92baa0d16c4413e8dc28da32e9addf165
+EBUILD netbeans-php-9999_p20160904.ebuild 4418 SHA256 a17bc9f6e62b924bf20ee0470be1fd2a94ca037c28cfe25420942c421618f752 SHA512 2253cdfab4a994e9e55be449d8f8184f0523ff9557c431ff9365df5aa57376f33863afc51228f2f3288bbf7b1cc47ec580e2fc3f6a71d0b738595e9457304b86 WHIRLPOOL b441b3265616095482152deacc3df59f6bc505a1f0a6884153841928addaa13b0d6e2dab8fbae69b2b5872728f24041d60ecf98a193ec0d92dca59270aec7937
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160904.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160904.ebuild
new file mode 100644
index 0000000..dde5a35
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20160904.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-04_00-02-33/zip/netbeans-trunk-nightly-201609040002-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 dbfe1be..2baf33d 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -53,6 +53,7 @@ DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
 DIST netbeans-trunk-nightly-201609020002-src.zip 217296178 SHA256 6632afeb1d3fb3cf91648945d03703b474ac9ee5d6855f6a4732bd6c711c1d9b SHA512 bb9f63963e2895c46a0869fd48e401c5d14325e63cea951ddc6385f88dd6fef8385783432f094315d521fcf8795f28997a13fea249e957949f1cc021827152b7 WHIRLPOOL 64aeace6080e9fdfef49484fbf32665a1dee2bd0c597dcbe0d22e5aaf486d45e7f1919cb826b0273dfca780b80d9e19de616b638ac775190b1493a262c269d81
 DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0ecac361b9c3fde36c0680843b36b13edee0c77c82ce82de1fcb SHA512 4da03b4ec722bd3ce3453e1e9e9753f1d7ecf48bb15b3550270eff8748e74765c1dfe3af9e5eef7fec036d352d513797b0619042d76537b8670b55e29f52340f WHIRLPOOL 8d036a278c24075565fdaa6791f04a2cd413f5370c77688a225dd618bfa14c4a8926639b9077c5526084edfdf35de9aac4126fa62af633306e4e15b4985d0065
+DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 9520 SHA256 37d585dfcb3fe3945f1a40493695892af455f99a6ad6b4d33663251494e56a4d SHA512 9fa9e38328bb44b437b04a877be340d234b6d1a0039de75bb61852f142174f3d73b227828cb6bfd2def19050cb5102ee3c8f4b98e9044df51b667c81f937d4b3 WHIRLPOOL 66490293a57c48db63f947de70f0f2d505b8ca3d86f4b09e140c1f4ba87fe744d07dd58ad272d9ce877b67e827a4c65e25fe63839142e8c9a7f8c626a3741c8b
@@ -79,4 +80,5 @@ EBUILD netbeans-platform-9999_p20160829.ebuild 9520 SHA256 0f78647b9f0684f9c3c3c
 EBUILD netbeans-platform-9999_p20160901.ebuild 9520 SHA256 9e58f6281f7dc2b135e95047be70133098c8aa8841e72a51942b88b50da5d51e SHA512 01e963910202ed93b07ac1b99dd9214fc88989d27904dddf2082cb7f334035281bfff2c4fa63a7d5ef115ce5fb43bd4d42e5d6d325f65c995e662e63fee6e969 WHIRLPOOL c6a57988c8c04a6c2efd4abee7719e7cea63e135b944e167109e343f47b3dfe3b44573b48e76aad2bc3e6270ff166d45daad99f250cad94f7d8229b96bbcb178
 EBUILD netbeans-platform-9999_p20160902.ebuild 9520 SHA256 1ad4417b676389ea8b175332ba961ca4811a1b324562cc49fe59bb4528eb91bd SHA512 8d4fe130cd0f0b0a41672fa86ae1e6359b80a6eff8f996203171d1e1fb6dfca60aacfab24b0f565d5dd780f167e19ecdad28c21062ca045b69761bed4c49728c WHIRLPOOL 8ce61effe4e984dac4bade67704dda5eb15566df0f4f869796cdc5d7bc7107ef964fb2a593eb504fea424af0ef5994f8172660d9438f0dbb16815a4fb26e7464
 EBUILD netbeans-platform-9999_p20160903.ebuild 9520 SHA256 6276fe781629a5adad6b9b3df582924286c810e2232a01b0821153400d47d2aa SHA512 ddbd3b083bb45f4218477b7a7c5198c6212864e37a1c6f9032fbb57243ca1c09fed5023eea2c6c15658859d6f95a9af1ef6c9139968b4eb456d8fc17302608cf WHIRLPOOL 667caa6aa1d54271ee918a0daf4dd1cfc7f46734f76805c67092cf71b5782dacd11d0891891db8bb628fd33055abb6f5322ba9738c466fca4bc23d3645e9d8ce
+EBUILD netbeans-platform-9999_p20160904.ebuild 9520 SHA256 2f94cb4b5561a356deb3c4c18b9e4a3f3a1473932a7282bacc18463067c85b5a SHA512 4cb75ea59f4b8a31f378b607e3c7e873da8bb1d1b1df7f1cf3c93cb67cc842835516e966ee1d43d55f573b802d1e1d8fa724fc4a2df965354c5d75749aea4fe2 WHIRLPOOL 41c4974bb9346578722d41c593ecbdb7f68842f6c1130cfd861c36313843ab980aec21b12629d1720681c1e78a6058f2040d8535a412fefd44a210777f0b0be0
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160904.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160904.ebuild
new file mode 100644
index 0000000..48a52fa
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20160904.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-04_00-02-33/zip/netbeans-trunk-nightly-201609040002-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 ff8023a..9c8253b 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
 DIST netbeans-trunk-nightly-201609020002-src.zip 217296178 SHA256 6632afeb1d3fb3cf91648945d03703b474ac9ee5d6855f6a4732bd6c711c1d9b SHA512 bb9f63963e2895c46a0869fd48e401c5d14325e63cea951ddc6385f88dd6fef8385783432f094315d521fcf8795f28997a13fea249e957949f1cc021827152b7 WHIRLPOOL 64aeace6080e9fdfef49484fbf32665a1dee2bd0c597dcbe0d22e5aaf486d45e7f1919cb826b0273dfca780b80d9e19de616b638ac775190b1493a262c269d81
 DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0ecac361b9c3fde36c0680843b36b13edee0c77c82ce82de1fcb SHA512 4da03b4ec722bd3ce3453e1e9e9753f1d7ecf48bb15b3550270eff8748e74765c1dfe3af9e5eef7fec036d352d513797b0619042d76537b8670b55e29f52340f WHIRLPOOL 8d036a278c24075565fdaa6791f04a2cd413f5370c77688a225dd618bfa14c4a8926639b9077c5526084edfdf35de9aac4126fa62af633306e4e15b4985d0065
+DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 3472 SHA256 9e18bfb3068b1c55766af682d3248c8337d18faad1344092a9c35f42a6d8e626 SHA512 c69bba3bae120d6bdb9eeb3c27663b56a0bb3f11fe58ab3f100175ff8e5dc214d6ea87d3587071bffa2d26569b410b09477eb4a55978ab25d63edbf956598df0 WHIRLPOOL 0443cfbe6289fdaf07720ce3816a1585b2540bf0611645eafe3395104df4862f0fa25f5d907794900648cb28b4883911baa8e607a646dc74b5945ea60168ffa7
@@ -53,4 +54,5 @@ EBUILD netbeans-profiler-9999_p20160829.ebuild 3472 SHA256 5b2114102e446e49f573f
 EBUILD netbeans-profiler-9999_p20160901.ebuild 3472 SHA256 f5edd5388e32394979dc528bdf3818d27500a6ded3041c07a0e675bbb3274af3 SHA512 1c312dcc8754a84121916706864826e36283e73611744977b5821ab25cb6aa8c7768f1a42f1daf68a61a0b2b62a90fdc741d45a5855682c3b4292b75c02b5a12 WHIRLPOOL a792c1d76aab6d528d6a43b0e440fa74b75bcdda092d1ff994ef2d9b412e2a43dd9c5c81d51a06daa8ae51d7228b73994d882fb1bad2d39e04b5fff55fe38622
 EBUILD netbeans-profiler-9999_p20160902.ebuild 3472 SHA256 0004247b6668fd223edff24e1793f13a9ceefcda665230b5e7f5494634b15189 SHA512 ab2972f4fa5e525505cb00530f652da76384253d2459796459625fc0a63d178d5f36204cdd068a57b5c3ffa5dedfcf810d3d1510824b829510365652c85ea98f WHIRLPOOL 98d14bced6600c4afe105c8b9f7e521c475a61c9b6a89992b6e7e38fbb5311cad67ca97b1808764125957eeb7f5afd6fa8c39d17b0603c16afdb91225cfdda6a
 EBUILD netbeans-profiler-9999_p20160903.ebuild 3472 SHA256 b5cc8b42343a869a356e30976b3dba0c3509cf7f7c72d594e9c9800e19647cfe SHA512 de5ec146e0b69ebf144d4cd5dc11a0b55923483101837755e5f76ffcdb13e1fcd90669689e067d0f92a31b7f51caf2e0c5ee24eaabd3151a6601cd6a8e191aad WHIRLPOOL 8ac34b0e90c949f90bb729335de7c953973bd1d5206cb0f649177c1642151f6fd97fe4987726fe9d8108dc4e1b565c764fe82f163c00addaa30e598fce260095
+EBUILD netbeans-profiler-9999_p20160904.ebuild 3472 SHA256 cb0ee8c87fc41d375f921360485d437360fc857b502755aa66d7ee0ea94869e4 SHA512 3e645315f7ee10c281740a44cdb4ea4a68669f94899f6bad4f0ecd480eab13a98e293cd2d7082d6f688e20e31a824e543f6a6f2dbbc68d18915c5adefaec9691 WHIRLPOOL 564973383e38fd1c9fe3664fcb76d3410bc660c07c230c1939b1fd5054ebda1f905819a9dc831ca068bbc29dc1b88aea90ae47308ac1ad4106e183d87dc2a2cd
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160904.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160904.ebuild
new file mode 100644
index 0000000..2a84d4e
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160904.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-04_00-02-33/zip/netbeans-trunk-nightly-201609040002-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 c8f81e0..c327cfb 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -46,6 +46,7 @@ DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
 DIST netbeans-trunk-nightly-201609020002-src.zip 217296178 SHA256 6632afeb1d3fb3cf91648945d03703b474ac9ee5d6855f6a4732bd6c711c1d9b SHA512 bb9f63963e2895c46a0869fd48e401c5d14325e63cea951ddc6385f88dd6fef8385783432f094315d521fcf8795f28997a13fea249e957949f1cc021827152b7 WHIRLPOOL 64aeace6080e9fdfef49484fbf32665a1dee2bd0c597dcbe0d22e5aaf486d45e7f1919cb826b0273dfca780b80d9e19de616b638ac775190b1493a262c269d81
 DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0ecac361b9c3fde36c0680843b36b13edee0c77c82ce82de1fcb SHA512 4da03b4ec722bd3ce3453e1e9e9753f1d7ecf48bb15b3550270eff8748e74765c1dfe3af9e5eef7fec036d352d513797b0619042d76537b8670b55e29f52340f WHIRLPOOL 8d036a278c24075565fdaa6791f04a2cd413f5370c77688a225dd618bfa14c4a8926639b9077c5526084edfdf35de9aac4126fa62af633306e4e15b4985d0065
+DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 6242 SHA256 69f1b62f9854561efb578637a3e15ebcfff378922782577ea06c7043f40d39d1 SHA512 20576ede88474e3c3f7fd2e72384675c60730b9c5f4cfb452bc7a87905308feeac77307a855f87978c044c308be68584e9375850b342cd48eba214b113e5aab5 WHIRLPOOL 0bc8d4883a57af2ed2d5a5ca84d4902b03bf1434579defff2737d6e47a5ea23154c73e58efa000a123dbb74a677b68ce1140640d2d06b6cd0335cb4d6f481cb9
@@ -72,4 +73,5 @@ EBUILD netbeans-webcommon-9999_p20160829.ebuild 6242 SHA256 ef73c787c9210d44569e
 EBUILD netbeans-webcommon-9999_p20160901.ebuild 6242 SHA256 46564b33607829cb2f0da5a2167f53a1be8a62c2c4f8754ef3fe384cf3bea584 SHA512 51558f03f77aa0c85ea437860a62f307b56187e43fc0a2bc1724011c62599a17b157b212e42c27b90cd4c7b2227cb541002ef4738d546afc6196175525e9458a WHIRLPOOL e41cac853513b3e3fa214ba2747fa32b0054dcd56c9d13f985c15400076180607ba7c953818a07165a979e584618d65b58bee623b80c103f739a9835762d79dd
 EBUILD netbeans-webcommon-9999_p20160902.ebuild 6242 SHA256 b6391591e1d5a6a7814a6578720c862e5b395747ff94f63ee82c915d13867234 SHA512 564fe2c6a89bc3dee07fb80e07cd953d1dd8dee5f04135e7fcb41c738fcc70fc8fa4f6fffcfb394954636ff744f5160aea07f0004a43ff1c8f9542fff22a09e1 WHIRLPOOL 815d7c6fe6689a004740afd0677bf2b3cbecc37456cbba9103ff48e67ce2f0b1ab62170b16e958b8e3658fd4d1679de54d7d6f391da64bc9696bef0aded5d558
 EBUILD netbeans-webcommon-9999_p20160903.ebuild 6242 SHA256 63fc4965bcfa94463df38e9f35ceedb03cb46ed00e50d738bc7be60e777e2516 SHA512 03b1eeed9b60778dac04f254f0b3de138bbdee4178046dd4fa615d1ec52ad367c1e655d6a2120e796b5ab1a50f1984d7ba5aec877a9e11c965851719b4b13f8d WHIRLPOOL 58d570e1fbf329488fc5d517557575f6167036f5f66c6f43c85583ba61460d3e64587e45f99d5b6d0aeccdc86acc8bfdf1b76632384c029755cc473026c70ee6
+EBUILD netbeans-webcommon-9999_p20160904.ebuild 6242 SHA256 a09736d7ab4471e200f2e519da6373461cfd9a8c7c9449c5d8bc35aea29083be SHA512 723efd1d67ae020c17788e56b35f24681d5e764086c85f95503ed19218b30316a20e91691c09fd15677b07481b8fd3decd5b7fb012d86bd797d1218259cabc9a WHIRLPOOL 06f729a75270f6c89e7ec6d5e2739210be822d04d0a74b80e279444511da95d9be9bd915ed60bd7cbdc15e10774cad68d7f343fbcc0e53ade4be58dfda65d284
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160904.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160904.ebuild
new file mode 100644
index 0000000..80ba02d
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160904.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-04_00-02-33/zip/netbeans-trunk-nightly-201609040002-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 7a66eec..8d34964 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
 DIST netbeans-trunk-nightly-201609020002-src.zip 217296178 SHA256 6632afeb1d3fb3cf91648945d03703b474ac9ee5d6855f6a4732bd6c711c1d9b SHA512 bb9f63963e2895c46a0869fd48e401c5d14325e63cea951ddc6385f88dd6fef8385783432f094315d521fcf8795f28997a13fea249e957949f1cc021827152b7 WHIRLPOOL 64aeace6080e9fdfef49484fbf32665a1dee2bd0c597dcbe0d22e5aaf486d45e7f1919cb826b0273dfca780b80d9e19de616b638ac775190b1493a262c269d81
 DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0ecac361b9c3fde36c0680843b36b13edee0c77c82ce82de1fcb SHA512 4da03b4ec722bd3ce3453e1e9e9753f1d7ecf48bb15b3550270eff8748e74765c1dfe3af9e5eef7fec036d352d513797b0619042d76537b8670b55e29f52340f WHIRLPOOL 8d036a278c24075565fdaa6791f04a2cd413f5370c77688a225dd618bfa14c4a8926639b9077c5526084edfdf35de9aac4126fa62af633306e4e15b4985d0065
+DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 2721 SHA256 b1ee00734f3213fded0e0fcdd807bdb20a114ada052451df6e3566142949735c SHA512 01e7acb1638070ca74e7d31fc29fc502f60d30bbee61a64e751dac7503cd6edfec84fd1ee00d54e18ccdffc560cf3bcc0255bc06d8f68519ade5b4606d240cab WHIRLPOOL 28b0a1f3f065590227678a99efcd2f28b7e78da4e19b86b4518e4a28b3884bc43a98cc5c7ee12ea4de833a15319227eef62ccdaac4d28214dcff5bcdd425f79c
@@ -53,4 +54,5 @@ EBUILD netbeans-websvccommon-9999_p20160829.ebuild 2721 SHA256 3dac61291723c9248
 EBUILD netbeans-websvccommon-9999_p20160901.ebuild 2721 SHA256 91c5896de81d6ec33f5170b1ae03eefdccc531fe717a7965b29b1307736fd2fc SHA512 dd006f9188a31b559f452b844b9e82fd221536d629c55a8ad0d617aeb20f9d4cc905edf7e640acb8fdf783282004bcb036d13ee0c744104b0028d29e8bf33d0a WHIRLPOOL d329b2bef5896dcb93946f8bd6f1495ad5b4e125c38ae449eead2e9491db0766fcd895254e3f95e2ace97c29771eac434c82744d35dcc025879b5b0986b27ee9
 EBUILD netbeans-websvccommon-9999_p20160902.ebuild 2721 SHA256 a665a8e01867973c6572b49b7115b82cbd21798ff5032278488cbf6a1783072d SHA512 286157850a10f1322d379058cc51be952f1ca622253bb5aa786d1bb6fc27f0957df1fd666b8451fc4ea293f821de38694835312bb0e8549b75957c03455307bc WHIRLPOOL 058e4288fffad281c2ad45f258f04665cc2aec3d728ccf9bfbda3be99768521b5970e15eba4e22da365ff66d58ded4898a03601ce6440e2456043a5593c6958c
 EBUILD netbeans-websvccommon-9999_p20160903.ebuild 2721 SHA256 9cae6e8d7a7d95bf07b7df8f4d55d2172a2b3587d2cde176a8d2471e3f2895d6 SHA512 98ab9f7c7fb6fcf27ae35d2289b1fbf0447c73160beb5c0b8a0c2c37a6dc2f4b3e3e66748bcb502ea3bd12480143838900b733d6734635f402b58e72f3e07c94 WHIRLPOOL 6b9ae4a1343d639dead69c408c8c2bbca7f237e6fbd2118df58d80e41b79376a17b915ff643b4c39b25268418bcbf85759e62f395a64e19ae87190ba5edb2418
+EBUILD netbeans-websvccommon-9999_p20160904.ebuild 2721 SHA256 6bc66b44207a503e93e0b2bdd282888e70ceca85b148c38e2ad534bba5cf1adf SHA512 f746abb31a33a27860e80fe723901fd82ebe290b6003b6b914831706bd56d980dda817d791ecf3967d172580e8cff7b64c0a11b0a4cf4b7e5fe851c0ca2a3550 WHIRLPOOL ded112eaa645f68b1a71c9671d65279314fb2535ce5e78fbddbe873e967fde781a7ebf77d0a911f9e8b9cfa02fa3d01d689ff2dfa69c01e2e3231b278488258f
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160904.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160904.ebuild
new file mode 100644
index 0000000..c35ea20
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160904.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-04_00-02-33/zip/netbeans-trunk-nightly-201609040002-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 958b65f..754368e 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201608290002-src.zip 217265282 SHA256 99023c8224a7dc
 DIST netbeans-trunk-nightly-201609010002-src.zip 217266043 SHA256 248db4918ecd15952abe8450f74d45ac25a860ee6dd84db7aebb8517b5c234ae SHA512 a47b7ef9f5b5869486d5e39142c0a5d8dc45330b2dfe4d04a77a3a9ea836dc018f0ffac3e6628b69f362156397429a8a08f15600bd18c5765dba26d2c36347b1 WHIRLPOOL 52af0a8209f3d49c61c01a8d1c0bb8a5dbd9bd23620153388c97a351e91b7c5445878b259975711ee90fec4bae80c898dea4b31f61687e20925dfd559aeadd6a
 DIST netbeans-trunk-nightly-201609020002-src.zip 217296178 SHA256 6632afeb1d3fb3cf91648945d03703b474ac9ee5d6855f6a4732bd6c711c1d9b SHA512 bb9f63963e2895c46a0869fd48e401c5d14325e63cea951ddc6385f88dd6fef8385783432f094315d521fcf8795f28997a13fea249e957949f1cc021827152b7 WHIRLPOOL 64aeace6080e9fdfef49484fbf32665a1dee2bd0c597dcbe0d22e5aaf486d45e7f1919cb826b0273dfca780b80d9e19de616b638ac775190b1493a262c269d81
 DIST netbeans-trunk-nightly-201609030002-src.zip 217283280 SHA256 5c8e693c0a9f0ecac361b9c3fde36c0680843b36b13edee0c77c82ce82de1fcb SHA512 4da03b4ec722bd3ce3453e1e9e9753f1d7ecf48bb15b3550270eff8748e74765c1dfe3af9e5eef7fec036d352d513797b0619042d76537b8670b55e29f52340f WHIRLPOOL 8d036a278c24075565fdaa6791f04a2cd413f5370c77688a225dd618bfa14c4a8926639b9077c5526084edfdf35de9aac4126fa62af633306e4e15b4985d0065
+DIST netbeans-trunk-nightly-201609040002-src.zip 217295386 SHA256 7d335bb6aa43f4cbe3c78a1c217a325fe9c8ec7bc9adfb665f8000317e451ba8 SHA512 d3221f234fdad2b3853d9def32857efbeaae870ae04047afd2ae2d04c3c63def10fec8c8ffc99a6c652de232396f50706f153cea5af97e2c7af7e740c6938791 WHIRLPOOL c09fd497bfd599c604744b92c6a2feaf74aa8eba429c9eeaeacec7effd895eb1c1eebe264c6ff49232ce4d98d76274ae42c1a930e71e5de2ff0f4c3a0d132dc0
 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_p20160726.ebuild 6939 SHA256 6d77d80205042f72e52fa2a6d98f4d8d940e3298f2e67c4db48cf3360c9ad470 SHA512 70bae8da40f377610552d1e108797602a61130c3c7910bb8c65c832242937e8e26e986706197f21ecded09709facfa1b6b2753b845cf81dee8bf8335cbf3de55 WHIRLPOOL 27273a5debefbfdcbe9f45c5383c104ecea9e1b4dc7793c7941196dc8c4d17c708f6d7d6fdd7b328afd2c86254a9376e167df8f16f0356d9e5c8866d9d83986a
@@ -56,4 +57,5 @@ EBUILD netbeans-9999_p20160829.ebuild 6939 SHA256 0ef0e941b9969a3c0d7fdee5eefff4
 EBUILD netbeans-9999_p20160901.ebuild 6939 SHA256 e5770caa7f53a2d42a136a4eaf8ee427d6b160c097e3eeb9cd6edfa73d0f40c1 SHA512 e47e2aaf66892b07f9e4bbb31b2643fef1141c86d780d6d1d0666f1678674dda490fcfa8edebf4527943c1426531f423460b06499c1821abc3e38d784ac5e848 WHIRLPOOL 0b7dfc7134c5f3966a1299e128ee8257a59dc49a072e6faae9a2ea76ddda1fc6e7dd9d8ffd67e8091a74864817e340e06a2246822af903581c4ad59c953cb972
 EBUILD netbeans-9999_p20160902.ebuild 6939 SHA256 22b3583c58376a84e2250f9ec8ed314c502c0dca178271bb279beb3f3cf9184f SHA512 d3d50613316f791b03de94d7c8d732037f55f9dde225359ed4b207d47c763492f8a8f58959973652615f75dc1f8b87ec50aae224afdc67f12d9f739b7a64e9dd WHIRLPOOL 9bd2bf61317489ee634fc899bd0068c0d220e4df607318f9e41fce4f77a6774d382a7d8d6119d44f6c0599411756d9bd3765187e22016202e31b85a3d68d99f2
 EBUILD netbeans-9999_p20160903.ebuild 6939 SHA256 c1ef0a5fa1d6014ad0f06f4e19bb3a10fd213b15ad44895efb58a747d37a9960 SHA512 44f8c95f94342732891b34091f2c6c653a90b0cf5e402f2d80088c17d5d9978f6555d553f7f4765c12042ed7752274d880d3e78a76c256d0b41070d7f0535b19 WHIRLPOOL c5c21860c8082ee1f592dd815946c91b27eeba867d9d53d021935b7d5816531d8395c6f75b8f6d8da3beb5a55db24744bfee16faf12d363e7a90f933b714926a
+EBUILD netbeans-9999_p20160904.ebuild 6939 SHA256 a95dd06b25a5a2472489f04d9c8ad979a3ac39a0de42207fa00493f79a2eadbf SHA512 558ff853f831c12c01b89b2f635bdd0bea4741652fc086be8cc7cfafd8ba2cd118b4c65e10850bf6141a7c7118b32362951d4e78623c0dad7feac47d70a83787 WHIRLPOOL 8ddfcdf88ca189c19c8db25fe2c848373ae52790473535bd57235f761f169ff938161fc62f24e6cd56403c7094f6117f2e0e7afca61c4897d634da32ee765c23
 MISC metadata.xml 329 SHA256 8aeaf2a0228f15c2e4140f401b30f083509bd99d0a578873069f3595cd8555f3 SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640 WHIRLPOOL 799a9b79b1b447bda9631f67e2dfaf722376740e1d2037796528a05f9745eeed00d9990a74a65ce09f74bc5e1d60a887abde540c3c62487d7dd49b8377c15834

diff --git a/dev-util/netbeans/netbeans-9999_p20160904.ebuild b/dev-util/netbeans/netbeans-9999_p20160904.ebuild
new file mode 100644
index 0000000..f6506a4
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20160904.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-04_00-02-33/zip/netbeans-trunk-nightly-201609040002-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
+}