public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
Search results ordered by [date|relevance]  view[summary|nested|Atom feed]
thread overview below | download mbox.gz: |
* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-ide/, dev-java/netbeans-websvccommon/, ...
@ 2016-05-30  9:39 99% Miroslav Šulc
  0 siblings, 0 replies; 1+ results
From: Miroslav Šulc @ 2016-05-30  9:39 UTC (permalink / raw
  To: gentoo-commits

commit:     ac0a44136044f9ddb84f9e61835bcd0eed0c2c05
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon May 30 09:38:49 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon May 30 09:38:49 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=ac0a4413

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.3.0_rc1

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index ebc9de2..6b7b7e2 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201605250002-src.zip 213747513 SHA256 89b56f89feefee
 DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
+DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
 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_p20160430.ebuild 3384 SHA256 f7125ac081a85a5ce6c28d2bbffbb4db19dd56fbdb7e8d191916ebf182b43c28 SHA512 6a99a95d020859118839f6ab0a6fb90456bb4815720824171c7fbd98588e5a896655e2c3e8e69c0ba3b5a3ef76996e9cc3de6134a3f5d812316cb9d7ffbc3d49 WHIRLPOOL fadf22cefdcb71f65ab8888229e90104b0f965f0ba620d63646dffea7692726ded287536af6f7dd30f98f7b31a0f13f048d66107396c47660c2697f339827303
@@ -51,4 +52,5 @@ EBUILD netbeans-apisupport-9999_p20160525.ebuild 3384 SHA256 5c92c7fa7bc62ba8307
 EBUILD netbeans-apisupport-9999_p20160526.ebuild 3384 SHA256 78b42989812c06a312a216ba4d7478ba3ac8ff3553724cf8301d5bf50e00160a SHA512 d9b856dac4c202eb279fefcf3354496f48847c2e62d054bc2cd6f983d3b6ef108dfad5f5a962fe5d938619bb1168864227b529c0dfe9465f3bc93199c379e859 WHIRLPOOL ce2799381ebcbb851d972b5c93a96d40cb65eb773ec7ba787ef1c36b15fd20a89ffa561ccc344c2dcb9bf273c1d4e8c5e6e7baa72a174711f47a8cc8db87c645
 EBUILD netbeans-apisupport-9999_p20160527.ebuild 3384 SHA256 6b1cdd342ea791cd5a43da5207aacd826f027402357c638fb0c2949a67a064db SHA512 b89d4adde2359b36d31b520d7795a9c52c0a13a1b26da354148e4622143f50dc28aa8e2f61755d3e7f10a91bc21b9f8df78089cf286ebcb641f4f95f4c990cd5 WHIRLPOOL e3fbdb080132993746349a051a15102ff3268986d963a1933e3f9c7d2dfad5e4585006a52f083cd7b070da870f99410846c37b6e4612bef01f8b129b022b2703
 EBUILD netbeans-apisupport-9999_p20160528.ebuild 3384 SHA256 dea76ca12a89bdc4de57bf75ef99a2d11aa1813abac00884438810fff9669d75 SHA512 aee2a8891a7f2ce8bef07ad356ec38e32e34a99b8ba0ca8b8e5ec79f1c1d5718df4968afdfb2c3ffb8e5e0ab3b49cb3f16a2e19c1e50d1d2279eaf68c869d564 WHIRLPOOL ec6188dd99f247ac87b35abd162b23a1fb9cba47f7f039850ec600664322b7db1e375cf70d5d69df588bdd64f632ed4ca8e37e7aff10225a602447fe4d4d317c
+EBUILD netbeans-apisupport-9999_p20160530.ebuild 3384 SHA256 914cb3fd6fb081b4854169a8b4ffaa481c4fc48c6fb7f0d0914a4fab479c7b1a SHA512 845fcd99745a16a760747cce6fb3278d4a13be79135521b2a40ec136f71bb72d7c63f6327196d204f0e96baf1081f179563647c562fe9f99d96845d8d5272a5a WHIRLPOOL 93c0d56cfbbab65286e24417665a1c7efadaf03fa40293902d3e963c00ca41635041cef1ceb1f6ad270dc19c839bced955923c584ec372b5b2c702bf3998d5ed
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160530.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160530.ebuild
new file mode 100644
index 0000000..73f99fd
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160530.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-30_00-02-33/zip/netbeans-trunk-nightly-201605300002-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 8f8a426..db2e35c 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201605250002-src.zip 213747513 SHA256 89b56f89feefee
 DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
+DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
 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_p20160430.ebuild 4790 SHA256 af49eb045691ba158c4f3d1bd0df4daa8b901fb31ff87929ab5aab41718f738e SHA512 b45ed427c74adc932a16199e6bc5a2abc0ec28b2be58a0b08f0e98b8ea1227540d405c1272103a462332c42c28b412c27b39c2c8fa742988e4590aeaaa979ca5 WHIRLPOOL 4f6d02207ae1cf4f8d20e8d2bd78a7711c41ed0ec64dcd78d1ca4fa2fb08e860bd5225aaa6a91d9ff0ce951c108197dc6979ab095f6d75e096152712bb01a637
@@ -64,4 +65,5 @@ EBUILD netbeans-cnd-9999_p20160525.ebuild 4790 SHA256 0f486830393ad04b308b301b29
 EBUILD netbeans-cnd-9999_p20160526.ebuild 4790 SHA256 15c1efdf697e4eec5d827e580c4d2ee6e3ac3308a0184fedf3b882ff16abc55b SHA512 055977fc46ed6ea306c43a939cb9a24deec2764a881ada5a32d15f5f8e06024a628785d71827dcd331d0ae8d0aea8e89a780ae3a09e6a24a5a1aaf1acaed3ba6 WHIRLPOOL 1d04809ee29093158af062fc7e8e3f9843bc11d51c439c7b47c45f646f4a21b9f5231e5bdccb6e168fcf30b0dfb613c7ba4265c014b298cec68edf6276d33c02
 EBUILD netbeans-cnd-9999_p20160527.ebuild 4790 SHA256 3cf4a0d65a879cc2a8f9e5ebb83abc6bc3fd8c804adaae9d33792639b762ba26 SHA512 9cd977b0c24d4b5422f55b47dd593fb45980ecaba25dc71d5eefa77e365d446bb12b32d3211a449b804515924785117bb4dd31915fb65c28f31aa2c0994cc202 WHIRLPOOL 6b41d54b12d7fde225f5673c6acefa2d9a1d4616be5be9f1b949023d2c35af70577ef5d680c86c03035ddf8b3ba22294a7d052c224904a12e77c014fef21e10c
 EBUILD netbeans-cnd-9999_p20160528.ebuild 4790 SHA256 51886877261cfbad884f0726664a048b620d40e5a0e2782d812990762027dcd5 SHA512 73284fbc92397b2abd8d67e3d343f010e82d2b35df86ae3a2787d5f88434c2211098452a8b203e16a5afa083d62a35d404ef4e0ff0927b77c6ddf62a6a19c015 WHIRLPOOL ae5620916361e0970e17476ade2d3bb50848b5840775d903daf7bafecc2dc70311ede53b268d211cbefca8820b346fcb4bf3dddb5fe2f72dca0c497fe61c7900
+EBUILD netbeans-cnd-9999_p20160530.ebuild 4790 SHA256 7769cf54a5ed50ad522d6be9dd38b301e410e973bcc43ed14b743d531281b80c SHA512 7e0ad8ae0ec2d5f40c401ae196c4c39c0768e8dd27bf716ddd211935753fb11a77031b5a5337ca7ebd7268931eb6462040a567283e339bae34b313bfc6830def WHIRLPOOL 34f1eccec6eaff036e66eb94ca671448a94fef0c8507d447593e04c3371082f7b1fdc3a675c18905a91c9a85aa48185d8aeb7cb78aa9d092e62464d5e0541f83
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160530.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160530.ebuild
new file mode 100644
index 0000000..e994cb2
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160530.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-30_00-02-33/zip/netbeans-trunk-nightly-201605300002-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 9f75e25..5a95a01 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201605250002-src.zip 213747513 SHA256 89b56f89feefee
 DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
+DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
 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_p20160430.ebuild 2968 SHA256 e9fef6100fd02fb343207a77f1e6eeea0c86d3eb48f26d7f657712da84900539 SHA512 274625dfb516afe3226a643964804944304dd6b9ce160bf29d15667375f9ab353f24b75be488f882c9b5b8194de21c29743ee7f1f49741fc5093520d1c8853b0 WHIRLPOOL 005eafc551e71307197b230dee99c598d1e3ad6f0ef0baab0345a330b2c446de9ca576a2eb3fdc46d82cac33dbc5e9b9bfe850200ab593eda55d61411aacf210
@@ -54,4 +55,5 @@ EBUILD netbeans-dlight-9999_p20160525.ebuild 2968 SHA256 b225c348d11bfc697fdd2db
 EBUILD netbeans-dlight-9999_p20160526.ebuild 2968 SHA256 627ff0954db98e43e9961942b65ed75c2faf99904e31275ed290f72438142738 SHA512 a39dfcf667517f62ec637af1ea16aa7481e598016e83201aec40a0414bbcb60e8e00a4aa7f407358a1c07e93dc915444c1913966140a45d7b23ee0bc59fdadc7 WHIRLPOOL 6667817edc1d8e81d2ddc9d9304c4cd12f2af1ddba13c534427f11183fb8e241bac9bc4d4755f19d53163beeb0bfb0d33535292b6c56fb77fab79064269cccc1
 EBUILD netbeans-dlight-9999_p20160527.ebuild 2968 SHA256 e31aa9c2e0d9768c6734acb590461f8a45007517b52f24eb1020a5bae75bb505 SHA512 950b04493deae35018a60bfdc2d245e1ca114deee3acb888bc89d0a86d10010d096be1d48b0740173ae9cb54bc07af0269e8f060578ee0dcdbcc85ae41f37622 WHIRLPOOL a1122ae0ac832f1a22574411b92e83513f10372d6952d64159724e31826d11acf209d5e0af8dd1ed51eb3964c8fcbcfc988b8c9b8548aef9871ad453c8e87dbc
 EBUILD netbeans-dlight-9999_p20160528.ebuild 2968 SHA256 44a7bac7ffc8b7b17500ee8d784debe345e573f796ae4615453198d5712a6762 SHA512 f1ce3a2e8790b1a70efbec5914ae90d0e2282cb9aa16f3758f124413a81c51cf6b797f50fa8fe87b3e06a1cccbdc014e51875d412e28a6aaafefb12fe4617966 WHIRLPOOL e61c1c70dbde5e769e5a62247247673c367239a8278cba3b278dd7a96b0ed11e6e662acd3c97c96235e65ad552058de4b32c3081c6a65ba0c9d1ea776d6688a4
+EBUILD netbeans-dlight-9999_p20160530.ebuild 2968 SHA256 10bd2623faba3cf6d42fb9e5af40344891403ec71d7f191c5e7f12750377c50f SHA512 9be1cd298afa533147aac29313ce8ba75f780a1c40b1cfa7af85a688d5f8afedcc8f9450b7ffd35ffede2755646190f41afaa2e715fa174e2c45b6037cd9ec55 WHIRLPOOL 090d3826a38a8ed6781ad14024fa0ac3d5eaa061368a06403899b02652d8240ff045639a150fdb8c97521df2adafe996844699e71072b5f7696ae85b5082701b
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160530.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160530.ebuild
new file mode 100644
index 0000000..107d4c5
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160530.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-30_00-02-33/zip/netbeans-trunk-nightly-201605300002-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 d0f31e9..4e51077 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -58,6 +58,7 @@ DIST netbeans-trunk-nightly-201605250002-src.zip 213747513 SHA256 89b56f89feefee
 DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
+DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
 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_p20160430.ebuild 15825 SHA256 05ed24b0672dcb4a88c8e9889164a33ac27d3904c22c1e6bbd315e3f9980dc4f SHA512 1e0991ea492824ca929b3b250c4857034065aed3a2ae50c4b261f43a01313fd69a917ee609cdf5449c7f63299589aa2f824d13f25a46bbf643a7e647e027d64e WHIRLPOOL c8fc088951776e6c0f722464829b81f6a535d4630df0cf155b96fdf0bca964ace6686cf8538c49c9b65308b8eb9761aac09efbbe1871dfb32985147eb5e06a1d
@@ -83,4 +84,5 @@ EBUILD netbeans-enterprise-9999_p20160525.ebuild 15825 SHA256 4ff12331787132ba2f
 EBUILD netbeans-enterprise-9999_p20160526.ebuild 15825 SHA256 95734908288d5bc9cc17af2c0906bda2fa17e50f24dc295334a339083d95e756 SHA512 d85ff9ba3e3420832b65f6863ffa352b3cb9b28dbd33e2ba110c0b7d15a0a68f5546341d83e6e18419c3c33feb8f95dda6bb0839f3f852733f0e0d0ce5657cc1 WHIRLPOOL 77c0a24f3a1e2da993a1c01cc67a216f011bb877f4afb9cea648251b73ce34b80ae5fc692a2b3236a965bfba95b0d7700764eb7429c45cc1abca7b4e5305dc3c
 EBUILD netbeans-enterprise-9999_p20160527.ebuild 15825 SHA256 5ae5cf98ef42b44e124270fb3709dd675c651830f1ecc6c2ab8f6c7e4e8602d1 SHA512 b34cb992fbd884382264e975f0d51866af7c25564b24f90a76253b25356340f108a84863394da00ff2f15bd0c65059265c6dc758d142b99f5095cc2a3df195a9 WHIRLPOOL 613d2de27c9936d86f878666257a9fdf8868478b39c06ff7504779aea2f5dda257cfc86db013967090278a0cfbbcf116d3a75407ae10c97c37ef89b8a0c59613
 EBUILD netbeans-enterprise-9999_p20160528.ebuild 15825 SHA256 05765270dd6968aac62912496073a5b8a45c4f0721ae3f2e55fa9b956c04a73b SHA512 dce21c1246bc6a6c7d2953a92bc7662f8ab3867dbab34289556c09a9a6d4af339717a830288308680077b9a68fd333197fbaba5ee0c78610e26b1e018f308721 WHIRLPOOL e7bc32b284e69d83733e2d134828c56b09600a2e523fe8200c339056d707f6800b8bd117df43b7fbdc4028839ee3d3ad0cbc683d5cc8662329b71317ae0837f0
+EBUILD netbeans-enterprise-9999_p20160530.ebuild 15825 SHA256 c2a2164241155e021bcead95e796793f06dfd14bb17d30b31dc521a6f6010440 SHA512 da6e60db8ad6523551250509e2b95a236c5f519ceee3e0c748b6f7d78a07cd83c52cf3499d6b943f73f9693389311aba256de58e6d606afb31b38e3e17a560ce WHIRLPOOL c8736abcd05f81742a152f9430ceb58dc621a28ff872db9fc7c09206e21e06bfc8f91cb199573cdfd1882545e91641c7c5d0da8251828a7573f0efe6c1c2ff57
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160530.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160530.ebuild
new file mode 100644
index 0000000..6b8a775
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160530.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-30_00-02-33/zip/netbeans-trunk-nightly-201605300002-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 e5f8cf2..6ad043d 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201605250002-src.zip 213747513 SHA256 89b56f89feefee
 DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
+DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
 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_p20160430.ebuild 2913 SHA256 d29ce3ce54570a70417a7b25e238f24328a5edbfd17e31c1dd53888916cd0fab SHA512 9b5fd6e536ede818074a59112991402a614983e439a253d7af296ca1188f0fd3a52c0e06078b0b1c4f17e50bb1fb1dd5d4234ecb8410bc42b3ca1da8658ef4b5 WHIRLPOOL 74b6d0121d10eac421cd68a00c62d348d7f7a8040b2861232125ff6183fadab3eb608641cc55f73c6c9896a57ce46961f446cd67a3206fed9633cde2e5ebb5dd
@@ -51,4 +52,5 @@ EBUILD netbeans-ergonomics-9999_p20160525.ebuild 2913 SHA256 562acf2ee31be2895a3
 EBUILD netbeans-ergonomics-9999_p20160526.ebuild 2913 SHA256 cb90adcc4199e00b2781e94bd34c5ef0c05361dad1bb389b9a583c2ea4d83a36 SHA512 bb235a9b2421fe6369e5700c924c66a19c8a4798f133b886fa87f2d0213ee41eb9902b602d78d766a568b355f8178ea445958d00af7dfe7bdb19b2d37e96723b WHIRLPOOL 50ef76e33091a3c40e8b1791a273a9525210f02a0ba0bd0fdbdf69182d2a709c01ca019c01f12c84721c1427dbefcc9ccef4af2c22670d35df703d5c72d4fe38
 EBUILD netbeans-ergonomics-9999_p20160527.ebuild 2913 SHA256 d0a9c443f59b0f26f50c7faf75ecc091e6c82c7ed7b07bfca2ecab8f622ae24a SHA512 c8b64476f191ed7cca4980c8f80046ddc68780bc9176249606247fbfd16f234fc1941a8a6035628967906278f2f07b087da67962cc076fdfe4ebdfda1e4b16c9 WHIRLPOOL 16067a2a0dfe092143a35ebff76ca6ef2170fcbd0db6890f5abbce25ae094385d7c54f88be771279f9dd7341732e406535d2d79ab31220569bb08f4dd891f7db
 EBUILD netbeans-ergonomics-9999_p20160528.ebuild 2913 SHA256 a9167b158e314e46f83edbd5d520e3defc3af442bc32455a1916fcb028244380 SHA512 bcf7d2833f57f7376ed4638b3ce0d807ad2d86f6114d5c34ea95dec01b05929c73bb6cf4a4dbf90d581ab2c9706ae16047a9e52346f396b6f0dd79d83db31ebe WHIRLPOOL d1faa8f2a115beeab22807028e43a0a972e057a9ea1d0ccbf0a1ab96bca64ec952e588c93d4c49a1540002a8f5463f19bd25ae3c5134859010b11c646cd2065f
+EBUILD netbeans-ergonomics-9999_p20160530.ebuild 2913 SHA256 fece8416b9de9c9799e0baf8911e4964081a5bd0268cd2b9cb8dd086b45a7cfd SHA512 de4e1004a910a763f4086ab4b57241dc03704a4acb9126dd47c7b5883046898b51af9f838904ebd74e5b11af6a8d650ad85a3f6d0c27939feeb22e557ad04c8d WHIRLPOOL dc65801139c09d51a68f3481478d1aa1b42683ce52e73afc5fa86994535bebd224e752649dde268c6cd8cc61ef2cac949faa9f9577aefdcba8fd902159e6d22b
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160530.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160530.ebuild
new file mode 100644
index 0000000..e7f028f
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160530.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-30_00-02-33/zip/netbeans-trunk-nightly-201605300002-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 34e0a7b..5b96ecd 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201605250002-src.zip 213747513 SHA256 89b56f89feefee
 DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
+DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
 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_p20160430.ebuild 3377 SHA256 cf5564f3b737c12c4713beca1a239d6d8fc5f845f1058fcf2787655b99c8ed55 SHA512 69a5c32e599601fca96d30b523ba283d4259c0a1f414bd7a536fe5141a3ab7829fff4cc40501aac13f5a12ca480406ea3742ef7818dba8e567430fe5d6e0dcec WHIRLPOOL 2e9945deea2f787f923646e27806bd66deafd323bc8bdc37ce738c8419388ba1070b1b6df1afe53d70baa8f80e02cd2fdfe67e7ed854915b3f8f7f01d27c0fac
@@ -55,4 +56,5 @@ EBUILD netbeans-extide-9999_p20160525.ebuild 3377 SHA256 c454ecc26a6f7f4312f3179
 EBUILD netbeans-extide-9999_p20160526.ebuild 3377 SHA256 32ae570338aab8acd5f5dac7154bba217fb1baf507d24e6d2df7c13c0eda06a6 SHA512 0c295a66ace5709c4ad71569f32c645de4bf39f09ea308388becec3b55753d363763b2e22733d234992e0471b0ffeeb1ed94d69e2121140519434781c4ffdaf2 WHIRLPOOL f478663b9c91a5f4400286b714cd49d9efa8a2d193b4c0209926b062ac9f35443d7ac620712112dab3448139bcfde744c5fb37767e2530a9ebecd0ac19c86796
 EBUILD netbeans-extide-9999_p20160527.ebuild 3377 SHA256 c34a7b73508938fae77cd74201f666d9fe7e12a64846e2950cf8e236ffa8658d SHA512 c3449cb97376606ac0e728e6a93deccc4fc0d9d46b96d33bbedfa8479bcdd0c89220f3302565ed9d1e4f7e78102e51d78d757c6f7a8f5886c62b36470c7175df WHIRLPOOL 7e1320997af8ff09f5da347671287a869856296e96863595bccf195f02f11bbf7ada4f377565cd94e0e456cfab91b04d7658c8d456796a71fc5758b1045e3a3f
 EBUILD netbeans-extide-9999_p20160528.ebuild 3377 SHA256 2d0a71ea5ca88ab01cb5e6c35ef961750821f30632158856d757b1a8ccb2fba4 SHA512 3fa3bead601fd0d04f59be7ffd7b8c009d3b31986f2dff444e1398767c31b96cdf6df4926b6486b0f91dbb970a1eda3e884b981e596b0d4f233e89dcaa31a78b WHIRLPOOL 6b4cf850a935d3357bf5af97ed2a9945b6c0946ff79c68940f28626c293a099e6d3bbe0e18335f4c1024f95ace91b0a20d2640f4b613c1c875a63436c7fa26da
+EBUILD netbeans-extide-9999_p20160530.ebuild 3377 SHA256 ca892dd9aad03a6b440aebbaedd80910eaedfeae1ff671c3c5f85b258cd1561d SHA512 01435f91fe82dda69ce7135e867068add4b284fee0bacfa6247f898313dc6bc7215258f80d1fd5c50ee07b5015b625327eea355864d4c94196fa39862605e6c3 WHIRLPOOL 833940e29916f0e24e2ef1039193caf6efd519013476529c55c6527f8940f8eb852e28cf39e3931cb9b243829273522a774f30bdb68db018d04ef38de35658f6
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160530.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160530.ebuild
new file mode 100644
index 0000000..d9f392e
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20160530.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-30_00-02-33/zip/netbeans-trunk-nightly-201605300002-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 1188914..6199d67 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201605250002-src.zip 213747513 SHA256 89b56f89feefee
 DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
+DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
 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_p20160430.ebuild 3416 SHA256 24dc8d153b36f64517cf87056fcb8caef9f7f5b7d2c817af9f845176c547a2ee SHA512 316853d127b31c7e0a0f510ac2d287713b1d8d4919dfe53af579b408583818661a0cbf41b84f3a86a97266ef4c36cde9193adca15515edc681d6915f6f648ec4 WHIRLPOOL 8d1e3af73a61806c153ff1470926c7d2e2c529fa42d8789bf71b78f69fa127e39baec1c0cb8f95c62a03c5ef6f2b9c9488dccf8845570dc99726f3d49ee29d4c
@@ -53,4 +54,5 @@ EBUILD netbeans-groovy-9999_p20160525.ebuild 3416 SHA256 7c55a64823b7b6732b690e2
 EBUILD netbeans-groovy-9999_p20160526.ebuild 3416 SHA256 be1ee8f717846b15a238066b76cc786a50cfff7753ee71e63b121dd10d44013a SHA512 ff10317dfb02d9ed8dbcfdc42ee97c5860a6122feaa5393078f4c5605fb386a85df7b18c4e163d9d2d87a53d8f6b55b5171ef05dc81307d804884c4879dd6f04 WHIRLPOOL d09c5c26b83863ec3608941b9fad7dd34f8d7f4b1dff1b34035d151033bf0a201aaab8b934aca4d5f679df78f6e95a879a26b1e164a9f05b6682c007de4aa11d
 EBUILD netbeans-groovy-9999_p20160527.ebuild 3416 SHA256 0f2f2e202c85daf713c98770e52be0d0c073ab7ee584c55c8d3222b46fc9f760 SHA512 3b2b0b87f80de8e749415853ef46ad84a5c5d9d72844f90eefa460868bb83565ed7f056dc8dea9e22ecb07852122995abe4f5c2cd38e9c2fae995d8f7c1f0598 WHIRLPOOL 6ccaaeb8e90376b932016b9cc84aa4e6fb5db26ff6430e3960ab0d452df4ca7f16c7a0ccb02d286771320045118ea5c85883843f4da93ed27a7f92ee6ab9e6f4
 EBUILD netbeans-groovy-9999_p20160528.ebuild 3416 SHA256 e665a7c01fc1a2d1b677d309eb7f8948f8e6f1f0e28ac44366a6611bd295348f SHA512 4fd0989c9b68477f8c47ce83d85f22ff56d0f407551b91aef0f43e1f6e2a435e3cde6fa7ae911d835874fd7457a1ee6a922d05f78529ebd29fff0d7b829c3dde WHIRLPOOL a52adde743894e8da2fa3a8cc810e69382f4807d61dd758a83e4d04771b0400b2720737437e5ca54fe9748dcb0fd5c043394db69f22bc21daff90fe99d203b20
+EBUILD netbeans-groovy-9999_p20160530.ebuild 3416 SHA256 604d361d4be2383ad30473ba61e48f657bc2719a9b8f4d36165bff85a9470002 SHA512 a3a7da055fb9ca2d099767aadb356219f7d05613352dc3ab093d660ffac45d9d1a52d3f3a2fa3e69e59c911eca1ad9f40cb454977611cabeb16b0c005fd88487 WHIRLPOOL a4f6a6b224d4bd4ece3ca0714cd336e1d07e2d9ecebf3841ac2aae05b583251a09acd5424e9e76f2dfe0c8de6a78153a01b90b2c60983d212ae16be0c77b5acd
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160530.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160530.ebuild
new file mode 100644
index 0000000..db61d8b
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160530.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-30_00-02-33/zip/netbeans-trunk-nightly-201605300002-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 d974426..82dad32 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201605250002-src.zip 213747513 SHA256 89b56f89feefee
 DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
+DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
 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_p20160430.ebuild 4126 SHA256 63e4b6d886348f7f39077305292df0ad29183de98d727035ecb3ef85531d5f10 SHA512 db0f8c1b25cd93d77dab0c65fb4acd11af91dbc665014acf0aeed05c608103aae62b099f4be5a96a7d19f17c12f11b8b9436f05a2a25202889c2cdf283ec798e WHIRLPOOL 00b6fd7f9e4eecb2ac1c58a26cff2e70b9bad1268661aa598d525e41135a4e6d2ca9facff3961a44e4fb6a17561e4410c640bb48bfa2b6b59b1fd4c5b07ff172
@@ -56,4 +57,5 @@ EBUILD netbeans-harness-9999_p20160525.ebuild 4126 SHA256 251213b08a34921e2c8953
 EBUILD netbeans-harness-9999_p20160526.ebuild 4126 SHA256 426d851e07f7b4aecb4dbf0dd7d6bb5fcede49dd6adc57323f5f9dce73dfc458 SHA512 c5196c5c0ce120cbf0f99f5d7086970f2985dd020e989c0818dfb39311a268970a56631bd6989a7ddce6655194417f60888532775cd3597f2de54ced3fb98c5c WHIRLPOOL f0d745155325d6fc65f9953e097b9bbb9e65c4972621c5761b29c603acc98362a55faebb33d05b6daa0791cafca99460e16a57a9cacbe71acdeb64858d29bbd0
 EBUILD netbeans-harness-9999_p20160527.ebuild 4126 SHA256 6ea77d6402426bfd58f582615164c3fd8a36fb4a79e10843fb8fe345ab6c8b36 SHA512 85d2523f2ab58847cc39933ebd7e17c66a1c2c6e9f4b7a150b9fa9ba354e64b31497e9218aaa7b121b267ba0d44cdca8dff3550ceceff269913389bb85dce533 WHIRLPOOL b864cea4fb36f50f228120b337c704128b244ae335caa8657c4437a3e677eb16f883ea4f0e28a9dcc67e3e64c687506de8ffd8b3a08cdfae4ddff0799e62a79a
 EBUILD netbeans-harness-9999_p20160528.ebuild 4126 SHA256 99f5fa177880e85be0724d2aae9fe5e940fed4532d5c59018fa01be4b98c5ab1 SHA512 09c011633e1a96636f11aa64033fcf082952684626560ff48817075f4613af2c42674d7eac3ffea8e4f9f525a2696e60b10c523541f303e7389dd3c566efd4e3 WHIRLPOOL 83beb42e42ef2b659e9f6945eb0519d042bb6d8345f762c667984ddf0ee7d65ebe10b364b134f4d852f5882331e2af8fd7744a359e672d34dcb53916cf6b6293
+EBUILD netbeans-harness-9999_p20160530.ebuild 4126 SHA256 c4ca867ae9a0127cb0e3313c92b296d89208d60049a715f6e1f3e52784be1555 SHA512 72bee50ccc7c0fd2e89fba17865f59c23dadce10c354a8c4aaa5f122d54498f536dddb560721a6b853d4bcef9e2319d28e4819d885cb9c209208d9b16a6272cf WHIRLPOOL 562e44586ad6e1116626724bb9607498ca50d1a28fe9af2cd1f71f307c33eb7efeb7a22eb4057fe4e876520f7546e216aabd909b56c5faeff7a945b1e22f0ce8
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160530.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160530.ebuild
new file mode 100644
index 0000000..708f03b
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20160530.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-30_00-02-33/zip/netbeans-trunk-nightly-201605300002-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 339696e..1a3983a 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -165,6 +165,7 @@ DIST netbeans-trunk-nightly-201605250002-src.zip 213747513 SHA256 89b56f89feefee
 DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
+DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
 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_p20160430.ebuild 30761 SHA256 57128e51bcebcdf8c0e950ec6e6681b7c496388c9e2bc60d6ee78e3edd9cf06f SHA512 d6373d9c2c0359ff491aa30e227332abdfabf35eaf76a64ad1aa6994d33a9ac916d1733b95530b296203e20f9b5f11cea26019776b2341834b0b08ab0fafecaf WHIRLPOOL 21d6ce2570a3992f30a0b445b5a577f3a871fe04368170ff29c1d7bf600b434e273d541880ad66d0100fb4d71c1ba92082f73f49abb26abae5285fe1b4332bc1
@@ -190,4 +191,5 @@ EBUILD netbeans-ide-9999_p20160525.ebuild 30761 SHA256 af3ed95df1e451fb3dc429c86
 EBUILD netbeans-ide-9999_p20160526.ebuild 30761 SHA256 aa8fd88f3ff99839f86621747c14468edb5b7a17fd2674d7f818e51c22e66ab0 SHA512 a6005dd66cc846cb911435e51b630ce9a2373c61bd5ea086fad16ee0240929707ec2385626c6a970fd2dbac0dd02eb6cff7297ac0b616a93544f21d527324183 WHIRLPOOL b54d768432f1d48822383bd03fa00143ac588c1e660bf3ac2dfa79068bf9c910e53f161302048c2dd966d1dfe2a34e7f59d8aede8930b1345c947b57aac242d8
 EBUILD netbeans-ide-9999_p20160527.ebuild 30761 SHA256 30a7c01e43ea6727c41f308b99f970f1746c1c88d42e3d67357f725305855222 SHA512 304c7aa29e132ed0a7d6dcc5e96ad57c7b6cf22807f4580bb4505a86cf2583dc4a8b6930ab0678462707df81bd97076408aa0ee7d0edbd923aed7116aa631af7 WHIRLPOOL 46e57e5010ce719a538fbfdef4e090fc9d961923bce888e2c7d186bb4f281a607fd66991d0536f3760259806bc5691590fb76742402fa54db48121af7efb2f58
 EBUILD netbeans-ide-9999_p20160528.ebuild 30761 SHA256 f96ccfd9ca8d15d671c2262f1e1b88b18f650567c313750cea011fcd6886a7da SHA512 1f19648d50f20876ae1ca79da4e79d87fe876d87cd113ac4a876ef77e0c4503e3bcfe1e233e08a9edbad5a4f97f980c789b087666137c23874d22666fa17eeff WHIRLPOOL a46f961a1d7d19b42834bf67acb49247a7efa7877d21a832224dde769aff62c7f4505f531ac24fcd516b06a1f9e7c9c527b111d7d644fc85dc9fc94595034b5f
+EBUILD netbeans-ide-9999_p20160530.ebuild 30761 SHA256 729d47fa65bda0ffd9e451882d14fb7a046bca4b429a6801243db70fda2993a0 SHA512 1dbd30fc7b3229e3d5e46068a53008d4e364913d03883cfbb38e043eeb2f04873045b3a6ee89945576b4df872e636c4938cc4252618c15a05c8c7a58f2988d20 WHIRLPOOL 70311879716c5927aba8321f9e919ccaaa508bd78f55fa11727d9c24599ce949655bbce7d58463f345ed52909204a0f026763daa1101a29cb9983e3b45ececca
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160530.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160530.ebuild
new file mode 100644
index 0000000..747d2e5
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20160530.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-30_00-02-33/zip/netbeans-trunk-nightly-201605300002-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 ac376e2..000ae71 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -61,6 +61,7 @@ DIST netbeans-trunk-nightly-201605250002-src.zip 213747513 SHA256 89b56f89feefee
 DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
+DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
 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_p20160430.ebuild 15656 SHA256 25fd51247bc67e579554cd2fe817c5ff4bedcd3ca431f5a7f7d4a4cbf54825a8 SHA512 063bb5fc4cacdfda1609193fe6a34fc1f5d39e84745ec2c2cec8d9bf151d0f49a41ebd042b47a73e33651b112abe8801d59f798a5f0051d37a6ffebab19d4605 WHIRLPOOL 2414a92762c16f3e3ccb08d8e9882dba4de2cce320dbd28b086f95ee8ac485ab516532705f778becbc9cc38898288bef3dbab97a57cae10b53d71f03b63079d3
@@ -86,4 +87,5 @@ EBUILD netbeans-java-9999_p20160525.ebuild 15656 SHA256 75a7cf5be55b519589092165
 EBUILD netbeans-java-9999_p20160526.ebuild 15656 SHA256 7ab21a594c4dbfb50403217ae8ae32613bdaad67d92035bf725601a23836b53f SHA512 3a2ea79df5dc4e481324fe22cb93bdd59189f22fcf92b333aaf45e975bee73192a732c2901eab2822d2e5bb4f7f0f02f5101b554734317b1b2bf96021f57f0a4 WHIRLPOOL e4f0aef8a47f2065c9256058588603975c2612bb3a3e20e990dab86b467ce7d4b7102091904478a05bed8e5d9bc5c4f75f332807930f4a6bcfbc9d969ed27daa
 EBUILD netbeans-java-9999_p20160527.ebuild 15656 SHA256 82f8a59c3f4d2173ae303f5f9088cfe156c31a9856e0ae1db15531ea9c45b975 SHA512 d6bff5d1324e912f7ad385cf8f2ffb1922ce9e498924da16b25f438f1d3ece1d83558e42839bdec39bc744e1d3ad8e8c6b1698a6061c331ffeda3adc3a1cc798 WHIRLPOOL ef578a7a426cedbe3cf42bc31aca392f280bf193df244e6a86f71f28135cec15e0827d3cc59b9accdf08806d83b78e5db9b058f806e05259e70b458198af08f4
 EBUILD netbeans-java-9999_p20160528.ebuild 15656 SHA256 6dd45030be2a0858ed1651144cf484f6cc5e4d1dacc06fa6005d55079b8290bd SHA512 58ebbe7985852cd6613875ece3322fcc0bf3dfc6993cdf9009d9fdcd51e35b21b53071b448883d78bf8650f9549e11144f6dffb5c24bc5ca9c2055b4cef208a9 WHIRLPOOL a7e93b5b94f6551521040bd10bc90dbca666eb83594db9716d2d6d0c80d8d02446bde557844691c8d052a75ea8445410eeddac218c698336bf11473ada7b369f
+EBUILD netbeans-java-9999_p20160530.ebuild 15656 SHA256 1b8eae5cc69ee5c52d22ee4877eaa52e1f472ee530f21815ab48e34ccbbee3b5 SHA512 6a907af9f568ee927df9f10f7564182592fb6cd448fa163294041aa5f5070a197426d954f6676e05f5e0c6c40fa49fda5cb4426c922805ed502d0183db314fbb WHIRLPOOL 8be5a9d7a20549a2d72c3f14fc15ab5db8836459042409a112e2f9de2dc9e21c503cc22d41230597f023b5c3fb97870b3194bab32873fb4ff51ba6f2766dc287
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160530.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160530.ebuild
new file mode 100644
index 0000000..783e880
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20160530.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-30_00-02-33/zip/netbeans-trunk-nightly-201605300002-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/B732870DED6CCA71896B0D8913C7035E396550D9-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}"/B732870DED6CCA71896B0D8913C7035E396550D9-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 9efae45..dedea2f 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201605250002-src.zip 213747513 SHA256 89b56f89feefee
 DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
+DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
 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_p20160430.ebuild 4971 SHA256 20462176c170768faffa16b9eac3f2349caea337dafeacbf58ad9778924ec032 SHA512 347b7f5473f750d9a57149e9ab317a1be360ed0d27007d521920867de1c1ceac62343fb79f05589d6132bc42c447e00f9821bf139955a52344cb43ce30741ea2 WHIRLPOOL c188dcc97df4ea053513e7ebce5c513609ca87301bd7f326e78433c1827dfc70ff7caf470a01cfc2dccaa5389ac64c2c0b6d7939c6f3b7c10eb7e91c70e7d401
@@ -54,4 +55,5 @@ EBUILD netbeans-javacard-9999_p20160525.ebuild 4971 SHA256 7bf29ca24938c787b33f3
 EBUILD netbeans-javacard-9999_p20160526.ebuild 4971 SHA256 78ce43ca036f26420537eb05b34c6c0079a8d16899c6f4a2c95461ab9ec86153 SHA512 e1190b0a1fe0e1f91a71fd9bcd9ebaf1e66a87d5866b0c08c883fb37eb98bb267610289068bf14b0625385fda1c568851901e143406b1b47050718a09c45d56f WHIRLPOOL 48a011eb8157d25349659c952d51ae4178851345e0999c2c3cc9ffbd0879008355874c80eecd4923f0c7108a3fd3acf13a19b81486c6e5c3f00d6227d0d82ed8
 EBUILD netbeans-javacard-9999_p20160527.ebuild 4971 SHA256 53b3a9fa460a828eb7500f8be6ffe71a692ed829090b81e866ec5c2184dc3fd2 SHA512 bad4d747cd0fdbecd7ad142690e4b5ca7274fa7eddf95189ab4553bb80c2c16202d98b9a35e4878a96d4bd462b76ffaf5c4cee9fe3522191c624d1fb4b223c8f WHIRLPOOL 9a7ab13755a4a3f3df80c530a04980c0f1c504a0bbdd51fcb80600e888a2b35fa4b0b26cf4a19d77357681d226379ca92016d9cb3f121220f7f4619b614be7a6
 EBUILD netbeans-javacard-9999_p20160528.ebuild 4971 SHA256 540550bc4c687bd48bb77fe687b97f392fc0204e30ea9939a9d2d4537ab35999 SHA512 bd132115990a1687bab73ce04621d52c4625ffc9e00075ace4efab6e565f80b76bf1d8781a2b0f4e861bef04b7bfb24d5eed6c0c782c4d9e1567cbc39be7fd14 WHIRLPOOL 2340d8fcb95fc5d562b9717cdded960de68b770f44370a00d7af2cc7af98f16220b3a72711d76c66516613c5dfbed9fead249d560852383dc29d6c8b85a20bfe
+EBUILD netbeans-javacard-9999_p20160530.ebuild 4971 SHA256 8aed47e3d3a4d151cad6366d8a8ab02c52464cc372ad2aab9023f9f646eeea45 SHA512 e813fa58fbd5ca2dcf0b62bf5b7f26b5ace2c954cc673f99f23b4ca2a5bb96420c9bf0f985c40943096cc539d5064165facf25528c130476d8026f7807653613 WHIRLPOOL 21af88b8f80b9d13fb1b5603a5b8a8d5d22a443887e6fe5394cfd5956bc8b0e4e4f848cd147afc0fd1d0ac964874f91f9474dd74eaf626fbec682c6f0b3ddf3f
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160530.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160530.ebuild
new file mode 100644
index 0000000..a12c415
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160530.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-30_00-02-33/zip/netbeans-trunk-nightly-201605300002-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 82ad9d2..0fe0ff0 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201605250002-src.zip 213747513 SHA256 89b56f89feefee
 DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
+DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
 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_p20160430.ebuild 6293 SHA256 b13f5fa58347a57d13391a3b465d4cd480c1b9c53ca3ca4769d8b06d5e7c31a6 SHA512 dfa6d5e3a2b64054c64c2943672eb5b65a70762aab2ce38ddc33d6c5febab3c8c647bdc9dfa27cd421788d437ea50849e34e621250c3b98a0997ba949dc13471 WHIRLPOOL cb506843d1adc9ee7c12f991f2bd83f2408705202945e4335944d980f7cbf318be1f2ace525b2a0f9c081c122b8dc8b0111424bf1ad27d369e98f8085905432e
@@ -53,4 +54,5 @@ EBUILD netbeans-javadoc-9999_p20160525.ebuild 6293 SHA256 de3e7a2d178bcb77ec8c79
 EBUILD netbeans-javadoc-9999_p20160526.ebuild 6293 SHA256 8fa5191a0ac5191df7f812f391bdade4829283bb7f6044e64c37324c24d8adc4 SHA512 8dd2d609f1badefb9d55af6a51b7e89ceb774d589b1a4f8ff845826fe2f8c0d43261b959da89404eddf68fef1dbff9d7af097a44cb4f87036bc8cfc6ac252902 WHIRLPOOL 969646b20d660d40ad6a8caaa72836900b5ae85f83b3a10493f73686e761abbccd4e144a7bf1d3c3cc7b7e98bb672d85a3d091ae7d697d6910cc52e19a863653
 EBUILD netbeans-javadoc-9999_p20160527.ebuild 6293 SHA256 ff75ead29a2cc11526903a4a47206492af3ad3b97411c690f4a0b5fe0aa0b3d2 SHA512 b5c233c49cfa52a8c06ba5851f2ccef84528ffa0cb368b42ddf186092a38455a684458872ec9bd0abf65ee048495e1a25b4e52b9c94ab00fdbe44ac5d1ab217e WHIRLPOOL 7f4284e14b082a75b148f318ac4759ec692fb39a1a801fda68138982505c25db8150f7ee4e6267a626adc62967a54b539e3f775315103ec1be3d530cd9b56ab5
 EBUILD netbeans-javadoc-9999_p20160528.ebuild 6293 SHA256 1819bdd300775c2e68859957bd2e494f5712b87e3c71a3b4a17da1515310a0ac SHA512 c560c0eb3f21c2cfa8f7eb940998332268b8566eba553dc5dd9bc83b4f3566c1a2c909c5a2a7503a4da4ebd01c8f70eb016570d85584bfcda33344614946303f WHIRLPOOL 3fd6cb40583c2b6a3ed056013e5b3ee95ded71f0586c0d4d48211ff89fd64e3c635ddd1453aad3b77249d4edd338aaa5e553d328af99651020da2e8a9c2ab46a
+EBUILD netbeans-javadoc-9999_p20160530.ebuild 6293 SHA256 4a30ffd321e2cf9d48884e5558cf10f59b851dcd8dd0ad611752b4945fad6507 SHA512 c639dd17eaecd5a6fed55eb537306ce388e020be4aed9ffec572d1a928d80a880ee7834b13012f3a65b1d88a058a64c3958f2f24795f9e4a0f5ed21e8f518b1a WHIRLPOOL 079267b3edb4803f49151012b8e48b4a8e50a69357143ee5c721a8d39f9dd04cdfdca81120ee9df871ebca1017353d8264eba13fb5f6499f606fd5e3a49844ce
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160530.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160530.ebuild
new file mode 100644
index 0000000..342b663
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160530.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-30_00-02-33/zip/netbeans-trunk-nightly-201605300002-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 a45187a..eaa6b67 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201605250002-src.zip 213747513 SHA256 89b56f89feefee
 DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
+DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
 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_p20160430.ebuild 4717 SHA256 e20cf78022aaa6abd1a010ec306c78a44b18e131aafb29f76dc85bdc3cb4f137 SHA512 4de45170fb042c9442bbf9a21219e19f65cad2949ba6d8d7b69b150945a435dd884ae477f3a495b7d9ab48f5ebf27351da5f6b63d80fd3506655ef867d181ae0 WHIRLPOOL 8d3254d2ca5e60befa50dbe28b34e32b637112f4c2dba4ce74bd41895c68eeca5ab446f06a4833c036f32b68ebc857bda23d81ef0b5d7ab394391737a84bafc5
@@ -59,4 +60,5 @@ EBUILD netbeans-javafx-9999_p20160525.ebuild 4717 SHA256 c15b89ecd88d0e1697d5d23
 EBUILD netbeans-javafx-9999_p20160526.ebuild 4717 SHA256 4225476bd2157f41fce02dea5997d9241c5734a6f523782276cd0e1cc8446797 SHA512 88beac29101918cfb7e51ae9f2facacc94959f6368f15783837e29c43640f166e51fe1b021635c15f3e4a426b3ccc253bdad90fac4b1c93fb23eb30edda8396d WHIRLPOOL d6c35b42954f656e44e65524d049f940a6e357aa40f684cc120a3cc0cff79fded39a42a2dacdef95cdd04879897bc430eac77b5d8e63e67c56ef6323eb9e8b0a
 EBUILD netbeans-javafx-9999_p20160527.ebuild 4717 SHA256 a3378dcc1dcc5f3e9404fa2d4abcea51f5db5cd146aafe6d86dfc109d61c03b6 SHA512 d56a70aebf8613e15327844fbea54ec3d31db5a5037d2af8663bdef320c048a7c1e34a0747b901e0483c6a083627e2f88f01151d65bc3dc3cfbd5c987820d97d WHIRLPOOL b08b97e419e59d58c0f1f0a539a03d3ab135adfdebd32253953997e3abd472935b336256e1504d19b1b8aa91c79600576d98504479fb86bb531567fdd47db62f
 EBUILD netbeans-javafx-9999_p20160528.ebuild 4717 SHA256 a6768b7e080c378775cad95ceea1cb37f280c3995a56008eea5d16d2c9b0ab68 SHA512 2864481bafccf49f714b96554713f7142de1265d23526fba1b82c104e7463c8be4dda95eb1f9b19ca824959f579c63d0e9367bf994b5f29609c178bc234577c5 WHIRLPOOL 7055fb8dd6da8d93c1b6e729b7851be87335b279f61442982ca5a044b6f241bafed60f8c901de980a6ec829601c329e2f0767959994ab372acbfe261d32ee4cd
+EBUILD netbeans-javafx-9999_p20160530.ebuild 4717 SHA256 8d47c484169039f422ab26243e9759920de989254eb8d36d229f03a9e846072c SHA512 7706da460389b59cbe9932b4927901168af67be0d4eeb690c261c66bcae9c765cfcf319310849ffa8aee62a20867cfa6dd676733a5536303364cc627959ca8bd WHIRLPOOL 990455ca21ef0e5b9ddd2ca76d1960b7a2eb3088193ca12d732ed4dfa8dcbdf1d5c9ebe33de58ddfe814f9ec922aace5a18f1281097aa95061ef210ec80e5251
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160530.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160530.ebuild
new file mode 100644
index 0000000..d539345
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160530.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-30_00-02-33/zip/netbeans-trunk-nightly-201605300002-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 7130936..508b4b6 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201605250002-src.zip 213747513 SHA256 89b56f89feefee
 DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
+DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
 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_p20160430.ebuild 4412 SHA256 ab0ad76afa579cadd04c3606a41f74b8a3cbc15d621d4f3172edef54bc8be63f SHA512 d43d44e48d7e1259bec1aec7d1d508b594f1f4abe9e2e227726596e52ded3ad9b92982f1b054c8a88bd25bc77c34b0d5cf891d734ae943db10e514dd75bcec77 WHIRLPOOL 2767ed53a47cad2dbdcb39755247485b37bf4cbd3d6f4caba24ba5dfe4d3730780594e1e8327a9dfcb73fb8937d1fc8880e48e11279b4c6b0d7c8afd185cf36e
@@ -51,4 +52,5 @@ EBUILD netbeans-mobility-9999_p20160525.ebuild 4412 SHA256 62229014579941a3187c1
 EBUILD netbeans-mobility-9999_p20160526.ebuild 4412 SHA256 08e99f6a150a8646821e68f3cfae74afc8da8c2165056c31965ad97671d3fce7 SHA512 078206786fb0ebce9f7f439e9038b3ece094113d6a842842263210e2ecb9527c32dc0164eca238aaafe9d41c6fb4d2105c55f02ad61a37b9ac73d92df303359b WHIRLPOOL 80cd1e1db614f23fed21b3225e9b0546ecc7574e569ed411e39f6bf47007f50fe3b0586d6bf4e580c3be7ffdf80bc78c56ef0a99c4a91706ffa7047008f5b640
 EBUILD netbeans-mobility-9999_p20160527.ebuild 4412 SHA256 ed5ed3bcc24bc10c7cf4a1a13149e8913b13d0714c0b6b124e3329b61cba840b SHA512 f0e71dbe8fbf0810ec38e16317551be93d75baf0717e7345418a8e72970b6301642acdfaa7d335fb5b693f3505679421c52a9b221dae152ae9d26dc1698e7b0a WHIRLPOOL 227788711dca74888fff365b850c7a0d71f59ff834be6ad0f47af676f454c58ad9c02f5d54da969d30dc8a8dd178fbc9952f136a203e3106257a41d20f5eede4
 EBUILD netbeans-mobility-9999_p20160528.ebuild 4412 SHA256 8d5a5a9c719ae131256033cd64457e7bdac10b58acc7bb0afd6bf3e7d910d492 SHA512 02fbbe548076277b229043b61fb411aefcc04fc10caf84754ae8c7a3b252736aa495a10d06be6fc0feee466b0d16b390e2cc4b22e432b03d084735229072b6b1 WHIRLPOOL 85561167229adf05bba05c7c92549ee111f3724feea68c5b0da824bd539a912d800742fd5d8388e1cad7b0dfbd41ce8165e8c3979116e7f328ab9ab6d8a8afa9
+EBUILD netbeans-mobility-9999_p20160530.ebuild 4412 SHA256 d28b10e50afe7913493d1418b41f70c956226228a2c4914ffc4b9b8ca312d1b6 SHA512 d5d44e26ce875490dd1da9f6dda261e42383b33ab411b56cf91f464ca5356136e27b13be182b78a19d67b4b387b003b78cf496e16f05d2bdba0de80b44dcd353 WHIRLPOOL 9e488789123eaefa971aba6e285ee128119306babd06e3c763c989c4e4f61f7d54fdf4ce89a6b247666bcac2f3ac64048824b1f67c01d79b73a7da21e5c10073
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160530.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160530.ebuild
new file mode 100644
index 0000000..dbe03e4
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160530.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-30_00-02-33/zip/netbeans-trunk-nightly-201605300002-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 bc5784e..2f52d00 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201605250002-src.zip 213747513 SHA256 89b56f89feefee
 DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
+DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
 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_p20160430.ebuild 4111 SHA256 a8877d3574e8c1bf748bf75cf5be70f0e1b5e1c3a1fd5c34a8492e7bf01a4f3a SHA512 44727305d56021bf57a8302ba2deedd34538ec72b602b485cd0900b9030e3635e7330b1440f88478ec0112610cf646dc464f03a7dc53975975ab78ecd967cd74 WHIRLPOOL 47329420a5768e92f153f99de5588bd1aa709b652ce93281775beb64c11ba9ba07985a552dd0ae776a786157157d1c7de2ece5a52095b0cc499e89fb84963e80
@@ -54,4 +55,5 @@ EBUILD netbeans-nb-9999_p20160525.ebuild 4111 SHA256 c0191a55bcfd6db0de1ddb5e66c
 EBUILD netbeans-nb-9999_p20160526.ebuild 4111 SHA256 e931fffc71d94a04205eadbfb0de0860b452ae5736f2306bb2bc152f2f38b349 SHA512 f62400f7255598b7d484095298b8332ffda0591019603e1c4d46c33eb053c1cf24f3102ff1450cf778f7d00fa1c39b4074d36196bb967308ab51c516192bc84e WHIRLPOOL 5a0abeb8b9df6132e2671179710b2323e3e13b116f38d767c279e03be1a08bbbc27ab4e71037bb1bfcf7c670a95aeaaef7e0fa2317dd4ac84c6a4cf247f1e1c9
 EBUILD netbeans-nb-9999_p20160527.ebuild 4111 SHA256 a6dfefd5ee97a3a17f592ab00b3c97c9ed3d2bb6971c0758b215f65a70907dd2 SHA512 bcee6f396b2020052c7723d30d8447efa54e1e2a7e086e1b4ca5a45edccf452c11ba1c6a08487a7b354a76ac110004f7a99520ab7322c1d5dee7d18e2189f70b WHIRLPOOL f30344ef2098f118261d5bdfc1f0a7dd573cdc491956d36207fa5b609fbb51c0972001d9bb64976ca8fa22f896da46023645a3900404301d40eba3494d6fcbc0
 EBUILD netbeans-nb-9999_p20160528.ebuild 4111 SHA256 59330ba4b6068e00b552441f03f908a7df398b21d909410a26e8d24013ec05bc SHA512 dad57262798f5567cfe4469fc144eef0e9a061326bc426670bc533ceb0f636e5fb8915facf09a7e7c5b686deb9cf3436a28f7a57fbb520ab56201729520fd649 WHIRLPOOL 13d6816b75dc66ef5c794f1ca5ed82d0e77854e432e4b6226aefe78b501f3010d0104a9795004e505d907daf44d6a4963ad08f3c70490ed5f3dbbf6be59cd4a3
+EBUILD netbeans-nb-9999_p20160530.ebuild 4111 SHA256 894ad7d26fed0945f1a472f8812f3509ac426844ad7bad373d1ffcd35eb41218 SHA512 c71b4268dbf84a3e9313ae4d5a1df700e5266675cdcf00c533985dc0abf6d5160087a43c176c48eeac3d69e689835ce686ef9f35f495f9793096560b6b8aad79 WHIRLPOOL cf7b1672061157a1c600b75f638131c4bf7e69305759e25033590dfb14736e28c8c60dd163997fa2794aab0c7061b911a73c84538ae588393ee2ae7c13905900
 MISC metadata.xml 392 SHA256 01cdbcc83099b97486bd7b8e813e5b19c1138eb0d8d3e8a5683aafd579820435 SHA512 4d2f9160baa022d6a48b61d5f42e71cfd411d244e7a36436629bc5ee4036e4ce19079134d9a6c704ebe942306c2e0199d0591c1e54f92f8f3c8835147e639246 WHIRLPOOL c1131764e1cec66c56b977ebe36014b29e5a68e35ccc326c0cbadd050a6c625cf191c85c212e0a733661c008dab0d99f9a4cdc4c4ae0cc9d775ba1de554795a9

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160530.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160530.ebuild
new file mode 100644
index 0000000..daf8a00
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20160530.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-30_00-02-33/zip/netbeans-trunk-nightly-201605300002-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 845fd51..a84b070 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201605250002-src.zip 213747513 SHA256 89b56f89feefee
 DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
+DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
 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_p20160430.ebuild 4418 SHA256 c46eba4967a823c3b5a26edf651faedf16bdc9459ddd64b7874c8fa3a6af11ce SHA512 35cc623e4374520ea6305a7bcd247ced8b78c7e827c1f541e3678503fa1bc7b5008cc45e7137bd521d19c5c1287219b8dbc7999edc87e84d9a07e96938dc56b7 WHIRLPOOL 8a3252e718c3c4bb07399ed1f5a41e3ec93de0757120ec9798325742dd52cac8b07c69028516aa0a9b757ec794b7d2f4f1ccf0a1d504c4f58ea3f62086ac6254
@@ -56,4 +57,5 @@ EBUILD netbeans-php-9999_p20160525.ebuild 4418 SHA256 ee73ed1101b0c91c105a8f3aaf
 EBUILD netbeans-php-9999_p20160526.ebuild 4418 SHA256 539f53cd6a9e911a052485e7bf5f523293dfa9991b34d23ef8b12a2e0867ade2 SHA512 563bd8382822108144477619c6ee105e6a2961569f3bc699d5914ee46d4815130ada2c214a770ce4cbf94363f63b09531cb540e83b20c91b6ef481e20bfad081 WHIRLPOOL 98cec862c50ed659e6f8295db4b6ec40712f257c75d351eb418873147fdabf16adee232233b5f1fa12d8f79925b5508b5e7db24c014d64c1ee9285761b7aaf58
 EBUILD netbeans-php-9999_p20160527.ebuild 4418 SHA256 a14c7a641f7f0b4e73f3bcf74bf783c0b93d4fbe871a1b5e522da7e98c58a166 SHA512 66dec4856192ab502fb4b702b2b73021181c16c232905eca73d68e049433603e4d2b7c3779a49d8e5b58a24d5b4fc1b90a8dfbe28659e33a1aebfd6566a770ed WHIRLPOOL aeb8c177b49be01b55f83155aa64ec9a132eeb2858e04e552b03189a62ac8a0aad115b3012d2203c3bfbb33ed11a7d41bf8b50eb6e116c2f55851b9eca5639c3
 EBUILD netbeans-php-9999_p20160528.ebuild 4418 SHA256 89f59ed6c89ba5e6cbfb4ed92e7a0473f8698a888cdbcb3d3664c5095be265b0 SHA512 d861bb733db82aad7e69d79e78ee997a0b3da2982cd36c463f5b14bb44e97732acc9eb928aa98081cee1cfd1f0c685e3c3039a65cd699a7186e730427ee6e588 WHIRLPOOL a86c2b18877287e331e0f9318d775388ef2401295b5c9f5df933016c11684bb92a3d959bcbad8b6280e4c4d8d2b828bd30995a4f56237aa9334d8a305d7f0c99
+EBUILD netbeans-php-9999_p20160530.ebuild 4418 SHA256 81d6ff1ace4684c8e091e318c5ad27739b204e8138be984cb62fe11e547ff2bf SHA512 60aadfda9de85fc255803fdbfafb9c3bc19bd1be035adb0cd4d135005bb6e5b3c70ad658d2d1c462e7dbc759459fce57dae0a05cd2b2bf85062e7c9fb4b7914c WHIRLPOOL 3036c97558de84352415e08b90b4a233995ee449e8cc2c4ec18bbb849ef1c9b10d2958c01b4d41abe9fe4685e7621ef91e45a30181176793bd5a039cd5cd349d
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160530.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160530.ebuild
new file mode 100644
index 0000000..0be3878
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20160530.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-30_00-02-33/zip/netbeans-trunk-nightly-201605300002-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 d4e690a..9b8df4b 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -52,6 +52,7 @@ DIST netbeans-trunk-nightly-201605250002-src.zip 213747513 SHA256 89b56f89feefee
 DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
+DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
 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_p20160430.ebuild 9520 SHA256 92dc097df1540dd297899d2751f6b292a77dde24e6a1b8ccb21a6d9fd47223eb SHA512 e1f7e6d14ec0f7a6acf33f18d98a44b7eab25d69ebc21dd24abcb63819157727b7f47835d1839c30d4ae6abba20241fef94e1da4da93faf2a9a36c41b179b79d WHIRLPOOL b157f4184a6577fb4438258517b92761b7b15456e4912ac017072ce5e7564a35e95baaba2627e8ba7a1839b550cccaaaec417cf69a15a7d6b813ccea1eb1b07e
@@ -77,4 +78,5 @@ EBUILD netbeans-platform-9999_p20160525.ebuild 9520 SHA256 2f2d5cdb8e76728e2de31
 EBUILD netbeans-platform-9999_p20160526.ebuild 9520 SHA256 258a40482a2e3a2f2c95c9d01ea629812a818387eeb2ef8086ca5324935a91a6 SHA512 f78c19a870b32734cb60154a0ab0a7645d9171cfaf280aea736bfc008cded701043703745d8cd273dc7fcd0622f9bf40bb63ee4bda8f8d45c106c8ffa041a86b WHIRLPOOL 0a31f9dc97fd2fe961dfb9619005e95e1f7c26e66b32f9ad50285ebb2b1048a1db6db43598bc2f9f8c26ce4dbbdb2e6aaa3b610c33f4ac221eff187c1ea891c0
 EBUILD netbeans-platform-9999_p20160527.ebuild 9520 SHA256 6182f4e93aeb1875102826bba91362b9313a0e3f23257d7d02b88f4d1b641132 SHA512 b5030e9f64ad6406ec887fd6fd41aca394e5676cabeec574aec0ec4ad1db38c97e44be85fa46d88573c9f9f611a5931d287db55610683c86ffe41b732f0d55d3 WHIRLPOOL 0c4a9bc995979e3e7f5ecc1e4634cc798b83f137e7ba89e3a91168654cff6a45dcb80e0cde934c34a959867553d7445f26d8422a0fcd3e51f1f02e19628392f8
 EBUILD netbeans-platform-9999_p20160528.ebuild 9520 SHA256 e8ae71da574ddadb2103716aa0c511df722a8c57bed50b849dbfecf0939ccf82 SHA512 2bbc29ff5ef604b029590b4021f3caca21a46bc2876370776f665982032df896e32d49171c1046255e7b015fc51a3298264503eb7456a26c4d8fd5171bc28513 WHIRLPOOL 11a7e0b2dff87a673b720f9aa92e11fc47a22d1e22908cfb62c1ba8efdcd2702b7312be08c9e80d8db628dcb8a81951ad5296f84304917a75573136f2387104e
+EBUILD netbeans-platform-9999_p20160530.ebuild 9520 SHA256 76304dc6ed4405b46126d2b081d0a3dcc187825b92651b26ac6ccb0379e81876 SHA512 a9e4db74a54d19837dcdc52c1d04a2ed51d561ba8380da9a2c31e09ad489548f4d114e9958d552cbf9b8c276fa6bdda735f7bda237fde63e5229b7cb9a6e89ce WHIRLPOOL 9adc5f9dcb52ac33d08019b694d245bac8a397d8b16a9752b241435bda041b6b110d160817fcf846e056cb7037307450c0016e9d5b6b2a80aeb1d3d79f6b3e5c
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160530.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160530.ebuild
new file mode 100644
index 0000000..b420e70
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20160530.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-30_00-02-33/zip/netbeans-trunk-nightly-201605300002-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 7495b66..e526c27 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201605250002-src.zip 213747513 SHA256 89b56f89feefee
 DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
+DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
 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_p20160430.ebuild 3472 SHA256 1fc86d7b980203ff0b59dae607a92117db2379423c096014fb67d897b75080eb SHA512 c6e234e3d8356a57e3e45a2318a12de2891a288bf8342b4cb12379df6885fa935cbb7c84539c5176c018ac3b2451d8d140846451e4a553a0a761b8dad120fd0f WHIRLPOOL 1127184708d513d8bb6c689a02ea508101e5892e229a773be8b5628cce6aedae75ea56e15677cda93c394904578a8bab145ee4c16197363600107e6503a7d434
@@ -51,4 +52,5 @@ EBUILD netbeans-profiler-9999_p20160525.ebuild 3472 SHA256 43b44998a9d7d396856da
 EBUILD netbeans-profiler-9999_p20160526.ebuild 3472 SHA256 9c5c819930b714dd0dfa69331167ffe84f3e1f64091a2bf98bdbb193ea5d02eb SHA512 6920123dd625b37f41b0fd7fe6a56264737003ae056db050e954a41a7c9e0344247214c7be51ed4bd91e923edd1ba453540690bcd9491a07c5f0aa6bbfc04a8b WHIRLPOOL 9e12ef4ee182fd6d4b9808adaf2f5f0264a93d7a1dbb1e1a0fcda61ca0bcdf4b967820485c462eaa569663c9c4a04184dd6e3f79cdb61296634cb24505a08098
 EBUILD netbeans-profiler-9999_p20160527.ebuild 3472 SHA256 a606cd9bf4b3cd59ab6f6837c30a87030073c1c3f99067074b4a9a54aeb7ace7 SHA512 3d6530b60d7fbab5c389813df9a9100f630289a82301572f50158492c2f624fa6c36e63c79c6fb74b7cde690aa6a529a20b9fcbf7bb4b0d973fe10126fba91eb WHIRLPOOL 33770ccd6c966b016d6627bafc8cbc8019972f01222fe09957d1cd23ce4cfa90c62fb11b2782f975189ca510a6b27054629f3a4cd3ac8e435734a1e582f958d3
 EBUILD netbeans-profiler-9999_p20160528.ebuild 3472 SHA256 8a49898402a8dc8a616ab2ac090bc203a5d1ab18d51d0ae84beca00a10957654 SHA512 51aeab139a508fe6b722ce6c7d88b11d6f6554d1b5786d5163a2a0f09d4b0d4398673087e5cf055aa1f46e3e2f210b02347d0c372fb1205e52419620cabc78df WHIRLPOOL c6e3b7cbbac535dd84894cd3ec76552a57986d6f7406a36644da7f98571e519691f4803f4841b451564fccbe2a58b797b7500c0edcbed9fc8512ab6c57c250a0
+EBUILD netbeans-profiler-9999_p20160530.ebuild 3472 SHA256 f4891cae7bc0778360ade4015dd259f7f3f1fbf034c907bcd238a59c4f5da8e2 SHA512 bfad3027bb756de537d9d50a4195ae021914323e75ae5ca8c41a5af3b42f2e04d7835ed15786030a3fa0e2169d9d4215485bd73917d7121aa8397c10218012c0 WHIRLPOOL d785e33a7b45710ecb9a0b5d50151ac37f60a2878461995b5e53e5557efce758deff13711d3f41e0fa73ffbbca266d311adfc184db10d016e900897c69fa2520
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160530.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160530.ebuild
new file mode 100644
index 0000000..64ef13a
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160530.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-30_00-02-33/zip/netbeans-trunk-nightly-201605300002-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 679027d..51cc188 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -41,6 +41,7 @@ DIST netbeans-trunk-nightly-201605250002-src.zip 213747513 SHA256 89b56f89feefee
 DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
+DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
 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_p20160430.ebuild 5343 SHA256 a83105795953f4a336d19ac139a95984dca2a9d08dafcf44eba142f09f1ec340 SHA512 8588b4af4197bcc3958840bb3700fffce2d67750216f92bacb70e9131ca54d0ceb3340bf1282355ff9c68de50872236446909cfedf779c72bbcc922fbed91aac WHIRLPOOL 60246009e21b3e7e14d5cb36ff2711c3a9ae79257beee5f033080720cec4d8df06bab3c1b40c4587c0acbf1e8ae6f8f19c1e62418b9a0c234ac9699a7e062d7a
@@ -66,4 +67,5 @@ EBUILD netbeans-webcommon-9999_p20160525.ebuild 5343 SHA256 7b3276a21b03a8fccfc0
 EBUILD netbeans-webcommon-9999_p20160526.ebuild 5343 SHA256 641c9053ad1d10625552c0b8564dc0f0f2e47c92bfc3ec076a2d255a5fcebbf5 SHA512 5d473720ff5e7d35e6cf03d29575e5d517fe92a67f652a82babc25c9a255c09eccdc89d68c1e48c7b2e19c0e265827cca3572ed45df445c27de07bc41601ea00 WHIRLPOOL b1ba9950f0cdc9aa10e98e2821c5ae0c9ade328fcac7e86554092a9dcfd276ef3497ffa84f66f85b2b630e6a9ab708ee7730c9a01ab94cbb1f6a4a06cacb6fc5
 EBUILD netbeans-webcommon-9999_p20160527.ebuild 5343 SHA256 0a8def86900796e0200f07ec7dc461f19765fcf6051d7a394d55d5b343510153 SHA512 fbe546b3c51d7c84779b1ec88f9894e3bf74bd76d0a4badf61ad39b154e51ae78e7a172a5bf7cd71a8872d4984661203f087010fd225ba9002b87c3a1a00d344 WHIRLPOOL ffab5b9147ac7c4fc49004d4dd0e8116e6011baad4aef4a8b46214dc950b7d6774622b13cacc38a8f50f4f43b7e86c4e96fde45d6a64f3f7471b2a1fba3dc675
 EBUILD netbeans-webcommon-9999_p20160528.ebuild 5343 SHA256 b1c3e0af12fac98bcb169b4cccd822919f965a7f842e56b2c8bec1afdcb55912 SHA512 6f77a01c8336f45fc41ea179dff017e791b3fec16ad3820ecd99abeaf597b408b6732087d4625e9325ff04379a27a580f01159c85d2abe6136b510bfafd55f76 WHIRLPOOL 170981192a08e7213376631275ec1503e5c8aac0623c5ad490f3ebe4d1b698338d57e33c79a8000b34c6c391fd76def1efe48d117e8daa4634ee7347c6067462
+EBUILD netbeans-webcommon-9999_p20160530.ebuild 5343 SHA256 0cfced87a671a4fe5762de3a4b4dcd0f24e45cfe0181c167207db1ea1b6c52c6 SHA512 76399150baf348ae63358e9e265009bdd8286179168ff874fbe1ee04c5d8ba2f1163ae4604a9ed648fda3cffa02a764d71e7e8b863a308b3caea410da8dddee5 WHIRLPOOL 05539e87b9eeafcfa3e33986d5a104e3c4c644da540aad987766ba4b5556e1a0594e3fa81e057b36a595581fb41383fcb775c33326c3dc5b4442d0086966b443
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160530.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160530.ebuild
new file mode 100644
index 0000000..aa4accd
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160530.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-30_00-02-33/zip/netbeans-trunk-nightly-201605300002-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 4937497..cae2d9c 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201605250002-src.zip 213747513 SHA256 89b56f89feefee
 DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
+DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
 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_p20160430.ebuild 2721 SHA256 5cb3f0753abebe6fc55cf19b018f2e7f21ac0d613a24ce9e53c5c5ca3c36543e SHA512 c62813c1fc37c309d8a632fb0c91093251ec797248f283d0d6593c01db064e987859abdabf39465eb569af650645eb00af6b3612dd9d1c246ad01b4e68375243 WHIRLPOOL f70e684ef198cab020efb56835819a47f3c714c68b6bdf3da261b7c1208bd799134ea16062a16fa3bd635234822cc66905125afe71350e6e824c10a5c4d93ec8
@@ -51,4 +52,5 @@ EBUILD netbeans-websvccommon-9999_p20160525.ebuild 2721 SHA256 454a5fc60a23bc628
 EBUILD netbeans-websvccommon-9999_p20160526.ebuild 2721 SHA256 970655934ee3b7eec8935449ccd63a35112d33a858d4e9cc6404c46045f24ff3 SHA512 57de5ff271959da3a04a733df902e37d14e51fa0ee60c94ec6567eee65b182da68cfe98c90ac5a218ede59ea17f624b252bcce2f2f1072194301aa1639e0af5e WHIRLPOOL 3d3c5df73a4ee8cb03ad232792780e989bd4626a16b061c84b6e675c75448f398de0a0fab6a778ab39e511cf3e222248a954247ee833ce9bb113f281f406eb7f
 EBUILD netbeans-websvccommon-9999_p20160527.ebuild 2721 SHA256 f5f9b560951f634e83d1744f9bca681eaaf2f8a44b1d4047b4bd11f60bd27c99 SHA512 7fd7a7a696891db0c760c1c40aae8fcf1f9cd76c3f934d4c2ac14315fb629804c875edc197d438e1844d8778cf38a2a81e6de7bce4296dcdc60ec493b8938fdf WHIRLPOOL a86ed25643632aefc85f9da470473839a79944fc40e79025881c8ba9ae763b304a5f36c270087cef5f68f7d2f117637c5a85c7ac37269188f24a06afaf541769
 EBUILD netbeans-websvccommon-9999_p20160528.ebuild 2721 SHA256 df33ea22af6c470e5949bfe5fef8870f67e598cb1e33c07ff122f78c15ad06c3 SHA512 c96153fde1e4cfecbb80c9903cd9039d5cf2bacaaa97e90750c2df727bdf404f0795159895a85865f78ac4cc64617f2e565a40c27e8b7e57cfd41dc854d8142a WHIRLPOOL fde53ceeefbd901667b8df002551c17a95c19baacee332841c008755a16e25e69da3abaffa53c6be281e0e0ca15e2b34bc84804ac8fd08a0f400ebbb768d3fca
+EBUILD netbeans-websvccommon-9999_p20160530.ebuild 2721 SHA256 1247a0423aecd4a5fa8e9d360367e09cd747bcc03375430a9cd9e13c1f0d33d9 SHA512 387048f5f2c6e095852b2470e793659a7bd17b2ce8441b17fa247fe4e770ffaa279313df8e8233444f9f02f6791e389a973fc22ede481a33edd4d4eca212a285 WHIRLPOOL 58056552b07e285af6d95e667b85cfff55ae61119358f565dfe96c3858d03109aca3ab2f55dbd7b622d661298cda8608c763bf5030948c70bafbb0e8fc6711b3
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160530.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160530.ebuild
new file mode 100644
index 0000000..22878fd
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160530.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-30_00-02-33/zip/netbeans-trunk-nightly-201605300002-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 318ede6..4968c02 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201605250002-src.zip 213747513 SHA256 89b56f89feefee
 DIST netbeans-trunk-nightly-201605260002-src.zip 213751083 SHA256 7735192102648951d90ddb67186a02a5bdcfb37f85614ca0f504951bf671d8b8 SHA512 091577ef2c7397a940e4cef43f800c709e0750a034336a3886f82574f524c7008198086269306986af7df29930450b3630f0c96525cf52bc80aeaa02b435d0f3 WHIRLPOOL cb30eb499fe99c7ce651acef53edc97155508f505255135a9d810ddb3baa20c791ff21c3fd5549d6950b4cf021591058973bda5e2344580814b44775c5fae065
 DIST netbeans-trunk-nightly-201605270002-src.zip 213776411 SHA256 3bbb9020367be3d16bd7a28b19c6e0adf3a8cc2764324e364713b255ef092ffe SHA512 8817c5b25e4fb5d865c48012b34f408caf74f77c469ab0f90178fac0f00d6b8d924a97c6c6d45ea00cf8c9a5addc19cf79dcb80d571e5304d0ee2bc62d90fb27 WHIRLPOOL 660c73323eca97d29c1a2ddfac56fb006376f5dfaae01584e582d2424ad403fb092362d5e8547e70891e8841ef948e5ace2fab58055c0c004a8be856b2a870d6
 DIST netbeans-trunk-nightly-201605280002-src.zip 213561244 SHA256 c4b19fe7283ed56073503b773e1e8c0636491ba1ece2d3d174a5d3a79e4d8218 SHA512 4b03a12f212d501161adbcaa32797cd6cd7a66e0c0ff7232e939e5a4e8154508365bde57391aa52f687f49876b00c04ce61ff196f4e33391378d8eb5013fd44a WHIRLPOOL 34bbdad7bcc87bcdd20490395a4711968d9332dcde8eb20ed2db2992fe1bb114329fe3beebf6a08ed776ad417137e6435a88eb35cc1ca2230511598b51c257dd
+DIST netbeans-trunk-nightly-201605300002-src.zip 213559987 SHA256 c123f5f79a0ec333719fc6eb9910c157b4ef9dfc6a28025e278e0f837c8707b6 SHA512 7935f6be6d27246b40d66e6dbeb27f63da5b7c3d532c08308382aa47840e5cff13c92cdedcf4e6fb846892b1123998234025240c3b03a1bd6a99477d1abf8ed8 WHIRLPOOL 2c365a8e7c4241930e994a5f62232d4832a569b3fb0783f1b98cae1bb0927b550be075d4d2bb8edece2c0dbc62bc3b771226a031d2aad239b74ac5c8adf154f2
 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_p20160430.ebuild 6939 SHA256 81709213df88f28f223141977ebff2e25ee16f55b9d556f8b7be3fcce60bbe1c SHA512 865fa8b987017317fe66302e838c0d62c8914705666ec1aec7a0133f174981b1178dd925d66b337a5d4bbc4d0c3185cad8882e3e207655932fb40a5940e973f3 WHIRLPOOL f6f854fd7c39ba3be9e00e7ba5e2b771d4641238c71845c5605b83c8b19fcbc93cd6de2fcf738586deb97fffd943fdd748845582ff928ceaeaaa043f235e2dea
@@ -54,4 +55,5 @@ EBUILD netbeans-9999_p20160525.ebuild 6939 SHA256 0547c4c4c43aac77de818f28a39cd6
 EBUILD netbeans-9999_p20160526.ebuild 6939 SHA256 2565f9c875e0303e0c161ba372716b4c6b0972abd4013b3da988e0cd5c223dfd SHA512 13583780bacb761445bc2c9331b374d889c9629c69cf70bf800951b8e57e80b86bf59bb5872bb0d3bd18c48cf21bd0420eca9ce59cc89e46ac845a9bdc6e9c1a WHIRLPOOL 910a1c3a7518eff6be5fc69a0f33fc3f09ff0b88452b1cf43eebc1df1bd4d86fa63710a4da739755a9d4d0bcf3ca8bb1023728d035f9021479fc6d4845a0ea9b
 EBUILD netbeans-9999_p20160527.ebuild 6939 SHA256 4609ef39a87fc0528b592a021a612c0e7c855a0b70778385a5f18a90ea8b73af SHA512 8912aea322ba92c9d8a03bf10717cae056a9ecfb89928e76aa468923c92d6c251980ccc7e3bfc99792863c9cd8983c5a916c41693df3f0d7160c582a5e354f6b WHIRLPOOL 66ba582715f13692fcffb6daf43e0b43bdd49393e2f1528e2aee62d86f4d31a7f1ab5557dcb7779909e0d0e8fe968f59664cd18002ec962b1095f00239ba590a
 EBUILD netbeans-9999_p20160528.ebuild 6939 SHA256 01fdb05047da53305851d0354c5abc106a327936c614853b62e56568d613bbaa SHA512 2fcffe52bca886750d9189914eddf6531e6c4c391731860e277ee8ccb394ea7f781e8ca9cc395d47c0c446cf9b16b27bf31f6bf90583f0c7a7db5b597d302c45 WHIRLPOOL 65f5b1614121b0defa87598d869af5904d14ab6ee8fc82cf9f51674972e3faa9273eba8bd6d8ab4b947940bf1517e759ea2d25888f01b3b551c9a92d84cc0ce8
+EBUILD netbeans-9999_p20160530.ebuild 6939 SHA256 5dd3440de60fcd4bee802a332f06a0110e66e8530cf89a59c7342171e47df863 SHA512 fca992d656ec13a8278fd760660a278ae76e499c5355ecf9d2bfd0914d5ba02a585766d524c4e069dbb2280cdc587ea158caf927bb1ee206bd2039c7064d1d2c WHIRLPOOL 808326ef2e03695c52064a263afb50f79a3aa34b197405d10d4e0a567602903eefd6961a7221740f84fe78d923f1858360be49751c42c18d8e87a4b8e7e868d9
 MISC metadata.xml 329 SHA256 8aeaf2a0228f15c2e4140f401b30f083509bd99d0a578873069f3595cd8555f3 SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640 WHIRLPOOL 799a9b79b1b447bda9631f67e2dfaf722376740e1d2037796528a05f9745eeed00d9990a74a65ce09f74bc5e1d60a887abde540c3c62487d7dd49b8377c15834

diff --git a/dev-util/netbeans/netbeans-9999_p20160530.ebuild b/dev-util/netbeans/netbeans-9999_p20160530.ebuild
new file mode 100644
index 0000000..a370584
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20160530.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-30_00-02-33/zip/netbeans-trunk-nightly-201605300002-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	[relevance 99%]

Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2016-05-30  9:39 99% [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-ide/, dev-java/netbeans-websvccommon/, Miroslav Šulc

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