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

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

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-mobility/, dev-java/netbeans-nb/, dev-java/netbeans-javacard/, ...
@ 2016-04-18  9:11 Miroslav Šulc
  0 siblings, 0 replies; only message in thread
From: Miroslav Šulc @ 2016-04-18  9:11 UTC (permalink / raw
  To: gentoo-commits

commit:     8b575f61ea08b07df45ee431088bfc4f447fde18
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 18 09:02:16 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Apr 18 09:02:16 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=8b575f61

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.2.28

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 29fdd37..f2e1204 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201604140001-src.zip 214335581 SHA256 68ee1a7dc8f093
 DIST netbeans-trunk-nightly-201604150001-src.zip 214340943 SHA256 7f1bb65d38367e2547a96e8fa027bcf4bf5815c2fd805dd01ce1c9fcb208a332 SHA512 7d598e18df326cb53b7f62a7e2a083d82e719c3db990275854b13abac138f6badb8852dfb1738a76f920e0daf4a106a54af637911e25e082b9f4fc1dce4eb373 WHIRLPOOL a46d8106c83073773dded36f9eebd37b860701460e3435deaaeef0e86b9af10ec3bdce3708d4ac783647af953a6ca3c24f78c3ee58585e65b1f0a29e92444147
 DIST netbeans-trunk-nightly-201604160001-src.zip 214350948 SHA256 6d42235d9f7fb7feed1d76934beb75ab5c548fcf1fd36d9523afeed1aff72edf SHA512 154186e3c48615ffe3ce26f37330eb28137e550426dbc5ca6d73565fcd08d3520f2e00bf4dab5d3cbfe7b489b1697113e40049eeade42e7676afac7136eb034b WHIRLPOOL b5019dee51a9eed46ac1f370fcbc8f6149db814919665236b92638131c759b0d6dd0b72e609344a6469ede3cbe90e3a2b68bfbc186c2dde89c34de5c2e53f5cf
 DIST netbeans-trunk-nightly-201604170001-src.zip 213245562 SHA256 8d1da18eea0786bbacec5b3a9479ba5f3f62463cb972b2b8d5658dfda29a3e93 SHA512 9bf389396c0b42023497277fb6312799853514b40c3fe714ff02d3945ff9c3ea6b90b433a07b85efb04a032865afd47a0c64a1aec5e8aef0884b2b4f8566e14f WHIRLPOOL 7d6dd3f54dc1e3355078a7eef2e15de18b7c03805d71ab61e8c5dc8fd0ccd281e5bd263f87daa90fcd44ac5db9cddb05c97cd850e11797eb9d0dc5ef47d641f4
+DIST netbeans-trunk-nightly-201604180001-src.zip 213245562 SHA256 33e9976d15aa52ed61f53bebb87d8290a64d6e7658dc96b044136f47d46c28de SHA512 71252b57630390c901bed5fec7021d5f9255adf02c2e84c1e0981a2d729c1d0c1ed14b927b1dd36c9a72b30ced64ae6b74429e4990ddfac4bc36aff4c46e7e17 WHIRLPOOL af4f5d0f0c8f7caac85bc7ecab0fe91c68141abc9df5a0a28cc069262aa08f869d5934f5d4a546fdd997e29dc5d63ab0aefcce530560e8ed5b9bfab86b962105
 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_p20160316.ebuild 3384 SHA256 2b0dc286cd42bd6d61b58c51f737ea5b4e5a4d827948d0ef7b2b33768f2784a2 SHA512 098f86b858fdf6fe8434bc47f43be7a44191ca81cc8b0e435db1f2e8c22d12023d062b18805cff7bb7aa5ddfc86f7026a22b9569c0366a2a8ec99eaece6cbf1b WHIRLPOOL a2dda23b09b40a15495b2386be00aa1e747bc6692af8cf54421a0e58a17c557c354cd8a4bca2bfb92b2c8f5a48db0513ca5c527b5fd25162be9323d27a1d2f21
@@ -44,4 +45,5 @@ EBUILD netbeans-apisupport-9999_p20160414.ebuild 3384 SHA256 e47cc03e2d80f052551
 EBUILD netbeans-apisupport-9999_p20160415.ebuild 3384 SHA256 3a30332ca988f521792cb4da2ea9a5bc4c90b39f57823afdbf035f539d5e70dd SHA512 d237666cca753ad2b5e2a431eff42fa9d1193dba319cca148cd57e68fb8795bb43505b10970f9f43c6d5d4ea52b5f6c22c58ab6b45179ef41643c735c9b6cb3a WHIRLPOOL bfb5785da9b6ba1173e892a323846eb2a6f902183ecbc8b52d2265c057f1288420d41f6a0c519ab81bd0b6d4d853eb48214613098684b1d2da822b50e89c69e6
 EBUILD netbeans-apisupport-9999_p20160416.ebuild 3384 SHA256 9d4eeb4f7fa5e4f8573591fd923c9e262db371e13c1a6d9fb55d86cef47e89eb SHA512 43b4fd9988f69e5246a358af4376f440f4bbd45941d88f1f8b01ac6ae4640648bd4b2d13224ae731827e59bd8081d0691dbab51ddb677ec07bed1dc637c0625a WHIRLPOOL 40cc03d49bf87036c8126a02771996f5b5dbaa19c8ac7663be0fd1e72fc2cbb7a6cbaeca2afd6f788cdf4d4654ad8b55cf2b044e8b4d5b84001b51e2ac4352ad
 EBUILD netbeans-apisupport-9999_p20160417.ebuild 3384 SHA256 0fb247fc376d9cfe8f120a07db8d7d121d4669f2eac25208ab31bd06f02135e2 SHA512 b2c2ba418a0c3144cd5ac819950f55f43408d4d0df2baddd0c4bb799d046f5b7c65a1ca192a1a4f5140cd115615533b2a017f0530a9accabda4fe80ad5c7d666 WHIRLPOOL af9aaa5f1c779653ff810ff21e93af6f34fab91e638f4fee246e0f1929354d6e321bfab86e817dcad149c02d55f397a0f74b6679b32ef7f6e94d6d2d3ec1113c
+EBUILD netbeans-apisupport-9999_p20160418.ebuild 3384 SHA256 ce302141901379f4f31cdf17604551dd0c6f7dc45185bd56ea21137b3586dffb SHA512 a7ac352502a6ca40c51f3f78ac180e17f261ff803ec1428b28ecfb861ddb75c17183453233ac3dbe415e64796342a4f60ce34c14940c4acbcb1f5d965279152f WHIRLPOOL aa66a6fe21cf9ccd72e53d12bde3db2d863d9b55dc260e7c75b840ed60b3ce885cf22d8da6686162d21a986b411c3d7131bc96039a28ea9099f27215ae354d0b
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160418.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160418.ebuild
new file mode 100644
index 0000000..2e4ff08
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160418.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-18_00-01-48/zip/netbeans-trunk-nightly-201604180001-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 58c5cb3..33d6a3b 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201604140001-src.zip 214335581 SHA256 68ee1a7dc8f093
 DIST netbeans-trunk-nightly-201604150001-src.zip 214340943 SHA256 7f1bb65d38367e2547a96e8fa027bcf4bf5815c2fd805dd01ce1c9fcb208a332 SHA512 7d598e18df326cb53b7f62a7e2a083d82e719c3db990275854b13abac138f6badb8852dfb1738a76f920e0daf4a106a54af637911e25e082b9f4fc1dce4eb373 WHIRLPOOL a46d8106c83073773dded36f9eebd37b860701460e3435deaaeef0e86b9af10ec3bdce3708d4ac783647af953a6ca3c24f78c3ee58585e65b1f0a29e92444147
 DIST netbeans-trunk-nightly-201604160001-src.zip 214350948 SHA256 6d42235d9f7fb7feed1d76934beb75ab5c548fcf1fd36d9523afeed1aff72edf SHA512 154186e3c48615ffe3ce26f37330eb28137e550426dbc5ca6d73565fcd08d3520f2e00bf4dab5d3cbfe7b489b1697113e40049eeade42e7676afac7136eb034b WHIRLPOOL b5019dee51a9eed46ac1f370fcbc8f6149db814919665236b92638131c759b0d6dd0b72e609344a6469ede3cbe90e3a2b68bfbc186c2dde89c34de5c2e53f5cf
 DIST netbeans-trunk-nightly-201604170001-src.zip 213245562 SHA256 8d1da18eea0786bbacec5b3a9479ba5f3f62463cb972b2b8d5658dfda29a3e93 SHA512 9bf389396c0b42023497277fb6312799853514b40c3fe714ff02d3945ff9c3ea6b90b433a07b85efb04a032865afd47a0c64a1aec5e8aef0884b2b4f8566e14f WHIRLPOOL 7d6dd3f54dc1e3355078a7eef2e15de18b7c03805d71ab61e8c5dc8fd0ccd281e5bd263f87daa90fcd44ac5db9cddb05c97cd850e11797eb9d0dc5ef47d641f4
+DIST netbeans-trunk-nightly-201604180001-src.zip 213245562 SHA256 33e9976d15aa52ed61f53bebb87d8290a64d6e7658dc96b044136f47d46c28de SHA512 71252b57630390c901bed5fec7021d5f9255adf02c2e84c1e0981a2d729c1d0c1ed14b927b1dd36c9a72b30ced64ae6b74429e4990ddfac4bc36aff4c46e7e17 WHIRLPOOL af4f5d0f0c8f7caac85bc7ecab0fe91c68141abc9df5a0a28cc069262aa08f869d5934f5d4a546fdd997e29dc5d63ab0aefcce530560e8ed5b9bfab86b962105
 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_p20160316.ebuild 4790 SHA256 58fd8b3ccf7caf0f0e98d40c46498cbafbb4e3c3dc3c0069c59799689efef8b5 SHA512 a2a109f10d084aac30a7e6aa3d1c665fac9a3e14abf26f3b2bf8e00ec1bc405f54feca62c53e0e991516f380edd961e3832282364eb56f861c1d6b941df59cf4 WHIRLPOOL 60ba0bb3fa15ce41c46ea9df3e8bf766794269f3c48f658519abdcf5eaa2fa026e77f9a4b91151e79bf5991a39714b334b4c4cd45c939969a0c01f4aa20771ed
@@ -56,4 +57,5 @@ EBUILD netbeans-cnd-9999_p20160414.ebuild 4790 SHA256 2a56a726f8adee8e680f63f9f0
 EBUILD netbeans-cnd-9999_p20160415.ebuild 4790 SHA256 db084d849847db4940313660294f904a45a527f322d23d8ef523c43c3340585b SHA512 e32abcd05a82279757373a060c0c67fbfe74e3d3f21e66335031fb07bb96df0ebd19b5062d18be4268ed24b7cdfbf3544267378e52a37442106c5bb52c9be0ac WHIRLPOOL 60a80a9bc2110562e3464e9ccd0001f3f0a8301ca0a77a880397dc061a72d7c83c79fa5ac7657d5662ac7565453b686c64328a97bbcb98e519dccdb7c041d6da
 EBUILD netbeans-cnd-9999_p20160416.ebuild 4790 SHA256 0d3bbc52847f6f40d457c1e00681ce3cd571df8a2878ad4d51e1aacc70aabf1a SHA512 3229613d3da8991a1299ad81f431922f71aec093b57f7c94a006ad1afc6f774e51a97d7c55dea9b954d83551c267f4509ba71bf50962fb91a147c2611b2dffa4 WHIRLPOOL df7f928270a413585b86d116d3cacc374ca23406c07df430b7a1fdc575df6ceb35f15c0f5f8a5ea56b66a3a38768cc6db08586ef799af7e7d36f20fb1923c751
 EBUILD netbeans-cnd-9999_p20160417.ebuild 4790 SHA256 0fd32adf3f2f838ff2e50af202a66b818606bd33385346fb2dc79abdc8d1c19b SHA512 3324cbd2ebd4bc344a2d2af0d8bf8b7d5d2e6dfb65c1639955893d2c0f20a288b0d9be8aca50590a5168cdc3c3236b96e362ee87fd4721096d6fac4a02d09e70 WHIRLPOOL 9ab43ae62cefc6c73a1776a9c2a5be499000676d3bef8cf755804fe00e5f232f93aa07581bf54fb6f78ba121c8d79ea491179e22d26811a59fd3f40cd74b2c89
+EBUILD netbeans-cnd-9999_p20160418.ebuild 4790 SHA256 cccdb3a54b00fe2e4a6d0daa702b5c087f53dd319815c5053d26b588b5b72691 SHA512 d3b813fda44e681754fedcd8dd9a1f297898f1b95fdd997676f82792624ac887732c8e752924f92d614215bf4df22f350a7637c775a723de5420b4811fc4bf8b WHIRLPOOL eaab91fea4dc9c792e504e72307bfc55f211e603705d90fc6243ccd5012623b33b0c99d80e87f7d5faf90bec77fd36246fdf4cda99dc4261f72ac94b6dbd3d2c
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160418.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160418.ebuild
new file mode 100644
index 0000000..df59218
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160418.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-18_00-01-48/zip/netbeans-trunk-nightly-201604180001-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 e9d69ef..b9e712f 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201604140001-src.zip 214335581 SHA256 68ee1a7dc8f093
 DIST netbeans-trunk-nightly-201604150001-src.zip 214340943 SHA256 7f1bb65d38367e2547a96e8fa027bcf4bf5815c2fd805dd01ce1c9fcb208a332 SHA512 7d598e18df326cb53b7f62a7e2a083d82e719c3db990275854b13abac138f6badb8852dfb1738a76f920e0daf4a106a54af637911e25e082b9f4fc1dce4eb373 WHIRLPOOL a46d8106c83073773dded36f9eebd37b860701460e3435deaaeef0e86b9af10ec3bdce3708d4ac783647af953a6ca3c24f78c3ee58585e65b1f0a29e92444147
 DIST netbeans-trunk-nightly-201604160001-src.zip 214350948 SHA256 6d42235d9f7fb7feed1d76934beb75ab5c548fcf1fd36d9523afeed1aff72edf SHA512 154186e3c48615ffe3ce26f37330eb28137e550426dbc5ca6d73565fcd08d3520f2e00bf4dab5d3cbfe7b489b1697113e40049eeade42e7676afac7136eb034b WHIRLPOOL b5019dee51a9eed46ac1f370fcbc8f6149db814919665236b92638131c759b0d6dd0b72e609344a6469ede3cbe90e3a2b68bfbc186c2dde89c34de5c2e53f5cf
 DIST netbeans-trunk-nightly-201604170001-src.zip 213245562 SHA256 8d1da18eea0786bbacec5b3a9479ba5f3f62463cb972b2b8d5658dfda29a3e93 SHA512 9bf389396c0b42023497277fb6312799853514b40c3fe714ff02d3945ff9c3ea6b90b433a07b85efb04a032865afd47a0c64a1aec5e8aef0884b2b4f8566e14f WHIRLPOOL 7d6dd3f54dc1e3355078a7eef2e15de18b7c03805d71ab61e8c5dc8fd0ccd281e5bd263f87daa90fcd44ac5db9cddb05c97cd850e11797eb9d0dc5ef47d641f4
+DIST netbeans-trunk-nightly-201604180001-src.zip 213245562 SHA256 33e9976d15aa52ed61f53bebb87d8290a64d6e7658dc96b044136f47d46c28de SHA512 71252b57630390c901bed5fec7021d5f9255adf02c2e84c1e0981a2d729c1d0c1ed14b927b1dd36c9a72b30ced64ae6b74429e4990ddfac4bc36aff4c46e7e17 WHIRLPOOL af4f5d0f0c8f7caac85bc7ecab0fe91c68141abc9df5a0a28cc069262aa08f869d5934f5d4a546fdd997e29dc5d63ab0aefcce530560e8ed5b9bfab86b962105
 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_p20160316.ebuild 2968 SHA256 6d1c43401d93014a97b07f85faa1713559797e52aa39c1d449039f93297d1cbe SHA512 31133f6dfe5ec0e2de41b93368499816cfdd6f105ea59cd860ce9dbd9564c4d086ff4589ee94234905ccb83e9831ee88bcc0a1c17a7bb1df7070549295ac8811 WHIRLPOOL f597bcd667d5b7aefb32bb74d6d667e877bfb34d239229fe6692f93f9da6fc3cc47ea7bbbf2991e870e5ad39e60409d2ec55b7a43cbf70086352160948b9970c
@@ -47,4 +48,5 @@ EBUILD netbeans-dlight-9999_p20160414.ebuild 2968 SHA256 093c6dcc6fc35259076fc90
 EBUILD netbeans-dlight-9999_p20160415.ebuild 2968 SHA256 b13167d5c03f5421610cdbd4da9969d55487dcecb2b86fcb5129dcad5810c6d3 SHA512 f499d4609854328e4dccb533a79a4836476b523994c0a89379a96388d3a76207f09a81a674e75f35858e9e6f631e076b72a2057da1ad276269a948854290aef1 WHIRLPOOL ba1625dfbec4f16fcdda9cfb47844578bc5200eb51632107aa4ad2babf3dc135933199b999343ce1c7bd79b989064026d7699baacb980b25307d876b89087a6c
 EBUILD netbeans-dlight-9999_p20160416.ebuild 2968 SHA256 dcc46bda1f543994beb5cde2e8825b3be22f9bd4aaf1c6756e16a4aee54097d3 SHA512 76c26b1d9bf2ec03c4bc097a399c327eedd6e6f883eb3c0284f953c5471fa086f1160ae56876be47d2c7d7c4616044865ae64bfd624d37adc53cf1392c584930 WHIRLPOOL a10b5e989a876636ad25861ff9a90988a5becbfc9e9f22a69c0575d2cd353198f15bb576ee9f5d08cdf0fe815d51412c3bd7ff156cc4f911a131382f9e528c0d
 EBUILD netbeans-dlight-9999_p20160417.ebuild 2968 SHA256 2aad4091f37950956c63cc13198b73970e12826b6dc9940c494f54ca11f0a135 SHA512 ee07ba2e192e7d0ad17bdac8caebc6eda555c184c24737e379def3d57059864faaabe93bac46b79d1fd9199246a8dc3b00fb926fc6cb8e78748fb84fba771c5d WHIRLPOOL 6bc79908f97169868ce7c58cbeb6a7ef232ac907190bc16369993962ac4ea8b3a66f2a2dcd0d367dd95934828d1bd57e9dd2d33da2f1fc55925e2e3cba954714
+EBUILD netbeans-dlight-9999_p20160418.ebuild 2968 SHA256 fec90bb8acda9dd8fd5b96e24914f54e5df417f30e25f6f398178e92e2088fdf SHA512 85e4b571e731493250834d42b605d27685581ed35185a9cdebbba7183f1c4d9966523985d1ff5c9a1e24f49b5a2842f12b7280b1a1396852da9dbced09a656bb WHIRLPOOL 93f89788f24b1c52367655a1183239b312da64cc2510a3e00a90e627f48620f9fd2825309f38cf68041d2861998d85f9692e54b633a79bd07e9e30152dbc1d88
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160418.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160418.ebuild
new file mode 100644
index 0000000..4b3f029
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160418.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-18_00-01-48/zip/netbeans-trunk-nightly-201604180001-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 17e9d81..07c85ea 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -55,6 +55,7 @@ DIST netbeans-trunk-nightly-201604140001-src.zip 214335581 SHA256 68ee1a7dc8f093
 DIST netbeans-trunk-nightly-201604150001-src.zip 214340943 SHA256 7f1bb65d38367e2547a96e8fa027bcf4bf5815c2fd805dd01ce1c9fcb208a332 SHA512 7d598e18df326cb53b7f62a7e2a083d82e719c3db990275854b13abac138f6badb8852dfb1738a76f920e0daf4a106a54af637911e25e082b9f4fc1dce4eb373 WHIRLPOOL a46d8106c83073773dded36f9eebd37b860701460e3435deaaeef0e86b9af10ec3bdce3708d4ac783647af953a6ca3c24f78c3ee58585e65b1f0a29e92444147
 DIST netbeans-trunk-nightly-201604160001-src.zip 214350948 SHA256 6d42235d9f7fb7feed1d76934beb75ab5c548fcf1fd36d9523afeed1aff72edf SHA512 154186e3c48615ffe3ce26f37330eb28137e550426dbc5ca6d73565fcd08d3520f2e00bf4dab5d3cbfe7b489b1697113e40049eeade42e7676afac7136eb034b WHIRLPOOL b5019dee51a9eed46ac1f370fcbc8f6149db814919665236b92638131c759b0d6dd0b72e609344a6469ede3cbe90e3a2b68bfbc186c2dde89c34de5c2e53f5cf
 DIST netbeans-trunk-nightly-201604170001-src.zip 213245562 SHA256 8d1da18eea0786bbacec5b3a9479ba5f3f62463cb972b2b8d5658dfda29a3e93 SHA512 9bf389396c0b42023497277fb6312799853514b40c3fe714ff02d3945ff9c3ea6b90b433a07b85efb04a032865afd47a0c64a1aec5e8aef0884b2b4f8566e14f WHIRLPOOL 7d6dd3f54dc1e3355078a7eef2e15de18b7c03805d71ab61e8c5dc8fd0ccd281e5bd263f87daa90fcd44ac5db9cddb05c97cd850e11797eb9d0dc5ef47d641f4
+DIST netbeans-trunk-nightly-201604180001-src.zip 213245562 SHA256 33e9976d15aa52ed61f53bebb87d8290a64d6e7658dc96b044136f47d46c28de SHA512 71252b57630390c901bed5fec7021d5f9255adf02c2e84c1e0981a2d729c1d0c1ed14b927b1dd36c9a72b30ced64ae6b74429e4990ddfac4bc36aff4c46e7e17 WHIRLPOOL af4f5d0f0c8f7caac85bc7ecab0fe91c68141abc9df5a0a28cc069262aa08f869d5934f5d4a546fdd997e29dc5d63ab0aefcce530560e8ed5b9bfab86b962105
 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_p20160316.ebuild 15825 SHA256 ff3f2c1a3e30aacaa3dd133f1c183b74df10890d54405aa05ebd3cd34d225c18 SHA512 34ff07b9414e699db1871da94a0cdbb8b951e5bac8eb40ba4ffbd9fdef6715a93f20df4a8953b961a8e48cf579b58f93c62314b1c9a33511f62fdec9dab1033a WHIRLPOOL d44ee053465e092d53349137252e1d06cf82a6964cbb9b018ea819702cd17fc788fb7f602f94a844abc87e99abd24445a4bd23d5051526431ce47bafcc7aad2e
@@ -76,4 +77,5 @@ EBUILD netbeans-enterprise-9999_p20160414.ebuild 15825 SHA256 6d8d3fdd23ab60ff2d
 EBUILD netbeans-enterprise-9999_p20160415.ebuild 15825 SHA256 a3d0dbfcfbc1b944ebee5bdf9de844e406d482e3c9701981ae10e6d9a28faa9f SHA512 062cb5fa1c86b9d91e88a29fe5a5d38616b70b7a8a11bdbbc3dc541a44e1ae368a0e5f9dfa2ce7024018600f508c80f82befc1e7aa8cd6251a5b9946db90b957 WHIRLPOOL 5e478178349730af233177e3aef5a0a548debc6656b67cf6fcce7dec71b30123719d1329b7cc806ff8227873acb89d30509ee4604f401095fa68f1d8d8461c67
 EBUILD netbeans-enterprise-9999_p20160416.ebuild 15825 SHA256 03884eecac71964870d40e245c51774a9f8693d0c108d378beb48b8c038a6d8e SHA512 f25e119c814ed9c20b1d9846faf20494607ddd1298198391dc68420138d7c13b787d062ae483491f9780cc49219aa697e8d94057983c868e1cba95b565a42525 WHIRLPOOL 017d2fea08a16041e4ee3e4d8c38b3ffef2a985bb62ba0cf41162d7f8466968ab1e53b360e3abf423b6416fb765e5989c0f46d069e7a4bbf74342491ac9e586d
 EBUILD netbeans-enterprise-9999_p20160417.ebuild 15825 SHA256 86b3aadd49c6cd877c4b93ed9b974394d07c8d802aa75c9fcd8756ccb36a9948 SHA512 07e182ba3ea94ab83a0478b598f21e995fb3a2b2f08b8d431d5f60e4e596559cfb2a9c52d6afee294735d86ba7cefa5a753e5ec16aa61f36afba65ea55c0d7f4 WHIRLPOOL 56cad845609c867178d4dfadc478c571923339c09da321a09318ab56f0cadc42c8a5e34aa98b560585736ef10dd0198bcf50fce08e9c199ebdc69c19c8414fbc
+EBUILD netbeans-enterprise-9999_p20160418.ebuild 15825 SHA256 c2af91026534862779f5a3845882d375ce0df4b67e4f3d2b3ab8c88dc2f6361f SHA512 41163907e34ab6d6d61869521198d671cc4dec04ccfdfe891692296afe8fca6641268d20644553a5af434cb8021c15101a9d1fee49767e2dce6eabe6d1ba4c11 WHIRLPOOL 232eeaab21d111daed2ffa86bb63bba9f9d1283ae5e8c829bae27fa8dfbcf75e41a12431662ae80fc99ee1bc71034cc6dade3abd024422de8fd51fe86e41d7a4
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160418.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160418.ebuild
new file mode 100644
index 0000000..c3a6e6a
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160418.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-18_00-01-48/zip/netbeans-trunk-nightly-201604180001-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 17da62b..6e4b9a5 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201604140001-src.zip 214335581 SHA256 68ee1a7dc8f093
 DIST netbeans-trunk-nightly-201604150001-src.zip 214340943 SHA256 7f1bb65d38367e2547a96e8fa027bcf4bf5815c2fd805dd01ce1c9fcb208a332 SHA512 7d598e18df326cb53b7f62a7e2a083d82e719c3db990275854b13abac138f6badb8852dfb1738a76f920e0daf4a106a54af637911e25e082b9f4fc1dce4eb373 WHIRLPOOL a46d8106c83073773dded36f9eebd37b860701460e3435deaaeef0e86b9af10ec3bdce3708d4ac783647af953a6ca3c24f78c3ee58585e65b1f0a29e92444147
 DIST netbeans-trunk-nightly-201604160001-src.zip 214350948 SHA256 6d42235d9f7fb7feed1d76934beb75ab5c548fcf1fd36d9523afeed1aff72edf SHA512 154186e3c48615ffe3ce26f37330eb28137e550426dbc5ca6d73565fcd08d3520f2e00bf4dab5d3cbfe7b489b1697113e40049eeade42e7676afac7136eb034b WHIRLPOOL b5019dee51a9eed46ac1f370fcbc8f6149db814919665236b92638131c759b0d6dd0b72e609344a6469ede3cbe90e3a2b68bfbc186c2dde89c34de5c2e53f5cf
 DIST netbeans-trunk-nightly-201604170001-src.zip 213245562 SHA256 8d1da18eea0786bbacec5b3a9479ba5f3f62463cb972b2b8d5658dfda29a3e93 SHA512 9bf389396c0b42023497277fb6312799853514b40c3fe714ff02d3945ff9c3ea6b90b433a07b85efb04a032865afd47a0c64a1aec5e8aef0884b2b4f8566e14f WHIRLPOOL 7d6dd3f54dc1e3355078a7eef2e15de18b7c03805d71ab61e8c5dc8fd0ccd281e5bd263f87daa90fcd44ac5db9cddb05c97cd850e11797eb9d0dc5ef47d641f4
+DIST netbeans-trunk-nightly-201604180001-src.zip 213245562 SHA256 33e9976d15aa52ed61f53bebb87d8290a64d6e7658dc96b044136f47d46c28de SHA512 71252b57630390c901bed5fec7021d5f9255adf02c2e84c1e0981a2d729c1d0c1ed14b927b1dd36c9a72b30ced64ae6b74429e4990ddfac4bc36aff4c46e7e17 WHIRLPOOL af4f5d0f0c8f7caac85bc7ecab0fe91c68141abc9df5a0a28cc069262aa08f869d5934f5d4a546fdd997e29dc5d63ab0aefcce530560e8ed5b9bfab86b962105
 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_p20160316.ebuild 2913 SHA256 fdd9d8564ee09ebcd6aadeb102f6db8f94206447b889a60236738f393712e3dd SHA512 0831595349999afa3568bbb2f7b523feebc4506836e6c9d050fed54af42eb4df04754d8389905c5d6bdfd11acdf305a3750c6e0f4aed8c3ed1820101a20630e7 WHIRLPOOL 3ea7aeca83746382a8445d95828486a0f439f8fd9c0094b96f1894ade992dff28f530a2be0b9a55b797dc8615d57e19e73530c192c7d10e70112b49a076bb292
@@ -44,4 +45,5 @@ EBUILD netbeans-ergonomics-9999_p20160414.ebuild 2913 SHA256 6e42eac5881121305a5
 EBUILD netbeans-ergonomics-9999_p20160415.ebuild 2913 SHA256 f3ac6fd9db8c232bdcf99dd399202c894d8ea083f2842482b83e9e1d7eac0fc0 SHA512 7458b5755b012663b279b4ef29dff7d458af9fe2bad10d36cb372fc5015689701e15f7b3e61da5cf9936f3e80e2f5c9d35f333a52f220b42e429aa315486f2b3 WHIRLPOOL ac723b4cc7ea3ca335e261ef0bca935d3cf3673a980ee3620e09ac9f30f94bb80088b7d1f65df708e5e4f9b6ea18774333990e47e5840961630ac214757718e7
 EBUILD netbeans-ergonomics-9999_p20160416.ebuild 2913 SHA256 1e143063de82da90a9eaaadc62c42f97148248e0d30ee4d00b1c30104e2937e9 SHA512 904ce9cf7fe4120e418b795a93c69c76ace5d6221a91e13def8a743834c7c67111a5b3c55f9dee301497a588c14ab33954b52923a8b2321065ee6e93085625d9 WHIRLPOOL 4ee01b56996b2105c51984aceb08ae3c7838dff8baa05d7a07ba59fb661df8bc8a1f04f5c9d8967943d6292393b516bcfe83d76228c3ad4dc812164e8147e025
 EBUILD netbeans-ergonomics-9999_p20160417.ebuild 2913 SHA256 3e985a1f7545ffc91ad5e4682e320346ee3d0e0d4229bd556bbfd135d1749645 SHA512 bcbbf24b2c79102dfb73b61fb0d53fb3f6ed6bfa8352e32a73b8f68c38d8a8e5a228f4d4866bb8c22134a36fc4e859fc69144d525fc2b758c71206ce4c06267a WHIRLPOOL a1c75cb0f4329d8f49bc993c58828f18b59d960f41dee71661a73668bddfccf50302b84ed27b02e3698224934550f7f7d412c403b38a32b696e7a46eae563f47
+EBUILD netbeans-ergonomics-9999_p20160418.ebuild 2913 SHA256 f30646af86d27330358ab60305d9f7c05b1eaf29a2ce3f6c94bc289b854ce298 SHA512 5e7e7798ae4f6bc8859e071ea0835887b99dc5c4f6c38ad0e626f0e949126e4b53d902f63e3203f7c5c33e0d39d62da018a72b5502b62437845706d3a897449d WHIRLPOOL 78e48094d6ba8c6aff7b3243511cba8f35f8854deb6955cf73b14b7b0ecaa89c88be335fdc0f430af265874a31d9282b242657cff7a695f5cdb2988c5e4db5d9
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160418.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160418.ebuild
new file mode 100644
index 0000000..ed21af4
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160418.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-18_00-01-48/zip/netbeans-trunk-nightly-201604180001-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 473bbe8..c18ae7b 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201604140001-src.zip 214335581 SHA256 68ee1a7dc8f093
 DIST netbeans-trunk-nightly-201604150001-src.zip 214340943 SHA256 7f1bb65d38367e2547a96e8fa027bcf4bf5815c2fd805dd01ce1c9fcb208a332 SHA512 7d598e18df326cb53b7f62a7e2a083d82e719c3db990275854b13abac138f6badb8852dfb1738a76f920e0daf4a106a54af637911e25e082b9f4fc1dce4eb373 WHIRLPOOL a46d8106c83073773dded36f9eebd37b860701460e3435deaaeef0e86b9af10ec3bdce3708d4ac783647af953a6ca3c24f78c3ee58585e65b1f0a29e92444147
 DIST netbeans-trunk-nightly-201604160001-src.zip 214350948 SHA256 6d42235d9f7fb7feed1d76934beb75ab5c548fcf1fd36d9523afeed1aff72edf SHA512 154186e3c48615ffe3ce26f37330eb28137e550426dbc5ca6d73565fcd08d3520f2e00bf4dab5d3cbfe7b489b1697113e40049eeade42e7676afac7136eb034b WHIRLPOOL b5019dee51a9eed46ac1f370fcbc8f6149db814919665236b92638131c759b0d6dd0b72e609344a6469ede3cbe90e3a2b68bfbc186c2dde89c34de5c2e53f5cf
 DIST netbeans-trunk-nightly-201604170001-src.zip 213245562 SHA256 8d1da18eea0786bbacec5b3a9479ba5f3f62463cb972b2b8d5658dfda29a3e93 SHA512 9bf389396c0b42023497277fb6312799853514b40c3fe714ff02d3945ff9c3ea6b90b433a07b85efb04a032865afd47a0c64a1aec5e8aef0884b2b4f8566e14f WHIRLPOOL 7d6dd3f54dc1e3355078a7eef2e15de18b7c03805d71ab61e8c5dc8fd0ccd281e5bd263f87daa90fcd44ac5db9cddb05c97cd850e11797eb9d0dc5ef47d641f4
+DIST netbeans-trunk-nightly-201604180001-src.zip 213245562 SHA256 33e9976d15aa52ed61f53bebb87d8290a64d6e7658dc96b044136f47d46c28de SHA512 71252b57630390c901bed5fec7021d5f9255adf02c2e84c1e0981a2d729c1d0c1ed14b927b1dd36c9a72b30ced64ae6b74429e4990ddfac4bc36aff4c46e7e17 WHIRLPOOL af4f5d0f0c8f7caac85bc7ecab0fe91c68141abc9df5a0a28cc069262aa08f869d5934f5d4a546fdd997e29dc5d63ab0aefcce530560e8ed5b9bfab86b962105
 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_p20160316.ebuild 3377 SHA256 109463728e454d659cadbc7e828810a2951775ad95e0c80543a1498a28f561ed SHA512 9aea6ebe66ec5d55402b53019829fca6e22b6d6c0ebcd91d967d487c7c8966cb37214b601ac3955f1760de121fc6d20aeb253d97aa477c7f800b7df04a6544fb WHIRLPOOL f492f5a70706a9187931fc3c989de8cae35035e63475ac924c7747238f0466d54865fa721da064d210cf5acaa4f3422db3f0f7a1980a03f6317e4ffe65ba0691
@@ -46,4 +47,5 @@ EBUILD netbeans-extide-9999_p20160414.ebuild 3377 SHA256 3fa98b52652957e198a1492
 EBUILD netbeans-extide-9999_p20160415.ebuild 3377 SHA256 95ecaefc4f377b3b0459eb7962571a08656917b9b6bea7b3fadc7ba4036f3751 SHA512 2b81635abc6f293b0dc500b3c158931098731062eabf5196d4396f74bc30f98e21657ec0b92e81c0f4897e53c2b8454cecf4368ad5cbe90b2efcb83cb5f31f0e WHIRLPOOL 5132fd0779fc3091a6c9df94cd2ed62e48b9f6250ca1a6fdf313efac2d101b37e0f3e3cde7f4a2c30e0d224bfdf5c775644f30a5ff4f66877605c844c5c2cb6e
 EBUILD netbeans-extide-9999_p20160416.ebuild 3377 SHA256 7e9c5c98a3dba4784d8f63474cdd4d8e589b816c0f731a092b6725e62c16a158 SHA512 7be4bec9672446bbf40c5101bac958a58ec95c06f767bcdcb6f04a4c814aa08623895bf49232d6b934e506ac45f0dc8b047b44fc53738d8de4248a59ad5f0179 WHIRLPOOL 88d8656d424892999b50b902f4ea37bdd0cf7cb5ecd74434907db859068a455ddc174bb3088ae54f0bb161b2059d9faebc09c5051fce67be5e44038e644e82b2
 EBUILD netbeans-extide-9999_p20160417.ebuild 3377 SHA256 8207c1951821a6d0e746f36886d6400830b213e932ba1b3a70086d2e3f933787 SHA512 040a6fd0d2fc530d1e42144054df0ef20ced782e966eeab31ca87e213796fef1bdf6a44d4254cb2e01461602852301a666ac9cb07d3660517235c1670349e8ab WHIRLPOOL 519dd9ac964186257e1e1e3670700bad461f5e794b1854531d4dbb82d9398a31a5f0746019dda297e1b9ae922e40f0978a26f2b30e476139a65c6b9975ccf3e3
+EBUILD netbeans-extide-9999_p20160418.ebuild 3377 SHA256 a2d2397ed22bfe02eafa0acc7179c13dd3a4dd08956703cc190a6d95d3eea748 SHA512 b32db013e94888b06ead77215020eafb2ee546860d3e3f7f690028dff40b79fb740a07225e209c53fc669da8c46c9763368d9de1aa75708d6078a0dd70baf9b1 WHIRLPOOL 1c5ce7ac90aea790524f712d9511d96cd415d6ff97b81490a0d4904baed501de78931c3722d6f22ad0368ee75f6cf6e17b403a26e59da097ec6924c1402d4a04
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index f258a15..229aa2a 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201604140001-src.zip 214335581 SHA256 68ee1a7dc8f093
 DIST netbeans-trunk-nightly-201604150001-src.zip 214340943 SHA256 7f1bb65d38367e2547a96e8fa027bcf4bf5815c2fd805dd01ce1c9fcb208a332 SHA512 7d598e18df326cb53b7f62a7e2a083d82e719c3db990275854b13abac138f6badb8852dfb1738a76f920e0daf4a106a54af637911e25e082b9f4fc1dce4eb373 WHIRLPOOL a46d8106c83073773dded36f9eebd37b860701460e3435deaaeef0e86b9af10ec3bdce3708d4ac783647af953a6ca3c24f78c3ee58585e65b1f0a29e92444147
 DIST netbeans-trunk-nightly-201604160001-src.zip 214350948 SHA256 6d42235d9f7fb7feed1d76934beb75ab5c548fcf1fd36d9523afeed1aff72edf SHA512 154186e3c48615ffe3ce26f37330eb28137e550426dbc5ca6d73565fcd08d3520f2e00bf4dab5d3cbfe7b489b1697113e40049eeade42e7676afac7136eb034b WHIRLPOOL b5019dee51a9eed46ac1f370fcbc8f6149db814919665236b92638131c759b0d6dd0b72e609344a6469ede3cbe90e3a2b68bfbc186c2dde89c34de5c2e53f5cf
 DIST netbeans-trunk-nightly-201604170001-src.zip 213245562 SHA256 8d1da18eea0786bbacec5b3a9479ba5f3f62463cb972b2b8d5658dfda29a3e93 SHA512 9bf389396c0b42023497277fb6312799853514b40c3fe714ff02d3945ff9c3ea6b90b433a07b85efb04a032865afd47a0c64a1aec5e8aef0884b2b4f8566e14f WHIRLPOOL 7d6dd3f54dc1e3355078a7eef2e15de18b7c03805d71ab61e8c5dc8fd0ccd281e5bd263f87daa90fcd44ac5db9cddb05c97cd850e11797eb9d0dc5ef47d641f4
+DIST netbeans-trunk-nightly-201604180001-src.zip 213245562 SHA256 33e9976d15aa52ed61f53bebb87d8290a64d6e7658dc96b044136f47d46c28de SHA512 71252b57630390c901bed5fec7021d5f9255adf02c2e84c1e0981a2d729c1d0c1ed14b927b1dd36c9a72b30ced64ae6b74429e4990ddfac4bc36aff4c46e7e17 WHIRLPOOL af4f5d0f0c8f7caac85bc7ecab0fe91c68141abc9df5a0a28cc069262aa08f869d5934f5d4a546fdd997e29dc5d63ab0aefcce530560e8ed5b9bfab86b962105
 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_p20160316.ebuild 3416 SHA256 98385adf344a4b4ebadb33af9ab0fdb2fcaf0170f33a985b651e0ac72f2c6bfe SHA512 c1ae8a64da34f06296dfb46bbcb94e08183454d600e510d4737533674033196a6f94d125f7d30cd26605a6ea6ba6696f731886c61f406f955ffd6064850f81c4 WHIRLPOOL 85ac1736cd80ce349b53219e7cc82b5f559ea741f4416bd0c0579a0361f4d38ae642ccc3f014cbc1e81445800a4c7f297cf1b1388c909d0c066e2dcde3841eef
@@ -46,4 +47,5 @@ EBUILD netbeans-groovy-9999_p20160414.ebuild 3416 SHA256 e24729142f4ac1f47b5c03f
 EBUILD netbeans-groovy-9999_p20160415.ebuild 3416 SHA256 4f90db48368c83be648ab3b954cf2e697c177191eec834878478cac168a9a437 SHA512 699081da6b19f89c48e0528cc3dab6d4761af38039a4227c3a82d17429f4e4fab149a35e1f874a632e1ab2ccc3f6919467bf1d59e96c95e59ff8c5b1c59c24c2 WHIRLPOOL ae61739a6a346a8151535ec619b58f3644a0259bce7740454cb313ff35f0128203e023f94ae5986875d477950ae5e3d78f40b32f5594382f20ae819fc81e58c4
 EBUILD netbeans-groovy-9999_p20160416.ebuild 3416 SHA256 60c74aa13c7b4c0e8197df443ccbf23343157b02e81550c69fce9f0ffa0c2d07 SHA512 70df025d424a5f5b409f9b5a28348c4bb24d056044e00ea7243ea4131792ece72853e533816d6f234b32da2783645a5c99a4279a00deb76824317e172e45bc6b WHIRLPOOL 474245ed2f09bf94f9a61af01615d76bddf40e3d0408ec992bbd76c5e88a6a0c06f4ea7c5c3136164b8f3a29fc10831a6bc29d5be2bdcd2da954e72c649916aa
 EBUILD netbeans-groovy-9999_p20160417.ebuild 3416 SHA256 4d34c6c3d9cc2ae5cfe8d42ca7f92eb2ce6768aa362c890f80fad76483cc2566 SHA512 2cd4906d59f46a9060bca17344cc7385284e23eb2fed2d35c0de8891395a4263dbc1c14ba4d9cad399f25059a7d4bfc548409d3021b5e998b6baf69a8321b16c WHIRLPOOL fa4faba9f46720746e80c9e2c1fd0a6a9fda97b6217f376d7fc42b9ef3cb3f15e0105f5f5eee44bb000777ecda171036409bc7b92cd36cecaa81c108618911d9
+EBUILD netbeans-groovy-9999_p20160418.ebuild 3416 SHA256 417d9145b45a0f232c767dabed7df89dbb79049bffa0223b5af25cba769d9dd8 SHA512 e28cd8c6567fb091b7faa5937e0443ef1c6523d261fee666bc47c8c9f3f3fc1886c1cb9bb62db4ac8c75eaaebb83bfc840e9bc8cd4f79cb9f33e727fd1918b64 WHIRLPOOL b717be05f9a03d2551ec9211e657a0080a77d067031cdb07faaa25d3ad1e9dcd2adaaecc6a67b10f23c412609566034abb15c5af61507ce9ac8b58ccf76daf74
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160418.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160418.ebuild
new file mode 100644
index 0000000..9e49bdf
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160418.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-18_00-01-48/zip/netbeans-trunk-nightly-201604180001-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 7d7e234..e7e1f56 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201604140001-src.zip 214335581 SHA256 68ee1a7dc8f093
 DIST netbeans-trunk-nightly-201604150001-src.zip 214340943 SHA256 7f1bb65d38367e2547a96e8fa027bcf4bf5815c2fd805dd01ce1c9fcb208a332 SHA512 7d598e18df326cb53b7f62a7e2a083d82e719c3db990275854b13abac138f6badb8852dfb1738a76f920e0daf4a106a54af637911e25e082b9f4fc1dce4eb373 WHIRLPOOL a46d8106c83073773dded36f9eebd37b860701460e3435deaaeef0e86b9af10ec3bdce3708d4ac783647af953a6ca3c24f78c3ee58585e65b1f0a29e92444147
 DIST netbeans-trunk-nightly-201604160001-src.zip 214350948 SHA256 6d42235d9f7fb7feed1d76934beb75ab5c548fcf1fd36d9523afeed1aff72edf SHA512 154186e3c48615ffe3ce26f37330eb28137e550426dbc5ca6d73565fcd08d3520f2e00bf4dab5d3cbfe7b489b1697113e40049eeade42e7676afac7136eb034b WHIRLPOOL b5019dee51a9eed46ac1f370fcbc8f6149db814919665236b92638131c759b0d6dd0b72e609344a6469ede3cbe90e3a2b68bfbc186c2dde89c34de5c2e53f5cf
 DIST netbeans-trunk-nightly-201604170001-src.zip 213245562 SHA256 8d1da18eea0786bbacec5b3a9479ba5f3f62463cb972b2b8d5658dfda29a3e93 SHA512 9bf389396c0b42023497277fb6312799853514b40c3fe714ff02d3945ff9c3ea6b90b433a07b85efb04a032865afd47a0c64a1aec5e8aef0884b2b4f8566e14f WHIRLPOOL 7d6dd3f54dc1e3355078a7eef2e15de18b7c03805d71ab61e8c5dc8fd0ccd281e5bd263f87daa90fcd44ac5db9cddb05c97cd850e11797eb9d0dc5ef47d641f4
+DIST netbeans-trunk-nightly-201604180001-src.zip 213245562 SHA256 33e9976d15aa52ed61f53bebb87d8290a64d6e7658dc96b044136f47d46c28de SHA512 71252b57630390c901bed5fec7021d5f9255adf02c2e84c1e0981a2d729c1d0c1ed14b927b1dd36c9a72b30ced64ae6b74429e4990ddfac4bc36aff4c46e7e17 WHIRLPOOL af4f5d0f0c8f7caac85bc7ecab0fe91c68141abc9df5a0a28cc069262aa08f869d5934f5d4a546fdd997e29dc5d63ab0aefcce530560e8ed5b9bfab86b962105
 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_p20160316.ebuild 4126 SHA256 6deec86c975f542f29865f0378d933d5cd5b53ef8f687bb44362035d4fb9c7c1 SHA512 2c8ecd5103e783f0b4c489742b34a56bc85f671c0c63a94cb81aec650556844c33cac97534d312caeb37b955f122e50af3d4e21512b76f526b50184480ff2784 WHIRLPOOL 1d65c245b5c444a2468d5310ade6a3b809c04dc978724055252f34f1c938e2c26ad41deb53b0ddd72f6a6e130997ab381ad1a6628c5d4a55d23d9fbd64252192
@@ -49,4 +50,5 @@ EBUILD netbeans-harness-9999_p20160414.ebuild 4126 SHA256 bb3cc24807e3f2fdadf6ce
 EBUILD netbeans-harness-9999_p20160415.ebuild 4126 SHA256 a1b9e37cfc3ea87d9bb635b0999e4d5859fc4d1f30314a5855b5cab83ac5d200 SHA512 000ac71100406a03c6a26dbe87f3e54ce44b74f36404c7affadf741565a906067927cc8db0a7d7ebff8d26ced2a54e161bb57776793750c634389816cb93c85d WHIRLPOOL 628732d1e9e75fc0df7c97a12bbc171d75e77949b9e1dd6f1ac5f7ec7ca3c67103607c207929b2c179acfbe5d6c6e3a0e8a8b3ab7067087c04144b70ff4f9323
 EBUILD netbeans-harness-9999_p20160416.ebuild 4126 SHA256 eebc40afc47c3a8e3d6edccb9d28dde09da6bcf6dfab42e6c55c6bd2887c909c SHA512 5ffe99d33ee31e4d1ae99958b9b5b1cac6c645e1181b3374ba9e202828970c22da1e24cd5d66aeaf8f74baeacfd4891f00e6aab34be9a466fabf03301a848d1e WHIRLPOOL 51986cd5700d9e97405c9e5e7752637e7db9754525d872837bbfc59317656c958c520b9c71b995899b4e8a4d9d6c6ad9bbf91ca937f9ece37a049a689fe93dc2
 EBUILD netbeans-harness-9999_p20160417.ebuild 4126 SHA256 b1ca4a6a126491f642a5c87fa955e1481c356cf606fc3d4b24d1f4e8f947a787 SHA512 873e3077d7e4ca4241b9f78e99a18cdf1b10f1add25c1941cec67fff3f62c38866547259ce88a0bf878ca3903de583b7773de3884ebbb77a1ade7bd00200babe WHIRLPOOL 1e33092e59ebc49375a53ea0ceab3a2a34d9797047725c9ae932c532fdd8013c0e19f9b9f2b039fd89dae31b349cac0aee3462087f817f23cede062bfe86dc42
+EBUILD netbeans-harness-9999_p20160418.ebuild 4126 SHA256 1d3986f63355996367a28abcc860c38db8badc241d3a8286f2d9c329dffd9179 SHA512 93f7823bf2c9185dfda5bd623c21158325fb6735e2472c93b65fd18be66cde9b4390bde2d9e1887abe93360442c7115f8b9b8f8229442be0f2e99774a0ae31d4 WHIRLPOOL d1c8553bf93227f98dd0df80a298214a2be36486838fc937e7924d5a075749a6b1deca0dfd7c719b27dd7f5392edca14734e9d52106980a53b7e726f0cd6af55
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160418.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160418.ebuild
new file mode 100644
index 0000000..d21f705
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20160418.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-18_00-01-48/zip/netbeans-trunk-nightly-201604180001-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 be940ff..233d86e 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -162,6 +162,7 @@ DIST netbeans-trunk-nightly-201604140001-src.zip 214335581 SHA256 68ee1a7dc8f093
 DIST netbeans-trunk-nightly-201604150001-src.zip 214340943 SHA256 7f1bb65d38367e2547a96e8fa027bcf4bf5815c2fd805dd01ce1c9fcb208a332 SHA512 7d598e18df326cb53b7f62a7e2a083d82e719c3db990275854b13abac138f6badb8852dfb1738a76f920e0daf4a106a54af637911e25e082b9f4fc1dce4eb373 WHIRLPOOL a46d8106c83073773dded36f9eebd37b860701460e3435deaaeef0e86b9af10ec3bdce3708d4ac783647af953a6ca3c24f78c3ee58585e65b1f0a29e92444147
 DIST netbeans-trunk-nightly-201604160001-src.zip 214350948 SHA256 6d42235d9f7fb7feed1d76934beb75ab5c548fcf1fd36d9523afeed1aff72edf SHA512 154186e3c48615ffe3ce26f37330eb28137e550426dbc5ca6d73565fcd08d3520f2e00bf4dab5d3cbfe7b489b1697113e40049eeade42e7676afac7136eb034b WHIRLPOOL b5019dee51a9eed46ac1f370fcbc8f6149db814919665236b92638131c759b0d6dd0b72e609344a6469ede3cbe90e3a2b68bfbc186c2dde89c34de5c2e53f5cf
 DIST netbeans-trunk-nightly-201604170001-src.zip 213245562 SHA256 8d1da18eea0786bbacec5b3a9479ba5f3f62463cb972b2b8d5658dfda29a3e93 SHA512 9bf389396c0b42023497277fb6312799853514b40c3fe714ff02d3945ff9c3ea6b90b433a07b85efb04a032865afd47a0c64a1aec5e8aef0884b2b4f8566e14f WHIRLPOOL 7d6dd3f54dc1e3355078a7eef2e15de18b7c03805d71ab61e8c5dc8fd0ccd281e5bd263f87daa90fcd44ac5db9cddb05c97cd850e11797eb9d0dc5ef47d641f4
+DIST netbeans-trunk-nightly-201604180001-src.zip 213245562 SHA256 33e9976d15aa52ed61f53bebb87d8290a64d6e7658dc96b044136f47d46c28de SHA512 71252b57630390c901bed5fec7021d5f9255adf02c2e84c1e0981a2d729c1d0c1ed14b927b1dd36c9a72b30ced64ae6b74429e4990ddfac4bc36aff4c46e7e17 WHIRLPOOL af4f5d0f0c8f7caac85bc7ecab0fe91c68141abc9df5a0a28cc069262aa08f869d5934f5d4a546fdd997e29dc5d63ab0aefcce530560e8ed5b9bfab86b962105
 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_p20160316.ebuild 30250 SHA256 1c00e9ce20992f520a4ed254db5cb7244f0917bc2c2a6fdb30b04197f5f42a19 SHA512 156358d9d6bd9256b5e40d64ecc010acdf8ec077e0913df4a2deb1397678fa0950f17f75929b327f0485da36661fd7e1cf3d2fd7db8c8799f146bd24be7310e4 WHIRLPOOL 6b4c3180ada9053ef9c16b3e432d560e6256c9cbb94a11ade8cd1826f9f94c224742636431180daa9817e014a97855cfed48f13d6a0409debdec39d34cda6fde
@@ -183,4 +184,5 @@ EBUILD netbeans-ide-9999_p20160414.ebuild 30761 SHA256 9714b1df3718b4287b459c4d7
 EBUILD netbeans-ide-9999_p20160415.ebuild 30761 SHA256 ff45c5ddb0f685576d8fd783b3aeb0c54b185bf2e122edb92da8992cd0665abb SHA512 dcca522c32f95ccb5f7cda40b72a0b460cab074c002cb55e4dbcc07e29216b5ba56a604134b59cd6231e56ec023d39dc1c8d611ca8e2b241588aa7e0e222999e WHIRLPOOL 4c2fec40c19566fa059907c2ca6791efc02ec36f85b507f3676bd6004cc3509f799575a25608f62e25ee353372847b302adc3fa69a31b0fcf618465e0bd5e35d
 EBUILD netbeans-ide-9999_p20160416.ebuild 30761 SHA256 0f8e6ef881c78bf426a32d3f8022f77e2e9d12d124c7318e725d38dcae7d8ce7 SHA512 e21aed85b31e99e3318391f8c8e6a1ba235ef54106a48370fd204d54965673ab2aa59bf4942f2cc0b3e8d9e92a50c364cc118f1f37d158df4c82c39e7255b7d2 WHIRLPOOL 9b449a6a25134752072a6cc2077e0eea595d634eec505e9b69f0c72a03b4ecc196ffe223400bd6de2707e8b1597aedf63f3169e36a741b47f8f26bfaeae768cf
 EBUILD netbeans-ide-9999_p20160417.ebuild 30761 SHA256 b91fd3ae94e850a5ee8f3747cee62cb830691ce7853db08a0a4d2768b8144b97 SHA512 64de3ddfd105236cba1f1c279a8592b63d10b35b4617b96fe741adc951215a62b3fba2f2f1d7c66def0b0818d2fa9e56c4a853be9b36bc22ea093705ea915d36 WHIRLPOOL bcb172623893cd8f0254a7e71bc895a247632e8bfecbc5c1feae77390f7ca20d85aa0e539abd3630eb6e97c38a6491ed1bf772eae53ef9040ff514749e70b981
+EBUILD netbeans-ide-9999_p20160418.ebuild 30761 SHA256 ea9bd06da776f3f911af65a19e9b987ab8c3747d3ac8db9bd80e6092d00a5e57 SHA512 c909bd02673b5dcdbbb3309720006e49fd1ef01e8635dbbc9667556d29f1d975d2b658a58d33a24883b82b9b22ff042cc89c38da31272f6a6904faf17f673308 WHIRLPOOL 378d660d7fc5a4b24830f239fd3230c8c77411f6effff410b16a1322ff9afab96fc157ad977937622c422938f8c2f7b12a900beb79bdfb23ab8e431164840538
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160418.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160418.ebuild
new file mode 100644
index 0000000..15665df
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20160418.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-18_00-01-48/zip/netbeans-trunk-nightly-201604180001-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 e26fed9..4d53416 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -60,6 +60,7 @@ DIST netbeans-trunk-nightly-201604140001-src.zip 214335581 SHA256 68ee1a7dc8f093
 DIST netbeans-trunk-nightly-201604150001-src.zip 214340943 SHA256 7f1bb65d38367e2547a96e8fa027bcf4bf5815c2fd805dd01ce1c9fcb208a332 SHA512 7d598e18df326cb53b7f62a7e2a083d82e719c3db990275854b13abac138f6badb8852dfb1738a76f920e0daf4a106a54af637911e25e082b9f4fc1dce4eb373 WHIRLPOOL a46d8106c83073773dded36f9eebd37b860701460e3435deaaeef0e86b9af10ec3bdce3708d4ac783647af953a6ca3c24f78c3ee58585e65b1f0a29e92444147
 DIST netbeans-trunk-nightly-201604160001-src.zip 214350948 SHA256 6d42235d9f7fb7feed1d76934beb75ab5c548fcf1fd36d9523afeed1aff72edf SHA512 154186e3c48615ffe3ce26f37330eb28137e550426dbc5ca6d73565fcd08d3520f2e00bf4dab5d3cbfe7b489b1697113e40049eeade42e7676afac7136eb034b WHIRLPOOL b5019dee51a9eed46ac1f370fcbc8f6149db814919665236b92638131c759b0d6dd0b72e609344a6469ede3cbe90e3a2b68bfbc186c2dde89c34de5c2e53f5cf
 DIST netbeans-trunk-nightly-201604170001-src.zip 213245562 SHA256 8d1da18eea0786bbacec5b3a9479ba5f3f62463cb972b2b8d5658dfda29a3e93 SHA512 9bf389396c0b42023497277fb6312799853514b40c3fe714ff02d3945ff9c3ea6b90b433a07b85efb04a032865afd47a0c64a1aec5e8aef0884b2b4f8566e14f WHIRLPOOL 7d6dd3f54dc1e3355078a7eef2e15de18b7c03805d71ab61e8c5dc8fd0ccd281e5bd263f87daa90fcd44ac5db9cddb05c97cd850e11797eb9d0dc5ef47d641f4
+DIST netbeans-trunk-nightly-201604180001-src.zip 213245562 SHA256 33e9976d15aa52ed61f53bebb87d8290a64d6e7658dc96b044136f47d46c28de SHA512 71252b57630390c901bed5fec7021d5f9255adf02c2e84c1e0981a2d729c1d0c1ed14b927b1dd36c9a72b30ced64ae6b74429e4990ddfac4bc36aff4c46e7e17 WHIRLPOOL af4f5d0f0c8f7caac85bc7ecab0fe91c68141abc9df5a0a28cc069262aa08f869d5934f5d4a546fdd997e29dc5d63ab0aefcce530560e8ed5b9bfab86b962105
 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_p20160316.ebuild 14930 SHA256 825e6e76d356b0cac519ea8f82dbf3ba8cf35a7bee2b90d106ef520bd95e56cb SHA512 9042f1f891fa9a8400058179031a6f521ebefa2fe20af5e25eab70c10204db34e2b6b354404ab5bf4367e1fbcffbf7eb2a23258a3255220f9d303d674fb0f93e WHIRLPOOL 1b1cdac4a6698713f0673ad957c77bf4d2047db611ec999bb17f9d89b24df6ff692c5a53525c3cea0cbb905297b4ce46b6c1a75dab6c4558d7b089653ad4bac9
@@ -81,4 +82,5 @@ EBUILD netbeans-java-9999_p20160414.ebuild 15656 SHA256 8a1a67cd685b764fabe43739
 EBUILD netbeans-java-9999_p20160415.ebuild 15656 SHA256 52b7c1ad3917c6f2330ba0da4b8f0de84ed282b18bc61864a6dcea48dc587785 SHA512 325e26f2f91ebe42915d69ff0be607b6f7b53fe8e83c775c1ef295e6b9463a0e2448d0093941ff8bb129b49c7e82991355fb86f916d2f221ea91c6a7a819b8e7 WHIRLPOOL 0cee5ed972b22d659516850f8abb975e02d05f0112b85c9cc974c4533541509c061181a5dd3eddc4b2d3fb0cec112edb1af5b70f713c27e8a9ebbbcf88f31354
 EBUILD netbeans-java-9999_p20160416.ebuild 15656 SHA256 b8e795b15f3e41e57a530caff4c5a9ef5921fd3da16a718785acc77b9ea6984f SHA512 14f95675f6a64c0dca20babaee6cf595213d20a8b655edebf7c50173f33e6a34ca7fbd2aa8727141cd232146deabd3f07c17386b85252f3eb0c757e06f2d6469 WHIRLPOOL 2a0b363677277809c6270610dc5546413a0a25699d7525e8920f6da570c3aceba8f7d079610ff7b07bf1282ec7c8314ca4cfa8ab676d1af38618fd493cd6a79a
 EBUILD netbeans-java-9999_p20160417.ebuild 15656 SHA256 004348a9ed0c0f8ded8ee03d74fc022eda26559a403087735318a49baf457afb SHA512 2793b06777c1e01c186654cea20a74955d1d1a28bcfe74613ff0ffd3b3ec28f8211e9c7c28368f558088f54bff1a775515bb853c76e81d640f562ee69bf053b3 WHIRLPOOL db1fa3f2ef7a2336568a54f76e1204f7e54ca235487ecbff6a8f2e106ecd6b0fc3adee8d90ba29886788e8b5e8ce6930ac9b08c37394bdd9a74b648e9f14a870
+EBUILD netbeans-java-9999_p20160418.ebuild 15656 SHA256 c32afc695b05ff58946236b9d5f4999d8658aa58214a820605cc9c20b3d93d62 SHA512 1683311f3cdab287e652706eea039050b0e91447a31b2ab35e4ed2a4bba29887a82d3cbe11d4b6281a9bf37c2190a55fbde3e425810dd406278ec8f8481fa6d0 WHIRLPOOL fb09c7938d3ae68737262cad6dc3b8aa0df7e38ff5bd02ee67a4b393a32f23c7aced8293f137e952c5087a228616d83bfb3f0a6a986146b3f2d3dbd2de383977
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160418.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160418.ebuild
new file mode 100644
index 0000000..cd403f1
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20160418.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-18_00-01-48/zip/netbeans-trunk-nightly-201604180001-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 6731deb..1c77c3b 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201604140001-src.zip 214335581 SHA256 68ee1a7dc8f093
 DIST netbeans-trunk-nightly-201604150001-src.zip 214340943 SHA256 7f1bb65d38367e2547a96e8fa027bcf4bf5815c2fd805dd01ce1c9fcb208a332 SHA512 7d598e18df326cb53b7f62a7e2a083d82e719c3db990275854b13abac138f6badb8852dfb1738a76f920e0daf4a106a54af637911e25e082b9f4fc1dce4eb373 WHIRLPOOL a46d8106c83073773dded36f9eebd37b860701460e3435deaaeef0e86b9af10ec3bdce3708d4ac783647af953a6ca3c24f78c3ee58585e65b1f0a29e92444147
 DIST netbeans-trunk-nightly-201604160001-src.zip 214350948 SHA256 6d42235d9f7fb7feed1d76934beb75ab5c548fcf1fd36d9523afeed1aff72edf SHA512 154186e3c48615ffe3ce26f37330eb28137e550426dbc5ca6d73565fcd08d3520f2e00bf4dab5d3cbfe7b489b1697113e40049eeade42e7676afac7136eb034b WHIRLPOOL b5019dee51a9eed46ac1f370fcbc8f6149db814919665236b92638131c759b0d6dd0b72e609344a6469ede3cbe90e3a2b68bfbc186c2dde89c34de5c2e53f5cf
 DIST netbeans-trunk-nightly-201604170001-src.zip 213245562 SHA256 8d1da18eea0786bbacec5b3a9479ba5f3f62463cb972b2b8d5658dfda29a3e93 SHA512 9bf389396c0b42023497277fb6312799853514b40c3fe714ff02d3945ff9c3ea6b90b433a07b85efb04a032865afd47a0c64a1aec5e8aef0884b2b4f8566e14f WHIRLPOOL 7d6dd3f54dc1e3355078a7eef2e15de18b7c03805d71ab61e8c5dc8fd0ccd281e5bd263f87daa90fcd44ac5db9cddb05c97cd850e11797eb9d0dc5ef47d641f4
+DIST netbeans-trunk-nightly-201604180001-src.zip 213245562 SHA256 33e9976d15aa52ed61f53bebb87d8290a64d6e7658dc96b044136f47d46c28de SHA512 71252b57630390c901bed5fec7021d5f9255adf02c2e84c1e0981a2d729c1d0c1ed14b927b1dd36c9a72b30ced64ae6b74429e4990ddfac4bc36aff4c46e7e17 WHIRLPOOL af4f5d0f0c8f7caac85bc7ecab0fe91c68141abc9df5a0a28cc069262aa08f869d5934f5d4a546fdd997e29dc5d63ab0aefcce530560e8ed5b9bfab86b962105
 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_p20160316.ebuild 4971 SHA256 f49fc339a8fc9eb802540f8602cc83da965793e7e8e9263b732d92944eef31e9 SHA512 01c897c31a975ac8d8f1bea21c5648653fe4e36fb0e7e563c487c092f38d76ae8d4cd354848fdb448a364fd301eed409d4bc8f496499a04402794a65bf748ee3 WHIRLPOOL 7e67fd153f8b0542d37f84b64f8a45cdd100ccca8ccfc407f4bd66a5f5d9febab3a65b8d4ee614355ae1a43cc3c9ad64175bf73af1c5aec27c9f1b59838b1de5
@@ -47,4 +48,5 @@ EBUILD netbeans-javacard-9999_p20160414.ebuild 4971 SHA256 736fbe257c0c830b07675
 EBUILD netbeans-javacard-9999_p20160415.ebuild 4971 SHA256 2a01c0c15f8d8289cad42653dc4cd712e66d606cc9a1326c8e5b0c339e16def4 SHA512 c9292aa586042244cbfc4cb7af123749fce91c45de629ca5af1623ac11b7b3b65d5591de17199dadf691ac7998a427f0bd4d4138765dc00094f618ded83958eb WHIRLPOOL dd69edb303db345be7cce46ac75f558eae04952bf0ab8a78d5635f9d4fc9fa4d5d8ce3ecd859cdaa30f0480e49e593e663de7d133e448dbe31fd747db8ef4358
 EBUILD netbeans-javacard-9999_p20160416.ebuild 4971 SHA256 2d5f68bb39b215c56e4a0765d14f356158d9e3fd743a2af0d812143b56811fb4 SHA512 a301d72ce30eddb2f075f489912ff3b814a5b4b6524ca6bab7e092217a7833fcc6c249f05531141c9da977fabd94ff4d2006a51d713087b8f67d9932e013a7ba WHIRLPOOL 349675c1cb2b64fa2ddfcd6cf19f18b46092ec47aa2cfa07969bfe796b3acc686054d4d4cbe5efe1e0529747b0fcdde2cb130eec40d7e8f9a50d8001c156c33a
 EBUILD netbeans-javacard-9999_p20160417.ebuild 4971 SHA256 63649670731a69a41afb079fb681550ccd79c7602e4d0a7999f56f1a447a9a1f SHA512 c62c7c2eb56b6f8af8f8670c0344732791fbd3942eadb4077bdfc1cdf15e37967ed45bde76cecccd6205c0fab74b38dc7c4708c37fca39ccade18e1b556b7b01 WHIRLPOOL 0f25506fe35914a24e0d4ca1aac2be06fab57dbb75ac8d1cb3bd16e6034e7d0039bda8248974e25402af5e2e6bad2a6db27be1dbe5f5d3cc605569c7442da423
+EBUILD netbeans-javacard-9999_p20160418.ebuild 4971 SHA256 03076b874ec32867fe6a2c1df674924b3542b3c76ad3c37d63d4f80a56f92c1e SHA512 00f3243347b966ae8cd21d2e620a1f598d1a158c98f1e436f5ca974454033cedeb4e9fd6b3df0c834a5581610559a21b7a5696adb36a3db427b6655aef9846f6 WHIRLPOOL ff67fa7357d40f6963d282c6cda5dd9812efa6b666dbadc6c64b5f84432f31f7e05fbc72162a439703e75fdc1086258ae31212823663f3d9f2bf80dc8988b81b
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160418.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160418.ebuild
new file mode 100644
index 0000000..6af5139
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160418.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-18_00-01-48/zip/netbeans-trunk-nightly-201604180001-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 110baa1..838ac63 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201604140001-src.zip 214335581 SHA256 68ee1a7dc8f093
 DIST netbeans-trunk-nightly-201604150001-src.zip 214340943 SHA256 7f1bb65d38367e2547a96e8fa027bcf4bf5815c2fd805dd01ce1c9fcb208a332 SHA512 7d598e18df326cb53b7f62a7e2a083d82e719c3db990275854b13abac138f6badb8852dfb1738a76f920e0daf4a106a54af637911e25e082b9f4fc1dce4eb373 WHIRLPOOL a46d8106c83073773dded36f9eebd37b860701460e3435deaaeef0e86b9af10ec3bdce3708d4ac783647af953a6ca3c24f78c3ee58585e65b1f0a29e92444147
 DIST netbeans-trunk-nightly-201604160001-src.zip 214350948 SHA256 6d42235d9f7fb7feed1d76934beb75ab5c548fcf1fd36d9523afeed1aff72edf SHA512 154186e3c48615ffe3ce26f37330eb28137e550426dbc5ca6d73565fcd08d3520f2e00bf4dab5d3cbfe7b489b1697113e40049eeade42e7676afac7136eb034b WHIRLPOOL b5019dee51a9eed46ac1f370fcbc8f6149db814919665236b92638131c759b0d6dd0b72e609344a6469ede3cbe90e3a2b68bfbc186c2dde89c34de5c2e53f5cf
 DIST netbeans-trunk-nightly-201604170001-src.zip 213245562 SHA256 8d1da18eea0786bbacec5b3a9479ba5f3f62463cb972b2b8d5658dfda29a3e93 SHA512 9bf389396c0b42023497277fb6312799853514b40c3fe714ff02d3945ff9c3ea6b90b433a07b85efb04a032865afd47a0c64a1aec5e8aef0884b2b4f8566e14f WHIRLPOOL 7d6dd3f54dc1e3355078a7eef2e15de18b7c03805d71ab61e8c5dc8fd0ccd281e5bd263f87daa90fcd44ac5db9cddb05c97cd850e11797eb9d0dc5ef47d641f4
+DIST netbeans-trunk-nightly-201604180001-src.zip 213245562 SHA256 33e9976d15aa52ed61f53bebb87d8290a64d6e7658dc96b044136f47d46c28de SHA512 71252b57630390c901bed5fec7021d5f9255adf02c2e84c1e0981a2d729c1d0c1ed14b927b1dd36c9a72b30ced64ae6b74429e4990ddfac4bc36aff4c46e7e17 WHIRLPOOL af4f5d0f0c8f7caac85bc7ecab0fe91c68141abc9df5a0a28cc069262aa08f869d5934f5d4a546fdd997e29dc5d63ab0aefcce530560e8ed5b9bfab86b962105
 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_p20160316.ebuild 6293 SHA256 522dc944441e51c7cef0fb129c2779588d4282ac2aa315bae1c267821f6a3ef3 SHA512 0cae801105968a8123aaaadb95629cca04fe23dfccc1b0e2872bcacdbb802462d0213315e4846112ec63cee60bca270db63a344a5ce9196c1196a8ae9cd68c8d WHIRLPOOL 99131e7238a64ebbfba835e3ff4716e95fdb76cd192de6fe5e48cfb06328ef05138e56729a2f6e468c0bb7d546ee35332547b3cae3c80f359ca52b795283dfab
@@ -45,4 +46,5 @@ EBUILD netbeans-javadoc-9999_p20160414.ebuild 6293 SHA256 e22f6fe4c783ab18414c36
 EBUILD netbeans-javadoc-9999_p20160415.ebuild 6293 SHA256 6d943b568605d33fb18d74709a04c61fa2b37fbbbb7a53dc34c6b043ff7d5533 SHA512 587489336c996ece695499776f786a405ce6bc7c5c24f614b68dccbace7da4ca22218fb43c021e40694b37272b758333dcafdfc3206d0adf0a363cc16988b33d WHIRLPOOL 7e9a1cf12fbffdc32d85b10aa59fe05524705f06b226c3ed7958e6c501b41eb9c04eeb249543c1b4dadde84bfdadb8a700e7d878c1b2678032ea1f5bb59f478d
 EBUILD netbeans-javadoc-9999_p20160416.ebuild 6293 SHA256 2ae9cf7637c8526ec3aa56e9aa2844a52cfb3dd3a25b8721755190df39fa4438 SHA512 6d649d2fc00e56ee609205003828c1672d3e30efe92b2232f0334e51450106818d4c63f7bc93404b9da46739a93a024aeb9e23131164bc0711ebf2d638959f43 WHIRLPOOL bf22470df3e2cb0344d1013a3b9cfa65ee2b92d6d3f94f869a1ea546fdae02ca204786088d96b720e2f89ea70275f6b0f42e52b4e06eb3e1ff916d27c0ca85bf
 EBUILD netbeans-javadoc-9999_p20160417.ebuild 6293 SHA256 40d0a558fb66ddbe526e7f6a95bdbf5040256b40f3e8e655db4dad6c7fb7fbd2 SHA512 7540e82fa42ba25859d339c97dbfff5f4f55eba248a3b933a7c1500a13216fbc07f002ffca5f86cba9da0bf7bb4113d507cd64613e9669b59e7a1013aa514af2 WHIRLPOOL a9e4636b9424f231c42b4af6c3730736f90abe2a671bfb452c325afe050abf12888da671823965cd5316908f6ccf195568d5db87fbdc6286bb5288925a4507d9
+EBUILD netbeans-javadoc-9999_p20160418.ebuild 6293 SHA256 385e21683da0bba90cd606aa9d25285f247e859e131de661b6c300987b0de424 SHA512 e8da4e3ebd7d7c6bfb5a76af727723a6f80a1166288d2a7522a6a3912dd066bce4e4e00b7dc65b8a76e63cfb9453b552534a6a411bd1f2bdcf376779daf46fb5 WHIRLPOOL f2d94a0494acc93bd61648505f3a9c108320ef3250d1737f580e98ad57a38923625ea1e2e495c790cd343ca240eb526b8874a2e99853a69ceb44f6151fc80426
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index df28fe2..95647ec 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201604140001-src.zip 214335581 SHA256 68ee1a7dc8f093
 DIST netbeans-trunk-nightly-201604150001-src.zip 214340943 SHA256 7f1bb65d38367e2547a96e8fa027bcf4bf5815c2fd805dd01ce1c9fcb208a332 SHA512 7d598e18df326cb53b7f62a7e2a083d82e719c3db990275854b13abac138f6badb8852dfb1738a76f920e0daf4a106a54af637911e25e082b9f4fc1dce4eb373 WHIRLPOOL a46d8106c83073773dded36f9eebd37b860701460e3435deaaeef0e86b9af10ec3bdce3708d4ac783647af953a6ca3c24f78c3ee58585e65b1f0a29e92444147
 DIST netbeans-trunk-nightly-201604160001-src.zip 214350948 SHA256 6d42235d9f7fb7feed1d76934beb75ab5c548fcf1fd36d9523afeed1aff72edf SHA512 154186e3c48615ffe3ce26f37330eb28137e550426dbc5ca6d73565fcd08d3520f2e00bf4dab5d3cbfe7b489b1697113e40049eeade42e7676afac7136eb034b WHIRLPOOL b5019dee51a9eed46ac1f370fcbc8f6149db814919665236b92638131c759b0d6dd0b72e609344a6469ede3cbe90e3a2b68bfbc186c2dde89c34de5c2e53f5cf
 DIST netbeans-trunk-nightly-201604170001-src.zip 213245562 SHA256 8d1da18eea0786bbacec5b3a9479ba5f3f62463cb972b2b8d5658dfda29a3e93 SHA512 9bf389396c0b42023497277fb6312799853514b40c3fe714ff02d3945ff9c3ea6b90b433a07b85efb04a032865afd47a0c64a1aec5e8aef0884b2b4f8566e14f WHIRLPOOL 7d6dd3f54dc1e3355078a7eef2e15de18b7c03805d71ab61e8c5dc8fd0ccd281e5bd263f87daa90fcd44ac5db9cddb05c97cd850e11797eb9d0dc5ef47d641f4
+DIST netbeans-trunk-nightly-201604180001-src.zip 213245562 SHA256 33e9976d15aa52ed61f53bebb87d8290a64d6e7658dc96b044136f47d46c28de SHA512 71252b57630390c901bed5fec7021d5f9255adf02c2e84c1e0981a2d729c1d0c1ed14b927b1dd36c9a72b30ced64ae6b74429e4990ddfac4bc36aff4c46e7e17 WHIRLPOOL af4f5d0f0c8f7caac85bc7ecab0fe91c68141abc9df5a0a28cc069262aa08f869d5934f5d4a546fdd997e29dc5d63ab0aefcce530560e8ed5b9bfab86b962105
 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_p20160316.ebuild 4717 SHA256 764340a3f0915bd67ef742dd8403815a517d3d127333fdb0214d8386d42c913f SHA512 975b7c9206e8cdadc9da21fa8c1a783339b1d8178d0012417c22667588a8ce297cbbf1daa59fc966c25dcbde07f05bc8d67fd42cb60f66e4234f208871746b69 WHIRLPOOL cf2273d03cbd3f4c76572e0bd111c836f953b35dd72db8874d1e578a903051fd1deb243b94050f4f08502a7486dd267cd2e9d3dd37ac55821c331e8ebf87deb3
@@ -52,4 +53,5 @@ EBUILD netbeans-javafx-9999_p20160414.ebuild 4717 SHA256 dfc5e684e13fdd7e965864e
 EBUILD netbeans-javafx-9999_p20160415.ebuild 4717 SHA256 eef6a527d44af709d9b434ead3867197d8c1052a5aee04a5f48131a3b4378cb5 SHA512 36b9e6cc1b10fce024edb9ed490557db0448c4d9c3223bcb1f6ad8eab2d54aeb4a299fb7ad2254ad86238df309113299232d8be66c3c4c32d69196650993e33d WHIRLPOOL bc2aeeb387ee080753794df25899165dfd0d577d185a3fb2b6d8fc19fa375021df7567d89e639b7be1a626ee38980038951377c24232a0a846dc330c39c053fb
 EBUILD netbeans-javafx-9999_p20160416.ebuild 4717 SHA256 309e722f72f482dc69e3feb163aacafb7a6f2b38f408876cd64c659c5c7158a6 SHA512 6b6abc9b95d91a19a214cdf2218850c96c443b1e188e2a43341c47de5093423954969bdbaa01eefb781f35c8c2332d849825ba8314480dac1b13c175eeb0eabb WHIRLPOOL 0da39ff64adc76588c3843a6f0c7b4cd46e6c9b37a75ce03a1abe116fe4425c8d1222df3095608449201e1060f34e2b4f91cacd85b548596a97bfea54b337351
 EBUILD netbeans-javafx-9999_p20160417.ebuild 4717 SHA256 8e608fd2303950497649ab6f23e9c8fa44ef939a7bc50cd64e57760139f9804b SHA512 822414223e3e108bc2943d642781ad0e8660b012ec05303dc28b7ae770499ac2857c3b326d9a5398f6b7469542b88a6e32e348bd18111fe77cb6d1211d62d97f WHIRLPOOL bcfde863080c0ba68ec278ee29f977903edfd1087be1e340cf46b31fc981c665e49f599ac784a92f32b94f1c2dda7572eeccd9f199d472771f1caf4f22134963
+EBUILD netbeans-javafx-9999_p20160418.ebuild 4717 SHA256 ca49ca0191ce5ce4464008fb7f9581f5d6149442448b540f30968abbbfa15d6b SHA512 1acc9f0382e82fb139705c06f5862bbdfd0db37599b173bda125f1c1e80955e16fa6121cd9d774aa6712a1b2f5c65f4070de0c2a38cdaa95d48ee40ceef773bb WHIRLPOOL 0bab04ae22f3904293d35b70923366a7b64637eb412fdbb6d982e342d684422f0be80d80df6aa95c9a90dc0609b6384daf1d1b0f4fd3d309939825e38555d252
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160418.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160418.ebuild
new file mode 100644
index 0000000..9da6fde
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160418.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-18_00-01-48/zip/netbeans-trunk-nightly-201604180001-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 d9b3ee0..4619dd3 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201604140001-src.zip 214335581 SHA256 68ee1a7dc8f093
 DIST netbeans-trunk-nightly-201604150001-src.zip 214340943 SHA256 7f1bb65d38367e2547a96e8fa027bcf4bf5815c2fd805dd01ce1c9fcb208a332 SHA512 7d598e18df326cb53b7f62a7e2a083d82e719c3db990275854b13abac138f6badb8852dfb1738a76f920e0daf4a106a54af637911e25e082b9f4fc1dce4eb373 WHIRLPOOL a46d8106c83073773dded36f9eebd37b860701460e3435deaaeef0e86b9af10ec3bdce3708d4ac783647af953a6ca3c24f78c3ee58585e65b1f0a29e92444147
 DIST netbeans-trunk-nightly-201604160001-src.zip 214350948 SHA256 6d42235d9f7fb7feed1d76934beb75ab5c548fcf1fd36d9523afeed1aff72edf SHA512 154186e3c48615ffe3ce26f37330eb28137e550426dbc5ca6d73565fcd08d3520f2e00bf4dab5d3cbfe7b489b1697113e40049eeade42e7676afac7136eb034b WHIRLPOOL b5019dee51a9eed46ac1f370fcbc8f6149db814919665236b92638131c759b0d6dd0b72e609344a6469ede3cbe90e3a2b68bfbc186c2dde89c34de5c2e53f5cf
 DIST netbeans-trunk-nightly-201604170001-src.zip 213245562 SHA256 8d1da18eea0786bbacec5b3a9479ba5f3f62463cb972b2b8d5658dfda29a3e93 SHA512 9bf389396c0b42023497277fb6312799853514b40c3fe714ff02d3945ff9c3ea6b90b433a07b85efb04a032865afd47a0c64a1aec5e8aef0884b2b4f8566e14f WHIRLPOOL 7d6dd3f54dc1e3355078a7eef2e15de18b7c03805d71ab61e8c5dc8fd0ccd281e5bd263f87daa90fcd44ac5db9cddb05c97cd850e11797eb9d0dc5ef47d641f4
+DIST netbeans-trunk-nightly-201604180001-src.zip 213245562 SHA256 33e9976d15aa52ed61f53bebb87d8290a64d6e7658dc96b044136f47d46c28de SHA512 71252b57630390c901bed5fec7021d5f9255adf02c2e84c1e0981a2d729c1d0c1ed14b927b1dd36c9a72b30ced64ae6b74429e4990ddfac4bc36aff4c46e7e17 WHIRLPOOL af4f5d0f0c8f7caac85bc7ecab0fe91c68141abc9df5a0a28cc069262aa08f869d5934f5d4a546fdd997e29dc5d63ab0aefcce530560e8ed5b9bfab86b962105
 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_p20160316.ebuild 4412 SHA256 ea5cfd184f876ba7820e0445313ba89d52967b54fd52a2af7be746f0819a1a62 SHA512 170b2967bae914b35b7e6451eef48ef7c9288f7b99694dff9d4fd29831e82526484c979b9118846a5a3c2fd39310745d211fdec281daa8c70eb96eb8b8039b63 WHIRLPOOL 65e40a9b307446b0d03b6fc59175722d12920c53c80a628cc03b8437bc66df9960d50fe5c9f90356559cb01f9e7311588d6a719413dd0293976f0767ba148044
@@ -44,4 +45,5 @@ EBUILD netbeans-mobility-9999_p20160414.ebuild 4412 SHA256 212c11cf49b60e043dfaa
 EBUILD netbeans-mobility-9999_p20160415.ebuild 4412 SHA256 6a97bb393cfb48bccb6067eed94e95340d8cdb99ed7a3a4413cff6db1b905056 SHA512 87527ccef8304b01685ca87349ec0284d89f6054d6714c84ceaff0d12f01a3d610b90e11ba1906f3bef1c76a9cfd7e1e4c24bf84a7d70578e4cebb8809e24a4c WHIRLPOOL 3279bdaad37806c4151580b7175ee3f0be387aa16f73f69c4ac14c88e02b8cb9005309063420db4078562a550e06b7081180215dd3eb5054070bda77ce613ded
 EBUILD netbeans-mobility-9999_p20160416.ebuild 4412 SHA256 52d3fa42db38e1b6d1dea1bb439802f1368d6747f6e5d3312d18494eff3486cf SHA512 a4ebd1a24de80063af0da5589b8914c83b8fe6557aefa052903dd9eb8e371f49428fadcd08c247a036b659f58c8bf6d81343b33f22ce622beddc91095b337671 WHIRLPOOL 9ec04421c2baa5bc0dec32d4e3b1dcee56d4bee66c94f22816d2de857971a8491f5188ff4f099adef13b9bd4b7f6ee4f71be29ec2d86ebacba2ee3a5f6dbc027
 EBUILD netbeans-mobility-9999_p20160417.ebuild 4412 SHA256 df71322874c90a942a153e72bf82f74efe05c28d14057e11df9f95eae7b0424f SHA512 569590028c31c5760e1f534c8cfafbf642be0cb86218c6f1a3e3d1a921d86c85e2037be3cccc1c2f1e0834453a09e43d580ff69fae6bdd73b48621c87b30c6b9 WHIRLPOOL 2a2d4df957bdba68a72947df2e187e70c2d73d28f5e17efc8e1a2139029688f2aeafcfffda168f7e3d92d0af11ee44ea87ea23c7b7003f74de15787cc64ecd44
+EBUILD netbeans-mobility-9999_p20160418.ebuild 4412 SHA256 4c34a329c4cb0c72c28dec092214b95af0c00036a3977e9b270dcb98d0ce0bd5 SHA512 b8025fb42bcecb499b926d71f926118f476650f6f7331d1db7965311f664c5ab70ef361472de55883a60dbee2becf6b90a95ce297f4945c3f792970b25b8ef4f WHIRLPOOL 3fc633a1f5bae919a9f321b944c0fbce364d0558a75f2eb09c411abba8ba219990904cbda9306b592c68f50970f0dc349aa1b2ce9b97feb11a34d949b175d600
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160418.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160418.ebuild
new file mode 100644
index 0000000..941c7cd
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160418.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-18_00-01-48/zip/netbeans-trunk-nightly-201604180001-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 d71aae0..f6d0233 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201604140001-src.zip 214335581 SHA256 68ee1a7dc8f093
 DIST netbeans-trunk-nightly-201604150001-src.zip 214340943 SHA256 7f1bb65d38367e2547a96e8fa027bcf4bf5815c2fd805dd01ce1c9fcb208a332 SHA512 7d598e18df326cb53b7f62a7e2a083d82e719c3db990275854b13abac138f6badb8852dfb1738a76f920e0daf4a106a54af637911e25e082b9f4fc1dce4eb373 WHIRLPOOL a46d8106c83073773dded36f9eebd37b860701460e3435deaaeef0e86b9af10ec3bdce3708d4ac783647af953a6ca3c24f78c3ee58585e65b1f0a29e92444147
 DIST netbeans-trunk-nightly-201604160001-src.zip 214350948 SHA256 6d42235d9f7fb7feed1d76934beb75ab5c548fcf1fd36d9523afeed1aff72edf SHA512 154186e3c48615ffe3ce26f37330eb28137e550426dbc5ca6d73565fcd08d3520f2e00bf4dab5d3cbfe7b489b1697113e40049eeade42e7676afac7136eb034b WHIRLPOOL b5019dee51a9eed46ac1f370fcbc8f6149db814919665236b92638131c759b0d6dd0b72e609344a6469ede3cbe90e3a2b68bfbc186c2dde89c34de5c2e53f5cf
 DIST netbeans-trunk-nightly-201604170001-src.zip 213245562 SHA256 8d1da18eea0786bbacec5b3a9479ba5f3f62463cb972b2b8d5658dfda29a3e93 SHA512 9bf389396c0b42023497277fb6312799853514b40c3fe714ff02d3945ff9c3ea6b90b433a07b85efb04a032865afd47a0c64a1aec5e8aef0884b2b4f8566e14f WHIRLPOOL 7d6dd3f54dc1e3355078a7eef2e15de18b7c03805d71ab61e8c5dc8fd0ccd281e5bd263f87daa90fcd44ac5db9cddb05c97cd850e11797eb9d0dc5ef47d641f4
+DIST netbeans-trunk-nightly-201604180001-src.zip 213245562 SHA256 33e9976d15aa52ed61f53bebb87d8290a64d6e7658dc96b044136f47d46c28de SHA512 71252b57630390c901bed5fec7021d5f9255adf02c2e84c1e0981a2d729c1d0c1ed14b927b1dd36c9a72b30ced64ae6b74429e4990ddfac4bc36aff4c46e7e17 WHIRLPOOL af4f5d0f0c8f7caac85bc7ecab0fe91c68141abc9df5a0a28cc069262aa08f869d5934f5d4a546fdd997e29dc5d63ab0aefcce530560e8ed5b9bfab86b962105
 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_p20160316.ebuild 4111 SHA256 a650d837db80676ff4197417482006dbbffdda62c2acffd226b2d20e2c87d210 SHA512 faa621fc38cd66adaf9203dfaaf1c1ac8fee25112982f37fce6c120ca1856be1d99b592d23259d74316a0896d132782b0660efa5c1b2ab66297675d988c9e0e2 WHIRLPOOL f53d71a336e933f09301bd38de831775355b00685c79f13732800df5dcca47d97b3dfb01537cc7a918b3894355784eb2e09b5f91cf7de0603a00fc3ca59bf0ac
@@ -47,4 +48,5 @@ EBUILD netbeans-nb-9999_p20160414.ebuild 4111 SHA256 f5627120f0e17f9844aff2efc5c
 EBUILD netbeans-nb-9999_p20160415.ebuild 4111 SHA256 557f2350babc7d6183f51e899701fc09e9dc8a02a070fa80da04bc6667e7fb14 SHA512 8a13b18c2a5f94c9a3eab95eebb33a29e933461bb32c4007c86e5b7246cecd23a0686c0ee55f9257f2da75ce3ff35e3c167a821b2ee94f5c98a84682d035cd46 WHIRLPOOL bcf7570334ba84dc8d790d6ccd4bb6f1d03a68aa952fd6335cacf7448bdd40222e7e1841b021671287fcf1203450345590376fd8ceafea390160ae1ec87b8dc2
 EBUILD netbeans-nb-9999_p20160416.ebuild 4111 SHA256 440b2d6b80608905a666c373168e38db486f84fd6d47bf5e6347c15e767ee3fa SHA512 ee964626d4344a21353c96e5b8cf832c79161e1e567cc1dfa597e0fcce8c4a93438ceef0d077dbd023ed5c7e9b644ac15757f70d6abc4c111fd421e8ff864e44 WHIRLPOOL 0756b3d6856850d6585bf974d273fa45ead6d4a6aa7a473579eba2067614993e8001a50c5c85468915bfdd8b0fab0b099ff752a0d4cd8db8d1e057c64ea13ff5
 EBUILD netbeans-nb-9999_p20160417.ebuild 4111 SHA256 d6ba131f04f756d8850a44276b20cc1c09be08ee45089cd149be0e97f7c81aee SHA512 749e9924c90f0657f504eba376a48d70be0d78b288ba0bba461b4e6c1dc16f161b30711f11a629a853be4f8883484680c4738369c4b0c8a9a3bca698a76ace9a WHIRLPOOL f681271e2bb6a52b474d902447e717950d943834927ba62b35e825000705786b994264cd7731576298422dcad090b46920e7477e21e85e3d64e61b54ed9d6b0b
+EBUILD netbeans-nb-9999_p20160418.ebuild 4111 SHA256 913ba4229842c07420111bddc6ad0bf65feee71704d377a605e8c4e3fdf4dbab SHA512 c9cb517cdda4ef52448572df999859cb37ccd37c1bdc3e9ad01a6482a75d5db7430ff5b07e8f984751a8c6fe28f7fdcfced15c4ffe8f814b2da2b9b90632c7a3 WHIRLPOOL feb8f8a5f2809370ca419897d8b902b29e476783f6655833c6c333cf42addd13e4dc9b636717908956eab18be476efba41a54f4bdc43e1d0fa17ee995579da8f
 MISC metadata.xml 392 SHA256 01cdbcc83099b97486bd7b8e813e5b19c1138eb0d8d3e8a5683aafd579820435 SHA512 4d2f9160baa022d6a48b61d5f42e71cfd411d244e7a36436629bc5ee4036e4ce19079134d9a6c704ebe942306c2e0199d0591c1e54f92f8f3c8835147e639246 WHIRLPOOL c1131764e1cec66c56b977ebe36014b29e5a68e35ccc326c0cbadd050a6c625cf191c85c212e0a733661c008dab0d99f9a4cdc4c4ae0cc9d775ba1de554795a9

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160418.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160418.ebuild
new file mode 100644
index 0000000..2c7176e
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20160418.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-18_00-01-48/zip/netbeans-trunk-nightly-201604180001-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 b4b57bb..235f7a8 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201604140001-src.zip 214335581 SHA256 68ee1a7dc8f093
 DIST netbeans-trunk-nightly-201604150001-src.zip 214340943 SHA256 7f1bb65d38367e2547a96e8fa027bcf4bf5815c2fd805dd01ce1c9fcb208a332 SHA512 7d598e18df326cb53b7f62a7e2a083d82e719c3db990275854b13abac138f6badb8852dfb1738a76f920e0daf4a106a54af637911e25e082b9f4fc1dce4eb373 WHIRLPOOL a46d8106c83073773dded36f9eebd37b860701460e3435deaaeef0e86b9af10ec3bdce3708d4ac783647af953a6ca3c24f78c3ee58585e65b1f0a29e92444147
 DIST netbeans-trunk-nightly-201604160001-src.zip 214350948 SHA256 6d42235d9f7fb7feed1d76934beb75ab5c548fcf1fd36d9523afeed1aff72edf SHA512 154186e3c48615ffe3ce26f37330eb28137e550426dbc5ca6d73565fcd08d3520f2e00bf4dab5d3cbfe7b489b1697113e40049eeade42e7676afac7136eb034b WHIRLPOOL b5019dee51a9eed46ac1f370fcbc8f6149db814919665236b92638131c759b0d6dd0b72e609344a6469ede3cbe90e3a2b68bfbc186c2dde89c34de5c2e53f5cf
 DIST netbeans-trunk-nightly-201604170001-src.zip 213245562 SHA256 8d1da18eea0786bbacec5b3a9479ba5f3f62463cb972b2b8d5658dfda29a3e93 SHA512 9bf389396c0b42023497277fb6312799853514b40c3fe714ff02d3945ff9c3ea6b90b433a07b85efb04a032865afd47a0c64a1aec5e8aef0884b2b4f8566e14f WHIRLPOOL 7d6dd3f54dc1e3355078a7eef2e15de18b7c03805d71ab61e8c5dc8fd0ccd281e5bd263f87daa90fcd44ac5db9cddb05c97cd850e11797eb9d0dc5ef47d641f4
+DIST netbeans-trunk-nightly-201604180001-src.zip 213245562 SHA256 33e9976d15aa52ed61f53bebb87d8290a64d6e7658dc96b044136f47d46c28de SHA512 71252b57630390c901bed5fec7021d5f9255adf02c2e84c1e0981a2d729c1d0c1ed14b927b1dd36c9a72b30ced64ae6b74429e4990ddfac4bc36aff4c46e7e17 WHIRLPOOL af4f5d0f0c8f7caac85bc7ecab0fe91c68141abc9df5a0a28cc069262aa08f869d5934f5d4a546fdd997e29dc5d63ab0aefcce530560e8ed5b9bfab86b962105
 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_p20160316.ebuild 4418 SHA256 ce4a6d03d8de02b48d96c4937068e016d7270bfa9159e785c6163ad9824f1d01 SHA512 dc823be4904e2a33091c5d0123508383db4bf2c3eb3b2cdaf41cbabc0affeed59f86e2ee8dee080fc89acc91e4522f168e3aab020a36591831e54a1b293c040c WHIRLPOOL d06bcfee3f1bcbbb1398e05a0395811a58839261aef0b09f9c98d235fee94b1fc20a13d196dd2c255f9da466c8de1be3b21a403888ac208f1a997c6a29e63d9f
@@ -48,4 +49,5 @@ EBUILD netbeans-php-9999_p20160414.ebuild 4418 SHA256 75eeaa16756b85545829a35a67
 EBUILD netbeans-php-9999_p20160415.ebuild 4418 SHA256 fc0de9556f9ea5608dabb117884a23397da57233e8597b4b2bc2010e51eb2469 SHA512 2be2951e8331fd7c1c556b6f2fd55eed5beffde0fb926f3b7ba7da3ece9ec8fbae00735c5afa91c0d93db51c2784a7b02b19dc3709246b52577335f08ff0fa42 WHIRLPOOL d6c1594bfff5f24dcb3ddedfc6050062a11f7a575e392826113cd950a8de64824395cab8660b2d9cfc7097f8dafc53c4aaa89c5af96f12c9bc78e3c0f8d57aae
 EBUILD netbeans-php-9999_p20160416.ebuild 4418 SHA256 ee4128d90405e81d9f2a4f11627ccc1aea1889d9686dae0a9b12ac67fea03057 SHA512 84f63b5e47d80b174aeb612a628d86fa83f69ec53dff29172c5a8aa73f88c831fe664f2e26dfd811372bd46914f1ac78ff3a46107ad31e0c6b220aac2d50fd2c WHIRLPOOL cc6745983139f050ef79433af0c897740f2910129d40678a0aa119796d55220c7529e2ec7ca4cc8c2a229ccb968bc8218a6176b12c1b4106b2aabb65df956cc8
 EBUILD netbeans-php-9999_p20160417.ebuild 4418 SHA256 16396e5d8a89c0de7cf159e5f09c2a35b77c1245d587886f3523415d07ba847a SHA512 8ec7ac6d76165f4e0948d519f87cb34194bca5da940c788ec6a1db9482da346c1c01f3fa286c1689439b7b9005ecac18418214960abe62cd295ac7c9cde46f17 WHIRLPOOL 915914d849337b13a338f49e86690deea46dd3558cf4edbc73026fbb90e26efee91b603e4879c472b1f72295a6533d54c95b84caf483a7dd66a19dd631aac7ef
+EBUILD netbeans-php-9999_p20160418.ebuild 4418 SHA256 03969fd1475873de4da38e3461e67adc2ac67568c7ce6291b15776e1bb982098 SHA512 c80f7cb03d407c354c1af56f4d432c730128f4e446b6eba0bc3545ccf7602b5557a690b4863ff305d497e440c4ef424640e69097db918fd1f669266bd359ddd8 WHIRLPOOL f0a76a4a515d94e0d13295f78f29651075c768bac34c489b52924b5fb16e7bcc4550ce07acde565c107cea2b0be9353752613d90884b8463616fdb47e0b9af12
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160418.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160418.ebuild
new file mode 100644
index 0000000..995bcaa
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20160418.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-18_00-01-48/zip/netbeans-trunk-nightly-201604180001-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 12aa8c5..9def7cf 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -50,6 +50,7 @@ DIST netbeans-trunk-nightly-201604140001-src.zip 214335581 SHA256 68ee1a7dc8f093
 DIST netbeans-trunk-nightly-201604150001-src.zip 214340943 SHA256 7f1bb65d38367e2547a96e8fa027bcf4bf5815c2fd805dd01ce1c9fcb208a332 SHA512 7d598e18df326cb53b7f62a7e2a083d82e719c3db990275854b13abac138f6badb8852dfb1738a76f920e0daf4a106a54af637911e25e082b9f4fc1dce4eb373 WHIRLPOOL a46d8106c83073773dded36f9eebd37b860701460e3435deaaeef0e86b9af10ec3bdce3708d4ac783647af953a6ca3c24f78c3ee58585e65b1f0a29e92444147
 DIST netbeans-trunk-nightly-201604160001-src.zip 214350948 SHA256 6d42235d9f7fb7feed1d76934beb75ab5c548fcf1fd36d9523afeed1aff72edf SHA512 154186e3c48615ffe3ce26f37330eb28137e550426dbc5ca6d73565fcd08d3520f2e00bf4dab5d3cbfe7b489b1697113e40049eeade42e7676afac7136eb034b WHIRLPOOL b5019dee51a9eed46ac1f370fcbc8f6149db814919665236b92638131c759b0d6dd0b72e609344a6469ede3cbe90e3a2b68bfbc186c2dde89c34de5c2e53f5cf
 DIST netbeans-trunk-nightly-201604170001-src.zip 213245562 SHA256 8d1da18eea0786bbacec5b3a9479ba5f3f62463cb972b2b8d5658dfda29a3e93 SHA512 9bf389396c0b42023497277fb6312799853514b40c3fe714ff02d3945ff9c3ea6b90b433a07b85efb04a032865afd47a0c64a1aec5e8aef0884b2b4f8566e14f WHIRLPOOL 7d6dd3f54dc1e3355078a7eef2e15de18b7c03805d71ab61e8c5dc8fd0ccd281e5bd263f87daa90fcd44ac5db9cddb05c97cd850e11797eb9d0dc5ef47d641f4
+DIST netbeans-trunk-nightly-201604180001-src.zip 213245562 SHA256 33e9976d15aa52ed61f53bebb87d8290a64d6e7658dc96b044136f47d46c28de SHA512 71252b57630390c901bed5fec7021d5f9255adf02c2e84c1e0981a2d729c1d0c1ed14b927b1dd36c9a72b30ced64ae6b74429e4990ddfac4bc36aff4c46e7e17 WHIRLPOOL af4f5d0f0c8f7caac85bc7ecab0fe91c68141abc9df5a0a28cc069262aa08f869d5934f5d4a546fdd997e29dc5d63ab0aefcce530560e8ed5b9bfab86b962105
 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_p20160316.ebuild 9360 SHA256 9c44bd0fb5330b62798fbb8d0e47676ecdbdbe1402f23150202673bd08c82c9a SHA512 eee06869ee6b0d64edbc1b4540120bf36b36ce08ad613c57432d991af84ba4198e418890e0a8d401f518c9334aebc5bb18f8448c0b330bc7d77180d82764ed72 WHIRLPOOL 584edc403377de5d5c103382124396620000eca813183ac99f342dd2004f34a505d2012deafc4b24d61309e7fa6c76fca6962cef6d477f68a64bed71f4805df9
@@ -71,4 +72,5 @@ EBUILD netbeans-platform-9999_p20160414.ebuild 9511 SHA256 d18281adebcf1be655f31
 EBUILD netbeans-platform-9999_p20160415.ebuild 9511 SHA256 0366d34133f179a621e96f4bc1a43a1adc210ca43b426a5d9bcea9a90cc6aebe SHA512 f348e694d6d54c590f2292bae16f05ec271b32e3a774f1f56aba317aae96eae08288805425290bc4d40bc576870d040fef4a4224378286dc4277d61059cfa5c2 WHIRLPOOL 01417525fb78bf2a069161ccd25833b47ec5fe0dce83824e15f9fb7f22a015e15ce77eedc9c479058bf26ca25f4786e780aa52171a273a52654da8e66b677fe1
 EBUILD netbeans-platform-9999_p20160416.ebuild 9520 SHA256 17e11d1906dbecf7eaa658d4b9eccb0a4b7685c646057e9a4eccaa2a6bb33482 SHA512 e124a80008833350e0e3020d6b79a77fbccec35aaac65f8295fd8efc8219ab12f9194ae757aae5d85ff3f24ca9f354c98cb0e2f9fbf2a0a98eeb90a861ec427d WHIRLPOOL 56a684b9964b0170e4ba40bfa34811a5bbd9246ec23e00f6770a2b908408aa9607b912f06e50c720c6e8c753f391bc640f5d6c449f0831bdbe4aaff0086f5ab4
 EBUILD netbeans-platform-9999_p20160417.ebuild 9520 SHA256 ffebba1aead76e8aae5fb8dc42da5101152e4b790c007ac8f5b4c7bbf31fdb2c SHA512 f7aa66dddab5e9635348a589107ad9e917bc140bf7678351c04d45fa85424e74df8e903b6963220dae673425ceda85c032752689a5522e66e7631a69e986a585 WHIRLPOOL 6f7f65a5fa1fe35245bb5459b9207da88d1e56864da7735ba8cbe676073f7f59edc3feba0f44f6c4e83412de760b95a0479f496b139bf316e10b2d09d0336db4
+EBUILD netbeans-platform-9999_p20160418.ebuild 9520 SHA256 f0db295d6e2b0aa0cf792bfe5fb25ed2762dca4faf32862a21714464fc47bdcc SHA512 d33a5b0a97fb9fb06b253c050e41699b2e32192a9fd39bdaaacaeb95d7564484e27992595f1621802326348f92ac3f5c7d38f5e9bb408482a634987f9d411770 WHIRLPOOL 8c12dff9fefdc9e2c4aa1e2ff309a1ae8d23c60d129dd867c23fdbd76a2b7a62b15a136bc79bd31f4327ef378ed7b4deaced77e1ba831e9c50d92a6dc14cb424
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160418.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160418.ebuild
new file mode 100644
index 0000000..6ddbdd6
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20160418.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-18_00-01-48/zip/netbeans-trunk-nightly-201604180001-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 86988cf..89d5401 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201604140001-src.zip 214335581 SHA256 68ee1a7dc8f093
 DIST netbeans-trunk-nightly-201604150001-src.zip 214340943 SHA256 7f1bb65d38367e2547a96e8fa027bcf4bf5815c2fd805dd01ce1c9fcb208a332 SHA512 7d598e18df326cb53b7f62a7e2a083d82e719c3db990275854b13abac138f6badb8852dfb1738a76f920e0daf4a106a54af637911e25e082b9f4fc1dce4eb373 WHIRLPOOL a46d8106c83073773dded36f9eebd37b860701460e3435deaaeef0e86b9af10ec3bdce3708d4ac783647af953a6ca3c24f78c3ee58585e65b1f0a29e92444147
 DIST netbeans-trunk-nightly-201604160001-src.zip 214350948 SHA256 6d42235d9f7fb7feed1d76934beb75ab5c548fcf1fd36d9523afeed1aff72edf SHA512 154186e3c48615ffe3ce26f37330eb28137e550426dbc5ca6d73565fcd08d3520f2e00bf4dab5d3cbfe7b489b1697113e40049eeade42e7676afac7136eb034b WHIRLPOOL b5019dee51a9eed46ac1f370fcbc8f6149db814919665236b92638131c759b0d6dd0b72e609344a6469ede3cbe90e3a2b68bfbc186c2dde89c34de5c2e53f5cf
 DIST netbeans-trunk-nightly-201604170001-src.zip 213245562 SHA256 8d1da18eea0786bbacec5b3a9479ba5f3f62463cb972b2b8d5658dfda29a3e93 SHA512 9bf389396c0b42023497277fb6312799853514b40c3fe714ff02d3945ff9c3ea6b90b433a07b85efb04a032865afd47a0c64a1aec5e8aef0884b2b4f8566e14f WHIRLPOOL 7d6dd3f54dc1e3355078a7eef2e15de18b7c03805d71ab61e8c5dc8fd0ccd281e5bd263f87daa90fcd44ac5db9cddb05c97cd850e11797eb9d0dc5ef47d641f4
+DIST netbeans-trunk-nightly-201604180001-src.zip 213245562 SHA256 33e9976d15aa52ed61f53bebb87d8290a64d6e7658dc96b044136f47d46c28de SHA512 71252b57630390c901bed5fec7021d5f9255adf02c2e84c1e0981a2d729c1d0c1ed14b927b1dd36c9a72b30ced64ae6b74429e4990ddfac4bc36aff4c46e7e17 WHIRLPOOL af4f5d0f0c8f7caac85bc7ecab0fe91c68141abc9df5a0a28cc069262aa08f869d5934f5d4a546fdd997e29dc5d63ab0aefcce530560e8ed5b9bfab86b962105
 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_p20160316.ebuild 3472 SHA256 9bcd46949afed478f5fac0b310cef1e1f4854234bca722a7135737b432f40eb8 SHA512 70c0c0bb426c7f011e7a568b8ae2b16aaad58f796c49c85b7dde20b0e9bcd0774b4da46726cef5f30222d3ab8ed988e7c1ca677796316cba73f2b3a9de9cfcc3 WHIRLPOOL eb002e9a325d9b9f5747d531737d779eacc4df96b4a29f790a83311f144a871301f43908a88ef0dd0a185f63947484a925b6e9bd09fe99e3289604845f56a1aa
@@ -44,4 +45,5 @@ EBUILD netbeans-profiler-9999_p20160414.ebuild 3472 SHA256 ab8b6bdfed389a65177de
 EBUILD netbeans-profiler-9999_p20160415.ebuild 3472 SHA256 af33762fc6f9b50e5d26434aa71920db1027b1d0165eb19201aac1b053e03555 SHA512 ddfe13061141790125845d9fd2c1c56181486c3be21a28ab20821111184c8703f085cb3420c6b4f7757a08afb0dcdd7e7c42d53232aadef32dcf90bef4292643 WHIRLPOOL ae310a26aa49b93582a76f9d387ceb70971f77a6c56ad2d1479d1c9d6840ab60a1b2cd5ccd6d5f74c15be297b403316de1ab558ab4a138057e0034515ae066ef
 EBUILD netbeans-profiler-9999_p20160416.ebuild 3472 SHA256 164a181b04e1507395133583768b871664634c9806b20e194be2f71041642075 SHA512 7c589871b4d5d3ab09b5f1a98d0094981fa457b496f105e9fc80ba424275659f2f83942cd00a340a7b24ce6d957428e4e5399fbd4162a92b5c6a71616bc42216 WHIRLPOOL 8519e369c255b4f2b21b9e54c94d3148b28e6d82742b6bd39ca3e9aabe57b03cf8b6ac8cdf43cd2e0d7e831ee2bd94654205c0d4bae1f21876e6a08311beee0f
 EBUILD netbeans-profiler-9999_p20160417.ebuild 3472 SHA256 54398576b7b55e124cc5f9d1fa3227c3b84aa3fbb0899a5a81f73a2ee63cc780 SHA512 d1825b705397275b6dfd2854d0ac7d5d7c675a147f43bcd6f6a49c012f7620cec906542f49157d8ab1984fdfde9c0b6e8ddd4aa516c72d2a8a141e8b359d3e83 WHIRLPOOL 33ec2ee23a15c679a0428c6fde72fd79f3c3df70acf0eb5c1d14af6ca8e18f563908761bac66560168c5ab9fe5a0dc58bb24180bc8335fe47559ca2870926739
+EBUILD netbeans-profiler-9999_p20160418.ebuild 3472 SHA256 fc88063db6929a34b0442170298f423b58e9c8320be90696091fe7929f3802d8 SHA512 3325b88e8a90ce451bc77301477bffc7fd929b2f688e74fca07eec4e97e08dce27c7199be54dbe1fb955351bf8e80296887e431721cf573d6298a5f0ecfd2fe3 WHIRLPOOL afd355430eba86570851b0601a5b09fa15332894bd99138606eb94b188c7b814dd8c7234b078ebc0a05632b751484826ba5ab5f6260af34a71d68d6fb442077e
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160418.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160418.ebuild
new file mode 100644
index 0000000..d8d568d
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160418.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-18_00-01-48/zip/netbeans-trunk-nightly-201604180001-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 723b128..b0d95ab 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201604140001-src.zip 214335581 SHA256 68ee1a7dc8f093
 DIST netbeans-trunk-nightly-201604150001-src.zip 214340943 SHA256 7f1bb65d38367e2547a96e8fa027bcf4bf5815c2fd805dd01ce1c9fcb208a332 SHA512 7d598e18df326cb53b7f62a7e2a083d82e719c3db990275854b13abac138f6badb8852dfb1738a76f920e0daf4a106a54af637911e25e082b9f4fc1dce4eb373 WHIRLPOOL a46d8106c83073773dded36f9eebd37b860701460e3435deaaeef0e86b9af10ec3bdce3708d4ac783647af953a6ca3c24f78c3ee58585e65b1f0a29e92444147
 DIST netbeans-trunk-nightly-201604160001-src.zip 214350948 SHA256 6d42235d9f7fb7feed1d76934beb75ab5c548fcf1fd36d9523afeed1aff72edf SHA512 154186e3c48615ffe3ce26f37330eb28137e550426dbc5ca6d73565fcd08d3520f2e00bf4dab5d3cbfe7b489b1697113e40049eeade42e7676afac7136eb034b WHIRLPOOL b5019dee51a9eed46ac1f370fcbc8f6149db814919665236b92638131c759b0d6dd0b72e609344a6469ede3cbe90e3a2b68bfbc186c2dde89c34de5c2e53f5cf
 DIST netbeans-trunk-nightly-201604170001-src.zip 213245562 SHA256 8d1da18eea0786bbacec5b3a9479ba5f3f62463cb972b2b8d5658dfda29a3e93 SHA512 9bf389396c0b42023497277fb6312799853514b40c3fe714ff02d3945ff9c3ea6b90b433a07b85efb04a032865afd47a0c64a1aec5e8aef0884b2b4f8566e14f WHIRLPOOL 7d6dd3f54dc1e3355078a7eef2e15de18b7c03805d71ab61e8c5dc8fd0ccd281e5bd263f87daa90fcd44ac5db9cddb05c97cd850e11797eb9d0dc5ef47d641f4
+DIST netbeans-trunk-nightly-201604180001-src.zip 213245562 SHA256 33e9976d15aa52ed61f53bebb87d8290a64d6e7658dc96b044136f47d46c28de SHA512 71252b57630390c901bed5fec7021d5f9255adf02c2e84c1e0981a2d729c1d0c1ed14b927b1dd36c9a72b30ced64ae6b74429e4990ddfac4bc36aff4c46e7e17 WHIRLPOOL af4f5d0f0c8f7caac85bc7ecab0fe91c68141abc9df5a0a28cc069262aa08f869d5934f5d4a546fdd997e29dc5d63ab0aefcce530560e8ed5b9bfab86b962105
 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_p20160316.ebuild 5244 SHA256 10198edde545dd3cd708ed683d97d9a223b9339e86aa544e1218a5eb703fe657 SHA512 d72ed54cc339c4337acc43c9a814c5245725f6ffcd1e0e82b378faafb83cbf249faaaf7c06407a915f26ace737887f441e06740055db44cf5ef903e7ca641815 WHIRLPOOL a23f9eb4b7303ac2552e6dd6b53ba15fc2989b42dab709bad06413486a33136f865daddf5915f15809e17b7be222e9c57614b8165b0732a7e8d606b096456930
@@ -59,4 +60,5 @@ EBUILD netbeans-webcommon-9999_p20160414.ebuild 5343 SHA256 5dac79ba522b4a367b5a
 EBUILD netbeans-webcommon-9999_p20160415.ebuild 5343 SHA256 f259360d7d282d53a42c5d9dfb221037ad2127ed2d06e9964dc93b2ffaa849d6 SHA512 37d1fafad598a0118e160ee3adda351d1a26d24c2f2b3926e5f568200a6fbc81f607796387c7841942a26456ead7677484b82010758cff71b3bbb9225c84622e WHIRLPOOL 027aadb11d27d3411fd23516f341121345d34bf1a1eefede8a0dc3a9590e54ab9f7da9e26575ded2e0fab5eb22d4a6da64c02d396cca35d5f3fcd38a48c6ad2c
 EBUILD netbeans-webcommon-9999_p20160416.ebuild 5343 SHA256 e03ee7061c3166b12188e23cc89b64c52a79d278ad4ead8f821d031a3136a937 SHA512 8a4af0eec5b2b4bbca1c4d8598f64028e7f56b345767bd4530fec337ddcd76b41f24469201ab1ea8068de4890182d701779184d1b6f4476c8b93f3ae70d28e14 WHIRLPOOL acb6775bc6affd6ead367892851eceda263509242a85dd6b8c8cc655350355fef4f77c438ef30ed7e899ac053d7486ddd9d18177facac280dfd8455e6cb27e76
 EBUILD netbeans-webcommon-9999_p20160417.ebuild 5343 SHA256 9ee3864c697cb0cd16ed51cbfd74ba0a4afb41629909dbcf9893f27fa75188f9 SHA512 f9a3141b74efe5b97e00460549ab437954c794002a75725e920e7e01a3ce6bd6e9121fe7a16588460320c636950dde50005ab3eb5fe264a65d7ce1d011acd5dc WHIRLPOOL af0263d891ebe5312430d4efbb4fc02e290b6f0b8567c6274a0e62129620c57c5483fc5a6f8daf4975bff0272f8d50157648461d26c023f5ee87c86b93e4d8a6
+EBUILD netbeans-webcommon-9999_p20160418.ebuild 5343 SHA256 d7a215ea9abe29e024a1b0a67674a52f4e3f035698f3e966c5d6040ee2fc3f94 SHA512 88a197870e27a1dc275d3b434b546ef1e71d47b3aad2b2555b440932f467d5b70668f76a25850db2bb5ee0398b942b9525597023d38b827bcb7a0a039155f7d5 WHIRLPOOL 141c0e4484d23d11c828b96a3690f27884868fe05439751ac1fc6e7cb00455f6f870594ab337e8f133baf541b9dec0dd403bef677c4ef949a6d72cb067d1112b
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160418.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160418.ebuild
new file mode 100644
index 0000000..51a2596
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160418.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-18_00-01-48/zip/netbeans-trunk-nightly-201604180001-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 f7952dc..cf46a20 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201604140001-src.zip 214335581 SHA256 68ee1a7dc8f093
 DIST netbeans-trunk-nightly-201604150001-src.zip 214340943 SHA256 7f1bb65d38367e2547a96e8fa027bcf4bf5815c2fd805dd01ce1c9fcb208a332 SHA512 7d598e18df326cb53b7f62a7e2a083d82e719c3db990275854b13abac138f6badb8852dfb1738a76f920e0daf4a106a54af637911e25e082b9f4fc1dce4eb373 WHIRLPOOL a46d8106c83073773dded36f9eebd37b860701460e3435deaaeef0e86b9af10ec3bdce3708d4ac783647af953a6ca3c24f78c3ee58585e65b1f0a29e92444147
 DIST netbeans-trunk-nightly-201604160001-src.zip 214350948 SHA256 6d42235d9f7fb7feed1d76934beb75ab5c548fcf1fd36d9523afeed1aff72edf SHA512 154186e3c48615ffe3ce26f37330eb28137e550426dbc5ca6d73565fcd08d3520f2e00bf4dab5d3cbfe7b489b1697113e40049eeade42e7676afac7136eb034b WHIRLPOOL b5019dee51a9eed46ac1f370fcbc8f6149db814919665236b92638131c759b0d6dd0b72e609344a6469ede3cbe90e3a2b68bfbc186c2dde89c34de5c2e53f5cf
 DIST netbeans-trunk-nightly-201604170001-src.zip 213245562 SHA256 8d1da18eea0786bbacec5b3a9479ba5f3f62463cb972b2b8d5658dfda29a3e93 SHA512 9bf389396c0b42023497277fb6312799853514b40c3fe714ff02d3945ff9c3ea6b90b433a07b85efb04a032865afd47a0c64a1aec5e8aef0884b2b4f8566e14f WHIRLPOOL 7d6dd3f54dc1e3355078a7eef2e15de18b7c03805d71ab61e8c5dc8fd0ccd281e5bd263f87daa90fcd44ac5db9cddb05c97cd850e11797eb9d0dc5ef47d641f4
+DIST netbeans-trunk-nightly-201604180001-src.zip 213245562 SHA256 33e9976d15aa52ed61f53bebb87d8290a64d6e7658dc96b044136f47d46c28de SHA512 71252b57630390c901bed5fec7021d5f9255adf02c2e84c1e0981a2d729c1d0c1ed14b927b1dd36c9a72b30ced64ae6b74429e4990ddfac4bc36aff4c46e7e17 WHIRLPOOL af4f5d0f0c8f7caac85bc7ecab0fe91c68141abc9df5a0a28cc069262aa08f869d5934f5d4a546fdd997e29dc5d63ab0aefcce530560e8ed5b9bfab86b962105
 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_p20160316.ebuild 2721 SHA256 8a07ef88583977f67457beb80754368bce495718c5cb6987bef37993e978e168 SHA512 d5dc1dc2efa9509ab00f0da9d098281ec3af685d9a6dd0a53859dad3f612fb78757d6719596ac542ee68dd7de6f359ed2a7cfc396f4e57559c327e7983aaea9f WHIRLPOOL 7c5503a521ecfdb948ae1d383cfb997b925e9fce20de999e2d5272553544fd1157f9fac358aae688dda0a69ab7377b9dcd5198591b98e7ef49f12a0d46e0f629
@@ -44,4 +45,5 @@ EBUILD netbeans-websvccommon-9999_p20160414.ebuild 2721 SHA256 b882d45ba87ddde0e
 EBUILD netbeans-websvccommon-9999_p20160415.ebuild 2721 SHA256 b82432f5251a4ba93d1fd0d2a6ed12a08dbe1f9f20ccef944ce07d1945e40216 SHA512 6d32acd1977e16bd776032b975deb1fad92392a57be1aa62ee448958346ddb43049949873f01dd2d6317ab12ad72453cc9813df8592fb47541ba40718483097f WHIRLPOOL 76da9b4243bbe5ad7e1d3ec4af484d5da29b35f0efc9a4569584879e4cd487b527def108e95e6d25b64a3a9d8a9af99381a89c165d96ca0f422b5f0f41e790ca
 EBUILD netbeans-websvccommon-9999_p20160416.ebuild 2721 SHA256 e91308ae1b7391067c72822e519af35a8f15157abe43f8963f2ad1f312445f26 SHA512 5b12c95720aa66b20987c2d940b70d85bf364793aad5f9f6479364185deb8b4b1571f1ee1219d26caffd98fa16b4141ec6a66305961b158503656babda577af2 WHIRLPOOL d099ba7b0ff20efaec07c570dfbbe930394140e6747d4261e664a6d247605d9a9acdf3b969ee69f3eaa01e096d88380c26c043295ba2bd40e2cc7984c9dfd7ad
 EBUILD netbeans-websvccommon-9999_p20160417.ebuild 2721 SHA256 a2092848b2bf41fb2797ac5621264f8119e6143b142201001a5cf95c2ec15dc3 SHA512 eb3d0b649d0db7ac05c39f455f5f1b01cf6697a207dc65cf08485a44114862bc7c86bb76e3d02590f88f05606ae37a6ddee181dcd4704efad366f7d5fa593f0a WHIRLPOOL 6a49671c852d8adbb6354138ef650c27b5a2f23a6694a3f26c8a9c09fbf50bbfce3108840a7a79bef3c4cc068dafedcfccf3d3e14bb573b1ec820427613aff4e
+EBUILD netbeans-websvccommon-9999_p20160418.ebuild 2721 SHA256 cd5ff5bbacfaadcc0c7e5e07c7d6487132fdd2f5fa1b820713a05144c4e7bfcd SHA512 05b162645511dfda25154fa20ddd3f4e9e52a30af32e0806eaa8a030da5969c4da21de8459d5a4cceee83c4489be5dbbe3b292b36af54f8aefa1a56a6698dfab WHIRLPOOL 6cd71499fa5e0ab1c7c21191fa1127ce21f45c10d93f40a78b51fde01bf69f811ac2e4f50611d04e33e8a69933a9b206a0a17c7d99461efa3fe1b28271e7b036
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160418.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160418.ebuild
new file mode 100644
index 0000000..8cea797
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160418.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-18_00-01-48/zip/netbeans-trunk-nightly-201604180001-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 1d8a69c..7558eef 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201604140001-src.zip 214335581 SHA256 68ee1a7dc8f093
 DIST netbeans-trunk-nightly-201604150001-src.zip 214340943 SHA256 7f1bb65d38367e2547a96e8fa027bcf4bf5815c2fd805dd01ce1c9fcb208a332 SHA512 7d598e18df326cb53b7f62a7e2a083d82e719c3db990275854b13abac138f6badb8852dfb1738a76f920e0daf4a106a54af637911e25e082b9f4fc1dce4eb373 WHIRLPOOL a46d8106c83073773dded36f9eebd37b860701460e3435deaaeef0e86b9af10ec3bdce3708d4ac783647af953a6ca3c24f78c3ee58585e65b1f0a29e92444147
 DIST netbeans-trunk-nightly-201604160001-src.zip 214350948 SHA256 6d42235d9f7fb7feed1d76934beb75ab5c548fcf1fd36d9523afeed1aff72edf SHA512 154186e3c48615ffe3ce26f37330eb28137e550426dbc5ca6d73565fcd08d3520f2e00bf4dab5d3cbfe7b489b1697113e40049eeade42e7676afac7136eb034b WHIRLPOOL b5019dee51a9eed46ac1f370fcbc8f6149db814919665236b92638131c759b0d6dd0b72e609344a6469ede3cbe90e3a2b68bfbc186c2dde89c34de5c2e53f5cf
 DIST netbeans-trunk-nightly-201604170001-src.zip 213245562 SHA256 8d1da18eea0786bbacec5b3a9479ba5f3f62463cb972b2b8d5658dfda29a3e93 SHA512 9bf389396c0b42023497277fb6312799853514b40c3fe714ff02d3945ff9c3ea6b90b433a07b85efb04a032865afd47a0c64a1aec5e8aef0884b2b4f8566e14f WHIRLPOOL 7d6dd3f54dc1e3355078a7eef2e15de18b7c03805d71ab61e8c5dc8fd0ccd281e5bd263f87daa90fcd44ac5db9cddb05c97cd850e11797eb9d0dc5ef47d641f4
+DIST netbeans-trunk-nightly-201604180001-src.zip 213245562 SHA256 33e9976d15aa52ed61f53bebb87d8290a64d6e7658dc96b044136f47d46c28de SHA512 71252b57630390c901bed5fec7021d5f9255adf02c2e84c1e0981a2d729c1d0c1ed14b927b1dd36c9a72b30ced64ae6b74429e4990ddfac4bc36aff4c46e7e17 WHIRLPOOL af4f5d0f0c8f7caac85bc7ecab0fe91c68141abc9df5a0a28cc069262aa08f869d5934f5d4a546fdd997e29dc5d63ab0aefcce530560e8ed5b9bfab86b962105
 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_p20160316.ebuild 6939 SHA256 ec060ffffa8905bde4b4cabf768690a1c8cc3c1d3a60e18fdfca1b4b32c43398 SHA512 c83a272a3db907fbe9166062c5b1d563974ed27c34cd40e3867ca47d4a468a7c7db1259c9a5d86ae0f8e1c0d68eac6fe1bd69012d546c69c08d02adc63bfa41d WHIRLPOOL ba5274d9813a707e063d6037ef8f274518dadc5e1cc68a585f8f0163a0a45dfb95744897604d361ae8e09dea7ca7c2f1e5817720e830f63f49bd189e1f2b0bdf
@@ -47,4 +48,5 @@ EBUILD netbeans-9999_p20160414.ebuild 6939 SHA256 7bbe42c0f471c8fbd75805f78799e5
 EBUILD netbeans-9999_p20160415.ebuild 6939 SHA256 846f1ae42398258263e2c538159befeeb59f87622d386bddac3d10af6dcc8055 SHA512 09b1c009f0224844e797475fcf4ffd2fdbc157e24dac1b61f5750f575889a40a89eff0e7d58a724ddb2c99422d7ba151baa47f9e0215ef2fab0354a77d29f4c4 WHIRLPOOL 557eafc04a505eae95644b6478158ee9e2f7077b8ce50d7174ea89751ad9e5c370839aae0a1b2048c70e4dbcf52aaa45708a459af1c6e1b4c01fb3df95d4bf7e
 EBUILD netbeans-9999_p20160416.ebuild 6939 SHA256 f8a165ac0171df487eee889ced4ad95029c93dcc7dd6826f2d539bb40c586a21 SHA512 9743997b49cc2e893e9ab455b2a8447cc89edce154a31419d1678baa62e6ef9a1eff3ccbd0720cc76341209079e503d87b35ad4aa09a6ce72d5f982998ccc407 WHIRLPOOL b8aa0bdfc97204182811c02556d9889b62dc4976ff0b7127c57026c05cf74d3eb1c22c453c0df6be98eb4fc21ce91711bbf1b6e0e7e76ae31416d4d99cf36653
 EBUILD netbeans-9999_p20160417.ebuild 6939 SHA256 1ff713ec7a2f1d42f17325e029e5f5fd5c1fcfaf434ddf12d22c44d2c6b1ba9b SHA512 a7c8f648b31fe5c13f1cec5b8c8c85338e82db81eb69333379bbe7f36bb017158e5d5eda058e1017c1195dd2ebd66dc7d9e19022120d7cbe069123de42102cf9 WHIRLPOOL 8b044431c1cbf421eef2d0eda48b95c096fbc39f2d718547828715209162ace238cc7f81f52715f56df9c050972ea369424f79c96b21587d1937dd78eac41644
+EBUILD netbeans-9999_p20160418.ebuild 6939 SHA256 18b5deca587d50422faf08b0d63ea0a56198831eff26a7ce5a7bd638eebc5f5c SHA512 e45680bc1316b2141a665868b0b4f59f10aa59ee2f12b05794022ad1c43e71fc8e5fd642ff5090ce1bfc405c3ed8910e3628cfb354d98b582f2776acf206b839 WHIRLPOOL aadf4aa3e6214013c9f8b9da059ba1866abe43856c4208abe0af014c1a8534d21c091795dcfb25ceacdcfea174ffc0d593d2f1ee704bb1db9ab7b57b102e0e65
 MISC metadata.xml 329 SHA256 8aeaf2a0228f15c2e4140f401b30f083509bd99d0a578873069f3595cd8555f3 SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640 WHIRLPOOL 799a9b79b1b447bda9631f67e2dfaf722376740e1d2037796528a05f9745eeed00d9990a74a65ce09f74bc5e1d60a887abde540c3c62487d7dd49b8377c15834

diff --git a/dev-util/netbeans/netbeans-9999_p20160418.ebuild b/dev-util/netbeans/netbeans-9999_p20160418.ebuild
new file mode 100644
index 0000000..a11a287
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20160418.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-18_00-01-48/zip/netbeans-trunk-nightly-201604180001-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-18  9:11 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-18  9:11 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-mobility/, dev-java/netbeans-nb/, dev-java/netbeans-javacard/, Miroslav Šulc

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