[gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-cnd/, dev-java/netbeans-extide/, 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-cnd/, dev-java/netbeans-extide/, dev-java/netbeans-nb/, ...
@ 2016-08-12  9:06 Miroslav Šulc
  0 siblings, 0 replies; only message in thread
From: Miroslav Šulc @ 2016-08-12  9:06 UTC (permalink / raw
  To: gentoo-commits

commit:     34ce4c41cf952d16847120c5bc4ee48efc7795fd
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 12 09:05:44 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Aug 12 09:05:44 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=34ce4c41

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.3.0

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 3d2d5cf..8b1b10a 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c8519
 DIST netbeans-trunk-nightly-201608090002-src.zip 217056261 SHA256 f0a275e932b5948c00e24beae1eb599f8c0912fa905997b1ef7b11345fddf60c SHA512 81761482cbd5e238e1c2597a4b9bcc506b32c296e4d6c0785fa8fe69e1d1a6ddc9f4a7f6dcdb8ed816f366fb840e01a5d8003cf289bb1735be74f9906d6c7575 WHIRLPOOL 903eb7d99f8fecafca4f3a06a567a5994f0602431d29c74df1a300785b62f205e1257c1c4158cb2f7706a6c8bf70c7e3b7d7e6503a96bcaefb7411be0d701f70
 DIST netbeans-trunk-nightly-201608100002-src.zip 217066650 SHA256 35d4ea867e7626174a9b82264002f9aacfc3807ea14745d3548281f406c1ea84 SHA512 30b65ff7914a454995a5a6d022657cbc1256ab050ef6a1d217f7cdb2a5b054ab656cff966045184ade5c137d5400121e67800b5f1b4f0f2babf7d938c2d5d072 WHIRLPOOL 6e994f402b7d58ce68fb611d81daec1304a4c9400b9a785679b50ee6d3bb535bfbc35f374582b87a2ed08225b2112dcf91b8fa1148ffa097867bcbb7637583fe
 DIST netbeans-trunk-nightly-201608110002-src.zip 217074142 SHA256 1017ce540b38dcf7a1e6080e49e975255bfd4db72294c82e05ab67aafb92f407 SHA512 d6015ec2da1f2857457f36e1bcec5dd0e495265763f607ecdf0343fa34c52fee55f7fa31f8ed49c6595d370719fdf7c3d50e7bd9eedfe4fb5d1f73807bd20db9 WHIRLPOOL f59e8bbdca914e0732b37b21f1a8a76466bc095c1b18d5a5e1a785430fbe6713f1e9fe276f458c00f9df7253e3d5a8981dba1e8049e9f8924910031cd6e576c0
+DIST netbeans-trunk-nightly-201608120002-src.zip 217080929 SHA256 b8ef1d20faf0485e85cf44ba6ea77282d130efeeafd7caf58d1ae3a33bb5ee01 SHA512 eec5a8165446247e28fd9ecda21017c7d877f8199326565f4750e3631e5f58c66c60424b906782ebcd34e5e58e5810ed60399d3efc01877663821360538b798c WHIRLPOOL 6eae8a97f579b3e009b9ddec46cca6de1033591ecdbb962258d3c929f6768f49ebae96fb1013392d80a912271942d14f31920ccf3e3b69a732eea4313dc8558b
 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_p20160704.ebuild 3384 SHA256 951ab1c28c6b76a5d18cfd1b50bbb1771fe21d594464a28a1c029fc4c99ed4bc SHA512 fa8a3098a038f03709a0f3919b9ae60c73336198def27515643a2345e215c180531f984a47183959ff7f6998529fa12a8ed0570972da633979547ad35ed7d421 WHIRLPOOL 36398dc5715a9ed007b5a76193989a54a5bacd24c6f1f69668d3c17c0fcfb46869b0430049fa472665c69522d16beb2fee06d400166cb10c443ba0b9a5ec5398
@@ -55,4 +56,5 @@ EBUILD netbeans-apisupport-9999_p20160805.ebuild 3384 SHA256 3f5da5b7d0f77b1df1f
 EBUILD netbeans-apisupport-9999_p20160809.ebuild 3384 SHA256 9d7f86575797bdab5e9ef47550df786fc94f8582cb24cdb15015d679b21a1623 SHA512 05d842a5f9bacb4717c1c1e7bfc46d3a38e376b4d82c4454f301f3a44a127a57c6194dc39e7698b2e8059c27fca3c74b9ed4fde25c4e9a6f94192247094d4f68 WHIRLPOOL 8e6e9545fb98ea88baf8ce6296216ddd1a1bb1f2bd6310e7bceb81c94551a64574e930fa985a4f4baa1dc774570b2a9f30ed521c3d6ab626733fab474f9007c1
 EBUILD netbeans-apisupport-9999_p20160810.ebuild 3384 SHA256 c96f93c027531ca90fa836b7cb98c8da0eb0c6596da2e9a1d632df318b754da7 SHA512 4af39da27d86e3ca7bfd1485712c6e62233cf9e62e63de2248f7c50a1bd7ca9c1368d1b577b4ebfc5a5acafaf4673cad850127878a6c6fc35b8b6520fb2a5e24 WHIRLPOOL d69578cbbf28592055c54ebe17d8231431bae61b37b1a726c87718cd22c5486104a8cdbe53b814b5109f3e411ab4b1aaa4b90cac2ab2a8d5cffe03ee9e82b2b6
 EBUILD netbeans-apisupport-9999_p20160811.ebuild 3384 SHA256 3e5d02444c1a378f1de9437ce1b2fda43e1d8c9c157e6f90c4dd3f4787f1f039 SHA512 a3622247bd36846ea87a5fab7d78e5a95ac8389b25750869283401259781db37f1c9b7b71f3c2ad00ecad79cc3c7856a828b0b74da297ddd0978cf42e65626df WHIRLPOOL 556099d9f65df0fff7dbd362b8145bcbbb73bdf494f9157d81db81cd086dd0fa930b50e3e5f5b4c9dea802fd2874ceceea95e6752e6a10f2db2c6ae6db564809
+EBUILD netbeans-apisupport-9999_p20160812.ebuild 3384 SHA256 14481c927f61bdd58f448c4de154398e370f4e625e99b58af51a6e3693764675 SHA512 36bb743914d5a0b2b112dcfd14702bb2a197f0f82241db21846364846e41083b118d45bf53deeb5e3b92e770c5faaa742d533b921186277af51c65ac62904716 WHIRLPOOL 92873dc9419329d20af8c6edc4fd27691cb6e4f5095d900e720fdc32fd4b53ccb13f9fa431e60206512ca34c1ce9dfe2a6408fc858f23aa2a55d2f21046bc3e7
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160812.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160812.ebuild
new file mode 100644
index 0000000..1ba949a
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160812.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-12_00-02-33/zip/netbeans-trunk-nightly-201608120002-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 da605d8..47a42ea 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -40,6 +40,7 @@ DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c8519
 DIST netbeans-trunk-nightly-201608090002-src.zip 217056261 SHA256 f0a275e932b5948c00e24beae1eb599f8c0912fa905997b1ef7b11345fddf60c SHA512 81761482cbd5e238e1c2597a4b9bcc506b32c296e4d6c0785fa8fe69e1d1a6ddc9f4a7f6dcdb8ed816f366fb840e01a5d8003cf289bb1735be74f9906d6c7575 WHIRLPOOL 903eb7d99f8fecafca4f3a06a567a5994f0602431d29c74df1a300785b62f205e1257c1c4158cb2f7706a6c8bf70c7e3b7d7e6503a96bcaefb7411be0d701f70
 DIST netbeans-trunk-nightly-201608100002-src.zip 217066650 SHA256 35d4ea867e7626174a9b82264002f9aacfc3807ea14745d3548281f406c1ea84 SHA512 30b65ff7914a454995a5a6d022657cbc1256ab050ef6a1d217f7cdb2a5b054ab656cff966045184ade5c137d5400121e67800b5f1b4f0f2babf7d938c2d5d072 WHIRLPOOL 6e994f402b7d58ce68fb611d81daec1304a4c9400b9a785679b50ee6d3bb535bfbc35f374582b87a2ed08225b2112dcf91b8fa1148ffa097867bcbb7637583fe
 DIST netbeans-trunk-nightly-201608110002-src.zip 217074142 SHA256 1017ce540b38dcf7a1e6080e49e975255bfd4db72294c82e05ab67aafb92f407 SHA512 d6015ec2da1f2857457f36e1bcec5dd0e495265763f607ecdf0343fa34c52fee55f7fa31f8ed49c6595d370719fdf7c3d50e7bd9eedfe4fb5d1f73807bd20db9 WHIRLPOOL f59e8bbdca914e0732b37b21f1a8a76466bc095c1b18d5a5e1a785430fbe6713f1e9fe276f458c00f9df7253e3d5a8981dba1e8049e9f8924910031cd6e576c0
+DIST netbeans-trunk-nightly-201608120002-src.zip 217080929 SHA256 b8ef1d20faf0485e85cf44ba6ea77282d130efeeafd7caf58d1ae3a33bb5ee01 SHA512 eec5a8165446247e28fd9ecda21017c7d877f8199326565f4750e3631e5f58c66c60424b906782ebcd34e5e58e5810ed60399d3efc01877663821360538b798c WHIRLPOOL 6eae8a97f579b3e009b9ddec46cca6de1033591ecdbb962258d3c929f6768f49ebae96fb1013392d80a912271942d14f31920ccf3e3b69a732eea4313dc8558b
 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_p20160704.ebuild 4790 SHA256 ee2e074ab100f5cdbbf9581ae6eff719f119d4685071eeeeee56f43e9d08398d SHA512 8e7908f351f3bb750cddc471670d18cc54bedec4592b1f18568b098f9b47b1970b6b7dd7751f5fac013a413ceb19ca139daa3c5222a2119196091add96436352 WHIRLPOOL 3a9bf321a4b34dac9e6584bb1485091f17255e6fadb78ab8576797ccbc13290d5b0967af2ed519a242e8794b2aba0e909916e5ea91fe84d3bd3b9392614807a2
@@ -67,4 +68,5 @@ EBUILD netbeans-cnd-9999_p20160805.ebuild 4790 SHA256 e86abcabd7bf93bd5368f7a355
 EBUILD netbeans-cnd-9999_p20160809.ebuild 4790 SHA256 f683f40acf8c74e290d7db666eff24b79c81393e5d5513e545a2a3d3c15219f9 SHA512 07da221c809e2e0adfec30a13b88274b1b799deeb28bc6fb299f8b634707c0f37eeb71537b58a2183d1ed17b1171278e0b45476bc5a3ba8e05f694aed94af3be WHIRLPOOL fbd1464a83ac991c618206141a13a3edd1af130146f9dabd52d0e73dd275f54b5f01011abd1560cba2565a9ebb88c05b2e4c699ac177cbcc52a9d2f349917ec4
 EBUILD netbeans-cnd-9999_p20160810.ebuild 4790 SHA256 32920b60d0473593e3e2333ba7520a831b095633a17c999194f14d8a66e0543b SHA512 7e1b813e083a85ce3bdb733cd224ee6bae7f6cb2665934cb4e2dd2ec6931e80147147607f4f2c6f0c846cf0301ff4e05ded13e58c30268e995253ac12a47ee30 WHIRLPOOL f831a9bb9addd68fbb2aea61a2a7e76049b9a11bb0af4246406f2d5a176b30bc26fd076f59fded6421232865ac526ab00dfe86acf7784b28472e687a732428e2
 EBUILD netbeans-cnd-9999_p20160811.ebuild 4790 SHA256 28216d2fef26e1583d7a2c7657813d1084d43ae67bcd6c87d18a9dfda82016f0 SHA512 8cd4c0fdac6ce81396cd160b0cd27fdc8ee98f66862cc4e46211d999677f40094221ae16402bfa25d3b66562af65df6ef346fa756653e95df56e1231609f37a2 WHIRLPOOL 332c737e0c83ba4c819daf86da35df3666e6d39e63d8666892675d280abbb61ca658d0dd5685997978cda2bc4494f65f7b0e03eb26eb070b02d37710cc79fbe3
+EBUILD netbeans-cnd-9999_p20160812.ebuild 4790 SHA256 7e16ac50211e32277d3a753c4d4341ec9b327f4897b9cf83bc18f7f5ae412f4c SHA512 8a1285cabb0acb80e6d13cbcd6fb10137435d717f5a437e8bf73f01f2d16d3fa69e271c5b8ea81c241d984b4463837ed6211e2219d7f4bb4b67acd2cb72e3413 WHIRLPOOL a25d4d2e09ee3b64b412a3a39bf3e98d2ec7eaa00a6660dbbf275fe03a341cd92b4d87815952b664e71dc66230d56adfaf59b4b195feff6c7464913df9c5085f
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160812.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160812.ebuild
new file mode 100644
index 0000000..7d421e4
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160812.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-12_00-02-33/zip/netbeans-trunk-nightly-201608120002-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 59496af..57f411b 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c8519
 DIST netbeans-trunk-nightly-201608090002-src.zip 217056261 SHA256 f0a275e932b5948c00e24beae1eb599f8c0912fa905997b1ef7b11345fddf60c SHA512 81761482cbd5e238e1c2597a4b9bcc506b32c296e4d6c0785fa8fe69e1d1a6ddc9f4a7f6dcdb8ed816f366fb840e01a5d8003cf289bb1735be74f9906d6c7575 WHIRLPOOL 903eb7d99f8fecafca4f3a06a567a5994f0602431d29c74df1a300785b62f205e1257c1c4158cb2f7706a6c8bf70c7e3b7d7e6503a96bcaefb7411be0d701f70
 DIST netbeans-trunk-nightly-201608100002-src.zip 217066650 SHA256 35d4ea867e7626174a9b82264002f9aacfc3807ea14745d3548281f406c1ea84 SHA512 30b65ff7914a454995a5a6d022657cbc1256ab050ef6a1d217f7cdb2a5b054ab656cff966045184ade5c137d5400121e67800b5f1b4f0f2babf7d938c2d5d072 WHIRLPOOL 6e994f402b7d58ce68fb611d81daec1304a4c9400b9a785679b50ee6d3bb535bfbc35f374582b87a2ed08225b2112dcf91b8fa1148ffa097867bcbb7637583fe
 DIST netbeans-trunk-nightly-201608110002-src.zip 217074142 SHA256 1017ce540b38dcf7a1e6080e49e975255bfd4db72294c82e05ab67aafb92f407 SHA512 d6015ec2da1f2857457f36e1bcec5dd0e495265763f607ecdf0343fa34c52fee55f7fa31f8ed49c6595d370719fdf7c3d50e7bd9eedfe4fb5d1f73807bd20db9 WHIRLPOOL f59e8bbdca914e0732b37b21f1a8a76466bc095c1b18d5a5e1a785430fbe6713f1e9fe276f458c00f9df7253e3d5a8981dba1e8049e9f8924910031cd6e576c0
+DIST netbeans-trunk-nightly-201608120002-src.zip 217080929 SHA256 b8ef1d20faf0485e85cf44ba6ea77282d130efeeafd7caf58d1ae3a33bb5ee01 SHA512 eec5a8165446247e28fd9ecda21017c7d877f8199326565f4750e3631e5f58c66c60424b906782ebcd34e5e58e5810ed60399d3efc01877663821360538b798c WHIRLPOOL 6eae8a97f579b3e009b9ddec46cca6de1033591ecdbb962258d3c929f6768f49ebae96fb1013392d80a912271942d14f31920ccf3e3b69a732eea4313dc8558b
 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_p20160704.ebuild 2968 SHA256 b69ef07eb1aac09251cca079445d47a644e78a035f30ce084995c352619c14c4 SHA512 944dd7a7aa278a6657fe7783b7800d37286b07f8eb4f42253565dcb9ce41257fc3178b606b5687b00815f80252afd6cf86f936f7653d4b0ef9602bc60d2ed44b WHIRLPOOL 9625e043c7547f9d5d9add96ac797b25767e4e73c4fbdea423af8418b0a82670a0d5651fbcb26ff087febd9b360e2155ad5894cd4c5894f97e981d491ed80756
@@ -58,4 +59,5 @@ EBUILD netbeans-dlight-9999_p20160805.ebuild 2968 SHA256 65a63164a7a9335bf7e2b35
 EBUILD netbeans-dlight-9999_p20160809.ebuild 2968 SHA256 7f9f63fc29ed563678c5ea9bccf0342b306105a878137a45c216a5005a33233a SHA512 93b53e272f359f7f137e88d7da9896f070a6719954395f6d2bd42c330c9242eeaf9d956739e241cf92d4ad50e9d7aff1c0e276d411cb65dd77e950abdc136993 WHIRLPOOL 574b4774580825c565d2028ca552c0b2700c4ac8aeef6fcf53a9fd8b16ed9f65cb5a2ad9d477a535492d6ea3caf151a24ba80b59a82fc9197c9b086382170c7d
 EBUILD netbeans-dlight-9999_p20160810.ebuild 2968 SHA256 4be39c2451f4a8834aae0b265d4af3ae07a4dcffa45e1ca6a496d8b06460d81e SHA512 7c1761aff6b01da9fe0c8971bab18141b091a13e1b9b59fd302fcc9299c8213cac6acbb8386032cdbe044ee6d71662864c7c0dd30c6c1eee99a6a1eeaf389aff WHIRLPOOL 9eb3e6fb7c3081dece27b7fe00ae8354cc834f0f3c54a172e9816b53adee2d456b4eb3c914d411f1abb9f1e3acf085d3f24377585886bcc7db51f62681677415
 EBUILD netbeans-dlight-9999_p20160811.ebuild 2968 SHA256 e11c15f124b5bc01f1a01f0e0f33c27bb70729f75156e5234a80a971993c9b84 SHA512 bdf63a978734992b7717ec7d9b93b35bab0081f2bbf44c539326af89a8eabd63f60cb4725921610002d4c984cee31968f0c10bf77498975f52468ba80b0aeddf WHIRLPOOL 4485776cd2097779f73272e39d417d21e4925f12eb1e945a0838ce46e224d3299dd54fd6630ece6b8a6b5617806b4c29cbc6efad75aa22f7db871fe5645b8600
+EBUILD netbeans-dlight-9999_p20160812.ebuild 2968 SHA256 6326fa2950fb261835e2e476b5eeef8a562e58be7d1308814382aae6b6ba82e9 SHA512 203426cb958549b82861a202ac46cc4bc896366b9e525659df1402e6ca745d2de927239ef8587ade1a33443016e5a698557176f60b8726a5da75921f4c75087d WHIRLPOOL 50ecbe3e04c1b0fdd2acbf30d5af971683609a653c5fec69e8126c5a974ae1586537e74838f1420e492ee1e6c746231482ab31444ddbcfcd99ed43105e7b190a
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160812.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160812.ebuild
new file mode 100644
index 0000000..205f2eb
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160812.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-12_00-02-33/zip/netbeans-trunk-nightly-201608120002-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 d131c40..c751064 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -60,6 +60,7 @@ DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c8519
 DIST netbeans-trunk-nightly-201608090002-src.zip 217056261 SHA256 f0a275e932b5948c00e24beae1eb599f8c0912fa905997b1ef7b11345fddf60c SHA512 81761482cbd5e238e1c2597a4b9bcc506b32c296e4d6c0785fa8fe69e1d1a6ddc9f4a7f6dcdb8ed816f366fb840e01a5d8003cf289bb1735be74f9906d6c7575 WHIRLPOOL 903eb7d99f8fecafca4f3a06a567a5994f0602431d29c74df1a300785b62f205e1257c1c4158cb2f7706a6c8bf70c7e3b7d7e6503a96bcaefb7411be0d701f70
 DIST netbeans-trunk-nightly-201608100002-src.zip 217066650 SHA256 35d4ea867e7626174a9b82264002f9aacfc3807ea14745d3548281f406c1ea84 SHA512 30b65ff7914a454995a5a6d022657cbc1256ab050ef6a1d217f7cdb2a5b054ab656cff966045184ade5c137d5400121e67800b5f1b4f0f2babf7d938c2d5d072 WHIRLPOOL 6e994f402b7d58ce68fb611d81daec1304a4c9400b9a785679b50ee6d3bb535bfbc35f374582b87a2ed08225b2112dcf91b8fa1148ffa097867bcbb7637583fe
 DIST netbeans-trunk-nightly-201608110002-src.zip 217074142 SHA256 1017ce540b38dcf7a1e6080e49e975255bfd4db72294c82e05ab67aafb92f407 SHA512 d6015ec2da1f2857457f36e1bcec5dd0e495265763f607ecdf0343fa34c52fee55f7fa31f8ed49c6595d370719fdf7c3d50e7bd9eedfe4fb5d1f73807bd20db9 WHIRLPOOL f59e8bbdca914e0732b37b21f1a8a76466bc095c1b18d5a5e1a785430fbe6713f1e9fe276f458c00f9df7253e3d5a8981dba1e8049e9f8924910031cd6e576c0
+DIST netbeans-trunk-nightly-201608120002-src.zip 217080929 SHA256 b8ef1d20faf0485e85cf44ba6ea77282d130efeeafd7caf58d1ae3a33bb5ee01 SHA512 eec5a8165446247e28fd9ecda21017c7d877f8199326565f4750e3631e5f58c66c60424b906782ebcd34e5e58e5810ed60399d3efc01877663821360538b798c WHIRLPOOL 6eae8a97f579b3e009b9ddec46cca6de1033591ecdbb962258d3c929f6768f49ebae96fb1013392d80a912271942d14f31920ccf3e3b69a732eea4313dc8558b
 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_p20160704.ebuild 15825 SHA256 46d7aab48f8a7b87117fa6f4fa2200c2861caf900e9a7a6921ebaf26dcca9160 SHA512 3dc8fa6c55c1bf6b44211445ed1825a08c7359ab50738f4251e8ac731430c589563893344473c2f9b28d521b2426a0bb760ec6228400c757f8a85f8a46b53758 WHIRLPOOL 4908e88bd3626eff5a1ad17300d7cfc36bb1e7d260c4025c379f2738dc9f78a3fa37d1001273cefc4ae248dd2be4a74b90a9de54ccbedf38bb2ec9acc6afd903
@@ -87,4 +88,5 @@ EBUILD netbeans-enterprise-9999_p20160805.ebuild 15825 SHA256 10da3ae881c0b78042
 EBUILD netbeans-enterprise-9999_p20160809.ebuild 15825 SHA256 3e6bfb1e8d2316047ac43e3ead0cbfbe2e0f320979ecc37fb58812d034b130ac SHA512 f24751a2f5dc8a6079cb2acb3bf627614c260a44ee33fd179243e18feaaac8460cd2faa5f2efefe43de41e12d22f647d7b6c4a4376f368d2676e637e2ae3221f WHIRLPOOL f523a7249d8634f4a8763d59c9d5635c13bea9ac3e73d8efdd912a6b55d2a06548f32e445f863fcf2b50c3ff3fa720783e8ec1cb2e094b35160c105668ec5aae
 EBUILD netbeans-enterprise-9999_p20160810.ebuild 15825 SHA256 b2df82439b685ef1071a7e6a221d6d45272fbb7057527843b1d3c3aece7fe3be SHA512 215a517c26216a60e3855143e34892afb8bb3e497b8ec00a32c10d425c015a3e60e5c5d2ed8e33a9ee8f704eef9990cd6db9efd3f0dac9864d293176496af36c WHIRLPOOL 3ee60409163fcccc81582465dc00690f48341b60a6e04f42591ac7925642e417a39f92fe17e8af4d6b63b294d3f9df6cc35bb7c72b9897c892276f85adfc72ed
 EBUILD netbeans-enterprise-9999_p20160811.ebuild 15825 SHA256 fd5e785fa9a47b328e794053b795431b6e715836a3c331e1b3d9243193cdb23d SHA512 68674339fe0e38ad82e0bc125916b010a82ca797ea993fd9a8172671231eecbfcd48dfd8f7edc209f6ce1a684c08ea3a0bfc6eba077f3f25f176cb8869a1e0ff WHIRLPOOL 7d7aa0fa352cff9299e231fc9764a438b15f2ff21c98f374020b31eae9d91e5bf44d6c47ef448fd98e5fb945debd294abe3e4048b1df0b2b1fa3afd5f086b1d8
+EBUILD netbeans-enterprise-9999_p20160812.ebuild 15825 SHA256 3745d0bc3f87ac76a29617366e73e4b92d699dcaabe50593db062ffa3f9fd4e9 SHA512 6d7c3c97af50720c733e44843ec0274f7ff9635229e1c136d1ed457dc52fb3b1bdbba37b70ecaf6d0c7e4b141661ceef1061759ab3d71a1bfb513918cda5ebd9 WHIRLPOOL 73917819d4e9e2954f082a45eda4cbdd6cfafb646d6800a8a9bb0544b7a8df2e51359cc7ddaa60a731571a770ed19f741ce5aa860f43fc972dfddb5843c1f714
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160812.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160812.ebuild
new file mode 100644
index 0000000..bd35441
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160812.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-12_00-02-33/zip/netbeans-trunk-nightly-201608120002-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 0dc99ad..7c389d5 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c8519
 DIST netbeans-trunk-nightly-201608090002-src.zip 217056261 SHA256 f0a275e932b5948c00e24beae1eb599f8c0912fa905997b1ef7b11345fddf60c SHA512 81761482cbd5e238e1c2597a4b9bcc506b32c296e4d6c0785fa8fe69e1d1a6ddc9f4a7f6dcdb8ed816f366fb840e01a5d8003cf289bb1735be74f9906d6c7575 WHIRLPOOL 903eb7d99f8fecafca4f3a06a567a5994f0602431d29c74df1a300785b62f205e1257c1c4158cb2f7706a6c8bf70c7e3b7d7e6503a96bcaefb7411be0d701f70
 DIST netbeans-trunk-nightly-201608100002-src.zip 217066650 SHA256 35d4ea867e7626174a9b82264002f9aacfc3807ea14745d3548281f406c1ea84 SHA512 30b65ff7914a454995a5a6d022657cbc1256ab050ef6a1d217f7cdb2a5b054ab656cff966045184ade5c137d5400121e67800b5f1b4f0f2babf7d938c2d5d072 WHIRLPOOL 6e994f402b7d58ce68fb611d81daec1304a4c9400b9a785679b50ee6d3bb535bfbc35f374582b87a2ed08225b2112dcf91b8fa1148ffa097867bcbb7637583fe
 DIST netbeans-trunk-nightly-201608110002-src.zip 217074142 SHA256 1017ce540b38dcf7a1e6080e49e975255bfd4db72294c82e05ab67aafb92f407 SHA512 d6015ec2da1f2857457f36e1bcec5dd0e495265763f607ecdf0343fa34c52fee55f7fa31f8ed49c6595d370719fdf7c3d50e7bd9eedfe4fb5d1f73807bd20db9 WHIRLPOOL f59e8bbdca914e0732b37b21f1a8a76466bc095c1b18d5a5e1a785430fbe6713f1e9fe276f458c00f9df7253e3d5a8981dba1e8049e9f8924910031cd6e576c0
+DIST netbeans-trunk-nightly-201608120002-src.zip 217080929 SHA256 b8ef1d20faf0485e85cf44ba6ea77282d130efeeafd7caf58d1ae3a33bb5ee01 SHA512 eec5a8165446247e28fd9ecda21017c7d877f8199326565f4750e3631e5f58c66c60424b906782ebcd34e5e58e5810ed60399d3efc01877663821360538b798c WHIRLPOOL 6eae8a97f579b3e009b9ddec46cca6de1033591ecdbb962258d3c929f6768f49ebae96fb1013392d80a912271942d14f31920ccf3e3b69a732eea4313dc8558b
 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_p20160704.ebuild 2913 SHA256 e5ded9a6fbbeaa0c1a641401c9e8f3420e2e837455178eedd5e5a2ed9416d169 SHA512 e3bd8a5677d7406bd9d059c068d93aeeadd217b62af32817d70517f7931c8e1a2a47abd59099519dc71353cbdf9e029ab731382c2b5643b9f3562de81fea1a4d WHIRLPOOL 7a6fdcaeac3cfea9ebc6952d49513159028d3c939cb8112132e7f25572b75d639921272798608ce109666e186405d33d16c6cf3af51407e6002ded0f50ae2df9
@@ -55,4 +56,5 @@ EBUILD netbeans-ergonomics-9999_p20160805.ebuild 2913 SHA256 5e6027dbc32197697cf
 EBUILD netbeans-ergonomics-9999_p20160809.ebuild 2913 SHA256 c92e2ff4b194e526bdf5308bf24e70a4027054634cdbc0c8b12445dd63a30e7a SHA512 d85fb971e7089c48f7d481458c0b274b6c69a552523aa1190546e5d1b9e44b91e229641d289b00126a299733bb9dcba74f70af0aad8170dd0a21f2a93e8599d9 WHIRLPOOL 0f8f39654e28a39fb16c6c00f0240eacf30a2c5ab2956344a0b4709b4fb0446727d4acb25f257fc2db7ab25979f2934efe2ebf1d723062816b02f476433f73c3
 EBUILD netbeans-ergonomics-9999_p20160810.ebuild 2913 SHA256 c9ca71d7b77d25f3af16d9df03c2538febf63b88f5868bb3a2606e189f12c3f5 SHA512 c3a2b8caec00b0505e94fc60d56be03f816c319f3a142f88b4e9b65a507bdafd4e4dcdbf57a6bb9d3b1960df1581d07a3732f608014f415c21815e4be4852c71 WHIRLPOOL 3360d518a3e3ce9373d7ff145818a9a4bf5da50be08dfa27c275661c595fe68072cff6d316821428e3ab42f6e27fd88ad41d773a79bb0bcc0c6a435bf4cbfa1c
 EBUILD netbeans-ergonomics-9999_p20160811.ebuild 2913 SHA256 db55765b798b2dabd0be141201bf9fae3d3927148ac69fa0d5c33d46f3fc0e16 SHA512 f4be2fe85bcc3502228b9358bc61dea985117b0671f667df055f1bf80b22bcc3d5230c0585522db728536393f6551b60f81697177edd6f582ad8449fd13aa4a0 WHIRLPOOL d37de9defe17a263eac0d4807a98ebb00badab4f4d6607c51bd0dc6d8fe5aa8af1c85d3264c9e43fbf82c3b4f20ce5e91628f0e65a4792b9b579641f81202aac
+EBUILD netbeans-ergonomics-9999_p20160812.ebuild 2913 SHA256 4c9b4e4ee1fb8c690d91ff45c59d0e3b1f9355e7fe2c833419ba4ae33369ddec SHA512 8c03176d30a298db130a62ec673795d273cef70b4680a13f7c55ad3d653583731ca5b040880374f4effcb63e3d031de9a574c2a68ccdefeb196176cfc71c56b0 WHIRLPOOL 8ed651a8770685a2d63a1191f000e602877dbfde83d4622ab531add0c088f16ef5032f18bb20f239e6da0fd651b0c4101f654d1bb6c64e6533a00047aa30b3b1
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160812.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160812.ebuild
new file mode 100644
index 0000000..8e6ff94
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160812.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-12_00-02-33/zip/netbeans-trunk-nightly-201608120002-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 55473dd..86f64ce 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -32,6 +32,7 @@ DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c8519
 DIST netbeans-trunk-nightly-201608090002-src.zip 217056261 SHA256 f0a275e932b5948c00e24beae1eb599f8c0912fa905997b1ef7b11345fddf60c SHA512 81761482cbd5e238e1c2597a4b9bcc506b32c296e4d6c0785fa8fe69e1d1a6ddc9f4a7f6dcdb8ed816f366fb840e01a5d8003cf289bb1735be74f9906d6c7575 WHIRLPOOL 903eb7d99f8fecafca4f3a06a567a5994f0602431d29c74df1a300785b62f205e1257c1c4158cb2f7706a6c8bf70c7e3b7d7e6503a96bcaefb7411be0d701f70
 DIST netbeans-trunk-nightly-201608100002-src.zip 217066650 SHA256 35d4ea867e7626174a9b82264002f9aacfc3807ea14745d3548281f406c1ea84 SHA512 30b65ff7914a454995a5a6d022657cbc1256ab050ef6a1d217f7cdb2a5b054ab656cff966045184ade5c137d5400121e67800b5f1b4f0f2babf7d938c2d5d072 WHIRLPOOL 6e994f402b7d58ce68fb611d81daec1304a4c9400b9a785679b50ee6d3bb535bfbc35f374582b87a2ed08225b2112dcf91b8fa1148ffa097867bcbb7637583fe
 DIST netbeans-trunk-nightly-201608110002-src.zip 217074142 SHA256 1017ce540b38dcf7a1e6080e49e975255bfd4db72294c82e05ab67aafb92f407 SHA512 d6015ec2da1f2857457f36e1bcec5dd0e495265763f607ecdf0343fa34c52fee55f7fa31f8ed49c6595d370719fdf7c3d50e7bd9eedfe4fb5d1f73807bd20db9 WHIRLPOOL f59e8bbdca914e0732b37b21f1a8a76466bc095c1b18d5a5e1a785430fbe6713f1e9fe276f458c00f9df7253e3d5a8981dba1e8049e9f8924910031cd6e576c0
+DIST netbeans-trunk-nightly-201608120002-src.zip 217080929 SHA256 b8ef1d20faf0485e85cf44ba6ea77282d130efeeafd7caf58d1ae3a33bb5ee01 SHA512 eec5a8165446247e28fd9ecda21017c7d877f8199326565f4750e3631e5f58c66c60424b906782ebcd34e5e58e5810ed60399d3efc01877663821360538b798c WHIRLPOOL 6eae8a97f579b3e009b9ddec46cca6de1033591ecdbb962258d3c929f6768f49ebae96fb1013392d80a912271942d14f31920ccf3e3b69a732eea4313dc8558b
 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_p20160704.ebuild 3377 SHA256 b41d519ead2f743826abeb29d9d7a03529bc044641f922ee5f9e8943e7b81aa5 SHA512 be900848494382cb149df6cd636bde246fc2e5165491ae8408569f8f15b5fadfae35e23306367d179b749950c34cf3c49535703ac9cf0b6ff9355d979857f042 WHIRLPOOL ba1ad53e16ae58014f22d68c6acf4d7ac09bdfe2b4e1e78e8175143abee95f19c81798df8eea4a6103589ccd499ac316ada5bf3cc3c50646305dbd609ab9800a
@@ -59,4 +60,5 @@ EBUILD netbeans-extide-9999_p20160805.ebuild 3377 SHA256 5e06394ce97e0f015462aa6
 EBUILD netbeans-extide-9999_p20160809.ebuild 3377 SHA256 19f32c2ec58805a8ba4d2626cca16543af1b554eb709d9bb102ba068ad108d11 SHA512 78fcc396162fb6cb46638d9b09f83759859af91cd6bc4ff1210542ac98638a08118a6995fe05578cf5b03e8eeb18a0ddfac5ac4eb8f127a5b401aab2414c0cda WHIRLPOOL b63cb58123d05051f60fc751f682e334540f28e236816290ee890f22e46fba73a66422a289088caf8a81d04ff862d8a96c53f8cc7d36d737b81d1e3f1a9f3284
 EBUILD netbeans-extide-9999_p20160810.ebuild 3377 SHA256 5ca924f9357c6089d8d0cbe95f5c089abbb0f03c07f4e43d0758c7e75eda3617 SHA512 1b42655310733fd0152b2c99ad6285ca63a35bb91cd2c982a6c008c8a510020f5dba851bbe2b6be21a9e66242241428582f514e78149f49e5fe58144f2594f00 WHIRLPOOL f64b0aa1b63255c308bee28c8cfc41f696fc476f8d31b82f078f66d8211072fe4abe55d04ac416352229e42afb40e82d8a696a3215f326780d48409e5f1406eb
 EBUILD netbeans-extide-9999_p20160811.ebuild 3377 SHA256 4502ceeec141e39f38041523c91915580981334c595296a6dc6c02616d1157a4 SHA512 bcc70caf0ee87b183cfdedb29877e616460b32a233d3764ab5725bb90f50c37f6025e5e35b068cc5b2d3a38ccf0e5714b20bb1e41f668727b9296e130d84c6b9 WHIRLPOOL 0beb97d76c9f2a1e6abaf3bc55467706a1d49297a30f1e5209aa70ef72398bf7bf2639a7a5449cdaa50581a507eb3126952be6885f2694bc522e397c55521923
+EBUILD netbeans-extide-9999_p20160812.ebuild 3377 SHA256 14586d7127335c735d35b33335ae75d4fdafb3c72599d341e58edeb166df2890 SHA512 0b79181e9fb12779edbe9b357496dd182a12361c89b7c1c52ddeba3af2b9a0ff57db08b959becfdc7863fc1864a7bdc4206b1648283e1a7e2c2ab20304d9c825 WHIRLPOOL e063fd8403ab0531160eb37c0b176f5e40df50ec618fe415a99ee62a4ead2bff513f41316cb5b40ab96c3db454a2e3ab501c12eefaa123cc026b7f336e46a638
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160812.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160812.ebuild
new file mode 100644
index 0000000..f36a0db
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20160812.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-12_00-02-33/zip/netbeans-trunk-nightly-201608120002-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 5bc2b5a..0e80928 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c8519
 DIST netbeans-trunk-nightly-201608090002-src.zip 217056261 SHA256 f0a275e932b5948c00e24beae1eb599f8c0912fa905997b1ef7b11345fddf60c SHA512 81761482cbd5e238e1c2597a4b9bcc506b32c296e4d6c0785fa8fe69e1d1a6ddc9f4a7f6dcdb8ed816f366fb840e01a5d8003cf289bb1735be74f9906d6c7575 WHIRLPOOL 903eb7d99f8fecafca4f3a06a567a5994f0602431d29c74df1a300785b62f205e1257c1c4158cb2f7706a6c8bf70c7e3b7d7e6503a96bcaefb7411be0d701f70
 DIST netbeans-trunk-nightly-201608100002-src.zip 217066650 SHA256 35d4ea867e7626174a9b82264002f9aacfc3807ea14745d3548281f406c1ea84 SHA512 30b65ff7914a454995a5a6d022657cbc1256ab050ef6a1d217f7cdb2a5b054ab656cff966045184ade5c137d5400121e67800b5f1b4f0f2babf7d938c2d5d072 WHIRLPOOL 6e994f402b7d58ce68fb611d81daec1304a4c9400b9a785679b50ee6d3bb535bfbc35f374582b87a2ed08225b2112dcf91b8fa1148ffa097867bcbb7637583fe
 DIST netbeans-trunk-nightly-201608110002-src.zip 217074142 SHA256 1017ce540b38dcf7a1e6080e49e975255bfd4db72294c82e05ab67aafb92f407 SHA512 d6015ec2da1f2857457f36e1bcec5dd0e495265763f607ecdf0343fa34c52fee55f7fa31f8ed49c6595d370719fdf7c3d50e7bd9eedfe4fb5d1f73807bd20db9 WHIRLPOOL f59e8bbdca914e0732b37b21f1a8a76466bc095c1b18d5a5e1a785430fbe6713f1e9fe276f458c00f9df7253e3d5a8981dba1e8049e9f8924910031cd6e576c0
+DIST netbeans-trunk-nightly-201608120002-src.zip 217080929 SHA256 b8ef1d20faf0485e85cf44ba6ea77282d130efeeafd7caf58d1ae3a33bb5ee01 SHA512 eec5a8165446247e28fd9ecda21017c7d877f8199326565f4750e3631e5f58c66c60424b906782ebcd34e5e58e5810ed60399d3efc01877663821360538b798c WHIRLPOOL 6eae8a97f579b3e009b9ddec46cca6de1033591ecdbb962258d3c929f6768f49ebae96fb1013392d80a912271942d14f31920ccf3e3b69a732eea4313dc8558b
 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_p20160704.ebuild 3416 SHA256 7a6dce76ab4e8b02e7a52d48938e58d2d3f2c403df2d198087739c7905b78250 SHA512 9d25bfe4a37d0d9a7b1370121f7848ee20114a03197f47a24a68da7654d695042da18b5847df567ac2a17136358589b4dadec8afa54b1a499bf25cab1feb2c48 WHIRLPOOL 1b3f764d3a0ce32fa7442b1efca3356b2060085fdecee160c68baa61d5bcab6ad95c6e1d4abc57887ee75a61c888dabd1db43de79bc8304efe83f7c43088b8c8
@@ -57,4 +58,5 @@ EBUILD netbeans-groovy-9999_p20160805.ebuild 3416 SHA256 13d715215a17c2f0d9e5e28
 EBUILD netbeans-groovy-9999_p20160809.ebuild 3416 SHA256 9cba6475ec6bf0d0049177f8402330f98368da55a51cba8617233facd39e0010 SHA512 ef530a4b6b5df55635e969f8b871f7672801aab549254e5f59f77aa070e0b4d9ef0e25026c7a0d0ec7ee1f37ab2574a5653c4de9d8b7c776067d3fe29a2f7133 WHIRLPOOL ddc4e71bdb1ad1f7f5e78401cc573ebb4c2bad0aeaff2cb4bad139e3765678acb2d9f47b6b4a28223347f218c0e55fb41edd8b3e7177543a524b9df8e4de9a53
 EBUILD netbeans-groovy-9999_p20160810.ebuild 3416 SHA256 fdb433e1756936d5efa59de59b1f2c65b92af1edb427823e31136ad5eb4cbdc6 SHA512 6181515dc59bfb2fc6de64d5f8df66e07df3ef17a4aa977ea8fcf8747241637025945cf658f113a53391c4545468ca49ad712e000e36de43d41098597652f890 WHIRLPOOL 70767b8a404d1ce09904bd9f54a71f8bacd2b5a96f1dc277ad10857a614bfbd29dd61f273194f8f90c4c5d538cd6db741c057d107e246a810230c5a6933d5790
 EBUILD netbeans-groovy-9999_p20160811.ebuild 3416 SHA256 2a8bf17a024d02d43f0ef5e548b9abf7bd2266323f7fec8cec46c8b2fca5d7b1 SHA512 e10c22656c4d5e1c3110a619af88e5e9574bcc0a243c9ac9f45cad5edd2577d43dae8c218e997aba318a5742129ed1b8dac5f9b32ddcbbb9a331ee72a3ceee35 WHIRLPOOL 91087a8d4ebca77e2f9d8b45d3ecb1ce632078dd3e6bec8dd2bfc9fc54526f2159a011741a8dd29b28f2c1dfd0b2975e6ba1fae27820fbbbb91beebbafc1f94c
+EBUILD netbeans-groovy-9999_p20160812.ebuild 3416 SHA256 b307f88eda261726b3eda78334030af7899650ff1fea9085f668beced3a4e422 SHA512 2ec3348ad97db9c2077159cd19a0023e2bae2a7de06072ccf242531405d2fb7a0e0dc698b90388a71fd11c04261de72c71c3e4c715c3e791104fc32f69d63484 WHIRLPOOL 5cc2a77b80f6abc0f642039d64f2c72c9726befeae7ac4f267233b44d35958c515d0c923339e59f93db5b0ad5f32df7bf996ffb6414f624a475e9b723622e169
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160812.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160812.ebuild
new file mode 100644
index 0000000..aa7bfba
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160812.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-12_00-02-33/zip/netbeans-trunk-nightly-201608120002-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 d97531a..68941b5 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c8519
 DIST netbeans-trunk-nightly-201608090002-src.zip 217056261 SHA256 f0a275e932b5948c00e24beae1eb599f8c0912fa905997b1ef7b11345fddf60c SHA512 81761482cbd5e238e1c2597a4b9bcc506b32c296e4d6c0785fa8fe69e1d1a6ddc9f4a7f6dcdb8ed816f366fb840e01a5d8003cf289bb1735be74f9906d6c7575 WHIRLPOOL 903eb7d99f8fecafca4f3a06a567a5994f0602431d29c74df1a300785b62f205e1257c1c4158cb2f7706a6c8bf70c7e3b7d7e6503a96bcaefb7411be0d701f70
 DIST netbeans-trunk-nightly-201608100002-src.zip 217066650 SHA256 35d4ea867e7626174a9b82264002f9aacfc3807ea14745d3548281f406c1ea84 SHA512 30b65ff7914a454995a5a6d022657cbc1256ab050ef6a1d217f7cdb2a5b054ab656cff966045184ade5c137d5400121e67800b5f1b4f0f2babf7d938c2d5d072 WHIRLPOOL 6e994f402b7d58ce68fb611d81daec1304a4c9400b9a785679b50ee6d3bb535bfbc35f374582b87a2ed08225b2112dcf91b8fa1148ffa097867bcbb7637583fe
 DIST netbeans-trunk-nightly-201608110002-src.zip 217074142 SHA256 1017ce540b38dcf7a1e6080e49e975255bfd4db72294c82e05ab67aafb92f407 SHA512 d6015ec2da1f2857457f36e1bcec5dd0e495265763f607ecdf0343fa34c52fee55f7fa31f8ed49c6595d370719fdf7c3d50e7bd9eedfe4fb5d1f73807bd20db9 WHIRLPOOL f59e8bbdca914e0732b37b21f1a8a76466bc095c1b18d5a5e1a785430fbe6713f1e9fe276f458c00f9df7253e3d5a8981dba1e8049e9f8924910031cd6e576c0
+DIST netbeans-trunk-nightly-201608120002-src.zip 217080929 SHA256 b8ef1d20faf0485e85cf44ba6ea77282d130efeeafd7caf58d1ae3a33bb5ee01 SHA512 eec5a8165446247e28fd9ecda21017c7d877f8199326565f4750e3631e5f58c66c60424b906782ebcd34e5e58e5810ed60399d3efc01877663821360538b798c WHIRLPOOL 6eae8a97f579b3e009b9ddec46cca6de1033591ecdbb962258d3c929f6768f49ebae96fb1013392d80a912271942d14f31920ccf3e3b69a732eea4313dc8558b
 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_p20160704.ebuild 4126 SHA256 ba5fc6010a900721db190dbff3693a5e7272ea3da6d13a9cb069e6d02aff0d29 SHA512 99f72ddb2fac98eeb40dcffe478cbb84dd022e20e399ee728fb7e46d3e5132341cc5e6b2eedbe1afd77086397e7661814ee22e112642d6dd9aa3d62b9a664277 WHIRLPOOL 14980a150ccb49cd482d99e1ff369a40ea80a16ec626b662fdb3c5ac62a96a13c73142fadd52b0c1e2a1cc4b3e5b6df1e2097b8d89e5258180cb1d841564fc82
@@ -60,4 +61,5 @@ EBUILD netbeans-harness-9999_p20160805.ebuild 4126 SHA256 e1726eadd01d8707fb8faf
 EBUILD netbeans-harness-9999_p20160809.ebuild 4126 SHA256 f032777e233a90ecf88886af0faa49c9b9fe5be788c186f1eb1622f90fdf4b73 SHA512 8f50148c2c8978ccdcd3495fab8cc541170fbe09f76003af1e8e6fe54efdcd4056922ba3351dab7d19b4c3deb593f3ab75e60693fc869ba9fcf33823690710e8 WHIRLPOOL f636f5eafb4bbfa624df6d5d1978c1814f0e780ea045119ee0aa9a28fc8d659c10be77794531db83870f5aa768adbe756f184d54de877236409d2f91ab004de4
 EBUILD netbeans-harness-9999_p20160810.ebuild 4126 SHA256 4c6fd4294b3aac8b9de84647536286e97dec144ac0f0fba5a937fb8269deed05 SHA512 06fb9a2c8607707ee00683b206d35c3279d311a353d8d9ec08a992e307a8452e97773e5127d49b6e0a590d8bf0290af7ff58b24dfc3ba3facce2f6e2d5727928 WHIRLPOOL 799fefca711c9dafb2729f825d19d5f2d98eaa258ec25fed22fc90fa770532d153f560a3d8e6bae6058734428ef205af71064a76ecf95912f9e4c5586da75339
 EBUILD netbeans-harness-9999_p20160811.ebuild 4126 SHA256 19b79d2e79427dbf4e98e8670c7ccb67759381da8957906dadd5a35b14b1a5f6 SHA512 4cfa96e06459adbdc6e82ff8f0af41b1cbb768afb2dc96d59c4a4f6eaa6804281b1608938f47d0b88595985215faf707090930f03e8779848ffc26aa15efe152 WHIRLPOOL 675f9840304a1e59a64e80a6b2763eb837d729ad1460d51b8755c74c263071c54c8cdba7c66d264712dba76f6c352f2bdda078c68c244af8365cd7eb263fbc2a
+EBUILD netbeans-harness-9999_p20160812.ebuild 4126 SHA256 2370a0aab9791d6082652f2e5fd28f9f7738c04760fb8b47bbb7c7d24d237a53 SHA512 3143fbf70a094e56a790db1b2cd46a49f4bcfbf52b3c3c1ae14f83a6a4ec81cc68af960268f17af8b4b1f5ddd0a34ee5661ea6c324036caef915f618d200a63d WHIRLPOOL ae10de3e886ec6a3a11421c2efa6923680caa9949ccf0b36a9773f40fa69feadbb2ffc333e696254c4a968d2ae63b32c81adad467afa9bf345cdff4481e2376a
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160812.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160812.ebuild
new file mode 100644
index 0000000..bc65403
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20160812.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-12_00-02-33/zip/netbeans-trunk-nightly-201608120002-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 fdc6527..c0bb493 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -167,6 +167,7 @@ DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c8519
 DIST netbeans-trunk-nightly-201608090002-src.zip 217056261 SHA256 f0a275e932b5948c00e24beae1eb599f8c0912fa905997b1ef7b11345fddf60c SHA512 81761482cbd5e238e1c2597a4b9bcc506b32c296e4d6c0785fa8fe69e1d1a6ddc9f4a7f6dcdb8ed816f366fb840e01a5d8003cf289bb1735be74f9906d6c7575 WHIRLPOOL 903eb7d99f8fecafca4f3a06a567a5994f0602431d29c74df1a300785b62f205e1257c1c4158cb2f7706a6c8bf70c7e3b7d7e6503a96bcaefb7411be0d701f70
 DIST netbeans-trunk-nightly-201608100002-src.zip 217066650 SHA256 35d4ea867e7626174a9b82264002f9aacfc3807ea14745d3548281f406c1ea84 SHA512 30b65ff7914a454995a5a6d022657cbc1256ab050ef6a1d217f7cdb2a5b054ab656cff966045184ade5c137d5400121e67800b5f1b4f0f2babf7d938c2d5d072 WHIRLPOOL 6e994f402b7d58ce68fb611d81daec1304a4c9400b9a785679b50ee6d3bb535bfbc35f374582b87a2ed08225b2112dcf91b8fa1148ffa097867bcbb7637583fe
 DIST netbeans-trunk-nightly-201608110002-src.zip 217074142 SHA256 1017ce540b38dcf7a1e6080e49e975255bfd4db72294c82e05ab67aafb92f407 SHA512 d6015ec2da1f2857457f36e1bcec5dd0e495265763f607ecdf0343fa34c52fee55f7fa31f8ed49c6595d370719fdf7c3d50e7bd9eedfe4fb5d1f73807bd20db9 WHIRLPOOL f59e8bbdca914e0732b37b21f1a8a76466bc095c1b18d5a5e1a785430fbe6713f1e9fe276f458c00f9df7253e3d5a8981dba1e8049e9f8924910031cd6e576c0
+DIST netbeans-trunk-nightly-201608120002-src.zip 217080929 SHA256 b8ef1d20faf0485e85cf44ba6ea77282d130efeeafd7caf58d1ae3a33bb5ee01 SHA512 eec5a8165446247e28fd9ecda21017c7d877f8199326565f4750e3631e5f58c66c60424b906782ebcd34e5e58e5810ed60399d3efc01877663821360538b798c WHIRLPOOL 6eae8a97f579b3e009b9ddec46cca6de1033591ecdbb962258d3c929f6768f49ebae96fb1013392d80a912271942d14f31920ccf3e3b69a732eea4313dc8558b
 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_p20160704.ebuild 29867 SHA256 cc9a9f0fd9cb88725e3fbe3c05081742a46e041f2d5ef4158594ab80db062317 SHA512 6724660509905200323ae61e340825c17772a4e94952fe0442e5352adf1595bb54c239562131af4a40b3afa06ceef5c2b43f3e4ebe02161d7e7449a69ea994e3 WHIRLPOOL 44ecc0bd24800e7641044f8d14c87b5e46081371957ecc1fec095706a2f7749eb26223fe65dcd4bcfffff387696594a21330ab75479c0e938386c841e7adc1d0
@@ -194,4 +195,5 @@ EBUILD netbeans-ide-9999_p20160805.ebuild 29867 SHA256 a6e5b01dd7645ae6d601e387c
 EBUILD netbeans-ide-9999_p20160809.ebuild 29867 SHA256 b15bdd68bbc3ab11e44f9db65d37d5c6c84b75c7593c8693703a41da9c6bbccc SHA512 06d5280069e4082154254b318f0826954d08d364b8141b50fbf38b3fc92543f143ed0ebc271ede7cacc93d846c6a3b535d0abb1a3b2877932f26fb9f0af59439 WHIRLPOOL d677c6393fd1d476948f61a14fcf31146418d2ece0508f6ed12ba368ad5e421fe1f14e767cebeff075c693626d029ee6f8d9ea7ce165e0a5cde7ee439e9e11ca
 EBUILD netbeans-ide-9999_p20160810.ebuild 29867 SHA256 3de308abc5b0e975594c6c42b09bdaef87264a804fdf5cfd64f693dfb059a1b4 SHA512 cfc7b610cdbe12d19dedd564921f5a34f2d8d94341216bba7a8494712bbc4c807d2c4bd7afbb4500f4917ea11ffdae7f91248a7143e414b937a7e573b387a2f7 WHIRLPOOL 0689d2b81d0ccf47604cff29917f40fa9608fc2679fd4dfe50662bfa2f4268e74c43e899dedc307fd4f5edec83cda471a9dd424606b55c92baeaa619a9de720b
 EBUILD netbeans-ide-9999_p20160811.ebuild 29867 SHA256 6aabb0021b233cfda7a388a6a6a6c221d62b23350b8fd4e96f244c1fd2ad8150 SHA512 54235e3e4506a71fb56445db0b9945392bed3ff76853f14ca2255da5cec607ae2af210d819a72496ee24fedcd72c4559d4593e71c68b7a437e59ba0785ce4e5b WHIRLPOOL ad14344a6ac7fbbb7867cff0a2d4ba57c9444fe9ef8d2416d34944fbc2d9c106cf98cd0f951c57fb7700a4b97e545fcefa409f253081ad67237304ba56d2203e
+EBUILD netbeans-ide-9999_p20160812.ebuild 29867 SHA256 5e8ce5cca6fe4f213ae68f2e2b9319d3effa4f92f11e223c96cd204a8691714f SHA512 716dff156925311c9df278013065c6452f84d81ddb2b8aa6e6d37030019dd207a57ccc9a0284650503023833778350ad94f10285ba27f68e6c9d1b25e6c16eca WHIRLPOOL 9c7da8a411edd5d54ec2394eecbce2204e820df03b7112a5cc76db1121a25d6b10c0ba804952560b659ae220980dd626554a78a64a565067a7f8d10dc7b2aaf6
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160812.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160812.ebuild
new file mode 100644
index 0000000..79d06f6
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20160812.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-12_00-02-33/zip/netbeans-trunk-nightly-201608120002-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 ff50254..db8a248 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -62,6 +62,7 @@ DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c8519
 DIST netbeans-trunk-nightly-201608090002-src.zip 217056261 SHA256 f0a275e932b5948c00e24beae1eb599f8c0912fa905997b1ef7b11345fddf60c SHA512 81761482cbd5e238e1c2597a4b9bcc506b32c296e4d6c0785fa8fe69e1d1a6ddc9f4a7f6dcdb8ed816f366fb840e01a5d8003cf289bb1735be74f9906d6c7575 WHIRLPOOL 903eb7d99f8fecafca4f3a06a567a5994f0602431d29c74df1a300785b62f205e1257c1c4158cb2f7706a6c8bf70c7e3b7d7e6503a96bcaefb7411be0d701f70
 DIST netbeans-trunk-nightly-201608100002-src.zip 217066650 SHA256 35d4ea867e7626174a9b82264002f9aacfc3807ea14745d3548281f406c1ea84 SHA512 30b65ff7914a454995a5a6d022657cbc1256ab050ef6a1d217f7cdb2a5b054ab656cff966045184ade5c137d5400121e67800b5f1b4f0f2babf7d938c2d5d072 WHIRLPOOL 6e994f402b7d58ce68fb611d81daec1304a4c9400b9a785679b50ee6d3bb535bfbc35f374582b87a2ed08225b2112dcf91b8fa1148ffa097867bcbb7637583fe
 DIST netbeans-trunk-nightly-201608110002-src.zip 217074142 SHA256 1017ce540b38dcf7a1e6080e49e975255bfd4db72294c82e05ab67aafb92f407 SHA512 d6015ec2da1f2857457f36e1bcec5dd0e495265763f607ecdf0343fa34c52fee55f7fa31f8ed49c6595d370719fdf7c3d50e7bd9eedfe4fb5d1f73807bd20db9 WHIRLPOOL f59e8bbdca914e0732b37b21f1a8a76466bc095c1b18d5a5e1a785430fbe6713f1e9fe276f458c00f9df7253e3d5a8981dba1e8049e9f8924910031cd6e576c0
+DIST netbeans-trunk-nightly-201608120002-src.zip 217080929 SHA256 b8ef1d20faf0485e85cf44ba6ea77282d130efeeafd7caf58d1ae3a33bb5ee01 SHA512 eec5a8165446247e28fd9ecda21017c7d877f8199326565f4750e3631e5f58c66c60424b906782ebcd34e5e58e5810ed60399d3efc01877663821360538b798c WHIRLPOOL 6eae8a97f579b3e009b9ddec46cca6de1033591ecdbb962258d3c929f6768f49ebae96fb1013392d80a912271942d14f31920ccf3e3b69a732eea4313dc8558b
 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_p20160704.ebuild 15656 SHA256 85d002b3150e9944ebf7a268b0d31c5cb1bb5302d5513a08c5ca81a29c84815a SHA512 baf8c2924e9630e6d5ee2612310221318c915bd73ed26583dd35e527ed133bc913f7ecc7adab990284f39779ff905dfba40a5160b4603bfec3a198281449b333 WHIRLPOOL d97ae3b11a6539883aa6e1765885abf2dc6ff6309542881cd7300496655b0c24619499b37c7b5da109fde8916e229d7b8fe802039297686fd3044951d41a3ae3
@@ -89,4 +90,5 @@ EBUILD netbeans-java-9999_p20160805.ebuild 15656 SHA256 8fd66a5aad22d20caa1386bf
 EBUILD netbeans-java-9999_p20160809.ebuild 15656 SHA256 3b109093b32816e9b0e387739bd464e29cc86ace8d7c17d7741e3d942e52cfe6 SHA512 efa59fdb0d73f67d7728b027b421bf16b542ac69ac01a1802cf0098e7e0fbd6dee6bf0c44371ca9387a34dde1b626e9737ad274240f2413211b06b2869acb390 WHIRLPOOL 6d992d6df38cdeb9fafcb9bbafbd2f5f1608ab45a7d616692aa19860bf3e5c11d3ea903cbfe9fbb8e45130434b01ccb40446838a28be0a81ffe7bdaf7f5fb8a3
 EBUILD netbeans-java-9999_p20160810.ebuild 15656 SHA256 85ad00e9a05857b51784471d25a3d5cd21d2a5cfca783bee39a94d428181a29f SHA512 5b26a631890eb63ae72f9376345f37f7cc66485a181b2991c2d07cfdda5d63c0d36e5388d88de4b24c0ee3e5c370270497f74bf496c7e145696b66d24a098779 WHIRLPOOL 89db94a716308f73e8f0ffcac1f8d9a936de04ba1b7850c9ae828f31df4838d8d8b33938bfdd1ff086f0aaef1c632c9c91c8da5d74cdf6f9e3932c966537952f
 EBUILD netbeans-java-9999_p20160811.ebuild 15656 SHA256 2c938293063f922651a736d6ac02c8e06cbd52df6766d266b9751f5fec499159 SHA512 53e2da5314e06da80e98d58d7e1d69edc3f8bc29eb95391afaf2b3e31c0a17d226ad61bf86895de5333cdfe524bd897eb4bd47f84a0cf67af975ebf3fd7c4d07 WHIRLPOOL 53011bf132b69d1ee23d48515fffe9fbdb5fd38f3e3f3913332d06f48d5ef30083a0fd979779eaafe7a08fc41a0d9f317c74f2ff4d37f402922fd3666103ff36
+EBUILD netbeans-java-9999_p20160812.ebuild 15656 SHA256 6cb2e07e01c159c9bb977d0364665d0634b59ee951f7c66eb493b7796efcd650 SHA512 6eea47c4f8ba2c11d6fd57938bb1566f2dc91562941a9385bb2b7c3feedee175ce2b3d1e7c22a8b021039aae5fb52957bc87fcf1c1d9e2d8da37200189c855da WHIRLPOOL 60c89f0e5ab35cbdd2d125094569b6988f71632522a0dc6f22c2cb9b9a9ba3d7aab427dcfe6703829a3e38d5d55afc3f58e317c2863f8773018661c3a67399c6
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160812.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160812.ebuild
new file mode 100644
index 0000000..3e3772a
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20160812.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-12_00-02-33/zip/netbeans-trunk-nightly-201608120002-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 6976c84..e9e9edb 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c8519
 DIST netbeans-trunk-nightly-201608090002-src.zip 217056261 SHA256 f0a275e932b5948c00e24beae1eb599f8c0912fa905997b1ef7b11345fddf60c SHA512 81761482cbd5e238e1c2597a4b9bcc506b32c296e4d6c0785fa8fe69e1d1a6ddc9f4a7f6dcdb8ed816f366fb840e01a5d8003cf289bb1735be74f9906d6c7575 WHIRLPOOL 903eb7d99f8fecafca4f3a06a567a5994f0602431d29c74df1a300785b62f205e1257c1c4158cb2f7706a6c8bf70c7e3b7d7e6503a96bcaefb7411be0d701f70
 DIST netbeans-trunk-nightly-201608100002-src.zip 217066650 SHA256 35d4ea867e7626174a9b82264002f9aacfc3807ea14745d3548281f406c1ea84 SHA512 30b65ff7914a454995a5a6d022657cbc1256ab050ef6a1d217f7cdb2a5b054ab656cff966045184ade5c137d5400121e67800b5f1b4f0f2babf7d938c2d5d072 WHIRLPOOL 6e994f402b7d58ce68fb611d81daec1304a4c9400b9a785679b50ee6d3bb535bfbc35f374582b87a2ed08225b2112dcf91b8fa1148ffa097867bcbb7637583fe
 DIST netbeans-trunk-nightly-201608110002-src.zip 217074142 SHA256 1017ce540b38dcf7a1e6080e49e975255bfd4db72294c82e05ab67aafb92f407 SHA512 d6015ec2da1f2857457f36e1bcec5dd0e495265763f607ecdf0343fa34c52fee55f7fa31f8ed49c6595d370719fdf7c3d50e7bd9eedfe4fb5d1f73807bd20db9 WHIRLPOOL f59e8bbdca914e0732b37b21f1a8a76466bc095c1b18d5a5e1a785430fbe6713f1e9fe276f458c00f9df7253e3d5a8981dba1e8049e9f8924910031cd6e576c0
+DIST netbeans-trunk-nightly-201608120002-src.zip 217080929 SHA256 b8ef1d20faf0485e85cf44ba6ea77282d130efeeafd7caf58d1ae3a33bb5ee01 SHA512 eec5a8165446247e28fd9ecda21017c7d877f8199326565f4750e3631e5f58c66c60424b906782ebcd34e5e58e5810ed60399d3efc01877663821360538b798c WHIRLPOOL 6eae8a97f579b3e009b9ddec46cca6de1033591ecdbb962258d3c929f6768f49ebae96fb1013392d80a912271942d14f31920ccf3e3b69a732eea4313dc8558b
 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_p20160704.ebuild 4971 SHA256 a16c5985a556ef75e6cfd42f0da8d55e71a14e405948749798d19b5022dc0c7b SHA512 dcb91d9399cdd3b282cb2c2a0d4ce712f216ab4012261e61fb71b212fbacb6af7025f75efa115283952c49c5da56f132ea0ded604fe99469019d747ccfca0846 WHIRLPOOL ac4eab54534988d1fd33edf3bfc7c7c7dd80cf488b9e7b02c48687ecc663c67023b27a2a2b77c9f7fdc4b92125b34b1ba5a191756107a5de779d037e6a5226a3
@@ -58,4 +59,5 @@ EBUILD netbeans-javacard-9999_p20160805.ebuild 4971 SHA256 b7e3e600097e97891fe5b
 EBUILD netbeans-javacard-9999_p20160809.ebuild 4971 SHA256 5a599eaef3e6108e43252f2c30e9d13a1212694e9a4ea11079b5c065fc6d093d SHA512 d2abdec1e7dacf600afc396e66f36f230711178b1709901ccf09e06a4cf957599ce1fe996ea91326af57bfeb2c5ae9967f36dbaeef984dad76c99b1b01f8dfd6 WHIRLPOOL 3d5069ee3a244b27988f6584f06dd9e0c680f25588f07a51b09104970c8acffa95bbf3fef04ebbb477056adc2a6db77906a8b6e87a2a955b891791d367c10236
 EBUILD netbeans-javacard-9999_p20160810.ebuild 4971 SHA256 cfc5f679e90f1eb59ae1546de85035616c98a553462a87caf12f0d9b95423b4c SHA512 bfb0d35f5780a1b5e7cbb1a4fa627bd7a6c09a5648164c9c92f98529d770ce8db24580bdb01e0435686339eaed8ffd6f6534e889f2bed363f59a5626bbbd1616 WHIRLPOOL 3ba4deaeea01bd656b7bdcdbdf1a1e672956b629f93293ac2203612c086c8258c951c8351d5c371c5837098e57659dd19142c20eb123b07a407a622ad43613dc
 EBUILD netbeans-javacard-9999_p20160811.ebuild 4971 SHA256 2433a3422810e12d01feb86e27561d611c15405f98378c9b8985b4e604a6bd74 SHA512 a98c73da9b9f4b3bac0445c7cc7569f591d5b5b94af43fc69f43093d64c34befad0c253f2dd10deed820e58a4ff36cd198c78ecdab58b5bf4ef2f9a23d73d1a9 WHIRLPOOL bb40d12d4ef857eba9fee7c8358c50c20ebbac58d47591c282365f7944f6f9d2917fcdabbb91b916ad5da89298217921b87e1b4671b3bf2d3a369aafc792ab50
+EBUILD netbeans-javacard-9999_p20160812.ebuild 4971 SHA256 a15aa4bc401b8ba57608d46ca81eb82854360af5f76b249a11c793049e6b1888 SHA512 8dee4dbb9ea911273876c2cba8dc6894c9b0cbb7ac6d7b2a59b7d30222017f753abd87aebb6a832b0770e5d5fae147ba188843e400a3db67f287f84dbdb93b90 WHIRLPOOL d872053fd161ee62eb7264ad09eb6d8e69f6e26136c435ced038573a2a77aeda5f0795062e52e4c34051ba7081b894e9b50bf1e4798c5efb0703564fe795e24c
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160812.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160812.ebuild
new file mode 100644
index 0000000..81102f1
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160812.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-12_00-02-33/zip/netbeans-trunk-nightly-201608120002-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 461b34c..cecfb8a 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c8519
 DIST netbeans-trunk-nightly-201608090002-src.zip 217056261 SHA256 f0a275e932b5948c00e24beae1eb599f8c0912fa905997b1ef7b11345fddf60c SHA512 81761482cbd5e238e1c2597a4b9bcc506b32c296e4d6c0785fa8fe69e1d1a6ddc9f4a7f6dcdb8ed816f366fb840e01a5d8003cf289bb1735be74f9906d6c7575 WHIRLPOOL 903eb7d99f8fecafca4f3a06a567a5994f0602431d29c74df1a300785b62f205e1257c1c4158cb2f7706a6c8bf70c7e3b7d7e6503a96bcaefb7411be0d701f70
 DIST netbeans-trunk-nightly-201608100002-src.zip 217066650 SHA256 35d4ea867e7626174a9b82264002f9aacfc3807ea14745d3548281f406c1ea84 SHA512 30b65ff7914a454995a5a6d022657cbc1256ab050ef6a1d217f7cdb2a5b054ab656cff966045184ade5c137d5400121e67800b5f1b4f0f2babf7d938c2d5d072 WHIRLPOOL 6e994f402b7d58ce68fb611d81daec1304a4c9400b9a785679b50ee6d3bb535bfbc35f374582b87a2ed08225b2112dcf91b8fa1148ffa097867bcbb7637583fe
 DIST netbeans-trunk-nightly-201608110002-src.zip 217074142 SHA256 1017ce540b38dcf7a1e6080e49e975255bfd4db72294c82e05ab67aafb92f407 SHA512 d6015ec2da1f2857457f36e1bcec5dd0e495265763f607ecdf0343fa34c52fee55f7fa31f8ed49c6595d370719fdf7c3d50e7bd9eedfe4fb5d1f73807bd20db9 WHIRLPOOL f59e8bbdca914e0732b37b21f1a8a76466bc095c1b18d5a5e1a785430fbe6713f1e9fe276f458c00f9df7253e3d5a8981dba1e8049e9f8924910031cd6e576c0
+DIST netbeans-trunk-nightly-201608120002-src.zip 217080929 SHA256 b8ef1d20faf0485e85cf44ba6ea77282d130efeeafd7caf58d1ae3a33bb5ee01 SHA512 eec5a8165446247e28fd9ecda21017c7d877f8199326565f4750e3631e5f58c66c60424b906782ebcd34e5e58e5810ed60399d3efc01877663821360538b798c WHIRLPOOL 6eae8a97f579b3e009b9ddec46cca6de1033591ecdbb962258d3c929f6768f49ebae96fb1013392d80a912271942d14f31920ccf3e3b69a732eea4313dc8558b
 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_p20160704.ebuild 6293 SHA256 facd790a162faf661027444b75b5668b36b153cf73a42e9925f700dce9395c03 SHA512 f30c8ef1ee8ce2ff7fb3c13c2cd60d3b18ff81fadc2ea51e08237ff92088b24ac155515535a609473beae40dc6f09c3b8f968176e00147e5a66e27f8e57be717 WHIRLPOOL de51200b96ba0d00d419f764cb50f58112c3e6a25ef03d48abb17ce41575cbad02429c9364c83181bc304c75daa518ef5517d671217fbea0ef7aa841c4cdf7e8
@@ -57,4 +58,5 @@ EBUILD netbeans-javadoc-9999_p20160805.ebuild 6293 SHA256 39069bd8e788b3cbedefe8
 EBUILD netbeans-javadoc-9999_p20160809.ebuild 6293 SHA256 5711af550cd9374b2402e3bb9231a2104432bb22667419732be1861bf94b4cec SHA512 cfde64bbac9043c08250e517d7440943f5dc9133591ec3e02be98e58e7d87311dcff5ab0cd9f45e99218b16f7a88f325767a0deb0b877f7759d566ce4319f022 WHIRLPOOL 546091d899c116f531b1f4a531e469ca5274ce9cbc20b3c42ba231cb776f5bbbf44770821a6c05a831accce31a29b4688f4cec33c238d8e1de90851e9ca1a842
 EBUILD netbeans-javadoc-9999_p20160810.ebuild 6293 SHA256 6066172e979b1695f0bea27fbf9eb055c714930e778b9453c4efe4c705e1f083 SHA512 21442bdecb0b18395c865c8d2e0ca8d6848accb53013f02fc0654ff06d1298d21cabd89df8bf6bb189981055ae8ae46c01664968c0ea4f01893070f46e1674fb WHIRLPOOL a4c8496320ffa5f9942cce21834e2c7d1ef067b5e2924ad754d18190d393fc86054da2b9be62f97ed7979614bdab0d8be37a6727f366e022312041904c998f49
 EBUILD netbeans-javadoc-9999_p20160811.ebuild 6293 SHA256 d38f30c49051f45ba58914ecd7fd0c455e8543edf6b38f74a2e7345753f7fde8 SHA512 fe2fe8c130d878e6e28240e62fb407c27d6eceaa7245b9b27c25b13437da073a365cc3fffcb588d8f2a664b99aaad73b875d4d393fea7482103ab15d261b4081 WHIRLPOOL 3db73b3f9d2618ed497e92fc46c2e36d6e8391ee0771a8a82d8906b9e7fc50fa0f54425d2cd920a30e9874a13265d6fd8490a43acef025d6c078819276790dfc
+EBUILD netbeans-javadoc-9999_p20160812.ebuild 6293 SHA256 a349b69303e652f0d6b6d011e6ee1d291eaead05ad651f9c0a2929258b6e0f59 SHA512 ca59e5319858a1ede6e7f3f1957150f4b63f33712673791c31851a34f72fe92a3550bf45020831ee5a9e8d93cb3c686a3d63f434f548e4fc4f1d2a19150de917 WHIRLPOOL a915d788a3cf8dbed70601f47a9250ca3b51fc44817b5b66112625ea244d1f6a6c7410d7ba1613b23ef774f5c46866bc2e9780deaea20def00ab407fc4b73c37
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160812.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160812.ebuild
new file mode 100644
index 0000000..553fc77
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160812.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-12_00-02-33/zip/netbeans-trunk-nightly-201608120002-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 960b36c..4ea278f 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c8519
 DIST netbeans-trunk-nightly-201608090002-src.zip 217056261 SHA256 f0a275e932b5948c00e24beae1eb599f8c0912fa905997b1ef7b11345fddf60c SHA512 81761482cbd5e238e1c2597a4b9bcc506b32c296e4d6c0785fa8fe69e1d1a6ddc9f4a7f6dcdb8ed816f366fb840e01a5d8003cf289bb1735be74f9906d6c7575 WHIRLPOOL 903eb7d99f8fecafca4f3a06a567a5994f0602431d29c74df1a300785b62f205e1257c1c4158cb2f7706a6c8bf70c7e3b7d7e6503a96bcaefb7411be0d701f70
 DIST netbeans-trunk-nightly-201608100002-src.zip 217066650 SHA256 35d4ea867e7626174a9b82264002f9aacfc3807ea14745d3548281f406c1ea84 SHA512 30b65ff7914a454995a5a6d022657cbc1256ab050ef6a1d217f7cdb2a5b054ab656cff966045184ade5c137d5400121e67800b5f1b4f0f2babf7d938c2d5d072 WHIRLPOOL 6e994f402b7d58ce68fb611d81daec1304a4c9400b9a785679b50ee6d3bb535bfbc35f374582b87a2ed08225b2112dcf91b8fa1148ffa097867bcbb7637583fe
 DIST netbeans-trunk-nightly-201608110002-src.zip 217074142 SHA256 1017ce540b38dcf7a1e6080e49e975255bfd4db72294c82e05ab67aafb92f407 SHA512 d6015ec2da1f2857457f36e1bcec5dd0e495265763f607ecdf0343fa34c52fee55f7fa31f8ed49c6595d370719fdf7c3d50e7bd9eedfe4fb5d1f73807bd20db9 WHIRLPOOL f59e8bbdca914e0732b37b21f1a8a76466bc095c1b18d5a5e1a785430fbe6713f1e9fe276f458c00f9df7253e3d5a8981dba1e8049e9f8924910031cd6e576c0
+DIST netbeans-trunk-nightly-201608120002-src.zip 217080929 SHA256 b8ef1d20faf0485e85cf44ba6ea77282d130efeeafd7caf58d1ae3a33bb5ee01 SHA512 eec5a8165446247e28fd9ecda21017c7d877f8199326565f4750e3631e5f58c66c60424b906782ebcd34e5e58e5810ed60399d3efc01877663821360538b798c WHIRLPOOL 6eae8a97f579b3e009b9ddec46cca6de1033591ecdbb962258d3c929f6768f49ebae96fb1013392d80a912271942d14f31920ccf3e3b69a732eea4313dc8558b
 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_p20160704.ebuild 4717 SHA256 ba15b86def3276e7cc7393aabb6b30bcf459e8606e062c64dc0a957b52b9ecfd SHA512 44a826bca25d4ed92b8c7257fd07583dd7784c9a1a80a99d1056b2d952c56d53e27427e84613b8bef659d3116ac20b7f3690789aec0ffaa4990e8e9ee3ed179a WHIRLPOOL 50e2d803a4d4ec68590b8f1990ea1912e4ebca811c5c55fc0a61d220d1190d6d19f067fb9b81a1e4aa65094443d49569603f86582c263926bd438902f5b90818
@@ -63,4 +64,5 @@ EBUILD netbeans-javafx-9999_p20160805.ebuild 4717 SHA256 0ab75a5cfeb7229da3a1dc0
 EBUILD netbeans-javafx-9999_p20160809.ebuild 4717 SHA256 4e91d25d04a3f331a53833868405ae4241c07622f11cf44dd2f5513b8e2cbcd5 SHA512 ab6d7690c79dc32455e655bcacfcf4053a98cadb5ef05301bf4d115170711a233623a64808a6258f8ebe0baf586643b9d79a236ebf3beddaca67d9f463e5619e WHIRLPOOL 148f3a8b439f428ace496edfcf014dc5500f343d1a758bb58d355bdd3694e0b9026359f7adaf3cfdc56614dd43c54e2a88515f0fbb38c1311363e980f21f9dbc
 EBUILD netbeans-javafx-9999_p20160810.ebuild 4717 SHA256 be2ff064c773cccb936570329c34a9e7ded8b2f828900f8e1dc5ee795ca90cb8 SHA512 7388c4e446611d732fd99a19feb0d40642f14f24b31bb925f145abb0e021af94650e4332b958c8a3735711987f7cccba5e6d43605900211a0df3492cb39fd516 WHIRLPOOL e3d6a4e2e04ddb9168b8ffa7f160b940fc4c7bdc1fa01ba8503cf864d2cccd91269ccd732573e286c358dbebb7b9a7af9d508f1682e4d20b448c7c14d7581aea
 EBUILD netbeans-javafx-9999_p20160811.ebuild 4717 SHA256 aa97d551e078e76c618e59156c387dd7b69a9fe43e94283c6810564a9a73cc93 SHA512 bb533866435121a7aa1279e15d60e9420f221614ea8734049171935db76e8e316a55e015e00301f67f5a61cf0e127028b830ccf86dc2b170cea600743ba5dfaf WHIRLPOOL eb86310324d23670f959b8f9f010956089feb90d1b1da7aeaea1870e0411b3b565311161a5d65cf84028dfd7357d3e9956175053334b869470f7ef4c79b705a1
+EBUILD netbeans-javafx-9999_p20160812.ebuild 4717 SHA256 e39a39caee9853ea83fbf6da41367a0eae4d14f0a5428d9f964ed3ce9588393e SHA512 51652e4310b6b7ff169e9b51286c79e9770a2042cb0fc6e479d30e5ccaee0f7d4dbbe31a4ea5e735f4d85877256766d58332224a9ace1c34da8de9e58b41a672 WHIRLPOOL 3cdcfa6610dfe8e39017795da0b4964483f062d9da7b04c70bfb6bcc380312ecd7bb9af57490b6f90398bc6dad457fd367e2820968a74ec87534fcb857f621e7
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160812.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160812.ebuild
new file mode 100644
index 0000000..d24dddd
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160812.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-12_00-02-33/zip/netbeans-trunk-nightly-201608120002-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 8279cbb..394bad8 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c8519
 DIST netbeans-trunk-nightly-201608090002-src.zip 217056261 SHA256 f0a275e932b5948c00e24beae1eb599f8c0912fa905997b1ef7b11345fddf60c SHA512 81761482cbd5e238e1c2597a4b9bcc506b32c296e4d6c0785fa8fe69e1d1a6ddc9f4a7f6dcdb8ed816f366fb840e01a5d8003cf289bb1735be74f9906d6c7575 WHIRLPOOL 903eb7d99f8fecafca4f3a06a567a5994f0602431d29c74df1a300785b62f205e1257c1c4158cb2f7706a6c8bf70c7e3b7d7e6503a96bcaefb7411be0d701f70
 DIST netbeans-trunk-nightly-201608100002-src.zip 217066650 SHA256 35d4ea867e7626174a9b82264002f9aacfc3807ea14745d3548281f406c1ea84 SHA512 30b65ff7914a454995a5a6d022657cbc1256ab050ef6a1d217f7cdb2a5b054ab656cff966045184ade5c137d5400121e67800b5f1b4f0f2babf7d938c2d5d072 WHIRLPOOL 6e994f402b7d58ce68fb611d81daec1304a4c9400b9a785679b50ee6d3bb535bfbc35f374582b87a2ed08225b2112dcf91b8fa1148ffa097867bcbb7637583fe
 DIST netbeans-trunk-nightly-201608110002-src.zip 217074142 SHA256 1017ce540b38dcf7a1e6080e49e975255bfd4db72294c82e05ab67aafb92f407 SHA512 d6015ec2da1f2857457f36e1bcec5dd0e495265763f607ecdf0343fa34c52fee55f7fa31f8ed49c6595d370719fdf7c3d50e7bd9eedfe4fb5d1f73807bd20db9 WHIRLPOOL f59e8bbdca914e0732b37b21f1a8a76466bc095c1b18d5a5e1a785430fbe6713f1e9fe276f458c00f9df7253e3d5a8981dba1e8049e9f8924910031cd6e576c0
+DIST netbeans-trunk-nightly-201608120002-src.zip 217080929 SHA256 b8ef1d20faf0485e85cf44ba6ea77282d130efeeafd7caf58d1ae3a33bb5ee01 SHA512 eec5a8165446247e28fd9ecda21017c7d877f8199326565f4750e3631e5f58c66c60424b906782ebcd34e5e58e5810ed60399d3efc01877663821360538b798c WHIRLPOOL 6eae8a97f579b3e009b9ddec46cca6de1033591ecdbb962258d3c929f6768f49ebae96fb1013392d80a912271942d14f31920ccf3e3b69a732eea4313dc8558b
 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_p20160704.ebuild 4412 SHA256 8166ed2971b3111b7851c73425907f7c54a00fd1385ca2faea0907141b640c46 SHA512 fb9bb5e8e9e63dd969f7d0b96ae0290e29cbe92cd90372865917acc13297c935e06e97998092a0cc65a7590881ec776eb75b4605bffa796bcaeec9ef8b43ded9 WHIRLPOOL 7c2a27497595d2ed82a6cca087306b7d2080c297839d90e210598cb9ec2b7daa407bc8b2c144605a654b095a89611cc57b90767f12f02917d94481ffd986e13b
@@ -55,4 +56,5 @@ EBUILD netbeans-mobility-9999_p20160805.ebuild 4412 SHA256 a41d717864a56f05306e3
 EBUILD netbeans-mobility-9999_p20160809.ebuild 4412 SHA256 64a8d1049e3af6e36e2386a9ee1c2c59f789a24fec8df688fbe55b44e969ea1b SHA512 ffac090bbfb9c23db4d22652481bfec5631389d4e9f1ebe4cbbd59cd5829f3469cbea811f4e108c1b0172369954aec46e1e269d9ef25ce4175a1a04084d14500 WHIRLPOOL 77f45d36aacd88ad501435092784b17b2f79eeaf1ed654d571a6e7ba78f59f6ac8301064fb58f3324f484bb5fd1f34192649ff02269d9d63ac0c6db9ced4ba73
 EBUILD netbeans-mobility-9999_p20160810.ebuild 4412 SHA256 cd280829cca6440251317ef25077c330b23e334f55ff96b803473fb48ab9be87 SHA512 87bc01755479a4afdd35ae93dedd132ef086e640985a5bc565417ca62288b0c88f110780efe5b783f26c2551b5dd27fa9535a71a6a25257e37703aa2a3374d46 WHIRLPOOL 07f03982cf41da8a1d60b2b8c53308c379074cfe5eb50cc35906b88b42ecff005dafe0fbffe5fc9341596f6fb7461e3144608a3c00b5b44a486c7c7ac7fcbe58
 EBUILD netbeans-mobility-9999_p20160811.ebuild 4412 SHA256 c0bb5a7b01f0a4dcc17915a9466bee745b7383d2d63925037e358a69ad635961 SHA512 fc73136ce013098bfccbed1e44d508b6af2c9eb1ed729c5d6e54e831a891f698e3ee40d30f6e1aec2a423cc956ccf971af6b8724e70013b1815eb308b5c411cd WHIRLPOOL 914eebf0b73c8990db82daa2bf2a2f8574056c8ee5ea866b9d784924fe8cde198073de63d04189757066d0681ce5d99cd76befe8bfd1d35c906b261ad4352f61
+EBUILD netbeans-mobility-9999_p20160812.ebuild 4412 SHA256 d6de843c5ffa502c5a02080112dd3f0583e9ee9cfbed890fbb62e6ebed9fce72 SHA512 02ead7cd06079fada2b2e0da8bb053e48044a926e4cffd716d55552ba171f505ac4a9758a7dc81a020ea8e7eb23bedff668dd5939f790ac273f9cb5c7de729c1 WHIRLPOOL edbc044b25f826e2742f656bd37b272e7d711e5caed53179645f9dc7e250fcf461201aa10aa468b8a643f32b3b10a2f26c80696eeab9fa9752dbe7593d0c46f6
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160812.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160812.ebuild
new file mode 100644
index 0000000..9ac9bcb
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160812.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-12_00-02-33/zip/netbeans-trunk-nightly-201608120002-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 2036b74..eca156b 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c8519
 DIST netbeans-trunk-nightly-201608090002-src.zip 217056261 SHA256 f0a275e932b5948c00e24beae1eb599f8c0912fa905997b1ef7b11345fddf60c SHA512 81761482cbd5e238e1c2597a4b9bcc506b32c296e4d6c0785fa8fe69e1d1a6ddc9f4a7f6dcdb8ed816f366fb840e01a5d8003cf289bb1735be74f9906d6c7575 WHIRLPOOL 903eb7d99f8fecafca4f3a06a567a5994f0602431d29c74df1a300785b62f205e1257c1c4158cb2f7706a6c8bf70c7e3b7d7e6503a96bcaefb7411be0d701f70
 DIST netbeans-trunk-nightly-201608100002-src.zip 217066650 SHA256 35d4ea867e7626174a9b82264002f9aacfc3807ea14745d3548281f406c1ea84 SHA512 30b65ff7914a454995a5a6d022657cbc1256ab050ef6a1d217f7cdb2a5b054ab656cff966045184ade5c137d5400121e67800b5f1b4f0f2babf7d938c2d5d072 WHIRLPOOL 6e994f402b7d58ce68fb611d81daec1304a4c9400b9a785679b50ee6d3bb535bfbc35f374582b87a2ed08225b2112dcf91b8fa1148ffa097867bcbb7637583fe
 DIST netbeans-trunk-nightly-201608110002-src.zip 217074142 SHA256 1017ce540b38dcf7a1e6080e49e975255bfd4db72294c82e05ab67aafb92f407 SHA512 d6015ec2da1f2857457f36e1bcec5dd0e495265763f607ecdf0343fa34c52fee55f7fa31f8ed49c6595d370719fdf7c3d50e7bd9eedfe4fb5d1f73807bd20db9 WHIRLPOOL f59e8bbdca914e0732b37b21f1a8a76466bc095c1b18d5a5e1a785430fbe6713f1e9fe276f458c00f9df7253e3d5a8981dba1e8049e9f8924910031cd6e576c0
+DIST netbeans-trunk-nightly-201608120002-src.zip 217080929 SHA256 b8ef1d20faf0485e85cf44ba6ea77282d130efeeafd7caf58d1ae3a33bb5ee01 SHA512 eec5a8165446247e28fd9ecda21017c7d877f8199326565f4750e3631e5f58c66c60424b906782ebcd34e5e58e5810ed60399d3efc01877663821360538b798c WHIRLPOOL 6eae8a97f579b3e009b9ddec46cca6de1033591ecdbb962258d3c929f6768f49ebae96fb1013392d80a912271942d14f31920ccf3e3b69a732eea4313dc8558b
 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_p20160704.ebuild 4111 SHA256 e2a1051b907b8d24a2db073f53741bafe90be2456f76d6b98c6db81219606486 SHA512 f87e748974287662c73ea951b9e100a806af65877c6b5271b04f2b3afa328ddc2f42768a18f9a74701a5c9e9c42cc52dc87cee623fbfdcebaae6df9053c71d0e WHIRLPOOL 1fe3f3425bd650b2b22d946f887a0cb77255e84a8897fa37a4d388247ea2ed4602cc1ad88f8e68a2a3fea97870ec809ed34a1275da38b2a9c0fd11cbfd57f208
@@ -58,4 +59,5 @@ EBUILD netbeans-nb-9999_p20160805.ebuild 4111 SHA256 09bb7fee378ce42b8e5227641d5
 EBUILD netbeans-nb-9999_p20160809.ebuild 4111 SHA256 6d55df0ddaba364166e03ccaca27601db8078d105e0428d0f746215b91c94826 SHA512 9b89877aa985d8ea34f12a51cacd1a5d987a6972b8b2cec78adbdf1d69b633a26843c35c7019ccc2580e2081ceb9f73b959d6d7aa45f1e35569a3b365ed36a67 WHIRLPOOL 920a5db9e591874cd639ace9ad8306dec85dd60e8fc0dde304bfe55fbc37a73e59fe3f66b2b965f303e68bb9b376992503bc9dbe6b048454904a71bc08c3cbdd
 EBUILD netbeans-nb-9999_p20160810.ebuild 4111 SHA256 2f18c1e149f78993ee041d9b2d7e1fb1213e1370ad593ba93bf1f57929672160 SHA512 b30449fa75cd15901a7f55a33d04c78022d8894627779e2a3c395005bdfd2c0f3de2ea03ced4996e6e45afaf6a22ffd558df8599a38357715e96f50088b667a0 WHIRLPOOL f26cc4746d819dce6f2c7d7df9cb80945cb2306f55db927846fee00ee88f1285c0712fcc80f6f855ec5c9474786941beeeb6c2ca4793723df0fc819a832bb558
 EBUILD netbeans-nb-9999_p20160811.ebuild 4111 SHA256 92d2f57cf102246f715411e55ba6be96c55809d40de8e30e72a02a2a3368113f SHA512 f8566cc9f290d9a8f5f9c58b89ab121c92958859cd8ccec125036ecc6c72d5132a682b2a1bb7a5c9ea37a96f8fc0b7b2deb676ab9321f7638b89b15ebae0f28e WHIRLPOOL cf24613ef3e2a205687242feab0f43f386f1ad6997849ac2a3e2909ebd27bf6d20bd7f4bbced4b2b2d2dfa7a515dbbe17d5b25a6eb5a01d45c7cd969aa2c799c
+EBUILD netbeans-nb-9999_p20160812.ebuild 4111 SHA256 9a77c9f46254b94bf7442da8f6818e045030c48ea1ce18e2ed8a28434601d003 SHA512 4a43566ea132efbe1e6b498159fb7f782330372d918fb94c7d1c03ce7a29d78be08beb39ec13ac31a17b3f03d974006b4680266523a3ad9a023dcdb185c50be8 WHIRLPOOL b915015597789532dd53b6373a5fed551eb9a986d33e7d736b4610cff9b7d842530f099ee9625f47c893bc3ef7b90da1ebddd725226db4782aa47c643a4a534b
 MISC metadata.xml 392 SHA256 01cdbcc83099b97486bd7b8e813e5b19c1138eb0d8d3e8a5683aafd579820435 SHA512 4d2f9160baa022d6a48b61d5f42e71cfd411d244e7a36436629bc5ee4036e4ce19079134d9a6c704ebe942306c2e0199d0591c1e54f92f8f3c8835147e639246 WHIRLPOOL c1131764e1cec66c56b977ebe36014b29e5a68e35ccc326c0cbadd050a6c625cf191c85c212e0a733661c008dab0d99f9a4cdc4c4ae0cc9d775ba1de554795a9

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160812.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160812.ebuild
new file mode 100644
index 0000000..78a41c5
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20160812.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-12_00-02-33/zip/netbeans-trunk-nightly-201608120002-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 f915be6..8e0e0fd 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c8519
 DIST netbeans-trunk-nightly-201608090002-src.zip 217056261 SHA256 f0a275e932b5948c00e24beae1eb599f8c0912fa905997b1ef7b11345fddf60c SHA512 81761482cbd5e238e1c2597a4b9bcc506b32c296e4d6c0785fa8fe69e1d1a6ddc9f4a7f6dcdb8ed816f366fb840e01a5d8003cf289bb1735be74f9906d6c7575 WHIRLPOOL 903eb7d99f8fecafca4f3a06a567a5994f0602431d29c74df1a300785b62f205e1257c1c4158cb2f7706a6c8bf70c7e3b7d7e6503a96bcaefb7411be0d701f70
 DIST netbeans-trunk-nightly-201608100002-src.zip 217066650 SHA256 35d4ea867e7626174a9b82264002f9aacfc3807ea14745d3548281f406c1ea84 SHA512 30b65ff7914a454995a5a6d022657cbc1256ab050ef6a1d217f7cdb2a5b054ab656cff966045184ade5c137d5400121e67800b5f1b4f0f2babf7d938c2d5d072 WHIRLPOOL 6e994f402b7d58ce68fb611d81daec1304a4c9400b9a785679b50ee6d3bb535bfbc35f374582b87a2ed08225b2112dcf91b8fa1148ffa097867bcbb7637583fe
 DIST netbeans-trunk-nightly-201608110002-src.zip 217074142 SHA256 1017ce540b38dcf7a1e6080e49e975255bfd4db72294c82e05ab67aafb92f407 SHA512 d6015ec2da1f2857457f36e1bcec5dd0e495265763f607ecdf0343fa34c52fee55f7fa31f8ed49c6595d370719fdf7c3d50e7bd9eedfe4fb5d1f73807bd20db9 WHIRLPOOL f59e8bbdca914e0732b37b21f1a8a76466bc095c1b18d5a5e1a785430fbe6713f1e9fe276f458c00f9df7253e3d5a8981dba1e8049e9f8924910031cd6e576c0
+DIST netbeans-trunk-nightly-201608120002-src.zip 217080929 SHA256 b8ef1d20faf0485e85cf44ba6ea77282d130efeeafd7caf58d1ae3a33bb5ee01 SHA512 eec5a8165446247e28fd9ecda21017c7d877f8199326565f4750e3631e5f58c66c60424b906782ebcd34e5e58e5810ed60399d3efc01877663821360538b798c WHIRLPOOL 6eae8a97f579b3e009b9ddec46cca6de1033591ecdbb962258d3c929f6768f49ebae96fb1013392d80a912271942d14f31920ccf3e3b69a732eea4313dc8558b
 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_p20160704.ebuild 4418 SHA256 00d1ed6228d6465df71e721b11bc4cfe46eb5bc00458cbaf138959147b52b361 SHA512 84d6c119ff17db2f4e5027ab7bb9ac0e617c7e5855de53643a3e1e63425f36abd076f11300ba0d01616a28872288c6f4a40fe070dd515956c8d6f80282ffd360 WHIRLPOOL 4c6521587826815e05baa69796029404fc2d5a88bed3f7eae969f7f7bfe34e6ec7992ea9260fbbf8d992b7d813e1b5dfaa4f2866fdd320f48023ddc3d2b8ba52
@@ -60,4 +61,5 @@ EBUILD netbeans-php-9999_p20160805.ebuild 4418 SHA256 ca5953e1f7771dca5d26be7bc8
 EBUILD netbeans-php-9999_p20160809.ebuild 4418 SHA256 ba12af974c54f01510fb34d85c8ccee40e3049c1faf013547264c0f433df8965 SHA512 b1797ef8b7b8fddf51e539b2dccf39b04f4df50f3f7f75d7717be2da1cb14ea91dbef8f5bd652f946d8a54285d99846275af2e5e47807ffe1dffba3bf41d41c2 WHIRLPOOL dca0cbbb2ae9c298152087ee9a17e760639c04b06b560928e6d474dd1d5c168df956036c09aa33de81a9133c354dea96598c3f0cd4fdf5dfd1d4a5204b7902ba
 EBUILD netbeans-php-9999_p20160810.ebuild 4418 SHA256 4465cb2f456c38e86ebeb02d25086bf15d3a3c9f883199bec7ad21eb16484608 SHA512 2579a7da9c09d72be04e7ceb11dabfd257ca02ef39de344dcfc5f2bbe50c10eabca5193398f431a68d6843176b9444ac54775dc6596d38bb1b6ada87fc443f50 WHIRLPOOL c486d1e114367bcb03d7842e5547112813bfb58ffc420d0fb12f518ca6d3a03f4b2d8c59886a277d005c52f3a6d138ae9de3a4bf11e055bfde460c2417e50bc5
 EBUILD netbeans-php-9999_p20160811.ebuild 4418 SHA256 2f8b3517de2cc4c025e14c48c0ce7bec523f4bb7a804dbe885de61990ff05866 SHA512 ec1fba415aa64f4b5ec03e559cc7469d7fc62c78507b5f83567e182c1a5761372a5761689f1a8f4099274188932bfb592f86397c7296e8bd9cf1f5cf5a5ed549 WHIRLPOOL e3e2436adb9b1dacaf64cff2bd80a056f8ccaf2da658912c124d7be436baab614d4da93724cbc07a68156d757108aea6bfe39ac8f1c033d601c1bbc023c6d74e
+EBUILD netbeans-php-9999_p20160812.ebuild 4418 SHA256 533fdad60f1f91d711f2d9ab95581256f2ba18f7b3e936c3a7144762545aed54 SHA512 018f38a567c1d1aba4356f895c5ac1f20f626c3679fed97a515ad8254fdf266270b61db7d10353409b1300657b96e93e0940c101e5167c056551d10703b166ec WHIRLPOOL 1639121302bc7d0b295e7fac2984e9eeb889d951e036cfab1d061acb4f49e5d66d4055a78c05c7cb4bb209e8e6cf544d173dcf8d735bf28a50d84554a05da226
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160812.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160812.ebuild
new file mode 100644
index 0000000..7297ed6
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20160812.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-12_00-02-33/zip/netbeans-trunk-nightly-201608120002-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 7f52783..5d75f65 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -54,6 +54,7 @@ DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c8519
 DIST netbeans-trunk-nightly-201608090002-src.zip 217056261 SHA256 f0a275e932b5948c00e24beae1eb599f8c0912fa905997b1ef7b11345fddf60c SHA512 81761482cbd5e238e1c2597a4b9bcc506b32c296e4d6c0785fa8fe69e1d1a6ddc9f4a7f6dcdb8ed816f366fb840e01a5d8003cf289bb1735be74f9906d6c7575 WHIRLPOOL 903eb7d99f8fecafca4f3a06a567a5994f0602431d29c74df1a300785b62f205e1257c1c4158cb2f7706a6c8bf70c7e3b7d7e6503a96bcaefb7411be0d701f70
 DIST netbeans-trunk-nightly-201608100002-src.zip 217066650 SHA256 35d4ea867e7626174a9b82264002f9aacfc3807ea14745d3548281f406c1ea84 SHA512 30b65ff7914a454995a5a6d022657cbc1256ab050ef6a1d217f7cdb2a5b054ab656cff966045184ade5c137d5400121e67800b5f1b4f0f2babf7d938c2d5d072 WHIRLPOOL 6e994f402b7d58ce68fb611d81daec1304a4c9400b9a785679b50ee6d3bb535bfbc35f374582b87a2ed08225b2112dcf91b8fa1148ffa097867bcbb7637583fe
 DIST netbeans-trunk-nightly-201608110002-src.zip 217074142 SHA256 1017ce540b38dcf7a1e6080e49e975255bfd4db72294c82e05ab67aafb92f407 SHA512 d6015ec2da1f2857457f36e1bcec5dd0e495265763f607ecdf0343fa34c52fee55f7fa31f8ed49c6595d370719fdf7c3d50e7bd9eedfe4fb5d1f73807bd20db9 WHIRLPOOL f59e8bbdca914e0732b37b21f1a8a76466bc095c1b18d5a5e1a785430fbe6713f1e9fe276f458c00f9df7253e3d5a8981dba1e8049e9f8924910031cd6e576c0
+DIST netbeans-trunk-nightly-201608120002-src.zip 217080929 SHA256 b8ef1d20faf0485e85cf44ba6ea77282d130efeeafd7caf58d1ae3a33bb5ee01 SHA512 eec5a8165446247e28fd9ecda21017c7d877f8199326565f4750e3631e5f58c66c60424b906782ebcd34e5e58e5810ed60399d3efc01877663821360538b798c WHIRLPOOL 6eae8a97f579b3e009b9ddec46cca6de1033591ecdbb962258d3c929f6768f49ebae96fb1013392d80a912271942d14f31920ccf3e3b69a732eea4313dc8558b
 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_p20160704.ebuild 9520 SHA256 9a48a158cdeb133516fd4f7b041626608d58d100ea529cef8af2b7dffa762865 SHA512 32e05bc7776eddeb2b539811d37c03579c7d93adcbb8ba72777948d37df471451e95b5eff6378b57510af33f3e5865b6397cb4657a6b8bb7079f7856eb3387e4 WHIRLPOOL 906d81b0de79c2e3e053204d1847cbe43ec3e306a1c5dd728bd47e7f52da18352d274de03dcb59de53f20ffd73d0805f95d1fe76e797241b4df833d396775ea8
@@ -81,4 +82,5 @@ EBUILD netbeans-platform-9999_p20160805.ebuild 9520 SHA256 546ab9250584d86027340
 EBUILD netbeans-platform-9999_p20160809.ebuild 9520 SHA256 d4e9b26a05bb74dc0537ef1cff826eb21dd881c0de1ea1f4d65c6ffac6a13ce9 SHA512 050917dce2edf1fb10571f4e91d24d62c0e3ff317dc9e96109105695de646c4d76151486501a4ef98bec17fda8e6c97e6eb409e265a93fdd46646b8948b860a2 WHIRLPOOL ce6543e916a0e55fcde658c11a3f9bd29cf59a336b1ad5fd7186de5778cd5a2c515b1c1be80136a876188e236b9d1668304ad945c1987d512af96b396a2f8240
 EBUILD netbeans-platform-9999_p20160810.ebuild 9520 SHA256 92043353007c246c8eeed16f8b530f3d97b73d81828fea5c6015d3cdc7c27b85 SHA512 0e18369a638ca9e9e97650a5f6ac04fde0c0ae8cc4c7b3a08284c01e8ab1ebce96b8c8bd50bab091c6e94d3d445bc0862fb98051cbee106a5cfad60afda97b86 WHIRLPOOL ce231df370b1b68a4f4e180d50c87a91378d830b92a724387bad2e57910318715cc702b67e266d4f3af9df3556fd24e711a4930b87590024f7dd65afef414529
 EBUILD netbeans-platform-9999_p20160811.ebuild 9520 SHA256 e629587fe1666ddac011a1f07fa6f8b133b7430a8ea76d4dd9a0de3554443b49 SHA512 1ba6f2a3ca7dc2c5c434804846dad99b29e71a90d1002aa7d12823ac5e8478e1329ab99237c6b7c0658cc1f0f42b86a3394909634d1a94364b4f05efefa5f914 WHIRLPOOL 56621f8e2dc6239ef0fe5c3bf5b1f09591ce7cd844dd53ec14c2be5710dc48e772e4aec6e6baefe67f870abbbae387c994d3836e5b41ca4e4be3380d9fe700f4
+EBUILD netbeans-platform-9999_p20160812.ebuild 9520 SHA256 9af76f8a500e2f1e81e0096afb4f83d578872223dd1a37d77951f8ca3ce0c17d SHA512 8f257810044a515e07bb05b724a5eb1cd0496794881169d86bcd8a73bc444c66c2075c54afd867000d5df033c8e4320cd6e540828c5457f889b5e32f239f1848 WHIRLPOOL 83f937774e0a6cd416299f884aac537c75cf8cfa9d13efbee5f7be1bc04766058a8ccfe5707dfc534b07b2bcecc235410b81783891b2a7255dcb629f1af11c81
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160812.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160812.ebuild
new file mode 100644
index 0000000..22a9ebe
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20160812.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-12_00-02-33/zip/netbeans-trunk-nightly-201608120002-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 7a09acd..1389e4f 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c8519
 DIST netbeans-trunk-nightly-201608090002-src.zip 217056261 SHA256 f0a275e932b5948c00e24beae1eb599f8c0912fa905997b1ef7b11345fddf60c SHA512 81761482cbd5e238e1c2597a4b9bcc506b32c296e4d6c0785fa8fe69e1d1a6ddc9f4a7f6dcdb8ed816f366fb840e01a5d8003cf289bb1735be74f9906d6c7575 WHIRLPOOL 903eb7d99f8fecafca4f3a06a567a5994f0602431d29c74df1a300785b62f205e1257c1c4158cb2f7706a6c8bf70c7e3b7d7e6503a96bcaefb7411be0d701f70
 DIST netbeans-trunk-nightly-201608100002-src.zip 217066650 SHA256 35d4ea867e7626174a9b82264002f9aacfc3807ea14745d3548281f406c1ea84 SHA512 30b65ff7914a454995a5a6d022657cbc1256ab050ef6a1d217f7cdb2a5b054ab656cff966045184ade5c137d5400121e67800b5f1b4f0f2babf7d938c2d5d072 WHIRLPOOL 6e994f402b7d58ce68fb611d81daec1304a4c9400b9a785679b50ee6d3bb535bfbc35f374582b87a2ed08225b2112dcf91b8fa1148ffa097867bcbb7637583fe
 DIST netbeans-trunk-nightly-201608110002-src.zip 217074142 SHA256 1017ce540b38dcf7a1e6080e49e975255bfd4db72294c82e05ab67aafb92f407 SHA512 d6015ec2da1f2857457f36e1bcec5dd0e495265763f607ecdf0343fa34c52fee55f7fa31f8ed49c6595d370719fdf7c3d50e7bd9eedfe4fb5d1f73807bd20db9 WHIRLPOOL f59e8bbdca914e0732b37b21f1a8a76466bc095c1b18d5a5e1a785430fbe6713f1e9fe276f458c00f9df7253e3d5a8981dba1e8049e9f8924910031cd6e576c0
+DIST netbeans-trunk-nightly-201608120002-src.zip 217080929 SHA256 b8ef1d20faf0485e85cf44ba6ea77282d130efeeafd7caf58d1ae3a33bb5ee01 SHA512 eec5a8165446247e28fd9ecda21017c7d877f8199326565f4750e3631e5f58c66c60424b906782ebcd34e5e58e5810ed60399d3efc01877663821360538b798c WHIRLPOOL 6eae8a97f579b3e009b9ddec46cca6de1033591ecdbb962258d3c929f6768f49ebae96fb1013392d80a912271942d14f31920ccf3e3b69a732eea4313dc8558b
 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_p20160704.ebuild 3472 SHA256 a1af52990353646259df8954ce56388655a96796153e0731b14ec6cddd47ecfa SHA512 04e27a0ac592d4a5b52cf07584cb29d93f1a7e8834f29026661b711e4683d9716260916f3658eb42ba1ee7444962ed5fc57d838a8b78ad8558d09661ddd63476 WHIRLPOOL df399c80001ab63c840b3503cc7e209225464423f15cdca9f6b253034fa935656f81beb5727d0378aebf76054ff1a30d2f009faaacf1327d89bb6117efd1967b
@@ -55,4 +56,5 @@ EBUILD netbeans-profiler-9999_p20160805.ebuild 3472 SHA256 a69831eec96d1ff1b001d
 EBUILD netbeans-profiler-9999_p20160809.ebuild 3472 SHA256 e48396e4beb2dce00ebd932c68cecbbc7fe2ce22727ec8318f70538b1d49cea9 SHA512 4a3f3abbcce7ecbbc226a3bed28347c2dbf434b8ecc34c9c61507f20d42f9eb8b74ef2a39307672be681920505bb2d2aca4ef934ff567c2bda6bec941ef5a9e8 WHIRLPOOL feb603f6cd04c67bc0308f1a54a7c5acc83fe325b089d0f01d06c3c99119b6649a76330a659d56b22d976afbd9de6c39f3b4e7a0a1416a1ae7370a0eb0503de6
 EBUILD netbeans-profiler-9999_p20160810.ebuild 3472 SHA256 ecfb457f27546ce9618e0eac877cb9d5c654c7a6c66688c38a168d1d496168e5 SHA512 4d479b91e225a32064afe3dca568d663d82c6293d4c6688ec816d99ede08d89911641c9c4de29cc547d62323e75387fac6120322f4d7aaf037a3157959e9762a WHIRLPOOL fcc8cc19b046c2af2df4f6962eabf94c2dff360c1ac4417c418907a488b470bd769374bc1b1b035b3e88a2fb8439b4b281efbfdebd1c920eefc0f737a94970ff
 EBUILD netbeans-profiler-9999_p20160811.ebuild 3472 SHA256 40ebc955c13567df6cc822e56d6735275acf87a0d965940e0bf7d2709a85b614 SHA512 5e585b85cbd093f7b997b6473ba1fc9e8ed2086f56b99c4c7aeefa0dd83bf563d1747dc884f00736d397ee65e0d203f13c7089ca7e813860036067bae356616b WHIRLPOOL 1457d7588126293405a4107acf5aebf7c456bdd483d544986d597a6daab6f2792070fe2fb3436fa5f609f3d18997e86974a2c492d93eaaa6f3ae0142daac29d8
+EBUILD netbeans-profiler-9999_p20160812.ebuild 3472 SHA256 5ec4c4bd8af171fb3f83673060757e54efe1b13552f45e84e4dc462561626567 SHA512 cadf9c4d2c5f8e19eb5794a54c6995d071cdcf242be8a056e5ae095c773a2e7d48ca959834b83300a71c8fe0b2fe0a09416356ec2b93d91c7f57fccd1ce786cf WHIRLPOOL 2c7690da5718c9646c7d34e2bf517f0b38d06903870f5a24870606e04b426b77cd1be95cd283c6f922e89c469bcdb4dfdbeada3079f673b2e5841fd500b299a2
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160812.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160812.ebuild
new file mode 100644
index 0000000..fda2322
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160812.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-12_00-02-33/zip/netbeans-trunk-nightly-201608120002-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 de05e55..a06b9c6 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -49,6 +49,7 @@ DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c8519
 DIST netbeans-trunk-nightly-201608090002-src.zip 217056261 SHA256 f0a275e932b5948c00e24beae1eb599f8c0912fa905997b1ef7b11345fddf60c SHA512 81761482cbd5e238e1c2597a4b9bcc506b32c296e4d6c0785fa8fe69e1d1a6ddc9f4a7f6dcdb8ed816f366fb840e01a5d8003cf289bb1735be74f9906d6c7575 WHIRLPOOL 903eb7d99f8fecafca4f3a06a567a5994f0602431d29c74df1a300785b62f205e1257c1c4158cb2f7706a6c8bf70c7e3b7d7e6503a96bcaefb7411be0d701f70
 DIST netbeans-trunk-nightly-201608100002-src.zip 217066650 SHA256 35d4ea867e7626174a9b82264002f9aacfc3807ea14745d3548281f406c1ea84 SHA512 30b65ff7914a454995a5a6d022657cbc1256ab050ef6a1d217f7cdb2a5b054ab656cff966045184ade5c137d5400121e67800b5f1b4f0f2babf7d938c2d5d072 WHIRLPOOL 6e994f402b7d58ce68fb611d81daec1304a4c9400b9a785679b50ee6d3bb535bfbc35f374582b87a2ed08225b2112dcf91b8fa1148ffa097867bcbb7637583fe
 DIST netbeans-trunk-nightly-201608110002-src.zip 217074142 SHA256 1017ce540b38dcf7a1e6080e49e975255bfd4db72294c82e05ab67aafb92f407 SHA512 d6015ec2da1f2857457f36e1bcec5dd0e495265763f607ecdf0343fa34c52fee55f7fa31f8ed49c6595d370719fdf7c3d50e7bd9eedfe4fb5d1f73807bd20db9 WHIRLPOOL f59e8bbdca914e0732b37b21f1a8a76466bc095c1b18d5a5e1a785430fbe6713f1e9fe276f458c00f9df7253e3d5a8981dba1e8049e9f8924910031cd6e576c0
+DIST netbeans-trunk-nightly-201608120002-src.zip 217080929 SHA256 b8ef1d20faf0485e85cf44ba6ea77282d130efeeafd7caf58d1ae3a33bb5ee01 SHA512 eec5a8165446247e28fd9ecda21017c7d877f8199326565f4750e3631e5f58c66c60424b906782ebcd34e5e58e5810ed60399d3efc01877663821360538b798c WHIRLPOOL 6eae8a97f579b3e009b9ddec46cca6de1033591ecdbb962258d3c929f6768f49ebae96fb1013392d80a912271942d14f31920ccf3e3b69a732eea4313dc8558b
 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_p20160704.ebuild 6242 SHA256 27158da014ce1d4f743b6ab16058ba1abb528b05b512075e5d34b061237be00e SHA512 1a56881a912a67fdb6691b36c596fc72667134a788b668e3278235006815c4869a2b55755de24d9ad73c8c783a093a5d9f0ab4fb9ceccd8bf6dd7bf8fc0b56e3 WHIRLPOOL 1e69d63511f223746da904e1c97cc392991b78d02b6b7439a85c5296ae82df9c78da4b4fd93df8869d463b171ad7cc684a4dbe763922110aa40126be228f9466
@@ -76,4 +77,5 @@ EBUILD netbeans-webcommon-9999_p20160805.ebuild 6242 SHA256 d4360b1017f3d9da2542
 EBUILD netbeans-webcommon-9999_p20160809.ebuild 6242 SHA256 be4bbfe8b2da33a58e613abc7a1392bf87ad4ea4db306d9a195c79577ecee91a SHA512 7ce16484c42d7410a345e6863e235da5684b41a213d4443bc9a7a54504221263e174d4a19f3a7a5f60a2221f0104952852ea0d11d94704f549fd6de63a234f02 WHIRLPOOL b9196a94d64e4ce1622bae5d60c567307393bba074797f106a5d4f94419d6ea406d30524305fabf1655e88f7ca5cde99448a2d6b6ea0e0a732278829289ccb1a
 EBUILD netbeans-webcommon-9999_p20160810.ebuild 6242 SHA256 33b37a35482f6494a9dad940e8df49a42d2ffc944d3cd14879bf568f9c478fd2 SHA512 494f1923e998bcc51d3d2ab2b0f321494d80d4a0b142f9f39cd0d0488b1ec0b1830bba00866080c99c9f70f9e89c6f66f50e6cbd8a748e717ecfcfb16f609298 WHIRLPOOL ed2a307b515cfe4b285c3cecbc0877f03aa65ef7b94c001090a382bb000b314c366c93aafda9053905694c7856608750e9e5cccd419da20b5fa2e302be8b22ec
 EBUILD netbeans-webcommon-9999_p20160811.ebuild 6242 SHA256 7a1de285db5bf93873be99d283c17b8484555dbfce38137fcc3b1da6a7b00e2a SHA512 20e2183baea0fc815a0e6860c1b55d08d5c0d5a4e3a05da0efa3a138235099a8c91a40e29c1f890d5ef5c89c791e2052cf1c9a7e6d6af0c92d591ea667adfd30 WHIRLPOOL 8e2377e977251f3ae685543f7687c46bfc1eb99355ae0e3c0e3ae326a6b875332544edf58d178f11d70f99da107602fef03f94d32f1da86479b67da4dae7d49e
+EBUILD netbeans-webcommon-9999_p20160812.ebuild 6242 SHA256 c8605b0e463e3a85b7158d1d63fda596f97b4f561b519546ff00d101fabac0f5 SHA512 1492d26fb549ceef35ec55b19acb123667a027e6f67e25f65aea9071fdc194649a1225ff2efb99401f4668ec0de47cfac65c707d6b3ca71d593fae38aa5b6672 WHIRLPOOL 9afcc76d69909b061b7775a4f8485f6a49a0b8c7880bd2baa41ced18815853e3803e179589e3d4abdb38862dc82cf8beb6aea9bcae4c231961935af24a6bdd1d
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160812.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160812.ebuild
new file mode 100644
index 0000000..1ab4f5e
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160812.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-12_00-02-33/zip/netbeans-trunk-nightly-201608120002-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 a395416..62a6b88 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c8519
 DIST netbeans-trunk-nightly-201608090002-src.zip 217056261 SHA256 f0a275e932b5948c00e24beae1eb599f8c0912fa905997b1ef7b11345fddf60c SHA512 81761482cbd5e238e1c2597a4b9bcc506b32c296e4d6c0785fa8fe69e1d1a6ddc9f4a7f6dcdb8ed816f366fb840e01a5d8003cf289bb1735be74f9906d6c7575 WHIRLPOOL 903eb7d99f8fecafca4f3a06a567a5994f0602431d29c74df1a300785b62f205e1257c1c4158cb2f7706a6c8bf70c7e3b7d7e6503a96bcaefb7411be0d701f70
 DIST netbeans-trunk-nightly-201608100002-src.zip 217066650 SHA256 35d4ea867e7626174a9b82264002f9aacfc3807ea14745d3548281f406c1ea84 SHA512 30b65ff7914a454995a5a6d022657cbc1256ab050ef6a1d217f7cdb2a5b054ab656cff966045184ade5c137d5400121e67800b5f1b4f0f2babf7d938c2d5d072 WHIRLPOOL 6e994f402b7d58ce68fb611d81daec1304a4c9400b9a785679b50ee6d3bb535bfbc35f374582b87a2ed08225b2112dcf91b8fa1148ffa097867bcbb7637583fe
 DIST netbeans-trunk-nightly-201608110002-src.zip 217074142 SHA256 1017ce540b38dcf7a1e6080e49e975255bfd4db72294c82e05ab67aafb92f407 SHA512 d6015ec2da1f2857457f36e1bcec5dd0e495265763f607ecdf0343fa34c52fee55f7fa31f8ed49c6595d370719fdf7c3d50e7bd9eedfe4fb5d1f73807bd20db9 WHIRLPOOL f59e8bbdca914e0732b37b21f1a8a76466bc095c1b18d5a5e1a785430fbe6713f1e9fe276f458c00f9df7253e3d5a8981dba1e8049e9f8924910031cd6e576c0
+DIST netbeans-trunk-nightly-201608120002-src.zip 217080929 SHA256 b8ef1d20faf0485e85cf44ba6ea77282d130efeeafd7caf58d1ae3a33bb5ee01 SHA512 eec5a8165446247e28fd9ecda21017c7d877f8199326565f4750e3631e5f58c66c60424b906782ebcd34e5e58e5810ed60399d3efc01877663821360538b798c WHIRLPOOL 6eae8a97f579b3e009b9ddec46cca6de1033591ecdbb962258d3c929f6768f49ebae96fb1013392d80a912271942d14f31920ccf3e3b69a732eea4313dc8558b
 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_p20160704.ebuild 2721 SHA256 ff9eba591e89477f019a53dc4b82784c1173abcf508fddd51ca69367a038857d SHA512 ce9dc4e8e5c24fbfd6b6628736c094c337acab0d2adc1a878c575f3731755d975b209c4f670eb66da75e1853681110d4b2273d8e8b1d3b2a493530e2452a954f WHIRLPOOL 1f22220757c374f5e32e3d9e6edfa79c928ccf80cd9b0e658b1b582456ffac4c31bdcc252a2e6b2fef508329f7f58bc5a16dd3067da3360e5853065724a9df20
@@ -55,4 +56,5 @@ EBUILD netbeans-websvccommon-9999_p20160805.ebuild 2721 SHA256 5d067a2efa2ccff44
 EBUILD netbeans-websvccommon-9999_p20160809.ebuild 2721 SHA256 83c47f4cd0e28ca7c088d4dba8a311892d0313d0528bb38cabad89e1a5018a5f SHA512 b1dadd45bf979a8f8e351d82eda8f8445c049c77655d889415e7d6418667d368f3d38e5428ff866559e12fa6f0c15529e65deb16e4f9039007d0e1c55458f05f WHIRLPOOL 82fbec856d51fd38e1e055dd7eacd1109867ba97b865488313cde171c37c288846898c25c9eb229ed3868728b619fc35c0f6561a24a20e18cda3db18bdcb2805
 EBUILD netbeans-websvccommon-9999_p20160810.ebuild 2721 SHA256 b9c125ce2dfef4fe9f4deca1ceafae6a44cb617986dd9b5ff508015f4fdd289a SHA512 cf927e0af945f02a46b75b626a2235601362f6d1f38dfc029644f5c3b60005e6ff1dc6a919806a1d801f8d5cdd4f296d341bea1b6ddc15437e94cccc51a79a1d WHIRLPOOL 413bead7049b1a82bddf71011ce31c4ca5b193fddc4dd3b073ab81103cd365421623e013c122ccf5c05f7d59023167fbdb2394d11827125d864d33aa1eb17f8e
 EBUILD netbeans-websvccommon-9999_p20160811.ebuild 2721 SHA256 7c6b58d731020f6954ad47ac559fa874a9db232c08efe3a6f08896c1554c3993 SHA512 3e74eaf9753827c70fe03fc3e48472c56940b2721782e7e1e1a8f259233c238d2ac637d58673ada8d4f46cf2a323ffeecb07abb6c2eb11234b91f08f78559e8d WHIRLPOOL 99727f343f75d2cfbdde30e97a63e66bde44922083b5ba465b407ca806096a20b6ced4cd3ee384bacc2a787bc44bacc2603c16368d2952cedc7130b533fcd79e
+EBUILD netbeans-websvccommon-9999_p20160812.ebuild 2721 SHA256 f53cfc56c4a1a2fc3d23a4905e939b35bc2f3de333a6a524fc6c345fd1140248 SHA512 ac2af3f63c56049f68e644668c9cdaf1afcbd15ed569ff3456da1dab0480b158fbe9e1dfec2eb2a2155d9851af44c513fc8b0fbab0cb909658fb2dad426d1117 WHIRLPOOL edb17270f4612d7127074b408f188ca2e069e0bfa4849f79fc54c4de27beb27fb3f88bad174873d26eea5aa1ca51a6d66a2fe0b688e4b569c68872a4069af409
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160812.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160812.ebuild
new file mode 100644
index 0000000..1c511db
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160812.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-12_00-02-33/zip/netbeans-trunk-nightly-201608120002-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 81ab466..6dd31d3 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201608050002-src.zip 217051880 SHA256 954da5c25c8519
 DIST netbeans-trunk-nightly-201608090002-src.zip 217056261 SHA256 f0a275e932b5948c00e24beae1eb599f8c0912fa905997b1ef7b11345fddf60c SHA512 81761482cbd5e238e1c2597a4b9bcc506b32c296e4d6c0785fa8fe69e1d1a6ddc9f4a7f6dcdb8ed816f366fb840e01a5d8003cf289bb1735be74f9906d6c7575 WHIRLPOOL 903eb7d99f8fecafca4f3a06a567a5994f0602431d29c74df1a300785b62f205e1257c1c4158cb2f7706a6c8bf70c7e3b7d7e6503a96bcaefb7411be0d701f70
 DIST netbeans-trunk-nightly-201608100002-src.zip 217066650 SHA256 35d4ea867e7626174a9b82264002f9aacfc3807ea14745d3548281f406c1ea84 SHA512 30b65ff7914a454995a5a6d022657cbc1256ab050ef6a1d217f7cdb2a5b054ab656cff966045184ade5c137d5400121e67800b5f1b4f0f2babf7d938c2d5d072 WHIRLPOOL 6e994f402b7d58ce68fb611d81daec1304a4c9400b9a785679b50ee6d3bb535bfbc35f374582b87a2ed08225b2112dcf91b8fa1148ffa097867bcbb7637583fe
 DIST netbeans-trunk-nightly-201608110002-src.zip 217074142 SHA256 1017ce540b38dcf7a1e6080e49e975255bfd4db72294c82e05ab67aafb92f407 SHA512 d6015ec2da1f2857457f36e1bcec5dd0e495265763f607ecdf0343fa34c52fee55f7fa31f8ed49c6595d370719fdf7c3d50e7bd9eedfe4fb5d1f73807bd20db9 WHIRLPOOL f59e8bbdca914e0732b37b21f1a8a76466bc095c1b18d5a5e1a785430fbe6713f1e9fe276f458c00f9df7253e3d5a8981dba1e8049e9f8924910031cd6e576c0
+DIST netbeans-trunk-nightly-201608120002-src.zip 217080929 SHA256 b8ef1d20faf0485e85cf44ba6ea77282d130efeeafd7caf58d1ae3a33bb5ee01 SHA512 eec5a8165446247e28fd9ecda21017c7d877f8199326565f4750e3631e5f58c66c60424b906782ebcd34e5e58e5810ed60399d3efc01877663821360538b798c WHIRLPOOL 6eae8a97f579b3e009b9ddec46cca6de1033591ecdbb962258d3c929f6768f49ebae96fb1013392d80a912271942d14f31920ccf3e3b69a732eea4313dc8558b
 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_p20160704.ebuild 6939 SHA256 dfeca6651d8e2a47638bc7f8c1bb686d699102731932461367f4e3c5dc5dac9d SHA512 a9e442c6851df0e2d71355cb84c941933238884ca2d2248a05e45c14ee0551bd0a51a9a5598acc98b62ad38f8d4fcdad75fa2294610724061a58ae7276405a2d WHIRLPOOL 5c52ca7550d1b26b1b7ef9413b554688c0dddc7fb12847e56730f7751e8ccf68e42a4b3f53e9adacfd90a78cd1c7209aff9cba26b5246c38f5527558140c120b
@@ -58,4 +59,5 @@ EBUILD netbeans-9999_p20160805.ebuild 6939 SHA256 5ffdd07851b1d258f805db5481734d
 EBUILD netbeans-9999_p20160809.ebuild 6939 SHA256 14fa042412f2449b87aba41ca4810563119707c2a7c87c7a54a1db64767ae506 SHA512 70021add22dccf7c1025dea3ece4cc3ce4f34c130f7df3d27f76e995d13ad0b8659692c8fd81fd3e3d61282b001551992c1468b76fa0c7f45e106c4ce5d2a2c8 WHIRLPOOL 60190142aa282065144f7453cab9e5f2e64dbe9f20d1e16f546a9d191a30ac19f358771311c4994a4910c2e7dfadf86abcf2f9e9cc1b34efd83c865a285f0e1e
 EBUILD netbeans-9999_p20160810.ebuild 6939 SHA256 1a7e0f19ea302986eed685b13f7e8c790af13b25883c33bd5a55b9f7c87e2c78 SHA512 b453e5cd1de539c7dce6a75965f3a50fc9db8ff2273a30a757adf9a37cf2bc427bafebf16b30f73aed616bcaea0b2d342353e2c396fcccf223a063010564c2df WHIRLPOOL 97ed4b0199631ef4ad11e9ea525c5189a7e5ba3bc16ec96e13dc306212042377b1f977f7f1e6a9a843aa658075fea2e3c535461e4a20514c217949cedc99f6f2
 EBUILD netbeans-9999_p20160811.ebuild 6939 SHA256 3012f2bfb7a5e92b633ab00220b8a952199ffe5c16928cf58beecb9b2b8555bb SHA512 839dc4e9214590bad5caaf442273403baf79617ce7d4019af9f6701055c1dd61b08f00197bb2e7643df269161d8e375361d9b2e14279eaf9217990adfcfb8675 WHIRLPOOL f88439210059b0cc05b091e7b25295b85ad522daf6aab1c542343f8d955e69bf9da246ba3924ee079c16d447b8d721a1814fa09945e06037f6060be67510f8b3
+EBUILD netbeans-9999_p20160812.ebuild 6939 SHA256 44ab0dd398a78be93d09b2ca6277c10922d8736203eca566658f52c761ae0267 SHA512 85736b3d80fb137bbc0b3c57e5e7f949d3595e2a8ea59856e340c7af04a6828a53ba32adc4c9f334ce6f3e20e3c69409e310e1771b22b372c388a02bea866fec WHIRLPOOL 2515cf14c99ae8d1610c932b2ec7695f28dc7bc3bc5e51e64f8efc2e606e3448321646b4c51fb5e3d46a5ecc47f1ed09c275d7b1c290de13e6efff4da0272319
 MISC metadata.xml 329 SHA256 8aeaf2a0228f15c2e4140f401b30f083509bd99d0a578873069f3595cd8555f3 SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640 WHIRLPOOL 799a9b79b1b447bda9631f67e2dfaf722376740e1d2037796528a05f9745eeed00d9990a74a65ce09f74bc5e1d60a887abde540c3c62487d7dd49b8377c15834

diff --git a/dev-util/netbeans/netbeans-9999_p20160812.ebuild b/dev-util/netbeans/netbeans-9999_p20160812.ebuild
new file mode 100644
index 0000000..15d48aa
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20160812.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-12_00-02-33/zip/netbeans-trunk-nightly-201608120002-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-12  9:06 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-12  9:06 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-cnd/, dev-java/netbeans-extide/, 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