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

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

From: "Miroslav Šulc" <fordfrog@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-javacard/, dev-java/netbeans-websvccommon/, ...
Date: Mon,  4 Jul 2016 17:08:05 +0000 (UTC)	[thread overview]
Message-ID: <1467652049.991984308a9c1747b8f6b0c03433d531a4013ada.fordfrog@gentoo> (raw)

commit:     991984308a9c1747b8f6b0c03433d531a4013ada
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  4 17:07:29 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Jul  4 17:07:29 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=99198430

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.3.0

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index db68ff3..e3d2199 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ff
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
+DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 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_p20160606.ebuild 3384 SHA256 d9d7fda88e50276b0be653e8931833dc18269751b51b4a96e2d1d01dca5c375e SHA512 f8eaf39c28beafeeb7a6bc281c5c0efcf50f1c757ee3d43642cc57d23761514531898a8e64b7cbbc669fd06a20aa8ca92d4eafe6c49bd63ab5ee5c0d643a7a57 WHIRLPOOL 8e00aabb160f1ffaccd8dbdfa70bb4816ec9ae00a89868bfec2a491d20e6f468477a3a9e5d228f542a37b10f53dff3e28c4582e7b2d1ac144fff5c9ec7381ae6
@@ -49,4 +50,5 @@ EBUILD netbeans-apisupport-9999_p20160629.ebuild 3384 SHA256 3fdfcf8f51c94feebff
 EBUILD netbeans-apisupport-9999_p20160630.ebuild 3384 SHA256 c0b6d124da980cd4d2a690a2029b260f2147a12e827b957a9f2608090635a6cb SHA512 43f13339305c6b25df318a6f9754cdd1d847f952a3176b80f46c8883e4bb5a55a9c8695472267792e926f0f883e1670cd27865cffc622fab3d8d59498905273b WHIRLPOOL f4430df4b3bf4d26f5257e9f35274cd9644ca940a38ea5cbfcee03efe71fd64e25f45363a0c039e6de984788d8669828ab89d8348c5fbc40cbef2daee6257c64
 EBUILD netbeans-apisupport-9999_p20160701.ebuild 3384 SHA256 23ddf90569b909e034103f3833b095c9b80aa2ddf369b8447e48c837fc615e8e SHA512 d32cdc40e4e928572805643841606f69e5517e8e010561b36c50dc6890524bed236ca442d8718149ff6dcd65e7c8412ed4bdfbb228e663e1eba4197c79c53953 WHIRLPOOL 18a0b2e081835ab23b41e2da27e91b4b217f80deb3b8f4e4b2e01470219d1b2f46ff43164d016ca214d2b9f5d1fcfdb8d3f32297e1b078edbeb86667a015a3c2
 EBUILD netbeans-apisupport-9999_p20160703.ebuild 3384 SHA256 9ef07c0f89d66838dfb548c6aec4c06f78e8efdac91b65190f9a8e7bde75202b SHA512 cefea52998b294738ce78e05888329400a6fa819551b294692cd571ce67c3b82538b3911dfef80541a76c61ff7769f2dbe5b62bc8be570f4eedc0a5f3d051b44 WHIRLPOOL 56ae1c90226179dc70b09ef10553b91f847b5100dad310458e903bd087fbf96f1fcc77b0661738462e207a0f0db2af02cdd989c5a83d41d58bbb40bbed8d1230
+EBUILD netbeans-apisupport-9999_p20160704.ebuild 3384 SHA256 951ab1c28c6b76a5d18cfd1b50bbb1771fe21d594464a28a1c029fc4c99ed4bc SHA512 fa8a3098a038f03709a0f3919b9ae60c73336198def27515643a2345e215c180531f984a47183959ff7f6998529fa12a8ed0570972da633979547ad35ed7d421 WHIRLPOOL 36398dc5715a9ed007b5a76193989a54a5bacd24c6f1f69668d3c17c0fcfb46869b0430049fa472665c69522d16beb2fee06d400166cb10c443ba0b9a5ec5398
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160704.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160704.ebuild
new file mode 100644
index 0000000..0c4690a
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160704.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-07-04_00-02-33/zip/netbeans-trunk-nightly-201607040002-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 91e0c75..31770dd 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ff
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
+DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 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_p20160606.ebuild 4790 SHA256 57c9d72c05eef78cdff0f3084cad23820153076a6630c64f72f8e29905d87cbf SHA512 5582bbc5a5e359e0bba7b7f9c72b15dfcd41a1d5ad0ae68c92e1a497a296b73139cbf0241bfb6309a6e527aea04f35d5e56b7f4da985942860b7377325fc2308 WHIRLPOOL 8091e8b0c30579d851d67db49fab63f5a4fd84624ecb7d25a3fa127a48c792a5c7a5823eb8fdc912e095eb009c42eec3a23fe40523699fe2e69e0d901a6d7755
@@ -62,4 +63,5 @@ EBUILD netbeans-cnd-9999_p20160629.ebuild 4790 SHA256 3947dba3a41d59419448c10217
 EBUILD netbeans-cnd-9999_p20160630.ebuild 4790 SHA256 4fbd1088c37f203ef0bcf1fff49366a6d8fc6865ac02afe0bebebf8a84403332 SHA512 f2b297e1abe3a6987109384d2317d541320f25a125026dca43dc5b8041725c4821ef1d8df585c01fed6d35940cc64d2e5eb2e005f8d2502cbc47f18dacdc71f5 WHIRLPOOL a485f8b5b39f034af07dd830ef01f746c7a7fd8a2cc33bc910e2e26b2ba6d4325ecc73c51637d251a754dc79b945f4d4f115edb6829efb06889221f132c76944
 EBUILD netbeans-cnd-9999_p20160701.ebuild 4790 SHA256 2408eb3f64253d3f307d2c423a8a161a6bfbc900aeadda0f277d60c2ad56762e SHA512 7c7f8739a628fa9a76cf835c7a535bb02dc20fefff441085e98be115c4bfd70a68027f414f574a8691dd67847d177af11446830a329c42c99fde9f890e433bc6 WHIRLPOOL da6455a33ea8a7022491ff6b2bc4b07a58e1d811b8a6e7ecf199085bbef0185f7a515beb1f8b14335f7b4e6ec8f44f00893f3c1be371ade69b3fdfd181b16b00
 EBUILD netbeans-cnd-9999_p20160703.ebuild 4790 SHA256 c523d0fd4053d15b0aa5856d69931bf91fd6306a014c3e6fb873d8e021ab532d SHA512 c22035a8e6454480721278965d03513dc1f50e28df959c55355d14ddab8a395c0c3e9e76070e93abb733c4a52ee593102d4df374eac9705193ac28cb15dd40a9 WHIRLPOOL 958a194633e5c13deb8ddbb7e04c38d8f962e894a7fcc177612128f63150d5529469a44fe6006b310850282134b989007cf357f4dccceaee2900bff9eb3ff829
+EBUILD netbeans-cnd-9999_p20160704.ebuild 4790 SHA256 ee2e074ab100f5cdbbf9581ae6eff719f119d4685071eeeeee56f43e9d08398d SHA512 8e7908f351f3bb750cddc471670d18cc54bedec4592b1f18568b098f9b47b1970b6b7dd7751f5fac013a413ceb19ca139daa3c5222a2119196091add96436352 WHIRLPOOL 3a9bf321a4b34dac9e6584bb1485091f17255e6fadb78ab8576797ccbc13290d5b0967af2ed519a242e8794b2aba0e909916e5ea91fe84d3bd3b9392614807a2
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160704.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160704.ebuild
new file mode 100644
index 0000000..5c2129e
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160704.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-07-04_00-02-33/zip/netbeans-trunk-nightly-201607040002-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/5F62670605D036468D158D3D02FDCC6FBAB5D20F-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}"/5F62670605D036468D158D3D02FDCC6FBAB5D20F-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 041eb5d..141056b 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ff
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
+DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 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_p20160606.ebuild 2968 SHA256 eace9f04be0c3ab093f5a8452f762e0c7fd3ddb4bb9778a5fa6a3beb95763474 SHA512 7889d109855cbcafcdca41ced2097993fb0b014647a1ac2cbd53bd3771bbe8e31f9c64fbc7fafebde89d8a8cfd2cddbfae3e143a49b27bf98d55d5a2bbfc74fc WHIRLPOOL 67b57d267edd0f50bd81ef44a33d2cf988a44be405487a840552775b937831b0dd4d466ecc8a4b09c473ef1cdb4bfd3b349e6d6a92ac034bb83c162b30e21733
@@ -52,4 +53,5 @@ EBUILD netbeans-dlight-9999_p20160629.ebuild 2968 SHA256 9c6a5702731dd8d67223462
 EBUILD netbeans-dlight-9999_p20160630.ebuild 2968 SHA256 151f88f9c269e103fe3a319810e477c10414b25f772c39150055779ae1e5013c SHA512 8108cca35d437cf6a0f790e8b404ecce4a7194ac07b47e246dd0e1d69e5ef409bbc6a7effb16d72f3afd3774aeef329d7ddf96dba20535b072d022ec14d53bb3 WHIRLPOOL 3f1086fd3be26688fa97dec41e0e9bcbda0d662bcaefe9c8738aa39d9a8ca1024273ce87eb5f7d2c4c3ff9a1473255cf39b3abe12a7838d9f6bc54ca38328014
 EBUILD netbeans-dlight-9999_p20160701.ebuild 2968 SHA256 c42d40f303a188eb4eab79422cebd86d57380ad3055bba40519cc673fd04fc93 SHA512 5d19b80f6599808ac4b1d228b3e51d294ba2f8a10a78bf8671ee7aaf5c6cef1210019c573ae3ab4c821c0da6571200cb9c175c12b2142f601dc219045c827857 WHIRLPOOL 1f89275128b17e0733ab61dab34e9ce032e7e215ed93e9681d9a145e986cd8b33459e808fe7cc776eaeaa6e3eddf71d6ee6dddf293ed0c91d3c10850ccedfa07
 EBUILD netbeans-dlight-9999_p20160703.ebuild 2968 SHA256 a3d7fd8c65576aa6946f5c2fa1c83f20a1ea9f35d232612d73f76767dbaef2cb SHA512 6e57b9195beedb5f0d3ffcbdb92d96247ac8f5453319739a0e8849167d28746b1e2889210a969ab716c6f269e52f3d4ce64acf4e19338268fe3c441838394f54 WHIRLPOOL 34f19128334048599fb0331e306679aa1c47fdfb55f757b8e7063a02dcf061f8182e7015afa6ce6a2f5bc04e918d9b7d6550ea32ddbd7cd99d7ede6981415cbb
+EBUILD netbeans-dlight-9999_p20160704.ebuild 2968 SHA256 b69ef07eb1aac09251cca079445d47a644e78a035f30ce084995c352619c14c4 SHA512 944dd7a7aa278a6657fe7783b7800d37286b07f8eb4f42253565dcb9ce41257fc3178b606b5687b00815f80252afd6cf86f936f7653d4b0ef9602bc60d2ed44b WHIRLPOOL 9625e043c7547f9d5d9add96ac797b25767e4e73c4fbdea423af8418b0a82670a0d5651fbcb26ff087febd9b360e2155ad5894cd4c5894f97e981d491ed80756
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160704.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160704.ebuild
new file mode 100644
index 0000000..1de7649
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160704.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-07-04_00-02-33/zip/netbeans-trunk-nightly-201607040002-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 61e746f..fb4ae32 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -57,6 +57,7 @@ DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ff
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
+DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 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_p20160606.ebuild 15825 SHA256 b56d5e6e816cee9c0d13690b3e152e3c39abba39af6522fa3d42449f26e029ae SHA512 438781fd2724bd860af2d7b19ff014eea74dc465f74aa9c91b532cf7437d180837fdd1c050072b880f6cca0a6d5b3af61bc707088bd59eba7d5138bac5ffc44b WHIRLPOOL f4d91c86dab32f57c3bfcd00b81897442cd6eb7025b609633a112e5e919e381f9f3e518f0f77b1f1a58668874ad30a5711a785250c8d2a32338209480375f524
@@ -81,4 +82,5 @@ EBUILD netbeans-enterprise-9999_p20160629.ebuild 15825 SHA256 11f57bfcb0e6c75c5b
 EBUILD netbeans-enterprise-9999_p20160630.ebuild 15825 SHA256 bc6797d11f7ae5c6fa0733383639e2009ede80a1e0cd3b97b4ce432a340a598c SHA512 1b0d67dc1cb7a7b7a5d5072fbf48f6be0e35538d488e97a79b07a9a3ac8265d7113c0c6f97886c624c56089fa050a21962e8ba35f6f1b4b944e62a60688b8b67 WHIRLPOOL f0701486928212650fe3e287e6460999a109d913cb8b35b9e6262a3e6b2e90e7ed8ee35b16cbd68499dab3f82a3b8837e9b4dedd5424e4b5b54b0b018a575bac
 EBUILD netbeans-enterprise-9999_p20160701.ebuild 15825 SHA256 972d11302e41244601dc8bf7b9a7de574fe7d7536f87c507e79077c367314e45 SHA512 36c7a9637ae9c73de230cb361efa06c85262ba2d4d9dc68cc9c2bcdaf35826d664f05aafb38ebc0792d89e15e88ef72519bbe832ce38c9519c1dbc4d59e85d70 WHIRLPOOL 5b4cf8f2b40c641a44ab8b6590d5128fc264d9881d618eab5ad5ad8158a436cafd731cb0083e82ffe7e9750681d53d5f528a730a0763df67fd2ea9e373b4c9b9
 EBUILD netbeans-enterprise-9999_p20160703.ebuild 15825 SHA256 ebba0ae1b9d43156670aa6c9b7ff17338e8ff65b5b82c9c4df23eee53f11b7e8 SHA512 2d65e67bde091ce23acf3c2667f33671910b37b9ed44276bc5ed0f115abfe455e2c70fb8609bc7c05353ef0bed2c9b82bdd2d19d9971100467cb2b9476890311 WHIRLPOOL ade8544202c9f120b147a5ad8a87e67a7932d756dfa5e436d528d4a83bbe61181c0bc3276e3026f7fb5117f9ceddae343bf08cf666e5f19ccce32b5da485ac9e
+EBUILD netbeans-enterprise-9999_p20160704.ebuild 15825 SHA256 46d7aab48f8a7b87117fa6f4fa2200c2861caf900e9a7a6921ebaf26dcca9160 SHA512 3dc8fa6c55c1bf6b44211445ed1825a08c7359ab50738f4251e8ac731430c589563893344473c2f9b28d521b2426a0bb760ec6228400c757f8a85f8a46b53758 WHIRLPOOL 4908e88bd3626eff5a1ad17300d7cfc36bb1e7d260c4025c379f2738dc9f78a3fa37d1001273cefc4ae248dd2be4a74b90a9de54ccbedf38bb2ec9acc6afd903
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160704.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160704.ebuild
new file mode 100644
index 0000000..8c6070e
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160704.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-07-04_00-02-33/zip/netbeans-trunk-nightly-201607040002-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 88f187d..d0b3a7d 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ff
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
+DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 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_p20160606.ebuild 2913 SHA256 8c4b3cfe1d285065e964f1959f27688b5e55e8030ca2c0536db76dcdb95c0572 SHA512 04665163417286cd5de14b523db4e00598216505c7afa4522a6cbe493083520a11ca90002008459e43e75d5011df07f9eaf1b3b364d414fa5a62916c8ca1324c WHIRLPOOL 891401c30e52345432e72d42444df079d4d8b871cfdaf1c9f3b5744cc23c3dfa4380be62c68e4b24086ab3a3e55c06b9c638162124f9e9016823bba7bda3925d
@@ -49,4 +50,5 @@ EBUILD netbeans-ergonomics-9999_p20160629.ebuild 2913 SHA256 13940f982e267ed2694
 EBUILD netbeans-ergonomics-9999_p20160630.ebuild 2913 SHA256 d1f52c185611e0203dba0b6653d18805a93cd83cecc09bc90a95467f325f3d37 SHA512 f4b30de29908f98adf987f70ce6ae99879ce0c625b65719652a89db32cc38670878041e4089a108fda8ccb1e6c7c99280383d1687aec8d6da120625547f5c2a1 WHIRLPOOL d81aea7642c1c197b7ce214a9784c31d10cca10dabe7111babe3afeb48837b4a91e168bae55b6f50633281a312abda514226e3ba2533707c0d7db1ab259f14c2
 EBUILD netbeans-ergonomics-9999_p20160701.ebuild 2913 SHA256 3a18a7f12e35e887afffb69d4949102032578c10cfd865d1ba4e76368abae25b SHA512 635b3424c39000343302fbf4e07d48f1275b42c6ae24e4ce41be3f1f5f3752df92e5b963e066d8fd087f2330dd4f079bdbaa6caf6a75bdfe9eef6fd9fe1fc7e3 WHIRLPOOL f0d27ec9b86089d603cab707736ffb77948ce8f0094813314f25e82c7fe94936f74385f9d611c4c44d44c8f2436ef06ec661d62a48e9f5f73872da065d5f14ef
 EBUILD netbeans-ergonomics-9999_p20160703.ebuild 2913 SHA256 a8cddebb47cbb92c07787e2506db7b33ad55505993bfa07f2596617c2e634b56 SHA512 5e785b2b13e9f16754bf422a970205677cddc0c561c178be22ac248f0d5df18deb4419162e5fa6b72bb1733b0705079a86253d78f966f191d9b8d7e798a0be60 WHIRLPOOL 9064f8ad43d0b7fa5ec62ace7089b709b39b199b22a3d04357c4a98fe3019142beb4744753ea3c03a246386423ca8dd83b25d99049c9045da9bc21049f11eb3c
+EBUILD netbeans-ergonomics-9999_p20160704.ebuild 2913 SHA256 e5ded9a6fbbeaa0c1a641401c9e8f3420e2e837455178eedd5e5a2ed9416d169 SHA512 e3bd8a5677d7406bd9d059c068d93aeeadd217b62af32817d70517f7931c8e1a2a47abd59099519dc71353cbdf9e029ab731382c2b5643b9f3562de81fea1a4d WHIRLPOOL 7a6fdcaeac3cfea9ebc6952d49513159028d3c939cb8112132e7f25572b75d639921272798608ce109666e186405d33d16c6cf3af51407e6002ded0f50ae2df9
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160704.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160704.ebuild
new file mode 100644
index 0000000..d003714
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160704.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-07-04_00-02-33/zip/netbeans-trunk-nightly-201607040002-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 37835d9..0aba827 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ff
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
+DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 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_p20160606.ebuild 3377 SHA256 24df61ba752a163f83a487f6ad0ef51b155c99a08b98e2c779176ff58878a6e7 SHA512 26e48ccfef92a981c2684cc54ff7a62cc9be8dbf2a3685c4fa51d1264e4337941048212b096d807dbcb4f33601ba0853f930795a379c242c6b89dbd35c17e4f7 WHIRLPOOL be01cb203f35bd0a8fbc11d80876c5e98859f470397b539d25786feac1a57d5024d12fd224a9e1268775f7062603c7112a8d06fe426a79490b0653bd023125ef
@@ -53,4 +54,5 @@ EBUILD netbeans-extide-9999_p20160629.ebuild 3377 SHA256 3170816d19c52c4655d6659
 EBUILD netbeans-extide-9999_p20160630.ebuild 3377 SHA256 0d3c6af9a0e8161b3fa0b9b60c262ab5117d719f885486bdc4e2081dadbf63c5 SHA512 930b68b6f394bf920db722250619530be4deab7d175df5093d1f44b98633d4c31772567ef3944210f66fda68723d53e9e256a095a13f643bd468ba88204c3d93 WHIRLPOOL 2abaee375b4b3896b2732b5f7efdcdf97bc2170f21849cc720adf9e66154c2c33bde50553cce66889b951fe03b3ceb9bd00b25717b92ce9c27e40b9ea7f69041
 EBUILD netbeans-extide-9999_p20160701.ebuild 3377 SHA256 ccc4f9c6cb22ffd678ef66f6b60aea2717f8bfa18abf5c51da28c8a72e76236c SHA512 c9ee93605a215518e4f0b68e007cb78f7767913fb4d4b39f2468aef3d0d9cc06578f388f6c9431e105b0f72a1219742838da04c1b80e5b04e015b98f23f63dad WHIRLPOOL 71bdc5a14c664d4344b57e408ee55a0ccd83d06cf70f61a266841f740ee37195a9fb2104a2b574a625fa29c660530919d27209638eb817e94c23ea75c67c0270
 EBUILD netbeans-extide-9999_p20160703.ebuild 3377 SHA256 e5778092a56ee97249f69a2b6626912dd2b3a54791a1814cc79fe5671c34ab88 SHA512 e814e1301fc09e306f8039aeb0617e63485d3f7aecdaf1a4065e400315273bfb30d8e0dfcd72e125ba77c7eed90f3d39b789bf27711d7c7d1e494470495cf972 WHIRLPOOL ba2d34d7c3eb0e66a46e78bb83febab9bd93a050db572b44306ad8cfa78a6f85895efab6361fa18961cec78aaa91fb4b457906e15b4a909460407d4b3ebe1f21
+EBUILD netbeans-extide-9999_p20160704.ebuild 3377 SHA256 b41d519ead2f743826abeb29d9d7a03529bc044641f922ee5f9e8943e7b81aa5 SHA512 be900848494382cb149df6cd636bde246fc2e5165491ae8408569f8f15b5fadfae35e23306367d179b749950c34cf3c49535703ac9cf0b6ff9355d979857f042 WHIRLPOOL ba1ad53e16ae58014f22d68c6acf4d7ac09bdfe2b4e1e78e8175143abee95f19c81798df8eea4a6103589ccd499ac316ada5bf3cc3c50646305dbd609ab9800a
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160704.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160704.ebuild
new file mode 100644
index 0000000..f806ef3
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20160704.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-07-04_00-02-33/zip/netbeans-trunk-nightly-201607040002-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 ae243d7..72ad81a 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ff
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
+DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 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_p20160606.ebuild 3416 SHA256 f981750d39c645681123d280a3088da72805bb6368a631b2e577467ef62d3ed0 SHA512 0cb3b37b346e3fa445a4095a6b069030c6be2d2d58a9fc3b245fe5de67d8d0272f66585db68f63b61469fced31feacaf74648513714b0244a6efe6917a41406b WHIRLPOOL e0933ea494c7d95a1da450f10198e4a4d2ed520e1eaa53e75446b99efa8fa29ba22d7ce349944901f57c5a7e2e643b219a57e0338f988140af9bdae25b7a2522
@@ -51,4 +52,5 @@ EBUILD netbeans-groovy-9999_p20160629.ebuild 3416 SHA256 b9a83d04dd6f79e5ad9aa01
 EBUILD netbeans-groovy-9999_p20160630.ebuild 3416 SHA256 9ef9707035ebefaca0a3ec2c8aa6bdb934e77456ef96a97eaaaebe82ecaeb172 SHA512 a3920b6427d5cc808034ccaea68ec67c599d6369c99276c0341be7640b71761041cbdd4f3a62a3317ef4da638a32b8bac1238cc197e53f6401797b7a3a8e15a3 WHIRLPOOL 03b8c56d92f037ca96a7e90849533638d03172149745f0d0a680e43ecdc6f172102622561b2662377f355a5a16348c025b87ab5a8a1b444dbf4d39cc5a768b56
 EBUILD netbeans-groovy-9999_p20160701.ebuild 3416 SHA256 ea0bbd8112d5bf8d41e44b5bc43a1d9444ed551a37cc0618000e502a0c0aea9d SHA512 ec83732bdfdd2d2974f492048f746d2ebcf359a601d3c2714d744901395fcc2c11704698bea7beeda7062c063eefec1cae2f13ef307d168dd34c15b0e2831e7d WHIRLPOOL af3d6b95378cca5c6b8d0ecdfbe3ae74e1a9fc57e9ec7543f7f621628df15aa24b67b6a667e573ffbb2951423a01fb36adc3dd8802672b1ce417d1c05c1bcef0
 EBUILD netbeans-groovy-9999_p20160703.ebuild 3416 SHA256 9a87e96c45b2e84bded618fb60efb9f3f03533d816b018a8465671f64e68bc91 SHA512 032d10f214d938e42e4c7b724d69104c18ef4936d0e2c1ca87db56a6b0521e4142a4fc977ac9f92825e80741255a672ce54b53b23559297f2698e0f03fa0bff7 WHIRLPOOL cb9567751982b71596658d356eafc1f83b37a618aa4341809699b7399430169ed0980ea641be8e370a459b468b2a23000449850fba6626065526dc4b9712a7da
+EBUILD netbeans-groovy-9999_p20160704.ebuild 3416 SHA256 7a6dce76ab4e8b02e7a52d48938e58d2d3f2c403df2d198087739c7905b78250 SHA512 9d25bfe4a37d0d9a7b1370121f7848ee20114a03197f47a24a68da7654d695042da18b5847df567ac2a17136358589b4dadec8afa54b1a499bf25cab1feb2c48 WHIRLPOOL 1b3f764d3a0ce32fa7442b1efca3356b2060085fdecee160c68baa61d5bcab6ad95c6e1d4abc57887ee75a61c888dabd1db43de79bc8304efe83f7c43088b8c8
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160704.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160704.ebuild
new file mode 100644
index 0000000..d775f79
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160704.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-07-04_00-02-33/zip/netbeans-trunk-nightly-201607040002-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 dc4e847..803ed14 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ff
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
+DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 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_p20160606.ebuild 4126 SHA256 514ff520724dcf59dfea147a31def444cb4cb30e251255033d62fabc45f2ae16 SHA512 fa631be9abfe034f89c499891e35243a65bc09c4d72cf4d2c3c73ef8c5f96273088001219490922e889cb0486ae351d294000f2415fb0ecb8b10315f1b6d8bc4 WHIRLPOOL 5c43ee95fe05ea6d33b61adeb87a93441c4eb5cb58c7b3e0d9b47008ebe856f12cd27d2f9da9f358b56b15923173831c4c941aedd1fcbe74450ba2acdec52cea
@@ -54,4 +55,5 @@ EBUILD netbeans-harness-9999_p20160629.ebuild 4126 SHA256 34ca6fef3595b72a03737a
 EBUILD netbeans-harness-9999_p20160630.ebuild 4126 SHA256 1e20afd829afbee3b5383b89eb72c5f8d2cb5434b8ae07d69a35e2ef62766fb2 SHA512 680bfad181ae0dd712d628b778e4b5a1127ec47ff5b420dffd89719a43251dd0bbee2759f1f2026d04b75bff36a268a81d61b1215ace2a10b6acc50dd6a7a75e WHIRLPOOL 36b1bc8e8f1d97a2dc9888bb607979882a1e2dae6b08c585fa85beba0447ee2eda06e2384f3b01c0e81d8499c385c56e43f09e52fbb8fb882d5be8be5661a343
 EBUILD netbeans-harness-9999_p20160701.ebuild 4126 SHA256 556fb4c378f146091a5449097c6898309dc7e95890009f162e69e058cda113a0 SHA512 99d11f7e1e61d132dcc4693cb65b4921dc907cf8a0b9489beb11510f879e3d102c79608f37ffffce185c198c2dfb99318f37f4e0ee10f0af305e478feba69ee9 WHIRLPOOL a8c8c124e58b393e864c2ed054891333d6141b170e3b40abd87cdfe7ef42763b47bd7f748ac9b98d1a2646697eb3f401433d2f5d96ce96144addd30c4a7e51fa
 EBUILD netbeans-harness-9999_p20160703.ebuild 4126 SHA256 c8400f90fccb787acd82b32c2cc5652a8a09bef4de6fe3cdd5f5ec5be81f748c SHA512 742a0349c4807583eba67794fd6e31ea03f9d9b95e85c8b4ce9c22429e00ec3ef8c47af2e886508ae76d539d5eb16c1f90208c9a27c36c65b594d81bcbcd9d5c WHIRLPOOL 1ca2e87c03f82dca264f233c0dc2627260e96f48dc4ab31672232f98381a503c4c5f73aab01ad650a8116f565e05764866e5e98664a8d013fc30b18588dad098
+EBUILD netbeans-harness-9999_p20160704.ebuild 4126 SHA256 ba5fc6010a900721db190dbff3693a5e7272ea3da6d13a9cb069e6d02aff0d29 SHA512 99f72ddb2fac98eeb40dcffe478cbb84dd022e20e399ee728fb7e46d3e5132341cc5e6b2eedbe1afd77086397e7661814ee22e112642d6dd9aa3d62b9a664277 WHIRLPOOL 14980a150ccb49cd482d99e1ff369a40ea80a16ec626b662fdb3c5ac62a96a13c73142fadd52b0c1e2a1cc4b3e5b6df1e2097b8d89e5258180cb1d841564fc82
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160704.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160704.ebuild
new file mode 100644
index 0000000..591dee5
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20160704.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-07-04_00-02-33/zip/netbeans-trunk-nightly-201607040002-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 f704f64..639e67b 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -165,6 +165,7 @@ DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ff
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
+DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 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_p20160606.ebuild 30761 SHA256 54a5c2805a74eaf0c623c98ad090b2b7d78254f42dd2f44b58dc8bbd99420436 SHA512 37064a64ce85aea7efc242357fd50bb6b648a13b60ebc6cb1cc417156fde75a0df083e0943be291b692ca8083e0b5e469c366ee792c7139ac59f7622430223eb WHIRLPOOL 967b9db8bd4d6b8a53c47126c2bb0ec1d8ee0c8916a796d38979ec47f9d616a1ea97c1c161abd88e9b622456491bdf018574ebebd83d504c47a1dca4102bf90b
@@ -189,4 +190,5 @@ EBUILD netbeans-ide-9999_p20160629.ebuild 29867 SHA256 760997dd43b5afbea24aeb513
 EBUILD netbeans-ide-9999_p20160630.ebuild 29867 SHA256 4430d70cb7fa21c71b8ca406cf82ffab4608487e74ab3d45e09ddaec795a15a2 SHA512 f23eef33aaf47f0e71722965280dc742dea2502d9a91f224a16541c70851a5352603bda4657257f9e7071bc6940c34c6d37bf3e53c12e16db5cd2bb54e2aa13b WHIRLPOOL 24189670d441eb2a8aefb0c35a1af63ae030873eb373fa12183e5c2b127bf7d3cd933df19d14b8d65fb8dd58bf08a51ca133b01202f9b48a2a07da4e61fffdb7
 EBUILD netbeans-ide-9999_p20160701.ebuild 29867 SHA256 dd31ada77eb33d9ec31d6b157bc0e47b73a2c3821d4aa8797bfff8cdff853d0c SHA512 4183db5276dd53946121d309fdf0696e011bf52939161819117aea6afd2b25a735559920205636ad1c5754da4c10f0e874ba2f29942ea84d82e706b7b752ca02 WHIRLPOOL 3884a49c0303bc1e77a50d772c22018601d17b51db51b28c361ce71e431e8e343e1157696b1cc31b7d5aee2b45d2362a9189c9df7e71ddf749048c77d7e532ce
 EBUILD netbeans-ide-9999_p20160703.ebuild 29867 SHA256 265ef7ad1ee6240dc6c2e5fcc4dea1155d39df0dc9391c5b573d01da21814b48 SHA512 405e47c936863bbec00114957ea083ad07a2b9abebe75f6593fb03f3dda8e20319659f44088d8eef0acba1ec1f9e2bc89b6c616a58ec25e90230b120f87ebac7 WHIRLPOOL 13076fd6cfbd2be66bd1c383c62dd31e6a479811d518f15c463f2d805f829e76263ac31bca29086de1b2374aa2d8b280a4c35223f8658b234cb606e834d7a3f9
+EBUILD netbeans-ide-9999_p20160704.ebuild 29867 SHA256 cc9a9f0fd9cb88725e3fbe3c05081742a46e041f2d5ef4158594ab80db062317 SHA512 6724660509905200323ae61e340825c17772a4e94952fe0442e5352adf1595bb54c239562131af4a40b3afa06ceef5c2b43f3e4ebe02161d7e7449a69ea994e3 WHIRLPOOL 44ecc0bd24800e7641044f8d14c87b5e46081371957ecc1fec095706a2f7749eb26223fe65dcd4bcfffff387696594a21330ab75479c0e938386c841e7adc1d0
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160704.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160704.ebuild
new file mode 100644
index 0000000..0933e29
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20160704.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-07-04_00-02-33/zip/netbeans-trunk-nightly-201607040002-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 28e9697..147d72e 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -65,6 +65,7 @@ DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ff
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
+DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 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_p20160606.ebuild 15656 SHA256 8151a2aa93a3ff2b85ff81bc3c32d8f1ea246ef79db2d4d1baba50947a9bf92b SHA512 8db63e9607e14374a58026ea5f6bc65427f497882a246cf1aca39fecec3db29fab50ff293d19eec67c57471fc9495b55516a11b73a177d7b3ad4d8e4a3bd3f19 WHIRLPOOL 2b54787bbfe8137293daf93df1250a206eb4fc83d91f29fe57a577ad88ae32db2d1ce58aef6f4e4364bc72341077ccb9a2e76feb6fce050a1d8773393f74fb38
@@ -89,4 +90,5 @@ EBUILD netbeans-java-9999_p20160629.ebuild 15656 SHA256 94b39fc264595d8874ad8ac4
 EBUILD netbeans-java-9999_p20160630.ebuild 15656 SHA256 e8c32ea6da188a35c907c524a58461fc42937cfb3fe2bbe73c39c13da831c2ae SHA512 4e391402d049f4920413f6dfd2cea54eeca5fca7678f0c1c835e640a7b51dc72d5b1baef15f9394797e07f679d24d2dcc734ba61c7250295171b55222b817685 WHIRLPOOL 19330ffec1177c233bfbc4c264d8b5d896b5f993afe3696f5c9a645d66e554056a54261af923e1fdee36b8426bdaadb93c756efef4701de3f507fe93fcc6fd7d
 EBUILD netbeans-java-9999_p20160701.ebuild 15656 SHA256 be7e4a2b002f9a878926a201eac8916ebb017b922149f8aba594c7b4c2cf1e14 SHA512 12d10a6db2cb9d188adc32876c2c3097eba5a8bc68eeaf0227bcbfa4e0d94efa81772b1371a95f59cdd042e1cb44a8f7a09d457a24841c88cd96b4ab031a7f06 WHIRLPOOL 598ba41ef173aa4a2edd32725f96b0d46676566bdd25d6f7cb60ce70343056e76d242e04de77c4f3e463d081d84d32e44cc47cb13f1c33461b50f1c5e1d4edf1
 EBUILD netbeans-java-9999_p20160703.ebuild 15656 SHA256 3fcc256725c5a332ccf91636fd739d1c0204ebe0f190398b0883ebee90c84382 SHA512 939cf64a8876801042af05a6e893d912b00db49d02ea3ca00ae14d3fc6a9f072eab0414f71ce1a0c63cf6499f19b89b3d9d34eadc4f95c20658c5c74a5bdaac6 WHIRLPOOL 05fd8e9b26a5eed4bfc53210599971c6283ecddcb486483c02e470e423785f0a5c30477c991152cbaa31cd082e5086f3994bded84a3c126deab63eba139e993e
+EBUILD netbeans-java-9999_p20160704.ebuild 15656 SHA256 85d002b3150e9944ebf7a268b0d31c5cb1bb5302d5513a08c5ca81a29c84815a SHA512 baf8c2924e9630e6d5ee2612310221318c915bd73ed26583dd35e527ed133bc913f7ecc7adab990284f39779ff905dfba40a5160b4603bfec3a198281449b333 WHIRLPOOL d97ae3b11a6539883aa6e1765885abf2dc6ff6309542881cd7300496655b0c24619499b37c7b5da109fde8916e229d7b8fe802039297686fd3044951d41a3ae3
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160704.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160704.ebuild
new file mode 100644
index 0000000..8825775
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20160704.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-07-04_00-02-33/zip/netbeans-trunk-nightly-201607040002-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/D803BEB75E912EB3C2F2E042B808AC0263C066DC-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}"/D803BEB75E912EB3C2F2E042B808AC0263C066DC-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 6fada65..691e69c 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ff
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
+DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 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_p20160606.ebuild 4971 SHA256 beceef4ac87abbcba45128f7294fac9307b266562b6068407e0ad4dd502c07d0 SHA512 b408ebb34f66a02cfd884b588e7913429fd8a77b182649c05bbde5c275b6e5211703787c024f3e61764b87c5b7d920f3301dde494a1def17e4ded9ed289e5fa2 WHIRLPOOL b382e352d546d903b60a0dfc9a80cbf18b0caa31d48b49b8685047405bfc6e347ad805413f23c84a5013b974d211d6eb306a81dc9c6c2304add3b28b15530af8
@@ -52,4 +53,5 @@ EBUILD netbeans-javacard-9999_p20160629.ebuild 4971 SHA256 4dd26a24283478bb99d31
 EBUILD netbeans-javacard-9999_p20160630.ebuild 4971 SHA256 c91aa9f5cf3d3be652368a7b839a544141e58e69f2b08b4620c1e702187660cf SHA512 2224a4a2d6c13d954aaf50afa9d04adf90fb108bc91213963dce7919c17146a9178a431669a34b0423890238c1bddb5d11b880b30f5624ab2be9cbec52ba2168 WHIRLPOOL 38ff77cb87c27a75af1e665a4ad977b124bc49656a7ff140b7b734f070fe0fe947577ea4915601fc2d096c52a33a13cdbc6319ab80438d9b384dfb0fb2e1cb29
 EBUILD netbeans-javacard-9999_p20160701.ebuild 4971 SHA256 ca20c7b1f0f49e4d72f14aeb8c0656eba4e601fdb19f33da9067b7e62acbdbd0 SHA512 c86db0f8f1915a20fdcf9e697e7af5c62a7a4740e25cb31a82aa7159814faaa90d8f1c7aab8392f3dcd9110d8942d8ce866bae0c8764b6aa4b7c43c64134010f WHIRLPOOL e6d299bbfe786f30fd8a640be8bbf5f3ff3ffa3b3a290fe334982c820ac464915e69909b43eb4c6b49f585cd04bc50f3c9e4dc4b1389d93eb8192ce24a04c15f
 EBUILD netbeans-javacard-9999_p20160703.ebuild 4971 SHA256 f382fb5dba85a7e23a10bf5dc162731d08e94a9497940f7c51fe7334748866b3 SHA512 2a458415a39adddee753bed5fface315b91464ba63af0fda5480cb78f02a54e4ff516ba45ffe8707ebaa2eadaef4657e2b1307090ef1a70c34ca1510cc8578d6 WHIRLPOOL e7f9d81d57bcbb8c4602baba11a185c941cb29408b77f9d65980702aadcd63d5aa81cd67b234fd10f2e4b6cd5051afe6ae548df60671b0a2302457cc1f5b7b4e
+EBUILD netbeans-javacard-9999_p20160704.ebuild 4971 SHA256 a16c5985a556ef75e6cfd42f0da8d55e71a14e405948749798d19b5022dc0c7b SHA512 dcb91d9399cdd3b282cb2c2a0d4ce712f216ab4012261e61fb71b212fbacb6af7025f75efa115283952c49c5da56f132ea0ded604fe99469019d747ccfca0846 WHIRLPOOL ac4eab54534988d1fd33edf3bfc7c7c7dd80cf488b9e7b02c48687ecc663c67023b27a2a2b77c9f7fdc4b92125b34b1ba5a191756107a5de779d037e6a5226a3
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160704.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160704.ebuild
new file mode 100644
index 0000000..d6a6ebd
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160704.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-07-04_00-02-33/zip/netbeans-trunk-nightly-201607040002-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 16e9891..e850de4 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ff
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
+DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 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_p20160606.ebuild 6293 SHA256 e64e678fe3060c2ffbb9c0bca362a47b2369091cf9c1a72aca14c29f7678ef5a SHA512 c725dce07d30be36cf628287b1b9f6850ca8bca63bb0896be4376303c6f8583d887baa4f8ecc6dbd8748b8ec272af182ec34a79dc217be6a044b1adc77c6e0b1 WHIRLPOOL e42566df691b3ee4afa2cdf1fc0387ee1617e856a8eaa52a7a6179d17df4b824d6cfaffdf8488eeaf77f801260db4bc5f2e7a73f8d1f042cd4b90563b2865fd3
@@ -51,4 +52,5 @@ EBUILD netbeans-javadoc-9999_p20160629.ebuild 6293 SHA256 9e8876f9264bc95d99ac05
 EBUILD netbeans-javadoc-9999_p20160630.ebuild 6293 SHA256 c4d9d977a855f64423f0ad73f72b2a3a43fe3b06a5cd6bf165bc3a727af55316 SHA512 600a7ca4c423837031fcbf7cd3bc5437d0b5e286e52f5f70a457e281432b3dcfa9719053752850103818746ee1a615ab25e9021cdfe58bd9c8364c64efca8f74 WHIRLPOOL 83b6d4ebe0918323150a3d609894c3cba34c58ddafd8f04481bdeaadedb654765520583870af7c989dc07f19430980bf42d9f6be36d72ad5c21d2ff5413edd7e
 EBUILD netbeans-javadoc-9999_p20160701.ebuild 6293 SHA256 e8545a0e790c537c163bc273e7dd33f76acfa7ff9bb9738ebd7c430b12b2b0fe SHA512 9de182fb4b3f72b2a7444f199c002769601be156792836b5096eb289cafa2c1ad3fd27538f35e97e5b4685bed872209d5eb1242ea84b26b7c307a09725a6a484 WHIRLPOOL 1b82a54dd811f83d89ca4bb80a773ab173f70b636354c2bc7682185a6f0e3aebcb95b86412f64bc7261c4c2a9a729bcaba81ec28577a2e161abcd025fb6e4788
 EBUILD netbeans-javadoc-9999_p20160703.ebuild 6293 SHA256 3e194cbce3e198089acd9fd63e737a36c74491d1f1d6b8ad81488c10f4aaf321 SHA512 6ec6169eb87ff1806f5cc244fd38c3b3d64be2e81937a2e3ce7a3d5d8dffb41c10f5a9a0ef9f2d9dbf2fc3b7892211e13def453be4a3ad54fa83307aaa45f1f2 WHIRLPOOL 10cc937c6d4d909346cf2da1e01cff86d5e4b31d14a3eaf4a01e253880c62b944559c31ad5478e82648196eb561aa752cc2edf57c3302cd3a6e874abe4bb7fee
+EBUILD netbeans-javadoc-9999_p20160704.ebuild 6293 SHA256 facd790a162faf661027444b75b5668b36b153cf73a42e9925f700dce9395c03 SHA512 f30c8ef1ee8ce2ff7fb3c13c2cd60d3b18ff81fadc2ea51e08237ff92088b24ac155515535a609473beae40dc6f09c3b8f968176e00147e5a66e27f8e57be717 WHIRLPOOL de51200b96ba0d00d419f764cb50f58112c3e6a25ef03d48abb17ce41575cbad02429c9364c83181bc304c75daa518ef5517d671217fbea0ef7aa841c4cdf7e8
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160704.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160704.ebuild
new file mode 100644
index 0000000..17b2574
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160704.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-07-04_00-02-33/zip/netbeans-trunk-nightly-201607040002-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 3c8998a..36e247b 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ff
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
+DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 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_p20160606.ebuild 4717 SHA256 654924b3685971f7acc5a59206e8f7f3d0ab8553ed7d2c061a06a99950e431af SHA512 61418be02ef17789176484606ab42a664529780fee1f05b06436a14a7817496d68677e1825771356b00b1e6e92114e60291efcee3efaba3f8223328fb667cf5d WHIRLPOOL d81cbddcb1df0504a09c3ac24ea05a75cce22f56062ca099cb73183470c041556fb00618972b91f8810e41a28e35d9f02610145f780f130957d2385414d48600
@@ -57,4 +58,5 @@ EBUILD netbeans-javafx-9999_p20160629.ebuild 4717 SHA256 bc5e4d8cdeefc3dfae713e5
 EBUILD netbeans-javafx-9999_p20160630.ebuild 4717 SHA256 6edabee784826f7c2d071397b7247faa325fddbac560f9601f79b87067263466 SHA512 63ddc4a2f48745b7be67f6ba0575792833e596fdbfa39fc8f49a301bb8ce4866346bf72d1f7f1bc1d79df43da58217ca7bdf00dfd09294ffa74b578998ebdb7d WHIRLPOOL 5e432f9205528ffebbbc105997b2f15df264491b9e4a3b31794166b21a921822b063541eab502eac05844f15b38bcfbd3dee7d38cccb2eafd705a0cde6eb4863
 EBUILD netbeans-javafx-9999_p20160701.ebuild 4717 SHA256 073a4aa3261480f4ccaf57e6f5379a86c3ad20f8b282b1263b6ccece556773c1 SHA512 aca1cab07c16d19d5cf127d6aaf32594d35550510347020c89d988e344d6836fb4b68496cf7dd19b441c666d328aa8ed0895bbca98d3f5b9265e13478ed5695a WHIRLPOOL 6380e563ffcb7e47bdcdcd00c4386b9b6d3eeca8e0be9f4c555ba199fff29b4dce242c49570e984a262ae256d50cc42a06c55ce8d9a7d2b1fa5d04daa6f3e15e
 EBUILD netbeans-javafx-9999_p20160703.ebuild 4717 SHA256 4bb1e976a5430af00fee9eadbee17860ea212e8440706762d95e9a05f925f529 SHA512 2ceedc57b817476c1742eb2a544ed51c0d5fb9d88790f5afe03f9fd619bc869a2b99654213100b230467ff75a0767bfd82a198c7a02d868db7a03a341e446e45 WHIRLPOOL 4ad1a6d03c3134552671c3b0e584f8dffba27f148460bab2add640bfb245f585605451fa4c7905768840fc16a590c1b8a27f7049004f2dc164d67e669573c1e3
+EBUILD netbeans-javafx-9999_p20160704.ebuild 4717 SHA256 ba15b86def3276e7cc7393aabb6b30bcf459e8606e062c64dc0a957b52b9ecfd SHA512 44a826bca25d4ed92b8c7257fd07583dd7784c9a1a80a99d1056b2d952c56d53e27427e84613b8bef659d3116ac20b7f3690789aec0ffaa4990e8e9ee3ed179a WHIRLPOOL 50e2d803a4d4ec68590b8f1990ea1912e4ebca811c5c55fc0a61d220d1190d6d19f067fb9b81a1e4aa65094443d49569603f86582c263926bd438902f5b90818
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160704.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160704.ebuild
new file mode 100644
index 0000000..03bf2aa
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160704.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-07-04_00-02-33/zip/netbeans-trunk-nightly-201607040002-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 f8bbc33..826f0d2 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ff
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
+DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 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_p20160606.ebuild 4412 SHA256 e1ca74ce252f1feba95a8b88d262ae1eb577b0f8586e27f657306e0d7bd2f2bf SHA512 896307af7e958ff257322f1f65e5f1ffdd999ea24be7458df22d68e868e18052854059a65bd56ed541b9bf9fbcf5372e92365cfd887e846308bd9c0e08f36f4f WHIRLPOOL 166ac944fb10a1c753696e68f03d0c4f34709792b9bfaffbbf6124d0583d7c1c0b5aa35998480e96b43b6982684676e3df8e8813a1f9bd2b409c46c120e0b3f1
@@ -49,4 +50,5 @@ EBUILD netbeans-mobility-9999_p20160629.ebuild 4412 SHA256 648e2262c5bbb91513d39
 EBUILD netbeans-mobility-9999_p20160630.ebuild 4412 SHA256 e32b041292bf8e4bc05873c668f64aca27078eb053592d1da441202e9703113b SHA512 7a278d841edf7d34b004f2ecd335ace3bc7a9ff3df4a2510b35db0a92c908672d17a8c12cb2b8a81962275453d89f4022ea75e9a1fe9f63dc6bdf6ed2167b71d WHIRLPOOL 10daf018f5277004fca61c9dc68eb029332f2f6967461e2ea636d0b046993cd2e2426c303675b0c16a5aaae7d7c764a0bce3f9fbee5fc5c20d6aeb1f428451b6
 EBUILD netbeans-mobility-9999_p20160701.ebuild 4412 SHA256 0e7dc45b843f10c2b39d47ff65d37093bf1615a5a5182d61f7f0e4c00428988b SHA512 54b00648496dde999076b408cb327679c175ab755d8e009b2ae58de6909472dcd5b21384e3badbaf757f78aca904728ec7e8725df38e3db704a7a087e27f8c43 WHIRLPOOL ce27785a1b6d36f3702222401d632c46649b0520694798ec76233760080b765c31771db17a0bc4ecac544975fb71d524ed06d1b1b37df843dfc17ad854afca96
 EBUILD netbeans-mobility-9999_p20160703.ebuild 4412 SHA256 cd7979651af160dbd8814d4484dd0119c6633ceca956b8ee3bc245b1ac9ea29f SHA512 9083589ecb98032772051ccd29606810fe1888bc084c11ee833f43a4c2729b5135d08465f80aea7b911681fe134550ceae7feff305c7de140603a10cfc9323b0 WHIRLPOOL 0c6dbe0d65570bf85717687e215412de5a17269661284d52791c56b921f517aa3b00fb26ca4a5960dca6fc059ab95d676ba4c810d0d1f112439905191ee28a0d
+EBUILD netbeans-mobility-9999_p20160704.ebuild 4412 SHA256 8166ed2971b3111b7851c73425907f7c54a00fd1385ca2faea0907141b640c46 SHA512 fb9bb5e8e9e63dd969f7d0b96ae0290e29cbe92cd90372865917acc13297c935e06e97998092a0cc65a7590881ec776eb75b4605bffa796bcaeec9ef8b43ded9 WHIRLPOOL 7c2a27497595d2ed82a6cca087306b7d2080c297839d90e210598cb9ec2b7daa407bc8b2c144605a654b095a89611cc57b90767f12f02917d94481ffd986e13b
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160704.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160704.ebuild
new file mode 100644
index 0000000..feab85f
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160704.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-07-04_00-02-33/zip/netbeans-trunk-nightly-201607040002-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 46f99fb..ae1846b 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ff
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
+DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 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_p20160606.ebuild 4111 SHA256 70b15b899bc4fd8e8add5cc0d2bfaa48cdddf360a0efb399d504fd5c86926451 SHA512 b4330dd0bc0c907e55c2b00e5d4722b664d833d66c408d60b76c9f35dc6ce896b418271ed95fd8c2b83c9c4c6df759fea438bab7e203f99e7127810356490375 WHIRLPOOL baa1a26dbc6499b96349dadd33467ec2752be83a8458d95cf0894b750601edd36acddee6141bbbe8eb1e95d4ada17ff3900273cf45b2cb02b7b8e95c89455620
@@ -52,4 +53,5 @@ EBUILD netbeans-nb-9999_p20160629.ebuild 4111 SHA256 44b08b44dc2978d1df916fb0396
 EBUILD netbeans-nb-9999_p20160630.ebuild 4111 SHA256 25848c805cee3d0cdf442978db8376fcb147ebbe4dd7b3806d709c64093c15c1 SHA512 d72896f92f985d35f0f21c72ad710b381243ecf5ffaba7a3d47f0e93b27656368cb6a51b5576a1e8545a0553a82fb9e6f89fbe98defaae7a5c6eacf26e81fdfa WHIRLPOOL 7e0e162afc6d40c89fa96dc2edd6785d1e4d2b96b1b71e16420e890f636f33d54dcabc7e82e387b3beceb1cc9e87305960e8cac4e332a72ec24637912f10af02
 EBUILD netbeans-nb-9999_p20160701.ebuild 4111 SHA256 362d6a095e1c257ba1666b31df4bfb23fdc8d4f8088f7908ec113ded940940cf SHA512 98937edd208e7a88a4a80ccbf2f7b856c6a7fd53ff1c58280aaf52864bd0c321696a054b92613e94aefe664eaa58e562936546bf8bd484a80d4a7da3643d31ad WHIRLPOOL 1038f5c84e1a0fd07bae5b17b447cfdfec91bc210bc925ddf14b0fa2378e3a64b29c43d3c5703f3e7a9a341aaa513778c767a4ced152196737b3dcdd80fa3cae
 EBUILD netbeans-nb-9999_p20160703.ebuild 4111 SHA256 297453e28beff4fdbc4846cca69092b1f81c57184ce1fa0326aa2cc1f290c9e1 SHA512 2140c0a32f09a44477bbe141b3e45da3178709d8e15214c1b4bf2f146251304f03229168f43975e39278343be8a16e756a56dff318ac2563dc6401d81a95edd3 WHIRLPOOL 90d6c9dbf5b7770d84f19d71e1794d8ba716993e71a6447e2db483f1048b73209e257c525c81f1695128035fbe8529bddb21ddce6ca0dbd586a219704c68df2a
+EBUILD netbeans-nb-9999_p20160704.ebuild 4111 SHA256 e2a1051b907b8d24a2db073f53741bafe90be2456f76d6b98c6db81219606486 SHA512 f87e748974287662c73ea951b9e100a806af65877c6b5271b04f2b3afa328ddc2f42768a18f9a74701a5c9e9c42cc52dc87cee623fbfdcebaae6df9053c71d0e WHIRLPOOL 1fe3f3425bd650b2b22d946f887a0cb77255e84a8897fa37a4d388247ea2ed4602cc1ad88f8e68a2a3fea97870ec809ed34a1275da38b2a9c0fd11cbfd57f208
 MISC metadata.xml 392 SHA256 01cdbcc83099b97486bd7b8e813e5b19c1138eb0d8d3e8a5683aafd579820435 SHA512 4d2f9160baa022d6a48b61d5f42e71cfd411d244e7a36436629bc5ee4036e4ce19079134d9a6c704ebe942306c2e0199d0591c1e54f92f8f3c8835147e639246 WHIRLPOOL c1131764e1cec66c56b977ebe36014b29e5a68e35ccc326c0cbadd050a6c625cf191c85c212e0a733661c008dab0d99f9a4cdc4c4ae0cc9d775ba1de554795a9

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160704.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160704.ebuild
new file mode 100644
index 0000000..9f02c26
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20160704.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-07-04_00-02-33/zip/netbeans-trunk-nightly-201607040002-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 56589db..27a86fc 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ff
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
+DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 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_p20160606.ebuild 4418 SHA256 bfb5b207aee5d8c75f0343bbbc674270b99d38a2cb740625c3378bda3d4ea3dc SHA512 7635ea777cd143f8b57aeca840939f6636cf34ac8ecaca0866db7f14e25de554190b780dbfa336bf43979e9c2dc57d74341491a2697ae7e54682f81cb251d2b0 WHIRLPOOL c3f786e48e55978b6637b49710973efe12481cb7082d9693d351d06f4f7df91eaf4fd0fc5dbec5484189d506cdca5795b2d812f241943ddde6c3f744db9feb08
@@ -54,4 +55,5 @@ EBUILD netbeans-php-9999_p20160629.ebuild 4418 SHA256 11d47be338b1ca237c468a5fe3
 EBUILD netbeans-php-9999_p20160630.ebuild 4418 SHA256 6010aaf38fd8362861f9b806c2b64677b04dfa1c58d9ec66883b8538acef6d40 SHA512 383ce987bfd97089a1b378a29444677d9af8cf7a76c3cf2eeca7c2dd9efe4df14ace107815aaac7cd6e48c7e7533491415e5374c79a061fdfed24deea4498d60 WHIRLPOOL b9b0f59d8ad9057582008479ee1e512cc654088a1e7ad41b001510dc65c0c128bc32b2ec9b377da3f2649c87e6bf49d943176c6bd68145325e22fbcc8af304ee
 EBUILD netbeans-php-9999_p20160701.ebuild 4418 SHA256 01223f49ba6b96b258d2c7e7c502b168f12b2edf2e0e8af7fdacdf4446796136 SHA512 5b8e985e1c5e443c345ff621b38810ec1626aed1fc28aa4dfb6d7f4fdd7cd8b493346666bcb69fdd2539ed6fdd0ed73a3cfdab744eaa723f22203dadf8f8e540 WHIRLPOOL d2ef1262516dc9b42cd3ac6a2ccf01a526c67cd1988bd44fbf55c0db909d5f4da92dc19d790e67e0ff912b8ad350ad8cd97ac92ab32c8c812362c71dd97b9736
 EBUILD netbeans-php-9999_p20160703.ebuild 4418 SHA256 91a9b546b3a4937c422ed37561448532723d56f17389789c3688e42ebb350e26 SHA512 b038ce6d0ebfa1e8129791955c5b877c10086d2a63777f58cdfa6a0f1824ca331fa263dd34f44e8f014a095ab432d0122703c18bc9437e491c22b7f318b5390b WHIRLPOOL 00dad5a18eb93a723bdab010da55fa30ae4b39545e1a35316f2f82a8a1fc5fb20c30b1195dc803b1af2e153c785fcc0305ca2f9c93e1c1fea66a1914e3d82be3
+EBUILD netbeans-php-9999_p20160704.ebuild 4418 SHA256 00d1ed6228d6465df71e721b11bc4cfe46eb5bc00458cbaf138959147b52b361 SHA512 84d6c119ff17db2f4e5027ab7bb9ac0e617c7e5855de53643a3e1e63425f36abd076f11300ba0d01616a28872288c6f4a40fe070dd515956c8d6f80282ffd360 WHIRLPOOL 4c6521587826815e05baa69796029404fc2d5a88bed3f7eae969f7f7bfe34e6ec7992ea9260fbbf8d992b7d813e1b5dfaa4f2866fdd320f48023ddc3d2b8ba52
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160704.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160704.ebuild
new file mode 100644
index 0000000..95d14f4
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20160704.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-07-04_00-02-33/zip/netbeans-trunk-nightly-201607040002-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 a635459..726a561 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -51,6 +51,7 @@ DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ff
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
+DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 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_p20160606.ebuild 9520 SHA256 044800ebb01df778ead5d4e05e05e6c0dd5faf3a172d3c7b0681ab12d9dd7eb6 SHA512 e4cd8819042ab15906ebda8e92314091e09ef7b0a3f1b538310af34739c94217033a76707a71def3debdb0b45f832b2b107357a443be4e2b00b103990a9256b5 WHIRLPOOL 80d65b32865a339937332ba0afe75c2b481bcde562f7ec40ace207d39b007e2eda423afb0de34a24237cd10182d06b027d1ac91f3e65bb0ba12e581557655f8f
@@ -75,4 +76,5 @@ EBUILD netbeans-platform-9999_p20160629.ebuild 9520 SHA256 0bf3526d550909a3f9395
 EBUILD netbeans-platform-9999_p20160630.ebuild 9520 SHA256 8d27a23a3f18d02205b602f815c308a4c8246ce753be78be741857c76ad3513f SHA512 298b1e8e8f31a0e84daeb1edfac9db9a6b6c51e1605a224600a7a6f6c8b775467469cc9d526ff2b5f6660501eefd8bab4a5741a8a431bc1d677b9280e05dc037 WHIRLPOOL 9fecf9a6b5eddd1c9f152073c2323bf70b59ecb506df9ed524d0a0b84da320d96e9cd209342b4b29a56bc82a1ebd5ef1027f10817b0d5a0dd4bcb6d4fa5df9b0
 EBUILD netbeans-platform-9999_p20160701.ebuild 9520 SHA256 ffd5c1ab67582e5447635fbea6628fded4bd4538ae0132f23355bb6c02b18f6f SHA512 16312c828596ddea8f21d1d03f94c2e7628bdfdfd22aad8292a475b8da1193573cf72ab919d28bb65d96920a96b2ea766aa431afbc8660d831ef1addc8e460ba WHIRLPOOL 72252feff38fe227f5001ab9fc55fb173ac921da30f81f2c4457c82f9c09166a1711f9bba1cd4efd34aff6f755c9e05344eba2b603dc2744aebc4338c817c3a8
 EBUILD netbeans-platform-9999_p20160703.ebuild 9520 SHA256 3b04e535b26734284dd6fcfb8d2a153ba4cdfbc91620b124fc0341d33683d38c SHA512 e94afff5df96eeaf18f6ca825cccb6f45b6c7700e12fc1e3e5781691aeb41e9b159ad350d8722152663869ae4c65e148b3123db3602fcf7a359a50d16943dbeb WHIRLPOOL 3caea5b25594ca14313ee25cd6fbac9f9c3184df22d2b5fbd11b738d09d4f8765f462296f8af5617f764b6e76e9e72c5aea4dd4e0bcff6288fe79a0900682755
+EBUILD netbeans-platform-9999_p20160704.ebuild 9520 SHA256 9a48a158cdeb133516fd4f7b041626608d58d100ea529cef8af2b7dffa762865 SHA512 32e05bc7776eddeb2b539811d37c03579c7d93adcbb8ba72777948d37df471451e95b5eff6378b57510af33f3e5865b6397cb4657a6b8bb7079f7856eb3387e4 WHIRLPOOL 906d81b0de79c2e3e053204d1847cbe43ec3e306a1c5dd728bd47e7f52da18352d274de03dcb59de53f20ffd73d0805f95d1fe76e797241b4df833d396775ea8
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160704.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160704.ebuild
new file mode 100644
index 0000000..ebabfff
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20160704.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-07-04_00-02-33/zip/netbeans-trunk-nightly-201607040002-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 0fe0526..fc7ad5a 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ff
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
+DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 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_p20160606.ebuild 3472 SHA256 ab6942ae90acf230d05a564c4d33730cdf4feeae669729bb0bf50743e27f0383 SHA512 38c96a84403b45a52f1a7b7844447376a0dec6d36ffc36485a802e26bd17611c38ce855e08ce69e350b7b45b2945e2821b5cc5bf5a66615a81be07147c927982 WHIRLPOOL 8ab6257be14ecefb7dad28ad6803917dc44ff7f0c2f4ebb31aa848fdb076210de11e585e58060326c4f16fdc2f7c555f220168572a999e04da279e9213e350ab
@@ -49,4 +50,5 @@ EBUILD netbeans-profiler-9999_p20160629.ebuild 3472 SHA256 400f9c8fd8d2ac203576d
 EBUILD netbeans-profiler-9999_p20160630.ebuild 3472 SHA256 99b2aabe6c38e44e9da1223f800bc2264bd27716b3325696d851669aa02e4327 SHA512 b34a95550e7c81284e89aa6a4db42ce9375eda58749a1c4ab4b16af17d859624be96667fbccc5e00d7311a84804b7a2f512e1fc56488c1753603f5c97053b13b WHIRLPOOL d047fa55173d99b94048e3e7b87d4d421ab8255f898e36112daa7e2e7c01de44c245b261e8cadf75ca9319b1f0acd9850ec4bf8f22067f21ca472610816dcc71
 EBUILD netbeans-profiler-9999_p20160701.ebuild 3472 SHA256 b003e864b0d1b28e937959eb1922f8b000e2cd0c1ccb7a31d84cce81b705bf20 SHA512 c9999b8c8552f22e957f0c25c9b07a9c759f824c02a623f27d69132fd98281d3c6f133fbb089170216792a6aa1e101e50d644e77da99253e88840a080832b4a8 WHIRLPOOL e7348d82b438e95ee58ecdfad13b85de3f82115e4157454fd40f0195e8e39ff41b66ad85b54d43aaa114f335cce526fd4c603e102019b0bbc98ab71f6c5d99a4
 EBUILD netbeans-profiler-9999_p20160703.ebuild 3472 SHA256 c3274064fec10aa0458581ae124143dcdfa5f380c3f166e1e83b833595cdf895 SHA512 eb37cf0163d9032e43a3bcfe14f94ef7b0d0c7dd4dfc1452e7b85f8491203559980f83e359317b233fecb1d48c85b82b24a6a7395768f577cf9b0058d3231136 WHIRLPOOL ecfda57e947224e486c3118d1c2b035f6e0ca23e29f69a9af311268b80001d8e28bf84c13a3d053c122afc98a05e23343f725e1f81f556e4cd2f7f867e24ec78
+EBUILD netbeans-profiler-9999_p20160704.ebuild 3472 SHA256 a1af52990353646259df8954ce56388655a96796153e0731b14ec6cddd47ecfa SHA512 04e27a0ac592d4a5b52cf07584cb29d93f1a7e8834f29026661b711e4683d9716260916f3658eb42ba1ee7444962ed5fc57d838a8b78ad8558d09661ddd63476 WHIRLPOOL df399c80001ab63c840b3503cc7e209225464423f15cdca9f6b253034fa935656f81beb5727d0378aebf76054ff1a30d2f009faaacf1327d89bb6117efd1967b
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160704.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160704.ebuild
new file mode 100644
index 0000000..e9329b2
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160704.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-07-04_00-02-33/zip/netbeans-trunk-nightly-201607040002-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 c0ba80c..7cba2ec 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -49,6 +49,7 @@ DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ff
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
+DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 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_p20160606.ebuild 5343 SHA256 3a18ef09edf6901a4e4c54d71341ab236c4f0711bce63bfc9e13997bf2a40eee SHA512 4fd4540fb289084b81c4ba7350c028afdb2178ed02734b948fd15ef2be8ee4c0b7a8b60d7717c0fd8d65fde44f8b69fa0925520b2867302d9a09e32af5181315 WHIRLPOOL f43a4287a80324b01c4b191b390c040b4bf4ae66ab6ddafe3c3dc8f35ea4ad357789cba9fb243010b8cc3769377342d32be0106eebebdda8744d070008653b3c
@@ -73,4 +74,5 @@ EBUILD netbeans-webcommon-9999_p20160629.ebuild 6242 SHA256 26fa0c9759e3ecca0517
 EBUILD netbeans-webcommon-9999_p20160630.ebuild 6242 SHA256 9c217ac02417695459edba8050d2360bd5f1e0f085f8706d0ad2a1807c82aaa3 SHA512 be4ecd6cc59e877398f96bfdceb17048e3f4c69fc03fa6e896646b25d84a998736294e9f2c6cc82d3d3964f1ecfd9fa2f6defaa60227df28c3590d918abd6874 WHIRLPOOL 3cd416e9664794e970e23af2d9fcd9b3fae05667d5ed7ece7b794cb4abf89dc1d34e4718dc97717a718ed0a41cc8e1b8b6749ec91e638e773f215efe93e7c56b
 EBUILD netbeans-webcommon-9999_p20160701.ebuild 6242 SHA256 0c39818df923716655598daac17daf8a191217bb24783b8fe1ed45898a32d76a SHA512 669f6ea6473c4e92bd2e99ff7d108a173f4458c497e061438995e7ec0699ce363ff9fa56bce0d01983ea0e12f800fde337b6237860c48b2fb2b75c54e3e9af7d WHIRLPOOL 7e239f05594127725b00f5c1619465cfc183ff36c0b6da96497b97d28c1129cb5efae1b265183bccc7f8cd64a56d3e337ab7f86837f6684f062f0169a578c3e0
 EBUILD netbeans-webcommon-9999_p20160703.ebuild 6242 SHA256 5ae26a642e641d0e8d3989b2441cd87b985652885d101b6cdb0f959d981c8f03 SHA512 1a435a50e5251660a77ea77153dbc5c559076bb4a4a48acd75a99b499c2430a58a4357acf377664b508b947b51df1c9f4aa65c065b49f1376040d4c185da0ea0 WHIRLPOOL 1e39fa9140d6021c592f3ac4f0106f6a0e698485b5a06e705e056b9008e3f6df0b231ec5ba1cbd8fdfe0ee34a3356153fa66bfa77e9d6c6c5b82959bf0542e6f
+EBUILD netbeans-webcommon-9999_p20160704.ebuild 6242 SHA256 27158da014ce1d4f743b6ab16058ba1abb528b05b512075e5d34b061237be00e SHA512 1a56881a912a67fdb6691b36c596fc72667134a788b668e3278235006815c4869a2b55755de24d9ad73c8c783a093a5d9f0ab4fb9ceccd8bf6dd7bf8fc0b56e3 WHIRLPOOL 1e69d63511f223746da904e1c97cc392991b78d02b6b7439a85c5296ae82df9c78da4b4fd93df8869d463b171ad7cc684a4dbe763922110aa40126be228f9466
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160704.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160704.ebuild
new file mode 100644
index 0000000..6f86203
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160704.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-07-04_00-02-33/zip/netbeans-trunk-nightly-201607040002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/2E7B73D8CB88351034507A6E365AEAF76FE6FD5C-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}"/2E7B73D8CB88351034507A6E365AEAF76FE6FD5C-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 09534a5..c660343 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ff
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
+DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 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_p20160606.ebuild 2721 SHA256 ecfeb506a4a1d704063d16534434eaaacd7380ec250448001f26b8ae03660be9 SHA512 525662a4f3e748a56dc65f9523d1aad183121b9a43d574cb5f721af320efde68ea685dcfac8866be22eae29890937b2cd9ce7a9ec03ca77b92a465a31009da9f WHIRLPOOL a350856c30916841b819c5317e6413f68572377ec17742910153b93a5e24aed297862031b5fc1e7656d1563affefffdd31213dd47bae2b01849e430f1e3fa9b1
@@ -49,4 +50,5 @@ EBUILD netbeans-websvccommon-9999_p20160629.ebuild 2721 SHA256 31b16740d9c5b5f0d
 EBUILD netbeans-websvccommon-9999_p20160630.ebuild 2721 SHA256 23de0fdebdd2cd62dc0d9ef58e18b6d62947ff0c03862ed021f0a2cc48a79684 SHA512 8816743ee02fc3c919e7bfd2409ecad37de6bbbc95ae81baf20fb68234d86c1cef52111446ba5be8e15a2f284c4ec96f152776d3a98f8124a4c61dbd7452ca05 WHIRLPOOL 27088983c59a56537825676f026a8fdd597213fe676e7a76613a63d98c8b5f3f0408d11f702cdc5222bbc23cc9b240320a3dd7c98bb72224b658a6d7dcc9d97b
 EBUILD netbeans-websvccommon-9999_p20160701.ebuild 2721 SHA256 cf027c12663df0a41c36419e8433517530be2d0ca4e8d8d49316aae88529eb43 SHA512 1359eb7cd6bd6c3bdbd4c4e70de12ab00c2c42df6cc253d52102fe2d39281c7c486d5de1305ad4739823b3f3d28fa2bb76b4d2cef4db92cfbf4bfd462c96c04b WHIRLPOOL 0ed8e01e9d265e3d82aab748575f6aa7e2c2cfa062ed7d0d0b64e66f24418183f4cd2fe46e762a52bb26a7038e7afa52cdd1a542dbd0e8103ccf8cb6b7c4a7f9
 EBUILD netbeans-websvccommon-9999_p20160703.ebuild 2721 SHA256 ebe2d8daac903b630639b7a1d6fc6e14a0acfbc93a13f8699ac6fc2c0aecbc0c SHA512 9e46365580e115131e85632eea0a24c80e84abe12581f3c8d96d07853b6d1f29736ea8235fe4455facd2597f62d9dc552a2af213520ded892dbf8bbfb3f9e5ef WHIRLPOOL fb48e0d44c677b3b7efae2d9f27f41d16b96543f8266ee4b6a4c7737f3d38fc0c3e05d2f8609af589924a4ff32bd2fc0b28cb0efc4a24f90e8b1a9132b710f8b
+EBUILD netbeans-websvccommon-9999_p20160704.ebuild 2721 SHA256 ff9eba591e89477f019a53dc4b82784c1173abcf508fddd51ca69367a038857d SHA512 ce9dc4e8e5c24fbfd6b6628736c094c337acab0d2adc1a878c575f3731755d975b209c4f670eb66da75e1853681110d4b2273d8e8b1d3b2a493530e2452a954f WHIRLPOOL 1f22220757c374f5e32e3d9e6edfa79c928ccf80cd9b0e658b1b582456ffac4c31bdcc252a2e6b2fef508329f7f58bc5a16dd3067da3360e5853065724a9df20
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160704.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160704.ebuild
new file mode 100644
index 0000000..cc808a1
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160704.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-07-04_00-02-33/zip/netbeans-trunk-nightly-201607040002-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 adc91fe..807fa14 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201606290002-src.zip 216524255 SHA256 676f2e2309e6ff
 DIST netbeans-trunk-nightly-201606300002-src.zip 216530311 SHA256 a9edd475135b8989598e4398be2fb89d5fa857de234028db73a4af9d57f1a7e9 SHA512 b1e4fffe78cd36a2e635cb12d80db103a39449f8acd4aa9f1576382f50206f16ba345ed2c08ba2f48c59fb0861d474edd7df7ad1de679debc82c858efa6cb369 WHIRLPOOL 8012e60cdbdb863c429b551af75ab15095036f4dfeff78ccd3c316719d021828c7fe4ffd52134750c3fe2c6adf3fee44eafaec7239e03086c8aa495282199e68
 DIST netbeans-trunk-nightly-201607010002-src.zip 216527795 SHA256 1d037ccb4ccdceca33cf16aaebc99a3dedc8408f3fcdfb77d0fbcfa483b3de10 SHA512 8d735876284fff506107074b023369f335eb0a1c4358fe4055b08da98a5b68298f61dcab08701282b6e87c63d476027298e049a414bd1458188da137866aed58 WHIRLPOOL cdcc51a57b8142065aecf6fea1a258b9bd47f56ad41c33d89bd1a6964cb3d748c1f52c1a19a24b7bcc0e5aa21976f630ad8a5726591585255af21a9793114238
 DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2359f5f3cacaaa6ac5507cb21970c0ebf4e05b571fa352c4a2c SHA512 d1d443a26c2029df748b8661c7460d435f8d68e714f65ebb75418d83d824b623d6deb148152525ee3bcd2fa62e4a466f882c367965786db60b0a6fa388b58bcb WHIRLPOOL c334a02cdfefa93bc81b3d573ae812a0f730bb7f0e7faae8fc644432b49dc76123ae2af91ddd6ec240272b383b21b4ede097e9f19c1ec9d2a5fa8d074253ce6b
+DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 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_p20160606.ebuild 6939 SHA256 24f08ce080db26b4b6c53547e843a8314879ff51d2480cd98e3ef1d9c1b273d9 SHA512 56f9fceed1491c48e02a9da8860a756fc7f38af248b293bb749a462b89b24be9b425acd575def82ff4999473b8137e7d61733fc2e5dae9736c87e5a390aba031 WHIRLPOOL 02e2ab66cf4d7cd75c18475b5ee5edffb29909f1f57950526385abb4310b8bcb5293b1dc8a35a5b3d746903beb7b4c88b2823524d9926f09ef82748a3081c456
@@ -52,4 +53,5 @@ EBUILD netbeans-9999_p20160629.ebuild 6939 SHA256 7d7a99cae16080f9451ebfa095406a
 EBUILD netbeans-9999_p20160630.ebuild 6939 SHA256 f5fd58e599cce28a31bbfef0cdd0439e4e9ca2b77e3ad24a2b5aedf03fcc6253 SHA512 f80a07e8255c519770edb3cc7059b6a74411960912fde261004cc09e3bb74fbeedcf4d17e5681cad4054ec977270e3b04796f420ea11667f1c60e60cb775ee36 WHIRLPOOL 97f51865187c7815cca18869c9067c31990eafe1ea314465e830704812e44ea4b263ab387bf4fd470bf0d44f091a6f71e2ea6e710f4235492c6960b733b9be25
 EBUILD netbeans-9999_p20160701.ebuild 6939 SHA256 d0d49ec67a9a634dbd210d5f3348d586a14feeecda8b8acaf9340d4446228645 SHA512 8e30e5b71bf1079b504235bf356c7cc6fcc7e0383eed94982a759252fd5aa6e0517876ba5da24709250259a8ce14e03029753113b0a24bc6bbf85d44d14b0d5c WHIRLPOOL b4752d5d37423c339bd1108c8513a20c72d2eb57c3374419e7559e4e52f41d8df760902cb95cb19709753ad734805b78a29afab56bfc573acae35e54de3bf012
 EBUILD netbeans-9999_p20160703.ebuild 6939 SHA256 bb32d89b2b352baf8a90c945f3ac328150ddac7dddde75788fe2ac963020dbeb SHA512 74a1c4728cb4b47dae8ede7c107229eed7f80d0403ddcc9f111001c295791bed1c167d4bf34859c5edaa163333060e71e5c8bac00d458356e62ee1b97db3645b WHIRLPOOL 6e8faa9164f5d078ee3555898afc148ec4ae5a1b5c279cc31f6e0be6d7656b170e5b6e67a4346294978c541129845f2f2843a0935e1fa5eaae08cb6cfe4fd17c
+EBUILD netbeans-9999_p20160704.ebuild 6939 SHA256 dfeca6651d8e2a47638bc7f8c1bb686d699102731932461367f4e3c5dc5dac9d SHA512 a9e442c6851df0e2d71355cb84c941933238884ca2d2248a05e45c14ee0551bd0a51a9a5598acc98b62ad38f8d4fcdad75fa2294610724061a58ae7276405a2d WHIRLPOOL 5c52ca7550d1b26b1b7ef9413b554688c0dddc7fb12847e56730f7751e8ccf68e42a4b3f53e9adacfd90a78cd1c7209aff9cba26b5246c38f5527558140c120b
 MISC metadata.xml 329 SHA256 8aeaf2a0228f15c2e4140f401b30f083509bd99d0a578873069f3595cd8555f3 SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640 WHIRLPOOL 799a9b79b1b447bda9631f67e2dfaf722376740e1d2037796528a05f9745eeed00d9990a74a65ce09f74bc5e1d60a887abde540c3c62487d7dd49b8377c15834

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

next             reply	other threads:[~2016-07-04 17:08 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-04 17:08 Miroslav Šulc [this message]
  -- strict thread matches above, loose matches on Subject: below --
2016-02-14  9:27 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-javacard/, dev-java/netbeans-websvccommon/, Miroslav Šulc
2016-01-27 10:53 Miroslav Šulc

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:db68ff3 dfblob:e3d2199 dfblob:0c4690a dfblob:91e0c75
dfblob:31770dd dfblob:5c2129e dfblob:041eb5d dfblob:141056b
dfblob:1de7649 dfblob:61e746f dfblob:fb4ae32 dfblob:8c6070e
dfblob:88f187d dfblob:d0b3a7d dfblob:d003714 dfblob:37835d9
dfblob:0aba827 dfblob:f806ef3 dfblob:ae243d7 dfblob:72ad81a
dfblob:d775f79 dfblob:dc4e847 dfblob:803ed14 dfblob:591dee5
dfblob:f704f64 dfblob:639e67b dfblob:0933e29 dfblob:28e9697
dfblob:147d72e dfblob:8825775 dfblob:6fada65 dfblob:691e69c
dfblob:d6a6ebd dfblob:16e9891 dfblob:e850de4 dfblob:17b2574
dfblob:3c8998a dfblob:36e247b dfblob:03bf2aa dfblob:f8bbc33
dfblob:826f0d2 dfblob:feab85f dfblob:46f99fb dfblob:ae1846b
dfblob:9f02c26 dfblob:56589db dfblob:27a86fc dfblob:95d14f4
dfblob:a635459 dfblob:726a561 dfblob:ebabfff dfblob:0fe0526
dfblob:fc7ad5a dfblob:e9329b2 dfblob:c0ba80c dfblob:7cba2ec
dfblob:6f86203 dfblob:09534a5 dfblob:c660343 dfblob:cc808a1
dfblob:adc91fe dfblob:807fa14 dfblob:86d2969 )
 OR (
bs:"[gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-javacard/, dev-java/netbeans-websvccommon/, ..." )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1467652049.991984308a9c1747b8f6b0c03433d531a4013ada.fordfrog@gentoo \
    --to=fordfrog@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

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