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

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

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-java/, dev-java/netbeans-javadoc/, dev-java/netbeans-harness/, ...
@ 2016-04-30 16:17 Miroslav Šulc
  0 siblings, 0 replies; only message in thread
From: Miroslav Šulc @ 2016-04-30 16:17 UTC (permalink / raw
  To: gentoo-commits

commit:     1dce4f1cd0991dba5748ed344e534adb466693dc
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 30 09:36:01 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Apr 30 09:36:01 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=1dce4f1c

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.2.28

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index b2b1128..6babbb2 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201604261340-src.zip 213360814 SHA256 82a01aa68497b1
 DIST netbeans-trunk-nightly-201604270002-src.zip 213361504 SHA256 7969b4b1058bfd65cfa704058136d06f8f87bfe2290354ead9ecf279ffdbf462 SHA512 8be518f7b1771a21dd0be041b71d990447fb158ed6d2be2e862eaa98ee40922e3b235627508b2e32d6c9f5f0834fdcd2d60f80b7253fcfc8d10e62ee3229cd23 WHIRLPOOL 4400c9f7f789ed54d9af81680b8c134b6766d1f101e8e94dfadf1faf579a5fe9a9d6c65f6ae87368d8920c0d60813ba6854f9af668db42f0d4219174a3905c67
 DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247baa9620dae7672b3b27c8863c40f6d37ad5e6649fe6cf013752 SHA512 61af7c64fa9f0725752b28f78edc006362dbb9441f9c22d4f290c362ba76b94f34eaa3e0acac026f8e10f385c106dff33af0bc22673fec35f5e70528db001ed7 WHIRLPOOL 4021eee486a6e4fe4df381154d94caefdd74d725103aa3c996d64d159c433f49939a7abcce063ec130087cde2a7609750b98e69a3c3571171865eb6657c09b8d
 DIST netbeans-trunk-nightly-201604290002-src.zip 213411377 SHA256 d0ac79f9aceaaf246c9b20cd612472e6ecc4abc9bf6add0d61fadfca3ba85a79 SHA512 ac78733d4248f6fc6ff23705f1db5e001eca8e05c2dae7c3e2e59a60dd8afbe9e6a363188e17cb78492da6e1fe35cf5bcd87a0b0c1fc4e0d91129f0812db0bd6 WHIRLPOOL 4a704f8a4aa16130c84fd481f7e1ff45f87adb589e71955857b0342927dfe960b73adde97ba12022d265169cd4b736baa48f4bb4e10d8311bab787cbeefa28b9
+DIST netbeans-trunk-nightly-201604300002-src.zip 213455252 SHA256 8ac717a944d58471d4ceb9a22a21deaf0d1f51f4eca622ebaa8f4f100f7a5338 SHA512 32a07261706f944f02b161d687998395a588c060b2e59311b2e3e08a84237e1635df2af75d523da87845e794a906283ceae26b17d88b2c649d542ba525c94429 WHIRLPOOL da034854b495fc9d685d34a181fcdba320f58718a0a2ab939ae3bba9049941b405555db173a314f4881eac31e7d42d78641d96f7e097d68ecc2fe06a0c2133df
 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_p20160329.ebuild 3384 SHA256 258837e6ec254494ddcd21ab0a8326fc4bff27a84e3bd385d04fb7b3f629a3cb SHA512 1a1b48e97574aca19409322cb5d19524505fc5a2a646a2d3535998d723cf8d50bdf045b9dd5decda7f42a69ee6d055cd6c84e1f7efd662da4a4d166553b37a8e WHIRLPOOL b798b996f505b86701421970c257c21e5735673211092b44f22b7797898c6a51d0069ada2927f3c5919ad3cc868a7be16444ed7db70830bb9708b128c915553a
@@ -50,4 +51,5 @@ EBUILD netbeans-apisupport-9999_p20160426.ebuild 3384 SHA256 0bb51453daef4fc5319
 EBUILD netbeans-apisupport-9999_p20160427.ebuild 3384 SHA256 f4c691c6d0a2bc3701346acbb56098122ea0b54c132fdf89854ad20b4d290cbf SHA512 af99e9695eb962a90bcb6baabc1933c0535c1e0171cc03ccf3d3ee862cdd9b0c08f807f6a09a55abb816e62882c1ab1ecc7159b051df406bb41c2da7ea60fabe WHIRLPOOL a6694df1692081b52c8ae5756c9e5f38b300374a1a44788407b0c6b19e9ec2101e946f1ea781db67038f937e06d2165f6921b0b376c6c7017fb4ae8f9a3c9717
 EBUILD netbeans-apisupport-9999_p20160428.ebuild 3384 SHA256 e866d9fd43d85c959d598d6111e061a3138aea2a9133f516f547a15370086e3a SHA512 cdf600716d69e7b50162f7556e2f70c6cfe9c998c94529be32305cb6bcf732ff568cdb7a3529478c12c72693a8aaa3edd10b2e752f875f6a40ef9599daff9bc1 WHIRLPOOL 5571ecd51924a63326a4759bdd584da6e7c2e5f9b33b7eeea01e4afbd58d6bdf6360e964896112aab5dde57c7b52d136e37e35f35883f3762543afb28a84cd42
 EBUILD netbeans-apisupport-9999_p20160429.ebuild 3384 SHA256 d1a11151cc917d31f5a6608d63a033b074dd10bda127ddd01ec2de154d69a28c SHA512 cfa61439a98941c4b9faf9fb0ba9ccb45a917b235323f737cdfe054f1c0931974977cb653f8383264f4e39874d6bee6a1777ac00386e1f591acb4d55ec9b6ad4 WHIRLPOOL 96d46a8e752361a06cc369251c2acdfb65dafd405d33fec1f1a13991831dd6c5f2fb24a3404f1702c6daa4faef85b74aa2c3efb332cc2a2e62eef16be40c6f1f
+EBUILD netbeans-apisupport-9999_p20160430.ebuild 3384 SHA256 f7125ac081a85a5ce6c28d2bbffbb4db19dd56fbdb7e8d191916ebf182b43c28 SHA512 6a99a95d020859118839f6ab0a6fb90456bb4815720824171c7fbd98588e5a896655e2c3e8e69c0ba3b5a3ef76996e9cc3de6134a3f5d812316cb9d7ffbc3d49 WHIRLPOOL fadf22cefdcb71f65ab8888229e90104b0f965f0ba620d63646dffea7692726ded287536af6f7dd30f98f7b31a0f13f048d66107396c47660c2697f339827303
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160430.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160430.ebuild
new file mode 100644
index 0000000..8b76931
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160430.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-30_00-02-33/zip/netbeans-trunk-nightly-201604300002-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 8555c72..8732bb4 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -37,6 +37,7 @@ DIST netbeans-trunk-nightly-201604261340-src.zip 213360814 SHA256 82a01aa68497b1
 DIST netbeans-trunk-nightly-201604270002-src.zip 213361504 SHA256 7969b4b1058bfd65cfa704058136d06f8f87bfe2290354ead9ecf279ffdbf462 SHA512 8be518f7b1771a21dd0be041b71d990447fb158ed6d2be2e862eaa98ee40922e3b235627508b2e32d6c9f5f0834fdcd2d60f80b7253fcfc8d10e62ee3229cd23 WHIRLPOOL 4400c9f7f789ed54d9af81680b8c134b6766d1f101e8e94dfadf1faf579a5fe9a9d6c65f6ae87368d8920c0d60813ba6854f9af668db42f0d4219174a3905c67
 DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247baa9620dae7672b3b27c8863c40f6d37ad5e6649fe6cf013752 SHA512 61af7c64fa9f0725752b28f78edc006362dbb9441f9c22d4f290c362ba76b94f34eaa3e0acac026f8e10f385c106dff33af0bc22673fec35f5e70528db001ed7 WHIRLPOOL 4021eee486a6e4fe4df381154d94caefdd74d725103aa3c996d64d159c433f49939a7abcce063ec130087cde2a7609750b98e69a3c3571171865eb6657c09b8d
 DIST netbeans-trunk-nightly-201604290002-src.zip 213411377 SHA256 d0ac79f9aceaaf246c9b20cd612472e6ecc4abc9bf6add0d61fadfca3ba85a79 SHA512 ac78733d4248f6fc6ff23705f1db5e001eca8e05c2dae7c3e2e59a60dd8afbe9e6a363188e17cb78492da6e1fe35cf5bcd87a0b0c1fc4e0d91129f0812db0bd6 WHIRLPOOL 4a704f8a4aa16130c84fd481f7e1ff45f87adb589e71955857b0342927dfe960b73adde97ba12022d265169cd4b736baa48f4bb4e10d8311bab787cbeefa28b9
+DIST netbeans-trunk-nightly-201604300002-src.zip 213455252 SHA256 8ac717a944d58471d4ceb9a22a21deaf0d1f51f4eca622ebaa8f4f100f7a5338 SHA512 32a07261706f944f02b161d687998395a588c060b2e59311b2e3e08a84237e1635df2af75d523da87845e794a906283ceae26b17d88b2c649d542ba525c94429 WHIRLPOOL da034854b495fc9d685d34a181fcdba320f58718a0a2ab939ae3bba9049941b405555db173a314f4881eac31e7d42d78641d96f7e097d68ecc2fe06a0c2133df
 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_p20160329.ebuild 4790 SHA256 4d5333ecbc15f387317dd1a5f18e929cdd5ce598f157d0fdcf77ae3a10be9eb0 SHA512 46cbfa9fa42bab6cbfd38f4e8c651e3a48dbc9c508a843c85e775754d70c87b0312c6146ad6eaa4269c36588e73554e282395c7e96d46d0203975693e9307202 WHIRLPOOL b6b391d7479b9512f1d1e53d19d3b00c9903fd571e6b6e03945355932d51e601fc4c1e59710d5cd592cb15369f30f5b188ce4c91647c5b1c66d3f86d0c2f3a28
@@ -61,4 +62,5 @@ EBUILD netbeans-cnd-9999_p20160426.ebuild 4790 SHA256 76605a5b0426a4b83ba47d03a0
 EBUILD netbeans-cnd-9999_p20160427.ebuild 4790 SHA256 f2deecb5f97b35dce26f6bdac0fbe0862bf3f9550504352399a26b9f2559dc2e SHA512 987032edd700b96b8a4c1acea561d69aa751d5ccff1db7c120158b76e39632a7cc217259610690cae35b53fdaf7241e7befc6b845a66cb490341d8da77cb6d89 WHIRLPOOL c5d4d89c059e13ffb00aef57a0833116000bf2a84c1ac8e7df4da40f29771ab37989925c7d42190b6ff82c58bc30723b67cade9f81e86377daa31349b25f37ab
 EBUILD netbeans-cnd-9999_p20160428.ebuild 4790 SHA256 af153a0e0435678331a5a5a43c3f393786a0f804dedbc7fbccc3b539cea583bf SHA512 cae08e9b98753c358da559fdf3387c860fd8ba8a4dd5d787f843b4cfe8f1aacf9bb1d57be5b7e52849abcfcc219262b8bcc338a6ff05451aefd2e434a4d86eee WHIRLPOOL bfaf9faa4bbed952d542ec45d51daa200bb307a922889ad6b586fec4f3386ca995ca1dac974e789a072abb4d69b58ae7c0056086966329af07244a23c0924370
 EBUILD netbeans-cnd-9999_p20160429.ebuild 4790 SHA256 6e5892e3a3ad901398a0322715d859a3b2fc67af991fa1a99a137ff04d4a4db0 SHA512 c4ae7bc81d6440e92dc9fbaf3e822f9bc6ebecf318536fff6f8fa76844cef0b88110291d4c708dea269c4c02294d9ffcd8dd57e06284fb936bb9cf89791f8e58 WHIRLPOOL 4925c7fe9a30fe47eb88dd492b39ffc057f8a2581918bc6637e73c7b67a2ab0df8b6022c396b4dcf57630b0dbaaafaa1d81e04e1a39a8907f5434960f4534cc0
+EBUILD netbeans-cnd-9999_p20160430.ebuild 4790 SHA256 af49eb045691ba158c4f3d1bd0df4daa8b901fb31ff87929ab5aab41718f738e SHA512 b45ed427c74adc932a16199e6bc5a2abc0ec28b2be58a0b08f0e98b8ea1227540d405c1272103a462332c42c28b412c27b39c2c8fa742988e4590aeaaa979ca5 WHIRLPOOL 4f6d02207ae1cf4f8d20e8d2bd78a7711c41ed0ec64dcd78d1ca4fa2fb08e860bd5225aaa6a91d9ff0ce951c108197dc6979ab095f6d75e096152712bb01a637
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160430.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160430.ebuild
new file mode 100644
index 0000000..279e160
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160430.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-30_00-02-33/zip/netbeans-trunk-nightly-201604300002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar
+	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
+	http://hg.netbeans.org/binaries/85FD13415B0553D6421F4BBA5FE0F587B9748B20-clank_0.3.6.zip
+	http://hg.netbeans.org/binaries/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}"/85FD13415B0553D6421F4BBA5FE0F587B9748B20-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 8d3f5a3..f00a901 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201604261340-src.zip 213360814 SHA256 82a01aa68497b1
 DIST netbeans-trunk-nightly-201604270002-src.zip 213361504 SHA256 7969b4b1058bfd65cfa704058136d06f8f87bfe2290354ead9ecf279ffdbf462 SHA512 8be518f7b1771a21dd0be041b71d990447fb158ed6d2be2e862eaa98ee40922e3b235627508b2e32d6c9f5f0834fdcd2d60f80b7253fcfc8d10e62ee3229cd23 WHIRLPOOL 4400c9f7f789ed54d9af81680b8c134b6766d1f101e8e94dfadf1faf579a5fe9a9d6c65f6ae87368d8920c0d60813ba6854f9af668db42f0d4219174a3905c67
 DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247baa9620dae7672b3b27c8863c40f6d37ad5e6649fe6cf013752 SHA512 61af7c64fa9f0725752b28f78edc006362dbb9441f9c22d4f290c362ba76b94f34eaa3e0acac026f8e10f385c106dff33af0bc22673fec35f5e70528db001ed7 WHIRLPOOL 4021eee486a6e4fe4df381154d94caefdd74d725103aa3c996d64d159c433f49939a7abcce063ec130087cde2a7609750b98e69a3c3571171865eb6657c09b8d
 DIST netbeans-trunk-nightly-201604290002-src.zip 213411377 SHA256 d0ac79f9aceaaf246c9b20cd612472e6ecc4abc9bf6add0d61fadfca3ba85a79 SHA512 ac78733d4248f6fc6ff23705f1db5e001eca8e05c2dae7c3e2e59a60dd8afbe9e6a363188e17cb78492da6e1fe35cf5bcd87a0b0c1fc4e0d91129f0812db0bd6 WHIRLPOOL 4a704f8a4aa16130c84fd481f7e1ff45f87adb589e71955857b0342927dfe960b73adde97ba12022d265169cd4b736baa48f4bb4e10d8311bab787cbeefa28b9
+DIST netbeans-trunk-nightly-201604300002-src.zip 213455252 SHA256 8ac717a944d58471d4ceb9a22a21deaf0d1f51f4eca622ebaa8f4f100f7a5338 SHA512 32a07261706f944f02b161d687998395a588c060b2e59311b2e3e08a84237e1635df2af75d523da87845e794a906283ceae26b17d88b2c649d542ba525c94429 WHIRLPOOL da034854b495fc9d685d34a181fcdba320f58718a0a2ab939ae3bba9049941b405555db173a314f4881eac31e7d42d78641d96f7e097d68ecc2fe06a0c2133df
 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_p20160329.ebuild 2968 SHA256 d408c3c49ef3e8fb3b20fcf752f17e16b848b5cfe7079492ecb13b2c5ceae885 SHA512 6543a4ca09fc73557f5fc5006c3a6e8d56e14cf0ec93e5d434a9ebc5b9aaed976a40e035a0844d8dd7ffca4384cacf0487ef329f9e949f2cb7c5fe15a259d5c4 WHIRLPOOL 5f8a29ffeef2d2a6d755f7b0a114f1031462cb987fa5c444b7a0a82c0c0a5578dace8236530c9dc7cda961406da2c7cb61c55e710704b438a86a4fcfeead459b
@@ -53,4 +54,5 @@ EBUILD netbeans-dlight-9999_p20160426.ebuild 2968 SHA256 79a972b0e734bcc0af44c65
 EBUILD netbeans-dlight-9999_p20160427.ebuild 2968 SHA256 48ae5693584503e00f5b4dcf79d46ec406a875822ebef2c888d33ba1543c449b SHA512 a894ca516f5a7b2f8fa769ffdc107081245a686fefb082029fd4a98ed6aeb168ef6f36ebc575540fa3064e1aebc93f0b4d2addbe862eb883ecf6e9b16212c59f WHIRLPOOL b2163f389eea63add06ad4af5155bef93613688e36701669b26e856415f19e0bfcffb3dc3c05d901905b48481e5f62724cd95701559aedf5e43189ce02ef87a4
 EBUILD netbeans-dlight-9999_p20160428.ebuild 2968 SHA256 a78d9fe846d94ed422c84a3dd06ff9b4eba872d64ffd217817f93f3bface22ba SHA512 c8ba6923704e00c0da015c99217c078e2eb3b548fa80f0a17d6189e94e7781ae57cb5c9a67e3921fb1c4dbba717b73cb0b56542ad247c0ec740578cf981ed78d WHIRLPOOL 6828cb5cd0d0669bf1114d12f86dbc386cb3f49df002501b61bfc518c507882f961ebc63cce7e9d3382961189be71e51ca4acedcbc93c9d7547bcd93b9f36750
 EBUILD netbeans-dlight-9999_p20160429.ebuild 2968 SHA256 d7b752d8514d47164b82939771de005a6723136317c7e774e9db0975af18635e SHA512 acf6e11e9ac3436b22429a219275afe0ef0015722cf5a6bbd90ff918149be44f84eb3f0d899d8a77ff873a7dd44178d58f26f2351ffc3e48d50cd4d896be161d WHIRLPOOL 9351914c1a73125ef093de24488e865dad522354114249611d351e2c8134ec3eb0d72e1466c686f5208a46db19a4a167735d4aaa162f09a16adcb14c9a298337
+EBUILD netbeans-dlight-9999_p20160430.ebuild 2968 SHA256 e9fef6100fd02fb343207a77f1e6eeea0c86d3eb48f26d7f657712da84900539 SHA512 274625dfb516afe3226a643964804944304dd6b9ce160bf29d15667375f9ab353f24b75be488f882c9b5b8194de21c29743ee7f1f49741fc5093520d1c8853b0 WHIRLPOOL 005eafc551e71307197b230dee99c598d1e3ad6f0ef0baab0345a330b2c446de9ca576a2eb3fdc46d82cac33dbc5e9b9bfe850200ab593eda55d61411aacf210
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160430.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160430.ebuild
new file mode 100644
index 0000000..f0a5ae8
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160430.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-30_00-02-33/zip/netbeans-trunk-nightly-201604300002-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 adab0e0..53593e4 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -58,6 +58,7 @@ DIST netbeans-trunk-nightly-201604261340-src.zip 213360814 SHA256 82a01aa68497b1
 DIST netbeans-trunk-nightly-201604270002-src.zip 213361504 SHA256 7969b4b1058bfd65cfa704058136d06f8f87bfe2290354ead9ecf279ffdbf462 SHA512 8be518f7b1771a21dd0be041b71d990447fb158ed6d2be2e862eaa98ee40922e3b235627508b2e32d6c9f5f0834fdcd2d60f80b7253fcfc8d10e62ee3229cd23 WHIRLPOOL 4400c9f7f789ed54d9af81680b8c134b6766d1f101e8e94dfadf1faf579a5fe9a9d6c65f6ae87368d8920c0d60813ba6854f9af668db42f0d4219174a3905c67
 DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247baa9620dae7672b3b27c8863c40f6d37ad5e6649fe6cf013752 SHA512 61af7c64fa9f0725752b28f78edc006362dbb9441f9c22d4f290c362ba76b94f34eaa3e0acac026f8e10f385c106dff33af0bc22673fec35f5e70528db001ed7 WHIRLPOOL 4021eee486a6e4fe4df381154d94caefdd74d725103aa3c996d64d159c433f49939a7abcce063ec130087cde2a7609750b98e69a3c3571171865eb6657c09b8d
 DIST netbeans-trunk-nightly-201604290002-src.zip 213411377 SHA256 d0ac79f9aceaaf246c9b20cd612472e6ecc4abc9bf6add0d61fadfca3ba85a79 SHA512 ac78733d4248f6fc6ff23705f1db5e001eca8e05c2dae7c3e2e59a60dd8afbe9e6a363188e17cb78492da6e1fe35cf5bcd87a0b0c1fc4e0d91129f0812db0bd6 WHIRLPOOL 4a704f8a4aa16130c84fd481f7e1ff45f87adb589e71955857b0342927dfe960b73adde97ba12022d265169cd4b736baa48f4bb4e10d8311bab787cbeefa28b9
+DIST netbeans-trunk-nightly-201604300002-src.zip 213455252 SHA256 8ac717a944d58471d4ceb9a22a21deaf0d1f51f4eca622ebaa8f4f100f7a5338 SHA512 32a07261706f944f02b161d687998395a588c060b2e59311b2e3e08a84237e1635df2af75d523da87845e794a906283ceae26b17d88b2c649d542ba525c94429 WHIRLPOOL da034854b495fc9d685d34a181fcdba320f58718a0a2ab939ae3bba9049941b405555db173a314f4881eac31e7d42d78641d96f7e097d68ecc2fe06a0c2133df
 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_p20160329.ebuild 15825 SHA256 2ea849e62c0cbab8245d1bd586ecb01a7bd30643edf79a323fda308e45167912 SHA512 e58893fba0fd96ef6da5eff515b3e9b3cd29b10857f39c8639d089531e8c879460b5c1e9920391b61770f9842bda93553440d22d20b6bb3a9c07ce027d275d9a WHIRLPOOL b51afee9442614ae919bdca9523896be9ac352e8270d5e9ef7950ec13b6da8a7815f8b923c77ae6ad53cc4e79e26d13eb0941c79b58a4774a464417f3a5ae4d6
@@ -82,4 +83,5 @@ EBUILD netbeans-enterprise-9999_p20160426.ebuild 15825 SHA256 dc2808dc1593e1b0a2
 EBUILD netbeans-enterprise-9999_p20160427.ebuild 15825 SHA256 167c92c5def2d012da57515fa873e10d1dcf35f9de59d8e525dcf4587a2074aa SHA512 9fa0eb2a743cce582d981bd70018d70ab0a28e8a8d6888ca71280df1255afc1d72a044be7b8c82c4088a0899ee4107ef361f6b21d563e9d09d6060a596cc6c2f WHIRLPOOL 56a56c9844cfca5ac72263ac9224f2ad6e139c8d8694bf7b4a190e68519d0bf5dfe246e58781f35718a7a42dc1dae5c176ea2c3d363e099c233c6f877ee78692
 EBUILD netbeans-enterprise-9999_p20160428.ebuild 15825 SHA256 d36265c231f1f56c998acc0e6268f1c61be91492a9243785066dbbfc6ff3053f SHA512 c7c3a2ab27a93d457f5f95341b6e740e66ee57dca0998cadb6f97842084a2450669fefb0bf3611c52df23b266bef5004b916e769e2fd6886915705729d79e91f WHIRLPOOL 8e461fad4f405bda6a70b1024fd9ef18b8070deda66b328838cd1eb6b0665727553075222d489c2f657eb286da8c33b48f1de347efd514f28860c8aa397c076c
 EBUILD netbeans-enterprise-9999_p20160429.ebuild 15825 SHA256 05bc437093193e88924bb2dcbca61368af02579e7a53154ef547a705c962b66f SHA512 bbe9514bf02b5ae617f9c69b123e5014d60728905f08ab805623fda11a9055a73874155dccdfcbefe771780447fb6fad6ec92e005b1668e8e54bae4f7df420f5 WHIRLPOOL a7be814db2696fb17b0bf2942a8a4f5e03e47d3727d91b2b09384c18b3930bb0930d92026a29babfbb46aef695ba1f08af07443fb053fb4280b7fc67e62161e2
+EBUILD netbeans-enterprise-9999_p20160430.ebuild 15825 SHA256 05ed24b0672dcb4a88c8e9889164a33ac27d3904c22c1e6bbd315e3f9980dc4f SHA512 1e0991ea492824ca929b3b250c4857034065aed3a2ae50c4b261f43a01313fd69a917ee609cdf5449c7f63299589aa2f824d13f25a46bbf643a7e647e027d64e WHIRLPOOL c8fc088951776e6c0f722464829b81f6a535d4630df0cf155b96fdf0bca964ace6686cf8538c49c9b65308b8eb9761aac09efbbe1871dfb32985147eb5e06a1d
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160430.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160430.ebuild
new file mode 100644
index 0000000..e221413
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160430.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-30_00-02-33/zip/netbeans-trunk-nightly-201604300002-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 7abc386..fb0817e 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201604261340-src.zip 213360814 SHA256 82a01aa68497b1
 DIST netbeans-trunk-nightly-201604270002-src.zip 213361504 SHA256 7969b4b1058bfd65cfa704058136d06f8f87bfe2290354ead9ecf279ffdbf462 SHA512 8be518f7b1771a21dd0be041b71d990447fb158ed6d2be2e862eaa98ee40922e3b235627508b2e32d6c9f5f0834fdcd2d60f80b7253fcfc8d10e62ee3229cd23 WHIRLPOOL 4400c9f7f789ed54d9af81680b8c134b6766d1f101e8e94dfadf1faf579a5fe9a9d6c65f6ae87368d8920c0d60813ba6854f9af668db42f0d4219174a3905c67
 DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247baa9620dae7672b3b27c8863c40f6d37ad5e6649fe6cf013752 SHA512 61af7c64fa9f0725752b28f78edc006362dbb9441f9c22d4f290c362ba76b94f34eaa3e0acac026f8e10f385c106dff33af0bc22673fec35f5e70528db001ed7 WHIRLPOOL 4021eee486a6e4fe4df381154d94caefdd74d725103aa3c996d64d159c433f49939a7abcce063ec130087cde2a7609750b98e69a3c3571171865eb6657c09b8d
 DIST netbeans-trunk-nightly-201604290002-src.zip 213411377 SHA256 d0ac79f9aceaaf246c9b20cd612472e6ecc4abc9bf6add0d61fadfca3ba85a79 SHA512 ac78733d4248f6fc6ff23705f1db5e001eca8e05c2dae7c3e2e59a60dd8afbe9e6a363188e17cb78492da6e1fe35cf5bcd87a0b0c1fc4e0d91129f0812db0bd6 WHIRLPOOL 4a704f8a4aa16130c84fd481f7e1ff45f87adb589e71955857b0342927dfe960b73adde97ba12022d265169cd4b736baa48f4bb4e10d8311bab787cbeefa28b9
+DIST netbeans-trunk-nightly-201604300002-src.zip 213455252 SHA256 8ac717a944d58471d4ceb9a22a21deaf0d1f51f4eca622ebaa8f4f100f7a5338 SHA512 32a07261706f944f02b161d687998395a588c060b2e59311b2e3e08a84237e1635df2af75d523da87845e794a906283ceae26b17d88b2c649d542ba525c94429 WHIRLPOOL da034854b495fc9d685d34a181fcdba320f58718a0a2ab939ae3bba9049941b405555db173a314f4881eac31e7d42d78641d96f7e097d68ecc2fe06a0c2133df
 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_p20160329.ebuild 2913 SHA256 6a9e7506e25ea265e71e86742df6f05847bc47ec2af12448ab087ad236c0d511 SHA512 91e2130fcc32196e365e917126f6eaf3314ef667ab3ec1a840de55d04a199457536c3ed82b9351e0228f24ce2a7ee42b683a8b3a741acccd34433aad7f3a752e WHIRLPOOL abdae709ffc9cfbc4438dd2f5647f2135b5546706231d876fb96a66fa68198c2ae0b347fb93ba1aa1c352adbdfacd743c7f5bfdf29f8ab939eeca4b6bbe7940b
@@ -50,4 +51,5 @@ EBUILD netbeans-ergonomics-9999_p20160426.ebuild 2913 SHA256 6d96a7dba915b63fb10
 EBUILD netbeans-ergonomics-9999_p20160427.ebuild 2913 SHA256 6aa1c9813bf76caae337c0ef3690b1640dcffdd099ef5c5fc81d22b1949d50db SHA512 d8ca20e2c34e1b103dd16141d97075308a5dcca25eff763ad7ff18001404645e014edf15899ce7fcd9ba573465492de24e42750f3be2556a19d08fe1b0297365 WHIRLPOOL 7768dc93b06fcf6023f1a553c2a9a10c177733a27ad824053fd68e974f719031f71e1ad022cffab221b0fafd63cd8a0a71409b698f61a4f6f40ea73cdb7c7461
 EBUILD netbeans-ergonomics-9999_p20160428.ebuild 2913 SHA256 03be7f911ef9e0cc84ae0c302552ce8755cfb31022c087e620b214d4becdef0a SHA512 4961338b8b363a36000ab2ee47d567bf8bf7fdd7e10d63c046f9b1d00ea415390e1cfeae5d02d6090afaa5ab45f7c05b1aa3fc071f1c073eaacb288eddad4832 WHIRLPOOL 110c80e66dfd1e0f880f50fbbc8795445dfb62f6c6b7424b0791067b9b28c58979bd7e56f4df31d3da8f86aa33df43529c3d3f1c795ff14424e8530176c7db46
 EBUILD netbeans-ergonomics-9999_p20160429.ebuild 2913 SHA256 e2df6fa486e4018403d50f9e0292c0a0a6e6c00b881624c1587a0a559e513a3d SHA512 706690ab6b186bfbda0f93fdd826eee100479a8ac2517e05ff1b4f00828ff49083196fdf34cf1a8ee9ce5a2a872979de67e02bcc076ea46b6ba7a4955de7acf3 WHIRLPOOL c68ebc9c4578ec5fee9bca56e56cffff9a209c6593cc4fc9f6c7e47abf89dbf2e305d0068f8a3ebadc2aeb38362df7d4a95af18ba58fbacd4d397b384ab0dedb
+EBUILD netbeans-ergonomics-9999_p20160430.ebuild 2913 SHA256 d29ce3ce54570a70417a7b25e238f24328a5edbfd17e31c1dd53888916cd0fab SHA512 9b5fd6e536ede818074a59112991402a614983e439a253d7af296ca1188f0fd3a52c0e06078b0b1c4f17e50bb1fb1dd5d4234ecb8410bc42b3ca1da8658ef4b5 WHIRLPOOL 74b6d0121d10eac421cd68a00c62d348d7f7a8040b2861232125ff6183fadab3eb608641cc55f73c6c9896a57ce46961f446cd67a3206fed9633cde2e5ebb5dd
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160430.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160430.ebuild
new file mode 100644
index 0000000..f177a35
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160430.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-30_00-02-33/zip/netbeans-trunk-nightly-201604300002-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 a35b901..6343c33 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201604261340-src.zip 213360814 SHA256 82a01aa68497b1
 DIST netbeans-trunk-nightly-201604270002-src.zip 213361504 SHA256 7969b4b1058bfd65cfa704058136d06f8f87bfe2290354ead9ecf279ffdbf462 SHA512 8be518f7b1771a21dd0be041b71d990447fb158ed6d2be2e862eaa98ee40922e3b235627508b2e32d6c9f5f0834fdcd2d60f80b7253fcfc8d10e62ee3229cd23 WHIRLPOOL 4400c9f7f789ed54d9af81680b8c134b6766d1f101e8e94dfadf1faf579a5fe9a9d6c65f6ae87368d8920c0d60813ba6854f9af668db42f0d4219174a3905c67
 DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247baa9620dae7672b3b27c8863c40f6d37ad5e6649fe6cf013752 SHA512 61af7c64fa9f0725752b28f78edc006362dbb9441f9c22d4f290c362ba76b94f34eaa3e0acac026f8e10f385c106dff33af0bc22673fec35f5e70528db001ed7 WHIRLPOOL 4021eee486a6e4fe4df381154d94caefdd74d725103aa3c996d64d159c433f49939a7abcce063ec130087cde2a7609750b98e69a3c3571171865eb6657c09b8d
 DIST netbeans-trunk-nightly-201604290002-src.zip 213411377 SHA256 d0ac79f9aceaaf246c9b20cd612472e6ecc4abc9bf6add0d61fadfca3ba85a79 SHA512 ac78733d4248f6fc6ff23705f1db5e001eca8e05c2dae7c3e2e59a60dd8afbe9e6a363188e17cb78492da6e1fe35cf5bcd87a0b0c1fc4e0d91129f0812db0bd6 WHIRLPOOL 4a704f8a4aa16130c84fd481f7e1ff45f87adb589e71955857b0342927dfe960b73adde97ba12022d265169cd4b736baa48f4bb4e10d8311bab787cbeefa28b9
+DIST netbeans-trunk-nightly-201604300002-src.zip 213455252 SHA256 8ac717a944d58471d4ceb9a22a21deaf0d1f51f4eca622ebaa8f4f100f7a5338 SHA512 32a07261706f944f02b161d687998395a588c060b2e59311b2e3e08a84237e1635df2af75d523da87845e794a906283ceae26b17d88b2c649d542ba525c94429 WHIRLPOOL da034854b495fc9d685d34a181fcdba320f58718a0a2ab939ae3bba9049941b405555db173a314f4881eac31e7d42d78641d96f7e097d68ecc2fe06a0c2133df
 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_p20160329.ebuild 3377 SHA256 707875c5589aac9391e819c9cc4b3fa53e06231c64efbcd6e2c02b9db23a07db SHA512 dddd8959468d71dd3c68b7c3a992d667b579ada303fc950a47b03d7e31e9c07453ce1f4a8aea8883e73904c6809171f76723f61370ab3e41abb36ab91114c6ba WHIRLPOOL 564347e65a44b44dc5bcfdf21ec9ec4a82f7d7a8caeb769e7e8e26826563c1ac0e09ba4f0a0b87cae777e20bffc59de4c61b985292215be86e033e74e83cba81
@@ -54,4 +55,5 @@ EBUILD netbeans-extide-9999_p20160426.ebuild 3377 SHA256 9af02c8929c9ea357ea3d94
 EBUILD netbeans-extide-9999_p20160427.ebuild 3377 SHA256 21abd3353722b5bc54008259df90ea64f000883472a1bb9f932bb1d8d13b08c3 SHA512 1a9c44910cbf2164079232a9a32585a731292273dc2c22ac13fb64fab5ea19438529e28b8d149132b164a151e76d18292d8cd332b9d52c973f52805ab2b615a2 WHIRLPOOL 383dc89cb56e7f08d23c2a8518d5163ca7ceff8d171f835bb0cd187884f618ccbf632963f1e4ea9ecb63ced8bbb5cf93dd059ae8d5f7c1d8785d74b3d9d75749
 EBUILD netbeans-extide-9999_p20160428.ebuild 3377 SHA256 b69e4995f884a7524e29274702b2eb3851dca8a7c74a618d98725fe26f951332 SHA512 c8fc3c04d1fc7b2586bcaa5972b1f40ac94b09097f4ad0333d50e9c494f2b2e131dd504c5a274d0b130b1887e2ace51eecca46f20fab32198a123591e6fde228 WHIRLPOOL d921c10e7a80ac065dea04ff546b5635eb8d251a37cc0d8b7533097cc4fc28683d3a60b1b9bb8459b1abc4878fdb306f07db6d80ca65e92dba9543b32866f412
 EBUILD netbeans-extide-9999_p20160429.ebuild 3377 SHA256 4d5556da92053e67624a244760528d32090ec8baa5c0e83787500397b5f67a44 SHA512 30790e951ff824bbe98582ec0ae700e9a413d8c18b92fd9cbf99fcb6911e3d2201a8af88b048771aa52d2d05ec2884e3781b0d3db45c33f36fde8892bd462f5f WHIRLPOOL e52cadc8a91ad84e20a1a8066b8cee19a4ec9debbb63db6cc360d15f74e65e72b51a5bb310b8e92a2b0f26168d55bc51fc955057ca343a7cdec5cb08e920e9e8
+EBUILD netbeans-extide-9999_p20160430.ebuild 3377 SHA256 cf5564f3b737c12c4713beca1a239d6d8fc5f845f1058fcf2787655b99c8ed55 SHA512 69a5c32e599601fca96d30b523ba283d4259c0a1f414bd7a536fe5141a3ab7829fff4cc40501aac13f5a12ca480406ea3742ef7818dba8e567430fe5d6e0dcec WHIRLPOOL 2e9945deea2f787f923646e27806bd66deafd323bc8bdc37ce738c8419388ba1070b1b6df1afe53d70baa8f80e02cd2fdfe67e7ed854915b3f8f7f01d27c0fac
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160430.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160430.ebuild
new file mode 100644
index 0000000..fd965e1
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20160430.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-30_00-02-33/zip/netbeans-trunk-nightly-201604300002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip
+	http://hg.netbeans.org/binaries/545E2B7AB1BD579CC76E3836055877982C5CD0C6-ant-misc-1.9.7.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	dev-java/javahelp:0
+	${CDEPEND}"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.extide -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r16-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip o.apache.tools.ant.module/external/ant-libs-1.9.7.zip || die
+	ln -s "${DISTDIR}"/545E2B7AB1BD579CC76E3836055877982C5CD0C6-ant-misc-1.9.7.zip o.apache.tools.ant.module/external/ant-misc-1.9.7.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	unset DISPLAY
+	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+	pushd nbbuild/netbeans/extide >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/extide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/extide
+}

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index 328cd0e..ffcd627 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201604261340-src.zip 213360814 SHA256 82a01aa68497b1
 DIST netbeans-trunk-nightly-201604270002-src.zip 213361504 SHA256 7969b4b1058bfd65cfa704058136d06f8f87bfe2290354ead9ecf279ffdbf462 SHA512 8be518f7b1771a21dd0be041b71d990447fb158ed6d2be2e862eaa98ee40922e3b235627508b2e32d6c9f5f0834fdcd2d60f80b7253fcfc8d10e62ee3229cd23 WHIRLPOOL 4400c9f7f789ed54d9af81680b8c134b6766d1f101e8e94dfadf1faf579a5fe9a9d6c65f6ae87368d8920c0d60813ba6854f9af668db42f0d4219174a3905c67
 DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247baa9620dae7672b3b27c8863c40f6d37ad5e6649fe6cf013752 SHA512 61af7c64fa9f0725752b28f78edc006362dbb9441f9c22d4f290c362ba76b94f34eaa3e0acac026f8e10f385c106dff33af0bc22673fec35f5e70528db001ed7 WHIRLPOOL 4021eee486a6e4fe4df381154d94caefdd74d725103aa3c996d64d159c433f49939a7abcce063ec130087cde2a7609750b98e69a3c3571171865eb6657c09b8d
 DIST netbeans-trunk-nightly-201604290002-src.zip 213411377 SHA256 d0ac79f9aceaaf246c9b20cd612472e6ecc4abc9bf6add0d61fadfca3ba85a79 SHA512 ac78733d4248f6fc6ff23705f1db5e001eca8e05c2dae7c3e2e59a60dd8afbe9e6a363188e17cb78492da6e1fe35cf5bcd87a0b0c1fc4e0d91129f0812db0bd6 WHIRLPOOL 4a704f8a4aa16130c84fd481f7e1ff45f87adb589e71955857b0342927dfe960b73adde97ba12022d265169cd4b736baa48f4bb4e10d8311bab787cbeefa28b9
+DIST netbeans-trunk-nightly-201604300002-src.zip 213455252 SHA256 8ac717a944d58471d4ceb9a22a21deaf0d1f51f4eca622ebaa8f4f100f7a5338 SHA512 32a07261706f944f02b161d687998395a588c060b2e59311b2e3e08a84237e1635df2af75d523da87845e794a906283ceae26b17d88b2c649d542ba525c94429 WHIRLPOOL da034854b495fc9d685d34a181fcdba320f58718a0a2ab939ae3bba9049941b405555db173a314f4881eac31e7d42d78641d96f7e097d68ecc2fe06a0c2133df
 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_p20160329.ebuild 3416 SHA256 5b438c070b98dc3eedc28545213cd082974849344a0cc767158938ab2d7f75ac SHA512 848e80f70976a647cabdcf9addea2a4c083a220b6d942e3d8aad9d02c1f836fae80e2ce9574b5b5802c83dc591d194892863f9655b2cfffb3b12c7107d616760 WHIRLPOOL d3acbadda3a41be9aa4460f5d905a8e9102f7924b9ebc6b63283738f5d43712bbec5988a5e475f8e6dc8a26685d034f7c1c9bda893e24119ba9933dafb2e2736
@@ -52,4 +53,5 @@ EBUILD netbeans-groovy-9999_p20160426.ebuild 3416 SHA256 52f979cd825c5ff7bbe8eb3
 EBUILD netbeans-groovy-9999_p20160427.ebuild 3416 SHA256 82767364bd0dc56c73dfebc4cb6937ba8b641610ccacb26a5cef788b1ffb77c6 SHA512 ac5bec9b735e5e40b88cca150fd1789fda93e01bfeecf5420cf0d2d84a3b4a03265610339ca0437a104845ce30192fa97096dbc618496d5fb0ca10103f94f8f8 WHIRLPOOL 39c95dfd444d8af233b27d6d37dbe3df5689b08ce330f408f317863bb4fe899990c110bca11a1d661bb91264bd511084f257b5903346c5914f7cf8c8535a71e4
 EBUILD netbeans-groovy-9999_p20160428.ebuild 3416 SHA256 e79a68a525a8e7b9929f6099fcd1e18066daf75b72d06556c2fa24ad49c5b998 SHA512 3d2b217ce426091f0f3cbc1f3ea8881fa21c5bb482da2830349d1283ab9192354100b994b1a3ce4cb86265356035b417e1855d3a50e88e13cd41154bfc00c83d WHIRLPOOL 72d71a968c86d7f7033c35b624852e32dfce945c6711a74b30ef71f3f017a6fc9ff1dfce9c57e1c4ccb273f60c7263dc221fcd7a26a0ffd2acaa4b5f44c05450
 EBUILD netbeans-groovy-9999_p20160429.ebuild 3416 SHA256 193f5e06ec560c2d94389cc828b04cb05259fd242a3ebd90c1ee6eb2ddc5b11a SHA512 e20d0f708d52ae85dfe8701afaa8eb8254538af7f4ac16e1fbdf84539e35a83d4a014fae8e69f9e569325f2d7f0deca72f57fae72fab9fb807f395026b49504f WHIRLPOOL 99681523978447b901a033a70db7de97ee5039d9a47f86bc6dfc61aa0d4bb56c9dc9c89e4d25bf1ede85490793dcb8756a3c15b4491adc52bf4a517a658a7930
+EBUILD netbeans-groovy-9999_p20160430.ebuild 3416 SHA256 24dc8d153b36f64517cf87056fcb8caef9f7f5b7d2c817af9f845176c547a2ee SHA512 316853d127b31c7e0a0f510ac2d287713b1d8d4919dfe53af579b408583818661a0cbf41b84f3a86a97266ef4c36cde9193adca15515edc681d6915f6f648ec4 WHIRLPOOL 8d1e3af73a61806c153ff1470926c7d2e2c529fa42d8789bf71b78f69fa127e39baec1c0cb8f95c62a03c5ef6f2b9c9488dccf8845570dc99726f3d49ee29d4c
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160430.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160430.ebuild
new file mode 100644
index 0000000..d9c23b0
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160430.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-30_00-02-33/zip/netbeans-trunk-nightly-201604300002-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 537b1e6..162ffc7 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201604261340-src.zip 213360814 SHA256 82a01aa68497b1
 DIST netbeans-trunk-nightly-201604270002-src.zip 213361504 SHA256 7969b4b1058bfd65cfa704058136d06f8f87bfe2290354ead9ecf279ffdbf462 SHA512 8be518f7b1771a21dd0be041b71d990447fb158ed6d2be2e862eaa98ee40922e3b235627508b2e32d6c9f5f0834fdcd2d60f80b7253fcfc8d10e62ee3229cd23 WHIRLPOOL 4400c9f7f789ed54d9af81680b8c134b6766d1f101e8e94dfadf1faf579a5fe9a9d6c65f6ae87368d8920c0d60813ba6854f9af668db42f0d4219174a3905c67
 DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247baa9620dae7672b3b27c8863c40f6d37ad5e6649fe6cf013752 SHA512 61af7c64fa9f0725752b28f78edc006362dbb9441f9c22d4f290c362ba76b94f34eaa3e0acac026f8e10f385c106dff33af0bc22673fec35f5e70528db001ed7 WHIRLPOOL 4021eee486a6e4fe4df381154d94caefdd74d725103aa3c996d64d159c433f49939a7abcce063ec130087cde2a7609750b98e69a3c3571171865eb6657c09b8d
 DIST netbeans-trunk-nightly-201604290002-src.zip 213411377 SHA256 d0ac79f9aceaaf246c9b20cd612472e6ecc4abc9bf6add0d61fadfca3ba85a79 SHA512 ac78733d4248f6fc6ff23705f1db5e001eca8e05c2dae7c3e2e59a60dd8afbe9e6a363188e17cb78492da6e1fe35cf5bcd87a0b0c1fc4e0d91129f0812db0bd6 WHIRLPOOL 4a704f8a4aa16130c84fd481f7e1ff45f87adb589e71955857b0342927dfe960b73adde97ba12022d265169cd4b736baa48f4bb4e10d8311bab787cbeefa28b9
+DIST netbeans-trunk-nightly-201604300002-src.zip 213455252 SHA256 8ac717a944d58471d4ceb9a22a21deaf0d1f51f4eca622ebaa8f4f100f7a5338 SHA512 32a07261706f944f02b161d687998395a588c060b2e59311b2e3e08a84237e1635df2af75d523da87845e794a906283ceae26b17d88b2c649d542ba525c94429 WHIRLPOOL da034854b495fc9d685d34a181fcdba320f58718a0a2ab939ae3bba9049941b405555db173a314f4881eac31e7d42d78641d96f7e097d68ecc2fe06a0c2133df
 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_p20160329.ebuild 4126 SHA256 554e05f0c33d64d1e2e90fd8469828e6c2ff9c687244d280f30148bea2e7ba25 SHA512 9253104aff0393e09e80f98a4f2617561ebd34ed28cfadfc72d7ed342dcaef0ede7d0fa386301903f7e2a889745e1da3d1f6d41519d33744d4a0a4d59c899d92 WHIRLPOOL 5cb5b8defea45d709867274d6ea105ced205c89f1ad7dea54ddb7655b745cc3fb983ceb2a9efa13ce86da1c91a1cf137e3db9d86d2509a5669093fd88b94a5a8
@@ -55,4 +56,5 @@ EBUILD netbeans-harness-9999_p20160426.ebuild 4126 SHA256 cd4fe367c5d7165e96c13d
 EBUILD netbeans-harness-9999_p20160427.ebuild 4126 SHA256 b1eacf993fcd5e80314f86e1864e42eb70685fa119b59be5c8fdc9372d146720 SHA512 48c9464340279e73b8c0768cfd7bfa3841f4db26207aa9ddb3eaf326ea911cb91951b0aceee2f2d79336da1fc8e87003fc616d9c21e16365b652f10020aff77c WHIRLPOOL 1206a73c93a71f184ab64069e47ac790fcb64da33da36fecaed4ab07613f725d8f20b619c6c6f5f72a340fdbb8b475e8ee431e047af62ad8fc93ef5507bebee1
 EBUILD netbeans-harness-9999_p20160428.ebuild 4126 SHA256 6fa78ddd6b86962f5c5ddadd1493edf1f6545863f195b3bf390c970a07cb0b30 SHA512 6a9dc57df3f90fc79d5d372454fbabfa86ae4fbe951896018dfc6682663617721e3cbff4e68c051bf22c5d0764840ab2abf993f3754f7d6c27c44fe20125bc2e WHIRLPOOL 81e8cbac2a7fb4b976bdf5c6764f619f3b9130cf3c1d0f9ea80eebf3c58bba95aa61a8e5c10c2d52122a138c58fc51f5ce63fb36a1462e98577e64bed9e8637a
 EBUILD netbeans-harness-9999_p20160429.ebuild 4126 SHA256 fbc8a05c691e4b9d7e9d1fd8b952aec66d98b7dfc2de71e7068b1e0d151f39b1 SHA512 bf486a03dd2bb9740a67fc49aeaf0eaf02ec5284c0d162a25609d53ce27e31041d4bc369467e44c97088cb56e320f03987186597e326ab2bc2ca7995c7d3a787 WHIRLPOOL 9290445142f4b0fb2f629cfe9f45de6818166780540f479680853b539969cc35baf7e53276217c81fbd625d99c032127895d1ea01b699ed95b41f5de95d41f97
+EBUILD netbeans-harness-9999_p20160430.ebuild 4126 SHA256 63e4b6d886348f7f39077305292df0ad29183de98d727035ecb3ef85531d5f10 SHA512 db0f8c1b25cd93d77dab0c65fb4acd11af91dbc665014acf0aeed05c608103aae62b099f4be5a96a7d19f17c12f11b8b9436f05a2a25202889c2cdf283ec798e WHIRLPOOL 00b6fd7f9e4eecb2ac1c58a26cff2e70b9bad1268661aa598d525e41135a4e6d2ca9facff3961a44e4fb6a17561e4410c640bb48bfa2b6b59b1fd4c5b07ff172
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160430.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160430.ebuild
new file mode 100644
index 0000000..093bed1
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20160430.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-30_00-02-33/zip/netbeans-trunk-nightly-201604300002-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 50b974b..dfc5a9c 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -165,6 +165,7 @@ DIST netbeans-trunk-nightly-201604261340-src.zip 213360814 SHA256 82a01aa68497b1
 DIST netbeans-trunk-nightly-201604270002-src.zip 213361504 SHA256 7969b4b1058bfd65cfa704058136d06f8f87bfe2290354ead9ecf279ffdbf462 SHA512 8be518f7b1771a21dd0be041b71d990447fb158ed6d2be2e862eaa98ee40922e3b235627508b2e32d6c9f5f0834fdcd2d60f80b7253fcfc8d10e62ee3229cd23 WHIRLPOOL 4400c9f7f789ed54d9af81680b8c134b6766d1f101e8e94dfadf1faf579a5fe9a9d6c65f6ae87368d8920c0d60813ba6854f9af668db42f0d4219174a3905c67
 DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247baa9620dae7672b3b27c8863c40f6d37ad5e6649fe6cf013752 SHA512 61af7c64fa9f0725752b28f78edc006362dbb9441f9c22d4f290c362ba76b94f34eaa3e0acac026f8e10f385c106dff33af0bc22673fec35f5e70528db001ed7 WHIRLPOOL 4021eee486a6e4fe4df381154d94caefdd74d725103aa3c996d64d159c433f49939a7abcce063ec130087cde2a7609750b98e69a3c3571171865eb6657c09b8d
 DIST netbeans-trunk-nightly-201604290002-src.zip 213411377 SHA256 d0ac79f9aceaaf246c9b20cd612472e6ecc4abc9bf6add0d61fadfca3ba85a79 SHA512 ac78733d4248f6fc6ff23705f1db5e001eca8e05c2dae7c3e2e59a60dd8afbe9e6a363188e17cb78492da6e1fe35cf5bcd87a0b0c1fc4e0d91129f0812db0bd6 WHIRLPOOL 4a704f8a4aa16130c84fd481f7e1ff45f87adb589e71955857b0342927dfe960b73adde97ba12022d265169cd4b736baa48f4bb4e10d8311bab787cbeefa28b9
+DIST netbeans-trunk-nightly-201604300002-src.zip 213455252 SHA256 8ac717a944d58471d4ceb9a22a21deaf0d1f51f4eca622ebaa8f4f100f7a5338 SHA512 32a07261706f944f02b161d687998395a588c060b2e59311b2e3e08a84237e1635df2af75d523da87845e794a906283ceae26b17d88b2c649d542ba525c94429 WHIRLPOOL da034854b495fc9d685d34a181fcdba320f58718a0a2ab939ae3bba9049941b405555db173a314f4881eac31e7d42d78641d96f7e097d68ecc2fe06a0c2133df
 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_p20160329.ebuild 30250 SHA256 6d14e82007f2246082db0d0e01bb93e578b0ff3f1b2a9aa68b83a4f8a18eb1a4 SHA512 08351979dd42e6f6d5d4ac383661eb0fb5d8b6716a32346270681fc58091b32115075c6ad4c1c6af153f5f2c55d4c3a4046af824fd21bba8b62537953880f5fa WHIRLPOOL fd35a92dd12cdff6145f19447d7666a2df19f8c206ef5bbda455d7019682b35bbce6bc3f90df9f426719d98f93492c1f513e22f1fb758dccdf60126596a46791
@@ -189,4 +190,5 @@ EBUILD netbeans-ide-9999_p20160426.ebuild 30761 SHA256 29bef6d41793577f22b7492df
 EBUILD netbeans-ide-9999_p20160427.ebuild 30761 SHA256 2a78f48c00abe6d07efa1c77ccf02803a5320190f3b43f3375383c8410d9fcee SHA512 cadb351e8252cde28abd2f0dbc0cdd27c84ea49ac247f18c5e725f9fc479fb1ce92065ab21b9bf0cd37599b74940fe15658f2b4e03b8378f05dbe48a8b008e23 WHIRLPOOL af67da37980787e81fabf8aefc6d4f5ad07e11f442d50a63d3843c08dbfbfb1c5284fe828069e90efd31e39610927db9d600dad9e126b075faba9a837fc6b315
 EBUILD netbeans-ide-9999_p20160428.ebuild 30761 SHA256 d6735e6e8cf412cbfb9dd4a2f0f68f8296b74e03fe87b12150506f7c063f281d SHA512 d3c49f4a00823801049688170c461ebcc5de106f30fa11e232d953a56cf196c946610cbda0216f393c28923efd5017a28d8fc5870d90e98c6a5fd347a400711d WHIRLPOOL ba3d111337fd5e21e3a4e97457c1f00f2b53b0af20991833203c6f68301520853731f63b291d6adc55d6a96b42d52e13e6d65bd6dcf529c39bc40f30d334155a
 EBUILD netbeans-ide-9999_p20160429.ebuild 30761 SHA256 2ae3370291b5d623f905e5c713209050e57b45445f3fe4f7d44ec9a74e69422f SHA512 f1110a99d0e4b9f94019cab2169aa99932d1361377c7f709372a85a2aaf07c3b56f37c8c0e5d7a7f3c3198ee1e76ed565eccb56d44a82d75de733950e853cbe0 WHIRLPOOL f2a2b549b4ed393af308a9dd52d57ff8172dc246c1535440bff99004e605fd41525ba7ca02cd6afe87e43a997fc4f4ece380bd6ebe3f7947894914a57fd45510
+EBUILD netbeans-ide-9999_p20160430.ebuild 30761 SHA256 57128e51bcebcdf8c0e950ec6e6681b7c496388c9e2bc60d6ee78e3edd9cf06f SHA512 d6373d9c2c0359ff491aa30e227332abdfabf35eaf76a64ad1aa6994d33a9ac916d1733b95530b296203e20f9b5f11cea26019776b2341834b0b08ab0fafecaf WHIRLPOOL 21d6ce2570a3992f30a0b445b5a577f3a871fe04368170ff29c1d7bf600b434e273d541880ad66d0100fb4d71c1ba92082f73f49abb26abae5285fe1b4332bc1
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160430.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160430.ebuild
new file mode 100644
index 0000000..b063962
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20160430.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-30_00-02-33/zip/netbeans-trunk-nightly-201604300002-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 9b5a59d..35f977e 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -61,6 +61,7 @@ DIST netbeans-trunk-nightly-201604261340-src.zip 213360814 SHA256 82a01aa68497b1
 DIST netbeans-trunk-nightly-201604270002-src.zip 213361504 SHA256 7969b4b1058bfd65cfa704058136d06f8f87bfe2290354ead9ecf279ffdbf462 SHA512 8be518f7b1771a21dd0be041b71d990447fb158ed6d2be2e862eaa98ee40922e3b235627508b2e32d6c9f5f0834fdcd2d60f80b7253fcfc8d10e62ee3229cd23 WHIRLPOOL 4400c9f7f789ed54d9af81680b8c134b6766d1f101e8e94dfadf1faf579a5fe9a9d6c65f6ae87368d8920c0d60813ba6854f9af668db42f0d4219174a3905c67
 DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247baa9620dae7672b3b27c8863c40f6d37ad5e6649fe6cf013752 SHA512 61af7c64fa9f0725752b28f78edc006362dbb9441f9c22d4f290c362ba76b94f34eaa3e0acac026f8e10f385c106dff33af0bc22673fec35f5e70528db001ed7 WHIRLPOOL 4021eee486a6e4fe4df381154d94caefdd74d725103aa3c996d64d159c433f49939a7abcce063ec130087cde2a7609750b98e69a3c3571171865eb6657c09b8d
 DIST netbeans-trunk-nightly-201604290002-src.zip 213411377 SHA256 d0ac79f9aceaaf246c9b20cd612472e6ecc4abc9bf6add0d61fadfca3ba85a79 SHA512 ac78733d4248f6fc6ff23705f1db5e001eca8e05c2dae7c3e2e59a60dd8afbe9e6a363188e17cb78492da6e1fe35cf5bcd87a0b0c1fc4e0d91129f0812db0bd6 WHIRLPOOL 4a704f8a4aa16130c84fd481f7e1ff45f87adb589e71955857b0342927dfe960b73adde97ba12022d265169cd4b736baa48f4bb4e10d8311bab787cbeefa28b9
+DIST netbeans-trunk-nightly-201604300002-src.zip 213455252 SHA256 8ac717a944d58471d4ceb9a22a21deaf0d1f51f4eca622ebaa8f4f100f7a5338 SHA512 32a07261706f944f02b161d687998395a588c060b2e59311b2e3e08a84237e1635df2af75d523da87845e794a906283ceae26b17d88b2c649d542ba525c94429 WHIRLPOOL da034854b495fc9d685d34a181fcdba320f58718a0a2ab939ae3bba9049941b405555db173a314f4881eac31e7d42d78641d96f7e097d68ecc2fe06a0c2133df
 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_p20160329.ebuild 14930 SHA256 b5130c99937fa3eace6917bf544981290651cd55749f5f60af944e50bc9822fe SHA512 3fb99d19f29835e9eebc58227a7e5d8bc4b3f078885f43f294bc00ce33f86c395e50ea72ea072bb103d1ac7e72487d6c347640a8cec0b6e44dc86cdfbb573453 WHIRLPOOL 78445a2941bc4e890ddf7888602ef4f81616d8c57f8b5f23e515e11347e6d6e90c3b73f278cb49a69b1f782f34901500c4a08e0a64627ff510e89145c020af43
@@ -85,4 +86,5 @@ EBUILD netbeans-java-9999_p20160426.ebuild 15656 SHA256 8a4100f2086e3ac3225b5056
 EBUILD netbeans-java-9999_p20160427.ebuild 15656 SHA256 e91542bf8daaa74dae5f86bd6c40bdbcbfc8eb6f677889733d955af5299808dd SHA512 ef1ca4eef1b7da6103f74829dcf7437795e1dfde8e01b346072f67182d2ba73f37aaf4320db6da06dfb624002693508d981e0112a004b0be758e0d7c8da94b4e WHIRLPOOL 34952e6862bb050fb43daeb5a6c66ae2220dc316b4b0a7f6209300f7f9db7567bd6029e31c70b2bd84d7505d6ea36f42d71ba66142d9284feb86c5a223b72e88
 EBUILD netbeans-java-9999_p20160428.ebuild 15656 SHA256 197082a052d63c9aea66f8595e7a2cdc28ef3a0c3e662f4dbf215d794e2b8129 SHA512 5658fd47bd0582945b333a666e47eab9d358fe92277725edfdedde5ae5572b51aed6a63808e13c5d27bb788738fcd263baf36c6b1ff8740153fd89605a5aa9f4 WHIRLPOOL ac7ecbd6bea378255961f986f2998bc6bfdd6bff3343df76ad4f3445bf2d8a0815437cf547dd50a9b4ed4c80b57c027e77b9c39b22ed3d9769dce35672ec02fa
 EBUILD netbeans-java-9999_p20160429.ebuild 15656 SHA256 69aba6e099a96f071eef4d03dc3367aeb36f4f9d8d82808d894cbb3d64b5ee06 SHA512 9e1949638884d3e6cf46fdf79bf21afb0afe3fd5859cac1127f6d2ea2d3304746378e76c674c0031a4b372dff7badc8848aab5e8866e459c00c0f67574beec80 WHIRLPOOL bc9a0704a355e727d352475388e7424f166a48a74af8be4de0725a45ca3e4f00434802d6e3a59ef7372fc4484adb08879af320f12b6fc52e4c1f8a52cc10bdb5
+EBUILD netbeans-java-9999_p20160430.ebuild 15656 SHA256 25fd51247bc67e579554cd2fe817c5ff4bedcd3ca431f5a7f7d4a4cbf54825a8 SHA512 063bb5fc4cacdfda1609193fe6a34fc1f5d39e84745ec2c2cec8d9bf151d0f49a41ebd042b47a73e33651b112abe8801d59f798a5f0051d37a6ffebab19d4605 WHIRLPOOL 2414a92762c16f3e3ccb08d8e9882dba4de2cce320dbd28b086f95ee8ac485ab516532705f778becbc9cc38898288bef3dbab97a57cae10b53d71f03b63079d3
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160430.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160430.ebuild
new file mode 100644
index 0000000..0b0cf62
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20160430.ebuild
@@ -0,0 +1,280 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+# Maven cannot be unbundled because it depends on exact maven version and exact content of maven directory
+
+DESCRIPTION="Netbeans Java Cluster"
+HOMEPAGE="http://netbeans.org/projects/java"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-04-30_00-02-33/zip/netbeans-trunk-nightly-201604300002-src.zip"
+# jarjar-1.4 contains also asm libraries
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar
+	http://hg.netbeans.org/binaries/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip
+	http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip
+	http://hg.netbeans.org/binaries/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar
+	http://hg.netbeans.org/binaries/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip
+	http://hg.netbeans.org/binaries/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar
+	http://hg.netbeans.org/binaries/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar
+	http://hg.netbeans.org/binaries/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar
+	http://hg.netbeans.org/binaries/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar
+	http://hg.netbeans.org/binaries/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip
+	http://hg.netbeans.org/binaries/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip
+	http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip
+	http://hg.netbeans.org/binaries/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip
+	http://hg.netbeans.org/binaries/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar
+	http://hg.netbeans.org/binaries/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar
+	http://hg.netbeans.org/binaries/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar
+	http://hg.netbeans.org/binaries/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar
+	http://hg.netbeans.org/binaries/E3764E0AB4F9F9ED16AEB6A68B8E3F2442DDCCB6-nb-javac-impl.jar
+	http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
+	http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar
+	http://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip
+	http://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip
+	http://hg.netbeans.org/binaries/BFCC4C322190D6E3DD2FA9F191C0359D380D87C5-wagon-file-2.10.jar
+	http://hg.netbeans.org/binaries/4EF309C09ABB5F8B2D0C6A4010205DB185729CDC-wagon-http-2.10-shaded.jar
+	http://hg.netbeans.org/binaries/3B96251214DF697E902C849EB0B4A0EFA2CD1A53-wagon-http-shared-2.10.jar
+	http://hg.netbeans.org/binaries/0CD9CDDE3F56BB5250D87C54592F04CBC24F03BF-wagon-provider-api-2.10.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/beansbinding:0
+	dev-java/cglib:3
+	dev-java/jdom:0"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	dev-java/json-simple:0
+	dev-java/junit:4"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}
+	dev-java/absolutelayout:0
+	>=dev-java/antlr-2.7.7-r7:0
+	dev-java/c3p0:0
+	dev-java/commons-cli:1
+	dev-java/commons-collections:0
+	dev-java/dom4j:1
+	dev-java/fastinfoset:0
+	dev-java/glassfish-transaction-api:0
+	dev-java/javassist:3
+	dev-java/jboss-logging:0
+	dev-java/jsr67:0
+	dev-java/jsr181:0
+	>=dev-java/jtidy-1:0
+	dev-java/log4j:0
+	dev-java/mimepull:0
+	dev-java/oracle-javamail:0
+	dev-java/saaj:0
+	dev-java/slf4j-api:0
+	dev-java/slf4j-log4j12:0
+	dev-java/slf4j-simple:0
+	dev-java/stax-ex:0
+	dev-java/stax2-api:0
+	dev-java/xmlstreambuffer:0"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.java -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+pkg_pretend() {
+	local die_now=""
+
+	if [ -d /usr/share/netbeans-java-${SLOT}/ant ]; then
+		if [ -n "$(find /usr/share/netbeans-java-${SLOT}/ant -type l)" ]; then
+			eerror "Please remove following symlinks and run emerge again:"
+			find /usr/share/netbeans-java-${SLOT}/ant -type l
+			die_now="1"
+		fi
+	fi
+
+	if [ -L /usr/share/netbeans-java-${SLOT}/maven ]; then
+		if [ -z "${die_now}" ]; then
+			eerror "Please remove following symlinks and run emerge again:"
+		fi
+
+		echo "/usr/share/netbeans-java-${SLOT}/maven"
+		die_now="1"
+	fi
+
+	if [ -n "${die_now}" ]; then
+		die "Symlinks exist"
+	fi
+}
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r16-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar maven/external/aether-api-1.0.2.v20150114.jar || die
+	ln -s "${DISTDIR}"/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip maven.embedder/external/apache-maven-3.0.5-bin.zip || die
+	ln -s "${DISTDIR}"/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip o.jdesktop.beansbinding/external/beansbinding-1.2.1-doc.zip || die
+	ln -s "${DISTDIR}"/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar j2ee.eclipselink/external/eclipselink.jar || die
+	ln -s "${DISTDIR}"/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip hibernate4lib/external/hibernate-release-4.3.1-lib.zip || die
+	ln -s "${DISTDIR}"/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar maven.indexer/external/indexer-artifact-5.1.1.jar || die
+	ln -s "${DISTDIR}"/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar maven.indexer/external/indexer-core-5.1.1-patched.jar || die
+	ln -s "${DISTDIR}"/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar maven/external/jarjar-1.4.jar || die
+	ln -s "${DISTDIR}"/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar j2ee.eclipselink/external/javax.persistence_2.1.0.v201304241213.jar || die
+	ln -s "${DISTDIR}"/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip websvc.jaxws21/external/jaxws-2.2.6.zip || die
+	ln -s "${DISTDIR}"/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip websvc.jaxws21api/external/jaxws-2.2.6-api.zip || die
+	ln -s "${DISTDIR}"/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip websvc.jaxws21/external/jaxws-api-doc.zip || die
+	ln -s "${DISTDIR}"/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip j2ee.eclipselink/external/JPAjavadocs04032013.zip || die
+	ln -s "${DISTDIR}"/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar maven.indexer/external/lucene-core-3.6.2.jar || die
+	ln -s "${DISTDIR}"/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar maven.indexer/external/lucene-highlighter-3.6.2.jar || die
+	ln -s "${DISTDIR}"/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar maven.embedder/external/maven-dependency-tree-2.0.jar || die
+	ln -s "${DISTDIR}"/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
+	ln -s "${DISTDIR}"/E3764E0AB4F9F9ED16AEB6A68B8E3F2442DDCCB6-nb-javac-impl.jar libs.javacimpl/external/nb-javac-impl.jar || die
+	ln -s "${DISTDIR}"/CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.jar maven/external/netbeans-cos.jar || die
+	ln -s "${DISTDIR}"/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselink/external/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar || die
+	ln -s "${DISTDIR}"/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselinkmodelgen/external/org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar || die
+	ln -s "${DISTDIR}"/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip libs.springframework/external/spring-framework-3.2.7.RELEASE.zip || die
+	ln -s "${DISTDIR}"/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip libs.springframework/external/spring-framework-4.0.1.RELEASE.zip || die
+	ln -s "${DISTDIR}"/BFCC4C322190D6E3DD2FA9F191C0359D380D87C5-wagon-file-2.10.jar maven.embedder/external/wagon-file-2.10.jar || die
+	ln -s "${DISTDIR}"/4EF309C09ABB5F8B2D0C6A4010205DB185729CDC-wagon-http-2.10-shaded.jar maven.embedder/external/wagon-http-2.10-shaded.jar || die
+	ln -s "${DISTDIR}"/3B96251214DF697E902C849EB0B4A0EFA2CD1A53-wagon-http-shared-2.10.jar maven.embedder/external/wagon-http-shared-2.10.jar || die
+	ln -s "${DISTDIR}"/0CD9CDDE3F56BB5250D87C54592F04CBC24F03BF-wagon-provider-api-2.10.jar maven.embedder/external/wagon-provider-api-2.10.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.cglib/external cglib-3 cglib.jar cglib-2.2.jar
+	java-pkg_jar-from --build-only --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+	java-pkg_jar-from --into maven.embedder/external jdom jdom.jar jdom-1.0.jar
+	java-pkg_jar-from --into o.jdesktop.beansbinding/external beansbinding beansbinding.jar beansbinding-1.2.1.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/java >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+	grep -E "/java$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	chmod 755 "${D}"/${INSTALL_DIR}/maven/bin/mvn* || die
+	rm -fr "${D}"/${INSTALL_DIR}/maven/bin/*.bat || die
+
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/maven/lib
+	pushd "${instdir}" >/dev/null || die
+	rm commons-cli-1.2.jar && java-pkg_jar-from --into "${instdir}" commons-cli-1 commons-cli.jar commons-cli-1.2.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext
+	pushd "${instdir}" >/dev/null || die
+	rm AbsoluteLayout.jar  && java-pkg_jar-from --into "${instdir}" absolutelayout absolutelayout.jar AbsoluteLayout.jar
+	rm beansbinding-1.2.1.jar && java-pkg_jar-from --into "${instdir}" beansbinding beansbinding.jar beansbinding-1.2.1.jar
+	rm cglib-2.2.jar && java-pkg_jar-from --into "${instdir}" cglib-3 cglib.jar cglib-2.2.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/hibernate4
+	pushd "${instdir}" >/dev/null || die
+	rm antlr-2.7.7.jar && java-pkg_jar-from --into "${instdir}" antlr antlr.jar antlr-2.7.7.jar
+	rm c3p0-0.9.2.1.jar && java-pkg_jar-from --into "${instdir}" c3p0 c3p0.jar c3p0-0.9.2.1.jar
+	rm cglib-2.2.jar && java-pkg_jar-from --into "${instdir}" cglib-3 cglib.jar cglib-2.2.jar
+	rm commons-collections-3.2.1.jar && java-pkg_jar-from --into "${instdir}" commons-collections commons-collections.jar commons-collections-3.2.1.jar
+	rm dom4j-1.6.1.jar && java-pkg_jar-from --into "${instdir}" dom4j-1 dom4j.jar dom4j-1.6.1.jar
+	rm javassist-3.18.1-GA.jar && java-pkg_jar-from --into "${instdir}" javassist-3 javassist.jar javassist-3.18.1-GA.jar
+	rm jboss-logging-3.1.3.GA.jar && java-pkg_jar-from --into "${instdir}" jboss-logging jboss-logging.jar jboss-logging-3.1.3.GA.jar
+	rm jboss-transaction-api_1.2_spec-1.0.0.Final.jar && java-pkg_jar-from --into "${instdir}" glassfish-transaction-api jta.jar jboss-transaction-api_1.2_spec-1.0.0.Final.jar
+	rm jtidy-r8-20060801.jar && java-pkg_jar-from --into "${instdir}" jtidy jtidy.jar jtidy-r8-20060801.jar
+	rm log4j-1.2.12.jar && java-pkg_jar-from --into "${instdir}" log4j log4j.jar log4j-1.2.12.jar
+	rm slf4j-api-1.6.1.jar && java-pkg_jar-from --into "${instdir}" slf4j-api slf4j-api.jar slf4j-api-1.6.1.jar
+	rm slf4j-log4j12-1.6.1.jar && java-pkg_jar-from --into "${instdir}" slf4j-log4j12 slf4j-log4j12.jar slf4j-log4j12-1.6.1.jar
+	rm slf4j-simple-1.6.1.jar && java-pkg_jar-from --into "${instdir}" slf4j-simple slf4j-simple.jar slf4j-simple-1.6.1.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxws22
+	pushd "${instdir}" >/dev/null || die
+	rm FastInfoset.jar && java-pkg_jar-from --into "${instdir}" fastinfoset fastinfoset.jar FastInfoset.jar
+	rm javax.mail_1.4.jar && java-pkg_jar-from --into "${instdir}" oracle-javamail mail.jar javax.mail_1.4.jar
+	rm mimepull.jar && java-pkg_jar-from --into "${instdir}" mimepull mimepull.jar
+	rm saaj-impl.jar && java-pkg_jar-from --into "${instdir}" saaj saaj.jar saaj-impl.jar
+	rm stax-ex.jar && java-pkg_jar-from --into "${instdir}" stax-ex stax-ex.jar
+	rm stax2-api.jar && java-pkg_jar-from --into "${instdir}" stax2-api stax2-api.jar
+	rm streambuffer.jar && java-pkg_jar-from --into "${instdir}" xmlstreambuffer xmlstreambuffer.jar streambuffer.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxws22/api
+	pushd "${instdir}" >/dev/null || die
+	rm jsr181-api.jar && java-pkg_jar-from --into "${instdir}" jsr181 jsr181.jar jsr181-api.jar
+	rm saaj-api.jar && java-pkg_jar-from --into "${instdir}" jsr67 jsr67.jar saaj-api.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/maven
+	pushd "${instdir}" >/dev/null || die
+	rm jdom-1.0.jar && java-pkg_jar-from --into "${instdir}" jdom jdom.jar jdom-1.0.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java
+}

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index 49abbeb..ade7a90 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201604261340-src.zip 213360814 SHA256 82a01aa68497b1
 DIST netbeans-trunk-nightly-201604270002-src.zip 213361504 SHA256 7969b4b1058bfd65cfa704058136d06f8f87bfe2290354ead9ecf279ffdbf462 SHA512 8be518f7b1771a21dd0be041b71d990447fb158ed6d2be2e862eaa98ee40922e3b235627508b2e32d6c9f5f0834fdcd2d60f80b7253fcfc8d10e62ee3229cd23 WHIRLPOOL 4400c9f7f789ed54d9af81680b8c134b6766d1f101e8e94dfadf1faf579a5fe9a9d6c65f6ae87368d8920c0d60813ba6854f9af668db42f0d4219174a3905c67
 DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247baa9620dae7672b3b27c8863c40f6d37ad5e6649fe6cf013752 SHA512 61af7c64fa9f0725752b28f78edc006362dbb9441f9c22d4f290c362ba76b94f34eaa3e0acac026f8e10f385c106dff33af0bc22673fec35f5e70528db001ed7 WHIRLPOOL 4021eee486a6e4fe4df381154d94caefdd74d725103aa3c996d64d159c433f49939a7abcce063ec130087cde2a7609750b98e69a3c3571171865eb6657c09b8d
 DIST netbeans-trunk-nightly-201604290002-src.zip 213411377 SHA256 d0ac79f9aceaaf246c9b20cd612472e6ecc4abc9bf6add0d61fadfca3ba85a79 SHA512 ac78733d4248f6fc6ff23705f1db5e001eca8e05c2dae7c3e2e59a60dd8afbe9e6a363188e17cb78492da6e1fe35cf5bcd87a0b0c1fc4e0d91129f0812db0bd6 WHIRLPOOL 4a704f8a4aa16130c84fd481f7e1ff45f87adb589e71955857b0342927dfe960b73adde97ba12022d265169cd4b736baa48f4bb4e10d8311bab787cbeefa28b9
+DIST netbeans-trunk-nightly-201604300002-src.zip 213455252 SHA256 8ac717a944d58471d4ceb9a22a21deaf0d1f51f4eca622ebaa8f4f100f7a5338 SHA512 32a07261706f944f02b161d687998395a588c060b2e59311b2e3e08a84237e1635df2af75d523da87845e794a906283ceae26b17d88b2c649d542ba525c94429 WHIRLPOOL da034854b495fc9d685d34a181fcdba320f58718a0a2ab939ae3bba9049941b405555db173a314f4881eac31e7d42d78641d96f7e097d68ecc2fe06a0c2133df
 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_p20160329.ebuild 4971 SHA256 05e935166a8e1155d8fbc78b06f19cc45b4425bab40cf2de1f73e76e69094cc0 SHA512 4f98bad550427586b746e58c76f8511433831c3566a25820fe0b028515feeda881c2647b03c28f02df2b7e170dcdd3b68022b8598240b4748a5cc87b875d4c34 WHIRLPOOL 61ec4cceb7ce93510f4827a87ac404d16f375ec7e1c621191057aed27681ae6390934b8c9831729efbb94f58073f914dcb7c6d630e9cb101d6f0595de6f67098
@@ -53,4 +54,5 @@ EBUILD netbeans-javacard-9999_p20160426.ebuild 4971 SHA256 022194eb62bdb49bfe851
 EBUILD netbeans-javacard-9999_p20160427.ebuild 4971 SHA256 2cd20b10af7bf0f242afc274531c890c0a42e10308a7881900471472d07b8dd6 SHA512 bf87c545967b468962c84d70d08090c440c82ebe6bcffee99684d4746cbb451faea8c65da68daacd80cc20fa950a9ee2d0095d96c90626fba7e1ebfa02124853 WHIRLPOOL 6f55492724736c66ecfb4d3bf18ce9be62c8a6fb58637851eec0adaf11da7c9bc45f1d01fff2c54f9e17c8c408d2fe6a35fc55d44f77cf1d229f3a085ba728eb
 EBUILD netbeans-javacard-9999_p20160428.ebuild 4971 SHA256 953faa9ef469c397ce24d47c608926a014b50202ec5197261f4d7118a5a2be0c SHA512 a14dc4090bef622fd3b13dcf19d2f692996d541b54ee156c2bd7cc87da5a5273c955fa829026f88e3d04be09f4275e41be797eee29a64c0b5af13eb7955b9527 WHIRLPOOL fed09a4d12a7adb2ac2de781f5452df9764cd56ae26e8396d516c06e739af88f34b44135f1a7a136d972ff545fb807d69fd6ed2fb82370eb09020a4f822e8a8e
 EBUILD netbeans-javacard-9999_p20160429.ebuild 4971 SHA256 e92b8594afb8fd58ca38c9683807acf8e9c5a6cc2a2bc69410ebb7d3ed5aa1bc SHA512 385c1488c84c2b2370c9c0e0a927fc40a2be234be6bd3a9c6d213ca02b1a7a2bd091443adff4924d09accb891a01c10eaa27e8b29e1b7dfbf3c5d493893c45bf WHIRLPOOL 952b838e8ae795bc46118c119385fbafcf32d7e4f513f5232680f6db17dd6d2e670aaaa319467baad0dd5ff9eef3f1c35f11a2b8e614a131dd05cb4f5c72e17d
+EBUILD netbeans-javacard-9999_p20160430.ebuild 4971 SHA256 20462176c170768faffa16b9eac3f2349caea337dafeacbf58ad9778924ec032 SHA512 347b7f5473f750d9a57149e9ab317a1be360ed0d27007d521920867de1c1ceac62343fb79f05589d6132bc42c447e00f9821bf139955a52344cb43ce30741ea2 WHIRLPOOL c188dcc97df4ea053513e7ebce5c513609ca87301bd7f326e78433c1827dfc70ff7caf470a01cfc2dccaa5389ac64c2c0b6d7939c6f3b7c10eb7e91c70e7d401
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160430.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160430.ebuild
new file mode 100644
index 0000000..99ef26f
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160430.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-30_00-02-33/zip/netbeans-trunk-nightly-201604300002-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 73088c2..be3c592 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201604261340-src.zip 213360814 SHA256 82a01aa68497b1
 DIST netbeans-trunk-nightly-201604270002-src.zip 213361504 SHA256 7969b4b1058bfd65cfa704058136d06f8f87bfe2290354ead9ecf279ffdbf462 SHA512 8be518f7b1771a21dd0be041b71d990447fb158ed6d2be2e862eaa98ee40922e3b235627508b2e32d6c9f5f0834fdcd2d60f80b7253fcfc8d10e62ee3229cd23 WHIRLPOOL 4400c9f7f789ed54d9af81680b8c134b6766d1f101e8e94dfadf1faf579a5fe9a9d6c65f6ae87368d8920c0d60813ba6854f9af668db42f0d4219174a3905c67
 DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247baa9620dae7672b3b27c8863c40f6d37ad5e6649fe6cf013752 SHA512 61af7c64fa9f0725752b28f78edc006362dbb9441f9c22d4f290c362ba76b94f34eaa3e0acac026f8e10f385c106dff33af0bc22673fec35f5e70528db001ed7 WHIRLPOOL 4021eee486a6e4fe4df381154d94caefdd74d725103aa3c996d64d159c433f49939a7abcce063ec130087cde2a7609750b98e69a3c3571171865eb6657c09b8d
 DIST netbeans-trunk-nightly-201604290002-src.zip 213411377 SHA256 d0ac79f9aceaaf246c9b20cd612472e6ecc4abc9bf6add0d61fadfca3ba85a79 SHA512 ac78733d4248f6fc6ff23705f1db5e001eca8e05c2dae7c3e2e59a60dd8afbe9e6a363188e17cb78492da6e1fe35cf5bcd87a0b0c1fc4e0d91129f0812db0bd6 WHIRLPOOL 4a704f8a4aa16130c84fd481f7e1ff45f87adb589e71955857b0342927dfe960b73adde97ba12022d265169cd4b736baa48f4bb4e10d8311bab787cbeefa28b9
+DIST netbeans-trunk-nightly-201604300002-src.zip 213455252 SHA256 8ac717a944d58471d4ceb9a22a21deaf0d1f51f4eca622ebaa8f4f100f7a5338 SHA512 32a07261706f944f02b161d687998395a588c060b2e59311b2e3e08a84237e1635df2af75d523da87845e794a906283ceae26b17d88b2c649d542ba525c94429 WHIRLPOOL da034854b495fc9d685d34a181fcdba320f58718a0a2ab939ae3bba9049941b405555db173a314f4881eac31e7d42d78641d96f7e097d68ecc2fe06a0c2133df
 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_p20160329.ebuild 6293 SHA256 c2aa61de03070ede75a2b55ebc9227dea09dee2382762d87557a5d84a63ac8af SHA512 87b4db3bb2cf60834a9a59436ebb90a42ee1f62d700916d78ab4c8dc5d6b00f623efba0b8b32a574ee6aa22f622b0f004a9f3e8d2b911ac3644f833a18cf86eb WHIRLPOOL 0ddb5511d52baa63550345a2bbf4af0bca40533d2958bb07e8ae8e6a1733af77d1ce7b749fd3afc3bcf2e735eec7041adcab86daea0c2087f4ec50b5ad6920d0
@@ -52,4 +53,5 @@ EBUILD netbeans-javadoc-9999_p20160426.ebuild 6293 SHA256 01d332d412cd3c6070ac5b
 EBUILD netbeans-javadoc-9999_p20160427.ebuild 6293 SHA256 68a800b9f48c34532f72bd43215c247b7202e5f10ca568049bf79b5a13dd7ee1 SHA512 f8a2c9f6e6522ffd7b4c41f3fde9133673ccf4cf36bcb2622aa76d02d495d90e9cf15d1a31f66e80643d3a88811af08046e1babf92d621707c7ba4eda04047f0 WHIRLPOOL 7192d8d26478e18bfd704794ab2fec31c4f7a5d51f28ce3c500bbd9a4af7fe74307d865ee80e14f438f5b0db790ac47a1f56d2280e5763c9d78da6f6b55e1ba0
 EBUILD netbeans-javadoc-9999_p20160428.ebuild 6293 SHA256 a45afe043254c2596f50568a88fe8e61738ee230c369fdc09e583b1898af2b35 SHA512 4a06b6abae4513a4fc810f735546777ff7f68f63f49def5a210dad83e09a75c44b59c80afb5bb6a22f6bcaa28ff97021ac2b987cbb2d4f4715abf7e3ac5d090b WHIRLPOOL a8a400e470bcab256c606583faa300745e3fc8f604c0788e3a37d6015c7f1e6781d4444472dfa6359a1b6001d2769ab175da299c783c5e5f6e8261890c41f407
 EBUILD netbeans-javadoc-9999_p20160429.ebuild 6293 SHA256 cb61a015c4205943ace21756e668f17d4620951e0e9756877b59208b2ab73a38 SHA512 733c75c7b490d08181ddbcd1ae491ae79a3268edd5f4d876084c77160ad3056ee45efa0aceea5069d37637f47b4ba84600dab944c0b348dfe0dcd18c56f42f9a WHIRLPOOL a5715202a53a24bd9c18c046b46ff2139abb39b4eb84fa0b20550832663947f321e68ae58344e6e2f8a2910f18f207d03fc6000f1e206a1eb126d4f5e5edc75a
+EBUILD netbeans-javadoc-9999_p20160430.ebuild 6293 SHA256 b13f5fa58347a57d13391a3b465d4cd480c1b9c53ca3ca4769d8b06d5e7c31a6 SHA512 dfa6d5e3a2b64054c64c2943672eb5b65a70762aab2ce38ddc33d6c5febab3c8c647bdc9dfa27cd421788d437ea50849e34e621250c3b98a0997ba949dc13471 WHIRLPOOL cb506843d1adc9ee7c12f991f2bd83f2408705202945e4335944d980f7cbf318be1f2ace525b2a0f9c081c122b8dc8b0111424bf1ad27d369e98f8085905432e
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160430.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160430.ebuild
new file mode 100644
index 0000000..6cb4353
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160430.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-30_00-02-33/zip/netbeans-trunk-nightly-201604300002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+# oracle-jdk-bin is needed because of javafx which is not currently packaged separately
+DEPEND="dev-java/oracle-jdk-bin:1.8[javafx]
+	app-arch/unzip
+	dev-java/javahelp:0
+	dev-java/junit:4
+	~dev-java/netbeans-apisupport-${PV}
+	~dev-java/netbeans-cnd-${PV}
+	~dev-java/netbeans-dlight-${PV}
+	~dev-java/netbeans-enterprise-${PV}
+	~dev-java/netbeans-ergonomics-${PV}
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-groovy-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-javacard-${PV}
+	~dev-java/netbeans-mobility-${PV}
+	~dev-java/netbeans-nb-${PV}
+	~dev-java/netbeans-php-${PV}
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-profiler-${PV}
+	~dev-java/netbeans-websvccommon-${PV}"
+RDEPEND=""
+
+JAVA_PKG_BSFIX="off"
+JAVA_PKG_WANT_BUILD_VM="oracle-jdk-bin-1.8"
+JAVA_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r16-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip o.apache.tools.ant.module/external/ant-libs-1.9.7.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-apisupport-${SLOT} apisupport || die
+	cat /usr/share/netbeans-apisupport-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.apisupport.built
+
+	ln -s /usr/share/netbeans-cnd-${SLOT} cnd || die
+	cat /usr/share/netbeans-cnd-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.cnd.built
+
+	ln -s /usr/share/netbeans-dlight-${SLOT} dlight || die
+	cat /usr/share/netbeans-dlight-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.dlight.built
+
+	ln -s /usr/share/netbeans-enterprise-${SLOT} enterprise || die
+	cat /usr/share/netbeans-enterprise-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.enterprise.built
+
+	ln -s /usr/share/netbeans-ergonomics-${SLOT} ergonomics || die
+	cat /usr/share/netbeans-ergonomics-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ergonomics.built
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-groovy-${SLOT} groovy || die
+	cat /usr/share/netbeans-groovy-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.groovy.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-javacard-${SLOT} javacard || die
+	cat /usr/share/netbeans-javacard-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.javacard.built
+
+	ln -s /usr/share/netbeans-mobility-${SLOT} mobility || die
+	cat /usr/share/netbeans-mobility-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.mobility.built
+
+	ln -s /usr/share/netbeans-nb-${SLOT}/nb nb || die
+	cat /usr/share/netbeans-nb-${SLOT}/nb/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.nb.built
+
+	ln -s /usr/share/netbeans-php-${SLOT} php || die
+	cat /usr/share/netbeans-php-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.php.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-profiler-${SLOT} profiler || die
+	cat /usr/share/netbeans-profiler-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.profiler.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	eant -Dpermit.jdk8.builds=true -f nbbuild/build.xml bootstrap || die
+	ANT_OPTS="-Xmx1536m" eant -Dpermit.jdk8.builds=true -f nbbuild/javadoctools/build.xml build-javadoc
+}
+
+src_install() {
+	rm nbbuild/build/javadoc/*.zip
+	java-pkg_dojavadoc nbbuild/build/javadoc
+}

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index b6ae728..d3650b6 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201604261340-src.zip 213360814 SHA256 82a01aa68497b1
 DIST netbeans-trunk-nightly-201604270002-src.zip 213361504 SHA256 7969b4b1058bfd65cfa704058136d06f8f87bfe2290354ead9ecf279ffdbf462 SHA512 8be518f7b1771a21dd0be041b71d990447fb158ed6d2be2e862eaa98ee40922e3b235627508b2e32d6c9f5f0834fdcd2d60f80b7253fcfc8d10e62ee3229cd23 WHIRLPOOL 4400c9f7f789ed54d9af81680b8c134b6766d1f101e8e94dfadf1faf579a5fe9a9d6c65f6ae87368d8920c0d60813ba6854f9af668db42f0d4219174a3905c67
 DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247baa9620dae7672b3b27c8863c40f6d37ad5e6649fe6cf013752 SHA512 61af7c64fa9f0725752b28f78edc006362dbb9441f9c22d4f290c362ba76b94f34eaa3e0acac026f8e10f385c106dff33af0bc22673fec35f5e70528db001ed7 WHIRLPOOL 4021eee486a6e4fe4df381154d94caefdd74d725103aa3c996d64d159c433f49939a7abcce063ec130087cde2a7609750b98e69a3c3571171865eb6657c09b8d
 DIST netbeans-trunk-nightly-201604290002-src.zip 213411377 SHA256 d0ac79f9aceaaf246c9b20cd612472e6ecc4abc9bf6add0d61fadfca3ba85a79 SHA512 ac78733d4248f6fc6ff23705f1db5e001eca8e05c2dae7c3e2e59a60dd8afbe9e6a363188e17cb78492da6e1fe35cf5bcd87a0b0c1fc4e0d91129f0812db0bd6 WHIRLPOOL 4a704f8a4aa16130c84fd481f7e1ff45f87adb589e71955857b0342927dfe960b73adde97ba12022d265169cd4b736baa48f4bb4e10d8311bab787cbeefa28b9
+DIST netbeans-trunk-nightly-201604300002-src.zip 213455252 SHA256 8ac717a944d58471d4ceb9a22a21deaf0d1f51f4eca622ebaa8f4f100f7a5338 SHA512 32a07261706f944f02b161d687998395a588c060b2e59311b2e3e08a84237e1635df2af75d523da87845e794a906283ceae26b17d88b2c649d542ba525c94429 WHIRLPOOL da034854b495fc9d685d34a181fcdba320f58718a0a2ab939ae3bba9049941b405555db173a314f4881eac31e7d42d78641d96f7e097d68ecc2fe06a0c2133df
 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_p20160329.ebuild 4717 SHA256 4d939865949ce42fc60478a9795efdf59b3ff8b8022a03ada209029cc7b5b179 SHA512 8b74ef8017987be3ef086dd7dd03190b328f9f3c794d24641a7ed4b605cb301f9da6679d1848e0f1fd9707ba3cdf5cb67ef899280ee3b38c64e8435156b12550 WHIRLPOOL 265e288ee9608ab69fa1b749ebf513f4f6f7d2e3b416e670ffd4232e39acda5b76c71eedf7cc8d041fc8a508c65f00a2ccb96fa9ebed833a108bf7c01ae8f1a5
@@ -58,4 +59,5 @@ EBUILD netbeans-javafx-9999_p20160426.ebuild 4717 SHA256 19eab5b18589681d64ddcbf
 EBUILD netbeans-javafx-9999_p20160427.ebuild 4717 SHA256 57c5e3a324b2e4b544c1778ca61e5a8721b07b55c0519dab1f3e69fbb5e484e6 SHA512 4164ffa870cb3fd11e8dea8e22bf7a2bda745874dcc2a2529469451ffcb83f118c7fe95f7bb13f08aeda00198a150e1bcc600e2195f4827d5e9ddc6fadf240e3 WHIRLPOOL 7405876fee9c0685297dc1a5341aee11f510d05eb33f16811cb30407f30475e159a0e416ceec2f422c2f15fe38a57ef2409a532675a6ba10cad7f7e0cfc1dabd
 EBUILD netbeans-javafx-9999_p20160428.ebuild 4717 SHA256 d66d24fd69cf70db58c771a8022cbd16fe687b8fa04fad227460c9c4c16a282f SHA512 a8eadadc1e636c9a3907909fdc8f39af3c3f789dadd440f3717f183e28489b6f6d07e82ef1665b06dba6f2d7d750482c7f22b55ee8a38356d8208ba3e5c27ff5 WHIRLPOOL 2a938d9fde09ab500cb042026520f13f99c6d74452a230f146bf6d69930a6d4e1e3d108fa7e1d459712e6c6893b758d4f42025e0d5e32dc24db26b97b980194b
 EBUILD netbeans-javafx-9999_p20160429.ebuild 4717 SHA256 6772e6b5c12f9c149045a69a1e57c8fd4ca22482fb4c7387b84ffb1c71da1b9e SHA512 1f728784aeea95ad25621f6aeff0dcb6172e769356e48ee9b2fcaa9323c7c1e7f5a31f8c018dfaffd9a5158bb92d1592f4d3f1a3b01f318013dd19c21e00cdfb WHIRLPOOL 122f3cf88996a77894f361dd9bff5721b009134c9e6974cb24d2ddc56f95f1e997e59c46d312468ad51ca3ecb4daf1742290adaa4e4a57945952849a7b329fd2
+EBUILD netbeans-javafx-9999_p20160430.ebuild 4717 SHA256 e20cf78022aaa6abd1a010ec306c78a44b18e131aafb29f76dc85bdc3cb4f137 SHA512 4de45170fb042c9442bbf9a21219e19f65cad2949ba6d8d7b69b150945a435dd884ae477f3a495b7d9ab48f5ebf27351da5f6b63d80fd3506655ef867d181ae0 WHIRLPOOL 8d3254d2ca5e60befa50dbe28b34e32b637112f4c2dba4ce74bd41895c68eeca5ab446f06a4833c036f32b68ebc857bda23d81ef0b5d7ab394391737a84bafc5
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160430.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160430.ebuild
new file mode 100644
index 0000000..82a9348
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160430.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-30_00-02-33/zip/netbeans-trunk-nightly-201604300002-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 c81b694..3753aec 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201604261340-src.zip 213360814 SHA256 82a01aa68497b1
 DIST netbeans-trunk-nightly-201604270002-src.zip 213361504 SHA256 7969b4b1058bfd65cfa704058136d06f8f87bfe2290354ead9ecf279ffdbf462 SHA512 8be518f7b1771a21dd0be041b71d990447fb158ed6d2be2e862eaa98ee40922e3b235627508b2e32d6c9f5f0834fdcd2d60f80b7253fcfc8d10e62ee3229cd23 WHIRLPOOL 4400c9f7f789ed54d9af81680b8c134b6766d1f101e8e94dfadf1faf579a5fe9a9d6c65f6ae87368d8920c0d60813ba6854f9af668db42f0d4219174a3905c67
 DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247baa9620dae7672b3b27c8863c40f6d37ad5e6649fe6cf013752 SHA512 61af7c64fa9f0725752b28f78edc006362dbb9441f9c22d4f290c362ba76b94f34eaa3e0acac026f8e10f385c106dff33af0bc22673fec35f5e70528db001ed7 WHIRLPOOL 4021eee486a6e4fe4df381154d94caefdd74d725103aa3c996d64d159c433f49939a7abcce063ec130087cde2a7609750b98e69a3c3571171865eb6657c09b8d
 DIST netbeans-trunk-nightly-201604290002-src.zip 213411377 SHA256 d0ac79f9aceaaf246c9b20cd612472e6ecc4abc9bf6add0d61fadfca3ba85a79 SHA512 ac78733d4248f6fc6ff23705f1db5e001eca8e05c2dae7c3e2e59a60dd8afbe9e6a363188e17cb78492da6e1fe35cf5bcd87a0b0c1fc4e0d91129f0812db0bd6 WHIRLPOOL 4a704f8a4aa16130c84fd481f7e1ff45f87adb589e71955857b0342927dfe960b73adde97ba12022d265169cd4b736baa48f4bb4e10d8311bab787cbeefa28b9
+DIST netbeans-trunk-nightly-201604300002-src.zip 213455252 SHA256 8ac717a944d58471d4ceb9a22a21deaf0d1f51f4eca622ebaa8f4f100f7a5338 SHA512 32a07261706f944f02b161d687998395a588c060b2e59311b2e3e08a84237e1635df2af75d523da87845e794a906283ceae26b17d88b2c649d542ba525c94429 WHIRLPOOL da034854b495fc9d685d34a181fcdba320f58718a0a2ab939ae3bba9049941b405555db173a314f4881eac31e7d42d78641d96f7e097d68ecc2fe06a0c2133df
 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_p20160329.ebuild 4412 SHA256 ada2e09f2e3bbb228882c05f85344ac4cb0bb57e16db30b9b13790db58ddaa64 SHA512 6c11ee026c449c23d36b36f120e5150e1e8758440489c80c8b253bd1e91ce36fe649bbced71ec20e9aafde7d0400df93e3550c43b1f5849f9475400b82f48a26 WHIRLPOOL 9e4aff71b105d8cdb7f0aa665963bc4226a84cbe419733b396aaa6b328a64c8e3a6209471ddcaa179eb7ec16a4af822fde9253f528c6759ce9e645ca92189441
@@ -50,4 +51,5 @@ EBUILD netbeans-mobility-9999_p20160426.ebuild 4412 SHA256 03878427c0583c773426b
 EBUILD netbeans-mobility-9999_p20160427.ebuild 4412 SHA256 ab127c0dff041920619ef185732806e6e9881fc3ce2db7e421e10a27e29dcb72 SHA512 a7f4c0205782f2e2be5cc63192a335d948398bca841791d35f3de91832e3db93cd7bb768fcd4756813b09fb213b8eaae701f68d7a3c45d7b9ee18f2c9f56f7a1 WHIRLPOOL 01345a859e3a44db442b85c60cbabbe1175f5933c51b0aff8aab3a5d14ace0f0a0fb7f8514390021326199e597711f59cb7d179cb8fee9384fb2514e64db4a2e
 EBUILD netbeans-mobility-9999_p20160428.ebuild 4412 SHA256 92ec38e61718089a7a0f048629e2390b138113cfd286ba1e8168edd9ac86aae1 SHA512 0b0b3e80376fecf0af36478252595774af197c427a8162cd2394e43d3e1772a730434cf07de1680be0bd7c3777d826c822334ce4f36c42d7a05e8aae306c4a3e WHIRLPOOL 2b317f045489273543ccd76df12009bf2b9230912a5ba4814ad5e1dab25dbe92cd0b317d4458835ed64d6386bb5216b328e1afc53d60fb9b07848397581c6bdf
 EBUILD netbeans-mobility-9999_p20160429.ebuild 4412 SHA256 2581c442b7a708410dc8f381b252888e9424f1ed75e5a831a0bf1e6015e4b790 SHA512 3e02833fe7a549c351d29f406bacb6eb06f96194624c5cfc695d90197e44e855fba7b15f5f561c44ab1da2a9f677baaf991704940451f60cf976e2797e2b18e8 WHIRLPOOL 436365e52d16d06b5cb7cf18228b97a361bf4b64d188d64294cbc2c20969a844546d13583f9213aab5ce66b34b06697e122f9c9ca60aaf216847d5d4660aee93
+EBUILD netbeans-mobility-9999_p20160430.ebuild 4412 SHA256 ab0ad76afa579cadd04c3606a41f74b8a3cbc15d621d4f3172edef54bc8be63f SHA512 d43d44e48d7e1259bec1aec7d1d508b594f1f4abe9e2e227726596e52ded3ad9b92982f1b054c8a88bd25bc77c34b0d5cf891d734ae943db10e514dd75bcec77 WHIRLPOOL 2767ed53a47cad2dbdcb39755247485b37bf4cbd3d6f4caba24ba5dfe4d3730780594e1e8327a9dfcb73fb8937d1fc8880e48e11279b4c6b0d7c8afd185cf36e
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160430.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160430.ebuild
new file mode 100644
index 0000000..1873b5b
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160430.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-30_00-02-33/zip/netbeans-trunk-nightly-201604300002-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 046e8d6..428b322 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201604261340-src.zip 213360814 SHA256 82a01aa68497b1
 DIST netbeans-trunk-nightly-201604270002-src.zip 213361504 SHA256 7969b4b1058bfd65cfa704058136d06f8f87bfe2290354ead9ecf279ffdbf462 SHA512 8be518f7b1771a21dd0be041b71d990447fb158ed6d2be2e862eaa98ee40922e3b235627508b2e32d6c9f5f0834fdcd2d60f80b7253fcfc8d10e62ee3229cd23 WHIRLPOOL 4400c9f7f789ed54d9af81680b8c134b6766d1f101e8e94dfadf1faf579a5fe9a9d6c65f6ae87368d8920c0d60813ba6854f9af668db42f0d4219174a3905c67
 DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247baa9620dae7672b3b27c8863c40f6d37ad5e6649fe6cf013752 SHA512 61af7c64fa9f0725752b28f78edc006362dbb9441f9c22d4f290c362ba76b94f34eaa3e0acac026f8e10f385c106dff33af0bc22673fec35f5e70528db001ed7 WHIRLPOOL 4021eee486a6e4fe4df381154d94caefdd74d725103aa3c996d64d159c433f49939a7abcce063ec130087cde2a7609750b98e69a3c3571171865eb6657c09b8d
 DIST netbeans-trunk-nightly-201604290002-src.zip 213411377 SHA256 d0ac79f9aceaaf246c9b20cd612472e6ecc4abc9bf6add0d61fadfca3ba85a79 SHA512 ac78733d4248f6fc6ff23705f1db5e001eca8e05c2dae7c3e2e59a60dd8afbe9e6a363188e17cb78492da6e1fe35cf5bcd87a0b0c1fc4e0d91129f0812db0bd6 WHIRLPOOL 4a704f8a4aa16130c84fd481f7e1ff45f87adb589e71955857b0342927dfe960b73adde97ba12022d265169cd4b736baa48f4bb4e10d8311bab787cbeefa28b9
+DIST netbeans-trunk-nightly-201604300002-src.zip 213455252 SHA256 8ac717a944d58471d4ceb9a22a21deaf0d1f51f4eca622ebaa8f4f100f7a5338 SHA512 32a07261706f944f02b161d687998395a588c060b2e59311b2e3e08a84237e1635df2af75d523da87845e794a906283ceae26b17d88b2c649d542ba525c94429 WHIRLPOOL da034854b495fc9d685d34a181fcdba320f58718a0a2ab939ae3bba9049941b405555db173a314f4881eac31e7d42d78641d96f7e097d68ecc2fe06a0c2133df
 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_p20160329.ebuild 4111 SHA256 76772682b35507ad629b6dce0d4f8565dd152de333a26921b30cd0a649aba7c1 SHA512 4243543e0f3f79cce79805602bcf9149a9d3310a8c9709e872c58b984ab56fb581827e7b6c656c3d6453f2185b97c390308d7b7b027d9b0cde43b0ce0605d844 WHIRLPOOL 89fa502a5bb2127f87264fa4e96012b8a8cc86666ba7e977c5a595af1d11d2dd16244288d9f1f1714859b932f616c0874c869b2367b4a5b1656840e16479858f
@@ -53,4 +54,5 @@ EBUILD netbeans-nb-9999_p20160426.ebuild 4111 SHA256 b414f6659f97813d611b28188ab
 EBUILD netbeans-nb-9999_p20160427.ebuild 4111 SHA256 9330c46757ea609e8679962c0679feb436f9d9df75eacdda2b3700c3e47cbdc5 SHA512 8c8fa613be91a27233248df486640729bdd90a9cfc404683a004c7637d8edd794c0fff48ea36a1420cec694da029f744a54cac0763616d648d1dadac1347b720 WHIRLPOOL 6989bf350da1790f919138515c97391e93edc071b0db0da264ab6a2927f71e4d6cb48fd9d4327c75e09657548614611ade87dcad05f0668b4fe8506dc5b315dc
 EBUILD netbeans-nb-9999_p20160428.ebuild 4111 SHA256 8e968459df586e6fc8b27eb683e2b0936dba423cccdb334af64c3918d2749843 SHA512 9ca5684d63d1efe7b5158014375752449fbce3a3fb86acfcd12a14f7c9195fefca83d11379906cbd707a48a60ae24a5312c9823acf337811e1d00e9711dbe126 WHIRLPOOL 8ddbc652a3ef6a2fa079498f3d59900f7a507d4494a2aa514cfaae3a1b67fba2880d80a9d285a9513fb9e00e6c3c842b3e8faf6060d1b545706cb2c871443f2d
 EBUILD netbeans-nb-9999_p20160429.ebuild 4111 SHA256 98a293723d524ae4ade9784dcc1beeb75cac0637286e99121a734a1d2d09f027 SHA512 fefbf9da1aaf1d74fd74af7e92664200351fef93122ed21da6273c5583aff493fa70d45a80766afd546f6420ed5e04017d0c6bd55fd9179d80b5794b0f68d8f0 WHIRLPOOL 0d5454f43a641e355e073e41ebd49896b430cb962cb6a4bd80a8a4cddeefa865500ea278f6952be14fbe895123f55739024b3b8c111d817e3fd76b517e041a98
+EBUILD netbeans-nb-9999_p20160430.ebuild 4111 SHA256 a8877d3574e8c1bf748bf75cf5be70f0e1b5e1c3a1fd5c34a8492e7bf01a4f3a SHA512 44727305d56021bf57a8302ba2deedd34538ec72b602b485cd0900b9030e3635e7330b1440f88478ec0112610cf646dc464f03a7dc53975975ab78ecd967cd74 WHIRLPOOL 47329420a5768e92f153f99de5588bd1aa709b652ce93281775beb64c11ba9ba07985a552dd0ae776a786157157d1c7de2ece5a52095b0cc499e89fb84963e80
 MISC metadata.xml 392 SHA256 01cdbcc83099b97486bd7b8e813e5b19c1138eb0d8d3e8a5683aafd579820435 SHA512 4d2f9160baa022d6a48b61d5f42e71cfd411d244e7a36436629bc5ee4036e4ce19079134d9a6c704ebe942306c2e0199d0591c1e54f92f8f3c8835147e639246 WHIRLPOOL c1131764e1cec66c56b977ebe36014b29e5a68e35ccc326c0cbadd050a6c625cf191c85c212e0a733661c008dab0d99f9a4cdc4c4ae0cc9d775ba1de554795a9

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160430.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160430.ebuild
new file mode 100644
index 0000000..2ad4855
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20160430.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-30_00-02-33/zip/netbeans-trunk-nightly-201604300002-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 b538ecb..2eb2433 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201604261340-src.zip 213360814 SHA256 82a01aa68497b1
 DIST netbeans-trunk-nightly-201604270002-src.zip 213361504 SHA256 7969b4b1058bfd65cfa704058136d06f8f87bfe2290354ead9ecf279ffdbf462 SHA512 8be518f7b1771a21dd0be041b71d990447fb158ed6d2be2e862eaa98ee40922e3b235627508b2e32d6c9f5f0834fdcd2d60f80b7253fcfc8d10e62ee3229cd23 WHIRLPOOL 4400c9f7f789ed54d9af81680b8c134b6766d1f101e8e94dfadf1faf579a5fe9a9d6c65f6ae87368d8920c0d60813ba6854f9af668db42f0d4219174a3905c67
 DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247baa9620dae7672b3b27c8863c40f6d37ad5e6649fe6cf013752 SHA512 61af7c64fa9f0725752b28f78edc006362dbb9441f9c22d4f290c362ba76b94f34eaa3e0acac026f8e10f385c106dff33af0bc22673fec35f5e70528db001ed7 WHIRLPOOL 4021eee486a6e4fe4df381154d94caefdd74d725103aa3c996d64d159c433f49939a7abcce063ec130087cde2a7609750b98e69a3c3571171865eb6657c09b8d
 DIST netbeans-trunk-nightly-201604290002-src.zip 213411377 SHA256 d0ac79f9aceaaf246c9b20cd612472e6ecc4abc9bf6add0d61fadfca3ba85a79 SHA512 ac78733d4248f6fc6ff23705f1db5e001eca8e05c2dae7c3e2e59a60dd8afbe9e6a363188e17cb78492da6e1fe35cf5bcd87a0b0c1fc4e0d91129f0812db0bd6 WHIRLPOOL 4a704f8a4aa16130c84fd481f7e1ff45f87adb589e71955857b0342927dfe960b73adde97ba12022d265169cd4b736baa48f4bb4e10d8311bab787cbeefa28b9
+DIST netbeans-trunk-nightly-201604300002-src.zip 213455252 SHA256 8ac717a944d58471d4ceb9a22a21deaf0d1f51f4eca622ebaa8f4f100f7a5338 SHA512 32a07261706f944f02b161d687998395a588c060b2e59311b2e3e08a84237e1635df2af75d523da87845e794a906283ceae26b17d88b2c649d542ba525c94429 WHIRLPOOL da034854b495fc9d685d34a181fcdba320f58718a0a2ab939ae3bba9049941b405555db173a314f4881eac31e7d42d78641d96f7e097d68ecc2fe06a0c2133df
 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_p20160329.ebuild 4418 SHA256 819373c0d5d791ba49c87ed8164e8472788c20dc6fb4000d274b044dc0c8c40d SHA512 1dd59632f68ebacb49b6685c9767cd94d8760ebbcdb8aba9aa94a8ee0bf95578b56b9db7f2080d415bed7c2518d58de80ac7f7ad271d026a9feccbb37e5cdd9e WHIRLPOOL b5d380fe8cd2de24a73376e8d96dbdbf7b66ecba19fbb5c0055bb6d628e44ad7c5b0310ef325ec9f43beb729adc6be3464cc42559e960270ecc4a70abfbee345
@@ -54,4 +55,5 @@ EBUILD netbeans-php-9999_p20160426.ebuild 4418 SHA256 0133c7d50f5246123a81330ccb
 EBUILD netbeans-php-9999_p20160427.ebuild 4418 SHA256 111fca797f92914216fa604726f914a984a6602498535ebb20e183fc3d0d7ef0 SHA512 3f25a656ff08a80c7ce64d5b36fd34b3820dffcaf1313f6d5735ae580bdd439cad783284f56e09cd7b8d6d3d10d4107bafe7112c95fdbd9afb739b53bceae9d0 WHIRLPOOL 406e646235b0c750a0fa402354746f5b752f6abd0e4bc46e31e9d33994cd70f46d08c78af72fc481ad34ce1c1853b3513ba2a6e73f0530b6a64aae1770764be3
 EBUILD netbeans-php-9999_p20160428.ebuild 4418 SHA256 ff39622b2f582fb73f069ddea76fcb846f2fdbdce6559af061a13ead577d4a47 SHA512 3f71b975e8316433510e89914be7a1ffe7837a39d42a4c8f25a033b82d54bee62cafe0a28d45cada322594dfc328f43c2a1a05abbec1e43e207f73fcb225e128 WHIRLPOOL 696cf1a13fe113a7156da0fa4db41802052c5885a1cde7eb5eac17431ca31792576d22d4cecc6b2bd5ead506abb0e3a3d0dee62183b346aed1aa146234c7df8a
 EBUILD netbeans-php-9999_p20160429.ebuild 4418 SHA256 91eaccc7404ed5c4c703fb4197631b10b5583508204c73363016ad110184269f SHA512 028e58926a853219e866edf3f872a67d546d32839306867921527c81ebef5ab004da018aab014994f3fecca79506267dcdcdcf06054f90c6a457b68bfa0bf6b7 WHIRLPOOL e9ad76bdecfff67dd851e31c4356278547b6da7ed73649f36e5233b78cc05f4295dd6460560b4613abf226afa5826b5cd6d7d4270f482e28a9996f78a7152048
+EBUILD netbeans-php-9999_p20160430.ebuild 4418 SHA256 c46eba4967a823c3b5a26edf651faedf16bdc9459ddd64b7874c8fa3a6af11ce SHA512 35cc623e4374520ea6305a7bcd247ced8b78c7e827c1f541e3678503fa1bc7b5008cc45e7137bd521d19c5c1287219b8dbc7999edc87e84d9a07e96938dc56b7 WHIRLPOOL 8a3252e718c3c4bb07399ed1f5a41e3ec93de0757120ec9798325742dd52cac8b07c69028516aa0a9b757ec794b7d2f4f1ccf0a1d504c4f58ea3f62086ac6254
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160430.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160430.ebuild
new file mode 100644
index 0000000..0557321
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20160430.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-30_00-02-33/zip/netbeans-trunk-nightly-201604300002-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 d1f847d..dc3125b 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -53,6 +53,7 @@ DIST netbeans-trunk-nightly-201604261340-src.zip 213360814 SHA256 82a01aa68497b1
 DIST netbeans-trunk-nightly-201604270002-src.zip 213361504 SHA256 7969b4b1058bfd65cfa704058136d06f8f87bfe2290354ead9ecf279ffdbf462 SHA512 8be518f7b1771a21dd0be041b71d990447fb158ed6d2be2e862eaa98ee40922e3b235627508b2e32d6c9f5f0834fdcd2d60f80b7253fcfc8d10e62ee3229cd23 WHIRLPOOL 4400c9f7f789ed54d9af81680b8c134b6766d1f101e8e94dfadf1faf579a5fe9a9d6c65f6ae87368d8920c0d60813ba6854f9af668db42f0d4219174a3905c67
 DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247baa9620dae7672b3b27c8863c40f6d37ad5e6649fe6cf013752 SHA512 61af7c64fa9f0725752b28f78edc006362dbb9441f9c22d4f290c362ba76b94f34eaa3e0acac026f8e10f385c106dff33af0bc22673fec35f5e70528db001ed7 WHIRLPOOL 4021eee486a6e4fe4df381154d94caefdd74d725103aa3c996d64d159c433f49939a7abcce063ec130087cde2a7609750b98e69a3c3571171865eb6657c09b8d
 DIST netbeans-trunk-nightly-201604290002-src.zip 213411377 SHA256 d0ac79f9aceaaf246c9b20cd612472e6ecc4abc9bf6add0d61fadfca3ba85a79 SHA512 ac78733d4248f6fc6ff23705f1db5e001eca8e05c2dae7c3e2e59a60dd8afbe9e6a363188e17cb78492da6e1fe35cf5bcd87a0b0c1fc4e0d91129f0812db0bd6 WHIRLPOOL 4a704f8a4aa16130c84fd481f7e1ff45f87adb589e71955857b0342927dfe960b73adde97ba12022d265169cd4b736baa48f4bb4e10d8311bab787cbeefa28b9
+DIST netbeans-trunk-nightly-201604300002-src.zip 213455252 SHA256 8ac717a944d58471d4ceb9a22a21deaf0d1f51f4eca622ebaa8f4f100f7a5338 SHA512 32a07261706f944f02b161d687998395a588c060b2e59311b2e3e08a84237e1635df2af75d523da87845e794a906283ceae26b17d88b2c649d542ba525c94429 WHIRLPOOL da034854b495fc9d685d34a181fcdba320f58718a0a2ab939ae3bba9049941b405555db173a314f4881eac31e7d42d78641d96f7e097d68ecc2fe06a0c2133df
 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_p20160329.ebuild 9581 SHA256 408ddbf6b99d3f4e6b25ee751a25c88d16bfd01f968152d8a428900099fd44fb SHA512 6f7492e0fc4b2c6085ee1d5ca602796d04b901beba99334f0e549e3bd429ba4403ba520cf9660be6f5cc0b98c46ce1aae742ce8d6c5de1cc7eda2df812635bd8 WHIRLPOOL ecad3d56c5520af9fc8aeb1bf20ec82dbac721a4e337a702cecc009252d0a7985207b5e41d4fa2de492346324e6dfeeaf59a0af1fc52a1e3bac3a422179cb25d
@@ -77,4 +78,5 @@ EBUILD netbeans-platform-9999_p20160426.ebuild 9520 SHA256 bf082ea57a7598c443e29
 EBUILD netbeans-platform-9999_p20160427.ebuild 9520 SHA256 83f07d50b587613b6af1038f8e093fd9a00bcf2e69507926e05cd3d83a6369f1 SHA512 7c943f115b3d1ff156232bbe13e7a23f8c24f35160fa65106478aaa115684f15fce9b91e813b093b38ddbf4398c5c27a1cce2ce0308344738ed8a3e3e713e32a WHIRLPOOL b2cdedfcb5339123380fabcd9e5e5efe90b3d9d4009693a406bf4265a4d759a3bfbfeb80dfd49dea1378cfd12689d0c005a36d5afabacae51deb4988f989acb5
 EBUILD netbeans-platform-9999_p20160428.ebuild 9520 SHA256 43ab2d84807ce29e75b611c4aee4269e1cd2ab9bcd41220e572d68f2095280a1 SHA512 698447f4e5a9dbe05337a59966f05fe7f4bc8517dd463571b65d6ab777239191ee341fb56b1c9c1b479b3fad247c5284c3712f3b142839d930214f36d75e194b WHIRLPOOL b38abccc36b868f0f07607a2d487335d134554c44e085418dd4e15b6dbdbca18337fd1dc50729bc92e2e076210fb6be7caf1502c76e3100d4e0fdd8d56e3fe1f
 EBUILD netbeans-platform-9999_p20160429.ebuild 9520 SHA256 f7ad9dddcef0aa421a8ef4cbcb85216906fabe21268d243501c740903c515ba2 SHA512 922a98b6b78b7f59e673d36e0aecdc9caf80b0cf53bcd3a73ab6e7b598da514c49809944d84759471d0a895fb9aa5e5a40b6c8af2f0f0e41017e885015a3f69f WHIRLPOOL 1ab4034ff5ff03e5d12f38dcfe358ff5c9fcd924f55400ee5954c0b339dcf291766460eb3eaea55fe5355c17659d0f4e42a7429128972346adfebd50e94d0099
+EBUILD netbeans-platform-9999_p20160430.ebuild 9520 SHA256 92dc097df1540dd297899d2751f6b292a77dde24e6a1b8ccb21a6d9fd47223eb SHA512 e1f7e6d14ec0f7a6acf33f18d98a44b7eab25d69ebc21dd24abcb63819157727b7f47835d1839c30d4ae6abba20241fef94e1da4da93faf2a9a36c41b179b79d WHIRLPOOL b157f4184a6577fb4438258517b92761b7b15456e4912ac017072ce5e7564a35e95baaba2627e8ba7a1839b550cccaaaec417cf69a15a7d6b813ccea1eb1b07e
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160430.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160430.ebuild
new file mode 100644
index 0000000..1473f46
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20160430.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-30_00-02-33/zip/netbeans-trunk-nightly-201604300002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar
+	http://hg.netbeans.org/binaries/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar
+	http://hg.netbeans.org/binaries/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar
+	http://hg.netbeans.org/binaries/771CDCA0A3F2F3CE818E20CC2D707A3592422485-ko4j-1.3.jar
+	http://hg.netbeans.org/binaries/A3085BAA78C8EE7F55081E70C79ABE04CA38CE93-net.java.html-1.3.jar
+	http://hg.netbeans.org/binaries/7FC91530F4395FA0D58F9539F3B40858E766BFA3-net.java.html.boot-1.3.jar
+	http://hg.netbeans.org/binaries/5C992BAEC0111EE293BD44173140A9D8EC860765-net.java.html.boot.fx-1.3.jar
+	http://hg.netbeans.org/binaries/BF6C9BB0FFB78A6B846ECAEB880C460D883B4F72-net.java.html.boot.script-1.3.jar
+	http://hg.netbeans.org/binaries/10E4214A89082C70FCF9F721953001C0932037BA-net.java.html.geo-1.3.jar
+	http://hg.netbeans.org/binaries/D97314CE1869DD3B8B8942256A70673E2991C9DD-net.java.html.json-1.3.jar
+	http://hg.netbeans.org/binaries/6BDCE8349F83CD02F2942D4FBFA86A81A129F42A-net.java.html.sound-1.3.jar
+	http://hg.netbeans.org/binaries/E5DDC5E827D3D62E7BE9F7E32927CA01F2839971-org.eclipse.osgi_3.9.1.v20140110-1610.jar
+	http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip
+	http://hg.netbeans.org/binaries/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip
+	http://hg.netbeans.org/binaries/CEC2829EC391CB404AD32EB2D08F879C418B745B-xhr4j-1.3.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+# oracle-jdk-bin is needed for now because of javafx which is not packaged separately yet
+# [parseprojectxml] Distilling /var/tmp/portage/dev-java/netbeans-platform-9999_p20151108/work/nbbuild/build/public-package-jars/org-netbeans-libs-javafx.jar from [/var/tmp/portage/dev-java/netbeans-platform-9999_p20151108/work/nbbuild/netbeans/platform/modules/org-netbeans-libs-javafx.jar, /usr/lib64/icedtea8/jre/lib/ext/jfxrt.jar]
+# [parseprojectxml] Classpath entry /usr/lib64/icedtea8/jre/lib/ext/jfxrt.jar does not exist; skipping
+#  [nbmerge] Failed to build target: all-api.htmlui
+
+CDEPEND="dev-java/hamcrest-core:1.3
+	dev-java/javahelp:0
+	>=dev-java/jna-3.4:0
+	dev-java/junit:4[source]
+	>=dev-java/osgi-core-api-5:0
+	dev-java/osgi-compendium:0
+	dev-java/swing-layout:1[source]
+	dev-java/testng:0"
+DEPEND="dev-java/oracle-jdk-bin:1.8[javafx]
+	app-arch/unzip
+	${CDEPEND}"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.platform -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+JAVA_PKG_WANT_BUILD_VM="oracle-jdk-bin-1.8"
+JAVA_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r16-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar libs.asm/external/asm-all-5.0.1.jar || die
+	ln -s "${DISTDIR}"/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar libs.felix/external/felix-4.2.1.jar || die
+	ln -s "${DISTDIR}"/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar junitlib/external/junit-4.12-javadoc.jar || die
+	ln -s "${DISTDIR}"/771CDCA0A3F2F3CE818E20CC2D707A3592422485-ko4j-1.3.jar o.n.html.ko4j/external/ko4j-1.3.jar || die
+	ln -s "${DISTDIR}"/A3085BAA78C8EE7F55081E70C79ABE04CA38CE93-net.java.html-1.3.jar net.java.html/external/net.java.html-1.3.jar || die
+	ln -s "${DISTDIR}"/7FC91530F4395FA0D58F9539F3B40858E766BFA3-net.java.html.boot-1.3.jar net.java.html.boot/external/net.java.html.boot-1.3.jar || die
+	ln -s "${DISTDIR}"/5C992BAEC0111EE293BD44173140A9D8EC860765-net.java.html.boot.fx-1.3.jar net.java.html.boot.fx/external/net.java.html.boot.fx-1.3.jar || die
+	ln -s "${DISTDIR}"/BF6C9BB0FFB78A6B846ECAEB880C460D883B4F72-net.java.html.boot.script-1.3.jar net.java.html.boot.script/external/net.java.html.boot.script-1.3.jar || die
+	ln -s "${DISTDIR}"/10E4214A89082C70FCF9F721953001C0932037BA-net.java.html.geo-1.3.jar net.java.html.geo/external/net.java.html.geo-1.3.jar || die
+	ln -s "${DISTDIR}"/D97314CE1869DD3B8B8942256A70673E2991C9DD-net.java.html.json-1.3.jar net.java.html.json/external/net.java.html.json-1.3.jar || die
+	ln -s "${DISTDIR}"/6BDCE8349F83CD02F2942D4FBFA86A81A129F42A-net.java.html.sound-1.3.jar net.java.html.sound/external/net.java.html.sound-1.3.jar || die
+	ln -s "${DISTDIR}"/E5DDC5E827D3D62E7BE9F7E32927CA01F2839971-org.eclipse.osgi_3.9.1.v20140110-1610.jar netbinox/external/org.eclipse.osgi_3.9.1.v20140110-1610.jar || die
+	ln -s "${DISTDIR}"/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip o.jdesktop.layout/external/swing-layout-1.0.4-doc.zip || die
+	ln -s "${DISTDIR}"/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip libs.testng/external/testng-6.8.1-javadoc.zip || die
+	ln -s "${DISTDIR}"/CEC2829EC391CB404AD32EB2D08F879C418B745B-xhr4j-1.3.jar o.n.html.xhr4j/external/xhr4j-1.3.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	# upstream jna jar contains bundled binary libraries so we disable that feature
+	epatch netbeans-9999-r16-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --into libs.junit4/external hamcrest-core-1.3 hamcrest-core.jar hamcrest-core-1.3.jar
+	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.jna/external jna jna.jar jna-4.2.2.jar
+	java-pkg_jar-from --into libs.jna.platform/external jna platform.jar jna-platform-4.2.2.jar
+	java-pkg_jar-from --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+	ln -s /usr/share/junit-4/sources/junit-src.zip junitlib/external/junit-4.12-sources.jar || die
+	java-pkg_jar-from --into libs.osgi/external osgi-core-api osgi-core-api.jar osgi.core-5.0.0.jar
+	java-pkg_jar-from --into libs.osgi/external osgi-compendium osgi-compendium.jar osgi.cmpn-4.2.jar
+	java-pkg_jar-from --into o.jdesktop.layout/external swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
+	ln -s /usr/share/swing-layout-1/sources/swing-layout-src.zip o.jdesktop.layout/external/swing-layout-1.0.4-src.zip || die
+	java-pkg_jar-from --into libs.testng/external testng testng.jar testng-6.8.1-dist.jar
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	unset DISPLAY
+	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+	pushd nbbuild/netbeans/platform >/dev/null || die
+
+	java-pkg_dojar lib/*.jar
+	grep -E "/platform$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	insinto ${INSTALL_DIR}
+	doins -r *
+	rm "${D}"/${INSTALL_DIR}/docs/junit-4.12-sources.jar || die
+	dosym /usr/share/junit-4/sources/junit-src.zip ${INSTALL_DIR}/docs/junit-4.12-sources.jar
+	rm "${D}"/${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip || die
+	dosym /usr/share/swing-layout-1/sources/swing-layout-src.zip ${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip
+	find "${D}"/${INSTALL_DIR} -name "*.exe" -delete
+	find "${D}"/${INSTALL_DIR} -name "*.dll" -delete
+	rm -fr "${D}"/modules/lib || die
+
+	popd >/dev/null || die
+
+	fperms 775 ${INSTALL_DIR}/lib/nbexec
+	dosym ${INSTALL_DIR}/lib/nbexec /usr/bin/nbexec-${SLOT}
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext
+	pushd "${instdir}" >/dev/null || die
+	rm hamcrest-core-1.3.jar && java-pkg_jar-from --into "${instdir}" hamcrest-core-1.3 hamcrest-core.jar hamcrest-core-1.3.jar
+	rm jhall-2.0_05.jar && java-pkg_jar-from --into "${instdir}" javahelp jhall.jar jhall-2.0_05.jar
+	rm jna-4.2.2.jar && java-pkg_jar-from --into "${instdir}" jna jna.jar jna-4.2.2.jar
+	rm jna-platform-4.2.2.jar && java-pkg_jar-from --into "${instdir}" jna platform.jar jna-platform-4.2.2.jar
+	rm junit-4.12.jar && java-pkg_jar-from --into "${instdir}" junit-4 junit.jar junit-4.12.jar
+	rm osgi.cmpn-4.2.jar && java-pkg_jar-from --into "${instdir}" osgi-compendium osgi-compendium.jar osgi.cmpn-4.2.jar
+	rm osgi.core-5.0.0.jar && java-pkg_jar-from --into "${instdir}" osgi-core-api osgi-core-api.jar osgi.core-5.0.0.jar
+	rm swing-layout-1.0.4.jar && java-pkg_jar-from --into "${instdir}" swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
+	rm testng-6.8.1-dist.jar && java-pkg_jar-from --into "${instdir}" testng testng.jar testng-6.8.1-dist.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/platform
+}

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index fcec76b..916ccee 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201604261340-src.zip 213360814 SHA256 82a01aa68497b1
 DIST netbeans-trunk-nightly-201604270002-src.zip 213361504 SHA256 7969b4b1058bfd65cfa704058136d06f8f87bfe2290354ead9ecf279ffdbf462 SHA512 8be518f7b1771a21dd0be041b71d990447fb158ed6d2be2e862eaa98ee40922e3b235627508b2e32d6c9f5f0834fdcd2d60f80b7253fcfc8d10e62ee3229cd23 WHIRLPOOL 4400c9f7f789ed54d9af81680b8c134b6766d1f101e8e94dfadf1faf579a5fe9a9d6c65f6ae87368d8920c0d60813ba6854f9af668db42f0d4219174a3905c67
 DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247baa9620dae7672b3b27c8863c40f6d37ad5e6649fe6cf013752 SHA512 61af7c64fa9f0725752b28f78edc006362dbb9441f9c22d4f290c362ba76b94f34eaa3e0acac026f8e10f385c106dff33af0bc22673fec35f5e70528db001ed7 WHIRLPOOL 4021eee486a6e4fe4df381154d94caefdd74d725103aa3c996d64d159c433f49939a7abcce063ec130087cde2a7609750b98e69a3c3571171865eb6657c09b8d
 DIST netbeans-trunk-nightly-201604290002-src.zip 213411377 SHA256 d0ac79f9aceaaf246c9b20cd612472e6ecc4abc9bf6add0d61fadfca3ba85a79 SHA512 ac78733d4248f6fc6ff23705f1db5e001eca8e05c2dae7c3e2e59a60dd8afbe9e6a363188e17cb78492da6e1fe35cf5bcd87a0b0c1fc4e0d91129f0812db0bd6 WHIRLPOOL 4a704f8a4aa16130c84fd481f7e1ff45f87adb589e71955857b0342927dfe960b73adde97ba12022d265169cd4b736baa48f4bb4e10d8311bab787cbeefa28b9
+DIST netbeans-trunk-nightly-201604300002-src.zip 213455252 SHA256 8ac717a944d58471d4ceb9a22a21deaf0d1f51f4eca622ebaa8f4f100f7a5338 SHA512 32a07261706f944f02b161d687998395a588c060b2e59311b2e3e08a84237e1635df2af75d523da87845e794a906283ceae26b17d88b2c649d542ba525c94429 WHIRLPOOL da034854b495fc9d685d34a181fcdba320f58718a0a2ab939ae3bba9049941b405555db173a314f4881eac31e7d42d78641d96f7e097d68ecc2fe06a0c2133df
 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_p20160329.ebuild 3472 SHA256 0e308bc5777440e00b2e6292a3eb23090c525799027c5bcf85df7aed10f3f24a SHA512 a1ec22a982ffca8075ebce0f3b54cbb2807a677ad77d2fd27eb32089ce5e9e61c7ef097d19423f4fc5494865fce471801ce15ee10d86c47f0c6b451f4630b02c WHIRLPOOL 9d50d36784cca80bb3d4fd24d41475395d68707fd4743a2af4d58ac890ad610a052c58a5d2a4c961f9bf21ebb183d1c367bafb6db9f30787579ae19909e15502
@@ -50,4 +51,5 @@ EBUILD netbeans-profiler-9999_p20160426.ebuild 3472 SHA256 7b6777b8200f5f2eaca76
 EBUILD netbeans-profiler-9999_p20160427.ebuild 3472 SHA256 4497bad86a19c077be7ace1b8d19263ee096df32af556f213d7950c511b0c0c8 SHA512 dd4f53b08e4934f70a1dac507799abf4cf63007115db35e05268f18052c5801ccc9401f545e5258676bffc2b967b5cc78d26e143fc9e7447f89e689ecf14eb17 WHIRLPOOL 0db7a0bce87f9527b5c9317ebb920c990519cfbdfe868377fcfd0670535f1b93210746cc5fe4741bde31af6d69c8127c747142b5f1d8a7c79abb9c61b80528d8
 EBUILD netbeans-profiler-9999_p20160428.ebuild 3472 SHA256 c01c6eaecbc72dff72adbdd14940ae8935b207096293026b94bc2e3f620e934d SHA512 9a0cfbe6a0e5b27611f4817889d3b102ecbf07c05987b558e17013711c3f40a2239a07c340effe846d54b14bd4f4987adef4c290563bfa461e56762d99f8c2bf WHIRLPOOL 4c47981cf634b924f82b4c9b8cd2fac84006454beb9d7923757b0eb5d82512b58090245fa068f66b6760ac83681106ab659ca036907d40faf9709274a99dccaf
 EBUILD netbeans-profiler-9999_p20160429.ebuild 3472 SHA256 063a30427397a12cb94b03b26813b8dc5485b10d9b495b8860bf35dfb4b0224f SHA512 111527419ab1021308548d5c2f2d9a9576a43c5915125a14a9c6d030ac18dfe2e8771e5ef1e3f8310cc995b652d21a4d73671983e246a871a3606dc775a4a044 WHIRLPOOL 40ca2771efd02e39629b29577feafe59a9e0d5eef67f29a25037ce1317ae0c7b9499933ab66a5cafb8a89d2cdda07d1e5e05c04ca7c4077de88286e3e2d2f1ff
+EBUILD netbeans-profiler-9999_p20160430.ebuild 3472 SHA256 1fc86d7b980203ff0b59dae607a92117db2379423c096014fb67d897b75080eb SHA512 c6e234e3d8356a57e3e45a2318a12de2891a288bf8342b4cb12379df6885fa935cbb7c84539c5176c018ac3b2451d8d140846451e4a553a0a761b8dad120fd0f WHIRLPOOL 1127184708d513d8bb6c689a02ea508101e5892e229a773be8b5628cce6aedae75ea56e15677cda93c394904578a8bab145ee4c16197363600107e6503a7d434
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160430.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160430.ebuild
new file mode 100644
index 0000000..4d4d80d
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160430.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-30_00-02-33/zip/netbeans-trunk-nightly-201604300002-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 12cc304..baaff5f 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -41,6 +41,7 @@ DIST netbeans-trunk-nightly-201604261340-src.zip 213360814 SHA256 82a01aa68497b1
 DIST netbeans-trunk-nightly-201604270002-src.zip 213361504 SHA256 7969b4b1058bfd65cfa704058136d06f8f87bfe2290354ead9ecf279ffdbf462 SHA512 8be518f7b1771a21dd0be041b71d990447fb158ed6d2be2e862eaa98ee40922e3b235627508b2e32d6c9f5f0834fdcd2d60f80b7253fcfc8d10e62ee3229cd23 WHIRLPOOL 4400c9f7f789ed54d9af81680b8c134b6766d1f101e8e94dfadf1faf579a5fe9a9d6c65f6ae87368d8920c0d60813ba6854f9af668db42f0d4219174a3905c67
 DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247baa9620dae7672b3b27c8863c40f6d37ad5e6649fe6cf013752 SHA512 61af7c64fa9f0725752b28f78edc006362dbb9441f9c22d4f290c362ba76b94f34eaa3e0acac026f8e10f385c106dff33af0bc22673fec35f5e70528db001ed7 WHIRLPOOL 4021eee486a6e4fe4df381154d94caefdd74d725103aa3c996d64d159c433f49939a7abcce063ec130087cde2a7609750b98e69a3c3571171865eb6657c09b8d
 DIST netbeans-trunk-nightly-201604290002-src.zip 213411377 SHA256 d0ac79f9aceaaf246c9b20cd612472e6ecc4abc9bf6add0d61fadfca3ba85a79 SHA512 ac78733d4248f6fc6ff23705f1db5e001eca8e05c2dae7c3e2e59a60dd8afbe9e6a363188e17cb78492da6e1fe35cf5bcd87a0b0c1fc4e0d91129f0812db0bd6 WHIRLPOOL 4a704f8a4aa16130c84fd481f7e1ff45f87adb589e71955857b0342927dfe960b73adde97ba12022d265169cd4b736baa48f4bb4e10d8311bab787cbeefa28b9
+DIST netbeans-trunk-nightly-201604300002-src.zip 213455252 SHA256 8ac717a944d58471d4ceb9a22a21deaf0d1f51f4eca622ebaa8f4f100f7a5338 SHA512 32a07261706f944f02b161d687998395a588c060b2e59311b2e3e08a84237e1635df2af75d523da87845e794a906283ceae26b17d88b2c649d542ba525c94429 WHIRLPOOL da034854b495fc9d685d34a181fcdba320f58718a0a2ab939ae3bba9049941b405555db173a314f4881eac31e7d42d78641d96f7e097d68ecc2fe06a0c2133df
 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_p20160329.ebuild 5244 SHA256 9574bd4be256af06ef0b45f848889458280dee5bb35e8ba5ba0355dee994978a SHA512 65c4c0bed434072db1450fde2a424df522a4ad15eadb1de47ac0af740b6609e2491f3a679a2960f845390f205c431bee994fd776a4ed1cad3aa394dfab24296a WHIRLPOOL 5776a1a76517782efcd4fd7fc817e0bf541fea1c5565351c7c4516e6f78a90f90c5b77a2a57e8f1d81f51a6703a81a38351ee9bbfab01aea3f991934b11696a8
@@ -65,4 +66,5 @@ EBUILD netbeans-webcommon-9999_p20160426.ebuild 5343 SHA256 6dd39bc5d36aa9082d7c
 EBUILD netbeans-webcommon-9999_p20160427.ebuild 5343 SHA256 df75957d8cdf4bad4655953d9997a286ee93547e472e45c906a5296e7acd0d3b SHA512 1baed7a176b7c311e77dbd81a735bc60a2985110584c153eba0b912d05f60b114eee0ddd305cf04768d18315a28166ecbaffd34c75dbd7f32fbd0af02d455913 WHIRLPOOL 7d5446d8dcb3880f5d918277b1634083af2979f1d2a08bf12125a3d3da2940434c5c0aa33dd7751da0392c20a29b00afa2107bd16288ed396e899dc0f9437038
 EBUILD netbeans-webcommon-9999_p20160428.ebuild 5343 SHA256 3b6415155ed76a64dbed48af896dcb00fde8f49f53248bd544305bd6bbe01577 SHA512 d3a549390972da7e210c839116f2a9f0607b6bef416d3169493b00b525fb7280b5fbd9d633ca23d21168303ddb16e51af92272e9296d1dd9d6ca7437dfe7e4fe WHIRLPOOL b4d34bf8241733789c989859edb61d235868465a3362488b4a28dc66c7a4b866f97cf8a1178bf92c90078514d8b102a41bfcb2d6addd44b389277e7fb1436b2d
 EBUILD netbeans-webcommon-9999_p20160429.ebuild 5343 SHA256 4aaa259fb8747fa6e21b30f9dfbf95745818745ac05da1fb24f6baadb2379009 SHA512 38a79d64caad82da5af1f1a854a12a2d8c50e18497fbf613658aa594e065f1e26737baac660b261dc2dcafdd70bbc5c65e3996881d33a6fefeb106df09848498 WHIRLPOOL b4d6f760f875df5779822b9322fbfff389c886988a85aac482c5b3557f9a2c481d41d3c51c04c1fce4d7bed461a3e689ac6c03730b2ae9095f23a8100125e44f
+EBUILD netbeans-webcommon-9999_p20160430.ebuild 5343 SHA256 a83105795953f4a336d19ac139a95984dca2a9d08dafcf44eba142f09f1ec340 SHA512 8588b4af4197bcc3958840bb3700fffce2d67750216f92bacb70e9131ca54d0ceb3340bf1282355ff9c68de50872236446909cfedf779c72bbcc922fbed91aac WHIRLPOOL 60246009e21b3e7e14d5cb36ff2711c3a9ae79257beee5f033080720cec4d8df06bab3c1b40c4587c0acbf1e8ae6f8f19c1e62418b9a0c234ac9699a7e062d7a
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160430.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160430.ebuild
new file mode 100644
index 0000000..623e0bb
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160430.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-30_00-02-33/zip/netbeans-trunk-nightly-201604300002-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 cdb2718..4066066 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201604261340-src.zip 213360814 SHA256 82a01aa68497b1
 DIST netbeans-trunk-nightly-201604270002-src.zip 213361504 SHA256 7969b4b1058bfd65cfa704058136d06f8f87bfe2290354ead9ecf279ffdbf462 SHA512 8be518f7b1771a21dd0be041b71d990447fb158ed6d2be2e862eaa98ee40922e3b235627508b2e32d6c9f5f0834fdcd2d60f80b7253fcfc8d10e62ee3229cd23 WHIRLPOOL 4400c9f7f789ed54d9af81680b8c134b6766d1f101e8e94dfadf1faf579a5fe9a9d6c65f6ae87368d8920c0d60813ba6854f9af668db42f0d4219174a3905c67
 DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247baa9620dae7672b3b27c8863c40f6d37ad5e6649fe6cf013752 SHA512 61af7c64fa9f0725752b28f78edc006362dbb9441f9c22d4f290c362ba76b94f34eaa3e0acac026f8e10f385c106dff33af0bc22673fec35f5e70528db001ed7 WHIRLPOOL 4021eee486a6e4fe4df381154d94caefdd74d725103aa3c996d64d159c433f49939a7abcce063ec130087cde2a7609750b98e69a3c3571171865eb6657c09b8d
 DIST netbeans-trunk-nightly-201604290002-src.zip 213411377 SHA256 d0ac79f9aceaaf246c9b20cd612472e6ecc4abc9bf6add0d61fadfca3ba85a79 SHA512 ac78733d4248f6fc6ff23705f1db5e001eca8e05c2dae7c3e2e59a60dd8afbe9e6a363188e17cb78492da6e1fe35cf5bcd87a0b0c1fc4e0d91129f0812db0bd6 WHIRLPOOL 4a704f8a4aa16130c84fd481f7e1ff45f87adb589e71955857b0342927dfe960b73adde97ba12022d265169cd4b736baa48f4bb4e10d8311bab787cbeefa28b9
+DIST netbeans-trunk-nightly-201604300002-src.zip 213455252 SHA256 8ac717a944d58471d4ceb9a22a21deaf0d1f51f4eca622ebaa8f4f100f7a5338 SHA512 32a07261706f944f02b161d687998395a588c060b2e59311b2e3e08a84237e1635df2af75d523da87845e794a906283ceae26b17d88b2c649d542ba525c94429 WHIRLPOOL da034854b495fc9d685d34a181fcdba320f58718a0a2ab939ae3bba9049941b405555db173a314f4881eac31e7d42d78641d96f7e097d68ecc2fe06a0c2133df
 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_p20160329.ebuild 2721 SHA256 fb51b0a08b8465241559bfebf5095a411373358181eeac146ec70a4c3f33320f SHA512 f7e9e77887499aa7c7b50daeb9e7268149bd10c795271cd21604c55334c2b8d2fa998e577ba6405442dcb29310a319ab20957cab84434308ec74d607a0f03f1f WHIRLPOOL 438e98bd55965923bf88fba5d4f21a4399e556596c70056289d1ec176811e15a8016e5d33eb83f37ab07bfc80f7ac8198211244fae6bd2f78927283862d53589
@@ -50,4 +51,5 @@ EBUILD netbeans-websvccommon-9999_p20160426.ebuild 2721 SHA256 6a6ffc69548427b23
 EBUILD netbeans-websvccommon-9999_p20160427.ebuild 2721 SHA256 818742f6ab0c1d46c9361c86ea0005fe31aa9bd70c6295500d38c3c497232f46 SHA512 e5b32396f0716e31221a855c4e8b9fff929f334879ac090ff3be36181c0565aec2a39c3ebe2639262d6e0c2117c92d916dc810d414170ddf46e9a4d3b84d4347 WHIRLPOOL 08a8d570f7dadd7e1d06c1a4b1567e167aef7c5f07eb25408a0ca312becad2c039a5deed43c02cd42cce8dc4d528fe3dbac1e9d47c3b58041aa821dccfc7bdab
 EBUILD netbeans-websvccommon-9999_p20160428.ebuild 2721 SHA256 e06e7fe1eeda962aff7fbc12e4c46d0d1b20c20c2c312ae0ce8958a832ad6055 SHA512 00b42a7ffa32ea8488086b9ab2ca09610d920ff325e640077159ad4c08418e43855aacc741d094304a891e665c46be785997cd857c0607de49955e8475369404 WHIRLPOOL 5b30492d9257888e1ca4b45e092e2c7fe7548b4160939ac8f1f32dbe625b9534a669d62727abcd80be9809071973d27ea403fb1a765665a09c21dcd112485443
 EBUILD netbeans-websvccommon-9999_p20160429.ebuild 2721 SHA256 dd72b0f89e52883a2576d505ff65ff4c1738ff6ff14bff97ec310ffbb1028078 SHA512 c32f1d75eae0c1a25d4ed235221e41974e0a6a82a3c10439a0e162f9724a0ee98d1b3f83294f157f562f550c476833ec54591f63ea4a9afa9753d88d7933c33a WHIRLPOOL 69eb0df8f2a1f6a895079162ce3ef78728bad9d2de67efeba27ef15348aaacdec51c6d851f7b69fa058b5fadd2e9735c443356a1f115850a2613b2d057998ccb
+EBUILD netbeans-websvccommon-9999_p20160430.ebuild 2721 SHA256 5cb3f0753abebe6fc55cf19b018f2e7f21ac0d613a24ce9e53c5c5ca3c36543e SHA512 c62813c1fc37c309d8a632fb0c91093251ec797248f283d0d6593c01db064e987859abdabf39465eb569af650645eb00af6b3612dd9d1c246ad01b4e68375243 WHIRLPOOL f70e684ef198cab020efb56835819a47f3c714c68b6bdf3da261b7c1208bd799134ea16062a16fa3bd635234822cc66905125afe71350e6e824c10a5c4d93ec8
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160430.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160430.ebuild
new file mode 100644
index 0000000..2106de9
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160430.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-30_00-02-33/zip/netbeans-trunk-nightly-201604300002-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 c453ddd..5f75029 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201604261340-src.zip 213360814 SHA256 82a01aa68497b1
 DIST netbeans-trunk-nightly-201604270002-src.zip 213361504 SHA256 7969b4b1058bfd65cfa704058136d06f8f87bfe2290354ead9ecf279ffdbf462 SHA512 8be518f7b1771a21dd0be041b71d990447fb158ed6d2be2e862eaa98ee40922e3b235627508b2e32d6c9f5f0834fdcd2d60f80b7253fcfc8d10e62ee3229cd23 WHIRLPOOL 4400c9f7f789ed54d9af81680b8c134b6766d1f101e8e94dfadf1faf579a5fe9a9d6c65f6ae87368d8920c0d60813ba6854f9af668db42f0d4219174a3905c67
 DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247baa9620dae7672b3b27c8863c40f6d37ad5e6649fe6cf013752 SHA512 61af7c64fa9f0725752b28f78edc006362dbb9441f9c22d4f290c362ba76b94f34eaa3e0acac026f8e10f385c106dff33af0bc22673fec35f5e70528db001ed7 WHIRLPOOL 4021eee486a6e4fe4df381154d94caefdd74d725103aa3c996d64d159c433f49939a7abcce063ec130087cde2a7609750b98e69a3c3571171865eb6657c09b8d
 DIST netbeans-trunk-nightly-201604290002-src.zip 213411377 SHA256 d0ac79f9aceaaf246c9b20cd612472e6ecc4abc9bf6add0d61fadfca3ba85a79 SHA512 ac78733d4248f6fc6ff23705f1db5e001eca8e05c2dae7c3e2e59a60dd8afbe9e6a363188e17cb78492da6e1fe35cf5bcd87a0b0c1fc4e0d91129f0812db0bd6 WHIRLPOOL 4a704f8a4aa16130c84fd481f7e1ff45f87adb589e71955857b0342927dfe960b73adde97ba12022d265169cd4b736baa48f4bb4e10d8311bab787cbeefa28b9
+DIST netbeans-trunk-nightly-201604300002-src.zip 213455252 SHA256 8ac717a944d58471d4ceb9a22a21deaf0d1f51f4eca622ebaa8f4f100f7a5338 SHA512 32a07261706f944f02b161d687998395a588c060b2e59311b2e3e08a84237e1635df2af75d523da87845e794a906283ceae26b17d88b2c649d542ba525c94429 WHIRLPOOL da034854b495fc9d685d34a181fcdba320f58718a0a2ab939ae3bba9049941b405555db173a314f4881eac31e7d42d78641d96f7e097d68ecc2fe06a0c2133df
 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_p20160329.ebuild 6939 SHA256 a95ba6f56fa964c2d5f1cd023c56b1d2ce7b7b5fc25854998fef25706f762ca3 SHA512 4db2b9cee4fa4f1e0e5dfee7958b47e445448db4b926f15af92708d3f1a8c1f5e98cd76a2e29503e4636a2d0e55b25ffecadef7a0dbf652870e50ebe96d2f64c WHIRLPOOL 934fb6887354027586c36233ae42d1fcf455b27730026585d5538da3d6bdabe0e4e32700a764ef0588e9f588cc763a495c41a19e5ab0fb01a5d2e5f4e8322fe8
@@ -53,4 +54,5 @@ EBUILD netbeans-9999_p20160426.ebuild 6939 SHA256 99e439e090ecbc61e9f5801277a99f
 EBUILD netbeans-9999_p20160427.ebuild 6939 SHA256 80586b4ae619166c9927d10bb12ed775294a4252f3ddacd87422d9f8726efe99 SHA512 b0cf23c3459382cb90af24fa5e965c2bc94bb98594458f6d0efb7d617ab39c0eb0e3d0acb67d5b2881f7680ca77fa1b859e043a6751a63613828546401396e33 WHIRLPOOL d6477f6b57d352e2dc55fa7eb5a5eb9cfaa0fb5bda2831f23a2bc91e3a017efde716a031da5cd83e00f9be697d9df310f1dc8460b8c4bc5c4bb0e4aa0909f3ab
 EBUILD netbeans-9999_p20160428.ebuild 6939 SHA256 1b8ffc29323b7fe1c2308f75240c295e475626a7232fe70c6a6d096adce971fa SHA512 232be1939cb9767558f9befc29f085962d978b508940a093850602dd10a4ad49e801cb526d1ced56da3654bdf31f447619ac1bab2ae4c712fe858a475baffcc7 WHIRLPOOL 2e4d5265c0870bda91523777b9ddc9383e83a81befa8a86beb9c3f99990fa3ff6a22770d621a4120f8e891e607b61300308f5f3c433446e6bd59944fad8617c7
 EBUILD netbeans-9999_p20160429.ebuild 6939 SHA256 3786836b8a6ba5f705fe7e398484f3c5d7a16ef279b6254071f9798725c67e06 SHA512 ea8ae8704dd3c5942f1169905af21a51a5b095a8870464638f6d0e2c614e5208a0ae78f4bfec0c3d50ae78c163473b59b675e590faf4dd7bf3205281acd93a7f WHIRLPOOL 56418ec0d95bfc02d8587b1ab24562a7368943941ec1c36245b9db54a9b1535b7673f5df4400e56b8b45ff4d5fef004b76e3e8fdd474bd1cccc6cd7bb07d1526
+EBUILD netbeans-9999_p20160430.ebuild 6939 SHA256 81709213df88f28f223141977ebff2e25ee16f55b9d556f8b7be3fcce60bbe1c SHA512 865fa8b987017317fe66302e838c0d62c8914705666ec1aec7a0133f174981b1178dd925d66b337a5d4bbc4d0c3185cad8882e3e207655932fb40a5940e973f3 WHIRLPOOL f6f854fd7c39ba3be9e00e7ba5e2b771d4641238c71845c5605b83c8b19fcbc93cd6de2fcf738586deb97fffd943fdd748845582ff928ceaeaaa043f235e2dea
 MISC metadata.xml 329 SHA256 8aeaf2a0228f15c2e4140f401b30f083509bd99d0a578873069f3595cd8555f3 SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640 WHIRLPOOL 799a9b79b1b447bda9631f67e2dfaf722376740e1d2037796528a05f9745eeed00d9990a74a65ce09f74bc5e1d60a887abde540c3c62487d7dd49b8377c15834

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


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

only message in thread, other threads:[~2016-04-30 16:17 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-30 16:17 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-java/, dev-java/netbeans-javadoc/, dev-java/netbeans-harness/, Miroslav Šulc

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