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

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

From: "Miroslav Šulc" <fordfrog@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-mobility/, dev-java/netbeans-java/, ...
Date: Wed,  6 Apr 2016 08:28:23 +0000 (UTC)	[thread overview]
Message-ID: <1459931268.532339d8838062126229aa30095638f4a8e2f998.fordfrog@gentoo> (raw)

commit:     532339d8838062126229aa30095638f4a8e2f998
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  6 08:27:48 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Apr  6 08:27:48 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=532339d8

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.2.28

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index d9cdbd1..8238e3c 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58
 DIST netbeans-trunk-nightly-201604010001-src.zip 210167621 SHA256 986f8b460566192e6a291ab9e9e8e81a49a7776c603583aece0c9639a88b130e SHA512 aa93a3d68c764456d471510528ca47c6e5a3111474314a274d96abd4d07a9c295c6ddb8755dbc8f4e78e323b64b752dc14eaf2a385e0be07f33f16b112e2f275 WHIRLPOOL 3422335a2243ddc9883d2f91e4ad8ab971d822358a90699fee47f353342637012cef153909f4f0ec9465f22e2d4955a7fe05cc81c4d73ce5b8805b1cde3f9ef0
 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
 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_p20160303.ebuild 3384 SHA256 52a3f8365db13f9ed95496ace86dbb49e74814712ef7d5e4ffc7690ab6762107 SHA512 eb5106ffc0ae8382bdd72d9e591562d0d3bdf26bce3109868e393e6b4e8957826f76006cc25e238ba7a1cef1a8828662313341fea429f89d46e0fd0ce590c107 WHIRLPOOL 347510f9044ac71b3b45a1418069b9fa3602274c1bcec10854eca601b134c231220467df675f3f26c7542e42f6c4504dca045ec324a23f68536e5c33e196048d
@@ -43,4 +44,5 @@ EBUILD netbeans-apisupport-9999_p20160331.ebuild 3384 SHA256 e06346a1fb3dddd5424
 EBUILD netbeans-apisupport-9999_p20160401.ebuild 3384 SHA256 003973c2750597459fb300a27786a814c9c15f87cbaba6848bbc65c4019ae129 SHA512 3f159253de523f061621a96f0f32c656127e7eab2e15c10ea21c2f672463db080366e9081e2b63cddd2876a368c90d277ecf2533ddffe30870dc0d5e9524023c WHIRLPOOL b464c550f23e41773a62f7c84485b6c0be9b3dffca420c69e5c56eccb307af05d632de7918cc9bfe5239426391378e2c541564e429a597b0ac00dadcb9703ce8
 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
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160406.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160406.ebuild
new file mode 100644
index 0000000..7ed1d2c
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160406.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-06_00-01-48/zip/netbeans-trunk-nightly-201604060001-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 96dd765..a6d5336 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58
 DIST netbeans-trunk-nightly-201604010001-src.zip 210167621 SHA256 986f8b460566192e6a291ab9e9e8e81a49a7776c603583aece0c9639a88b130e SHA512 aa93a3d68c764456d471510528ca47c6e5a3111474314a274d96abd4d07a9c295c6ddb8755dbc8f4e78e323b64b752dc14eaf2a385e0be07f33f16b112e2f275 WHIRLPOOL 3422335a2243ddc9883d2f91e4ad8ab971d822358a90699fee47f353342637012cef153909f4f0ec9465f22e2d4955a7fe05cc81c4d73ce5b8805b1cde3f9ef0
 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
 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_p20160303.ebuild 4790 SHA256 0f7630db1a724b6a54e4a7bf145e48af91b270013e17f69e6b900f38a9848122 SHA512 1849e141a145d1e04401b32f63b19e2fb56abf8210b0c901a5df5a2825e5729c6ad3d489afbb875ff7bf2673aa7cbad43f79079414d493af76a62392f7fba044 WHIRLPOOL df0354f5f092672353df313c73e7494a9993d6f0f49d01929f2bb80eb61d7eb0af4a44cc226395d62dc6624c66652285f5b5ce58544e3aa923b6613a2a7086f4
@@ -56,4 +57,5 @@ EBUILD netbeans-cnd-9999_p20160331.ebuild 4790 SHA256 921daecbf10817366b63263124
 EBUILD netbeans-cnd-9999_p20160401.ebuild 4790 SHA256 889152394a5f211305222dcfd01543f19518383ba67819cb04b2ea30e56d6463 SHA512 2fcf49f27cc0f26c9308f3cf4e74d851716b07ed7a179aca147d9237014e7a33295cd8f875e4c3e3bf8e1cde56ae7f3222ec222860874319f8d3b40656f1b965 WHIRLPOOL b7bb68a43761e3bf59a3025e1d91f1abb5ff0e50c734082b5e61fecfb002984146445052516250087ec5b25c2e9d84d8c15ffa44d583accd615c54094a1c405b
 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
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160406.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160406.ebuild
new file mode 100644
index 0000000..bc62a55
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160406.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-06_00-01-48/zip/netbeans-trunk-nightly-201604060001-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 3d6f3c8..f502832 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58
 DIST netbeans-trunk-nightly-201604010001-src.zip 210167621 SHA256 986f8b460566192e6a291ab9e9e8e81a49a7776c603583aece0c9639a88b130e SHA512 aa93a3d68c764456d471510528ca47c6e5a3111474314a274d96abd4d07a9c295c6ddb8755dbc8f4e78e323b64b752dc14eaf2a385e0be07f33f16b112e2f275 WHIRLPOOL 3422335a2243ddc9883d2f91e4ad8ab971d822358a90699fee47f353342637012cef153909f4f0ec9465f22e2d4955a7fe05cc81c4d73ce5b8805b1cde3f9ef0
 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
 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_p20160303.ebuild 2968 SHA256 948d9d319f6a28861581bdf635229105a406610237e3cf9cbdad933f9eb2e6c0 SHA512 24c7bc3c4ab6922d2c787fb427c44593e83321e17618ba918fb08700dc830c3bce982e668e856aef7502a7b45c3732cc517215dfff28034d48135fec5a6264b5 WHIRLPOOL 48dcb46c3081b3dbe6a99656f6e49f7c72f10c806a2f742fb2818b87938910bccbddc854fc4a6a6d4be266da3e983d5cd57b3486d5dff9c4b825f0267d548570
@@ -46,4 +47,5 @@ EBUILD netbeans-dlight-9999_p20160331.ebuild 2968 SHA256 7a30d7daacf28a2d141b724
 EBUILD netbeans-dlight-9999_p20160401.ebuild 2968 SHA256 0bc13d62d2370c432c8951682b7e6efb2fd6e28fcacf2c49caff308ce454c56d SHA512 454edf5b2e86603b6b7671b31eb8c77274fe06a8d56f103ce4a61e217502a9a1e009f6a6fb3930047702b2647ef90260530fcaaf86dec26fa430710ea12f3f53 WHIRLPOOL d8d5ea10d62a9eb330021d0185c9913bd9baf6de65e239be2ad58959f7587bd083748f7703468f5d67cac842fdcbe5e08e9993f953728f063174dd4b4abdd31b
 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
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160406.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160406.ebuild
new file mode 100644
index 0000000..9fedaa4
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160406.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-06_00-01-48/zip/netbeans-trunk-nightly-201604060001-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 7b84293..4a9eb2f 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -55,6 +55,7 @@ DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58
 DIST netbeans-trunk-nightly-201604010001-src.zip 210167621 SHA256 986f8b460566192e6a291ab9e9e8e81a49a7776c603583aece0c9639a88b130e SHA512 aa93a3d68c764456d471510528ca47c6e5a3111474314a274d96abd4d07a9c295c6ddb8755dbc8f4e78e323b64b752dc14eaf2a385e0be07f33f16b112e2f275 WHIRLPOOL 3422335a2243ddc9883d2f91e4ad8ab971d822358a90699fee47f353342637012cef153909f4f0ec9465f22e2d4955a7fe05cc81c4d73ce5b8805b1cde3f9ef0
 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
 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_p20160303.ebuild 15825 SHA256 b01b08c90e434f2744b6701bd9efcad779cdfc284c27622a31e05a9d403ba22f SHA512 48d9c0d20231ad24e0a2e7c6a5d850c32e5c42d41b99054f336a3c52f82d8595d10325cf4363d1faa5f9ccf616ebc6076c9625eccf6adf1d9c788b6c80dbcb3f WHIRLPOOL 581194d3a9f50b64befde84ef107d015dfdf84a443ef7d733dea5edceacf3c5c633588eee269def5cfc70a695de1f011a5b1ead0f97be80a822a0d193d40b318
@@ -75,4 +76,5 @@ EBUILD netbeans-enterprise-9999_p20160331.ebuild 15825 SHA256 664afb5530ce19dbae
 EBUILD netbeans-enterprise-9999_p20160401.ebuild 15825 SHA256 fcdad2df11b6b3d32ae073cfbb2c64b01ec3a83367eb552c8bcdd228ca9209db SHA512 0d95d4f05a4236aadffab3626ef4aa0c6dd3b2583870e16f62ae151ccb8f9d685612c4a281f20426a6ec8eda3793e813e1fa474e501c8723c539deb51e29c092 WHIRLPOOL e6ce0092f179f80f4956665f4a0cd826f980d2346217684ccb39d87003440fe937a4f8d17f77322adf2a179dfc220ef35c4582196acf2c71b80c349b53c44ade
 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
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160406.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160406.ebuild
new file mode 100644
index 0000000..8c2906f
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160406.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-06_00-01-48/zip/netbeans-trunk-nightly-201604060001-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 f5e1d01..85428f5 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58
 DIST netbeans-trunk-nightly-201604010001-src.zip 210167621 SHA256 986f8b460566192e6a291ab9e9e8e81a49a7776c603583aece0c9639a88b130e SHA512 aa93a3d68c764456d471510528ca47c6e5a3111474314a274d96abd4d07a9c295c6ddb8755dbc8f4e78e323b64b752dc14eaf2a385e0be07f33f16b112e2f275 WHIRLPOOL 3422335a2243ddc9883d2f91e4ad8ab971d822358a90699fee47f353342637012cef153909f4f0ec9465f22e2d4955a7fe05cc81c4d73ce5b8805b1cde3f9ef0
 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
 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_p20160303.ebuild 2913 SHA256 1780ddbc014c939cf37cd0ee79006e06f03c97c50d31f17b2e6a5bdc8d072ca9 SHA512 a0ba6433dcccdc301921c09a99c944266ccacf7dabd885c76bba526ac307108c3839478bf0cd9a2b79adc03645b3756f7f7536506a8da19ee58a3c429dab1d35 WHIRLPOOL 73ac39e8bf8f92a16507d985d4d23de4d416a233dfe7cc2243f6dc15d82a141af33416878820d874836a2921c4fc41b4e8b99a2260fd729d7936ef5df0cd23be
@@ -43,4 +44,5 @@ EBUILD netbeans-ergonomics-9999_p20160331.ebuild 2913 SHA256 c479d5e94d109a7cced
 EBUILD netbeans-ergonomics-9999_p20160401.ebuild 2913 SHA256 77a71f27a523b6e8f6dac5427194ed97c2ce76a0abbfcf755b0e9a30b3cc8581 SHA512 2f94fcbe62d6ce112fead5cde63b2c1ef82ccfd88109293cec7ecb9601f0c06e2f8d24e6e6fd4c282a244d19f34362e8406b10d2fb5573a95211aba9b77f8515 WHIRLPOOL 461c850d0702acc4321f66e8ec9d7cb798eb1affad59e767ada54f0deb396c15ec8c54aae3ca0f46ef95507664bdab6f777bf00e68fec20a015fe0bdf6ecfa0f
 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
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160406.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160406.ebuild
new file mode 100644
index 0000000..769f732
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160406.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-06_00-01-48/zip/netbeans-trunk-nightly-201604060001-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 b39d2b1..088c4e8 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58
 DIST netbeans-trunk-nightly-201604010001-src.zip 210167621 SHA256 986f8b460566192e6a291ab9e9e8e81a49a7776c603583aece0c9639a88b130e SHA512 aa93a3d68c764456d471510528ca47c6e5a3111474314a274d96abd4d07a9c295c6ddb8755dbc8f4e78e323b64b752dc14eaf2a385e0be07f33f16b112e2f275 WHIRLPOOL 3422335a2243ddc9883d2f91e4ad8ab971d822358a90699fee47f353342637012cef153909f4f0ec9465f22e2d4955a7fe05cc81c4d73ce5b8805b1cde3f9ef0
 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
 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_p20160303.ebuild 3377 SHA256 63c3800a0a1900d64e6b83268bead9b49d11f8dabc51ac6dea0218a159bd0a71 SHA512 c920b66c234735d502ca4a3647736acf41813e676e8274bfc558bd3475002410b92c53d2e13e099d0c1211d0756c6371cac74793f75c1a74aa60f49cd1a8a5c6 WHIRLPOOL 4723de22dc7dd158ac034e28ad40ad43a80ebde54fe304b13819236d9f9a51484c2535165e570a480ae6759dbd43ac79fa554b22f835571c30caea07fcb9ddc3
@@ -45,4 +46,5 @@ EBUILD netbeans-extide-9999_p20160331.ebuild 3377 SHA256 bb28509aea9cce9ac991563
 EBUILD netbeans-extide-9999_p20160401.ebuild 3377 SHA256 307b27e83d281cd2be425f62f095451b1f206d622b61befdfa0a67c053a52f72 SHA512 63e9610fbc15ad07b91b1c77cc7a20546c59c1fb4abed75fc99581d9101c9f2663273f0307c2428190e66e52f24cd0981552b06a4f4cee6c63017505cf355040 WHIRLPOOL ba4466640c898f45d131692876bc8dce3364f5f392d2dfaae1bc79f988bac4ac690e8ffa5ede1014e5692c7cf555e24ce74703f6990e2441d89fa394b7e6d165
 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
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160406.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160406.ebuild
new file mode 100644
index 0000000..d772492
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20160406.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-06_00-01-48/zip/netbeans-trunk-nightly-201604060001-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 be91114..89c1739 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58
 DIST netbeans-trunk-nightly-201604010001-src.zip 210167621 SHA256 986f8b460566192e6a291ab9e9e8e81a49a7776c603583aece0c9639a88b130e SHA512 aa93a3d68c764456d471510528ca47c6e5a3111474314a274d96abd4d07a9c295c6ddb8755dbc8f4e78e323b64b752dc14eaf2a385e0be07f33f16b112e2f275 WHIRLPOOL 3422335a2243ddc9883d2f91e4ad8ab971d822358a90699fee47f353342637012cef153909f4f0ec9465f22e2d4955a7fe05cc81c4d73ce5b8805b1cde3f9ef0
 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
 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_p20160303.ebuild 3416 SHA256 dc43d706026c978dcf72e34bd0aedfd5237042f40981021b0ad042f95193aa18 SHA512 53b3cc3839a1563359eedf8d06ad87819aa6052b61c425b75cf40f7a10f5d2ecae774bd9efdafb1cad98a57d09bfb3688f16cfb93b007db758f9ce3b87479f88 WHIRLPOOL 27fcb7a0e5240a3aafefa05865195e3e11a556ae6f30a5dfd399cb458b21e41e6f8a6e69b4b1fcc6dbed0e2bb9cea82ed24be440710cd4f5ba11f91ca9f0850e
@@ -45,4 +46,5 @@ EBUILD netbeans-groovy-9999_p20160331.ebuild 3416 SHA256 98fd46f7cf8f374604d70a9
 EBUILD netbeans-groovy-9999_p20160401.ebuild 3416 SHA256 a8da5130ea3796de0692066af578fd0daeff2ca23170cf7c8f2768d521a6da9f SHA512 962d9934cbaa45eeaa44dac2e1c44bb3ade8e7dfe4e9ffa80f24abc7a26ffddd96844aa16f5202b7e4769f7caf69fd0a6a59f3b9147a74f04219d0e0ad9c701a WHIRLPOOL 11d7129f2ca2f5b0d5d1f00986db5f03ef3c5b99d000c45942ab3fef4a832420ca2afa81e8b9e4e7a2a3125c35a9fdc9543e8cea3d7db6e7819e207e4ba2a187
 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
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160406.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160406.ebuild
new file mode 100644
index 0000000..46255d7
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160406.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-06_00-01-48/zip/netbeans-trunk-nightly-201604060001-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 26ff795..e10f33c 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58
 DIST netbeans-trunk-nightly-201604010001-src.zip 210167621 SHA256 986f8b460566192e6a291ab9e9e8e81a49a7776c603583aece0c9639a88b130e SHA512 aa93a3d68c764456d471510528ca47c6e5a3111474314a274d96abd4d07a9c295c6ddb8755dbc8f4e78e323b64b752dc14eaf2a385e0be07f33f16b112e2f275 WHIRLPOOL 3422335a2243ddc9883d2f91e4ad8ab971d822358a90699fee47f353342637012cef153909f4f0ec9465f22e2d4955a7fe05cc81c4d73ce5b8805b1cde3f9ef0
 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
 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_p20160303.ebuild 4126 SHA256 754cad0825f87fd715b855a23ff7e50272976c463aa5920a6a1be55d063bd884 SHA512 77bf28c87b1d7ba8c03b2f90e033be8da676e81d297b66856debf929be7b2549f8be5a07da46783f537e16476eb55145626e8c4be34c5d4623722561f3b7e8f6 WHIRLPOOL 18c84fc8b7872638765b3fdfdedbf7be9e4f414a034d20421d87bdd9978458e247d95ae0d19bf681bcfd666ba49aeb5d7a1c99e2f81717c292d8813842280042
@@ -48,4 +49,5 @@ EBUILD netbeans-harness-9999_p20160331.ebuild 4126 SHA256 033231abaedbfc186f2256
 EBUILD netbeans-harness-9999_p20160401.ebuild 4126 SHA256 f36ff6131bf9091d639820517dceb095369c5820cac10a01f7b424c63d9e5faa SHA512 57e909cefb0a6575e04fe28ff3075fd67ba3b6b53a19479dd27f761f3871e9742f802fa00365115eefd3dab84dd81583eeb61c83a2bf277e9222b4cfc907956a WHIRLPOOL 137a1303c90e5fe0e92d86fead4aaa75a0c05cbfa04d21e7c8f52f149ece55e064f96d203cfe7571fb83c0397dd31b7f255a567e666c48a68f8c127d768d6496
 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
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160406.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160406.ebuild
new file mode 100644
index 0000000..4e30c5e
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20160406.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-06_00-01-48/zip/netbeans-trunk-nightly-201604060001-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 c5eaf5b..9720157 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -162,6 +162,7 @@ DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58
 DIST netbeans-trunk-nightly-201604010001-src.zip 210167621 SHA256 986f8b460566192e6a291ab9e9e8e81a49a7776c603583aece0c9639a88b130e SHA512 aa93a3d68c764456d471510528ca47c6e5a3111474314a274d96abd4d07a9c295c6ddb8755dbc8f4e78e323b64b752dc14eaf2a385e0be07f33f16b112e2f275 WHIRLPOOL 3422335a2243ddc9883d2f91e4ad8ab971d822358a90699fee47f353342637012cef153909f4f0ec9465f22e2d4955a7fe05cc81c4d73ce5b8805b1cde3f9ef0
 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
 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_p20160303.ebuild 30250 SHA256 8e95840ddfb681c49a7f20d001e8ec6feac5f53726cc7dd941729e44da0c08f7 SHA512 41f3f88884e8eb1c39ff2bac412e9448001a0e1bbd85553698e34bece49f675d29fc9319ee35537600c88dc43842212c679137958e6d44f60eed74eef0dfdaed WHIRLPOOL 7958e441bfb1b26a211ce6818829bc396ae13fd131ac22a32c23d32246dc256c786f2621efcc1ce608f257131f9a22a3d42061d63ffb262cd596fb08af1f7a42
@@ -182,4 +183,5 @@ EBUILD netbeans-ide-9999_p20160331.ebuild 30349 SHA256 9f7fe0cb8fd58d7b36ad257e7
 EBUILD netbeans-ide-9999_p20160401.ebuild 30737 SHA256 cab862c91572446e13cde880db74963f956682dde55822939138fb9e0dd98e06 SHA512 f0bdbf23ca343f85b40c0868c824fa777922cb2a760d9c9194160f42c93f892bab77a74925c4b2518575a42d0de1d9a2b714af85b9369623e9e96d8620a42ab4 WHIRLPOOL 3f7be89f8d93f00649b4dacea1c3e1e5fb5b9b039afc40fbf00d6006b0bd54a4af57b4ce4958af46aef549ea1552f662fd000f9a1ff8bfb5edcd3c70efe5faff
 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
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160406.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160406.ebuild
new file mode 100644
index 0000000..f385069
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20160406.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-06_00-01-48/zip/netbeans-trunk-nightly-201604060001-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 ba517f5..2cc81e5 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -56,6 +56,7 @@ DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58
 DIST netbeans-trunk-nightly-201604010001-src.zip 210167621 SHA256 986f8b460566192e6a291ab9e9e8e81a49a7776c603583aece0c9639a88b130e SHA512 aa93a3d68c764456d471510528ca47c6e5a3111474314a274d96abd4d07a9c295c6ddb8755dbc8f4e78e323b64b752dc14eaf2a385e0be07f33f16b112e2f275 WHIRLPOOL 3422335a2243ddc9883d2f91e4ad8ab971d822358a90699fee47f353342637012cef153909f4f0ec9465f22e2d4955a7fe05cc81c4d73ce5b8805b1cde3f9ef0
 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
 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_p20160303.ebuild 14930 SHA256 48040d08990cf6747fcb40212f5a0e438e2fe071f07e68efb11e5595b83e6382 SHA512 090fffdb42ede2fea0dd1c4dc85e2e375f880c343bf86950204bb5033fd5f85540ed0ac06d8b01ec315bd65743949c653e603b0233559473d6520ec367159fe6 WHIRLPOOL 5747f47808172573e830761831c1e86693c55a23916773a9ca16e7c31ea34ce1914530c8e0f974872f350b1714c38bf805ef0732d09c31b2d4a5c48190913f31
@@ -76,4 +77,5 @@ EBUILD netbeans-java-9999_p20160331.ebuild 14930 SHA256 3c03cb6543559f3d8160ef4c
 EBUILD netbeans-java-9999_p20160401.ebuild 14930 SHA256 78fd1a39ec397d001e586993d8047d9938fe0bedc959e7913c83a225737d8319 SHA512 b87e6bafbda3f7cbc0cda2c58974f05bd775b7bc1d82b132f00247f51a80690ce7643799c2fe3024b23157fedbbe220199b0f55d8a8b8cdb11c9cb70f8e77436 WHIRLPOOL bcf64f8c4aded49f8a08bed7dbd6860ba6404d11c8347c91a94b245433c6c0908576f6453bd520b832bac6ca4c641f6569789f18ec3f2d8ad93130a86637edeb
 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
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160406.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160406.ebuild
new file mode 100644
index 0000000..ab6cc7f
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20160406.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-06_00-01-48/zip/netbeans-trunk-nightly-201604060001-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 cf408d2..ee25fe4 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58
 DIST netbeans-trunk-nightly-201604010001-src.zip 210167621 SHA256 986f8b460566192e6a291ab9e9e8e81a49a7776c603583aece0c9639a88b130e SHA512 aa93a3d68c764456d471510528ca47c6e5a3111474314a274d96abd4d07a9c295c6ddb8755dbc8f4e78e323b64b752dc14eaf2a385e0be07f33f16b112e2f275 WHIRLPOOL 3422335a2243ddc9883d2f91e4ad8ab971d822358a90699fee47f353342637012cef153909f4f0ec9465f22e2d4955a7fe05cc81c4d73ce5b8805b1cde3f9ef0
 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
 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_p20160303.ebuild 4971 SHA256 7a6b595b5f021e7dabc75296d116684d6655b4b5091f9b2781697eb292f6e32c SHA512 edcce20d305cde1ac15cd2d9ac8b8b7533d40f4b7c4bd7f2a9ece1c400651ff6421e56603c949d2de8b5f377fa778d07a021e339898706c9edad1b363a349d04 WHIRLPOOL 5d6b28448471e579cbc4094651c82a0fe7e351eedba489ac92eeb356b35e7c53d09f15a13b36071aa76bbd0e0c2095b4578d1de3a1d4e05613b4544b01e8110d
@@ -46,4 +47,5 @@ EBUILD netbeans-javacard-9999_p20160331.ebuild 4971 SHA256 0f6aef9d90ac8cdcb2827
 EBUILD netbeans-javacard-9999_p20160401.ebuild 4971 SHA256 d9424f22b00a06ae3f2c8b601cbbe918a7905e581d7faddaa059be33e0c760cc SHA512 ac77f8ee78927e32bef48d577cb7a71285efdfc7bdbee46af2968d34a544d2f38d673d4472704afeca5234c8d9ebedfdada7f28042fdfa15d7b10fd4dbbf816c WHIRLPOOL 4c410563227bf0e7eb302172699c0e16b1031ca627d8e5e6df49692043357373213aeea6e99f99edd38c280f98455f6d0d74504e960b8e5ffe7a754a011b16f8
 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
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160406.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160406.ebuild
new file mode 100644
index 0000000..f9800cd
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160406.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-06_00-01-48/zip/netbeans-trunk-nightly-201604060001-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 8f9739e..bacc414 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58
 DIST netbeans-trunk-nightly-201604010001-src.zip 210167621 SHA256 986f8b460566192e6a291ab9e9e8e81a49a7776c603583aece0c9639a88b130e SHA512 aa93a3d68c764456d471510528ca47c6e5a3111474314a274d96abd4d07a9c295c6ddb8755dbc8f4e78e323b64b752dc14eaf2a385e0be07f33f16b112e2f275 WHIRLPOOL 3422335a2243ddc9883d2f91e4ad8ab971d822358a90699fee47f353342637012cef153909f4f0ec9465f22e2d4955a7fe05cc81c4d73ce5b8805b1cde3f9ef0
 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
 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_p20160303.ebuild 6293 SHA256 a4fbb12f22ff73af67571aae249baac735e372f21df6905c8147b770300ea875 SHA512 e9bda131249482f49574ccf8240e3a4f04e7916c9f3f3794409b619451cbbbfb249a4d2a1412ec37ebcfe04df12c3f793bd7107d9487f0d9180d133c0ff78c3f WHIRLPOOL 55de83bd329038ea7fce8c9ee7af3e200df783051751b1250e869048b14c98d9dbcf9d35a2948fa476cf5019eb6d6503d3aa8e720380d1fed17a40023277753d
@@ -44,4 +45,5 @@ EBUILD netbeans-javadoc-9999_p20160331.ebuild 6293 SHA256 5dff3f1000550164027319
 EBUILD netbeans-javadoc-9999_p20160401.ebuild 6293 SHA256 a7720fd0f5b0a34bb841c590abd2797be3dbb347030ded4d162c5b5ffdc2e070 SHA512 660027c1335dc1d62953d4307497cd6ae8fc6feb7b5f7a1e0352c0caec03f3af1c3123876e22f3897ae5981383ca05d887985a2e5bc8e0b9c9660af9d54e978b WHIRLPOOL cf2b33e24cfca4f2ea4cb01aad71bd204c245e38f703fd62f5b564dd5480e8e086177944ba82bbecac788a81b1e27409f910b334f6c6523096a33099ba330c41
 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
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160406.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160406.ebuild
new file mode 100644
index 0000000..21469f9
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160406.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-06_00-01-48/zip/netbeans-trunk-nightly-201604060001-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 523403c..6e07e98 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58
 DIST netbeans-trunk-nightly-201604010001-src.zip 210167621 SHA256 986f8b460566192e6a291ab9e9e8e81a49a7776c603583aece0c9639a88b130e SHA512 aa93a3d68c764456d471510528ca47c6e5a3111474314a274d96abd4d07a9c295c6ddb8755dbc8f4e78e323b64b752dc14eaf2a385e0be07f33f16b112e2f275 WHIRLPOOL 3422335a2243ddc9883d2f91e4ad8ab971d822358a90699fee47f353342637012cef153909f4f0ec9465f22e2d4955a7fe05cc81c4d73ce5b8805b1cde3f9ef0
 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
 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_p20160303.ebuild 4717 SHA256 be7244682dc2c2aecab8ffb24aeb115f0950af7a67bf78f01faca3aac15af5ef SHA512 d8f24b4a4e03e97a49572d2681c11c52a48f4d7e483d5e066ac6fdf9f8305b742f61ebcb2be74639a95c97ba1e938706066082a3fbcecb2475ffb102fe280dbe WHIRLPOOL ddc19415d2beeb49202b0afef224ca5cc8d6bb55e147471185f856489832323d455afb5b5844078e72aadc7d97d8154578b8d13f1ff43e531ffc5ead97bec98e
@@ -51,4 +52,5 @@ EBUILD netbeans-javafx-9999_p20160331.ebuild 4717 SHA256 2dd090b16911c99b59dac99
 EBUILD netbeans-javafx-9999_p20160401.ebuild 4717 SHA256 ac66499d21ff428d577f84009c73c8d1c8ac2018bf5362179e47386c282815bc SHA512 d2a21bc5d2533eb21f4f9de0b36644f74faf0ca152710497cb4c78827249b810586e64df1a5031daffc87249e52f388e8c5c59757b620ae504c49b05ee9b3be4 WHIRLPOOL adf1bc07ebfe403c9c699cb8e0eb118d578ebcc250f2bd385ef52f952517a073902c1ae80c7768a9ce2f59e18e175a2151098844f814328c446812c3a5531897
 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
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160406.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160406.ebuild
new file mode 100644
index 0000000..261315b
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160406.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-06_00-01-48/zip/netbeans-trunk-nightly-201604060001-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 045a4aa..535f955 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58
 DIST netbeans-trunk-nightly-201604010001-src.zip 210167621 SHA256 986f8b460566192e6a291ab9e9e8e81a49a7776c603583aece0c9639a88b130e SHA512 aa93a3d68c764456d471510528ca47c6e5a3111474314a274d96abd4d07a9c295c6ddb8755dbc8f4e78e323b64b752dc14eaf2a385e0be07f33f16b112e2f275 WHIRLPOOL 3422335a2243ddc9883d2f91e4ad8ab971d822358a90699fee47f353342637012cef153909f4f0ec9465f22e2d4955a7fe05cc81c4d73ce5b8805b1cde3f9ef0
 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
 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_p20160303.ebuild 4412 SHA256 8f52fcc92dbaf37e3887f12ac4ad10e2c923e21be6ec8ec63853c15a2f04f066 SHA512 4420009dfd7a78bff0813e8196cfdd03e5f9d43321ee2f454bf59f9fabd0eabfad0294c0913db1dca63a9288857154e30b42775f66a98a1b2979841b2d2af0a8 WHIRLPOOL 771e180ecf0e5cdbbf16971cf5a3f850f8190343e62e46c2a96128a5846df93bd858bb380f2670f93b26a02476dba291ec960d228b93f71c4a07123531ad5898
@@ -43,4 +44,5 @@ EBUILD netbeans-mobility-9999_p20160331.ebuild 4412 SHA256 1f21b389bbba1d8148c10
 EBUILD netbeans-mobility-9999_p20160401.ebuild 4412 SHA256 c78055a6879233eda7ce738eef8723ac7ba1dc80860431444a26f73a838b0283 SHA512 9448d3c7201ae6701b9a3854c9a89985a24759ff500026bc2b5ceb4c5393833f6533152da089c085e848f40f3171374f81aa4516aa3fd2e87eb433bdb17a56b4 WHIRLPOOL a918ce37270d7d418b875005f0588f72f617147ccaf65afc000ac05244ed6d4eab9b940c2f5ffda42f50d9137c9a91de38287628dc1079fe21665230085390a5
 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
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160406.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160406.ebuild
new file mode 100644
index 0000000..b461f55
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160406.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-06_00-01-48/zip/netbeans-trunk-nightly-201604060001-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 80d8191..2681341 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58
 DIST netbeans-trunk-nightly-201604010001-src.zip 210167621 SHA256 986f8b460566192e6a291ab9e9e8e81a49a7776c603583aece0c9639a88b130e SHA512 aa93a3d68c764456d471510528ca47c6e5a3111474314a274d96abd4d07a9c295c6ddb8755dbc8f4e78e323b64b752dc14eaf2a385e0be07f33f16b112e2f275 WHIRLPOOL 3422335a2243ddc9883d2f91e4ad8ab971d822358a90699fee47f353342637012cef153909f4f0ec9465f22e2d4955a7fe05cc81c4d73ce5b8805b1cde3f9ef0
 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
 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_p20160303.ebuild 4111 SHA256 f42d9576c503c4ece2d21fd101662fb2c221e79eecec73ad653ea6f889ba9e7c SHA512 6101a74ac88ce11cf947a1febfe0c107954e768509ac1fbe24f2fc414e61e976b5972f2139a012fd38d3ac3b89e648acd2e88f70d19f77047464508900c7f234 WHIRLPOOL 40c3586394f5b860c8c41abc0fe7863479ded869bb47e626635655116b6c5fa0275da1e03196871b2c2b53f0eb45c4d40cb3b81d5ee8c819414cdf7f142b9885
@@ -46,4 +47,5 @@ EBUILD netbeans-nb-9999_p20160331.ebuild 4111 SHA256 499ea0dcc9529f0a80be56d8b83
 EBUILD netbeans-nb-9999_p20160401.ebuild 4111 SHA256 788510b2df2b5f438ad7016972e1668836975448909d0e8487dc2c26de7eea25 SHA512 47a9c6282f41065acf02e5e3d057cd0c3210c3c6eb44d5e9ed622a387f3fc873bcc11208ba121a3dd61c3a16f1613714ea2964d6d4658af9612ad9f1c29c4719 WHIRLPOOL 5fce0e18dc6ab7f41e19a73f0379f77740638e940e51a5932430dbcddb47567986bc90f0e2bc54ea8c219c534a9c3a3c1f4e07eae95246f752c83f30f41e7136
 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
 MISC metadata.xml 392 SHA256 01cdbcc83099b97486bd7b8e813e5b19c1138eb0d8d3e8a5683aafd579820435 SHA512 4d2f9160baa022d6a48b61d5f42e71cfd411d244e7a36436629bc5ee4036e4ce19079134d9a6c704ebe942306c2e0199d0591c1e54f92f8f3c8835147e639246 WHIRLPOOL c1131764e1cec66c56b977ebe36014b29e5a68e35ccc326c0cbadd050a6c625cf191c85c212e0a733661c008dab0d99f9a4cdc4c4ae0cc9d775ba1de554795a9

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160406.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160406.ebuild
new file mode 100644
index 0000000..c6ca9e9
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20160406.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-06_00-01-48/zip/netbeans-trunk-nightly-201604060001-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 8aeb9a4..de58c96 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58
 DIST netbeans-trunk-nightly-201604010001-src.zip 210167621 SHA256 986f8b460566192e6a291ab9e9e8e81a49a7776c603583aece0c9639a88b130e SHA512 aa93a3d68c764456d471510528ca47c6e5a3111474314a274d96abd4d07a9c295c6ddb8755dbc8f4e78e323b64b752dc14eaf2a385e0be07f33f16b112e2f275 WHIRLPOOL 3422335a2243ddc9883d2f91e4ad8ab971d822358a90699fee47f353342637012cef153909f4f0ec9465f22e2d4955a7fe05cc81c4d73ce5b8805b1cde3f9ef0
 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
 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_p20160303.ebuild 4418 SHA256 516a8d94b363471554af18a5807fadd69815b02f1822a030b3d7f1fd87a93275 SHA512 b2e92dd1b51d5e7be45402fd32c01f6e92fc366c3ac4f1200d493b14eebd561873960b2311c24b1c2452fe0e039dfdc39b7de9de5446d30beb0e9129733c5119 WHIRLPOOL 54f22c62f22fdc86d611b0b50c4cf7d734ec6231ac1d029a33bccbf8095bc2249a876713721fe60a8fcbe71a6a9dad34a34afb58daf09c9802d4aca1c31a3544
@@ -47,4 +48,5 @@ EBUILD netbeans-php-9999_p20160331.ebuild 4418 SHA256 225f8be498d1200e86f68bf864
 EBUILD netbeans-php-9999_p20160401.ebuild 4418 SHA256 f6d677bb981da3098fb94013983f2a1b4d0065463f9a7312cfafc16a021dc12c SHA512 3575117307b2ed2267a884e22f04a5e0857d5744d80b5130e5176ff7da1c6e655099ff0529fb925638d4ddd19220b72b4429a97c7a4da7c0e1cb936d2f87b5a7 WHIRLPOOL d5c8da6875fdaf51b06eee27e2d84f85d85eb6b096129e2b1242ac6b1a48e092b2de5291083e1a15a360d2ee67c68fa71a30b84d555cebe030d8c1ffb00e040d
 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
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160406.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160406.ebuild
new file mode 100644
index 0000000..361c629
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20160406.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-06_00-01-48/zip/netbeans-trunk-nightly-201604060001-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 5331a2d..fed155d 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -50,6 +50,7 @@ DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58
 DIST netbeans-trunk-nightly-201604010001-src.zip 210167621 SHA256 986f8b460566192e6a291ab9e9e8e81a49a7776c603583aece0c9639a88b130e SHA512 aa93a3d68c764456d471510528ca47c6e5a3111474314a274d96abd4d07a9c295c6ddb8755dbc8f4e78e323b64b752dc14eaf2a385e0be07f33f16b112e2f275 WHIRLPOOL 3422335a2243ddc9883d2f91e4ad8ab971d822358a90699fee47f353342637012cef153909f4f0ec9465f22e2d4955a7fe05cc81c4d73ce5b8805b1cde3f9ef0
 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
 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_p20160303.ebuild 9360 SHA256 aac5b549e4e9e0951f784012acad2c25dd9a3eb753536bf9ba33b78a995139df SHA512 c308198a0dd0ea33afb06f097e99f9a624c1096ff7f708af97a21e98df3aef6cadb7a6ed5f474c1cb5365b569d080f17c6728baedcd5670f60d75d35adc75a0c WHIRLPOOL 1a04bd89ed592e6633b32707d6a0072163006a1c40658aeedd268a43afe5b495567db15ebf404deceed79f8e87f10b4aec2eb028551659b06d7852137618a401
@@ -70,4 +71,5 @@ EBUILD netbeans-platform-9999_p20160331.ebuild 9511 SHA256 479be994ae2dc8424d59e
 EBUILD netbeans-platform-9999_p20160401.ebuild 9511 SHA256 bb57d04eb7ae361b0028cef08c9463a1aa54f1943325ca2165cb80f7b1c128dd SHA512 46ccc8acd55b0b21d9543803e1ebd43f8ddc1938228e1bdd58efabb83995fd6181a3e90d63e89c6b9fa162d3b5c973a18784de6713912e083ec3558733e91330 WHIRLPOOL 91e68c0caf9135c5fbc4aa8663cc78df6da0bd3abefc14c363de2328745fd84bf24c75228a08685cbbf2c43efa6278b02eed97fcad38e7ec50fd89f5c7e0acab
 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
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160406.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160406.ebuild
new file mode 100644
index 0000000..e03c52d
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20160406.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-06_00-01-48/zip/netbeans-trunk-nightly-201604060001-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 412a427..4aface6 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58
 DIST netbeans-trunk-nightly-201604010001-src.zip 210167621 SHA256 986f8b460566192e6a291ab9e9e8e81a49a7776c603583aece0c9639a88b130e SHA512 aa93a3d68c764456d471510528ca47c6e5a3111474314a274d96abd4d07a9c295c6ddb8755dbc8f4e78e323b64b752dc14eaf2a385e0be07f33f16b112e2f275 WHIRLPOOL 3422335a2243ddc9883d2f91e4ad8ab971d822358a90699fee47f353342637012cef153909f4f0ec9465f22e2d4955a7fe05cc81c4d73ce5b8805b1cde3f9ef0
 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
 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_p20160303.ebuild 3472 SHA256 a62d4ddfd07891f3eb19070302ff24c7af342c06c597b8b7a68036610d0415a7 SHA512 03f798e90d2135906034a573014ce12f9418a69ae1edce7595b5a09c97b91b1d93d94ad4fd4bb9903214266aa5a920f6502b53ddb866b2ab76df1980c67e38f0 WHIRLPOOL ac13538a6cfe53463dd23c33afff4853dd3d6982d492411a2f57ab9662a5b588749bad7c7f993cce328330d9374356780eb2634b8e479a146c783e6de44bb78c
@@ -43,4 +44,5 @@ EBUILD netbeans-profiler-9999_p20160331.ebuild 3472 SHA256 e90ec5c86ec4bde0b20c2
 EBUILD netbeans-profiler-9999_p20160401.ebuild 3472 SHA256 151089b6b86a48db6b79e5105e0789b2810c6b10a59646719ec18940d5e77425 SHA512 f1b59feeba886511cb1c234082ec00d4dcf07ad58bb0c03440ef5b4315c146025068a4129989acede38da55a67e5c93cc533238de87d3ed99cc6a3282f47e87e WHIRLPOOL de3284b7e4a2225be714ca99e4eea6872035e83552486e1ae953179b5f342c23f53743dd323bd49a088c7809dabd5ca39a1ef3efc8a3addc24cffa973d682b45
 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
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160406.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160406.ebuild
new file mode 100644
index 0000000..d9247b3
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160406.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-06_00-01-48/zip/netbeans-trunk-nightly-201604060001-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 3a2ae1a..5ecc403 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58
 DIST netbeans-trunk-nightly-201604010001-src.zip 210167621 SHA256 986f8b460566192e6a291ab9e9e8e81a49a7776c603583aece0c9639a88b130e SHA512 aa93a3d68c764456d471510528ca47c6e5a3111474314a274d96abd4d07a9c295c6ddb8755dbc8f4e78e323b64b752dc14eaf2a385e0be07f33f16b112e2f275 WHIRLPOOL 3422335a2243ddc9883d2f91e4ad8ab971d822358a90699fee47f353342637012cef153909f4f0ec9465f22e2d4955a7fe05cc81c4d73ce5b8805b1cde3f9ef0
 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
 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_p20160303.ebuild 5280 SHA256 17176743f2d7826ade0b0f4fa5923562216e541962e75087217f2292e3efb332 SHA512 d1016a2079834f641c3da8e0c961f58911b7b43bb1df1c760e8dfd9a884422bafb4bf2135deeead36349602c55fce92a3eaab3190ca9607e5a6a360a6c4be23d WHIRLPOOL b5384daff7e4beaf0c145e65130c22459cd8e13f8470066391cf5844f1dcd39613c21b088822b37bc54ef4e4ac90ee70fd134821384613e3d8e746598c3cc6cd
@@ -59,4 +60,5 @@ EBUILD netbeans-webcommon-9999_p20160331.ebuild 5343 SHA256 7974e89d7efbc401e5b1
 EBUILD netbeans-webcommon-9999_p20160401.ebuild 5343 SHA256 b07a2393ed9f3db469e8b1053e41bbc327b4ec899e72fb5d626a7f9a7996a75e SHA512 b30d7ab07483924e9a2545aa60547ed6099bae450290958c9559e512b21c56f725f09a0a51326410ff79321590060e376a0e0ec04eca3ae9b1a06fd3f9078974 WHIRLPOOL 7a7a1b39b3e43ef505baabe6ac8c5da3dc23364e734349b900492878d73d02ec932cd34d4f9cb362c80518889af8ac03a815bf06837448208b38c77eb7e433c3
 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
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160406.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160406.ebuild
new file mode 100644
index 0000000..eada4d9
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160406.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-06_00-01-48/zip/netbeans-trunk-nightly-201604060001-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 6801529..c3cdd68 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58
 DIST netbeans-trunk-nightly-201604010001-src.zip 210167621 SHA256 986f8b460566192e6a291ab9e9e8e81a49a7776c603583aece0c9639a88b130e SHA512 aa93a3d68c764456d471510528ca47c6e5a3111474314a274d96abd4d07a9c295c6ddb8755dbc8f4e78e323b64b752dc14eaf2a385e0be07f33f16b112e2f275 WHIRLPOOL 3422335a2243ddc9883d2f91e4ad8ab971d822358a90699fee47f353342637012cef153909f4f0ec9465f22e2d4955a7fe05cc81c4d73ce5b8805b1cde3f9ef0
 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
 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_p20160303.ebuild 2721 SHA256 8de1746444842698a77a8d0de23ba4a06c7c7c17c41a52d8c0685bcc3c36ec72 SHA512 cc65c55e3d4e771bcb545580275a69ecdc6e46bccbccac1d03f1c7f19356e909e7722fedad1d2689f5b619e776af4ec1af3d92c8ca35c230df10e67b6150b120 WHIRLPOOL dd3bbaca8ba7bcb726dbee85f8f62f69054cde78edca42bc69773f830957ce485e50386905c8244bb5b4481f8d83e96e12df5c0282e2dfdc17835085ab0d3a72
@@ -43,4 +44,5 @@ EBUILD netbeans-websvccommon-9999_p20160331.ebuild 2721 SHA256 c3612d88add231f06
 EBUILD netbeans-websvccommon-9999_p20160401.ebuild 2721 SHA256 ccd565612492dfd98619256dd90f8e10afffdfcdbc112fe723333488b83a5ab3 SHA512 96f1e88e733a8ab2f3956f04e410fea29b13d5f88e09b937bd9b72cf40a6dae3602925221de0cddcd836f4591b5c7a3978bdb340998faa4b574c485118cef723 WHIRLPOOL 0580274af6e7a4cd52eaf004016e3ac2838305cc6676c346e29ef5d64c121c514714a464a550685f40496b608d84dcab9385e3c3c63a245b5e2d248a1fa258cd
 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
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160406.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160406.ebuild
new file mode 100644
index 0000000..7f16fc3
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160406.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-06_00-01-48/zip/netbeans-trunk-nightly-201604060001-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 fc37fec..79ed24d 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201603310001-src.zip 210160668 SHA256 db7c7451354a58
 DIST netbeans-trunk-nightly-201604010001-src.zip 210167621 SHA256 986f8b460566192e6a291ab9e9e8e81a49a7776c603583aece0c9639a88b130e SHA512 aa93a3d68c764456d471510528ca47c6e5a3111474314a274d96abd4d07a9c295c6ddb8755dbc8f4e78e323b64b752dc14eaf2a385e0be07f33f16b112e2f275 WHIRLPOOL 3422335a2243ddc9883d2f91e4ad8ab971d822358a90699fee47f353342637012cef153909f4f0ec9465f22e2d4955a7fe05cc81c4d73ce5b8805b1cde3f9ef0
 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
 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_p20160303.ebuild 6939 SHA256 e2f34d201cfe2c1fa08e721254c4d27412dd0d7c84d8dda7d9cccef84f241381 SHA512 1b83e73f773d4f0dfccb80e45b40e8f614d9f863e6e7496791886ec05181eec6c93192419349e27a86518e71135cd91346cdfda54cc13af13781ee61289021f6 WHIRLPOOL 9f08e8702a6bad2448df50d6acee354ec84ffbe260df99b32364d3d566fe27d4472955bc2a43b5fa16bed37c3667b5eeed4cfeee961d623b655e04a9e7b8a357
@@ -46,4 +47,5 @@ EBUILD netbeans-9999_p20160331.ebuild 6939 SHA256 4b7a7964372c76649a31bee97a072f
 EBUILD netbeans-9999_p20160401.ebuild 6939 SHA256 1cb131702cf9f55da26f29e28914af7bad3b42b60f8273a48a4dd7bbde103043 SHA512 b79becbc4354e6b3339e64ec31f23ca198de074e9f52ef4910d9388e29ca3029c8cedb7388362c1477d926831b1afbc19f59fe69d26d2e1459a42cc81380610e WHIRLPOOL f035dacb7032b7545234d91b6f106308e5498865f6f9aee896af68799e45c06801104af7cba9c2bbd7d22fc8312ad5afcd2f1049bc129e3f1816232647743af3
 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
 MISC metadata.xml 329 SHA256 8aeaf2a0228f15c2e4140f401b30f083509bd99d0a578873069f3595cd8555f3 SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640 WHIRLPOOL 799a9b79b1b447bda9631f67e2dfaf722376740e1d2037796528a05f9745eeed00d9990a74a65ce09f74bc5e1d60a887abde540c3c62487d7dd49b8377c15834

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

next             reply	other threads:[~2016-04-06  8:28 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-06  8:28 Miroslav Šulc [this message]
  -- strict thread matches above, loose matches on Subject: below --
2016-10-21  7:41 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-mobility/, dev-java/netbeans-java/, Miroslav Šulc

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:d9cdbd1 dfblob:8238e3c dfblob:7ed1d2c dfblob:96dd765
dfblob:a6d5336 dfblob:bc62a55 dfblob:3d6f3c8 dfblob:f502832
dfblob:9fedaa4 dfblob:7b84293 dfblob:4a9eb2f dfblob:8c2906f
dfblob:f5e1d01 dfblob:85428f5 dfblob:769f732 dfblob:b39d2b1
dfblob:088c4e8 dfblob:d772492 dfblob:be91114 dfblob:89c1739
dfblob:46255d7 dfblob:26ff795 dfblob:e10f33c dfblob:4e30c5e
dfblob:c5eaf5b dfblob:9720157 dfblob:f385069 dfblob:ba517f5
dfblob:2cc81e5 dfblob:ab6cc7f dfblob:cf408d2 dfblob:ee25fe4
dfblob:f9800cd dfblob:8f9739e dfblob:bacc414 dfblob:21469f9
dfblob:523403c dfblob:6e07e98 dfblob:261315b dfblob:045a4aa
dfblob:535f955 dfblob:b461f55 dfblob:80d8191 dfblob:2681341
dfblob:c6ca9e9 dfblob:8aeb9a4 dfblob:de58c96 dfblob:361c629
dfblob:5331a2d dfblob:fed155d dfblob:e03c52d dfblob:412a427
dfblob:4aface6 dfblob:d9247b3 dfblob:3a2ae1a dfblob:5ecc403
dfblob:eada4d9 dfblob:6801529 dfblob:c3cdd68 dfblob:7f16fc3
dfblob:fc37fec dfblob:79ed24d dfblob:8670c35 )
 OR (
bs:"[gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-mobility/, dev-java/netbeans-java/, ..." )
	(help)

Reply instructions:

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

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

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

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

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

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

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

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

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