public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-java/, dev-java/netbeans-extide/, dev-util/netbeans/, ...
@ 2016-08-05  8:09 Miroslav Šulc
  0 siblings, 0 replies; only message in thread
From: Miroslav Šulc @ 2016-08-05  8:09 UTC (permalink / raw
  To: gentoo-commits

commit:     11bf3f0d30ee994c1bdbf83d96892a0a204a56f0
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  5 08:09:25 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Aug  5 08:09:25 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=11bf3f0d

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.3.0

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 5a0a9de..d3a3b58 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201607230002-src.zip 217014076 SHA256 b297107296d96c
 DIST netbeans-trunk-nightly-201607250002-src.zip 217019515 SHA256 4f7317d2fa0693c653216be2607fb8e9d2c90f6f22e650ba38971767cdea57aa SHA512 ca97c3cf0bb7bb7031e82445accaed1f09d971b81de6a8e11824c2232968c4acb92077af57d5a91c8dca029ce39f18b3e676a1fdf21ef7190a2a8577652f4181 WHIRLPOOL 64a2af5584458e9a415d83685f99387ad7c2422d21750d4c6234fa5922def0374517081a633837bb45231073fcd0ba366748bf6861d64d987952f4c786529cca
 DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0bf64eb9954902ac044869706bfb6bc6a3d6c3180db184249a94 SHA512 cf146c2b53ecf99feb93cb3ece2eb8be14b3764587d9dac5b783c5486e3f9ce1aa7bea55f3289e6aa8d4661511ed733f6bc125067ad83cff356dc46380cd8eeb WHIRLPOOL e9af0196209422a27085122ef2f2c3499f18ca82a01ee9fd4e6cd5ccf51888d26429e2dd90b705e0d2bc0c195856598f13715ae29ffa64b174e02e1617c3dd07
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
+DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 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_p20160629.ebuild 3384 SHA256 3fdfcf8f51c94feebff30161abaf8596121dff51ae4a5094dc34f3024daaaf08 SHA512 7428e5a53211d40fea6c9d9d586d463b24ef903b91f4b72da6b82952341ae635932797a68cc95f3cd1bd6af246be2896fc94a1bf8092385b35429db7c005d84d WHIRLPOOL c6b26d3994d587f3f4d8e67a51810e8e8060110b806725d726117197f5966b6006fc31be3eebe63db6ba3887a21f8a2e59289e1f11451cad497d233aae06e50b
@@ -55,4 +56,5 @@ EBUILD netbeans-apisupport-9999_p20160723.ebuild 3384 SHA256 84401dc7cdbbf634946
 EBUILD netbeans-apisupport-9999_p20160725.ebuild 3384 SHA256 1d86a358db627c1f19928420f98665d60acb427fe03befbe38826648a3bb01f0 SHA512 e5f8d5475939387ca1516b995aa452f9ed9716e6ebbc74b14fe256c2c4d7b5a9b7dfceaef8c77782d8fc6e6b47e3bf7092b36a84fb0603046c460d56de97a544 WHIRLPOOL 2a8b706a71e5868f0babf3bf29e25f9334d78b40c17b81cfac50ea7ebaf349c12dde8789da174c7f38c166976e8c04663937f726eee714a976994d6931b76ecb
 EBUILD netbeans-apisupport-9999_p20160726.ebuild 3384 SHA256 f0e45793d8d2a56949aff7f0239c9f63dcedec497450d521037281b52c699ee4 SHA512 ef21d03f27c1df2f86d7d8fd2bc08d4e98d13daa6f14d4ddff305c608901b810612d83247c737a2bd7b961c63d9c803801c29f2db67b7537a9b34cc1bebb4013 WHIRLPOOL 501c684661f3b3aea7935b3435d79566fbcab25b2320ab85e9221ce8bee620f5afc04b000de1ed0a465981f1514418e79523be9c7e807257ddc8a162e426dced
 EBUILD netbeans-apisupport-9999_p20160727.ebuild 3384 SHA256 ab73b674cb9068182e62ccea9f4df53a4f43ac984ba51af5cb352553f3ad430b SHA512 95f4f55af236556561e3ef8ebfa8aceafa04aebf3eef503ad6c3ac253eb9ada9949fa5984b77883bb43893283ec199c6c573e1eb120fbb7afbfa700c6c92d15c WHIRLPOOL af28d68e20c454b3478216d3c14bfbd7dc65a16aaff25068bc0da6377c8ab8c4968bb80d5f7adae514d65348d43f683b2fe50eba02cea26d7fedc24332435eeb
+EBUILD netbeans-apisupport-9999_p20160805.ebuild 3384 SHA256 3f5da5b7d0f77b1df1f12debe29669c3ffe94235b15c7e7870c0419f43e1411c SHA512 efc31b92392a555f9a166d236d22bd807973ff53825ff615c03e9d4482f1beca3807d2a3fe674cbda52e13ea054a484e2e75a5d66f59a14f191c9cd6c64ccfbd WHIRLPOOL f18e318f0764773213ff63bba4d4ac1df74af89b0c371a512f0606b42142dd669acc0b39ba97916e4adcff9f157e453e8868fa06e1fc5f97694f0c824c258e49
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160805.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160805.ebuild
new file mode 100644
index 0000000..7392e2b
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160805.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-08-05_00-02-33/zip/netbeans-trunk-nightly-201608050002-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 391f99f..4c339e4 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -41,6 +41,7 @@ DIST netbeans-trunk-nightly-201607230002-src.zip 217014076 SHA256 b297107296d96c
 DIST netbeans-trunk-nightly-201607250002-src.zip 217019515 SHA256 4f7317d2fa0693c653216be2607fb8e9d2c90f6f22e650ba38971767cdea57aa SHA512 ca97c3cf0bb7bb7031e82445accaed1f09d971b81de6a8e11824c2232968c4acb92077af57d5a91c8dca029ce39f18b3e676a1fdf21ef7190a2a8577652f4181 WHIRLPOOL 64a2af5584458e9a415d83685f99387ad7c2422d21750d4c6234fa5922def0374517081a633837bb45231073fcd0ba366748bf6861d64d987952f4c786529cca
 DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0bf64eb9954902ac044869706bfb6bc6a3d6c3180db184249a94 SHA512 cf146c2b53ecf99feb93cb3ece2eb8be14b3764587d9dac5b783c5486e3f9ce1aa7bea55f3289e6aa8d4661511ed733f6bc125067ad83cff356dc46380cd8eeb WHIRLPOOL e9af0196209422a27085122ef2f2c3499f18ca82a01ee9fd4e6cd5ccf51888d26429e2dd90b705e0d2bc0c195856598f13715ae29ffa64b174e02e1617c3dd07
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
+DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 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_p20160629.ebuild 4790 SHA256 3947dba3a41d59419448c102176ec03d42a202cfe2581c69c2e43b55665f1230 SHA512 726f246e63511149d5745dbb8e69e3d7627692c2dad034b890afd5e947c12b8aedfe0bbf1f349a4b234f01ccb0357771f11fb8e40c78026e29493fa583894731 WHIRLPOOL c681e4673b980acb05a3eb7a1cb1dfdefdb63e7bc8b31964fd2d07b3f3fe82b38509a4ef88b5a0e9b11807c0adae1702761f525944b68b311a5be1965f883a1c
@@ -68,4 +69,5 @@ EBUILD netbeans-cnd-9999_p20160723.ebuild 4790 SHA256 dc08c4c40e07e31ae279f9ab3a
 EBUILD netbeans-cnd-9999_p20160725.ebuild 4790 SHA256 1a6a47c15a27ff0c80202dd8d9a2bd495ada9b2271e86ee3fdb8c2af4ef1012c SHA512 8de7178abf45739105bb8385916c6a06e16e34ab13d47ac3840e2eed81e0a87cf53d3476c08658a632e5e763da369899b796549f394a93d09688093be54d89f4 WHIRLPOOL 7ae13d9b2cb409849f79d25ee4f16e3e84a81ed0def6f22308ef1b54db8d9df55c807312f31f1d1c208d832d4d26bc498c8d4d23dc1407c0d5d7ab709db2b8c5
 EBUILD netbeans-cnd-9999_p20160726.ebuild 4790 SHA256 3f49046069953d4fb2f708fe39dd5e779d94084591413fc1e14adfb1b41ae8f8 SHA512 31a7baefa4beab6f131652c482160bb97d5fe24e1ac5da2caa5d6ac665ce32a2047d140143d8f4e1a2ebf8ecd85958ad8b1057ae2aefcfc7c42aa0f10cb40430 WHIRLPOOL 1fd17c62a11782e5937093b01b327883e7ded5ae4d6e5d8df562dd1a98f69501d0ea4650da53dfdf171719aff53fb95ca84b2295f0b56fc53ad746f104097d1d
 EBUILD netbeans-cnd-9999_p20160727.ebuild 4790 SHA256 ff5c20dc59a64c25b4bc4e2576b01c702f5f6dc8224f71d1aea17b0d8eccf32d SHA512 fdb21f3596d8c9c949b4781b115b48cfa412b7f76d90c3205babf787771148938ee67d11b29d008f9c6ea54bd1fb56fe31ee93668aeafd3c887653a43e1df7a9 WHIRLPOOL 7747ed28f7e7574d206c6dc0e1afe119f90ccf5ea69e3c0b2a6ef3c020aa17b6511565cee939aa0ccd3ca8b68910385b2605da6f6ff5bb730d8b6a215a5af39d
+EBUILD netbeans-cnd-9999_p20160805.ebuild 4790 SHA256 e86abcabd7bf93bd5368f7a355879325edaa18548f1068614c4609eb4f0af4ef SHA512 7d550c1d8ff93e1b95a4b64c861d88f2be457a1120d35b0217163085cb3d0742b8cfa5a204644808932e299fc2762fac80e52c90f25c8d27a32a3f4bff309bb8 WHIRLPOOL 79c0f5b38ff5d2e0f88a4e69f880eb56ab7d71e270b99859044e06a953ccad56022f0ac4112e4de78fe9b86699ca98fea565cc8ebded5910b2991608ab73faec
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index a22fe77..3a7c117 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201607230002-src.zip 217014076 SHA256 b297107296d96c
 DIST netbeans-trunk-nightly-201607250002-src.zip 217019515 SHA256 4f7317d2fa0693c653216be2607fb8e9d2c90f6f22e650ba38971767cdea57aa SHA512 ca97c3cf0bb7bb7031e82445accaed1f09d971b81de6a8e11824c2232968c4acb92077af57d5a91c8dca029ce39f18b3e676a1fdf21ef7190a2a8577652f4181 WHIRLPOOL 64a2af5584458e9a415d83685f99387ad7c2422d21750d4c6234fa5922def0374517081a633837bb45231073fcd0ba366748bf6861d64d987952f4c786529cca
 DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0bf64eb9954902ac044869706bfb6bc6a3d6c3180db184249a94 SHA512 cf146c2b53ecf99feb93cb3ece2eb8be14b3764587d9dac5b783c5486e3f9ce1aa7bea55f3289e6aa8d4661511ed733f6bc125067ad83cff356dc46380cd8eeb WHIRLPOOL e9af0196209422a27085122ef2f2c3499f18ca82a01ee9fd4e6cd5ccf51888d26429e2dd90b705e0d2bc0c195856598f13715ae29ffa64b174e02e1617c3dd07
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
+DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 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_p20160629.ebuild 2968 SHA256 9c6a5702731dd8d67223462b16d07c889cd18318f4738fce2cbca0a52fa40afa SHA512 530f7d5d9089173f25d1dd19681903e396b80db9d46b17202615e1e3f4cecf0040124d247ad442de1eeacf8205dce08bb4f18749ff7d8efd09a11690fdfdfcd3 WHIRLPOOL 18fea7b2e26ef4ef2457ce88d26e35298373f50ccabdbbd118d3a054f8695aa6343e6e26db392053791e516e32aa1e92b211d8d91d27137b09a7b7e5856f4897
@@ -58,4 +59,5 @@ EBUILD netbeans-dlight-9999_p20160723.ebuild 2968 SHA256 77ce61705b89bbcc6ff6a12
 EBUILD netbeans-dlight-9999_p20160725.ebuild 2968 SHA256 995f70851172b30ab20ca77d72b67a0b418615b24cef98cae3676c689916e7fd SHA512 a7e4dbc214cd6529d1c9b9f017531c300bcc5d57bb303209c782cd71383df864b527c42e5958348b911b906590bc752d46ed7deb207993a8f18abe1ede8d89a1 WHIRLPOOL 8604c66afc3801fa98b90f315b99977482b000fceaefea94a987870c6a9dbf6f3e8b600eeb2c6d1474e6329aff2c29378f361ee4505c0ff3c0441ff7041a7129
 EBUILD netbeans-dlight-9999_p20160726.ebuild 2968 SHA256 c4fd510f32e35649b9e5a73979905ffdd65d28a5d2d0c355f8980423a6566795 SHA512 3012d48de23e892ca1cf372d7531ee8b8a13b329de7a6890b9995d2610b9390798689233c4946f9a835fe5c5d5d31b076e953ddbce1cc82b2f1a8bcf4dcbf41f WHIRLPOOL eedd4a62f3b46c6823dc3c14f74bf90524062f7829002d563f4f7f6e8715b3f577783d74bc9c6a3bd33c1876032fe86327e0b3364627a6155af2ec51cf64ca6d
 EBUILD netbeans-dlight-9999_p20160727.ebuild 2968 SHA256 9e077fe0be9c0262e855a7be471a0653119b6e840e6b486b2848566b29c31a03 SHA512 7f63a602791192a0cec627ec55ff7858c52780c2180a54f78699988117d532c80c7a27e1694c86eda94ba3f3828f46653e0c616f30411729ae6c6a1623f87bba WHIRLPOOL 782a83f52022c14ffaa63ba195f7f0a2f76e67376f93aa3bf760c5ef639b1c04d7f7c2b94e2a7c7a6dce248642dab937557ab1f1cca5b85db5b80552c822e92c
+EBUILD netbeans-dlight-9999_p20160805.ebuild 2968 SHA256 65a63164a7a9335bf7e2b35745f4f3aaea3ca1648be100315c4e5207b0618999 SHA512 3ff43efdc879ed064625f29f496f39922715e17248dd3501aaecd2dc8848ed3c8212f0c86b4f2e6968fe2a09c1f2198fd290f1dfc81966ecf90ed87e40d9be7e WHIRLPOOL 1bca4824c17c88a4a281c1ed5045b99857920b65f86959851d21b1dae5e89ad87650ac635398949462cc32700f92d264f0144c67dd27f691a561ee8ed0a7ec19
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index be4fef2..e05d53a 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -60,6 +60,7 @@ DIST netbeans-trunk-nightly-201607230002-src.zip 217014076 SHA256 b297107296d96c
 DIST netbeans-trunk-nightly-201607250002-src.zip 217019515 SHA256 4f7317d2fa0693c653216be2607fb8e9d2c90f6f22e650ba38971767cdea57aa SHA512 ca97c3cf0bb7bb7031e82445accaed1f09d971b81de6a8e11824c2232968c4acb92077af57d5a91c8dca029ce39f18b3e676a1fdf21ef7190a2a8577652f4181 WHIRLPOOL 64a2af5584458e9a415d83685f99387ad7c2422d21750d4c6234fa5922def0374517081a633837bb45231073fcd0ba366748bf6861d64d987952f4c786529cca
 DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0bf64eb9954902ac044869706bfb6bc6a3d6c3180db184249a94 SHA512 cf146c2b53ecf99feb93cb3ece2eb8be14b3764587d9dac5b783c5486e3f9ce1aa7bea55f3289e6aa8d4661511ed733f6bc125067ad83cff356dc46380cd8eeb WHIRLPOOL e9af0196209422a27085122ef2f2c3499f18ca82a01ee9fd4e6cd5ccf51888d26429e2dd90b705e0d2bc0c195856598f13715ae29ffa64b174e02e1617c3dd07
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
+DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 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_p20160629.ebuild 15825 SHA256 11f57bfcb0e6c75c5b6db35bc5287fb9ef0962faee72895d733e02182bbfcd04 SHA512 89e2c89a917a48198a2642e83e3f9e84b07c19bc9b6e4ba4ae96f831fd210a55bcb101614664828ee1df3167fe84a0372d326b13b248c5b5c09b7f41b732a99f WHIRLPOOL 9206c61df238922a70e4647cb8cd15971a9962ce70f4692d3e47b841d9fb4a89c54ce21307a50fcfc71bb4c1472ab3413575e7c935df6d8102b89abce1e53eb6
@@ -87,4 +88,5 @@ EBUILD netbeans-enterprise-9999_p20160723.ebuild 15825 SHA256 dc842810ba9ddfa9dc
 EBUILD netbeans-enterprise-9999_p20160725.ebuild 15825 SHA256 18c5bbf7bcc5a321cc2da55b8efddf6b2aba8df5604b1d91d7b2bf6829f80ab2 SHA512 919b78b18a883170a9cba70289f3dfbcfe0ea363091bfea04bc9602c05997b0b708a4f3688fd025af1fa34618754816cd84354afd03a17c7717a2c2035e1c2db WHIRLPOOL c0f53185bd50c6af1f462cfdbe918ed5abe668aa7dd39a9b3228e3a2cac5c0ed66c111bf4b7c13bf9e3e746a97e3f68b00115af1eb018b7ae531e76a0d4648ae
 EBUILD netbeans-enterprise-9999_p20160726.ebuild 15825 SHA256 e4824e152bd518440ca8e09ea452519a3888f4f5868ac466596b138c5b2f61ba SHA512 c1ef3b8c2cd54238ad1c5b77d2c0f7d530c9f2e2194a372879eef06d37a7e23df087f98a529e598270ca6bd8e3a78c5e52a08e8c1085e0a6c5b46b433f3c9496 WHIRLPOOL 2a39dfaf18a3225e2c7050573f4c38897057b11ef1e62c85aa147760a840c20442ba8e1e6901f00606ca96c50dade0713596820f1453c2cb9c826ab7bb37cb3d
 EBUILD netbeans-enterprise-9999_p20160727.ebuild 15825 SHA256 b6ef55a6c439ea4560b430a61424d45f0f2b341c9494aab0cf3a1b1164883f44 SHA512 ccc5efbfd86a93154ff936c4efa544581182d6fb8885e200d1352c61dc7d017457d93e0e3feae87e8ec8ea0054342eaebea1fb521bf50b9871bb9f292086dd77 WHIRLPOOL dc146537cdce16aa436bb43a118622bf72867a76518f76001950238ac885f3f8558fbeee2bbcd3726f49e4f6698d37c208a5bc9ff98e6f33413db42ec65cf199
+EBUILD netbeans-enterprise-9999_p20160805.ebuild 15825 SHA256 10da3ae881c0b780420c32e01ecba246f6b53e57ba8644e6635c5aeaf0f61cb0 SHA512 ace696ee8188f6b330af0d063d58090743fcfd3993a6c607f8a36ec788b25500db353fcda7e37dd427fd48e0c2d50fb67e69f64938d4a3deab4cf1c201eae7f7 WHIRLPOOL 4faf167a5a7fb6d4d162f2192762729abd2418cd41f4480d81aa746df2cafd95384bf40ee78cf063e0034b02e2271ccc7c9848b4f3e72b9ffeb427461cb5d170
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160805.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160805.ebuild
new file mode 100644
index 0000000..8712a66
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160805.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-08-05_00-02-33/zip/netbeans-trunk-nightly-201608050002-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 7f1e7ca..db8a0f0 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201607230002-src.zip 217014076 SHA256 b297107296d96c
 DIST netbeans-trunk-nightly-201607250002-src.zip 217019515 SHA256 4f7317d2fa0693c653216be2607fb8e9d2c90f6f22e650ba38971767cdea57aa SHA512 ca97c3cf0bb7bb7031e82445accaed1f09d971b81de6a8e11824c2232968c4acb92077af57d5a91c8dca029ce39f18b3e676a1fdf21ef7190a2a8577652f4181 WHIRLPOOL 64a2af5584458e9a415d83685f99387ad7c2422d21750d4c6234fa5922def0374517081a633837bb45231073fcd0ba366748bf6861d64d987952f4c786529cca
 DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0bf64eb9954902ac044869706bfb6bc6a3d6c3180db184249a94 SHA512 cf146c2b53ecf99feb93cb3ece2eb8be14b3764587d9dac5b783c5486e3f9ce1aa7bea55f3289e6aa8d4661511ed733f6bc125067ad83cff356dc46380cd8eeb WHIRLPOOL e9af0196209422a27085122ef2f2c3499f18ca82a01ee9fd4e6cd5ccf51888d26429e2dd90b705e0d2bc0c195856598f13715ae29ffa64b174e02e1617c3dd07
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
+DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 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_p20160629.ebuild 2913 SHA256 13940f982e267ed269408cad3fbc8dc90ebb9159f2edc60633c7742b24da5ce7 SHA512 db512c205ed6539b19ea670783b268630a7fafd4f755c999e3e5e17a8fa0bb336f6d9842183a1cf9d3f046a46e4a649174437c99e78ae0b840d3acd31a8f12f3 WHIRLPOOL 42be192d17e6f9977d68c5b85052cbc4fc6c62c548e007fea8cdafa322e725c83ceaf3172c1335b4e21d1caab1ad2bb55583bd276eb539aa58cc0cefd3deeaa0
@@ -55,4 +56,5 @@ EBUILD netbeans-ergonomics-9999_p20160723.ebuild 2913 SHA256 6dea6c001f7962e0fc0
 EBUILD netbeans-ergonomics-9999_p20160725.ebuild 2913 SHA256 98a7b66a7b6e5208185eb4589b2114c67e03bed2c9579d7feb8d1cc936c481a7 SHA512 8612a038ac62d5fcc64724021f1f15ffa239c702fad834e38664334e81882cdb5e1c68c3011fca55c3c54e48615920d71981be31cc091677f807aae6c5e99383 WHIRLPOOL 4745e4bea6dd6a8dd03273a7d8ac2b56fa1e52651d42598532b6daafc0c5371e4d1d230bbd4993d1df4971e857d2611a5b4572ce378923582c3a4cc680a874f9
 EBUILD netbeans-ergonomics-9999_p20160726.ebuild 2913 SHA256 0f64221b065daf4e7ec4a250e2306ea2e9e1906418bdf15a74bf2f62ac91726d SHA512 e42fcb525d3d92fcc84778ca8e6a06288516b92117a5e587e7c3fb18ed87e9ae0359a47b196283175a7badc4e17bf8819356cf4de74a53e55c9a2ed93be8e295 WHIRLPOOL c867c8722300351c3a8ea7193f4693860ebc1d8c88d6f95db7ff5d3c005c221de639bc9225f83e683ee0830208e14c6d841ec97fdc7c4f875017397b0aaa16a3
 EBUILD netbeans-ergonomics-9999_p20160727.ebuild 2913 SHA256 44fbd1335b875431429fc7455e8cff75b11f1c379415e74dab0e935f16641af1 SHA512 f7686853b308ffbcca1530429899f118b76e0c288cd1ff9af342cb3426c6fa6af2e3c03bfde68217d7d4516f6a8648c48ff63b6a525dbda7e80010d9d3c3645e WHIRLPOOL 167dd9bc53173704d73a36106307349f297301e9fe4523a58efe5eaf2ad032123ca1e56f0cd7cf5f116c5017ddca439a312ea5221fc66be49b053c26cc94c9a8
+EBUILD netbeans-ergonomics-9999_p20160805.ebuild 2913 SHA256 5e6027dbc32197697cff6e51bbc75202d70e2d1723d3b7232b875b7c9191bd1e SHA512 80f5f05d92bd66c9850276866685d2f545cad6ca2efd755c1069c6f5228b07ff8fd41944c1ea94354d21d470de70b3bb7f6d84e032859de243782f965e8f4619 WHIRLPOOL 5ec24eae8cb8bac91c7965a28e8306a1546cedabf9216e06f74319516df123158717f8738df06f4f2c90cb6916685c2868113824065e5b555484190669e643cd
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160805.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160805.ebuild
new file mode 100644
index 0000000..d3d8c09
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160805.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-08-05_00-02-33/zip/netbeans-trunk-nightly-201608050002-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 c80974c..7c76c5b 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -32,6 +32,7 @@ DIST netbeans-trunk-nightly-201607230002-src.zip 217014076 SHA256 b297107296d96c
 DIST netbeans-trunk-nightly-201607250002-src.zip 217019515 SHA256 4f7317d2fa0693c653216be2607fb8e9d2c90f6f22e650ba38971767cdea57aa SHA512 ca97c3cf0bb7bb7031e82445accaed1f09d971b81de6a8e11824c2232968c4acb92077af57d5a91c8dca029ce39f18b3e676a1fdf21ef7190a2a8577652f4181 WHIRLPOOL 64a2af5584458e9a415d83685f99387ad7c2422d21750d4c6234fa5922def0374517081a633837bb45231073fcd0ba366748bf6861d64d987952f4c786529cca
 DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0bf64eb9954902ac044869706bfb6bc6a3d6c3180db184249a94 SHA512 cf146c2b53ecf99feb93cb3ece2eb8be14b3764587d9dac5b783c5486e3f9ce1aa7bea55f3289e6aa8d4661511ed733f6bc125067ad83cff356dc46380cd8eeb WHIRLPOOL e9af0196209422a27085122ef2f2c3499f18ca82a01ee9fd4e6cd5ccf51888d26429e2dd90b705e0d2bc0c195856598f13715ae29ffa64b174e02e1617c3dd07
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
+DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 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_p20160629.ebuild 3377 SHA256 3170816d19c52c4655d6659fc0e5c3d1b3213051f8b57af1aeffcbbcfd9d860a SHA512 8dd8d4fda80dc6f215ebe4b2b2cdd25bdb7c4258f1452bf6715375d9f1f17561f914c0d7f9285c288bcf9673ba34c34b51a4e0f0660b9d68198f49fd4ca72696 WHIRLPOOL 26cced4c04ca73c74d87db2a864957845405ddc57ff540584b867c21bac3ab36e74667803218c0bf5962eb998caeba1820e73de54624b5e021c50bc692c8a2f6
@@ -59,4 +60,5 @@ EBUILD netbeans-extide-9999_p20160723.ebuild 3377 SHA256 2a363bdd94008e428c6eb31
 EBUILD netbeans-extide-9999_p20160725.ebuild 3377 SHA256 f2362c6a546367162e3a6dacf6f743e394af3ff9978c9260d6553a3dd8703706 SHA512 e003897daf70efac75180a7bfebce810c91ded58ff55dcc94595a84277c8a3a30477e799b4bd6e056c1046eeec5ee1778764d59cd2f36669a1f6adcb58993624 WHIRLPOOL 25473279c9f3a7a9b25052f1457b94711b7c3e65ca8b5fc3963b9878d3e1397302f28f5705a24a665b804f492a4fd410e1155c02e71964f15dc87dc36f4424ca
 EBUILD netbeans-extide-9999_p20160726.ebuild 3377 SHA256 b45f733134cc75997718dbfbf6a3d02e3c6eab38bf4b23ea84c1a29281e419dd SHA512 03514caddb6f8e9fb04c85c8f2a3e47fb4718a248f082119ecfa1c541e53123c0bc08f9524263de0905ba340108ae53da3ecff1f91cb200af71374b0d52a1bfc WHIRLPOOL 5f377c28e81ccddb3da0e84cd019b54c30c08ac87ce8780cca0786e985cc347ba32495cb118832865fc257df0f967aa9b61e306c1f765ce7989d1617d3ff9200
 EBUILD netbeans-extide-9999_p20160727.ebuild 3377 SHA256 5f73a894a795ba5283951e749e6132022ab19d15250a55c8f1effce5af1e3307 SHA512 b4c4c15d09ef14e0f7fb37401ae55cce65ef2a4dbb9feaa74243fc706c5ddf2c9295c26229ab87b2c146bb4e1a732fac258fdc2e2cab803c1ff3e68b33ff7356 WHIRLPOOL e6ca429608bc37218149cd4529eb6e2ad12690bb56a44bd46530646170adb709bc8e5360a92072cd9b635a665c38862f7dbb284e3fa0b4fdcedc39fc7c701df0
+EBUILD netbeans-extide-9999_p20160805.ebuild 3377 SHA256 5e06394ce97e0f015462aa6bdcd136355a682a53a0ad82dc1c5f134932abc142 SHA512 c17f5143dd8192a178d222850476529f35e026ca16f29be7860032910fc19fde750c3bd4ed8fc1e7f67b10d6d232a0625e7b45832a510fb9c6e287b82a76b6d7 WHIRLPOOL ff2fc02914bb163ee3e78d107746f2cce9f015457a450a8abf880b9a3084b4835a4a6fa8df0a60269b50f1d1330ab0e7c523ee880b7decb0bea9258564c0b810
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160805.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160805.ebuild
new file mode 100644
index 0000000..4243205
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20160805.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-08-05_00-02-33/zip/netbeans-trunk-nightly-201608050002-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 c788bca..5cdba4c 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201607230002-src.zip 217014076 SHA256 b297107296d96c
 DIST netbeans-trunk-nightly-201607250002-src.zip 217019515 SHA256 4f7317d2fa0693c653216be2607fb8e9d2c90f6f22e650ba38971767cdea57aa SHA512 ca97c3cf0bb7bb7031e82445accaed1f09d971b81de6a8e11824c2232968c4acb92077af57d5a91c8dca029ce39f18b3e676a1fdf21ef7190a2a8577652f4181 WHIRLPOOL 64a2af5584458e9a415d83685f99387ad7c2422d21750d4c6234fa5922def0374517081a633837bb45231073fcd0ba366748bf6861d64d987952f4c786529cca
 DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0bf64eb9954902ac044869706bfb6bc6a3d6c3180db184249a94 SHA512 cf146c2b53ecf99feb93cb3ece2eb8be14b3764587d9dac5b783c5486e3f9ce1aa7bea55f3289e6aa8d4661511ed733f6bc125067ad83cff356dc46380cd8eeb WHIRLPOOL e9af0196209422a27085122ef2f2c3499f18ca82a01ee9fd4e6cd5ccf51888d26429e2dd90b705e0d2bc0c195856598f13715ae29ffa64b174e02e1617c3dd07
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
+DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 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_p20160629.ebuild 3416 SHA256 b9a83d04dd6f79e5ad9aa01c9519da1e2087d2365b14a07dc98ff5f13a8a20ff SHA512 c8d2ea2b8fd411aff0dfb534e1742f91ee9fedf133636fb8a128cc066b0924466b910e13ef5d616dffd045e383a30cfe4fd7ceb73d5997d665660d99ce25bd7b WHIRLPOOL 7c9bae88294805c2bb98fe6de1675a533a009c4bd1537fc986c2ff63c4b606e1a2386f55ddb3ec5298b84edecdc0e69c809582b752ceab1df4b06d3d58f2c8d6
@@ -57,4 +58,5 @@ EBUILD netbeans-groovy-9999_p20160723.ebuild 3416 SHA256 2a2bb9162be60c05af2475f
 EBUILD netbeans-groovy-9999_p20160725.ebuild 3416 SHA256 6d2df034543ef10df794e1a8a000273bced0193486140fd0bc0d3775a48c7b33 SHA512 ff849498b8654f50d79dbb7744929ab569909ff8818d8d446895f1924fe81fc74c0391c54e4c328d55da6e2d9aeb3100d043999a69f3f552c1039bfff92aa224 WHIRLPOOL fc75bd02bbb1bf60179af8a7d9384e3f258e1db88098edd5bc0c4a9e050552597ab9f1273985ab80fe4951f40b4030cb3d57f99ac8777cc4e5869ec419d100ed
 EBUILD netbeans-groovy-9999_p20160726.ebuild 3416 SHA256 4a5078fdb207606b04792b824fb6f76f7e6e8b6bebf806ec6eca22998feecfb5 SHA512 4c20436c57537ea3adc9c9697053c5fb45e257c7c69ddb0b00024d5858d8fce3833318fdcaa286ab1f32972fddd9a1c94ea5cd28e935cbe626c7ad759d3fbb4d WHIRLPOOL f6b82e7f117578a24b3bf718ebc90e8ae3962f8d3c55c172f5326cd07133848b7b594dbeb1a3e888e10c7d2bd7bb1e5de17b86bc8ed10bfca5c5739a294206ef
 EBUILD netbeans-groovy-9999_p20160727.ebuild 3416 SHA256 0ff981bdca33e139e245cb0bfb48ea25404b1bf43b1d45296add49ddeaf06f57 SHA512 141c44b2e2c31161469826557b26edb3b9d841122440bfd44e196aab9d0fe45997b47dd17d58b2b6db632d7257e701a7b34e581562793316d9a16629766b3cf8 WHIRLPOOL ead729eb89e7a0b9adec81dd0e5ed83f1793ccc1beed9f690e4edb56c541d0fdddd96fc0c92666a0cca3f931b70515e2b280b643aafd9edd1deffadfa13b0b26
+EBUILD netbeans-groovy-9999_p20160805.ebuild 3416 SHA256 13d715215a17c2f0d9e5e289dfa942433e3f52ca33de3554c6a9aa97b35bd39b SHA512 d3e1a676d5dfe4d23e4fe863bdec76eeb2dfaa26f316da055e68380c4af7a93a1db55a67512ed09aea50f16888592dbab1b44cc38b34c1cf1fe1542e501868df WHIRLPOOL 93e1ca50d7186ca0c8f4e83fe21166148c3b4b99912438bd38d815aaecd222d86ef0a9499664ab95dc8b1452a42c465cc25258d55646508dfb28ec0e185ed46f
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160805.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160805.ebuild
new file mode 100644
index 0000000..760a85b
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160805.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-08-05_00-02-33/zip/netbeans-trunk-nightly-201608050002-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 2c4f302..a85cfba 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201607230002-src.zip 217014076 SHA256 b297107296d96c
 DIST netbeans-trunk-nightly-201607250002-src.zip 217019515 SHA256 4f7317d2fa0693c653216be2607fb8e9d2c90f6f22e650ba38971767cdea57aa SHA512 ca97c3cf0bb7bb7031e82445accaed1f09d971b81de6a8e11824c2232968c4acb92077af57d5a91c8dca029ce39f18b3e676a1fdf21ef7190a2a8577652f4181 WHIRLPOOL 64a2af5584458e9a415d83685f99387ad7c2422d21750d4c6234fa5922def0374517081a633837bb45231073fcd0ba366748bf6861d64d987952f4c786529cca
 DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0bf64eb9954902ac044869706bfb6bc6a3d6c3180db184249a94 SHA512 cf146c2b53ecf99feb93cb3ece2eb8be14b3764587d9dac5b783c5486e3f9ce1aa7bea55f3289e6aa8d4661511ed733f6bc125067ad83cff356dc46380cd8eeb WHIRLPOOL e9af0196209422a27085122ef2f2c3499f18ca82a01ee9fd4e6cd5ccf51888d26429e2dd90b705e0d2bc0c195856598f13715ae29ffa64b174e02e1617c3dd07
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
+DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 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_p20160629.ebuild 4126 SHA256 34ca6fef3595b72a03737a92c6b15f8875c2820b32cca229f19ef8e3d1be88d7 SHA512 4e49f975d8db981e1e55eb67e92bc5145e972cabcfb8dff452ffb1459ee26f0befe64b739a0b5938a25cd84aa36d687dd235d85623cba4e94b333e08f48fdeec WHIRLPOOL 743e3b95b6221223ffb18df4b93d29935b7e1bae4855cd0c7f3e0440f6bae666814c94554559985c92454d467c4c219044b1bee8a26705edb120efecc6739550
@@ -60,4 +61,5 @@ EBUILD netbeans-harness-9999_p20160723.ebuild 4126 SHA256 26d4a9ceb75dd4cb2c4307
 EBUILD netbeans-harness-9999_p20160725.ebuild 4126 SHA256 364fb4152488cfc97a705db935479c9fce161d830435dfd5b7d9a2bcde346e68 SHA512 dcfc54c1bc057f4be516557547ebe816eca26f8747e9552eb73fc700fd9d7fcb3ccb0189c7a963ddc2a79b2ebc7613ed07aea20e9ecbac166192de119260c180 WHIRLPOOL a8e3e91cbbf8d07f69e650bf5604a05dd19e7a07b0daf7e11f8964d167193f03cba00571425213eef72980e21cafa8557c488e18f65ccb9715c3d397d00e00c6
 EBUILD netbeans-harness-9999_p20160726.ebuild 4126 SHA256 063a865a89d4d4c566d53ae77a754a61c74d9837cd982e203d276008b8c7e7dc SHA512 1824c591a18d713347f1ca4f3bafc945ea9c54fdab7d3fbf6ef5b8550535e8e4d6965b997cc6b3cdf311fd8fcd4495810477a39aff8520cd2cc486993e1f6924 WHIRLPOOL 9b5f3d910228fce6268b06f55285100f033ef3de9c344d4f3f7f24cbc7ad871cf8b3771abec2e6362d515918d73b6475e5943b20d4f6472a5f7513e3815eb696
 EBUILD netbeans-harness-9999_p20160727.ebuild 4126 SHA256 fc8c88d1a56ae970dcb826c90ef2b2201a846a2a517d0324d06f0080fad3f11e SHA512 a3ff90bf9d6f176dd08b4b3b3812720a3b75ad8dd8d33cfb025f1be6097642aa0d8644385aacd99cc1c4f1244c8cd75231f6977ab9a225927029c9eaf010ce4b WHIRLPOOL fe678f3d203467f746fe43e61b05c3078b1a433ba288928aec13b33b2553ba011c894350d8c08034c8ff4174b174d9ad686cbc0b2c53c40e38b2b066db305cad
+EBUILD netbeans-harness-9999_p20160805.ebuild 4126 SHA256 e1726eadd01d8707fb8faf5dc0a5c42073ea4dd5b5265cc69ff5ac775543cefc SHA512 bd33858446356dc69e916d22d1c1775a947d2762c9b004814815b3385b3e9052ba8b242209593507276bf1ad9311e51c8c1c8eed57fe01d265b1b20ef575ad4b WHIRLPOOL 969b4d11a1023c7ef720bbb34869e4da9c9d878a0c16871ecd023857ad4732b397eaa9d194df9f9958f5b30aec09e8c073610f4063f0b837160a658bdef4ee40
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160805.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160805.ebuild
new file mode 100644
index 0000000..451acd3
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20160805.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-08-05_00-02-33/zip/netbeans-trunk-nightly-201608050002-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 27d60da..fc31402 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -167,6 +167,7 @@ DIST netbeans-trunk-nightly-201607230002-src.zip 217014076 SHA256 b297107296d96c
 DIST netbeans-trunk-nightly-201607250002-src.zip 217019515 SHA256 4f7317d2fa0693c653216be2607fb8e9d2c90f6f22e650ba38971767cdea57aa SHA512 ca97c3cf0bb7bb7031e82445accaed1f09d971b81de6a8e11824c2232968c4acb92077af57d5a91c8dca029ce39f18b3e676a1fdf21ef7190a2a8577652f4181 WHIRLPOOL 64a2af5584458e9a415d83685f99387ad7c2422d21750d4c6234fa5922def0374517081a633837bb45231073fcd0ba366748bf6861d64d987952f4c786529cca
 DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0bf64eb9954902ac044869706bfb6bc6a3d6c3180db184249a94 SHA512 cf146c2b53ecf99feb93cb3ece2eb8be14b3764587d9dac5b783c5486e3f9ce1aa7bea55f3289e6aa8d4661511ed733f6bc125067ad83cff356dc46380cd8eeb WHIRLPOOL e9af0196209422a27085122ef2f2c3499f18ca82a01ee9fd4e6cd5ccf51888d26429e2dd90b705e0d2bc0c195856598f13715ae29ffa64b174e02e1617c3dd07
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
+DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 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_p20160629.ebuild 29867 SHA256 760997dd43b5afbea24aeb5132459f93f607110bb15155b010c2626dd65568f8 SHA512 474343f31eca8eab0b6bd9bf029519e1e904909ff45925cc867f9e96e6a39bce2abc82a1af63729cfa2ccb0340dc8ea85994500629629e11a194acc2b6718604 WHIRLPOOL 9c0fc771f3cc4ccec359307d9e5c9a20d5666b82e05b3deb8c85e511b099601f840fe0280dcb583959d95e1514469bde45442591a09e336855ecc03020dc7a3e
@@ -194,4 +195,5 @@ EBUILD netbeans-ide-9999_p20160723.ebuild 29867 SHA256 420a19b6dafddf384b182553d
 EBUILD netbeans-ide-9999_p20160725.ebuild 29867 SHA256 93a9a8cc65f92223d82fb6b6fea53afa7340e88dcc2690f95948fea6d25aeb7d SHA512 bc2b519c363b76f2e3652e5869c9dc3be11a76a93f00728dd2ca8cc539f4b5b29a2bee979303fd249fb51d1c23eb6e6251315a7a31b45fa07664efd59d41a67f WHIRLPOOL dbe724fdeb153cb2785d17903245b15be11c87f278ffbecad79b108728cf7b8f6da4e566f3f2f9c6966774c8f472786ef354bc1c2df44a77899526bd1e1d6a66
 EBUILD netbeans-ide-9999_p20160726.ebuild 29867 SHA256 8869ab05195b271f6778d85766fa3f9fd961e0c083dd46b3a053101e0ab05c96 SHA512 6fec085ea686b0542eb98875716958a899b4058abda539f883b2ad701d8805ac8c74486a783e0ff11ceebc996e5eeff744f429d8f36c361ab9c6d334c55e7e66 WHIRLPOOL 3f1bc01d0fc4d54f176ee1f8115080447b739749f1e2fafc3e1db7648e9d8ff2e661979490020d43c1d7e24ad51d32a7bca5ed1b0b2b4a39d2c95a449b12112f
 EBUILD netbeans-ide-9999_p20160727.ebuild 29867 SHA256 f20aa4f6ecf6ece497b148a16b9cb74d61716098ec33c10934fa16d4fe465f95 SHA512 8a65144b5388b69ce62661d3e32141d4b1ef5ac2880e3ce5f1e6693494ad87b762d0b3cd91cb9aea2c0f5192faa54bf04d7116becd5ba52e5d904d507167dc6f WHIRLPOOL 684c0237cf4040946647e08e4c929454e58272cf104525a1a6f78199da3da27c6bf49b28a1b1a9790b551a436f4e26e315770a3e968ca77a41854d36f76ed3c3
+EBUILD netbeans-ide-9999_p20160805.ebuild 29867 SHA256 a6e5b01dd7645ae6d601e387ce1a9cfd13bc1f55befbafd4a1c3e65677063381 SHA512 ef130ea92b4eaf0d08466ca830bd19a533a1fe83b721d95a9cfd6f215dabb31f994dac566104af447ab30b4928167e48f72ce254a2c6a4f066c8b5c89b62e584 WHIRLPOOL d5b3323224d1bca0ca62d972e50b574ac53742b4fed709e104acf0c00c72348d19177277bc8c8567948631b455c102050b084572c73f5ed24ea104aed8c8d0a9
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160805.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160805.ebuild
new file mode 100644
index 0000000..b3872c3
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20160805.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-08-05_00-02-33/zip/netbeans-trunk-nightly-201608050002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
+	http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
+	http://hg.netbeans.org/binaries/DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8-com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar
+	http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar
+	http://hg.netbeans.org/binaries/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar
+	http://hg.netbeans.org/binaries/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar
+	http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip
+	http://hg.netbeans.org/binaries/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip
+	http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip
+	http://hg.netbeans.org/binaries/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip
+	http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar
+	http://hg.netbeans.org/binaries/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar
+	http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
+	http://hg.netbeans.org/binaries/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip
+	http://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar
+	http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar
+	http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar
+	http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip
+	http://hg.netbeans.org/binaries/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar
+	http://hg.netbeans.org/binaries/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar
+	http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip
+	http://hg.netbeans.org/binaries/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar
+	http://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar
+	http://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar
+	http://hg.netbeans.org/binaries/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar
+	http://hg.netbeans.org/binaries/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar
+	http://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar
+	http://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar
+	http://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar
+	http://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar
+	http://hg.netbeans.org/binaries/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar
+	http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
+	http://hg.netbeans.org/binaries/AA2671239EBB762FEEE8B908E9F35473A72AFE1B-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar
+	http://hg.netbeans.org/binaries/1605B38BB28EAE32C11EAB8F9E238A497754A5B8-org.eclipse.core.jobs-3.5.101_nosignature.jar
+	http://hg.netbeans.org/binaries/20800206EB8B490F3CE5BB8AC8A7C3B9E8004A30-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar
+	http://hg.netbeans.org/binaries/D2D2105B1E3C9E2FA6240AD088237A57590DDA8D-org.eclipse.core.runtime-3.7.0_nosignature.jar
+	http://hg.netbeans.org/binaries/16507EAFDC2B95121AA718895BDB54D616EE4B0F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar
+	http://hg.netbeans.org/binaries/BD55836AABD558DC643A7844B78866AD990544BC-org.eclipse.equinox.app-1.3.100_nosignature.jar
+	http://hg.netbeans.org/binaries/4EE275AE73A140A403903D7E4DBA68C8FBB07001-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar
+	http://hg.netbeans.org/binaries/B7001D9CC2E2AC4E167D22A13063F0350C71AAA9-org.eclipse.equinox.preferences-3.4.2_nosignature.jar
+	http://hg.netbeans.org/binaries/C647079E36A4EB7A24AED2C545E4F0F94194C4D1-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar
+	http://hg.netbeans.org/binaries/9267CF311F979078211A70C1B19AF8A8EE71DC8E-org.eclipse.equinox.security-1.1.1_nosignature.jar
+	http://hg.netbeans.org/binaries/B580E446B543A8DD2F5AA368B07F9C4C9C2E7029-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar
+	http://hg.netbeans.org/binaries/244560B99152F3F9BC75DF2D6FAFA8A5216B06B6-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar
+	http://hg.netbeans.org/binaries/8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar
+	http://hg.netbeans.org/binaries/D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar
+	http://hg.netbeans.org/binaries/4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar
+	http://hg.netbeans.org/binaries/8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar
+	http://hg.netbeans.org/binaries/50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar
+	http://hg.netbeans.org/binaries/4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar
+	http://hg.netbeans.org/binaries/11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar
+	http://hg.netbeans.org/binaries/A3FEF6144ED1622E4CDD506B9D745527CC675D8D-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar
+	http://hg.netbeans.org/binaries/825DC870D1D423E347F4F8229A211A2C297BB15D-org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar
+	http://hg.netbeans.org/binaries/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar
+	http://hg.netbeans.org/binaries/17C0C8D6DEBF5EBE734881C131888D8088BD9E7D-org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar
+	http://hg.netbeans.org/binaries/6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar
+	http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar
+	http://hg.netbeans.org/binaries/DAAEFA7A5F3AF75FE4CDC86A1B5904C9F3B5BBF8-svnClientAdapter-javahl-1.10.12.jar
+	http://hg.netbeans.org/binaries/C47ED3BCD8CEAECDE3BDEEB7D8D14B577B26F9C8-svnClientAdapter-main-1.10.12.jar
+	http://hg.netbeans.org/binaries/AD4A88D99AB7C5B64C8893CA2FF2CBCFCEFC51C8-svnClientAdapter-svnkit-1.10.12.jar
+	http://hg.netbeans.org/binaries/5C47A97F05F761F190D87ED5FCBB08D1E05A7FB5-svnjavahl-1.9.3.jar
+	http://hg.netbeans.org/binaries/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar
+	http://hg.netbeans.org/binaries/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar
+	http://hg.netbeans.org/binaries/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar
+	http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar
+	http://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar
+	http://hg.netbeans.org/binaries/15ACB06E2E3A70FC188782BA51369CA81ACFE860-validator.jar
+	http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar
+	http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar
+	http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar
+	http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-platform-${PV}
+	dev-java/antlr:4
+	dev-java/commons-compress:0
+	dev-java/commons-httpclient:3
+	dev-java/commons-logging:0
+	dev-java/icu4j:55
+	dev-java/iso-relax:0
+	dev-java/jdbc-mysql:0
+	dev-java/jdbc-postgresql:0
+	>=dev-java/jsch-0.1.46:0
+	>=dev-java/json-simple-1.1:0
+	dev-java/jsr173:0
+	dev-java/jvyamlb:0
+	dev-java/log4j:0
+	dev-java/lucene:3.5
+	dev-java/rhino:1.6
+	dev-java/saxon:9
+	dev-java/smack:2.2
+	dev-java/sun-jaf:0
+	dev-java/tomcat-servlet-api:2.2
+	dev-java/ws-commons-util:0
+	dev-java/xerces:2"
+#	dev-vcs/subversion>=1.8.4:0[java] missing from the tree
+#	app-text/jing:0 our version is probably too old
+#	dev-java/commons-io:1 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/commons-lang:2.1 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/freemarker:2.3
+#	dev-java/guava:15 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/ini4j:0 our version is too old
+#	dev-java/jaxb:2 upstream version contains more stuff so websvccommon does not compile with ours
+#	dev-java/jzlib:0 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/trilead-ssh2:0 in overlay
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	dev-java/commons-codec:0
+	${CDEPEND}
+	dev-java/javacc:0
+	dev-java/javahelp:0
+	dev-java/jna:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ide -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+JAVA_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r16-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
+	ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die
+	ln -s "${DISTDIR}"/DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8-com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar || die
+	ln -s "${DISTDIR}"/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar o.apache.commons.io/external/commons-io-1.4.jar || die
+	ln -s "${DISTDIR}"/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar o.apache.commons.lang/external/commons-lang-2.6.jar || die
+	ln -s "${DISTDIR}"/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar libs.commons_net/external/commons-net-3.3.jar || die
+	ln -s "${DISTDIR}"/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip css.editor/external/css21-spec.zip || die
+	ln -s "${DISTDIR}"/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip css.editor/external/css3-spec.zip || die
+	ln -s "${DISTDIR}"/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip derby/external/derbysampledb.zip || die
+	ln -s "${DISTDIR}"/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip dlight.nativeexecution/external/exechlp-1.0.zip || die
+	ln -s "${DISTDIR}"/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar libs.freemarker/external/freemarker-2.3.19.jar || die
+	ln -s "${DISTDIR}"/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar c.google.guava/external/guava-15.0.jar || die
+	ln -s "${DISTDIR}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || die
+	ln -s "${DISTDIR}"/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip html.parser/external/html5doc.zip || die
+	ln -s "${DISTDIR}"/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar html.parser/external/htmlparser-1.2.1.jar || die
+	ln -s "${DISTDIR}"/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar libs.ini4j/external/ini4j-0.5.1.jar || die
+	ln -s "${DISTDIR}"/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar html.validation/external/iri.jar || die
+	ln -s "${DISTDIR}"/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip spellchecker.dictionary_en/external/ispell-enwl-3.1.20.zip || die
+	ln -s "${DISTDIR}"/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar c.googlecode.javaewah.JavaEWAH/external/JavaEWAH-0.7.9.jar || die
+	ln -s "${DISTDIR}"/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar xml.jaxb.api/external/jaxb-api.jar || die
+	ln -s "${DISTDIR}"/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip libs.jaxb/external/jaxb-api-doc.zip || die
+	ln -s "${DISTDIR}"/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar libs.jaxb/external/jaxb-impl.jar || die
+	ln -s "${DISTDIR}"/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar libs.jaxb/external/jaxb-xjc.jar || die
+	ln -s "${DISTDIR}"/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar libs.jaxb/external/jaxb1-impl.jar || die
+	ln -s "${DISTDIR}"/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar libs.javafx/external/jfxrt.jar || die
+	ln -s "${DISTDIR}"/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar html.validation/external/jing.jar || die
+	ln -s "${DISTDIR}"/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.core-0.0.7.jar || die
+	ln -s "${DISTDIR}"/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.sshagent-0.0.7.jar || die
+	ln -s "${DISTDIR}"/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.pageant-0.0.7.jar || die
+	ln -s "${DISTDIR}"/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.usocket-jna-0.0.7.jar || die
+	ln -s "${DISTDIR}"/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar c.jcraft.jzlib/external/jzlib-1.0.7.jar || die
+	ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.process/external/libpam4j-1.1.jar || die
+	ln -s "${DISTDIR}"/AA2671239EBB762FEEE8B908E9F35473A72AFE1B-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar o.eclipse.core.contenttype/external/org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar || die
+	ln -s "${DISTDIR}"/1605B38BB28EAE32C11EAB8F9E238A497754A5B8-org.eclipse.core.jobs-3.5.101_nosignature.jar o.eclipse.core.jobs/external/org.eclipse.core.jobs-3.5.101_nosignature.jar || die
+	ln -s "${DISTDIR}"/20800206EB8B490F3CE5BB8AC8A7C3B9E8004A30-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar o.eclipse.core.net/external/org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar || die
+	ln -s "${DISTDIR}"/D2D2105B1E3C9E2FA6240AD088237A57590DDA8D-org.eclipse.core.runtime-3.7.0_nosignature.jar o.eclipse.core.runtime/external/org.eclipse.core.runtime-3.7.0_nosignature.jar || die
+	ln -s "${DISTDIR}"/16507EAFDC2B95121AA718895BDB54D616EE4B0F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar o.eclipse.core.runtime.compatibility.auth/external/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar || die
+	ln -s "${DISTDIR}"/BD55836AABD558DC643A7844B78866AD990544BC-org.eclipse.equinox.app-1.3.100_nosignature.jar o.eclipse.equinox.app/external/org.eclipse.equinox.app-1.3.100_nosignature.jar || die
+	ln -s "${DISTDIR}"/4EE275AE73A140A403903D7E4DBA68C8FBB07001-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar o.eclipse.equinox.common/external/org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar || die
+	ln -s "${DISTDIR}"/B7001D9CC2E2AC4E167D22A13063F0350C71AAA9-org.eclipse.equinox.preferences-3.4.2_nosignature.jar o.eclipse.equinox.preferences/external/org.eclipse.equinox.preferences-3.4.2_nosignature.jar || die
+	ln -s "${DISTDIR}"/C647079E36A4EB7A24AED2C545E4F0F94194C4D1-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar o.eclipse.equinox.registry/external/org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar || die
+	ln -s "${DISTDIR}"/9267CF311F979078211A70C1B19AF8A8EE71DC8E-org.eclipse.equinox.security-1.1.1_nosignature.jar o.eclipse.equinox.security/external/org.eclipse.equinox.security-1.1.1_nosignature.jar || die
+	ln -s "${DISTDIR}"/B580E446B543A8DD2F5AA368B07F9C4C9C2E7029-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit/external/org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar || die
+	ln -s "${DISTDIR}"/244560B99152F3F9BC75DF2D6FAFA8A5216B06B6-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit.java7/external/org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar || die
+	ln -s "${DISTDIR}"/8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar || die
+	ln -s "${DISTDIR}"/D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar || die
+	ln -s "${DISTDIR}"/4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar || die
+	ln -s "${DISTDIR}"/8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar o.eclipse.mylyn.commons.repositories.core/external/org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar || die
+	ln -s "${DISTDIR}"/50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar || die
+	ln -s "${DISTDIR}"/4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar || die
+	ln -s "${DISTDIR}"/11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.confluence.core/external/org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar || die
+	ln -s "${DISTDIR}"/A3FEF6144ED1622E4CDD506B9D745527CC675D8D-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar || die
+	ln -s "${DISTDIR}"/825DC870D1D423E347F4F8229A211A2C297BB15D-org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.markdown.core/external/org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar || die
+	ln -s "${DISTDIR}"/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.textile.core/external/org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar || die
+	ln -s "${DISTDIR}"/17C0C8D6DEBF5EBE734881C131888D8088BD9E7D-org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar || die
+	ln -s "${DISTDIR}"/6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar extexecution.process/external/processtreekiller-1.0.7.jar || die
+	ln -s "${DISTDIR}"/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar libs.svnClientAdapter.svnkit/external/svnkit_1.7.8.r9538_v20130107_2001.jar || die
+	ln -s "${DISTDIR}"/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar o.apache.xml.resolver/external/resolver-1.2.jar || die
+	ln -s "${DISTDIR}"/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar libs.svnClientAdapter.svnkit/external/sqljet-1.1.10.jar || die
+	ln -s "${DISTDIR}"/DAAEFA7A5F3AF75FE4CDC86A1B5904C9F3B5BBF8-svnClientAdapter-javahl-1.10.12.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-javahl-1.10.12.jar || die
+	ln -s "${DISTDIR}"/C47ED3BCD8CEAECDE3BDEEB7D8D14B577B26F9C8-svnClientAdapter-main-1.10.12.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.10.12.jar || die
+	ln -s "${DISTDIR}"/AD4A88D99AB7C5B64C8893CA2FF2CBCFCEFC51C8-svnClientAdapter-svnkit-1.10.12.jar libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.10.12.jar || die
+	ln -s "${DISTDIR}"/5C47A97F05F761F190D87ED5FCBB08D1E05A7FB5-svnjavahl-1.9.3.jar libs.svnClientAdapter.javahl/external/svnjavahl-1.9.3.jar || die
+	ln -s "${DISTDIR}"/3B91269E9055504778F57744D24F505856698602-svnkit-1.7.0-beta4-20120316.233307-1.jar libs.svnClientAdapter.svnkit/external/svnkit-1.7.0-beta4-20120316.233307-1.jar || die
+	ln -s "${DISTDIR}"/015525209A02BD74254930FF844C7C13498B7FB9-svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar libs.svnClientAdapter.svnkit/external/svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar || die
+	ln -s "${DISTDIR}"/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar libs.swingx/external/swingx-all-1.6.4.jar || die
+	ln -s "${DISTDIR}"/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar httpserver/external/tomcat-webserver-3.2.jar || die
+	ln -s "${DISTDIR}"/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar swing.validation/external/ValidationAPI.jar || die
+	ln -s "${DISTDIR}"/15ACB06E2E3A70FC188782BA51369CA81ACFE860-validator.jar html.validation/external/validator.jar || die
+	ln -s "${DISTDIR}"/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar extexecution.process/external/winp-1.14-patched.jar || die
+	ln -s "${DISTDIR}"/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar o.apache.xmlrpc/external/xmlrpc-client-3.0.jar || die
+	ln -s "${DISTDIR}"/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar o.apache.xmlrpc/external/xmlrpc-common-3.0.jar || die
+	ln -s "${DISTDIR}"/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar o.apache.xmlrpc/external/xmlrpc-server-3.0.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.53.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar
+	java-pkg_jar-from --build-only --into db.sql.visualeditor/external javacc javacc.jar javacc-3.2.jar
+	java-pkg_jar-from --into html.parser/external icu4j-55 icu4j.jar icu4j-4_4_2.jar
+	java-pkg_jar-from --into html.validation/external iso-relax iso-relax.jar isorelax.jar
+	java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar
+	java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.antlr4.runtime/external antlr-4 antlr-runtime.jar antlr-runtime-4.5.3.jar
+	java-pkg_jar-from --into libs.commons_compress/external commons-compress commons-compress.jar commons-compress-1.8.1.jar
+	# java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.19.jar
+	java-pkg_jar-from --build-only --into libs.jna/external jna jna.jar jna-4.2.2.jar
+	java-pkg_jar-from --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
+	java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
+	java-pkg_jar-from --into libs.lucene/external lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
+	java-pkg_jar-from --into libs.smack/external smack-2.2 smack.jar smack.jar
+	java-pkg_jar-from --into libs.smack/external smack-2.2 smackx.jar smackx.jar
+	# java-pkg_jar-from --into libs.svnClientAdapter.javahl/external subversion svn-javahl.jar svnjavahl-1.8.4.jar
+	java-pkg_jar-from --into libs.xerces/external xerces-2 xercesImpl.jar xerces-2.8.0.jar
+	java-pkg_jar-from --build-only --into o.apache.commons.codec/external commons-codec commons-codec.jar apache-commons-codec-1.3.jar
+	java-pkg_jar-from --into o.apache.commons.httpclient/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.1.jar
+	java-pkg_jar-from --into o.apache.commons.logging/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
+	java-pkg_jar-from --into o.apache.ws.commons.util/external ws-commons-util ws-commons-util.jar ws-commons-util-1.0.1.jar
+	java-pkg_jar-from --into servletapi/external tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
+	java-pkg_jar-from --into xml.jaxb.api/external sun-jaf activation.jar activation.jar
+	java-pkg_jar-from --into xml.jaxb.api/external jsr173 jsr173.jar jsr173_1.0_api.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	unset DISPLAY
+	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+	pushd nbbuild/netbeans/ide >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/ide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	rm -fr "${D}"/${INSTALL_DIR}/bin/nativeexecution || die
+	rm -fr "${D}"/${INSTALL_DIR}/modules/lib || die
+
+	insinto ${INSTALL_DIR}/bin/nativeexecution
+	doins bin/nativeexecution/*
+
+	pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution >/dev/null || die
+	for file in *.sh ; do
+		fperms 755 ${file}
+	done
+	popd >/dev/null || die
+
+	if use x86 ; then
+		doins -r bin/nativeexecution/Linux-x86
+		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86 >/dev/null || die
+		for file in * ; do
+			fperms 755 ${file}
+		done
+		popd >/dev/null || die
+	elif use amd64 ; then
+		doins -r bin/nativeexecution/Linux-x86_64
+		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86_64 >/dev/null || die
+		for file in * ; do
+			fperms 755 ${file}
+		done
+		popd >/dev/null || die
+	fi
+
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules
+	pushd "${instdir}" >/dev/null || die
+	rm com-jcraft-jsch.jar && java-pkg_jar-from --into "${instdir}" jsch jsch.jar com-jcraft-jsch.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext
+	pushd "${instdir}" >/dev/null || die
+	rm antlr-runtime-4.5.3.jar && java-pkg_jar-from --into "${instdir}" antlr-4 antlr-runtime.jar antlr-runtime-4.5.3.jar
+	rm commons-compress-1.8.1.jar && java-pkg_jar-from --into "${instdir}" commons-compress commons-compress.jar commons-compress-1.8.1.jar
+	# rm freemarker-2.3.19.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.19.jar || die
+	rm icu4j-4_4_2.jar && java-pkg_jar-from --into "${instdir}" icu4j-55 icu4j.jar icu4j-4_4_2.jar
+	rm isorelax.jar && java-pkg_jar-from --into "${instdir}" iso-relax iso-relax.jar isorelax.jar
+	rm json-simple-1.1.1.jar && java-pkg_jar-from --into "${instdir}" json-simple json-simple.jar json-simple-1.1.1.jar
+	rm jvyamlb-0.2.7.jar && java-pkg_jar-from --into "${instdir}" jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
+	rm log4j-1.2.15.jar && java-pkg_jar-from --into "${instdir}" log4j log4j.jar log4j-1.2.15.jar
+	rm lucene-core-3.5.0.jar && java-pkg_jar-from --into "${instdir}" lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
+	rm mysql-connector-java-5.1.23-bin.jar && java-pkg_jar-from --into "${instdir}" jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
+	rm postgresql-9.2-1002.jdbc4.jar && java-pkg_jar-from --into "${instdir}" jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar
+	rm saxon9B.jar && java-pkg_jar-from --into "${instdir}" saxon-9 saxon.jar saxon9B.jar
+	rm servlet-2.2.jar && java-pkg_jar-from --into "${instdir}" tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
+	rm smack.jar && java-pkg_jar-from --into "${instdir}" smack-2.2 smack.jar
+	rm smackx.jar && java-pkg_jar-from --into "${instdir}" smack-2.2 smackx.jar
+	# rm svnjavahl.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl.jar || die
+	rm xerces-2.8.0.jar && java-pkg_jar-from --into "${instdir}" xerces-2 xercesImpl.jar xerces-2.8.0.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxb
+	pushd "${instdir}" >/dev/null || die
+	rm activation.jar && java-pkg_jar-from --into "${instdir}" sun-jaf activation.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxb/api
+	pushd "${instdir}" >/dev/null || die
+	rm jsr173_1.0_api.jar && java-pkg_jar-from --into "${instdir}" jsr173 jsr173.jar jsr173_1.0_api.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ide
+}

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index f94f76a..8df34fe 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -63,6 +63,7 @@ DIST netbeans-trunk-nightly-201607230002-src.zip 217014076 SHA256 b297107296d96c
 DIST netbeans-trunk-nightly-201607250002-src.zip 217019515 SHA256 4f7317d2fa0693c653216be2607fb8e9d2c90f6f22e650ba38971767cdea57aa SHA512 ca97c3cf0bb7bb7031e82445accaed1f09d971b81de6a8e11824c2232968c4acb92077af57d5a91c8dca029ce39f18b3e676a1fdf21ef7190a2a8577652f4181 WHIRLPOOL 64a2af5584458e9a415d83685f99387ad7c2422d21750d4c6234fa5922def0374517081a633837bb45231073fcd0ba366748bf6861d64d987952f4c786529cca
 DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0bf64eb9954902ac044869706bfb6bc6a3d6c3180db184249a94 SHA512 cf146c2b53ecf99feb93cb3ece2eb8be14b3764587d9dac5b783c5486e3f9ce1aa7bea55f3289e6aa8d4661511ed733f6bc125067ad83cff356dc46380cd8eeb WHIRLPOOL e9af0196209422a27085122ef2f2c3499f18ca82a01ee9fd4e6cd5ccf51888d26429e2dd90b705e0d2bc0c195856598f13715ae29ffa64b174e02e1617c3dd07
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
+DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 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_p20160629.ebuild 15656 SHA256 94b39fc264595d8874ad8ac4e32be9ef9ed3772dd39cee46913a061c2c7e4c06 SHA512 09d3f1a6a959a2a39a4fdedfb3a5a0e37bb4f065b1654d0f7a6247c88463b51dcca65ca8e24b7c99dbe8a6c756520068d895331a3c2066321847c669f39fae1b WHIRLPOOL 75f086471489a3503f1f000966bb0017d11ed5c26b68e525c4d58566d7162456d4d6f0f2a10127fc3b623ee0853a619ead15f50c3d39368c9d89bbeace295c6c
@@ -90,4 +91,5 @@ EBUILD netbeans-java-9999_p20160723.ebuild 15656 SHA256 4feb049ec82e942d8d923cff
 EBUILD netbeans-java-9999_p20160725.ebuild 15656 SHA256 08626afb9dab6d553903c8c2b283d9c365758c7990ea0826e9c3a2f44c1ca0ef SHA512 0fd1054c62662cb92d4c822bc7d7047ce2aec4dfee4a6cfd12890848a306cbb02d420cc7c48b8abfd7fd9774d92d553cefb50caaa50148df874df88e299abea4 WHIRLPOOL ad1301e2018a2e7613f5c3987b237d32aa34fa53e5d8dda5640b936faaa8c4b579e13ab24357459b36386c5ebb3a586dac37d2ea1d707c68cd6a3f73cb9a2c03
 EBUILD netbeans-java-9999_p20160726.ebuild 15656 SHA256 b4bdbaa284e5081e64dac110f95a1798350cd821e5bddc210957c8852918559e SHA512 82e0b5329cecfa0f3ed1dbdc16319592c2b71c3fe4b93503e1ed02bef7f18a91d8cef91b44d242b418e437a329db30127357d965bc6d578797245afdd05b4e38 WHIRLPOOL 02782938a01df4ecdfcd9bc99d1aa9853ff91b5c81507189e1ac7a66ec5dae657aeb32c3bcf99f91ec0f38e1f65da097d5c783eb84fdb5766dd5be2c3d2349f6
 EBUILD netbeans-java-9999_p20160727.ebuild 15656 SHA256 ed21f4b2da8ad6afceb3774e40a632209345124897cf1ad48ca730805a65342e SHA512 3ba58f3a471eb3f1eac803241eaa9fd2a14d351eeee61d7e572c6526142e62528ad904b191c13354bc039c7b671160fb9a1e026f043061c6736f142086fed5eb WHIRLPOOL 5dc117e908fe416258333bf06140d4095a7d5657dd05c82a055add90af569ca66db3bb5ded00adaa782d74febc93448d2a158b492d854a21e00afc22bac04cfe
+EBUILD netbeans-java-9999_p20160805.ebuild 15656 SHA256 8fd66a5aad22d20caa1386bf0ae7388037fbbb7ef8a75ceba804b014f94ac4b6 SHA512 0b8e2dd9f19603682409a151b2cc614e06c37cf892a42830ed7841b8ef7c96c64d9d6ee0035140f3089a8801f8f5768aee651dd9634e43a4728554e7cc2514c1 WHIRLPOOL fec2d5c85420b3db2ffd45e7427c8f71d48e50cef2c181266367d75f1b341c9a85029f3e90d1fe7b88d3654c77a4c53293b9f1df9262d8bb9b95a9cbbf424681
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160805.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160805.ebuild
new file mode 100644
index 0000000..0424718
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20160805.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-08-05_00-02-33/zip/netbeans-trunk-nightly-201608050002-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/CE81899206FF733BB596523C26FBA17E029689B8-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}"/CE81899206FF733BB596523C26FBA17E029689B8-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 5b2632a..b61fba9 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201607230002-src.zip 217014076 SHA256 b297107296d96c
 DIST netbeans-trunk-nightly-201607250002-src.zip 217019515 SHA256 4f7317d2fa0693c653216be2607fb8e9d2c90f6f22e650ba38971767cdea57aa SHA512 ca97c3cf0bb7bb7031e82445accaed1f09d971b81de6a8e11824c2232968c4acb92077af57d5a91c8dca029ce39f18b3e676a1fdf21ef7190a2a8577652f4181 WHIRLPOOL 64a2af5584458e9a415d83685f99387ad7c2422d21750d4c6234fa5922def0374517081a633837bb45231073fcd0ba366748bf6861d64d987952f4c786529cca
 DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0bf64eb9954902ac044869706bfb6bc6a3d6c3180db184249a94 SHA512 cf146c2b53ecf99feb93cb3ece2eb8be14b3764587d9dac5b783c5486e3f9ce1aa7bea55f3289e6aa8d4661511ed733f6bc125067ad83cff356dc46380cd8eeb WHIRLPOOL e9af0196209422a27085122ef2f2c3499f18ca82a01ee9fd4e6cd5ccf51888d26429e2dd90b705e0d2bc0c195856598f13715ae29ffa64b174e02e1617c3dd07
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
+DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 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_p20160629.ebuild 4971 SHA256 4dd26a24283478bb99d31c49c03a548d6817a005fbfbec6069c13febebdb7aad SHA512 0eabb5dfd298cf60c7d766c85146d592efd2df0f948d6de28ae70fc9fda41cdf6a8568bf2838aca4f4b58a210fcaca3df7b320f56e4fc60987490c5599bd9662 WHIRLPOOL ce7a60d2461b148ce333f10835fa447dddf2cfe9ec83ef7f4e91d66854499bea1541c6fbd7899a7150a9f1c3fc1199b3856407f4273a037e32ff2555138326e0
@@ -58,4 +59,5 @@ EBUILD netbeans-javacard-9999_p20160723.ebuild 4971 SHA256 188237f988aea7b0e8809
 EBUILD netbeans-javacard-9999_p20160725.ebuild 4971 SHA256 6e72305c297d7ba6f2e1a5c114b64b29783ebaf3dda975a1dbd0aef4bd7b0850 SHA512 32137970262f7c6130ed73f719b28c2c94ea7186b54a0d8f020451bf0558d9754c1c339972e9d5647b6761c939996131c0c68b19d93994efa45079acc4cc9d5a WHIRLPOOL c358bd61da14ca2969525d44f7efc8942fa332e4db692936c454d8bac8737baae83897c0724e43cf36e553aedaa3e630b1df9dd9344fc27a7ddba0326640b8b8
 EBUILD netbeans-javacard-9999_p20160726.ebuild 4971 SHA256 ea2d1f4a305aeefea537b23c11d9b8b59ca31798d2819bd6cd06a4e2354bcec1 SHA512 5995560a03a6486a93282c4bfc01295a065ec8f2f6566ed486fe2f2f4c69bcd43c44fecdc4f90e9a2c62a78a1ddbeafc9c990c73f01734a4d8ce373754c3b735 WHIRLPOOL aee5fb419748f2659c34ec3cbf0b6e300bd544cf8f88b897d59452bfe0f2232a5d4ea421e26c98fe88afdfaaad61c389cee702cc17e7fac154459f7b0f8a8925
 EBUILD netbeans-javacard-9999_p20160727.ebuild 4971 SHA256 b1ee376520b2d9f77091d624a472d8d4e632ed622785d13277c9a2c672bfb8fa SHA512 67dc27e090d7df7f82d0ff0130ddab8366dbd1898153b8cbd6cdfbc319754d535a4734fa85efe7be530f12d74742b99838f91d6446ac1138af744d8f055cddf1 WHIRLPOOL 96cdb3c33bed0ff5782591a47b645184e90ba6dfa7c44e812fbfafc8dfba4ff4f3f3f9016f7c736b29e12d04356a0b8efee289704b40c1731f0b66c15199c21c
+EBUILD netbeans-javacard-9999_p20160805.ebuild 4971 SHA256 b7e3e600097e97891fe5bf6fc7ba2e3588e42f9a28228ef2b6a70746bab1c5d2 SHA512 1260a91fcf223caa93ece524320cc1b2897e74925d389d82b232da7a2d226e137173b10cb3dad0517157e101e6c42601e59bb1163132a8052e1fc76cc3daa62b WHIRLPOOL 61c45684d9796faea7b11d94941bad1810a9190ce957b6fa0d5780050b72df414352b878ccb2a3955b09ce23d0d007570975ed64c4d4d03adec40275b8b0adec
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160805.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160805.ebuild
new file mode 100644
index 0000000..3350f1b
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160805.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-08-05_00-02-33/zip/netbeans-trunk-nightly-201608050002-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 bb588d3..0d1a951 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201607230002-src.zip 217014076 SHA256 b297107296d96c
 DIST netbeans-trunk-nightly-201607250002-src.zip 217019515 SHA256 4f7317d2fa0693c653216be2607fb8e9d2c90f6f22e650ba38971767cdea57aa SHA512 ca97c3cf0bb7bb7031e82445accaed1f09d971b81de6a8e11824c2232968c4acb92077af57d5a91c8dca029ce39f18b3e676a1fdf21ef7190a2a8577652f4181 WHIRLPOOL 64a2af5584458e9a415d83685f99387ad7c2422d21750d4c6234fa5922def0374517081a633837bb45231073fcd0ba366748bf6861d64d987952f4c786529cca
 DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0bf64eb9954902ac044869706bfb6bc6a3d6c3180db184249a94 SHA512 cf146c2b53ecf99feb93cb3ece2eb8be14b3764587d9dac5b783c5486e3f9ce1aa7bea55f3289e6aa8d4661511ed733f6bc125067ad83cff356dc46380cd8eeb WHIRLPOOL e9af0196209422a27085122ef2f2c3499f18ca82a01ee9fd4e6cd5ccf51888d26429e2dd90b705e0d2bc0c195856598f13715ae29ffa64b174e02e1617c3dd07
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
+DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 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_p20160629.ebuild 6293 SHA256 9e8876f9264bc95d99ac059b4eb580c81ea6ecf52b238c3b607ffc6ea6bd2a2e SHA512 6bb65358523a64d814d451e4953faaea5fba5a9abe24582d03732e2a3122ae18f315076414420a38425252976a9ed5a39e69b1efaa72a2a21a3017cf17d7b9dc WHIRLPOOL 097a0f24eb060a2d85d47042705e4dc28c88a0797405745334a72a09683731a417829e3e62de170b4afc8fa9df6fbe0541078c8dc6b582a914f0ae2e84fe37c5
@@ -57,4 +58,5 @@ EBUILD netbeans-javadoc-9999_p20160723.ebuild 6293 SHA256 734339816641b1fc548fa7
 EBUILD netbeans-javadoc-9999_p20160725.ebuild 6293 SHA256 d60457add0b51216b165e0e4632b06f64829992fe3ee3a9fe83b44a9dd74a453 SHA512 7510dc25f701865a1b4e5d7fcbc78ffa2c47dba7afebca48e32e4e9d2153f6893c366607dfb38dfada0a0096787164340df7f773acccccfb76d561bbba7e588b WHIRLPOOL 2ea5c91018849e72755bd158ad026265f777e394032aecca9babd39a040b4c83cc772403522fffed4c3c9dc9bb13f0b2567756f9fbda456c8a06cf35a02927fc
 EBUILD netbeans-javadoc-9999_p20160726.ebuild 6293 SHA256 4cb1aa813d16116f1b4606ade20a77bba7950ba86d680149d17b5c6641342342 SHA512 2b16a76c082c76431c3622e215801c1c133e455b7f2a4b15fd075a78c166cd6b5f30f40745f53be9ff0cb5a24d4832f0562278ac42f2f266b76611a3289b01de WHIRLPOOL dcd7d717e90178dd04a1a8ebb79bbd23f3e8316c8a66abadb3a4f66a48c3a889147155dd650be168bffd0a38fed627ef3821d9a1148ab84dcf5cd878518746cd
 EBUILD netbeans-javadoc-9999_p20160727.ebuild 6293 SHA256 252788c15ce2112ca38bb2ba973c9469ef254ba3365f2f7754cc91bf3e10d33b SHA512 c6e5842c0deb4c7d4afec97cd32af0e274e8efa942c46bd28c00d63b3f5afa642a4a8587841c10a43c30c71ebb32cf9cb8cfac7e57c57d7541d3b9b576ac995f WHIRLPOOL bcba22021000cb48f9f779561b35852283dc0948c45562a4c9e9bb68eabc13a2fa982080ded58fd65281aaf18b5cfb849acd66830efe90f9a333a45f218cf697
+EBUILD netbeans-javadoc-9999_p20160805.ebuild 6293 SHA256 39069bd8e788b3cbedefe8818d489a051a5bb51d453951078034f32a1abdf6dc SHA512 4aed18ed367b64f931ce0a0a4717ee23a0bb7782b73caa6ff795a0780c0167fc6fa2f29b7c635fca4b0a22f95032f1c19d83fdbf2ff771c9e6eee18f1ff802d2 WHIRLPOOL 0e5ed36ba6222dd7dcbac59f67328b0df98b22e42b40ff28072547ff06e4464796131217647d33915f17e6889142d419a667a94f426a9ac36df75dcb28ad32d9
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160805.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160805.ebuild
new file mode 100644
index 0000000..92b3837
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160805.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-08-05_00-02-33/zip/netbeans-trunk-nightly-201608050002-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 a1e8506..4a23d55 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201607230002-src.zip 217014076 SHA256 b297107296d96c
 DIST netbeans-trunk-nightly-201607250002-src.zip 217019515 SHA256 4f7317d2fa0693c653216be2607fb8e9d2c90f6f22e650ba38971767cdea57aa SHA512 ca97c3cf0bb7bb7031e82445accaed1f09d971b81de6a8e11824c2232968c4acb92077af57d5a91c8dca029ce39f18b3e676a1fdf21ef7190a2a8577652f4181 WHIRLPOOL 64a2af5584458e9a415d83685f99387ad7c2422d21750d4c6234fa5922def0374517081a633837bb45231073fcd0ba366748bf6861d64d987952f4c786529cca
 DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0bf64eb9954902ac044869706bfb6bc6a3d6c3180db184249a94 SHA512 cf146c2b53ecf99feb93cb3ece2eb8be14b3764587d9dac5b783c5486e3f9ce1aa7bea55f3289e6aa8d4661511ed733f6bc125067ad83cff356dc46380cd8eeb WHIRLPOOL e9af0196209422a27085122ef2f2c3499f18ca82a01ee9fd4e6cd5ccf51888d26429e2dd90b705e0d2bc0c195856598f13715ae29ffa64b174e02e1617c3dd07
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
+DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 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_p20160629.ebuild 4717 SHA256 bc5e4d8cdeefc3dfae713e53e12787e0d6066dfdc7dfefefc5897b90580f6781 SHA512 7c71831c87f2fb55704f5c6286420ed55a1dcc61b8a1db7d38f5ce07a329a5edb45fe17813bbce063dcd446ed6c63f2afa50f8fe8b5d0681e9e21fe36749972a WHIRLPOOL 5195604559ea7dc003739f155053bc7afd5205c5b26ab06a06ce2fce4e60887497290c97fb6f5b4d5b3a4baf9b188d2b1fb9a8ace25005a1a1e29880d234861b
@@ -63,4 +64,5 @@ EBUILD netbeans-javafx-9999_p20160723.ebuild 4717 SHA256 1d6ca7979aa901593c3a755
 EBUILD netbeans-javafx-9999_p20160725.ebuild 4717 SHA256 e3c5fb7763de76bdfad722c1a41fe28711a9585f619cbdfa0876ab18df03130d SHA512 0557928141da05b87c48fb87cca9b9ff86f92b74e12f8dc038725d2f7cb38dc19d9a34fb544b06f3eae35f5eded9f91dfb53e5880339f3aae99ff3012210e934 WHIRLPOOL 2a3c627c0128094c79666700f2ec544b4bf972e7a1b2a3fe304e27749c9b6b402827620d5db29b61bb080ff5c9b36f208b781c1e369f87f4a948a2f2e5d5d0e8
 EBUILD netbeans-javafx-9999_p20160726.ebuild 4717 SHA256 6186231ec60cc3e9352ef6aac6744b45d6ec096b9208c766b2f208edfd044f5e SHA512 b1d322976745d28065ee76a62c65231b4890715c38b143508d7b81c99d25c65298bb564f1c8e45c37db5b1b4255d9aa9d5ec0b090d9f63f1e0b9b453fc489f14 WHIRLPOOL 49b587b41efcfa7853ca98d5e6b18608428492396bbbe4c2f52b6840d7aeb3d68deccd306a0a92e03917ef7eab0710edc8fbdd010aaf25597f839622171371ff
 EBUILD netbeans-javafx-9999_p20160727.ebuild 4717 SHA256 0370ef84d4cbfe2f2a521292e27144523681e96d53e91cd623f71104d6a67e14 SHA512 75cd6a994bb7c9393d2319badb49b0f1c7eeebd2c48f0b168da76573d2c079e9360b5331e9d0b9a233978ccd99290b0c686c2ebbf0e4677b1ce836bc1d1ee663 WHIRLPOOL 3ee7209e0c01c2e60ee211b87c398c4fcfb1e5ec63fb434976041c478d401d979a5c67dbde79eeec431b512c6893ad6fe8a7be3c831293a7892e853cbac3f545
+EBUILD netbeans-javafx-9999_p20160805.ebuild 4717 SHA256 0ab75a5cfeb7229da3a1dc00b2dd7157f6de1a4fc8e1d8fdadbe0c2b0f74d22c SHA512 2cb81a9528264ce6012deacdd812c24f22c918a2ea6c4ce148723a0a78285d5a98e1696d5f950843cc1f67321bf544215271f1d7bf620294945bddb30bce0acf WHIRLPOOL 3e4eb69d8821b87ec9ac0a17aa89389d0d76f839d40982f9080cd43aa632f818627eac1bf07e65dba877d3ee715f35e9b54e421346525e9216b36c4f3fc9e583
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160805.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160805.ebuild
new file mode 100644
index 0000000..3077592
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160805.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-08-05_00-02-33/zip/netbeans-trunk-nightly-201608050002-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 b82ab77..69780dd 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201607230002-src.zip 217014076 SHA256 b297107296d96c
 DIST netbeans-trunk-nightly-201607250002-src.zip 217019515 SHA256 4f7317d2fa0693c653216be2607fb8e9d2c90f6f22e650ba38971767cdea57aa SHA512 ca97c3cf0bb7bb7031e82445accaed1f09d971b81de6a8e11824c2232968c4acb92077af57d5a91c8dca029ce39f18b3e676a1fdf21ef7190a2a8577652f4181 WHIRLPOOL 64a2af5584458e9a415d83685f99387ad7c2422d21750d4c6234fa5922def0374517081a633837bb45231073fcd0ba366748bf6861d64d987952f4c786529cca
 DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0bf64eb9954902ac044869706bfb6bc6a3d6c3180db184249a94 SHA512 cf146c2b53ecf99feb93cb3ece2eb8be14b3764587d9dac5b783c5486e3f9ce1aa7bea55f3289e6aa8d4661511ed733f6bc125067ad83cff356dc46380cd8eeb WHIRLPOOL e9af0196209422a27085122ef2f2c3499f18ca82a01ee9fd4e6cd5ccf51888d26429e2dd90b705e0d2bc0c195856598f13715ae29ffa64b174e02e1617c3dd07
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
+DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 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_p20160629.ebuild 4412 SHA256 648e2262c5bbb91513d395f2f86f056e10f4a77f60970131987da3e13f454233 SHA512 2c74f3b4e3ff7079fb47e62d57f4107b082752a3c17456f62b86022763e875fa3597a78b3816fbe244af0a44fd7df74cff8630c52b42f1f1a2c7c15cb53d1c8c WHIRLPOOL c596a045e493fedcb96ec368890a7d14f28f24d564ba82321fa34ea0cbf730abe6361bf43675dddfa94b1c022adfc31e5b82347faf7c843e3205cbbfca0144a0
@@ -55,4 +56,5 @@ EBUILD netbeans-mobility-9999_p20160723.ebuild 4412 SHA256 41682f4d83ffe28189481
 EBUILD netbeans-mobility-9999_p20160725.ebuild 4412 SHA256 08ed8b736ac8a756d4c5d97b1dd2869e25352b5562b9c70c9750c94bd7b16160 SHA512 fe21470d446297a9c7c000923dfae5dc4c25128507d0378b54c9223435fbddf42bd87e8066d6b2143a56be946c21e9084d9b8a031460c86774582c4d8e718299 WHIRLPOOL a66a083b664034bd552f8b0c16152ab48598c633b37c4e502dc5853e86534984275c9ba120a9d27abcdbd1679ef09cd2f8fcd54b7947bdfc71c8902a890b1450
 EBUILD netbeans-mobility-9999_p20160726.ebuild 4412 SHA256 3f56c4dca782b3bc27f5b6e0ba6d786091db3f8f7e736cd78e2dd8ea38f76ff3 SHA512 7a55fb8c75cacdd59827b50c10308a08beeedae9a3a09342d18e84cb432c0db0f6b3c052db336ca0114b14c440253022fa5c06b3a3d8a4f3645188a92c0ae1e3 WHIRLPOOL eceb99365cdc47692b74bf170ba0488f1089b59ab577bec1ecd2f2c229c237b5ce669e62a68fe1f37df956ad53d05cac87646599139fca6e24e8a60ff3cad07a
 EBUILD netbeans-mobility-9999_p20160727.ebuild 4412 SHA256 3181731ccb3d338ab0dc72fc9b0607d48a98db6408d7fd305c558653b1928d82 SHA512 c6c4e366babe7af5a6475ac4a500ef2f9428911c042aad6d54109e84220de31bb80fb73132c181434cadf218d153821f834feb591acccef8ac5efb90d61abcc8 WHIRLPOOL 6cfa577b0d718f403d1d08ed2daa9e1c393a10c8626fd965348f702532a9fc780f09a3860e6e5507eba16b1d365362e903ec6a402c32ab838045cc4ff897edd5
+EBUILD netbeans-mobility-9999_p20160805.ebuild 4412 SHA256 a41d717864a56f05306e368243d3ddbeda846f367ae6222b24bce1523bfb7e19 SHA512 13d0e451ddca0217329139be86e3cf5cfc63af0b7841e92efbfcd04c665500f2eb3169f7559befc3188b4ba27256c69954328a1c0d8d3768b51cf49634769f74 WHIRLPOOL a97fc399cf3c9cd6bc9ee438a6b5de82642baa64ccba80c720d302c9f48fcbd96e30b1008bb7bc72bdf858887b1bfe774add9fe8dc8d6e3230ed8047b8eddc56
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160805.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160805.ebuild
new file mode 100644
index 0000000..bfed95b
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160805.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-08-05_00-02-33/zip/netbeans-trunk-nightly-201608050002-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 5ceb2a0..fa48c81 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201607230002-src.zip 217014076 SHA256 b297107296d96c
 DIST netbeans-trunk-nightly-201607250002-src.zip 217019515 SHA256 4f7317d2fa0693c653216be2607fb8e9d2c90f6f22e650ba38971767cdea57aa SHA512 ca97c3cf0bb7bb7031e82445accaed1f09d971b81de6a8e11824c2232968c4acb92077af57d5a91c8dca029ce39f18b3e676a1fdf21ef7190a2a8577652f4181 WHIRLPOOL 64a2af5584458e9a415d83685f99387ad7c2422d21750d4c6234fa5922def0374517081a633837bb45231073fcd0ba366748bf6861d64d987952f4c786529cca
 DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0bf64eb9954902ac044869706bfb6bc6a3d6c3180db184249a94 SHA512 cf146c2b53ecf99feb93cb3ece2eb8be14b3764587d9dac5b783c5486e3f9ce1aa7bea55f3289e6aa8d4661511ed733f6bc125067ad83cff356dc46380cd8eeb WHIRLPOOL e9af0196209422a27085122ef2f2c3499f18ca82a01ee9fd4e6cd5ccf51888d26429e2dd90b705e0d2bc0c195856598f13715ae29ffa64b174e02e1617c3dd07
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
+DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 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_p20160629.ebuild 4111 SHA256 44b08b44dc2978d1df916fb039640a8fae17d81a4486108df922b250d97d7af3 SHA512 8d31ff0d73f1c107a595daa66486a4622a654d4bf5def914ce096c9348f43ffa0e07ba796b8daec2ac46114175a9bcc212954819f8e1fd524695fff8f0f0bbd2 WHIRLPOOL 41be443ca44390dfe17b270b7ff6a0d84c3a9aca0d98c124a41d4ecc8062984ddebb39f793a92f9ee9d67914a1f81388d9baecd83e38e6e04f6927a384adecd5
@@ -58,4 +59,5 @@ EBUILD netbeans-nb-9999_p20160723.ebuild 4111 SHA256 726677e556b14f337da7004ba57
 EBUILD netbeans-nb-9999_p20160725.ebuild 4111 SHA256 4ab4d7945efdd34c0188b0460e88524c6b4b9133f391d63b3e61f7a334b530d2 SHA512 2949d2687d7d2703ed4a2f201764296781cc0b2717b93ddb6c9f06203c2e56004cf0d6c280b39c15e6ce94a6971036a1398411b4d939b6c74d6725d4f625bf42 WHIRLPOOL faa8c95e0b5ecac9fb4a252f270391ae57bfc4d00ae9400bfc007bd0561603188ea5f600c745a0c2813730341c793c7142833a523d44fdb5edfc940df865798b
 EBUILD netbeans-nb-9999_p20160726.ebuild 4111 SHA256 914fc806c0c6dabe5b4b1ebc0b7f013e17fb042de587811b8410b46da9e39dfe SHA512 1eb08797e5e261912e0be656928324dfbddcecf60f7c849ba3f0952ed034cee39cf68a75ec76ea9257a0542529ac629849338ab5aa672763f350fe9f030113b1 WHIRLPOOL 19bc4171859d690450e3eca42c4e98c5b5a8814932b44571358c1349d34bd9e0a2866e5523bc2562df67d81926f61ba050fbf49425e53a48eff92e28843eb74b
 EBUILD netbeans-nb-9999_p20160727.ebuild 4111 SHA256 70da776a92a3084541cccc8c4b22cef4355242a8f43a439bd19ff941e5810872 SHA512 3c2deaac1cbfe62369dfc0b736f9dab42937463ebc49d1707f614f768604fc3fd681c99ef3bd436e0c67c8a012fcb4b0805bc72b40c58b226ec4f33701b9f294 WHIRLPOOL b5246428c5f6316e763bbe5fbfc703bceb2dfdfc111b0d5cd0433266ea2be49adb282477d41822fd23cf3fee2c741c5898804230bd699741c35234e76c7decba
+EBUILD netbeans-nb-9999_p20160805.ebuild 4111 SHA256 09bb7fee378ce42b8e5227641d546bbb8dcd0ca0abaa1a0194d53579d0e8d57d SHA512 e9d2421c26e73ed059a94472594a43f40ea36d658c671cfa86bb719bfbf68e0c0e2aaf5462728c848f29b62653a37c614fb7f46caa1f72cfbb7501ae2c8169cf WHIRLPOOL 1349f7b111532a8b6999469225aaffe8b894e89e99e428511d9048d315728a47c7ecfe86ad09e36e8953fa4913654d889e8e0f975a9223fbfc10f215aa77d311
 MISC metadata.xml 392 SHA256 01cdbcc83099b97486bd7b8e813e5b19c1138eb0d8d3e8a5683aafd579820435 SHA512 4d2f9160baa022d6a48b61d5f42e71cfd411d244e7a36436629bc5ee4036e4ce19079134d9a6c704ebe942306c2e0199d0591c1e54f92f8f3c8835147e639246 WHIRLPOOL c1131764e1cec66c56b977ebe36014b29e5a68e35ccc326c0cbadd050a6c625cf191c85c212e0a733661c008dab0d99f9a4cdc4c4ae0cc9d775ba1de554795a9

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160805.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160805.ebuild
new file mode 100644
index 0000000..1ddc03c
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20160805.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-08-05_00-02-33/zip/netbeans-trunk-nightly-201608050002-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 3a514ed..c8cc0eb 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201607230002-src.zip 217014076 SHA256 b297107296d96c
 DIST netbeans-trunk-nightly-201607250002-src.zip 217019515 SHA256 4f7317d2fa0693c653216be2607fb8e9d2c90f6f22e650ba38971767cdea57aa SHA512 ca97c3cf0bb7bb7031e82445accaed1f09d971b81de6a8e11824c2232968c4acb92077af57d5a91c8dca029ce39f18b3e676a1fdf21ef7190a2a8577652f4181 WHIRLPOOL 64a2af5584458e9a415d83685f99387ad7c2422d21750d4c6234fa5922def0374517081a633837bb45231073fcd0ba366748bf6861d64d987952f4c786529cca
 DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0bf64eb9954902ac044869706bfb6bc6a3d6c3180db184249a94 SHA512 cf146c2b53ecf99feb93cb3ece2eb8be14b3764587d9dac5b783c5486e3f9ce1aa7bea55f3289e6aa8d4661511ed733f6bc125067ad83cff356dc46380cd8eeb WHIRLPOOL e9af0196209422a27085122ef2f2c3499f18ca82a01ee9fd4e6cd5ccf51888d26429e2dd90b705e0d2bc0c195856598f13715ae29ffa64b174e02e1617c3dd07
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
+DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 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_p20160629.ebuild 4418 SHA256 11d47be338b1ca237c468a5fe3185f818fda7f46f8927e4023dcf5af02303c8e SHA512 81526613c6fbe4059453be97ce75d1fc121bcaa248c318cdead82a29bcde2ee16100c7afce783f051900fdbf745fbd99ae7319d1117b71fdc948b2d45e85e50b WHIRLPOOL bd11c27e91385a7527d0fd8fe2084873f3fa4b287b1e13ec4ec53c59bcc77c4f8e8a5b831a9e07d3dc221c6f5a9111c76589753cd93957ace920c808aa65c1fd
@@ -60,4 +61,5 @@ EBUILD netbeans-php-9999_p20160723.ebuild 4418 SHA256 b3fe09eeda5f5b5363ec3ed016
 EBUILD netbeans-php-9999_p20160725.ebuild 4418 SHA256 4f7b330f5c2354c27d270ec32b3e2ca837e0543e9b389082aed6b5117e5190b4 SHA512 9594d0fc21f30a571b0a951532f04259abf3fb8ac798ee53ebef4f10b69e6ff5f531fa320679d7959a1039ce281e3dbba598c3aaca39e1f513a9edffd4fbde47 WHIRLPOOL 7350f82cdf37c516e03290e4a69984a97499ae9768ee8cd47010ac3f48b85d1acbbd13d73dde7c912d99c40000d7dc6f8787391f328d7053c8f9a7266a5634d0
 EBUILD netbeans-php-9999_p20160726.ebuild 4418 SHA256 521f26a4aaf11c9f8c83ec8579139f3e7602cad7d305610f7c39b9e928231f69 SHA512 67b56b4c640b26ecc4b5dac146a07490944c8139da84a129259b88461fa8e6d3268f1b39becff6da3e49aa86b8da666dc7a1a52de02ff3a7188f0930f6f59480 WHIRLPOOL 9e017f383407056f3b242db533162cce5adfb83c7bcb731f54bde9637a3f5a0915abcb5a4cda1e7abcc30879e39d656105b6fd45e7a83f043ee4a2d66f82b89f
 EBUILD netbeans-php-9999_p20160727.ebuild 4418 SHA256 fb596960721bd84a462cf9bae85856e3bdbf87586af5ea47243a380b7326ade3 SHA512 be988749609f48e53026593876699c62d7929719a6fbe0054cde38fa7564886cdcb500b3a84055f2cca57034113cc00207f84639a4eb2f475f3c4acc180b6fe0 WHIRLPOOL 9d23cc557c59fcbd363e49a7bb2cb4f1541d53e438e111bd51f49c70f584e60ddb528cae0704db65135b9c54be746e305a4f70e1875de4f4f2d332595578c4b0
+EBUILD netbeans-php-9999_p20160805.ebuild 4418 SHA256 ca5953e1f7771dca5d26be7bc8b6ca785af67ee854830c8bf01edd1e5c46340f SHA512 430b0955c7ccb0bb8495ca94610623c12142585b15aa3c547e6f03b58f29c7fbd0dbf26bb3ca098ea81da22fb79789563e3795ce1e083a1bbf23adc3a385a9c7 WHIRLPOOL 22951c3969bb6f3e0676b46c770a628798afc4eeeb9b24aea70f15c06e92b7aef01ed8b8089cf2a34055e19183927b14c91e3b836e163505a780bfe04f6da782
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160805.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160805.ebuild
new file mode 100644
index 0000000..6897bd7
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20160805.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-08-05_00-02-33/zip/netbeans-trunk-nightly-201608050002-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 33bae1a..92c6a0b 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -54,6 +54,7 @@ DIST netbeans-trunk-nightly-201607230002-src.zip 217014076 SHA256 b297107296d96c
 DIST netbeans-trunk-nightly-201607250002-src.zip 217019515 SHA256 4f7317d2fa0693c653216be2607fb8e9d2c90f6f22e650ba38971767cdea57aa SHA512 ca97c3cf0bb7bb7031e82445accaed1f09d971b81de6a8e11824c2232968c4acb92077af57d5a91c8dca029ce39f18b3e676a1fdf21ef7190a2a8577652f4181 WHIRLPOOL 64a2af5584458e9a415d83685f99387ad7c2422d21750d4c6234fa5922def0374517081a633837bb45231073fcd0ba366748bf6861d64d987952f4c786529cca
 DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0bf64eb9954902ac044869706bfb6bc6a3d6c3180db184249a94 SHA512 cf146c2b53ecf99feb93cb3ece2eb8be14b3764587d9dac5b783c5486e3f9ce1aa7bea55f3289e6aa8d4661511ed733f6bc125067ad83cff356dc46380cd8eeb WHIRLPOOL e9af0196209422a27085122ef2f2c3499f18ca82a01ee9fd4e6cd5ccf51888d26429e2dd90b705e0d2bc0c195856598f13715ae29ffa64b174e02e1617c3dd07
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
+DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 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_p20160629.ebuild 9520 SHA256 0bf3526d550909a3f9395d5982093199a23ccd632d07a65f06a1eec59745287c SHA512 19cedab72e8ca9a692557fdfa8d669f06d270b3ab9fcbbfca24d6d7ebf92ab0588f008d114d40185d3d070c2523f51374ece866af29d4197194f8680bac50892 WHIRLPOOL 6b35d62ea994764e82492bf169c7e590d6a6a21fda5d220d35e1188d1b673c0405b2bb7ecbc3e1070b95e13c919609d1f30551135acb78ff0624c904b9ab1af6
@@ -81,4 +82,5 @@ EBUILD netbeans-platform-9999_p20160723.ebuild 9520 SHA256 c5391542d914c6b28f3b3
 EBUILD netbeans-platform-9999_p20160725.ebuild 9520 SHA256 79131725e93c3f96b6343ce3e6a958c3bd34b149767fdedbe6c6604360dc8c9b SHA512 7c0f91158e1aa2e8aa3d28caaa790b9256b66483277341c0477a40bed19eaf6eca9693143b6f7af9ecb1920623fec75aa2a403ee8a6d62416f849e6574b192d5 WHIRLPOOL 9fa76a1dadc80685e0d9ad7021da6fcd93c4a2ca2f9a656005eaf7b14bf10e388e9f4c57c0eb828bdcb41851d0f56bafb7fbc3bb127871b8e341f98912bd2a36
 EBUILD netbeans-platform-9999_p20160726.ebuild 9520 SHA256 37d585dfcb3fe3945f1a40493695892af455f99a6ad6b4d33663251494e56a4d SHA512 9fa9e38328bb44b437b04a877be340d234b6d1a0039de75bb61852f142174f3d73b227828cb6bfd2def19050cb5102ee3c8f4b98e9044df51b667c81f937d4b3 WHIRLPOOL 66490293a57c48db63f947de70f0f2d505b8ca3d86f4b09e140c1f4ba87fe744d07dd58ad272d9ce877b67e827a4c65e25fe63839142e8c9a7f8c626a3741c8b
 EBUILD netbeans-platform-9999_p20160727.ebuild 9520 SHA256 63e08e0c701b7bc57ea1508ae6612d3240e8d82211adcefa1bf4a711fff3af14 SHA512 42ba85af6ba2a1b3d5d70fc53f1bd688cd4a7d6878555a7ad7d9163c44cf3b5905827ab1a68bde1b47523b7c73e69d9fb2bf9d1c09562bf1add2970ed0d36db8 WHIRLPOOL 06c4fb0cde2c72ecb8e97ba49d949a91ba128d87197449c42621d2b410d16b4de50dfbe7621c88c47d2f0ebf7b22a42cf5259e0316842ac32d8e958557b85966
+EBUILD netbeans-platform-9999_p20160805.ebuild 9520 SHA256 546ab9250584d86027340a44ea3387216a7db6029f5af7c797e52202328b37c1 SHA512 d3408e43f8b658475e411f4f1e867d4a1dc136fc61a4190776facea4dc4042487875dec3eb39857813682b9a744b08de440a8a429e65ba7371eb304aa21536ca WHIRLPOOL 4e902c0137be4f332f300398462fb765c663686b7bf6c4d4f1bac60b5bf3397231733367c5b625e72cba6702590bc530f0d5bdb42f84cbdc23ce0ffc8460e986
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160805.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160805.ebuild
new file mode 100644
index 0000000..672f9c9
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20160805.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-08-05_00-02-33/zip/netbeans-trunk-nightly-201608050002-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 8886fb9..6604fe1 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201607230002-src.zip 217014076 SHA256 b297107296d96c
 DIST netbeans-trunk-nightly-201607250002-src.zip 217019515 SHA256 4f7317d2fa0693c653216be2607fb8e9d2c90f6f22e650ba38971767cdea57aa SHA512 ca97c3cf0bb7bb7031e82445accaed1f09d971b81de6a8e11824c2232968c4acb92077af57d5a91c8dca029ce39f18b3e676a1fdf21ef7190a2a8577652f4181 WHIRLPOOL 64a2af5584458e9a415d83685f99387ad7c2422d21750d4c6234fa5922def0374517081a633837bb45231073fcd0ba366748bf6861d64d987952f4c786529cca
 DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0bf64eb9954902ac044869706bfb6bc6a3d6c3180db184249a94 SHA512 cf146c2b53ecf99feb93cb3ece2eb8be14b3764587d9dac5b783c5486e3f9ce1aa7bea55f3289e6aa8d4661511ed733f6bc125067ad83cff356dc46380cd8eeb WHIRLPOOL e9af0196209422a27085122ef2f2c3499f18ca82a01ee9fd4e6cd5ccf51888d26429e2dd90b705e0d2bc0c195856598f13715ae29ffa64b174e02e1617c3dd07
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
+DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 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_p20160629.ebuild 3472 SHA256 400f9c8fd8d2ac203576d74f7f2124b0eb0c0b8c3195d7631f07def1ef16901c SHA512 540230b9d19253d3268fd0219a677c586efd9232526c75e8cea53d19c05e8c0a1d9619fc8f49708ff0b086c7b0d2aef3b6e845db7ab3d64100b86b8746082903 WHIRLPOOL c1bf20139867706bcafa86bc1978f1ea379c6699532f40b3da644736d0eaccc9bd5066509301cd4a192d40e14c78247ecf6ebd63d8c9401f8e1917e79474f570
@@ -55,4 +56,5 @@ EBUILD netbeans-profiler-9999_p20160723.ebuild 3472 SHA256 8ca9dedaf45ab872053e6
 EBUILD netbeans-profiler-9999_p20160725.ebuild 3472 SHA256 76f8214d5b4cc26e81eaefbeb1d98a8d8e56736a6e396fdf9d3ba489cf98eb53 SHA512 2d5618c8d95471eef1441fd3838551ab82f289c52abe16f3e8bfc88f08e213d8ede57bd0bfd2436a98eaf149ee20c29e02890d3f2af95f3513316f6edc84cf12 WHIRLPOOL bcda56f9da6dea0dd46bc4a26d03aa0b8a028cce2eaa1a5cf866513da7fa5b9d98ee9c7dc7acfa6df0246dcf56298d15273f0d3cebabf4622cf20142eab25417
 EBUILD netbeans-profiler-9999_p20160726.ebuild 3472 SHA256 9e18bfb3068b1c55766af682d3248c8337d18faad1344092a9c35f42a6d8e626 SHA512 c69bba3bae120d6bdb9eeb3c27663b56a0bb3f11fe58ab3f100175ff8e5dc214d6ea87d3587071bffa2d26569b410b09477eb4a55978ab25d63edbf956598df0 WHIRLPOOL 0443cfbe6289fdaf07720ce3816a1585b2540bf0611645eafe3395104df4862f0fa25f5d907794900648cb28b4883911baa8e607a646dc74b5945ea60168ffa7
 EBUILD netbeans-profiler-9999_p20160727.ebuild 3472 SHA256 04b29552e8a6089e0a56d4cd9714f128e9750445573306ab643ac4ce05be009b SHA512 e19ad44453696af938630e5c5efce5ab786f0367535ed1a0d500a03a025d024bcb36911a68c6b043225640a59604af343dbacf78009d193cdeb0a21be544fd1c WHIRLPOOL 6072b53a30147d7d97b85141f0416ce3eed72dbd80c47c9d4e486a83dddc4881e0cd699b6f557b8965ea5a34ae1b79d835547b12ec640e312086d5820f4d02a7
+EBUILD netbeans-profiler-9999_p20160805.ebuild 3472 SHA256 a69831eec96d1ff1b001d66eeed5085433fc3ecae308e67409226f305d0a75a4 SHA512 8c1f686bf8fcb8a4319c8169c43b0ef13b0bf9431babe8002865ca0b96f840c89feb5799034052ee199b2cbb09527cf78e340fceba571c4ff3efd75160b27053 WHIRLPOOL 528861b4f14316b5143799bd451fdd1fa078722ba0fd782ab25019ebf0d92451dae8d23132425aa3ace8ab36d3df24e750d3e4fc4692b52ac96402b8a536e414
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160805.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160805.ebuild
new file mode 100644
index 0000000..fc5b50f
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160805.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-08-05_00-02-33/zip/netbeans-trunk-nightly-201608050002-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 98e5b63..192a4fc 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -50,6 +50,7 @@ DIST netbeans-trunk-nightly-201607230002-src.zip 217014076 SHA256 b297107296d96c
 DIST netbeans-trunk-nightly-201607250002-src.zip 217019515 SHA256 4f7317d2fa0693c653216be2607fb8e9d2c90f6f22e650ba38971767cdea57aa SHA512 ca97c3cf0bb7bb7031e82445accaed1f09d971b81de6a8e11824c2232968c4acb92077af57d5a91c8dca029ce39f18b3e676a1fdf21ef7190a2a8577652f4181 WHIRLPOOL 64a2af5584458e9a415d83685f99387ad7c2422d21750d4c6234fa5922def0374517081a633837bb45231073fcd0ba366748bf6861d64d987952f4c786529cca
 DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0bf64eb9954902ac044869706bfb6bc6a3d6c3180db184249a94 SHA512 cf146c2b53ecf99feb93cb3ece2eb8be14b3764587d9dac5b783c5486e3f9ce1aa7bea55f3289e6aa8d4661511ed733f6bc125067ad83cff356dc46380cd8eeb WHIRLPOOL e9af0196209422a27085122ef2f2c3499f18ca82a01ee9fd4e6cd5ccf51888d26429e2dd90b705e0d2bc0c195856598f13715ae29ffa64b174e02e1617c3dd07
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
+DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 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_p20160629.ebuild 6242 SHA256 26fa0c9759e3ecca05171327d4b5f6f6f19c4c211b13bf6f5d2a4aab0a2a9161 SHA512 52c38e186e47668946cf14f0bd0898e7dad972f52473365d7911a0a5f58635fb43fc0183afead37ef7b7ac91872fff0fbdd3c74cc43bc3f4e8676094802b6434 WHIRLPOOL f0c7761e48852a8621d2cc155dabf8c6190f4376a803407d328aca00859860dac14521d4e03b4724b8af7589a64335f1d239a1cba3b0d4ff95973df3c8ca3e59
@@ -77,4 +78,5 @@ EBUILD netbeans-webcommon-9999_p20160723.ebuild 6242 SHA256 65d9a58c4c744d41f936
 EBUILD netbeans-webcommon-9999_p20160725.ebuild 6242 SHA256 7c6f193c82c754fbe6234b3c3192824e11b13d07220f5f530935fd7c180ba563 SHA512 ff3b3a341610e6018a00610a6a2cdb01551a41e611dea5df367be9b4dd2530057d3f2840df11bf987e7ed1ebed58182665baaec8fc0be96795042adac35a7e9a WHIRLPOOL d4320b3ac883ca90f746a9f67cd76cce383046b7fb01afb0eeb603baac85c8ab80fd208de694b1ef5744fc8c877e729825afc5fc4cc66565b97dc9aebbb124f4
 EBUILD netbeans-webcommon-9999_p20160726.ebuild 6242 SHA256 69f1b62f9854561efb578637a3e15ebcfff378922782577ea06c7043f40d39d1 SHA512 20576ede88474e3c3f7fd2e72384675c60730b9c5f4cfb452bc7a87905308feeac77307a855f87978c044c308be68584e9375850b342cd48eba214b113e5aab5 WHIRLPOOL 0bc8d4883a57af2ed2d5a5ca84d4902b03bf1434579defff2737d6e47a5ea23154c73e58efa000a123dbb74a677b68ce1140640d2d06b6cd0335cb4d6f481cb9
 EBUILD netbeans-webcommon-9999_p20160727.ebuild 6242 SHA256 a6b8229bb9ec92945fec640edc45eee24b21e2476839c0a2ca92c1d923c757e7 SHA512 5220fb7a8f278fe4a632b5333e8856d58eac8fb1cc5440ea3b912055111315714366f978a43562dea806a45299ad9c82d9050803b8685c910a6fabbc5eec7b9a WHIRLPOOL 075f3241ba415961b3cbce2731c5b6c16c54ac73068f6813c1b628050df26470341073d632ae831145667c49e9a32d6264d8f505cd4e3091c986332d498fbcfc
+EBUILD netbeans-webcommon-9999_p20160805.ebuild 6242 SHA256 d4360b1017f3d9da2542318e75a0908026d2cbe41decaa16dab141cfe240683a SHA512 967236a8ec2035cc5622777f1b84763f163da728f3f6d5625205448d9682e5d7f60f4163ed366d1edb9cafbcbc3e222a4e8786d2ddc28ba04e28056e499bffdc WHIRLPOOL d8d803ecf8391ece21538d27ee4b1c0327a8cb4268601111d9b24344638b76f49b5dd71484a52afbf3f4f10365d5a9d1aea3d88837d2ed54e309989df7e53c34
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160805.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160805.ebuild
new file mode 100644
index 0000000..38d1eda
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160805.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-08-05_00-02-33/zip/netbeans-trunk-nightly-201608050002-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 45f7525..7474eca 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201607230002-src.zip 217014076 SHA256 b297107296d96c
 DIST netbeans-trunk-nightly-201607250002-src.zip 217019515 SHA256 4f7317d2fa0693c653216be2607fb8e9d2c90f6f22e650ba38971767cdea57aa SHA512 ca97c3cf0bb7bb7031e82445accaed1f09d971b81de6a8e11824c2232968c4acb92077af57d5a91c8dca029ce39f18b3e676a1fdf21ef7190a2a8577652f4181 WHIRLPOOL 64a2af5584458e9a415d83685f99387ad7c2422d21750d4c6234fa5922def0374517081a633837bb45231073fcd0ba366748bf6861d64d987952f4c786529cca
 DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0bf64eb9954902ac044869706bfb6bc6a3d6c3180db184249a94 SHA512 cf146c2b53ecf99feb93cb3ece2eb8be14b3764587d9dac5b783c5486e3f9ce1aa7bea55f3289e6aa8d4661511ed733f6bc125067ad83cff356dc46380cd8eeb WHIRLPOOL e9af0196209422a27085122ef2f2c3499f18ca82a01ee9fd4e6cd5ccf51888d26429e2dd90b705e0d2bc0c195856598f13715ae29ffa64b174e02e1617c3dd07
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
+DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 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_p20160629.ebuild 2721 SHA256 31b16740d9c5b5f0dba53536a474ab9ef34841f5414f125cfe1ba0a182affc34 SHA512 1f23b25d36ad6e959f5cad16357bceaba8bd7cb4da62c876b6a13ddb76f069eef18290835896a167c2190d928add56d61a976ec4ac866db26201488237665678 WHIRLPOOL 134ad03608f379efbea024ace5c653519510d3c2e54d8ab2cfc88045c86b737980b2a4fd7a9a7b9d87a5a23f0a354e073c046a9b1681bc9084128618c06c3630
@@ -55,4 +56,5 @@ EBUILD netbeans-websvccommon-9999_p20160723.ebuild 2721 SHA256 ba6ab450b681f24f2
 EBUILD netbeans-websvccommon-9999_p20160725.ebuild 2721 SHA256 0f146a3c605899891880e2bd666517b0b8b8398662f3d63f9dade338dfc6395b SHA512 c88f313ee23d1df38cdeacd6d74848a34f756227dc4855036466ddc7c036e211ff43882540cbaa1cabe269220c308d1b7dada4e9484b31f28fd882120034e96b WHIRLPOOL 8278867610de581e842347eb533976ab3bdd6f8ddefc923dc1f3b5ceb051b1ba9fd26bcf072d2c8841a3e58a976c8946eb718f4cb93cca42cd3a7d81736c72c2
 EBUILD netbeans-websvccommon-9999_p20160726.ebuild 2721 SHA256 b1ee00734f3213fded0e0fcdd807bdb20a114ada052451df6e3566142949735c SHA512 01e7acb1638070ca74e7d31fc29fc502f60d30bbee61a64e751dac7503cd6edfec84fd1ee00d54e18ccdffc560cf3bcc0255bc06d8f68519ade5b4606d240cab WHIRLPOOL 28b0a1f3f065590227678a99efcd2f28b7e78da4e19b86b4518e4a28b3884bc43a98cc5c7ee12ea4de833a15319227eef62ccdaac4d28214dcff5bcdd425f79c
 EBUILD netbeans-websvccommon-9999_p20160727.ebuild 2721 SHA256 0f32abfe8cbff7b26c7b28fa3bb0bb15e5a682f81f8698c04d0b89d2347ba183 SHA512 10c819c8fbe76490640d3e2f60062c6c47eab3239395aa70caa2268bc783da52f775de61b6aa43beeb19e6fab3bcc46da4dc6cb590303c1026fbda5381ab6c37 WHIRLPOOL 8ba2fccb655bed25f0ff0f8979dbad675976ea77aa30fa4dcda3c8bb28154fed3935a7dd3eba668def44582e547908b5cb388c3d9cd710daaa990fb4d8d54230
+EBUILD netbeans-websvccommon-9999_p20160805.ebuild 2721 SHA256 5d067a2efa2ccff444b377ca2c33880788383bba8e8747d4d3cc61a4727e0b1a SHA512 7cae0ffd2e701262b03cb672077a6614b296ddbc9c15d2a4dffc0f9b971ba43a768e74cedd9666b459dc0243dcfbf227f9b0e45e03e99231bc0cb38abd34ea8f WHIRLPOOL 7373b765908ff38ec8af04f852603b0dd6cf141f8aa2a5d64cbab051030f143cc0b37109b8f98bf3e0a1a10efbe5ed9f3f8563eb46f1058d3bbfdbe9f8ca0667
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160805.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160805.ebuild
new file mode 100644
index 0000000..d554ed0
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160805.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-08-05_00-02-33/zip/netbeans-trunk-nightly-201608050002-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 0fa6090..4dc0b9a 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201607230002-src.zip 217014076 SHA256 b297107296d96c
 DIST netbeans-trunk-nightly-201607250002-src.zip 217019515 SHA256 4f7317d2fa0693c653216be2607fb8e9d2c90f6f22e650ba38971767cdea57aa SHA512 ca97c3cf0bb7bb7031e82445accaed1f09d971b81de6a8e11824c2232968c4acb92077af57d5a91c8dca029ce39f18b3e676a1fdf21ef7190a2a8577652f4181 WHIRLPOOL 64a2af5584458e9a415d83685f99387ad7c2422d21750d4c6234fa5922def0374517081a633837bb45231073fcd0ba366748bf6861d64d987952f4c786529cca
 DIST netbeans-trunk-nightly-201607260002-src.zip 217022695 SHA256 0de64b7d0fba0bf64eb9954902ac044869706bfb6bc6a3d6c3180db184249a94 SHA512 cf146c2b53ecf99feb93cb3ece2eb8be14b3764587d9dac5b783c5486e3f9ce1aa7bea55f3289e6aa8d4661511ed733f6bc125067ad83cff356dc46380cd8eeb WHIRLPOOL e9af0196209422a27085122ef2f2c3499f18ca82a01ee9fd4e6cd5ccf51888d26429e2dd90b705e0d2bc0c195856598f13715ae29ffa64b174e02e1617c3dd07
 DIST netbeans-trunk-nightly-201607270002-src.zip 217027777 SHA256 ef4b416e0c3691284d5aae7f8abe29778b06d97d306c4010be05b5b0ca5a76ac SHA512 7a1794e86bfc6363b19efc61c0fe9c27ed98d782383d76a01564de73c32622fe2f93f3289fdbb211ee16ff5e290418f0697f9bb8d9f6f7dede4aa55f635ea0de WHIRLPOOL 339fd71f6ccc54ef4f757085aec693718da5f4e88ec8c155f2dbd77f1f6cbab704a94904ca4bccb7eb9add318208db2423515ddd9ccd06dbefd68942c9c6a125
+DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c85198debe7011a2d831bc6ae30f4d8afac3608954ca5bea6ea2f28 SHA512 059de702befe9675d42e053bbb8d78b2a7aaf4a344e0f74b187c77d99c8c53cfa9d3447de7477d81f98f8df2592e563c69d28f47a6fc0a025f33a50444b48eb4 WHIRLPOOL cbcedb70dc3780e2e6eab7a5b33c854a2dfdddb200bf8c3546bb76607e5b60a8de336938b0e2037896c8fbca1cadef877f37d3f68548562e064a4b7214b6dc24
 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_p20160629.ebuild 6939 SHA256 7d7a99cae16080f9451ebfa095406a24ab4b84ff20e7840835992affcbc13602 SHA512 ad291eea5ffa6e139f2ea7284174e7c65df5bc59b741a463cc2d3b07f6678897d2d8debd92e957d284ef071261f3ca04064f55a6a58f0fd1a23f88e3134820bc WHIRLPOOL 9c8f78e356e76cc25e2dcb60fc030f2f499e77e9802e4a28bffed4fbde0f73ab1fc8cb56073aeef820f0cd534ccec41723b1d117ae7fbe265de202c506a5281a
@@ -58,4 +59,5 @@ EBUILD netbeans-9999_p20160723.ebuild 6939 SHA256 279217c6f4f7a0e98e8ba0475abb02
 EBUILD netbeans-9999_p20160725.ebuild 6939 SHA256 acdfae78a6312e7ea8046251bf99fa9aa1fed3207fe1968493ca65e9b5a2d6c0 SHA512 e590b8af97e9f3a3ae8fa2d06ecb12cd3f177240cc93eb7414b27df4bb5a5fc6b3d50bb0c86b117f918bdc58d7be6ed3a49efbbb13a80fc53ea647e89c6df64c WHIRLPOOL f1ed746f78103d360d589f9b9f9fe9dc62e1bac8bb21beea11c15e55f6f547bd060410df91ef207d1f9d78ac66acee703db4894c285e792212ce018c3ee465e9
 EBUILD netbeans-9999_p20160726.ebuild 6939 SHA256 6d77d80205042f72e52fa2a6d98f4d8d940e3298f2e67c4db48cf3360c9ad470 SHA512 70bae8da40f377610552d1e108797602a61130c3c7910bb8c65c832242937e8e26e986706197f21ecded09709facfa1b6b2753b845cf81dee8bf8335cbf3de55 WHIRLPOOL 27273a5debefbfdcbe9f45c5383c104ecea9e1b4dc7793c7941196dc8c4d17c708f6d7d6fdd7b328afd2c86254a9376e167df8f16f0356d9e5c8866d9d83986a
 EBUILD netbeans-9999_p20160727.ebuild 6939 SHA256 e82a22e92ca017a1a2a4c54f2016c3034ef959b32624efa09225367868628e60 SHA512 70c6ef34cc377ed8aa56ce01e2e7fde7dec41f6159dfea89cb85d753d3a5b0699eeb7d7c5aaadded4472c0b38bce830ec2941973b56bcca077c4895a0d13c84d WHIRLPOOL e01c3528904dd6c2978d0769d14759a062d1a6eecd9881dc023441b0c30fa3eb378d702c67a4a78bec433d6488c6b217dc176fbaab65fffb8a79d1c312d2f790
+EBUILD netbeans-9999_p20160805.ebuild 6939 SHA256 5ffdd07851b1d258f805db5481734db1921762bdf06cb56f6a14fca653bf85d4 SHA512 2ec0e15dcb6068967d6a687b262e13c9b67f83a6062baabedbe633adc4b4b0021dec52b57a8ee1496510343a2d2ae4c39173b69fe9d1e6178bb86a43d862999c WHIRLPOOL 67f4ab9b4d2d87377dbe3e86220d7df00b6b385ce7e2f8aa7490c980c26154c25449b07705d90c9414a533b3006319bb0b1035201da823afca2e94d8fb9b3ce3
 MISC metadata.xml 329 SHA256 8aeaf2a0228f15c2e4140f401b30f083509bd99d0a578873069f3595cd8555f3 SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640 WHIRLPOOL 799a9b79b1b447bda9631f67e2dfaf722376740e1d2037796528a05f9745eeed00d9990a74a65ce09f74bc5e1d60a887abde540c3c62487d7dd49b8377c15834

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


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

only message in thread, other threads:[~2016-08-05  8:09 UTC | newest]

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

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