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

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

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-ide/, dev-java/netbeans-nb/, dev-java/netbeans-webcommon/, ...
@ 2016-04-07 10:50 Miroslav Šulc
  0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2016-04-07 10:50 UTC (permalink / raw
  To: gentoo-commits

commit:     0e2ad1648e7067859200e4d3b1c0060cacd5ad32
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  7 10:50:46 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Apr  7 10:50:46 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=0e2ad164

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.2.28

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index aa88d9c..c63f2aa 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201604010001-src.zip 210167621 SHA256 986f8b46056619
 DIST netbeans-trunk-nightly-201604040001-src.zip 210177204 SHA256 d631db81653c15068048be2b74afc1db99343569290cc8bb69e4896d218359f1 SHA512 b32f719319b8b62b0e97571dca3025de424c6e36b5798f8a834793dea6c17bff7d478ffe175471ceb75e8fbd8e4a0f9400a93588ba939073c7675b965ba355ac WHIRLPOOL 0fe29a3e7e9599f662abad9e555b1d389203bf8149dd5523f83cc540ef4858ba338feaa7b8c9d43877b02a56e9de3e9b45de798a5bda3a74241bd8e42dee723e
 DIST netbeans-trunk-nightly-201604050001-src.zip 210178748 SHA256 c8df05a78860af29856a5b64aacf8ff870cfe03770bd2346329b73e8fd0784f8 SHA512 c3eb40e3e9702e750d0f8dd3e69083575e379fb35146e25a461d5e204206a719f8d9bd7e744fbab387ed75add6778f87a5079eae9af2f7792114aa1a97a98b37 WHIRLPOOL f63f7339759d4f701454cef85447abd8c993a0aa02375d2b8405033962a2d6f0c6933b0b55a55c71c5f6dc94273abe0806880d0c3fc496869a34a237d15e4cd5
 DIST netbeans-trunk-nightly-201604060001-src.zip 210178912 SHA256 9cba66d0d2af5fcdbd2dc21ee273931bb2c0ea84907761a6ae84c29206709589 SHA512 437ab0030682f694066c40df29b446eb0bcf0b90dfc519b9cae20534fd1409fedcc78774b7e614036b696e2b6e4bcdf2e5943d84500635d224fc1ad767b37ee0 WHIRLPOOL 91903a438d4599f3c7d483a82554b948ffe01dc50ec547f256450b9f94d4f0c7b9738b01448ab6c3585b98798c3f5ad96c432d04a36c0d9f2776a0228c1e2674
+DIST netbeans-trunk-nightly-201604070001-src.zip 210188037 SHA256 7092c74499a788c69c0cd6539a42939851f3af3d1e4e7412f484dd5b0cb31904 SHA512 58b2f347020c917f4eec46aa9de482d9f4c26592d11b8bea2393554cdc5f5420451468824c64389d56a8801925cf2b9d605b4ee4eba8ab59f0d43f392ff1737f WHIRLPOOL d8a978091f9511677606df39902b8f9aff6e26ef369a6410d74b11efd409455681257a90879ce883a6ae3cac671562bcbd25991c2c5e81b672dcfa981e1b476c
 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_p20160304.ebuild 3384 SHA256 f3213028bba3ed46dcda12998289a0e991318436fb1f9942056878cfaab54042 SHA512 9f19fc93db38b381fb29920feb2c7a320914f45bb292808aae45dd90bfd0ef666a20ed3f9721041192125cc25cfddf84fceed3bf2875cee2b56773257032bfe1 WHIRLPOOL c652bde4846719e0e6b577abbf3c08a62f3d5a3e7b90ffa22e0836ea2c740064552d1a3962d6f1866c10c68e3031cbfae4a7f77c13cb578a8f7acd9eccdefb7a
@@ -43,4 +44,5 @@ EBUILD netbeans-apisupport-9999_p20160401.ebuild 3384 SHA256 003973c2750597459fb
 EBUILD netbeans-apisupport-9999_p20160404.ebuild 3384 SHA256 8f54e9ac6c3f97487a9184792851f04d8e7ed7b4976d0033aced85e286927b57 SHA512 9d665ce19cc3dc2dde493083579668b1ad2cefcda9bae50ade05e3f2d4bb8eb52529b5ad67227e2ffc8b1ee8b51b674526975f235b328d75aa9e83d1b4cbd7b7 WHIRLPOOL 26a75949516d969f871c5ee586113870e2452338448b7f7635f8fb1b81c6c6a5025e14b969aa97a7aa39661e59b0c244671f394db87c1e9467f4a10d133d0331
 EBUILD netbeans-apisupport-9999_p20160405.ebuild 3384 SHA256 6b627a227a444b745b45fbe693e6f0bf0bcb84575ac0700c3ab6220dea509c58 SHA512 c2064c152e2870ebc8af67c8cb18160f8b1dda5bd0493427038ad2acf4275e3ad61cd47c1ae74301935e3a7d7c5f0fb387c45916103cb51e799d536174b25279 WHIRLPOOL 875da3fb6df314c313b12aa22e31e79be3b23f6468a6181cf075c59fc9a5477e699bbed5e8e4b0970bdf7093af788e6d61dbf458bb01cba8d957aa3c7f6811e9
 EBUILD netbeans-apisupport-9999_p20160406.ebuild 3384 SHA256 c1d774756d7ca01dd8b89b8cca7ab255b647211af22fa5121a6ec2741c0cdfd3 SHA512 707df1e866ab6997a6d1dc736fdf3b54109a8a494aef2fa8efdc2fcf511d6c90810e46553a1b31ec84ff0af62f0a559678d947a5d4ede84c303466f37b1d215b WHIRLPOOL 7174399ff4a5a3e103f5caabf56974099a3f920501ba9589456205adf309879f7588025c3547fd6cd7e901731f6825bd8ef303ecde483e1e31c66f3bfbb7637b
+EBUILD netbeans-apisupport-9999_p20160407.ebuild 3384 SHA256 0fe0ad5f4bf66fe1973ffde7a7ab5b88f51f85c0b95c6ed23101dab3454fc17e SHA512 3cc1dbb4077e6b9255ca2db2de368b3897ba9ed9b3699f4a8aa4bc344a2a05b4974a52bad576d2395b28086a610dba7a21e37b2048a237551e32ef6a3a50a3ac WHIRLPOOL 5f3efcbac238c4ea02b9de56cd6f63844371c0d345918ba816d25e31debcf68db7e1d805f4fbee7237b7514a7c36cae8006a1ff3bdf32789462667d54f16e9d2
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160407.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160407.ebuild
new file mode 100644
index 0000000..c0b5cc8
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160407.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-04-07_00-01-48/zip/netbeans-trunk-nightly-201604070001-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 357b771..2af8a93 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201604010001-src.zip 210167621 SHA256 986f8b46056619
 DIST netbeans-trunk-nightly-201604040001-src.zip 210177204 SHA256 d631db81653c15068048be2b74afc1db99343569290cc8bb69e4896d218359f1 SHA512 b32f719319b8b62b0e97571dca3025de424c6e36b5798f8a834793dea6c17bff7d478ffe175471ceb75e8fbd8e4a0f9400a93588ba939073c7675b965ba355ac WHIRLPOOL 0fe29a3e7e9599f662abad9e555b1d389203bf8149dd5523f83cc540ef4858ba338feaa7b8c9d43877b02a56e9de3e9b45de798a5bda3a74241bd8e42dee723e
 DIST netbeans-trunk-nightly-201604050001-src.zip 210178748 SHA256 c8df05a78860af29856a5b64aacf8ff870cfe03770bd2346329b73e8fd0784f8 SHA512 c3eb40e3e9702e750d0f8dd3e69083575e379fb35146e25a461d5e204206a719f8d9bd7e744fbab387ed75add6778f87a5079eae9af2f7792114aa1a97a98b37 WHIRLPOOL f63f7339759d4f701454cef85447abd8c993a0aa02375d2b8405033962a2d6f0c6933b0b55a55c71c5f6dc94273abe0806880d0c3fc496869a34a237d15e4cd5
 DIST netbeans-trunk-nightly-201604060001-src.zip 210178912 SHA256 9cba66d0d2af5fcdbd2dc21ee273931bb2c0ea84907761a6ae84c29206709589 SHA512 437ab0030682f694066c40df29b446eb0bcf0b90dfc519b9cae20534fd1409fedcc78774b7e614036b696e2b6e4bcdf2e5943d84500635d224fc1ad767b37ee0 WHIRLPOOL 91903a438d4599f3c7d483a82554b948ffe01dc50ec547f256450b9f94d4f0c7b9738b01448ab6c3585b98798c3f5ad96c432d04a36c0d9f2776a0228c1e2674
+DIST netbeans-trunk-nightly-201604070001-src.zip 210188037 SHA256 7092c74499a788c69c0cd6539a42939851f3af3d1e4e7412f484dd5b0cb31904 SHA512 58b2f347020c917f4eec46aa9de482d9f4c26592d11b8bea2393554cdc5f5420451468824c64389d56a8801925cf2b9d605b4ee4eba8ab59f0d43f392ff1737f WHIRLPOOL d8a978091f9511677606df39902b8f9aff6e26ef369a6410d74b11efd409455681257a90879ce883a6ae3cac671562bcbd25991c2c5e81b672dcfa981e1b476c
 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_p20160304.ebuild 4790 SHA256 1be1a29a9b9ff2664300f0cdd13b87bf5ef168ec85b18ddc2faa53099c0f63f6 SHA512 911ffec2a3773a27e9a29b1b41a4e8de3d4aacf121f94a6640bba0a1e1460c7b80f5ed9d230de974fd2b2f8bcd29538db08ea0202cbcf2558d3c4af649a70679 WHIRLPOOL 35dc0e38eb9ade8ad0333d1a048accefe59ceeec7b0b803a9ec8a01ca61a663937c038c6b02d44201eab749ef79e0380011125dbd04d61b72133cd332b038f0f
@@ -56,4 +57,5 @@ EBUILD netbeans-cnd-9999_p20160401.ebuild 4790 SHA256 889152394a5f211305222dcfd0
 EBUILD netbeans-cnd-9999_p20160404.ebuild 4790 SHA256 d4bbeaf11bef96134d2bb7763cf72e5f51944562ab16743474f7f287666b906b SHA512 4ba6b49005e4d7926909e3c4dc4f218ce9bd190551b0d806e9b8bd101c0cdf6e750e6b8adcf7b71e6c5f94ab0163b6fc4642cc7f7c4f6b47de140995441778a2 WHIRLPOOL 00a1655580d06c42c117b071fef5f2619ab07b8ef7f29e29190f8da474aa1afc3361b0481a4adbe3814f47417787994f4c98c2c78a8ef3ed486095d91512eddf
 EBUILD netbeans-cnd-9999_p20160405.ebuild 4790 SHA256 43b032d28408666db0d7e9807bffa3ce298f880efe19f0174a43219a8a8784c4 SHA512 a2bbecf4d32d6225150804934b85de165d6f1feae7d580459e149edec89e037f9bc2abcaaecd86eb64f22f84a1e8a452113854eb50a2c7525c64abc104f4cc4a WHIRLPOOL 4bb8ff6f4e02ed127e900e4f6c0cf6de36fb0a41bf40475f37a069e01f06b84ddb1fb4208c6d229a27247b68ae6147ae245654b2af921ead5e8696626c2cfc55
 EBUILD netbeans-cnd-9999_p20160406.ebuild 4790 SHA256 96b2c0ccc8e5f29e5d531d002192c05e81f6094d102018a7b503aca631dd6acd SHA512 e18a640f61247f38f3a11fb228240e9122d5816547a0c69c4f674aa77d9b227c5d3ed9f4939f818403438c818ff824bfd1ee9fabf8fdeff1d9ecb54d3c74558e WHIRLPOOL 8f5b203ea64a2c90546a0fe29f44be85e9ad1f8af543de9520cd646443600960f477db7ebbe34c830cc5182eae991f3c5ebf1fe95bbdb483cde6daa9eadf35fd
+EBUILD netbeans-cnd-9999_p20160407.ebuild 4790 SHA256 e1f0c92ea654409961a30de65bcefde4b026e79ff8d0f3377ba726fb7e7f5d79 SHA512 7632bccf69cd17657c4af52e73aa819d491edf9d6b7040c2677ff86d94e24890cb7d1cdcfca68a3a2c9d333222bb600355d7d607126532beac3a2bd44bb9954e WHIRLPOOL 218d41c35bb281ca6d30eff7ea86fbe6c5e784b1689c07cd029dcf567b6acfd4fb20bad67f426a50fa8ec824048c80eb865b5db83ad18fa164a9dd6a58ff09d9
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160407.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160407.ebuild
new file mode 100644
index 0000000..cfe405c
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160407.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-04-07_00-01-48/zip/netbeans-trunk-nightly-201604070001-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/38DAC4EB409E96D3AABD4D3F5807505BB751C043-clank_0.3.6.zip
+	http://hg.netbeans.org/binaries/BF2C234985CF9BD6CDE18114406C67EC7C32B84A-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}"/38DAC4EB409E96D3AABD4D3F5807505BB751C043-clank_0.3.6.zip libs.clank/external/clank_0.3.6.zip || die
+	ln -s "${DISTDIR}"/BF2C234985CF9BD6CDE18114406C67EC7C32B84A-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 a70cf52..61b4de2 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201604010001-src.zip 210167621 SHA256 986f8b46056619
 DIST netbeans-trunk-nightly-201604040001-src.zip 210177204 SHA256 d631db81653c15068048be2b74afc1db99343569290cc8bb69e4896d218359f1 SHA512 b32f719319b8b62b0e97571dca3025de424c6e36b5798f8a834793dea6c17bff7d478ffe175471ceb75e8fbd8e4a0f9400a93588ba939073c7675b965ba355ac WHIRLPOOL 0fe29a3e7e9599f662abad9e555b1d389203bf8149dd5523f83cc540ef4858ba338feaa7b8c9d43877b02a56e9de3e9b45de798a5bda3a74241bd8e42dee723e
 DIST netbeans-trunk-nightly-201604050001-src.zip 210178748 SHA256 c8df05a78860af29856a5b64aacf8ff870cfe03770bd2346329b73e8fd0784f8 SHA512 c3eb40e3e9702e750d0f8dd3e69083575e379fb35146e25a461d5e204206a719f8d9bd7e744fbab387ed75add6778f87a5079eae9af2f7792114aa1a97a98b37 WHIRLPOOL f63f7339759d4f701454cef85447abd8c993a0aa02375d2b8405033962a2d6f0c6933b0b55a55c71c5f6dc94273abe0806880d0c3fc496869a34a237d15e4cd5
 DIST netbeans-trunk-nightly-201604060001-src.zip 210178912 SHA256 9cba66d0d2af5fcdbd2dc21ee273931bb2c0ea84907761a6ae84c29206709589 SHA512 437ab0030682f694066c40df29b446eb0bcf0b90dfc519b9cae20534fd1409fedcc78774b7e614036b696e2b6e4bcdf2e5943d84500635d224fc1ad767b37ee0 WHIRLPOOL 91903a438d4599f3c7d483a82554b948ffe01dc50ec547f256450b9f94d4f0c7b9738b01448ab6c3585b98798c3f5ad96c432d04a36c0d9f2776a0228c1e2674
+DIST netbeans-trunk-nightly-201604070001-src.zip 210188037 SHA256 7092c74499a788c69c0cd6539a42939851f3af3d1e4e7412f484dd5b0cb31904 SHA512 58b2f347020c917f4eec46aa9de482d9f4c26592d11b8bea2393554cdc5f5420451468824c64389d56a8801925cf2b9d605b4ee4eba8ab59f0d43f392ff1737f WHIRLPOOL d8a978091f9511677606df39902b8f9aff6e26ef369a6410d74b11efd409455681257a90879ce883a6ae3cac671562bcbd25991c2c5e81b672dcfa981e1b476c
 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_p20160304.ebuild 2968 SHA256 4e079f1f62ef2d50ee1926baab30ef6fe3d70abac10bc222200e5119505ee61b SHA512 828fbc1474d512fd6ee106402383b7442e593755790fe18cbb88411aab7a278b7622ed63cd86e6d34c144d9316913c19618c529e3379e48e81453479798cb8b1 WHIRLPOOL e59978e9de8bd33dc46c3a6ef72bef87f4caa7ec920892b7363097e3160a1a4f404c63bc4c154d6997d776b9d2b4408a205f2ab146bf25dea70418008e13b973
@@ -46,4 +47,5 @@ EBUILD netbeans-dlight-9999_p20160401.ebuild 2968 SHA256 0bc13d62d2370c432c89516
 EBUILD netbeans-dlight-9999_p20160404.ebuild 2968 SHA256 d0843d44c9e942c6f6b9e6958775f40b67077e8a1ab307a2f239e0dedb8aaa8a SHA512 e3171aedc0187372ef11c0251c841878417029a2cd232a92b2a1c7f326db06186b40cc6b0d5f4e363188b788a2af0da15d28be1561da0fc0e589e42a87591697 WHIRLPOOL f4a466d9e0ddeacdb37961cd1e3fb56c65327e2eb59d46b7be79c6ffab524ff1194e006d23b925474108bed1ca7fdb92474e484b2df6b6fc5495ba5f51b2bb9b
 EBUILD netbeans-dlight-9999_p20160405.ebuild 2968 SHA256 589d7038d93e008a53a04ec04d3d97e52ee68b097bf5b6bbdc0b9d44fdc8bcf9 SHA512 921b12885120acb992178a5b72791fa1be7d5b8d15f770a27edd6b7b61820c84bc7d52e90c5ff2be3474595292a02a64d0e54d54eec3421710f34969c5583e3a WHIRLPOOL b7f17bf5dd88acb70ac9746fd2b2ae676e1ba0c3e128fc56737ffec4d5a7a91edb3b194f9efa64d542065bd8752a7ef7c9862e5ad0adc9acd119f069ed2733b1
 EBUILD netbeans-dlight-9999_p20160406.ebuild 2968 SHA256 8b41c79d337d4b274bdc2d4716f91cf03094d919d5a36982dd017c0407cd5c97 SHA512 b0b59a943f1e598afd78c76ecb5c5c0375e15cf54aff0d8ac2cb2b62150ba82d32827333df27aaf97d3ecbe519b9abeb0ecee95e16c02f905b6efa3b7d7a33c5 WHIRLPOOL 80f575c0b698692fbb5495c63916eb8abc1ab2e6f64976c727add1bac56b1085a5110074af179c88e86d3811d291c0ad9ff07407c6a406d3b04ad53956a685b3
+EBUILD netbeans-dlight-9999_p20160407.ebuild 2968 SHA256 9424f9ebcd1539b9a12cb73c8d252193086e3717a354c36a63e9cac016a1e2bc SHA512 4ba717da50fb137f331c8733da24c19848541fa89f950d1228a2656192bfd2eb69ad83d4a769c41a63df4391bb249027ee0a083b06861c157835d0db0720b92a WHIRLPOOL bce73b636db69d7dacd4391493dd68a3625707967b92ae90c01a373c8e93563a19d0277bdde7145357f352edb1d83e07a402b96d01ac55d817c29c8db8d40ce7
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160407.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160407.ebuild
new file mode 100644
index 0000000..144cf03
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160407.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-04-07_00-01-48/zip/netbeans-trunk-nightly-201604070001-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 137f826..93d4fd1 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -55,6 +55,7 @@ DIST netbeans-trunk-nightly-201604010001-src.zip 210167621 SHA256 986f8b46056619
 DIST netbeans-trunk-nightly-201604040001-src.zip 210177204 SHA256 d631db81653c15068048be2b74afc1db99343569290cc8bb69e4896d218359f1 SHA512 b32f719319b8b62b0e97571dca3025de424c6e36b5798f8a834793dea6c17bff7d478ffe175471ceb75e8fbd8e4a0f9400a93588ba939073c7675b965ba355ac WHIRLPOOL 0fe29a3e7e9599f662abad9e555b1d389203bf8149dd5523f83cc540ef4858ba338feaa7b8c9d43877b02a56e9de3e9b45de798a5bda3a74241bd8e42dee723e
 DIST netbeans-trunk-nightly-201604050001-src.zip 210178748 SHA256 c8df05a78860af29856a5b64aacf8ff870cfe03770bd2346329b73e8fd0784f8 SHA512 c3eb40e3e9702e750d0f8dd3e69083575e379fb35146e25a461d5e204206a719f8d9bd7e744fbab387ed75add6778f87a5079eae9af2f7792114aa1a97a98b37 WHIRLPOOL f63f7339759d4f701454cef85447abd8c993a0aa02375d2b8405033962a2d6f0c6933b0b55a55c71c5f6dc94273abe0806880d0c3fc496869a34a237d15e4cd5
 DIST netbeans-trunk-nightly-201604060001-src.zip 210178912 SHA256 9cba66d0d2af5fcdbd2dc21ee273931bb2c0ea84907761a6ae84c29206709589 SHA512 437ab0030682f694066c40df29b446eb0bcf0b90dfc519b9cae20534fd1409fedcc78774b7e614036b696e2b6e4bcdf2e5943d84500635d224fc1ad767b37ee0 WHIRLPOOL 91903a438d4599f3c7d483a82554b948ffe01dc50ec547f256450b9f94d4f0c7b9738b01448ab6c3585b98798c3f5ad96c432d04a36c0d9f2776a0228c1e2674
+DIST netbeans-trunk-nightly-201604070001-src.zip 210188037 SHA256 7092c74499a788c69c0cd6539a42939851f3af3d1e4e7412f484dd5b0cb31904 SHA512 58b2f347020c917f4eec46aa9de482d9f4c26592d11b8bea2393554cdc5f5420451468824c64389d56a8801925cf2b9d605b4ee4eba8ab59f0d43f392ff1737f WHIRLPOOL d8a978091f9511677606df39902b8f9aff6e26ef369a6410d74b11efd409455681257a90879ce883a6ae3cac671562bcbd25991c2c5e81b672dcfa981e1b476c
 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_p20160304.ebuild 15825 SHA256 cacae844485117fb589ec58ef2fc1dd43574a9886803825a818853dcd36c4353 SHA512 626866b493f95707116eb3938a1734fbaf39a64a1aaa0d81a376186f367523b429416ecb75d49f69930a98b31946379eedf592a1358b2759a4d31011df875857 WHIRLPOOL e6bad13b30ee3006db84d8e2b011773575ae9158403627c6424daacd503824c61f040588e42e0b7663d23b0890b5ec14f5bebd07069e8ea31bca7b731296c22b
@@ -75,4 +76,5 @@ EBUILD netbeans-enterprise-9999_p20160401.ebuild 15825 SHA256 fcdad2df11b6b3d32a
 EBUILD netbeans-enterprise-9999_p20160404.ebuild 15825 SHA256 7c76724ab1e361ff6edfe7d58499fc13e8fc5c06d7b9a25930fec70845416c07 SHA512 a749801759e96fbd6af37fe3f4ea29b48ca17dbc6c2e4a99b005d19e9c82eab4edd6ca6016c1d6df06406f62fe65f8ff18f94736d2a7493a87ca09f33c42dd82 WHIRLPOOL a6a709f33b01f6edab0a22f7061d4c4d7090e1f47df01ac3a8a8de0cca0af0c7d97fa9d25033af41deca0f7b9b4f8c8207de933af0ec4e5a832642eae090bd11
 EBUILD netbeans-enterprise-9999_p20160405.ebuild 15825 SHA256 cd3a3e915ab0845309f005001030c00e2e7039235868697a62b26afbd6d8a0a6 SHA512 e7b5c27827d1e77a3ccfe9adf0cb8460b2a4f186d9954462615cdcc00f9616028467d6276d9e386336cc886cab39b3c2f1b2b6d032929145b387bb81c07d15eb WHIRLPOOL fe3c0c2ae9be37030ee4778bb4860606f6940ddf311045f14a9c796f0b22c9a1d56e144e2b6de0d72d60727453d093aa44f9d0f3a7600d3f173ec27de74e7b89
 EBUILD netbeans-enterprise-9999_p20160406.ebuild 15825 SHA256 b5393880aa847da4683e1f7691d682afa5675426453feee0b3b38471e490cd20 SHA512 f6034b406e6382dfdfd0fdf5eed12ecca78801ef9d82b1e00ac89fad26edcc45e4076e66150317dfce07dd7cde8a0e22c97f6cd7cd4875ef4b546c1e104cb417 WHIRLPOOL 10c99bb4caba4e4be41e125570223266ce082cb011960859bc371eda1a13173976f7b75c7d32e59b20206a9d02a4e69210ba3b6accde5c0e2f15e5f75ef543ed
+EBUILD netbeans-enterprise-9999_p20160407.ebuild 15825 SHA256 85034ecccd8dd28793578d8720700b3309b299e150e4c79e3356a0f6c83b187e SHA512 03572b04593f11f1f5e845c02d7dd3c8b716fb5cff769a4680ccc7873e65a6f134ec1b5cf1513fc78afefbac756d319e37fe0d6918406d0f05639e63ef3292a0 WHIRLPOOL 1a95004372f3b901a9f0627617e285ce3a1ce1fe498e7ec39de389ba6659c38c9ee5551ccb3708f9da58a2de9409110cfb32b43b40f7a765cadf6e40148d0928
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160407.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160407.ebuild
new file mode 100644
index 0000000..ac9b6c3
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160407.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-04-07_00-01-48/zip/netbeans-trunk-nightly-201604070001-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 15e24c2..7aa36aa 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201604010001-src.zip 210167621 SHA256 986f8b46056619
 DIST netbeans-trunk-nightly-201604040001-src.zip 210177204 SHA256 d631db81653c15068048be2b74afc1db99343569290cc8bb69e4896d218359f1 SHA512 b32f719319b8b62b0e97571dca3025de424c6e36b5798f8a834793dea6c17bff7d478ffe175471ceb75e8fbd8e4a0f9400a93588ba939073c7675b965ba355ac WHIRLPOOL 0fe29a3e7e9599f662abad9e555b1d389203bf8149dd5523f83cc540ef4858ba338feaa7b8c9d43877b02a56e9de3e9b45de798a5bda3a74241bd8e42dee723e
 DIST netbeans-trunk-nightly-201604050001-src.zip 210178748 SHA256 c8df05a78860af29856a5b64aacf8ff870cfe03770bd2346329b73e8fd0784f8 SHA512 c3eb40e3e9702e750d0f8dd3e69083575e379fb35146e25a461d5e204206a719f8d9bd7e744fbab387ed75add6778f87a5079eae9af2f7792114aa1a97a98b37 WHIRLPOOL f63f7339759d4f701454cef85447abd8c993a0aa02375d2b8405033962a2d6f0c6933b0b55a55c71c5f6dc94273abe0806880d0c3fc496869a34a237d15e4cd5
 DIST netbeans-trunk-nightly-201604060001-src.zip 210178912 SHA256 9cba66d0d2af5fcdbd2dc21ee273931bb2c0ea84907761a6ae84c29206709589 SHA512 437ab0030682f694066c40df29b446eb0bcf0b90dfc519b9cae20534fd1409fedcc78774b7e614036b696e2b6e4bcdf2e5943d84500635d224fc1ad767b37ee0 WHIRLPOOL 91903a438d4599f3c7d483a82554b948ffe01dc50ec547f256450b9f94d4f0c7b9738b01448ab6c3585b98798c3f5ad96c432d04a36c0d9f2776a0228c1e2674
+DIST netbeans-trunk-nightly-201604070001-src.zip 210188037 SHA256 7092c74499a788c69c0cd6539a42939851f3af3d1e4e7412f484dd5b0cb31904 SHA512 58b2f347020c917f4eec46aa9de482d9f4c26592d11b8bea2393554cdc5f5420451468824c64389d56a8801925cf2b9d605b4ee4eba8ab59f0d43f392ff1737f WHIRLPOOL d8a978091f9511677606df39902b8f9aff6e26ef369a6410d74b11efd409455681257a90879ce883a6ae3cac671562bcbd25991c2c5e81b672dcfa981e1b476c
 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_p20160304.ebuild 2913 SHA256 12ef018080f077c1c4c96c83c187ffafe8044b0f731bab99ade16178e04930a9 SHA512 50ad4580b1434f97b7fa1444936cafabe99b43e5e6efc25da4760cbcba4ef44b7e9e602d48c1e83033d3bceb199e7777ddb81745a8ac3dd0c40943681435d9a4 WHIRLPOOL 84532e014a2a07e6276b85c84dc70515bbc4c37ca6b8479f1d755c567c8cf171cd5a5756b43c0d81c3a74c7955744634602bfa7458425d0b93aa2d3d48341908
@@ -43,4 +44,5 @@ EBUILD netbeans-ergonomics-9999_p20160401.ebuild 2913 SHA256 77a71f27a523b6e8f6d
 EBUILD netbeans-ergonomics-9999_p20160404.ebuild 2913 SHA256 44b4fdb29be6087e5c653725d159a7de540498c92a0a0778c11fcb9c7bc3960f SHA512 2863a7fd87921475af15a41556194e08df1337af12fd320998920a8e1c75080e39e41c5c1978e656d3faaae79d3f89d28a8083baa866895ce30d9a6d67a9baa9 WHIRLPOOL 071fdf43a90da19072f6183f0329a9c7ac925861df3b3e4e4de26a494b486427bd0f27b18a47cceeeac970cbe8f5ceb825ad3979d29c7b6ab3145c80737ae211
 EBUILD netbeans-ergonomics-9999_p20160405.ebuild 2913 SHA256 86b2151166cb68d525d75cf116438711727831f3a75f49dcc40072233ba52012 SHA512 0234e0e9c6de281709f121c44622d89ab98eb984f36926f595c8380a5c5f1d716042d25ed3aab652afcd7a6715fcf4a1fb364cc0996ed7937fa3f425b0ff42df WHIRLPOOL fbb7f4d3b4e45d464b65c06eaaccf07e1a725770ca6648b4377f3323e2471121b0b7d69bdfc02843c3f907cf94e1eeafe138131745c5c527ef86d55a649c7c49
 EBUILD netbeans-ergonomics-9999_p20160406.ebuild 2913 SHA256 ba596e4f86d19501e1f79ce9999d3e359fcae8327d27916e3f763656c66af75f SHA512 c1217de07c49fe52d4b2ef29f77884472d4275606aca280b62579cc27e22c616cd82cd7ebf26396201749c0cd437360802ccf1529d6e6ecaa7c5c25e054f3020 WHIRLPOOL 0ab3b7f45277f6c7c52ad0d31b67a343e0d26592394a23591019a699f8a09794c04df97c190a0c850a4dbc81f5a1aaf142beadd278d8bdc078ad0ae43cfb3465
+EBUILD netbeans-ergonomics-9999_p20160407.ebuild 2913 SHA256 d6f4452274295a8f6efc989d5a89c03360914b6354f73492a7e8e7d6f16c64a6 SHA512 d8706bff297719925ef59b87f25a64265f25328186c3a45abdace0b6db25a6b02ffe93af36a3fef46a05bd8dd0cd968aafedbf253d6036065761eb20c6c980df WHIRLPOOL 88ffd8e235d4479848785b198e83f1472d46f40a77cfd047455fb1bf70b7e8dbe115ba26901f7674d995c3bd9d979e62883d783dc463d2b739e270ee49e852dd
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160407.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160407.ebuild
new file mode 100644
index 0000000..45c45b6
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160407.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-04-07_00-01-48/zip/netbeans-trunk-nightly-201604070001-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 260008f..bb79340 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201604010001-src.zip 210167621 SHA256 986f8b46056619
 DIST netbeans-trunk-nightly-201604040001-src.zip 210177204 SHA256 d631db81653c15068048be2b74afc1db99343569290cc8bb69e4896d218359f1 SHA512 b32f719319b8b62b0e97571dca3025de424c6e36b5798f8a834793dea6c17bff7d478ffe175471ceb75e8fbd8e4a0f9400a93588ba939073c7675b965ba355ac WHIRLPOOL 0fe29a3e7e9599f662abad9e555b1d389203bf8149dd5523f83cc540ef4858ba338feaa7b8c9d43877b02a56e9de3e9b45de798a5bda3a74241bd8e42dee723e
 DIST netbeans-trunk-nightly-201604050001-src.zip 210178748 SHA256 c8df05a78860af29856a5b64aacf8ff870cfe03770bd2346329b73e8fd0784f8 SHA512 c3eb40e3e9702e750d0f8dd3e69083575e379fb35146e25a461d5e204206a719f8d9bd7e744fbab387ed75add6778f87a5079eae9af2f7792114aa1a97a98b37 WHIRLPOOL f63f7339759d4f701454cef85447abd8c993a0aa02375d2b8405033962a2d6f0c6933b0b55a55c71c5f6dc94273abe0806880d0c3fc496869a34a237d15e4cd5
 DIST netbeans-trunk-nightly-201604060001-src.zip 210178912 SHA256 9cba66d0d2af5fcdbd2dc21ee273931bb2c0ea84907761a6ae84c29206709589 SHA512 437ab0030682f694066c40df29b446eb0bcf0b90dfc519b9cae20534fd1409fedcc78774b7e614036b696e2b6e4bcdf2e5943d84500635d224fc1ad767b37ee0 WHIRLPOOL 91903a438d4599f3c7d483a82554b948ffe01dc50ec547f256450b9f94d4f0c7b9738b01448ab6c3585b98798c3f5ad96c432d04a36c0d9f2776a0228c1e2674
+DIST netbeans-trunk-nightly-201604070001-src.zip 210188037 SHA256 7092c74499a788c69c0cd6539a42939851f3af3d1e4e7412f484dd5b0cb31904 SHA512 58b2f347020c917f4eec46aa9de482d9f4c26592d11b8bea2393554cdc5f5420451468824c64389d56a8801925cf2b9d605b4ee4eba8ab59f0d43f392ff1737f WHIRLPOOL d8a978091f9511677606df39902b8f9aff6e26ef369a6410d74b11efd409455681257a90879ce883a6ae3cac671562bcbd25991c2c5e81b672dcfa981e1b476c
 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_p20160304.ebuild 3377 SHA256 a45dfb7fdfe434df9b67e593e735749384e870f2eb9ab732977ffd3deb86636f SHA512 7b931fae6b9c60430df8e44060815d4cf6c3d2d8ac68bea554c4365cb4f2b0ac82ab817501391190f045b94e4db3fbf08ac8f1303dcfed2979ad7fdcc2996765 WHIRLPOOL 55b1a81ec036fed6997bcd322858ca14b15bbc54db1611e0f22b2db16bb7b67e4ed48bda98a4010ea2ab2fd6e86bcdd3b00f80d275226cd94bf9f871ddcac54c
@@ -45,4 +46,5 @@ EBUILD netbeans-extide-9999_p20160401.ebuild 3377 SHA256 307b27e83d281cd2be425f6
 EBUILD netbeans-extide-9999_p20160404.ebuild 3377 SHA256 078c085b379c5ce7c3b1cf50e6d1f6659d022299edd248f28e8b203730888d81 SHA512 00c9d313c1865442d52263e576b2967024c91202cb08f78d54f01a6d99668fc943219612a241bdba23c4757017b54464f789510e82881a3b449d01e01cafd1db WHIRLPOOL 0ff21fca4a5173f021135e6837ce70e2626dd6655b0a4c2be1c6d362ae8a29f3e870f85d37566232be868787e70917c7f91ef5710a25976db8247829148eafb3
 EBUILD netbeans-extide-9999_p20160405.ebuild 3377 SHA256 dbe773244fe3daa0c926bf542a5b786b2f9abd7f1f879b60fa7176f20db665a4 SHA512 5d869221f9b731f1a472038fc20dd6b5333d545ce412b6cf41fe0d9fca09127264f439400f1c0893dfa3deeaf16407b6e9f2acd8b6dcdba4fdb454c4b735fd4f WHIRLPOOL 2b0b0842e6365efb011467a3dd8050ac97ba71b3793ad114d13bfb91d82540914f83c2b77dc13206ea21d7ada2b5aa2e2a9faf880bb837bf70bfcc148af1a6f6
 EBUILD netbeans-extide-9999_p20160406.ebuild 3377 SHA256 d0a047f98094ed3b0c8739003d8493f34862103de3c8f1406e359bfa911e7581 SHA512 bdea180977b43e87c3321acea82349a90505daeebce6db7cb73953fb4e9e0972001ec775afca48e2a51def3c23969b67d471c45521c99cf890cc25df09fd0eb1 WHIRLPOOL c7baaccb33930c847c397d66391d2b2b6d4310303e45d05d58e09d8c21d4f37300c5e5fabaf3911644791bee395894857f2a4b471bbd5f9adc40db1ebc24ebfd
+EBUILD netbeans-extide-9999_p20160407.ebuild 3377 SHA256 4534945a9effb764773c672a9c4c23a1478cbdeb29d210d745e4e1bcde9b052e SHA512 cb8d92f431c8f0e827c354552fc8c4344b944d3a8ebc95937c3d64d97edb59c5a32f4f1afb9d50747934ee005ca346e9ad4116187c80dcff132492a190c46b1c WHIRLPOOL c260ecf2c5004e0a18f1394cd26dd5c08251b812969ef605f4b1a1b583af4b663487344178d4095ee686716513a680088d4b8306865eaabd5d5db81c3947fd40
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160407.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160407.ebuild
new file mode 100644
index 0000000..459cfe0
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20160407.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-04-07_00-01-48/zip/netbeans-trunk-nightly-201604070001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip
+	http://hg.netbeans.org/binaries/95CCE237B1E9390FBED0440B601822813DB220E6-ant-misc-1.9.4.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}"/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip o.apache.tools.ant.module/external/ant-libs-1.9.4.zip || die
+	ln -s "${DISTDIR}"/95CCE237B1E9390FBED0440B601822813DB220E6-ant-misc-1.9.4.zip o.apache.tools.ant.module/external/ant-misc-1.9.4.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 0bda684..d7add0f 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201604010001-src.zip 210167621 SHA256 986f8b46056619
 DIST netbeans-trunk-nightly-201604040001-src.zip 210177204 SHA256 d631db81653c15068048be2b74afc1db99343569290cc8bb69e4896d218359f1 SHA512 b32f719319b8b62b0e97571dca3025de424c6e36b5798f8a834793dea6c17bff7d478ffe175471ceb75e8fbd8e4a0f9400a93588ba939073c7675b965ba355ac WHIRLPOOL 0fe29a3e7e9599f662abad9e555b1d389203bf8149dd5523f83cc540ef4858ba338feaa7b8c9d43877b02a56e9de3e9b45de798a5bda3a74241bd8e42dee723e
 DIST netbeans-trunk-nightly-201604050001-src.zip 210178748 SHA256 c8df05a78860af29856a5b64aacf8ff870cfe03770bd2346329b73e8fd0784f8 SHA512 c3eb40e3e9702e750d0f8dd3e69083575e379fb35146e25a461d5e204206a719f8d9bd7e744fbab387ed75add6778f87a5079eae9af2f7792114aa1a97a98b37 WHIRLPOOL f63f7339759d4f701454cef85447abd8c993a0aa02375d2b8405033962a2d6f0c6933b0b55a55c71c5f6dc94273abe0806880d0c3fc496869a34a237d15e4cd5
 DIST netbeans-trunk-nightly-201604060001-src.zip 210178912 SHA256 9cba66d0d2af5fcdbd2dc21ee273931bb2c0ea84907761a6ae84c29206709589 SHA512 437ab0030682f694066c40df29b446eb0bcf0b90dfc519b9cae20534fd1409fedcc78774b7e614036b696e2b6e4bcdf2e5943d84500635d224fc1ad767b37ee0 WHIRLPOOL 91903a438d4599f3c7d483a82554b948ffe01dc50ec547f256450b9f94d4f0c7b9738b01448ab6c3585b98798c3f5ad96c432d04a36c0d9f2776a0228c1e2674
+DIST netbeans-trunk-nightly-201604070001-src.zip 210188037 SHA256 7092c74499a788c69c0cd6539a42939851f3af3d1e4e7412f484dd5b0cb31904 SHA512 58b2f347020c917f4eec46aa9de482d9f4c26592d11b8bea2393554cdc5f5420451468824c64389d56a8801925cf2b9d605b4ee4eba8ab59f0d43f392ff1737f WHIRLPOOL d8a978091f9511677606df39902b8f9aff6e26ef369a6410d74b11efd409455681257a90879ce883a6ae3cac671562bcbd25991c2c5e81b672dcfa981e1b476c
 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_p20160304.ebuild 3416 SHA256 30a8467b1da38b63dda67c87f14ca150d668615ca422adafaa7283577e19408e SHA512 9fa536090970a04491827b48ebe5e162f53a76b28dee6e1d466604bc965875ae83eba49f76c586fc39cf2fc02a78a9162fbba61072e1a27b4f864879cdb8e23c WHIRLPOOL 8dfc3b5e40a3e06bf656cea9b173b717e9134118a2840c86ee9b793883635ac43beedb669a743bbeeae61cce291519a62d7c5ac6fbd6e7c493babe62737f22e2
@@ -45,4 +46,5 @@ EBUILD netbeans-groovy-9999_p20160401.ebuild 3416 SHA256 a8da5130ea3796de0692066
 EBUILD netbeans-groovy-9999_p20160404.ebuild 3416 SHA256 f57a53d7323492491f66390c6001520e30c536df37c09bf4221de18188c22c49 SHA512 927b47948c23dfe97a098e53863ddca6e92c23fb759feb6b6df304949df2e9389ce39a87fa967941f9bbf14b3f64f12a65ab96c77b0877e023ed7facdf7d326a WHIRLPOOL a858348d7618085b306429db7b14450736d1b8db25f99b17046f580fc63aa81ff47b4a8f37a3ef3d869603e0f71de2b1227e37c0ab6a8cc14b11c941d4d41c91
 EBUILD netbeans-groovy-9999_p20160405.ebuild 3416 SHA256 9a0faeef3f1a1ff6654386adbd09f63736107bfe1574551a43a63e7db35b881c SHA512 2f2fbf9e33ea2f6230525ec685d182a36eb6db57914f475807b5e71c33d40a3ca121220a46f7cfd36520c158247369d35c5276019e05d4c771832664538ec63c WHIRLPOOL 9e9a893da44dae6d520b6b90dd6bedde8b36d4cfb3b62759f930ae90ed135a6b0caa05f3c2db37d6813851047a5fa501aef5336f3fb48eebef188decb0a691e2
 EBUILD netbeans-groovy-9999_p20160406.ebuild 3416 SHA256 b8ce854264075a2c6bffa0141685c43f4cf2b127ab44a790d977c96de3110526 SHA512 4dad8c5b4051df9e2da8b023ed2b5c25ff92aae52f8b542985a91dc2929c5c9dd1cc43217a79f68173e6f5124702e4dd25e16757fa7fb702d928a7e6aa1ea21b WHIRLPOOL 5c2040e7c93074b3b1ad3785448e21621cd6eccaae3759591a5d05238391d86eedf44501ac9db6fe792ac966bbbb4e265d9fc7a93afe87a6bae41c7f7473126c
+EBUILD netbeans-groovy-9999_p20160407.ebuild 3416 SHA256 48366057548a1e0391d975751650f88c7ae81c024604fda233c8a24a4430188d SHA512 6af5afa979e04e7d26ad223497a84383fc008c0098271d82fae9b7c6962ea54028693c668c67e2657641be7f8dc8b35fb2c86492baabf5bfe817c8e86a0825b5 WHIRLPOOL edf6cc0659b2fcfc7fcdfd0886ba786e55a7eeb2c441994d7d16b327d4e25224e5b38cfd0c1acc96f9e26f3759583a5d05aa191877e431d6305f587d14926c4d
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160407.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160407.ebuild
new file mode 100644
index 0000000..4963897
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160407.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-04-07_00-01-48/zip/netbeans-trunk-nightly-201604070001-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 4df2c56..c7f0879 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201604010001-src.zip 210167621 SHA256 986f8b46056619
 DIST netbeans-trunk-nightly-201604040001-src.zip 210177204 SHA256 d631db81653c15068048be2b74afc1db99343569290cc8bb69e4896d218359f1 SHA512 b32f719319b8b62b0e97571dca3025de424c6e36b5798f8a834793dea6c17bff7d478ffe175471ceb75e8fbd8e4a0f9400a93588ba939073c7675b965ba355ac WHIRLPOOL 0fe29a3e7e9599f662abad9e555b1d389203bf8149dd5523f83cc540ef4858ba338feaa7b8c9d43877b02a56e9de3e9b45de798a5bda3a74241bd8e42dee723e
 DIST netbeans-trunk-nightly-201604050001-src.zip 210178748 SHA256 c8df05a78860af29856a5b64aacf8ff870cfe03770bd2346329b73e8fd0784f8 SHA512 c3eb40e3e9702e750d0f8dd3e69083575e379fb35146e25a461d5e204206a719f8d9bd7e744fbab387ed75add6778f87a5079eae9af2f7792114aa1a97a98b37 WHIRLPOOL f63f7339759d4f701454cef85447abd8c993a0aa02375d2b8405033962a2d6f0c6933b0b55a55c71c5f6dc94273abe0806880d0c3fc496869a34a237d15e4cd5
 DIST netbeans-trunk-nightly-201604060001-src.zip 210178912 SHA256 9cba66d0d2af5fcdbd2dc21ee273931bb2c0ea84907761a6ae84c29206709589 SHA512 437ab0030682f694066c40df29b446eb0bcf0b90dfc519b9cae20534fd1409fedcc78774b7e614036b696e2b6e4bcdf2e5943d84500635d224fc1ad767b37ee0 WHIRLPOOL 91903a438d4599f3c7d483a82554b948ffe01dc50ec547f256450b9f94d4f0c7b9738b01448ab6c3585b98798c3f5ad96c432d04a36c0d9f2776a0228c1e2674
+DIST netbeans-trunk-nightly-201604070001-src.zip 210188037 SHA256 7092c74499a788c69c0cd6539a42939851f3af3d1e4e7412f484dd5b0cb31904 SHA512 58b2f347020c917f4eec46aa9de482d9f4c26592d11b8bea2393554cdc5f5420451468824c64389d56a8801925cf2b9d605b4ee4eba8ab59f0d43f392ff1737f WHIRLPOOL d8a978091f9511677606df39902b8f9aff6e26ef369a6410d74b11efd409455681257a90879ce883a6ae3cac671562bcbd25991c2c5e81b672dcfa981e1b476c
 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_p20160304.ebuild 4126 SHA256 f6f9e3908a92125ccb69f77fa46c359747820af6fd85b76f981e03ebb22036e8 SHA512 f41939f69fd3f6f081b2d764d2a4776131a1c31c57c91ec4bc7874b17bd46f00f3ccf898ac5155c8724b6e5363b8a7c533125cdcadb2f710e616d24ca1b75270 WHIRLPOOL c850c5d501ad1a91ceedc06185c07f30370dc8f2bac7685f81ad0329b6571219b0b69fbd817d2570750066c403587653efbe1427db162856db3c9b04b40e7f03
@@ -48,4 +49,5 @@ EBUILD netbeans-harness-9999_p20160401.ebuild 4126 SHA256 f36ff6131bf9091d639820
 EBUILD netbeans-harness-9999_p20160404.ebuild 4126 SHA256 b2cf5fd46d6eb92eb7176a1b1b2230698ece37a6bbe3acb1d5237ac333a3845e SHA512 c0b6fe15e3aef900ff82afdd90f22d5f8d9386eeff07fa274eb3ef0adfdcc32ca8a7d9606c5af3dd8faf769bab95aed4adfca7f0c71888c93d9a9d8419d416ca WHIRLPOOL 66d9d4ad3fced90aeb13b271158f107c57b7f0c796747808dc0bd88d4e7431402a22a11386671067d1a78cbdf93b15a9a48e2585c216de45e801af4915007550
 EBUILD netbeans-harness-9999_p20160405.ebuild 4126 SHA256 cb27954eb78341a895b905ef42f0a91fbbd84660ba9d547c397217d2ca65ab39 SHA512 24ac97ae927652fe22f3d676c223677192ad2a7c772a73ebb74a0188ff0402e8e8fc4d3e2e91a0f821371783f4e4117d8f77be2dccc418ed2a729ea80fcf0116 WHIRLPOOL d7c17aaea55d3f53576183202c8b41a8149176afb6f8a456d56abe5cc1fe6c39436937c84e4fbc29f2b99e252e5464afe04e0fa980ba19101a4249036eed2f91
 EBUILD netbeans-harness-9999_p20160406.ebuild 4126 SHA256 706579e6984842c5f3219abdb3903054c9eabc1a98772a10d59d256a166b4cfe SHA512 8bacd2006e3c6cd46149e8ad66b5e4472fa6b80b04f77a36273255288b816c4a85f3498c0c233250ad4d71b071f8a70ecde488bea40b4395b9117fd7864a823f WHIRLPOOL a18731b52f19cf46d36d922dce3e10301b67d5ba0962029c52ae0552e2bb9869de2a8b8220795c766e27f2be39e2c1bb2c15fcf28ec40ff2e012d3abcae58c9e
+EBUILD netbeans-harness-9999_p20160407.ebuild 4126 SHA256 2fee9a93531779313c2f426dc8d293df1184daabdff2591254cd1af492c8daa3 SHA512 1940845a62c8c85bc3fa090e11b54fedf241fa35bf2ace65becc96fd920162614dd69fe12473bdb4606b778dcd0236449654abfb14d4864dc22d9956bfa84f0d WHIRLPOOL 21627dc15a17300da8e104970e58bd763858ad56cbde5985c72b7a51a35a0fcaae67c1f6e11809ad3a9aa17625d6871ce4285c129791966d3b38e06750fd6ee3
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160407.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160407.ebuild
new file mode 100644
index 0000000..60b3120
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20160407.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-04-07_00-01-48/zip/netbeans-trunk-nightly-201604070001-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 e34e57b..bdbbe1d 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -162,6 +162,7 @@ DIST netbeans-trunk-nightly-201604010001-src.zip 210167621 SHA256 986f8b46056619
 DIST netbeans-trunk-nightly-201604040001-src.zip 210177204 SHA256 d631db81653c15068048be2b74afc1db99343569290cc8bb69e4896d218359f1 SHA512 b32f719319b8b62b0e97571dca3025de424c6e36b5798f8a834793dea6c17bff7d478ffe175471ceb75e8fbd8e4a0f9400a93588ba939073c7675b965ba355ac WHIRLPOOL 0fe29a3e7e9599f662abad9e555b1d389203bf8149dd5523f83cc540ef4858ba338feaa7b8c9d43877b02a56e9de3e9b45de798a5bda3a74241bd8e42dee723e
 DIST netbeans-trunk-nightly-201604050001-src.zip 210178748 SHA256 c8df05a78860af29856a5b64aacf8ff870cfe03770bd2346329b73e8fd0784f8 SHA512 c3eb40e3e9702e750d0f8dd3e69083575e379fb35146e25a461d5e204206a719f8d9bd7e744fbab387ed75add6778f87a5079eae9af2f7792114aa1a97a98b37 WHIRLPOOL f63f7339759d4f701454cef85447abd8c993a0aa02375d2b8405033962a2d6f0c6933b0b55a55c71c5f6dc94273abe0806880d0c3fc496869a34a237d15e4cd5
 DIST netbeans-trunk-nightly-201604060001-src.zip 210178912 SHA256 9cba66d0d2af5fcdbd2dc21ee273931bb2c0ea84907761a6ae84c29206709589 SHA512 437ab0030682f694066c40df29b446eb0bcf0b90dfc519b9cae20534fd1409fedcc78774b7e614036b696e2b6e4bcdf2e5943d84500635d224fc1ad767b37ee0 WHIRLPOOL 91903a438d4599f3c7d483a82554b948ffe01dc50ec547f256450b9f94d4f0c7b9738b01448ab6c3585b98798c3f5ad96c432d04a36c0d9f2776a0228c1e2674
+DIST netbeans-trunk-nightly-201604070001-src.zip 210188037 SHA256 7092c74499a788c69c0cd6539a42939851f3af3d1e4e7412f484dd5b0cb31904 SHA512 58b2f347020c917f4eec46aa9de482d9f4c26592d11b8bea2393554cdc5f5420451468824c64389d56a8801925cf2b9d605b4ee4eba8ab59f0d43f392ff1737f WHIRLPOOL d8a978091f9511677606df39902b8f9aff6e26ef369a6410d74b11efd409455681257a90879ce883a6ae3cac671562bcbd25991c2c5e81b672dcfa981e1b476c
 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_p20160304.ebuild 30250 SHA256 2d7305acf4ef9ba48e1349642eedd7c12c21c5dd4ee95c240e78a4cf7146c57c SHA512 abccbdf576bb9cb242943179e17807f36c0d7f59b52f97042f86ae7df34044508e1f3cfc77a493b9dd9dec57dadc35679ac867aaa570abac1fe24e66609ffc85 WHIRLPOOL 07bc0b5ec502fbd5790e2958b1efbc515ca531ba083648bdbfc7d093519a537641108173cf2aa2df5cc4fdee06452f6bed630c14c9e414b045bf740a03a891b8
@@ -182,4 +183,5 @@ EBUILD netbeans-ide-9999_p20160401.ebuild 30737 SHA256 cab862c91572446e13cde880d
 EBUILD netbeans-ide-9999_p20160404.ebuild 30761 SHA256 36b6161257c1a98479c3a7c951cecb46686f0c6cc41822545eefaffb7e262799 SHA512 5d5dec666cc8b96562b909a4415773e3afd157088b3a6cd484ed7511f475870c54b3f2216ce882e4e73f3c192f01d0c402578258b28e1e38b41833ab62ffd627 WHIRLPOOL 53bfd61c6135fbe00998f22843a69faf21ea3166981f3af807e41d5419855871f221017ce639ea12660bad519d7805af2e65cef216d5fc4cb593deb2e9ed6a5b
 EBUILD netbeans-ide-9999_p20160405.ebuild 30761 SHA256 0f411e090da66cd9ae0f8520ac4f6facbc37053ec40e031953bc76a790cf3958 SHA512 5fe86e37eab4b4199dbc50763709e79e52b93a7696d5e88c4a5f564d79d20efde1a212e70bf0756cfd17a631b3265465afec59d86fa3e414e144f70190dc10c4 WHIRLPOOL 14173f70a71f6672e02e1284f49973ec39f78c8aa604f050985a1854cd7977219657fc38fa1f3763bbec369090c5e328fea7eda6ca256e312a34b830c5419a6c
 EBUILD netbeans-ide-9999_p20160406.ebuild 30761 SHA256 43fcbda8582a3c87fd527dc720313978c96a9b24653daa8de289562926168ef9 SHA512 02b3f3feb55b706028e1f7cf10aaf12c0b092c7a985d41b9558c5ad2ee3edcdf6dd1559922eb9b56c5c0b10bc0438b98fad0407786e749fe49cc9b8769fe369a WHIRLPOOL 9068b1dee92732bfb1a2a1b5b8b6f5a3dc045018edf01c77186856b56455db09e82f132480320e0cfa7e50b30831717ffcf08fac77d1baf65f4ad72726904b63
+EBUILD netbeans-ide-9999_p20160407.ebuild 30761 SHA256 6a6c02c32fb8ba7faaf1389efc9f44f6b95ab4f3e37379eb05ebc5296ddee752 SHA512 123517e24a17cdbe155123924e69f100c1419245f54eb3d2d1a74660de8bdb23ed3e4bd86122a18e045a59bb05ed91d1c5edbb4cabded72e2990e7f9eaa8368b WHIRLPOOL cea2ed13af2873ba19f2c7bc7d8ca04c32a3a0594771127d97e22b82c157a9e98a8777cd2a879cbfbdc38abac8ec1f948baf0d343812a9cdefa9c8daf8ad46cc
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160407.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160407.ebuild
new file mode 100644
index 0000000..142abf1
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20160407.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-04-07_00-01-48/zip/netbeans-trunk-nightly-201604070001-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 0709e21..b93a32e 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -56,6 +56,7 @@ DIST netbeans-trunk-nightly-201604010001-src.zip 210167621 SHA256 986f8b46056619
 DIST netbeans-trunk-nightly-201604040001-src.zip 210177204 SHA256 d631db81653c15068048be2b74afc1db99343569290cc8bb69e4896d218359f1 SHA512 b32f719319b8b62b0e97571dca3025de424c6e36b5798f8a834793dea6c17bff7d478ffe175471ceb75e8fbd8e4a0f9400a93588ba939073c7675b965ba355ac WHIRLPOOL 0fe29a3e7e9599f662abad9e555b1d389203bf8149dd5523f83cc540ef4858ba338feaa7b8c9d43877b02a56e9de3e9b45de798a5bda3a74241bd8e42dee723e
 DIST netbeans-trunk-nightly-201604050001-src.zip 210178748 SHA256 c8df05a78860af29856a5b64aacf8ff870cfe03770bd2346329b73e8fd0784f8 SHA512 c3eb40e3e9702e750d0f8dd3e69083575e379fb35146e25a461d5e204206a719f8d9bd7e744fbab387ed75add6778f87a5079eae9af2f7792114aa1a97a98b37 WHIRLPOOL f63f7339759d4f701454cef85447abd8c993a0aa02375d2b8405033962a2d6f0c6933b0b55a55c71c5f6dc94273abe0806880d0c3fc496869a34a237d15e4cd5
 DIST netbeans-trunk-nightly-201604060001-src.zip 210178912 SHA256 9cba66d0d2af5fcdbd2dc21ee273931bb2c0ea84907761a6ae84c29206709589 SHA512 437ab0030682f694066c40df29b446eb0bcf0b90dfc519b9cae20534fd1409fedcc78774b7e614036b696e2b6e4bcdf2e5943d84500635d224fc1ad767b37ee0 WHIRLPOOL 91903a438d4599f3c7d483a82554b948ffe01dc50ec547f256450b9f94d4f0c7b9738b01448ab6c3585b98798c3f5ad96c432d04a36c0d9f2776a0228c1e2674
+DIST netbeans-trunk-nightly-201604070001-src.zip 210188037 SHA256 7092c74499a788c69c0cd6539a42939851f3af3d1e4e7412f484dd5b0cb31904 SHA512 58b2f347020c917f4eec46aa9de482d9f4c26592d11b8bea2393554cdc5f5420451468824c64389d56a8801925cf2b9d605b4ee4eba8ab59f0d43f392ff1737f WHIRLPOOL d8a978091f9511677606df39902b8f9aff6e26ef369a6410d74b11efd409455681257a90879ce883a6ae3cac671562bcbd25991c2c5e81b672dcfa981e1b476c
 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_p20160304.ebuild 14930 SHA256 650a61b9e39822c25a55cf08221f118e8d1aa168f9947a32bfaeeb1b991798bd SHA512 c0edb556a1dde102b0979335e9a312850baa8dc8dfc8479f0e4ca576ae2326b026a7df7581d50b829dbc9cfa183c144e366fd53e0ea8996a91d9e0e944b658ab WHIRLPOOL 4e0780d57cbe0c0992354cd1ea273bdec1eb1d98821654a2c69b7a8ca459296dae2ac95aff2dccc708b9d1600dde95550c811a35371fbeb54e069f270dc7d957
@@ -76,4 +77,5 @@ EBUILD netbeans-java-9999_p20160401.ebuild 14930 SHA256 78fd1a39ec397d001e586993
 EBUILD netbeans-java-9999_p20160404.ebuild 14930 SHA256 5503a058959183e2163e84c1fd1a2583059f19055b985cc43056601e8ebc8a40 SHA512 9c72bee85ada7f19af9e6c4a37152c0a7084a36c7462568a65a8b46320b71033d96842fe4b00cc038b5d6ff2acc2dea6819a54ecc0c783ee0a24930aa05f0f21 WHIRLPOOL c13dfda94321c2ff3d9b95f12422c32fba650bf995190776ec4c72cf23939ba5a5c6bd2321dfc73b934fd99d1d2d37e7876520475f8867caff580ff64fb0745c
 EBUILD netbeans-java-9999_p20160405.ebuild 14930 SHA256 0463a50dd7009899c64c9166d5c96cc2087cc1762a15ed760ce368e48231dd51 SHA512 1beab06e17692ffcda3e44cafaed6b01a65a78f009eb0d4e9bc022a18ffb7dce9a78c561a5757c249c230fc782ffe05fe739431944bb9b092fb4874c60a2195a WHIRLPOOL 8530f57ea4107a89e5d2e4f6b3b3d021c1dd42ccde4258f1a8bf322999bea1261a8af63ec594619166e4fcb9a39c1b6afd47a01bdeb66d5ee9c78cec9ec910ee
 EBUILD netbeans-java-9999_p20160406.ebuild 14930 SHA256 70383ffd8bc55e8fabb2b0a860f226d74b4802d170c5ce8fa41ce4fb1fb9b022 SHA512 cbf302378cd0b559fd9ad823b08bacc1a57777a88d02655b3f4d96af801759e5425fa035dc7bda150f98dc791ca9ac6d186979fa53878f9e40b5a1c5d74c17b4 WHIRLPOOL dd08ce2ade737076a92d39e522c0dccb039e38c655ab7ad7a5088fe23ef777bd1430fbec0d58c1df53f120e580d5196b77d2e1efb73b230bdf7494caba0e0181
+EBUILD netbeans-java-9999_p20160407.ebuild 14930 SHA256 752b6c286e7a3c9379eeba617a5fa3d80ab94696f803fb55b9d38aeae3033f86 SHA512 24a31d5f4228f68104892444f43a9640a13a507be20a62133fd77e4226c4057d085f2679a9ca776e62802523336b6da4041a3ed215409f055b73570b02638a0d WHIRLPOOL f0c8043e9e41b9adce0691729d463ba9336108a7f8ea3da78e6c65cba726ca2f7b4e6a1e7db92977c7614f6da5c46c8bdee55e34b59015a128025b1ccf952aa0
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160407.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160407.ebuild
new file mode 100644
index 0000000..a76fa1c
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20160407.ebuild
@@ -0,0 +1,274 @@
+# 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-04-07_00-01-48/zip/netbeans-trunk-nightly-201604070001-src.zip"
+# jarjar-1.4 contains also asm libraries
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar
+	http://hg.netbeans.org/binaries/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip
+	http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip
+	http://hg.netbeans.org/binaries/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar
+	http://hg.netbeans.org/binaries/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip
+	http://hg.netbeans.org/binaries/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar
+	http://hg.netbeans.org/binaries/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar
+	http://hg.netbeans.org/binaries/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar
+	http://hg.netbeans.org/binaries/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar
+	http://hg.netbeans.org/binaries/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip
+	http://hg.netbeans.org/binaries/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip
+	http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip
+	http://hg.netbeans.org/binaries/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip
+	http://hg.netbeans.org/binaries/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar
+	http://hg.netbeans.org/binaries/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar
+	http://hg.netbeans.org/binaries/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar
+	http://hg.netbeans.org/binaries/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar
+	http://hg.netbeans.org/binaries/E3764E0AB4F9F9ED16AEB6A68B8E3F2442DDCCB6-nb-javac-impl.jar
+	http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
+	http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar
+	http://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip
+	http://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip
+	http://hg.netbeans.org/binaries/B572007A07023ADF7ECBDB7FC2D572BF1BDED20D-wagon-http-2.8-shaded.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/beansbinding:0
+	dev-java/cglib:3
+	dev-java/jdom:0"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	dev-java/json-simple:0
+	dev-java/junit:4"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}
+	dev-java/absolutelayout:0
+	>=dev-java/antlr-2.7.7-r7:0
+	dev-java/c3p0:0
+	dev-java/commons-cli:1
+	dev-java/commons-collections:0
+	dev-java/dom4j:1
+	dev-java/fastinfoset:0
+	dev-java/glassfish-transaction-api:0
+	dev-java/javassist:3
+	dev-java/jboss-logging:0
+	dev-java/jsr67:0
+	dev-java/jsr181:0
+	>=dev-java/jtidy-1:0
+	dev-java/log4j:0
+	dev-java/mimepull:0
+	dev-java/oracle-javamail:0
+	dev-java/saaj:0
+	dev-java/slf4j-api:0
+	dev-java/slf4j-log4j12:0
+	dev-java/slf4j-simple:0
+	dev-java/stax-ex:0
+	dev-java/stax2-api:0
+	dev-java/xmlstreambuffer:0"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.java -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+pkg_pretend() {
+	local die_now=""
+
+	if [ -d /usr/share/netbeans-java-${SLOT}/ant ]; then
+		if [ -n "$(find /usr/share/netbeans-java-${SLOT}/ant -type l)" ]; then
+			eerror "Please remove following symlinks and run emerge again:"
+			find /usr/share/netbeans-java-${SLOT}/ant -type l
+			die_now="1"
+		fi
+	fi
+
+	if [ -L /usr/share/netbeans-java-${SLOT}/maven ]; then
+		if [ -z "${die_now}" ]; then
+			eerror "Please remove following symlinks and run emerge again:"
+		fi
+
+		echo "/usr/share/netbeans-java-${SLOT}/maven"
+		die_now="1"
+	fi
+
+	if [ -n "${die_now}" ]; then
+		die "Symlinks exist"
+	fi
+}
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r16-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar maven/external/aether-api-1.0.2.v20150114.jar || die
+	ln -s "${DISTDIR}"/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip maven.embedder/external/apache-maven-3.0.5-bin.zip || die
+	ln -s "${DISTDIR}"/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip o.jdesktop.beansbinding/external/beansbinding-1.2.1-doc.zip || die
+	ln -s "${DISTDIR}"/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar j2ee.eclipselink/external/eclipselink.jar || die
+	ln -s "${DISTDIR}"/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip hibernate4lib/external/hibernate-release-4.3.1-lib.zip || die
+	ln -s "${DISTDIR}"/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar maven.indexer/external/indexer-artifact-5.1.1.jar || die
+	ln -s "${DISTDIR}"/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar maven.indexer/external/indexer-core-5.1.1-patched.jar || die
+	ln -s "${DISTDIR}"/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar maven/external/jarjar-1.4.jar || die
+	ln -s "${DISTDIR}"/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar j2ee.eclipselink/external/javax.persistence_2.1.0.v201304241213.jar || die
+	ln -s "${DISTDIR}"/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip websvc.jaxws21/external/jaxws-2.2.6.zip || die
+	ln -s "${DISTDIR}"/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip websvc.jaxws21api/external/jaxws-2.2.6-api.zip || die
+	ln -s "${DISTDIR}"/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip websvc.jaxws21/external/jaxws-api-doc.zip || die
+	ln -s "${DISTDIR}"/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip j2ee.eclipselink/external/JPAjavadocs04032013.zip || die
+	ln -s "${DISTDIR}"/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar maven.indexer/external/lucene-core-3.6.2.jar || die
+	ln -s "${DISTDIR}"/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar maven.indexer/external/lucene-highlighter-3.6.2.jar || die
+	ln -s "${DISTDIR}"/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar maven.embedder/external/maven-dependency-tree-2.0.jar || die
+	ln -s "${DISTDIR}"/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
+	ln -s "${DISTDIR}"/E3764E0AB4F9F9ED16AEB6A68B8E3F2442DDCCB6-nb-javac-impl.jar libs.javacimpl/external/nb-javac-impl.jar || die
+	ln -s "${DISTDIR}"/CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.jar maven/external/netbeans-cos.jar || die
+	ln -s "${DISTDIR}"/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselink/external/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar || die
+	ln -s "${DISTDIR}"/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselinkmodelgen/external/org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar || die
+	ln -s "${DISTDIR}"/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip libs.springframework/external/spring-framework-3.2.7.RELEASE.zip || die
+	ln -s "${DISTDIR}"/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip libs.springframework/external/spring-framework-4.0.1.RELEASE.zip || die
+	ln -s "${DISTDIR}"/B572007A07023ADF7ECBDB7FC2D572BF1BDED20D-wagon-http-2.8-shaded.jar maven.embedder/external/wagon-http-2.8-shaded.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 316e049..f958ecc 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201604010001-src.zip 210167621 SHA256 986f8b46056619
 DIST netbeans-trunk-nightly-201604040001-src.zip 210177204 SHA256 d631db81653c15068048be2b74afc1db99343569290cc8bb69e4896d218359f1 SHA512 b32f719319b8b62b0e97571dca3025de424c6e36b5798f8a834793dea6c17bff7d478ffe175471ceb75e8fbd8e4a0f9400a93588ba939073c7675b965ba355ac WHIRLPOOL 0fe29a3e7e9599f662abad9e555b1d389203bf8149dd5523f83cc540ef4858ba338feaa7b8c9d43877b02a56e9de3e9b45de798a5bda3a74241bd8e42dee723e
 DIST netbeans-trunk-nightly-201604050001-src.zip 210178748 SHA256 c8df05a78860af29856a5b64aacf8ff870cfe03770bd2346329b73e8fd0784f8 SHA512 c3eb40e3e9702e750d0f8dd3e69083575e379fb35146e25a461d5e204206a719f8d9bd7e744fbab387ed75add6778f87a5079eae9af2f7792114aa1a97a98b37 WHIRLPOOL f63f7339759d4f701454cef85447abd8c993a0aa02375d2b8405033962a2d6f0c6933b0b55a55c71c5f6dc94273abe0806880d0c3fc496869a34a237d15e4cd5
 DIST netbeans-trunk-nightly-201604060001-src.zip 210178912 SHA256 9cba66d0d2af5fcdbd2dc21ee273931bb2c0ea84907761a6ae84c29206709589 SHA512 437ab0030682f694066c40df29b446eb0bcf0b90dfc519b9cae20534fd1409fedcc78774b7e614036b696e2b6e4bcdf2e5943d84500635d224fc1ad767b37ee0 WHIRLPOOL 91903a438d4599f3c7d483a82554b948ffe01dc50ec547f256450b9f94d4f0c7b9738b01448ab6c3585b98798c3f5ad96c432d04a36c0d9f2776a0228c1e2674
+DIST netbeans-trunk-nightly-201604070001-src.zip 210188037 SHA256 7092c74499a788c69c0cd6539a42939851f3af3d1e4e7412f484dd5b0cb31904 SHA512 58b2f347020c917f4eec46aa9de482d9f4c26592d11b8bea2393554cdc5f5420451468824c64389d56a8801925cf2b9d605b4ee4eba8ab59f0d43f392ff1737f WHIRLPOOL d8a978091f9511677606df39902b8f9aff6e26ef369a6410d74b11efd409455681257a90879ce883a6ae3cac671562bcbd25991c2c5e81b672dcfa981e1b476c
 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_p20160304.ebuild 4971 SHA256 747cad2182c461390f07519ea12f1bc2516d90dbbb20c93aace62f9ad4239365 SHA512 b61910b15df6dd0c2f718498582316375c30681aba6ac6d454cd7ad4d306f7bd05df1ddc75f8202ffb5e6889e70e6c901dcaa72dc57d407b9fedffe72923efd5 WHIRLPOOL ce1e0f7300a5fc08cd6dd496201b2be5ef33b42436c455c8d4b62f0f2e1baf7d06a419a4010e8027edb1e1b91ab33985dcb963e14ec144f0f98d7eae8920c1ca
@@ -46,4 +47,5 @@ EBUILD netbeans-javacard-9999_p20160401.ebuild 4971 SHA256 d9424f22b00a06ae3f2c8
 EBUILD netbeans-javacard-9999_p20160404.ebuild 4971 SHA256 7f83d41142cea48e34d13be2815182c98664006e48516188c7953b2b0581e240 SHA512 3870749bda04b8d8214b5fabc770c130257c4f2902dc7b6eff1ee9d9df695afe23176a996acc26c7f71b530258cd54a87b866f436807e9c8d9772a5abd8f806e WHIRLPOOL 26e5388971d9b8f122ae8254f4bdbffc0a0555654dad52fbdd95436ff0895253059ebc44bb673e1be681baf81db83c26f56d861c9b66c347a9d4c2b4777c4336
 EBUILD netbeans-javacard-9999_p20160405.ebuild 4971 SHA256 02f277687a3e966625d4ee6c96dcc0368fa0ccd46d0f57daf8743fa4c9193b09 SHA512 0233214d585041a4faa7465a8c115450ef23c84904c06227d5f3a022e3d1fc51564b05bf4baecdf921386fa3c9baaf7e76a1e4608da2601d2fd643f724b01897 WHIRLPOOL 12c228200d8d42f2a8afd29d308a34f37d6c6edf93ee748e5a87597c49914d6d6de968047bd27453c3889556765e98e8b178b141ecb0815dcdecfdc18c3d1f19
 EBUILD netbeans-javacard-9999_p20160406.ebuild 4971 SHA256 43351f8b4408ea6cee50dea6ba81fa98538f47d8096450c30343f1ab02999669 SHA512 6ce075715661a853984bedb377c81d4e8d2832d2f8c6786045e4c2323f7ac8811ff8f6b7ee5cbcf3984878d54ead08999497679e457d1df6e993338dc03e9ac7 WHIRLPOOL 865e40aa9c540e93d6ef4d016528847bf74bc69b1ebda75e3c6a170eb70c898b964a288b860d3610529ba9e718960ace6298545a339a14f7e2e565e0c0c3c87b
+EBUILD netbeans-javacard-9999_p20160407.ebuild 4971 SHA256 7ccdc87322b52abcd6005ea642ef4d4986f1e577ffab2d2f15058021d3fb0a98 SHA512 ad358b92a14473dfad415c71960308267290fd1566dab6195be3dbbfd88aea9c54ba6c08ec63a998f2ef01bb1d88b595968a9e13fd1db1a2a5a197d9db591c1f WHIRLPOOL 9d2224c1ec4d0372777375cacc849b3f185ec4a402a52af86f36777ee2c9c1e7708e0e9e96b27cae623f97e1d6f1a0e86a4ff11323e2b859bfebc534300e0dd2
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160407.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160407.ebuild
new file mode 100644
index 0000000..2b5d177
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160407.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-04-07_00-01-48/zip/netbeans-trunk-nightly-201604070001-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 c2ddb1b..24165de 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201604010001-src.zip 210167621 SHA256 986f8b46056619
 DIST netbeans-trunk-nightly-201604040001-src.zip 210177204 SHA256 d631db81653c15068048be2b74afc1db99343569290cc8bb69e4896d218359f1 SHA512 b32f719319b8b62b0e97571dca3025de424c6e36b5798f8a834793dea6c17bff7d478ffe175471ceb75e8fbd8e4a0f9400a93588ba939073c7675b965ba355ac WHIRLPOOL 0fe29a3e7e9599f662abad9e555b1d389203bf8149dd5523f83cc540ef4858ba338feaa7b8c9d43877b02a56e9de3e9b45de798a5bda3a74241bd8e42dee723e
 DIST netbeans-trunk-nightly-201604050001-src.zip 210178748 SHA256 c8df05a78860af29856a5b64aacf8ff870cfe03770bd2346329b73e8fd0784f8 SHA512 c3eb40e3e9702e750d0f8dd3e69083575e379fb35146e25a461d5e204206a719f8d9bd7e744fbab387ed75add6778f87a5079eae9af2f7792114aa1a97a98b37 WHIRLPOOL f63f7339759d4f701454cef85447abd8c993a0aa02375d2b8405033962a2d6f0c6933b0b55a55c71c5f6dc94273abe0806880d0c3fc496869a34a237d15e4cd5
 DIST netbeans-trunk-nightly-201604060001-src.zip 210178912 SHA256 9cba66d0d2af5fcdbd2dc21ee273931bb2c0ea84907761a6ae84c29206709589 SHA512 437ab0030682f694066c40df29b446eb0bcf0b90dfc519b9cae20534fd1409fedcc78774b7e614036b696e2b6e4bcdf2e5943d84500635d224fc1ad767b37ee0 WHIRLPOOL 91903a438d4599f3c7d483a82554b948ffe01dc50ec547f256450b9f94d4f0c7b9738b01448ab6c3585b98798c3f5ad96c432d04a36c0d9f2776a0228c1e2674
+DIST netbeans-trunk-nightly-201604070001-src.zip 210188037 SHA256 7092c74499a788c69c0cd6539a42939851f3af3d1e4e7412f484dd5b0cb31904 SHA512 58b2f347020c917f4eec46aa9de482d9f4c26592d11b8bea2393554cdc5f5420451468824c64389d56a8801925cf2b9d605b4ee4eba8ab59f0d43f392ff1737f WHIRLPOOL d8a978091f9511677606df39902b8f9aff6e26ef369a6410d74b11efd409455681257a90879ce883a6ae3cac671562bcbd25991c2c5e81b672dcfa981e1b476c
 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_p20160304.ebuild 6293 SHA256 71c88043d8c79b22f860623f4c3be4a5a7ae4b081cf726f7822b112425d145ec SHA512 9879a283cf9ba07b928c8e178d84aa3f7ba3011e96def675a29341987209aad414ca1bfa46b502b05e99477cbebd3ec4d6b21b07489dbd3ca7a3161d470dd7a9 WHIRLPOOL ffd97ff2dc609aff1c708f9fd177f3b51247e5c7c7e07d008267a803791a34c989430b0dafef1f6f3cc862339fc69feea6141d49b8bf6486deb6fd852ac6ac82
@@ -44,4 +45,5 @@ EBUILD netbeans-javadoc-9999_p20160401.ebuild 6293 SHA256 a7720fd0f5b0a34bb841c5
 EBUILD netbeans-javadoc-9999_p20160404.ebuild 6293 SHA256 bb18098093ed3065215aa8b36a0d3893cf4f1c1560a540db6cad6e981c74478d SHA512 3c26780636c11fd42599d86078a8162ae5e2a691df5a986da34ca6052f4d9033246a7bad13e2a37365b7c1effec43912e88f874a9e67d23e621ccb62d2ee948e WHIRLPOOL 3dd02775a14bda0ce38d8eaa2d5b33159caabaa663b22d5e5c28ebe0668244b2e89113001038a1b7ee41034060b1b9112aa6e8382edad144bf938c817dd9bf61
 EBUILD netbeans-javadoc-9999_p20160405.ebuild 6293 SHA256 0a65551d5910776e112eb0730161594c91d4d770c968431457eaeecb8e6ed3cc SHA512 36218cde42d64b4a9783173caf1b2616726fb34225f5d230c033fe32c48df5d29d3dc79e65d3b7b12454034c35c171a64d3ca8cde2ebcc4b150d81d1e05c91e2 WHIRLPOOL 7b7eda47bd473af08e6a2b2c313cbf0766547039cec810e5688926bfa2abf81a832a331ebdb38259464def612676edaaa4cad2ece2cd82868200e4e3f4c73b07
 EBUILD netbeans-javadoc-9999_p20160406.ebuild 6293 SHA256 ae8bdb87c48ad3694bb97b4e36469315f27d693fb6a535f4ca5a147e5d746ad8 SHA512 a580b2fa453730077bd949b8b3a40f75576a90238b82998b9ab12d1ce0d90fbd8a0407de1e7660380adc9aaa8fdb9ac6eb0c240a7983026044ea03139fdf3dfa WHIRLPOOL 6723e0c56a852783e3715f0b5933ce292b9f3c87d40b72cdf00afdb8e40b0682d26a99e51ea02e7b38cdb60d9b38ceb769f40c91bb8f58ad00cd8a1fbab3f144
+EBUILD netbeans-javadoc-9999_p20160407.ebuild 6293 SHA256 13af3ef36414ae6901bb1854ff4a5b47c2c605d003ff22148ba86ac9ae1af145 SHA512 05fe42eb4e35094e6f7c37588dd4ac28bbcbf4c8820d34ceca44f7ebd4ca73ec37efd94dc6a36dd4e5cd23d8eda9a99b64e2a78861f15476dc595f69411d15db WHIRLPOOL 9eb0fce37235c7795c2fbac7f9d30b8c9e37efed34968fe945f133d282fb3a7961c441ba71921725bb23b1efa420965d6c19f30977a52dbd88a6fea3373750a6
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160407.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160407.ebuild
new file mode 100644
index 0000000..4182812
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160407.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-04-07_00-01-48/zip/netbeans-trunk-nightly-201604070001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.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}"/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip o.apache.tools.ant.module/external/ant-libs-1.9.4.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 92a55e5..fec554e 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201604010001-src.zip 210167621 SHA256 986f8b46056619
 DIST netbeans-trunk-nightly-201604040001-src.zip 210177204 SHA256 d631db81653c15068048be2b74afc1db99343569290cc8bb69e4896d218359f1 SHA512 b32f719319b8b62b0e97571dca3025de424c6e36b5798f8a834793dea6c17bff7d478ffe175471ceb75e8fbd8e4a0f9400a93588ba939073c7675b965ba355ac WHIRLPOOL 0fe29a3e7e9599f662abad9e555b1d389203bf8149dd5523f83cc540ef4858ba338feaa7b8c9d43877b02a56e9de3e9b45de798a5bda3a74241bd8e42dee723e
 DIST netbeans-trunk-nightly-201604050001-src.zip 210178748 SHA256 c8df05a78860af29856a5b64aacf8ff870cfe03770bd2346329b73e8fd0784f8 SHA512 c3eb40e3e9702e750d0f8dd3e69083575e379fb35146e25a461d5e204206a719f8d9bd7e744fbab387ed75add6778f87a5079eae9af2f7792114aa1a97a98b37 WHIRLPOOL f63f7339759d4f701454cef85447abd8c993a0aa02375d2b8405033962a2d6f0c6933b0b55a55c71c5f6dc94273abe0806880d0c3fc496869a34a237d15e4cd5
 DIST netbeans-trunk-nightly-201604060001-src.zip 210178912 SHA256 9cba66d0d2af5fcdbd2dc21ee273931bb2c0ea84907761a6ae84c29206709589 SHA512 437ab0030682f694066c40df29b446eb0bcf0b90dfc519b9cae20534fd1409fedcc78774b7e614036b696e2b6e4bcdf2e5943d84500635d224fc1ad767b37ee0 WHIRLPOOL 91903a438d4599f3c7d483a82554b948ffe01dc50ec547f256450b9f94d4f0c7b9738b01448ab6c3585b98798c3f5ad96c432d04a36c0d9f2776a0228c1e2674
+DIST netbeans-trunk-nightly-201604070001-src.zip 210188037 SHA256 7092c74499a788c69c0cd6539a42939851f3af3d1e4e7412f484dd5b0cb31904 SHA512 58b2f347020c917f4eec46aa9de482d9f4c26592d11b8bea2393554cdc5f5420451468824c64389d56a8801925cf2b9d605b4ee4eba8ab59f0d43f392ff1737f WHIRLPOOL d8a978091f9511677606df39902b8f9aff6e26ef369a6410d74b11efd409455681257a90879ce883a6ae3cac671562bcbd25991c2c5e81b672dcfa981e1b476c
 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_p20160304.ebuild 4717 SHA256 166a2baa58f236e911e9388646b82ef01a335e3a773d919b50cd44ad46b0da09 SHA512 da5f3452d3ac712a628ba1ccf9ae2c540e98b3fafb81c0b6e0bd0b59ab213259e1e006eac2830821b496bc8f8f8987c1c1549b6741f5bda22eaad621802a4876 WHIRLPOOL 6720dd8f2bd3d997cd64b89bf939014b0318e6c88293906d455c8458b883bf2189edc7de9c0c5a07ecf0d7e832af7d0c32fd98664477c5ca0b1ab53da3e7ecd9
@@ -51,4 +52,5 @@ EBUILD netbeans-javafx-9999_p20160401.ebuild 4717 SHA256 ac66499d21ff428d577f840
 EBUILD netbeans-javafx-9999_p20160404.ebuild 4717 SHA256 915ccf707fbcba3e6b4f4ba73524be8529c0a3168eea605eb6ff161749252e35 SHA512 44e5e12eb6a7074cc001e23d7672eb09fb66fb26752ac16d46b71a64d2ab54c4f9055f687530c62558391e5c0f129ea041dec94031e7510ce46dfc6e1740b9ff WHIRLPOOL 347d79aa2eace093939cb3dc38ee45203387c9c7da802e83203b3a67c8f1e5c49060f2425784c34cf20758337994be9765b18e8d46800d04c1c439e8770f2593
 EBUILD netbeans-javafx-9999_p20160405.ebuild 4717 SHA256 3e851cdd2fb8f65f2129b3986fb5f84919be187d867387f9fea42bfc81140faf SHA512 3dd6d7d41ac699ad066d41c4be34d9fa540c353236d9441b58191d1af6f0b2c8161b5daacfe9b72c695ce848fdb9d7d0c28904780793df013221045ef00bf93b WHIRLPOOL 02df3c85cbf9e9845f6a32130ea6d172d74fba1ca3f67530eec47d09a896ca8ad4300ce4bbdca275b4aba45d28e653139daaa576734ddad1215b34394eb8400a
 EBUILD netbeans-javafx-9999_p20160406.ebuild 4717 SHA256 8dfb2e3b9b605f3a096faf06101ffeeb4909b835a78c67a3e2894ab57c42ca3c SHA512 1f821eb42d63f9a2aceff6c12ea9e2e7fffd3ee539341d44875210254f09ae45f71d485d4ef3a7128909e4adb2ca3d3b7e2913bae956c5ff8626232747db73a0 WHIRLPOOL 379c41ac39e0f8e187acb3cc2b3a02f12f9d4688632137255252fe2eab7e991323b2c4622ff952b1d295a38d9671bb485db5cc4868aef965c59daf54cc1a03e6
+EBUILD netbeans-javafx-9999_p20160407.ebuild 4717 SHA256 b59bda1d0084764d94c1f7eced3c5785cc19646093eb1544f5c9854f457f55d4 SHA512 49ed568dcb3d6dff16a9a29af39a8f58a1530361dea995fa795e36dc6f226492297763e37300445af3c0f571f860f297e84462803484f7115bec14eaccd408bd WHIRLPOOL 283084e3013dc16225d9f7f6f116cdf558c4d56d6565c56c726876d6d14b3b356a6d15ca7ccfc132133a18b30478ebadb1e96d9d4bf589adbc7309a083b3393b
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160407.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160407.ebuild
new file mode 100644
index 0000000..c9b6dbe
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160407.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-04-07_00-01-48/zip/netbeans-trunk-nightly-201604070001-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 fb7d39d..4e3bc26 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201604010001-src.zip 210167621 SHA256 986f8b46056619
 DIST netbeans-trunk-nightly-201604040001-src.zip 210177204 SHA256 d631db81653c15068048be2b74afc1db99343569290cc8bb69e4896d218359f1 SHA512 b32f719319b8b62b0e97571dca3025de424c6e36b5798f8a834793dea6c17bff7d478ffe175471ceb75e8fbd8e4a0f9400a93588ba939073c7675b965ba355ac WHIRLPOOL 0fe29a3e7e9599f662abad9e555b1d389203bf8149dd5523f83cc540ef4858ba338feaa7b8c9d43877b02a56e9de3e9b45de798a5bda3a74241bd8e42dee723e
 DIST netbeans-trunk-nightly-201604050001-src.zip 210178748 SHA256 c8df05a78860af29856a5b64aacf8ff870cfe03770bd2346329b73e8fd0784f8 SHA512 c3eb40e3e9702e750d0f8dd3e69083575e379fb35146e25a461d5e204206a719f8d9bd7e744fbab387ed75add6778f87a5079eae9af2f7792114aa1a97a98b37 WHIRLPOOL f63f7339759d4f701454cef85447abd8c993a0aa02375d2b8405033962a2d6f0c6933b0b55a55c71c5f6dc94273abe0806880d0c3fc496869a34a237d15e4cd5
 DIST netbeans-trunk-nightly-201604060001-src.zip 210178912 SHA256 9cba66d0d2af5fcdbd2dc21ee273931bb2c0ea84907761a6ae84c29206709589 SHA512 437ab0030682f694066c40df29b446eb0bcf0b90dfc519b9cae20534fd1409fedcc78774b7e614036b696e2b6e4bcdf2e5943d84500635d224fc1ad767b37ee0 WHIRLPOOL 91903a438d4599f3c7d483a82554b948ffe01dc50ec547f256450b9f94d4f0c7b9738b01448ab6c3585b98798c3f5ad96c432d04a36c0d9f2776a0228c1e2674
+DIST netbeans-trunk-nightly-201604070001-src.zip 210188037 SHA256 7092c74499a788c69c0cd6539a42939851f3af3d1e4e7412f484dd5b0cb31904 SHA512 58b2f347020c917f4eec46aa9de482d9f4c26592d11b8bea2393554cdc5f5420451468824c64389d56a8801925cf2b9d605b4ee4eba8ab59f0d43f392ff1737f WHIRLPOOL d8a978091f9511677606df39902b8f9aff6e26ef369a6410d74b11efd409455681257a90879ce883a6ae3cac671562bcbd25991c2c5e81b672dcfa981e1b476c
 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_p20160304.ebuild 4412 SHA256 5a0e86a9aa4b9ce082677514b00470216500bf471044b9c271afb1bcc3a59381 SHA512 ace567e0483a17d5272b4c8c94cc46523f5021b076eb21bd20c726dce3d5c686b20c422a9cf75f94ca36473912830dcca2f6306eda291d0a0e9674c21f535369 WHIRLPOOL 124e23939f5393cf624df9b4050cec6ba441f3fd1f1476d32e8b4729eb1cbadd32032288ae36992dbbe623180d7b59de8c08dddbb5dd002062d1874c075f855c
@@ -43,4 +44,5 @@ EBUILD netbeans-mobility-9999_p20160401.ebuild 4412 SHA256 c78055a6879233eda7ce7
 EBUILD netbeans-mobility-9999_p20160404.ebuild 4412 SHA256 bdde67d46744228af35ccf771ec42e4f186db43bcae7d7cb1a9978c5de1d7565 SHA512 1ba9e1ebf3cc6d478811be06ba8436bcfa79d1a0a770f5540a99ec9d78cb1f3d1fabeb25d58872de133b777b4576630efb55d00000ebc7e2cc6c11addd5c180d WHIRLPOOL 8286099a44ec2c2dce1ae760389de585c2e1119b9e675f7dcc6c51825ce55f70757ccc2f01e68c1ca8e0d14c1b1523b4ada193b8215c7d1c8c8420d3b32d10d0
 EBUILD netbeans-mobility-9999_p20160405.ebuild 4412 SHA256 2b7022f6c25424ddb1efc5a92a91e03788eff2a37a0b6da018c738d82671ce3a SHA512 150c862ae6140dc3e4dd6a281e54c301529d55fb7700a60cc9f92f47a8fa427d2fd62faf8aa5b240b8949dc86e468898d31d0884fd42b1d30a31ab932a5f3af1 WHIRLPOOL 51819699dace57457154403250ad50517729d455e99201126581b5b0a5e22e611ba35a3500beb3268d0d834122a56f368ee319b703c6a3f6f2ad1d622d77cfac
 EBUILD netbeans-mobility-9999_p20160406.ebuild 4412 SHA256 8071c094a2650214d7d05ecd43f5c4b210df7481b2d6d6c50ac524ab842cb162 SHA512 422b77d80d1dd353c0c0e1c831867e63cc6bd7fc3db277deff32d41dc848570af4091ddc90bde3e850cb5fccbb0dbd8d87c29df4c81dbe9efe4a3462098a8e6b WHIRLPOOL 947bdd82a493883b5998a204cb464f3b83df8a1bb441a3a70c109a89d5398c8da3d8d7c585560f3007573a6faf8b43b3e4f62137d4d79fce5ced8c936efa72f4
+EBUILD netbeans-mobility-9999_p20160407.ebuild 4412 SHA256 614fa018df257073da93b90e6f4023673b3ac6d7891134673ebb0274108ae012 SHA512 3b66871711599be7ae31216fa8be03c5495b4f7ec5527a8e971a1386b5601eabfb8712574802f7256e402517ce264cc25e24ce1d30671202735d4099944dcc48 WHIRLPOOL bfe61830d4061b0ac2122e2edfa717c08a2915ffdf9e24baa22848b8e025ffbc4d6165442effa5b78cc67cc0a4a43b03b70ed99865034331ca481d49093c2eb5
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160407.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160407.ebuild
new file mode 100644
index 0000000..dc6e928
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160407.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-04-07_00-01-48/zip/netbeans-trunk-nightly-201604070001-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 46f8790..2a3611a 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201604010001-src.zip 210167621 SHA256 986f8b46056619
 DIST netbeans-trunk-nightly-201604040001-src.zip 210177204 SHA256 d631db81653c15068048be2b74afc1db99343569290cc8bb69e4896d218359f1 SHA512 b32f719319b8b62b0e97571dca3025de424c6e36b5798f8a834793dea6c17bff7d478ffe175471ceb75e8fbd8e4a0f9400a93588ba939073c7675b965ba355ac WHIRLPOOL 0fe29a3e7e9599f662abad9e555b1d389203bf8149dd5523f83cc540ef4858ba338feaa7b8c9d43877b02a56e9de3e9b45de798a5bda3a74241bd8e42dee723e
 DIST netbeans-trunk-nightly-201604050001-src.zip 210178748 SHA256 c8df05a78860af29856a5b64aacf8ff870cfe03770bd2346329b73e8fd0784f8 SHA512 c3eb40e3e9702e750d0f8dd3e69083575e379fb35146e25a461d5e204206a719f8d9bd7e744fbab387ed75add6778f87a5079eae9af2f7792114aa1a97a98b37 WHIRLPOOL f63f7339759d4f701454cef85447abd8c993a0aa02375d2b8405033962a2d6f0c6933b0b55a55c71c5f6dc94273abe0806880d0c3fc496869a34a237d15e4cd5
 DIST netbeans-trunk-nightly-201604060001-src.zip 210178912 SHA256 9cba66d0d2af5fcdbd2dc21ee273931bb2c0ea84907761a6ae84c29206709589 SHA512 437ab0030682f694066c40df29b446eb0bcf0b90dfc519b9cae20534fd1409fedcc78774b7e614036b696e2b6e4bcdf2e5943d84500635d224fc1ad767b37ee0 WHIRLPOOL 91903a438d4599f3c7d483a82554b948ffe01dc50ec547f256450b9f94d4f0c7b9738b01448ab6c3585b98798c3f5ad96c432d04a36c0d9f2776a0228c1e2674
+DIST netbeans-trunk-nightly-201604070001-src.zip 210188037 SHA256 7092c74499a788c69c0cd6539a42939851f3af3d1e4e7412f484dd5b0cb31904 SHA512 58b2f347020c917f4eec46aa9de482d9f4c26592d11b8bea2393554cdc5f5420451468824c64389d56a8801925cf2b9d605b4ee4eba8ab59f0d43f392ff1737f WHIRLPOOL d8a978091f9511677606df39902b8f9aff6e26ef369a6410d74b11efd409455681257a90879ce883a6ae3cac671562bcbd25991c2c5e81b672dcfa981e1b476c
 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_p20160304.ebuild 4111 SHA256 dde7a75ee404d2f1e84aa839f1af3c09dc735f82ff7caaf85878a7ffc10de2cd SHA512 e801fcc7b5360f0bbc0f14a81dd202d6375e0e31a45bea67d999055d24a0097c42e5711adfc0316b913ac56725d2f339bdbb623fcd3869ca016ac315f0657ad1 WHIRLPOOL b61e584a06d136d81780292f17bd73e453c280460f51a561a9ab4f6b9cf08bd69069bf5bee5ea2918c033b8ad5f2ea9d10afd475572ed8c4648bbfece0a4389b
@@ -46,4 +47,5 @@ EBUILD netbeans-nb-9999_p20160401.ebuild 4111 SHA256 788510b2df2b5f438ad7016972e
 EBUILD netbeans-nb-9999_p20160404.ebuild 4111 SHA256 6ea47965aa313425e0c1c9400ac6cc3d6a5d34d19b53bc87e1e92efd17e33573 SHA512 daa301585e8faf3b1204a6f3206fb1a0fb1ef0a1725be0705c81f5d1a78303451ffa383666f6acbe7afef7a68933d97cb49d502d5ed31d1f5efddc329a8510c0 WHIRLPOOL 37bb3ce928f738fda0dbb80a4095a6cdcd7bd364edd372e6b377031f3e0bdc2da04ff5753d212e4e1fe98d9d46b180c16fc4f8a0c746b9d8c6ab5a77472cc5d2
 EBUILD netbeans-nb-9999_p20160405.ebuild 4111 SHA256 5f2d5d95f39685ae2467e11c6a3b458dde72267d90fbf2fa6eb854e85fb5e6f9 SHA512 b380a2a7195ed08229acfed12f5b51d6a0390f440aacaccc4453c5ed7f430eb0bbfe9f21b2856b3e40dfa5c1200ef778ea4ace1d977f20d433b7e8a264ee3c5f WHIRLPOOL f8c29a61d61a8691d29055e32fc5fb46a3fa0f452ff0abb5a2f53339de4b7a3ac20cd036cc3f52dc4a357710a7e903b5c520151226b35afead4bee5987e7964d
 EBUILD netbeans-nb-9999_p20160406.ebuild 4111 SHA256 9942fc5958fc44c3f7a92f51be898df62d24b72606685d962baa3125e3950a50 SHA512 342e7f1653b4eb090e6ed6c046ee2a18365aba93029294064e4953b52ecf7f8bc718855100f65516eaefd3adcc1e6e725e9a6a290fb2ea8ddce44cac0a4e3ed7 WHIRLPOOL ad0645698cd0076efce047fad10c25e6147c8f13bc5399df067b525cb386fe3dbb0313ffa53506f44c78cd65813aad250ed3bcebb8217781cd6bce880be645fb
+EBUILD netbeans-nb-9999_p20160407.ebuild 4111 SHA256 9732fbe09e35cf95af8235312c5710014a27646596acde6203341333cec527fb SHA512 571a1dc295fd3f696ba6c55fb82814c28d8d2e9aeb197ff09181dc6501255abf5500a3f7821167bae0f52b7b4fe652147da5f6e030295bf59d2dec3294580eb5 WHIRLPOOL 69669893eed55f3bd008527630f2ee56fa5c7674d2f45966c4eac04575a6a713201f49961a1cb20814f39cbd55dfc4caf53620f43252c1b68bc61e79ff250949
 MISC metadata.xml 392 SHA256 01cdbcc83099b97486bd7b8e813e5b19c1138eb0d8d3e8a5683aafd579820435 SHA512 4d2f9160baa022d6a48b61d5f42e71cfd411d244e7a36436629bc5ee4036e4ce19079134d9a6c704ebe942306c2e0199d0591c1e54f92f8f3c8835147e639246 WHIRLPOOL c1131764e1cec66c56b977ebe36014b29e5a68e35ccc326c0cbadd050a6c625cf191c85c212e0a733661c008dab0d99f9a4cdc4c4ae0cc9d775ba1de554795a9

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160407.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160407.ebuild
new file mode 100644
index 0000000..d7c0481
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20160407.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-04-07_00-01-48/zip/netbeans-trunk-nightly-201604070001-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 7d0f5ac..cd269e2 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201604010001-src.zip 210167621 SHA256 986f8b46056619
 DIST netbeans-trunk-nightly-201604040001-src.zip 210177204 SHA256 d631db81653c15068048be2b74afc1db99343569290cc8bb69e4896d218359f1 SHA512 b32f719319b8b62b0e97571dca3025de424c6e36b5798f8a834793dea6c17bff7d478ffe175471ceb75e8fbd8e4a0f9400a93588ba939073c7675b965ba355ac WHIRLPOOL 0fe29a3e7e9599f662abad9e555b1d389203bf8149dd5523f83cc540ef4858ba338feaa7b8c9d43877b02a56e9de3e9b45de798a5bda3a74241bd8e42dee723e
 DIST netbeans-trunk-nightly-201604050001-src.zip 210178748 SHA256 c8df05a78860af29856a5b64aacf8ff870cfe03770bd2346329b73e8fd0784f8 SHA512 c3eb40e3e9702e750d0f8dd3e69083575e379fb35146e25a461d5e204206a719f8d9bd7e744fbab387ed75add6778f87a5079eae9af2f7792114aa1a97a98b37 WHIRLPOOL f63f7339759d4f701454cef85447abd8c993a0aa02375d2b8405033962a2d6f0c6933b0b55a55c71c5f6dc94273abe0806880d0c3fc496869a34a237d15e4cd5
 DIST netbeans-trunk-nightly-201604060001-src.zip 210178912 SHA256 9cba66d0d2af5fcdbd2dc21ee273931bb2c0ea84907761a6ae84c29206709589 SHA512 437ab0030682f694066c40df29b446eb0bcf0b90dfc519b9cae20534fd1409fedcc78774b7e614036b696e2b6e4bcdf2e5943d84500635d224fc1ad767b37ee0 WHIRLPOOL 91903a438d4599f3c7d483a82554b948ffe01dc50ec547f256450b9f94d4f0c7b9738b01448ab6c3585b98798c3f5ad96c432d04a36c0d9f2776a0228c1e2674
+DIST netbeans-trunk-nightly-201604070001-src.zip 210188037 SHA256 7092c74499a788c69c0cd6539a42939851f3af3d1e4e7412f484dd5b0cb31904 SHA512 58b2f347020c917f4eec46aa9de482d9f4c26592d11b8bea2393554cdc5f5420451468824c64389d56a8801925cf2b9d605b4ee4eba8ab59f0d43f392ff1737f WHIRLPOOL d8a978091f9511677606df39902b8f9aff6e26ef369a6410d74b11efd409455681257a90879ce883a6ae3cac671562bcbd25991c2c5e81b672dcfa981e1b476c
 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_p20160304.ebuild 4418 SHA256 20e988491ddc08070e0d69b20ccc7c931824bd687df616fb4adf9f8c521d2468 SHA512 446757a7e9074387d596b24e5b657aa9ae7849b1cf626379179e7fa1fc1f5be9b1caa75ecaf9ce99bc46fef8dd7a6481ff693fb85607dc9848dac0c0c273abd2 WHIRLPOOL 49daaa882e8444267d4c5cd5f136b096978018e58b230e283912e02e00c88d03235efa1922fab35376b2fe58ca228e2064395cac75fbdd191c9bd2bf4c8c4c81
@@ -47,4 +48,5 @@ EBUILD netbeans-php-9999_p20160401.ebuild 4418 SHA256 f6d677bb981da3098fb9401398
 EBUILD netbeans-php-9999_p20160404.ebuild 4418 SHA256 b18fed54fe9ceb3088dc0df461992b748ff8363ff8482b5ad234a5e103a91b81 SHA512 9a6d90cd68135c241d4e9cc202470a00ad509b4065ed074fc62c50177fa59eb71959d788daffea81ed9b8980c1b04304002e5abe65922fb8d25ce6e16d785dc9 WHIRLPOOL 0055d46e2bf04274031db1165fde3319f42f1f379ab423a209e7b5b62edf91018368913cdc85a91d5ea94f06be664fa33f1f6a66a6a2b09ea3a83c4b245157ba
 EBUILD netbeans-php-9999_p20160405.ebuild 4418 SHA256 72709d3a47c5c58baa04e978e42a8690c2c9833c57a5ec1163bada5d74742d22 SHA512 5fe7ec18d427a99b6f329b90a10d98a840a04cb3107123b7433ab4650717c9647c8a359498debe7a9832adbee3d6cacfb00ea98d2012debf7a031815240ecf56 WHIRLPOOL 595b126e03096294bf962fd9ee14a53109a7eb44ab190f2a9079b26bdcaf770c0913e0855d6629e67c21b977084fce20ee823057c73b0f760d906df8bc43e31c
 EBUILD netbeans-php-9999_p20160406.ebuild 4418 SHA256 4bd3cd8732a3491847ed3434ea1ce26a71f5056d0ced8dd992dbd9b847f231f9 SHA512 9a358f0cad9c0a905077ac64cf088851a0516e20452d039f3d5be0d440cd21184ad9f06d4950978c42d3210f0f7185942b7ebd3353e75b550d5029a3af02e356 WHIRLPOOL aca32da586b539830b449191a398b61cd71994ff9b76e180383006fca7301218c5b6faffd51769190fd944504e8dd07b2bcb82568baaaf6dbebc5e04fd5a774f
+EBUILD netbeans-php-9999_p20160407.ebuild 4418 SHA256 c18b90d15ed5470bd9f96d4586838a977b80c3174bee65a2146e9e8cf05a39d7 SHA512 4e6cdc36c7f1e641a91d02a892f583e8fce13941fca42e10a5c74ccf253ad0ae20c9472943fc22b7639a23d9fd911c26272de88a4953ed558c933d0543463b1e WHIRLPOOL ff278bcfbc222276c3783bb6d8a4b021571190c08f7b6d95085f73d3cfd3c16f7cde4904dd02b722b908431669769e9f825a215e5ad375f688ba79f7f426db07
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160407.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160407.ebuild
new file mode 100644
index 0000000..872102d
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20160407.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-04-07_00-01-48/zip/netbeans-trunk-nightly-201604070001-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/73E9BC8A7AF36E0C95210F61A85AFEF212AEE1A9-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}"/73E9BC8A7AF36E0C95210F61A85AFEF212AEE1A9-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 f32d3f4..be7b75a 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -50,6 +50,7 @@ DIST netbeans-trunk-nightly-201604010001-src.zip 210167621 SHA256 986f8b46056619
 DIST netbeans-trunk-nightly-201604040001-src.zip 210177204 SHA256 d631db81653c15068048be2b74afc1db99343569290cc8bb69e4896d218359f1 SHA512 b32f719319b8b62b0e97571dca3025de424c6e36b5798f8a834793dea6c17bff7d478ffe175471ceb75e8fbd8e4a0f9400a93588ba939073c7675b965ba355ac WHIRLPOOL 0fe29a3e7e9599f662abad9e555b1d389203bf8149dd5523f83cc540ef4858ba338feaa7b8c9d43877b02a56e9de3e9b45de798a5bda3a74241bd8e42dee723e
 DIST netbeans-trunk-nightly-201604050001-src.zip 210178748 SHA256 c8df05a78860af29856a5b64aacf8ff870cfe03770bd2346329b73e8fd0784f8 SHA512 c3eb40e3e9702e750d0f8dd3e69083575e379fb35146e25a461d5e204206a719f8d9bd7e744fbab387ed75add6778f87a5079eae9af2f7792114aa1a97a98b37 WHIRLPOOL f63f7339759d4f701454cef85447abd8c993a0aa02375d2b8405033962a2d6f0c6933b0b55a55c71c5f6dc94273abe0806880d0c3fc496869a34a237d15e4cd5
 DIST netbeans-trunk-nightly-201604060001-src.zip 210178912 SHA256 9cba66d0d2af5fcdbd2dc21ee273931bb2c0ea84907761a6ae84c29206709589 SHA512 437ab0030682f694066c40df29b446eb0bcf0b90dfc519b9cae20534fd1409fedcc78774b7e614036b696e2b6e4bcdf2e5943d84500635d224fc1ad767b37ee0 WHIRLPOOL 91903a438d4599f3c7d483a82554b948ffe01dc50ec547f256450b9f94d4f0c7b9738b01448ab6c3585b98798c3f5ad96c432d04a36c0d9f2776a0228c1e2674
+DIST netbeans-trunk-nightly-201604070001-src.zip 210188037 SHA256 7092c74499a788c69c0cd6539a42939851f3af3d1e4e7412f484dd5b0cb31904 SHA512 58b2f347020c917f4eec46aa9de482d9f4c26592d11b8bea2393554cdc5f5420451468824c64389d56a8801925cf2b9d605b4ee4eba8ab59f0d43f392ff1737f WHIRLPOOL d8a978091f9511677606df39902b8f9aff6e26ef369a6410d74b11efd409455681257a90879ce883a6ae3cac671562bcbd25991c2c5e81b672dcfa981e1b476c
 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_p20160304.ebuild 9360 SHA256 bceedbb18067e9e362589f41a97e8b6394b86a1f5dca73c238881edb9f304711 SHA512 fa83f915c3183f069206758fc32809cbd0d5d65f0d189c3b1d8dca4d3eaa0faa87e886da33936c5f9c1bc47415b835790ca3c0238e8f4568193e31be1d3e6cfa WHIRLPOOL 065024a4c748c501c6f1d5e4d2fffd8c64d1add0b4a6513efcf8540d71572db323d9a23c718d64cbdeeba7fd0ca159bfd8d2a682c86f01c6e4a2296d2194d5e3
@@ -70,4 +71,5 @@ EBUILD netbeans-platform-9999_p20160401.ebuild 9511 SHA256 bb57d04eb7ae361b0028c
 EBUILD netbeans-platform-9999_p20160404.ebuild 9511 SHA256 5174f8e9cff4f05b7ebe9bfbb64cec3c6855d199b1a9b54fb8f27a748ef32513 SHA512 cadd9c9972966e5268f3ad15b1d0f634559622c0a4a559362126586cca11aadcc9e319ea4e7cced450827fd690abf3b44bf3296785c51ae3713e0da9e5103fe9 WHIRLPOOL 2927b3730d6010ae16db1caf21d86679c506e4096c651768b3c14734b75614dab5d8dc991190e44c1c1be1f1d2a45f73b657ac1c6b2b43e682cfdf21fe4a1a54
 EBUILD netbeans-platform-9999_p20160405.ebuild 9511 SHA256 4e26672c8968d8d941d09088f2de125e251de5d9c0012866a4c8933c8de113e6 SHA512 5dbe019a3811e0f502c4d735601b798d80b674c6ab4768130497c6cb3e817c566f6cb481fb6af2b649b41141aea36f9de71a7db851ed36ae50c55ca70b73d645 WHIRLPOOL fcc818fc63472fb8424e02c04807830388eeafd9020acb88486bb411c406b3438d958e12e2a8c3fea73ad5301a6a42a3d69d82f7989325f18b9a8147938b7148
 EBUILD netbeans-platform-9999_p20160406.ebuild 9511 SHA256 bafb25e1f8a2e71609ca52349d335b53bf4c8f1fe9125ebe884d1263414668bb SHA512 ae0c010c38b7c89dba96d9b2edf61040ee21cbb925694adf74e9b49b585bc423392ac9c0c307146dbbc3e047a644eea132720866b9c054aac1ec41f7e0869794 WHIRLPOOL 722adac37aedfaa40509ec11c113fcb4e4f4b368610bb1802bd117462a3a48d6b494badeb0990e4d8b2d1cac592692b084d522a0d2a9533620f473ef911f662f
+EBUILD netbeans-platform-9999_p20160407.ebuild 9511 SHA256 8499d31229ae975e65c03f11f225811ec5230f5dbaf8287a813a1b71833d285b SHA512 9ed45017ca85f93c426d4b53908707612b9bd1f610542e9b24e7647c64c9650b7b6a035d5721a5eb0fdf24884b4696399bc32a89c2c4881c86ae31999163e678 WHIRLPOOL da6be4bd192db07c266b660181f18abc7e5c38fb5702d7feb53a4ee125d3d451ebd279138d4b206e5500a9bdcc8f68eb3527258aee013130483e03b2a13808d9
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160407.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160407.ebuild
new file mode 100644
index 0000000..ac662c9
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20160407.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-04-07_00-01-48/zip/netbeans-trunk-nightly-201604070001-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-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 f727ee2..89b3e48 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201604010001-src.zip 210167621 SHA256 986f8b46056619
 DIST netbeans-trunk-nightly-201604040001-src.zip 210177204 SHA256 d631db81653c15068048be2b74afc1db99343569290cc8bb69e4896d218359f1 SHA512 b32f719319b8b62b0e97571dca3025de424c6e36b5798f8a834793dea6c17bff7d478ffe175471ceb75e8fbd8e4a0f9400a93588ba939073c7675b965ba355ac WHIRLPOOL 0fe29a3e7e9599f662abad9e555b1d389203bf8149dd5523f83cc540ef4858ba338feaa7b8c9d43877b02a56e9de3e9b45de798a5bda3a74241bd8e42dee723e
 DIST netbeans-trunk-nightly-201604050001-src.zip 210178748 SHA256 c8df05a78860af29856a5b64aacf8ff870cfe03770bd2346329b73e8fd0784f8 SHA512 c3eb40e3e9702e750d0f8dd3e69083575e379fb35146e25a461d5e204206a719f8d9bd7e744fbab387ed75add6778f87a5079eae9af2f7792114aa1a97a98b37 WHIRLPOOL f63f7339759d4f701454cef85447abd8c993a0aa02375d2b8405033962a2d6f0c6933b0b55a55c71c5f6dc94273abe0806880d0c3fc496869a34a237d15e4cd5
 DIST netbeans-trunk-nightly-201604060001-src.zip 210178912 SHA256 9cba66d0d2af5fcdbd2dc21ee273931bb2c0ea84907761a6ae84c29206709589 SHA512 437ab0030682f694066c40df29b446eb0bcf0b90dfc519b9cae20534fd1409fedcc78774b7e614036b696e2b6e4bcdf2e5943d84500635d224fc1ad767b37ee0 WHIRLPOOL 91903a438d4599f3c7d483a82554b948ffe01dc50ec547f256450b9f94d4f0c7b9738b01448ab6c3585b98798c3f5ad96c432d04a36c0d9f2776a0228c1e2674
+DIST netbeans-trunk-nightly-201604070001-src.zip 210188037 SHA256 7092c74499a788c69c0cd6539a42939851f3af3d1e4e7412f484dd5b0cb31904 SHA512 58b2f347020c917f4eec46aa9de482d9f4c26592d11b8bea2393554cdc5f5420451468824c64389d56a8801925cf2b9d605b4ee4eba8ab59f0d43f392ff1737f WHIRLPOOL d8a978091f9511677606df39902b8f9aff6e26ef369a6410d74b11efd409455681257a90879ce883a6ae3cac671562bcbd25991c2c5e81b672dcfa981e1b476c
 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_p20160304.ebuild 3472 SHA256 a892e83c4428af2cb424652a39a2cda7bc289c25a88debb43a31f8fa91a1cab3 SHA512 0f80455c5f4850575da80a9d01e7bff73bd79de0c0dcc602404b7d5ef6f57e59e21b350a0354e90c5a3af742631df39fd459d4099352dd03c99f85b92c665bdc WHIRLPOOL 56ce90eccf3731b1d635ef54d24bee2923a079ca41397292f47a94ba7cf8ceeb9f4f1319a40e866e25f90e2f6f9a0228f6566acd844ce6b459c9c25900d4c1a0
@@ -43,4 +44,5 @@ EBUILD netbeans-profiler-9999_p20160401.ebuild 3472 SHA256 151089b6b86a48db6b79e
 EBUILD netbeans-profiler-9999_p20160404.ebuild 3472 SHA256 da2311b1e331eaeb78a1669066c1e2a972dd8143ae05dd2c9909d43e5a703ef4 SHA512 2434db412ad7d08a6bcbed17c04aad7c97e0aa057b948114fd0139fbb06ea7f4e2adf0d0fd2b639c44cefce8cdda3bdb9f78b92e540dfd143e850eddb5daceb8 WHIRLPOOL f7dabd92b38495ebd01914b0093b39325c63965f73a57b8ecc452843a3e200e4c38b95643fb1fca275527402c316280df675031c40f50a5780e28babbfde6150
 EBUILD netbeans-profiler-9999_p20160405.ebuild 3472 SHA256 0194007f822963899c5f5d973440c968a9df90bc08e31a37e80448bbd224039c SHA512 a9b85b494faca68284a69556ef04999c11ffd417668dd95d8a1149badf37994d5c4d422f6abfcd840f9fdbb52c1b488512a7513cc9e348a1c3fbd09fbfd12a98 WHIRLPOOL 6f7b1928145113b08be95142c453c66d0ed29093ffc20da32aeeec15a09da671c9fed4764bc4aa060d7456e2b158b9bed04b5fa4a2b1c3e10bca416df83803f2
 EBUILD netbeans-profiler-9999_p20160406.ebuild 3472 SHA256 d936e4d07d1eb82e2643c27ad7579133f27453fd3c7908c21bc3be57cc139f55 SHA512 7b2aa18cd934d6e9b76d38f27b0a01f658d3a35c0e06dfb47b13c0dae8c00c52dbbbf26cf4d27129465da3f987116f6dc6920338af3a0f07c2833cacaaf6c070 WHIRLPOOL 8c09aa19b3d66ecf081105076629f12308ca4917eb0f4757ca5f6d4dbd44ef94bdc9253caf96c9300c5cb905378f95c67b1a367bc792ce8264cdd35d645dbfc0
+EBUILD netbeans-profiler-9999_p20160407.ebuild 3472 SHA256 7ef4ed30cff796a7bc209582719447dcc4f74377c5c1551858a56650690a1281 SHA512 024bacb7962c4eab4fee10fa2bcc89e6f239fb74c3fe8e8a2ece3827f864c3b167cf3e2405a98585e30ed3714b4b313b3a47cae76a906e9170c534ee698ec991 WHIRLPOOL 52218b9bda0db57fdd3369790761bc45925d97a2c8b887598e424622b9e3334d6ab5f546fd6f0614aa0d235d70ef14e94fa0f2aef6be6d7e8534d7b491640e2f
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160407.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160407.ebuild
new file mode 100644
index 0000000..7601dbf
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160407.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-04-07_00-01-48/zip/netbeans-trunk-nightly-201604070001-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 691c0ae..8e9cbd1 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201604010001-src.zip 210167621 SHA256 986f8b46056619
 DIST netbeans-trunk-nightly-201604040001-src.zip 210177204 SHA256 d631db81653c15068048be2b74afc1db99343569290cc8bb69e4896d218359f1 SHA512 b32f719319b8b62b0e97571dca3025de424c6e36b5798f8a834793dea6c17bff7d478ffe175471ceb75e8fbd8e4a0f9400a93588ba939073c7675b965ba355ac WHIRLPOOL 0fe29a3e7e9599f662abad9e555b1d389203bf8149dd5523f83cc540ef4858ba338feaa7b8c9d43877b02a56e9de3e9b45de798a5bda3a74241bd8e42dee723e
 DIST netbeans-trunk-nightly-201604050001-src.zip 210178748 SHA256 c8df05a78860af29856a5b64aacf8ff870cfe03770bd2346329b73e8fd0784f8 SHA512 c3eb40e3e9702e750d0f8dd3e69083575e379fb35146e25a461d5e204206a719f8d9bd7e744fbab387ed75add6778f87a5079eae9af2f7792114aa1a97a98b37 WHIRLPOOL f63f7339759d4f701454cef85447abd8c993a0aa02375d2b8405033962a2d6f0c6933b0b55a55c71c5f6dc94273abe0806880d0c3fc496869a34a237d15e4cd5
 DIST netbeans-trunk-nightly-201604060001-src.zip 210178912 SHA256 9cba66d0d2af5fcdbd2dc21ee273931bb2c0ea84907761a6ae84c29206709589 SHA512 437ab0030682f694066c40df29b446eb0bcf0b90dfc519b9cae20534fd1409fedcc78774b7e614036b696e2b6e4bcdf2e5943d84500635d224fc1ad767b37ee0 WHIRLPOOL 91903a438d4599f3c7d483a82554b948ffe01dc50ec547f256450b9f94d4f0c7b9738b01448ab6c3585b98798c3f5ad96c432d04a36c0d9f2776a0228c1e2674
+DIST netbeans-trunk-nightly-201604070001-src.zip 210188037 SHA256 7092c74499a788c69c0cd6539a42939851f3af3d1e4e7412f484dd5b0cb31904 SHA512 58b2f347020c917f4eec46aa9de482d9f4c26592d11b8bea2393554cdc5f5420451468824c64389d56a8801925cf2b9d605b4ee4eba8ab59f0d43f392ff1737f WHIRLPOOL d8a978091f9511677606df39902b8f9aff6e26ef369a6410d74b11efd409455681257a90879ce883a6ae3cac671562bcbd25991c2c5e81b672dcfa981e1b476c
 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_p20160304.ebuild 5280 SHA256 b1e8cba256efe0742265cb9c061ccb77a6554a3fbd2f206178fc362eef25f5b1 SHA512 7ecb75e01268c778b432e971efca3615af017b8281be02f3cb04e35ca2c50ab57b4b22e3b9d224df49027644fe1dcf697a73faffbe95aca40e1eff2cf99933ad WHIRLPOOL abb6b5d70e4b84c3694f1c74817b10ee80cae8588e6076efe0a580206596a6ebbacab07c14f53394a11559d01a92b945d711805c5ae78bbec6c0c5e9c20b6787
@@ -59,4 +60,5 @@ EBUILD netbeans-webcommon-9999_p20160401.ebuild 5343 SHA256 b07a2393ed9f3db469e8
 EBUILD netbeans-webcommon-9999_p20160404.ebuild 5343 SHA256 f72398bc8ae2825df6279237d6a4138158a9a7e3cee3ee25a9d052f449478c8d SHA512 6aaba71da60a71e9706b8ebb4ecb66607febe4b44959c51ddb5557a231c26e2637c3b257b0cd824702e484c0e58a5105ca1b993c87d8354d47a465e4b8b1e7d5 WHIRLPOOL 0876309c61f9646db820e82d3a70102dfa7913e842220f7ae0423791fb60a781421819b63306a52b1b215834eb4044623aa88eea9b2695ae84d3c2de7bdb9151
 EBUILD netbeans-webcommon-9999_p20160405.ebuild 5343 SHA256 0e9907a50d6f5e43384b028b883b1920ac7056f431d92391712c187c76903f6a SHA512 12b2f135dc49a4bebde9b9118327f9ef6989e14eafb2cd3f64454bc21c648cb1f971460fd19c151be177ce37662da99659994ab4a2cc66e08b33254fd97e75cb WHIRLPOOL 12932d754de1768ed220b0f330e6e0fbfd2846936a56bd8191ef8e04ccc7fb106e86adb03e6dc743a650e59ff3e9c3ae4df797824ddc3d21ce519aa26a49b003
 EBUILD netbeans-webcommon-9999_p20160406.ebuild 5343 SHA256 31a68c2dfa36897c9af9084da7b336790531b78457b78945258080017f9d4825 SHA512 8fe85ec4a4fcf8c6d2ab97330dab692364acfbb89b9c6e20ae7e7612a04a5e8d3b896c70b94247f977cd707f38b55f09d0fadf0493049817516f8d9bcfb9b2fe WHIRLPOOL 3a8ac85e506d34d02f770421fed342a51e15d3b0208cd4409751fe5ad7a24429aff452f23f556a9db8271b1a9e24fd696274d83be05f24e2a294362b43651f5e
+EBUILD netbeans-webcommon-9999_p20160407.ebuild 5343 SHA256 80c10ced8e6ad69ad4b5bbe0a85c57e37057b839d0e383a421c1fb7b7badfa87 SHA512 cd6b1af710c1fab1ef6f95a2b7fe69c9aae2a0d32c5ccfa1be1c19cb54dbd61438fe8100c880ff367c7ad6d4b9a09630534ef07552035df549b2107afb5b792f WHIRLPOOL 9ba0546d7a5b1014dd990db179e3451d020b8c0e465b57f8994c7303ac3caa5b541b31ffaea7aae920df1f318476fbc5ac438ccb9f2e3be95c3ca1277f273e71
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160407.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160407.ebuild
new file mode 100644
index 0000000..5590f77
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160407.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-04-07_00-01-48/zip/netbeans-trunk-nightly-201604070001-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 dff8360..1aa27a7 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201604010001-src.zip 210167621 SHA256 986f8b46056619
 DIST netbeans-trunk-nightly-201604040001-src.zip 210177204 SHA256 d631db81653c15068048be2b74afc1db99343569290cc8bb69e4896d218359f1 SHA512 b32f719319b8b62b0e97571dca3025de424c6e36b5798f8a834793dea6c17bff7d478ffe175471ceb75e8fbd8e4a0f9400a93588ba939073c7675b965ba355ac WHIRLPOOL 0fe29a3e7e9599f662abad9e555b1d389203bf8149dd5523f83cc540ef4858ba338feaa7b8c9d43877b02a56e9de3e9b45de798a5bda3a74241bd8e42dee723e
 DIST netbeans-trunk-nightly-201604050001-src.zip 210178748 SHA256 c8df05a78860af29856a5b64aacf8ff870cfe03770bd2346329b73e8fd0784f8 SHA512 c3eb40e3e9702e750d0f8dd3e69083575e379fb35146e25a461d5e204206a719f8d9bd7e744fbab387ed75add6778f87a5079eae9af2f7792114aa1a97a98b37 WHIRLPOOL f63f7339759d4f701454cef85447abd8c993a0aa02375d2b8405033962a2d6f0c6933b0b55a55c71c5f6dc94273abe0806880d0c3fc496869a34a237d15e4cd5
 DIST netbeans-trunk-nightly-201604060001-src.zip 210178912 SHA256 9cba66d0d2af5fcdbd2dc21ee273931bb2c0ea84907761a6ae84c29206709589 SHA512 437ab0030682f694066c40df29b446eb0bcf0b90dfc519b9cae20534fd1409fedcc78774b7e614036b696e2b6e4bcdf2e5943d84500635d224fc1ad767b37ee0 WHIRLPOOL 91903a438d4599f3c7d483a82554b948ffe01dc50ec547f256450b9f94d4f0c7b9738b01448ab6c3585b98798c3f5ad96c432d04a36c0d9f2776a0228c1e2674
+DIST netbeans-trunk-nightly-201604070001-src.zip 210188037 SHA256 7092c74499a788c69c0cd6539a42939851f3af3d1e4e7412f484dd5b0cb31904 SHA512 58b2f347020c917f4eec46aa9de482d9f4c26592d11b8bea2393554cdc5f5420451468824c64389d56a8801925cf2b9d605b4ee4eba8ab59f0d43f392ff1737f WHIRLPOOL d8a978091f9511677606df39902b8f9aff6e26ef369a6410d74b11efd409455681257a90879ce883a6ae3cac671562bcbd25991c2c5e81b672dcfa981e1b476c
 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_p20160304.ebuild 2721 SHA256 5a1197b666514124e4463fed005a0cfb2a81c7e843ccd180313f440c03e447f7 SHA512 a154ae502b2bb3c860443de89ea66b1846ea8e213bf7ca91f2c6d32b992073c86a07abac3761e1a9e649a12b3a87a1cbcd298634e239855a6bbe601b3aeb99e1 WHIRLPOOL 6422c81e01e4c5a9f29618535a9af7c7a14c7722a3b057cef2ca778924e1709e2e263dd125869e33c0c6e965dc757a79f3d6152226e0e13353dd0a0d73dfe040
@@ -43,4 +44,5 @@ EBUILD netbeans-websvccommon-9999_p20160401.ebuild 2721 SHA256 ccd565612492dfd98
 EBUILD netbeans-websvccommon-9999_p20160404.ebuild 2721 SHA256 f1934ce9d9efbdba06982a672f6a9724476ed53ebea3feafe3461f403b341993 SHA512 765e28a558ece367a0048e08853ed89c2368379635967986370a551cc055a0d269950e132932354b5437bc1aa036134f92015c7d47bbdefecbc334831422f525 WHIRLPOOL ec1cad2ec578e9c358bb71960a7451628fd9328cedb34db4f2452f0f9f5181dbfe381b5cb5d8ca779aa860a928fea4eea7924325367259ab33841567294be4f3
 EBUILD netbeans-websvccommon-9999_p20160405.ebuild 2721 SHA256 66bd485771b44dfd7f4941127585b824ecf85cd6ca9570a4ddefd16c3472ea0f SHA512 f5a67450038b03849d07bc7d33721a5d2f891b1ed35ac9d7018202c03d49ee871c7278813c3792f90991677f201e35ad0ef2a89c8a6888c6a7bd9bbf4314fe9a WHIRLPOOL 04c7bf3729c3600c6ddbd69efb7c0a3f6aa1f501412265e0d4f27c0be6f83e1afabb2acc61db7c729dcc6f38094c06c56c93942c71653f367fe25f5ff571e531
 EBUILD netbeans-websvccommon-9999_p20160406.ebuild 2721 SHA256 b157d6ef6275b5993755d7ff7db25d52ab6814a660a019c4261935e9e7580cbb SHA512 5f111cd1a25381b3695810236ae4da756f4242171b4380363ae5c9537315b22f94275af93d380f4590345c615c7e27b7f8263d62e36b718e7ae8c6d1a44b0a3d WHIRLPOOL e943f3c7dd3d69e27dc2b2d3cb17d3a33643cab38eccee71e25df336c8c41b3a7a1efd1a932b1cd20015ddf1cb71d2f13278029c930ae3a68268663b1ad5db51
+EBUILD netbeans-websvccommon-9999_p20160407.ebuild 2721 SHA256 7512d394a7baf04adf5b7ea7ca6663513af42d91f1a9e82a82017ff1cacace7e SHA512 7a7efa60234eb9dc521dfd6ec258f13b82cbc5bd2d6a9971d94f40a109031c1b72d473006f501e1db43657e7b4dea00e7a769e3a7926063f1341c03b264bd7a3 WHIRLPOOL d3443d06522ad389c39afead46dfaab35e62653c722dd351f87adb10c31cc64a9ac01e7f4d56e66427af518360beac62df0a3b838e6eeee5f0a112cfbc1fa2d3
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160407.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160407.ebuild
new file mode 100644
index 0000000..13f3a37
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160407.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-04-07_00-01-48/zip/netbeans-trunk-nightly-201604070001-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 e189fad..35cf36a 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201604010001-src.zip 210167621 SHA256 986f8b46056619
 DIST netbeans-trunk-nightly-201604040001-src.zip 210177204 SHA256 d631db81653c15068048be2b74afc1db99343569290cc8bb69e4896d218359f1 SHA512 b32f719319b8b62b0e97571dca3025de424c6e36b5798f8a834793dea6c17bff7d478ffe175471ceb75e8fbd8e4a0f9400a93588ba939073c7675b965ba355ac WHIRLPOOL 0fe29a3e7e9599f662abad9e555b1d389203bf8149dd5523f83cc540ef4858ba338feaa7b8c9d43877b02a56e9de3e9b45de798a5bda3a74241bd8e42dee723e
 DIST netbeans-trunk-nightly-201604050001-src.zip 210178748 SHA256 c8df05a78860af29856a5b64aacf8ff870cfe03770bd2346329b73e8fd0784f8 SHA512 c3eb40e3e9702e750d0f8dd3e69083575e379fb35146e25a461d5e204206a719f8d9bd7e744fbab387ed75add6778f87a5079eae9af2f7792114aa1a97a98b37 WHIRLPOOL f63f7339759d4f701454cef85447abd8c993a0aa02375d2b8405033962a2d6f0c6933b0b55a55c71c5f6dc94273abe0806880d0c3fc496869a34a237d15e4cd5
 DIST netbeans-trunk-nightly-201604060001-src.zip 210178912 SHA256 9cba66d0d2af5fcdbd2dc21ee273931bb2c0ea84907761a6ae84c29206709589 SHA512 437ab0030682f694066c40df29b446eb0bcf0b90dfc519b9cae20534fd1409fedcc78774b7e614036b696e2b6e4bcdf2e5943d84500635d224fc1ad767b37ee0 WHIRLPOOL 91903a438d4599f3c7d483a82554b948ffe01dc50ec547f256450b9f94d4f0c7b9738b01448ab6c3585b98798c3f5ad96c432d04a36c0d9f2776a0228c1e2674
+DIST netbeans-trunk-nightly-201604070001-src.zip 210188037 SHA256 7092c74499a788c69c0cd6539a42939851f3af3d1e4e7412f484dd5b0cb31904 SHA512 58b2f347020c917f4eec46aa9de482d9f4c26592d11b8bea2393554cdc5f5420451468824c64389d56a8801925cf2b9d605b4ee4eba8ab59f0d43f392ff1737f WHIRLPOOL d8a978091f9511677606df39902b8f9aff6e26ef369a6410d74b11efd409455681257a90879ce883a6ae3cac671562bcbd25991c2c5e81b672dcfa981e1b476c
 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_p20160304.ebuild 6939 SHA256 218118ab7763417d107fe79074f5a7bd1ca99e8a373325981c4138bf60d594fd SHA512 4b4efb5df479ff97174c4b760099edf1403178cbfc571f4064fdc1cc39119a916446ee3cc555a67977082d68f3c01a82794828a8f7a884f91ff3fa0ded77fc8f WHIRLPOOL 975f796308eabb202ffe3954af345930c0e76cd1beced830a410d49f1353d6aea6b8617ecf051d1ca33ab38a5d613f6d25dcc48e8919a7b386fe48b1098de466
@@ -46,4 +47,5 @@ EBUILD netbeans-9999_p20160401.ebuild 6939 SHA256 1cb131702cf9f55da26f29e28914af
 EBUILD netbeans-9999_p20160404.ebuild 6939 SHA256 a50e44b56b6d5dfc9d950a82c4d8d635257428317c2a965f9c8b334976ee406b SHA512 3a5c291017c3b099cf31b9e0983ee35a7f0a3ad41eceafcd42f466b1132a564c922bf4cb2f2291bfadf37ae0e97931094b934377df203723f60498dd5eaa30a9 WHIRLPOOL 02ae5858c5873ac207a981b7d00a133a83b6db591c271630e16aaea8875e969b14047b48584e214b7156909b9215107dc5c6c388918b37bcfee0871377e36e19
 EBUILD netbeans-9999_p20160405.ebuild 6939 SHA256 2d48a7cb7d83d8fa224648f68b78a2da6bae2ed17b6b41e3eb86fdada034f415 SHA512 a1512fc0201c051994e92231d421b84be45de97c74e3ce39705dcacf68a018202badef17b5291239deff16307d73c0088c2fc291f85196e4026c44e760793cd2 WHIRLPOOL f4825bf48e08d32eb4dd9688f660dd7411232be82691ffd5ffbc6e415ce53a67a094cb5207ae634617eef67f0c87ebaf13e36b697a5e24190c4465a7901c1805
 EBUILD netbeans-9999_p20160406.ebuild 6939 SHA256 210ec45f9be030b9e65f4fcaaadc2ed6bbfdf9e84fdcac5ff4b3ccaa1664f7b4 SHA512 ae8d52a510e241ccac0ff6b363506ca344b5fc5b443c41c855229442071455db17cf076cfe6b40152e14566c42988e1e71d9f2d2947de8cdca82939640fe7c83 WHIRLPOOL e30b3ee853e6257578c8e17a39b774825b70fe54157b44c7061d19975cc8d6b11c894a2d436bc2bfa67bca9221b970c1dae18b38013c30bdc7d8182e04f3dd02
+EBUILD netbeans-9999_p20160407.ebuild 6939 SHA256 3c11c578773405c09851fe1b590fd1c042cd3cc61a2776632180f1cd700b5f17 SHA512 1ca96b7e849322f66b7160e9a7cc02ed71ff6d74c636a231205b8d5427dc5ca46059841f5deb9bb2b915401445623065b7aee1d9de92f8be791855f5fec9f5f7 WHIRLPOOL 036e0b6abdcacac1b5df1e29d556e5ec8e96859be75677effb45e7bd6bb89b3d06e8c81e91c0ad18b6630c77854fefe20fb4196bcfc37dca40bb4cb140953543
 MISC metadata.xml 329 SHA256 8aeaf2a0228f15c2e4140f401b30f083509bd99d0a578873069f3595cd8555f3 SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640 WHIRLPOOL 799a9b79b1b447bda9631f67e2dfaf722376740e1d2037796528a05f9745eeed00d9990a74a65ce09f74bc5e1d60a887abde540c3c62487d7dd49b8377c15834

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


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

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-ide/, dev-java/netbeans-nb/, dev-java/netbeans-webcommon/, ...
@ 2016-06-27  8:40 Miroslav Šulc
  0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2016-06-27  8:40 UTC (permalink / raw
  To: gentoo-commits

commit:     22a3f0fbc46f1e1a65a9634e2d798ff671eb5417
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 27 08:40:18 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Jun 27 08:40:18 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=22a3f0fb

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.3.0

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index b8e3f0a..09fa3e3 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62
 DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae933c49b42cea56fe36ace1ac114430312e20a9484532e4ffeb3 SHA512 7efc824e3e47f07202d3f687726a5432fbc391c22bc762a0810a95c454c9f1f515bd0b026f22a9a00e39027023e31e9d0fcb3bc95688f8e54ec1465267246bd6 WHIRLPOOL d58c979aacb6021322b5595de5ac1a99f441413aae39bc5a02c09dc353125e778a9c62f45b8e3c88db125f27010d901d6a763f875e86e5f1aae6cc571579c2df
 DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 DIST netbeans-trunk-nightly-201606250002-src.zip 216438825 SHA256 f03d25d6d23b7548774067a664220990366da49ea1e15e1d33ec31d1ab934d06 SHA512 6cac9c55e060ddfe901a0fd361b629ff19666ffc3ebf7e5f1184135b8ca6e5b3056bcfa506e0bcc973405dd7dcae83b0bfd08f81c8c6ade1f2dbd13d60de38a7 WHIRLPOOL 7ee0b8add0f67ed4800d5c41b7967488119d7e865ce0d4bc8b15496a8bfcfebbfae08eb55d69d7de4d7bedb32fc7850c2cb76e46ae3ad5bf465a96f28b1392b2
+DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 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_p20160530.ebuild 3384 SHA256 914cb3fd6fb081b4854169a8b4ffaa481c4fc48c6fb7f0d0914a4fab479c7b1a SHA512 845fcd99745a16a760747cce6fb3278d4a13be79135521b2a40ec136f71bb72d7c63f6327196d204f0e96baf1081f179563647c562fe9f99d96845d8d5272a5a WHIRLPOOL 93c0d56cfbbab65286e24417665a1c7efadaf03fa40293902d3e963c00ca41635041cef1ceb1f6ad270dc19c839bced955923c584ec372b5b2c702bf3998d5ed
@@ -47,4 +48,5 @@ EBUILD netbeans-apisupport-9999_p20160620.ebuild 3384 SHA256 dc1efedb045c624a498
 EBUILD netbeans-apisupport-9999_p20160623.ebuild 3384 SHA256 b81dcfbd3c810d95ac1fff137ff674f7b11604ecd5fe14a48cbf668787df585b SHA512 b84a782c5898e243108eefe9d7f71b1dff2efd0ad4c15cb9e785b4b8cc227207b3908050259511325dee6070d0f6368839654bae0992e136d586613662b1a142 WHIRLPOOL e617eaf1c0dcd2581892a5fc2e3e71b22ec4c903c480a8c989da9795ec2a8b375244609921846cbb3f767ae3963bf93e721ae373be4151e4db6ac19508109923
 EBUILD netbeans-apisupport-9999_p20160624.ebuild 3384 SHA256 e431cabec3f55aa7d6a35ded434ea414172050c53d9b09a28b182e5eb06ab03d SHA512 347d6410c7421a5f3c069484e264d92ed604eded7a8ea223761daa4fc69062edaa1025c299919c4d1d2f0d5023833a68bf50fed449d1cae7a78fcd7d6175d826 WHIRLPOOL d96440d9c988d1cbc415eeba691b8d7547dfbf844f15870d5e7cdf77b7d0e070f11c02435db733ec099a8b2dea271848616ae3b56a8c459200e5dfc720119348
 EBUILD netbeans-apisupport-9999_p20160625.ebuild 3384 SHA256 51ce3b3d573c3fce716da0cbfd14aa731fee36d4b6caea1d4d3bc557297d4c85 SHA512 acf4cfbfdf441e61784c1b16cb6cdd20f15b390d4cd1b035ff0d11544ab06555308134f746fce198c2e13707aca8cbd9add3490df1420e74280f2b8e9c57e257 WHIRLPOOL 2eb20e3096daad3e8a451606cb96beb1591ec59d08bed40ea816e0dab4fa865b6db203d04c83ffbaf1110c311b1fee122ee517637a0a39ed649c7ca493ef0072
+EBUILD netbeans-apisupport-9999_p20160627.ebuild 3384 SHA256 cafb20753781552fa43f0b09ba11712fdfc6cfd76c1a2b4179f588c3572258dd SHA512 85b7e2a07cf82d1abba314f8ab19e3add7fb913d98dd0a3b26a0bf7fa10c82c6dd5104e437078c9e1b07d9f7e6a1c7c0ff6082abfd27f270f3221f2cc551453e WHIRLPOOL abd3451b3d769f6c6ab0bec5395674c32a199be5c5d03c33a3ddf586351e137c1ad4015f133b0ff2de32057d6bc9af192b96480b356011f88c19b03a63221085
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160627.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160627.ebuild
new file mode 100644
index 0000000..537720a
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160627.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-06-27_00-02-33/zip/netbeans-trunk-nightly-201606270002-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 d899746..d6d5d15 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -37,6 +37,7 @@ DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62
 DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae933c49b42cea56fe36ace1ac114430312e20a9484532e4ffeb3 SHA512 7efc824e3e47f07202d3f687726a5432fbc391c22bc762a0810a95c454c9f1f515bd0b026f22a9a00e39027023e31e9d0fcb3bc95688f8e54ec1465267246bd6 WHIRLPOOL d58c979aacb6021322b5595de5ac1a99f441413aae39bc5a02c09dc353125e778a9c62f45b8e3c88db125f27010d901d6a763f875e86e5f1aae6cc571579c2df
 DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 DIST netbeans-trunk-nightly-201606250002-src.zip 216438825 SHA256 f03d25d6d23b7548774067a664220990366da49ea1e15e1d33ec31d1ab934d06 SHA512 6cac9c55e060ddfe901a0fd361b629ff19666ffc3ebf7e5f1184135b8ca6e5b3056bcfa506e0bcc973405dd7dcae83b0bfd08f81c8c6ade1f2dbd13d60de38a7 WHIRLPOOL 7ee0b8add0f67ed4800d5c41b7967488119d7e865ce0d4bc8b15496a8bfcfebbfae08eb55d69d7de4d7bedb32fc7850c2cb76e46ae3ad5bf465a96f28b1392b2
+DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 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_p20160530.ebuild 4790 SHA256 7769cf54a5ed50ad522d6be9dd38b301e410e973bcc43ed14b743d531281b80c SHA512 7e0ad8ae0ec2d5f40c401ae196c4c39c0768e8dd27bf716ddd211935753fb11a77031b5a5337ca7ebd7268931eb6462040a567283e339bae34b313bfc6830def WHIRLPOOL 34f1eccec6eaff036e66eb94ca671448a94fef0c8507d447593e04c3371082f7b1fdc3a675c18905a91c9a85aa48185d8aeb7cb78aa9d092e62464d5e0541f83
@@ -60,4 +61,5 @@ EBUILD netbeans-cnd-9999_p20160620.ebuild 4790 SHA256 952df2833e6bc5eddac469dba4
 EBUILD netbeans-cnd-9999_p20160623.ebuild 4790 SHA256 c65c20a80f812bc612d06127b77f102d7d789039aa2d12f34012a7be937695da SHA512 25532433ca63cc1540a5efafab3cb0829d4141210352b1ec661c363a63dea4af43e20766b7bfdb3494a9af2405f0a4b25d475c606b6e6169c50ce9baf38d3bbb WHIRLPOOL b27cc31f94bc5aea8a5eaf98688eb80482e602c83e6dda6813da28d53d1909fab95710854d269cc11d1715195cb3bf310f57ad78b8b08c2e87c68bafe05ecea4
 EBUILD netbeans-cnd-9999_p20160624.ebuild 4790 SHA256 4f434bac078af589851bf4e2af8dc133a755215a1d7a980c579ca00465f93735 SHA512 7aba1d9935844e6f43bfffc2e7888d973470d0e308988b281a274f2e4c0a4694182d6a7b6941ea852e56487a4d19741aadb0c11c5dbf0178ba1400c94e8dcb42 WHIRLPOOL 7810bdd0e73991a8abef9291aefdc1b8be7b65f5f6f9525e7b944dbd3b47bd52cf861eb48037ba78723f31045544a78ad778cd8528af6f028e7416773034f6fa
 EBUILD netbeans-cnd-9999_p20160625.ebuild 4790 SHA256 6b65f2374c3a7f94729ec349ccbab0fe2df4f7b80831c547c0a84fc711c94756 SHA512 60fad1715bce209924cba14a15984a6d3ab072b5fcb541afb33e26149299bc165e30d532c3b47cfb9f7699f1ba7ba65376ee1029817eaaf1bf2c0f3731ee9a4b WHIRLPOOL e1b310a717b5b2f1e0814ad15349e3e7d3c99512f2ab82f41b734492dd7ab3375c95b2a341112cbd24011a9e74b035ef606def95f75061ab2d8f419bd3d41f6d
+EBUILD netbeans-cnd-9999_p20160627.ebuild 4790 SHA256 f05d34b4cdfdd349f7ba75085688be31364eb73ca0ff759457289a3aa67da52b SHA512 8385f2ea862f5a4800995844e413e24be3a22a25a15b5d3e9315a3f538622b6bbc6551cb36902cf84e93b19a7ebf2e675801ca81c8b5808351d0fa879017f390 WHIRLPOOL a5512e971dc695387f0eab7248eeff5130bd437e6b960b054e92fd684138b6f5f06faa88671005a8782fe028444fe049d9bc0d5fc703d4cc27182b8b307714f8
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160627.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160627.ebuild
new file mode 100644
index 0000000..9bc936b
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160627.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-06-27_00-02-33/zip/netbeans-trunk-nightly-201606270002-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/1BD2563498D0E0BE1C7B3DD31FAD892B41EC041A-clank_0.3.6.zip
+	http://hg.netbeans.org/binaries/43A82EB3CE61B9B0B1C60586C7D84729BD5BE3E0-cnd-build-trace-1.0.zip
+	http://hg.netbeans.org/binaries/E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip
+	http://hg.netbeans.org/binaries/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+# These files are for remote development and debugging
+QA_PREBUILT="usr/share/netbeans-cnd-${SLOT}/bin/*"
+
+CDEPEND="~dev-java/netbeans-dlight-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	>=dev-java/jna-3.4.0
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.cnd -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r16-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar libs.antlr3.devel/external/antlr-3.4.jar || die
+	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
+	ln -s "${DISTDIR}"/1BD2563498D0E0BE1C7B3DD31FAD892B41EC041A-clank_0.3.6.zip libs.clank/external/clank_0.3.6.zip || die
+	ln -s "${DISTDIR}"/43A82EB3CE61B9B0B1C60586C7D84729BD5BE3E0-cnd-build-trace-1.0.zip cnd.discovery/external/cnd-build-trace-1.0.zip || die
+	ln -s "${DISTDIR}"/E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip cnd.remote/external/cnd-rfs-1.0.zip || die
+	ln -s "${DISTDIR}"/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip cnd.modelimpl/external/open-fortran-parser-0.7.1.2.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.jna/external jna jna.jar jna-4.2.2.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-dlight-${SLOT} dlight || die
+	cat /usr/share/netbeans-dlight-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.dlight.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/cnd >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/cnd$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	fperms 755 bin/dorun.sh
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/cnd
+}

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index a0ff776..98d62db 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62
 DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae933c49b42cea56fe36ace1ac114430312e20a9484532e4ffeb3 SHA512 7efc824e3e47f07202d3f687726a5432fbc391c22bc762a0810a95c454c9f1f515bd0b026f22a9a00e39027023e31e9d0fcb3bc95688f8e54ec1465267246bd6 WHIRLPOOL d58c979aacb6021322b5595de5ac1a99f441413aae39bc5a02c09dc353125e778a9c62f45b8e3c88db125f27010d901d6a763f875e86e5f1aae6cc571579c2df
 DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 DIST netbeans-trunk-nightly-201606250002-src.zip 216438825 SHA256 f03d25d6d23b7548774067a664220990366da49ea1e15e1d33ec31d1ab934d06 SHA512 6cac9c55e060ddfe901a0fd361b629ff19666ffc3ebf7e5f1184135b8ca6e5b3056bcfa506e0bcc973405dd7dcae83b0bfd08f81c8c6ade1f2dbd13d60de38a7 WHIRLPOOL 7ee0b8add0f67ed4800d5c41b7967488119d7e865ce0d4bc8b15496a8bfcfebbfae08eb55d69d7de4d7bedb32fc7850c2cb76e46ae3ad5bf465a96f28b1392b2
+DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 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_p20160530.ebuild 2968 SHA256 10bd2623faba3cf6d42fb9e5af40344891403ec71d7f191c5e7f12750377c50f SHA512 9be1cd298afa533147aac29313ce8ba75f780a1c40b1cfa7af85a688d5f8afedcc8f9450b7ffd35ffede2755646190f41afaa2e715fa174e2c45b6037cd9ec55 WHIRLPOOL 090d3826a38a8ed6781ad14024fa0ac3d5eaa061368a06403899b02652d8240ff045639a150fdb8c97521df2adafe996844699e71072b5f7696ae85b5082701b
@@ -50,4 +51,5 @@ EBUILD netbeans-dlight-9999_p20160620.ebuild 2968 SHA256 f9e9572d5d109050da1a785
 EBUILD netbeans-dlight-9999_p20160623.ebuild 2968 SHA256 0cf93c044fbdfb46ddfe0ffb40efb572dbf7a3f9751e156b3d31c3479f0ee0e5 SHA512 1c0d64fbd8429f9bb8ff9bda2ff0c1389b041d49fba3e4976a6cd4d78e78203b31b2bc8827866c28b044c20894f5d1806a17ea557963ec8ae8444552e2c362cf WHIRLPOOL 573b1715614f70969a206e8970943c625793b3076e8c3a1b29158f3ddc516b2d42ecd765045baab6c4d7460bc61231d9b89c39d447619b2fc1093488c06a4267
 EBUILD netbeans-dlight-9999_p20160624.ebuild 2968 SHA256 9ff84b6b9364fd7301449856f3738f09f7cfd1347995eaa18e3694e9e299ba7f SHA512 11d1706c15962c2f115c915880f3b426f60d87657991928baa6701eea3e2e8706385980adc260c9935a737e54c6f611a81bcf39e56963c4aef42d667fd78fca1 WHIRLPOOL 061db39bd88e2396e4247c85d9e7148aa668a969d7b4c0639f0503a140ba325bb673db4bdd25a3d1d718cb15c52f2ab6bc3ca54118814e900db57c26cfed7199
 EBUILD netbeans-dlight-9999_p20160625.ebuild 2968 SHA256 4c622d1cf3e1c78824b2a3fb8b2a0e38d77d7ceb07cec858e5aa7f4badedbe77 SHA512 53ad3b1e63ca1ab82aab7a835178bbc22159d8407d895b8fe86cb34c68bdea64d1b8d821d1ac07c947e020e02603d182285b8b606b5559196cac13c536048ade WHIRLPOOL 21e60e1f365f6c8a648b8eee76f6a41d0fd4e9d2bcadb941bdef313ec759d13afbcb1167fd379ba487653afc90c85fa985a1d7df1c994b4396def70bfe9bf8ae
+EBUILD netbeans-dlight-9999_p20160627.ebuild 2968 SHA256 7fd9685273d8d68ae9cec2f93e2419f3ac65ac9990e1b9a7a63fe0811897a8a3 SHA512 9e4f6d9cac819b49af0f2fdfdde5dfe645efbf2320970319ffb20ed1efcf2de7c05aeffa8e37475b3d8e650a6ba23eeda90468f3fbb45a9674e56ded22167af1 WHIRLPOOL 08e8f72a67bd7f0d728c1178c79a830a0d4091f486ec935f34e18502abf4d7286b1371c2e84f2a48d0a998134cb84215e8beaafe56fbfefc7e0280b02345c9ac
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160627.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160627.ebuild
new file mode 100644
index 0000000..96feb3f
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160627.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-06-27_00-02-33/zip/netbeans-trunk-nightly-201606270002-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 2fe7797..a7a306f 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -56,6 +56,7 @@ DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62
 DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae933c49b42cea56fe36ace1ac114430312e20a9484532e4ffeb3 SHA512 7efc824e3e47f07202d3f687726a5432fbc391c22bc762a0810a95c454c9f1f515bd0b026f22a9a00e39027023e31e9d0fcb3bc95688f8e54ec1465267246bd6 WHIRLPOOL d58c979aacb6021322b5595de5ac1a99f441413aae39bc5a02c09dc353125e778a9c62f45b8e3c88db125f27010d901d6a763f875e86e5f1aae6cc571579c2df
 DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 DIST netbeans-trunk-nightly-201606250002-src.zip 216438825 SHA256 f03d25d6d23b7548774067a664220990366da49ea1e15e1d33ec31d1ab934d06 SHA512 6cac9c55e060ddfe901a0fd361b629ff19666ffc3ebf7e5f1184135b8ca6e5b3056bcfa506e0bcc973405dd7dcae83b0bfd08f81c8c6ade1f2dbd13d60de38a7 WHIRLPOOL 7ee0b8add0f67ed4800d5c41b7967488119d7e865ce0d4bc8b15496a8bfcfebbfae08eb55d69d7de4d7bedb32fc7850c2cb76e46ae3ad5bf465a96f28b1392b2
+DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 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_p20160530.ebuild 15825 SHA256 c2a2164241155e021bcead95e796793f06dfd14bb17d30b31dc521a6f6010440 SHA512 da6e60db8ad6523551250509e2b95a236c5f519ceee3e0c748b6f7d78a07cd83c52cf3499d6b943f73f9693389311aba256de58e6d606afb31b38e3e17a560ce WHIRLPOOL c8736abcd05f81742a152f9430ceb58dc621a28ff872db9fc7c09206e21e06bfc8f91cb199573cdfd1882545e91641c7c5d0da8251828a7573f0efe6c1c2ff57
@@ -79,4 +80,5 @@ EBUILD netbeans-enterprise-9999_p20160620.ebuild 15825 SHA256 189acebbc23a0c6121
 EBUILD netbeans-enterprise-9999_p20160623.ebuild 15825 SHA256 ce86cbadd5583f98f07da4c086b4118ca149a07045462b9ca0b93adaf5f899b6 SHA512 61723065c911e3d0204e32e2ee8b5e787ba70894508e6253aee72f96906cf867cc3edb694b27a6fc3223af9fd98db60cf69bcf5b0b3d793ad6f5c3fe70a56a51 WHIRLPOOL 314a9f88e488f1f1b37a039ef8dc40b0deb6404437f0e9ddc7c9107ce5cb34668a2e4aa808d9c57f059731fe09a87533264af780abc5b8ca0b7505440c3e4f4a
 EBUILD netbeans-enterprise-9999_p20160624.ebuild 15825 SHA256 e6f71be68512f48dd6dca27f1b0912f2936bfa4b307d53e45b554f02d7e7fcac SHA512 b2659671d2dacfee02d53fb8e60fca4f0966410ae6744baf44a778aa43eaeb9f00e0854c44ad529023305eab2693682411fd5f4fa52f46c853272cc5a829b79f WHIRLPOOL 79deb19fa2b996c8c4ede92cceb275d2a0db915ce1ea4304bcbd19163c277eca81562a667ea50af559cea041bb544cb281d2157be418ecf33d3a5b7a551c2629
 EBUILD netbeans-enterprise-9999_p20160625.ebuild 15825 SHA256 049dbeb88a797176e232af5143a06bebcf1b8b81cf9d7026c2df6ad5add2d848 SHA512 3759c4faec1b3f721649e2accdb14680e7d8864d2a0a56e564794b73bc1db933d8f9ec884c111e3c1bacbd7ce986e8b550d92073475cf9a4c0e92ca01fc7c1ab WHIRLPOOL 13073347d637d76bab8d718e0bdf22bd1f75e254a1cfd2d64706ff92a43eb907ac93dc497217b14ab71e5225c870f9f02c5dcf44257608f64d4194fddaaa0d5f
+EBUILD netbeans-enterprise-9999_p20160627.ebuild 15825 SHA256 4bbec74b5aa599919e345d9b2021417e00560165648b9c030dedf482a48cdf84 SHA512 895d045cb5c28b36323f83cd23435faea56dbb31da0cebc8f2f02bf50a6b614e2033d374023ae9641d1aa3db00891a48e40091f13060567fec98fbd02bae3f90 WHIRLPOOL f55cb1e1a7ce262144be804649f721c29d2f5f7fb28851dcd5e1d4f87d2881443639acca2ac0afea411811684244920badb72ab6e197668d13e58a131dd9cacd
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160627.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160627.ebuild
new file mode 100644
index 0000000..8fa6671
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160627.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-06-27_00-02-33/zip/netbeans-trunk-nightly-201606270002-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 c882969..51adc7a 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62
 DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae933c49b42cea56fe36ace1ac114430312e20a9484532e4ffeb3 SHA512 7efc824e3e47f07202d3f687726a5432fbc391c22bc762a0810a95c454c9f1f515bd0b026f22a9a00e39027023e31e9d0fcb3bc95688f8e54ec1465267246bd6 WHIRLPOOL d58c979aacb6021322b5595de5ac1a99f441413aae39bc5a02c09dc353125e778a9c62f45b8e3c88db125f27010d901d6a763f875e86e5f1aae6cc571579c2df
 DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 DIST netbeans-trunk-nightly-201606250002-src.zip 216438825 SHA256 f03d25d6d23b7548774067a664220990366da49ea1e15e1d33ec31d1ab934d06 SHA512 6cac9c55e060ddfe901a0fd361b629ff19666ffc3ebf7e5f1184135b8ca6e5b3056bcfa506e0bcc973405dd7dcae83b0bfd08f81c8c6ade1f2dbd13d60de38a7 WHIRLPOOL 7ee0b8add0f67ed4800d5c41b7967488119d7e865ce0d4bc8b15496a8bfcfebbfae08eb55d69d7de4d7bedb32fc7850c2cb76e46ae3ad5bf465a96f28b1392b2
+DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 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_p20160530.ebuild 2913 SHA256 fece8416b9de9c9799e0baf8911e4964081a5bd0268cd2b9cb8dd086b45a7cfd SHA512 de4e1004a910a763f4086ab4b57241dc03704a4acb9126dd47c7b5883046898b51af9f838904ebd74e5b11af6a8d650ad85a3f6d0c27939feeb22e557ad04c8d WHIRLPOOL dc65801139c09d51a68f3481478d1aa1b42683ce52e73afc5fa86994535bebd224e752649dde268c6cd8cc61ef2cac949faa9f9577aefdcba8fd902159e6d22b
@@ -47,4 +48,5 @@ EBUILD netbeans-ergonomics-9999_p20160620.ebuild 2913 SHA256 ae0de72df0662eac127
 EBUILD netbeans-ergonomics-9999_p20160623.ebuild 2913 SHA256 aa044120ca7af2bfcee8ed1670637cd863010c022318974d30606a1191835666 SHA512 e0a3f14cdffe30202fe778f579a35d0f02f117ba9d81c83820c841161afe68c772b47ef8d3a6e20f30dbbafcc5dcc81ffb48a6362dfabb7cf7db89c8b5a7ed32 WHIRLPOOL 609632051fadd1638d807a62e37e887b589ab489ee5769c9e28116fe6ff519f4cd35013a87702093b76fc094e5de63effb9c05d8f1cee508763a9f756476ffe5
 EBUILD netbeans-ergonomics-9999_p20160624.ebuild 2913 SHA256 10b41dbffcbe022eeae17505b0d818b0b07953d44b3f20a024fe1d1db8854b12 SHA512 e08f7e71328e992cf8ee9cd4f39ff5e1f11deb597284db757aa969e27b58f15fa4b488bbc44d474f367d678ea09c7f452541fef9aa6648447acdd859c9daabb4 WHIRLPOOL 8fe488cef5a74ed57f39ae4820270cd0433dd72278cf6363d5f79776f103769494f7917ac87bc869ff22c77ce8cd4bcc3ed4360ba6975c8de33ba4e3045d12be
 EBUILD netbeans-ergonomics-9999_p20160625.ebuild 2913 SHA256 f8a9e471ea6ce247dc8cb623dc46ad3c9a40e21e920414364e8f736dcdf2f7a3 SHA512 d1eda936093a8d717c9ed32038ecd5bf553045b7a9d38eacdadb8afcdfb2c701dd15f8d3dc93bc2e36539902e77378810159c42d49fbf63207f4d6dffde9ce3a WHIRLPOOL 731be56254ad68882aae7f2599800af4054d5f463be6ca3cf0f2a3cb378380d28d9e336ba9a4c749d16e98fc8617122126541507e2f92890272183f6f2c3382e
+EBUILD netbeans-ergonomics-9999_p20160627.ebuild 2913 SHA256 6d60db206ce50a1eee95d3da37089c61e17775eeba08c15b5f0c3bb5ac282ddb SHA512 75a922b8c6a5268a52abd5f32d4e430aa60c40c906e0ddf5681b49edbf947a029bd661e56ad6eb19d3c82fd276cfcbe69487f079f477b431410dd4cd14597295 WHIRLPOOL 1933b4d6792bee6a8a1f10745867b83a0632ecebefdf45221d29da4397fe5dddae1c7ebfc8911d22d8ac48392b95618563c16c1632796650670e3c975a110d2c
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160627.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160627.ebuild
new file mode 100644
index 0000000..5279052
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160627.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-06-27_00-02-33/zip/netbeans-trunk-nightly-201606270002-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 f2960fc..3c52b5e 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62
 DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae933c49b42cea56fe36ace1ac114430312e20a9484532e4ffeb3 SHA512 7efc824e3e47f07202d3f687726a5432fbc391c22bc762a0810a95c454c9f1f515bd0b026f22a9a00e39027023e31e9d0fcb3bc95688f8e54ec1465267246bd6 WHIRLPOOL d58c979aacb6021322b5595de5ac1a99f441413aae39bc5a02c09dc353125e778a9c62f45b8e3c88db125f27010d901d6a763f875e86e5f1aae6cc571579c2df
 DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 DIST netbeans-trunk-nightly-201606250002-src.zip 216438825 SHA256 f03d25d6d23b7548774067a664220990366da49ea1e15e1d33ec31d1ab934d06 SHA512 6cac9c55e060ddfe901a0fd361b629ff19666ffc3ebf7e5f1184135b8ca6e5b3056bcfa506e0bcc973405dd7dcae83b0bfd08f81c8c6ade1f2dbd13d60de38a7 WHIRLPOOL 7ee0b8add0f67ed4800d5c41b7967488119d7e865ce0d4bc8b15496a8bfcfebbfae08eb55d69d7de4d7bedb32fc7850c2cb76e46ae3ad5bf465a96f28b1392b2
+DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 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_p20160530.ebuild 3377 SHA256 ca892dd9aad03a6b440aebbaedd80910eaedfeae1ff671c3c5f85b258cd1561d SHA512 01435f91fe82dda69ce7135e867068add4b284fee0bacfa6247f898313dc6bc7215258f80d1fd5c50ee07b5015b625327eea355864d4c94196fa39862605e6c3 WHIRLPOOL 833940e29916f0e24e2ef1039193caf6efd519013476529c55c6527f8940f8eb852e28cf39e3931cb9b243829273522a774f30bdb68db018d04ef38de35658f6
@@ -51,4 +52,5 @@ EBUILD netbeans-extide-9999_p20160620.ebuild 3377 SHA256 99510df57abd7eb44da5619
 EBUILD netbeans-extide-9999_p20160623.ebuild 3377 SHA256 9110ba0f5512c37751ff67efb47cb8daa02165a95638349d0021172d0a3261b5 SHA512 dd5b2735915012a1e80372819da66e3fe765ac78e7da257b7890667406f6e15abb9ab6144bcd3f981bc02325e8235e2fe33772c07de13742d3da19cac61e6a8a WHIRLPOOL 29b9d307e472a73288fba307fa28f5cc12aa28149472d49b283046a7843aa6dfd4595d4cf7436d33673b12233a7b3a4e2f60cbbc21416da38ee9a0adbca7b001
 EBUILD netbeans-extide-9999_p20160624.ebuild 3377 SHA256 4822ccf1f24743aafd4c5196c46ea6b8f067292fe33d7763bf5e9691369d4351 SHA512 53612be6cc06db6e3ce050aab9170e1c5fa34f3a581778527d696beddeecac43a3ce84371bea64248dc4b1ab95d2aa797a15de27a4e7afa5ab716017772ca5b4 WHIRLPOOL 3822fe7832811a1f69b343a84cc5596403e07076aaa60600e3d469bbbfc8b0d817e229e0206866ff939b45c185adbbd5be81d4df9ca348872f84b36b43ca22d9
 EBUILD netbeans-extide-9999_p20160625.ebuild 3377 SHA256 4468396a27d22ee76d14d6cab0766f84b5731d339aa28f23ec2583a88a76cf45 SHA512 b91e3cccf6d1fd4e7ec1752e4cb4f1c437a268f7a221aeb4e3793d41ed45f57e00f6204fd9040016200eccb55255e9488013533cadd98a1995a1e1faf9365e00 WHIRLPOOL e4fe5f78466d5d7dac071ef837916919afc5a42c58734c5f2636aea8b3bcd5f3c7a0c7a5755ce0c071f4019945fa0a4dfc09ee5fc72a9ccb7b46e9a95940b89f
+EBUILD netbeans-extide-9999_p20160627.ebuild 3377 SHA256 a1f35439d93238fe2e8f80b6e95e17aab6e1b6048a20980279673d55d804edd4 SHA512 459e52e6e76879087ab2b3c5d80f153bc45e3489a77330d4026555bcf659d1e90952fb8affcab40f0b13a5f6069947a310e2977187ed69316f8a79aa7b40ba9b WHIRLPOOL 5aa65d0ca5659cf37bf4cac1b548a2ca53613303cf80f8ece263bac536bbac549aa448e761ed5e426cc705e493e98719156eae3306d7ec367e1449f53047527b
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160627.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160627.ebuild
new file mode 100644
index 0000000..e692ed1
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20160627.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-06-27_00-02-33/zip/netbeans-trunk-nightly-201606270002-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 6fb43d1..3dc8037 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62
 DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae933c49b42cea56fe36ace1ac114430312e20a9484532e4ffeb3 SHA512 7efc824e3e47f07202d3f687726a5432fbc391c22bc762a0810a95c454c9f1f515bd0b026f22a9a00e39027023e31e9d0fcb3bc95688f8e54ec1465267246bd6 WHIRLPOOL d58c979aacb6021322b5595de5ac1a99f441413aae39bc5a02c09dc353125e778a9c62f45b8e3c88db125f27010d901d6a763f875e86e5f1aae6cc571579c2df
 DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 DIST netbeans-trunk-nightly-201606250002-src.zip 216438825 SHA256 f03d25d6d23b7548774067a664220990366da49ea1e15e1d33ec31d1ab934d06 SHA512 6cac9c55e060ddfe901a0fd361b629ff19666ffc3ebf7e5f1184135b8ca6e5b3056bcfa506e0bcc973405dd7dcae83b0bfd08f81c8c6ade1f2dbd13d60de38a7 WHIRLPOOL 7ee0b8add0f67ed4800d5c41b7967488119d7e865ce0d4bc8b15496a8bfcfebbfae08eb55d69d7de4d7bedb32fc7850c2cb76e46ae3ad5bf465a96f28b1392b2
+DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 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_p20160530.ebuild 3416 SHA256 604d361d4be2383ad30473ba61e48f657bc2719a9b8f4d36165bff85a9470002 SHA512 a3a7da055fb9ca2d099767aadb356219f7d05613352dc3ab093d660ffac45d9d1a52d3f3a2fa3e69e59c911eca1ad9f40cb454977611cabeb16b0c005fd88487 WHIRLPOOL a4f6a6b224d4bd4ece3ca0714cd336e1d07e2d9ecebf3841ac2aae05b583251a09acd5424e9e76f2dfe0c8de6a78153a01b90b2c60983d212ae16be0c77b5acd
@@ -49,4 +50,5 @@ EBUILD netbeans-groovy-9999_p20160620.ebuild 3416 SHA256 e9d9d62161cbfd589ca3a3f
 EBUILD netbeans-groovy-9999_p20160623.ebuild 3416 SHA256 f2661a9a996c6add6ee7f4994ce33f396d5d9b0876bb7b08528b79eee3d93a05 SHA512 6ea29ab03b267c46e9580367ac6d3a2398422401c355809e47d529e36e7d332efd28e512e1d01195b0d14b6852c2e37b5d0df3e3d9c6ec1a9ddb1ab8ca2fc5c3 WHIRLPOOL 9207b873136cccd177f91f6c998d8aae37b52d822985da9510d82c162065f17f432dbf5b398551ddf4362b60d00ba4235600c8e379121023f4354a25fd7f42e0
 EBUILD netbeans-groovy-9999_p20160624.ebuild 3416 SHA256 deecef74257451bf7b85d599730001873c34583f67187a3cad01f100eb188656 SHA512 cb9e2d5396a32927a1d98c7bef2a7e9379dfe14217bdc5b50aa88206947c447ff5c96b01130ada2541060e72078f85940cb3fa9c78dff86714a3145433481ae9 WHIRLPOOL eead86547dad2cf321cb729977e0ec08ae6d6379d22190420d71727a04784b169af39b9cf0ce867ee8ac4f21e89bb28d24f57e0460d93427ff92669f320f53f2
 EBUILD netbeans-groovy-9999_p20160625.ebuild 3416 SHA256 4ca6698f53846b3f8db04c36f706d606968247db4b56c5ed1d1fd91aaf1437a3 SHA512 da3059c5cce3bd2bc4ff7154f423938abbdc53e28f1c2fc5ee1b7424853a76f5a432b300b8da704ac09846deb40df5dc45fd0b22ede4e3227297e9a16f73bd56 WHIRLPOOL fc379718167b8f467a41920d8172d3dbe79eafc4f5a47cc96b80fef9faf7c9b5549aad8acb475e6d7177bc5c00d64f792ea27f036b5b04cce51a982ce790aa2c
+EBUILD netbeans-groovy-9999_p20160627.ebuild 3416 SHA256 627ace0d9803f4ad6bbe0fbdf1a8145a1d826d7175944cb35b22634b131dc7f9 SHA512 41ac61b8f0ca65fa04500882235ebf056b441822a29d5e8e397e43d34904de1cbd862f77537ef99d652b1ab52537d3d96f8512f9017da3006531b5d6fa100170 WHIRLPOOL 75be63b355ba9ad881cf9235c70f89b97a2920608ac66a34d7133d1747bda30c448cc6eb5edea3a3aa95af77d7a517024678bdf68d7d6871a390bcda2e9f541e
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160627.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160627.ebuild
new file mode 100644
index 0000000..fc7254f
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160627.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-06-27_00-02-33/zip/netbeans-trunk-nightly-201606270002-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 74f8736..cddaa3c 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62
 DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae933c49b42cea56fe36ace1ac114430312e20a9484532e4ffeb3 SHA512 7efc824e3e47f07202d3f687726a5432fbc391c22bc762a0810a95c454c9f1f515bd0b026f22a9a00e39027023e31e9d0fcb3bc95688f8e54ec1465267246bd6 WHIRLPOOL d58c979aacb6021322b5595de5ac1a99f441413aae39bc5a02c09dc353125e778a9c62f45b8e3c88db125f27010d901d6a763f875e86e5f1aae6cc571579c2df
 DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 DIST netbeans-trunk-nightly-201606250002-src.zip 216438825 SHA256 f03d25d6d23b7548774067a664220990366da49ea1e15e1d33ec31d1ab934d06 SHA512 6cac9c55e060ddfe901a0fd361b629ff19666ffc3ebf7e5f1184135b8ca6e5b3056bcfa506e0bcc973405dd7dcae83b0bfd08f81c8c6ade1f2dbd13d60de38a7 WHIRLPOOL 7ee0b8add0f67ed4800d5c41b7967488119d7e865ce0d4bc8b15496a8bfcfebbfae08eb55d69d7de4d7bedb32fc7850c2cb76e46ae3ad5bf465a96f28b1392b2
+DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 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_p20160530.ebuild 4126 SHA256 c4ca867ae9a0127cb0e3313c92b296d89208d60049a715f6e1f3e52784be1555 SHA512 72bee50ccc7c0fd2e89fba17865f59c23dadce10c354a8c4aaa5f122d54498f536dddb560721a6b853d4bcef9e2319d28e4819d885cb9c209208d9b16a6272cf WHIRLPOOL 562e44586ad6e1116626724bb9607498ca50d1a28fe9af2cd1f71f307c33eb7efeb7a22eb4057fe4e876520f7546e216aabd909b56c5faeff7a945b1e22f0ce8
@@ -52,4 +53,5 @@ EBUILD netbeans-harness-9999_p20160620.ebuild 4126 SHA256 b780bdd9c4558c4822f7a8
 EBUILD netbeans-harness-9999_p20160623.ebuild 4126 SHA256 a47d24f53df9c45778058bbd99f4b8a7269eb7d03767d6fa7c529ac7db1a921e SHA512 122b7e7258deee689e685a48aa0b0938f8949c2f060207bf455415ed60e6b9ba5d1062318d69959de14b21f3a74df20ff4e4220b068cfab96aa8e2f504e8ece1 WHIRLPOOL 3313d732896d6104db3cbc3b1e7562bedf36f09f7c228b41faa48ba32fbe340566d8440e339bd99c9ea2bf7e8b9115a2ed203bdf57a29a3f231b5fb13eb88b6f
 EBUILD netbeans-harness-9999_p20160624.ebuild 4126 SHA256 d889c88b917f55171baede682d0a04f48dfa12a20b8d2a18ee14a62d9482520c SHA512 43f1add15f6d7988aca396e2e086c38344d1c1e5f22f03702f9b93eafc9235f9c3cbefba9c9f85326807b8131485f689e3403c6407a46dfeb68c906f1f934ca9 WHIRLPOOL ddcdebbe640f1f35413f42514e9e198b32c81c5f4e40e7780928fcb917f12580bea9173d5e3660b2eb18f1a35468aedddcd3df22bc08346de49eca34ca371fed
 EBUILD netbeans-harness-9999_p20160625.ebuild 4126 SHA256 9df76abdeb35072b525a4b426cbba277c9eea58f3bdf0c23dc367f2b669c4926 SHA512 65c2deae84801bf1d968c976f521bb8065662b263f5f982ede1892a31b08390b2813d9a29f5ad98f54757456af94fe76c344e4c68fa52768761a7ecc61a46690 WHIRLPOOL 80c25c7fce5296ded0029832d27a12ee9deb05b2ea82e5ef9deac1906547b81116fb37bd9561cb8f68edbe41d5aad9842cb7fe8de94c9ddf3ead8617f598b6f0
+EBUILD netbeans-harness-9999_p20160627.ebuild 4126 SHA256 38bf8dcd9133256f5d299cf86e47b5fe5b5a16025b733cd8897288ba03afdbe0 SHA512 f921fc694b28e3b9ad7c385af23c733d89a814deeb03335cae2a9bed6cfcde3ba27b01c9b55f9651bb8ae0e34108448a2914f47e8887f6d85f552c11ec8cb8c5 WHIRLPOOL 8d285a12a9c91b8a6767bd0a826bdd6028a6dd0df69d3797e72b671690983f0bd0e8fcae823bfd91b6827d3d10230bdf03cfe43c49c25e5dfd02a0e9fc86b9d8
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160627.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160627.ebuild
new file mode 100644
index 0000000..879b9f9
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20160627.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-06-27_00-02-33/zip/netbeans-trunk-nightly-201606270002-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 1c4b3f9..958a140 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -164,6 +164,7 @@ DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62
 DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae933c49b42cea56fe36ace1ac114430312e20a9484532e4ffeb3 SHA512 7efc824e3e47f07202d3f687726a5432fbc391c22bc762a0810a95c454c9f1f515bd0b026f22a9a00e39027023e31e9d0fcb3bc95688f8e54ec1465267246bd6 WHIRLPOOL d58c979aacb6021322b5595de5ac1a99f441413aae39bc5a02c09dc353125e778a9c62f45b8e3c88db125f27010d901d6a763f875e86e5f1aae6cc571579c2df
 DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 DIST netbeans-trunk-nightly-201606250002-src.zip 216438825 SHA256 f03d25d6d23b7548774067a664220990366da49ea1e15e1d33ec31d1ab934d06 SHA512 6cac9c55e060ddfe901a0fd361b629ff19666ffc3ebf7e5f1184135b8ca6e5b3056bcfa506e0bcc973405dd7dcae83b0bfd08f81c8c6ade1f2dbd13d60de38a7 WHIRLPOOL 7ee0b8add0f67ed4800d5c41b7967488119d7e865ce0d4bc8b15496a8bfcfebbfae08eb55d69d7de4d7bedb32fc7850c2cb76e46ae3ad5bf465a96f28b1392b2
+DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 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_p20160530.ebuild 30761 SHA256 729d47fa65bda0ffd9e451882d14fb7a046bca4b429a6801243db70fda2993a0 SHA512 1dbd30fc7b3229e3d5e46068a53008d4e364913d03883cfbb38e043eeb2f04873045b3a6ee89945576b4df872e636c4938cc4252618c15a05c8c7a58f2988d20 WHIRLPOOL 70311879716c5927aba8321f9e919ccaaa508bd78f55fa11727d9c24599ce949655bbce7d58463f345ed52909204a0f026763daa1101a29cb9983e3b45ececca
@@ -187,4 +188,5 @@ EBUILD netbeans-ide-9999_p20160620.ebuild 29867 SHA256 3b66da71001f5525582f0d867
 EBUILD netbeans-ide-9999_p20160623.ebuild 29867 SHA256 41723791ba5a1468af48e1afa45b47c15908fa4e65f06de424e3ec0b2a4e8663 SHA512 16b676d92078fd69152938c358ad1db74c5522985dd2bb3e888bf217427abf3c24a9ac0f71021f906fd1357764d556bbe923a0253cf1e944417d23e3e4011bfc WHIRLPOOL cfa44cfa7e436158a0fa7ce85761eaf5e5e43537b9e5a37dd942ae54cb36ba6e958523818ef5a69e8895df7202d9d5772df63966e0c7056fc7e200e2d77be76f
 EBUILD netbeans-ide-9999_p20160624.ebuild 29867 SHA256 e91e8649490f38bcf35279743bde5d435190a903f5b690984e34ca80d2fc787e SHA512 2b2acc69cd5fb2a7c790d910f445d859b5d6c52005f1d496cb730554da192cf8c68cee9b1b34c8c50dbb24a24e7b93420e334d0b56bde9c324521b9470a90dd1 WHIRLPOOL f4ea80141b6ed53f5d90f2ddc7df81c07c431f31c2eccbcb24116356e1b6ccbb6697ebc05ff313499b0b906754237f0a28f2b44597326ee03f9a69d7262cb6f9
 EBUILD netbeans-ide-9999_p20160625.ebuild 29867 SHA256 11771b2e7343b9d6627660c5c1171a55e1044fcc9f5598ec38addb398a79976e SHA512 7e801880c8953a7e000d21acacf4dd2b1d217af664b7443922ca4119f827e8fb1684f0ace9ca766b4bcba8d73377814c16a64a9262f151913e393012e2acde69 WHIRLPOOL 864a4ccf23682c7af7ff61e7d8e2a5c05ad07d094d8c53929298635497b248ed7e9e241c3bb1034fb5bb672d54d2d7d0a9b34cad12bdd88886b17fc73979c64c
+EBUILD netbeans-ide-9999_p20160627.ebuild 29867 SHA256 b08d643a6b73f16d73d4d0cd7148ec71e333a1199b01a03f637043a5dc71e432 SHA512 f60c4e606c1d7efbee98356f5e39fa2bc0eea4a676342e244e362efa91ddc4b66df90645846244580dd58a994f95d4aa55499ebd50210ac0e7aa7142196625df WHIRLPOOL 6b134d56033b9654b2cd4df48ece779a65feada24da904a14b7bd3b15e158902de1085ed9d4174695b538c44b99383c0883e738e99b6d82c1f2669d0bcaa7f70
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160627.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160627.ebuild
new file mode 100644
index 0000000..2fa4d6c
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20160627.ebuild
@@ -0,0 +1,374 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-27_00-02-33/zip/netbeans-trunk-nightly-201606270002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
+	http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
+	http://hg.netbeans.org/binaries/DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8-com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar
+	http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar
+	http://hg.netbeans.org/binaries/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar
+	http://hg.netbeans.org/binaries/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar
+	http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip
+	http://hg.netbeans.org/binaries/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip
+	http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip
+	http://hg.netbeans.org/binaries/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip
+	http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar
+	http://hg.netbeans.org/binaries/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar
+	http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
+	http://hg.netbeans.org/binaries/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip
+	http://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar
+	http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar
+	http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar
+	http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip
+	http://hg.netbeans.org/binaries/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar
+	http://hg.netbeans.org/binaries/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar
+	http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip
+	http://hg.netbeans.org/binaries/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar
+	http://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar
+	http://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar
+	http://hg.netbeans.org/binaries/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar
+	http://hg.netbeans.org/binaries/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar
+	http://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar
+	http://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar
+	http://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar
+	http://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar
+	http://hg.netbeans.org/binaries/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar
+	http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
+	http://hg.netbeans.org/binaries/AA2671239EBB762FEEE8B908E9F35473A72AFE1B-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar
+	http://hg.netbeans.org/binaries/1605B38BB28EAE32C11EAB8F9E238A497754A5B8-org.eclipse.core.jobs-3.5.101_nosignature.jar
+	http://hg.netbeans.org/binaries/20800206EB8B490F3CE5BB8AC8A7C3B9E8004A30-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar
+	http://hg.netbeans.org/binaries/D2D2105B1E3C9E2FA6240AD088237A57590DDA8D-org.eclipse.core.runtime-3.7.0_nosignature.jar
+	http://hg.netbeans.org/binaries/16507EAFDC2B95121AA718895BDB54D616EE4B0F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar
+	http://hg.netbeans.org/binaries/BD55836AABD558DC643A7844B78866AD990544BC-org.eclipse.equinox.app-1.3.100_nosignature.jar
+	http://hg.netbeans.org/binaries/4EE275AE73A140A403903D7E4DBA68C8FBB07001-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar
+	http://hg.netbeans.org/binaries/B7001D9CC2E2AC4E167D22A13063F0350C71AAA9-org.eclipse.equinox.preferences-3.4.2_nosignature.jar
+	http://hg.netbeans.org/binaries/C647079E36A4EB7A24AED2C545E4F0F94194C4D1-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar
+	http://hg.netbeans.org/binaries/9267CF311F979078211A70C1B19AF8A8EE71DC8E-org.eclipse.equinox.security-1.1.1_nosignature.jar
+	http://hg.netbeans.org/binaries/B580E446B543A8DD2F5AA368B07F9C4C9C2E7029-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar
+	http://hg.netbeans.org/binaries/244560B99152F3F9BC75DF2D6FAFA8A5216B06B6-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar
+	http://hg.netbeans.org/binaries/8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar
+	http://hg.netbeans.org/binaries/D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar
+	http://hg.netbeans.org/binaries/4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar
+	http://hg.netbeans.org/binaries/8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar
+	http://hg.netbeans.org/binaries/50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar
+	http://hg.netbeans.org/binaries/4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar
+	http://hg.netbeans.org/binaries/11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar
+	http://hg.netbeans.org/binaries/A3FEF6144ED1622E4CDD506B9D745527CC675D8D-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar
+	http://hg.netbeans.org/binaries/825DC870D1D423E347F4F8229A211A2C297BB15D-org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar
+	http://hg.netbeans.org/binaries/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar
+	http://hg.netbeans.org/binaries/17C0C8D6DEBF5EBE734881C131888D8088BD9E7D-org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar
+	http://hg.netbeans.org/binaries/6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar
+	http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar
+	http://hg.netbeans.org/binaries/DAAEFA7A5F3AF75FE4CDC86A1B5904C9F3B5BBF8-svnClientAdapter-javahl-1.10.12.jar
+	http://hg.netbeans.org/binaries/C47ED3BCD8CEAECDE3BDEEB7D8D14B577B26F9C8-svnClientAdapter-main-1.10.12.jar
+	http://hg.netbeans.org/binaries/AD4A88D99AB7C5B64C8893CA2FF2CBCFCEFC51C8-svnClientAdapter-svnkit-1.10.12.jar
+	http://hg.netbeans.org/binaries/5C47A97F05F761F190D87ED5FCBB08D1E05A7FB5-svnjavahl-1.9.3.jar
+	http://hg.netbeans.org/binaries/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar
+	http://hg.netbeans.org/binaries/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar
+	http://hg.netbeans.org/binaries/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar
+	http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar
+	http://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar
+	http://hg.netbeans.org/binaries/15ACB06E2E3A70FC188782BA51369CA81ACFE860-validator.jar
+	http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar
+	http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar
+	http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar
+	http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-platform-${PV}
+	dev-java/antlr:4
+	dev-java/commons-compress:0
+	dev-java/commons-httpclient:3
+	dev-java/commons-logging:0
+	dev-java/icu4j:55
+	dev-java/iso-relax:0
+	dev-java/jdbc-mysql:0
+	dev-java/jdbc-postgresql:0
+	>=dev-java/jsch-0.1.46:0
+	>=dev-java/json-simple-1.1:0
+	dev-java/jsr173:0
+	dev-java/jvyamlb:0
+	dev-java/log4j:0
+	dev-java/lucene:3.5
+	dev-java/rhino:1.6
+	dev-java/saxon:9
+	dev-java/smack:2.2
+	dev-java/sun-jaf:0
+	dev-java/tomcat-servlet-api:2.2
+	dev-java/ws-commons-util:0
+	dev-java/xerces:2"
+#	dev-vcs/subversion>=1.8.4:0[java] missing from the tree
+#	app-text/jing:0 our version is probably too old
+#	dev-java/commons-io:1 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/commons-lang:2.1 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/freemarker:2.3
+#	dev-java/guava:15 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/ini4j:0 our version is too old
+#	dev-java/jaxb:2 upstream version contains more stuff so websvccommon does not compile with ours
+#	dev-java/jzlib:0 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/trilead-ssh2:0 in overlay
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	dev-java/commons-codec:0
+	${CDEPEND}
+	dev-java/javacc:0
+	dev-java/javahelp:0
+	dev-java/jna:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ide -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+JAVA_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r16-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
+	ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die
+	ln -s "${DISTDIR}"/DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8-com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar || die
+	ln -s "${DISTDIR}"/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar o.apache.commons.io/external/commons-io-1.4.jar || die
+	ln -s "${DISTDIR}"/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar o.apache.commons.lang/external/commons-lang-2.6.jar || die
+	ln -s "${DISTDIR}"/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar libs.commons_net/external/commons-net-3.3.jar || die
+	ln -s "${DISTDIR}"/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip css.editor/external/css21-spec.zip || die
+	ln -s "${DISTDIR}"/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip css.editor/external/css3-spec.zip || die
+	ln -s "${DISTDIR}"/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip derby/external/derbysampledb.zip || die
+	ln -s "${DISTDIR}"/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip dlight.nativeexecution/external/exechlp-1.0.zip || die
+	ln -s "${DISTDIR}"/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar libs.freemarker/external/freemarker-2.3.19.jar || die
+	ln -s "${DISTDIR}"/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar c.google.guava/external/guava-15.0.jar || die
+	ln -s "${DISTDIR}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || die
+	ln -s "${DISTDIR}"/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip html.parser/external/html5doc.zip || die
+	ln -s "${DISTDIR}"/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar html.parser/external/htmlparser-1.2.1.jar || die
+	ln -s "${DISTDIR}"/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar libs.ini4j/external/ini4j-0.5.1.jar || die
+	ln -s "${DISTDIR}"/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar html.validation/external/iri.jar || die
+	ln -s "${DISTDIR}"/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip spellchecker.dictionary_en/external/ispell-enwl-3.1.20.zip || die
+	ln -s "${DISTDIR}"/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar c.googlecode.javaewah.JavaEWAH/external/JavaEWAH-0.7.9.jar || die
+	ln -s "${DISTDIR}"/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar xml.jaxb.api/external/jaxb-api.jar || die
+	ln -s "${DISTDIR}"/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip libs.jaxb/external/jaxb-api-doc.zip || die
+	ln -s "${DISTDIR}"/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar libs.jaxb/external/jaxb-impl.jar || die
+	ln -s "${DISTDIR}"/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar libs.jaxb/external/jaxb-xjc.jar || die
+	ln -s "${DISTDIR}"/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar libs.jaxb/external/jaxb1-impl.jar || die
+	ln -s "${DISTDIR}"/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar libs.javafx/external/jfxrt.jar || die
+	ln -s "${DISTDIR}"/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar html.validation/external/jing.jar || die
+	ln -s "${DISTDIR}"/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.core-0.0.7.jar || die
+	ln -s "${DISTDIR}"/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.sshagent-0.0.7.jar || die
+	ln -s "${DISTDIR}"/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.pageant-0.0.7.jar || die
+	ln -s "${DISTDIR}"/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.usocket-jna-0.0.7.jar || die
+	ln -s "${DISTDIR}"/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar c.jcraft.jzlib/external/jzlib-1.0.7.jar || die
+	ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.process/external/libpam4j-1.1.jar || die
+	ln -s "${DISTDIR}"/AA2671239EBB762FEEE8B908E9F35473A72AFE1B-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar o.eclipse.core.contenttype/external/org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar || die
+	ln -s "${DISTDIR}"/1605B38BB28EAE32C11EAB8F9E238A497754A5B8-org.eclipse.core.jobs-3.5.101_nosignature.jar o.eclipse.core.jobs/external/org.eclipse.core.jobs-3.5.101_nosignature.jar || die
+	ln -s "${DISTDIR}"/20800206EB8B490F3CE5BB8AC8A7C3B9E8004A30-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar o.eclipse.core.net/external/org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar || die
+	ln -s "${DISTDIR}"/D2D2105B1E3C9E2FA6240AD088237A57590DDA8D-org.eclipse.core.runtime-3.7.0_nosignature.jar o.eclipse.core.runtime/external/org.eclipse.core.runtime-3.7.0_nosignature.jar || die
+	ln -s "${DISTDIR}"/16507EAFDC2B95121AA718895BDB54D616EE4B0F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar o.eclipse.core.runtime.compatibility.auth/external/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar || die
+	ln -s "${DISTDIR}"/BD55836AABD558DC643A7844B78866AD990544BC-org.eclipse.equinox.app-1.3.100_nosignature.jar o.eclipse.equinox.app/external/org.eclipse.equinox.app-1.3.100_nosignature.jar || die
+	ln -s "${DISTDIR}"/4EE275AE73A140A403903D7E4DBA68C8FBB07001-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar o.eclipse.equinox.common/external/org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar || die
+	ln -s "${DISTDIR}"/B7001D9CC2E2AC4E167D22A13063F0350C71AAA9-org.eclipse.equinox.preferences-3.4.2_nosignature.jar o.eclipse.equinox.preferences/external/org.eclipse.equinox.preferences-3.4.2_nosignature.jar || die
+	ln -s "${DISTDIR}"/C647079E36A4EB7A24AED2C545E4F0F94194C4D1-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar o.eclipse.equinox.registry/external/org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar || die
+	ln -s "${DISTDIR}"/9267CF311F979078211A70C1B19AF8A8EE71DC8E-org.eclipse.equinox.security-1.1.1_nosignature.jar o.eclipse.equinox.security/external/org.eclipse.equinox.security-1.1.1_nosignature.jar || die
+	ln -s "${DISTDIR}"/B580E446B543A8DD2F5AA368B07F9C4C9C2E7029-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit/external/org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar || die
+	ln -s "${DISTDIR}"/244560B99152F3F9BC75DF2D6FAFA8A5216B06B6-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit.java7/external/org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar || die
+	ln -s "${DISTDIR}"/8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar || die
+	ln -s "${DISTDIR}"/D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar || die
+	ln -s "${DISTDIR}"/4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar || die
+	ln -s "${DISTDIR}"/8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar o.eclipse.mylyn.commons.repositories.core/external/org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar || die
+	ln -s "${DISTDIR}"/50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar || die
+	ln -s "${DISTDIR}"/4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar || die
+	ln -s "${DISTDIR}"/11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.confluence.core/external/org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar || die
+	ln -s "${DISTDIR}"/A3FEF6144ED1622E4CDD506B9D745527CC675D8D-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar || die
+	ln -s "${DISTDIR}"/825DC870D1D423E347F4F8229A211A2C297BB15D-org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.markdown.core/external/org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar || die
+	ln -s "${DISTDIR}"/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.textile.core/external/org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar || die
+	ln -s "${DISTDIR}"/17C0C8D6DEBF5EBE734881C131888D8088BD9E7D-org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar || die
+	ln -s "${DISTDIR}"/6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar extexecution.process/external/processtreekiller-1.0.7.jar || die
+	ln -s "${DISTDIR}"/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar libs.svnClientAdapter.svnkit/external/svnkit_1.7.8.r9538_v20130107_2001.jar || die
+	ln -s "${DISTDIR}"/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar o.apache.xml.resolver/external/resolver-1.2.jar || die
+	ln -s "${DISTDIR}"/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar libs.svnClientAdapter.svnkit/external/sqljet-1.1.10.jar || die
+	ln -s "${DISTDIR}"/DAAEFA7A5F3AF75FE4CDC86A1B5904C9F3B5BBF8-svnClientAdapter-javahl-1.10.12.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-javahl-1.10.12.jar || die
+	ln -s "${DISTDIR}"/C47ED3BCD8CEAECDE3BDEEB7D8D14B577B26F9C8-svnClientAdapter-main-1.10.12.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.10.12.jar || die
+	ln -s "${DISTDIR}"/AD4A88D99AB7C5B64C8893CA2FF2CBCFCEFC51C8-svnClientAdapter-svnkit-1.10.12.jar libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.10.12.jar || die
+	ln -s "${DISTDIR}"/5C47A97F05F761F190D87ED5FCBB08D1E05A7FB5-svnjavahl-1.9.3.jar libs.svnClientAdapter.javahl/external/svnjavahl-1.9.3.jar || die
+	ln -s "${DISTDIR}"/3B91269E9055504778F57744D24F505856698602-svnkit-1.7.0-beta4-20120316.233307-1.jar libs.svnClientAdapter.svnkit/external/svnkit-1.7.0-beta4-20120316.233307-1.jar || die
+	ln -s "${DISTDIR}"/015525209A02BD74254930FF844C7C13498B7FB9-svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar libs.svnClientAdapter.svnkit/external/svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar || die
+	ln -s "${DISTDIR}"/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar libs.swingx/external/swingx-all-1.6.4.jar || die
+	ln -s "${DISTDIR}"/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar httpserver/external/tomcat-webserver-3.2.jar || die
+	ln -s "${DISTDIR}"/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar swing.validation/external/ValidationAPI.jar || die
+	ln -s "${DISTDIR}"/15ACB06E2E3A70FC188782BA51369CA81ACFE860-validator.jar html.validation/external/validator.jar || die
+	ln -s "${DISTDIR}"/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar extexecution.process/external/winp-1.14-patched.jar || die
+	ln -s "${DISTDIR}"/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar o.apache.xmlrpc/external/xmlrpc-client-3.0.jar || die
+	ln -s "${DISTDIR}"/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar o.apache.xmlrpc/external/xmlrpc-common-3.0.jar || die
+	ln -s "${DISTDIR}"/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar o.apache.xmlrpc/external/xmlrpc-server-3.0.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.53.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar
+	java-pkg_jar-from --build-only --into db.sql.visualeditor/external javacc javacc.jar javacc-3.2.jar
+	java-pkg_jar-from --into html.parser/external icu4j-55 icu4j.jar icu4j-4_4_2.jar
+	java-pkg_jar-from --into html.validation/external iso-relax iso-relax.jar isorelax.jar
+	java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar
+	java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.antlr4.runtime/external antlr-4 antlr-runtime.jar antlr-runtime-4.5.3.jar
+	java-pkg_jar-from --into libs.commons_compress/external commons-compress commons-compress.jar commons-compress-1.8.1.jar
+	# java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.19.jar
+	java-pkg_jar-from --build-only --into libs.jna/external jna jna.jar jna-4.2.2.jar
+	java-pkg_jar-from --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
+	java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
+	java-pkg_jar-from --into libs.lucene/external lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
+	java-pkg_jar-from --into libs.smack/external smack-2.2 smack.jar smack.jar
+	java-pkg_jar-from --into libs.smack/external smack-2.2 smackx.jar smackx.jar
+	# java-pkg_jar-from --into libs.svnClientAdapter.javahl/external subversion svn-javahl.jar svnjavahl-1.8.4.jar
+	java-pkg_jar-from --into libs.xerces/external xerces-2 xercesImpl.jar xerces-2.8.0.jar
+	java-pkg_jar-from --build-only --into o.apache.commons.codec/external commons-codec commons-codec.jar apache-commons-codec-1.3.jar
+	java-pkg_jar-from --into o.apache.commons.httpclient/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.1.jar
+	java-pkg_jar-from --into o.apache.commons.logging/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
+	java-pkg_jar-from --into o.apache.ws.commons.util/external ws-commons-util ws-commons-util.jar ws-commons-util-1.0.1.jar
+	java-pkg_jar-from --into servletapi/external tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
+	java-pkg_jar-from --into xml.jaxb.api/external sun-jaf activation.jar activation.jar
+	java-pkg_jar-from --into xml.jaxb.api/external jsr173 jsr173.jar jsr173_1.0_api.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	unset DISPLAY
+	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+	pushd nbbuild/netbeans/ide >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/ide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	rm -fr "${D}"/${INSTALL_DIR}/bin/nativeexecution || die
+	rm -fr "${D}"/${INSTALL_DIR}/modules/lib || die
+
+	insinto ${INSTALL_DIR}/bin/nativeexecution
+	doins bin/nativeexecution/*
+
+	pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution >/dev/null || die
+	for file in *.sh ; do
+		fperms 755 ${file}
+	done
+	popd >/dev/null || die
+
+	if use x86 ; then
+		doins -r bin/nativeexecution/Linux-x86
+		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86 >/dev/null || die
+		for file in * ; do
+			fperms 755 ${file}
+		done
+		popd >/dev/null || die
+	elif use amd64 ; then
+		doins -r bin/nativeexecution/Linux-x86_64
+		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86_64 >/dev/null || die
+		for file in * ; do
+			fperms 755 ${file}
+		done
+		popd >/dev/null || die
+	fi
+
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules
+	pushd "${instdir}" >/dev/null || die
+	rm com-jcraft-jsch.jar && java-pkg_jar-from --into "${instdir}" jsch jsch.jar com-jcraft-jsch.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext
+	pushd "${instdir}" >/dev/null || die
+	rm antlr-runtime-4.5.3.jar && java-pkg_jar-from --into "${instdir}" antlr-4 antlr-runtime.jar antlr-runtime-4.5.3.jar
+	rm commons-compress-1.8.1.jar && java-pkg_jar-from --into "${instdir}" commons-compress commons-compress.jar commons-compress-1.8.1.jar
+	# rm freemarker-2.3.19.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.19.jar || die
+	rm icu4j-4_4_2.jar && java-pkg_jar-from --into "${instdir}" icu4j-55 icu4j.jar icu4j-4_4_2.jar
+	rm isorelax.jar && java-pkg_jar-from --into "${instdir}" iso-relax iso-relax.jar isorelax.jar
+	rm json-simple-1.1.1.jar && java-pkg_jar-from --into "${instdir}" json-simple json-simple.jar json-simple-1.1.1.jar
+	rm jvyamlb-0.2.7.jar && java-pkg_jar-from --into "${instdir}" jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
+	rm log4j-1.2.15.jar && java-pkg_jar-from --into "${instdir}" log4j log4j.jar log4j-1.2.15.jar
+	rm lucene-core-3.5.0.jar && java-pkg_jar-from --into "${instdir}" lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
+	rm mysql-connector-java-5.1.23-bin.jar && java-pkg_jar-from --into "${instdir}" jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
+	rm postgresql-9.2-1002.jdbc4.jar && java-pkg_jar-from --into "${instdir}" jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar
+	rm saxon9B.jar && java-pkg_jar-from --into "${instdir}" saxon-9 saxon.jar saxon9B.jar
+	rm servlet-2.2.jar && java-pkg_jar-from --into "${instdir}" tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
+	rm smack.jar && java-pkg_jar-from --into "${instdir}" smack-2.2 smack.jar
+	rm smackx.jar && java-pkg_jar-from --into "${instdir}" smack-2.2 smackx.jar
+	# rm svnjavahl.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl.jar || die
+	rm xerces-2.8.0.jar && java-pkg_jar-from --into "${instdir}" xerces-2 xercesImpl.jar xerces-2.8.0.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxb
+	pushd "${instdir}" >/dev/null || die
+	rm activation.jar && java-pkg_jar-from --into "${instdir}" sun-jaf activation.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxb/api
+	pushd "${instdir}" >/dev/null || die
+	rm jsr173_1.0_api.jar && java-pkg_jar-from --into "${instdir}" jsr173 jsr173.jar jsr173_1.0_api.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ide
+}

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 9f8f416..e3af589 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -65,6 +65,7 @@ DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62
 DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae933c49b42cea56fe36ace1ac114430312e20a9484532e4ffeb3 SHA512 7efc824e3e47f07202d3f687726a5432fbc391c22bc762a0810a95c454c9f1f515bd0b026f22a9a00e39027023e31e9d0fcb3bc95688f8e54ec1465267246bd6 WHIRLPOOL d58c979aacb6021322b5595de5ac1a99f441413aae39bc5a02c09dc353125e778a9c62f45b8e3c88db125f27010d901d6a763f875e86e5f1aae6cc571579c2df
 DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 DIST netbeans-trunk-nightly-201606250002-src.zip 216438825 SHA256 f03d25d6d23b7548774067a664220990366da49ea1e15e1d33ec31d1ab934d06 SHA512 6cac9c55e060ddfe901a0fd361b629ff19666ffc3ebf7e5f1184135b8ca6e5b3056bcfa506e0bcc973405dd7dcae83b0bfd08f81c8c6ade1f2dbd13d60de38a7 WHIRLPOOL 7ee0b8add0f67ed4800d5c41b7967488119d7e865ce0d4bc8b15496a8bfcfebbfae08eb55d69d7de4d7bedb32fc7850c2cb76e46ae3ad5bf465a96f28b1392b2
+DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 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_p20160530.ebuild 15656 SHA256 1b8eae5cc69ee5c52d22ee4877eaa52e1f472ee530f21815ab48e34ccbbee3b5 SHA512 6a907af9f568ee927df9f10f7564182592fb6cd448fa163294041aa5f5070a197426d954f6676e05f5e0c6c40fa49fda5cb4426c922805ed502d0183db314fbb WHIRLPOOL 8be5a9d7a20549a2d72c3f14fc15ab5db8836459042409a112e2f9de2dc9e21c503cc22d41230597f023b5c3fb97870b3194bab32873fb4ff51ba6f2766dc287
@@ -88,4 +89,5 @@ EBUILD netbeans-java-9999_p20160620.ebuild 15656 SHA256 0edb8c9338d57eacca6858cb
 EBUILD netbeans-java-9999_p20160623.ebuild 15656 SHA256 8a970675e48f73062c3608d3988929798fc4a13e265850774cc497d7986965e8 SHA512 1b5c555e80fb19bd739cf42e2032e6766c5fd018d462b002b18de3f801e180785e9fce39f59a00009684f94a0f56dc7ad10f56420cce6c9da3e727ddb4b23729 WHIRLPOOL 17eaddd58cb650ab0aa39816f3ad3588e8119606c095644771743c0c54ea75fd5377750a8083cf280c306c046a0749bdb9c30481aca7e1b93e8658c6603b7371
 EBUILD netbeans-java-9999_p20160624.ebuild 15656 SHA256 d5cde83be38240ff5bd5c46b8de5e9e895f582c1c62b5171c2d135f23afbc888 SHA512 15656d3ec5065e4c23a4aaec9bfcf0c2133f3d33423cdfb17fd0bc49e460ed43be503a9793d50cc6631bd408f16235d657fef23654f339c92f8f5e8b0fae86c8 WHIRLPOOL 49b74d9f36dc2071510b3201987a4e5d552eed2b8a1efa72294c9ac84e4f85715aabe1f79a01b5a1bed36e3d246b7164a3994aac0ce8500249bd276577442896
 EBUILD netbeans-java-9999_p20160625.ebuild 15656 SHA256 f65d83458111053f19648224f7f4f6d6ba92d985bbe52793805011f59d84ae20 SHA512 64742595e5b04a502d7513d063269b914d558af0fed73e21432aec8abb2120673b89fad95ea090e27f603e8405ced3165300ee922829812a0e1429177a0dc7b3 WHIRLPOOL 670b6dbb67f140d83c7ba0fc7ae9ea2af27d3c7e9f15dadac35f37f12326968c0ebea131fc195e3d0d1e5cf1e99536baecadf36cef9d3d7ae7d2a994d450be61
+EBUILD netbeans-java-9999_p20160627.ebuild 15656 SHA256 d5bd2ef557d74bfc8f582355ba0df1540233c73793c67e7f54554bcba5f13b1a SHA512 7c84ccd089ba94492aa9d680c105040c12d16ddbc4a29ea7058f34e359983be0c24a280c6a1a312499f47ba3a58a764de849337ddc539696592b6a9ea8f79790 WHIRLPOOL b1d98073bd89da4508012ad7d3aadecf02c1d523cb461e46628c0db762fe2f6b3098dc02c990fcbe3cfd58f4594e3ae80da8997203164da6d6123ed511bc54aa
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160627.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160627.ebuild
new file mode 100644
index 0000000..3b6eeda
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20160627.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-06-27_00-02-33/zip/netbeans-trunk-nightly-201606270002-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/47E8B11BBA8D4796ADC351499A07197ADF03383B-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}"/47E8B11BBA8D4796ADC351499A07197ADF03383B-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 bbad859..b22aba9 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62
 DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae933c49b42cea56fe36ace1ac114430312e20a9484532e4ffeb3 SHA512 7efc824e3e47f07202d3f687726a5432fbc391c22bc762a0810a95c454c9f1f515bd0b026f22a9a00e39027023e31e9d0fcb3bc95688f8e54ec1465267246bd6 WHIRLPOOL d58c979aacb6021322b5595de5ac1a99f441413aae39bc5a02c09dc353125e778a9c62f45b8e3c88db125f27010d901d6a763f875e86e5f1aae6cc571579c2df
 DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 DIST netbeans-trunk-nightly-201606250002-src.zip 216438825 SHA256 f03d25d6d23b7548774067a664220990366da49ea1e15e1d33ec31d1ab934d06 SHA512 6cac9c55e060ddfe901a0fd361b629ff19666ffc3ebf7e5f1184135b8ca6e5b3056bcfa506e0bcc973405dd7dcae83b0bfd08f81c8c6ade1f2dbd13d60de38a7 WHIRLPOOL 7ee0b8add0f67ed4800d5c41b7967488119d7e865ce0d4bc8b15496a8bfcfebbfae08eb55d69d7de4d7bedb32fc7850c2cb76e46ae3ad5bf465a96f28b1392b2
+DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 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_p20160530.ebuild 4971 SHA256 8aed47e3d3a4d151cad6366d8a8ab02c52464cc372ad2aab9023f9f646eeea45 SHA512 e813fa58fbd5ca2dcf0b62bf5b7f26b5ace2c954cc673f99f23b4ca2a5bb96420c9bf0f985c40943096cc539d5064165facf25528c130476d8026f7807653613 WHIRLPOOL 21af88b8f80b9d13fb1b5603a5b8a8d5d22a443887e6fe5394cfd5956bc8b0e4e4f848cd147afc0fd1d0ac964874f91f9474dd74eaf626fbec682c6f0b3ddf3f
@@ -50,4 +51,5 @@ EBUILD netbeans-javacard-9999_p20160620.ebuild 4971 SHA256 b15d354298a2102fec766
 EBUILD netbeans-javacard-9999_p20160623.ebuild 4971 SHA256 1d53284fe8e704e7bd355dc98a1630b2877ff251bc30e944646a668d9036271a SHA512 71524eea6ba281b58e95fe57ab758d96e2beb424a64f1b33b4f94157719a25b9f934033f17cc6bcb3f5d1dc8665dcd34ab61a80389e7578b180345f853fe3686 WHIRLPOOL 2ef3f1902133b16b76266de774049f6424cdb7f31a35656a1df4f91fbcc8af86c53a4ea32bfed153ad302e43d750387ab38812c76fb58979f5f900279727d54c
 EBUILD netbeans-javacard-9999_p20160624.ebuild 4971 SHA256 0eac450e404c30c7379e4829c42424b54a84352bc46322cf2bcf62636b6ecfa0 SHA512 b2aefb77c0c763ca33127dd128f8a145d4d8632ff79fe159440f318e1ac14e0b1790832abcabc7dfb7d928bd7e9d6f72f386f3c5e4e89e41ef043e4fbfd0ed3d WHIRLPOOL 21d02d1119d9aa3dde8fab77730a2fc73e0f533de6a279c95c78b72411117159f4c2f3d400eb5e4b8dafdac141312c690cd8399713b7af5c06d91d4144ca384e
 EBUILD netbeans-javacard-9999_p20160625.ebuild 4971 SHA256 31b5392bf084f3c31b4c4ec098ed3d4ce65569b43f64d6bfec3e0b6794a98b4e SHA512 9d05a779825e88cbed9c2865c5800f56771a076e8f51a2afd79c93b9f057c5b20a22ab5fbbbc45874243916b15546cc2c3a0098cd925410b8bd157a050519d88 WHIRLPOOL 0d47083df719f27c865505ace9d59107d90f3c71b8011a8415757756e73f82d3e01cd93d38c54a37792316798ac4453512a536b30cbd670501dbd45107873a1f
+EBUILD netbeans-javacard-9999_p20160627.ebuild 4971 SHA256 96d1bd0392bf4ca09dabd5cb0cc3ad6638cb14126808142389ad12888cd736e4 SHA512 28eb14a17ff58829aa6f34caf75d1dfd592dfc1588956a289f8cb973e624f6ee9af4cb25fb4b1073b0ecc54084202fb28326e032d1ba00e184086410dea73a5e WHIRLPOOL 9d9f52fd79d853f1ed034b1778d6dc0a479fab7c120625eabfa1f20abcc1317bc01b9d32980f75636754c8a58b42143006312aab9cc574e037a0a69b897bc0eb
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160627.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160627.ebuild
new file mode 100644
index 0000000..4928f21
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160627.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-06-27_00-02-33/zip/netbeans-trunk-nightly-201606270002-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 0f34ac4..df50e71 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62
 DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae933c49b42cea56fe36ace1ac114430312e20a9484532e4ffeb3 SHA512 7efc824e3e47f07202d3f687726a5432fbc391c22bc762a0810a95c454c9f1f515bd0b026f22a9a00e39027023e31e9d0fcb3bc95688f8e54ec1465267246bd6 WHIRLPOOL d58c979aacb6021322b5595de5ac1a99f441413aae39bc5a02c09dc353125e778a9c62f45b8e3c88db125f27010d901d6a763f875e86e5f1aae6cc571579c2df
 DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 DIST netbeans-trunk-nightly-201606250002-src.zip 216438825 SHA256 f03d25d6d23b7548774067a664220990366da49ea1e15e1d33ec31d1ab934d06 SHA512 6cac9c55e060ddfe901a0fd361b629ff19666ffc3ebf7e5f1184135b8ca6e5b3056bcfa506e0bcc973405dd7dcae83b0bfd08f81c8c6ade1f2dbd13d60de38a7 WHIRLPOOL 7ee0b8add0f67ed4800d5c41b7967488119d7e865ce0d4bc8b15496a8bfcfebbfae08eb55d69d7de4d7bedb32fc7850c2cb76e46ae3ad5bf465a96f28b1392b2
+DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 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_p20160530.ebuild 6293 SHA256 4a30ffd321e2cf9d48884e5558cf10f59b851dcd8dd0ad611752b4945fad6507 SHA512 c639dd17eaecd5a6fed55eb537306ce388e020be4aed9ffec572d1a928d80a880ee7834b13012f3a65b1d88a058a64c3958f2f24795f9e4a0f5ed21e8f518b1a WHIRLPOOL 079267b3edb4803f49151012b8e48b4a8e50a69357143ee5c721a8d39f9dd04cdfdca81120ee9df871ebca1017353d8264eba13fb5f6499f606fd5e3a49844ce
@@ -49,4 +50,5 @@ EBUILD netbeans-javadoc-9999_p20160620.ebuild 6293 SHA256 70827ae80a9f11fba41fea
 EBUILD netbeans-javadoc-9999_p20160623.ebuild 6293 SHA256 1b729e8fb95ec05abc2e967d0fb95a599ad0475ee69ad50eb7350d2c4c92e64c SHA512 b48f24fe5ea0cb0b2ca5cb8c6ca4f36375ee0da7017e45e122ca20e2cb47fc8c645bccf644f14bbbc9fc58732fcf8d0b7d2f58a84d7c631b50c6ab08bcbbab7c WHIRLPOOL 1989499e1df231d3bdce527f33f8d06d0f7da961e0b1ce09c764569fd2590a8d293516e635e648400233f0ab8d8553eeba1e8bac5a6f8471dce68d3b0fa3883c
 EBUILD netbeans-javadoc-9999_p20160624.ebuild 6293 SHA256 e1feaa816f465a59c44ca8d8550df2a5b17f942b65ced7093c95331e3c788dd6 SHA512 3a7b125204765137039fe574754b2a6f208ccf8d8d4f1040ed2d8126f7f237b6ed3841e5f4b1369574561fce600b1a45a3f7f51b759eec97b78354fb77c070f5 WHIRLPOOL 9c1a50a22255b3b0fcfef02d8596c5b01e85bee4a5ab79628cc15c873a684ee982f2eef6606029df781ba2ad00d030ccb181d5d17cdbf09d0299ea04b4849d18
 EBUILD netbeans-javadoc-9999_p20160625.ebuild 6293 SHA256 2a5df0681b5e74c128a214308caeb6dde759fd64de6c696fb2d773dcc59246fa SHA512 7f24d28ed49e2a76da66a011c2ef870104db6a7cc891b66e7afeaecc3ce433cd519f01079bcd6aed9852285a9241af3473efecb486e636e218ce1877705ac196 WHIRLPOOL a155440b43fed321d32d60717ee2caf7a61738a8f917ca406e2dbd575d38c8a85fc80049217a7f6b5c9b9382bb63b78cd6c9aef01ed79a390918f82e7ce0cd59
+EBUILD netbeans-javadoc-9999_p20160627.ebuild 6293 SHA256 04f6e4b2679577d84d112ab5b21cc43ae226d2490f811fc2e1283286b45c124a SHA512 abb63987bad569987dcd893da2e97ccb6c30c028858a65d0848da08336495f55f5aeaff1b89e16e2d88aaab35126e3aecf59077ac9ac02b7a7fbe414a0130b93 WHIRLPOOL 0ed5554a6bc82e09ebdc116d25fa6a4b01e6cf5f15122ca3000a285520bf566ef958cf01f43ea080b7eb5b6722ffffab0fc331e845ddb0b6edff2cb5d6d79994
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160627.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160627.ebuild
new file mode 100644
index 0000000..b0b274b
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160627.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-06-27_00-02-33/zip/netbeans-trunk-nightly-201606270002-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 def472e..8c6ab9b 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -32,6 +32,7 @@ DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62
 DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae933c49b42cea56fe36ace1ac114430312e20a9484532e4ffeb3 SHA512 7efc824e3e47f07202d3f687726a5432fbc391c22bc762a0810a95c454c9f1f515bd0b026f22a9a00e39027023e31e9d0fcb3bc95688f8e54ec1465267246bd6 WHIRLPOOL d58c979aacb6021322b5595de5ac1a99f441413aae39bc5a02c09dc353125e778a9c62f45b8e3c88db125f27010d901d6a763f875e86e5f1aae6cc571579c2df
 DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 DIST netbeans-trunk-nightly-201606250002-src.zip 216438825 SHA256 f03d25d6d23b7548774067a664220990366da49ea1e15e1d33ec31d1ab934d06 SHA512 6cac9c55e060ddfe901a0fd361b629ff19666ffc3ebf7e5f1184135b8ca6e5b3056bcfa506e0bcc973405dd7dcae83b0bfd08f81c8c6ade1f2dbd13d60de38a7 WHIRLPOOL 7ee0b8add0f67ed4800d5c41b7967488119d7e865ce0d4bc8b15496a8bfcfebbfae08eb55d69d7de4d7bedb32fc7850c2cb76e46ae3ad5bf465a96f28b1392b2
+DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 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_p20160530.ebuild 4717 SHA256 8d47c484169039f422ab26243e9759920de989254eb8d36d229f03a9e846072c SHA512 7706da460389b59cbe9932b4927901168af67be0d4eeb690c261c66bcae9c765cfcf319310849ffa8aee62a20867cfa6dd676733a5536303364cc627959ca8bd WHIRLPOOL 990455ca21ef0e5b9ddd2ca76d1960b7a2eb3088193ca12d732ed4dfa8dcbdf1d5c9ebe33de58ddfe814f9ec922aace5a18f1281097aa95061ef210ec80e5251
@@ -55,4 +56,5 @@ EBUILD netbeans-javafx-9999_p20160620.ebuild 4717 SHA256 89bab6c932266ab6153969e
 EBUILD netbeans-javafx-9999_p20160623.ebuild 4717 SHA256 0fe784e95f748fb6c8a667037053d303ef87d2e53b928fa43a30973739527593 SHA512 37e5e3d61723b1ed140b01a7a8fb311e05d82b76c5b8da5a994116cea8c2d8ca456d71990797a250e2e7e505254d3a3b29e850a87cbdb8477fef66ce9726161c WHIRLPOOL bff8051898d1a9ecb90d18e4fdd1d1ccdd99c0d5a4d35d5a11607ec4891baedea4146c55bf969830cc7d603a9d79e5041dee85694db99bebaff20ad62ed32cef
 EBUILD netbeans-javafx-9999_p20160624.ebuild 4717 SHA256 4c220a12e121b7c277ba1c77698f1a0e50404e963b497ca6c50ceeb0aeadabd9 SHA512 e5a16bd31917ea0dc731fede1cf8be706f291c86797fed1bb91566bf32c03d66491e138d16f380d32e83905bd4db7295388a6c55da9f210341ff505681a5e0f2 WHIRLPOOL 44dca52b15131dab14202079ac869a696265e863faa513eaac72702a7d8ec7017cbead84f69b5754a594f33e8dcc0fe2b1e8cc725c34d8ea58d38612aacf4ca9
 EBUILD netbeans-javafx-9999_p20160625.ebuild 4717 SHA256 27e60e1ba82de4d0b801ef367390e996145e0c15275b8749285aa3997900bbe5 SHA512 5cc934ff9bfc93d02c303689b73ae0d664c7a68c43dda5bb50582047e851a4bf7e632f6cd1f97dc93bd54dfe56b2ae04c2c27e959a33b5a31edc4667f0d23918 WHIRLPOOL f2a4c0228132bc1a3536f2ecaca6e3688b6b7ec923d0e5032dbe22e8f2d8bb52d305c86ac37cdb489f7e7933e7990071a98de8e8bde7b327c2d08e88026cd6db
+EBUILD netbeans-javafx-9999_p20160627.ebuild 4717 SHA256 a331a00f06cf750c742ceccdf4a68ec2600bba52cd0a4a6a1a4768d9d7a0acf8 SHA512 c426d98f28a139388ee3a6dc1705019af46bd9b15f6a5271008955eb28ba2be6aedc5368ba043792ebfe3b3a4151d8b542e370708dd39ed53dbf3ed35e96dde1 WHIRLPOOL 25a46e2d76067a2e1cac860ee3cf61f39fb3707739302fb88aaa4c6c4219824ad9131d05b02cb9556c60a9bd3508f5516fabb2e86a8412c987e708fe575558d6
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160627.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160627.ebuild
new file mode 100644
index 0000000..3e2de3f
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160627.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-06-27_00-02-33/zip/netbeans-trunk-nightly-201606270002-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 a5fe607..988e7b9 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62
 DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae933c49b42cea56fe36ace1ac114430312e20a9484532e4ffeb3 SHA512 7efc824e3e47f07202d3f687726a5432fbc391c22bc762a0810a95c454c9f1f515bd0b026f22a9a00e39027023e31e9d0fcb3bc95688f8e54ec1465267246bd6 WHIRLPOOL d58c979aacb6021322b5595de5ac1a99f441413aae39bc5a02c09dc353125e778a9c62f45b8e3c88db125f27010d901d6a763f875e86e5f1aae6cc571579c2df
 DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 DIST netbeans-trunk-nightly-201606250002-src.zip 216438825 SHA256 f03d25d6d23b7548774067a664220990366da49ea1e15e1d33ec31d1ab934d06 SHA512 6cac9c55e060ddfe901a0fd361b629ff19666ffc3ebf7e5f1184135b8ca6e5b3056bcfa506e0bcc973405dd7dcae83b0bfd08f81c8c6ade1f2dbd13d60de38a7 WHIRLPOOL 7ee0b8add0f67ed4800d5c41b7967488119d7e865ce0d4bc8b15496a8bfcfebbfae08eb55d69d7de4d7bedb32fc7850c2cb76e46ae3ad5bf465a96f28b1392b2
+DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 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_p20160530.ebuild 4412 SHA256 d28b10e50afe7913493d1418b41f70c956226228a2c4914ffc4b9b8ca312d1b6 SHA512 d5d44e26ce875490dd1da9f6dda261e42383b33ab411b56cf91f464ca5356136e27b13be182b78a19d67b4b387b003b78cf496e16f05d2bdba0de80b44dcd353 WHIRLPOOL 9e488789123eaefa971aba6e285ee128119306babd06e3c763c989c4e4f61f7d54fdf4ce89a6b247666bcac2f3ac64048824b1f67c01d79b73a7da21e5c10073
@@ -47,4 +48,5 @@ EBUILD netbeans-mobility-9999_p20160620.ebuild 4412 SHA256 e27fefcc1095fe6ddb39b
 EBUILD netbeans-mobility-9999_p20160623.ebuild 4412 SHA256 c3e43d6b8ef1171fb121d6c91e59bbd635b99900e19f13b9d13523fc3a3a3967 SHA512 7a5f9788c9b784b90fab481a72d22e66585c1d18be7f4ef7feb42db56e2a076c2f41f71aa74c15372b5c53ad3af0084c8c8c8961de9a3e36267f6e851af9c103 WHIRLPOOL be12b49ede237930e2b3ef73b9f316f4ae52bc3075ecd438bc1a5bdd1b596ed764910ff18bc38312e95e079026a1a28bfc809c67463a7f17783fec4da8dc150b
 EBUILD netbeans-mobility-9999_p20160624.ebuild 4412 SHA256 dee02c50a33798f851ddab55ef6fea8f63ad839b43d299c7a269ce17c522e34e SHA512 8d5aefe4a357000e0705a4aa9385778ee9e5edf18f35a8b3f1dacb5cc61cffec99e884f0d30dec9ebda73f7d4443be7370a1c34a42d59aa385c0d4a14ce6c31d WHIRLPOOL cd13490c3d897d775e1db76cae594af370b9806f7c6813a2a78f99a40b6e93d97ea25bd1edb2d2f76c26c8e98878e4cd3d7dfe4692bed98c23fe0743f4a86b75
 EBUILD netbeans-mobility-9999_p20160625.ebuild 4412 SHA256 20649f1c5359cf8a77f5f94762597b7cd663824774c56c58631be7a50fd68a18 SHA512 1f170168127db325b32d536bc7deb3457e29cfa62283ef24ea6686fde393127b8a9692cf31e3eee0edf12fbeccef559eb9e930cd3bb40ec5f80369e3107d6482 WHIRLPOOL 20f0c2290d641b7db3d1616182def2d5cc5dd61cb3a817b9b24902cca1194430c6f71ce4bdde3e850db8236458c18d39edbf4a7a6e1b3bc0f636da451e2b8024
+EBUILD netbeans-mobility-9999_p20160627.ebuild 4412 SHA256 43e79ccd0235c324319902441d5be38ee69e0b77ad9d644f7febdc00cdbe9ed1 SHA512 9b8fba2be34720a95d5f45f31a5174da1d3fc09c9a486acadb3ae39aa61395567ba1bebf9bc3e4e1b6f89e7ddf414edbf0b8bfeda7d7f6e2d619aa74f90e26ea WHIRLPOOL b6a6fa4c2c261e77254e46117f7c4c1a75fc316595f5c37b1d7656a926fc70caf6fd59e8b881fa77ac8f05904757b37f3c471b6de3447408117e3fb3a5b476e0
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160627.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160627.ebuild
new file mode 100644
index 0000000..ef89d7c
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160627.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-06-27_00-02-33/zip/netbeans-trunk-nightly-201606270002-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 554cb41..f219532 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62
 DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae933c49b42cea56fe36ace1ac114430312e20a9484532e4ffeb3 SHA512 7efc824e3e47f07202d3f687726a5432fbc391c22bc762a0810a95c454c9f1f515bd0b026f22a9a00e39027023e31e9d0fcb3bc95688f8e54ec1465267246bd6 WHIRLPOOL d58c979aacb6021322b5595de5ac1a99f441413aae39bc5a02c09dc353125e778a9c62f45b8e3c88db125f27010d901d6a763f875e86e5f1aae6cc571579c2df
 DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 DIST netbeans-trunk-nightly-201606250002-src.zip 216438825 SHA256 f03d25d6d23b7548774067a664220990366da49ea1e15e1d33ec31d1ab934d06 SHA512 6cac9c55e060ddfe901a0fd361b629ff19666ffc3ebf7e5f1184135b8ca6e5b3056bcfa506e0bcc973405dd7dcae83b0bfd08f81c8c6ade1f2dbd13d60de38a7 WHIRLPOOL 7ee0b8add0f67ed4800d5c41b7967488119d7e865ce0d4bc8b15496a8bfcfebbfae08eb55d69d7de4d7bedb32fc7850c2cb76e46ae3ad5bf465a96f28b1392b2
+DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 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_p20160530.ebuild 4111 SHA256 894ad7d26fed0945f1a472f8812f3509ac426844ad7bad373d1ffcd35eb41218 SHA512 c71b4268dbf84a3e9313ae4d5a1df700e5266675cdcf00c533985dc0abf6d5160087a43c176c48eeac3d69e689835ce686ef9f35f495f9793096560b6b8aad79 WHIRLPOOL cf7b1672061157a1c600b75f638131c4bf7e69305759e25033590dfb14736e28c8c60dd163997fa2794aab0c7061b911a73c84538ae588393ee2ae7c13905900
@@ -50,4 +51,5 @@ EBUILD netbeans-nb-9999_p20160620.ebuild 4111 SHA256 d1bbd78991d6cbeabff33d603d2
 EBUILD netbeans-nb-9999_p20160623.ebuild 4111 SHA256 53c2fa0fdda1ad5fe21508f2d54ce79cf5c1c67dbacf7cdde499784a6fd88e11 SHA512 f15cf6f54d4a7f7c73335e89d9a09d33734562c5247f30c0d0857796c71fa464d9270f2727a14ca390bbab0eac6a7bb937f841f7c03aefdf118f21fc16dad7bb WHIRLPOOL 435ed396d90a52e81523feee7c1244929c07a440820b9e408b53680f50e1e593601316c57eb327c578d23ba37d5276fdaf27b10b9c572b5884c63488f3a5dd3f
 EBUILD netbeans-nb-9999_p20160624.ebuild 4111 SHA256 1d9be27c25ec9a599d800ddb15cfe1a9ab36a3e4f6ee45a2401e985d687b45c0 SHA512 d31b636fe3bd91179efad10650525f8525e29f4767393cd7ca0e0525d61f7598adb197c96dc9d91fafb94e2628e6570af9f8fac55f949d526fca69ef49893206 WHIRLPOOL 159ce1a51adac191c957279904b0cb2dce26075297f2b10a53184ca00a00b9ebcf918b391b7457e3c5f9a6ad32f07eb9ee725245de27e747be6e23b10e646c0f
 EBUILD netbeans-nb-9999_p20160625.ebuild 4111 SHA256 f6aa69a1d5abb5e2579823433fc185acd4e40b98aa04bde77ff4a556b17f5bbb SHA512 a09603da7adee5028fc8f7de2fdc576b1194fc1a404ed04b9ad0c3dee222b1d0004c345c9276088b045af1f8c91a4f61dd6ed23e772746aea63fe4cd69c9ed4a WHIRLPOOL 92746a684a42f0343cc07c9bf764665a401d96ccd53fdd03bcde74415cf8cac729e76e0fb04294048141e5151449513d96e8be4a98d15fd6af0fc15f934873fd
+EBUILD netbeans-nb-9999_p20160627.ebuild 4111 SHA256 69eac502e7b633b2e09d936726e1cc01410e1b1e1d2473a1e1bd35ab2e7fea7f SHA512 6f2905abc0348f0d20ba0971b57b63f2a89bac30591663fb0d4d9c0afda2f02fd036ed97910f56d7f950a4b1c361ed63631a864b0152a2f47c7d67a7fd104e03 WHIRLPOOL 1d8b5078b89de223c20381ad2beeae903f86ee6c7908bca86d59610a30fcbf036426ff0d524c6bc2cce1604e92dca528ffcb4001809313b71707df46042f9a42
 MISC metadata.xml 392 SHA256 01cdbcc83099b97486bd7b8e813e5b19c1138eb0d8d3e8a5683aafd579820435 SHA512 4d2f9160baa022d6a48b61d5f42e71cfd411d244e7a36436629bc5ee4036e4ce19079134d9a6c704ebe942306c2e0199d0591c1e54f92f8f3c8835147e639246 WHIRLPOOL c1131764e1cec66c56b977ebe36014b29e5a68e35ccc326c0cbadd050a6c625cf191c85c212e0a733661c008dab0d99f9a4cdc4c4ae0cc9d775ba1de554795a9

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160627.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160627.ebuild
new file mode 100644
index 0000000..d7ccb7f
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20160627.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-06-27_00-02-33/zip/netbeans-trunk-nightly-201606270002-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 88c575b..266f8df 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62
 DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae933c49b42cea56fe36ace1ac114430312e20a9484532e4ffeb3 SHA512 7efc824e3e47f07202d3f687726a5432fbc391c22bc762a0810a95c454c9f1f515bd0b026f22a9a00e39027023e31e9d0fcb3bc95688f8e54ec1465267246bd6 WHIRLPOOL d58c979aacb6021322b5595de5ac1a99f441413aae39bc5a02c09dc353125e778a9c62f45b8e3c88db125f27010d901d6a763f875e86e5f1aae6cc571579c2df
 DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 DIST netbeans-trunk-nightly-201606250002-src.zip 216438825 SHA256 f03d25d6d23b7548774067a664220990366da49ea1e15e1d33ec31d1ab934d06 SHA512 6cac9c55e060ddfe901a0fd361b629ff19666ffc3ebf7e5f1184135b8ca6e5b3056bcfa506e0bcc973405dd7dcae83b0bfd08f81c8c6ade1f2dbd13d60de38a7 WHIRLPOOL 7ee0b8add0f67ed4800d5c41b7967488119d7e865ce0d4bc8b15496a8bfcfebbfae08eb55d69d7de4d7bedb32fc7850c2cb76e46ae3ad5bf465a96f28b1392b2
+DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 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_p20160530.ebuild 4418 SHA256 81d6ff1ace4684c8e091e318c5ad27739b204e8138be984cb62fe11e547ff2bf SHA512 60aadfda9de85fc255803fdbfafb9c3bc19bd1be035adb0cd4d135005bb6e5b3c70ad658d2d1c462e7dbc759459fce57dae0a05cd2b2bf85062e7c9fb4b7914c WHIRLPOOL 3036c97558de84352415e08b90b4a233995ee449e8cc2c4ec18bbb849ef1c9b10d2958c01b4d41abe9fe4685e7621ef91e45a30181176793bd5a039cd5cd349d
@@ -52,4 +53,5 @@ EBUILD netbeans-php-9999_p20160620.ebuild 4418 SHA256 3a9b143d6f707b717a3de6651f
 EBUILD netbeans-php-9999_p20160623.ebuild 4418 SHA256 3b2eb39bf10475587a261f03126d903d650c521970797868b876d2590482285f SHA512 0e43b248e98a0c6249409ea7562b8631ca4609eec997c9b8801d746542aea6bf1072f71c1b7ded5fb9ed5a3937130b62bffb99894a1e5b169f5bd51d0532dfc6 WHIRLPOOL 2ff98e42d200fe23adc2b39f5e7344d8a569a859dbbdb1f6f2c53f2c647d997987dd234aee3316661c989d8feddeeae5a8cf0689caf92b707d9ea8e2333a9f76
 EBUILD netbeans-php-9999_p20160624.ebuild 4418 SHA256 48e78f4bc26c43d4e7fe09c26496ca82cc05ef45e68d24a21c716719424f470b SHA512 db0c02a6bdf14a1ba941c075c7b953b5aee4b5de3408850d107b9a03dd30916c7e8798685ea328847919e2c9a3ad3485bfc037e2a90a84ea4281b57b5a9985ef WHIRLPOOL f5f79d8e776bc2e692394f77c5f5c02ada1f2f9e3988389d489b1f5635f9cea2b33f402e24cb6a35d2775c0614b00fd3805a39760fa50611347ba6e9750b4cbe
 EBUILD netbeans-php-9999_p20160625.ebuild 4418 SHA256 b3f2aa0367f5d90ee472b05ca055f30bcaeef1fe2faa8d9989db9aae673a1734 SHA512 bed3cd9a49032ca9c3a5532534126146e13210c0156ec7dca4d517a0c53ead397a84af674eb1c41204811ce1fe2ece7d5002fdaf64ccca38f16da434a050a15c WHIRLPOOL 4ddeb8734a2b4e49656e3ee92774718105686f63889e7b295472e5b95ce3ea15eb031bc5647e59ebf7b991a9db4fb95fe72a168e77633d62e9a0e9f6f6da734e
+EBUILD netbeans-php-9999_p20160627.ebuild 4418 SHA256 678ba4d3aa31423d93ebbacc46d1e27f6aa7a09b705114a93addcb338d003214 SHA512 d30bc908455185d3f647840b8fdb5051af8a4accaea320266a377d0ca8962f2ad8cc781aa212814bf30c4d0e3c3c303bf331ae23cac5636520bfc91eee898342 WHIRLPOOL 7ec6c21d66e0a37bd986b1bec3bc31154297b3575811f705a3207b671482af88b242654e873700057e9fc0c9e8116269e04eee89bec24aec41828864898c06ff
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160627.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160627.ebuild
new file mode 100644
index 0000000..1d72f4f
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20160627.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-06-27_00-02-33/zip/netbeans-trunk-nightly-201606270002-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 7dcd145..6a0b074 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -50,6 +50,7 @@ DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62
 DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae933c49b42cea56fe36ace1ac114430312e20a9484532e4ffeb3 SHA512 7efc824e3e47f07202d3f687726a5432fbc391c22bc762a0810a95c454c9f1f515bd0b026f22a9a00e39027023e31e9d0fcb3bc95688f8e54ec1465267246bd6 WHIRLPOOL d58c979aacb6021322b5595de5ac1a99f441413aae39bc5a02c09dc353125e778a9c62f45b8e3c88db125f27010d901d6a763f875e86e5f1aae6cc571579c2df
 DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 DIST netbeans-trunk-nightly-201606250002-src.zip 216438825 SHA256 f03d25d6d23b7548774067a664220990366da49ea1e15e1d33ec31d1ab934d06 SHA512 6cac9c55e060ddfe901a0fd361b629ff19666ffc3ebf7e5f1184135b8ca6e5b3056bcfa506e0bcc973405dd7dcae83b0bfd08f81c8c6ade1f2dbd13d60de38a7 WHIRLPOOL 7ee0b8add0f67ed4800d5c41b7967488119d7e865ce0d4bc8b15496a8bfcfebbfae08eb55d69d7de4d7bedb32fc7850c2cb76e46ae3ad5bf465a96f28b1392b2
+DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 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_p20160530.ebuild 9520 SHA256 76304dc6ed4405b46126d2b081d0a3dcc187825b92651b26ac6ccb0379e81876 SHA512 a9e4db74a54d19837dcdc52c1d04a2ed51d561ba8380da9a2c31e09ad489548f4d114e9958d552cbf9b8c276fa6bdda735f7bda237fde63e5229b7cb9a6e89ce WHIRLPOOL 9adc5f9dcb52ac33d08019b694d245bac8a397d8b16a9752b241435bda041b6b110d160817fcf846e056cb7037307450c0016e9d5b6b2a80aeb1d3d79f6b3e5c
@@ -73,4 +74,5 @@ EBUILD netbeans-platform-9999_p20160620.ebuild 9520 SHA256 b3b9097df1ef8e45811ab
 EBUILD netbeans-platform-9999_p20160623.ebuild 9520 SHA256 f3383e217dfd5b03fe753222dbf3b241ab0379f57a41bed382624dfa017afb49 SHA512 d8abbf6ffb0f5d0f13b2ff4da9e94b728215eb9eb2fcbab9a8c57c01171257d21e9ac34ab1ac3205ba292c7c2d1ce969a8b6b908245aab5eb92d52705841deb8 WHIRLPOOL eaf6391b1025c3e6b0081cc77fecbb4c5dbae5f72447ba2a33206ad453365c35d684ad1a22a7132e1b40da09fdf2360d1ba7399a51509cfcdcc0541c65bda283
 EBUILD netbeans-platform-9999_p20160624.ebuild 9520 SHA256 82402103054e31f617c8044942ca9adc43afa23056a9356f30b4eb3c529fe2e2 SHA512 8742742ad15a5eb3b56024b08b93244797643a2d22e854afdc65635d275733e5c01e210a71b29b34b69b48e24771ad34716aa75143af5c789449154ff3fe802a WHIRLPOOL 4ffb630d9dc8f073f9c0d942d47995ea08080ca278d16143c04759a97538fb91bd023e082e1b9288671a733ee3d13c84bf499b2854c656fd9e256afb0ada30e1
 EBUILD netbeans-platform-9999_p20160625.ebuild 9520 SHA256 901e19837a35a2471e8059fd4d313e2c7e72b68d891913fed84025184999e418 SHA512 10b57560c27a7792bdcece79a597c34d1afe0b2069f53fdf5e5c4e63a59cd165111bfbf4a34858c8fdb95190590ac797e77f24a84b9e3ef101d561ac2023ba4e WHIRLPOOL 7307bded9a50e4571558b74320e12117abc93cec7192334c5bacaeac2acb66f4520a6bc4a78a34669841fc0d91235f7632a50f7b6f0dd871ca0eccf0bb5921c4
+EBUILD netbeans-platform-9999_p20160627.ebuild 9520 SHA256 c292b6fe79fd036789bbb7525897b5eba90a2d7252f81cc7eb0e245c015a0bd8 SHA512 cf48c7b08e817c33914686acd3cbf431c22a390688d8686f5bd571e7cd9cb958ba106f0247e34afe244d66ec4202412e69f105ed752698315d4cac90972b8c9a WHIRLPOOL 7c53da4a387c7c89008bb86e67dfcf87a71512c74bfb654db89e35e2dea387af48c2e41bbc94248c629c3c8bc9374a0faa4203ce7336c49bc370a4612da7c715
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160627.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160627.ebuild
new file mode 100644
index 0000000..5b30458
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20160627.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-06-27_00-02-33/zip/netbeans-trunk-nightly-201606270002-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 a3bc886..8eef38f 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62
 DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae933c49b42cea56fe36ace1ac114430312e20a9484532e4ffeb3 SHA512 7efc824e3e47f07202d3f687726a5432fbc391c22bc762a0810a95c454c9f1f515bd0b026f22a9a00e39027023e31e9d0fcb3bc95688f8e54ec1465267246bd6 WHIRLPOOL d58c979aacb6021322b5595de5ac1a99f441413aae39bc5a02c09dc353125e778a9c62f45b8e3c88db125f27010d901d6a763f875e86e5f1aae6cc571579c2df
 DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 DIST netbeans-trunk-nightly-201606250002-src.zip 216438825 SHA256 f03d25d6d23b7548774067a664220990366da49ea1e15e1d33ec31d1ab934d06 SHA512 6cac9c55e060ddfe901a0fd361b629ff19666ffc3ebf7e5f1184135b8ca6e5b3056bcfa506e0bcc973405dd7dcae83b0bfd08f81c8c6ade1f2dbd13d60de38a7 WHIRLPOOL 7ee0b8add0f67ed4800d5c41b7967488119d7e865ce0d4bc8b15496a8bfcfebbfae08eb55d69d7de4d7bedb32fc7850c2cb76e46ae3ad5bf465a96f28b1392b2
+DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 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_p20160530.ebuild 3472 SHA256 f4891cae7bc0778360ade4015dd259f7f3f1fbf034c907bcd238a59c4f5da8e2 SHA512 bfad3027bb756de537d9d50a4195ae021914323e75ae5ca8c41a5af3b42f2e04d7835ed15786030a3fa0e2169d9d4215485bd73917d7121aa8397c10218012c0 WHIRLPOOL d785e33a7b45710ecb9a0b5d50151ac37f60a2878461995b5e53e5557efce758deff13711d3f41e0fa73ffbbca266d311adfc184db10d016e900897c69fa2520
@@ -47,4 +48,5 @@ EBUILD netbeans-profiler-9999_p20160620.ebuild 3472 SHA256 2783d740b452ef41f7a25
 EBUILD netbeans-profiler-9999_p20160623.ebuild 3472 SHA256 c03ba3f77191b2c0278902a6c27d129647e4c83027b6e4646961500cc994d592 SHA512 9cee72e33ff2d17da6fd3fadc6fcdf20e53f9eabb35c9439e68b005dc0ba44d449535ff4d2b93cdaf473b380a40ec97aa3da597dab61a11e6e64dc73c8fca8c0 WHIRLPOOL 7c2205e79ceb1d07a5d156dcd1264045d9542bc44a10e94df0ec928ca82b19099ed027dda5a071af3a6882ca7f1ff78da43c35fe26e746f8eb332a46ea130bed
 EBUILD netbeans-profiler-9999_p20160624.ebuild 3472 SHA256 5f219257179d5ef29341672efb029a636fd40260c8547284d83b75a1a2ad2b6a SHA512 236783097672dd47c95fb97494d7700ef4de7a1179440ffc76584b7ef30b9ae87150fc1fed06ca9841515ca739c52f3e483601de1163c8ec76ec6d6065ac12b9 WHIRLPOOL b251bccb975f523bca6c255da0c2bf0b3e677cea1a2d5ef898ba2128623ad15f97f5be0e8e70074b8c38a4b942b0c84d982e6717d52397e3184908731b49f641
 EBUILD netbeans-profiler-9999_p20160625.ebuild 3472 SHA256 b020cb8acc07dc569b6add3c24713c6ccf26aaa7324b8b53a564442df0ed4ee1 SHA512 9fff80a132ad34d3912825ef96dfbb3ceac62d0f1f3a4edbcd649e545b606281dc7925ad930d398433fffb94cd55a48dd83d211983057e38b8c325e09650ba15 WHIRLPOOL d5e4d6da03555141284a2eadea731a291904fe7bbde66526859b3091a046fa4e42126cb61513c1c6416fb5b00c198b2fc2af4a41144fbbf351cbea17d2bd9ce3
+EBUILD netbeans-profiler-9999_p20160627.ebuild 3472 SHA256 795845575a1ca8fc3ecc03ff839995fdfb50261a24b37d0fa9dfb6215d223983 SHA512 9d3983705b31dac9f54bf7030b2e3a1de1a62a4697f7c41549418a3478ad1db46bb600e121035e5e2e65e1eec43175e998d9b9c6896ab45cb299da88af37bca4 WHIRLPOOL 92fecd4ec1162852dbce53ba021d652ade8dcbe3e6d2f23bdfae63884801f555f468a32e38580f1d55ec43f584bfdce6cbf721bb1173b95dbaa0383129d142c7
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160627.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160627.ebuild
new file mode 100644
index 0000000..ea2ebcc
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160627.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-06-27_00-02-33/zip/netbeans-trunk-nightly-201606270002-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 8108058..3dd107f 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -45,6 +45,7 @@ DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62
 DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae933c49b42cea56fe36ace1ac114430312e20a9484532e4ffeb3 SHA512 7efc824e3e47f07202d3f687726a5432fbc391c22bc762a0810a95c454c9f1f515bd0b026f22a9a00e39027023e31e9d0fcb3bc95688f8e54ec1465267246bd6 WHIRLPOOL d58c979aacb6021322b5595de5ac1a99f441413aae39bc5a02c09dc353125e778a9c62f45b8e3c88db125f27010d901d6a763f875e86e5f1aae6cc571579c2df
 DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 DIST netbeans-trunk-nightly-201606250002-src.zip 216438825 SHA256 f03d25d6d23b7548774067a664220990366da49ea1e15e1d33ec31d1ab934d06 SHA512 6cac9c55e060ddfe901a0fd361b629ff19666ffc3ebf7e5f1184135b8ca6e5b3056bcfa506e0bcc973405dd7dcae83b0bfd08f81c8c6ade1f2dbd13d60de38a7 WHIRLPOOL 7ee0b8add0f67ed4800d5c41b7967488119d7e865ce0d4bc8b15496a8bfcfebbfae08eb55d69d7de4d7bedb32fc7850c2cb76e46ae3ad5bf465a96f28b1392b2
+DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 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_p20160530.ebuild 5343 SHA256 0cfced87a671a4fe5762de3a4b4dcd0f24e45cfe0181c167207db1ea1b6c52c6 SHA512 76399150baf348ae63358e9e265009bdd8286179168ff874fbe1ee04c5d8ba2f1163ae4604a9ed648fda3cffa02a764d71e7e8b863a308b3caea410da8dddee5 WHIRLPOOL 05539e87b9eeafcfa3e33986d5a104e3c4c644da540aad987766ba4b5556e1a0594e3fa81e057b36a595581fb41383fcb775c33326c3dc5b4442d0086966b443
@@ -68,4 +69,5 @@ EBUILD netbeans-webcommon-9999_p20160620.ebuild 6242 SHA256 50f813cd9c83364d9fd5
 EBUILD netbeans-webcommon-9999_p20160623.ebuild 6242 SHA256 679cf2d55516f7f13995e2aa9de1bc4d4d41903ed8f0cf58932f976f2046822a SHA512 23399f315261f8c70e37b911ae6fcfddd7050fa333e640b53bfbf841f946561a40e3dc3620ef7817602bb2bbd5080fb1ee2a72f66332c4a4f80ff240c1925f2f WHIRLPOOL 80520016205a64ca4d413892a6c0f4edc7e5576c5689d298b3c07df7b7efb257ee9d46f658c6741d0a357cc126bc54e6f6e3a4ffbf7ed3f62a674b811ce410b2
 EBUILD netbeans-webcommon-9999_p20160624.ebuild 6242 SHA256 b33d4de9344999e8f6143f29427dd689d1d6d84a205a6c07db93df897841cbe6 SHA512 b11642c296d63a1ee088f6c0bf49dba1bdea835d6956f08ee010f89578a49ccd16d80803ee087e4bff500805d0d061ea032d090be143859beeeaefd3ce3ba806 WHIRLPOOL bd9a4be8ae27eb0eb1b654752eebb2bdc23669db6a42c3b88b6e8f4963b5cc22ad1d0c554cd7d18e7c1eb23641a62081e98e6cb3d6018bfcd6f6a2a4f7b613e8
 EBUILD netbeans-webcommon-9999_p20160625.ebuild 6242 SHA256 a03dfcfbcacd7d1edb11799785eb8812b2bd034d2e57f7aabc4626225ceae962 SHA512 67ebed8440ba6c5979d6e70334ce749799eae2603c7fc67f8959e9514ceb3f053233c447f0a3ee0d90506697653a3de0e8ba12d99e0b8fd26a15f5809eddedbd WHIRLPOOL 8574d3c380261617fe10fae0f40a9a3c1a679a965565768df8226219f92ffe8bfbcf95540bc891fcd742958f03d769e0eff715f37575ac849820eebf3dc070fe
+EBUILD netbeans-webcommon-9999_p20160627.ebuild 6242 SHA256 a3851e9c84a81b1148eddb0ca6ae6a69a02a1fcf7024a344f78b93be4e053bb5 SHA512 85ffe56646202790b6af847d1d0b404aeb8085e0caa6ab18d5c4dc7e8023d53308a755cb288715f1ed38ed70abe72ca626a76d189ac751735cca7e4d36f6d1ef WHIRLPOOL fc8e3be758ce15726f50063c9f6ba6f147db3b3a66422df8623ac909ead127106f433267e1facc03a30882580cb8dd29c9fe6b6e6174b9f5c352e299aae9bcd3
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160627.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160627.ebuild
new file mode 100644
index 0000000..e04d304
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160627.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-06-27_00-02-33/zip/netbeans-trunk-nightly-201606270002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/C926927CC9D32F80BF93D2F9623E5C1C8425A75E-com.oracle.js.parser.jar
+	http://hg.netbeans.org/binaries/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar
+	http://hg.netbeans.org/binaries/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim
+	http://hg.netbeans.org/binaries/913947D60B9AE208A20A4CEAD4D033F141ABF9F4-js-corestubs.zip
+	http://hg.netbeans.org/binaries/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip
+	http://hg.netbeans.org/binaries/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip
+	http://hg.netbeans.org/binaries/0929AC5F40B5A8667021408748D64F30F77B3165-libiDeviceNativeBinding.dylib
+	http://hg.netbeans.org/binaries/2A38DA3DB5D36DBBDC0B03990B46810F72430D5E-libimobiledevice.4.dylib
+	http://hg.netbeans.org/binaries/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib
+	http://hg.netbeans.org/binaries/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar
+	http://hg.netbeans.org/binaries/C1BB9FF4232248B0054E5A26A33474A251EA19CB-libusbmuxd.2.dylib
+	http://hg.netbeans.org/binaries/D4BD3F62EADB61216A47EF96B3152EDD35A56005-ojetdocs-1_0_0.zip
+	http://hg.netbeans.org/binaries/1EFED55F8C442E4DB1C2338A5C35D494364F9ECD-ojetdocs-1_1_2.zip
+	http://hg.netbeans.org/binaries/CA8F6968FED0BE20E786C70CF9B603F4D7B66C68-ojetdocs-2_0_0.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	dev-java/jna:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.webcommon -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r16-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/C926927CC9D32F80BF93D2F9623E5C1C8425A75E-com.oracle.js.parser.jar libs.nashorn/external/com.oracle.js.parser.jar || die
+	ln -s "${DISTDIR}"/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar libs.plist/external/dd-plist.jar || die
+	ln -s "${DISTDIR}"/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim cordova.platforms.ios/external/ios-sim || die
+	ln -s "${DISTDIR}"/913947D60B9AE208A20A4CEAD4D033F141ABF9F4-js-corestubs.zip javascript2.editor/external/js-corestubs.zip || die
+	ln -s "${DISTDIR}"/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip javascript2.editor/external/js-domstubs.zip || die
+	ln -s "${DISTDIR}"/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip javascript2.editor/external/js-reststubs.zip || die
+	ln -s "${DISTDIR}"/0929AC5F40B5A8667021408748D64F30F77B3165-libiDeviceNativeBinding.dylib cordova.platforms.ios/external/libiDeviceNativeBinding.dylib || die
+	ln -s "${DISTDIR}"/2A38DA3DB5D36DBBDC0B03990B46810F72430D5E-libimobiledevice.4.dylib cordova.platforms.ios/external/libimobiledevice.4.dylib || die
+	ln -s "${DISTDIR}"/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib cordova.platforms.ios/external/libplist.1.dylib || die
+	ln -s "${DISTDIR}"/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar libs.jstestdriver/external/libs.jstestdriver-ext.jar || die
+	ln -s "${DISTDIR}"/C1BB9FF4232248B0054E5A26A33474A251EA19CB-libusbmuxd.2.dylib cordova.platforms.ios/external/libusbmuxd.2.dylib || die
+	ln -s "${DISTDIR}"/D4BD3F62EADB61216A47EF96B3152EDD35A56005-ojetdocs-1_0_0.zip html.ojet/external/ojetdocs-1_0_0.zip || die
+	ln -s "${DISTDIR}"/1EFED55F8C442E4DB1C2338A5C35D494364F9ECD-ojetdocs-1_1_2.zip html.ojet/external/ojetdocs-1_1_2.zip || die
+	ln -s "${DISTDIR}"/CA8F6968FED0BE20E786C70CF9B603F4D7B66C68-ojetdocs-2_0_0.zip html.ojet/external/ojetdocs-2_0_0.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.jna/external jna jna.jar jna-4.2.2.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/webcommon >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+	grep -E "/webcommon$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/webcommon
+}

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 830536b..b29bc92 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62
 DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae933c49b42cea56fe36ace1ac114430312e20a9484532e4ffeb3 SHA512 7efc824e3e47f07202d3f687726a5432fbc391c22bc762a0810a95c454c9f1f515bd0b026f22a9a00e39027023e31e9d0fcb3bc95688f8e54ec1465267246bd6 WHIRLPOOL d58c979aacb6021322b5595de5ac1a99f441413aae39bc5a02c09dc353125e778a9c62f45b8e3c88db125f27010d901d6a763f875e86e5f1aae6cc571579c2df
 DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 DIST netbeans-trunk-nightly-201606250002-src.zip 216438825 SHA256 f03d25d6d23b7548774067a664220990366da49ea1e15e1d33ec31d1ab934d06 SHA512 6cac9c55e060ddfe901a0fd361b629ff19666ffc3ebf7e5f1184135b8ca6e5b3056bcfa506e0bcc973405dd7dcae83b0bfd08f81c8c6ade1f2dbd13d60de38a7 WHIRLPOOL 7ee0b8add0f67ed4800d5c41b7967488119d7e865ce0d4bc8b15496a8bfcfebbfae08eb55d69d7de4d7bedb32fc7850c2cb76e46ae3ad5bf465a96f28b1392b2
+DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 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_p20160530.ebuild 2721 SHA256 1247a0423aecd4a5fa8e9d360367e09cd747bcc03375430a9cd9e13c1f0d33d9 SHA512 387048f5f2c6e095852b2470e793659a7bd17b2ce8441b17fa247fe4e770ffaa279313df8e8233444f9f02f6791e389a973fc22ede481a33edd4d4eca212a285 WHIRLPOOL 58056552b07e285af6d95e667b85cfff55ae61119358f565dfe96c3858d03109aca3ab2f55dbd7b622d661298cda8608c763bf5030948c70bafbb0e8fc6711b3
@@ -47,4 +48,5 @@ EBUILD netbeans-websvccommon-9999_p20160620.ebuild 2721 SHA256 0fba571efa2cbc177
 EBUILD netbeans-websvccommon-9999_p20160623.ebuild 2721 SHA256 d3ec1b666ede975d0d24027b33ef4bf8ed1dd7fa829f49f2f535db0e0c71a491 SHA512 b35ec5596fb73c55d037cd89877e908d9d71bb7ffdc602134f0fa096164cb173005048ed4b89230a878bad6b7588bf6753a9ac87ce4ffa709cdc9346cfe7f9e0 WHIRLPOOL f4c368f396c6c97a0e438855744dfa4e8f7ee7b80d6549490fc86b3d226d27921cd623d26ef58832c1026cb84b6209d9367fc7ad8d2261714357657000f68e9d
 EBUILD netbeans-websvccommon-9999_p20160624.ebuild 2721 SHA256 bbfe41fcc347cd0cdcd7e461e2d9d4712009af6582017a6424f0c5d233048a08 SHA512 aad2c8f4566549a62e4352b9da79ea3b2642fe675f5f49f293ed803d63c2d0239fa55a74be72b806ddc01e229e0f1cc55b56ddb7692bbc91298e08260e6e3928 WHIRLPOOL f9c39dca5560d8ec8080bcaea6197ec0583ad91e693c1ee7f6bd1b6ead2df6ae07abf93d0f0168f2aaad59b5e0f245ece3329b0862a8406dd8cbaf76419d860a
 EBUILD netbeans-websvccommon-9999_p20160625.ebuild 2721 SHA256 784c0aa20e19485d05b23cdcf7c71eb8e2d872b974ac89327ed92f034c30dc04 SHA512 1102648576d12de790d2417ae353cc8851e8c3ff59bf5120a5dc4dd91321be51aa89ce20be42a85e8c42ff2d7ce306c478f1b443036673ca12766331080bdd7d WHIRLPOOL 2b558e07bf5161267af40e92a1c676f262bdf56450586ff5417b7ae2e5c5b11e915d73ffda772ee63c9055b7eb26aa73030660c1cb9a60eb1b4b7b1b67e0cdb0
+EBUILD netbeans-websvccommon-9999_p20160627.ebuild 2721 SHA256 10bf8804a84f868341f2c6c26d03be4c69d18b35cf990bbb0d9201362f005b7c SHA512 885089bc475df0851a6a64b49029c9551143887925f445e8516b6e702be407df35e031d11ff0ae5e7e8039ab0c7859a8e41f3e8dd1dd704c08f21f8d0070e1a0 WHIRLPOOL e1f49293f6da7f2ce870ec71722d0954005627e096da547f082b0b0e047fb9675d8eadc2709025d28b4ef55a81b7ca0194a99510b08a4e8afcdb8354cc18ed3b
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160627.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160627.ebuild
new file mode 100644
index 0000000..05e1428
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160627.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-06-27_00-02-33/zip/netbeans-trunk-nightly-201606270002-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 87fa4a0..e193e1a 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201606200002-src.zip 216355098 SHA256 058ea5dd85ab62
 DIST netbeans-trunk-nightly-201606230002-src.zip 216433511 SHA256 9abe8fda5b2ae933c49b42cea56fe36ace1ac114430312e20a9484532e4ffeb3 SHA512 7efc824e3e47f07202d3f687726a5432fbc391c22bc762a0810a95c454c9f1f515bd0b026f22a9a00e39027023e31e9d0fcb3bc95688f8e54ec1465267246bd6 WHIRLPOOL d58c979aacb6021322b5595de5ac1a99f441413aae39bc5a02c09dc353125e778a9c62f45b8e3c88db125f27010d901d6a763f875e86e5f1aae6cc571579c2df
 DIST netbeans-trunk-nightly-201606240002-src.zip 216437934 SHA256 3fcadfb98b09fe52bc29c7635dc1dd4a720d5342440080f116d736df643b3c2c SHA512 b0e086962280c3171aaf53d57474fb43f8ae17a4d46b754fdd57b57f053882c54b98c78c87118c721d80ca4deceae7d377ef6c2ea5402a534387d6e33cac5837 WHIRLPOOL 8612a4a7032ab673407393ed4fe7b34e4c5fabab9f6c0a0b0742232b9fe8e59b634910286ed629bce69292631b879fbd8861092caa27258567c6b5015b1e6dfa
 DIST netbeans-trunk-nightly-201606250002-src.zip 216438825 SHA256 f03d25d6d23b7548774067a664220990366da49ea1e15e1d33ec31d1ab934d06 SHA512 6cac9c55e060ddfe901a0fd361b629ff19666ffc3ebf7e5f1184135b8ca6e5b3056bcfa506e0bcc973405dd7dcae83b0bfd08f81c8c6ade1f2dbd13d60de38a7 WHIRLPOOL 7ee0b8add0f67ed4800d5c41b7967488119d7e865ce0d4bc8b15496a8bfcfebbfae08eb55d69d7de4d7bedb32fc7850c2cb76e46ae3ad5bf465a96f28b1392b2
+DIST netbeans-trunk-nightly-201606270002-src.zip 216438847 SHA256 d9d5882d550e74ab39ed9ead3037b0d795b4a1cca701ab331bf819e9c43c787f SHA512 7a4ac22cef0b9d150ab1be1c20bda22b6b0badff949111e5a79fec017d0bcc09d949fbe9514ea042b7e99277637ae201dff8b0aed2da225d727bc930d0b4c564 WHIRLPOOL ed3d559f9657327cef5b01d6c3c4c9d6ea884ce641d5f6c9b9294e198f555c7f41a38e847176d19cbd6301770f7adc6113d9c1b9b514c63fc8c0417fc53f6a7b
 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_p20160530.ebuild 6939 SHA256 5dd3440de60fcd4bee802a332f06a0110e66e8530cf89a59c7342171e47df863 SHA512 fca992d656ec13a8278fd760660a278ae76e499c5355ecf9d2bfd0914d5ba02a585766d524c4e069dbb2280cdc587ea158caf927bb1ee206bd2039c7064d1d2c WHIRLPOOL 808326ef2e03695c52064a263afb50f79a3aa34b197405d10d4e0a567602903eefd6961a7221740f84fe78d923f1858360be49751c42c18d8e87a4b8e7e868d9
@@ -50,4 +51,5 @@ EBUILD netbeans-9999_p20160620.ebuild 6939 SHA256 8d7f89bd84e5979e27ac02ec9d644b
 EBUILD netbeans-9999_p20160623.ebuild 6939 SHA256 78857857866bdffcd2b189abd7065e678df23e0f15144e257b3f61d0e82e19c5 SHA512 e0feedb2fd5a3ba682c271c3326f600d319150308128cbaff160d2caa0e55d37125c2c5b7b7f5449b40cce9720a48d75eeafa4374290912ae1fb198401e9bb4c WHIRLPOOL 2b3a1ae8fb565122065043e28d5573872137886a10c6e12d2f57fab9a0a9e3f760a2778dad62647aba4cd79dd12bc336ad41d148d730f47e664cebde1fc5f6d0
 EBUILD netbeans-9999_p20160624.ebuild 6939 SHA256 e0af54b241a84ce091841bf5f5554b8d1e13ff91f77dd04fc26a7038cd4901ed SHA512 c20988d0f5633c4bb3c6f969fee8397743f997a1db197c646212c40ad0454adee3d2186c1b09080ca42fb43add0538b92a6e296392bf8250be2a5a18fd96579a WHIRLPOOL 8ac633aa467f081bfe5222db40851fadb5cacb88db6125e53f81dc984a00ea94febee236f961b425611b1877f22aec1c2798ff3ca739524e77728afdbcd880db
 EBUILD netbeans-9999_p20160625.ebuild 6939 SHA256 44da859ec3ffa59e85b7a155556c046218e00d236af6ba450a2f68728193b57f SHA512 0f1394d88b2369683f9d15805642a82bbfad6aeffd4a6538e64f3824b20cd9c6254b76d7a3a3359626a7e2de430ede220f89d38079a190564e79355193ddb464 WHIRLPOOL 50aa0f440ca53e7bb8600c5e438815a3dbe51c1447deb2b345aaa2f01f07ffab09ec7c1ecc7c2ac0c02eeb8f4ef0fcdaae6cc39a503798d08104ed4b6c93b226
+EBUILD netbeans-9999_p20160627.ebuild 6939 SHA256 1e4e47f4099b520155e9d6e52034ebf6a5a3575a9f368b2ed0afaabdb02b7d58 SHA512 b95cbce3ddf4d19e50e2a04b5e3eb1c3734c82eb139371cdbc78fcc6703dd0c3c7f4e9ecebc7367652f92afd0de045292d450919f7001817f75059564b22fddf WHIRLPOOL 9f1112d03d996f5035b4eb06f22a096d6213692d31e99c47cea032030baa97982cd61920cd233ef22b8e582e8fe9ff9454bc823c4fce00aae28eec964f899114
 MISC metadata.xml 329 SHA256 8aeaf2a0228f15c2e4140f401b30f083509bd99d0a578873069f3595cd8555f3 SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640 WHIRLPOOL 799a9b79b1b447bda9631f67e2dfaf722376740e1d2037796528a05f9745eeed00d9990a74a65ce09f74bc5e1d60a887abde540c3c62487d7dd49b8377c15834

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


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

end of thread, other threads:[~2016-06-27  8:40 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-07 10:50 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-ide/, dev-java/netbeans-nb/, dev-java/netbeans-webcommon/, Miroslav Šulc
  -- strict thread matches above, loose matches on Subject: below --
2016-06-27  8:40 Miroslav Šulc

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