[gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-ide/, dev-java/netbeans-javadoc/, dev-java/netbeans-dlight/, ...

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

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-ide/, dev-java/netbeans-javadoc/, dev-java/netbeans-dlight/, ...
@ 2016-05-20 12:00 Miroslav Šulc
  0 siblings, 0 replies; only message in thread
From: Miroslav Šulc @ 2016-05-20 12:00 UTC (permalink / raw
  To: gentoo-commits

commit:     1ccdc3c852144eb3d3c9c41a7fa43e9921f0af60
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri May 20 11:58:42 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri May 20 11:58:42 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=1ccdc3c8

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.3.0_rc1

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index fc5042f..7655c1b 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -21,6 +21,7 @@ DIST netbeans-trunk-nightly-201605120002-src.zip 213555263 SHA256 1e380aed9fbcb8
 DIST netbeans-trunk-nightly-201605160002-src.zip 213630667 SHA256 25f83a7f00ef6f724fefcabf47271f5673feff423abb70dcd3015088e66ee7a2 SHA512 3035b9d691f3aeb2f56dd648c04a61f8d3a45f801b9c26c19dabfffe83772cb8864cec68c8b388156539793bc8fa56744a8c10ed712ab7d85b557dec89de49a3 WHIRLPOOL 852b8ff6694b114e95983e6207ad05d51584ea94dd45ec1a19d3d04ac31a867e5ffc1e543e6fe7d953a50a5107f558ebe1efbdf2ae3171de7afdf81a337cdd2e
 DIST netbeans-trunk-nightly-201605170002-src.zip 213637520 SHA256 c891144c815ab8e898a39e145f7ee91dfa5fa49886bf1e29504ca95a86e3b3fb SHA512 f3d1c66f94d97addf07a12fefd3b3f4464cdbd303dd68f9e39e090f700f8186d0d720e282227f4355fc122dacd61abbb637a414c714823b831891544a39542ea WHIRLPOOL 6bedc152e04a386f55172c64ad43b431f38c3c7a452c24b5d2ee29597d9d677681007d2cf1e4ef30572aaefd34b07d750b2c6e8f41ed1a273cd15887a5544e73
 DIST netbeans-trunk-nightly-201605190002-src.zip 213658063 SHA256 2b6ae5543b3f212bfd32fba437715ef57256dc649e7aa7ec0b9a60abfd692943 SHA512 99990ad9193e39f41a07978ba07eebe0e3e827954adfc07431493180446cbb9044303b6109203b021c5f3e02ca91030727bd5cedb7c7780f76129853e47a28b9 WHIRLPOOL ebd2b3c2b4f97037cb07c81b667c3439467a7f48c4b20d12d6aa1e8797ac2af000be57c085e6f6098fee5863057320aaba3fd88633302423f02636648846eff8
+DIST netbeans-trunk-nightly-201605200002-src.zip 213666723 SHA256 0b2f88f07e8e46157f1a05a1c3b36d14edc2449e4871aee79da50b4d8d3816e9 SHA512 dd6b6756854857e4be6f2b40873f9095d683220d23fadd244a92da68e9e0919ea77e588a69fe8b098fe5845b354406bb439e5c291a5bcde502d8d3556528007e WHIRLPOOL 84a0ed60deaf783b9e9d81a75778cff9b5bf19ba46a931ba73b86b059d1f5b58f60040978c666c597c5eee2450485107b6d499b857d3818751b7253dc463fd43
 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_p20160428.ebuild 3384 SHA256 e866d9fd43d85c959d598d6111e061a3138aea2a9133f516f547a15370086e3a SHA512 cdf600716d69e7b50162f7556e2f70c6cfe9c998c94529be32305cb6bcf732ff568cdb7a3529478c12c72693a8aaa3edd10b2e752f875f6a40ef9599daff9bc1 WHIRLPOOL 5571ecd51924a63326a4759bdd584da6e7c2e5f9b33b7eeea01e4afbd58d6bdf6360e964896112aab5dde57c7b52d136e37e35f35883f3762543afb28a84cd42
@@ -41,4 +42,5 @@ EBUILD netbeans-apisupport-9999_p20160512.ebuild 3384 SHA256 2b0c3217730c8d11579
 EBUILD netbeans-apisupport-9999_p20160516.ebuild 3384 SHA256 8660b88d02074ef981e342f772b96cb1a808c4c5b523b39ae06c3d53fb5540bd SHA512 5a6eafcc852cfdabe9f291221fbabfa3cc6f6ababc7e4f7e97335558b85ae399d4c7935492f16e9415141565f958e9684434e261b2084a97f6fd1c21ce2d6ded WHIRLPOOL e2cee94b58496ba76c6a274e64a05116efd2797cb03fa5b42174b1f3294bc7a57128ffef115fac87e19a7620e68bbd3b8ce6ecafdcc1e3d26db70898f5e16ffc
 EBUILD netbeans-apisupport-9999_p20160517.ebuild 3384 SHA256 12613ce11dcd9f367cdf4795801f31cbc8c52830b0ef0995cd47916efef1fbd6 SHA512 06a1fb5ba55d29d796f1c4194cd7860e88826df6df6eb5510c66c72e97b004060b7635b45b04aabb51172e272ce65c2d2710a884931c4202270ea500bcfaf58c WHIRLPOOL 67d437f08e03cf96eaaa010a53263cac891a4d70e77fe8163e47160993e762e6d85840c501e679195b73b536f9368a3fa6f79fd5d303011bbf9d29f4f4d82bf2
 EBUILD netbeans-apisupport-9999_p20160519.ebuild 3384 SHA256 90000e5a2f6eeefa4ea55ee337d49bb047dd93ce6412ef6929354469993861f8 SHA512 8953404b069bc9e80c2c4bf9052798469fc607c00a23ad6421039834b897609d06dcbfce90a76d1828a8363ef8e47ca8ffe54ea1bc7e81f75c20357a4b7ad643 WHIRLPOOL 726e91e8d991604f30352033f9017833730167c5a40b00421d8d2a6749f96799c108e736ca6a08dd73a6c55bf765cc7651055539cf8ca9be5a4f71e509b18bfd
+EBUILD netbeans-apisupport-9999_p20160520.ebuild 3384 SHA256 34005593cbfb3b9d88bcd8165a079e384025dbf95fa88dc136d7279d3615aaf3 SHA512 c4cb89d4d2a628f2bcfbff360cd79883a2e9ef33009050a0abf5917d437d549e897a6f1fb2b32d158174f68e3e3f9b3f7a139cc1f66d9f0fe0c1ca8d09f84e4e WHIRLPOOL 1815d90efa0aedf7fc1ba6a934dfbb5faff957c01ce1f6c781424509aec5a3e5d30ea69e69c5699b9d2fa909310793b38e20fa59fe98e7484526998688914a0a
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160520.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160520.ebuild
new file mode 100644
index 0000000..9993350
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160520.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-05-20_00-02-33/zip/netbeans-trunk-nightly-201605200002-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 929789a..773357d 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201605120002-src.zip 213555263 SHA256 1e380aed9fbcb8
 DIST netbeans-trunk-nightly-201605160002-src.zip 213630667 SHA256 25f83a7f00ef6f724fefcabf47271f5673feff423abb70dcd3015088e66ee7a2 SHA512 3035b9d691f3aeb2f56dd648c04a61f8d3a45f801b9c26c19dabfffe83772cb8864cec68c8b388156539793bc8fa56744a8c10ed712ab7d85b557dec89de49a3 WHIRLPOOL 852b8ff6694b114e95983e6207ad05d51584ea94dd45ec1a19d3d04ac31a867e5ffc1e543e6fe7d953a50a5107f558ebe1efbdf2ae3171de7afdf81a337cdd2e
 DIST netbeans-trunk-nightly-201605170002-src.zip 213637520 SHA256 c891144c815ab8e898a39e145f7ee91dfa5fa49886bf1e29504ca95a86e3b3fb SHA512 f3d1c66f94d97addf07a12fefd3b3f4464cdbd303dd68f9e39e090f700f8186d0d720e282227f4355fc122dacd61abbb637a414c714823b831891544a39542ea WHIRLPOOL 6bedc152e04a386f55172c64ad43b431f38c3c7a452c24b5d2ee29597d9d677681007d2cf1e4ef30572aaefd34b07d750b2c6e8f41ed1a273cd15887a5544e73
 DIST netbeans-trunk-nightly-201605190002-src.zip 213658063 SHA256 2b6ae5543b3f212bfd32fba437715ef57256dc649e7aa7ec0b9a60abfd692943 SHA512 99990ad9193e39f41a07978ba07eebe0e3e827954adfc07431493180446cbb9044303b6109203b021c5f3e02ca91030727bd5cedb7c7780f76129853e47a28b9 WHIRLPOOL ebd2b3c2b4f97037cb07c81b667c3439467a7f48c4b20d12d6aa1e8797ac2af000be57c085e6f6098fee5863057320aaba3fd88633302423f02636648846eff8
+DIST netbeans-trunk-nightly-201605200002-src.zip 213666723 SHA256 0b2f88f07e8e46157f1a05a1c3b36d14edc2449e4871aee79da50b4d8d3816e9 SHA512 dd6b6756854857e4be6f2b40873f9095d683220d23fadd244a92da68e9e0919ea77e588a69fe8b098fe5845b354406bb439e5c291a5bcde502d8d3556528007e WHIRLPOOL 84a0ed60deaf783b9e9d81a75778cff9b5bf19ba46a931ba73b86b059d1f5b58f60040978c666c597c5eee2450485107b6d499b857d3818751b7253dc463fd43
 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_p20160428.ebuild 4790 SHA256 af153a0e0435678331a5a5a43c3f393786a0f804dedbc7fbccc3b539cea583bf SHA512 cae08e9b98753c358da559fdf3387c860fd8ba8a4dd5d787f843b4cfe8f1aacf9bb1d57be5b7e52849abcfcc219262b8bcc338a6ff05451aefd2e434a4d86eee WHIRLPOOL bfaf9faa4bbed952d542ec45d51daa200bb307a922889ad6b586fec4f3386ca995ca1dac974e789a072abb4d69b58ae7c0056086966329af07244a23c0924370
@@ -54,4 +55,5 @@ EBUILD netbeans-cnd-9999_p20160512.ebuild 4790 SHA256 59f0c27e7f300f41f0c4426f77
 EBUILD netbeans-cnd-9999_p20160516.ebuild 4790 SHA256 6bc6e3ee8c4284c7dbbcc3e033155733799ee8fc78229a41a8e2cb4fe3aa211c SHA512 876e463b72c8418f5c0c0a8bf17006267a3b7d58cf5cbe38c7c99a7649d973c941c227d890726fd259e32e64cb7f868692a777bff60fa5030dea60a8ed4dc0f6 WHIRLPOOL b3f0bb63e410561e8b3240a534041013d2b830ae5242fae3dba097c7ce7a3f67166d4bcf32cc4cda43164067a29bd95179d43255141e3efdd32882f241620744
 EBUILD netbeans-cnd-9999_p20160517.ebuild 4790 SHA256 762643ef57c5f55c54a51d6e106dc8c48e04c479270d0ee937ca72bd921b93a0 SHA512 9ad7cc5e90c525fed65055dc7ffd71bb1488d806ea6a025f1dc153aad1a8813c86bb9ef3af2f5bc7c6f7b48c4ff013222f63333a94276ccdf98c59211513fd55 WHIRLPOOL 4239862fc3d471fb9ccbdfcbe36a5c5d98b51765e466bc60f564c7aa3aa65b2e486d7003462300c3a6796c5f02103cf5da9487bc38dec2f65fb988cd50cbf680
 EBUILD netbeans-cnd-9999_p20160519.ebuild 4790 SHA256 e2a672de5b157a3ab126cc42fd59bfa56703888a0959fbfa7908650357f4f2fc SHA512 6c6956066ee4d0872f0b3dd531ae5dc98b2449a387eba1110fb11313b93f977aa80cb85bf8a9a2decdf468003780d5627c34d21f6a24ec2c5bccfa9c5f2d51b0 WHIRLPOOL 5f15749e2dac09c830dca6a9c68ab000f00ebd2d3d3319e62469ac8f801c76508eed678383c07f669032d8b5419a59147998cf476d4d3ce14885e5bef01161de
+EBUILD netbeans-cnd-9999_p20160520.ebuild 4790 SHA256 aea56249c25d03dee37790e18489dbd6203b79eba22c6c02281bf964fd9763c7 SHA512 335f02297685262fc2ca73717467e74bc16f8d4b7f9b84a6145cdddafc4fba65f2d3ae9dd138138839e7e0bd102f89890b9ebaeb85a0d78aa150deac739e8a25 WHIRLPOOL 60d6b7f3c37378cafdf4904bfc47e6288e7a3251aee937ab528721414e795424ec9899b6c4eb98d9ba31b47d2bcab8282aeb508380ee7c92f8d8cf7a5d58ff2e
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160520.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160520.ebuild
new file mode 100644
index 0000000..90edee3
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160520.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-05-20_00-02-33/zip/netbeans-trunk-nightly-201605200002-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/85FD13415B0553D6421F4BBA5FE0F587B9748B20-clank_0.3.6.zip
+	http://hg.netbeans.org/binaries/2B406087CE1AF289539768BDF36F52E63F69F1CB-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}"/85FD13415B0553D6421F4BBA5FE0F587B9748B20-clank_0.3.6.zip libs.clank/external/clank_0.3.6.zip || die
+	ln -s "${DISTDIR}"/2B406087CE1AF289539768BDF36F52E63F69F1CB-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 a74b345..b9a2f73 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201605120002-src.zip 213555263 SHA256 1e380aed9fbcb8
 DIST netbeans-trunk-nightly-201605160002-src.zip 213630667 SHA256 25f83a7f00ef6f724fefcabf47271f5673feff423abb70dcd3015088e66ee7a2 SHA512 3035b9d691f3aeb2f56dd648c04a61f8d3a45f801b9c26c19dabfffe83772cb8864cec68c8b388156539793bc8fa56744a8c10ed712ab7d85b557dec89de49a3 WHIRLPOOL 852b8ff6694b114e95983e6207ad05d51584ea94dd45ec1a19d3d04ac31a867e5ffc1e543e6fe7d953a50a5107f558ebe1efbdf2ae3171de7afdf81a337cdd2e
 DIST netbeans-trunk-nightly-201605170002-src.zip 213637520 SHA256 c891144c815ab8e898a39e145f7ee91dfa5fa49886bf1e29504ca95a86e3b3fb SHA512 f3d1c66f94d97addf07a12fefd3b3f4464cdbd303dd68f9e39e090f700f8186d0d720e282227f4355fc122dacd61abbb637a414c714823b831891544a39542ea WHIRLPOOL 6bedc152e04a386f55172c64ad43b431f38c3c7a452c24b5d2ee29597d9d677681007d2cf1e4ef30572aaefd34b07d750b2c6e8f41ed1a273cd15887a5544e73
 DIST netbeans-trunk-nightly-201605190002-src.zip 213658063 SHA256 2b6ae5543b3f212bfd32fba437715ef57256dc649e7aa7ec0b9a60abfd692943 SHA512 99990ad9193e39f41a07978ba07eebe0e3e827954adfc07431493180446cbb9044303b6109203b021c5f3e02ca91030727bd5cedb7c7780f76129853e47a28b9 WHIRLPOOL ebd2b3c2b4f97037cb07c81b667c3439467a7f48c4b20d12d6aa1e8797ac2af000be57c085e6f6098fee5863057320aaba3fd88633302423f02636648846eff8
+DIST netbeans-trunk-nightly-201605200002-src.zip 213666723 SHA256 0b2f88f07e8e46157f1a05a1c3b36d14edc2449e4871aee79da50b4d8d3816e9 SHA512 dd6b6756854857e4be6f2b40873f9095d683220d23fadd244a92da68e9e0919ea77e588a69fe8b098fe5845b354406bb439e5c291a5bcde502d8d3556528007e WHIRLPOOL 84a0ed60deaf783b9e9d81a75778cff9b5bf19ba46a931ba73b86b059d1f5b58f60040978c666c597c5eee2450485107b6d499b857d3818751b7253dc463fd43
 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_p20160428.ebuild 2968 SHA256 a78d9fe846d94ed422c84a3dd06ff9b4eba872d64ffd217817f93f3bface22ba SHA512 c8ba6923704e00c0da015c99217c078e2eb3b548fa80f0a17d6189e94e7781ae57cb5c9a67e3921fb1c4dbba717b73cb0b56542ad247c0ec740578cf981ed78d WHIRLPOOL 6828cb5cd0d0669bf1114d12f86dbc386cb3f49df002501b61bfc518c507882f961ebc63cce7e9d3382961189be71e51ca4acedcbc93c9d7547bcd93b9f36750
@@ -44,4 +45,5 @@ EBUILD netbeans-dlight-9999_p20160512.ebuild 2968 SHA256 2e1f8b8c6464f7eecfb324c
 EBUILD netbeans-dlight-9999_p20160516.ebuild 2968 SHA256 bc322dec3bbe94163c363e2d69d5c1d3be67f2512ec459b677478fb15a496e61 SHA512 c19ff950e71f1456e86071f94f0f09a5aad4cc4caec54547e26d8a3f8713c740221f911e950af900577aca35f4887e9f702f8c489b4d1b7252a3117b9366bce4 WHIRLPOOL 1b45eac4808a5fa24690dd96c4bc7bc1572eb59fac472a38d17aadcc02ccb1eb8f21dd6cb2e744e9f9fce237c607aed472a9c53ac4e018cc9b41e5a0c686ec9b
 EBUILD netbeans-dlight-9999_p20160517.ebuild 2968 SHA256 985bf5a3ed7a80b84cf3bd3b32a1b2f10099d25da7b3803637abcb4c71721871 SHA512 946652882c7b78d79aa44a31e461f5981ffb290456b89ac38cb4db3feb39dee9354f47445b02f0d135500529fa76fa0538c6c2f5049fe8f6bd33695e133af55e WHIRLPOOL e3ac6d2b52211a57b7f3deff39044e5235543a9f6ccc5823625b28718cc80cbd07108e05b3581cc48335703a546630ca91158d1431bcfd76da1bb76bfbe32ae3
 EBUILD netbeans-dlight-9999_p20160519.ebuild 2968 SHA256 a93f4a71adf17b40ce1fd6a980d1d199bee17864982b98005845d03206603c62 SHA512 57ebcf464b5a9721bc0a8c2bb0bb035e65fd171a57c41b594f76e70ecd63117a928c43741466bc4391ced9d8ac61c3139bdae076b79c1ec00d4ce0452df1827b WHIRLPOOL 70d9c4571af85e0437d0237b5d60e2e5f5f2962279b6e797f536e3971cb0308a744c85691fe01e8bade6b16203b354d750166a6ca7ff4490af35bf53f208f969
+EBUILD netbeans-dlight-9999_p20160520.ebuild 2968 SHA256 fcf7b66cfc097ba54c648b5621ec524fdf2db93e25252245ad1925141e6985a5 SHA512 a030403149f5412a56699eff4e06dacc36481a6ae7930dd06eb669196fd6c4e1ade4149f1c03759e3edfbe1a2de58e2a81d0e23ff93eb8462b6203fe37cefc6d WHIRLPOOL 7f5008277ec7ccdec54e69e1bed2eda427a40f4c79fa7d74b7989e4d7f7bf83bec19ed5b1b7baea863df64d03d03a24257448384b29930fcc51da0287c9b1f99
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160520.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160520.ebuild
new file mode 100644
index 0000000..3684007
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160520.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-05-20_00-02-33/zip/netbeans-trunk-nightly-201605200002-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 3fee1d3..848fc47 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -53,6 +53,7 @@ DIST netbeans-trunk-nightly-201605120002-src.zip 213555263 SHA256 1e380aed9fbcb8
 DIST netbeans-trunk-nightly-201605160002-src.zip 213630667 SHA256 25f83a7f00ef6f724fefcabf47271f5673feff423abb70dcd3015088e66ee7a2 SHA512 3035b9d691f3aeb2f56dd648c04a61f8d3a45f801b9c26c19dabfffe83772cb8864cec68c8b388156539793bc8fa56744a8c10ed712ab7d85b557dec89de49a3 WHIRLPOOL 852b8ff6694b114e95983e6207ad05d51584ea94dd45ec1a19d3d04ac31a867e5ffc1e543e6fe7d953a50a5107f558ebe1efbdf2ae3171de7afdf81a337cdd2e
 DIST netbeans-trunk-nightly-201605170002-src.zip 213637520 SHA256 c891144c815ab8e898a39e145f7ee91dfa5fa49886bf1e29504ca95a86e3b3fb SHA512 f3d1c66f94d97addf07a12fefd3b3f4464cdbd303dd68f9e39e090f700f8186d0d720e282227f4355fc122dacd61abbb637a414c714823b831891544a39542ea WHIRLPOOL 6bedc152e04a386f55172c64ad43b431f38c3c7a452c24b5d2ee29597d9d677681007d2cf1e4ef30572aaefd34b07d750b2c6e8f41ed1a273cd15887a5544e73
 DIST netbeans-trunk-nightly-201605190002-src.zip 213658063 SHA256 2b6ae5543b3f212bfd32fba437715ef57256dc649e7aa7ec0b9a60abfd692943 SHA512 99990ad9193e39f41a07978ba07eebe0e3e827954adfc07431493180446cbb9044303b6109203b021c5f3e02ca91030727bd5cedb7c7780f76129853e47a28b9 WHIRLPOOL ebd2b3c2b4f97037cb07c81b667c3439467a7f48c4b20d12d6aa1e8797ac2af000be57c085e6f6098fee5863057320aaba3fd88633302423f02636648846eff8
+DIST netbeans-trunk-nightly-201605200002-src.zip 213666723 SHA256 0b2f88f07e8e46157f1a05a1c3b36d14edc2449e4871aee79da50b4d8d3816e9 SHA512 dd6b6756854857e4be6f2b40873f9095d683220d23fadd244a92da68e9e0919ea77e588a69fe8b098fe5845b354406bb439e5c291a5bcde502d8d3556528007e WHIRLPOOL 84a0ed60deaf783b9e9d81a75778cff9b5bf19ba46a931ba73b86b059d1f5b58f60040978c666c597c5eee2450485107b6d499b857d3818751b7253dc463fd43
 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_p20160428.ebuild 15825 SHA256 d36265c231f1f56c998acc0e6268f1c61be91492a9243785066dbbfc6ff3053f SHA512 c7c3a2ab27a93d457f5f95341b6e740e66ee57dca0998cadb6f97842084a2450669fefb0bf3611c52df23b266bef5004b916e769e2fd6886915705729d79e91f WHIRLPOOL 8e461fad4f405bda6a70b1024fd9ef18b8070deda66b328838cd1eb6b0665727553075222d489c2f657eb286da8c33b48f1de347efd514f28860c8aa397c076c
@@ -73,4 +74,5 @@ EBUILD netbeans-enterprise-9999_p20160512.ebuild 15825 SHA256 9900794f2490b8cf36
 EBUILD netbeans-enterprise-9999_p20160516.ebuild 15825 SHA256 f8f65012a3093ebf8f64255e3ace44ffbc58c06776fdeee91f41191ed391c8a6 SHA512 69e14234a3d9f63ae19b12b772309f400801916f6ae95f5d92dea8f992298c242bb21ec98d5b594e9d60c0038546b2e3d8ff60cc51a2f2ca42598832b6d3bafc WHIRLPOOL 49b2ef486eff8ba717bdfe22c1a3df05f0a5bcef385dd1b0acd196d7701ced2e9dfeb758c3e4b5348557f4e202c1fa9061ec30ef8720f534e2f0eaccd6bcd9fc
 EBUILD netbeans-enterprise-9999_p20160517.ebuild 15825 SHA256 bbded2ffe6177e92d08ac8d69b0f826152d60563869054ff8c2c4efefc7b81ae SHA512 451f61ee406727684615813f44b8ffe278bdec172a206f7ace5d0037be9e06842e1f5742d14c1b32d1f2f9f9797b91295d043c5487b2f57f56a25fce1221f3c9 WHIRLPOOL 99dc3961273efc14a39cf6cdad5f583826b4a57f0e49038fe6be65029b38b57b563df2e4b027c7b0a4e18dc849272a201d730eb426515bab6cdb7e7d71caa2c4
 EBUILD netbeans-enterprise-9999_p20160519.ebuild 15825 SHA256 b3bf6d4c2f299784918ff67ff5bac4c5dbbccd481ff9da37e3d1f0675c81bcc0 SHA512 c950dd3f86e354896343398284cd4106870725141f1f864a64eea3d21139f549df885bc5d26b9726b4ce65e48fc318fac63fb0ad98beb32033356fbc69354147 WHIRLPOOL 7be3c3e0c7e017590408bed0afef0ca006dd3ec18592efc6219f1650f78bfe348e929e63d7cbab06526f8b84eaa9645c8eaada9145bf5f0fb76492520173704b
+EBUILD netbeans-enterprise-9999_p20160520.ebuild 15825 SHA256 0f8e199c137bef252f8bc8d092177153fc0ca93652bd521909826e21a5e60dfc SHA512 f9f941707db9ae3c4359be703edf3f6b41fb3380947201f0976cf9dcf1212f0338a1b7b2a220576119cf2b3de9c90e92ccffce96d0c73d48f24c9f7cdc7b5d45 WHIRLPOOL 1ac1b65a48980aa088f4cd09514b6f5a950654ed0e28eb4cda640b993458023d33be3a8d7d078efec2f88c922a0a773b841af88a214839824954e5f57af2d4f4
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160520.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160520.ebuild
new file mode 100644
index 0000000..45bfd0a
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160520.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-05-20_00-02-33/zip/netbeans-trunk-nightly-201605200002-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 634aa65..75d543c 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -21,6 +21,7 @@ DIST netbeans-trunk-nightly-201605120002-src.zip 213555263 SHA256 1e380aed9fbcb8
 DIST netbeans-trunk-nightly-201605160002-src.zip 213630667 SHA256 25f83a7f00ef6f724fefcabf47271f5673feff423abb70dcd3015088e66ee7a2 SHA512 3035b9d691f3aeb2f56dd648c04a61f8d3a45f801b9c26c19dabfffe83772cb8864cec68c8b388156539793bc8fa56744a8c10ed712ab7d85b557dec89de49a3 WHIRLPOOL 852b8ff6694b114e95983e6207ad05d51584ea94dd45ec1a19d3d04ac31a867e5ffc1e543e6fe7d953a50a5107f558ebe1efbdf2ae3171de7afdf81a337cdd2e
 DIST netbeans-trunk-nightly-201605170002-src.zip 213637520 SHA256 c891144c815ab8e898a39e145f7ee91dfa5fa49886bf1e29504ca95a86e3b3fb SHA512 f3d1c66f94d97addf07a12fefd3b3f4464cdbd303dd68f9e39e090f700f8186d0d720e282227f4355fc122dacd61abbb637a414c714823b831891544a39542ea WHIRLPOOL 6bedc152e04a386f55172c64ad43b431f38c3c7a452c24b5d2ee29597d9d677681007d2cf1e4ef30572aaefd34b07d750b2c6e8f41ed1a273cd15887a5544e73
 DIST netbeans-trunk-nightly-201605190002-src.zip 213658063 SHA256 2b6ae5543b3f212bfd32fba437715ef57256dc649e7aa7ec0b9a60abfd692943 SHA512 99990ad9193e39f41a07978ba07eebe0e3e827954adfc07431493180446cbb9044303b6109203b021c5f3e02ca91030727bd5cedb7c7780f76129853e47a28b9 WHIRLPOOL ebd2b3c2b4f97037cb07c81b667c3439467a7f48c4b20d12d6aa1e8797ac2af000be57c085e6f6098fee5863057320aaba3fd88633302423f02636648846eff8
+DIST netbeans-trunk-nightly-201605200002-src.zip 213666723 SHA256 0b2f88f07e8e46157f1a05a1c3b36d14edc2449e4871aee79da50b4d8d3816e9 SHA512 dd6b6756854857e4be6f2b40873f9095d683220d23fadd244a92da68e9e0919ea77e588a69fe8b098fe5845b354406bb439e5c291a5bcde502d8d3556528007e WHIRLPOOL 84a0ed60deaf783b9e9d81a75778cff9b5bf19ba46a931ba73b86b059d1f5b58f60040978c666c597c5eee2450485107b6d499b857d3818751b7253dc463fd43
 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_p20160428.ebuild 2913 SHA256 03be7f911ef9e0cc84ae0c302552ce8755cfb31022c087e620b214d4becdef0a SHA512 4961338b8b363a36000ab2ee47d567bf8bf7fdd7e10d63c046f9b1d00ea415390e1cfeae5d02d6090afaa5ab45f7c05b1aa3fc071f1c073eaacb288eddad4832 WHIRLPOOL 110c80e66dfd1e0f880f50fbbc8795445dfb62f6c6b7424b0791067b9b28c58979bd7e56f4df31d3da8f86aa33df43529c3d3f1c795ff14424e8530176c7db46
@@ -41,4 +42,5 @@ EBUILD netbeans-ergonomics-9999_p20160512.ebuild 2913 SHA256 5b56d0cb4627c889d14
 EBUILD netbeans-ergonomics-9999_p20160516.ebuild 2913 SHA256 80fcfad629ad2006d23f060158d8f25de4f043a96ccd56bc039f991cca6b99ff SHA512 1c0580a94a0e1fe559557672fa53bb95be82ac45f62dd4fab6d4b09550a7f0d99faf6ab9107333afadfff8c95328dc853bb8c4e525d07a1924bb97f50d8b6fbe WHIRLPOOL 12d0b947fd462084977183a7341713183d48947cf8475179e4d1bfe30c0714ba68281c75d68abece25b46034fda014f3953e89b1769ec7e0dc3e82216eeb8ad8
 EBUILD netbeans-ergonomics-9999_p20160517.ebuild 2913 SHA256 eb6ed0c53a0ce4635ad8f4d1847fb78171c91283747b288e7caa3390569c2fc3 SHA512 c47779e95fa1036375767deab7e0311c21a06ddf217d6f66ba367deba7a38c12a3618c3ad617ab6db63c40bc7e7fda8eda584ebac0bb51499b79adb3773d304b WHIRLPOOL 92808423123672450d3742603e85db474430844762bac5aa5d6f9dd9bc4796ecf91b8f739263a37723ab4fe8604a96bf5bb0c12217e16d17d461be96ddc088db
 EBUILD netbeans-ergonomics-9999_p20160519.ebuild 2913 SHA256 ee161ee6b2f4f1c6b5c034771ddbb1b446adaeb8506ff139c3da612729a3717d SHA512 beee8b4c69c6ff2b052af504f4fc72a059e6d7e981e696a8442cab2306d9a11164634a966db737d205948e399706fc11b87b8de4fb1bf5cd7ae077d560d5e313 WHIRLPOOL bd8754b5d5b0f12cd7a5845b6f1522bb3e21f7a2ff0472ee7f06b963b2b28c17ca22f78d0e3fad3bbb47f9f957d1f67bf1ede61f268e5e2bc6dee94cb3c2d934
+EBUILD netbeans-ergonomics-9999_p20160520.ebuild 2913 SHA256 59572d01bee019afee3119bd3abfa94f5ffd2927720f76ed68ef67ff1851ff4d SHA512 42e005a85fb4b8e8ec00fecb3e4a967c07f922a188dffa24642e2051ac15376db29c5dd9f67c41eb228284c7522f90acf2451d0c85fae4b4e65373998c94de7a WHIRLPOOL 7fd9aea7e48ffee6e57ca2918ba219cf067ef20fe58a7b233aaaba50bf0a6052745894cbc1a58277a38b9bce4d7aeb7ccbee8df38a082efc4413dfe6c4797ac5
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160520.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160520.ebuild
new file mode 100644
index 0000000..398db3a
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160520.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-05-20_00-02-33/zip/netbeans-trunk-nightly-201605200002-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 79b8372..69b0160 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201605120002-src.zip 213555263 SHA256 1e380aed9fbcb8
 DIST netbeans-trunk-nightly-201605160002-src.zip 213630667 SHA256 25f83a7f00ef6f724fefcabf47271f5673feff423abb70dcd3015088e66ee7a2 SHA512 3035b9d691f3aeb2f56dd648c04a61f8d3a45f801b9c26c19dabfffe83772cb8864cec68c8b388156539793bc8fa56744a8c10ed712ab7d85b557dec89de49a3 WHIRLPOOL 852b8ff6694b114e95983e6207ad05d51584ea94dd45ec1a19d3d04ac31a867e5ffc1e543e6fe7d953a50a5107f558ebe1efbdf2ae3171de7afdf81a337cdd2e
 DIST netbeans-trunk-nightly-201605170002-src.zip 213637520 SHA256 c891144c815ab8e898a39e145f7ee91dfa5fa49886bf1e29504ca95a86e3b3fb SHA512 f3d1c66f94d97addf07a12fefd3b3f4464cdbd303dd68f9e39e090f700f8186d0d720e282227f4355fc122dacd61abbb637a414c714823b831891544a39542ea WHIRLPOOL 6bedc152e04a386f55172c64ad43b431f38c3c7a452c24b5d2ee29597d9d677681007d2cf1e4ef30572aaefd34b07d750b2c6e8f41ed1a273cd15887a5544e73
 DIST netbeans-trunk-nightly-201605190002-src.zip 213658063 SHA256 2b6ae5543b3f212bfd32fba437715ef57256dc649e7aa7ec0b9a60abfd692943 SHA512 99990ad9193e39f41a07978ba07eebe0e3e827954adfc07431493180446cbb9044303b6109203b021c5f3e02ca91030727bd5cedb7c7780f76129853e47a28b9 WHIRLPOOL ebd2b3c2b4f97037cb07c81b667c3439467a7f48c4b20d12d6aa1e8797ac2af000be57c085e6f6098fee5863057320aaba3fd88633302423f02636648846eff8
+DIST netbeans-trunk-nightly-201605200002-src.zip 213666723 SHA256 0b2f88f07e8e46157f1a05a1c3b36d14edc2449e4871aee79da50b4d8d3816e9 SHA512 dd6b6756854857e4be6f2b40873f9095d683220d23fadd244a92da68e9e0919ea77e588a69fe8b098fe5845b354406bb439e5c291a5bcde502d8d3556528007e WHIRLPOOL 84a0ed60deaf783b9e9d81a75778cff9b5bf19ba46a931ba73b86b059d1f5b58f60040978c666c597c5eee2450485107b6d499b857d3818751b7253dc463fd43
 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_p20160428.ebuild 3377 SHA256 b69e4995f884a7524e29274702b2eb3851dca8a7c74a618d98725fe26f951332 SHA512 c8fc3c04d1fc7b2586bcaa5972b1f40ac94b09097f4ad0333d50e9c494f2b2e131dd504c5a274d0b130b1887e2ace51eecca46f20fab32198a123591e6fde228 WHIRLPOOL d921c10e7a80ac065dea04ff546b5635eb8d251a37cc0d8b7533097cc4fc28683d3a60b1b9bb8459b1abc4878fdb306f07db6d80ca65e92dba9543b32866f412
@@ -45,4 +46,5 @@ EBUILD netbeans-extide-9999_p20160512.ebuild 3377 SHA256 68fa56892839749f67c05eb
 EBUILD netbeans-extide-9999_p20160516.ebuild 3377 SHA256 7d9b6802a141d43b5683abb4ef316ee45ee8c6bd016fe3bfa1d11777fab92a9b SHA512 73d4246b550d87df5478a7a833c4918a90b3f9ab21b21e5a7413d2388aa564aee272ab1c4f55579b782b3454eeea557df91239e4efa3757cd6e07788dccd25f7 WHIRLPOOL 243303342550d66c127c5125bf7ca8c6da5b924fef36519f2e04a9609bdb7d3a816cec9598c4b8f83b8b0010996c4230e041272fa7ae35a5828d29c3bb581858
 EBUILD netbeans-extide-9999_p20160517.ebuild 3377 SHA256 cc825b60a79e4959ed1738149543ae1131a378a6826bb158076142dea3d641dd SHA512 5151e2cb41a91eaeca4bac68d2f81a1217ebad7b7147913cceb9f0d5760c12ac5e55e79e8d561b83a0585b356dfd2574ba54ae0bfb20ed834061cac64777c662 WHIRLPOOL 1c229b7a70ee422f9a306045c9a9e72a9014ffd6f25164d4c795e593d6c5bf632fdb485d637a4243703c778a48dcce8c2e2f97c6c5a8cb1a6cd61dd51cfaf662
 EBUILD netbeans-extide-9999_p20160519.ebuild 3377 SHA256 bbbc8c1d19a9283821c233d79dfcecbee4c8e69aecfd3ca6ea49d32bab9fff7a SHA512 2622f9c010f2827a822452116dfce190412bdb3216e9667656b355e9fe17fda7d01d2abc720e821153666625439f8c36b837b5e24e6299818b0bcf7ceb9cc513 WHIRLPOOL bec016e47bf1ff9eccba0b5db14e1d92236ceb80c96c5d0aac2d39c6200e9ec59227b49e37a8d66c9023d13cdd16df6ed744415f1747efc15a43e86ddfffc132
+EBUILD netbeans-extide-9999_p20160520.ebuild 3377 SHA256 bbf2702b637a6f6e1760c12c0eb0f4953e58e73b35546833603f5c74d4f3bdd1 SHA512 f7d9008d0d4eb9d25b653978ff890120b0d7050aaefb4c92446397d2d2d09ab1142c295e97d87a58590fa680a0d1e72c5657bf77cfc7d37d95b5ea602bbd1095 WHIRLPOOL d1b5aa2316c326ade830b9754a4ac89a874effb811c3e19c19ec6440b53ef0634cd07a250f1db6ed12ed29f5d275322eb39071083a8e5dbc2829dcbc44f41cd5
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160520.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160520.ebuild
new file mode 100644
index 0000000..654fbb8
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20160520.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-05-20_00-02-33/zip/netbeans-trunk-nightly-201605200002-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 c4e8a49..f02aa65 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201605120002-src.zip 213555263 SHA256 1e380aed9fbcb8
 DIST netbeans-trunk-nightly-201605160002-src.zip 213630667 SHA256 25f83a7f00ef6f724fefcabf47271f5673feff423abb70dcd3015088e66ee7a2 SHA512 3035b9d691f3aeb2f56dd648c04a61f8d3a45f801b9c26c19dabfffe83772cb8864cec68c8b388156539793bc8fa56744a8c10ed712ab7d85b557dec89de49a3 WHIRLPOOL 852b8ff6694b114e95983e6207ad05d51584ea94dd45ec1a19d3d04ac31a867e5ffc1e543e6fe7d953a50a5107f558ebe1efbdf2ae3171de7afdf81a337cdd2e
 DIST netbeans-trunk-nightly-201605170002-src.zip 213637520 SHA256 c891144c815ab8e898a39e145f7ee91dfa5fa49886bf1e29504ca95a86e3b3fb SHA512 f3d1c66f94d97addf07a12fefd3b3f4464cdbd303dd68f9e39e090f700f8186d0d720e282227f4355fc122dacd61abbb637a414c714823b831891544a39542ea WHIRLPOOL 6bedc152e04a386f55172c64ad43b431f38c3c7a452c24b5d2ee29597d9d677681007d2cf1e4ef30572aaefd34b07d750b2c6e8f41ed1a273cd15887a5544e73
 DIST netbeans-trunk-nightly-201605190002-src.zip 213658063 SHA256 2b6ae5543b3f212bfd32fba437715ef57256dc649e7aa7ec0b9a60abfd692943 SHA512 99990ad9193e39f41a07978ba07eebe0e3e827954adfc07431493180446cbb9044303b6109203b021c5f3e02ca91030727bd5cedb7c7780f76129853e47a28b9 WHIRLPOOL ebd2b3c2b4f97037cb07c81b667c3439467a7f48c4b20d12d6aa1e8797ac2af000be57c085e6f6098fee5863057320aaba3fd88633302423f02636648846eff8
+DIST netbeans-trunk-nightly-201605200002-src.zip 213666723 SHA256 0b2f88f07e8e46157f1a05a1c3b36d14edc2449e4871aee79da50b4d8d3816e9 SHA512 dd6b6756854857e4be6f2b40873f9095d683220d23fadd244a92da68e9e0919ea77e588a69fe8b098fe5845b354406bb439e5c291a5bcde502d8d3556528007e WHIRLPOOL 84a0ed60deaf783b9e9d81a75778cff9b5bf19ba46a931ba73b86b059d1f5b58f60040978c666c597c5eee2450485107b6d499b857d3818751b7253dc463fd43
 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_p20160428.ebuild 3416 SHA256 e79a68a525a8e7b9929f6099fcd1e18066daf75b72d06556c2fa24ad49c5b998 SHA512 3d2b217ce426091f0f3cbc1f3ea8881fa21c5bb482da2830349d1283ab9192354100b994b1a3ce4cb86265356035b417e1855d3a50e88e13cd41154bfc00c83d WHIRLPOOL 72d71a968c86d7f7033c35b624852e32dfce945c6711a74b30ef71f3f017a6fc9ff1dfce9c57e1c4ccb273f60c7263dc221fcd7a26a0ffd2acaa4b5f44c05450
@@ -43,4 +44,5 @@ EBUILD netbeans-groovy-9999_p20160512.ebuild 3416 SHA256 87b38e24be4f408bb302ada
 EBUILD netbeans-groovy-9999_p20160516.ebuild 3416 SHA256 8a008e7a155abb9779e74b696a84bd2c4263aa1500cd5f0203664a69fd21bd95 SHA512 5e6a819e1501e42710fdc7a95c876fbf17e40a4129bcdb21397325892dc6f5b185344d13fa2a3f7db77413942fd1cd3d24eea312e4cb8c47fe97253a27dd2f38 WHIRLPOOL b20de67410502f531a516501c1e042c0075a0b21c692099b0d97512a41766096ccf9abab15e05e4b5bfd345be89015acdbb816204db42d2e1ef26dffd1e506e9
 EBUILD netbeans-groovy-9999_p20160517.ebuild 3416 SHA256 6512d44376e5f6b91c2d15289b795d42426627506271641b34666894c539f2f8 SHA512 ecb2ee526f5231f3880c200ca2985d478b487bdb9bcd29350f89bea99eb5e82508d15e3c1f75619fb1c273094d3b420af7864610571a06e198493107de689eb5 WHIRLPOOL 9a05cae400c8e4fa2c0493551d133683a77949bf4b385625b238f482069d611a257656b97d819d938e5377b509819caedf30fee1b39b1a001191181f676e6a57
 EBUILD netbeans-groovy-9999_p20160519.ebuild 3416 SHA256 9d7a60f6d3707f3ad9eb11152d1b176d1dfe4321a6f6aa8d008ed9a581d35e3a SHA512 89360fc8c1ca0250b72b5c48883333c2f6168dfd038da473717c92067ed353d8f3f2875db735ee0e74758111444dba30a59410d98ba0d622f4a6784b81f70ddf WHIRLPOOL 20d494a8d7132955e1f6b9ace408bbd00bc32d1afa9a5d3ac68c457dc82afcbf2bb194356859bc886aedd1cbd1cf8c5f3ae229f91ce83da66a6b8b3074ad3535
+EBUILD netbeans-groovy-9999_p20160520.ebuild 3416 SHA256 d2865c4666b4da0d60c55c3dee42ee5b9caae77cdcfc9e285f1a857c5e9cbe69 SHA512 2068872ed96db485ee182c5f67755520a33b0b1c2433fae1c2025a9056e334638e430f5a1015f5cfe7a0b728972c9bf1c3a33ae2ee97167e62cb06a1589383e5 WHIRLPOOL ceb8024c2a78e792d8cccb83a3cd5f0bac8f62f22b9b02eb05afb51eef19eb4e38f7add0589a169034f5bff01104e1b92bac77bee46c4afca4696b4bcd089ad9
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160520.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160520.ebuild
new file mode 100644
index 0000000..5387ba2
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160520.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-05-20_00-02-33/zip/netbeans-trunk-nightly-201605200002-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 25333ee..359143a 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201605120002-src.zip 213555263 SHA256 1e380aed9fbcb8
 DIST netbeans-trunk-nightly-201605160002-src.zip 213630667 SHA256 25f83a7f00ef6f724fefcabf47271f5673feff423abb70dcd3015088e66ee7a2 SHA512 3035b9d691f3aeb2f56dd648c04a61f8d3a45f801b9c26c19dabfffe83772cb8864cec68c8b388156539793bc8fa56744a8c10ed712ab7d85b557dec89de49a3 WHIRLPOOL 852b8ff6694b114e95983e6207ad05d51584ea94dd45ec1a19d3d04ac31a867e5ffc1e543e6fe7d953a50a5107f558ebe1efbdf2ae3171de7afdf81a337cdd2e
 DIST netbeans-trunk-nightly-201605170002-src.zip 213637520 SHA256 c891144c815ab8e898a39e145f7ee91dfa5fa49886bf1e29504ca95a86e3b3fb SHA512 f3d1c66f94d97addf07a12fefd3b3f4464cdbd303dd68f9e39e090f700f8186d0d720e282227f4355fc122dacd61abbb637a414c714823b831891544a39542ea WHIRLPOOL 6bedc152e04a386f55172c64ad43b431f38c3c7a452c24b5d2ee29597d9d677681007d2cf1e4ef30572aaefd34b07d750b2c6e8f41ed1a273cd15887a5544e73
 DIST netbeans-trunk-nightly-201605190002-src.zip 213658063 SHA256 2b6ae5543b3f212bfd32fba437715ef57256dc649e7aa7ec0b9a60abfd692943 SHA512 99990ad9193e39f41a07978ba07eebe0e3e827954adfc07431493180446cbb9044303b6109203b021c5f3e02ca91030727bd5cedb7c7780f76129853e47a28b9 WHIRLPOOL ebd2b3c2b4f97037cb07c81b667c3439467a7f48c4b20d12d6aa1e8797ac2af000be57c085e6f6098fee5863057320aaba3fd88633302423f02636648846eff8
+DIST netbeans-trunk-nightly-201605200002-src.zip 213666723 SHA256 0b2f88f07e8e46157f1a05a1c3b36d14edc2449e4871aee79da50b4d8d3816e9 SHA512 dd6b6756854857e4be6f2b40873f9095d683220d23fadd244a92da68e9e0919ea77e588a69fe8b098fe5845b354406bb439e5c291a5bcde502d8d3556528007e WHIRLPOOL 84a0ed60deaf783b9e9d81a75778cff9b5bf19ba46a931ba73b86b059d1f5b58f60040978c666c597c5eee2450485107b6d499b857d3818751b7253dc463fd43
 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_p20160428.ebuild 4126 SHA256 6fa78ddd6b86962f5c5ddadd1493edf1f6545863f195b3bf390c970a07cb0b30 SHA512 6a9dc57df3f90fc79d5d372454fbabfa86ae4fbe951896018dfc6682663617721e3cbff4e68c051bf22c5d0764840ab2abf993f3754f7d6c27c44fe20125bc2e WHIRLPOOL 81e8cbac2a7fb4b976bdf5c6764f619f3b9130cf3c1d0f9ea80eebf3c58bba95aa61a8e5c10c2d52122a138c58fc51f5ce63fb36a1462e98577e64bed9e8637a
@@ -46,4 +47,5 @@ EBUILD netbeans-harness-9999_p20160512.ebuild 4126 SHA256 d9cbc03076fca4055ed4ed
 EBUILD netbeans-harness-9999_p20160516.ebuild 4126 SHA256 24ebb8a15983c38f7ad2bfceeefeb7634b06e9f00e8e8262e5a563ba8fa2c4f1 SHA512 d4c19c6687c522d68545beffc4711c182b5ee2d2942c61297f872ee237e51be6823a1ceb22cc686987e954a35f11a1fa91905c79c4ad84cf2c358cd71ce2c06b WHIRLPOOL 8f4dfe2f2b0c0dedb24e39595cd02c8b854aa1a201b9fc5059b7bb8bb78e71a61049556eee66963355b1c44a4897a3df06de35c19a2865116c417491483f4d29
 EBUILD netbeans-harness-9999_p20160517.ebuild 4126 SHA256 fc743cc6015724e3a533c071d613ba93c435f058c2583c33994bc298287f11c7 SHA512 c1b4a168a69002387f962fa23125fff132e0cb816285d4226c396113f4d88a67672b0fd7b7b0c5d8856013a5f00df09f37b47793870507d2927fbaaae5f87905 WHIRLPOOL d28bc8165472095d73f01202138a271e4ba9f5084102c2620ae05cd564ddc9f219b312e29d0759fc0fde7b57f91602dc5dd11c7f5b3aeb529bf92760a71041bd
 EBUILD netbeans-harness-9999_p20160519.ebuild 4126 SHA256 ae15ce092c7f8741a13d8b14bfc0b9353d51a010049773bec68a70ae82561515 SHA512 1cad3a0f7a597496e151ac316486e077c58d972bac574f9ac0baa30fbd3027f5a55b1ab5a5abb5c76049c5d139465a2dea32fc4bd62f129e110953ad2197f82a WHIRLPOOL bbd0f93bf8a2fd9ae45bcfacc87fa4b1b9b764d183ef001392df50090c8b87d9ed7a486e2bd98c82d007a2da5132eab3d72d79efacbaf2eac59168434687207b
+EBUILD netbeans-harness-9999_p20160520.ebuild 4126 SHA256 fbdb051711059038d00abd65cd05642ac07d6e6599096baad8b418920226f39e SHA512 7ed4952b2cdc8c938d73d4e1f7faa78ddf276a50b483c294b29b7dce66d521fcabfbd3de8f2949147e6f42ba779b1d007d08a756696106df519dec0608829b7b WHIRLPOOL 6f175c2361008f5558baec7c9f146e80df3a5fc56ff4d8b0cc660c5bb03c3697a509d216a156eb2166101ee81155ed15a21ccc177304bf1348f929e98d421245
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160520.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160520.ebuild
new file mode 100644
index 0000000..ea59a3c
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20160520.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-05-20_00-02-33/zip/netbeans-trunk-nightly-201605200002-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 c1712aa..220cfa2 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -160,6 +160,7 @@ DIST netbeans-trunk-nightly-201605120002-src.zip 213555263 SHA256 1e380aed9fbcb8
 DIST netbeans-trunk-nightly-201605160002-src.zip 213630667 SHA256 25f83a7f00ef6f724fefcabf47271f5673feff423abb70dcd3015088e66ee7a2 SHA512 3035b9d691f3aeb2f56dd648c04a61f8d3a45f801b9c26c19dabfffe83772cb8864cec68c8b388156539793bc8fa56744a8c10ed712ab7d85b557dec89de49a3 WHIRLPOOL 852b8ff6694b114e95983e6207ad05d51584ea94dd45ec1a19d3d04ac31a867e5ffc1e543e6fe7d953a50a5107f558ebe1efbdf2ae3171de7afdf81a337cdd2e
 DIST netbeans-trunk-nightly-201605170002-src.zip 213637520 SHA256 c891144c815ab8e898a39e145f7ee91dfa5fa49886bf1e29504ca95a86e3b3fb SHA512 f3d1c66f94d97addf07a12fefd3b3f4464cdbd303dd68f9e39e090f700f8186d0d720e282227f4355fc122dacd61abbb637a414c714823b831891544a39542ea WHIRLPOOL 6bedc152e04a386f55172c64ad43b431f38c3c7a452c24b5d2ee29597d9d677681007d2cf1e4ef30572aaefd34b07d750b2c6e8f41ed1a273cd15887a5544e73
 DIST netbeans-trunk-nightly-201605190002-src.zip 213658063 SHA256 2b6ae5543b3f212bfd32fba437715ef57256dc649e7aa7ec0b9a60abfd692943 SHA512 99990ad9193e39f41a07978ba07eebe0e3e827954adfc07431493180446cbb9044303b6109203b021c5f3e02ca91030727bd5cedb7c7780f76129853e47a28b9 WHIRLPOOL ebd2b3c2b4f97037cb07c81b667c3439467a7f48c4b20d12d6aa1e8797ac2af000be57c085e6f6098fee5863057320aaba3fd88633302423f02636648846eff8
+DIST netbeans-trunk-nightly-201605200002-src.zip 213666723 SHA256 0b2f88f07e8e46157f1a05a1c3b36d14edc2449e4871aee79da50b4d8d3816e9 SHA512 dd6b6756854857e4be6f2b40873f9095d683220d23fadd244a92da68e9e0919ea77e588a69fe8b098fe5845b354406bb439e5c291a5bcde502d8d3556528007e WHIRLPOOL 84a0ed60deaf783b9e9d81a75778cff9b5bf19ba46a931ba73b86b059d1f5b58f60040978c666c597c5eee2450485107b6d499b857d3818751b7253dc463fd43
 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_p20160428.ebuild 30761 SHA256 d6735e6e8cf412cbfb9dd4a2f0f68f8296b74e03fe87b12150506f7c063f281d SHA512 d3c49f4a00823801049688170c461ebcc5de106f30fa11e232d953a56cf196c946610cbda0216f393c28923efd5017a28d8fc5870d90e98c6a5fd347a400711d WHIRLPOOL ba3d111337fd5e21e3a4e97457c1f00f2b53b0af20991833203c6f68301520853731f63b291d6adc55d6a96b42d52e13e6d65bd6dcf529c39bc40f30d334155a
@@ -180,4 +181,5 @@ EBUILD netbeans-ide-9999_p20160512.ebuild 30761 SHA256 698ac5505f00c244aef9bdeb4
 EBUILD netbeans-ide-9999_p20160516.ebuild 30761 SHA256 8c8e91341db907e7c0e4b2f810f8f292f8088dd61a476ccac39aa5d52062cd39 SHA512 ff288eb0170fde5544f14b8b5978d441bae7705a701eaec131df6ab303b3ccc0199a43037894dfef66c15f729568e7996e2ffca2275f798e7f5bf7640adec1ea WHIRLPOOL 70904a8eb4e478803d15c8ead5f9f13823a062eebca8300a0c96069c2083d8e3a407c8c6c63fc55964007a6e5bd6fc267cd7e740eca451ac545b270f3409cc6e
 EBUILD netbeans-ide-9999_p20160517.ebuild 30761 SHA256 01df3a0d28ec19607fd3e76517d4ea2043baf833246a4fde939cdf317b513f39 SHA512 6b7f7ffa955ac15ad762b9d4f2f7ff8843cd317e138e1e409d002b4ba5962d7ff84b5a620f830bfee080090467b00b21bb97b463d43530552778d868affd51a5 WHIRLPOOL 6612bac6c98d573855b3cfcf06312d13e482f5b6f5ec1d9a4f4b89cfe90752fd73df22026ee737bc7fae55e27822c12d2242dc35fca983c0e121ddef5468941f
 EBUILD netbeans-ide-9999_p20160519.ebuild 30761 SHA256 b69cc0a862c5027fd30739320e9a86d56478e6a51c6136fbaf1e4d0fb18ae7b8 SHA512 5576580d77346fd6d8766a5bcce456392f3a4a19a6f3a1435f9c872e25d865f61db103bf2560b9083d7981e0598890c02a7e65c4cc3a14a7f85d641492f62d25 WHIRLPOOL 6f68616c3fdc4273278208e2f5062efcb32bc6bb94e7bfb0dfef9ffb7898cbab95bfcf7d44d2889c0ab2c9b72bb0c127be47a1adeff06a6e1e8bea12b65be411
+EBUILD netbeans-ide-9999_p20160520.ebuild 30761 SHA256 222957905af8bfdec7a39c30ef4258d060fc44917a6bf274e9213eb5d56d912c SHA512 36f3cd44e14248a2664087137454d1665c4b4487dbe2e6219fac0c949851075fc8508cd072290c7c803d9199986ab3bfcd42a7a5248e899468818640b653efeb WHIRLPOOL 9574cacb0e5c43fea9bb8a9f847f7cb31aa47099d882e8612130e4ce7834c10e116031ba8389d39a363d63205f72289f2a9bfc7312f9706de936ee8cba7bf094
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160520.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160520.ebuild
new file mode 100644
index 0000000..5495efd
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20160520.ebuild
@@ -0,0 +1,382 @@
+# 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-05-20_00-02-33/zip/netbeans-trunk-nightly-201605200002-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/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.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/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-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/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/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.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/5C322A10E13FADE0451263035B7AA26B63AAFA47-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/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}"/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar libs.nashorn/external/asm-all-4.0.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}"/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-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}"/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}"/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar libs.nashorn/external/nashorn-02f810c26ff9-patched.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}"/5C322A10E13FADE0451263035B7AA26B63AAFA47-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 --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.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-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_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 --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.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
+
+	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 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 61480ca..0732d5e 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -54,6 +54,7 @@ DIST netbeans-trunk-nightly-201605120002-src.zip 213555263 SHA256 1e380aed9fbcb8
 DIST netbeans-trunk-nightly-201605160002-src.zip 213630667 SHA256 25f83a7f00ef6f724fefcabf47271f5673feff423abb70dcd3015088e66ee7a2 SHA512 3035b9d691f3aeb2f56dd648c04a61f8d3a45f801b9c26c19dabfffe83772cb8864cec68c8b388156539793bc8fa56744a8c10ed712ab7d85b557dec89de49a3 WHIRLPOOL 852b8ff6694b114e95983e6207ad05d51584ea94dd45ec1a19d3d04ac31a867e5ffc1e543e6fe7d953a50a5107f558ebe1efbdf2ae3171de7afdf81a337cdd2e
 DIST netbeans-trunk-nightly-201605170002-src.zip 213637520 SHA256 c891144c815ab8e898a39e145f7ee91dfa5fa49886bf1e29504ca95a86e3b3fb SHA512 f3d1c66f94d97addf07a12fefd3b3f4464cdbd303dd68f9e39e090f700f8186d0d720e282227f4355fc122dacd61abbb637a414c714823b831891544a39542ea WHIRLPOOL 6bedc152e04a386f55172c64ad43b431f38c3c7a452c24b5d2ee29597d9d677681007d2cf1e4ef30572aaefd34b07d750b2c6e8f41ed1a273cd15887a5544e73
 DIST netbeans-trunk-nightly-201605190002-src.zip 213658063 SHA256 2b6ae5543b3f212bfd32fba437715ef57256dc649e7aa7ec0b9a60abfd692943 SHA512 99990ad9193e39f41a07978ba07eebe0e3e827954adfc07431493180446cbb9044303b6109203b021c5f3e02ca91030727bd5cedb7c7780f76129853e47a28b9 WHIRLPOOL ebd2b3c2b4f97037cb07c81b667c3439467a7f48c4b20d12d6aa1e8797ac2af000be57c085e6f6098fee5863057320aaba3fd88633302423f02636648846eff8
+DIST netbeans-trunk-nightly-201605200002-src.zip 213666723 SHA256 0b2f88f07e8e46157f1a05a1c3b36d14edc2449e4871aee79da50b4d8d3816e9 SHA512 dd6b6756854857e4be6f2b40873f9095d683220d23fadd244a92da68e9e0919ea77e588a69fe8b098fe5845b354406bb439e5c291a5bcde502d8d3556528007e WHIRLPOOL 84a0ed60deaf783b9e9d81a75778cff9b5bf19ba46a931ba73b86b059d1f5b58f60040978c666c597c5eee2450485107b6d499b857d3818751b7253dc463fd43
 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_p20160428.ebuild 15656 SHA256 197082a052d63c9aea66f8595e7a2cdc28ef3a0c3e662f4dbf215d794e2b8129 SHA512 5658fd47bd0582945b333a666e47eab9d358fe92277725edfdedde5ae5572b51aed6a63808e13c5d27bb788738fcd263baf36c6b1ff8740153fd89605a5aa9f4 WHIRLPOOL ac7ecbd6bea378255961f986f2998bc6bfdd6bff3343df76ad4f3445bf2d8a0815437cf547dd50a9b4ed4c80b57c027e77b9c39b22ed3d9769dce35672ec02fa
@@ -74,4 +75,5 @@ EBUILD netbeans-java-9999_p20160512.ebuild 15656 SHA256 f56bbbf024596b90dfb0e1c7
 EBUILD netbeans-java-9999_p20160516.ebuild 15656 SHA256 8d28e9ff8e9f9dea69fdc961871c459dba799898687673a8f1e7900bc37488d9 SHA512 8f48172a133679b6dd000a2a6d85aa176ead3377bd97b2a89bc9e1dc27c90182058f8fdf80f11665c0ae4ec2e04c9cd87cee0d03962b7aef191eb02789fc0f18 WHIRLPOOL e4f55bc0566875d26626990f32147d6a08385a63edd13afef4e5156f4209db71b75c2645e18d68e669fca8e42295f125c4e7ca4298914031c016aed0ed9a7cc3
 EBUILD netbeans-java-9999_p20160517.ebuild 15656 SHA256 5e1fdb8adf98728993a7a07b203f7a2371235ae214fa20e9ffb874d6a08d3c3b SHA512 b214c54b47047836eb89794b14fbc1c69d373f34cb029a809700441ac53e8fc492344a86518943ae692cf634527f18fd67f78ebc596592a0a73cf9e3428b6f31 WHIRLPOOL e6431c474384845a95d7d3d6df85918c90c845ac75f797f456eb5c3657c71370e00ba3c5465fccf32865db5525d839bb55bc5079ae5cf193b9cd2a093050598e
 EBUILD netbeans-java-9999_p20160519.ebuild 15656 SHA256 c6050357e7a89e920d34e6604b77e915a3cf470acff1bca35fb2d78762a437e9 SHA512 d97175fc0d3448abe7081f645a2b2bc04a61d69c1c9d740310a99098293a36f24c29dadc2fdd804308f1cb8aa37747ebe0f1ea01caa4eca6c110fc00889c10c5 WHIRLPOOL 15222b125ee2dd73c451f3abde721ced94ce799a66dc4e5327f4c656178dfe81a3e66b0748ad00cf4eb088c3ce7a28b720d747e109f78a076d896aaa1a190bf8
+EBUILD netbeans-java-9999_p20160520.ebuild 15656 SHA256 0c8cd36fbedb5fa24870783970d94f1ada32d8820a7d0a4dfc6cfec8ff1ba7bb SHA512 7141608f5b73e904da2e4a5850dea0e94c15c6848b98ced5de94c4e1f88a960585d1ba2eff2e44c70900a885b787581724ee29f06b7f28fb9e791818b945a7a1 WHIRLPOOL d699816e241496393f0c965bc7bdf64f48dedc13d08e1c3cc0d0d566af5bb4b44d9c94be4d6044ba73804b5675b46049cc57a2fc96e6274a3d3cfd427ccde636
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160520.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160520.ebuild
new file mode 100644
index 0000000..8eef469
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20160520.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-05-20_00-02-33/zip/netbeans-trunk-nightly-201605200002-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/E3764E0AB4F9F9ED16AEB6A68B8E3F2442DDCCB6-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}"/E3764E0AB4F9F9ED16AEB6A68B8E3F2442DDCCB6-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 1cca5f9..2a8faa8 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201605120002-src.zip 213555263 SHA256 1e380aed9fbcb8
 DIST netbeans-trunk-nightly-201605160002-src.zip 213630667 SHA256 25f83a7f00ef6f724fefcabf47271f5673feff423abb70dcd3015088e66ee7a2 SHA512 3035b9d691f3aeb2f56dd648c04a61f8d3a45f801b9c26c19dabfffe83772cb8864cec68c8b388156539793bc8fa56744a8c10ed712ab7d85b557dec89de49a3 WHIRLPOOL 852b8ff6694b114e95983e6207ad05d51584ea94dd45ec1a19d3d04ac31a867e5ffc1e543e6fe7d953a50a5107f558ebe1efbdf2ae3171de7afdf81a337cdd2e
 DIST netbeans-trunk-nightly-201605170002-src.zip 213637520 SHA256 c891144c815ab8e898a39e145f7ee91dfa5fa49886bf1e29504ca95a86e3b3fb SHA512 f3d1c66f94d97addf07a12fefd3b3f4464cdbd303dd68f9e39e090f700f8186d0d720e282227f4355fc122dacd61abbb637a414c714823b831891544a39542ea WHIRLPOOL 6bedc152e04a386f55172c64ad43b431f38c3c7a452c24b5d2ee29597d9d677681007d2cf1e4ef30572aaefd34b07d750b2c6e8f41ed1a273cd15887a5544e73
 DIST netbeans-trunk-nightly-201605190002-src.zip 213658063 SHA256 2b6ae5543b3f212bfd32fba437715ef57256dc649e7aa7ec0b9a60abfd692943 SHA512 99990ad9193e39f41a07978ba07eebe0e3e827954adfc07431493180446cbb9044303b6109203b021c5f3e02ca91030727bd5cedb7c7780f76129853e47a28b9 WHIRLPOOL ebd2b3c2b4f97037cb07c81b667c3439467a7f48c4b20d12d6aa1e8797ac2af000be57c085e6f6098fee5863057320aaba3fd88633302423f02636648846eff8
+DIST netbeans-trunk-nightly-201605200002-src.zip 213666723 SHA256 0b2f88f07e8e46157f1a05a1c3b36d14edc2449e4871aee79da50b4d8d3816e9 SHA512 dd6b6756854857e4be6f2b40873f9095d683220d23fadd244a92da68e9e0919ea77e588a69fe8b098fe5845b354406bb439e5c291a5bcde502d8d3556528007e WHIRLPOOL 84a0ed60deaf783b9e9d81a75778cff9b5bf19ba46a931ba73b86b059d1f5b58f60040978c666c597c5eee2450485107b6d499b857d3818751b7253dc463fd43
 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_p20160428.ebuild 4971 SHA256 953faa9ef469c397ce24d47c608926a014b50202ec5197261f4d7118a5a2be0c SHA512 a14dc4090bef622fd3b13dcf19d2f692996d541b54ee156c2bd7cc87da5a5273c955fa829026f88e3d04be09f4275e41be797eee29a64c0b5af13eb7955b9527 WHIRLPOOL fed09a4d12a7adb2ac2de781f5452df9764cd56ae26e8396d516c06e739af88f34b44135f1a7a136d972ff545fb807d69fd6ed2fb82370eb09020a4f822e8a8e
@@ -44,4 +45,5 @@ EBUILD netbeans-javacard-9999_p20160512.ebuild 4971 SHA256 c78019b8d02ddbea022f6
 EBUILD netbeans-javacard-9999_p20160516.ebuild 4971 SHA256 b41f45d15c2c50ac6e1d2543f31aff5e82139efe2fb311b791f07a74cc70e3c8 SHA512 6273f019d779e88ff1cf12094acfae18c2b6e4af54e8962235c49d7fb2f0f1e0b3327eb5b4cf22b2dd3dccc483ff688aefd01b3b5a3b13b0751bb3d5f45cef06 WHIRLPOOL a51905df718be6163b4ea1e1faaf78ec51ab7228a0806de72744f24b67d56369ab9b22dbb0b552feaeefc13fa379930164ea1eb18ca39d1e23d0cf73a6205f78
 EBUILD netbeans-javacard-9999_p20160517.ebuild 4971 SHA256 3deba85156fc5d2f2b04157a4019b30a70a0df2a48b29c2279208fae2b332a42 SHA512 c7a31255c683c62f1aa988a983d1687d89a68fa7611853b6e9f06c66ec27fc6eb057d693543e9f1b2926b1352cfe6db4fd7827ab08d85f87391ce52ba8c45f03 WHIRLPOOL aaaa016c4251b9b73baa8c08edadd2cfc9a6051a0b7f35317d4e842e074e1a71b175ef1dca2aa421ef5ab3fd0b44e58ec6a63759d5ba9484c75851958f1d1877
 EBUILD netbeans-javacard-9999_p20160519.ebuild 4971 SHA256 62f205454d9863f90a376586f299a808dc9c4b696ba5635c7e6476ecd8e4363c SHA512 68863cbffe1365a426065a0ab32f45be10f745e04f0ef2b8f845bc4f8c44ee14b436baad7602472cc6587c1f686c333f37ee7d2bbf52a0c77b7291b7d63847aa WHIRLPOOL 6532b2571de4bad6588d4e0282ce35cb0cd131a0684fa72dd56477fc119c0cd61d908570b8a77eb23ed3ee0c0e8f44883cd59b441a7842145ca51c219678d86f
+EBUILD netbeans-javacard-9999_p20160520.ebuild 4971 SHA256 a084cafb0e2265e6874125b6061d7f67f7213f8841cd67c82aa57320d306a994 SHA512 6366b75b70c8bd9faa5da71eadca205ceec5eaa705f319903aab707b0ed43d251ad151e76dedc3a3f8dc3e7029d79a3919453155e5b76efea46db33a9a8d2e6f WHIRLPOOL e865004b6be44cdebf11efc38a8879a8f141023c5d0be9d36b989b0be94eea9546b46fd04dee80e2b5379c8b68b19c91320ab6f1bc123417439c5864ddb3f550
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160520.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160520.ebuild
new file mode 100644
index 0000000..5574e3b
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160520.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-05-20_00-02-33/zip/netbeans-trunk-nightly-201605200002-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 ca1d5be..9087485 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201605120002-src.zip 213555263 SHA256 1e380aed9fbcb8
 DIST netbeans-trunk-nightly-201605160002-src.zip 213630667 SHA256 25f83a7f00ef6f724fefcabf47271f5673feff423abb70dcd3015088e66ee7a2 SHA512 3035b9d691f3aeb2f56dd648c04a61f8d3a45f801b9c26c19dabfffe83772cb8864cec68c8b388156539793bc8fa56744a8c10ed712ab7d85b557dec89de49a3 WHIRLPOOL 852b8ff6694b114e95983e6207ad05d51584ea94dd45ec1a19d3d04ac31a867e5ffc1e543e6fe7d953a50a5107f558ebe1efbdf2ae3171de7afdf81a337cdd2e
 DIST netbeans-trunk-nightly-201605170002-src.zip 213637520 SHA256 c891144c815ab8e898a39e145f7ee91dfa5fa49886bf1e29504ca95a86e3b3fb SHA512 f3d1c66f94d97addf07a12fefd3b3f4464cdbd303dd68f9e39e090f700f8186d0d720e282227f4355fc122dacd61abbb637a414c714823b831891544a39542ea WHIRLPOOL 6bedc152e04a386f55172c64ad43b431f38c3c7a452c24b5d2ee29597d9d677681007d2cf1e4ef30572aaefd34b07d750b2c6e8f41ed1a273cd15887a5544e73
 DIST netbeans-trunk-nightly-201605190002-src.zip 213658063 SHA256 2b6ae5543b3f212bfd32fba437715ef57256dc649e7aa7ec0b9a60abfd692943 SHA512 99990ad9193e39f41a07978ba07eebe0e3e827954adfc07431493180446cbb9044303b6109203b021c5f3e02ca91030727bd5cedb7c7780f76129853e47a28b9 WHIRLPOOL ebd2b3c2b4f97037cb07c81b667c3439467a7f48c4b20d12d6aa1e8797ac2af000be57c085e6f6098fee5863057320aaba3fd88633302423f02636648846eff8
+DIST netbeans-trunk-nightly-201605200002-src.zip 213666723 SHA256 0b2f88f07e8e46157f1a05a1c3b36d14edc2449e4871aee79da50b4d8d3816e9 SHA512 dd6b6756854857e4be6f2b40873f9095d683220d23fadd244a92da68e9e0919ea77e588a69fe8b098fe5845b354406bb439e5c291a5bcde502d8d3556528007e WHIRLPOOL 84a0ed60deaf783b9e9d81a75778cff9b5bf19ba46a931ba73b86b059d1f5b58f60040978c666c597c5eee2450485107b6d499b857d3818751b7253dc463fd43
 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_p20160428.ebuild 6293 SHA256 a45afe043254c2596f50568a88fe8e61738ee230c369fdc09e583b1898af2b35 SHA512 4a06b6abae4513a4fc810f735546777ff7f68f63f49def5a210dad83e09a75c44b59c80afb5bb6a22f6bcaa28ff97021ac2b987cbb2d4f4715abf7e3ac5d090b WHIRLPOOL a8a400e470bcab256c606583faa300745e3fc8f604c0788e3a37d6015c7f1e6781d4444472dfa6359a1b6001d2769ab175da299c783c5e5f6e8261890c41f407
@@ -43,4 +44,5 @@ EBUILD netbeans-javadoc-9999_p20160512.ebuild 6293 SHA256 0beb43ec9eb709e1e5bb15
 EBUILD netbeans-javadoc-9999_p20160516.ebuild 6293 SHA256 81d88452c1b029e6b99ebfa9aaac68d0f4e3684274fa1498e07953f231af85c4 SHA512 1c67d416d2db70d4d03a833b9d40f9aa5459146b353af8f0c93ab86be3a2e96aa47f204c168aa42623682b627f36c1766339d381ae512a23718eb4e54b64e56c WHIRLPOOL 14e3f361e52ce2967b68ff9d2648b188f420402980373522afcba077da674eeca4fad15991381c06207acbb41946124b6c29442c5dc9acb7d1893bf8199e65ac
 EBUILD netbeans-javadoc-9999_p20160517.ebuild 6293 SHA256 77d357ad9998a8ce08af2eb84a1a58e6adc0febaeff40fe1cd7f32402f783658 SHA512 c582fe87ee8555295f3f5029689b49296ed9a6048322a73513da013fe6cbd9f7cee062f54d4091bfbf2ecd42f732a34b20b36d21eb0eb59ad6daba6b2a6e1d3c WHIRLPOOL a1d5c5e148d4c588b0a77d08b9a96ed1e4f390105a08aa7876bb2a461c018aa4ec757117f28a6cfde6d78f8e27ccc1ba0b93cb6a48439d4a079c657a92c7bcbe
 EBUILD netbeans-javadoc-9999_p20160519.ebuild 6293 SHA256 84144efc921bb561f023d8d6d65d5101cad8705358753235dd2640ae2409a357 SHA512 d4956830e87e4d28b4e52a7e55eec978d6a13663797bde4bb1e0e359ced5d216e35f041422717f4e667744a640be0fcde85af56da602dfe29b6af356e248ea4d WHIRLPOOL c489e2e556d72fe6c16b69a2e8b0997ebbea8a75001f0a37865e813561ef9b60781d04b4995e92a096f0a6faea8a4bbcb3e9ad7b9ae35a8133ddfc6db3c041a4
+EBUILD netbeans-javadoc-9999_p20160520.ebuild 6293 SHA256 ab9c9ce6d42e6b347190035951a297dc7df4c604e0b34fa8dbbc4c986c7af80c SHA512 933454dd14f2b8f9d2cc90304debfe2a76d2c54192025b521cdd723b6cd01e455e35406dd13a6140dae7123fe2da13a3e7ec7a71d036963e967241ee470c0e8f WHIRLPOOL 1b0d5f6e44d885f411092c6758a43ce10c06ef417c215749bc785f6ff6578a9c1f2db83c59d2fd6a033f051751b6a129b54ba03278befdf1bc81f73256307125
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160520.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160520.ebuild
new file mode 100644
index 0000000..dd821af
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160520.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-05-20_00-02-33/zip/netbeans-trunk-nightly-201605200002-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 319ff0a..bad13ea 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201605120002-src.zip 213555263 SHA256 1e380aed9fbcb8
 DIST netbeans-trunk-nightly-201605160002-src.zip 213630667 SHA256 25f83a7f00ef6f724fefcabf47271f5673feff423abb70dcd3015088e66ee7a2 SHA512 3035b9d691f3aeb2f56dd648c04a61f8d3a45f801b9c26c19dabfffe83772cb8864cec68c8b388156539793bc8fa56744a8c10ed712ab7d85b557dec89de49a3 WHIRLPOOL 852b8ff6694b114e95983e6207ad05d51584ea94dd45ec1a19d3d04ac31a867e5ffc1e543e6fe7d953a50a5107f558ebe1efbdf2ae3171de7afdf81a337cdd2e
 DIST netbeans-trunk-nightly-201605170002-src.zip 213637520 SHA256 c891144c815ab8e898a39e145f7ee91dfa5fa49886bf1e29504ca95a86e3b3fb SHA512 f3d1c66f94d97addf07a12fefd3b3f4464cdbd303dd68f9e39e090f700f8186d0d720e282227f4355fc122dacd61abbb637a414c714823b831891544a39542ea WHIRLPOOL 6bedc152e04a386f55172c64ad43b431f38c3c7a452c24b5d2ee29597d9d677681007d2cf1e4ef30572aaefd34b07d750b2c6e8f41ed1a273cd15887a5544e73
 DIST netbeans-trunk-nightly-201605190002-src.zip 213658063 SHA256 2b6ae5543b3f212bfd32fba437715ef57256dc649e7aa7ec0b9a60abfd692943 SHA512 99990ad9193e39f41a07978ba07eebe0e3e827954adfc07431493180446cbb9044303b6109203b021c5f3e02ca91030727bd5cedb7c7780f76129853e47a28b9 WHIRLPOOL ebd2b3c2b4f97037cb07c81b667c3439467a7f48c4b20d12d6aa1e8797ac2af000be57c085e6f6098fee5863057320aaba3fd88633302423f02636648846eff8
+DIST netbeans-trunk-nightly-201605200002-src.zip 213666723 SHA256 0b2f88f07e8e46157f1a05a1c3b36d14edc2449e4871aee79da50b4d8d3816e9 SHA512 dd6b6756854857e4be6f2b40873f9095d683220d23fadd244a92da68e9e0919ea77e588a69fe8b098fe5845b354406bb439e5c291a5bcde502d8d3556528007e WHIRLPOOL 84a0ed60deaf783b9e9d81a75778cff9b5bf19ba46a931ba73b86b059d1f5b58f60040978c666c597c5eee2450485107b6d499b857d3818751b7253dc463fd43
 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_p20160428.ebuild 4717 SHA256 d66d24fd69cf70db58c771a8022cbd16fe687b8fa04fad227460c9c4c16a282f SHA512 a8eadadc1e636c9a3907909fdc8f39af3c3f789dadd440f3717f183e28489b6f6d07e82ef1665b06dba6f2d7d750482c7f22b55ee8a38356d8208ba3e5c27ff5 WHIRLPOOL 2a938d9fde09ab500cb042026520f13f99c6d74452a230f146bf6d69930a6d4e1e3d108fa7e1d459712e6c6893b758d4f42025e0d5e32dc24db26b97b980194b
@@ -49,4 +50,5 @@ EBUILD netbeans-javafx-9999_p20160512.ebuild 4717 SHA256 3f269b3eedada8da0c96fce
 EBUILD netbeans-javafx-9999_p20160516.ebuild 4717 SHA256 35312100a5ddadb43d81a5b25dd99b8a064c0b30cad71cc77ba47b737c0eb26b SHA512 64b39c410639adc585e60860366c56dfef3a55fc6c4380259e8e84c2c51b6bf8c3e97eab247c923e76022a17945d21d8c0fa449f83021c79609c6d20190d8708 WHIRLPOOL ae0a08449564e23b4f5508196aa39c06172a9b17a6a0744cb8462af597189ef37bf99ba47f2f4d93032fe3c6c7da5b45face0fa0c6d4aa9b588f35398925aee9
 EBUILD netbeans-javafx-9999_p20160517.ebuild 4717 SHA256 a3b66899cdb13eb8efdfec9edc0f79d1991ada2154e4a5dd7e1ce4f1cf5ddfca SHA512 bf4afff3a36f8f88516a2f53a915ba95b2cdc7a109368ad29a72e2b23c36b58a03bfdfdd4d48052979622328446012b38650b393cab3f26ac9098ebaecbcd7ba WHIRLPOOL 3a1f2d60ba3f606f5123d80fdd063085a779fe92667bb5f213c9ff174f5c1243f668fc36d1272a4e890edd388d4ddefd46b825cb7c7834c0a8bb203f33eccc56
 EBUILD netbeans-javafx-9999_p20160519.ebuild 4717 SHA256 8d8087b4bee7bcb841e215964d9186da50fc3720d1cf4ec2e1168ef22b988d67 SHA512 ea43150fec3c7b4f00ab2e0e7f30dc4d3c01b4bc73a1c24328f7e902d77a2fe58f9a2460591ce9e568afc534047ad10b7bcc8f4bf2c65d10342b7f93f6c04264 WHIRLPOOL a69a8bbe5cee84bb0d527038636ecccd1cc4930b02924bd57057352e8d8ce3e867cb6ac3404383dd51a29d2720d5d784549b3e45c82b36fb2b21870985b504c4
+EBUILD netbeans-javafx-9999_p20160520.ebuild 4717 SHA256 5d5c790d8d9761749b43fafaf9dd9d4b3e1828376930e692a5a6e727dd7dad54 SHA512 06fca0c6b027c3505e58f91a2a8df3cc8eed25409b539d42b0fe0cd167d98d01e37084de391a6d3f1ee2d32d82f7c3a4f7c206a927749dd8a63e43a258b63862 WHIRLPOOL c56b22b4ed7c757647f1d40f36aaf75d05314fbcd1c0a68c6fe5fde56bb3eb397e1c31e832e248fcb7cec500a6bb036799f732a49cd5a60cd1d15ea6546c93eb
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160520.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160520.ebuild
new file mode 100644
index 0000000..e3a4218
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160520.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-05-20_00-02-33/zip/netbeans-trunk-nightly-201605200002-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 5fa3829..42dbf98 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -21,6 +21,7 @@ DIST netbeans-trunk-nightly-201605120002-src.zip 213555263 SHA256 1e380aed9fbcb8
 DIST netbeans-trunk-nightly-201605160002-src.zip 213630667 SHA256 25f83a7f00ef6f724fefcabf47271f5673feff423abb70dcd3015088e66ee7a2 SHA512 3035b9d691f3aeb2f56dd648c04a61f8d3a45f801b9c26c19dabfffe83772cb8864cec68c8b388156539793bc8fa56744a8c10ed712ab7d85b557dec89de49a3 WHIRLPOOL 852b8ff6694b114e95983e6207ad05d51584ea94dd45ec1a19d3d04ac31a867e5ffc1e543e6fe7d953a50a5107f558ebe1efbdf2ae3171de7afdf81a337cdd2e
 DIST netbeans-trunk-nightly-201605170002-src.zip 213637520 SHA256 c891144c815ab8e898a39e145f7ee91dfa5fa49886bf1e29504ca95a86e3b3fb SHA512 f3d1c66f94d97addf07a12fefd3b3f4464cdbd303dd68f9e39e090f700f8186d0d720e282227f4355fc122dacd61abbb637a414c714823b831891544a39542ea WHIRLPOOL 6bedc152e04a386f55172c64ad43b431f38c3c7a452c24b5d2ee29597d9d677681007d2cf1e4ef30572aaefd34b07d750b2c6e8f41ed1a273cd15887a5544e73
 DIST netbeans-trunk-nightly-201605190002-src.zip 213658063 SHA256 2b6ae5543b3f212bfd32fba437715ef57256dc649e7aa7ec0b9a60abfd692943 SHA512 99990ad9193e39f41a07978ba07eebe0e3e827954adfc07431493180446cbb9044303b6109203b021c5f3e02ca91030727bd5cedb7c7780f76129853e47a28b9 WHIRLPOOL ebd2b3c2b4f97037cb07c81b667c3439467a7f48c4b20d12d6aa1e8797ac2af000be57c085e6f6098fee5863057320aaba3fd88633302423f02636648846eff8
+DIST netbeans-trunk-nightly-201605200002-src.zip 213666723 SHA256 0b2f88f07e8e46157f1a05a1c3b36d14edc2449e4871aee79da50b4d8d3816e9 SHA512 dd6b6756854857e4be6f2b40873f9095d683220d23fadd244a92da68e9e0919ea77e588a69fe8b098fe5845b354406bb439e5c291a5bcde502d8d3556528007e WHIRLPOOL 84a0ed60deaf783b9e9d81a75778cff9b5bf19ba46a931ba73b86b059d1f5b58f60040978c666c597c5eee2450485107b6d499b857d3818751b7253dc463fd43
 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_p20160428.ebuild 4412 SHA256 92ec38e61718089a7a0f048629e2390b138113cfd286ba1e8168edd9ac86aae1 SHA512 0b0b3e80376fecf0af36478252595774af197c427a8162cd2394e43d3e1772a730434cf07de1680be0bd7c3777d826c822334ce4f36c42d7a05e8aae306c4a3e WHIRLPOOL 2b317f045489273543ccd76df12009bf2b9230912a5ba4814ad5e1dab25dbe92cd0b317d4458835ed64d6386bb5216b328e1afc53d60fb9b07848397581c6bdf
@@ -41,4 +42,5 @@ EBUILD netbeans-mobility-9999_p20160512.ebuild 4412 SHA256 76c5baff573fb408093f5
 EBUILD netbeans-mobility-9999_p20160516.ebuild 4412 SHA256 ffed263c838b09685b3114b373a41f134f475f078349f33ec2b5030c599ccd74 SHA512 391aab66095feae999fdcaf1b578c1077551c4aa8d5543fd461b0f22e61a76ee428b822bb09a1c2904208d979fd6810a798f795f7f57056458865b71e79c52fa WHIRLPOOL 241b39574389e4a4927b405980149fc61e253cd62073a92cf9dd9c7e44fa8f49bce5b01b49ec5013ae010d9a22242d615938bdbd6800194f58b4847305b080b6
 EBUILD netbeans-mobility-9999_p20160517.ebuild 4412 SHA256 f97d3aaf52f20739a7858680794a89a41b82c43901459e3d303fd180ae4c4e6c SHA512 ade7f80a14a25eca0bf9ff836ea204b693a945be836065d4e72859cfd770ada6293bd56e24c0dd86f119041fb24942d44cd183981fc48bb619754762b9dad4a6 WHIRLPOOL 354aaacf11caf64b03f8fa4b0156250807e4ee6109f817e2de50dbe318f44d59ab54a7b6e7d9733494c0ed9d99dc370f2cf5d153160c0d01e244551051619a91
 EBUILD netbeans-mobility-9999_p20160519.ebuild 4412 SHA256 ed528e27cce2eb68a1d44e421319b84d49e910f0bd966c6e3e4a89cbf53734a3 SHA512 437033d9b80911f91f34210f38c70199a3e11ee70cae6f3ad0e3e3a6795bf6bae3d8be512dbe902fcb97c9b372e4333846c540d2b9b51f4945a63ad127c886a1 WHIRLPOOL 5d75deef3f43dd3e1784fb401699bcb78512997fbd8f358bd896d2df203433489d42329552a5d74853a661f266c3daac5d937f8859e298710752747eb93c4f48
+EBUILD netbeans-mobility-9999_p20160520.ebuild 4412 SHA256 f3482cc9274215c919498bf5ef0c40a2d4988e9371b1020119a187a5c539e63f SHA512 615c9feb4e648a5b2340ee8e023ebe63598c8ff178895989e3b791995721471934657d8c9005fa86e0caa6f235c8b4bea37be79d7d5afdade8bb1057e55a00cf WHIRLPOOL 1133505f82a7aa36dcd756851a672ae671807cde855edb911f91beddd967829c9e5359a7dc99a88602e8f2b456035baf04935ee7f6b53495f92ee8df7865d5bb
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160520.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160520.ebuild
new file mode 100644
index 0000000..cc45246
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160520.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-05-20_00-02-33/zip/netbeans-trunk-nightly-201605200002-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 c7526cf..93c0eb0 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201605120002-src.zip 213555263 SHA256 1e380aed9fbcb8
 DIST netbeans-trunk-nightly-201605160002-src.zip 213630667 SHA256 25f83a7f00ef6f724fefcabf47271f5673feff423abb70dcd3015088e66ee7a2 SHA512 3035b9d691f3aeb2f56dd648c04a61f8d3a45f801b9c26c19dabfffe83772cb8864cec68c8b388156539793bc8fa56744a8c10ed712ab7d85b557dec89de49a3 WHIRLPOOL 852b8ff6694b114e95983e6207ad05d51584ea94dd45ec1a19d3d04ac31a867e5ffc1e543e6fe7d953a50a5107f558ebe1efbdf2ae3171de7afdf81a337cdd2e
 DIST netbeans-trunk-nightly-201605170002-src.zip 213637520 SHA256 c891144c815ab8e898a39e145f7ee91dfa5fa49886bf1e29504ca95a86e3b3fb SHA512 f3d1c66f94d97addf07a12fefd3b3f4464cdbd303dd68f9e39e090f700f8186d0d720e282227f4355fc122dacd61abbb637a414c714823b831891544a39542ea WHIRLPOOL 6bedc152e04a386f55172c64ad43b431f38c3c7a452c24b5d2ee29597d9d677681007d2cf1e4ef30572aaefd34b07d750b2c6e8f41ed1a273cd15887a5544e73
 DIST netbeans-trunk-nightly-201605190002-src.zip 213658063 SHA256 2b6ae5543b3f212bfd32fba437715ef57256dc649e7aa7ec0b9a60abfd692943 SHA512 99990ad9193e39f41a07978ba07eebe0e3e827954adfc07431493180446cbb9044303b6109203b021c5f3e02ca91030727bd5cedb7c7780f76129853e47a28b9 WHIRLPOOL ebd2b3c2b4f97037cb07c81b667c3439467a7f48c4b20d12d6aa1e8797ac2af000be57c085e6f6098fee5863057320aaba3fd88633302423f02636648846eff8
+DIST netbeans-trunk-nightly-201605200002-src.zip 213666723 SHA256 0b2f88f07e8e46157f1a05a1c3b36d14edc2449e4871aee79da50b4d8d3816e9 SHA512 dd6b6756854857e4be6f2b40873f9095d683220d23fadd244a92da68e9e0919ea77e588a69fe8b098fe5845b354406bb439e5c291a5bcde502d8d3556528007e WHIRLPOOL 84a0ed60deaf783b9e9d81a75778cff9b5bf19ba46a931ba73b86b059d1f5b58f60040978c666c597c5eee2450485107b6d499b857d3818751b7253dc463fd43
 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_p20160428.ebuild 4111 SHA256 8e968459df586e6fc8b27eb683e2b0936dba423cccdb334af64c3918d2749843 SHA512 9ca5684d63d1efe7b5158014375752449fbce3a3fb86acfcd12a14f7c9195fefca83d11379906cbd707a48a60ae24a5312c9823acf337811e1d00e9711dbe126 WHIRLPOOL 8ddbc652a3ef6a2fa079498f3d59900f7a507d4494a2aa514cfaae3a1b67fba2880d80a9d285a9513fb9e00e6c3c842b3e8faf6060d1b545706cb2c871443f2d
@@ -44,4 +45,5 @@ EBUILD netbeans-nb-9999_p20160512.ebuild 4111 SHA256 c9721c5698e4a8cc7e6cc418332
 EBUILD netbeans-nb-9999_p20160516.ebuild 4111 SHA256 c3a2dc660bc25f923e50a6e0a0aff9439575007630a340bca12a81a6f558a854 SHA512 0c95242ae64cf3772084461a868f0ed91211a60e8ef50167b76cacb496e84fc764069e9bfac80d1bfc1688347ff772993b929ac03c8b10aebbd8e93b97d1d6ff WHIRLPOOL b4993d9190d04e75c0c5a24d90866e1c427d08895e818ef9afa5d3b32a7e3275f5a273c7c8910c9eee98df6f91b29869a70cbf86d39d8675d600579454c25715
 EBUILD netbeans-nb-9999_p20160517.ebuild 4111 SHA256 c4385a8e3a2f74c36439a502e79d02bcd00408fd03f050cb3eb6ed6fd76179e0 SHA512 78c7a616e658a79ce18fc1c4afd496961925d3fd406350e4ab835acc4415f13ccef55b872f6a968525eabe269932d2dcdcd0035635a653d43f99833f9f466e47 WHIRLPOOL b634029efc87a17bbf8a4ca600a0b9f405a418b6d500dab34c3f23d2cc232184d42aa8e4fba860f08dd0ed29110335c80a90a768921de522baf73f55c215c76a
 EBUILD netbeans-nb-9999_p20160519.ebuild 4111 SHA256 92cabb88bc3ad0e781b0f128d1f6598ec8fa2cd06de0d663e67c21c37b0943d0 SHA512 a27e6f1468479e3c52d2f99aedfbeb2a555030c109a1c360738f38ca00b65a51e6f9753975b8ec6a4e9f1b349caf8e0af6d6a55a3e99d96874c6562d69edf243 WHIRLPOOL 93207be9ccbd200600f71d466fe2b93c854d74196b8ac1cb4e052870a4bdba8d5ef6154050da1778c8f5e56e7cdbe661ddb6ee0654d2149954f070ad379c2017
+EBUILD netbeans-nb-9999_p20160520.ebuild 4111 SHA256 0fa2c7176c6a4f109493ced2223466071befc633dafff4f4b342cb8fbec36c00 SHA512 ceb07c539df16502b99f6872314c6e6968a9827e4a19dbfa44d51f87bd9bcbb78d2fff1ec5d32dc458d07f2f7839f89668667580ed5f0e8cc1e96356f8537bc1 WHIRLPOOL 2e22679ac3dabf0cb033f6381fe2a1d5517050ea070cf0d5249d9e487ba289611289f4add08fdf492481df3651a1279dfa3071692aaddd7c1c4313a7c7d377c3
 MISC metadata.xml 392 SHA256 01cdbcc83099b97486bd7b8e813e5b19c1138eb0d8d3e8a5683aafd579820435 SHA512 4d2f9160baa022d6a48b61d5f42e71cfd411d244e7a36436629bc5ee4036e4ce19079134d9a6c704ebe942306c2e0199d0591c1e54f92f8f3c8835147e639246 WHIRLPOOL c1131764e1cec66c56b977ebe36014b29e5a68e35ccc326c0cbadd050a6c625cf191c85c212e0a733661c008dab0d99f9a4cdc4c4ae0cc9d775ba1de554795a9

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160520.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160520.ebuild
new file mode 100644
index 0000000..f266765
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20160520.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-05-20_00-02-33/zip/netbeans-trunk-nightly-201605200002-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 d96f1d0..a3b01d4 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201605120002-src.zip 213555263 SHA256 1e380aed9fbcb8
 DIST netbeans-trunk-nightly-201605160002-src.zip 213630667 SHA256 25f83a7f00ef6f724fefcabf47271f5673feff423abb70dcd3015088e66ee7a2 SHA512 3035b9d691f3aeb2f56dd648c04a61f8d3a45f801b9c26c19dabfffe83772cb8864cec68c8b388156539793bc8fa56744a8c10ed712ab7d85b557dec89de49a3 WHIRLPOOL 852b8ff6694b114e95983e6207ad05d51584ea94dd45ec1a19d3d04ac31a867e5ffc1e543e6fe7d953a50a5107f558ebe1efbdf2ae3171de7afdf81a337cdd2e
 DIST netbeans-trunk-nightly-201605170002-src.zip 213637520 SHA256 c891144c815ab8e898a39e145f7ee91dfa5fa49886bf1e29504ca95a86e3b3fb SHA512 f3d1c66f94d97addf07a12fefd3b3f4464cdbd303dd68f9e39e090f700f8186d0d720e282227f4355fc122dacd61abbb637a414c714823b831891544a39542ea WHIRLPOOL 6bedc152e04a386f55172c64ad43b431f38c3c7a452c24b5d2ee29597d9d677681007d2cf1e4ef30572aaefd34b07d750b2c6e8f41ed1a273cd15887a5544e73
 DIST netbeans-trunk-nightly-201605190002-src.zip 213658063 SHA256 2b6ae5543b3f212bfd32fba437715ef57256dc649e7aa7ec0b9a60abfd692943 SHA512 99990ad9193e39f41a07978ba07eebe0e3e827954adfc07431493180446cbb9044303b6109203b021c5f3e02ca91030727bd5cedb7c7780f76129853e47a28b9 WHIRLPOOL ebd2b3c2b4f97037cb07c81b667c3439467a7f48c4b20d12d6aa1e8797ac2af000be57c085e6f6098fee5863057320aaba3fd88633302423f02636648846eff8
+DIST netbeans-trunk-nightly-201605200002-src.zip 213666723 SHA256 0b2f88f07e8e46157f1a05a1c3b36d14edc2449e4871aee79da50b4d8d3816e9 SHA512 dd6b6756854857e4be6f2b40873f9095d683220d23fadd244a92da68e9e0919ea77e588a69fe8b098fe5845b354406bb439e5c291a5bcde502d8d3556528007e WHIRLPOOL 84a0ed60deaf783b9e9d81a75778cff9b5bf19ba46a931ba73b86b059d1f5b58f60040978c666c597c5eee2450485107b6d499b857d3818751b7253dc463fd43
 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_p20160428.ebuild 4418 SHA256 ff39622b2f582fb73f069ddea76fcb846f2fdbdce6559af061a13ead577d4a47 SHA512 3f71b975e8316433510e89914be7a1ffe7837a39d42a4c8f25a033b82d54bee62cafe0a28d45cada322594dfc328f43c2a1a05abbec1e43e207f73fcb225e128 WHIRLPOOL 696cf1a13fe113a7156da0fa4db41802052c5885a1cde7eb5eac17431ca31792576d22d4cecc6b2bd5ead506abb0e3a3d0dee62183b346aed1aa146234c7df8a
@@ -46,4 +47,5 @@ EBUILD netbeans-php-9999_p20160512.ebuild 4418 SHA256 57aa8d07f1fd5815a88df2329d
 EBUILD netbeans-php-9999_p20160516.ebuild 4418 SHA256 52d1a6cc319512540c6c1a3942c0b86dc7dfa7599e5b0ee02a6ff6a57e579705 SHA512 e9e85a3d7ac60d02aa88b413f006faa495f30f5571787984eb6c1f024c5e2e7eb4aa224057ce7cb83b8ed10e471410865a465a098dce955be9b22e8e5488030b WHIRLPOOL f5dfd8c43860c000863c85e23b5253ab4cfd95750e9db668a3c8ceee54bd43371c241ab457f175e6768b9c69b2b9e78a8119749745d17545bad360665fce2e38
 EBUILD netbeans-php-9999_p20160517.ebuild 4418 SHA256 3fbae801f1fb4653dfcb5865e8c5ccb409301ec0b47b7e5208dc6d6221c34d40 SHA512 9d9381ec8bfb2cd1f136d39b1e33c1cd1e9296c1fb57736611a296cb8ee04ad111a3160ae14d89d57d5d99d9964906f70eca9e2b2b8fef29891a38c279a302a8 WHIRLPOOL bbd1517a7a8ff2beb008ca0210956e84f079ae020f3bd1421b6cf9068deaa828117b85ea3e8f8534efa192587aefc12256d829466a49b1c6efcf6f0efe6adf16
 EBUILD netbeans-php-9999_p20160519.ebuild 4418 SHA256 ae7a836757077ae6c43b5edf8cf317526d6c91a61eb55d8adfe6ed78802ed705 SHA512 c6020d38478f9862876d7ecb05b2b12bd4730b6f8d1fb2c9c5e1ad2339d07755377495713b8267dec5a72e449589b8253cad41574093e8de2c3038d27fef91c7 WHIRLPOOL 0cbf0b52b41f141d1ec3daf0d6e92938aa8d0f7aa3181c2cfc614bf118556ed3b7515188e33fca5ccd881469a52a788d46deee65eb07d47bc3846ec612f440ef
+EBUILD netbeans-php-9999_p20160520.ebuild 4418 SHA256 b87db194188ec9b03d19a3b0a8499756bbc00200c0ec8a722cc71eca823991e3 SHA512 d9c7cc4c0aa93e3be247f78ab67a0795d4c1ff0dd5a8d77ead73cbc9e2cd42ac539754e34867c3ff8c9d9e5cca698e1d5993311ee6ac6115c2acee4001d00106 WHIRLPOOL a4055f7c368c203de0b38aaf0d94c058f357c58b5838293cd7a4c8cd51c45197b1bdd2769e22c9f2199dbcc7fe5acdc3642872539a49fcc2df85aa37cf23db0c
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160520.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160520.ebuild
new file mode 100644
index 0000000..87a617c
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20160520.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-05-20_00-02-33/zip/netbeans-trunk-nightly-201605200002-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 da885cb..042a1f6 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -47,6 +47,7 @@ DIST netbeans-trunk-nightly-201605120002-src.zip 213555263 SHA256 1e380aed9fbcb8
 DIST netbeans-trunk-nightly-201605160002-src.zip 213630667 SHA256 25f83a7f00ef6f724fefcabf47271f5673feff423abb70dcd3015088e66ee7a2 SHA512 3035b9d691f3aeb2f56dd648c04a61f8d3a45f801b9c26c19dabfffe83772cb8864cec68c8b388156539793bc8fa56744a8c10ed712ab7d85b557dec89de49a3 WHIRLPOOL 852b8ff6694b114e95983e6207ad05d51584ea94dd45ec1a19d3d04ac31a867e5ffc1e543e6fe7d953a50a5107f558ebe1efbdf2ae3171de7afdf81a337cdd2e
 DIST netbeans-trunk-nightly-201605170002-src.zip 213637520 SHA256 c891144c815ab8e898a39e145f7ee91dfa5fa49886bf1e29504ca95a86e3b3fb SHA512 f3d1c66f94d97addf07a12fefd3b3f4464cdbd303dd68f9e39e090f700f8186d0d720e282227f4355fc122dacd61abbb637a414c714823b831891544a39542ea WHIRLPOOL 6bedc152e04a386f55172c64ad43b431f38c3c7a452c24b5d2ee29597d9d677681007d2cf1e4ef30572aaefd34b07d750b2c6e8f41ed1a273cd15887a5544e73
 DIST netbeans-trunk-nightly-201605190002-src.zip 213658063 SHA256 2b6ae5543b3f212bfd32fba437715ef57256dc649e7aa7ec0b9a60abfd692943 SHA512 99990ad9193e39f41a07978ba07eebe0e3e827954adfc07431493180446cbb9044303b6109203b021c5f3e02ca91030727bd5cedb7c7780f76129853e47a28b9 WHIRLPOOL ebd2b3c2b4f97037cb07c81b667c3439467a7f48c4b20d12d6aa1e8797ac2af000be57c085e6f6098fee5863057320aaba3fd88633302423f02636648846eff8
+DIST netbeans-trunk-nightly-201605200002-src.zip 213666723 SHA256 0b2f88f07e8e46157f1a05a1c3b36d14edc2449e4871aee79da50b4d8d3816e9 SHA512 dd6b6756854857e4be6f2b40873f9095d683220d23fadd244a92da68e9e0919ea77e588a69fe8b098fe5845b354406bb439e5c291a5bcde502d8d3556528007e WHIRLPOOL 84a0ed60deaf783b9e9d81a75778cff9b5bf19ba46a931ba73b86b059d1f5b58f60040978c666c597c5eee2450485107b6d499b857d3818751b7253dc463fd43
 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_p20160428.ebuild 9520 SHA256 43ab2d84807ce29e75b611c4aee4269e1cd2ab9bcd41220e572d68f2095280a1 SHA512 698447f4e5a9dbe05337a59966f05fe7f4bc8517dd463571b65d6ab777239191ee341fb56b1c9c1b479b3fad247c5284c3712f3b142839d930214f36d75e194b WHIRLPOOL b38abccc36b868f0f07607a2d487335d134554c44e085418dd4e15b6dbdbca18337fd1dc50729bc92e2e076210fb6be7caf1502c76e3100d4e0fdd8d56e3fe1f
@@ -67,4 +68,5 @@ EBUILD netbeans-platform-9999_p20160512.ebuild 9520 SHA256 db379c34326480adce6d0
 EBUILD netbeans-platform-9999_p20160516.ebuild 9520 SHA256 c8f2e16f4a9683efd091211ecf60d039943a640a3621f738fc6168ccb16e6699 SHA512 6158bf37abb855aa07942f0d040434a0ae15042badeeec405e234219659d74240bf20a6eaa4031aaeab5f41808c17ff23107e86d954b2a4134030f0a06fd5e3f WHIRLPOOL 17d85e878e43981b6a54408ccdea33c9900f6c6aa5efbd583b2a5b035258e3671a44ca662481898414e87a7681751e4000dedbc8588db26678ce7549b43c4688
 EBUILD netbeans-platform-9999_p20160517.ebuild 9520 SHA256 8d1a95087682bab0e14cbda5af927fb5c2efbbd19706d55a809fb407ae4c82c3 SHA512 991be19dff300a756f43f0def9ccc7b664f91489ada44049fdaa472635e6bfbe53d6082b55049afa5d147007ca51c1faa8edb75c9bf22e111cd572191083bcce WHIRLPOOL fba5780e789e919554f1cab00e5a3bc2cb58db466127d4d96bd31deb78d7dc24a5319758bd068cb620911c79dbc9e090377a74f69f8df99321782a1b9430dc76
 EBUILD netbeans-platform-9999_p20160519.ebuild 9520 SHA256 f99a1cea0581d82d62d05c3fabc4d7dfd894709b71657fcd9f52502904ab4aaf SHA512 672b28c0ee2b94c80a6e83a18bce24bbb0153addbace46f2183581e07f3be791e1ce8000010858b8018962b7fcbf8d558100a02c579591e4ab6869195fe926d9 WHIRLPOOL e40167cac1e2188b74c6ee791f86588207d378d86e6c5277672cc3eade50ba9c93220ed2a777e60f518cd271606942b1bb5d4631410c5409b145b95c74049f13
+EBUILD netbeans-platform-9999_p20160520.ebuild 9520 SHA256 4ed27572bc5049e678acaf3337904f42c80c006dfce151cc7458d9f82df562cf SHA512 3fafdb05bd96966ace8cbefe81e4d2b9951e6cffaee8fc08cd181b1b2e9c7c6edb5e40006b8863a8eb814acbcc2d87bf1e03c7ac062c410bab46b7ef5bad7243 WHIRLPOOL 5a88544d17de29d2e6bf2d6e50ac9bd749e3c8e85b273a67a26856899aa8486cb5d6f0c9f8794fda4e1b49adf447521b41e5a528958ca02b71d0a34e0acddcf2
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160520.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160520.ebuild
new file mode 100644
index 0000000..a0923dd
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20160520.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-05-20_00-02-33/zip/netbeans-trunk-nightly-201605200002-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 0d1ca6a..1c8851a 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -21,6 +21,7 @@ DIST netbeans-trunk-nightly-201605120002-src.zip 213555263 SHA256 1e380aed9fbcb8
 DIST netbeans-trunk-nightly-201605160002-src.zip 213630667 SHA256 25f83a7f00ef6f724fefcabf47271f5673feff423abb70dcd3015088e66ee7a2 SHA512 3035b9d691f3aeb2f56dd648c04a61f8d3a45f801b9c26c19dabfffe83772cb8864cec68c8b388156539793bc8fa56744a8c10ed712ab7d85b557dec89de49a3 WHIRLPOOL 852b8ff6694b114e95983e6207ad05d51584ea94dd45ec1a19d3d04ac31a867e5ffc1e543e6fe7d953a50a5107f558ebe1efbdf2ae3171de7afdf81a337cdd2e
 DIST netbeans-trunk-nightly-201605170002-src.zip 213637520 SHA256 c891144c815ab8e898a39e145f7ee91dfa5fa49886bf1e29504ca95a86e3b3fb SHA512 f3d1c66f94d97addf07a12fefd3b3f4464cdbd303dd68f9e39e090f700f8186d0d720e282227f4355fc122dacd61abbb637a414c714823b831891544a39542ea WHIRLPOOL 6bedc152e04a386f55172c64ad43b431f38c3c7a452c24b5d2ee29597d9d677681007d2cf1e4ef30572aaefd34b07d750b2c6e8f41ed1a273cd15887a5544e73
 DIST netbeans-trunk-nightly-201605190002-src.zip 213658063 SHA256 2b6ae5543b3f212bfd32fba437715ef57256dc649e7aa7ec0b9a60abfd692943 SHA512 99990ad9193e39f41a07978ba07eebe0e3e827954adfc07431493180446cbb9044303b6109203b021c5f3e02ca91030727bd5cedb7c7780f76129853e47a28b9 WHIRLPOOL ebd2b3c2b4f97037cb07c81b667c3439467a7f48c4b20d12d6aa1e8797ac2af000be57c085e6f6098fee5863057320aaba3fd88633302423f02636648846eff8
+DIST netbeans-trunk-nightly-201605200002-src.zip 213666723 SHA256 0b2f88f07e8e46157f1a05a1c3b36d14edc2449e4871aee79da50b4d8d3816e9 SHA512 dd6b6756854857e4be6f2b40873f9095d683220d23fadd244a92da68e9e0919ea77e588a69fe8b098fe5845b354406bb439e5c291a5bcde502d8d3556528007e WHIRLPOOL 84a0ed60deaf783b9e9d81a75778cff9b5bf19ba46a931ba73b86b059d1f5b58f60040978c666c597c5eee2450485107b6d499b857d3818751b7253dc463fd43
 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_p20160428.ebuild 3472 SHA256 c01c6eaecbc72dff72adbdd14940ae8935b207096293026b94bc2e3f620e934d SHA512 9a0cfbe6a0e5b27611f4817889d3b102ecbf07c05987b558e17013711c3f40a2239a07c340effe846d54b14bd4f4987adef4c290563bfa461e56762d99f8c2bf WHIRLPOOL 4c47981cf634b924f82b4c9b8cd2fac84006454beb9d7923757b0eb5d82512b58090245fa068f66b6760ac83681106ab659ca036907d40faf9709274a99dccaf
@@ -41,4 +42,5 @@ EBUILD netbeans-profiler-9999_p20160512.ebuild 3472 SHA256 a947d16e42243709831aa
 EBUILD netbeans-profiler-9999_p20160516.ebuild 3472 SHA256 f54e6725d520a4e3736d6c134632191a04248e11dc4fa32f664ec571bb38b9af SHA512 c79b32443c267d76b7a12dd97cf0181cc7b6cf22b52aa9767cb0def51c3d4e12c3d4b3675a60974acbd58975470ab05192e24e9d0b0ce370ce4ccf26acf9c799 WHIRLPOOL 8ec1fd9cabddeb71c45f41b0615de3b3c94ca3a5d041ed9b4972e78613204a5d94dc0cfccf3920df2be57663b8be39b11167b11ddf9bf6248fe4bb586d05b342
 EBUILD netbeans-profiler-9999_p20160517.ebuild 3472 SHA256 6ccc2ae72279221349a652cd6982ec798aa75cb10d5e9b6b2b459a4809ddca1c SHA512 8999a23c94b1d49efabebc21a4c09960f11dae8c2f4a64c8529a8a949ca47acc8264f427bc50dcc079e5338b3b0a3ff27a3db974f7009a4c4f69e030118d4767 WHIRLPOOL 303d966299dbe37c54921f7fc031edc1e32c6fc6719fe23e88ab2a0393fa097e3e310da844db34e3b51acff1ce834dc6fa0952e25edbce6fd55b93e2bbf777a1
 EBUILD netbeans-profiler-9999_p20160519.ebuild 3472 SHA256 7ba42261bd26c21e2ef9a600cc94cb6425e364620c12171a39fb2e16a46224d2 SHA512 ddf6566d83e05c348395e3f3dbdd486b8225bd2bba4001681ef3596803f1b0b7ec930603de146db2fe2ae5b066412ba2d84cb57436c0e8a06eaddbb68475dee1 WHIRLPOOL 2371e04e397188d7f3e2bcfb16f2f7a04791f3f21be450762f61162c6d5ad4db91e27df230db2ac9268b176e4ca27ca764406089ee3863bc4417d258ee8bfe71
+EBUILD netbeans-profiler-9999_p20160520.ebuild 3472 SHA256 891aa2d77eebbc4f408983db9d39f0fe59956cab0922febb1a754cabef2eae61 SHA512 ab1ffa59acdf08360ebf9b5805fa798f7a98ec7af9946a40b70065ace422b8c60561c07eca75c8be3797b4a60fb07d4a22eb58f321b28ec13eb0db9f4f5e69d9 WHIRLPOOL 6e096cb7d9ca6a5c864a57606ca500f314e6a73319afc4884def4095ad3d47d248e32dd6e7ada7cf0b2877aff0517803f55a8e384c635320e969bc78a50f600d
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160520.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160520.ebuild
new file mode 100644
index 0000000..6262c10
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160520.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-05-20_00-02-33/zip/netbeans-trunk-nightly-201605200002-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 6f6aa60..0d1f501 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201605120002-src.zip 213555263 SHA256 1e380aed9fbcb8
 DIST netbeans-trunk-nightly-201605160002-src.zip 213630667 SHA256 25f83a7f00ef6f724fefcabf47271f5673feff423abb70dcd3015088e66ee7a2 SHA512 3035b9d691f3aeb2f56dd648c04a61f8d3a45f801b9c26c19dabfffe83772cb8864cec68c8b388156539793bc8fa56744a8c10ed712ab7d85b557dec89de49a3 WHIRLPOOL 852b8ff6694b114e95983e6207ad05d51584ea94dd45ec1a19d3d04ac31a867e5ffc1e543e6fe7d953a50a5107f558ebe1efbdf2ae3171de7afdf81a337cdd2e
 DIST netbeans-trunk-nightly-201605170002-src.zip 213637520 SHA256 c891144c815ab8e898a39e145f7ee91dfa5fa49886bf1e29504ca95a86e3b3fb SHA512 f3d1c66f94d97addf07a12fefd3b3f4464cdbd303dd68f9e39e090f700f8186d0d720e282227f4355fc122dacd61abbb637a414c714823b831891544a39542ea WHIRLPOOL 6bedc152e04a386f55172c64ad43b431f38c3c7a452c24b5d2ee29597d9d677681007d2cf1e4ef30572aaefd34b07d750b2c6e8f41ed1a273cd15887a5544e73
 DIST netbeans-trunk-nightly-201605190002-src.zip 213658063 SHA256 2b6ae5543b3f212bfd32fba437715ef57256dc649e7aa7ec0b9a60abfd692943 SHA512 99990ad9193e39f41a07978ba07eebe0e3e827954adfc07431493180446cbb9044303b6109203b021c5f3e02ca91030727bd5cedb7c7780f76129853e47a28b9 WHIRLPOOL ebd2b3c2b4f97037cb07c81b667c3439467a7f48c4b20d12d6aa1e8797ac2af000be57c085e6f6098fee5863057320aaba3fd88633302423f02636648846eff8
+DIST netbeans-trunk-nightly-201605200002-src.zip 213666723 SHA256 0b2f88f07e8e46157f1a05a1c3b36d14edc2449e4871aee79da50b4d8d3816e9 SHA512 dd6b6756854857e4be6f2b40873f9095d683220d23fadd244a92da68e9e0919ea77e588a69fe8b098fe5845b354406bb439e5c291a5bcde502d8d3556528007e WHIRLPOOL 84a0ed60deaf783b9e9d81a75778cff9b5bf19ba46a931ba73b86b059d1f5b58f60040978c666c597c5eee2450485107b6d499b857d3818751b7253dc463fd43
 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_p20160428.ebuild 5343 SHA256 3b6415155ed76a64dbed48af896dcb00fde8f49f53248bd544305bd6bbe01577 SHA512 d3a549390972da7e210c839116f2a9f0607b6bef416d3169493b00b525fb7280b5fbd9d633ca23d21168303ddb16e51af92272e9296d1dd9d6ca7437dfe7e4fe WHIRLPOOL b4d34bf8241733789c989859edb61d235868465a3362488b4a28dc66c7a4b866f97cf8a1178bf92c90078514d8b102a41bfcb2d6addd44b389277e7fb1436b2d
@@ -56,4 +57,5 @@ EBUILD netbeans-webcommon-9999_p20160512.ebuild 5343 SHA256 a68df8a2c5a799a808ad
 EBUILD netbeans-webcommon-9999_p20160516.ebuild 5343 SHA256 058bf2ee81a3cb878d77feefb7185e7b8d20f49cb213e65f531ea40365c69c27 SHA512 9576bb05c7c9dacb1b9b2742fe1782990c839b5a00e0e2a59133a95f5c1933d53831669fbb36916a46f55003956b129f4561c6b9e1e566e339aa6bbd33e56f82 WHIRLPOOL 7f258fc94ad030d892171beb65e90bc1f0a5cff9f4b096a9c2496dddb7a736a23031c4b4f038ffd653e60feb209382a91996737172127cbe83426d3b6e269cf5
 EBUILD netbeans-webcommon-9999_p20160517.ebuild 5343 SHA256 ba35298affbca486382f252432258f2f6502f3ca962a65c32773fe5d3b30070f SHA512 69d03163eef312ed627ed8c882259ed41570a25885af34c4df7c4664a3a27144126a4a5d17ae0dc859744d133e34c61566a765398813c8c7b3723cb7072d1614 WHIRLPOOL b8c452462430d0b64564732c3ac0cb23d71f516ec99b55e389bc3a853fcd52ed387dc9df936741a4e637d7c70e6112013f9698a69b37d45a34238c481be2dceb
 EBUILD netbeans-webcommon-9999_p20160519.ebuild 5343 SHA256 68e9720448627be4a697b4e33e0e458162e5d0ae1bd3cf604a239403e5ac1c92 SHA512 7bc8a0c0baeacac63cabf701020f018322bf7f47d0b3094ac841e41a55070662872021e10da88abfa3723dfb12ff952b476f374f5f696ae78df9a0b5a37b53dd WHIRLPOOL fc96986e0da9374eaa073ec6c2a87010b033737b129e8f4e03e39094dcf6397eca26eb72cbfa0ace5f3abf0816649887dda271fbf62d4961bdce8815858ed340
+EBUILD netbeans-webcommon-9999_p20160520.ebuild 5343 SHA256 59e505c0ca41844a08bad8226ccc1a0faf15e56d1148373a3ffcb52fe53dc608 SHA512 8986830551b817a3d8efba911f7f1955e5b0aa17ac9957a61a4dac69678d0ccd056201bea05ce95e3b6ae2b4fe5a26f94c91ef0de5e56b5e23d82ab64eb48349 WHIRLPOOL 187bf7f7e5ede85bae4f5255d6328118f10c5b384a8fb578fa49289184f9a11ada06c877f670bfa2f81cacdf6d88210ce6f6e97050ede514cd16d3644b2df8b9
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160520.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160520.ebuild
new file mode 100644
index 0000000..7fae141
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160520.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 Web Services Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-05-20_00-02-33/zip/netbeans-trunk-nightly-201605200002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar
+	http://hg.netbeans.org/binaries/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim
+	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}"/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}"/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 260d284..5fae762 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -21,6 +21,7 @@ DIST netbeans-trunk-nightly-201605120002-src.zip 213555263 SHA256 1e380aed9fbcb8
 DIST netbeans-trunk-nightly-201605160002-src.zip 213630667 SHA256 25f83a7f00ef6f724fefcabf47271f5673feff423abb70dcd3015088e66ee7a2 SHA512 3035b9d691f3aeb2f56dd648c04a61f8d3a45f801b9c26c19dabfffe83772cb8864cec68c8b388156539793bc8fa56744a8c10ed712ab7d85b557dec89de49a3 WHIRLPOOL 852b8ff6694b114e95983e6207ad05d51584ea94dd45ec1a19d3d04ac31a867e5ffc1e543e6fe7d953a50a5107f558ebe1efbdf2ae3171de7afdf81a337cdd2e
 DIST netbeans-trunk-nightly-201605170002-src.zip 213637520 SHA256 c891144c815ab8e898a39e145f7ee91dfa5fa49886bf1e29504ca95a86e3b3fb SHA512 f3d1c66f94d97addf07a12fefd3b3f4464cdbd303dd68f9e39e090f700f8186d0d720e282227f4355fc122dacd61abbb637a414c714823b831891544a39542ea WHIRLPOOL 6bedc152e04a386f55172c64ad43b431f38c3c7a452c24b5d2ee29597d9d677681007d2cf1e4ef30572aaefd34b07d750b2c6e8f41ed1a273cd15887a5544e73
 DIST netbeans-trunk-nightly-201605190002-src.zip 213658063 SHA256 2b6ae5543b3f212bfd32fba437715ef57256dc649e7aa7ec0b9a60abfd692943 SHA512 99990ad9193e39f41a07978ba07eebe0e3e827954adfc07431493180446cbb9044303b6109203b021c5f3e02ca91030727bd5cedb7c7780f76129853e47a28b9 WHIRLPOOL ebd2b3c2b4f97037cb07c81b667c3439467a7f48c4b20d12d6aa1e8797ac2af000be57c085e6f6098fee5863057320aaba3fd88633302423f02636648846eff8
+DIST netbeans-trunk-nightly-201605200002-src.zip 213666723 SHA256 0b2f88f07e8e46157f1a05a1c3b36d14edc2449e4871aee79da50b4d8d3816e9 SHA512 dd6b6756854857e4be6f2b40873f9095d683220d23fadd244a92da68e9e0919ea77e588a69fe8b098fe5845b354406bb439e5c291a5bcde502d8d3556528007e WHIRLPOOL 84a0ed60deaf783b9e9d81a75778cff9b5bf19ba46a931ba73b86b059d1f5b58f60040978c666c597c5eee2450485107b6d499b857d3818751b7253dc463fd43
 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_p20160428.ebuild 2721 SHA256 e06e7fe1eeda962aff7fbc12e4c46d0d1b20c20c2c312ae0ce8958a832ad6055 SHA512 00b42a7ffa32ea8488086b9ab2ca09610d920ff325e640077159ad4c08418e43855aacc741d094304a891e665c46be785997cd857c0607de49955e8475369404 WHIRLPOOL 5b30492d9257888e1ca4b45e092e2c7fe7548b4160939ac8f1f32dbe625b9534a669d62727abcd80be9809071973d27ea403fb1a765665a09c21dcd112485443
@@ -41,4 +42,5 @@ EBUILD netbeans-websvccommon-9999_p20160512.ebuild 2721 SHA256 fcbc0c0b25d31fc1a
 EBUILD netbeans-websvccommon-9999_p20160516.ebuild 2721 SHA256 78cf30a4e4f125c642d26caa1eb0f08697c813bd6b687d9f5165810dab205cd4 SHA512 5c60600a1ef4bb78d1e0475aa21aabce1f1e33c808b9ba0b29c1ad0add64c2d7c9915ab2e4ffff1d4935360e17985ec55b68fdec49629992c566b01e1a98c472 WHIRLPOOL b551d0485b5f03a347b7c1e6454bab27113ba3fe68c3217814aa2d526ef52b63d106532fcbc6248a3e07e9249725ba2c3db261834f4d092e1d57b370b31c2135
 EBUILD netbeans-websvccommon-9999_p20160517.ebuild 2721 SHA256 81492a51753f65689b151f461e7ac4ada005dd19773093499a339dd5eea43040 SHA512 a4ebef303b2557b088c85c5c95fea7d91bd3e97a2f34b75d1f80ea255b91004693f5d96edd99b47fef990f607d6952322b9e269f35eaf450d483f612faf816bb WHIRLPOOL a6aa61bf249220e2d58608c679fd1f88c705ac8e4da225369b26629eb6c74249d3a6e7380f350925b5a222670bdffd51125c6be4de9d0321c477cd54eb537d42
 EBUILD netbeans-websvccommon-9999_p20160519.ebuild 2721 SHA256 f81d6de60da9a5ad1fc222332286a475d38b3b9317774928d782b3ac49e50c59 SHA512 137bac07422427f888a85734cbf4e9949925f331468ed00c49bc00f8065c4e0f36c95dd66c7fdd521539cda57a6684c1d1961ac0b30611b893fe0b325f980ac1 WHIRLPOOL 921ed6c6e320d91d356add4a5b10b57beff4140696f97cc2e3ee832f31e174a63455d3f9183e7e5b33329819b195903954c65299e3615333af70d93ac30643bb
+EBUILD netbeans-websvccommon-9999_p20160520.ebuild 2721 SHA256 84726beff5c97185db3493db92a8a8d4c9e308cba9a34e6943a6900d76e2f27b SHA512 ac40ff5047842cb1b79f205957007211c2e1152b5554036935f31c56fb4b54190c04ea3e086417cdea7207518d81429644c46c5e2f233ccf61e729a110a2d154 WHIRLPOOL c2b8bcf7f2bf58fec986c6d26e3ec39a6f32412c43e85fc418651c34c8f0042f3ce2ec87489884c852e65572a513076b007d1e985630d7f2eb119f42efc28d32
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160520.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160520.ebuild
new file mode 100644
index 0000000..ff1e4c1
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160520.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-05-20_00-02-33/zip/netbeans-trunk-nightly-201605200002-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 2323abc..aa3fe86 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201605120002-src.zip 213555263 SHA256 1e380aed9fbcb8
 DIST netbeans-trunk-nightly-201605160002-src.zip 213630667 SHA256 25f83a7f00ef6f724fefcabf47271f5673feff423abb70dcd3015088e66ee7a2 SHA512 3035b9d691f3aeb2f56dd648c04a61f8d3a45f801b9c26c19dabfffe83772cb8864cec68c8b388156539793bc8fa56744a8c10ed712ab7d85b557dec89de49a3 WHIRLPOOL 852b8ff6694b114e95983e6207ad05d51584ea94dd45ec1a19d3d04ac31a867e5ffc1e543e6fe7d953a50a5107f558ebe1efbdf2ae3171de7afdf81a337cdd2e
 DIST netbeans-trunk-nightly-201605170002-src.zip 213637520 SHA256 c891144c815ab8e898a39e145f7ee91dfa5fa49886bf1e29504ca95a86e3b3fb SHA512 f3d1c66f94d97addf07a12fefd3b3f4464cdbd303dd68f9e39e090f700f8186d0d720e282227f4355fc122dacd61abbb637a414c714823b831891544a39542ea WHIRLPOOL 6bedc152e04a386f55172c64ad43b431f38c3c7a452c24b5d2ee29597d9d677681007d2cf1e4ef30572aaefd34b07d750b2c6e8f41ed1a273cd15887a5544e73
 DIST netbeans-trunk-nightly-201605190002-src.zip 213658063 SHA256 2b6ae5543b3f212bfd32fba437715ef57256dc649e7aa7ec0b9a60abfd692943 SHA512 99990ad9193e39f41a07978ba07eebe0e3e827954adfc07431493180446cbb9044303b6109203b021c5f3e02ca91030727bd5cedb7c7780f76129853e47a28b9 WHIRLPOOL ebd2b3c2b4f97037cb07c81b667c3439467a7f48c4b20d12d6aa1e8797ac2af000be57c085e6f6098fee5863057320aaba3fd88633302423f02636648846eff8
+DIST netbeans-trunk-nightly-201605200002-src.zip 213666723 SHA256 0b2f88f07e8e46157f1a05a1c3b36d14edc2449e4871aee79da50b4d8d3816e9 SHA512 dd6b6756854857e4be6f2b40873f9095d683220d23fadd244a92da68e9e0919ea77e588a69fe8b098fe5845b354406bb439e5c291a5bcde502d8d3556528007e WHIRLPOOL 84a0ed60deaf783b9e9d81a75778cff9b5bf19ba46a931ba73b86b059d1f5b58f60040978c666c597c5eee2450485107b6d499b857d3818751b7253dc463fd43
 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_p20160428.ebuild 6939 SHA256 1b8ffc29323b7fe1c2308f75240c295e475626a7232fe70c6a6d096adce971fa SHA512 232be1939cb9767558f9befc29f085962d978b508940a093850602dd10a4ad49e801cb526d1ced56da3654bdf31f447619ac1bab2ae4c712fe858a475baffcc7 WHIRLPOOL 2e4d5265c0870bda91523777b9ddc9383e83a81befa8a86beb9c3f99990fa3ff6a22770d621a4120f8e891e607b61300308f5f3c433446e6bd59944fad8617c7
@@ -44,4 +45,5 @@ EBUILD netbeans-9999_p20160512.ebuild 6939 SHA256 c0d0be055d5e6a423265f63aa3ac67
 EBUILD netbeans-9999_p20160516.ebuild 6939 SHA256 7871592e8d220886d1819e6c62c9c84582a8bd9a944ea1a4fac049d19919299b SHA512 0417f6ae51ead5982bbbaf89a665f104b38b68cf65195ed8e76af3001acac4977d6772d82de35833499f6819371afbdd3bf75597ef1aaa06c4052c4e6e477a66 WHIRLPOOL 89c472bca2465726dcb70d611454cd602552d17f867d05384192dfc6c9fa8f774336b10d114c6fd7cfb802658a54d3d2721f43518f46af6bc3639bd927901f77
 EBUILD netbeans-9999_p20160517.ebuild 6939 SHA256 bc51979263fdc7164cf4bd825e07f1a67a57965e15ba74e7701c7c6ea0070c2a SHA512 00dff53d8147f4859b1a24f712c6176a577ab4581e4534ddb09f3780c86c9c39caae30ad9058484f12c53e72da9ca5b244ffe6128cdfe144fb4e7651cd2a90de WHIRLPOOL 3c17197b319584dda36e275a1a732c0e084737197188e8a4c74af8d2a173ae3b4220aafe27feb40c099121ed022d4e7fe79993caca424ca3ca021a5162b22a88
 EBUILD netbeans-9999_p20160519.ebuild 6939 SHA256 69fdddb9c104704ae5afd77fd7fde56a79a0e5552d3dcc4dc4c2bce9aa137efc SHA512 a3fca55562f27915bf1456b25b90c2c21f9627c98ff1eb7199b21bdb38bcf7116dea7349c15b6906bd35ca9014aa0c61104a981b08ed29807febf4cf2e4c9971 WHIRLPOOL cdc4a93778ccce5972ec7be4143dfbba62210ba1ea14fc140da4807aa4299d7149fc0c0ac5e16ca18efe5862378b0638bcef0e0a878921e436eab6c2dde8775c
+EBUILD netbeans-9999_p20160520.ebuild 6939 SHA256 a1feaf231b6d6be2c7efd34ff2d011f9cde533b45eeec98271020adc65bdec0d SHA512 0437a1fabc937308cd579a6052f773234f4b4480160252ffa0850cdd21282d6a0fd080755f6a30cd6ce10050759e0049954fc75ce059fd7de5048a9e1a2e14d2 WHIRLPOOL f8f7cc75d60441edd9b6be8ebc07687612b06d804079743def7b922848adcc46c2c3dd177ef38d692e96b9c7b77a2b9f31bca8927f49a3acd8599d7615aa0002
 MISC metadata.xml 329 SHA256 8aeaf2a0228f15c2e4140f401b30f083509bd99d0a578873069f3595cd8555f3 SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640 WHIRLPOOL 799a9b79b1b447bda9631f67e2dfaf722376740e1d2037796528a05f9745eeed00d9990a74a65ce09f74bc5e1d60a887abde540c3c62487d7dd49b8377c15834

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


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

only message in thread, other threads:[~2016-05-20 12:00 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-20 12:00 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-ide/, dev-java/netbeans-javadoc/, dev-java/netbeans-dlight/, Miroslav Šulc

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