public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-extide/, dev-java/netbeans-dlight/, dev-java/netbeans-javafx/, ...
@ 2016-07-07  9:26 Miroslav Šulc
  0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2016-07-07  9:26 UTC (permalink / raw
  To: gentoo-commits

commit:     64b28149e14ad0f86c2148747b5c44a1ca1b7096
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  7 09:25:54 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Jul  7 09:25:54 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=64b28149

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.3.0

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 9e3415b..a501ea5 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2
 DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 DIST netbeans-trunk-nightly-201607050002-src.zip 216525392 SHA256 4915315fb15da75250a7a10fa3ce1bc089acfb93098a2179e2369f609a6360a6 SHA512 2e26a5593ac76454f3689f8f553049644f71b49c2c1c8119d8cd84e7bbda1c41a284f3d5bd436d2dd0288af3f12263a90f656932b37533e2b9d829310bc17fc9 WHIRLPOOL cbd9eab6ab282f8c120b1d00aeb8cb93b977e85736bf73f2608835143ab948428e3321539970335cdf6f8a64903fb5f765f2543ac5af319e5618b49354d5a4eb
 DIST netbeans-trunk-nightly-201607060002-src.zip 216525395 SHA256 ea3a45a96e4ec5283e0c67f66878da17098a595543b996864b7bdea7d978ed34 SHA512 59732cc31e8cf9addea1235320e53c3f5334d07a7faed7e1cfabeee70eca9bc41f18c03d1741bea3b60edc53f0120908aac9acac26d537d74760eb3a57d98829 WHIRLPOOL a6858ec1461e103abda2d65fe68fc53078b82d31f895bf51a3a9e8ec1ba710e5a49225704a50127110eaf9f031136e03b1fd3d81c0507e341fafa93b97d99b39
+DIST netbeans-trunk-nightly-201607070002-src.zip 216525625 SHA256 ddf8129b13037315956f00228aeacf843e88fe67e4a61f2b730e5a0532c20f4f SHA512 6ce62a221980bce0b90816d68fa177b1f06b5a584e25a5a63448cae78b9de93ea79b42c3c68b958c4dab1da02c1fb3721aa3f700a74955b676ff3a9f273bba96 WHIRLPOOL f8725146f925a10084f363551548201d82fa51e0ef0ce3ca4c21be8e08bb54b74501b4daa595e7c114eef0872f5d81aa0843996f9860dc4812f736e756e4c16f
 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_p20160608.ebuild 3384 SHA256 fef0e34d4306671c2760b0c32dfc9c954d29cbb17ca9b8d73d6b12f8c267f8aa SHA512 d3904a93b2b8915d8a60c396d6039351acbf0560cae67ae2c8e695d6b5ad84392203d49e21a90ebe3230855e5784efb27b97e5eefe57d921a1afb779a7480b8e WHIRLPOOL cff28ab36a04bb088b35988dd42ccbc5babec882327a7de52feec0449e473f0ce47a7ab8463a72d6da70b00a1a24ddbaed52318e7c0ee99961a333d8c3466e2d
@@ -51,4 +52,5 @@ EBUILD netbeans-apisupport-9999_p20160703.ebuild 3384 SHA256 9ef07c0f89d66838dfb
 EBUILD netbeans-apisupport-9999_p20160704.ebuild 3384 SHA256 951ab1c28c6b76a5d18cfd1b50bbb1771fe21d594464a28a1c029fc4c99ed4bc SHA512 fa8a3098a038f03709a0f3919b9ae60c73336198def27515643a2345e215c180531f984a47183959ff7f6998529fa12a8ed0570972da633979547ad35ed7d421 WHIRLPOOL 36398dc5715a9ed007b5a76193989a54a5bacd24c6f1f69668d3c17c0fcfb46869b0430049fa472665c69522d16beb2fee06d400166cb10c443ba0b9a5ec5398
 EBUILD netbeans-apisupport-9999_p20160705.ebuild 3384 SHA256 10d15c639685ad337bd16f4a0349f586a68262b57d0c5feb9ab727118a78e133 SHA512 c45b2ef6b7643728946fb25e1ece5868dcccebb76cf5eda95bc075ce577b8f3421b6feefc9487fef23c2eba2378f911b3b22e23b71658d94595a45d0e92167d2 WHIRLPOOL 7be6da68dfebc5e6ee2b8eaefcebdc3a8629ad4757d2a40d5822490b2cc0f7d8bb0a61df820f090aaa1279591c8eb5899cf63340a5bf01fc8b0d3cd50af80cad
 EBUILD netbeans-apisupport-9999_p20160706.ebuild 3384 SHA256 7a47effb26bd0b832965873e989cbb286bd414e9f33489e00c285c53697bebc2 SHA512 8f36514295c22bae69b2143af3fa3869a8563b9537d6cba459e0fff8a815517e44119d0bb98ba0f5480190ed3c14b5ea5215918b1e0ef0f35485a4c911c1d546 WHIRLPOOL a188ec3e4ebdb0c1ee760793f4291a32c6048508dd8fa0d578ab1f2834d1deac030a66f4aa2277205270a7497179f676a44d8028d7c9bed2afe587ce8312e551
+EBUILD netbeans-apisupport-9999_p20160707.ebuild 3384 SHA256 ab90102f365f9fc9f028b925233dff878eabc3b7baa2b1c9eca67856a0a675d4 SHA512 e0bbddf34454a573f5f81f14f44f86fd6a74b183af41e1b94b76fc62d6daaaea9e20f92085a948114b0f55ad8e5d77bbe9985948613413f02692dc567ef2718e WHIRLPOOL 28a6c633e7855b350d4172aeea0bbcc5f699295aba8df42093b9be498cc2ccfdf3955342d3ed5b400ccadae5a39ee9a05bb62284f3f8993c5f6a87216f074d32
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160707.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160707.ebuild
new file mode 100644
index 0000000..f8861ac
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160707.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-07_00-02-33/zip/netbeans-trunk-nightly-201607070002-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 2884bfb..f24f71c 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2
 DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 DIST netbeans-trunk-nightly-201607050002-src.zip 216525392 SHA256 4915315fb15da75250a7a10fa3ce1bc089acfb93098a2179e2369f609a6360a6 SHA512 2e26a5593ac76454f3689f8f553049644f71b49c2c1c8119d8cd84e7bbda1c41a284f3d5bd436d2dd0288af3f12263a90f656932b37533e2b9d829310bc17fc9 WHIRLPOOL cbd9eab6ab282f8c120b1d00aeb8cb93b977e85736bf73f2608835143ab948428e3321539970335cdf6f8a64903fb5f765f2543ac5af319e5618b49354d5a4eb
 DIST netbeans-trunk-nightly-201607060002-src.zip 216525395 SHA256 ea3a45a96e4ec5283e0c67f66878da17098a595543b996864b7bdea7d978ed34 SHA512 59732cc31e8cf9addea1235320e53c3f5334d07a7faed7e1cfabeee70eca9bc41f18c03d1741bea3b60edc53f0120908aac9acac26d537d74760eb3a57d98829 WHIRLPOOL a6858ec1461e103abda2d65fe68fc53078b82d31f895bf51a3a9e8ec1ba710e5a49225704a50127110eaf9f031136e03b1fd3d81c0507e341fafa93b97d99b39
+DIST netbeans-trunk-nightly-201607070002-src.zip 216525625 SHA256 ddf8129b13037315956f00228aeacf843e88fe67e4a61f2b730e5a0532c20f4f SHA512 6ce62a221980bce0b90816d68fa177b1f06b5a584e25a5a63448cae78b9de93ea79b42c3c68b958c4dab1da02c1fb3721aa3f700a74955b676ff3a9f273bba96 WHIRLPOOL f8725146f925a10084f363551548201d82fa51e0ef0ce3ca4c21be8e08bb54b74501b4daa595e7c114eef0872f5d81aa0843996f9860dc4812f736e756e4c16f
 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_p20160608.ebuild 4790 SHA256 4cf79d337eafec4c8f56b70d9006e431c21df99a4fafb0ff68d2a1b7b81e736a SHA512 413521322481c6bad9b876dfdd8fc038782cd35af02bc5c5c38edd078dc18e9054d5b500fd1af8fbc2eec1ae314d698d41b6f143a23fcb6e7e6c697949562450 WHIRLPOOL d93b826975b7e78066d1a1d46fd408f20dfdbf911340805eeeb7c9f69da1c6f25a83c506dc8e99d0ada5e92035a18776e4f2c033f45418f166c09102386d337a
@@ -64,4 +65,5 @@ EBUILD netbeans-cnd-9999_p20160703.ebuild 4790 SHA256 c523d0fd4053d15b0aa5856d69
 EBUILD netbeans-cnd-9999_p20160704.ebuild 4790 SHA256 ee2e074ab100f5cdbbf9581ae6eff719f119d4685071eeeeee56f43e9d08398d SHA512 8e7908f351f3bb750cddc471670d18cc54bedec4592b1f18568b098f9b47b1970b6b7dd7751f5fac013a413ceb19ca139daa3c5222a2119196091add96436352 WHIRLPOOL 3a9bf321a4b34dac9e6584bb1485091f17255e6fadb78ab8576797ccbc13290d5b0967af2ed519a242e8794b2aba0e909916e5ea91fe84d3bd3b9392614807a2
 EBUILD netbeans-cnd-9999_p20160705.ebuild 4790 SHA256 a5fbb795ea2971e0fab2f81859d497d417e1af7478e9e700abd1d69276cb50f8 SHA512 283680fc6d5bb75c43061de220e89482d80d4c25325fa8674b978c02110fbbe711ab5ff302b3e2b9eebbba23363a3e81762adef7185f6a5be3049f2cf0c87c1e WHIRLPOOL 17f79b789213bcc114d903bf416740cbadf1758e25450f7e209b5adace2af3582280a4c39556fa8dcee21f5b8901fae09be75738c03f72c3b90ab7cd82fb5a73
 EBUILD netbeans-cnd-9999_p20160706.ebuild 4790 SHA256 f75bc3135dcf8d7550c938852a9f113974f4a874cbae40afbd36410834ff7b65 SHA512 26732ab28a6a963fc9393156a654b6b46ab6a28b3cbf6a7815dbd4950c013365dd6958ddaae3d5d25c2c046410b7fcfafc3044d3b9e5b6653f1e5e7e3d3da9c9 WHIRLPOOL 17553feb6ba1198ac68b0b1cfcd77bd9e46f8df7f18d55cbfa40a166c9dae2fc7be0095d59c0d6ccd9ba28b93d3d2bb469f377471b2ae57433eb9a9dc8b8a85f
+EBUILD netbeans-cnd-9999_p20160707.ebuild 4790 SHA256 b43945eb2a89a2d102d17819ee310d79250ab0ee1242035ca85b627610d6d6a2 SHA512 a07192a18803a5239e33790d337323f07a09cf549f06a9ee3e2b12e847e9f4a45d8b1bcb0fc2cdb3dcda99f5d13d57bce35629a6f81b3e7db87093ae42de2b68 WHIRLPOOL f4e80c46b6a514ee52732f1eac265a74b43544943337d824fd5e48fdcae11b76abe932c9611372355fbfce67457b502c6891db0fdab73cbf8964d8fb3b0004df
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160707.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160707.ebuild
new file mode 100644
index 0000000..1bfb6d6
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160707.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-07_00-02-33/zip/netbeans-trunk-nightly-201607070002-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 44c326c..ea6a444 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2
 DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 DIST netbeans-trunk-nightly-201607050002-src.zip 216525392 SHA256 4915315fb15da75250a7a10fa3ce1bc089acfb93098a2179e2369f609a6360a6 SHA512 2e26a5593ac76454f3689f8f553049644f71b49c2c1c8119d8cd84e7bbda1c41a284f3d5bd436d2dd0288af3f12263a90f656932b37533e2b9d829310bc17fc9 WHIRLPOOL cbd9eab6ab282f8c120b1d00aeb8cb93b977e85736bf73f2608835143ab948428e3321539970335cdf6f8a64903fb5f765f2543ac5af319e5618b49354d5a4eb
 DIST netbeans-trunk-nightly-201607060002-src.zip 216525395 SHA256 ea3a45a96e4ec5283e0c67f66878da17098a595543b996864b7bdea7d978ed34 SHA512 59732cc31e8cf9addea1235320e53c3f5334d07a7faed7e1cfabeee70eca9bc41f18c03d1741bea3b60edc53f0120908aac9acac26d537d74760eb3a57d98829 WHIRLPOOL a6858ec1461e103abda2d65fe68fc53078b82d31f895bf51a3a9e8ec1ba710e5a49225704a50127110eaf9f031136e03b1fd3d81c0507e341fafa93b97d99b39
+DIST netbeans-trunk-nightly-201607070002-src.zip 216525625 SHA256 ddf8129b13037315956f00228aeacf843e88fe67e4a61f2b730e5a0532c20f4f SHA512 6ce62a221980bce0b90816d68fa177b1f06b5a584e25a5a63448cae78b9de93ea79b42c3c68b958c4dab1da02c1fb3721aa3f700a74955b676ff3a9f273bba96 WHIRLPOOL f8725146f925a10084f363551548201d82fa51e0ef0ce3ca4c21be8e08bb54b74501b4daa595e7c114eef0872f5d81aa0843996f9860dc4812f736e756e4c16f
 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_p20160608.ebuild 2968 SHA256 b91b4319a9a05eefeaf14e3d36385468585dfab0dd638eb415419553e905f4ca SHA512 8159ba95417eb962fa30d0ca72bb7cb8c2dcda7c25b44ebaf61971e7f7892669aa4190dbb968cad9f119f89536774c0b8ea81e74cbeb4c71af167187184de47a WHIRLPOOL be7048e960c1938b2c6ad9e76fb83e1cd8aca69223de267e8c9b803532fd1abd3f098bb69a25a955db59bda7a77265b371e0a8a93422150ed11aa9c563b7b151
@@ -54,4 +55,5 @@ EBUILD netbeans-dlight-9999_p20160703.ebuild 2968 SHA256 a3d7fd8c65576aa6946f5c2
 EBUILD netbeans-dlight-9999_p20160704.ebuild 2968 SHA256 b69ef07eb1aac09251cca079445d47a644e78a035f30ce084995c352619c14c4 SHA512 944dd7a7aa278a6657fe7783b7800d37286b07f8eb4f42253565dcb9ce41257fc3178b606b5687b00815f80252afd6cf86f936f7653d4b0ef9602bc60d2ed44b WHIRLPOOL 9625e043c7547f9d5d9add96ac797b25767e4e73c4fbdea423af8418b0a82670a0d5651fbcb26ff087febd9b360e2155ad5894cd4c5894f97e981d491ed80756
 EBUILD netbeans-dlight-9999_p20160705.ebuild 2968 SHA256 80abd320ba8dcaa862543003f427dc32328167f96f2de80ac27a6c42862163d8 SHA512 29b58e3eae679f971086ba3efdd6435f4a8ae43071d307571b001bea518ae8f97c3f8fb22c190345b97ebf90bdbb6302230644a0041d1a83ca3e329a7c945327 WHIRLPOOL 4433e1610ec5ae68fd9e27dee6e7c57d71be5cb46350caf1fdc4f467e98b4b956d80959257cbc7a1794bd15785aa7a6cac208726df7b321a03263fd604b596b8
 EBUILD netbeans-dlight-9999_p20160706.ebuild 2968 SHA256 4d5025542fbd8bf401fe92176104cbeb482c1cd94f0b2717d5fe57a987a7d042 SHA512 37d09ddf4330fe71a7464987171f854f05440ccbb8df81bf6b7c4281517332953e266ed1ff6ad5aa04ebdd1d28512f96d0072c7a4ce9948563a4df790c067a3c WHIRLPOOL 1c1f62c4a674fd57b46f355ce4b3394ccd7f8d1c402fdf789097ad5c70749d7157fe2538f9df1d595723145db954f13bc8f160b34d72148e0b2454e01d3f0a1f
+EBUILD netbeans-dlight-9999_p20160707.ebuild 2968 SHA256 5fdba55c07910f1b7579ef89ec986a2a47b0e6afc61bc8e5870efd220731775c SHA512 e581bc811843fe324a2b562d5b471b49261c98a9a2a7ec6c2b4ed1f35852982e60918630b0519f01dedd5b843d2043bb63dbf972bdc73bfd5f247eed1332f7da WHIRLPOOL 4e40430ec1be8e88c1e155bfcc49af370e6898af2b3e59a762b3935ae07cf0d783f6f8248226a97d044be2df297f1654e2d4dabab7da52ca97e04276f8079762
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160707.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160707.ebuild
new file mode 100644
index 0000000..1076c0a
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160707.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-07_00-02-33/zip/netbeans-trunk-nightly-201607070002-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 91f8e7e..3c8360b 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -58,6 +58,7 @@ DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2
 DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 DIST netbeans-trunk-nightly-201607050002-src.zip 216525392 SHA256 4915315fb15da75250a7a10fa3ce1bc089acfb93098a2179e2369f609a6360a6 SHA512 2e26a5593ac76454f3689f8f553049644f71b49c2c1c8119d8cd84e7bbda1c41a284f3d5bd436d2dd0288af3f12263a90f656932b37533e2b9d829310bc17fc9 WHIRLPOOL cbd9eab6ab282f8c120b1d00aeb8cb93b977e85736bf73f2608835143ab948428e3321539970335cdf6f8a64903fb5f765f2543ac5af319e5618b49354d5a4eb
 DIST netbeans-trunk-nightly-201607060002-src.zip 216525395 SHA256 ea3a45a96e4ec5283e0c67f66878da17098a595543b996864b7bdea7d978ed34 SHA512 59732cc31e8cf9addea1235320e53c3f5334d07a7faed7e1cfabeee70eca9bc41f18c03d1741bea3b60edc53f0120908aac9acac26d537d74760eb3a57d98829 WHIRLPOOL a6858ec1461e103abda2d65fe68fc53078b82d31f895bf51a3a9e8ec1ba710e5a49225704a50127110eaf9f031136e03b1fd3d81c0507e341fafa93b97d99b39
+DIST netbeans-trunk-nightly-201607070002-src.zip 216525625 SHA256 ddf8129b13037315956f00228aeacf843e88fe67e4a61f2b730e5a0532c20f4f SHA512 6ce62a221980bce0b90816d68fa177b1f06b5a584e25a5a63448cae78b9de93ea79b42c3c68b958c4dab1da02c1fb3721aa3f700a74955b676ff3a9f273bba96 WHIRLPOOL f8725146f925a10084f363551548201d82fa51e0ef0ce3ca4c21be8e08bb54b74501b4daa595e7c114eef0872f5d81aa0843996f9860dc4812f736e756e4c16f
 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_p20160608.ebuild 15825 SHA256 36defa7266b234b9514d2af8ad8a8e982188b80a0229a0ad27b856b91060b1af SHA512 004a42dcf1dcbbfa79a3c19f97b8073360b82ba8792f229431ff0c2c7a381f7356d5c67d4bd33912786b688923b9f759d2f6880b72c626e490fb10ab455e6a73 WHIRLPOOL 4627ee149a0278364990aa23081e44571fb5f0a2ab3e7ebbad9803567f54be44027952aac6d4dccc569c2dcbbcdba1e57040f2af73838447a543f1ffb4406527
@@ -83,4 +84,5 @@ EBUILD netbeans-enterprise-9999_p20160703.ebuild 15825 SHA256 ebba0ae1b9d4315667
 EBUILD netbeans-enterprise-9999_p20160704.ebuild 15825 SHA256 46d7aab48f8a7b87117fa6f4fa2200c2861caf900e9a7a6921ebaf26dcca9160 SHA512 3dc8fa6c55c1bf6b44211445ed1825a08c7359ab50738f4251e8ac731430c589563893344473c2f9b28d521b2426a0bb760ec6228400c757f8a85f8a46b53758 WHIRLPOOL 4908e88bd3626eff5a1ad17300d7cfc36bb1e7d260c4025c379f2738dc9f78a3fa37d1001273cefc4ae248dd2be4a74b90a9de54ccbedf38bb2ec9acc6afd903
 EBUILD netbeans-enterprise-9999_p20160705.ebuild 15825 SHA256 775cb38e63e15d48f2038688c7131b1b3ff986d2fecb1fc4007aa8fe019cea82 SHA512 f2a286ef13280eb8b16946aa766ceab98565a9bb1d21edb66d74e7538ef5b47b54c11dbe1777b6f7293b17fa745a59f0884e6b4b697875464e9ff98620df7af1 WHIRLPOOL d55ff3bff4678ada53b0b5bf28fd31d6a954f9d7868fe397d705fec3fed72981265fc7492ffc504ffa385a9920ede469852979e272493d64fddd39d5c74333a6
 EBUILD netbeans-enterprise-9999_p20160706.ebuild 15825 SHA256 317ac2a4e41f08154ccf9af1f53215a5879c0220a2fb139f2e1cdbfcdfb9a86f SHA512 0d2e41db1bf380c25bea4bd3566d6bf4c5bb43d21edd8c7debc078b8f3cbaeee73579d70347340dec338b1cc4a9c46614bf266d9eca68c53a0498c350fb1614b WHIRLPOOL 30570bc0adde9788fa378dbc6f2fe24ba62a7305b8edb39d12ba2426ab95b0dfefc09961c4ef1fd29b000275397411974e4c7464cc4bb4870f2116d7a2f24b38
+EBUILD netbeans-enterprise-9999_p20160707.ebuild 15825 SHA256 c363b308fe2b270e10764f8897f0ff779c85cca488f4419f6cb91d6baca5869b SHA512 136582dcaa1f9c3c3415e37145b5f0f7f90caae25de76d737e4169c9fed67df454bbba6139468386e5d89b0ba946ed2e0f3c38089d4849c6365b33bddb56f45e WHIRLPOOL da17318b5894611098116593c866dd5f08d8be3374d206034a4c36f69cfad6e27bd0c1e720942f28b4b3beaf163fea5bbf844dc5f32f57e8d9b87f933fa5cf49
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160707.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160707.ebuild
new file mode 100644
index 0000000..369e33d
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160707.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-07_00-02-33/zip/netbeans-trunk-nightly-201607070002-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 c17139e..d2e7cf6 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2
 DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 DIST netbeans-trunk-nightly-201607050002-src.zip 216525392 SHA256 4915315fb15da75250a7a10fa3ce1bc089acfb93098a2179e2369f609a6360a6 SHA512 2e26a5593ac76454f3689f8f553049644f71b49c2c1c8119d8cd84e7bbda1c41a284f3d5bd436d2dd0288af3f12263a90f656932b37533e2b9d829310bc17fc9 WHIRLPOOL cbd9eab6ab282f8c120b1d00aeb8cb93b977e85736bf73f2608835143ab948428e3321539970335cdf6f8a64903fb5f765f2543ac5af319e5618b49354d5a4eb
 DIST netbeans-trunk-nightly-201607060002-src.zip 216525395 SHA256 ea3a45a96e4ec5283e0c67f66878da17098a595543b996864b7bdea7d978ed34 SHA512 59732cc31e8cf9addea1235320e53c3f5334d07a7faed7e1cfabeee70eca9bc41f18c03d1741bea3b60edc53f0120908aac9acac26d537d74760eb3a57d98829 WHIRLPOOL a6858ec1461e103abda2d65fe68fc53078b82d31f895bf51a3a9e8ec1ba710e5a49225704a50127110eaf9f031136e03b1fd3d81c0507e341fafa93b97d99b39
+DIST netbeans-trunk-nightly-201607070002-src.zip 216525625 SHA256 ddf8129b13037315956f00228aeacf843e88fe67e4a61f2b730e5a0532c20f4f SHA512 6ce62a221980bce0b90816d68fa177b1f06b5a584e25a5a63448cae78b9de93ea79b42c3c68b958c4dab1da02c1fb3721aa3f700a74955b676ff3a9f273bba96 WHIRLPOOL f8725146f925a10084f363551548201d82fa51e0ef0ce3ca4c21be8e08bb54b74501b4daa595e7c114eef0872f5d81aa0843996f9860dc4812f736e756e4c16f
 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_p20160608.ebuild 2913 SHA256 55ff2f3a9b96184996a2559695b5aa608e8fd7ea7a44266a0d19f8d14f831c6c SHA512 bbc88e212e5ca006034319bd83a17e9fbac3bbb35b58f06ee0097e8f7752b928da0dfe6f43e977063b7d371c3b8ae69b1c0844d5123554ceee155d7675b35125 WHIRLPOOL 85cc0a2b6cd2af13cb7716c8cbbafa30699f44e516fc90621bc6c591858f4a06adac897bd1fde14c0b025bd60e1b9949dac21637510ae23cf41ac62a469428c8
@@ -51,4 +52,5 @@ EBUILD netbeans-ergonomics-9999_p20160703.ebuild 2913 SHA256 a8cddebb47cbb92c077
 EBUILD netbeans-ergonomics-9999_p20160704.ebuild 2913 SHA256 e5ded9a6fbbeaa0c1a641401c9e8f3420e2e837455178eedd5e5a2ed9416d169 SHA512 e3bd8a5677d7406bd9d059c068d93aeeadd217b62af32817d70517f7931c8e1a2a47abd59099519dc71353cbdf9e029ab731382c2b5643b9f3562de81fea1a4d WHIRLPOOL 7a6fdcaeac3cfea9ebc6952d49513159028d3c939cb8112132e7f25572b75d639921272798608ce109666e186405d33d16c6cf3af51407e6002ded0f50ae2df9
 EBUILD netbeans-ergonomics-9999_p20160705.ebuild 2913 SHA256 991759bd9a2c2191e39bf33339143b89a829c662511cfae54141db1a14e6c229 SHA512 bff7ff12c4d6275e907dc27e49c620980db9558283358a56ca62d0c15ff43a9c5021a36dbd7296990b7d5ef0f16e2be6912ae902baf07e3f5bc9425ba9c57f7e WHIRLPOOL f93452d546e20dd848cd12a9c9ef067153df38ec5054245c46a905699950503b61ac49dbbc9af29d613d7098cccaac98cce78f84fd0e36f2c2fd237f7dbe06e9
 EBUILD netbeans-ergonomics-9999_p20160706.ebuild 2913 SHA256 a21e0892700beaf925a843e05a507519dd404b5264f98487d2c3fa17b9671cac SHA512 a3a0ac5f9afab8af7ff1881800f4bd2fe918ac5f1249934c6bf90d35c7c01fd9c3ce9cb2b971bf16c0b2eb2c91082255a4b994409f856e3c41afd19d44cbf388 WHIRLPOOL 2e65358e883e1d1bf368e449b2ed0b3d9820318240368c0dd3c204184da39aa93e6fcdda3e3fd630b897455f8d59963173d6458729fb9c08cbae0401d5d99062
+EBUILD netbeans-ergonomics-9999_p20160707.ebuild 2913 SHA256 7369b78f5d98d5010d7fce80f6c306aa55fc58f508e5d6add596d4b3670fcecc SHA512 81066f7873ac6e30c7ff72a03c22b9b62d453fddc6d57492016a54a04d27520cef1df15f56d8049e7f3c3f9a05436ffad7873333e963519c6157737ace267fbe WHIRLPOOL 89f6ac0d9283e7bc8eb6293e45042bcfb0128e2ed100a728f0b4715034bc29c6306d45ec3a204a91ffd319c4946387cd73bddc0aedd4407b1d96990b2581a17a
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160707.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160707.ebuild
new file mode 100644
index 0000000..75997c9
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160707.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-07_00-02-33/zip/netbeans-trunk-nightly-201607070002-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 8cb5cd8..aef6588 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2
 DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 DIST netbeans-trunk-nightly-201607050002-src.zip 216525392 SHA256 4915315fb15da75250a7a10fa3ce1bc089acfb93098a2179e2369f609a6360a6 SHA512 2e26a5593ac76454f3689f8f553049644f71b49c2c1c8119d8cd84e7bbda1c41a284f3d5bd436d2dd0288af3f12263a90f656932b37533e2b9d829310bc17fc9 WHIRLPOOL cbd9eab6ab282f8c120b1d00aeb8cb93b977e85736bf73f2608835143ab948428e3321539970335cdf6f8a64903fb5f765f2543ac5af319e5618b49354d5a4eb
 DIST netbeans-trunk-nightly-201607060002-src.zip 216525395 SHA256 ea3a45a96e4ec5283e0c67f66878da17098a595543b996864b7bdea7d978ed34 SHA512 59732cc31e8cf9addea1235320e53c3f5334d07a7faed7e1cfabeee70eca9bc41f18c03d1741bea3b60edc53f0120908aac9acac26d537d74760eb3a57d98829 WHIRLPOOL a6858ec1461e103abda2d65fe68fc53078b82d31f895bf51a3a9e8ec1ba710e5a49225704a50127110eaf9f031136e03b1fd3d81c0507e341fafa93b97d99b39
+DIST netbeans-trunk-nightly-201607070002-src.zip 216525625 SHA256 ddf8129b13037315956f00228aeacf843e88fe67e4a61f2b730e5a0532c20f4f SHA512 6ce62a221980bce0b90816d68fa177b1f06b5a584e25a5a63448cae78b9de93ea79b42c3c68b958c4dab1da02c1fb3721aa3f700a74955b676ff3a9f273bba96 WHIRLPOOL f8725146f925a10084f363551548201d82fa51e0ef0ce3ca4c21be8e08bb54b74501b4daa595e7c114eef0872f5d81aa0843996f9860dc4812f736e756e4c16f
 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_p20160608.ebuild 3377 SHA256 e53f634ccc760f390b70d56ff22ab720b6a795591c7048d77ea8378e225ce52f SHA512 3a0003a3b00f67fdd0ba5c7566f4d94d4e7a73cc819268ebf328e8093f9f3332cd805bf50a18284b39ae5f7fb95a2642731a73910697025b5c49009d82594808 WHIRLPOOL c6cc735e1521d523bf7e1c672fcb13ecf0faf60a2e3d24aea3e52efd236c5093b39dd881809ee2630325064b2800b6c28ae08a93be8da8cb7887ec280a7d4780
@@ -55,4 +56,5 @@ EBUILD netbeans-extide-9999_p20160703.ebuild 3377 SHA256 e5778092a56ee97249f69a2
 EBUILD netbeans-extide-9999_p20160704.ebuild 3377 SHA256 b41d519ead2f743826abeb29d9d7a03529bc044641f922ee5f9e8943e7b81aa5 SHA512 be900848494382cb149df6cd636bde246fc2e5165491ae8408569f8f15b5fadfae35e23306367d179b749950c34cf3c49535703ac9cf0b6ff9355d979857f042 WHIRLPOOL ba1ad53e16ae58014f22d68c6acf4d7ac09bdfe2b4e1e78e8175143abee95f19c81798df8eea4a6103589ccd499ac316ada5bf3cc3c50646305dbd609ab9800a
 EBUILD netbeans-extide-9999_p20160705.ebuild 3377 SHA256 f0efe891b2d5bde35839c4f28e1db5ce22440f3ef4a353b06815b32c12fb0315 SHA512 d261a5088d34260da6bde40f738421c987af144ab1cd27075aa9274c5f49ea34ff745ab41959c65a0463ad52ea777a9905fc9ab2a66d9a477abc74c8b489a429 WHIRLPOOL 80764258007ade4f4fc792fdab1c208266794e24d5157f27d7b3ae89525187e491c596511c507f80b66aaeaaa5315d8ac9c44519699e56f0aefb31a524ddeed0
 EBUILD netbeans-extide-9999_p20160706.ebuild 3377 SHA256 f24a1f29a41b8f892211c280a9b8ae88a1b9bc9652f89ed11462aeee37f2ab23 SHA512 5271454d6747e0ab419a0e14186d34183f71fb602bce2c32e61203369f471e59c33ad78497d1fddb47a3709db94cfbebc1d795de1ffbc4819f5e706ce6ad29cb WHIRLPOOL ab0e4af2ecf5010a6721a79ce9d5564569e751f2856d0af81e52d707f24526087c0047c036eb76076081799dc0aa32a5edd4bcd6274b0945d81287693d04cf9e
+EBUILD netbeans-extide-9999_p20160707.ebuild 3377 SHA256 e4becdf42116d40c8c7880c6e4360c7b01d02e43576c36ae5d2ee3d28a1a54cd SHA512 5766b18bae64391f5c23457e5f94fc9820694514cd0cc1218adb2cd35a41adea41869fefb979059e4edb45c659d88b82ec81beec26c1e7108f590d4ad749d765 WHIRLPOOL a84660a1c5b2019cadf1091a301bf2858425cfe58f912736914a5c9d90caa6f3dd17137fed733d5af9d4f64e99e14eaf15f5976ad4cd8165d223491ef9d07819
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160707.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160707.ebuild
new file mode 100644
index 0000000..26a6d6e
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20160707.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-07_00-02-33/zip/netbeans-trunk-nightly-201607070002-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 e2cf8c4..2a64bc3 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2
 DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 DIST netbeans-trunk-nightly-201607050002-src.zip 216525392 SHA256 4915315fb15da75250a7a10fa3ce1bc089acfb93098a2179e2369f609a6360a6 SHA512 2e26a5593ac76454f3689f8f553049644f71b49c2c1c8119d8cd84e7bbda1c41a284f3d5bd436d2dd0288af3f12263a90f656932b37533e2b9d829310bc17fc9 WHIRLPOOL cbd9eab6ab282f8c120b1d00aeb8cb93b977e85736bf73f2608835143ab948428e3321539970335cdf6f8a64903fb5f765f2543ac5af319e5618b49354d5a4eb
 DIST netbeans-trunk-nightly-201607060002-src.zip 216525395 SHA256 ea3a45a96e4ec5283e0c67f66878da17098a595543b996864b7bdea7d978ed34 SHA512 59732cc31e8cf9addea1235320e53c3f5334d07a7faed7e1cfabeee70eca9bc41f18c03d1741bea3b60edc53f0120908aac9acac26d537d74760eb3a57d98829 WHIRLPOOL a6858ec1461e103abda2d65fe68fc53078b82d31f895bf51a3a9e8ec1ba710e5a49225704a50127110eaf9f031136e03b1fd3d81c0507e341fafa93b97d99b39
+DIST netbeans-trunk-nightly-201607070002-src.zip 216525625 SHA256 ddf8129b13037315956f00228aeacf843e88fe67e4a61f2b730e5a0532c20f4f SHA512 6ce62a221980bce0b90816d68fa177b1f06b5a584e25a5a63448cae78b9de93ea79b42c3c68b958c4dab1da02c1fb3721aa3f700a74955b676ff3a9f273bba96 WHIRLPOOL f8725146f925a10084f363551548201d82fa51e0ef0ce3ca4c21be8e08bb54b74501b4daa595e7c114eef0872f5d81aa0843996f9860dc4812f736e756e4c16f
 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_p20160608.ebuild 3416 SHA256 7a05afd7b2c5d25b3e7631d2ce1cf8fee4ac230af07fb342bf69977bf7160f6f SHA512 9fdceff92ac66993f5f9dd9d9d7c30b99e70607a8cc63c650a664a01435df52df879366cf8f89dcc36a19412c6a541d6c195f1676b59904c2ec0a2c5c82bbabd WHIRLPOOL c0ff5af646cd9e1a04d0afb43f0140bf9f31badf571455b92e01f4f1788943fa4e1e29cea90a77db4dec860915a183fbe99f0b9f69c85fd4db203b1df1bb39e0
@@ -53,4 +54,5 @@ EBUILD netbeans-groovy-9999_p20160703.ebuild 3416 SHA256 9a87e96c45b2e84bded618f
 EBUILD netbeans-groovy-9999_p20160704.ebuild 3416 SHA256 7a6dce76ab4e8b02e7a52d48938e58d2d3f2c403df2d198087739c7905b78250 SHA512 9d25bfe4a37d0d9a7b1370121f7848ee20114a03197f47a24a68da7654d695042da18b5847df567ac2a17136358589b4dadec8afa54b1a499bf25cab1feb2c48 WHIRLPOOL 1b3f764d3a0ce32fa7442b1efca3356b2060085fdecee160c68baa61d5bcab6ad95c6e1d4abc57887ee75a61c888dabd1db43de79bc8304efe83f7c43088b8c8
 EBUILD netbeans-groovy-9999_p20160705.ebuild 3416 SHA256 759f1318abd7994679f72baff2ba44d5b4cc81c0da5cc3aa52c8c0ce85c40ce4 SHA512 7da2ba9ef38664fe9997cc0646d57498d0d661107a29ce54af2f53867c56438d98747a43a037afb67b15e17ea3ce44228239bf89849fb6d696345960a2d358cc WHIRLPOOL c29daba43f514b4bf4aed94bb5c005fdac31a9812ae4d3187378a00eb5a406e668d1f3002a653a5135275d9c1c02f11d995630ba0d26b32391e817587de9bd57
 EBUILD netbeans-groovy-9999_p20160706.ebuild 3416 SHA256 d7e2327c572e23aeacbaf17e9beb54eaece74e16ebe47383cbbc4fce2c574427 SHA512 6c6d05580dea1fc9ced3b0767c79f2fa158f0c9050299f6ae73759470ff4eb10b824851e76b22d5148558cf5de3baa3eba8bf3e8c2be6ee5124e27057e862829 WHIRLPOOL e49a0fe45242a400038a56217a7f5c7261d61b21f606cd3a949ab5c3a7fc1c77066acc9a5f53cb768bdaec8a7419facb6330ebb973478e86456543cc5ff81e3f
+EBUILD netbeans-groovy-9999_p20160707.ebuild 3416 SHA256 9194ddebfdae2aef644b8ee5135d1a611d7192066952361aa1b5e867a178adfd SHA512 3118c33098a88eb55d787abd5de79086bad5ff4219fbab3bd27df973d8f1ce4d2b04d22dad6aac455f3d3956c32a8e30787af7138ecb066c9a9df19a654f2c2a WHIRLPOOL d09b10a786a27c7137d3fba7c9b5fa24dc438b93f404f4e9f9190ad883de45903b061a893c54f7b21c2736f3d3d48f2b1e83b91dab14487cf443a532ae5153e6
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160707.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160707.ebuild
new file mode 100644
index 0000000..81d33b9
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160707.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-07_00-02-33/zip/netbeans-trunk-nightly-201607070002-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 e5bf8f2..7cf1d7f 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2
 DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 DIST netbeans-trunk-nightly-201607050002-src.zip 216525392 SHA256 4915315fb15da75250a7a10fa3ce1bc089acfb93098a2179e2369f609a6360a6 SHA512 2e26a5593ac76454f3689f8f553049644f71b49c2c1c8119d8cd84e7bbda1c41a284f3d5bd436d2dd0288af3f12263a90f656932b37533e2b9d829310bc17fc9 WHIRLPOOL cbd9eab6ab282f8c120b1d00aeb8cb93b977e85736bf73f2608835143ab948428e3321539970335cdf6f8a64903fb5f765f2543ac5af319e5618b49354d5a4eb
 DIST netbeans-trunk-nightly-201607060002-src.zip 216525395 SHA256 ea3a45a96e4ec5283e0c67f66878da17098a595543b996864b7bdea7d978ed34 SHA512 59732cc31e8cf9addea1235320e53c3f5334d07a7faed7e1cfabeee70eca9bc41f18c03d1741bea3b60edc53f0120908aac9acac26d537d74760eb3a57d98829 WHIRLPOOL a6858ec1461e103abda2d65fe68fc53078b82d31f895bf51a3a9e8ec1ba710e5a49225704a50127110eaf9f031136e03b1fd3d81c0507e341fafa93b97d99b39
+DIST netbeans-trunk-nightly-201607070002-src.zip 216525625 SHA256 ddf8129b13037315956f00228aeacf843e88fe67e4a61f2b730e5a0532c20f4f SHA512 6ce62a221980bce0b90816d68fa177b1f06b5a584e25a5a63448cae78b9de93ea79b42c3c68b958c4dab1da02c1fb3721aa3f700a74955b676ff3a9f273bba96 WHIRLPOOL f8725146f925a10084f363551548201d82fa51e0ef0ce3ca4c21be8e08bb54b74501b4daa595e7c114eef0872f5d81aa0843996f9860dc4812f736e756e4c16f
 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_p20160608.ebuild 4126 SHA256 e3210ee3a0de309a33d079a3d3d835fa86b7513b43357b6c8f3381ee0377ad98 SHA512 18a157ba23833b4d1a80e8cc039b2fa0ae6fca47049ae77ceeada93396c00f1abaf04bc0cf8b1993f106384328730f180cefc2b702969d4ad66a5f33256a8bba WHIRLPOOL f0717fed0f1fc0fd74af833118f6d2300829fa02adedf6d0aa1b86d5c45bef551c7ff6e93e94739b24006fd921dc8e6c07873b7fb1e89aa0bcf0eed07a653e37
@@ -56,4 +57,5 @@ EBUILD netbeans-harness-9999_p20160703.ebuild 4126 SHA256 c8400f90fccb787acd82b3
 EBUILD netbeans-harness-9999_p20160704.ebuild 4126 SHA256 ba5fc6010a900721db190dbff3693a5e7272ea3da6d13a9cb069e6d02aff0d29 SHA512 99f72ddb2fac98eeb40dcffe478cbb84dd022e20e399ee728fb7e46d3e5132341cc5e6b2eedbe1afd77086397e7661814ee22e112642d6dd9aa3d62b9a664277 WHIRLPOOL 14980a150ccb49cd482d99e1ff369a40ea80a16ec626b662fdb3c5ac62a96a13c73142fadd52b0c1e2a1cc4b3e5b6df1e2097b8d89e5258180cb1d841564fc82
 EBUILD netbeans-harness-9999_p20160705.ebuild 4126 SHA256 8020c822334d5b65bed32280fe09d80f5dc241e538da0c97571ae71a7b2559e9 SHA512 07373ca117258b2ae9c3e300485f53cbcd9c643900b32445518e78f6eb62224759163897b1606e761de09b654aab4eef95e6c8f935916cf65ed6113bbec790bd WHIRLPOOL 87d9518f0e40afcc2b6248bfcdefa25cad22995b432af315e9370caaf03e5589eedb369a2cf7e1c7747c0b8efcff0d292723b5f78995126720e3cf6e69a2b00a
 EBUILD netbeans-harness-9999_p20160706.ebuild 4126 SHA256 5ba4b342afd7a6b7407ea22a2338faf4b654fbde368734b50208955d76d094ba SHA512 22b5d39b1035dd5261bdf1db90bc9199e0956b8be5b4f794b6064b1d69d8d43edc5123b64b6dbc1b293f4dadde718070f02fdd0ef20857e99876e907faf10850 WHIRLPOOL 97e4250121239d3961b7f9c4788145116b2d24eddc34662046e47166addd099daa4b2eaa8adb419fe6f4298f52e720a5bb2062a69698baa34626ae077a130e52
+EBUILD netbeans-harness-9999_p20160707.ebuild 4126 SHA256 a1b90c448059f80f92c6f65dca0598470b33d3f17f0b8b43e5dfd6c62f6b4392 SHA512 1d913ebb8a5cf22e25ac66c36a1653ad059d036a65293f63c6c87a84643ebbafa2181d3a85ef6d531da9b36e6e87fd7d7f13a88b5cec2ba31b141e47255bb7ab WHIRLPOOL 96cd40f963c5d77de70ae5740f1b046902c6a9df621d027d9d228f24d88d2e04585121a6cdf9f9d08f2f2e89fd94f88da4f28f5028dc4be5dfe44f432da02349
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160707.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160707.ebuild
new file mode 100644
index 0000000..70ca827
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20160707.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-07_00-02-33/zip/netbeans-trunk-nightly-201607070002-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 ee349d6..622b077 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -166,6 +166,7 @@ DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2
 DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 DIST netbeans-trunk-nightly-201607050002-src.zip 216525392 SHA256 4915315fb15da75250a7a10fa3ce1bc089acfb93098a2179e2369f609a6360a6 SHA512 2e26a5593ac76454f3689f8f553049644f71b49c2c1c8119d8cd84e7bbda1c41a284f3d5bd436d2dd0288af3f12263a90f656932b37533e2b9d829310bc17fc9 WHIRLPOOL cbd9eab6ab282f8c120b1d00aeb8cb93b977e85736bf73f2608835143ab948428e3321539970335cdf6f8a64903fb5f765f2543ac5af319e5618b49354d5a4eb
 DIST netbeans-trunk-nightly-201607060002-src.zip 216525395 SHA256 ea3a45a96e4ec5283e0c67f66878da17098a595543b996864b7bdea7d978ed34 SHA512 59732cc31e8cf9addea1235320e53c3f5334d07a7faed7e1cfabeee70eca9bc41f18c03d1741bea3b60edc53f0120908aac9acac26d537d74760eb3a57d98829 WHIRLPOOL a6858ec1461e103abda2d65fe68fc53078b82d31f895bf51a3a9e8ec1ba710e5a49225704a50127110eaf9f031136e03b1fd3d81c0507e341fafa93b97d99b39
+DIST netbeans-trunk-nightly-201607070002-src.zip 216525625 SHA256 ddf8129b13037315956f00228aeacf843e88fe67e4a61f2b730e5a0532c20f4f SHA512 6ce62a221980bce0b90816d68fa177b1f06b5a584e25a5a63448cae78b9de93ea79b42c3c68b958c4dab1da02c1fb3721aa3f700a74955b676ff3a9f273bba96 WHIRLPOOL f8725146f925a10084f363551548201d82fa51e0ef0ce3ca4c21be8e08bb54b74501b4daa595e7c114eef0872f5d81aa0843996f9860dc4812f736e756e4c16f
 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_p20160608.ebuild 30761 SHA256 b9bf5ca9d81e896f62976e0acd3f627bedbb0484631f0cb8aeb57db237dde627 SHA512 465b1abc3b1b6c1cd99991f3dc117ed8c0406625ff0c107963787c1a2fccbc5f6e58382f9545e141c8be4292dbfc974c7b78d2b8fcaeb6ea0d2d2340b0431006 WHIRLPOOL c9a53ce61a48012ccc594744d4b193ef23ebaee063865633db6499ef1fa860ace289ca96d32024ac58e6b789b3983d1bd0ab7edc542c98bc0c40f7df54088e45
@@ -191,4 +192,5 @@ EBUILD netbeans-ide-9999_p20160703.ebuild 29867 SHA256 265ef7ad1ee6240dc6c2e5fcc
 EBUILD netbeans-ide-9999_p20160704.ebuild 29867 SHA256 cc9a9f0fd9cb88725e3fbe3c05081742a46e041f2d5ef4158594ab80db062317 SHA512 6724660509905200323ae61e340825c17772a4e94952fe0442e5352adf1595bb54c239562131af4a40b3afa06ceef5c2b43f3e4ebe02161d7e7449a69ea994e3 WHIRLPOOL 44ecc0bd24800e7641044f8d14c87b5e46081371957ecc1fec095706a2f7749eb26223fe65dcd4bcfffff387696594a21330ab75479c0e938386c841e7adc1d0
 EBUILD netbeans-ide-9999_p20160705.ebuild 29867 SHA256 abc15d8dbd1282685eb461a3482bf43c7359478afa05fd47bd091e3312731c61 SHA512 718eb9ca50437b00a7484568e2e5c8348b3fae4017a72c3f6289ddbd1c883a48c2f7fc0f4b1ca57acfa5ceafa1b9efc5d9cde91790a3e5c839d5d7fb1cd22808 WHIRLPOOL 1bb80f5c7e6ee2fe3274074d22b3de406541ce4281efb272cdf7fa851d7ea322e5e2552b6397c6ae4c5ae8a657ea9254e8cfcc9bc0565c767d89da72aaaa1048
 EBUILD netbeans-ide-9999_p20160706.ebuild 29867 SHA256 a7098bf9ccd132368fdddd90590daa3b8267c5bad2edb937f536f2923f58af1c SHA512 13cd324f522c284ac3d9567241da2b4439ee7debd359dbd4804309c2d135fe6a8ff0c5ab873e9585023c5815f36d5ac73b30f5ac4ffcfd2e950c706bed73f346 WHIRLPOOL 799b1c5a5973ef91a3ac22dc326156d88b37f31e3bd511e3677fb7289eb294f9c1ee4230f4644659ba4f567e515cb120631a8c9f58e569b8bbffe3873589b8c8
+EBUILD netbeans-ide-9999_p20160707.ebuild 29867 SHA256 42aada428fbf916fefcf9a5b9e73063f0bf3f38a5b45eb5472c4f54e56326362 SHA512 14af3ea538acb7499a837e7a0726a664884f086f7a9fbcc119498429cebc0b0d86873a95ea9b3f6fc10405535c75928d80ab970146044b0df711bd74133f5cca WHIRLPOOL 530891c349bc08deae1b3948865ecfd668aad4ea8fded6b22cce7476f4c0b7d0e2c72837cdaa161023eec9dbe9edac572b0c565cd0da79bce4394425c17f1133
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160707.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160707.ebuild
new file mode 100644
index 0000000..e41aa24
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20160707.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-07_00-02-33/zip/netbeans-trunk-nightly-201607070002-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 ada9e9c..3abca07 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -65,6 +65,7 @@ DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2
 DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 DIST netbeans-trunk-nightly-201607050002-src.zip 216525392 SHA256 4915315fb15da75250a7a10fa3ce1bc089acfb93098a2179e2369f609a6360a6 SHA512 2e26a5593ac76454f3689f8f553049644f71b49c2c1c8119d8cd84e7bbda1c41a284f3d5bd436d2dd0288af3f12263a90f656932b37533e2b9d829310bc17fc9 WHIRLPOOL cbd9eab6ab282f8c120b1d00aeb8cb93b977e85736bf73f2608835143ab948428e3321539970335cdf6f8a64903fb5f765f2543ac5af319e5618b49354d5a4eb
 DIST netbeans-trunk-nightly-201607060002-src.zip 216525395 SHA256 ea3a45a96e4ec5283e0c67f66878da17098a595543b996864b7bdea7d978ed34 SHA512 59732cc31e8cf9addea1235320e53c3f5334d07a7faed7e1cfabeee70eca9bc41f18c03d1741bea3b60edc53f0120908aac9acac26d537d74760eb3a57d98829 WHIRLPOOL a6858ec1461e103abda2d65fe68fc53078b82d31f895bf51a3a9e8ec1ba710e5a49225704a50127110eaf9f031136e03b1fd3d81c0507e341fafa93b97d99b39
+DIST netbeans-trunk-nightly-201607070002-src.zip 216525625 SHA256 ddf8129b13037315956f00228aeacf843e88fe67e4a61f2b730e5a0532c20f4f SHA512 6ce62a221980bce0b90816d68fa177b1f06b5a584e25a5a63448cae78b9de93ea79b42c3c68b958c4dab1da02c1fb3721aa3f700a74955b676ff3a9f273bba96 WHIRLPOOL f8725146f925a10084f363551548201d82fa51e0ef0ce3ca4c21be8e08bb54b74501b4daa595e7c114eef0872f5d81aa0843996f9860dc4812f736e756e4c16f
 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_p20160608.ebuild 15656 SHA256 9fc58bb0920b73d4cc3a99da4f711a317d271d2a506f927774f7ed0e5bd1b867 SHA512 9ce1fa75ce42be6adc4cf4df6254aa616096b6135eb6c4b0a0abf527979d9fdf57889eb2f2698cdf6c288e06b5653ad05f6c8825d02ec12819f035185815e5ea WHIRLPOOL 468316c7b728fd1d5d6a711ec35bbd92d430309dc489d30a9e200eb6474dcd375cfebe6c717e0e0b900f420fafb91834e367c1f448fb433354f059a87bf3105e
@@ -90,4 +91,5 @@ EBUILD netbeans-java-9999_p20160703.ebuild 15656 SHA256 3fcc256725c5a332ccf91636
 EBUILD netbeans-java-9999_p20160704.ebuild 15656 SHA256 85d002b3150e9944ebf7a268b0d31c5cb1bb5302d5513a08c5ca81a29c84815a SHA512 baf8c2924e9630e6d5ee2612310221318c915bd73ed26583dd35e527ed133bc913f7ecc7adab990284f39779ff905dfba40a5160b4603bfec3a198281449b333 WHIRLPOOL d97ae3b11a6539883aa6e1765885abf2dc6ff6309542881cd7300496655b0c24619499b37c7b5da109fde8916e229d7b8fe802039297686fd3044951d41a3ae3
 EBUILD netbeans-java-9999_p20160705.ebuild 15656 SHA256 817031ed08fd195504cf35bf98b1c9b206a764ccc1002a561a4c5b5189c1af2f SHA512 c1b0dc9a329ecb2cd1e4be43e913a796b77846be88eb88b21a6c9d9016f361198afe57f8a87bffe58398fbb5111a0bc85132a06d9d46c91ecfaf5d6527fa8aef WHIRLPOOL f8ad18e7adcc257423e27ded2de20ef4237432d6ddb838c4f1ee945936fa633298d40a4f90dffdded98c76f3b52596e755574e806990c13d43c9734270b53629
 EBUILD netbeans-java-9999_p20160706.ebuild 15656 SHA256 41a8db03c50938d24b010fdde63fbddd5c2c3767c84f167908f6500f874370cc SHA512 16d2592da5ac83ea1a2ddc02950a33e516d07f2c678d2de414f69a0e64fae345a29798af4d8f07e7a41ce3b9002fb2291494d7b7f0150b4eaf616a7896426cae WHIRLPOOL 5924d60f2dfbcae9c514e4b1e03a8f05181b74de02a44348f3c27fb188457c4d2fc79baf3ad7bd244a461845ded1a6985e71143d2f5dbd6b3f5cdb0d68673785
+EBUILD netbeans-java-9999_p20160707.ebuild 15656 SHA256 bf69fb0a97bfff1da41d5e72e69f8c31172d24fdb4aa7acff9448602b8959028 SHA512 79e23712517d7e36ad4fb76d0df5262a5dbdf67f75cbef5ca659b6c7c24b579e577c364dd2681b27555d5979e99e181aa0455d64eea0fb6a23840578967f0606 WHIRLPOOL 7ed169af62305d691f6cca1c175c6a4609b32a7c906353b759c89d0d59310e20b2ee7992ca3a138005a68db0840bc5b93bcad4586789123ceb041e83cd36e921
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160707.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160707.ebuild
new file mode 100644
index 0000000..29f92c4
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20160707.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-07_00-02-33/zip/netbeans-trunk-nightly-201607070002-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 70d0788..5569235 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2
 DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 DIST netbeans-trunk-nightly-201607050002-src.zip 216525392 SHA256 4915315fb15da75250a7a10fa3ce1bc089acfb93098a2179e2369f609a6360a6 SHA512 2e26a5593ac76454f3689f8f553049644f71b49c2c1c8119d8cd84e7bbda1c41a284f3d5bd436d2dd0288af3f12263a90f656932b37533e2b9d829310bc17fc9 WHIRLPOOL cbd9eab6ab282f8c120b1d00aeb8cb93b977e85736bf73f2608835143ab948428e3321539970335cdf6f8a64903fb5f765f2543ac5af319e5618b49354d5a4eb
 DIST netbeans-trunk-nightly-201607060002-src.zip 216525395 SHA256 ea3a45a96e4ec5283e0c67f66878da17098a595543b996864b7bdea7d978ed34 SHA512 59732cc31e8cf9addea1235320e53c3f5334d07a7faed7e1cfabeee70eca9bc41f18c03d1741bea3b60edc53f0120908aac9acac26d537d74760eb3a57d98829 WHIRLPOOL a6858ec1461e103abda2d65fe68fc53078b82d31f895bf51a3a9e8ec1ba710e5a49225704a50127110eaf9f031136e03b1fd3d81c0507e341fafa93b97d99b39
+DIST netbeans-trunk-nightly-201607070002-src.zip 216525625 SHA256 ddf8129b13037315956f00228aeacf843e88fe67e4a61f2b730e5a0532c20f4f SHA512 6ce62a221980bce0b90816d68fa177b1f06b5a584e25a5a63448cae78b9de93ea79b42c3c68b958c4dab1da02c1fb3721aa3f700a74955b676ff3a9f273bba96 WHIRLPOOL f8725146f925a10084f363551548201d82fa51e0ef0ce3ca4c21be8e08bb54b74501b4daa595e7c114eef0872f5d81aa0843996f9860dc4812f736e756e4c16f
 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_p20160608.ebuild 4971 SHA256 c076552cba7074a1a1c76c76e55a29c3516431dd3c487a415aa5c27f4cfb861e SHA512 4d7ede906e49eb917d673343c00b737298328ecf2c28e6fe2c3ff4c934cfe74ef7f0a11d4a09679fd5ec5ec03be07284c9b6e1a2b875242d4b649732d446f399 WHIRLPOOL 00b0a0a8a5237ccd9bbfd3a821734ac0a1736999154b8aad4d7201428fe7416347524a6c02792fea89a9464c56f35bd1ab085978e15120ef8b37876a64ee4991
@@ -54,4 +55,5 @@ EBUILD netbeans-javacard-9999_p20160703.ebuild 4971 SHA256 f382fb5dba85a7e23a10b
 EBUILD netbeans-javacard-9999_p20160704.ebuild 4971 SHA256 a16c5985a556ef75e6cfd42f0da8d55e71a14e405948749798d19b5022dc0c7b SHA512 dcb91d9399cdd3b282cb2c2a0d4ce712f216ab4012261e61fb71b212fbacb6af7025f75efa115283952c49c5da56f132ea0ded604fe99469019d747ccfca0846 WHIRLPOOL ac4eab54534988d1fd33edf3bfc7c7c7dd80cf488b9e7b02c48687ecc663c67023b27a2a2b77c9f7fdc4b92125b34b1ba5a191756107a5de779d037e6a5226a3
 EBUILD netbeans-javacard-9999_p20160705.ebuild 4971 SHA256 f5d8744b5e940fc957812de3a99da5c5cb8dd7f1fa0cb2c5b9a62e27bd41f986 SHA512 f3b08c4092c4d9e082f38955bbb89f04ad581f6463ba1b0cb944b9642dd8c481f7e4c0041b34062c4e5711954b910e64f0ed8c49cfcedfc1139cf7f274f044c6 WHIRLPOOL ffb203ffff4350843cf55bbf322090432e8176293f63519730e9364720f10853ee84b541b4e50a822545528a59fdb584401579a101231aa2ee140c803d3864f9
 EBUILD netbeans-javacard-9999_p20160706.ebuild 4971 SHA256 f7105d5d3bab4221b4d5097760a72c3b3686978659055d0a96b9265146763257 SHA512 aa661dfa3339513c4e71574268056aa4ad7d40115eac283e65ba3390c173790b01bb45513a84778e14b8a8e08d010e4af00b78598955c994068706419b0adb9e WHIRLPOOL d2e0b01e505a965c414e15b25b8adf70fc5d6ee88037881bbf7ace8211fa8fceebda3b8ab2fadb23dcc6fcdcfd1cc4cb503c32349872afd8d3bee4bb91a9acfa
+EBUILD netbeans-javacard-9999_p20160707.ebuild 4971 SHA256 c2bf393de1763c5f36bb34ceb8737a3a1f6b0bfbc160e0b5e25f0654ca317212 SHA512 42abdae2d58b5d571e1dc63b8232e48cca36f9ce0ee43ac8e2c37053de209f07fef5bf3ae3693dbdbe0ea049407a4b1941d8c222ddc44ad712c6ff75fbb442d5 WHIRLPOOL 565a57ac330c2bd08ba77b2488806a81380a4a632588ecec1deae290e3c90bc350f7b035c111b5c8708b9b8c084b9e326266a77e79095315cb52ee4b9093f012
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160707.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160707.ebuild
new file mode 100644
index 0000000..1fbfc83
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160707.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-07_00-02-33/zip/netbeans-trunk-nightly-201607070002-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 4042cf0..1ffe7b1 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2
 DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 DIST netbeans-trunk-nightly-201607050002-src.zip 216525392 SHA256 4915315fb15da75250a7a10fa3ce1bc089acfb93098a2179e2369f609a6360a6 SHA512 2e26a5593ac76454f3689f8f553049644f71b49c2c1c8119d8cd84e7bbda1c41a284f3d5bd436d2dd0288af3f12263a90f656932b37533e2b9d829310bc17fc9 WHIRLPOOL cbd9eab6ab282f8c120b1d00aeb8cb93b977e85736bf73f2608835143ab948428e3321539970335cdf6f8a64903fb5f765f2543ac5af319e5618b49354d5a4eb
 DIST netbeans-trunk-nightly-201607060002-src.zip 216525395 SHA256 ea3a45a96e4ec5283e0c67f66878da17098a595543b996864b7bdea7d978ed34 SHA512 59732cc31e8cf9addea1235320e53c3f5334d07a7faed7e1cfabeee70eca9bc41f18c03d1741bea3b60edc53f0120908aac9acac26d537d74760eb3a57d98829 WHIRLPOOL a6858ec1461e103abda2d65fe68fc53078b82d31f895bf51a3a9e8ec1ba710e5a49225704a50127110eaf9f031136e03b1fd3d81c0507e341fafa93b97d99b39
+DIST netbeans-trunk-nightly-201607070002-src.zip 216525625 SHA256 ddf8129b13037315956f00228aeacf843e88fe67e4a61f2b730e5a0532c20f4f SHA512 6ce62a221980bce0b90816d68fa177b1f06b5a584e25a5a63448cae78b9de93ea79b42c3c68b958c4dab1da02c1fb3721aa3f700a74955b676ff3a9f273bba96 WHIRLPOOL f8725146f925a10084f363551548201d82fa51e0ef0ce3ca4c21be8e08bb54b74501b4daa595e7c114eef0872f5d81aa0843996f9860dc4812f736e756e4c16f
 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_p20160608.ebuild 6293 SHA256 5c1d3a89916aca94e9fec74a0fb81dcee57af794ab857cea0d3d3255b92f1c44 SHA512 9f5d93e4bececcf9c64fcc6ea088cf1656cfd340a0cb52e57ca7214cedf12470a6439a1a84c06ece72c15f6f6219160ca35025465b86255cdb527599a050877c WHIRLPOOL 41d6481800fc9fc8c76e38a0da88a851b820e7841ba46d867686500a0757fcbae3883e6bdbeabf5a51a5651a9ad5c98628506d30c1542dd05036bb5bc71d3991
@@ -53,4 +54,5 @@ EBUILD netbeans-javadoc-9999_p20160703.ebuild 6293 SHA256 3e194cbce3e198089acd9f
 EBUILD netbeans-javadoc-9999_p20160704.ebuild 6293 SHA256 facd790a162faf661027444b75b5668b36b153cf73a42e9925f700dce9395c03 SHA512 f30c8ef1ee8ce2ff7fb3c13c2cd60d3b18ff81fadc2ea51e08237ff92088b24ac155515535a609473beae40dc6f09c3b8f968176e00147e5a66e27f8e57be717 WHIRLPOOL de51200b96ba0d00d419f764cb50f58112c3e6a25ef03d48abb17ce41575cbad02429c9364c83181bc304c75daa518ef5517d671217fbea0ef7aa841c4cdf7e8
 EBUILD netbeans-javadoc-9999_p20160705.ebuild 6293 SHA256 9b7e2ef3afc03ef01bb7be866cde41b5f8d2705927e2a8dfb100393f850a9028 SHA512 b2e157751bc239e96c901049b97e62d4ee4f8df872a139b63f21550f921bd163d740bf27d05263b75333246f15e737557bef70d352209060221c5b543340e696 WHIRLPOOL a6465adf73a673d0ee26896b6fb37500ff0f05991971685e9bb0d8d380c75c0d8e779f88848b54c8e0a7e969197250946ad2f7f63436b5984c18cb78aa9d44ad
 EBUILD netbeans-javadoc-9999_p20160706.ebuild 6293 SHA256 af7c6132817f222d5056d10ae90dd11b8a1a0e34f56df42733bde03ff4400a2e SHA512 796927ad360b7d6ff5d4714bc70322fc90443bf40549c7bb972057399b5c164728f93a4e8fe06ebea8b56a400abc57fd57ecca406baef2169cdecb32bd7c8c57 WHIRLPOOL ecd90a42358601458ca34a688c9ad6d95fb8f9c30c787ebab64d0009b2078061dc68969984dbd436b61b1835d7a9320856a00a8b933a3e1a8ee8088be197ccde
+EBUILD netbeans-javadoc-9999_p20160707.ebuild 6293 SHA256 09d884627adf40d6bd337ac72b00bf64af897d8dbc7f48e3d62fd6e8f29522ee SHA512 5d04c7e2b18a2c4d87d5d405cc73077ce5f18fe25f6a9c253512a9df5b26960527e4efd2ead0afe1a68afaff20e3b0441f1e99692a92a23de2c4c2c472f689a6 WHIRLPOOL 603ae70564f5e439a5ce7ff616e919e3c4e001ac526e3d56d4c0432ed7bd289c3349d264143cbb51965b1581a0895e024f6b6814d54cb25d63c559c9a0742bb2
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160707.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160707.ebuild
new file mode 100644
index 0000000..65fc6b4
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160707.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-07_00-02-33/zip/netbeans-trunk-nightly-201607070002-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 318f1bb..6972d7c 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2
 DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 DIST netbeans-trunk-nightly-201607050002-src.zip 216525392 SHA256 4915315fb15da75250a7a10fa3ce1bc089acfb93098a2179e2369f609a6360a6 SHA512 2e26a5593ac76454f3689f8f553049644f71b49c2c1c8119d8cd84e7bbda1c41a284f3d5bd436d2dd0288af3f12263a90f656932b37533e2b9d829310bc17fc9 WHIRLPOOL cbd9eab6ab282f8c120b1d00aeb8cb93b977e85736bf73f2608835143ab948428e3321539970335cdf6f8a64903fb5f765f2543ac5af319e5618b49354d5a4eb
 DIST netbeans-trunk-nightly-201607060002-src.zip 216525395 SHA256 ea3a45a96e4ec5283e0c67f66878da17098a595543b996864b7bdea7d978ed34 SHA512 59732cc31e8cf9addea1235320e53c3f5334d07a7faed7e1cfabeee70eca9bc41f18c03d1741bea3b60edc53f0120908aac9acac26d537d74760eb3a57d98829 WHIRLPOOL a6858ec1461e103abda2d65fe68fc53078b82d31f895bf51a3a9e8ec1ba710e5a49225704a50127110eaf9f031136e03b1fd3d81c0507e341fafa93b97d99b39
+DIST netbeans-trunk-nightly-201607070002-src.zip 216525625 SHA256 ddf8129b13037315956f00228aeacf843e88fe67e4a61f2b730e5a0532c20f4f SHA512 6ce62a221980bce0b90816d68fa177b1f06b5a584e25a5a63448cae78b9de93ea79b42c3c68b958c4dab1da02c1fb3721aa3f700a74955b676ff3a9f273bba96 WHIRLPOOL f8725146f925a10084f363551548201d82fa51e0ef0ce3ca4c21be8e08bb54b74501b4daa595e7c114eef0872f5d81aa0843996f9860dc4812f736e756e4c16f
 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_p20160608.ebuild 4717 SHA256 7f90ba3d7cabd3c2e0e9fcd8a44bdc1cf1218976715c01b48b9bcf7bcd99a84c SHA512 621ce463a504088f1f4c607852b2e17046fbf3ccef351807e33d69bbdc7e015591ef483ab83073075be612473312b5a5f3451650f2d22f8c1ada56f7f587e9fc WHIRLPOOL 104d18baaab7a119aba34c0006787d9f2e9876e0bf387911ee7fb9ad336d4cb484aa3ff79656270863ef99d334a325294e4a4f6227c672f2d3ea452c008dbcc9
@@ -59,4 +60,5 @@ EBUILD netbeans-javafx-9999_p20160703.ebuild 4717 SHA256 4bb1e976a5430af00fee9ea
 EBUILD netbeans-javafx-9999_p20160704.ebuild 4717 SHA256 ba15b86def3276e7cc7393aabb6b30bcf459e8606e062c64dc0a957b52b9ecfd SHA512 44a826bca25d4ed92b8c7257fd07583dd7784c9a1a80a99d1056b2d952c56d53e27427e84613b8bef659d3116ac20b7f3690789aec0ffaa4990e8e9ee3ed179a WHIRLPOOL 50e2d803a4d4ec68590b8f1990ea1912e4ebca811c5c55fc0a61d220d1190d6d19f067fb9b81a1e4aa65094443d49569603f86582c263926bd438902f5b90818
 EBUILD netbeans-javafx-9999_p20160705.ebuild 4717 SHA256 105c375b994f15604ede2051320fb3d7ca12c11bbf23fbcb9379220e782a58d1 SHA512 db580619d42799005441587afbde4e3abeb8452070a8b8eedb47493ec09d25ddad5577cadb86521a1427fa59672e40cb8a7c0960ee448789202d79858e8f8604 WHIRLPOOL 0c78e4bc129a2acffaf4fec188bb0369008335684dcc0aed2daf3ff57fe32539d01fac5a424f39c5f6dbfa34838ca9db05d3f83a72c821d3cd3817df345d876b
 EBUILD netbeans-javafx-9999_p20160706.ebuild 4717 SHA256 0a67e22f0778b15927629fcbe1a84124ca3b72a95b137106da5813b41cbf40ed SHA512 db464fe3483d0244c410d581010050c50965e9adc8814c94f5abbf29197d3fa774d03f0798b3a2bfaeaf9dd6a8bbd86cd35dce8890447c54b490bfd105857ecd WHIRLPOOL 44971300078df292e9721e47fafc30f337ddbe0aee9d1e4aca69cfafebe83646a4a8a7cba118b2a50b4a8cf18326570b10815c301920eb0296f600d3ca1d1f20
+EBUILD netbeans-javafx-9999_p20160707.ebuild 4717 SHA256 a28990f541bd8c043a86d87632cd72b5a3e47eaee8d64fa58865cbd5f471aa79 SHA512 08b78679e90b4d326d8d7060d8c7fd40a76848bfd843c4bc9dab6bf9da8e017d16be9c720c5b7da6e4db6ec4e8c0ab7aea8339f2ed0ee8fe61fc5c3799d5784f WHIRLPOOL 585640c1f574d7304fbdda74751bbac6a12ee6afc5761548ef8425f90014b43d43997cf2fc287349838656c52b4645901202de53ee79fc2626182c5114906ef0
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160707.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160707.ebuild
new file mode 100644
index 0000000..2bcb3f0
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160707.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-07_00-02-33/zip/netbeans-trunk-nightly-201607070002-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 f3996b9..8d11a8c 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2
 DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 DIST netbeans-trunk-nightly-201607050002-src.zip 216525392 SHA256 4915315fb15da75250a7a10fa3ce1bc089acfb93098a2179e2369f609a6360a6 SHA512 2e26a5593ac76454f3689f8f553049644f71b49c2c1c8119d8cd84e7bbda1c41a284f3d5bd436d2dd0288af3f12263a90f656932b37533e2b9d829310bc17fc9 WHIRLPOOL cbd9eab6ab282f8c120b1d00aeb8cb93b977e85736bf73f2608835143ab948428e3321539970335cdf6f8a64903fb5f765f2543ac5af319e5618b49354d5a4eb
 DIST netbeans-trunk-nightly-201607060002-src.zip 216525395 SHA256 ea3a45a96e4ec5283e0c67f66878da17098a595543b996864b7bdea7d978ed34 SHA512 59732cc31e8cf9addea1235320e53c3f5334d07a7faed7e1cfabeee70eca9bc41f18c03d1741bea3b60edc53f0120908aac9acac26d537d74760eb3a57d98829 WHIRLPOOL a6858ec1461e103abda2d65fe68fc53078b82d31f895bf51a3a9e8ec1ba710e5a49225704a50127110eaf9f031136e03b1fd3d81c0507e341fafa93b97d99b39
+DIST netbeans-trunk-nightly-201607070002-src.zip 216525625 SHA256 ddf8129b13037315956f00228aeacf843e88fe67e4a61f2b730e5a0532c20f4f SHA512 6ce62a221980bce0b90816d68fa177b1f06b5a584e25a5a63448cae78b9de93ea79b42c3c68b958c4dab1da02c1fb3721aa3f700a74955b676ff3a9f273bba96 WHIRLPOOL f8725146f925a10084f363551548201d82fa51e0ef0ce3ca4c21be8e08bb54b74501b4daa595e7c114eef0872f5d81aa0843996f9860dc4812f736e756e4c16f
 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_p20160608.ebuild 4412 SHA256 3d19fdcc7ed73784253915553d3eb23bcbd19905c1cc1527548211e3a70098ca SHA512 59f25d1d66f2103efc0ded92c829fb20651b04ea3d70457fe23736014e5c29e9d05cea603ee0d808305b2351e3f607ebee2d01349cb7a79c238f025d2961b2c6 WHIRLPOOL d6303dff540a67a187afc3cdc3f938f1b11439f13aea24312d36bc60206121b60dfd531d8417945b928753b1c5896e5215cfe198f854428ce6eb155e2e42a12a
@@ -51,4 +52,5 @@ EBUILD netbeans-mobility-9999_p20160703.ebuild 4412 SHA256 cd7979651af160dbd8814
 EBUILD netbeans-mobility-9999_p20160704.ebuild 4412 SHA256 8166ed2971b3111b7851c73425907f7c54a00fd1385ca2faea0907141b640c46 SHA512 fb9bb5e8e9e63dd969f7d0b96ae0290e29cbe92cd90372865917acc13297c935e06e97998092a0cc65a7590881ec776eb75b4605bffa796bcaeec9ef8b43ded9 WHIRLPOOL 7c2a27497595d2ed82a6cca087306b7d2080c297839d90e210598cb9ec2b7daa407bc8b2c144605a654b095a89611cc57b90767f12f02917d94481ffd986e13b
 EBUILD netbeans-mobility-9999_p20160705.ebuild 4412 SHA256 7b4890f709d8080601555cde19a0d61d75cf4a29af9d381788f8e5920894bf3e SHA512 c831bd798627c1c5998404aa3741b9a1718092a00e04bd67d2441decbbc990f938787c2a10a580d2c60fd35eedeb787047ec24a397749784f341133c1ccf9489 WHIRLPOOL 0a351d6ff65a2b9fd85605e504e64678e993afccd49e188891bb3e73e496ea53d14970294636fc04dc9ce3cefe287b7aec12056894be86f6ec985b0c1009a5ac
 EBUILD netbeans-mobility-9999_p20160706.ebuild 4412 SHA256 6c56a83a8b2e22b0beaf0da6cb2356a531caa00dbb0d2445e99d44b19014c584 SHA512 68049844982a93d0c31e3b1cff5d986c95ed6a0e868ec5fc4c62eae86c5a81e3e78d4310e54eb7a53157c3e75ba7b0cf090bc73855f67070ac64ddc35d97a2dd WHIRLPOOL bdc757bd40eb084e9c701e26a11b5e79c208f6b6f264f1d21b705b33a2c4221261e1ecc82a77a85ad3d84009ca151cbfce9aec23bb661facf43a2f6366847686
+EBUILD netbeans-mobility-9999_p20160707.ebuild 4412 SHA256 d28ca6cf2ee9226bfe09576cef87dafa746723b776097153e09c418772ecec4c SHA512 209d1f0dfbe393f42bbf82609acb3f0a79d1b84747eb37c67f9b825916bfb3e03038221d429fb4ce36f67d89559cd15adcf91a96f53ebc4e519862313ee25727 WHIRLPOOL 39531d36168e4b338db7b43e6cdf2cab483822e82cd1992f86de658c02c3ab4fd4458c04b0dab5bf4709ec3674126698b25bfdb5d563850a4c8c491fc4d8a547
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160707.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160707.ebuild
new file mode 100644
index 0000000..b4e4cb8
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160707.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-07_00-02-33/zip/netbeans-trunk-nightly-201607070002-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 b480eec..4c553b2 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2
 DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 DIST netbeans-trunk-nightly-201607050002-src.zip 216525392 SHA256 4915315fb15da75250a7a10fa3ce1bc089acfb93098a2179e2369f609a6360a6 SHA512 2e26a5593ac76454f3689f8f553049644f71b49c2c1c8119d8cd84e7bbda1c41a284f3d5bd436d2dd0288af3f12263a90f656932b37533e2b9d829310bc17fc9 WHIRLPOOL cbd9eab6ab282f8c120b1d00aeb8cb93b977e85736bf73f2608835143ab948428e3321539970335cdf6f8a64903fb5f765f2543ac5af319e5618b49354d5a4eb
 DIST netbeans-trunk-nightly-201607060002-src.zip 216525395 SHA256 ea3a45a96e4ec5283e0c67f66878da17098a595543b996864b7bdea7d978ed34 SHA512 59732cc31e8cf9addea1235320e53c3f5334d07a7faed7e1cfabeee70eca9bc41f18c03d1741bea3b60edc53f0120908aac9acac26d537d74760eb3a57d98829 WHIRLPOOL a6858ec1461e103abda2d65fe68fc53078b82d31f895bf51a3a9e8ec1ba710e5a49225704a50127110eaf9f031136e03b1fd3d81c0507e341fafa93b97d99b39
+DIST netbeans-trunk-nightly-201607070002-src.zip 216525625 SHA256 ddf8129b13037315956f00228aeacf843e88fe67e4a61f2b730e5a0532c20f4f SHA512 6ce62a221980bce0b90816d68fa177b1f06b5a584e25a5a63448cae78b9de93ea79b42c3c68b958c4dab1da02c1fb3721aa3f700a74955b676ff3a9f273bba96 WHIRLPOOL f8725146f925a10084f363551548201d82fa51e0ef0ce3ca4c21be8e08bb54b74501b4daa595e7c114eef0872f5d81aa0843996f9860dc4812f736e756e4c16f
 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_p20160608.ebuild 4111 SHA256 5fd3119be3cadb3a5d672145fbca1810838e3b79142412f49d5742466d5a5b7d SHA512 53a15b3837ff7e45a1213a9ab848b1dad33e3835bc2b7ebff0745ef07cb0fa37fe34976bc2f6ae47973529fd96f026b3b3590db067bd447d6cdaf01e687ac5e3 WHIRLPOOL 199f19719588961950db54da73c3fae2433d2fb67e9158a33276298b5553e8f574cf498bd1f9c130b653b9932d65a3eee6701fde7fdd07453dd6509d02fb7b6b
@@ -54,4 +55,5 @@ EBUILD netbeans-nb-9999_p20160703.ebuild 4111 SHA256 297453e28beff4fdbc4846cca69
 EBUILD netbeans-nb-9999_p20160704.ebuild 4111 SHA256 e2a1051b907b8d24a2db073f53741bafe90be2456f76d6b98c6db81219606486 SHA512 f87e748974287662c73ea951b9e100a806af65877c6b5271b04f2b3afa328ddc2f42768a18f9a74701a5c9e9c42cc52dc87cee623fbfdcebaae6df9053c71d0e WHIRLPOOL 1fe3f3425bd650b2b22d946f887a0cb77255e84a8897fa37a4d388247ea2ed4602cc1ad88f8e68a2a3fea97870ec809ed34a1275da38b2a9c0fd11cbfd57f208
 EBUILD netbeans-nb-9999_p20160705.ebuild 4111 SHA256 43d5773cd45770eef87ff9d363deb2add1282dcae6a1bdc98ccbb8230224b9a8 SHA512 2f104ab1a16e43797ea309129a6d4872c9ec64d01a64291f572e9c4cb3096532841fc3ecb696ac79d30a338e89fc1f900408f865054e30ba7f4a66abca3490f4 WHIRLPOOL 7d695b605a9a836ca7139d63ff682029af6e78f20260f03282f90b063502e94ea01ba80c21eec211088050d40000cc9053e3ec871bda73999d81e7cb91eef8ff
 EBUILD netbeans-nb-9999_p20160706.ebuild 4111 SHA256 e548325970a095e4e9d19da14ee9efee91018ff416a47ac218636b5884231a2e SHA512 47bd21a5374ed864ade9aabc219e0531e632c133d13222b9de1d66927e3fbe8035c05d4ed435ff12b7ad51a3230dff69517f86f4e5a2ed26acc4bb64b4dfb862 WHIRLPOOL 9da8ee0d95a90faa76d58eb7fb58f7d174dfa63b737e4dd32c4dd77056d1597d03e417d4450c6ae1c9a13703eeaca7da099ded9b32ac15a65b7780e0857cbe2c
+EBUILD netbeans-nb-9999_p20160707.ebuild 4111 SHA256 d944a3f5097390553bb935e590b2b56d1a6b0282f2bf8ec6d00f21150d486df8 SHA512 a5381d9f12236534822ea4d80bb53a13b62373b7eabc409822c64f2ec4b696752accb921395f9b979061f403176604d79dea831cd1bb3674dbbe67c17236f1f0 WHIRLPOOL 03ad56a6dd6afffbfd155fdbe2ed4e24764b822dcbcf4dfc1cfd4f3b5982e69fb39c9031d7bf01e306ac837ed4754a710c19b0f4030e9cd44b5e57e9f90b7132
 MISC metadata.xml 392 SHA256 01cdbcc83099b97486bd7b8e813e5b19c1138eb0d8d3e8a5683aafd579820435 SHA512 4d2f9160baa022d6a48b61d5f42e71cfd411d244e7a36436629bc5ee4036e4ce19079134d9a6c704ebe942306c2e0199d0591c1e54f92f8f3c8835147e639246 WHIRLPOOL c1131764e1cec66c56b977ebe36014b29e5a68e35ccc326c0cbadd050a6c625cf191c85c212e0a733661c008dab0d99f9a4cdc4c4ae0cc9d775ba1de554795a9

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160707.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160707.ebuild
new file mode 100644
index 0000000..c731932
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20160707.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-07_00-02-33/zip/netbeans-trunk-nightly-201607070002-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 f9db30c..c00530a 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2
 DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 DIST netbeans-trunk-nightly-201607050002-src.zip 216525392 SHA256 4915315fb15da75250a7a10fa3ce1bc089acfb93098a2179e2369f609a6360a6 SHA512 2e26a5593ac76454f3689f8f553049644f71b49c2c1c8119d8cd84e7bbda1c41a284f3d5bd436d2dd0288af3f12263a90f656932b37533e2b9d829310bc17fc9 WHIRLPOOL cbd9eab6ab282f8c120b1d00aeb8cb93b977e85736bf73f2608835143ab948428e3321539970335cdf6f8a64903fb5f765f2543ac5af319e5618b49354d5a4eb
 DIST netbeans-trunk-nightly-201607060002-src.zip 216525395 SHA256 ea3a45a96e4ec5283e0c67f66878da17098a595543b996864b7bdea7d978ed34 SHA512 59732cc31e8cf9addea1235320e53c3f5334d07a7faed7e1cfabeee70eca9bc41f18c03d1741bea3b60edc53f0120908aac9acac26d537d74760eb3a57d98829 WHIRLPOOL a6858ec1461e103abda2d65fe68fc53078b82d31f895bf51a3a9e8ec1ba710e5a49225704a50127110eaf9f031136e03b1fd3d81c0507e341fafa93b97d99b39
+DIST netbeans-trunk-nightly-201607070002-src.zip 216525625 SHA256 ddf8129b13037315956f00228aeacf843e88fe67e4a61f2b730e5a0532c20f4f SHA512 6ce62a221980bce0b90816d68fa177b1f06b5a584e25a5a63448cae78b9de93ea79b42c3c68b958c4dab1da02c1fb3721aa3f700a74955b676ff3a9f273bba96 WHIRLPOOL f8725146f925a10084f363551548201d82fa51e0ef0ce3ca4c21be8e08bb54b74501b4daa595e7c114eef0872f5d81aa0843996f9860dc4812f736e756e4c16f
 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_p20160608.ebuild 4418 SHA256 8d7c3e6ed933c5d6a602d72c8769b9053e68c5da97079eaca8f4da3f2ce670f7 SHA512 0131fa5880bfb5c44f3ee9901099c27fd7cf19f7378c2bcb8e4aaf84308d9ec55250e99233e1922e6d86049651ca53df88613c0db43ec0cfe40697011af6bdfa WHIRLPOOL de33340f3ede0526d21dff7ee55de0e141843f9dd15f0260711d11518dfa8e376991f2154bd8927976e58bf899ea781fa86dba30e9c72efe3395f533a27acb66
@@ -56,4 +57,5 @@ EBUILD netbeans-php-9999_p20160703.ebuild 4418 SHA256 91a9b546b3a4937c422ed37561
 EBUILD netbeans-php-9999_p20160704.ebuild 4418 SHA256 00d1ed6228d6465df71e721b11bc4cfe46eb5bc00458cbaf138959147b52b361 SHA512 84d6c119ff17db2f4e5027ab7bb9ac0e617c7e5855de53643a3e1e63425f36abd076f11300ba0d01616a28872288c6f4a40fe070dd515956c8d6f80282ffd360 WHIRLPOOL 4c6521587826815e05baa69796029404fc2d5a88bed3f7eae969f7f7bfe34e6ec7992ea9260fbbf8d992b7d813e1b5dfaa4f2866fdd320f48023ddc3d2b8ba52
 EBUILD netbeans-php-9999_p20160705.ebuild 4418 SHA256 f3b9723bd834a9077be7e23f69da9f7abf19003c1fe4d9f7d30a0af7ae7c6ede SHA512 07d4247c31ba3756c4a7fe2e1686aa535e9d37eb1308b0c6d2142e78e99ac82040ff6ebf86b14de0a8990a1aed44c5022d718157bd331f0cba7edf8175d9cf7a WHIRLPOOL aff31c11a35aab290088335ca78f278dd3687f21b461746d21ba5021f004bdcd914904eabe2779a76acdf2aeb18ac8afb6d9f878672e3721f3c7aa5d64168a87
 EBUILD netbeans-php-9999_p20160706.ebuild 4418 SHA256 86e913e3ee738641ce2d7c39ee70e7946a32baea9ad93068b8ac76617c112715 SHA512 044e4f0e24ae15a383dc8688d6ef8fd6022022d46a62f671453828197306fea5ace827846964764f6dabe75b7b19eb9fe526bd36eccfc1de434fed88c84e8c0e WHIRLPOOL c31046f37a151928f0d11d6ac44f218a0c2c10f96f87e8f05f43db8c8f61794f474712d8c7b226880a0415e3b84fe69eab4ae74a253a68423486948ea1a63b2f
+EBUILD netbeans-php-9999_p20160707.ebuild 4418 SHA256 7a5c0d246417f25c0cb10e81607c2efb39e061e3acb0b2055beb4d74bf42e5b3 SHA512 aa53537c81d3d763f7931b7b253449d28735acb4fa8bc2225c523400bef7431c18397b1ffa703ba9e096f2c57d4807913abb724cfd3e5624b8089c77140c99bf WHIRLPOOL 1d85d9f952194d3924f52b45fddcbf43d17da2f1142ee991be479fd838e50db5082408272a2feb96df3e5a7c448dcb7bbce7743a1abda59088cd43a9501e005f
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160707.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160707.ebuild
new file mode 100644
index 0000000..30a4079
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20160707.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-07_00-02-33/zip/netbeans-trunk-nightly-201607070002-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 279f80d..0e7b4d7 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -52,6 +52,7 @@ DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2
 DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 DIST netbeans-trunk-nightly-201607050002-src.zip 216525392 SHA256 4915315fb15da75250a7a10fa3ce1bc089acfb93098a2179e2369f609a6360a6 SHA512 2e26a5593ac76454f3689f8f553049644f71b49c2c1c8119d8cd84e7bbda1c41a284f3d5bd436d2dd0288af3f12263a90f656932b37533e2b9d829310bc17fc9 WHIRLPOOL cbd9eab6ab282f8c120b1d00aeb8cb93b977e85736bf73f2608835143ab948428e3321539970335cdf6f8a64903fb5f765f2543ac5af319e5618b49354d5a4eb
 DIST netbeans-trunk-nightly-201607060002-src.zip 216525395 SHA256 ea3a45a96e4ec5283e0c67f66878da17098a595543b996864b7bdea7d978ed34 SHA512 59732cc31e8cf9addea1235320e53c3f5334d07a7faed7e1cfabeee70eca9bc41f18c03d1741bea3b60edc53f0120908aac9acac26d537d74760eb3a57d98829 WHIRLPOOL a6858ec1461e103abda2d65fe68fc53078b82d31f895bf51a3a9e8ec1ba710e5a49225704a50127110eaf9f031136e03b1fd3d81c0507e341fafa93b97d99b39
+DIST netbeans-trunk-nightly-201607070002-src.zip 216525625 SHA256 ddf8129b13037315956f00228aeacf843e88fe67e4a61f2b730e5a0532c20f4f SHA512 6ce62a221980bce0b90816d68fa177b1f06b5a584e25a5a63448cae78b9de93ea79b42c3c68b958c4dab1da02c1fb3721aa3f700a74955b676ff3a9f273bba96 WHIRLPOOL f8725146f925a10084f363551548201d82fa51e0ef0ce3ca4c21be8e08bb54b74501b4daa595e7c114eef0872f5d81aa0843996f9860dc4812f736e756e4c16f
 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_p20160608.ebuild 9520 SHA256 ae0d07628ba99b8640d78f42e66aee6cc7918104fae579ce73189bdc42005eac SHA512 d839c53e0c0e5e84069446b7c2a3f869f680e790a443c70c6a66faea06e82a7999b68eee481fbaba7e3efebd7c0ee02118f379c660720e76943ba8c5a6f96237 WHIRLPOOL 26e606a846807e790a03d71b844ba5c76551f7417cd9c0ac62bc3007918c2d6c4da06b7395dd24cc175092a36e69374048156ca29397adb97719864deed798fb
@@ -77,4 +78,5 @@ EBUILD netbeans-platform-9999_p20160703.ebuild 9520 SHA256 3b04e535b26734284dd6f
 EBUILD netbeans-platform-9999_p20160704.ebuild 9520 SHA256 9a48a158cdeb133516fd4f7b041626608d58d100ea529cef8af2b7dffa762865 SHA512 32e05bc7776eddeb2b539811d37c03579c7d93adcbb8ba72777948d37df471451e95b5eff6378b57510af33f3e5865b6397cb4657a6b8bb7079f7856eb3387e4 WHIRLPOOL 906d81b0de79c2e3e053204d1847cbe43ec3e306a1c5dd728bd47e7f52da18352d274de03dcb59de53f20ffd73d0805f95d1fe76e797241b4df833d396775ea8
 EBUILD netbeans-platform-9999_p20160705.ebuild 9520 SHA256 5744467677f302b06e4eafb6e1cccdcc429996a2dd06df7716f19016204d4304 SHA512 fe99ed82613fdb33115468a3b216007e648a5f45d47b3bfe4f8b89185c34bfb27e3c746c4614d01a4d523b42e4fe74bb4340e4e76a2a4099ca8cdc8c28d7ef0f WHIRLPOOL 1546e375a8c0ac41b8fbe49fdbb6f0fe40502f62cce941d2aea76793ee5392f23e8c13c0ffc2eaad1899e4a856964c2346ea86f843097ea2d24fe5d8afa13056
 EBUILD netbeans-platform-9999_p20160706.ebuild 9520 SHA256 3fa016562c9ae2dbb2cc5a8a0e82888c7a016a2d93f3f1b4c27b267e3aaafcf4 SHA512 abe6cdca72536c784860b19158edeb7b9fdc1a3c049b3f673b0893da2991dc2abe242a8fe800a767297392b9856e0dbeb2fd3e211806b75845d7f8fbe14b56be WHIRLPOOL bbd3a7df45b8aa5b77690ba5d896a227487dba9a2b62b78f8e6605751b944a70afcd235c311bec7378c6467d2dc7c58a9fb55f27680712dc2f202aee65bdca17
+EBUILD netbeans-platform-9999_p20160707.ebuild 9520 SHA256 884a9a0444004d094355a281bfd28a5fb55bcbfb044cc2f305076b732e5513e9 SHA512 4900f1e9d3cba5fcca2faa20ae77d7182fc2103bf24d987582b28ce88504975a227649f03fe9b8458d184dddc81f330cfbfc1f4383994f65812f6dce14a9a305 WHIRLPOOL 5834a5307100b08f55f84857fd01287c694a1ac78d2322a882a5a03aa25d933cd8fe2d8c468b2ba45b4a4265a4eb5a8157a45787ab5d556e1c8fe1cda4bf7025
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160707.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160707.ebuild
new file mode 100644
index 0000000..0371e17
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20160707.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-07_00-02-33/zip/netbeans-trunk-nightly-201607070002-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 435f944..141e4d5 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2
 DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 DIST netbeans-trunk-nightly-201607050002-src.zip 216525392 SHA256 4915315fb15da75250a7a10fa3ce1bc089acfb93098a2179e2369f609a6360a6 SHA512 2e26a5593ac76454f3689f8f553049644f71b49c2c1c8119d8cd84e7bbda1c41a284f3d5bd436d2dd0288af3f12263a90f656932b37533e2b9d829310bc17fc9 WHIRLPOOL cbd9eab6ab282f8c120b1d00aeb8cb93b977e85736bf73f2608835143ab948428e3321539970335cdf6f8a64903fb5f765f2543ac5af319e5618b49354d5a4eb
 DIST netbeans-trunk-nightly-201607060002-src.zip 216525395 SHA256 ea3a45a96e4ec5283e0c67f66878da17098a595543b996864b7bdea7d978ed34 SHA512 59732cc31e8cf9addea1235320e53c3f5334d07a7faed7e1cfabeee70eca9bc41f18c03d1741bea3b60edc53f0120908aac9acac26d537d74760eb3a57d98829 WHIRLPOOL a6858ec1461e103abda2d65fe68fc53078b82d31f895bf51a3a9e8ec1ba710e5a49225704a50127110eaf9f031136e03b1fd3d81c0507e341fafa93b97d99b39
+DIST netbeans-trunk-nightly-201607070002-src.zip 216525625 SHA256 ddf8129b13037315956f00228aeacf843e88fe67e4a61f2b730e5a0532c20f4f SHA512 6ce62a221980bce0b90816d68fa177b1f06b5a584e25a5a63448cae78b9de93ea79b42c3c68b958c4dab1da02c1fb3721aa3f700a74955b676ff3a9f273bba96 WHIRLPOOL f8725146f925a10084f363551548201d82fa51e0ef0ce3ca4c21be8e08bb54b74501b4daa595e7c114eef0872f5d81aa0843996f9860dc4812f736e756e4c16f
 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_p20160608.ebuild 3472 SHA256 2d23aeb9efa1887cc8a6f4e066f2fcdd62d074a791d3e7c004e8e76735f84a8a SHA512 2d0826939aa3a2287b4a8302e8853eec41fd4381670f011f77fd96ac509114a1f4d5e1efc66da74c77dbe799edf052bc4b34d4ab8cfdb2386c86c9d7743236c2 WHIRLPOOL ef43378f42efdd607bf202c36ab914791e8734a96285c10f53a64c6098909853dddb9d57be8e243d5ce41ffcb85357490729f67deed0e25ee8268ab6949eeed6
@@ -51,4 +52,5 @@ EBUILD netbeans-profiler-9999_p20160703.ebuild 3472 SHA256 c3274064fec10aa045858
 EBUILD netbeans-profiler-9999_p20160704.ebuild 3472 SHA256 a1af52990353646259df8954ce56388655a96796153e0731b14ec6cddd47ecfa SHA512 04e27a0ac592d4a5b52cf07584cb29d93f1a7e8834f29026661b711e4683d9716260916f3658eb42ba1ee7444962ed5fc57d838a8b78ad8558d09661ddd63476 WHIRLPOOL df399c80001ab63c840b3503cc7e209225464423f15cdca9f6b253034fa935656f81beb5727d0378aebf76054ff1a30d2f009faaacf1327d89bb6117efd1967b
 EBUILD netbeans-profiler-9999_p20160705.ebuild 3472 SHA256 e43e333f6e31c326e7aaa8a4887931fbea0337886459f1ead508645560cbfd49 SHA512 b55747e13e2cda9b72c4dcdeeccc0b1e5292832dfd2dc92131331819fba73e6098dce7d8b6d4a70df10bf30ac89b8a7b3667fd046faaa38a0f9dc6fa80cdc53d WHIRLPOOL cd06eb948eca1c20e35c74067b16e240e842a4ed8b19168d0b3849aef3b3441bbf62fba3dc2e2067b151a019a441eec32fee20412637f7055a503246bc53b232
 EBUILD netbeans-profiler-9999_p20160706.ebuild 3472 SHA256 74531cffd42feb2b05d5b4bfce04014167b9128c043273615732491b674c8eb2 SHA512 dd326f0309149a9cd2df48ae138c21838adfeb96835d625b88d28ac24e069fb329a14648d224d6beca64c97eb360db22cd06765e648b7b70f51c0dc7d673a62b WHIRLPOOL 98aaaea58535bf5724490b07ca8f637e2d4793120de1e60c5d4fe8a65cfa96ac6d32449b478fa023ad2bf4e5f6898936184f73ac6ee2fab30e2cc3de2d4db7f6
+EBUILD netbeans-profiler-9999_p20160707.ebuild 3472 SHA256 1f0ee9449508faa65631eb249507b2dfecffd6d96140fa3dfc85bc6e54a342d9 SHA512 95edc575e5ffe552f3c769abf6ae5a2f69c2f898c8febdf20d5f6dcd2d9fde2682cc58d3921bfd8f85b515122abf2a34887615cc368b833a9f34d7c0d90a69c8 WHIRLPOOL db33ab6962f9a89ed3e9ba6ce4a3881fe92b24687d0b7fbf1988fe0d01802ede3753c9e3bb04b390dc9056b6225c9bc4a13095d3c718500ff35803f2677f081e
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160707.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160707.ebuild
new file mode 100644
index 0000000..5ed3009
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160707.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-07_00-02-33/zip/netbeans-trunk-nightly-201607070002-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 f09fc14..99904a2 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -50,6 +50,7 @@ DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2
 DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 DIST netbeans-trunk-nightly-201607050002-src.zip 216525392 SHA256 4915315fb15da75250a7a10fa3ce1bc089acfb93098a2179e2369f609a6360a6 SHA512 2e26a5593ac76454f3689f8f553049644f71b49c2c1c8119d8cd84e7bbda1c41a284f3d5bd436d2dd0288af3f12263a90f656932b37533e2b9d829310bc17fc9 WHIRLPOOL cbd9eab6ab282f8c120b1d00aeb8cb93b977e85736bf73f2608835143ab948428e3321539970335cdf6f8a64903fb5f765f2543ac5af319e5618b49354d5a4eb
 DIST netbeans-trunk-nightly-201607060002-src.zip 216525395 SHA256 ea3a45a96e4ec5283e0c67f66878da17098a595543b996864b7bdea7d978ed34 SHA512 59732cc31e8cf9addea1235320e53c3f5334d07a7faed7e1cfabeee70eca9bc41f18c03d1741bea3b60edc53f0120908aac9acac26d537d74760eb3a57d98829 WHIRLPOOL a6858ec1461e103abda2d65fe68fc53078b82d31f895bf51a3a9e8ec1ba710e5a49225704a50127110eaf9f031136e03b1fd3d81c0507e341fafa93b97d99b39
+DIST netbeans-trunk-nightly-201607070002-src.zip 216525625 SHA256 ddf8129b13037315956f00228aeacf843e88fe67e4a61f2b730e5a0532c20f4f SHA512 6ce62a221980bce0b90816d68fa177b1f06b5a584e25a5a63448cae78b9de93ea79b42c3c68b958c4dab1da02c1fb3721aa3f700a74955b676ff3a9f273bba96 WHIRLPOOL f8725146f925a10084f363551548201d82fa51e0ef0ce3ca4c21be8e08bb54b74501b4daa595e7c114eef0872f5d81aa0843996f9860dc4812f736e756e4c16f
 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_p20160608.ebuild 5343 SHA256 88ff1007a330fe6bcb7d6b7c87b13a475abb7f7e399eef825177db11f005d889 SHA512 c01bbf7e3283d4c8800a944a0199723bd4b3a189170ccd1afcaab0a37c8760a91169e2a4c912fa07c259ce8c400fce5b23b547d0fdbf069d8f2561439d6b13da WHIRLPOOL c6dddaa233bd7112c834fb640078c1c2d1491b57cae29bc8ceed6438980a74bfac3e6cd180cc0c9e814a5ee481af1b16feb114354187372f292f2b9116ec9c4a
@@ -75,4 +76,5 @@ EBUILD netbeans-webcommon-9999_p20160703.ebuild 6242 SHA256 5ae26a642e641d0e8d39
 EBUILD netbeans-webcommon-9999_p20160704.ebuild 6242 SHA256 27158da014ce1d4f743b6ab16058ba1abb528b05b512075e5d34b061237be00e SHA512 1a56881a912a67fdb6691b36c596fc72667134a788b668e3278235006815c4869a2b55755de24d9ad73c8c783a093a5d9f0ab4fb9ceccd8bf6dd7bf8fc0b56e3 WHIRLPOOL 1e69d63511f223746da904e1c97cc392991b78d02b6b7439a85c5296ae82df9c78da4b4fd93df8869d463b171ad7cc684a4dbe763922110aa40126be228f9466
 EBUILD netbeans-webcommon-9999_p20160705.ebuild 6242 SHA256 9e4b9d5912c72fb335f18b1e4c1d69d30437b623c9a2293ebf3b4726735c8b79 SHA512 18d624b069d80926c4b1c409183f7a6a354ffdba95831f8946322bcc6300c79ba18e59dc79be7e6ef9a707deca2e9e083fd6188311dcde8244e2224f8a6157eb WHIRLPOOL 0594afa1af1f1f9f1179624ff118b19e4931282abcc78b0c616dae8357f3ec9a9a7d9d6e2396365bb2e22bb8fad754ab669914ffcae57017d8a7a4b8db0b7c1e
 EBUILD netbeans-webcommon-9999_p20160706.ebuild 6242 SHA256 12cfebe400028fd7e58d801aa34abeee3cfff1c5e70c6ea14341b9c81e2fad4d SHA512 6428eaf205ddedfd42ae30a6412510ef8cdbc8032bb2d1c2b9f2dcdbfc37b722d694f55f35637cd9f5b678bf334a99170ba71480fd8f5cb7574b78626c76e5f2 WHIRLPOOL d06c6340f2c1fd1b50b6096042cf760f0c9ad8f31eaed6e75723987a479054691b4c6c276a4de398c1c86816b3fa90617005cdb42355e402418ff47faa5f5ae8
+EBUILD netbeans-webcommon-9999_p20160707.ebuild 6242 SHA256 d3d1abc3e596bf761798756e406a12f9c615b9bf7cf07c57f2455821d44234f3 SHA512 8a260e1c05d44b5c4e86585abef1fe5a09ec9eda523dceff5532ab92604cf61fef452d966ce58c3ed4d4f7c0ffa32c52003751f3dd9568f175be645cb51419d1 WHIRLPOOL 637845cf0fc830dac0ebd0e1feb734d6a4d63b853b87f8eec655248ad32231a0ebc8a16ae1268c08a670814da5a184bde5812872d176899a076c45d8d475947f
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160707.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160707.ebuild
new file mode 100644
index 0000000..ae7f49d
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160707.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-07_00-02-33/zip/netbeans-trunk-nightly-201607070002-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 098253b..0a3df44 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2
 DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 DIST netbeans-trunk-nightly-201607050002-src.zip 216525392 SHA256 4915315fb15da75250a7a10fa3ce1bc089acfb93098a2179e2369f609a6360a6 SHA512 2e26a5593ac76454f3689f8f553049644f71b49c2c1c8119d8cd84e7bbda1c41a284f3d5bd436d2dd0288af3f12263a90f656932b37533e2b9d829310bc17fc9 WHIRLPOOL cbd9eab6ab282f8c120b1d00aeb8cb93b977e85736bf73f2608835143ab948428e3321539970335cdf6f8a64903fb5f765f2543ac5af319e5618b49354d5a4eb
 DIST netbeans-trunk-nightly-201607060002-src.zip 216525395 SHA256 ea3a45a96e4ec5283e0c67f66878da17098a595543b996864b7bdea7d978ed34 SHA512 59732cc31e8cf9addea1235320e53c3f5334d07a7faed7e1cfabeee70eca9bc41f18c03d1741bea3b60edc53f0120908aac9acac26d537d74760eb3a57d98829 WHIRLPOOL a6858ec1461e103abda2d65fe68fc53078b82d31f895bf51a3a9e8ec1ba710e5a49225704a50127110eaf9f031136e03b1fd3d81c0507e341fafa93b97d99b39
+DIST netbeans-trunk-nightly-201607070002-src.zip 216525625 SHA256 ddf8129b13037315956f00228aeacf843e88fe67e4a61f2b730e5a0532c20f4f SHA512 6ce62a221980bce0b90816d68fa177b1f06b5a584e25a5a63448cae78b9de93ea79b42c3c68b958c4dab1da02c1fb3721aa3f700a74955b676ff3a9f273bba96 WHIRLPOOL f8725146f925a10084f363551548201d82fa51e0ef0ce3ca4c21be8e08bb54b74501b4daa595e7c114eef0872f5d81aa0843996f9860dc4812f736e756e4c16f
 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_p20160608.ebuild 2721 SHA256 3b7dd70b61c735180212ff44d2d882c04dc5784d45fc9146fd4aa0c1be587d00 SHA512 045d5aac47d3d3154f9bcde5236ce8c16528d6c30fd5ba414d0fda812855ad1bcc8f64350cc2064d302cdb33d61635f479ab94c184bd444a3912d30fe0c3022c WHIRLPOOL 61a4c1a0bbc3164fae0cb524904912ea5c3091bdb8e738270bc179a8cbe5c019ed0dd0bb32f43fb309895954a229efb5e727d069d50fe8b32ff15a40095134e1
@@ -51,4 +52,5 @@ EBUILD netbeans-websvccommon-9999_p20160703.ebuild 2721 SHA256 ebe2d8daac903b630
 EBUILD netbeans-websvccommon-9999_p20160704.ebuild 2721 SHA256 ff9eba591e89477f019a53dc4b82784c1173abcf508fddd51ca69367a038857d SHA512 ce9dc4e8e5c24fbfd6b6628736c094c337acab0d2adc1a878c575f3731755d975b209c4f670eb66da75e1853681110d4b2273d8e8b1d3b2a493530e2452a954f WHIRLPOOL 1f22220757c374f5e32e3d9e6edfa79c928ccf80cd9b0e658b1b582456ffac4c31bdcc252a2e6b2fef508329f7f58bc5a16dd3067da3360e5853065724a9df20
 EBUILD netbeans-websvccommon-9999_p20160705.ebuild 2721 SHA256 c5c12c9f66e2f155f465f75f61607d583fe971fb6dd00e05e629b5270ce86d56 SHA512 57e247854e61f0d9fc04acab517f5c19cfad96fc1f55cb480683dca5a18fbda979c0280338c51b8720c9056737a6d09bc7e7dc5527abcd6613c776b1316101e5 WHIRLPOOL 7083217c47559df298af0bb29f335ce46244f3a0e9564ebb9f46c6c769c60f9adadecb508107b9f9bab5a20516d8e97abe7cae049f2653e0eb23f636bcf075b6
 EBUILD netbeans-websvccommon-9999_p20160706.ebuild 2721 SHA256 ef8237e8e7bd5632eaea18b88a81e58fbed3d475fd0f4e3c5440f2810739b6d9 SHA512 57d9458bfb959d2fd1c92f889576219cd587caa0734821c41bc6362e6a81fc4f4f1cddebea90d000f2940a41a8b4e05a7a541a0db364fcffc5e2e4ebfdf49083 WHIRLPOOL 86c8abb96e933312faa8520d050efeab22b44a003c2dd9283124717afce9415742f266d5e197ff690158bb2925874381d6f3cfc9eb0cc9eb07e26c5f74cad9dd
+EBUILD netbeans-websvccommon-9999_p20160707.ebuild 2721 SHA256 f589c9cfe190deb87bc70573bdd0f2448c504b554c561768e52d1349e5e55f0d SHA512 7c0e3c5e38505897552113b3a76f3912270134fb79ab10f6e68cc8ae69348aa178732ae8ebec59fa10c7ad3fd221e9ef2fda4e135c82e8f0288c2fedd98f6cc2 WHIRLPOOL 41ad5634085988d4dda3d189acf7b203bc5e8bfa1b2627b94766dde149c9ca1b2577be94ae38e1f341c40da86c5a72336fc1ae4d61bd148c62bb0154db998072
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160707.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160707.ebuild
new file mode 100644
index 0000000..e8c4a20
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160707.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-07_00-02-33/zip/netbeans-trunk-nightly-201607070002-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 bfa89cf..86d2ae4 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201607030002-src.zip 216524170 SHA256 543022123cabd2
 DIST netbeans-trunk-nightly-201607040002-src.zip 216524170 SHA256 bae41800278cdb6c083e09135354c30aa0bd938e8f6520318d2a6093a1e36d70 SHA512 1f0952a1041b9c68419baf16a7a153f67732ed37adc90fb324e6786d84123f2b69b1038c3593fa57c622037d0163da2881ef63d80e017a388e63bc1cd6235f9d WHIRLPOOL ff0507af5556107f1b4294bf3843c1217fe820de4724b6915e755b312dfab3087b3b55956365932ffc15a8af6eb9615d7aecfa4603864b9de92f7bac79d13485
 DIST netbeans-trunk-nightly-201607050002-src.zip 216525392 SHA256 4915315fb15da75250a7a10fa3ce1bc089acfb93098a2179e2369f609a6360a6 SHA512 2e26a5593ac76454f3689f8f553049644f71b49c2c1c8119d8cd84e7bbda1c41a284f3d5bd436d2dd0288af3f12263a90f656932b37533e2b9d829310bc17fc9 WHIRLPOOL cbd9eab6ab282f8c120b1d00aeb8cb93b977e85736bf73f2608835143ab948428e3321539970335cdf6f8a64903fb5f765f2543ac5af319e5618b49354d5a4eb
 DIST netbeans-trunk-nightly-201607060002-src.zip 216525395 SHA256 ea3a45a96e4ec5283e0c67f66878da17098a595543b996864b7bdea7d978ed34 SHA512 59732cc31e8cf9addea1235320e53c3f5334d07a7faed7e1cfabeee70eca9bc41f18c03d1741bea3b60edc53f0120908aac9acac26d537d74760eb3a57d98829 WHIRLPOOL a6858ec1461e103abda2d65fe68fc53078b82d31f895bf51a3a9e8ec1ba710e5a49225704a50127110eaf9f031136e03b1fd3d81c0507e341fafa93b97d99b39
+DIST netbeans-trunk-nightly-201607070002-src.zip 216525625 SHA256 ddf8129b13037315956f00228aeacf843e88fe67e4a61f2b730e5a0532c20f4f SHA512 6ce62a221980bce0b90816d68fa177b1f06b5a584e25a5a63448cae78b9de93ea79b42c3c68b958c4dab1da02c1fb3721aa3f700a74955b676ff3a9f273bba96 WHIRLPOOL f8725146f925a10084f363551548201d82fa51e0ef0ce3ca4c21be8e08bb54b74501b4daa595e7c114eef0872f5d81aa0843996f9860dc4812f736e756e4c16f
 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_p20160608.ebuild 6939 SHA256 36ac229d579e5354ab92d0504eeed8b49c7e96228b4300fb1670666f7206b0d8 SHA512 23c2ac195ec9d7f65a2b57a0950979df44061c3dd35903cf7e3960484cfa210fe22d51456763c7a32308d2c5c2ec91c862088063418fa8c03229950e324b89d9 WHIRLPOOL fd47013b386e7f303a23bb72745ae0a78c89a4511e0ce2eab778ba85d9b6f222d532376afcc88137ff67bb7fbab9c922f65d0d6ba30a663b4a94500785d9e084
@@ -54,4 +55,5 @@ EBUILD netbeans-9999_p20160703.ebuild 6939 SHA256 bb32d89b2b352baf8a90c945f3ac32
 EBUILD netbeans-9999_p20160704.ebuild 6939 SHA256 dfeca6651d8e2a47638bc7f8c1bb686d699102731932461367f4e3c5dc5dac9d SHA512 a9e442c6851df0e2d71355cb84c941933238884ca2d2248a05e45c14ee0551bd0a51a9a5598acc98b62ad38f8d4fcdad75fa2294610724061a58ae7276405a2d WHIRLPOOL 5c52ca7550d1b26b1b7ef9413b554688c0dddc7fb12847e56730f7751e8ccf68e42a4b3f53e9adacfd90a78cd1c7209aff9cba26b5246c38f5527558140c120b
 EBUILD netbeans-9999_p20160705.ebuild 6939 SHA256 063ebafb03745bcbf4978dfe00ea146e2594596a081bf1eb7021005f30915582 SHA512 6efe387ad411781e63b9c28c40a62298b98772bd5096715fbbd17c71c9fdbb18f1f46fb858b06b67239c6a5debaae4d235608617bbca48e02811092f5660ee82 WHIRLPOOL 07f660d449292527a322e63f0796f405e292138b1887f19f57c23d0e02ce306f873b4e46baac77c42deb2b5f02b26d386dae0be852951fa1d893a862a8ba376b
 EBUILD netbeans-9999_p20160706.ebuild 6939 SHA256 4be9bf026eac7b37722218c14fc2f06fb1dfbdade10b1b1310ada18fc55d3e13 SHA512 3e362b07d6df990519aae9d88ee8aedd779fecc8e7ccfe0522eedfb86626e8cfeeaef0790e793770a66144877e687bf7cf34457190cba1fcef1fdcafb22e7a2a WHIRLPOOL cfd095934e484abd236a88204af4a556a67907b52d296c46833c70d6850b8d1dc54b070841c1a0b471e723bb33e1cd2f940be2aefe6a64811d3a3c55019db506
+EBUILD netbeans-9999_p20160707.ebuild 6939 SHA256 793f95e860b5635b9a5b62020fc6582fa077ed8196126df735ea5841e582a327 SHA512 3f0bb46bc7ba3f966d4bfc706f5481c993de12b565b7c5df1eefe6f474a044c24be21704c81bbede8a8399e86b7a7cbdf8d29eae6852a80653910b1a2feb0192 WHIRLPOOL dcf1b84d1035bc53e6d967116af595a2887a1f65ce572ee65d01dd82e5146787d69743930368ed85ba39d542f7e6d9f2199c3f1e0d5e812614de2e4bc5fa5d5d
 MISC metadata.xml 329 SHA256 8aeaf2a0228f15c2e4140f401b30f083509bd99d0a578873069f3595cd8555f3 SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640 WHIRLPOOL 799a9b79b1b447bda9631f67e2dfaf722376740e1d2037796528a05f9745eeed00d9990a74a65ce09f74bc5e1d60a887abde540c3c62487d7dd49b8377c15834

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


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-extide/, dev-java/netbeans-dlight/, dev-java/netbeans-javafx/, ...
@ 2016-07-14  8:36 Miroslav Šulc
  0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2016-07-14  8:36 UTC (permalink / raw
  To: gentoo-commits

commit:     3be03258ff793ac2fbbe6591fc56be9651911941
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 14 08:29:49 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Jul 14 08:29:49 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=3be03258

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.3.0

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 9b10684..1bdfb71 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
 DIST netbeans-trunk-nightly-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f07ffe990b3f8c5bdcefe7279f17a100fb3b184dabe6b5a9baed SHA512 ec01e8bb2fde13c2381c50417e3d4a1fee51aef86df1dc2806737a1cf69af0a65b11dad723dc8449b0034130e833cf33709dd401917b4e3beee5077cb1846821 WHIRLPOOL 24fd958875a23da7208a861bea1b5bf2d89b942ac37d864f3c29753989f513cea0ece0c0cbf1cbb47f761a5cfa4919435470ebb26c725adc313d5ef0fe9f0682
+DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 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_p20160614.ebuild 3384 SHA256 dbe70b440097697475f0437a79bd2e49084ed5ef06b83942923c9644c77397df SHA512 170f9342d1ac1fb191c99b726f489c18c88c74695fdf2687c9259e86e8ffdae7ec6afb2ab38d4f8ba9460177352f51b2650d52e051a5b136cf389c325b362986 WHIRLPOOL 191e8b000a1f0383d4100e3cb3f0f7f1866550b5a27707174b6b9f676a84927e9515385c98f586a9356ac45646ac06fd580bc487b34688d0c7634351c4a8998c
@@ -53,4 +54,5 @@ EBUILD netbeans-apisupport-9999_p20160708.ebuild 3384 SHA256 ae5443bbc4f537f9b2d
 EBUILD netbeans-apisupport-9999_p20160709.ebuild 3384 SHA256 ff2291110face9087273658153be86614c86f0aee6896a7ceb3c36d609abd3af SHA512 3a25f37a8fe814050ae66bd2f25e6c6f52bc56dc1733293b7471b9834e598981686c790c5e02c1b39d084c2693ef751918164f7423e2aa265ad3a5b126e175a0 WHIRLPOOL 41115144f0df3081bed7df981636b8694043c282749e5faaf13389c6c0bef9e9a4a1fc3720ce3e25ad7754254c10f3766bcde6d9b71bed7377923ac5affd7814
 EBUILD netbeans-apisupport-9999_p20160711.ebuild 3384 SHA256 5f841fa7b363550223d65b0f59719a548fefd90e9d3b72f5b4fd31134fd3fa47 SHA512 4c4252332fac461504f5d376e4d1c279f8699dbcf0b479f83182f39a2c133c9b386a48d04fdecb279480c7942159842864fc78c326288e55af16aa20dac6ffca WHIRLPOOL d42c9d8dfcb277b9ff409dc64b11c4934f8673fc327ab54fb27a5552d43eb9ad21d84618024f57fe5e064329f42c259202238f5ed8cf687ad58cabbf94e4ab89
 EBUILD netbeans-apisupport-9999_p20160712.ebuild 3384 SHA256 fcba3576425563b77cb98cea3e7a7fa6ca7d54db80d89bfe3d7e7ed54dbb4b0e SHA512 48081299c301df33239dbf7f47345d0467df61435f3cd8532c96b67e96164870d697fb59c31d1ffb446b97cb9fa77015a134ca901354973f62a86fd58c42d9d7 WHIRLPOOL 4b3a64a19d4a8164f46858c5586723fd82e532c78821d301a5835cf0f9033c799d818ec4f13eddd0e30708ad4c84829694a871856da592741c24206375a7f2f4
+EBUILD netbeans-apisupport-9999_p20160714.ebuild 3384 SHA256 837eac1f734cbfabf21e730aba428c0a2ce38f0de22867310663927d08fb2375 SHA512 6f0f6e9b7392d72b49a5a0eb663ce073ca38f9a7efb0b5eae760fd075e0ad55b962f7cb35963bc0ffe85903e87b331b075236a7c6c26bfddac4b54d54c340c0d WHIRLPOOL b2d7575ab01a541b60cc613df4d0f2edf85f15cdf17e7ab85f91ee3cd824abbe9c97ef9e10c0322e4de8d215486ccd536b1d523f2490792d19ceabf5ff652868
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160714.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160714.ebuild
new file mode 100644
index 0000000..b06f520
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160714.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-14_00-02-33/zip/netbeans-trunk-nightly-201607140002-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 d383993..1d5af39 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -40,6 +40,7 @@ DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
 DIST netbeans-trunk-nightly-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f07ffe990b3f8c5bdcefe7279f17a100fb3b184dabe6b5a9baed SHA512 ec01e8bb2fde13c2381c50417e3d4a1fee51aef86df1dc2806737a1cf69af0a65b11dad723dc8449b0034130e833cf33709dd401917b4e3beee5077cb1846821 WHIRLPOOL 24fd958875a23da7208a861bea1b5bf2d89b942ac37d864f3c29753989f513cea0ece0c0cbf1cbb47f761a5cfa4919435470ebb26c725adc313d5ef0fe9f0682
+DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 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_p20160614.ebuild 4790 SHA256 f910b56ea3f91aa0fb754e8299f13e6631bd18da7fc8e9c3f00831b89a0df2f0 SHA512 7b45e035b786cf35794cbb0c85c86093059a7e2c92b34d9e971ce000e115de24ca4406e251cd0ffff4595db77cded21fafa1b97145cec498e90de36987d3f734 WHIRLPOOL fea295483894adf1bab479af2bab61fd2e3e39178a830f11dbe9344d3f7a3c1824ce6c2d6ef8572864330650cb6bde24f74ad06de9fb9a92a2fe9428c916f189
@@ -66,4 +67,5 @@ EBUILD netbeans-cnd-9999_p20160708.ebuild 4790 SHA256 e27629389fb9d629de8198bd13
 EBUILD netbeans-cnd-9999_p20160709.ebuild 4790 SHA256 ed414bc5c3bd4beee38bb50314b65f6acc4b4323033381c0043105becb63c414 SHA512 48eadd416561f8115a36e8c6b26ac91c6cba266de5d6b416feb341d10bd0288668ec5abe2e94c3ded2b75e011949392b5a54e2a12949183d2d0b0ef795d1b6db WHIRLPOOL 7b7724cf4067303e89e2fdb57cc4737890ad02f09cfd49a496833d7cb4952214a4c458154fd7486976397e1eea331e8ce198abb55718e6c03674a1b66ddc19cc
 EBUILD netbeans-cnd-9999_p20160711.ebuild 4790 SHA256 fb23bf76dc0d505e2aec98737ebee4b6b000d63dcee5f19a86e4973758312965 SHA512 0ba017ee8da5d4630dfc6e2e0b4f5881c3d9f1e81879d0c70b22755ee91b4efcbc902d98e12680cd3b4147be46193337777303214bbffd4946d74e4a8d3989a9 WHIRLPOOL 8f29699a9c512ee03aed9b825d62ef5e315dc95ce7591c0d7df2cfe79c1b4921ee7f75be0fef872aa6f3ea04c00bc2cd9b47afa4bb25753d518aa2886253279c
 EBUILD netbeans-cnd-9999_p20160712.ebuild 4790 SHA256 9fe3e94c5795580417c4a392da3507d489f908cc8176b2f0af273d2ea4b51f33 SHA512 9c198ee39aeb4e868a867867d30fe10de2f7e031a9165bcd6c7a9c0bd1312dc295cc6747794343fdc7ccbf144dd62b63c723ad472d6b41a9c33a69a0dc213444 WHIRLPOOL 9fe494be159aa840eb47b6000baef453ae3298289624928cfb6beea190ac2ebf9df9f380e6ab296f5599153a059ac7496dd905fdcdd129c0a36002988206035a
+EBUILD netbeans-cnd-9999_p20160714.ebuild 4790 SHA256 2eee5026bdede204985cbf858cf62005092e0777cbe6e2ce80102b2c773b7307 SHA512 5bde5f619a6127851f259636ab1d6a21abaa51f90913fc4d1f85a0a60f98a54fa8788992abcd27d9d157f38e6d3bf3bc0597dd6094c2c6af2e7e1bdf438beb8f WHIRLPOOL 3764855b3dba15f00173fb7dc1dc0947188dd881d0df4f346c4305e48bacc3a4587f2013c50636314b4f500f1f7a0692a1a9ebfd10f04eb5d1375bbcb3a1143c
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160714.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160714.ebuild
new file mode 100644
index 0000000..9eb2054
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160714.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-14_00-02-33/zip/netbeans-trunk-nightly-201607140002-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 ed2fa6d..35f8834 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
 DIST netbeans-trunk-nightly-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f07ffe990b3f8c5bdcefe7279f17a100fb3b184dabe6b5a9baed SHA512 ec01e8bb2fde13c2381c50417e3d4a1fee51aef86df1dc2806737a1cf69af0a65b11dad723dc8449b0034130e833cf33709dd401917b4e3beee5077cb1846821 WHIRLPOOL 24fd958875a23da7208a861bea1b5bf2d89b942ac37d864f3c29753989f513cea0ece0c0cbf1cbb47f761a5cfa4919435470ebb26c725adc313d5ef0fe9f0682
+DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 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_p20160614.ebuild 2968 SHA256 d9fb867992793fee5e3b85f4ddb5cb978e3ac10769c027379bace490e21147e0 SHA512 a9fddb6baadb4a8de720821b224a14181e4e6c22f3a86762715084d350d3fadeffd3af5f1019acb8d0f3b3011985469b1959663203d12a1e520026c1b250761d WHIRLPOOL a97207fbc04bbd0be11bb873dce959dee17efe580ae9b2227c99dc5259d8c3d8679946ea85a047bba0a64720488a21e271410393a84c3f80e422f3a67d8354b7
@@ -56,4 +57,5 @@ EBUILD netbeans-dlight-9999_p20160708.ebuild 2968 SHA256 963208175d19102addb4519
 EBUILD netbeans-dlight-9999_p20160709.ebuild 2968 SHA256 f99daf182235c7a1400d2b87cf2b5a3cf1787e65e8dc6dcfd542b89ac2aa179e SHA512 ef256b024140b6c65ba6bca7b2e17bcb449e197626a4b43d64548ccd4cbd3f8cfbeba63bc9a3d861d0773e24326dbf1c449765abac2de07a1f8cb582965a5811 WHIRLPOOL 5eb46ba9515462dbb6e03621943db90577c3e65c87de66a6ba7303f2b2f5a234cb601d8a503d69b9387e4040b0be27c53b1e28cdacd6b810b79cb746464995fe
 EBUILD netbeans-dlight-9999_p20160711.ebuild 2968 SHA256 0e535a82b19a9bede37914e9e5b5dfa01685553b67d2aa43fa9c9aa2da0a31d9 SHA512 88e45c6f6daf4ab0c135811da402edf848fa2b4f4bda8a17678571e61263623e878bb133b57d8c9e5b83858da6978fce06021efa9441b90acf6189376841634d WHIRLPOOL c4481d43930a9ea99b310e230f1bc1598b67ccbac4d044c79d7670c9f31f48ffc93b2ee1c89634756cfcd807cc0c568bc56398276d45815272104edf62ef8fb0
 EBUILD netbeans-dlight-9999_p20160712.ebuild 2968 SHA256 33a6b4e50e10d7978289a377b9a5836490707d40ff5d91c014ed10d406e1f1e4 SHA512 7a869482c1e0523346207b84c8bc6ffa276484b7f99b6ff9143c15ef55016e40d3ff57c417f243bf88509b04507b670af10c5ec30e3d3b2cf02a0188f6da450d WHIRLPOOL d048ff91b01ab289634231c99e947fb1572cc16d5b665ac9b4254cb696b032c946cac6b37270ef9bfbb441f06e2ade26923d6c52061c9ee29e4da3d3b18db6b9
+EBUILD netbeans-dlight-9999_p20160714.ebuild 2968 SHA256 e4bd881e5a0edb900650b93198ef90eef955da49e5982b57cdfafdf146edb1e9 SHA512 c8eec6690a975909746b122915674aacecd15379d8152b7de740de14e4e916f0403756897fb97f4b827461e6fa5fa1af7c7f0d7735fb1fb5ddc0995ff5966f94 WHIRLPOOL f657db3d1267c93b870c0633617ec0bab5ccdd35a1ccaa786708ef17cc57056c1cb3b77801e04bb117f0bd37390dec9bf0913e546a1432251fdc64f4ebd9214e
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160714.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160714.ebuild
new file mode 100644
index 0000000..d58b25a
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160714.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-14_00-02-33/zip/netbeans-trunk-nightly-201607140002-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 dd4e841..cd43c72 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -59,6 +59,7 @@ DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
 DIST netbeans-trunk-nightly-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f07ffe990b3f8c5bdcefe7279f17a100fb3b184dabe6b5a9baed SHA512 ec01e8bb2fde13c2381c50417e3d4a1fee51aef86df1dc2806737a1cf69af0a65b11dad723dc8449b0034130e833cf33709dd401917b4e3beee5077cb1846821 WHIRLPOOL 24fd958875a23da7208a861bea1b5bf2d89b942ac37d864f3c29753989f513cea0ece0c0cbf1cbb47f761a5cfa4919435470ebb26c725adc313d5ef0fe9f0682
+DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 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_p20160614.ebuild 15825 SHA256 d45bebf7efdd045025a381bcedca4eda37cecdf22d691de1cd2e7977323ecb9c SHA512 cbd1cbb9c1dcd385ae77c37397b5c7fc5f127341ace488426f07652a480d42b538ce717149c8127de6f40993c45cd9be63b89b1435bff23e40c962e55b255f5d WHIRLPOOL f0f3c2622970c8a6096be2be4191a3fc3844c1ae06e48bb4b1e3de36d0f5576b4022a53cca6328298e5c76af0c8be28d1878ad53656f205c782cd81d0be15e96
@@ -85,4 +86,5 @@ EBUILD netbeans-enterprise-9999_p20160708.ebuild 15825 SHA256 b2f34faa9e39884e1b
 EBUILD netbeans-enterprise-9999_p20160709.ebuild 15825 SHA256 db45f24d4afa02d68a1a8beda60aa141f846c85a324ebbd44e3eedf098b4e8b4 SHA512 8d407cf0e04a9d45870224177e9eeca3ba2d14a923802eb39c9b0261e1b72e88a659bbcdf73c429443118e123b66ad86d2c002c81fb6d344e8debaaea2a50360 WHIRLPOOL 93e5aa6981befc0639da35c9f3b350b760989eb1f431cc9d014ef8484e3a3cabd177c80b37462024b6aa89a4f33ee48e4b6e8597e343a204923232fe39cfb9f6
 EBUILD netbeans-enterprise-9999_p20160711.ebuild 15825 SHA256 7451df7d091835ba79f2aaecab576d1524f14d5a65fcbf094e4a2d3a88a2692b SHA512 85dbf8aac0907adfe51948a2f6dfeddede8f8552ac1d31df93aaedf64e20a5d09c65814959e5f4c773b43a9f1ffc6ba28171b451d0465f5c4739337bbf055e6a WHIRLPOOL 4d77fb21c4ac2407c6d0fe784c5bab17e1f9c0729d1ae28da3827843a8961de210d4d8f9b27edc502f90a82142cbdd358b3aad0b5ef94bf3f68c1377ed1282ad
 EBUILD netbeans-enterprise-9999_p20160712.ebuild 15825 SHA256 7c62bb4e274dc45b32fc8c8e548f908d860ebbd41114b4cd6c4df33f3de717a6 SHA512 0ed3924b765cc03ef2f7c3cfde557e57d242380ae9d8081c52372d3c6d51de95d3e330ab991b236db0f754ebc9d31c33cf5003f3a18eaff6bfb6dc41789160e9 WHIRLPOOL b40dc556e189bbf1e34abcde879d73ac26e7644d61b5fa0155205629b2a105d2409dba4c1b3c41fa17b33dc72fa95060733d84f7592c78e6975debe8898eef0a
+EBUILD netbeans-enterprise-9999_p20160714.ebuild 15825 SHA256 9a5c9d3b1183b11b1d5550fb4520d5023f42d6bf0f89aa5d085ce63ead9536ad SHA512 fca857f0e31c220d0b4730181e07c0ac3f16eddd80e93dbc000ffc8c2269e7e5729ebb9ed6f8270c4516e779ace88958c3585e06e56ed137b50e376badfb6cf2 WHIRLPOOL 0b59979e921bc5ba3243e3330e19fe989e23ab5c3b2234ff0d9a0b2e786da938c858fcb57498c89e539af3fcc373bea34a185e1da37affbb16c8adaea624b451
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160714.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160714.ebuild
new file mode 100644
index 0000000..88504d5
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160714.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-14_00-02-33/zip/netbeans-trunk-nightly-201607140002-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 8385c3b..53daa2c 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
 DIST netbeans-trunk-nightly-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f07ffe990b3f8c5bdcefe7279f17a100fb3b184dabe6b5a9baed SHA512 ec01e8bb2fde13c2381c50417e3d4a1fee51aef86df1dc2806737a1cf69af0a65b11dad723dc8449b0034130e833cf33709dd401917b4e3beee5077cb1846821 WHIRLPOOL 24fd958875a23da7208a861bea1b5bf2d89b942ac37d864f3c29753989f513cea0ece0c0cbf1cbb47f761a5cfa4919435470ebb26c725adc313d5ef0fe9f0682
+DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 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_p20160614.ebuild 2913 SHA256 a09074eac38df267941db2bbe9e4257e31c00eb1c11836eddd3385dec43545d5 SHA512 72cb8b2542a77a2f74be708f94da431dac6fbbc44d8b4ad710f5030567650b1b17c6f51382f4d42d12b836b6f516ec6cbd18484ebb66b91a07454dbaead4bf06 WHIRLPOOL fa239076a01850a48e0b8aa3e977aeb604369e13c74daab5750452fcbd8e0684fcde631ecda9d30c49ca2e6bcb844a8c90156625165e127f18004b3545d219ea
@@ -53,4 +54,5 @@ EBUILD netbeans-ergonomics-9999_p20160708.ebuild 2913 SHA256 95c2ff05eee2c800991
 EBUILD netbeans-ergonomics-9999_p20160709.ebuild 2913 SHA256 e8ee2af392312c09dda4022d56497faf8ea6dbdce37722ea0e3df4b4701b078d SHA512 4741695d3b6ec5820142be726352e9399f1510d0aa2c1b723e9a77a29d7476fb389f79a2fd28eb6fd9e9868810c7f47a42af2996f5d0cf08ba6844fe1d0a1ec3 WHIRLPOOL 3dfc9e5a5beb0ee1edc61eae7ef5a8723bf51a959653885f11f2c70205ee5d712bd5daafbe5237fd49ed519dba423b3897db07d00a08c54965ce4c2d30067e01
 EBUILD netbeans-ergonomics-9999_p20160711.ebuild 2913 SHA256 718c727e901597f25b86eb504724838767612441a47b593419a4865df75dd1fd SHA512 b161dcb6326cbc10d9533794883be2583ee0e8ad3da39eba86c31ca4c0b9fee9505caa80155cce1555447f1b67a431d8d781325811bc087dc587e5668cca8739 WHIRLPOOL 11d7dc3cb91cf64abfda2b65054f32f1f89e2a5d3cbab85591e918f73bff29706123c11bada3d2af721250fec83a27d5e21be21cbe3f29261599a043afcb83f5
 EBUILD netbeans-ergonomics-9999_p20160712.ebuild 2913 SHA256 c861144edf651e86b2d4891b8ccfb7b4f8f1e3f9a6590b1d0153c6d971fb94eb SHA512 dbcef6bda36566271840ad762e85a2b1616250e9153af8ca81597c7fd9006e1d9149981e3e20c1b254c5bc0080878e9df53159d8c3a2bf0059f385ec10c85748 WHIRLPOOL 9362bffd616e41ae8232131b427f5652319138df99ad85535a79816a25a9a81dc5dcee47c695075d4b59aed3d6fe7d6bd222a52c6331cd9cffe2101e8fa1e8bb
+EBUILD netbeans-ergonomics-9999_p20160714.ebuild 2913 SHA256 109819e4303720b3686e458af604ef65da28e0fcbd1c41d0e934084c4f0d1600 SHA512 290ab44bc7fec8a29ae7f0dbc5938a1d51524453055932d065129503b2d0cbb1f58129da64a57794b67c1eae34fe37e130ffb8ed4ff603e12274df03f7a69c14 WHIRLPOOL b5038c12667bcb52688276111f187360f144622b09e64767ae6f92540373a7a16af179210bdf45a4acbb595152aff09f4bcc047da56c4ca78a88074dba358062
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160714.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160714.ebuild
new file mode 100644
index 0000000..ab52a2d
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160714.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-14_00-02-33/zip/netbeans-trunk-nightly-201607140002-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 8963c11..8e799a3 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
 DIST netbeans-trunk-nightly-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f07ffe990b3f8c5bdcefe7279f17a100fb3b184dabe6b5a9baed SHA512 ec01e8bb2fde13c2381c50417e3d4a1fee51aef86df1dc2806737a1cf69af0a65b11dad723dc8449b0034130e833cf33709dd401917b4e3beee5077cb1846821 WHIRLPOOL 24fd958875a23da7208a861bea1b5bf2d89b942ac37d864f3c29753989f513cea0ece0c0cbf1cbb47f761a5cfa4919435470ebb26c725adc313d5ef0fe9f0682
+DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 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_p20160614.ebuild 3377 SHA256 d522cbcac07c2ede87676cc6cec8de2e0ec79ab2cf7a9af63e9037e79dbac8cd SHA512 22e12e42ca768088bafd4de682787ac99c5e25d7263a17a6d94f6c3674175e8524e1dd6f0d474649a68db752c6f4f4cf0bb7860bc7bf2d57ae37f78964224ce0 WHIRLPOOL c1d657889ab53d84bd893e7569a33788ba6aa805d13822784a3809b6446619cd4c51ed464202c4815ba7c1a25739d13065df03207e8c7d2d201957700ba4718d
@@ -57,4 +58,5 @@ EBUILD netbeans-extide-9999_p20160708.ebuild 3377 SHA256 1b9b6448815917b88d6156b
 EBUILD netbeans-extide-9999_p20160709.ebuild 3377 SHA256 c6a471dca8849aec0b9d57d12cbc184761d939b2d7ea555e6ab45a150a193406 SHA512 c1211cfa115e66d7d134ce8d4d5f78d3b724f2af47fa12293f14fbaded40bd8807adc13167aa2e7d6b7f92e5cfc15a63494620534c6962b912aa38b1e9436b19 WHIRLPOOL 137e9b580426133b00e393b003989ecb161b87d99d74159fe9b0ea261b8947fd87a48f6cbffae731744192b77feab0e81db4dff56e24f4a213a14d744001388d
 EBUILD netbeans-extide-9999_p20160711.ebuild 3377 SHA256 22280e55838e12a7852ef56a51c6e3c4a070ff1b35af46298d0b2d4d069771ac SHA512 98baba49dac86642a7dc884b1bc7c5e6f4d478eeb41ce9551c72c540005de1f514edff07eb44e0bf692f50af47436fefa3dbb2a7ce8c345c42dd9d4d022288c4 WHIRLPOOL 1281c30d522494389978ed8e4a19b1dee21bcfb2143f0028eb8a93c94596b790e765b6c3e5860357ec0c2084c1b7988400a054a7a313c09b6414cacbd01e21e6
 EBUILD netbeans-extide-9999_p20160712.ebuild 3377 SHA256 130f06d602288a3332031e6bbae381caf5040b1356b50393489d7175793dd639 SHA512 b01b9a2188a651bc51c6e32853b39c0ec8ebebddc337690e249b56517e8e08a40b019d49daba8f32a498ee105e73b1c947c468deffa13223882e93e35a35d5a7 WHIRLPOOL 6f06ca772d294407580d06fe38b3b49bb6c9bc3c286027c35134c2f65f25b97b1d15b1425038d456a7ea03c6a1a80db2f0fcf76e46eed1883d7a0a11adae0d12
+EBUILD netbeans-extide-9999_p20160714.ebuild 3377 SHA256 2e016dccd68d836434b2ee24a15cfc04904084b7fd82a28c965a88c4adb673a1 SHA512 1bcdd0ba2cf76cab1d886a8ed20cf40adcef2703623994c4b270927104f9d67412768a35712d3f87a7dda7eb56f41870479f5b48a1cba6189ad23c484a30bdc4 WHIRLPOOL 8dbc1d0b61126c2236dbe7ac1d1f7a1f521252cf17ecd35fe4909540f3734430f59d1b6c56b691ebcd9c1ab464a2766e89ca18f4e80f683e2dad1e794a2c236c
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160714.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160714.ebuild
new file mode 100644
index 0000000..816d2b8
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20160714.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-14_00-02-33/zip/netbeans-trunk-nightly-201607140002-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 0a82aa4..f36b477 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
 DIST netbeans-trunk-nightly-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f07ffe990b3f8c5bdcefe7279f17a100fb3b184dabe6b5a9baed SHA512 ec01e8bb2fde13c2381c50417e3d4a1fee51aef86df1dc2806737a1cf69af0a65b11dad723dc8449b0034130e833cf33709dd401917b4e3beee5077cb1846821 WHIRLPOOL 24fd958875a23da7208a861bea1b5bf2d89b942ac37d864f3c29753989f513cea0ece0c0cbf1cbb47f761a5cfa4919435470ebb26c725adc313d5ef0fe9f0682
+DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 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_p20160614.ebuild 3416 SHA256 bb3506928773eff23710b353e022829d16908261b90296859d14195a074e23ed SHA512 a62ded04dfe943cdc45b6ba665667e6af3c69d79bc4f79131fb494b6c8103b6e27ea0a61da5e6120bc2e20af899bf98650f856884bc4955fe672d457ff6eb3f2 WHIRLPOOL 5261a809c997890f47f4cf1d284052236396c3c44a038cecdf3621cccea71b212e60c61c3cd011909231666a8919b5da5339e28e6d8929fc0bf530008aba12a3
@@ -55,4 +56,5 @@ EBUILD netbeans-groovy-9999_p20160708.ebuild 3416 SHA256 1078a851776bdfd7e877201
 EBUILD netbeans-groovy-9999_p20160709.ebuild 3416 SHA256 99d55b66920bba2e9ac078b7394f86f46c3898495c53da2d337a769ea31d2c07 SHA512 346a81381ff1b8d2c1c4fc818ff5f325948ee0c689b2ff1d9fe42dbb816b5c70000f033fe1d32669bbf933412c08179ed4f0733373d49394da0c195e22cd7d7c WHIRLPOOL 164ee93234c80c829098a6f2894bc2f7a4d998a57d441a1372db0acb63a107ef841f993226f69e6bba6f3620da80a845741cda566e8b6806cc8812e61ec088b9
 EBUILD netbeans-groovy-9999_p20160711.ebuild 3416 SHA256 0f70a9bf417bc1cf1b72147a11459f060c9e25a2c72eab37349c0c12ac4254cf SHA512 3e1b62b4a95df8f7ba6ba40a3fe10882ff266c90db82e57567e2b50653ccd81639c25ffd9ba572cd22101e09a0c45da6c9a5d6599e5cc83b8d7593d67e73fd6c WHIRLPOOL c5c5482353e72b72cebd23665d1ff2f59c3403f7ccb9632dfc9053f4dc0dab290da1e99a24193b6cbab2884fa6be21b3ed1aebf4d83f3d0b48d2dd90adb8a211
 EBUILD netbeans-groovy-9999_p20160712.ebuild 3416 SHA256 1b552e16fe46de929d14a5c32054504dc36e5560cadc1017ff1ac22e7afc7aef SHA512 97e37367d94cc0bab0a2ae071eb0f5d0c7d509d1a71befd6ab4f55c528902c58305fa2fbafa277f488864261bebf3120d2079cbbacb7ad0764d1434d9cf5358f WHIRLPOOL 27e5b3abcaadfab2075ece31bcb2aabca0e5d57d89a442f8de6a0bbd6703a63371a96ffa5f8d582a94b8e5b52bcdccef65130376502fecc291cde1a386cafa20
+EBUILD netbeans-groovy-9999_p20160714.ebuild 3416 SHA256 4198e02fe9c0dc7ad95306a57b7bf8a3eae0df6ef39549cde7a4a3ef56fc2947 SHA512 abb29366c9bc7483a5eaac509c9f2277997a2fda2096a68d51f3ed9d730e761275262f3c1ac5b3c8dddf434017ffef40da2447948adca47366d449c2013df4da WHIRLPOOL e11bb167bf2d5b7c56d0d7c791ba55b2b0bb3aa891f3c5f7ebfb54d1b326a44d7329a639ba68c857df31f671b9545207cfe5102bd8498dfa2ca5245000c1e404
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160714.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160714.ebuild
new file mode 100644
index 0000000..a237d61
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160714.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-14_00-02-33/zip/netbeans-trunk-nightly-201607140002-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 35d3dbd..4d915de 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -32,6 +32,7 @@ DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
 DIST netbeans-trunk-nightly-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f07ffe990b3f8c5bdcefe7279f17a100fb3b184dabe6b5a9baed SHA512 ec01e8bb2fde13c2381c50417e3d4a1fee51aef86df1dc2806737a1cf69af0a65b11dad723dc8449b0034130e833cf33709dd401917b4e3beee5077cb1846821 WHIRLPOOL 24fd958875a23da7208a861bea1b5bf2d89b942ac37d864f3c29753989f513cea0ece0c0cbf1cbb47f761a5cfa4919435470ebb26c725adc313d5ef0fe9f0682
+DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 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_p20160614.ebuild 4126 SHA256 c7e7e97ed46d14108eeea2887caf99c3fcee44b1964ad7ad2b76c052c5b820c2 SHA512 4603e234af04f12ced14c9f918e0433de9d6c1a0fb6c20b75b30c7ae27565995e5b20674ff4b9a30cbbbca6a2939dd0b4d17fc02a8c82f7a4ba9aa58bb7edd9f WHIRLPOOL 9bf9e2d84ac48c7cbe85cda87bd3147ad1903f391cac071dbb6391d3e79b2f3b1654077e3eb5b93aedd2304ac1b511eb94cf89c9989c0efcdf103f7ae1388757
@@ -58,4 +59,5 @@ EBUILD netbeans-harness-9999_p20160708.ebuild 4126 SHA256 8b7d8bc86e6d412da2aa6d
 EBUILD netbeans-harness-9999_p20160709.ebuild 4126 SHA256 d8a8a190777121167ebd1ae0180e139ade32a86319deec0740eff535bc4a7c41 SHA512 fdff2897148f1c58b20a5d0d7b1da46a3853a5aaaf56e8f1a003e54dd7a7228fbd65b449c0971a9b0ebd8236379f7f825b006130037209f5aa58bdb5240e575d WHIRLPOOL e06bdbd9f6a4b6d20cb157e0a0254b171c3ea5adf6d304b73bb9ed0426aec7f64fece05331a463d1d76627e5b2d39cc775e160dfd03049288cd1f8d6a4c84623
 EBUILD netbeans-harness-9999_p20160711.ebuild 4126 SHA256 8bdc2fb87f9042f86c8a12971a8c63c8694075298fbf1f036e22e6e33c2be8e3 SHA512 4412e347167376a92b5c4a4aa2c8a1c2cbaff22e31898b974510f7fdc4ed8676220f10e309efab500adc0524838af68cb3fb51e957523f581f9a1f6edc22e9ab WHIRLPOOL 31dac19fdc9ebbec4879fab96acf8738c2765c097c8b4a7fc7e706cda3a407f5950f0f035b3b1a44aaf0ad785fc511d8e1aad872dd0f555143c9e0ff7640f064
 EBUILD netbeans-harness-9999_p20160712.ebuild 4126 SHA256 74a7dc8ae1b872aeed7469ec6d45810dfda915f17e9e6c580454ea9a8e1c1179 SHA512 df4e7e13dc45718118462f650f19688447c9d32d9b7839ad04d46a5dbbbb975a47f626385a9e5b34e438faf7f72ff9d51eda0f391fedada9443f4925a1c1940c WHIRLPOOL 57ac87057f795cf6bedecd86cc22c0b8153a433e2b0c23ee7f260f3c8c540615ae9f93cfde787957cc060ad879340e32aa81acfa18f996ee94b623e7e9a3d212
+EBUILD netbeans-harness-9999_p20160714.ebuild 4126 SHA256 e7bb52061c190d9d3073df61b570507203158a241cd3f0d9b3ecfa4ba9c2c5e1 SHA512 aa121aafe325dea54073341de56853f1199579e55917c6966246708f4359555b74182ccaf1d7395499c8772e648f7f88f84edea50b75755e78749bca60748844 WHIRLPOOL 0f9a57978400e4c42cb8837a5f24d490ec9d8143d2e7be1be776b045a5d068cecb989070387165f63ad4ba70c7719b9972eac2cd8b988708f6febc51d178748a
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160714.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160714.ebuild
new file mode 100644
index 0000000..29da7e7
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20160714.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-14_00-02-33/zip/netbeans-trunk-nightly-201607140002-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 be769e5..0d754ab 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -167,6 +167,7 @@ DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
 DIST netbeans-trunk-nightly-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f07ffe990b3f8c5bdcefe7279f17a100fb3b184dabe6b5a9baed SHA512 ec01e8bb2fde13c2381c50417e3d4a1fee51aef86df1dc2806737a1cf69af0a65b11dad723dc8449b0034130e833cf33709dd401917b4e3beee5077cb1846821 WHIRLPOOL 24fd958875a23da7208a861bea1b5bf2d89b942ac37d864f3c29753989f513cea0ece0c0cbf1cbb47f761a5cfa4919435470ebb26c725adc313d5ef0fe9f0682
+DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 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_p20160614.ebuild 30761 SHA256 30b50c2919bada65db42cf59d9aec1f5504b737328841f732a6303409588e5e5 SHA512 d17a89889482a47a4adc1ba4591326b0d636003e9072e10cfd44cd2db3ca9776a75a60f1e05f885112a2b455747305221e6294ee8f0c7c0913990ae7d341dcb6 WHIRLPOOL 5f22361aa02682952e56470cd7b25002d8df215b496d5f88cd6bc822f3f1b50980efc98dfeeab1b9695c3804313ebae8351457c5f78065fcfb4355ae6e5be88a
@@ -193,4 +194,5 @@ EBUILD netbeans-ide-9999_p20160708.ebuild 29867 SHA256 cdccca7d4f50b61886d971197
 EBUILD netbeans-ide-9999_p20160709.ebuild 29867 SHA256 c59ddc10f98e85f1b3b2947132c104067a812453f145884eeff2bac0036b4c04 SHA512 f2be605fd0d65b5189be2af30161e5da0a86bb6a9e45f996dcd4e9ca0f5d1b40a6d6463d4ff1a4abea52477899ab53b10bd1a6b170ce13bf6efec58b9a387e00 WHIRLPOOL 2062f6b158778e0cc2c75f2876cf4098fae5ac42e72a23b97f5512851bad6b1e8c46d05afb232d92b401159471214cb1eb584f5c6b30faa881eca2e77864ce20
 EBUILD netbeans-ide-9999_p20160711.ebuild 29867 SHA256 b22b6f5d05a0b193cf86e10adfec890ae34521e3ad44ee71abcf0610653848ef SHA512 111ac1c6dc69da73a579ca1bfa3626d226d243e73439fc5acd82a26ee8be3f982a9a1607fe36f3626c427dd8c30a218a84060cfe7214169fbb4b62db3c32c720 WHIRLPOOL d7ac218b64f862f9c703fcd32838089048534907d801d78dc00f5ed1c4cfef3d7a128444cc5fa67008dc707ca6c60c54a2ce76ba7b970550905f5852d27426e8
 EBUILD netbeans-ide-9999_p20160712.ebuild 29867 SHA256 85b6bda9470fdcd1d2bf4b74d08bbe29d52e993c4d4f38cecc404f9d1bc93306 SHA512 ae40d71c4d95c3f5bdb4ebb877c42aa2e44e62a1907a2ce159f0d2d5a80b44d728c2696cdb4b695846ec0b83d51947910078e51a559c205f84c6d14c2f2c34a5 WHIRLPOOL 65b089ea712f1ab840e7a40059388c01c686bf7ee64e9f2cafd63796fb59a31d5293216f250aa9378ec6f813e785b85e8a59b0f5ecb4492a66a27afdfb14da51
+EBUILD netbeans-ide-9999_p20160714.ebuild 29867 SHA256 fd68f477e76398c46654bcc5a9e6a9199e66ea8752cf808cd20bedcc7b8703e3 SHA512 9bbe660125f0463c26f3bacc4bea97e2cb63015d419ebf789ee6142ce8142ab1caafdb0eec71918f53c045be70a58fadc978712210402f0938f6b10acff4c1ce WHIRLPOOL d2ba44aae7e1fe8e66dcbbb4bd204fc3d9c629435e3ffc2ae0ff46082817c6e77a97089b91ecc23b3516368b919cb8948769c661a82983848885eac041fc1c1a
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160714.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160714.ebuild
new file mode 100644
index 0000000..825184a
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20160714.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-14_00-02-33/zip/netbeans-trunk-nightly-201607140002-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 e97f910..be0b191 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -64,6 +64,7 @@ DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
 DIST netbeans-trunk-nightly-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f07ffe990b3f8c5bdcefe7279f17a100fb3b184dabe6b5a9baed SHA512 ec01e8bb2fde13c2381c50417e3d4a1fee51aef86df1dc2806737a1cf69af0a65b11dad723dc8449b0034130e833cf33709dd401917b4e3beee5077cb1846821 WHIRLPOOL 24fd958875a23da7208a861bea1b5bf2d89b942ac37d864f3c29753989f513cea0ece0c0cbf1cbb47f761a5cfa4919435470ebb26c725adc313d5ef0fe9f0682
+DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 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_p20160614.ebuild 15656 SHA256 1ba3f88c10129a6a5281b5f86325b61db5b1e7442ce489646ad58fbee45304c6 SHA512 df6debc471a80eb2072d8ea47c202fb7b252337ac35430d7129ce677d3784a7b40f60dbf4f4dd51245681a19b42015a61d381051aa13ceae314441aeb6634a08 WHIRLPOOL f7292f71a19506b6c07770284fafa3847b9c838ca7637e10c5a2f3cb16eae1de5ef87d12b0c2fa037e24b6e495d8bbd0cb8b2204777d243c088610cd3b9fc080
@@ -90,4 +91,5 @@ EBUILD netbeans-java-9999_p20160708.ebuild 15656 SHA256 cf53c668e429556e06cb2ddc
 EBUILD netbeans-java-9999_p20160709.ebuild 15656 SHA256 7eda322aea3fa2536c11fc19d9698c5703c6d1cf7394a76c3670727328691a87 SHA512 f6e47be5994d30533d109c338545b8a53fe4c8cc6b7cddb1c5e178df1ef77c54880ecea7f13016477c8e299e64e9f7a7a669d486415f2e28d9269b1732b78bae WHIRLPOOL 31290b461d6f51bac9ee08b8a92bae02b241b978ccde00a1cd78fce35ff1350ade088fd6c83294c401df848f079b05d56ca0c8664174dbf5aa5758a0a57c6a5c
 EBUILD netbeans-java-9999_p20160711.ebuild 15656 SHA256 0c5a06b6ea2d5e22bf1693da05a12d04c74db19c6797d57ccb84970fde3d6796 SHA512 dd2dd7ec7959fa0bfe865c39869547b2cf10b99c84abd78854f37c2a3182f250bc013af82fb95530fca51dada7f579b986261552a9d2509f446a72c50cbae394 WHIRLPOOL f80a146f0ab9c7326eacb96f69e30f5d4870fd1d184a5fbe6c11b2d996edb8dc2d33c1e98b85eafdeb0520779e056c080841f8bf8af433383c976b054a936fa8
 EBUILD netbeans-java-9999_p20160712.ebuild 15656 SHA256 3820fac9f920771610b240f33cc4dd9e80e615268f5811747633fb875796fcb7 SHA512 18ce7562d294e151f66780d4adddbde1312e83c5e99ffcaa91510d566a6bf3a920a6357ea398b7e8abd5b11a41edf86bac6617b7864759dbb681801030998c41 WHIRLPOOL 1af6aa04e53a57a5a7583c2ea67b57ccca0f20efcdb362310101efa364b8fb3ec19b695860c5a3341ef585cb840a1f4d21703e4ea2578edbd7852fd6c377bc46
+EBUILD netbeans-java-9999_p20160714.ebuild 15656 SHA256 e0daff95e9a907f92c867223b7fd2704698cb344f474131a7d3ba0f1268911ab SHA512 bf8b36115e47da27fd59202a1993bd07f477ae6fcae02b3146cb488c054b9fc8ef1651f27ecb516a185b24cbd36d160fe50cbe1d812e43c1205172b15a393828 WHIRLPOOL a137c764f0975a27c48babe20f4b5c02da5cbbfdbe329d9d3f8d68c64a4226d13ac69c00cdf4665edd6797691ce41666858e469145ee899147fd90f58a55ebc3
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160714.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160714.ebuild
new file mode 100644
index 0000000..d1b16a1
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20160714.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-14_00-02-33/zip/netbeans-trunk-nightly-201607140002-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 a8d46d9..20db408 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
 DIST netbeans-trunk-nightly-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f07ffe990b3f8c5bdcefe7279f17a100fb3b184dabe6b5a9baed SHA512 ec01e8bb2fde13c2381c50417e3d4a1fee51aef86df1dc2806737a1cf69af0a65b11dad723dc8449b0034130e833cf33709dd401917b4e3beee5077cb1846821 WHIRLPOOL 24fd958875a23da7208a861bea1b5bf2d89b942ac37d864f3c29753989f513cea0ece0c0cbf1cbb47f761a5cfa4919435470ebb26c725adc313d5ef0fe9f0682
+DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 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_p20160614.ebuild 4971 SHA256 a5f78b5059b09a0f38537ac49de89254f02395395513f1bac38b95bbb2151694 SHA512 80f779b18a7590db2aa2eead52a365a156c0cf18eeb678241cfa9ec1be54f63e8e76a1b95fb090a9c5bc15fbb1ce7272eba84665199d84fe910269ae135af253 WHIRLPOOL dfb6c912706f4df2e57f01f92e0e0bcc93f175455863987ed86144d12b8c60605ce98c35c8ea0dfbba1d0ab1d61eda22fdd147a93ea2cb923ae14ccd7475643a
@@ -56,4 +57,5 @@ EBUILD netbeans-javacard-9999_p20160708.ebuild 4971 SHA256 783f4d8134cad349c3cec
 EBUILD netbeans-javacard-9999_p20160709.ebuild 4971 SHA256 cf93ce037fff4f17afe8e77ab98bfcde07a47b2b9ccbdc9afbfc6d6f9c42a2c9 SHA512 dcc8017cd7b76bfceaf1730968fcbd8beba73420b1b7d1e2eefac65511ef0ba07bc6948ee6493037370ecd26a13e140a4e06e7038002cbc75959d0ecaa61901a WHIRLPOOL c05bcc6832725f71fad172c891ecae6d5ea05ecbd0125d1003b691ec2c04cb22226fae057e701391f5b10804df35137a997e3cc0ec3f312753a60bc9ae12d26f
 EBUILD netbeans-javacard-9999_p20160711.ebuild 4971 SHA256 2c1a6b579053e905bd02edcbce8c43dbca157ac8233f9a9def84a648f64f1d6e SHA512 fdaa65d0e81933c8d43a792b48e5a0931b9bdcc86bf6d5d2be9ce0b41d91c77ac9123326fa4f590d67b42bdf3d6bd2760b0265901cdd45f3c9c43a57c3daed0c WHIRLPOOL 9a599ee5e0ab5634dd79e9115d214aeaa9e3f79c2bd95a81459b1af156e99fd53b1d7fb072d2c70aef9980c6c05be5901f72965d4e38f976dd40ec4df7a259cb
 EBUILD netbeans-javacard-9999_p20160712.ebuild 4971 SHA256 300af673ed75d66106555ca008895fd08599e7d671df64ebaf772bb9a7b13047 SHA512 c9dd445c80d0c75722039a33e5ee69299c0a156644fe41d6bdf7c0966f53362fc77ee055401d69b9c5016191a529a12d985f5841cb58b46bca7dd6a1923c6e5a WHIRLPOOL 7873911e21343b6d1d196990aba2bc0fcc45efee4f79ac5c50b3a9f3170b9f1b437aa05a20a62418a23288bc70154e78d71221ed6ea332972582f9999c80676e
+EBUILD netbeans-javacard-9999_p20160714.ebuild 4971 SHA256 1939e85d24e271167fabb8729a6eaca2f7b6370df12177e7ceb72a64349194e4 SHA512 5eda28e523f64b1a5678ffbcefb365af60af65d3e6e78eecab70d5fdd74b67cca4896950c38b054cafaf88ab372c06bb473e946ef24d7cadf50f6542d9bfba4b WHIRLPOOL 65f7ccef9299bc705d46fec9d39fc4958f118aa8794acad48f0834db1b935bf2e144aa21f0750ae89fa156bb08337540baa6bcce6054d683bfef9f9328a4e1bf
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160714.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160714.ebuild
new file mode 100644
index 0000000..1f8f077
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160714.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-14_00-02-33/zip/netbeans-trunk-nightly-201607140002-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 d5fdb91..fabb2b3 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
 DIST netbeans-trunk-nightly-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f07ffe990b3f8c5bdcefe7279f17a100fb3b184dabe6b5a9baed SHA512 ec01e8bb2fde13c2381c50417e3d4a1fee51aef86df1dc2806737a1cf69af0a65b11dad723dc8449b0034130e833cf33709dd401917b4e3beee5077cb1846821 WHIRLPOOL 24fd958875a23da7208a861bea1b5bf2d89b942ac37d864f3c29753989f513cea0ece0c0cbf1cbb47f761a5cfa4919435470ebb26c725adc313d5ef0fe9f0682
+DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 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_p20160614.ebuild 6293 SHA256 fb96bef4686e43ad7801343e059ba7f214662c0ed37a0afece60c0214be66afe SHA512 0255b3ec42bf7deb1e44b50b1eb9982214979112c844b635be23fdc2bd0a72f2baa4ea5819620deddf42f9f828f846e8c232df91def62b2a3512a4a9596ad176 WHIRLPOOL c1341eb9644a5606e8dada9b702a112c9fdb71d7b8df80b22530a6917d7661cb55291838cebe8aed28028634b7fb71aa6c7bc18fb278ca63bc8929425954a609
@@ -55,4 +56,5 @@ EBUILD netbeans-javadoc-9999_p20160708.ebuild 6293 SHA256 1e81575c0aab27059ccefb
 EBUILD netbeans-javadoc-9999_p20160709.ebuild 6293 SHA256 854cf451f4d1b4c657214d62096d684f46f7bd42d77c96732b82ebee676a70cb SHA512 72edbaa0c92f1b24996790d41736358581330e792501533427ff13c5e313bbde3274e4079cedd025a92f308e2a37523ff1211a3b9c47c756e170930d3dcbdda5 WHIRLPOOL d17171fe6a21a1f3243e3bac2eb94a33091c035aa3c07835551c32c9f543b4c9aa0804b8b70e8ed891e4b165266bfb8a10d6e9043fb9b1deb1ad214b79f93c87
 EBUILD netbeans-javadoc-9999_p20160711.ebuild 6293 SHA256 bfc9e984ba1ec74d85c29ece808a1bd5e520600726036020abe95d92602d958e SHA512 180cf878482ba22c207ee584c2ff46a0ff974e4b41638f12d621acf099251e6d91fb5988a20d441d47d15fa3dadce9af82c18737f09cfb3a541cbfa0d7f699f9 WHIRLPOOL cd084454b801e1f2628806efb0ca2ee95d9b984924ae9998050492afbd7f8a5149a64513c17b67a8e6c4193de0773b784c7522879c2bbad6c27e8f9542f48b94
 EBUILD netbeans-javadoc-9999_p20160712.ebuild 6293 SHA256 63b25e52b6af5b1101d7fdf7aa351d64bfacc1914c4ee76f39e52fc0b3535ca8 SHA512 9c0ca7e4b68e19ff9ac4753cc0b337c40b54e4625e97d771e4b6f7f3bc891dc0671a47e03cff5787055867b4bf0c4abd72abb067d6bfc68e38bcf6d7dc18f999 WHIRLPOOL f09ac1041819516f428a463972f880700306a4c257224b292deb5e35759d9c934e6f2402c68cb66062a375f480165df19b84978657cc25f40dba1c35716f049f
+EBUILD netbeans-javadoc-9999_p20160714.ebuild 6293 SHA256 000c5327ecb0ef470e0a47fa538a548be89f44753cd7c5888cfc8f8a821dfc62 SHA512 ca47291b23e92812bb3b7b653bef76dc5948d1428acad025ce0ed3c38dc96355a3a5ba5c441f9fe116ee25d5e3890eed24159a62a999cb4a9dbfd56dd22623a0 WHIRLPOOL 1ca47476d6e70fdd14f119fca15329ffa0e55537dcf54aefaff343ff0b0b37ec919c79708001e0a465ce4b9e6bed1f54d6b8e4d6cc4a996fdebd26c7a29cb273
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160714.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160714.ebuild
new file mode 100644
index 0000000..dee5ebf
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160714.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-14_00-02-33/zip/netbeans-trunk-nightly-201607140002-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 45d9383..731b8df 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
 DIST netbeans-trunk-nightly-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f07ffe990b3f8c5bdcefe7279f17a100fb3b184dabe6b5a9baed SHA512 ec01e8bb2fde13c2381c50417e3d4a1fee51aef86df1dc2806737a1cf69af0a65b11dad723dc8449b0034130e833cf33709dd401917b4e3beee5077cb1846821 WHIRLPOOL 24fd958875a23da7208a861bea1b5bf2d89b942ac37d864f3c29753989f513cea0ece0c0cbf1cbb47f761a5cfa4919435470ebb26c725adc313d5ef0fe9f0682
+DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 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_p20160614.ebuild 4717 SHA256 2cd838ed81c37b4fc5d18f884908c7edbbbe4302fd0fb54d665f49b5552f3c70 SHA512 67027e9d8a697355c9cfe54f7177f47bfd81fd19c4e78f1176c0cb3edaa1b0858dfb741e532aed0c0b4010eef026e41c0b65407e2f7384328d4b7e1e1c385e0a WHIRLPOOL 44d6f03da201d4716bfda59086ec9514525f42c7978356d331e0d01222ec217944f375ed57eb0fb1d5ee479b8fe9626b3284273c56d087e538e500d693fbf8db
@@ -61,4 +62,5 @@ EBUILD netbeans-javafx-9999_p20160708.ebuild 4717 SHA256 b9100e39b7a262225db250e
 EBUILD netbeans-javafx-9999_p20160709.ebuild 4717 SHA256 db65d9406d29b2ac9fa438f49371ac0d2a003b29b4e16e8fb9c10dc95fdef40d SHA512 c54655bfece165470032a4b87c7ab6c63afe3040f7c71d3e9ede5439b75c6f675de40ec8c3c68352cc497b3fdedc2ceddbf40f685b396c8c8370d994f94900a1 WHIRLPOOL c8650f40d45e06c9a00239d01ad4bcbe9598f3bb68fa585329c917733b64b3028f26a0145604f01815bd417f7a1c613f44cf2b419e140ac9a0b8193a09875f2c
 EBUILD netbeans-javafx-9999_p20160711.ebuild 4717 SHA256 2e35df2c784d4d2919b8393de8e503d01ce1a3dd01c870329992db24d40d6151 SHA512 bf54e6beb32b7e9516653292cbab1e9446bcdd242e2acb011a09e186bd8b7b0562e315f34237c087be163b8e119503ae4451ce65656514897da44781707c01da WHIRLPOOL 7f254f3694dd69bb2bd9d754729bcf407b7f0432c8796ef3f02d04cce94cb41cb864320208024af11794f7e4ea3335e9210368d3b66cbb98a38a6c32df0e7e1e
 EBUILD netbeans-javafx-9999_p20160712.ebuild 4717 SHA256 b15f65389820606177c39383fc7ada09b3feb77dd53f75123e6f9cfedbda6a05 SHA512 8b6956ab570f4922a4d0ad7942d741259a23fcdc53dc6f673c35f0fbcee88e1796b5b96a81fd42c5aa72e4aaf0797a178c18653d080e2dad45e1b970bc67e84b WHIRLPOOL ce8e2b610b6078887170cb63ca22bfe7c4e45456c30e3bc098a7e2b8428e077225dce2bd73214641d29608a3ee7e92fd28623914dc71d212aa02c65775cf7d6d
+EBUILD netbeans-javafx-9999_p20160714.ebuild 4717 SHA256 79a5b09192620b7495ca7ba435701029d1d6d6b0fa9024a906a61e463256d8f2 SHA512 56a1d2937e4de529dcaa7b80037be3150f6d6d657b926ef56a9fd4e0a407c2648ef1abeb4ff6936f1cfd78787d72e6434b3f1cd58d548a8d89c7b6930459f8d8 WHIRLPOOL 04932d01999aa65f377168e039904d6c3c2d5f9e0048e0b0309aa7daeecb71195a4d4650546beede69e0339cb349ca8c02f3111c78512913ab49939d7d041788
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160714.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160714.ebuild
new file mode 100644
index 0000000..d49058b
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160714.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-14_00-02-33/zip/netbeans-trunk-nightly-201607140002-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 b9997a6..de5e02d 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
 DIST netbeans-trunk-nightly-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f07ffe990b3f8c5bdcefe7279f17a100fb3b184dabe6b5a9baed SHA512 ec01e8bb2fde13c2381c50417e3d4a1fee51aef86df1dc2806737a1cf69af0a65b11dad723dc8449b0034130e833cf33709dd401917b4e3beee5077cb1846821 WHIRLPOOL 24fd958875a23da7208a861bea1b5bf2d89b942ac37d864f3c29753989f513cea0ece0c0cbf1cbb47f761a5cfa4919435470ebb26c725adc313d5ef0fe9f0682
+DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 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_p20160614.ebuild 4412 SHA256 05399dedeac13996dd0aa1666e129cedf066d7f785438005cf7aff67e78bd966 SHA512 f9695296f0d06105faf5ca02cbe9884373ea585fec0a6f6eb3d1727ae608c84c83b5abaef7f4a5b742ebf358e9e43860b9400d08af529c71b74453337648e271 WHIRLPOOL 8a8f9950d746d6382e1f3af3f8650de708c376307245c7dad88c06976e02e33d2c009b15ebb38095711ad9a7013682794f000871c7c4a34acc139d9f2171e3a4
@@ -53,4 +54,5 @@ EBUILD netbeans-mobility-9999_p20160708.ebuild 4412 SHA256 4d164f735e4a0a6a0bdc0
 EBUILD netbeans-mobility-9999_p20160709.ebuild 4412 SHA256 64c479236cae23e6170f21f76fbab6fb962872621e3802be4575f0042b91ec2e SHA512 88715847e34c54915a9b5dba859ff8698f67f9272b3005d894ae5117ebe7a1c928ccf231b3407589e40a66f1fbe8c5c07ae121038aa7756121ef278f56ea2672 WHIRLPOOL 1d1cfb407e001cbb3a57a82a00f26135d4337a68bf47b918ebb38c0d4d2da0ed50093216cb9e3cd492f218da506b22896a8417e93b01107a6e3c48adb40615b7
 EBUILD netbeans-mobility-9999_p20160711.ebuild 4412 SHA256 d9f1267ba1361912cbc06651159d178b9b75807e7484502d0043b582a74d6492 SHA512 ec6f5ec1ce6644bcf63a3698fae293caf788632969dc83bb22653789fe505883dd07ddc026b8bffe6d14876cedd6c0b20862a946ba5c2618ed43025f491addd4 WHIRLPOOL 09886a51d38848e4f1ced067de61ef162339b2676fdfbeb152ccad37e07fdb653ff3c2b6db5c175190b57f413c13d2a968dd7884ac6cb8990cdcc36982da0da6
 EBUILD netbeans-mobility-9999_p20160712.ebuild 4412 SHA256 f27ec67bde63dd71ac3eeda11dcc3ce149ff48a71321b89c70ad18fb08a52c04 SHA512 7379b118a9fa44e6d179f478798a72b3da1a700c2f6d27a7ad4c342649d76f3ddb0c4614fd7c429eca10b67d2678fe97a3b0cd3c0eac5eb21cdd712027665812 WHIRLPOOL daefa5847cf528c5f6b34525e68d0a3a201c1b12ebf604f8bae9fe1c04435d1c5e186d4c37f6e951ddbdc39564d787af7853913e65c21f7d76051eeaf8c87a02
+EBUILD netbeans-mobility-9999_p20160714.ebuild 4412 SHA256 b1c95899d7e6a463241c007bc638f295bdabfcdd871f67e8e878371b498a26e7 SHA512 061fe34302e287ad1ceeff8e2647d4fcd419ba4799e65dae7ef7fb6d8217c829624ebe8ee72e926b2cef77567849a77ba9b71ecb7ba324ed68eed3b19b51e17a WHIRLPOOL 0549aa617b3efd4845eeade84162a6a1f0cc5addbb192fff351087c8850da7d30540031b4f721dc41deec511c5422bee3956a2db28dc6706000f62228499fa38
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160714.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160714.ebuild
new file mode 100644
index 0000000..758d20b
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160714.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-14_00-02-33/zip/netbeans-trunk-nightly-201607140002-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 68c6a9a..56b94e2 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
 DIST netbeans-trunk-nightly-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f07ffe990b3f8c5bdcefe7279f17a100fb3b184dabe6b5a9baed SHA512 ec01e8bb2fde13c2381c50417e3d4a1fee51aef86df1dc2806737a1cf69af0a65b11dad723dc8449b0034130e833cf33709dd401917b4e3beee5077cb1846821 WHIRLPOOL 24fd958875a23da7208a861bea1b5bf2d89b942ac37d864f3c29753989f513cea0ece0c0cbf1cbb47f761a5cfa4919435470ebb26c725adc313d5ef0fe9f0682
+DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 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_p20160614.ebuild 4111 SHA256 168a3c8ffa6c109af93f44dd247c652e7156cd763c3019553593d972a8e7498f SHA512 4d244ab7198d01106cabd4fa91729b93560b88a1430e11fff80507963e8cfebcf5a97ea42bd3486646f885634956eeb65440a045b9bc31fe817c29cd9e12382f WHIRLPOOL 71092e3fee7de0b4f2c99959d6e8b3967441913322de20a69216020d5c718850dcd95bf7b17b30b99f031b2752c7619720b909751674ed7a020cccca20138782
@@ -56,4 +57,5 @@ EBUILD netbeans-nb-9999_p20160708.ebuild 4111 SHA256 67e5e6290cf643ff9f5727055e2
 EBUILD netbeans-nb-9999_p20160709.ebuild 4111 SHA256 6ccb374c4041f62afc66096a2a21a663fbd1a002d203a8077feac755ecfa23fc SHA512 edf8686d6276a585123ad8ad5eb7ac6ad1d0a6d40afc5c4b3a08280b206f353ed13685034bfed9a574460f90c98c22d86c7c807c6064b8eb8d3cd14633fd7d65 WHIRLPOOL 49dd6ffc7cc2dcea8064df95300e18c1182d948982d5f0651e0d6660648ff921453f4803783622f1e33c9b276b4bf89f81c8c55dc736254fbde625a0cef6a9ed
 EBUILD netbeans-nb-9999_p20160711.ebuild 4111 SHA256 ba86487964a5e5cbca82a26d082142632f17c9aa6abd22b040b4d57c0ad0760a SHA512 d90a02987aeeb665f70ab5a0139a6fdc663429f64f5de47ad83df2d5fb10654590ee036fce3da45511eb276e136700cd823935f603787ac34acea5c2e5c18e6a WHIRLPOOL 1b3288fbf1b73b1be0d7d8ee6a2faecd182693c9d14f894b0c99d723a58f8cb951ba143537e2a40a7106a920aef8833f35014b1ab83682c73de3226a45bf13eb
 EBUILD netbeans-nb-9999_p20160712.ebuild 4111 SHA256 7451d65493aeea8cf2235c4bf362ff32eabeb6059d5424da3246edd046891b26 SHA512 42084498a52ae5db4773b1e8cffa7e1744aeea8999500b82ddb80f0cfecb877f23f7e864c9db4fb1e08807e22d374c034a4f0050d2be8fabf2fdd180838c94d2 WHIRLPOOL a2b76a4bd7319c39df03c023200c4df4b110601c7ea666b8a2b3098143ac6e6cd3660f9b65c9425d5c6f0ed8a1c04e777ba17494d223e08d7ddb3d68d1d50a57
+EBUILD netbeans-nb-9999_p20160714.ebuild 4111 SHA256 4baf4e282f2742165c53b78dc8987ef4e910f73c14b0cc43ba956bdb981f1622 SHA512 7238a5b2c4e5a1538f79e5247a3408a15ef5b431ea3f35bd9fd0fb449621bc559e17b52c31cece1b05244c2fb71263485bf3f681ffa2bebdee22b0b6692ed938 WHIRLPOOL db9c7f2a4f48dd0de80a6510dc41b68e678236e692ebd5ec14ca5bd50f3b68a0a9c4c87a4f9cb888b3dcc8fc7d49d8ae847935b3e0285a014cf363c71853b687
 MISC metadata.xml 392 SHA256 01cdbcc83099b97486bd7b8e813e5b19c1138eb0d8d3e8a5683aafd579820435 SHA512 4d2f9160baa022d6a48b61d5f42e71cfd411d244e7a36436629bc5ee4036e4ce19079134d9a6c704ebe942306c2e0199d0591c1e54f92f8f3c8835147e639246 WHIRLPOOL c1131764e1cec66c56b977ebe36014b29e5a68e35ccc326c0cbadd050a6c625cf191c85c212e0a733661c008dab0d99f9a4cdc4c4ae0cc9d775ba1de554795a9

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160714.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160714.ebuild
new file mode 100644
index 0000000..c80301a
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20160714.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-14_00-02-33/zip/netbeans-trunk-nightly-201607140002-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 0c816ee..4a8e601 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -32,6 +32,7 @@ DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
 DIST netbeans-trunk-nightly-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f07ffe990b3f8c5bdcefe7279f17a100fb3b184dabe6b5a9baed SHA512 ec01e8bb2fde13c2381c50417e3d4a1fee51aef86df1dc2806737a1cf69af0a65b11dad723dc8449b0034130e833cf33709dd401917b4e3beee5077cb1846821 WHIRLPOOL 24fd958875a23da7208a861bea1b5bf2d89b942ac37d864f3c29753989f513cea0ece0c0cbf1cbb47f761a5cfa4919435470ebb26c725adc313d5ef0fe9f0682
+DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 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_p20160614.ebuild 4418 SHA256 e7ef557d65dcde17857e167cc87bf0b35ee7d093964b2b4d663d4f70a8b30ea1 SHA512 77177aad36984e7bd6122386a03c73744364dd133b9f802a04dcf86352852f3ad6babb95c821b500bee80468edb069cf7fcbc465012bc6fff264e5b326bac693 WHIRLPOOL e37568e6e866c28d778a5ee9b391155706f57351d45d84104a8522035d7da01c12e9d7e8f63a7df4dff86123fd8159bc408ff17a6c4877a670dd15b78becc8e6
@@ -58,4 +59,5 @@ EBUILD netbeans-php-9999_p20160708.ebuild 4418 SHA256 52e95d73d12640c2129c966a30
 EBUILD netbeans-php-9999_p20160709.ebuild 4418 SHA256 32615a1e55939e861f7450d7bf439aa2610af312a901f70be0fd3281078cc0c8 SHA512 08d5fe403cdb55f5e0195c489f8f38168807c2cfe2c5099576d6bc3168eeb9b9bbeb3c7ab70efbd0c959cc25897ffbb6bc8347a4c6043df9fbc0068b95f75e19 WHIRLPOOL 593eec0d07c4a4315b6f623be19cfe4fa517f9dc6bf92a609313d7b5cd9697fdae7835b0e3a831e2470e83fc9f9ec3d54462550db68b9981f15d665bdbaafc6e
 EBUILD netbeans-php-9999_p20160711.ebuild 4418 SHA256 5474ef3a0e0d0e39fb122aafc49a731b8cc5b09c28b1b125686682c98251ada7 SHA512 9ab5dd7c33b7869f3a298b06ff9accfa50f5269bf9f4167eaa70ac0ba42c5b3735cbdc4e2686d05108908f166597f02be3be69927565e1433623a442a06bd97a WHIRLPOOL 65986488565ac9ddb5c9813405ea938d39d71ae89e5f519c0a1226d35f94d777841d573f93f3db63c837f6b5b37e6d7158a42194e1207b28bcfd005788721afc
 EBUILD netbeans-php-9999_p20160712.ebuild 4418 SHA256 9e3905f62ef3860be0aff89a7f96ef069db27899053ce22e46c2f9de666f3697 SHA512 dfb281de24b80694bf612f7da1f7d1e48763151d00ae9ceb227b9b621f860b79908000b166becd96f6e5cee475e88094d33e4a47a90f790ef4ebcd36048679a2 WHIRLPOOL b2f7de1c0c3a5d1ceb2047d42c9a01226d7866629d0a46906cb0efea86cffcc1488c15b833e036a384d5493a8edd6ba3d55c4803260406d57717194817102709
+EBUILD netbeans-php-9999_p20160714.ebuild 4418 SHA256 151fa7bd00a9fc0da71e1af780e3469234755cc55a9dc29fa6fd59f8eaf73399 SHA512 9e9a74d11c6275ee14a56be85f4caf6d7f5f3651bd46563bff27d6feffa3dbd378db7430694e6550a14b2cbac0069dd03d8e5bf88c1f734a1b1286ade9aa6366 WHIRLPOOL 3cb2690a7ae699252cc9c51794ffa3d287486945034150b55f1ced736eab63f74d19d9855cd7ac4d7bf49d51f785e2a6eb1578250a3802c6ec4fd167ffe7539f
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160714.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160714.ebuild
new file mode 100644
index 0000000..f309b98
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20160714.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-14_00-02-33/zip/netbeans-trunk-nightly-201607140002-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 4215f24..7fd56eb 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -53,6 +53,7 @@ DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
 DIST netbeans-trunk-nightly-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f07ffe990b3f8c5bdcefe7279f17a100fb3b184dabe6b5a9baed SHA512 ec01e8bb2fde13c2381c50417e3d4a1fee51aef86df1dc2806737a1cf69af0a65b11dad723dc8449b0034130e833cf33709dd401917b4e3beee5077cb1846821 WHIRLPOOL 24fd958875a23da7208a861bea1b5bf2d89b942ac37d864f3c29753989f513cea0ece0c0cbf1cbb47f761a5cfa4919435470ebb26c725adc313d5ef0fe9f0682
+DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 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_p20160614.ebuild 9520 SHA256 34c12f5c7aa190b190167e66abd35129889b96aeb20bac129d928376fd779d52 SHA512 beb785b098ee1d071e04100149652b597035da0ed399d42221e9a1c3cd9685b2235d2e981bc483b7adb436fefdbab0c5ba82440ce5afdad5d2f6e5551c1b1547 WHIRLPOOL b070f13d5e28fdb2efccbfbc38910ddb210a63e029cb746e6e3e0832157bcec51d12f2a7ddcfee0479c9f8dc35ee2c6edd86c5f2f911cd58cb0fad170628578c
@@ -79,4 +80,5 @@ EBUILD netbeans-platform-9999_p20160708.ebuild 9520 SHA256 387e0f5ac3e3b121d211f
 EBUILD netbeans-platform-9999_p20160709.ebuild 9520 SHA256 8934d4601805c8eab3fe092db99bd950c28f9c7b2258236bd75c5e7d026f49a2 SHA512 82c1f72b9749c178e797993a6f722b5a152fe728facf1055bf0e83b23b7aea763fba06a7af64e16acdeef6d0b551c4c2e1cb843ecc95179b05cfb7246783000a WHIRLPOOL f5629dd9b9ed7e17a5230c0dc485c3a205470aad38a887d4afc6b40b87bf159dbe2a37171cbc6fc00c02a8fb07816164dcf44fa4dfd71ef09beea1d26cac8d96
 EBUILD netbeans-platform-9999_p20160711.ebuild 9520 SHA256 6f6b4ec6ca0d3c7fb631532aa0f11556f486219e370dc63dbf0a9db12439f2da SHA512 a9419c3d7e7ee450e5fe1fa2f11fbf3a5403f8681c224c357a461cc400c719b07f16562d804124650b071b0fcb1328c422fc03687c4081262891972591360e3c WHIRLPOOL 90c4a1e0a1e871669f3b6d2c50a677b1ba1d8be47823be4742a1ae43f9dcd843c62b3e2a8cda54f35f522c07799cdcbf3c26ec9be85002775218f9df7fe12322
 EBUILD netbeans-platform-9999_p20160712.ebuild 9520 SHA256 7cfcc2b2e2086957cdb698c644ae579da758f6a5566ba9b69ec4ef8660546b05 SHA512 819e910a08de36911d1b02d77989d66dedb12478b9452cfd53d31e4999c0846376524b8597456585a8dd15145cae917614bf3d1d94a792f0e42aa921879b4613 WHIRLPOOL e20a2f539c1011a24aa35ad21b6558110c49cf53d164cd16aac158511f65947c41f2fcbfa2103cc61f85233e26b28b16de87915cf29994228aded12cc903fc89
+EBUILD netbeans-platform-9999_p20160714.ebuild 9520 SHA256 31e86905caca10d6b09b36127348f48524447c67a3c5d90bf2eb98142b63546d SHA512 f44e53ac7f345ad655dd945a63c66b956ef2511ac2abf4bde5607671dae264f282658c403f5e218888e86aa263161ad96a8f3e42c9817d6f7384960d69bc16c3 WHIRLPOOL 72481c75de16731e75b900e9d940754b86b1ae8c4019e89581478d539114d7094e05c0a8516ab069f722bcadf70bd72042a9c5757f6b859e29cab3497b825210
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160714.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160714.ebuild
new file mode 100644
index 0000000..f7884d8
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20160714.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-14_00-02-33/zip/netbeans-trunk-nightly-201607140002-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 8a99313..4821abc 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
 DIST netbeans-trunk-nightly-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f07ffe990b3f8c5bdcefe7279f17a100fb3b184dabe6b5a9baed SHA512 ec01e8bb2fde13c2381c50417e3d4a1fee51aef86df1dc2806737a1cf69af0a65b11dad723dc8449b0034130e833cf33709dd401917b4e3beee5077cb1846821 WHIRLPOOL 24fd958875a23da7208a861bea1b5bf2d89b942ac37d864f3c29753989f513cea0ece0c0cbf1cbb47f761a5cfa4919435470ebb26c725adc313d5ef0fe9f0682
+DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 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_p20160614.ebuild 3472 SHA256 65c683a2ef961b65bfc2599f294282b07fe90feb73e51683b91f789c673f1cec SHA512 8f50dbed2ee3ac960959dfd3c60a2bdcb850df700106ff217300f1b69bd228b1cdaa7d1f2d3f4c4c6105b77baf94e103838aa14886a444df755a92498ee884ba WHIRLPOOL 87092590a879d7d7b85b3d50a01683446f6be47e4c9ebfb5e3bb61ae5d5de9787464be90ba0f5f3941dc8544e2a83bf8cc1f87d63de89394def145d3751f6940
@@ -53,4 +54,5 @@ EBUILD netbeans-profiler-9999_p20160708.ebuild 3472 SHA256 0fb3054a7b8bd193b1acb
 EBUILD netbeans-profiler-9999_p20160709.ebuild 3472 SHA256 d69d67eb9e9f7c0d20d3bdedabd40de22e7bf5c220f7bbc74e6b4ca31cd1e048 SHA512 b8caa9583114b2d59d4238cc98f9af81017c6c00a3316af6d60619b7d6d2bdb83195d2aa9f38c0bb9788da86c99ef37d4726dbbfa396d964586cff149ffe2073 WHIRLPOOL cce43f65fa394b23efce5cfc270c759c91a17e767411f69b5cc800ec38d313b732802577bb2052ca4263784f1f249ae0b6b7e121e8e923d19fffc38e91d33900
 EBUILD netbeans-profiler-9999_p20160711.ebuild 3472 SHA256 77cf2cb6948a3350bc5c4816cd215ec85c8b8295bd663b271b5de0d3b873d1e4 SHA512 6779b941453292904e7c80e9f297d6faf034a1cc29ed0ee84860b567990e0c6b000602b1e5f1bfd0b923e2b780c3d14c4e2f786187454234a85b37dedd4fd37e WHIRLPOOL 08be3bfc8aaa71c037cfe784e1a6061f04cac329564daefcbd0428ee54b3ad6a80e5a09c4a6e254990df66bcf2934c56e35dd03ec525cd58ab64190a68780c4a
 EBUILD netbeans-profiler-9999_p20160712.ebuild 3472 SHA256 a66b34f5f6cb6d1097d4da7fd61709268323940eea64fb2bf3c154085cd9e7d4 SHA512 4d9f6d9ac919aba70e245afcaf061b22b4a24b9c4e040886f0b30c7f383537c73297ab5716a49514415ee890321bcc5a712b915da5d1ce8893573a9b2e39e4e1 WHIRLPOOL aca83edd85d1b429b6e325804074702d041976a151035a96a1eeef3870156fdf15c1b9ed8bea5364405dfe9278380ede89815fcd42fe8d529e4405fb410bf64b
+EBUILD netbeans-profiler-9999_p20160714.ebuild 3472 SHA256 1dfed7f18bdc70763ec83b1470ed7d5b0e0993b31ef59b60ed19481f57e6ef77 SHA512 e7cb4e0ffa5bdccc14b617dd1642bdaf133a276ea04612540de8c9a179091a873cbf2399367fc8508fc40e102a86df711088902fa231866e77b6002db175487f WHIRLPOOL de5812b4ed794c0b0b63cf212f247e3a3627fadd7727dc752330ab5b265ba1c9bd508bdf92c57046b657ccd5a9d6208d65651a25bff96a659dcf0b38e0962c4f
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160714.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160714.ebuild
new file mode 100644
index 0000000..ffb6b72
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160714.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-14_00-02-33/zip/netbeans-trunk-nightly-201607140002-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 f1596d5..e013a72 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -51,6 +51,7 @@ DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
 DIST netbeans-trunk-nightly-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f07ffe990b3f8c5bdcefe7279f17a100fb3b184dabe6b5a9baed SHA512 ec01e8bb2fde13c2381c50417e3d4a1fee51aef86df1dc2806737a1cf69af0a65b11dad723dc8449b0034130e833cf33709dd401917b4e3beee5077cb1846821 WHIRLPOOL 24fd958875a23da7208a861bea1b5bf2d89b942ac37d864f3c29753989f513cea0ece0c0cbf1cbb47f761a5cfa4919435470ebb26c725adc313d5ef0fe9f0682
+DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 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_p20160614.ebuild 5343 SHA256 fa14ab0bdff82d49cdc43b56e9be63884e409653e63863a09643683f92728e69 SHA512 70eac3c9ada4f71141995b3bd9d45406f501209f78e3122d9a28945f58d1d6c94596799859773c14d2330b99b80d2ae00162fed2b1d97eb75a9d37bbdd571160 WHIRLPOOL 54c802c71a488301d00830f372314b8cd856110d5bf9be28c83ff5fddf1c92e9c23cbe936777cf5b50ba0e566e12b3abfa5a63a53b0dc993c5bbfeabf16389ae
@@ -77,4 +78,5 @@ EBUILD netbeans-webcommon-9999_p20160708.ebuild 6242 SHA256 ab29a43b40734792e4a8
 EBUILD netbeans-webcommon-9999_p20160709.ebuild 6242 SHA256 65404d4f1626d6cca2ad19b4f276a4dfce53d7a03c32392d6d50e14141e57479 SHA512 40be70f00856a532ca4b94b3aacc68a2ee476efe39b3ebea649dddee6c5e11c90c8bfc81d03c2fee2e4c33c27cb3fa9d8851f19bc4d6d9c790c78bd0a596c794 WHIRLPOOL eb5d30a19f9718d551adadecce2e081a1e6ca272a662a67c7b9364bc74ded74591ff7cb1c191555f080d759fa5ef1262a86e9f0277fa8d57144ca5169ef9a51b
 EBUILD netbeans-webcommon-9999_p20160711.ebuild 6242 SHA256 cc24a6be2c157a3089d860b8815433967aada686660e1b5f6f47ffc38d6038f5 SHA512 6b9ec6faff6dddeb4510b393595bbdf2875099736711e1da1a55f70a85c5e07613081a8ddd302eab527f5fe95bbeff7450189a9a81d3e4639599cb5ab86e45a1 WHIRLPOOL cb6124dd5a9928dd2709004f4d5846eff6937520a09284ab2421ec383b793e778e5d921f04826a70885be429d951a5786d128ffc45dfcd468bf705324ee4500f
 EBUILD netbeans-webcommon-9999_p20160712.ebuild 6242 SHA256 3fb03a8463284271659640030a3c2d0622f23989c5aa2337f848497bf6d170d4 SHA512 13bf8f6bc672cf1ed4c54e82eff713587abc3f40f56229edf02fef1bd471bbc8b60c434396344ad1af68dfe32b7dfc29acfb6b7778c895af0c4669b33c3a4263 WHIRLPOOL f5be2abb1bbe959d0c93947362b7a81e2f16384ede41cd429e893b3cecb0a178d04f9bd9d4175ee4815ecc05828330d324471632d6c10758d30f110101db3511
+EBUILD netbeans-webcommon-9999_p20160714.ebuild 6242 SHA256 3418a62049f63b85ad79e5e2357168d735929ff4653368d519293a6ab0230611 SHA512 29bb9f84ae57687286d461fee7716f50b0180f2db560d97a9e9d9b509a2b82f8d0cf8cfe0dc34db91db42880e1985ddd9bed76cf12d840925ce69e4b917c919a WHIRLPOOL 92e3b0bfd97b14b4de071e9a8b3f54d6b93701a48e6290851071fd81c2fd488c2354a9ac3bfa282fac088e0775794e21040429cd6a29fdf62343e5a6804bcd60
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160714.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160714.ebuild
new file mode 100644
index 0000000..d67ff72
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160714.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-14_00-02-33/zip/netbeans-trunk-nightly-201607140002-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 f07856a..001799f 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
 DIST netbeans-trunk-nightly-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f07ffe990b3f8c5bdcefe7279f17a100fb3b184dabe6b5a9baed SHA512 ec01e8bb2fde13c2381c50417e3d4a1fee51aef86df1dc2806737a1cf69af0a65b11dad723dc8449b0034130e833cf33709dd401917b4e3beee5077cb1846821 WHIRLPOOL 24fd958875a23da7208a861bea1b5bf2d89b942ac37d864f3c29753989f513cea0ece0c0cbf1cbb47f761a5cfa4919435470ebb26c725adc313d5ef0fe9f0682
+DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 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_p20160614.ebuild 2721 SHA256 43c6c3327630f57e63eb4f8467ffd7471564c361db7efd919880eabfa4c36c55 SHA512 9f7a1df1b4db9a3bb9a596f4b39271d8f67d0946daf66c2202c2eb2c938ad75522aacb22f0fc4e7e663187c76d7fe8e104abb573234543f9ef6d742ff775f40f WHIRLPOOL 697a9ae0f0bd427cb98d7df3f59c896f42fde5c8bfaa0fc1202a0a0aaffa8baf8ca2dbc1eb9bd8dc49085233c0c2408b922cbfc9e776cd1e5293416dcaa3c6ef
@@ -53,4 +54,5 @@ EBUILD netbeans-websvccommon-9999_p20160708.ebuild 2721 SHA256 11c273062c2f0b5dc
 EBUILD netbeans-websvccommon-9999_p20160709.ebuild 2721 SHA256 493341c91a0cebf30bd5f4c1dd1ce1345ba5fcfdb347b125fa087c7c2fb9a2f3 SHA512 d9da4bac81a7efee20c9b27544b8423c497c618bdf8668223ac35388b274f5e6f2cde595de910a893aa28ae989f9b1ebe8e16ea700b19f81ea2c5fbfdfb27153 WHIRLPOOL fa6e93d055cb34b7e176e70b1e8115ad3258a35df58889150e0c3f70e1be00ab0d3dbd57a8f52f2614d366ae546bf48e06ddc0ed168c9af91f700ba4b2364d5c
 EBUILD netbeans-websvccommon-9999_p20160711.ebuild 2721 SHA256 cea1ff09427eee21f47d9937481aaebb047ea8c547cebdf37d7afc58b792db3d SHA512 2566a73ffe720f414cb3d37c5511517c3d43dccf2b9f3411d5f09b2fb55f4d1e66413110dc0d847c63381bd855eae33068e1bd0baf9bc3c2f9e17938fafa4f42 WHIRLPOOL 34ff368c84c9565d8906ec7aee6ac32b34d9a3a4b6440554c5519558f9d1164bd771b772bfbb36e7906a33863194c4041e9da63f56080e59e58d20c88703b576
 EBUILD netbeans-websvccommon-9999_p20160712.ebuild 2721 SHA256 254fa6d0c415ecaa4225c8832b97458847c241e604d5599ede133291c043a57e SHA512 56d4368e49b1a7f0ec241703257b271382ceba0f05544d2842169aaf2616445a70fb2150ad6a76e4a2b925869b06ffe680184a6ab8a1858b3651ad23219c23da WHIRLPOOL 9a96f652fc457c48fe58cfa4b83804a7a02eb457e32475fb7537a61056bd880bc58b4d41909892b240b8c1cd41d009dfcb0ee0499ed0e632576c407e93cda73d
+EBUILD netbeans-websvccommon-9999_p20160714.ebuild 2721 SHA256 a2779614839fbc7f3f990cb2d3b5b5c32d6598325c38a0bbab24ec2b6ec3af28 SHA512 0e30cc9ca5cb167597eb924712280d3d0fec53fe681d66aa1488097332cf41715a0a68a6ba15db9093e16091d261d68db9fad598da7d6f4244e69b06042dda01 WHIRLPOOL ffe86291db3ad1ffbcfbfd000853127f5ba82030fd865d5036d1955ab5e74e365be28c65cfe1b96bf92af58b7500833e95e62912e613911211b75e537fdb267f
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160714.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160714.ebuild
new file mode 100644
index 0000000..95c94de
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160714.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-14_00-02-33/zip/netbeans-trunk-nightly-201607140002-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 8de4ec8..b08dc02 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201607080002-src.zip 216525634 SHA256 61d954445d82a6
 DIST netbeans-trunk-nightly-201607090002-src.zip 216526739 SHA256 f2d675b0be41c05b80fdde2070057cbe0caa52925b78f796edbadf06fe1a0219 SHA512 8a973d3c81e4c04da60a3b48639299babe9050a96a19e77baa5088fdc396c94ede1e488ad19fe92e0c3cb8257d79969b99a6cc431f3cef7589a160834b8f3652 WHIRLPOOL 1b489bbf509efa6b1ab517757e25ee071d1d17fddbb6bcd9d631e777ff14478953e949246c440ba2fc9cef34b309384cabe4a73f80e1ad929843577ae0d6cf1c
 DIST netbeans-trunk-nightly-201607110002-src.zip 216526739 SHA256 594e8e4b4181a126fa5a5e9273a6e44c7e94d3be433360f41c86b3b642dc0f3d SHA512 5602d72680d343a84dc4748cf011d412eec64ef52569ab1375ee3551cbd122aafd5ce4c9849ac920a3f3c3dd9afb6abf76457d1a4af3e067c825b8310c709c70 WHIRLPOOL 1effc4fa4cbb82c99091bbd9f88a469025382e7323bab5efe73921c4931ba5f60db9296f04ff5c2da6b8cea02bdb6e3c587866eddf14bbbc53450cd6fd0be0ec
 DIST netbeans-trunk-nightly-201607120002-src.zip 216529223 SHA256 70468a8a4177f07ffe990b3f8c5bdcefe7279f17a100fb3b184dabe6b5a9baed SHA512 ec01e8bb2fde13c2381c50417e3d4a1fee51aef86df1dc2806737a1cf69af0a65b11dad723dc8449b0034130e833cf33709dd401917b4e3beee5077cb1846821 WHIRLPOOL 24fd958875a23da7208a861bea1b5bf2d89b942ac37d864f3c29753989f513cea0ece0c0cbf1cbb47f761a5cfa4919435470ebb26c725adc313d5ef0fe9f0682
+DIST netbeans-trunk-nightly-201607140002-src.zip 216542850 SHA256 92e15874de4105cb8ef705c99f33b0e93a169e6d49969bb261ff3e0f5cbc64b6 SHA512 f483907272dc88543750850c0fa418fb1ab0c60d11adccf4c8e534aaf5acf38ca52449aeccf6f3c39c2952b048afa82138fe4e8adccbbb43ef6a101881d9f804 WHIRLPOOL 33c526dff18c08cbcd1fb5ecb4f380b05a76cf70c38acb9f6fcc244c1d1c3c6881a475da1d3a8377f06ec59e23c3ffaafba8ace1bd319b151df30a966c8cb290
 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_p20160614.ebuild 6939 SHA256 cb99d4d210d9182f615ea6efccfa8d1f554819868d90546b2cb6b63943d18f07 SHA512 750df96437c696707693d497459d78be7a17612a9ce6a05101c89c1fc22e1c0f10e9873365927752d4c176c6afbee3bf23831c4fd2d9756d7e7b16e2a7b1ad34 WHIRLPOOL 2988a435623d33ad4556ba94fc0d20f2c0b58d07209527e8f7a19cc803d5d564bac16377046f2232e712ffe514b26467ffbb3a9a0998176dfedeee05cfb9e33a
@@ -56,4 +57,5 @@ EBUILD netbeans-9999_p20160708.ebuild 6939 SHA256 a59a0c4ae6651352cd4a8c4f57552d
 EBUILD netbeans-9999_p20160709.ebuild 6939 SHA256 db83b4c223721b239016d7b341968fe390291fe4824ee9345acbbdecf1f379b0 SHA512 cf6083ea94225af798084f8916fad5a831900d20e5c0256e803d02b0efbce97e22a408ac37132114e7851a46c7246041a808e1d31a141ca103279b8d90fee5b3 WHIRLPOOL 159876be31c88427f5003209d8218d6ed8627d967a4e3444d01d0bba686f019bc6ea4b8211b6c3f37c0e6b1c0aeb4a08811fcb6f3e517b6bb4bf5b37ffe3bc50
 EBUILD netbeans-9999_p20160711.ebuild 6939 SHA256 3984c53de0a417dc679d6decea66fc1ba65fa7e21a15aca4151787a1108d7bc7 SHA512 92d5f2dec966fd5abe9c028266a7fe1e14e90cb9f3f18e4b5d2f3615b101e9f6e29bd2c202f8e771ce9a46f06d7a62cdd9d54fe6992e3447a4dcd0247806aaa6 WHIRLPOOL 3e53745cae04d951d4993f52663e21f57b74f909232b3cf4f1448963aa2662891c525719aa61965fe40a435a609cebdd9273eaae6c37ee84103861318ba88cb2
 EBUILD netbeans-9999_p20160712.ebuild 6939 SHA256 4161f911f67da50af615e89e97c49aef15d89e23f3628bb1162ef4e547bda95a SHA512 18ca9d825f6756ed4b9721327a10135aca49346f1a288b2ad7d7203465c5be92de3a6f2320d74bde520bc5809b3a521955e99b71b389fbf96ef90a84474bd3de WHIRLPOOL 4c43c67dc6adecfb24a73173e0130f3026f09d34ee04af389273f961bc09816fd956ac421b453807593327605b1c99235f9977d56e10cbf090bff6aeaf11cecf
+EBUILD netbeans-9999_p20160714.ebuild 6939 SHA256 e5311bfc054c29ee55e8b47aca99541782178147ebe0d04ef84fcc7ae3939c7c SHA512 c04c20a9f6b319bc308e44665e1bdaff83344dba33efadc0c345c67e5867257a6d566ea933cf234c26cefe4a1b65f819799f537ceea617017940b4a284b4eac7 WHIRLPOOL 2426e16425125679933140033b89770cb1fbc2fa3fafc133385d024ccfa81fd6e4ebed299cd32933a5128cbcea27662780964fe6f2f60664017085530273b545
 MISC metadata.xml 329 SHA256 8aeaf2a0228f15c2e4140f401b30f083509bd99d0a578873069f3595cd8555f3 SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640 WHIRLPOOL 799a9b79b1b447bda9631f67e2dfaf722376740e1d2037796528a05f9745eeed00d9990a74a65ce09f74bc5e1d60a887abde540c3c62487d7dd49b8377c15834

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


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-07-14  8:36 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-07  9:26 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-extide/, dev-java/netbeans-dlight/, dev-java/netbeans-javafx/, Miroslav Šulc
  -- strict thread matches above, loose matches on Subject: below --
2016-07-14  8:36 Miroslav Šulc

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