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

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

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-websvccommon/, dev-java/netbeans-nb/, ...
@ 2016-08-16  7:28 Miroslav Šulc
  0 siblings, 0 replies; only message in thread
From: Miroslav Šulc @ 2016-08-16  7:28 UTC (permalink / raw
  To: gentoo-commits

commit:     22778eb85154dc170b2d91b2770afeb13257d7f6
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 16 07:25:02 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Aug 16 07:25:02 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=22778eb8

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.3.0

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index b979da2..c663a52 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201608110002-src.zip 217074142 SHA256 1017ce540b38dc
 DIST netbeans-trunk-nightly-201608120002-src.zip 217080929 SHA256 b8ef1d20faf0485e85cf44ba6ea77282d130efeeafd7caf58d1ae3a33bb5ee01 SHA512 eec5a8165446247e28fd9ecda21017c7d877f8199326565f4750e3631e5f58c66c60424b906782ebcd34e5e58e5810ed60399d3efc01877663821360538b798c WHIRLPOOL 6eae8a97f579b3e009b9ddec46cca6de1033591ecdbb962258d3c929f6768f49ebae96fb1013392d80a912271942d14f31920ccf3e3b69a732eea4313dc8558b
 DIST netbeans-trunk-nightly-201608140002-src.zip 217088384 SHA256 fe3aec6996f578f851f523bc169098f964c74412070b16a030ecf2ca816f72b6 SHA512 2342388288d6e11c7093abb7f5cd3b88fd7c7e8ae8a14fc7ce1becdcf5c24d1ce8d09f88c599cccbfe3d9837e21b4c459489a3dec46280682d378500d335a802 WHIRLPOOL 9ad8bd5bc9f4b00ccff17bcde21c3faa34f0aea05ff249dd8d3fc89d105073159f4a764733461f23e2608fedbd007bcd20d9e429ede3ee73f23ee799bbf654de
 DIST netbeans-trunk-nightly-201608150002-src.zip 217088384 SHA256 95ecd71a591cbb135e15157d06f7612df107f015e24ffe47338bda0a55523091 SHA512 8ff5ffdbcd89a305e0372049b1e4ed76076390f0e621fe66c867417a665d13d4b86ea09e9a55cd4a6cf162bc4e23b2dd0aaba2744abf7b205a2af8f60179e2a0 WHIRLPOOL dce14f26c47857482db487bc9d8c2fd51268021e8ecf770a77fbb3fae4576b74e86c7c4af695e8fe1dbdab6231ea962ac632d0edca9abb491656069bfcc71540
+DIST netbeans-trunk-nightly-201608160002-src.zip 217153721 SHA256 f7f0624027293b4eb18b02c6e83678b76f9161ae7790431e5cdf0a67c81067bf SHA512 004bbbafc97c8c155429d12c37e05d1737d5e5d7a5c1d77df1e120481c1f59f2535fd93efda3588aab85e8eef404cbae74ee01469b771226912ab876a23420dd WHIRLPOOL bd19581fb56c256dbf59dcc1fb7db4a11f0e8dc632763d55966f63f4bdc107645862c8ec51a8db231b462dafeb586f680f3de9ffe5af4a6c398dd4c30e880352
 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_p20160707.ebuild 3384 SHA256 ab90102f365f9fc9f028b925233dff878eabc3b7baa2b1c9eca67856a0a675d4 SHA512 e0bbddf34454a573f5f81f14f44f86fd6a74b183af41e1b94b76fc62d6daaaea9e20f92085a948114b0f55ad8e5d77bbe9985948613413f02692dc567ef2718e WHIRLPOOL 28a6c633e7855b350d4172aeea0bbcc5f699295aba8df42093b9be498cc2ccfdf3955342d3ed5b400ccadae5a39ee9a05bb62284f3f8993c5f6a87216f074d32
@@ -55,4 +56,5 @@ EBUILD netbeans-apisupport-9999_p20160811.ebuild 3384 SHA256 3e5d02444c1a378f1de
 EBUILD netbeans-apisupport-9999_p20160812.ebuild 3384 SHA256 14481c927f61bdd58f448c4de154398e370f4e625e99b58af51a6e3693764675 SHA512 36bb743914d5a0b2b112dcfd14702bb2a197f0f82241db21846364846e41083b118d45bf53deeb5e3b92e770c5faaa742d533b921186277af51c65ac62904716 WHIRLPOOL 92873dc9419329d20af8c6edc4fd27691cb6e4f5095d900e720fdc32fd4b53ccb13f9fa431e60206512ca34c1ce9dfe2a6408fc858f23aa2a55d2f21046bc3e7
 EBUILD netbeans-apisupport-9999_p20160814.ebuild 3384 SHA256 3ebb08ff9d1b7dfef58fdb1e0a90853872b029f8d1dd19f84c33a492c37a57a5 SHA512 81f319c079ceab3e6900a6ce61314d8355046f33590ddcddea4f3f65658cf8151178bc7cc8fa6b19853de4e9f0189854f2044eef97278cc07894286a37b4b430 WHIRLPOOL 0a31f2b5c88cd7ece70a8c7d16830c98089b5bd0e43f5fc4c76257302d75cf91331e4ed3288c5213b9712e4958175337d76e9cfe7c47d09e147f366b34415a94
 EBUILD netbeans-apisupport-9999_p20160815.ebuild 3384 SHA256 77fe42ecc1d845fb3d66d513dfbb7900c66032a4a307eba8054fe910f3bb4419 SHA512 da12e4688c116b52ce34a16e54e4fa73c7e1aa0a7cbc84ce2d208ecc8d25a01ec26c539ed2b58a67564eb709dff5cd780512e0f5175b909955ffe6db7744edb3 WHIRLPOOL 629474ca2d8a94fd81ae5a6faf573dd427e280938f3642cdc1bc0188d00007d4cac542094ed720a54b943e1cc13add533a2975106fb2867674ddb5247c05541f
+EBUILD netbeans-apisupport-9999_p20160816.ebuild 3384 SHA256 af947e60e6142b5af78a851fec48312745a6565b9bad6bc7bb4777a3df28503d SHA512 86fc68d0870780b209967b2eb16bab1e0fd94c65076949213886054563f6ab30faf121068721bcd73728ddd506a2a7ec2347b6be9ca3a51ecd8a9315cab9b96d WHIRLPOOL fde89f6f10bb1088f2d3c2bd799dc1ab4af28cf662a93a7f956314b5840a34a5c00a0eaedf1e8aa08497642abd3e4a106e37b4d737b1f77f41a7341f8f87a778
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160816.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160816.ebuild
new file mode 100644
index 0000000..a7b42ea
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160816.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-16_00-02-33/zip/netbeans-trunk-nightly-201608160002-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 7e49253..f83c683 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -40,6 +40,7 @@ DIST netbeans-trunk-nightly-201608110002-src.zip 217074142 SHA256 1017ce540b38dc
 DIST netbeans-trunk-nightly-201608120002-src.zip 217080929 SHA256 b8ef1d20faf0485e85cf44ba6ea77282d130efeeafd7caf58d1ae3a33bb5ee01 SHA512 eec5a8165446247e28fd9ecda21017c7d877f8199326565f4750e3631e5f58c66c60424b906782ebcd34e5e58e5810ed60399d3efc01877663821360538b798c WHIRLPOOL 6eae8a97f579b3e009b9ddec46cca6de1033591ecdbb962258d3c929f6768f49ebae96fb1013392d80a912271942d14f31920ccf3e3b69a732eea4313dc8558b
 DIST netbeans-trunk-nightly-201608140002-src.zip 217088384 SHA256 fe3aec6996f578f851f523bc169098f964c74412070b16a030ecf2ca816f72b6 SHA512 2342388288d6e11c7093abb7f5cd3b88fd7c7e8ae8a14fc7ce1becdcf5c24d1ce8d09f88c599cccbfe3d9837e21b4c459489a3dec46280682d378500d335a802 WHIRLPOOL 9ad8bd5bc9f4b00ccff17bcde21c3faa34f0aea05ff249dd8d3fc89d105073159f4a764733461f23e2608fedbd007bcd20d9e429ede3ee73f23ee799bbf654de
 DIST netbeans-trunk-nightly-201608150002-src.zip 217088384 SHA256 95ecd71a591cbb135e15157d06f7612df107f015e24ffe47338bda0a55523091 SHA512 8ff5ffdbcd89a305e0372049b1e4ed76076390f0e621fe66c867417a665d13d4b86ea09e9a55cd4a6cf162bc4e23b2dd0aaba2744abf7b205a2af8f60179e2a0 WHIRLPOOL dce14f26c47857482db487bc9d8c2fd51268021e8ecf770a77fbb3fae4576b74e86c7c4af695e8fe1dbdab6231ea962ac632d0edca9abb491656069bfcc71540
+DIST netbeans-trunk-nightly-201608160002-src.zip 217153721 SHA256 f7f0624027293b4eb18b02c6e83678b76f9161ae7790431e5cdf0a67c81067bf SHA512 004bbbafc97c8c155429d12c37e05d1737d5e5d7a5c1d77df1e120481c1f59f2535fd93efda3588aab85e8eef404cbae74ee01469b771226912ab876a23420dd WHIRLPOOL bd19581fb56c256dbf59dcc1fb7db4a11f0e8dc632763d55966f63f4bdc107645862c8ec51a8db231b462dafeb586f680f3de9ffe5af4a6c398dd4c30e880352
 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_p20160707.ebuild 4790 SHA256 b43945eb2a89a2d102d17819ee310d79250ab0ee1242035ca85b627610d6d6a2 SHA512 a07192a18803a5239e33790d337323f07a09cf549f06a9ee3e2b12e847e9f4a45d8b1bcb0fc2cdb3dcda99f5d13d57bce35629a6f81b3e7db87093ae42de2b68 WHIRLPOOL f4e80c46b6a514ee52732f1eac265a74b43544943337d824fd5e48fdcae11b76abe932c9611372355fbfce67457b502c6891db0fdab73cbf8964d8fb3b0004df
@@ -67,4 +68,5 @@ EBUILD netbeans-cnd-9999_p20160811.ebuild 4790 SHA256 28216d2fef26e1583d7a2c7657
 EBUILD netbeans-cnd-9999_p20160812.ebuild 4790 SHA256 7e16ac50211e32277d3a753c4d4341ec9b327f4897b9cf83bc18f7f5ae412f4c SHA512 8a1285cabb0acb80e6d13cbcd6fb10137435d717f5a437e8bf73f01f2d16d3fa69e271c5b8ea81c241d984b4463837ed6211e2219d7f4bb4b67acd2cb72e3413 WHIRLPOOL a25d4d2e09ee3b64b412a3a39bf3e98d2ec7eaa00a6660dbbf275fe03a341cd92b4d87815952b664e71dc66230d56adfaf59b4b195feff6c7464913df9c5085f
 EBUILD netbeans-cnd-9999_p20160814.ebuild 4790 SHA256 7c50b799c3299efa9b1c0904f7f8a8b61c92d89f0be0cea301c2dfbd710b3143 SHA512 ec1c27e881acdf701adf65942fcf7f3df046988a422c00f89c00f0fea739a627075c5bfe22792d07ff077c051fe9fc1e0038249ab632e1704d0bb75069d2511e WHIRLPOOL 11bde428ece690d35b60333c3addd566c434a7b884b4b544f325b8754b1d4caec9069443608aa6ff732d24e22bcccd6dedb4d76bd7449be4372dc806d4456f59
 EBUILD netbeans-cnd-9999_p20160815.ebuild 4790 SHA256 1badc35f8ce00bfc07b451457809d57ab7254632834a9c1ce6c55c0a73087b36 SHA512 cc11dce99e0460b057abe62c14cc11cd5b137bb30404ae91ab5ca048d379228361806c164b4ee47b651897dc8bc300600f2652099ea189ce6cb83e6976702432 WHIRLPOOL 9939e5e75ae7e49f854f9cb5b5f21c8efa54827e68b2f6c1d752306465e5e9d9e39edd8e95a6370b97ce8d60ea858a3fcef158d556a7decbfd9cf42cfcb76d12
+EBUILD netbeans-cnd-9999_p20160816.ebuild 4790 SHA256 0508775024101190991ff8279d4c6d5cd3a13c467bf1c57fefb9955c9e00f6c0 SHA512 95a5162b52f2e15047effd730e9b8d6ea5bc3bb5f023c16b2b601089c70c276069f9f0fc1c937bc7308b6f3118d6775e951a8f35f46f260dffae98e0ededecd8 WHIRLPOOL dfdad6ffe565aa3eaa7aa83ed3b7135f25f157602b6c8c8e8a4862a18c25e3af36987a31c1983fa9faa67d168a8b04be945b4b9e941668e228394bebfbc8dd05
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160816.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160816.ebuild
new file mode 100644
index 0000000..8211a67
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160816.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-16_00-02-33/zip/netbeans-trunk-nightly-201608160002-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 3375dec..198f4a2 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201608110002-src.zip 217074142 SHA256 1017ce540b38dc
 DIST netbeans-trunk-nightly-201608120002-src.zip 217080929 SHA256 b8ef1d20faf0485e85cf44ba6ea77282d130efeeafd7caf58d1ae3a33bb5ee01 SHA512 eec5a8165446247e28fd9ecda21017c7d877f8199326565f4750e3631e5f58c66c60424b906782ebcd34e5e58e5810ed60399d3efc01877663821360538b798c WHIRLPOOL 6eae8a97f579b3e009b9ddec46cca6de1033591ecdbb962258d3c929f6768f49ebae96fb1013392d80a912271942d14f31920ccf3e3b69a732eea4313dc8558b
 DIST netbeans-trunk-nightly-201608140002-src.zip 217088384 SHA256 fe3aec6996f578f851f523bc169098f964c74412070b16a030ecf2ca816f72b6 SHA512 2342388288d6e11c7093abb7f5cd3b88fd7c7e8ae8a14fc7ce1becdcf5c24d1ce8d09f88c599cccbfe3d9837e21b4c459489a3dec46280682d378500d335a802 WHIRLPOOL 9ad8bd5bc9f4b00ccff17bcde21c3faa34f0aea05ff249dd8d3fc89d105073159f4a764733461f23e2608fedbd007bcd20d9e429ede3ee73f23ee799bbf654de
 DIST netbeans-trunk-nightly-201608150002-src.zip 217088384 SHA256 95ecd71a591cbb135e15157d06f7612df107f015e24ffe47338bda0a55523091 SHA512 8ff5ffdbcd89a305e0372049b1e4ed76076390f0e621fe66c867417a665d13d4b86ea09e9a55cd4a6cf162bc4e23b2dd0aaba2744abf7b205a2af8f60179e2a0 WHIRLPOOL dce14f26c47857482db487bc9d8c2fd51268021e8ecf770a77fbb3fae4576b74e86c7c4af695e8fe1dbdab6231ea962ac632d0edca9abb491656069bfcc71540
+DIST netbeans-trunk-nightly-201608160002-src.zip 217153721 SHA256 f7f0624027293b4eb18b02c6e83678b76f9161ae7790431e5cdf0a67c81067bf SHA512 004bbbafc97c8c155429d12c37e05d1737d5e5d7a5c1d77df1e120481c1f59f2535fd93efda3588aab85e8eef404cbae74ee01469b771226912ab876a23420dd WHIRLPOOL bd19581fb56c256dbf59dcc1fb7db4a11f0e8dc632763d55966f63f4bdc107645862c8ec51a8db231b462dafeb586f680f3de9ffe5af4a6c398dd4c30e880352
 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_p20160707.ebuild 2968 SHA256 5fdba55c07910f1b7579ef89ec986a2a47b0e6afc61bc8e5870efd220731775c SHA512 e581bc811843fe324a2b562d5b471b49261c98a9a2a7ec6c2b4ed1f35852982e60918630b0519f01dedd5b843d2043bb63dbf972bdc73bfd5f247eed1332f7da WHIRLPOOL 4e40430ec1be8e88c1e155bfcc49af370e6898af2b3e59a762b3935ae07cf0d783f6f8248226a97d044be2df297f1654e2d4dabab7da52ca97e04276f8079762
@@ -58,4 +59,5 @@ EBUILD netbeans-dlight-9999_p20160811.ebuild 2968 SHA256 e11c15f124b5bc01f1a01f0
 EBUILD netbeans-dlight-9999_p20160812.ebuild 2968 SHA256 6326fa2950fb261835e2e476b5eeef8a562e58be7d1308814382aae6b6ba82e9 SHA512 203426cb958549b82861a202ac46cc4bc896366b9e525659df1402e6ca745d2de927239ef8587ade1a33443016e5a698557176f60b8726a5da75921f4c75087d WHIRLPOOL 50ecbe3e04c1b0fdd2acbf30d5af971683609a653c5fec69e8126c5a974ae1586537e74838f1420e492ee1e6c746231482ab31444ddbcfcd99ed43105e7b190a
 EBUILD netbeans-dlight-9999_p20160814.ebuild 2968 SHA256 020b0581e19a6d3c30f0edb50c961a286c4eb41193112f2e6795a69e445e572a SHA512 596d81f447b454dfdcda82dd8fc1ba079d6fdced8a302787758a49efa447b84ee7db0861e7dc6aa8f52a8007009d8845190b34ad3574b8243b11ce9623165de8 WHIRLPOOL 359a0fbecf56b5344900ba27eb9edbc0576c8139fcf2a1dcc985c5e52c2e6ef1351b8a54dfd25416ea59f18eae33864650fa6f7de85494917bc0085e81ce083b
 EBUILD netbeans-dlight-9999_p20160815.ebuild 2968 SHA256 8e385ffa07f0af7470769acaba590a397ce27eacba46d3582a148fe1ab330d92 SHA512 abb9eb228a09d445737afd9142e1d1f475664b91f7ce3fd379830b54f522bf7f0ca7f7ac52e4fc46bb4a4b3e308cd815ff50d0fe7a5b48ad31e1f44d4dc8d05f WHIRLPOOL 45a778544c131a32be2a0a3bdda9633fc7171038b7918da91928bb934479f10596f2860c325df491e689d984e6979f24d4d5bf9f3e039158e3565a32f1cc3f8f
+EBUILD netbeans-dlight-9999_p20160816.ebuild 2968 SHA256 9738df5d7f5a814965a9e59535364362375aee11d3b5be15ab826cd3cc74ec77 SHA512 88be684af2040260f05991b1b3e9eece437e6eb8fc6bb7125f42947cb940123e006e11951fcaecc385d014faaef4520d76b4423f7ba35b2dd708525534586e13 WHIRLPOOL a3bcadfee10a0b6294d62db93951cea9afc2daef9b0f96beedbc60f695fba8548cabda9d8286ce1823b6f2be1a40e837cd006507403f6943a791ab69da62b56a
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160816.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160816.ebuild
new file mode 100644
index 0000000..61eeb1f
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160816.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-16_00-02-33/zip/netbeans-trunk-nightly-201608160002-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 727c5f7..41119e0 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -60,6 +60,7 @@ DIST netbeans-trunk-nightly-201608110002-src.zip 217074142 SHA256 1017ce540b38dc
 DIST netbeans-trunk-nightly-201608120002-src.zip 217080929 SHA256 b8ef1d20faf0485e85cf44ba6ea77282d130efeeafd7caf58d1ae3a33bb5ee01 SHA512 eec5a8165446247e28fd9ecda21017c7d877f8199326565f4750e3631e5f58c66c60424b906782ebcd34e5e58e5810ed60399d3efc01877663821360538b798c WHIRLPOOL 6eae8a97f579b3e009b9ddec46cca6de1033591ecdbb962258d3c929f6768f49ebae96fb1013392d80a912271942d14f31920ccf3e3b69a732eea4313dc8558b
 DIST netbeans-trunk-nightly-201608140002-src.zip 217088384 SHA256 fe3aec6996f578f851f523bc169098f964c74412070b16a030ecf2ca816f72b6 SHA512 2342388288d6e11c7093abb7f5cd3b88fd7c7e8ae8a14fc7ce1becdcf5c24d1ce8d09f88c599cccbfe3d9837e21b4c459489a3dec46280682d378500d335a802 WHIRLPOOL 9ad8bd5bc9f4b00ccff17bcde21c3faa34f0aea05ff249dd8d3fc89d105073159f4a764733461f23e2608fedbd007bcd20d9e429ede3ee73f23ee799bbf654de
 DIST netbeans-trunk-nightly-201608150002-src.zip 217088384 SHA256 95ecd71a591cbb135e15157d06f7612df107f015e24ffe47338bda0a55523091 SHA512 8ff5ffdbcd89a305e0372049b1e4ed76076390f0e621fe66c867417a665d13d4b86ea09e9a55cd4a6cf162bc4e23b2dd0aaba2744abf7b205a2af8f60179e2a0 WHIRLPOOL dce14f26c47857482db487bc9d8c2fd51268021e8ecf770a77fbb3fae4576b74e86c7c4af695e8fe1dbdab6231ea962ac632d0edca9abb491656069bfcc71540
+DIST netbeans-trunk-nightly-201608160002-src.zip 217153721 SHA256 f7f0624027293b4eb18b02c6e83678b76f9161ae7790431e5cdf0a67c81067bf SHA512 004bbbafc97c8c155429d12c37e05d1737d5e5d7a5c1d77df1e120481c1f59f2535fd93efda3588aab85e8eef404cbae74ee01469b771226912ab876a23420dd WHIRLPOOL bd19581fb56c256dbf59dcc1fb7db4a11f0e8dc632763d55966f63f4bdc107645862c8ec51a8db231b462dafeb586f680f3de9ffe5af4a6c398dd4c30e880352
 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_p20160707.ebuild 15825 SHA256 c363b308fe2b270e10764f8897f0ff779c85cca488f4419f6cb91d6baca5869b SHA512 136582dcaa1f9c3c3415e37145b5f0f7f90caae25de76d737e4169c9fed67df454bbba6139468386e5d89b0ba946ed2e0f3c38089d4849c6365b33bddb56f45e WHIRLPOOL da17318b5894611098116593c866dd5f08d8be3374d206034a4c36f69cfad6e27bd0c1e720942f28b4b3beaf163fea5bbf844dc5f32f57e8d9b87f933fa5cf49
@@ -87,4 +88,5 @@ EBUILD netbeans-enterprise-9999_p20160811.ebuild 15825 SHA256 fd5e785fa9a47b328e
 EBUILD netbeans-enterprise-9999_p20160812.ebuild 15825 SHA256 3745d0bc3f87ac76a29617366e73e4b92d699dcaabe50593db062ffa3f9fd4e9 SHA512 6d7c3c97af50720c733e44843ec0274f7ff9635229e1c136d1ed457dc52fb3b1bdbba37b70ecaf6d0c7e4b141661ceef1061759ab3d71a1bfb513918cda5ebd9 WHIRLPOOL 73917819d4e9e2954f082a45eda4cbdd6cfafb646d6800a8a9bb0544b7a8df2e51359cc7ddaa60a731571a770ed19f741ce5aa860f43fc972dfddb5843c1f714
 EBUILD netbeans-enterprise-9999_p20160814.ebuild 15825 SHA256 a9fdea27c7e9ad9d07a7cc1828eaa61afed6647c20ee0568503c1ea72301936d SHA512 c5c2978c5c837f91504966d74af92b8f31f5fd8fbd96d496341233bec116674f2a392103f05be63277442fec07ae3a6b1e1824763200499f4d3def2cf80500d2 WHIRLPOOL 681ed7f404dee10f42e646e81ec49936996c99f300fdf0f2cee502e201c37d7a3a719732c86ca5d4da35e75b820cf83a82ddbb41a1ed2fbe2cdb1956f61dd585
 EBUILD netbeans-enterprise-9999_p20160815.ebuild 15825 SHA256 886e0440d5093ba8fa7291f85382deb276faa118ba1294f4679dced47bdc7bfc SHA512 a3b5ce01be733d7bdccddaa7dce46b4331a33b3b899828eb43daabe34f5678a39259a718ee5126cdb2b59b118200a70404c1ac3a43d225e9ce3602bc8450e778 WHIRLPOOL 830f4bff4f2d66c0074aab1ada00c142edddc6561364fdb722cbced77e8443abc6e1f638e96e8f9e7297823114a6cf019bffacc06dfb866815591ee073758494
+EBUILD netbeans-enterprise-9999_p20160816.ebuild 15825 SHA256 0113703432395733a4580f1e28462c572d966d1578b286821c3e80b5f1c465a1 SHA512 37fe453c3234f37569a3296777682ee632a8e29622c5cf8d40fe4b2e380be1a71ea4fb9e5e62d74be729de8eabef7cecba4c70600c2c1ed293c9bd4380c688da WHIRLPOOL 45fc21808fa84d84cfd1f620777837a34849a35161d27a3b896a558526707b27cbabb62e3aaf3a40bc5adbda004732835db7f083ec8c80a638aa21ff5a91cb43
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160816.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160816.ebuild
new file mode 100644
index 0000000..12c0a09
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160816.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-16_00-02-33/zip/netbeans-trunk-nightly-201608160002-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 f74962f..4db39cd 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201608110002-src.zip 217074142 SHA256 1017ce540b38dc
 DIST netbeans-trunk-nightly-201608120002-src.zip 217080929 SHA256 b8ef1d20faf0485e85cf44ba6ea77282d130efeeafd7caf58d1ae3a33bb5ee01 SHA512 eec5a8165446247e28fd9ecda21017c7d877f8199326565f4750e3631e5f58c66c60424b906782ebcd34e5e58e5810ed60399d3efc01877663821360538b798c WHIRLPOOL 6eae8a97f579b3e009b9ddec46cca6de1033591ecdbb962258d3c929f6768f49ebae96fb1013392d80a912271942d14f31920ccf3e3b69a732eea4313dc8558b
 DIST netbeans-trunk-nightly-201608140002-src.zip 217088384 SHA256 fe3aec6996f578f851f523bc169098f964c74412070b16a030ecf2ca816f72b6 SHA512 2342388288d6e11c7093abb7f5cd3b88fd7c7e8ae8a14fc7ce1becdcf5c24d1ce8d09f88c599cccbfe3d9837e21b4c459489a3dec46280682d378500d335a802 WHIRLPOOL 9ad8bd5bc9f4b00ccff17bcde21c3faa34f0aea05ff249dd8d3fc89d105073159f4a764733461f23e2608fedbd007bcd20d9e429ede3ee73f23ee799bbf654de
 DIST netbeans-trunk-nightly-201608150002-src.zip 217088384 SHA256 95ecd71a591cbb135e15157d06f7612df107f015e24ffe47338bda0a55523091 SHA512 8ff5ffdbcd89a305e0372049b1e4ed76076390f0e621fe66c867417a665d13d4b86ea09e9a55cd4a6cf162bc4e23b2dd0aaba2744abf7b205a2af8f60179e2a0 WHIRLPOOL dce14f26c47857482db487bc9d8c2fd51268021e8ecf770a77fbb3fae4576b74e86c7c4af695e8fe1dbdab6231ea962ac632d0edca9abb491656069bfcc71540
+DIST netbeans-trunk-nightly-201608160002-src.zip 217153721 SHA256 f7f0624027293b4eb18b02c6e83678b76f9161ae7790431e5cdf0a67c81067bf SHA512 004bbbafc97c8c155429d12c37e05d1737d5e5d7a5c1d77df1e120481c1f59f2535fd93efda3588aab85e8eef404cbae74ee01469b771226912ab876a23420dd WHIRLPOOL bd19581fb56c256dbf59dcc1fb7db4a11f0e8dc632763d55966f63f4bdc107645862c8ec51a8db231b462dafeb586f680f3de9ffe5af4a6c398dd4c30e880352
 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_p20160707.ebuild 2913 SHA256 7369b78f5d98d5010d7fce80f6c306aa55fc58f508e5d6add596d4b3670fcecc SHA512 81066f7873ac6e30c7ff72a03c22b9b62d453fddc6d57492016a54a04d27520cef1df15f56d8049e7f3c3f9a05436ffad7873333e963519c6157737ace267fbe WHIRLPOOL 89f6ac0d9283e7bc8eb6293e45042bcfb0128e2ed100a728f0b4715034bc29c6306d45ec3a204a91ffd319c4946387cd73bddc0aedd4407b1d96990b2581a17a
@@ -55,4 +56,5 @@ EBUILD netbeans-ergonomics-9999_p20160811.ebuild 2913 SHA256 db55765b798b2dabd0b
 EBUILD netbeans-ergonomics-9999_p20160812.ebuild 2913 SHA256 4c9b4e4ee1fb8c690d91ff45c59d0e3b1f9355e7fe2c833419ba4ae33369ddec SHA512 8c03176d30a298db130a62ec673795d273cef70b4680a13f7c55ad3d653583731ca5b040880374f4effcb63e3d031de9a574c2a68ccdefeb196176cfc71c56b0 WHIRLPOOL 8ed651a8770685a2d63a1191f000e602877dbfde83d4622ab531add0c088f16ef5032f18bb20f239e6da0fd651b0c4101f654d1bb6c64e6533a00047aa30b3b1
 EBUILD netbeans-ergonomics-9999_p20160814.ebuild 2913 SHA256 460e6d7b587b1d7b7980739b24d7c839f649c4358096607aa40f54f64149c663 SHA512 c276d845199799e539b4a39ca6de381e69114e2905995e75864d3ece13006debb0b9da991650e8be63dc284c11fc76420961eaa081b2d97cb5ae7f8a68784033 WHIRLPOOL 71af8bfbd4e2bc7b271023ad13691467f3d7df5a503bf2f7b065a96e30330e463b4f0a62f7011b7c61e8f532da0e677cb636855fb99490ca5c23cd8c0820b94f
 EBUILD netbeans-ergonomics-9999_p20160815.ebuild 2913 SHA256 8d354df1c3a2fb8a623988d0ebc61a03f230ade3a2992de6fd8fb4af9c1aef4d SHA512 3e8cdbc801d19a4e9ed9782484ef9ffb015526813c5496a9f90da49338ff7e0d81c24ad6f015ba7d766f212cca1afc6738c6f371d8aa01db8e66bde244a900fa WHIRLPOOL 0fea1059d1ec2f7f42d062ce0f977dd8e0739604cde9353d60dd30f91b8cc6156f59e928e98d1fb653bd07b47bebd49ad5753396d6e116ccbc2e8afbd834af7a
+EBUILD netbeans-ergonomics-9999_p20160816.ebuild 2913 SHA256 329ef2bf71b230285b383b26faf048077bff26c692d557e8ff51aa6f553588eb SHA512 657363cef99ce7a1d079dd94aa41ef4cb3c50ab193a0b192c199e159f511fb3cd9b3c11b62f8a03e54605f5752406007fdcef4579e2d6bd059066ff57335cb72 WHIRLPOOL ed10e6e50a48beca5b0f341c2d9498f9181ed94d66511cb1dc7566aec8e8bb224aab6c052ee462b3fe2986ae428da3c74625996bd328cc4fab6c29302acb5986
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160816.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160816.ebuild
new file mode 100644
index 0000000..8a3124d
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160816.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-16_00-02-33/zip/netbeans-trunk-nightly-201608160002-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 0068b96..3edc27d 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -32,6 +32,7 @@ DIST netbeans-trunk-nightly-201608110002-src.zip 217074142 SHA256 1017ce540b38dc
 DIST netbeans-trunk-nightly-201608120002-src.zip 217080929 SHA256 b8ef1d20faf0485e85cf44ba6ea77282d130efeeafd7caf58d1ae3a33bb5ee01 SHA512 eec5a8165446247e28fd9ecda21017c7d877f8199326565f4750e3631e5f58c66c60424b906782ebcd34e5e58e5810ed60399d3efc01877663821360538b798c WHIRLPOOL 6eae8a97f579b3e009b9ddec46cca6de1033591ecdbb962258d3c929f6768f49ebae96fb1013392d80a912271942d14f31920ccf3e3b69a732eea4313dc8558b
 DIST netbeans-trunk-nightly-201608140002-src.zip 217088384 SHA256 fe3aec6996f578f851f523bc169098f964c74412070b16a030ecf2ca816f72b6 SHA512 2342388288d6e11c7093abb7f5cd3b88fd7c7e8ae8a14fc7ce1becdcf5c24d1ce8d09f88c599cccbfe3d9837e21b4c459489a3dec46280682d378500d335a802 WHIRLPOOL 9ad8bd5bc9f4b00ccff17bcde21c3faa34f0aea05ff249dd8d3fc89d105073159f4a764733461f23e2608fedbd007bcd20d9e429ede3ee73f23ee799bbf654de
 DIST netbeans-trunk-nightly-201608150002-src.zip 217088384 SHA256 95ecd71a591cbb135e15157d06f7612df107f015e24ffe47338bda0a55523091 SHA512 8ff5ffdbcd89a305e0372049b1e4ed76076390f0e621fe66c867417a665d13d4b86ea09e9a55cd4a6cf162bc4e23b2dd0aaba2744abf7b205a2af8f60179e2a0 WHIRLPOOL dce14f26c47857482db487bc9d8c2fd51268021e8ecf770a77fbb3fae4576b74e86c7c4af695e8fe1dbdab6231ea962ac632d0edca9abb491656069bfcc71540
+DIST netbeans-trunk-nightly-201608160002-src.zip 217153721 SHA256 f7f0624027293b4eb18b02c6e83678b76f9161ae7790431e5cdf0a67c81067bf SHA512 004bbbafc97c8c155429d12c37e05d1737d5e5d7a5c1d77df1e120481c1f59f2535fd93efda3588aab85e8eef404cbae74ee01469b771226912ab876a23420dd WHIRLPOOL bd19581fb56c256dbf59dcc1fb7db4a11f0e8dc632763d55966f63f4bdc107645862c8ec51a8db231b462dafeb586f680f3de9ffe5af4a6c398dd4c30e880352
 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_p20160707.ebuild 3377 SHA256 e4becdf42116d40c8c7880c6e4360c7b01d02e43576c36ae5d2ee3d28a1a54cd SHA512 5766b18bae64391f5c23457e5f94fc9820694514cd0cc1218adb2cd35a41adea41869fefb979059e4edb45c659d88b82ec81beec26c1e7108f590d4ad749d765 WHIRLPOOL a84660a1c5b2019cadf1091a301bf2858425cfe58f912736914a5c9d90caa6f3dd17137fed733d5af9d4f64e99e14eaf15f5976ad4cd8165d223491ef9d07819
@@ -59,4 +60,5 @@ EBUILD netbeans-extide-9999_p20160811.ebuild 3377 SHA256 4502ceeec141e39f3804152
 EBUILD netbeans-extide-9999_p20160812.ebuild 3377 SHA256 14586d7127335c735d35b33335ae75d4fdafb3c72599d341e58edeb166df2890 SHA512 0b79181e9fb12779edbe9b357496dd182a12361c89b7c1c52ddeba3af2b9a0ff57db08b959becfdc7863fc1864a7bdc4206b1648283e1a7e2c2ab20304d9c825 WHIRLPOOL e063fd8403ab0531160eb37c0b176f5e40df50ec618fe415a99ee62a4ead2bff513f41316cb5b40ab96c3db454a2e3ab501c12eefaa123cc026b7f336e46a638
 EBUILD netbeans-extide-9999_p20160814.ebuild 3377 SHA256 6ed75316661f0bc87f5fd021b10bea20e0397096b5c62955972f6f4bb038f1a9 SHA512 a71da584c0bfda5ab73ab1e7254e511893e0c6a59cc7f543e8b51939d82e9ee0fbdfff242282a5f610e4a27da2a7243f3c2b19779a2681ad47b1dea6ee0da725 WHIRLPOOL 836ad637c121937bc434f4f760710fc35b64fc4597137cc58dc135b5bd51326f4c6d7af7afec242fafa4e91b062beb3128dc5157de818f0c4b80d8a98788b7c0
 EBUILD netbeans-extide-9999_p20160815.ebuild 3377 SHA256 d8f0d718652104be115e3ed9229d81956ff23c40b38ea6f1f70d761126f9d868 SHA512 bd40f8bce0363848b846c89497357f213fd1ecdc9ef0204d52f1e75283ab41183c8364b9a090bc00dc6c0fb113e05d45ecb3af346ce854841e383da0ea85e8b9 WHIRLPOOL badcb4ad4a1cd407f41e749cdadf9731ab4de7a7c817760305b7a327ed408de2b9aec31e4aa5314b90158a829ba2145378e0845cd81f09c8e42b835ecb924cf2
+EBUILD netbeans-extide-9999_p20160816.ebuild 3377 SHA256 a54ce52cd9bc33ac5e70b3cfec553d02688ae6db8b173aa01f25d2888a7f6dae SHA512 7b36e4e6020a60d14d23786828533929db4c7588167c144477acc1a569947d2e973af9711abb683f8a20781c4ddc6cdea9cb6365c8b78f312130fbfd69228290 WHIRLPOOL e0c70a2b69b2cfb041a9d9610b2d52bdf440c9740ab095308440f53a92e84b84970cc3f6c38df59348bb7b2364eeb07b74ba486189c9d655781fd8b23121cc6a
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160816.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160816.ebuild
new file mode 100644
index 0000000..92aafa6
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20160816.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-16_00-02-33/zip/netbeans-trunk-nightly-201608160002-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 c259fcd..f780415 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201608110002-src.zip 217074142 SHA256 1017ce540b38dc
 DIST netbeans-trunk-nightly-201608120002-src.zip 217080929 SHA256 b8ef1d20faf0485e85cf44ba6ea77282d130efeeafd7caf58d1ae3a33bb5ee01 SHA512 eec5a8165446247e28fd9ecda21017c7d877f8199326565f4750e3631e5f58c66c60424b906782ebcd34e5e58e5810ed60399d3efc01877663821360538b798c WHIRLPOOL 6eae8a97f579b3e009b9ddec46cca6de1033591ecdbb962258d3c929f6768f49ebae96fb1013392d80a912271942d14f31920ccf3e3b69a732eea4313dc8558b
 DIST netbeans-trunk-nightly-201608140002-src.zip 217088384 SHA256 fe3aec6996f578f851f523bc169098f964c74412070b16a030ecf2ca816f72b6 SHA512 2342388288d6e11c7093abb7f5cd3b88fd7c7e8ae8a14fc7ce1becdcf5c24d1ce8d09f88c599cccbfe3d9837e21b4c459489a3dec46280682d378500d335a802 WHIRLPOOL 9ad8bd5bc9f4b00ccff17bcde21c3faa34f0aea05ff249dd8d3fc89d105073159f4a764733461f23e2608fedbd007bcd20d9e429ede3ee73f23ee799bbf654de
 DIST netbeans-trunk-nightly-201608150002-src.zip 217088384 SHA256 95ecd71a591cbb135e15157d06f7612df107f015e24ffe47338bda0a55523091 SHA512 8ff5ffdbcd89a305e0372049b1e4ed76076390f0e621fe66c867417a665d13d4b86ea09e9a55cd4a6cf162bc4e23b2dd0aaba2744abf7b205a2af8f60179e2a0 WHIRLPOOL dce14f26c47857482db487bc9d8c2fd51268021e8ecf770a77fbb3fae4576b74e86c7c4af695e8fe1dbdab6231ea962ac632d0edca9abb491656069bfcc71540
+DIST netbeans-trunk-nightly-201608160002-src.zip 217153721 SHA256 f7f0624027293b4eb18b02c6e83678b76f9161ae7790431e5cdf0a67c81067bf SHA512 004bbbafc97c8c155429d12c37e05d1737d5e5d7a5c1d77df1e120481c1f59f2535fd93efda3588aab85e8eef404cbae74ee01469b771226912ab876a23420dd WHIRLPOOL bd19581fb56c256dbf59dcc1fb7db4a11f0e8dc632763d55966f63f4bdc107645862c8ec51a8db231b462dafeb586f680f3de9ffe5af4a6c398dd4c30e880352
 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_p20160707.ebuild 3416 SHA256 9194ddebfdae2aef644b8ee5135d1a611d7192066952361aa1b5e867a178adfd SHA512 3118c33098a88eb55d787abd5de79086bad5ff4219fbab3bd27df973d8f1ce4d2b04d22dad6aac455f3d3956c32a8e30787af7138ecb066c9a9df19a654f2c2a WHIRLPOOL d09b10a786a27c7137d3fba7c9b5fa24dc438b93f404f4e9f9190ad883de45903b061a893c54f7b21c2736f3d3d48f2b1e83b91dab14487cf443a532ae5153e6
@@ -57,4 +58,5 @@ EBUILD netbeans-groovy-9999_p20160811.ebuild 3416 SHA256 2a8bf17a024d02d43f0ef5e
 EBUILD netbeans-groovy-9999_p20160812.ebuild 3416 SHA256 b307f88eda261726b3eda78334030af7899650ff1fea9085f668beced3a4e422 SHA512 2ec3348ad97db9c2077159cd19a0023e2bae2a7de06072ccf242531405d2fb7a0e0dc698b90388a71fd11c04261de72c71c3e4c715c3e791104fc32f69d63484 WHIRLPOOL 5cc2a77b80f6abc0f642039d64f2c72c9726befeae7ac4f267233b44d35958c515d0c923339e59f93db5b0ad5f32df7bf996ffb6414f624a475e9b723622e169
 EBUILD netbeans-groovy-9999_p20160814.ebuild 3416 SHA256 525da48c95674043e1e8ef097f827833cb8720ae4a2c4c8bc5730bbba3847c80 SHA512 cda4b07b11d0df33b0f36e8ec2c672c71d9dc7ca8e5f1b88bcd588b6722f48d915ea90f980dcbfb32bbb27f8e0b1a79b7dd1f6ed9e53b4fb523e9fd5fdff4bd0 WHIRLPOOL 660e64f0235b61127395c581200316643987a063ed0ab6032da0bda9b2980d5f48042d614fdff089256ee2aae51bb4e0605625b553bb0cdb48a96e3f0cfd2c8b
 EBUILD netbeans-groovy-9999_p20160815.ebuild 3416 SHA256 83b0dc95444db539feefcc7ff462a7386eaf98dcc45d5bc8ecdcde0fb497ab0a SHA512 0adaa2174e08650114f95ceb267179ad23e94398ec5015304ea5313d95e99092802ceff05aac01106df87db77534529ccfe17e5bf0220bf8e3266e4b5ce45595 WHIRLPOOL 724278402b9e9879c766f4b047d9a7e749230725e948fd4aba4c12ee48dae6763928a41e5e367d12b44d73e92e40cf96148be9a172bc1f8bfe5968ee0482e384
+EBUILD netbeans-groovy-9999_p20160816.ebuild 3416 SHA256 dfa8087233f7ce6f9db1da48b5656b50032e041754e4374dce521c492bf2d6ee SHA512 274746c115a2a5ca52bbeecda87de4b413ecd0589c77628ea103c1edb1adb02da8219615c375a5da470f7cc1ad9c878d04a20b7bc5b77080e5fc94c0944ffb2d WHIRLPOOL 4cdac6ca115af00fc3ceadaeb82784ff154cd4bc4dfd907af31ce607da830bc6591aeeb42e115e96803bc3463e123d9a249c16a700e5a66a16ae1a9cfa8b9d45
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160816.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160816.ebuild
new file mode 100644
index 0000000..9d23ada
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160816.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-16_00-02-33/zip/netbeans-trunk-nightly-201608160002-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 3f4680e..11117be 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201608110002-src.zip 217074142 SHA256 1017ce540b38dc
 DIST netbeans-trunk-nightly-201608120002-src.zip 217080929 SHA256 b8ef1d20faf0485e85cf44ba6ea77282d130efeeafd7caf58d1ae3a33bb5ee01 SHA512 eec5a8165446247e28fd9ecda21017c7d877f8199326565f4750e3631e5f58c66c60424b906782ebcd34e5e58e5810ed60399d3efc01877663821360538b798c WHIRLPOOL 6eae8a97f579b3e009b9ddec46cca6de1033591ecdbb962258d3c929f6768f49ebae96fb1013392d80a912271942d14f31920ccf3e3b69a732eea4313dc8558b
 DIST netbeans-trunk-nightly-201608140002-src.zip 217088384 SHA256 fe3aec6996f578f851f523bc169098f964c74412070b16a030ecf2ca816f72b6 SHA512 2342388288d6e11c7093abb7f5cd3b88fd7c7e8ae8a14fc7ce1becdcf5c24d1ce8d09f88c599cccbfe3d9837e21b4c459489a3dec46280682d378500d335a802 WHIRLPOOL 9ad8bd5bc9f4b00ccff17bcde21c3faa34f0aea05ff249dd8d3fc89d105073159f4a764733461f23e2608fedbd007bcd20d9e429ede3ee73f23ee799bbf654de
 DIST netbeans-trunk-nightly-201608150002-src.zip 217088384 SHA256 95ecd71a591cbb135e15157d06f7612df107f015e24ffe47338bda0a55523091 SHA512 8ff5ffdbcd89a305e0372049b1e4ed76076390f0e621fe66c867417a665d13d4b86ea09e9a55cd4a6cf162bc4e23b2dd0aaba2744abf7b205a2af8f60179e2a0 WHIRLPOOL dce14f26c47857482db487bc9d8c2fd51268021e8ecf770a77fbb3fae4576b74e86c7c4af695e8fe1dbdab6231ea962ac632d0edca9abb491656069bfcc71540
+DIST netbeans-trunk-nightly-201608160002-src.zip 217153721 SHA256 f7f0624027293b4eb18b02c6e83678b76f9161ae7790431e5cdf0a67c81067bf SHA512 004bbbafc97c8c155429d12c37e05d1737d5e5d7a5c1d77df1e120481c1f59f2535fd93efda3588aab85e8eef404cbae74ee01469b771226912ab876a23420dd WHIRLPOOL bd19581fb56c256dbf59dcc1fb7db4a11f0e8dc632763d55966f63f4bdc107645862c8ec51a8db231b462dafeb586f680f3de9ffe5af4a6c398dd4c30e880352
 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_p20160707.ebuild 4126 SHA256 a1b90c448059f80f92c6f65dca0598470b33d3f17f0b8b43e5dfd6c62f6b4392 SHA512 1d913ebb8a5cf22e25ac66c36a1653ad059d036a65293f63c6c87a84643ebbafa2181d3a85ef6d531da9b36e6e87fd7d7f13a88b5cec2ba31b141e47255bb7ab WHIRLPOOL 96cd40f963c5d77de70ae5740f1b046902c6a9df621d027d9d228f24d88d2e04585121a6cdf9f9d08f2f2e89fd94f88da4f28f5028dc4be5dfe44f432da02349
@@ -60,4 +61,5 @@ EBUILD netbeans-harness-9999_p20160811.ebuild 4126 SHA256 19b79d2e79427dbf4e98e8
 EBUILD netbeans-harness-9999_p20160812.ebuild 4126 SHA256 2370a0aab9791d6082652f2e5fd28f9f7738c04760fb8b47bbb7c7d24d237a53 SHA512 3143fbf70a094e56a790db1b2cd46a49f4bcfbf52b3c3c1ae14f83a6a4ec81cc68af960268f17af8b4b1f5ddd0a34ee5661ea6c324036caef915f618d200a63d WHIRLPOOL ae10de3e886ec6a3a11421c2efa6923680caa9949ccf0b36a9773f40fa69feadbb2ffc333e696254c4a968d2ae63b32c81adad467afa9bf345cdff4481e2376a
 EBUILD netbeans-harness-9999_p20160814.ebuild 4126 SHA256 e5521d92c03210f01e80ab185d42cb5fa91a1c1a2b9553c9081f49656bcb22f8 SHA512 03622edea3707e3028ec558698dcd54520c62ad8a5b123c743f217aa523f47472e868e61955c578adc6364108af181d3dad1e0de8db11295821b482aa6eaf8d9 WHIRLPOOL 93bb7e72568d9ac16df555120648fb47d9aa70aef67c025b2f58071f841f663b2343d777c8d1b91f8dab02dfa6c12c101a8692a1b66803069b84a84ba60f19d3
 EBUILD netbeans-harness-9999_p20160815.ebuild 4126 SHA256 7b3f095d9426c6363b8e14749130bf356326e8115e40e00e9ae0a9f1fcf2c0d1 SHA512 52985c2b5b75548f538d5b355bf51ad053afd9fa0281e365605bc8a7643c84f3c2f35dab4f1440cae070c0ef1255dedd5b2322ef809e78449143c1089296cd89 WHIRLPOOL 41528cc3cf57d83eefaba51409925ddc82cd5d79d53a0444227713f56601e74ed737b1b5014f5baa82fa447ac92c05252adc6ee4781b81a2f7b67ae70449f56c
+EBUILD netbeans-harness-9999_p20160816.ebuild 4126 SHA256 d9dac36974e1c6e43ded744dfa8cc377a16c2070e7cd5a137f8f5d9cecb72f21 SHA512 be51ebb12b7e4ec734670b9d6a63c3ca39a79505f1fc3227b9777857d8d209a671646e522e210813a6c4fa26a28817837ba48a046df8c300833e4b968dfcad45 WHIRLPOOL 38b8ebc4939b2054fbb2a3f8bfa25780c95e272d55925925f50ace8545a1974a1ce5a727cbe9ccd686901c54727075d14ce644732586c06866836bc462642420
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160816.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160816.ebuild
new file mode 100644
index 0000000..056668b
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20160816.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-16_00-02-33/zip/netbeans-trunk-nightly-201608160002-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 01cf713..0e40c5e 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -167,6 +167,7 @@ DIST netbeans-trunk-nightly-201608110002-src.zip 217074142 SHA256 1017ce540b38dc
 DIST netbeans-trunk-nightly-201608120002-src.zip 217080929 SHA256 b8ef1d20faf0485e85cf44ba6ea77282d130efeeafd7caf58d1ae3a33bb5ee01 SHA512 eec5a8165446247e28fd9ecda21017c7d877f8199326565f4750e3631e5f58c66c60424b906782ebcd34e5e58e5810ed60399d3efc01877663821360538b798c WHIRLPOOL 6eae8a97f579b3e009b9ddec46cca6de1033591ecdbb962258d3c929f6768f49ebae96fb1013392d80a912271942d14f31920ccf3e3b69a732eea4313dc8558b
 DIST netbeans-trunk-nightly-201608140002-src.zip 217088384 SHA256 fe3aec6996f578f851f523bc169098f964c74412070b16a030ecf2ca816f72b6 SHA512 2342388288d6e11c7093abb7f5cd3b88fd7c7e8ae8a14fc7ce1becdcf5c24d1ce8d09f88c599cccbfe3d9837e21b4c459489a3dec46280682d378500d335a802 WHIRLPOOL 9ad8bd5bc9f4b00ccff17bcde21c3faa34f0aea05ff249dd8d3fc89d105073159f4a764733461f23e2608fedbd007bcd20d9e429ede3ee73f23ee799bbf654de
 DIST netbeans-trunk-nightly-201608150002-src.zip 217088384 SHA256 95ecd71a591cbb135e15157d06f7612df107f015e24ffe47338bda0a55523091 SHA512 8ff5ffdbcd89a305e0372049b1e4ed76076390f0e621fe66c867417a665d13d4b86ea09e9a55cd4a6cf162bc4e23b2dd0aaba2744abf7b205a2af8f60179e2a0 WHIRLPOOL dce14f26c47857482db487bc9d8c2fd51268021e8ecf770a77fbb3fae4576b74e86c7c4af695e8fe1dbdab6231ea962ac632d0edca9abb491656069bfcc71540
+DIST netbeans-trunk-nightly-201608160002-src.zip 217153721 SHA256 f7f0624027293b4eb18b02c6e83678b76f9161ae7790431e5cdf0a67c81067bf SHA512 004bbbafc97c8c155429d12c37e05d1737d5e5d7a5c1d77df1e120481c1f59f2535fd93efda3588aab85e8eef404cbae74ee01469b771226912ab876a23420dd WHIRLPOOL bd19581fb56c256dbf59dcc1fb7db4a11f0e8dc632763d55966f63f4bdc107645862c8ec51a8db231b462dafeb586f680f3de9ffe5af4a6c398dd4c30e880352
 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_p20160707.ebuild 29867 SHA256 42aada428fbf916fefcf9a5b9e73063f0bf3f38a5b45eb5472c4f54e56326362 SHA512 14af3ea538acb7499a837e7a0726a664884f086f7a9fbcc119498429cebc0b0d86873a95ea9b3f6fc10405535c75928d80ab970146044b0df711bd74133f5cca WHIRLPOOL 530891c349bc08deae1b3948865ecfd668aad4ea8fded6b22cce7476f4c0b7d0e2c72837cdaa161023eec9dbe9edac572b0c565cd0da79bce4394425c17f1133
@@ -194,4 +195,5 @@ EBUILD netbeans-ide-9999_p20160811.ebuild 29867 SHA256 6aabb0021b233cfda7a388a6a
 EBUILD netbeans-ide-9999_p20160812.ebuild 29867 SHA256 5e8ce5cca6fe4f213ae68f2e2b9319d3effa4f92f11e223c96cd204a8691714f SHA512 716dff156925311c9df278013065c6452f84d81ddb2b8aa6e6d37030019dd207a57ccc9a0284650503023833778350ad94f10285ba27f68e6c9d1b25e6c16eca WHIRLPOOL 9c7da8a411edd5d54ec2394eecbce2204e820df03b7112a5cc76db1121a25d6b10c0ba804952560b659ae220980dd626554a78a64a565067a7f8d10dc7b2aaf6
 EBUILD netbeans-ide-9999_p20160814.ebuild 29867 SHA256 1d41a39d4593ee06b4fdb3e046c27ae0141b0209819f0c9165675c7f3dc1821a SHA512 94e32299a7c3c42ba203a0bea9fd6a82bb360a7c3a5215ea60d1b0b7b9967d39b8a214273cb549fd99cace88f19c5fdee965f335a207660df9a63329638906c2 WHIRLPOOL bbade9422e73818a4a40ccce6e6524e8cf861e8cbf5844bea62f24c3e29483d718ee237621219d961f95f2e67f1dbcfce92a6ea59ffacc8b3afa5fd85d5071e1
 EBUILD netbeans-ide-9999_p20160815.ebuild 29867 SHA256 47897dd9dbb208f54919252af1efc96d1ea2ca744c4d291b87b1884e855ef778 SHA512 13e907e9d51c36eecc6fb33ca5d3578d9fcaf9d8cff4842f1b57d6dfc00b351773ae9801a1c1d6fee2c82ebec9fa39b2c757dbc9104a169a03ac8860d9c844e9 WHIRLPOOL f259f25f48ee5dcaa0bdc90ccaf5b7f17c695e2b87272779bf43ba96df2826ec49314ebf4fca299fcbbd87a08dea8dfadbbffa38e298fd17b29049e372d4b969
+EBUILD netbeans-ide-9999_p20160816.ebuild 29867 SHA256 18da6e7f5cf326e1851e5151e62d0077ebe464921ac4904a07e1b6855134bf06 SHA512 8aeb6ef5726ef24d7d535409e8db2d696ae561a4dbea669edcf2c7c5df62835e051f02387eb01849364359112c2e57d36cf12972f834e8b7724364f2e13bb49a WHIRLPOOL 9c20dd0390548045f340887425792603ace1b5338df2f59f54be0c342b7dad7ef4644a12f02bf95017f4c53ce77a3f9b1096d961e39fae0672d5edd7cde64078
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160816.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160816.ebuild
new file mode 100644
index 0000000..9c3bdda
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20160816.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-16_00-02-33/zip/netbeans-trunk-nightly-201608160002-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 240b9d5..b1fc280 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -62,6 +62,7 @@ DIST netbeans-trunk-nightly-201608110002-src.zip 217074142 SHA256 1017ce540b38dc
 DIST netbeans-trunk-nightly-201608120002-src.zip 217080929 SHA256 b8ef1d20faf0485e85cf44ba6ea77282d130efeeafd7caf58d1ae3a33bb5ee01 SHA512 eec5a8165446247e28fd9ecda21017c7d877f8199326565f4750e3631e5f58c66c60424b906782ebcd34e5e58e5810ed60399d3efc01877663821360538b798c WHIRLPOOL 6eae8a97f579b3e009b9ddec46cca6de1033591ecdbb962258d3c929f6768f49ebae96fb1013392d80a912271942d14f31920ccf3e3b69a732eea4313dc8558b
 DIST netbeans-trunk-nightly-201608140002-src.zip 217088384 SHA256 fe3aec6996f578f851f523bc169098f964c74412070b16a030ecf2ca816f72b6 SHA512 2342388288d6e11c7093abb7f5cd3b88fd7c7e8ae8a14fc7ce1becdcf5c24d1ce8d09f88c599cccbfe3d9837e21b4c459489a3dec46280682d378500d335a802 WHIRLPOOL 9ad8bd5bc9f4b00ccff17bcde21c3faa34f0aea05ff249dd8d3fc89d105073159f4a764733461f23e2608fedbd007bcd20d9e429ede3ee73f23ee799bbf654de
 DIST netbeans-trunk-nightly-201608150002-src.zip 217088384 SHA256 95ecd71a591cbb135e15157d06f7612df107f015e24ffe47338bda0a55523091 SHA512 8ff5ffdbcd89a305e0372049b1e4ed76076390f0e621fe66c867417a665d13d4b86ea09e9a55cd4a6cf162bc4e23b2dd0aaba2744abf7b205a2af8f60179e2a0 WHIRLPOOL dce14f26c47857482db487bc9d8c2fd51268021e8ecf770a77fbb3fae4576b74e86c7c4af695e8fe1dbdab6231ea962ac632d0edca9abb491656069bfcc71540
+DIST netbeans-trunk-nightly-201608160002-src.zip 217153721 SHA256 f7f0624027293b4eb18b02c6e83678b76f9161ae7790431e5cdf0a67c81067bf SHA512 004bbbafc97c8c155429d12c37e05d1737d5e5d7a5c1d77df1e120481c1f59f2535fd93efda3588aab85e8eef404cbae74ee01469b771226912ab876a23420dd WHIRLPOOL bd19581fb56c256dbf59dcc1fb7db4a11f0e8dc632763d55966f63f4bdc107645862c8ec51a8db231b462dafeb586f680f3de9ffe5af4a6c398dd4c30e880352
 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_p20160707.ebuild 15656 SHA256 bf69fb0a97bfff1da41d5e72e69f8c31172d24fdb4aa7acff9448602b8959028 SHA512 79e23712517d7e36ad4fb76d0df5262a5dbdf67f75cbef5ca659b6c7c24b579e577c364dd2681b27555d5979e99e181aa0455d64eea0fb6a23840578967f0606 WHIRLPOOL 7ed169af62305d691f6cca1c175c6a4609b32a7c906353b759c89d0d59310e20b2ee7992ca3a138005a68db0840bc5b93bcad4586789123ceb041e83cd36e921
@@ -89,4 +90,5 @@ EBUILD netbeans-java-9999_p20160811.ebuild 15656 SHA256 2c938293063f922651a736d6
 EBUILD netbeans-java-9999_p20160812.ebuild 15656 SHA256 6cb2e07e01c159c9bb977d0364665d0634b59ee951f7c66eb493b7796efcd650 SHA512 6eea47c4f8ba2c11d6fd57938bb1566f2dc91562941a9385bb2b7c3feedee175ce2b3d1e7c22a8b021039aae5fb52957bc87fcf1c1d9e2d8da37200189c855da WHIRLPOOL 60c89f0e5ab35cbdd2d125094569b6988f71632522a0dc6f22c2cb9b9a9ba3d7aab427dcfe6703829a3e38d5d55afc3f58e317c2863f8773018661c3a67399c6
 EBUILD netbeans-java-9999_p20160814.ebuild 15656 SHA256 bcabe6af3b5390bf357af5c3c50aa4b023b32420cd595d9aa36c18b34ec09c57 SHA512 f66be5f2b1e010d42a7b268df2135874122500ed1e5d824979650da2aac16c30aad3a35971d6e6d587accd85dd310f9e7e567f7f9436af4beb835dd41e3c4b7f WHIRLPOOL 1c7b20b5963107a03096d4e3dc3eae73bcfc8b227407ff5419013969cb91d4db97c8cf582a1fdaba1a245fc4545e8a7a643252695d9f35fd8aecdc47912c752d
 EBUILD netbeans-java-9999_p20160815.ebuild 15656 SHA256 c0fa32d4d73f057c7123d0f2d5c0f908cf25057b48e42c1354b22174771e4636 SHA512 18dd7ba3b2dcfee7f2df67e2204924ab5d94c910e47ccb7c4b82368a36aeb679461a48d53508b0944beb9ff6ec787757515d305f9fb166624feb4fa2c8bf5282 WHIRLPOOL db59df9359fa2f159586a2bd760c123ace10c05174230ab0ac39487cec874c57b964e95833b0da64f10316fee810064b9aa61291fdc8d4482fffccdfb9a6bee9
+EBUILD netbeans-java-9999_p20160816.ebuild 15656 SHA256 ae26c0d1839a78b4eafedb4ece35fa0e14644f6027925e77f64b47d4ae0b5c97 SHA512 31e2cc1d8f4b42463ad6df1bf7fa47275f7d78c64afd99bbe56e20c79eee51dbe71a1bdb040d85ceff0c45fb10e52ca83561f7467d3a02fcf0b3001114d003c0 WHIRLPOOL 7497e8a7d1d972fced43eb537cddad9d31e5b69bbb8e86c0cb5016300b25c369b71b9068f80bdd1f9b30f2437ba4e5b86e2e97bf97a12a219c30e113e2e0ad8e
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160816.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160816.ebuild
new file mode 100644
index 0000000..879cb56
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20160816.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-16_00-02-33/zip/netbeans-trunk-nightly-201608160002-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 5137c2d..d996166 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201608110002-src.zip 217074142 SHA256 1017ce540b38dc
 DIST netbeans-trunk-nightly-201608120002-src.zip 217080929 SHA256 b8ef1d20faf0485e85cf44ba6ea77282d130efeeafd7caf58d1ae3a33bb5ee01 SHA512 eec5a8165446247e28fd9ecda21017c7d877f8199326565f4750e3631e5f58c66c60424b906782ebcd34e5e58e5810ed60399d3efc01877663821360538b798c WHIRLPOOL 6eae8a97f579b3e009b9ddec46cca6de1033591ecdbb962258d3c929f6768f49ebae96fb1013392d80a912271942d14f31920ccf3e3b69a732eea4313dc8558b
 DIST netbeans-trunk-nightly-201608140002-src.zip 217088384 SHA256 fe3aec6996f578f851f523bc169098f964c74412070b16a030ecf2ca816f72b6 SHA512 2342388288d6e11c7093abb7f5cd3b88fd7c7e8ae8a14fc7ce1becdcf5c24d1ce8d09f88c599cccbfe3d9837e21b4c459489a3dec46280682d378500d335a802 WHIRLPOOL 9ad8bd5bc9f4b00ccff17bcde21c3faa34f0aea05ff249dd8d3fc89d105073159f4a764733461f23e2608fedbd007bcd20d9e429ede3ee73f23ee799bbf654de
 DIST netbeans-trunk-nightly-201608150002-src.zip 217088384 SHA256 95ecd71a591cbb135e15157d06f7612df107f015e24ffe47338bda0a55523091 SHA512 8ff5ffdbcd89a305e0372049b1e4ed76076390f0e621fe66c867417a665d13d4b86ea09e9a55cd4a6cf162bc4e23b2dd0aaba2744abf7b205a2af8f60179e2a0 WHIRLPOOL dce14f26c47857482db487bc9d8c2fd51268021e8ecf770a77fbb3fae4576b74e86c7c4af695e8fe1dbdab6231ea962ac632d0edca9abb491656069bfcc71540
+DIST netbeans-trunk-nightly-201608160002-src.zip 217153721 SHA256 f7f0624027293b4eb18b02c6e83678b76f9161ae7790431e5cdf0a67c81067bf SHA512 004bbbafc97c8c155429d12c37e05d1737d5e5d7a5c1d77df1e120481c1f59f2535fd93efda3588aab85e8eef404cbae74ee01469b771226912ab876a23420dd WHIRLPOOL bd19581fb56c256dbf59dcc1fb7db4a11f0e8dc632763d55966f63f4bdc107645862c8ec51a8db231b462dafeb586f680f3de9ffe5af4a6c398dd4c30e880352
 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_p20160707.ebuild 4971 SHA256 c2bf393de1763c5f36bb34ceb8737a3a1f6b0bfbc160e0b5e25f0654ca317212 SHA512 42abdae2d58b5d571e1dc63b8232e48cca36f9ce0ee43ac8e2c37053de209f07fef5bf3ae3693dbdbe0ea049407a4b1941d8c222ddc44ad712c6ff75fbb442d5 WHIRLPOOL 565a57ac330c2bd08ba77b2488806a81380a4a632588ecec1deae290e3c90bc350f7b035c111b5c8708b9b8c084b9e326266a77e79095315cb52ee4b9093f012
@@ -58,4 +59,5 @@ EBUILD netbeans-javacard-9999_p20160811.ebuild 4971 SHA256 2433a3422810e12d01feb
 EBUILD netbeans-javacard-9999_p20160812.ebuild 4971 SHA256 a15aa4bc401b8ba57608d46ca81eb82854360af5f76b249a11c793049e6b1888 SHA512 8dee4dbb9ea911273876c2cba8dc6894c9b0cbb7ac6d7b2a59b7d30222017f753abd87aebb6a832b0770e5d5fae147ba188843e400a3db67f287f84dbdb93b90 WHIRLPOOL d872053fd161ee62eb7264ad09eb6d8e69f6e26136c435ced038573a2a77aeda5f0795062e52e4c34051ba7081b894e9b50bf1e4798c5efb0703564fe795e24c
 EBUILD netbeans-javacard-9999_p20160814.ebuild 4971 SHA256 a9cc0f07fea58945a8ad207e989683fb57e91eb08aba145cbf966a744e697c0d SHA512 69fef673ae7905dac202cc72c9673e753771ef08521dbd7a262ec3b49b7cc0512cbde92e58d76358a55b9ca7db2c0d67d041d1c7e6f89bbb08f639f53154f28c WHIRLPOOL dad4171f23ec4ad16bd98112a65aac1679c4120e9c6018edade8c1f4d907595ce6a1719805cbc90af0a4c76e7c3f086c5ad95474709c256418c6164ee564f08c
 EBUILD netbeans-javacard-9999_p20160815.ebuild 4971 SHA256 c3171e102bc70f222519c1c267040629acc23dd7f9cbe98d86f32f3c794999c8 SHA512 10bb942d5db385efbb80a89e8dfa0d00fdbebf3dc6a30e9d9b90b7e99b08fcccdda159d357346cbd62ca6b2683e53b994f16be24086dcac15be7f122f3938bc2 WHIRLPOOL b2a653e87ed2108a88d1b721d65d51f682dadf9a9fbe406b6937426351691bd327c8d18516190ea9ad52af3424fd8d59c7b777f5aaaeaf9c255102afb9d920ed
+EBUILD netbeans-javacard-9999_p20160816.ebuild 4971 SHA256 516ef1945b529fdba09cb25577b04ee3982633cf995027bd6bd4450c7df29192 SHA512 befb8c3515ee3df100a46a34ac8d27803d3b812ac0ef03c5900680d652f85302e05608f95e69fa251781cb365489c4cadcc8d648583bd3244f8219c1121269a7 WHIRLPOOL 1d9d1f7b03a61afdf54907e65d9f2aaf362c7f90e5f80b177aa503f5bf4cd4fec2ed42a4a19865f0cfd84404038b1bcc35cd08c3ea3efd9ce9163a142f2a9ec9
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160816.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160816.ebuild
new file mode 100644
index 0000000..8514bd0
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160816.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-16_00-02-33/zip/netbeans-trunk-nightly-201608160002-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 4660a05..a599fe4 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201608110002-src.zip 217074142 SHA256 1017ce540b38dc
 DIST netbeans-trunk-nightly-201608120002-src.zip 217080929 SHA256 b8ef1d20faf0485e85cf44ba6ea77282d130efeeafd7caf58d1ae3a33bb5ee01 SHA512 eec5a8165446247e28fd9ecda21017c7d877f8199326565f4750e3631e5f58c66c60424b906782ebcd34e5e58e5810ed60399d3efc01877663821360538b798c WHIRLPOOL 6eae8a97f579b3e009b9ddec46cca6de1033591ecdbb962258d3c929f6768f49ebae96fb1013392d80a912271942d14f31920ccf3e3b69a732eea4313dc8558b
 DIST netbeans-trunk-nightly-201608140002-src.zip 217088384 SHA256 fe3aec6996f578f851f523bc169098f964c74412070b16a030ecf2ca816f72b6 SHA512 2342388288d6e11c7093abb7f5cd3b88fd7c7e8ae8a14fc7ce1becdcf5c24d1ce8d09f88c599cccbfe3d9837e21b4c459489a3dec46280682d378500d335a802 WHIRLPOOL 9ad8bd5bc9f4b00ccff17bcde21c3faa34f0aea05ff249dd8d3fc89d105073159f4a764733461f23e2608fedbd007bcd20d9e429ede3ee73f23ee799bbf654de
 DIST netbeans-trunk-nightly-201608150002-src.zip 217088384 SHA256 95ecd71a591cbb135e15157d06f7612df107f015e24ffe47338bda0a55523091 SHA512 8ff5ffdbcd89a305e0372049b1e4ed76076390f0e621fe66c867417a665d13d4b86ea09e9a55cd4a6cf162bc4e23b2dd0aaba2744abf7b205a2af8f60179e2a0 WHIRLPOOL dce14f26c47857482db487bc9d8c2fd51268021e8ecf770a77fbb3fae4576b74e86c7c4af695e8fe1dbdab6231ea962ac632d0edca9abb491656069bfcc71540
+DIST netbeans-trunk-nightly-201608160002-src.zip 217153721 SHA256 f7f0624027293b4eb18b02c6e83678b76f9161ae7790431e5cdf0a67c81067bf SHA512 004bbbafc97c8c155429d12c37e05d1737d5e5d7a5c1d77df1e120481c1f59f2535fd93efda3588aab85e8eef404cbae74ee01469b771226912ab876a23420dd WHIRLPOOL bd19581fb56c256dbf59dcc1fb7db4a11f0e8dc632763d55966f63f4bdc107645862c8ec51a8db231b462dafeb586f680f3de9ffe5af4a6c398dd4c30e880352
 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_p20160707.ebuild 6293 SHA256 09d884627adf40d6bd337ac72b00bf64af897d8dbc7f48e3d62fd6e8f29522ee SHA512 5d04c7e2b18a2c4d87d5d405cc73077ce5f18fe25f6a9c253512a9df5b26960527e4efd2ead0afe1a68afaff20e3b0441f1e99692a92a23de2c4c2c472f689a6 WHIRLPOOL 603ae70564f5e439a5ce7ff616e919e3c4e001ac526e3d56d4c0432ed7bd289c3349d264143cbb51965b1581a0895e024f6b6814d54cb25d63c559c9a0742bb2
@@ -57,4 +58,5 @@ EBUILD netbeans-javadoc-9999_p20160811.ebuild 6293 SHA256 d38f30c49051f45ba58914
 EBUILD netbeans-javadoc-9999_p20160812.ebuild 6293 SHA256 a349b69303e652f0d6b6d011e6ee1d291eaead05ad651f9c0a2929258b6e0f59 SHA512 ca59e5319858a1ede6e7f3f1957150f4b63f33712673791c31851a34f72fe92a3550bf45020831ee5a9e8d93cb3c686a3d63f434f548e4fc4f1d2a19150de917 WHIRLPOOL a915d788a3cf8dbed70601f47a9250ca3b51fc44817b5b66112625ea244d1f6a6c7410d7ba1613b23ef774f5c46866bc2e9780deaea20def00ab407fc4b73c37
 EBUILD netbeans-javadoc-9999_p20160814.ebuild 6293 SHA256 9417b379278b326a99795f65a2d683a9dca14d7652ded402ad1b8b2245d08d2c SHA512 5a30051cfbee71a255c037b21f289fbb581e32874e1f686c1b8ff856314c0c4c490ca5b7cdf261b9e46daa51da4523bf0f5f9a101bcdb95144a8d77e916c1dfa WHIRLPOOL 6991ec11e8defd6a131cf40c3ac6064e41eaa54ea3d0dab41695f3aef4e61925c470dc4752cb65becb697d3e249c177fc5d14f85f64235adfce187e159ce7572
 EBUILD netbeans-javadoc-9999_p20160815.ebuild 6293 SHA256 5051e3bc10a14672749e76f695c1f488ff42587fe00fa8a63658221cda1225e3 SHA512 99570b402de8679a2f30f23e7c9ff0669b9ec1fd2082965e37b97277e265f56b5ae14f90eb2d43d8b136b46839180f357d467a497ed368f75e6cb9c0f9cac215 WHIRLPOOL ce2db64336dcb60cece746afea382e223c59f49ac721ea89e27e762505e9dfad4adc875438c5056c4b5fd01911c31dfd7187427f8b98c25c9aee759fa8e41f87
+EBUILD netbeans-javadoc-9999_p20160816.ebuild 6293 SHA256 0fe8bb8b9ac0343a284114749c8be72692d70af4d6e91546a825e96509dad20b SHA512 656f7ffe55ec344bb36606a120f3d21daa2489899149c412d6183390a34e34678a6498398d5ceadb2df22977d2301a51ca580c25f0781080aeddbfa50021cc8f WHIRLPOOL a89348ac3f2230bde9bd686bcee417a8d3a5cf548f5f5cc025820c79ee0991b032d454563f796cf3e945e21429e7d42b33c0f6d100b3cf32b26e3e37092d6d4e
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160816.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160816.ebuild
new file mode 100644
index 0000000..3e22349
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160816.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-16_00-02-33/zip/netbeans-trunk-nightly-201608160002-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 59a41f7..9b0da40 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201608110002-src.zip 217074142 SHA256 1017ce540b38dc
 DIST netbeans-trunk-nightly-201608120002-src.zip 217080929 SHA256 b8ef1d20faf0485e85cf44ba6ea77282d130efeeafd7caf58d1ae3a33bb5ee01 SHA512 eec5a8165446247e28fd9ecda21017c7d877f8199326565f4750e3631e5f58c66c60424b906782ebcd34e5e58e5810ed60399d3efc01877663821360538b798c WHIRLPOOL 6eae8a97f579b3e009b9ddec46cca6de1033591ecdbb962258d3c929f6768f49ebae96fb1013392d80a912271942d14f31920ccf3e3b69a732eea4313dc8558b
 DIST netbeans-trunk-nightly-201608140002-src.zip 217088384 SHA256 fe3aec6996f578f851f523bc169098f964c74412070b16a030ecf2ca816f72b6 SHA512 2342388288d6e11c7093abb7f5cd3b88fd7c7e8ae8a14fc7ce1becdcf5c24d1ce8d09f88c599cccbfe3d9837e21b4c459489a3dec46280682d378500d335a802 WHIRLPOOL 9ad8bd5bc9f4b00ccff17bcde21c3faa34f0aea05ff249dd8d3fc89d105073159f4a764733461f23e2608fedbd007bcd20d9e429ede3ee73f23ee799bbf654de
 DIST netbeans-trunk-nightly-201608150002-src.zip 217088384 SHA256 95ecd71a591cbb135e15157d06f7612df107f015e24ffe47338bda0a55523091 SHA512 8ff5ffdbcd89a305e0372049b1e4ed76076390f0e621fe66c867417a665d13d4b86ea09e9a55cd4a6cf162bc4e23b2dd0aaba2744abf7b205a2af8f60179e2a0 WHIRLPOOL dce14f26c47857482db487bc9d8c2fd51268021e8ecf770a77fbb3fae4576b74e86c7c4af695e8fe1dbdab6231ea962ac632d0edca9abb491656069bfcc71540
+DIST netbeans-trunk-nightly-201608160002-src.zip 217153721 SHA256 f7f0624027293b4eb18b02c6e83678b76f9161ae7790431e5cdf0a67c81067bf SHA512 004bbbafc97c8c155429d12c37e05d1737d5e5d7a5c1d77df1e120481c1f59f2535fd93efda3588aab85e8eef404cbae74ee01469b771226912ab876a23420dd WHIRLPOOL bd19581fb56c256dbf59dcc1fb7db4a11f0e8dc632763d55966f63f4bdc107645862c8ec51a8db231b462dafeb586f680f3de9ffe5af4a6c398dd4c30e880352
 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_p20160707.ebuild 4717 SHA256 a28990f541bd8c043a86d87632cd72b5a3e47eaee8d64fa58865cbd5f471aa79 SHA512 08b78679e90b4d326d8d7060d8c7fd40a76848bfd843c4bc9dab6bf9da8e017d16be9c720c5b7da6e4db6ec4e8c0ab7aea8339f2ed0ee8fe61fc5c3799d5784f WHIRLPOOL 585640c1f574d7304fbdda74751bbac6a12ee6afc5761548ef8425f90014b43d43997cf2fc287349838656c52b4645901202de53ee79fc2626182c5114906ef0
@@ -63,4 +64,5 @@ EBUILD netbeans-javafx-9999_p20160811.ebuild 4717 SHA256 aa97d551e078e76c618e591
 EBUILD netbeans-javafx-9999_p20160812.ebuild 4717 SHA256 e39a39caee9853ea83fbf6da41367a0eae4d14f0a5428d9f964ed3ce9588393e SHA512 51652e4310b6b7ff169e9b51286c79e9770a2042cb0fc6e479d30e5ccaee0f7d4dbbe31a4ea5e735f4d85877256766d58332224a9ace1c34da8de9e58b41a672 WHIRLPOOL 3cdcfa6610dfe8e39017795da0b4964483f062d9da7b04c70bfb6bcc380312ecd7bb9af57490b6f90398bc6dad457fd367e2820968a74ec87534fcb857f621e7
 EBUILD netbeans-javafx-9999_p20160814.ebuild 4717 SHA256 618dea54db5e617fd66ff89afd4304330890af4edeca743186ae2afc6cdb6ae7 SHA512 d4f275605f8a6676ed4acaecead0c1eb5fd107f534d5d5e9af2341cd69b93a0266019573cc236af2488cb0fcc608b40126afcefd1e9d93e8215962de6ddca5bd WHIRLPOOL 9248d931f4ab2e6a5fbb72d526c759a8d592ec3002b7b7f9a8ce14e7cefaf28743c166ad23fdf6c4a09f2594a00c8d44f34fb2a134c6d50b3abd5a77234f0a1c
 EBUILD netbeans-javafx-9999_p20160815.ebuild 4717 SHA256 e6b21fe1cfd2a49c9f9ba59cd911261fb38752892765085629080821ef5b3b4e SHA512 bf66c725ddefa021995e1feb76a0b3b08645f8d468c8599554d444ecf66fce0a97de9cbf85af3562ac2be7e200315f194bdf3f7fa42bdfffa8d03b3eea300989 WHIRLPOOL 539a822142a58f7cae57be0b9ca5a629cf5353d6788f8fd515c43afa2f1f7dc7d4e2b5b42965ddb100aef91419ec037e27c2b4d7bed33475d14dffed853e8571
+EBUILD netbeans-javafx-9999_p20160816.ebuild 4717 SHA256 45c887cb461e0bdab54eeae32acfa5f317145c19e2410cf7ed117fbddf09e86d SHA512 b26dd5e5abffda3d0dc566c0206be428cbf5047519a2f9c3114a15d70f2d8731a95592b3d1c58bf6a3a5993eb8ec7ebfb262d5326e29a006d7e5016f87120dcb WHIRLPOOL 04b9cec1dd6e389bdb522a54e54457373fcee6ff224c735a25ba54f1d4ad5d59b9d61d37f21c221398f285cfeaefde8dabdfdad21f4311bd39be92227afae375
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160816.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160816.ebuild
new file mode 100644
index 0000000..4f2404d
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160816.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-16_00-02-33/zip/netbeans-trunk-nightly-201608160002-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 59f43b6..0b92957 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201608110002-src.zip 217074142 SHA256 1017ce540b38dc
 DIST netbeans-trunk-nightly-201608120002-src.zip 217080929 SHA256 b8ef1d20faf0485e85cf44ba6ea77282d130efeeafd7caf58d1ae3a33bb5ee01 SHA512 eec5a8165446247e28fd9ecda21017c7d877f8199326565f4750e3631e5f58c66c60424b906782ebcd34e5e58e5810ed60399d3efc01877663821360538b798c WHIRLPOOL 6eae8a97f579b3e009b9ddec46cca6de1033591ecdbb962258d3c929f6768f49ebae96fb1013392d80a912271942d14f31920ccf3e3b69a732eea4313dc8558b
 DIST netbeans-trunk-nightly-201608140002-src.zip 217088384 SHA256 fe3aec6996f578f851f523bc169098f964c74412070b16a030ecf2ca816f72b6 SHA512 2342388288d6e11c7093abb7f5cd3b88fd7c7e8ae8a14fc7ce1becdcf5c24d1ce8d09f88c599cccbfe3d9837e21b4c459489a3dec46280682d378500d335a802 WHIRLPOOL 9ad8bd5bc9f4b00ccff17bcde21c3faa34f0aea05ff249dd8d3fc89d105073159f4a764733461f23e2608fedbd007bcd20d9e429ede3ee73f23ee799bbf654de
 DIST netbeans-trunk-nightly-201608150002-src.zip 217088384 SHA256 95ecd71a591cbb135e15157d06f7612df107f015e24ffe47338bda0a55523091 SHA512 8ff5ffdbcd89a305e0372049b1e4ed76076390f0e621fe66c867417a665d13d4b86ea09e9a55cd4a6cf162bc4e23b2dd0aaba2744abf7b205a2af8f60179e2a0 WHIRLPOOL dce14f26c47857482db487bc9d8c2fd51268021e8ecf770a77fbb3fae4576b74e86c7c4af695e8fe1dbdab6231ea962ac632d0edca9abb491656069bfcc71540
+DIST netbeans-trunk-nightly-201608160002-src.zip 217153721 SHA256 f7f0624027293b4eb18b02c6e83678b76f9161ae7790431e5cdf0a67c81067bf SHA512 004bbbafc97c8c155429d12c37e05d1737d5e5d7a5c1d77df1e120481c1f59f2535fd93efda3588aab85e8eef404cbae74ee01469b771226912ab876a23420dd WHIRLPOOL bd19581fb56c256dbf59dcc1fb7db4a11f0e8dc632763d55966f63f4bdc107645862c8ec51a8db231b462dafeb586f680f3de9ffe5af4a6c398dd4c30e880352
 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_p20160707.ebuild 4412 SHA256 d28ca6cf2ee9226bfe09576cef87dafa746723b776097153e09c418772ecec4c SHA512 209d1f0dfbe393f42bbf82609acb3f0a79d1b84747eb37c67f9b825916bfb3e03038221d429fb4ce36f67d89559cd15adcf91a96f53ebc4e519862313ee25727 WHIRLPOOL 39531d36168e4b338db7b43e6cdf2cab483822e82cd1992f86de658c02c3ab4fd4458c04b0dab5bf4709ec3674126698b25bfdb5d563850a4c8c491fc4d8a547
@@ -55,4 +56,5 @@ EBUILD netbeans-mobility-9999_p20160811.ebuild 4412 SHA256 c0bb5a7b01f0a4dcc1791
 EBUILD netbeans-mobility-9999_p20160812.ebuild 4412 SHA256 d6de843c5ffa502c5a02080112dd3f0583e9ee9cfbed890fbb62e6ebed9fce72 SHA512 02ead7cd06079fada2b2e0da8bb053e48044a926e4cffd716d55552ba171f505ac4a9758a7dc81a020ea8e7eb23bedff668dd5939f790ac273f9cb5c7de729c1 WHIRLPOOL edbc044b25f826e2742f656bd37b272e7d711e5caed53179645f9dc7e250fcf461201aa10aa468b8a643f32b3b10a2f26c80696eeab9fa9752dbe7593d0c46f6
 EBUILD netbeans-mobility-9999_p20160814.ebuild 4412 SHA256 f71f2bbae5ff194684966b0783e2b525c5f2a14f40e9b52547f840e85daad315 SHA512 369b9d52325cc7315ed1a736bcf2f088d302fd3279ef0bcae6aa63179cd6cf68b3177e09a1794d1dc5db35e31f515512c6d5ec774f654146d1d746fc60d444e4 WHIRLPOOL 578166cc3fbbc4d8b0e49275908adc46a1a9e878bf276fa04cf9448556a82e993de710f27cf755341b31c9f6d32cf37e7b8c206476a5b3b4f19e0ff8eb8d19c6
 EBUILD netbeans-mobility-9999_p20160815.ebuild 4412 SHA256 7bad402af277783974d35c680898cd283040135ef33a68dab2d0ea76b4ce4a3f SHA512 28f8f4de391f64098a6fa4bded635c3abcc3278456d983f9d4079f6f4388bfa0f969c1ec0fc53d552bbfe4da6aefbb878fab1a78c5b78e386d12b450d330d392 WHIRLPOOL 9ee924b4acef285093d93828acae105dbf1e0cc72dd096ec850618f2f4446180822736df6ca1ad340c556b6a4842b8660b26bcda41e2101424e1ff4539cda43e
+EBUILD netbeans-mobility-9999_p20160816.ebuild 4412 SHA256 e42f228a870270be25a8656008d1df106e79940253e1493b50cbd41ad8bde3d9 SHA512 0a3ad62df9c15b1872d10e4fbbbf9f721185751c6a6ea3b45d1facd689d4cdb9c6b74005a733da1fd11a17b8432204a6463b2b6be458da1ff42d9e64f97ba391 WHIRLPOOL 7d90d71cb0f12f4898112ae81919b00e56fa54c70c5a0fd74ba7d28822a3aafdce36333cdf62ff8285e5ab1b91751f34c13fff581d3c72006799ec90e99b83ef
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160816.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160816.ebuild
new file mode 100644
index 0000000..698bf9e
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160816.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-16_00-02-33/zip/netbeans-trunk-nightly-201608160002-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 91886e2..0e5886a 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201608110002-src.zip 217074142 SHA256 1017ce540b38dc
 DIST netbeans-trunk-nightly-201608120002-src.zip 217080929 SHA256 b8ef1d20faf0485e85cf44ba6ea77282d130efeeafd7caf58d1ae3a33bb5ee01 SHA512 eec5a8165446247e28fd9ecda21017c7d877f8199326565f4750e3631e5f58c66c60424b906782ebcd34e5e58e5810ed60399d3efc01877663821360538b798c WHIRLPOOL 6eae8a97f579b3e009b9ddec46cca6de1033591ecdbb962258d3c929f6768f49ebae96fb1013392d80a912271942d14f31920ccf3e3b69a732eea4313dc8558b
 DIST netbeans-trunk-nightly-201608140002-src.zip 217088384 SHA256 fe3aec6996f578f851f523bc169098f964c74412070b16a030ecf2ca816f72b6 SHA512 2342388288d6e11c7093abb7f5cd3b88fd7c7e8ae8a14fc7ce1becdcf5c24d1ce8d09f88c599cccbfe3d9837e21b4c459489a3dec46280682d378500d335a802 WHIRLPOOL 9ad8bd5bc9f4b00ccff17bcde21c3faa34f0aea05ff249dd8d3fc89d105073159f4a764733461f23e2608fedbd007bcd20d9e429ede3ee73f23ee799bbf654de
 DIST netbeans-trunk-nightly-201608150002-src.zip 217088384 SHA256 95ecd71a591cbb135e15157d06f7612df107f015e24ffe47338bda0a55523091 SHA512 8ff5ffdbcd89a305e0372049b1e4ed76076390f0e621fe66c867417a665d13d4b86ea09e9a55cd4a6cf162bc4e23b2dd0aaba2744abf7b205a2af8f60179e2a0 WHIRLPOOL dce14f26c47857482db487bc9d8c2fd51268021e8ecf770a77fbb3fae4576b74e86c7c4af695e8fe1dbdab6231ea962ac632d0edca9abb491656069bfcc71540
+DIST netbeans-trunk-nightly-201608160002-src.zip 217153721 SHA256 f7f0624027293b4eb18b02c6e83678b76f9161ae7790431e5cdf0a67c81067bf SHA512 004bbbafc97c8c155429d12c37e05d1737d5e5d7a5c1d77df1e120481c1f59f2535fd93efda3588aab85e8eef404cbae74ee01469b771226912ab876a23420dd WHIRLPOOL bd19581fb56c256dbf59dcc1fb7db4a11f0e8dc632763d55966f63f4bdc107645862c8ec51a8db231b462dafeb586f680f3de9ffe5af4a6c398dd4c30e880352
 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_p20160707.ebuild 4111 SHA256 d944a3f5097390553bb935e590b2b56d1a6b0282f2bf8ec6d00f21150d486df8 SHA512 a5381d9f12236534822ea4d80bb53a13b62373b7eabc409822c64f2ec4b696752accb921395f9b979061f403176604d79dea831cd1bb3674dbbe67c17236f1f0 WHIRLPOOL 03ad56a6dd6afffbfd155fdbe2ed4e24764b822dcbcf4dfc1cfd4f3b5982e69fb39c9031d7bf01e306ac837ed4754a710c19b0f4030e9cd44b5e57e9f90b7132
@@ -58,4 +59,5 @@ EBUILD netbeans-nb-9999_p20160811.ebuild 4111 SHA256 92d2f57cf102246f715411e55ba
 EBUILD netbeans-nb-9999_p20160812.ebuild 4111 SHA256 9a77c9f46254b94bf7442da8f6818e045030c48ea1ce18e2ed8a28434601d003 SHA512 4a43566ea132efbe1e6b498159fb7f782330372d918fb94c7d1c03ce7a29d78be08beb39ec13ac31a17b3f03d974006b4680266523a3ad9a023dcdb185c50be8 WHIRLPOOL b915015597789532dd53b6373a5fed551eb9a986d33e7d736b4610cff9b7d842530f099ee9625f47c893bc3ef7b90da1ebddd725226db4782aa47c643a4a534b
 EBUILD netbeans-nb-9999_p20160814.ebuild 4111 SHA256 420a8b7861cf321211440b87d7d8048a0a09da4db5b19e482efc9b0fc561310e SHA512 54ed7c06d7e31315ef48d71b7c297ef7eb0c13df8f69686a33d362255123b9c3684900f22d1000e0959f501ef8f3041444fb23ac7b6976c1cc7e850a3d0e1c07 WHIRLPOOL fad163e8ce41ae0f810ca6ea0bc41019259e41f32e3d7245db82b8fd1ba5bf4f05cca1467b5b2f43138d96617c8ce0accd08a850a963293691fe2795a4fa3590
 EBUILD netbeans-nb-9999_p20160815.ebuild 4111 SHA256 6c6e4df97b242dd399c47f42d25b2d9a8ff840a2bdfa39924dbd249124cf2043 SHA512 e51deedd5a7b7f1fd7a70810ade81908ee5092519e3a0b688b9d2df3a4ea3589fe376c79ce1bcf644860b2437b644e21f710a68a7660682773c43b221d06d4aa WHIRLPOOL a7451f0fd2acaa3acf2698e4684b8955f641ccba01c65f22f5cbf7eaf6a6163346115bb37b7a117b9680b1fd1633410e462dd2aa3544b69f58bc8da8d846ee18
+EBUILD netbeans-nb-9999_p20160816.ebuild 4111 SHA256 cbd6252d751bbf47d389c4d1a4b9f96dd5035dfa442a7543b7b0f916969de7f0 SHA512 d28f48a5dd75d6f03138612e470abe72a665fc68b25e68f68ed88cacf8b54a574d30773dad0c3ee4809534459de2b36b08fc5e9766535514428fe5262a60daf9 WHIRLPOOL cc32ccff3b283e7c5b8fffb28d6871d881a9d99c7a4bb30387017fe49515328564354991b06d8a862a363e1156386bb0bf0a28dbeb4d69099f2a84785aa82521
 MISC metadata.xml 392 SHA256 01cdbcc83099b97486bd7b8e813e5b19c1138eb0d8d3e8a5683aafd579820435 SHA512 4d2f9160baa022d6a48b61d5f42e71cfd411d244e7a36436629bc5ee4036e4ce19079134d9a6c704ebe942306c2e0199d0591c1e54f92f8f3c8835147e639246 WHIRLPOOL c1131764e1cec66c56b977ebe36014b29e5a68e35ccc326c0cbadd050a6c625cf191c85c212e0a733661c008dab0d99f9a4cdc4c4ae0cc9d775ba1de554795a9

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160816.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160816.ebuild
new file mode 100644
index 0000000..357e6c4
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20160816.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-16_00-02-33/zip/netbeans-trunk-nightly-201608160002-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 ff9ccd5..90bc416 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201608110002-src.zip 217074142 SHA256 1017ce540b38dc
 DIST netbeans-trunk-nightly-201608120002-src.zip 217080929 SHA256 b8ef1d20faf0485e85cf44ba6ea77282d130efeeafd7caf58d1ae3a33bb5ee01 SHA512 eec5a8165446247e28fd9ecda21017c7d877f8199326565f4750e3631e5f58c66c60424b906782ebcd34e5e58e5810ed60399d3efc01877663821360538b798c WHIRLPOOL 6eae8a97f579b3e009b9ddec46cca6de1033591ecdbb962258d3c929f6768f49ebae96fb1013392d80a912271942d14f31920ccf3e3b69a732eea4313dc8558b
 DIST netbeans-trunk-nightly-201608140002-src.zip 217088384 SHA256 fe3aec6996f578f851f523bc169098f964c74412070b16a030ecf2ca816f72b6 SHA512 2342388288d6e11c7093abb7f5cd3b88fd7c7e8ae8a14fc7ce1becdcf5c24d1ce8d09f88c599cccbfe3d9837e21b4c459489a3dec46280682d378500d335a802 WHIRLPOOL 9ad8bd5bc9f4b00ccff17bcde21c3faa34f0aea05ff249dd8d3fc89d105073159f4a764733461f23e2608fedbd007bcd20d9e429ede3ee73f23ee799bbf654de
 DIST netbeans-trunk-nightly-201608150002-src.zip 217088384 SHA256 95ecd71a591cbb135e15157d06f7612df107f015e24ffe47338bda0a55523091 SHA512 8ff5ffdbcd89a305e0372049b1e4ed76076390f0e621fe66c867417a665d13d4b86ea09e9a55cd4a6cf162bc4e23b2dd0aaba2744abf7b205a2af8f60179e2a0 WHIRLPOOL dce14f26c47857482db487bc9d8c2fd51268021e8ecf770a77fbb3fae4576b74e86c7c4af695e8fe1dbdab6231ea962ac632d0edca9abb491656069bfcc71540
+DIST netbeans-trunk-nightly-201608160002-src.zip 217153721 SHA256 f7f0624027293b4eb18b02c6e83678b76f9161ae7790431e5cdf0a67c81067bf SHA512 004bbbafc97c8c155429d12c37e05d1737d5e5d7a5c1d77df1e120481c1f59f2535fd93efda3588aab85e8eef404cbae74ee01469b771226912ab876a23420dd WHIRLPOOL bd19581fb56c256dbf59dcc1fb7db4a11f0e8dc632763d55966f63f4bdc107645862c8ec51a8db231b462dafeb586f680f3de9ffe5af4a6c398dd4c30e880352
 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_p20160707.ebuild 4418 SHA256 7a5c0d246417f25c0cb10e81607c2efb39e061e3acb0b2055beb4d74bf42e5b3 SHA512 aa53537c81d3d763f7931b7b253449d28735acb4fa8bc2225c523400bef7431c18397b1ffa703ba9e096f2c57d4807913abb724cfd3e5624b8089c77140c99bf WHIRLPOOL 1d85d9f952194d3924f52b45fddcbf43d17da2f1142ee991be479fd838e50db5082408272a2feb96df3e5a7c448dcb7bbce7743a1abda59088cd43a9501e005f
@@ -60,4 +61,5 @@ EBUILD netbeans-php-9999_p20160811.ebuild 4418 SHA256 2f8b3517de2cc4c025e14c48c0
 EBUILD netbeans-php-9999_p20160812.ebuild 4418 SHA256 533fdad60f1f91d711f2d9ab95581256f2ba18f7b3e936c3a7144762545aed54 SHA512 018f38a567c1d1aba4356f895c5ac1f20f626c3679fed97a515ad8254fdf266270b61db7d10353409b1300657b96e93e0940c101e5167c056551d10703b166ec WHIRLPOOL 1639121302bc7d0b295e7fac2984e9eeb889d951e036cfab1d061acb4f49e5d66d4055a78c05c7cb4bb209e8e6cf544d173dcf8d735bf28a50d84554a05da226
 EBUILD netbeans-php-9999_p20160814.ebuild 4418 SHA256 7243438e9250b3baff50b6b1417e689140398f3f387494722763ee33bb32edd5 SHA512 3cca44b62592539ad5d30754af8b7db13326925b7b1879ba4c6b37d26fb04c66317254e0f28dab3f58373598339afc8505d3b4e5bb42d4dc35f7aea072369d94 WHIRLPOOL 1add03c8ba93b3cdc409b4336c477ec1f08f9a2abd98935ddead825e1ae2a21a09e4e7c5e4e3cc33372c0433eca25916cdd401956b0ef098550a86023a15b9e0
 EBUILD netbeans-php-9999_p20160815.ebuild 4418 SHA256 845f1a6d21694d25ec4169020ca4a0f0138d4d965a12fd838f193124a239f7aa SHA512 fa3daf73f340fadfee8c288efac67a6a16850236f2c89d57da70c1c40834cd2ea8bea8c62fd01f7def9e8e59f91d4bffa35da88cbc24581f4e9cd6dac5df7e35 WHIRLPOOL 4a54b4ca54cbe2f5dc3eddd2494381e6ca6502da0391067eabee51292db896cbd8b5b72015d333e6a622ae54a84b0721d54986260e5b7435e50f356e0d46f9ad
+EBUILD netbeans-php-9999_p20160816.ebuild 4418 SHA256 fdc8c013c1993ba95fe3e7ea12f18ee1fb818a4b70268a879d0b8cc8d4e3a3d4 SHA512 e30ca0f7c5bb9e81bdb972faec5be4c92618ceae91a722ebd5e13546d0721c80ae7a3b17e2e95142ed87b4fdccce752d0c94c26e15c59e1314365719fad23f89 WHIRLPOOL cc65b7e33ac80cc11d925e3ea97833d20e593b2c528088804c80773cfcd0be10639ef494ffd3ce09918899a9a6accd8ef60fb0a9abd0b4a3797c579e22e8b6ab
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160816.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160816.ebuild
new file mode 100644
index 0000000..9e0f51d
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20160816.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-16_00-02-33/zip/netbeans-trunk-nightly-201608160002-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 30ff975..0f88300 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -54,6 +54,7 @@ DIST netbeans-trunk-nightly-201608110002-src.zip 217074142 SHA256 1017ce540b38dc
 DIST netbeans-trunk-nightly-201608120002-src.zip 217080929 SHA256 b8ef1d20faf0485e85cf44ba6ea77282d130efeeafd7caf58d1ae3a33bb5ee01 SHA512 eec5a8165446247e28fd9ecda21017c7d877f8199326565f4750e3631e5f58c66c60424b906782ebcd34e5e58e5810ed60399d3efc01877663821360538b798c WHIRLPOOL 6eae8a97f579b3e009b9ddec46cca6de1033591ecdbb962258d3c929f6768f49ebae96fb1013392d80a912271942d14f31920ccf3e3b69a732eea4313dc8558b
 DIST netbeans-trunk-nightly-201608140002-src.zip 217088384 SHA256 fe3aec6996f578f851f523bc169098f964c74412070b16a030ecf2ca816f72b6 SHA512 2342388288d6e11c7093abb7f5cd3b88fd7c7e8ae8a14fc7ce1becdcf5c24d1ce8d09f88c599cccbfe3d9837e21b4c459489a3dec46280682d378500d335a802 WHIRLPOOL 9ad8bd5bc9f4b00ccff17bcde21c3faa34f0aea05ff249dd8d3fc89d105073159f4a764733461f23e2608fedbd007bcd20d9e429ede3ee73f23ee799bbf654de
 DIST netbeans-trunk-nightly-201608150002-src.zip 217088384 SHA256 95ecd71a591cbb135e15157d06f7612df107f015e24ffe47338bda0a55523091 SHA512 8ff5ffdbcd89a305e0372049b1e4ed76076390f0e621fe66c867417a665d13d4b86ea09e9a55cd4a6cf162bc4e23b2dd0aaba2744abf7b205a2af8f60179e2a0 WHIRLPOOL dce14f26c47857482db487bc9d8c2fd51268021e8ecf770a77fbb3fae4576b74e86c7c4af695e8fe1dbdab6231ea962ac632d0edca9abb491656069bfcc71540
+DIST netbeans-trunk-nightly-201608160002-src.zip 217153721 SHA256 f7f0624027293b4eb18b02c6e83678b76f9161ae7790431e5cdf0a67c81067bf SHA512 004bbbafc97c8c155429d12c37e05d1737d5e5d7a5c1d77df1e120481c1f59f2535fd93efda3588aab85e8eef404cbae74ee01469b771226912ab876a23420dd WHIRLPOOL bd19581fb56c256dbf59dcc1fb7db4a11f0e8dc632763d55966f63f4bdc107645862c8ec51a8db231b462dafeb586f680f3de9ffe5af4a6c398dd4c30e880352
 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_p20160707.ebuild 9520 SHA256 884a9a0444004d094355a281bfd28a5fb55bcbfb044cc2f305076b732e5513e9 SHA512 4900f1e9d3cba5fcca2faa20ae77d7182fc2103bf24d987582b28ce88504975a227649f03fe9b8458d184dddc81f330cfbfc1f4383994f65812f6dce14a9a305 WHIRLPOOL 5834a5307100b08f55f84857fd01287c694a1ac78d2322a882a5a03aa25d933cd8fe2d8c468b2ba45b4a4265a4eb5a8157a45787ab5d556e1c8fe1cda4bf7025
@@ -81,4 +82,5 @@ EBUILD netbeans-platform-9999_p20160811.ebuild 9520 SHA256 e629587fe1666ddac011a
 EBUILD netbeans-platform-9999_p20160812.ebuild 9520 SHA256 9af76f8a500e2f1e81e0096afb4f83d578872223dd1a37d77951f8ca3ce0c17d SHA512 8f257810044a515e07bb05b724a5eb1cd0496794881169d86bcd8a73bc444c66c2075c54afd867000d5df033c8e4320cd6e540828c5457f889b5e32f239f1848 WHIRLPOOL 83f937774e0a6cd416299f884aac537c75cf8cfa9d13efbee5f7be1bc04766058a8ccfe5707dfc534b07b2bcecc235410b81783891b2a7255dcb629f1af11c81
 EBUILD netbeans-platform-9999_p20160814.ebuild 9520 SHA256 5fbd3fa73bc9b55840ce8d168a65353f85d46cfc5884150b90460bf7bfc4c667 SHA512 65bda19bd4f398765d4cf51604ac04111a6f4fd84b95a62e86f56e23998eb123d2a8d74f6067cb220cc0b662c8ad97e2d653bb09a8ba3c65ec69f444eb882e47 WHIRLPOOL c7f7f64881281b4b7a51a184afec059349fc3adf3ad867b5f0080b8596e88e4bacd1e3706b8d17a73164c8908bb2bedaab7c6a1a7eb410f08730bc371be06fc5
 EBUILD netbeans-platform-9999_p20160815.ebuild 9520 SHA256 cfa9fb212460bfacbfe3c9dd041ffb825d0f405cb4ed1148c921878218d5dfcb SHA512 6676c8d32a87fc07da0976cb3090783798fd83be1e37e7b7e7558bdb93396fee5a2670e0cae5075595ce34c964d57c0f2a7f8dab336e45fdcd5ce1156ad86a74 WHIRLPOOL 9110ec1cca4735bb0a0a281ce1ecce0fafe533e2dbf801c5edb5e67ef63edb3414e043976416fafcdee7ce645f8cc7061ea4f802cc067d71b7cd26eb22793a3a
+EBUILD netbeans-platform-9999_p20160816.ebuild 9520 SHA256 9d696b911348b79511b23f6b213af67685629740741a70e233ad4a6c7a7f3e45 SHA512 e6dd7ddf9f68449ea8a9ebe5977c5a62f8677e2dd5e5200dd008ffca8fcf08b2301b5b53cabfe132467ab1c8a33d64926b33f382ad11476679b3c9e3cb3bf219 WHIRLPOOL ba10f87328b76e08a8954b6cfd07de893d53dcf73e4cdb0e2c1a26391ef6af5f8091ad2b03cc07a9674a00f7c0438afcabe707e7ee9b414cc0b9f9ed57f968f8
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160816.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160816.ebuild
new file mode 100644
index 0000000..1febfd3
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20160816.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-16_00-02-33/zip/netbeans-trunk-nightly-201608160002-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 96fdc40..3fd4a9d 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201608110002-src.zip 217074142 SHA256 1017ce540b38dc
 DIST netbeans-trunk-nightly-201608120002-src.zip 217080929 SHA256 b8ef1d20faf0485e85cf44ba6ea77282d130efeeafd7caf58d1ae3a33bb5ee01 SHA512 eec5a8165446247e28fd9ecda21017c7d877f8199326565f4750e3631e5f58c66c60424b906782ebcd34e5e58e5810ed60399d3efc01877663821360538b798c WHIRLPOOL 6eae8a97f579b3e009b9ddec46cca6de1033591ecdbb962258d3c929f6768f49ebae96fb1013392d80a912271942d14f31920ccf3e3b69a732eea4313dc8558b
 DIST netbeans-trunk-nightly-201608140002-src.zip 217088384 SHA256 fe3aec6996f578f851f523bc169098f964c74412070b16a030ecf2ca816f72b6 SHA512 2342388288d6e11c7093abb7f5cd3b88fd7c7e8ae8a14fc7ce1becdcf5c24d1ce8d09f88c599cccbfe3d9837e21b4c459489a3dec46280682d378500d335a802 WHIRLPOOL 9ad8bd5bc9f4b00ccff17bcde21c3faa34f0aea05ff249dd8d3fc89d105073159f4a764733461f23e2608fedbd007bcd20d9e429ede3ee73f23ee799bbf654de
 DIST netbeans-trunk-nightly-201608150002-src.zip 217088384 SHA256 95ecd71a591cbb135e15157d06f7612df107f015e24ffe47338bda0a55523091 SHA512 8ff5ffdbcd89a305e0372049b1e4ed76076390f0e621fe66c867417a665d13d4b86ea09e9a55cd4a6cf162bc4e23b2dd0aaba2744abf7b205a2af8f60179e2a0 WHIRLPOOL dce14f26c47857482db487bc9d8c2fd51268021e8ecf770a77fbb3fae4576b74e86c7c4af695e8fe1dbdab6231ea962ac632d0edca9abb491656069bfcc71540
+DIST netbeans-trunk-nightly-201608160002-src.zip 217153721 SHA256 f7f0624027293b4eb18b02c6e83678b76f9161ae7790431e5cdf0a67c81067bf SHA512 004bbbafc97c8c155429d12c37e05d1737d5e5d7a5c1d77df1e120481c1f59f2535fd93efda3588aab85e8eef404cbae74ee01469b771226912ab876a23420dd WHIRLPOOL bd19581fb56c256dbf59dcc1fb7db4a11f0e8dc632763d55966f63f4bdc107645862c8ec51a8db231b462dafeb586f680f3de9ffe5af4a6c398dd4c30e880352
 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_p20160707.ebuild 3472 SHA256 1f0ee9449508faa65631eb249507b2dfecffd6d96140fa3dfc85bc6e54a342d9 SHA512 95edc575e5ffe552f3c769abf6ae5a2f69c2f898c8febdf20d5f6dcd2d9fde2682cc58d3921bfd8f85b515122abf2a34887615cc368b833a9f34d7c0d90a69c8 WHIRLPOOL db33ab6962f9a89ed3e9ba6ce4a3881fe92b24687d0b7fbf1988fe0d01802ede3753c9e3bb04b390dc9056b6225c9bc4a13095d3c718500ff35803f2677f081e
@@ -55,4 +56,5 @@ EBUILD netbeans-profiler-9999_p20160811.ebuild 3472 SHA256 40ebc955c13567df6cc82
 EBUILD netbeans-profiler-9999_p20160812.ebuild 3472 SHA256 5ec4c4bd8af171fb3f83673060757e54efe1b13552f45e84e4dc462561626567 SHA512 cadf9c4d2c5f8e19eb5794a54c6995d071cdcf242be8a056e5ae095c773a2e7d48ca959834b83300a71c8fe0b2fe0a09416356ec2b93d91c7f57fccd1ce786cf WHIRLPOOL 2c7690da5718c9646c7d34e2bf517f0b38d06903870f5a24870606e04b426b77cd1be95cd283c6f922e89c469bcdb4dfdbeada3079f673b2e5841fd500b299a2
 EBUILD netbeans-profiler-9999_p20160814.ebuild 3472 SHA256 e43b2eb1a194974998f5a8fb1eabff03dc69acbb0d54cf901de40a579f23c338 SHA512 ea1a0699ad8a2d93ee485f6456bff42032d3731343ff773e625efd426b99d661f2403f40c35cf142dc3cb2b674436a57b16347b544c6d48afe4352074e3ad93e WHIRLPOOL d03b5838a2744708b5bd4b45646a3d14767930c5ae0f8561a8547604d064d5b05fea20e3cbd400bc92e25f4b60abd89ae720b651465b7e6cdd5dc03b31cc2aad
 EBUILD netbeans-profiler-9999_p20160815.ebuild 3472 SHA256 ca75cb1092968a126c89027d64cd1d32785fc67d6fa983f7ab12554d8356eef4 SHA512 172d4a51dcec2a8973e4fa772b43d968be01d4a67aa63b04f37ecf238547963db521735b537752a7202e6dbd3b7bd6138eff830948db45efcce941a6f052d4fd WHIRLPOOL 33dc27d4d3b3f7f4a1e5f5d6f17bed8e9796aaf3d1ec5d8cda8e3cb695e2e1741745a895a9cedecb6105870b399ffabe27bd57cb6cd9a99e49f9ca4fb3836ce3
+EBUILD netbeans-profiler-9999_p20160816.ebuild 3472 SHA256 88518622aea4d688593e76d8ea508822a82a3f78430389a4e83002c345079be9 SHA512 1eb036c2a52dea1bba695c2096b3c00a7d2df04df683b929f072a2e24c44b82bb30d0381fe197bcc106900ad732be73ec71a5ffaa9aade14a8829389d09e4b70 WHIRLPOOL 8210b9cdc3df1f990a171fa88727a6406342d5f21a9e07f58cf805ec09a29b647fc03d71df7329759c90ea197b93a147d7c8d22205f041fe8cc3fc41e288dd57
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160816.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160816.ebuild
new file mode 100644
index 0000000..0c46253
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160816.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-16_00-02-33/zip/netbeans-trunk-nightly-201608160002-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 d52aaba..1d4081b 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -49,6 +49,7 @@ DIST netbeans-trunk-nightly-201608110002-src.zip 217074142 SHA256 1017ce540b38dc
 DIST netbeans-trunk-nightly-201608120002-src.zip 217080929 SHA256 b8ef1d20faf0485e85cf44ba6ea77282d130efeeafd7caf58d1ae3a33bb5ee01 SHA512 eec5a8165446247e28fd9ecda21017c7d877f8199326565f4750e3631e5f58c66c60424b906782ebcd34e5e58e5810ed60399d3efc01877663821360538b798c WHIRLPOOL 6eae8a97f579b3e009b9ddec46cca6de1033591ecdbb962258d3c929f6768f49ebae96fb1013392d80a912271942d14f31920ccf3e3b69a732eea4313dc8558b
 DIST netbeans-trunk-nightly-201608140002-src.zip 217088384 SHA256 fe3aec6996f578f851f523bc169098f964c74412070b16a030ecf2ca816f72b6 SHA512 2342388288d6e11c7093abb7f5cd3b88fd7c7e8ae8a14fc7ce1becdcf5c24d1ce8d09f88c599cccbfe3d9837e21b4c459489a3dec46280682d378500d335a802 WHIRLPOOL 9ad8bd5bc9f4b00ccff17bcde21c3faa34f0aea05ff249dd8d3fc89d105073159f4a764733461f23e2608fedbd007bcd20d9e429ede3ee73f23ee799bbf654de
 DIST netbeans-trunk-nightly-201608150002-src.zip 217088384 SHA256 95ecd71a591cbb135e15157d06f7612df107f015e24ffe47338bda0a55523091 SHA512 8ff5ffdbcd89a305e0372049b1e4ed76076390f0e621fe66c867417a665d13d4b86ea09e9a55cd4a6cf162bc4e23b2dd0aaba2744abf7b205a2af8f60179e2a0 WHIRLPOOL dce14f26c47857482db487bc9d8c2fd51268021e8ecf770a77fbb3fae4576b74e86c7c4af695e8fe1dbdab6231ea962ac632d0edca9abb491656069bfcc71540
+DIST netbeans-trunk-nightly-201608160002-src.zip 217153721 SHA256 f7f0624027293b4eb18b02c6e83678b76f9161ae7790431e5cdf0a67c81067bf SHA512 004bbbafc97c8c155429d12c37e05d1737d5e5d7a5c1d77df1e120481c1f59f2535fd93efda3588aab85e8eef404cbae74ee01469b771226912ab876a23420dd WHIRLPOOL bd19581fb56c256dbf59dcc1fb7db4a11f0e8dc632763d55966f63f4bdc107645862c8ec51a8db231b462dafeb586f680f3de9ffe5af4a6c398dd4c30e880352
 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_p20160707.ebuild 6242 SHA256 d3d1abc3e596bf761798756e406a12f9c615b9bf7cf07c57f2455821d44234f3 SHA512 8a260e1c05d44b5c4e86585abef1fe5a09ec9eda523dceff5532ab92604cf61fef452d966ce58c3ed4d4f7c0ffa32c52003751f3dd9568f175be645cb51419d1 WHIRLPOOL 637845cf0fc830dac0ebd0e1feb734d6a4d63b853b87f8eec655248ad32231a0ebc8a16ae1268c08a670814da5a184bde5812872d176899a076c45d8d475947f
@@ -76,4 +77,5 @@ EBUILD netbeans-webcommon-9999_p20160811.ebuild 6242 SHA256 7a1de285db5bf93873be
 EBUILD netbeans-webcommon-9999_p20160812.ebuild 6242 SHA256 c8605b0e463e3a85b7158d1d63fda596f97b4f561b519546ff00d101fabac0f5 SHA512 1492d26fb549ceef35ec55b19acb123667a027e6f67e25f65aea9071fdc194649a1225ff2efb99401f4668ec0de47cfac65c707d6b3ca71d593fae38aa5b6672 WHIRLPOOL 9afcc76d69909b061b7775a4f8485f6a49a0b8c7880bd2baa41ced18815853e3803e179589e3d4abdb38862dc82cf8beb6aea9bcae4c231961935af24a6bdd1d
 EBUILD netbeans-webcommon-9999_p20160814.ebuild 6242 SHA256 a57d241b3e6d07e223d82e613380fe7837f2b313ddb35d6b917eed2d7878a8c1 SHA512 222549bddb477f4c555facae2c27a9cdb5d420cae1616e2aa6a97246c4d3992fbb92fd6d016d4985a23a523351d32591bfa272c95f35f6a2f4b64f4a7e69e687 WHIRLPOOL 835ddac5ac5b51bba83b153cd22e3c48817782299006d2126ab6984bff36c418d5818371bdc0c9378d0430e8acf1454b262e52124fa8d2602c645eadd5e16b5e
 EBUILD netbeans-webcommon-9999_p20160815.ebuild 6242 SHA256 e6d0cf000ce88ad6d3340d553bcc656c1232ccc1830bd6a7e6dd6b84d322f3ed SHA512 ac8c15dcdd6af9838e2b69ec56cc0c4bbb1b22e1495da293b8e2ed617fb14c19323ff253964a9cf8cb7cf4b8bed3d096e003afa967bb21d713c10207fb27af34 WHIRLPOOL 85481d42c0527341b79351900fc5cf1b0095f120f2555ac8f41085a624debede5c2b05ec714bfb1d984e1dc635b3aff32715657b963b3fa3a94a8bd66b151ada
+EBUILD netbeans-webcommon-9999_p20160816.ebuild 6242 SHA256 799a7b09e60d6a5ae006a67dd5a6d30755c8fc3839bb41888563488eecc65447 SHA512 270177407780752e3e01d5b7074c5f89c9870e90561527160fc9d308122b82fe866567f09487bd4535a6e51dca394539757f477093e53a3a06743ff05dc36e06 WHIRLPOOL 6649396e3d5e3490e0f80d089c144a0d9cd817601cc5a12e4a4fee66c8d98e6f74e9fd4dd37f0a39b99f31f0fcf56499ccdf7bfc15261778901bdd36e81ff89b
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160816.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160816.ebuild
new file mode 100644
index 0000000..897469d
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160816.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-16_00-02-33/zip/netbeans-trunk-nightly-201608160002-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 450ee7d..8c18d8a 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201608110002-src.zip 217074142 SHA256 1017ce540b38dc
 DIST netbeans-trunk-nightly-201608120002-src.zip 217080929 SHA256 b8ef1d20faf0485e85cf44ba6ea77282d130efeeafd7caf58d1ae3a33bb5ee01 SHA512 eec5a8165446247e28fd9ecda21017c7d877f8199326565f4750e3631e5f58c66c60424b906782ebcd34e5e58e5810ed60399d3efc01877663821360538b798c WHIRLPOOL 6eae8a97f579b3e009b9ddec46cca6de1033591ecdbb962258d3c929f6768f49ebae96fb1013392d80a912271942d14f31920ccf3e3b69a732eea4313dc8558b
 DIST netbeans-trunk-nightly-201608140002-src.zip 217088384 SHA256 fe3aec6996f578f851f523bc169098f964c74412070b16a030ecf2ca816f72b6 SHA512 2342388288d6e11c7093abb7f5cd3b88fd7c7e8ae8a14fc7ce1becdcf5c24d1ce8d09f88c599cccbfe3d9837e21b4c459489a3dec46280682d378500d335a802 WHIRLPOOL 9ad8bd5bc9f4b00ccff17bcde21c3faa34f0aea05ff249dd8d3fc89d105073159f4a764733461f23e2608fedbd007bcd20d9e429ede3ee73f23ee799bbf654de
 DIST netbeans-trunk-nightly-201608150002-src.zip 217088384 SHA256 95ecd71a591cbb135e15157d06f7612df107f015e24ffe47338bda0a55523091 SHA512 8ff5ffdbcd89a305e0372049b1e4ed76076390f0e621fe66c867417a665d13d4b86ea09e9a55cd4a6cf162bc4e23b2dd0aaba2744abf7b205a2af8f60179e2a0 WHIRLPOOL dce14f26c47857482db487bc9d8c2fd51268021e8ecf770a77fbb3fae4576b74e86c7c4af695e8fe1dbdab6231ea962ac632d0edca9abb491656069bfcc71540
+DIST netbeans-trunk-nightly-201608160002-src.zip 217153721 SHA256 f7f0624027293b4eb18b02c6e83678b76f9161ae7790431e5cdf0a67c81067bf SHA512 004bbbafc97c8c155429d12c37e05d1737d5e5d7a5c1d77df1e120481c1f59f2535fd93efda3588aab85e8eef404cbae74ee01469b771226912ab876a23420dd WHIRLPOOL bd19581fb56c256dbf59dcc1fb7db4a11f0e8dc632763d55966f63f4bdc107645862c8ec51a8db231b462dafeb586f680f3de9ffe5af4a6c398dd4c30e880352
 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_p20160707.ebuild 2721 SHA256 f589c9cfe190deb87bc70573bdd0f2448c504b554c561768e52d1349e5e55f0d SHA512 7c0e3c5e38505897552113b3a76f3912270134fb79ab10f6e68cc8ae69348aa178732ae8ebec59fa10c7ad3fd221e9ef2fda4e135c82e8f0288c2fedd98f6cc2 WHIRLPOOL 41ad5634085988d4dda3d189acf7b203bc5e8bfa1b2627b94766dde149c9ca1b2577be94ae38e1f341c40da86c5a72336fc1ae4d61bd148c62bb0154db998072
@@ -55,4 +56,5 @@ EBUILD netbeans-websvccommon-9999_p20160811.ebuild 2721 SHA256 7c6b58d731020f695
 EBUILD netbeans-websvccommon-9999_p20160812.ebuild 2721 SHA256 f53cfc56c4a1a2fc3d23a4905e939b35bc2f3de333a6a524fc6c345fd1140248 SHA512 ac2af3f63c56049f68e644668c9cdaf1afcbd15ed569ff3456da1dab0480b158fbe9e1dfec2eb2a2155d9851af44c513fc8b0fbab0cb909658fb2dad426d1117 WHIRLPOOL edb17270f4612d7127074b408f188ca2e069e0bfa4849f79fc54c4de27beb27fb3f88bad174873d26eea5aa1ca51a6d66a2fe0b688e4b569c68872a4069af409
 EBUILD netbeans-websvccommon-9999_p20160814.ebuild 2721 SHA256 d5d7042841c06508f248d2cc59d75b527e825653d31b7502da4cc9e9a7a488a8 SHA512 1b33fdb927b4d66b84ae727b417764ea12172f1450f33f08835cbb1365cedeaede13d0d2adee8c17aeb21afce3578b1f0b99d69156a613db0268bb7a5d63127c WHIRLPOOL d028d9890740660dd851ae54775a3f0134efa958b4df1e144a01c95e1ae25ac713683ae3e91aee1fbe87a7a0a05003bada6198736d0a50c1272d68bebeba8ae0
 EBUILD netbeans-websvccommon-9999_p20160815.ebuild 2721 SHA256 3e7f9ca2bc7cf2c3c35f3b89fa2889b77efd9213f5291293b4bd7df85d062d7b SHA512 8c405b61832551bb73ad21d2c3768077002dccee8cd8fb1bff7e8f2a1d9c7a92abe7db9941b3e4eab112b97119cf1d18ba07cbce924f3917ec4353c61d53878d WHIRLPOOL 9781c597f3cc4336e41f1e4becc8b76290c9633c17c90c8a68bc965ce6e7d5bb51215a38773d3a48ec7c7f10f0908ed3a5a316f99ee2cde17dad70cbf2de6701
+EBUILD netbeans-websvccommon-9999_p20160816.ebuild 2721 SHA256 c823084e70e6fd4f406af378ba45a89352649b5db523cff737baf2c4340e0720 SHA512 6ad7bfeaedad8b3df5d27a38bf9b94e8e47ae801346e62e58aff1affac2617054173e44abc7c3b18289cd4613d23fc1a2b33c524e4c96d992b53e33f2915c4e5 WHIRLPOOL d9974fe1eb9aa57b3a4b031aff3e597f069687dddd5787c9070ab384da242d5052044048dcdc7721037aed97dff704ad15398a3efa1874e6065cfaff77190dc4
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160816.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160816.ebuild
new file mode 100644
index 0000000..802e3f5
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160816.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-16_00-02-33/zip/netbeans-trunk-nightly-201608160002-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 6c6c9b1..90aff92 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201608110002-src.zip 217074142 SHA256 1017ce540b38dc
 DIST netbeans-trunk-nightly-201608120002-src.zip 217080929 SHA256 b8ef1d20faf0485e85cf44ba6ea77282d130efeeafd7caf58d1ae3a33bb5ee01 SHA512 eec5a8165446247e28fd9ecda21017c7d877f8199326565f4750e3631e5f58c66c60424b906782ebcd34e5e58e5810ed60399d3efc01877663821360538b798c WHIRLPOOL 6eae8a97f579b3e009b9ddec46cca6de1033591ecdbb962258d3c929f6768f49ebae96fb1013392d80a912271942d14f31920ccf3e3b69a732eea4313dc8558b
 DIST netbeans-trunk-nightly-201608140002-src.zip 217088384 SHA256 fe3aec6996f578f851f523bc169098f964c74412070b16a030ecf2ca816f72b6 SHA512 2342388288d6e11c7093abb7f5cd3b88fd7c7e8ae8a14fc7ce1becdcf5c24d1ce8d09f88c599cccbfe3d9837e21b4c459489a3dec46280682d378500d335a802 WHIRLPOOL 9ad8bd5bc9f4b00ccff17bcde21c3faa34f0aea05ff249dd8d3fc89d105073159f4a764733461f23e2608fedbd007bcd20d9e429ede3ee73f23ee799bbf654de
 DIST netbeans-trunk-nightly-201608150002-src.zip 217088384 SHA256 95ecd71a591cbb135e15157d06f7612df107f015e24ffe47338bda0a55523091 SHA512 8ff5ffdbcd89a305e0372049b1e4ed76076390f0e621fe66c867417a665d13d4b86ea09e9a55cd4a6cf162bc4e23b2dd0aaba2744abf7b205a2af8f60179e2a0 WHIRLPOOL dce14f26c47857482db487bc9d8c2fd51268021e8ecf770a77fbb3fae4576b74e86c7c4af695e8fe1dbdab6231ea962ac632d0edca9abb491656069bfcc71540
+DIST netbeans-trunk-nightly-201608160002-src.zip 217153721 SHA256 f7f0624027293b4eb18b02c6e83678b76f9161ae7790431e5cdf0a67c81067bf SHA512 004bbbafc97c8c155429d12c37e05d1737d5e5d7a5c1d77df1e120481c1f59f2535fd93efda3588aab85e8eef404cbae74ee01469b771226912ab876a23420dd WHIRLPOOL bd19581fb56c256dbf59dcc1fb7db4a11f0e8dc632763d55966f63f4bdc107645862c8ec51a8db231b462dafeb586f680f3de9ffe5af4a6c398dd4c30e880352
 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_p20160707.ebuild 6939 SHA256 793f95e860b5635b9a5b62020fc6582fa077ed8196126df735ea5841e582a327 SHA512 3f0bb46bc7ba3f966d4bfc706f5481c993de12b565b7c5df1eefe6f474a044c24be21704c81bbede8a8399e86b7a7cbdf8d29eae6852a80653910b1a2feb0192 WHIRLPOOL dcf1b84d1035bc53e6d967116af595a2887a1f65ce572ee65d01dd82e5146787d69743930368ed85ba39d542f7e6d9f2199c3f1e0d5e812614de2e4bc5fa5d5d
@@ -58,4 +59,5 @@ EBUILD netbeans-9999_p20160811.ebuild 6939 SHA256 3012f2bfb7a5e92b633ab00220b8a9
 EBUILD netbeans-9999_p20160812.ebuild 6939 SHA256 44ab0dd398a78be93d09b2ca6277c10922d8736203eca566658f52c761ae0267 SHA512 85736b3d80fb137bbc0b3c57e5e7f949d3595e2a8ea59856e340c7af04a6828a53ba32adc4c9f334ce6f3e20e3c69409e310e1771b22b372c388a02bea866fec WHIRLPOOL 2515cf14c99ae8d1610c932b2ec7695f28dc7bc3bc5e51e64f8efc2e606e3448321646b4c51fb5e3d46a5ecc47f1ed09c275d7b1c290de13e6efff4da0272319
 EBUILD netbeans-9999_p20160814.ebuild 6939 SHA256 7b607679b67237e627a9bf240b58d4338874d7bf18807a2a403ada96b0b27049 SHA512 1d3f756017f25226757e25c18bc270f2678e457ba98e5696304ab5be97160d13589b523afdcdbf0cd5f3aeee40f4871219563ffbceb51a5d82ccd6be826a0874 WHIRLPOOL e1fec146ec7dd5d46907c13158e491c2caee1b9ed1dd85ff60ae3c25e15f8bdd6f9f22d4030cc237567d01a4422f8188b2bfdb2f3e79accc13667be718086370
 EBUILD netbeans-9999_p20160815.ebuild 6939 SHA256 833d7d07b0341cd9594291fb2a60485db106d05d932d5c7d380821e68f513850 SHA512 8cf5cb63d0fb4d92819666c45d7dda3eed768487592490299d3a0c5ebb570bf4b5cff5e31f447e5889544f4e101352daf9a01cc7f2d81f608fdd97aae7f06ab5 WHIRLPOOL 6dea2ce229f703ed5703d60254c2dd581f88b74813ad595627d34cc4958a37f7b4023e6ac97211d1fe1bb978a9a52eb3b34f12ee1f1c667eed4ecbbd4e77e623
+EBUILD netbeans-9999_p20160816.ebuild 6939 SHA256 5a55d50ad50aa424194248f8d253031058365ac9625f9f84d5a9f9aa79f236a9 SHA512 bfeb71cb42693ed1346677d5634cc86041ac9b183a1ac766b3758ea0841a97d8695c0ebaf94c2f556848f3901a2db5a01dfcaae91885e9e672ce671eada5fcb9 WHIRLPOOL f871c5984fb5499297e8684120dcfe987c373932903a7be69fd05c15ed3973c84d05716c6a824fd9205d3a0629024077816b713f9d86fe106a38e12213270f66
 MISC metadata.xml 329 SHA256 8aeaf2a0228f15c2e4140f401b30f083509bd99d0a578873069f3595cd8555f3 SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640 WHIRLPOOL 799a9b79b1b447bda9631f67e2dfaf722376740e1d2037796528a05f9745eeed00d9990a74a65ce09f74bc5e1d60a887abde540c3c62487d7dd49b8377c15834

diff --git a/dev-util/netbeans/netbeans-9999_p20160816.ebuild b/dev-util/netbeans/netbeans-9999_p20160816.ebuild
new file mode 100644
index 0000000..a4305b4
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20160816.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-16_00-02-33/zip/netbeans-trunk-nightly-201608160002-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-16  7:28 UTC | newest]

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

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