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

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

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-groovy/, dev-java/netbeans-javafx/, ...
@ 2016-04-13  8:09 Miroslav Šulc
  0 siblings, 0 replies; only message in thread
From: Miroslav Šulc @ 2016-04-13  8:09 UTC (permalink / raw
  To: gentoo-commits

commit:     2e1168438a7ff89807f5798019efbbd631be7647
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 13 08:09:07 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Apr 13 08:09:07 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=2e116843

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.2.28

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index aa24932..4c437ff 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201604060001-src.zip 210178912 SHA256 9cba66d0d2af5f
 DIST netbeans-trunk-nightly-201604070001-src.zip 210188037 SHA256 7092c74499a788c69c0cd6539a42939851f3af3d1e4e7412f484dd5b0cb31904 SHA512 58b2f347020c917f4eec46aa9de482d9f4c26592d11b8bea2393554cdc5f5420451468824c64389d56a8801925cf2b9d605b4ee4eba8ab59f0d43f392ff1737f WHIRLPOOL d8a978091f9511677606df39902b8f9aff6e26ef369a6410d74b11efd409455681257a90879ce883a6ae3cac671562bcbd25991c2c5e81b672dcfa981e1b476c
 DIST netbeans-trunk-nightly-201604110001-src.zip 214209797 SHA256 b77721e7845710305bcf251547970caa5220bbd3659d42ca22a5a479b453d061 SHA512 c9fdf9b8d727aa056af65cdbcb8e9bf4448c012d964282019f9e6c72e184fe93b149e57878cf36963e0d43e7fa62f35879eab76b5701d85d8fc1121fd3384314 WHIRLPOOL f33848fdc313b7cf10f56fa96e82408da7a8052e6c7bcf68b706afc7a059317105ffdb0f4769414061d3f351b7e9e6eaf7585260a11d0212071a93899b584aca
 DIST netbeans-trunk-nightly-201604120001-src.zip 214308035 SHA256 c4ee83fc02814526c764bf7303438e59914fad937349cc0d1e9a74b57a3067a3 SHA512 f4b018d6133c2ea39cf6c027ee5ac227e2ea7eb28e5ee88a3413d2a50e3b2ddc57c90c20416a223ec312c059db6924679cbf8ef44c7db544037ce5791996b289 WHIRLPOOL df48d3e45091010c7b4987678c38ef34b534475bf1079b1901b506e1bafb3464f9ab9204a7d379a620df34965f854dc3afed6d9f9b77409c0a330cd8221a5380
+DIST netbeans-trunk-nightly-201604130001-src.zip 214317043 SHA256 f3f24013d19337cc3cc84b1a9b6b65e6add3a1c913cab5c1bcaf4a82afecae54 SHA512 1fe95e91c226177823f33f147967fbab0923afb81efda04a7414f2d45243b1fd5059542b4276513077dbbf1e7d13f4aa4b87510cf0d62806b3ad722a2ecb57a7 WHIRLPOOL f656cd4310a872404da8b734e0d328e0bc7a8cdba93da0180102f3dc4423290bf1c25ef97aa8bb9a18dacff9cc43c3bf499e85411f6c6235f7d1e7f44d2910cb
 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_p20160306.ebuild 3384 SHA256 1b57b15b5f431a70a2d983a9db02e49e6d51b7b6f1377f7624269456b9b71a53 SHA512 cb55af955e21072a6e3bb3d7d4eef23f156a1c285705cbab318f40887b7b4c555428659bec14f52d2e23d3dd79e152fe19edf6d2ef166d8cd9e80880c634136f WHIRLPOOL 8df1ed80ab7e8aac63a0eb8ab42b11cab96490865ff054cc06cfb9c24567b7e4fc8fbc3077860984f15c1b0012b47d647e867e43fe55e04b33688a51fc502fd3
@@ -45,4 +46,5 @@ EBUILD netbeans-apisupport-9999_p20160406.ebuild 3384 SHA256 c1d774756d7ca01dd8b
 EBUILD netbeans-apisupport-9999_p20160407.ebuild 3384 SHA256 0fe0ad5f4bf66fe1973ffde7a7ab5b88f51f85c0b95c6ed23101dab3454fc17e SHA512 3cc1dbb4077e6b9255ca2db2de368b3897ba9ed9b3699f4a8aa4bc344a2a05b4974a52bad576d2395b28086a610dba7a21e37b2048a237551e32ef6a3a50a3ac WHIRLPOOL 5f3efcbac238c4ea02b9de56cd6f63844371c0d345918ba816d25e31debcf68db7e1d805f4fbee7237b7514a7c36cae8006a1ff3bdf32789462667d54f16e9d2
 EBUILD netbeans-apisupport-9999_p20160411.ebuild 3384 SHA256 77f287d4d9a626d7570a7ca2b1492ff36edddbf476290fb50613f83cd4d3ecc5 SHA512 be68ba22efca5ece89a3dc42b0aeefbc84f124b2c9e455dade9370d2d7300e8468854e68dc6373d7eb0ebfaaaef60f8211b5b6695c802d54812f6777c2343723 WHIRLPOOL 107e6d29f88059786aaec3606abde6002468c40f75d4568662fefcad388a68e73c565f02fb648be51a3c9025befd653e10609e18f280eac9fa1c5c9675511730
 EBUILD netbeans-apisupport-9999_p20160412.ebuild 3384 SHA256 ccc081695ad26cebef816250a23f0695d02d54e591dfeb6f4fd5296d783e06cb SHA512 a8e3cd74e4e6a7e06f6ca08fc3617ab5cb0f7403b4dda3e8aa6d2c23d725c98d2ed5a4e1dcda69a566c6809fab6555f811ce67b1f0c678534e4f0c7e40c414db WHIRLPOOL dcdc86a2154a17f7dba5235647349a3c7e263415c58b28da9521d29892f66131f9fbd4f9bce98a4e308eb97c7d78afc79eec7e2d7098dfb060e1c93706e9d234
+EBUILD netbeans-apisupport-9999_p20160413.ebuild 3384 SHA256 b3df9431c8f59f910654e13f459f02eec964454b4b43d27ce166e835a127206a SHA512 e239154b6d524e2bc6428f2f2deacdc27992220aa44dc5f92941238f479df4c616cdad957b32d37414a395f710e687a00cfc64c93bf427ed0b3c08b0f4db2d6d WHIRLPOOL 55e3fc86fabed25e0104e6f47341485fae54419b598d665b074dd8c8ecfee7b2b727e157cc49b5843df948f64e243e0aeafad40da216634b1efa85bcb8aac93f
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160413.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160413.ebuild
new file mode 100644
index 0000000..139faf0
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160413.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-13_00-01-48/zip/netbeans-trunk-nightly-201604130001-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 6e783a1..aaa7757 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201604060001-src.zip 210178912 SHA256 9cba66d0d2af5f
 DIST netbeans-trunk-nightly-201604070001-src.zip 210188037 SHA256 7092c74499a788c69c0cd6539a42939851f3af3d1e4e7412f484dd5b0cb31904 SHA512 58b2f347020c917f4eec46aa9de482d9f4c26592d11b8bea2393554cdc5f5420451468824c64389d56a8801925cf2b9d605b4ee4eba8ab59f0d43f392ff1737f WHIRLPOOL d8a978091f9511677606df39902b8f9aff6e26ef369a6410d74b11efd409455681257a90879ce883a6ae3cac671562bcbd25991c2c5e81b672dcfa981e1b476c
 DIST netbeans-trunk-nightly-201604110001-src.zip 214209797 SHA256 b77721e7845710305bcf251547970caa5220bbd3659d42ca22a5a479b453d061 SHA512 c9fdf9b8d727aa056af65cdbcb8e9bf4448c012d964282019f9e6c72e184fe93b149e57878cf36963e0d43e7fa62f35879eab76b5701d85d8fc1121fd3384314 WHIRLPOOL f33848fdc313b7cf10f56fa96e82408da7a8052e6c7bcf68b706afc7a059317105ffdb0f4769414061d3f351b7e9e6eaf7585260a11d0212071a93899b584aca
 DIST netbeans-trunk-nightly-201604120001-src.zip 214308035 SHA256 c4ee83fc02814526c764bf7303438e59914fad937349cc0d1e9a74b57a3067a3 SHA512 f4b018d6133c2ea39cf6c027ee5ac227e2ea7eb28e5ee88a3413d2a50e3b2ddc57c90c20416a223ec312c059db6924679cbf8ef44c7db544037ce5791996b289 WHIRLPOOL df48d3e45091010c7b4987678c38ef34b534475bf1079b1901b506e1bafb3464f9ab9204a7d379a620df34965f854dc3afed6d9f9b77409c0a330cd8221a5380
+DIST netbeans-trunk-nightly-201604130001-src.zip 214317043 SHA256 f3f24013d19337cc3cc84b1a9b6b65e6add3a1c913cab5c1bcaf4a82afecae54 SHA512 1fe95e91c226177823f33f147967fbab0923afb81efda04a7414f2d45243b1fd5059542b4276513077dbbf1e7d13f4aa4b87510cf0d62806b3ad722a2ecb57a7 WHIRLPOOL f656cd4310a872404da8b734e0d328e0bc7a8cdba93da0180102f3dc4423290bf1c25ef97aa8bb9a18dacff9cc43c3bf499e85411f6c6235f7d1e7f44d2910cb
 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_p20160306.ebuild 4790 SHA256 97dd173ac83542326a4163070681d9d54d3801d8df638d14e1e99e07a6435e77 SHA512 a5b5fbea0911fb5c8ac7e01ec3f9f75d1c96e70d7af0e6e2345919cda7e114e5a4e62516b75df771e25d4c9c1c79ba987cdb015d66e160eaf4644bb6e41bf2f5 WHIRLPOOL e09e8398f2f45fa9e86f8ddb4528ff415d5eaac908577d2f6acaa469affad0b7f33aeb1e29a66bb385c74cf20bbd826080c8aacf4fafd5f9e2a843475538832b
@@ -59,4 +60,5 @@ EBUILD netbeans-cnd-9999_p20160406.ebuild 4790 SHA256 96b2c0ccc8e5f29e5d531d0021
 EBUILD netbeans-cnd-9999_p20160407.ebuild 4790 SHA256 e1f0c92ea654409961a30de65bcefde4b026e79ff8d0f3377ba726fb7e7f5d79 SHA512 7632bccf69cd17657c4af52e73aa819d491edf9d6b7040c2677ff86d94e24890cb7d1cdcfca68a3a2c9d333222bb600355d7d607126532beac3a2bd44bb9954e WHIRLPOOL 218d41c35bb281ca6d30eff7ea86fbe6c5e784b1689c07cd029dcf567b6acfd4fb20bad67f426a50fa8ec824048c80eb865b5db83ad18fa164a9dd6a58ff09d9
 EBUILD netbeans-cnd-9999_p20160411.ebuild 4790 SHA256 0878024500e8fc3f7e84f7d9df1165159887dcef27b6639542a198ccd7f69a48 SHA512 d8d805a7b2c2390d908c522d5f75b5e77959923ce355c57445dece36a9d79ab69c1cb0c8bb49a168c8744fad1f9e07939063804740b2642751dd7a2478197a08 WHIRLPOOL 943a374c98bba11b297a99d58608d53dc6946ecd0efe31f7fac8d629b70e47814b55992017f0664ed68149e2e44ee96ca4b303613af6337f948857ae3ce48d5b
 EBUILD netbeans-cnd-9999_p20160412.ebuild 4790 SHA256 002a81ecf26b121e3437c36aadd40f8c1adbe7d1c94058f9e893bea5a23ef86a SHA512 0e839faee57c277a0178376e29808b6bc432b44e9ae8594e6d34004b99f6e979f92b12fa27f72227561825945f7b1885b41afbd688f2d618f4562fb714afca4c WHIRLPOOL 38737053730a7822ebd093d5ac6e989a7c349dea8fa72a162e68a03727547350c1c42992e5688880501dc0cd609c141384fc94b9ef585fa8976489524c5b0712
+EBUILD netbeans-cnd-9999_p20160413.ebuild 4790 SHA256 c962c2f4b16858cc4d4cd6aa6dab4af290dd8b6b7abb48529ac079f02fc87ea6 SHA512 6bcf23f411d6d78da549ee971be2baa8503892f2d190ff14fcf79a5e6265ce509e92ee97c69266bc37c151ab2a3f986280bd1c473e24dd1c3ed7eb0e670ba550 WHIRLPOOL 71613c71bfcc916b6327836a02fb32a2a2f2bde9cbd8675e838992e9c6d2e83cb8e93a1e895b611f89eb846020dc5c990df0599c3e076f859b9278bea487813e
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160413.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160413.ebuild
new file mode 100644
index 0000000..9a6c432
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160413.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-13_00-01-48/zip/netbeans-trunk-nightly-201604130001-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 48e94cf..844b7e2 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201604060001-src.zip 210178912 SHA256 9cba66d0d2af5f
 DIST netbeans-trunk-nightly-201604070001-src.zip 210188037 SHA256 7092c74499a788c69c0cd6539a42939851f3af3d1e4e7412f484dd5b0cb31904 SHA512 58b2f347020c917f4eec46aa9de482d9f4c26592d11b8bea2393554cdc5f5420451468824c64389d56a8801925cf2b9d605b4ee4eba8ab59f0d43f392ff1737f WHIRLPOOL d8a978091f9511677606df39902b8f9aff6e26ef369a6410d74b11efd409455681257a90879ce883a6ae3cac671562bcbd25991c2c5e81b672dcfa981e1b476c
 DIST netbeans-trunk-nightly-201604110001-src.zip 214209797 SHA256 b77721e7845710305bcf251547970caa5220bbd3659d42ca22a5a479b453d061 SHA512 c9fdf9b8d727aa056af65cdbcb8e9bf4448c012d964282019f9e6c72e184fe93b149e57878cf36963e0d43e7fa62f35879eab76b5701d85d8fc1121fd3384314 WHIRLPOOL f33848fdc313b7cf10f56fa96e82408da7a8052e6c7bcf68b706afc7a059317105ffdb0f4769414061d3f351b7e9e6eaf7585260a11d0212071a93899b584aca
 DIST netbeans-trunk-nightly-201604120001-src.zip 214308035 SHA256 c4ee83fc02814526c764bf7303438e59914fad937349cc0d1e9a74b57a3067a3 SHA512 f4b018d6133c2ea39cf6c027ee5ac227e2ea7eb28e5ee88a3413d2a50e3b2ddc57c90c20416a223ec312c059db6924679cbf8ef44c7db544037ce5791996b289 WHIRLPOOL df48d3e45091010c7b4987678c38ef34b534475bf1079b1901b506e1bafb3464f9ab9204a7d379a620df34965f854dc3afed6d9f9b77409c0a330cd8221a5380
+DIST netbeans-trunk-nightly-201604130001-src.zip 214317043 SHA256 f3f24013d19337cc3cc84b1a9b6b65e6add3a1c913cab5c1bcaf4a82afecae54 SHA512 1fe95e91c226177823f33f147967fbab0923afb81efda04a7414f2d45243b1fd5059542b4276513077dbbf1e7d13f4aa4b87510cf0d62806b3ad722a2ecb57a7 WHIRLPOOL f656cd4310a872404da8b734e0d328e0bc7a8cdba93da0180102f3dc4423290bf1c25ef97aa8bb9a18dacff9cc43c3bf499e85411f6c6235f7d1e7f44d2910cb
 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_p20160306.ebuild 2968 SHA256 933df16ad2d5495061a4475805f1ff23c090e37c4cab1fa41136a5564e19f229 SHA512 17148bf7b926a80cca8da00d7eb80063993e911b60669b9ef1b715be2c121ab93256b35a3b65a45360d04c7a5f8de6a039c83a7552beb19903ab3e3d01e1a308 WHIRLPOOL cacb49e541e5883df5138380bb086f2f2c7f2ed7f5ddc06258afa94d8da025cc20e31d29ce4b20bc90bd256126a8292e3dddea7269f146f038438748ac52565e
@@ -48,4 +49,5 @@ EBUILD netbeans-dlight-9999_p20160406.ebuild 2968 SHA256 8b41c79d337d4b274bdc2d4
 EBUILD netbeans-dlight-9999_p20160407.ebuild 2968 SHA256 9424f9ebcd1539b9a12cb73c8d252193086e3717a354c36a63e9cac016a1e2bc SHA512 4ba717da50fb137f331c8733da24c19848541fa89f950d1228a2656192bfd2eb69ad83d4a769c41a63df4391bb249027ee0a083b06861c157835d0db0720b92a WHIRLPOOL bce73b636db69d7dacd4391493dd68a3625707967b92ae90c01a373c8e93563a19d0277bdde7145357f352edb1d83e07a402b96d01ac55d817c29c8db8d40ce7
 EBUILD netbeans-dlight-9999_p20160411.ebuild 2968 SHA256 cfb9394d1fb3745157e5504a8a71f41d65a0e3a77143d0c1ac1c2f31b46816c8 SHA512 37c7a24ffe5806ba84cd616421ae99511ceba23b7d2f69f1be61376dbbd15e9a5e5c7054fcb632a4ec157e89c6e2bcb8b05827b2968fdc76cb5d614411fb5c33 WHIRLPOOL fd0487be36a1f925161e355e607cdb6e20a69856cdc6295fe69f92a3fc283f29ad12ea9460c50288c64067187ae0bee12fa8cb02ef437fd29ba4adaf8d8773b1
 EBUILD netbeans-dlight-9999_p20160412.ebuild 2968 SHA256 b63b7ca6f928526121b3deb831aa8dc9b857818df291b4a07f19f86523ed664b SHA512 e626db974c895cfd80ab97a4e6243047064462ae3491d9df784f4639dab91941dd444c6b9f7fe0a1cac6dbb62a22c57bd5f068e0e5e0bb069f3ceebba3d88e83 WHIRLPOOL f14d8ab12aa63a811f3e849def5404a146a31ccd4f0cc92a82ebb331d278da84d6628f8229f0f644cf657cade7d08bb3ac74e973b748b6fb8144e29751b05304
+EBUILD netbeans-dlight-9999_p20160413.ebuild 2968 SHA256 27b82789692e45ea069ab75a83e0ab2d963ef1524e086220299af1b00ce0e509 SHA512 7adbe025dd82a432c30c6d6055b5cc608009934d92bf4606cc0b38130e75782051bd9dff5a082dae1e91c6796b0f9cc8a8e7a0fa472e8821620d367e0f8849c5 WHIRLPOOL d81f83e432e9892d806044dad558457a225f68925ecd574a88d3962a4ad5a2a785caa2b5de05f1389d125e91b7fc6723a3f789e9eb81ab9bfe43e234550667d9
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160413.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160413.ebuild
new file mode 100644
index 0000000..6a80df1
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160413.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-13_00-01-48/zip/netbeans-trunk-nightly-201604130001-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 8015d39..4b2fd42 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -56,6 +56,7 @@ DIST netbeans-trunk-nightly-201604060001-src.zip 210178912 SHA256 9cba66d0d2af5f
 DIST netbeans-trunk-nightly-201604070001-src.zip 210188037 SHA256 7092c74499a788c69c0cd6539a42939851f3af3d1e4e7412f484dd5b0cb31904 SHA512 58b2f347020c917f4eec46aa9de482d9f4c26592d11b8bea2393554cdc5f5420451468824c64389d56a8801925cf2b9d605b4ee4eba8ab59f0d43f392ff1737f WHIRLPOOL d8a978091f9511677606df39902b8f9aff6e26ef369a6410d74b11efd409455681257a90879ce883a6ae3cac671562bcbd25991c2c5e81b672dcfa981e1b476c
 DIST netbeans-trunk-nightly-201604110001-src.zip 214209797 SHA256 b77721e7845710305bcf251547970caa5220bbd3659d42ca22a5a479b453d061 SHA512 c9fdf9b8d727aa056af65cdbcb8e9bf4448c012d964282019f9e6c72e184fe93b149e57878cf36963e0d43e7fa62f35879eab76b5701d85d8fc1121fd3384314 WHIRLPOOL f33848fdc313b7cf10f56fa96e82408da7a8052e6c7bcf68b706afc7a059317105ffdb0f4769414061d3f351b7e9e6eaf7585260a11d0212071a93899b584aca
 DIST netbeans-trunk-nightly-201604120001-src.zip 214308035 SHA256 c4ee83fc02814526c764bf7303438e59914fad937349cc0d1e9a74b57a3067a3 SHA512 f4b018d6133c2ea39cf6c027ee5ac227e2ea7eb28e5ee88a3413d2a50e3b2ddc57c90c20416a223ec312c059db6924679cbf8ef44c7db544037ce5791996b289 WHIRLPOOL df48d3e45091010c7b4987678c38ef34b534475bf1079b1901b506e1bafb3464f9ab9204a7d379a620df34965f854dc3afed6d9f9b77409c0a330cd8221a5380
+DIST netbeans-trunk-nightly-201604130001-src.zip 214317043 SHA256 f3f24013d19337cc3cc84b1a9b6b65e6add3a1c913cab5c1bcaf4a82afecae54 SHA512 1fe95e91c226177823f33f147967fbab0923afb81efda04a7414f2d45243b1fd5059542b4276513077dbbf1e7d13f4aa4b87510cf0d62806b3ad722a2ecb57a7 WHIRLPOOL f656cd4310a872404da8b734e0d328e0bc7a8cdba93da0180102f3dc4423290bf1c25ef97aa8bb9a18dacff9cc43c3bf499e85411f6c6235f7d1e7f44d2910cb
 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_p20160306.ebuild 15825 SHA256 72460b56cfe22f250bfef4399e80895c04d542748b5ceedb3480d71503becdb9 SHA512 2788a742001e66bb4fff461a49c1286ea6385afee18833cbe1799c2467fff1c00175e2f9c735c888e335f281e5d81c7abb40f8425e28e098a8cb5f59ed68a67c WHIRLPOOL 86d66f6d19571651147483abdb78b63fd663b6d1b0d4d5c0dc5b9dba25a49c95b504b7f34c901b712684d0043557a4c907d69bf509f45a3c126d08e5e8ad786d
@@ -77,4 +78,5 @@ EBUILD netbeans-enterprise-9999_p20160406.ebuild 15825 SHA256 b5393880aa847da468
 EBUILD netbeans-enterprise-9999_p20160407.ebuild 15825 SHA256 85034ecccd8dd28793578d8720700b3309b299e150e4c79e3356a0f6c83b187e SHA512 03572b04593f11f1f5e845c02d7dd3c8b716fb5cff769a4680ccc7873e65a6f134ec1b5cf1513fc78afefbac756d319e37fe0d6918406d0f05639e63ef3292a0 WHIRLPOOL 1a95004372f3b901a9f0627617e285ce3a1ce1fe498e7ec39de389ba6659c38c9ee5551ccb3708f9da58a2de9409110cfb32b43b40f7a765cadf6e40148d0928
 EBUILD netbeans-enterprise-9999_p20160411.ebuild 15825 SHA256 b9c2e562c94e1dd2f198347b3516aa3195d5ce1a53c2c9f7487966cbfd07a31b SHA512 1ab06fb54e5fbc15d86a96828a040263ce591efe1095cb9753ffd59382ebe67e14a9e3c2a525bbc961946f3c388c746c2f9bb3d48db9cbded8b543799a23bcf6 WHIRLPOOL 85fc53627383ce829631e245b484720bebbbd3d8914a0a3e45279788681b95d95aa800577ddffd4026b4b92e74f92af160e4eea9bd44251eb14bf6c7ebf3cb2c
 EBUILD netbeans-enterprise-9999_p20160412.ebuild 15825 SHA256 cdd693c1f7866981bc7b27ca6ca7ce7ae4e5d45dda1c5a73d9c8892189c02748 SHA512 ac404a9e1ebf4b0e6a2741a45b0acdc1b8e722b8057e07e851fe37de0ecf06c8c885558c12eff34272868f4dace43e8e6213be2ec3fc67cbb2242656e7362ef9 WHIRLPOOL c92430f35320a0a142074115ca59b6b5ca533977b7a354de8fdf10d399204f0248fdd752fb23555eb6f470600ac0acf793612bf8601c9a0b96d844388a836d4e
+EBUILD netbeans-enterprise-9999_p20160413.ebuild 15825 SHA256 44638a3ea8d89d4357d628f087ef918d2a42155b42c95e1c280747e760180d00 SHA512 d296aa57b8174ce6216faed0d029557bbb3b486a9c62019d67c7db93c757f973f695822aa9d4405bae5e5e420e1e0b889a59a0edb558351e363a11bbe45f841f WHIRLPOOL eff82d58c1d0ef540ce2b75dc1bf4275a656877e72bad8ec92d6b67f13db209d56628f2018eb06fa7e1a7f07cbceb1bbfb3a843c40126001c3fd7902a9e67acf
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160413.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160413.ebuild
new file mode 100644
index 0000000..3832a1f
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160413.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-13_00-01-48/zip/netbeans-trunk-nightly-201604130001-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 78f009b..097f4c3 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201604060001-src.zip 210178912 SHA256 9cba66d0d2af5f
 DIST netbeans-trunk-nightly-201604070001-src.zip 210188037 SHA256 7092c74499a788c69c0cd6539a42939851f3af3d1e4e7412f484dd5b0cb31904 SHA512 58b2f347020c917f4eec46aa9de482d9f4c26592d11b8bea2393554cdc5f5420451468824c64389d56a8801925cf2b9d605b4ee4eba8ab59f0d43f392ff1737f WHIRLPOOL d8a978091f9511677606df39902b8f9aff6e26ef369a6410d74b11efd409455681257a90879ce883a6ae3cac671562bcbd25991c2c5e81b672dcfa981e1b476c
 DIST netbeans-trunk-nightly-201604110001-src.zip 214209797 SHA256 b77721e7845710305bcf251547970caa5220bbd3659d42ca22a5a479b453d061 SHA512 c9fdf9b8d727aa056af65cdbcb8e9bf4448c012d964282019f9e6c72e184fe93b149e57878cf36963e0d43e7fa62f35879eab76b5701d85d8fc1121fd3384314 WHIRLPOOL f33848fdc313b7cf10f56fa96e82408da7a8052e6c7bcf68b706afc7a059317105ffdb0f4769414061d3f351b7e9e6eaf7585260a11d0212071a93899b584aca
 DIST netbeans-trunk-nightly-201604120001-src.zip 214308035 SHA256 c4ee83fc02814526c764bf7303438e59914fad937349cc0d1e9a74b57a3067a3 SHA512 f4b018d6133c2ea39cf6c027ee5ac227e2ea7eb28e5ee88a3413d2a50e3b2ddc57c90c20416a223ec312c059db6924679cbf8ef44c7db544037ce5791996b289 WHIRLPOOL df48d3e45091010c7b4987678c38ef34b534475bf1079b1901b506e1bafb3464f9ab9204a7d379a620df34965f854dc3afed6d9f9b77409c0a330cd8221a5380
+DIST netbeans-trunk-nightly-201604130001-src.zip 214317043 SHA256 f3f24013d19337cc3cc84b1a9b6b65e6add3a1c913cab5c1bcaf4a82afecae54 SHA512 1fe95e91c226177823f33f147967fbab0923afb81efda04a7414f2d45243b1fd5059542b4276513077dbbf1e7d13f4aa4b87510cf0d62806b3ad722a2ecb57a7 WHIRLPOOL f656cd4310a872404da8b734e0d328e0bc7a8cdba93da0180102f3dc4423290bf1c25ef97aa8bb9a18dacff9cc43c3bf499e85411f6c6235f7d1e7f44d2910cb
 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_p20160306.ebuild 2913 SHA256 2580b44ac893dba5fa257693cfcc7d7c29ceb230944eb403bd07022e8012d967 SHA512 539b5b1cd00933132dfded163171339ba233e0161d0484646800a0146d4276717d67d02802cfd5999078149af449964b4da73b59c1e6201604f342bdbb10968a WHIRLPOOL 1a1215eb893b3c4d5ba4f6d1dfbfe4df0b604a5ab86d2109bd132ab40dafe6ba58ff32007a688bba166e8878c59f9acbfd7cc6e9575d039e71bfe13667bf548a
@@ -45,4 +46,5 @@ EBUILD netbeans-ergonomics-9999_p20160406.ebuild 2913 SHA256 ba596e4f86d19501e1f
 EBUILD netbeans-ergonomics-9999_p20160407.ebuild 2913 SHA256 d6f4452274295a8f6efc989d5a89c03360914b6354f73492a7e8e7d6f16c64a6 SHA512 d8706bff297719925ef59b87f25a64265f25328186c3a45abdace0b6db25a6b02ffe93af36a3fef46a05bd8dd0cd968aafedbf253d6036065761eb20c6c980df WHIRLPOOL 88ffd8e235d4479848785b198e83f1472d46f40a77cfd047455fb1bf70b7e8dbe115ba26901f7674d995c3bd9d979e62883d783dc463d2b739e270ee49e852dd
 EBUILD netbeans-ergonomics-9999_p20160411.ebuild 2913 SHA256 e051525cf8df3b01fc20c3dd799824e249cdcfaa707eb09c2d8366ea2591ccee SHA512 ae7d4be48335f2d0cb9ca74f38daafa9542dace3b305306860e6797f46479e2cc56b1a655d39ce7facbd9495e4ad7eb60dec051a5d82c43b576c87cd45d9eae6 WHIRLPOOL 81e8882145a9b03aa29010861ba9efae9d9618da0e081e5a5ba80ade7b1bacbf98623fc60cb9b26d0c53518d2c18923d33f71d52539b42e231fb984b19311fef
 EBUILD netbeans-ergonomics-9999_p20160412.ebuild 2913 SHA256 f97734f4d9cda8c79f0236cd7aa575be3c6bff2bfcebf02ca8d092756a665251 SHA512 6d20aed278d990e41e6f1f74819370290ac609c2a95375851b32f7e3f553ee4b3282d71ca2d9439e0b54fd6d19428e553648df702868432f89177a64d2e1a3e4 WHIRLPOOL 4af86598d29310ca193f3daa3aa39ab0ffa11e71023e8139c94b3bc356aadbc5b22c5c93b585995d8f072e2c8bc1e9c735ec003ad6b47ee577462162206c917e
+EBUILD netbeans-ergonomics-9999_p20160413.ebuild 2913 SHA256 db5bb46b5dde8e3033577be405d3a4ce714345661daa6023136dc534318a9be8 SHA512 f451491cb82ab59a459555630c9bfd063eb0c30d040c6e59346ed08ff981ce532da4b728790905aecd92276d5317cf9d114594c99d05728f35c4a11094ee9613 WHIRLPOOL b5ec0febbc61ed6e2884f014f2b33d356c21a29f80cdb06c69fe1c861ca9c29715851cf2a293aca0f804230e31d491f537db43681d693e1fccc8b48d1fcbe6ab
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160413.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160413.ebuild
new file mode 100644
index 0000000..93a2bf9
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160413.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-13_00-01-48/zip/netbeans-trunk-nightly-201604130001-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 ae7868c..651d934 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201604060001-src.zip 210178912 SHA256 9cba66d0d2af5f
 DIST netbeans-trunk-nightly-201604070001-src.zip 210188037 SHA256 7092c74499a788c69c0cd6539a42939851f3af3d1e4e7412f484dd5b0cb31904 SHA512 58b2f347020c917f4eec46aa9de482d9f4c26592d11b8bea2393554cdc5f5420451468824c64389d56a8801925cf2b9d605b4ee4eba8ab59f0d43f392ff1737f WHIRLPOOL d8a978091f9511677606df39902b8f9aff6e26ef369a6410d74b11efd409455681257a90879ce883a6ae3cac671562bcbd25991c2c5e81b672dcfa981e1b476c
 DIST netbeans-trunk-nightly-201604110001-src.zip 214209797 SHA256 b77721e7845710305bcf251547970caa5220bbd3659d42ca22a5a479b453d061 SHA512 c9fdf9b8d727aa056af65cdbcb8e9bf4448c012d964282019f9e6c72e184fe93b149e57878cf36963e0d43e7fa62f35879eab76b5701d85d8fc1121fd3384314 WHIRLPOOL f33848fdc313b7cf10f56fa96e82408da7a8052e6c7bcf68b706afc7a059317105ffdb0f4769414061d3f351b7e9e6eaf7585260a11d0212071a93899b584aca
 DIST netbeans-trunk-nightly-201604120001-src.zip 214308035 SHA256 c4ee83fc02814526c764bf7303438e59914fad937349cc0d1e9a74b57a3067a3 SHA512 f4b018d6133c2ea39cf6c027ee5ac227e2ea7eb28e5ee88a3413d2a50e3b2ddc57c90c20416a223ec312c059db6924679cbf8ef44c7db544037ce5791996b289 WHIRLPOOL df48d3e45091010c7b4987678c38ef34b534475bf1079b1901b506e1bafb3464f9ab9204a7d379a620df34965f854dc3afed6d9f9b77409c0a330cd8221a5380
+DIST netbeans-trunk-nightly-201604130001-src.zip 214317043 SHA256 f3f24013d19337cc3cc84b1a9b6b65e6add3a1c913cab5c1bcaf4a82afecae54 SHA512 1fe95e91c226177823f33f147967fbab0923afb81efda04a7414f2d45243b1fd5059542b4276513077dbbf1e7d13f4aa4b87510cf0d62806b3ad722a2ecb57a7 WHIRLPOOL f656cd4310a872404da8b734e0d328e0bc7a8cdba93da0180102f3dc4423290bf1c25ef97aa8bb9a18dacff9cc43c3bf499e85411f6c6235f7d1e7f44d2910cb
 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_p20160306.ebuild 3377 SHA256 2acd35b5450a2997b88383cc734fa58f08db957440c7ea374374874f6b9118df SHA512 3ed75a38605d0d0b8d5dc73b4692579101beda43f5f195c307196c459ce0aa6f13c59641c6fcee9450c425af15b715ba76b607bf819637133ffb7c3ac92995a6 WHIRLPOOL ea6907455dc412921d6ecfeb4047598f44714ed3f18e7fa8385e36bc924eeb9382c5285abfcc71a60e298ffc37d65fcd23fe5f0892e83c717781d96391d9d24e
@@ -47,4 +48,5 @@ EBUILD netbeans-extide-9999_p20160406.ebuild 3377 SHA256 d0a047f98094ed3b0c87390
 EBUILD netbeans-extide-9999_p20160407.ebuild 3377 SHA256 4534945a9effb764773c672a9c4c23a1478cbdeb29d210d745e4e1bcde9b052e SHA512 cb8d92f431c8f0e827c354552fc8c4344b944d3a8ebc95937c3d64d97edb59c5a32f4f1afb9d50747934ee005ca346e9ad4116187c80dcff132492a190c46b1c WHIRLPOOL c260ecf2c5004e0a18f1394cd26dd5c08251b812969ef605f4b1a1b583af4b663487344178d4095ee686716513a680088d4b8306865eaabd5d5db81c3947fd40
 EBUILD netbeans-extide-9999_p20160411.ebuild 3377 SHA256 32bce618cbe38ab1b3594dfeeba7d36c577cbc31188c1683177afcfb14665cf8 SHA512 65a605a42f6b87b671c3604c2b577607e2932cd8ad99faa3c72395971e54a0013013abb44af338cba190e30f9055131903d68845b722a90c413108ad32ffa9c2 WHIRLPOOL 169d29d4c479c7f5a90dcb88b35b4aa1c56675fd64544579449417eeeece340b503e3d3327a3fe9f180339ef668d6e5aa7f47f336c5f8e1fe4b0ca7eda90893b
 EBUILD netbeans-extide-9999_p20160412.ebuild 3377 SHA256 60137b31185c64f23dfcaee5b832663d976b988b3a1c7ea6f3e536738d12a161 SHA512 8036099af1f3469758169cae78fdbe1855167f2288ae9978ea7c9b4b9dd5f5232e57405d7fe3621b3a0a55ca0c456dfeeeb75cf4211e41fa12b0f8b13c505e42 WHIRLPOOL a66f50a3f9d9c130083d627fcc601a73b607dfbc85721b7e2d954c0ba6705c7f33daaf2299c921e822eeffd24574b1daab66decff1786eb572888443a1c09575
+EBUILD netbeans-extide-9999_p20160413.ebuild 3377 SHA256 3243e37df51ea67e91c30a929a047d5bd97297a0ce29cd07b21c8cb82146497b SHA512 72d32f3df33d29c30c106c8cb5cd223c05ede211b966ed3138e7a9286b692a4ffacad23c19044a219a58ffcacd1695f3d7b178f614746c9dce35cfea817d6d60 WHIRLPOOL a5cc48af2ade5c4d6d77c98d111db65a02cc0d335068689e6584bbf2fc747128e29be599f938185fabb52ed495c015f67f2242eca4fa0bacb2afb66cc5256f70
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160413.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160413.ebuild
new file mode 100644
index 0000000..fae6724
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20160413.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-13_00-01-48/zip/netbeans-trunk-nightly-201604130001-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 b7571b0..1aa91ca 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201604060001-src.zip 210178912 SHA256 9cba66d0d2af5f
 DIST netbeans-trunk-nightly-201604070001-src.zip 210188037 SHA256 7092c74499a788c69c0cd6539a42939851f3af3d1e4e7412f484dd5b0cb31904 SHA512 58b2f347020c917f4eec46aa9de482d9f4c26592d11b8bea2393554cdc5f5420451468824c64389d56a8801925cf2b9d605b4ee4eba8ab59f0d43f392ff1737f WHIRLPOOL d8a978091f9511677606df39902b8f9aff6e26ef369a6410d74b11efd409455681257a90879ce883a6ae3cac671562bcbd25991c2c5e81b672dcfa981e1b476c
 DIST netbeans-trunk-nightly-201604110001-src.zip 214209797 SHA256 b77721e7845710305bcf251547970caa5220bbd3659d42ca22a5a479b453d061 SHA512 c9fdf9b8d727aa056af65cdbcb8e9bf4448c012d964282019f9e6c72e184fe93b149e57878cf36963e0d43e7fa62f35879eab76b5701d85d8fc1121fd3384314 WHIRLPOOL f33848fdc313b7cf10f56fa96e82408da7a8052e6c7bcf68b706afc7a059317105ffdb0f4769414061d3f351b7e9e6eaf7585260a11d0212071a93899b584aca
 DIST netbeans-trunk-nightly-201604120001-src.zip 214308035 SHA256 c4ee83fc02814526c764bf7303438e59914fad937349cc0d1e9a74b57a3067a3 SHA512 f4b018d6133c2ea39cf6c027ee5ac227e2ea7eb28e5ee88a3413d2a50e3b2ddc57c90c20416a223ec312c059db6924679cbf8ef44c7db544037ce5791996b289 WHIRLPOOL df48d3e45091010c7b4987678c38ef34b534475bf1079b1901b506e1bafb3464f9ab9204a7d379a620df34965f854dc3afed6d9f9b77409c0a330cd8221a5380
+DIST netbeans-trunk-nightly-201604130001-src.zip 214317043 SHA256 f3f24013d19337cc3cc84b1a9b6b65e6add3a1c913cab5c1bcaf4a82afecae54 SHA512 1fe95e91c226177823f33f147967fbab0923afb81efda04a7414f2d45243b1fd5059542b4276513077dbbf1e7d13f4aa4b87510cf0d62806b3ad722a2ecb57a7 WHIRLPOOL f656cd4310a872404da8b734e0d328e0bc7a8cdba93da0180102f3dc4423290bf1c25ef97aa8bb9a18dacff9cc43c3bf499e85411f6c6235f7d1e7f44d2910cb
 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_p20160306.ebuild 3416 SHA256 558ad261158f302442abe5eb39c916e885059eb5849311f7a3c6dac0f028f2e4 SHA512 fda69d1ee0343649750bcc2e7b617789d4c761a9d65f407b1c89cc191942fcff91bdb14f9931d97a7c8ac36d02af82e5c4d418755caad103ad57530fcd621a9f WHIRLPOOL d016c7b16e7e93fab5c8bb881e887ef31e4daa39744425bce1a556e74774af4624f19829845816c0b36caadc22325663e7e31e682eadcdff3ac2cc7924bb044e
@@ -47,4 +48,5 @@ EBUILD netbeans-groovy-9999_p20160406.ebuild 3416 SHA256 b8ce854264075a2c6bffa01
 EBUILD netbeans-groovy-9999_p20160407.ebuild 3416 SHA256 48366057548a1e0391d975751650f88c7ae81c024604fda233c8a24a4430188d SHA512 6af5afa979e04e7d26ad223497a84383fc008c0098271d82fae9b7c6962ea54028693c668c67e2657641be7f8dc8b35fb2c86492baabf5bfe817c8e86a0825b5 WHIRLPOOL edf6cc0659b2fcfc7fcdfd0886ba786e55a7eeb2c441994d7d16b327d4e25224e5b38cfd0c1acc96f9e26f3759583a5d05aa191877e431d6305f587d14926c4d
 EBUILD netbeans-groovy-9999_p20160411.ebuild 3416 SHA256 7c8aa0012650330ab9159b6d505b6bf2a1e6528452cc0293a26e83ffc3628f8b SHA512 203d330cbb06e6c35bfc9bb3e2b8e7665591f9e944401c50c8b1b7c9f1518dc3418e6d28cf23392dc658765be27f3b1c8b28b715a5095f2f57576953363a7648 WHIRLPOOL 2dab521012796cac7bb741d55108f46104553e51d42e41b62aac1a393487444105d84e5763ee5683eabcf24d8b8e2c5599074fc7e2892b63ce82a7f52b4d6b96
 EBUILD netbeans-groovy-9999_p20160412.ebuild 3416 SHA256 5c082adb25fc042e8c0dad0ef43e51e2f08ed8cc1f7ae79d5e19cb3820d0138e SHA512 d2c1313e866686b4bd51cc14a4a57104776459ab01ceb70479547f767fdc1ef68aa3aa682e2fc41f6d1aedbd69addf56779c1ad25711eb3065ecfc4722d56671 WHIRLPOOL 4aa92804329371b767b40f90aac1293c571ac6a21ac9270e4ed659ee7b611cc2aba38deccd82d589b684afd74f6d7b53782e3f9b47e92f3738b3d4ed84975be6
+EBUILD netbeans-groovy-9999_p20160413.ebuild 3416 SHA256 eac91e3c6f057ecaf5f46202ec1375d79f7be396aea3ea07ef445123918c1689 SHA512 310f903c55a82ebda3c6c6af074b2aa78b579c563904e1cd7d5bc1daf2d244ebe51018d1251bc8666ec7348f8f08f9d967f2ba98a4bcf2e56ab990d92a304185 WHIRLPOOL 5cd149a665c03348a7213c61ac7b8472ae8a54a05620dc8a7b1dad42b28afe9fb88fb8986fe486e32fdf0ea826480def386816a29d077393e25bab93f7a47df5
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160413.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160413.ebuild
new file mode 100644
index 0000000..ec51f06
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160413.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-13_00-01-48/zip/netbeans-trunk-nightly-201604130001-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 7966727..ed3b6e6 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201604060001-src.zip 210178912 SHA256 9cba66d0d2af5f
 DIST netbeans-trunk-nightly-201604070001-src.zip 210188037 SHA256 7092c74499a788c69c0cd6539a42939851f3af3d1e4e7412f484dd5b0cb31904 SHA512 58b2f347020c917f4eec46aa9de482d9f4c26592d11b8bea2393554cdc5f5420451468824c64389d56a8801925cf2b9d605b4ee4eba8ab59f0d43f392ff1737f WHIRLPOOL d8a978091f9511677606df39902b8f9aff6e26ef369a6410d74b11efd409455681257a90879ce883a6ae3cac671562bcbd25991c2c5e81b672dcfa981e1b476c
 DIST netbeans-trunk-nightly-201604110001-src.zip 214209797 SHA256 b77721e7845710305bcf251547970caa5220bbd3659d42ca22a5a479b453d061 SHA512 c9fdf9b8d727aa056af65cdbcb8e9bf4448c012d964282019f9e6c72e184fe93b149e57878cf36963e0d43e7fa62f35879eab76b5701d85d8fc1121fd3384314 WHIRLPOOL f33848fdc313b7cf10f56fa96e82408da7a8052e6c7bcf68b706afc7a059317105ffdb0f4769414061d3f351b7e9e6eaf7585260a11d0212071a93899b584aca
 DIST netbeans-trunk-nightly-201604120001-src.zip 214308035 SHA256 c4ee83fc02814526c764bf7303438e59914fad937349cc0d1e9a74b57a3067a3 SHA512 f4b018d6133c2ea39cf6c027ee5ac227e2ea7eb28e5ee88a3413d2a50e3b2ddc57c90c20416a223ec312c059db6924679cbf8ef44c7db544037ce5791996b289 WHIRLPOOL df48d3e45091010c7b4987678c38ef34b534475bf1079b1901b506e1bafb3464f9ab9204a7d379a620df34965f854dc3afed6d9f9b77409c0a330cd8221a5380
+DIST netbeans-trunk-nightly-201604130001-src.zip 214317043 SHA256 f3f24013d19337cc3cc84b1a9b6b65e6add3a1c913cab5c1bcaf4a82afecae54 SHA512 1fe95e91c226177823f33f147967fbab0923afb81efda04a7414f2d45243b1fd5059542b4276513077dbbf1e7d13f4aa4b87510cf0d62806b3ad722a2ecb57a7 WHIRLPOOL f656cd4310a872404da8b734e0d328e0bc7a8cdba93da0180102f3dc4423290bf1c25ef97aa8bb9a18dacff9cc43c3bf499e85411f6c6235f7d1e7f44d2910cb
 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_p20160306.ebuild 4126 SHA256 87507bff557ec2117ac5ec782fab47d1781b54a136d62b5600d4d199f382cf2e SHA512 e7d924ff7b59b14c64735d8c1027cc9c0ec0fb146c18f5857355abb58becb6dc5ab59f93670e1e8d5acbfc2867d7ad9f28acfd10a25fd95f82ff24897f9ed6a1 WHIRLPOOL 48fb8ba2ff814db3234ac1dbdf5acd7c05a7fef2e2507d9d76a9b6a8ac856459957dfa4e801e1a0800ce94e4b22dfb5e2bf59f42cfc85e49fed68c341e26a0e4
@@ -50,4 +51,5 @@ EBUILD netbeans-harness-9999_p20160406.ebuild 4126 SHA256 706579e6984842c5f3219a
 EBUILD netbeans-harness-9999_p20160407.ebuild 4126 SHA256 2fee9a93531779313c2f426dc8d293df1184daabdff2591254cd1af492c8daa3 SHA512 1940845a62c8c85bc3fa090e11b54fedf241fa35bf2ace65becc96fd920162614dd69fe12473bdb4606b778dcd0236449654abfb14d4864dc22d9956bfa84f0d WHIRLPOOL 21627dc15a17300da8e104970e58bd763858ad56cbde5985c72b7a51a35a0fcaae67c1f6e11809ad3a9aa17625d6871ce4285c129791966d3b38e06750fd6ee3
 EBUILD netbeans-harness-9999_p20160411.ebuild 4126 SHA256 68137976fe84c3529fa9f5f3419619a397e0b52db68ea6bf450c45ddac0c319c SHA512 509948456272bf42d207126f528b01916f8cafeb0243d6b2353f2a61c49938f8b4fa95eff1fe9543b4b36e738ef1600c7f5a6a7dd75ac567eeba5da0db4f75b0 WHIRLPOOL 93bb9890451a92b4423785e2d1a7feffea8740e3c91a2d83f86b7e3b63dd0eff0f28f9640144af3e59e98850290d5d2dc8c81422860171b18be53c9383fc14eb
 EBUILD netbeans-harness-9999_p20160412.ebuild 4126 SHA256 23d29e34a99a230b844b6b160c84a13f2fed0e4c6d26af5396dc92a2038d8c71 SHA512 09ad0a7809aa1262962b62e06c9e26e1e084e9b7c250d66ba668a0d38ce457aa8abdad56a42241d409ff930781f001062354531d39471327ae6b55bd90e6b7dd WHIRLPOOL 3adfe28201e036a67f9d66467aedc19b191e1eb42496fce508884c2d2cb116c455ef36a1997909ce3e0477d8dc58e78e22b761bccf9cb2e06b820c5a30439366
+EBUILD netbeans-harness-9999_p20160413.ebuild 4126 SHA256 9b9ec6abb77708122a0e674dde1ce67d71390ef2d09fbf71bf999f9c80271ab6 SHA512 30ad03480b18e6b80ad6f08d5dd090fd813b7df9c7801f850ab865e32659f24d5f13a58f5c29dbba2a84791ce301d0043472c30f28765c68a52350c6b4d7fe2c WHIRLPOOL 3ba0fea5cf38228502265a28a90f954f4eaf30048f7c284020cced03271f0cb574863dc557dc47a743a7f1817df8ccb115d402b0f927858c18e61f371312e61f
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160413.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160413.ebuild
new file mode 100644
index 0000000..52bf1b4
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20160413.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-13_00-01-48/zip/netbeans-trunk-nightly-201604130001-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 7ad9f06..b8cebc3 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -163,6 +163,7 @@ DIST netbeans-trunk-nightly-201604060001-src.zip 210178912 SHA256 9cba66d0d2af5f
 DIST netbeans-trunk-nightly-201604070001-src.zip 210188037 SHA256 7092c74499a788c69c0cd6539a42939851f3af3d1e4e7412f484dd5b0cb31904 SHA512 58b2f347020c917f4eec46aa9de482d9f4c26592d11b8bea2393554cdc5f5420451468824c64389d56a8801925cf2b9d605b4ee4eba8ab59f0d43f392ff1737f WHIRLPOOL d8a978091f9511677606df39902b8f9aff6e26ef369a6410d74b11efd409455681257a90879ce883a6ae3cac671562bcbd25991c2c5e81b672dcfa981e1b476c
 DIST netbeans-trunk-nightly-201604110001-src.zip 214209797 SHA256 b77721e7845710305bcf251547970caa5220bbd3659d42ca22a5a479b453d061 SHA512 c9fdf9b8d727aa056af65cdbcb8e9bf4448c012d964282019f9e6c72e184fe93b149e57878cf36963e0d43e7fa62f35879eab76b5701d85d8fc1121fd3384314 WHIRLPOOL f33848fdc313b7cf10f56fa96e82408da7a8052e6c7bcf68b706afc7a059317105ffdb0f4769414061d3f351b7e9e6eaf7585260a11d0212071a93899b584aca
 DIST netbeans-trunk-nightly-201604120001-src.zip 214308035 SHA256 c4ee83fc02814526c764bf7303438e59914fad937349cc0d1e9a74b57a3067a3 SHA512 f4b018d6133c2ea39cf6c027ee5ac227e2ea7eb28e5ee88a3413d2a50e3b2ddc57c90c20416a223ec312c059db6924679cbf8ef44c7db544037ce5791996b289 WHIRLPOOL df48d3e45091010c7b4987678c38ef34b534475bf1079b1901b506e1bafb3464f9ab9204a7d379a620df34965f854dc3afed6d9f9b77409c0a330cd8221a5380
+DIST netbeans-trunk-nightly-201604130001-src.zip 214317043 SHA256 f3f24013d19337cc3cc84b1a9b6b65e6add3a1c913cab5c1bcaf4a82afecae54 SHA512 1fe95e91c226177823f33f147967fbab0923afb81efda04a7414f2d45243b1fd5059542b4276513077dbbf1e7d13f4aa4b87510cf0d62806b3ad722a2ecb57a7 WHIRLPOOL f656cd4310a872404da8b734e0d328e0bc7a8cdba93da0180102f3dc4423290bf1c25ef97aa8bb9a18dacff9cc43c3bf499e85411f6c6235f7d1e7f44d2910cb
 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_p20160306.ebuild 30250 SHA256 529ac3385d352d2798e547e48b78d68c27ecfda6812618935a1b98b212fc65ad SHA512 219ef1b1b01e9e905569eb900e8839e157a09ea50ee242899fe6680568cdc63e147c63c53749aec4d783753fa8e50559842ff3d8ad982cceb948ccd55ee3518b WHIRLPOOL 513d21b6b44297d9bd435cb8e4a9a1443f67fc677b9ce55ebd82ffff6f480931f00a4492f1cfd8ed4de06c442cde9a983d2c7f5d396bcc3812604c8733497e8e
@@ -184,4 +185,5 @@ EBUILD netbeans-ide-9999_p20160406.ebuild 30761 SHA256 43fcbda8582a3c87fd527dc72
 EBUILD netbeans-ide-9999_p20160407.ebuild 30761 SHA256 6a6c02c32fb8ba7faaf1389efc9f44f6b95ab4f3e37379eb05ebc5296ddee752 SHA512 123517e24a17cdbe155123924e69f100c1419245f54eb3d2d1a74660de8bdb23ed3e4bd86122a18e045a59bb05ed91d1c5edbb4cabded72e2990e7f9eaa8368b WHIRLPOOL cea2ed13af2873ba19f2c7bc7d8ca04c32a3a0594771127d97e22b82c157a9e98a8777cd2a879cbfbdc38abac8ec1f948baf0d343812a9cdefa9c8daf8ad46cc
 EBUILD netbeans-ide-9999_p20160411.ebuild 30761 SHA256 4512a2bef84933de45dcbbd94599bea7ef0e7546ab82a107220a9d5db81ef423 SHA512 d4fa302e8c42400729c3f8875db94044fb9504bfffb46e364db3601c69f8eba9e10f200c88575048c0eb5aa4eecea596297331a90eeb0e1ce1692a7eb9309470 WHIRLPOOL 11c062080473a2368b1a9cd367b95752f0e08cd52c0cfadf24de5557ec2420fc1355d86cded0352cedd3900de26e43bc37260db1df4895e3accb4a76cfb6ac76
 EBUILD netbeans-ide-9999_p20160412.ebuild 30761 SHA256 5b2ee552df9b127c9b20a82b8c04fe7e4b06eced6449086e3338c2174750eaec SHA512 8df6fcec05d352f42d30b066a980159df13d2d7ea625203458db913c57fe2041c44e3da33368781882b3e0602c67e1b7c4fe41b3a7f90ea2b5e19dcfe41522a0 WHIRLPOOL 22c7829516c6e496f11fde2b7429f19fc25766e91e50053e449950e127b6fc2095ea9806fe2a6b18a979e4ec124e5534d3ee1edb6ac25b2b7a49075549ac1084
+EBUILD netbeans-ide-9999_p20160413.ebuild 30761 SHA256 ede5f7146b442f83de46038c7e47fecddb49bcd791cff2215522f88df41e4bbf SHA512 7d3bb334624607460dc06366da545c376ea260ce85095f151673718f1ce6c36fd5c40a8706951bd2cf8835565baed897552d8093ac89943a349e2dc013117170 WHIRLPOOL 40514f948d29bba1fbf0a00cc1233110395c1d8307770e4542378351a5c3f96d5ccfea3539d1262a602949bf029b67526d30c044a38f7689de4160500f72aff1
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160413.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160413.ebuild
new file mode 100644
index 0000000..4d7f13e
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20160413.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-13_00-01-48/zip/netbeans-trunk-nightly-201604130001-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 cd481c3..40ce9df 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -61,6 +61,7 @@ DIST netbeans-trunk-nightly-201604060001-src.zip 210178912 SHA256 9cba66d0d2af5f
 DIST netbeans-trunk-nightly-201604070001-src.zip 210188037 SHA256 7092c74499a788c69c0cd6539a42939851f3af3d1e4e7412f484dd5b0cb31904 SHA512 58b2f347020c917f4eec46aa9de482d9f4c26592d11b8bea2393554cdc5f5420451468824c64389d56a8801925cf2b9d605b4ee4eba8ab59f0d43f392ff1737f WHIRLPOOL d8a978091f9511677606df39902b8f9aff6e26ef369a6410d74b11efd409455681257a90879ce883a6ae3cac671562bcbd25991c2c5e81b672dcfa981e1b476c
 DIST netbeans-trunk-nightly-201604110001-src.zip 214209797 SHA256 b77721e7845710305bcf251547970caa5220bbd3659d42ca22a5a479b453d061 SHA512 c9fdf9b8d727aa056af65cdbcb8e9bf4448c012d964282019f9e6c72e184fe93b149e57878cf36963e0d43e7fa62f35879eab76b5701d85d8fc1121fd3384314 WHIRLPOOL f33848fdc313b7cf10f56fa96e82408da7a8052e6c7bcf68b706afc7a059317105ffdb0f4769414061d3f351b7e9e6eaf7585260a11d0212071a93899b584aca
 DIST netbeans-trunk-nightly-201604120001-src.zip 214308035 SHA256 c4ee83fc02814526c764bf7303438e59914fad937349cc0d1e9a74b57a3067a3 SHA512 f4b018d6133c2ea39cf6c027ee5ac227e2ea7eb28e5ee88a3413d2a50e3b2ddc57c90c20416a223ec312c059db6924679cbf8ef44c7db544037ce5791996b289 WHIRLPOOL df48d3e45091010c7b4987678c38ef34b534475bf1079b1901b506e1bafb3464f9ab9204a7d379a620df34965f854dc3afed6d9f9b77409c0a330cd8221a5380
+DIST netbeans-trunk-nightly-201604130001-src.zip 214317043 SHA256 f3f24013d19337cc3cc84b1a9b6b65e6add3a1c913cab5c1bcaf4a82afecae54 SHA512 1fe95e91c226177823f33f147967fbab0923afb81efda04a7414f2d45243b1fd5059542b4276513077dbbf1e7d13f4aa4b87510cf0d62806b3ad722a2ecb57a7 WHIRLPOOL f656cd4310a872404da8b734e0d328e0bc7a8cdba93da0180102f3dc4423290bf1c25ef97aa8bb9a18dacff9cc43c3bf499e85411f6c6235f7d1e7f44d2910cb
 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_p20160306.ebuild 14930 SHA256 834f0d69202fd501db1e44d401b792845ed4abdb658f68439d30c09b3bdfd7c5 SHA512 7d4e3aaeda2d882729ed938090203f2713bd164cc2d5889675172155316753d3eecbdc9758f36b2e5215dc48e9f063383a8189c9b1effaab19c1dfca96ba44bd WHIRLPOOL 92a6369d45a897ae56b3545a8602e11ee029bef7d85fda9d35edfd09830dfb201154775ac52c9708778311f594c1d632394345f9d1ab86a20a2a604ae32119ee
@@ -82,4 +83,5 @@ EBUILD netbeans-java-9999_p20160406.ebuild 14930 SHA256 70383ffd8bc55e8fabb2b0a8
 EBUILD netbeans-java-9999_p20160407.ebuild 14930 SHA256 752b6c286e7a3c9379eeba617a5fa3d80ab94696f803fb55b9d38aeae3033f86 SHA512 24a31d5f4228f68104892444f43a9640a13a507be20a62133fd77e4226c4057d085f2679a9ca776e62802523336b6da4041a3ed215409f055b73570b02638a0d WHIRLPOOL f0c8043e9e41b9adce0691729d463ba9336108a7f8ea3da78e6c65cba726ca2f7b4e6a1e7db92977c7614f6da5c46c8bdee55e34b59015a128025b1ccf952aa0
 EBUILD netbeans-java-9999_p20160411.ebuild 15656 SHA256 7e3276e8757bcb49f0203d05229cd52540f418aaa7cf722672a8dc2ab533e08f SHA512 f0c7354892b144fb4aaf3e2f569723296782a24d5ab532035bd8aca6beb104d8258ca071dcf82a9a18f4a6f764079dec864a6af737ded6b349b35a94f3e85bfc WHIRLPOOL 62881998a52def9aafd224477e84b4a55e47bf6e70136dc2654432cdee0dbe057299c7b397eb7d3e9d96ceeba3e7a1b301c64f5e36625e043bc34221c450f65d
 EBUILD netbeans-java-9999_p20160412.ebuild 15656 SHA256 3b649e3bf7c7d791454ba48652c89fc05cb83b3509a7d9422ab38294fcb550e2 SHA512 90600aec80848b51765b096633823c0e2a341ed680bd52ef2e8db67a9d74bb1be8d6e35b88a90a6229cac3097d7bf1d3214f24e4eae20253c2d3e216473402c7 WHIRLPOOL 802b96a3f27c899cde94a1bf38cabfd74e1a3f754b7831a4d79f482b0059cfafffffd0c18425aee2947fecee2d36b289ca2d77cd2812768ca7a19dacec6c82ad
+EBUILD netbeans-java-9999_p20160413.ebuild 15656 SHA256 8cc3bac0eb22a934109401d828e5d1b5bc9c8fd2961bdf8dfa2c4edd036f01d0 SHA512 060122f1e7930a30a0106bfda41b491d1388adb3f4535a64fa35c2fd3bda3fd32425d77cb6423c5c3a94316a1e3be6c431ab5d9d6c896c326527424ef8cd7ea4 WHIRLPOOL ac03ff60aa69efcbc9481859c4274a46843ef1f0d713a41eed11f8d72aa8652d88e38e7b972ad42dfaed009ca43910ffb02a9964fd2f336bf475225cd8931483
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160413.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160413.ebuild
new file mode 100644
index 0000000..9f2013e
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20160413.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-13_00-01-48/zip/netbeans-trunk-nightly-201604130001-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 947400e..fc5bba6 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201604060001-src.zip 210178912 SHA256 9cba66d0d2af5f
 DIST netbeans-trunk-nightly-201604070001-src.zip 210188037 SHA256 7092c74499a788c69c0cd6539a42939851f3af3d1e4e7412f484dd5b0cb31904 SHA512 58b2f347020c917f4eec46aa9de482d9f4c26592d11b8bea2393554cdc5f5420451468824c64389d56a8801925cf2b9d605b4ee4eba8ab59f0d43f392ff1737f WHIRLPOOL d8a978091f9511677606df39902b8f9aff6e26ef369a6410d74b11efd409455681257a90879ce883a6ae3cac671562bcbd25991c2c5e81b672dcfa981e1b476c
 DIST netbeans-trunk-nightly-201604110001-src.zip 214209797 SHA256 b77721e7845710305bcf251547970caa5220bbd3659d42ca22a5a479b453d061 SHA512 c9fdf9b8d727aa056af65cdbcb8e9bf4448c012d964282019f9e6c72e184fe93b149e57878cf36963e0d43e7fa62f35879eab76b5701d85d8fc1121fd3384314 WHIRLPOOL f33848fdc313b7cf10f56fa96e82408da7a8052e6c7bcf68b706afc7a059317105ffdb0f4769414061d3f351b7e9e6eaf7585260a11d0212071a93899b584aca
 DIST netbeans-trunk-nightly-201604120001-src.zip 214308035 SHA256 c4ee83fc02814526c764bf7303438e59914fad937349cc0d1e9a74b57a3067a3 SHA512 f4b018d6133c2ea39cf6c027ee5ac227e2ea7eb28e5ee88a3413d2a50e3b2ddc57c90c20416a223ec312c059db6924679cbf8ef44c7db544037ce5791996b289 WHIRLPOOL df48d3e45091010c7b4987678c38ef34b534475bf1079b1901b506e1bafb3464f9ab9204a7d379a620df34965f854dc3afed6d9f9b77409c0a330cd8221a5380
+DIST netbeans-trunk-nightly-201604130001-src.zip 214317043 SHA256 f3f24013d19337cc3cc84b1a9b6b65e6add3a1c913cab5c1bcaf4a82afecae54 SHA512 1fe95e91c226177823f33f147967fbab0923afb81efda04a7414f2d45243b1fd5059542b4276513077dbbf1e7d13f4aa4b87510cf0d62806b3ad722a2ecb57a7 WHIRLPOOL f656cd4310a872404da8b734e0d328e0bc7a8cdba93da0180102f3dc4423290bf1c25ef97aa8bb9a18dacff9cc43c3bf499e85411f6c6235f7d1e7f44d2910cb
 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_p20160306.ebuild 4971 SHA256 342ddbfc7409f51a4d6704599c245805c0e86a62367d41171b2f7104edfcdff9 SHA512 eac2e543bb92bde68cc308a040f4c3907a3ee288ce6772052cf87132d118a07678b68cbc60095223c4ff283b48c69c3906a962ca6743aaf6afd6f5540830daf7 WHIRLPOOL 5c23ac62c9bc94746d496c4079239299665ae4d5d3ed73439645164c7facd02fbe807377bfd4938243255639c9a77be7ffded23d1c862ece854a2fc26efb00d1
@@ -48,4 +49,5 @@ EBUILD netbeans-javacard-9999_p20160406.ebuild 4971 SHA256 43351f8b4408ea6cee50d
 EBUILD netbeans-javacard-9999_p20160407.ebuild 4971 SHA256 7ccdc87322b52abcd6005ea642ef4d4986f1e577ffab2d2f15058021d3fb0a98 SHA512 ad358b92a14473dfad415c71960308267290fd1566dab6195be3dbbfd88aea9c54ba6c08ec63a998f2ef01bb1d88b595968a9e13fd1db1a2a5a197d9db591c1f WHIRLPOOL 9d2224c1ec4d0372777375cacc849b3f185ec4a402a52af86f36777ee2c9c1e7708e0e9e96b27cae623f97e1d6f1a0e86a4ff11323e2b859bfebc534300e0dd2
 EBUILD netbeans-javacard-9999_p20160411.ebuild 4971 SHA256 80d9e3883d4eecc0775678074814b9b3d1f0cdfd05e95db42d5d3112e5154881 SHA512 a7772d8704274d7cdbbf4e559a7a2f55b7cd51d6401b5d0c3bdb9202bb2cb1110c9f7af3a98aeae00e29365a964f83323f784f97621925bc1359993dc7a9a9aa WHIRLPOOL f341bdd01f5002468b6b68009354088fb14e86228e763afe494ac902fffe93e917dccd0b54eb04e068c41e3548919693847ec901aa8d2a0354e906616576eab5
 EBUILD netbeans-javacard-9999_p20160412.ebuild 4971 SHA256 bb46472052beec572c315377e0921e20516b9ece8fb09592a9b5a9e515cf43f2 SHA512 a429caa48bd021927a2f1dbbdead6732e8faee2905e90ec738ba727664a991c2013d83dd5865ced58a40f8e311a779c2fe550f0c6887ccf99cdb031023358407 WHIRLPOOL b0c70007ee44600fc547d1d72dea056a21d2e8b0a165ddcea0c3d35578731e321b87da262540a90a25ee49dd8ac8d6ca10f3f50da8702e6d2f79bd990e58d237
+EBUILD netbeans-javacard-9999_p20160413.ebuild 4971 SHA256 46cf665961509afba26d750324e4baf9a4cb946f53e4da5e49be85bbb0956db2 SHA512 1ed81145492ef7bb382c026c706aa951f1d5710a234f01dff7849deaa3cae2434de3a3ece8eccb72e8318b336c77e7cdff8a64112a566c815837eb58e9bdd92d WHIRLPOOL 4893882c0f26b404193621397b0e70415522b6f44322c33d195bf9c4c84be2f5ceabf7c2503ffa88e59cd08cca922b193b62f0d014d9b5213163874253dc58ad
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160413.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160413.ebuild
new file mode 100644
index 0000000..b3cbe8f
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160413.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-13_00-01-48/zip/netbeans-trunk-nightly-201604130001-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 531ab02..bf0fe1e 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201604060001-src.zip 210178912 SHA256 9cba66d0d2af5f
 DIST netbeans-trunk-nightly-201604070001-src.zip 210188037 SHA256 7092c74499a788c69c0cd6539a42939851f3af3d1e4e7412f484dd5b0cb31904 SHA512 58b2f347020c917f4eec46aa9de482d9f4c26592d11b8bea2393554cdc5f5420451468824c64389d56a8801925cf2b9d605b4ee4eba8ab59f0d43f392ff1737f WHIRLPOOL d8a978091f9511677606df39902b8f9aff6e26ef369a6410d74b11efd409455681257a90879ce883a6ae3cac671562bcbd25991c2c5e81b672dcfa981e1b476c
 DIST netbeans-trunk-nightly-201604110001-src.zip 214209797 SHA256 b77721e7845710305bcf251547970caa5220bbd3659d42ca22a5a479b453d061 SHA512 c9fdf9b8d727aa056af65cdbcb8e9bf4448c012d964282019f9e6c72e184fe93b149e57878cf36963e0d43e7fa62f35879eab76b5701d85d8fc1121fd3384314 WHIRLPOOL f33848fdc313b7cf10f56fa96e82408da7a8052e6c7bcf68b706afc7a059317105ffdb0f4769414061d3f351b7e9e6eaf7585260a11d0212071a93899b584aca
 DIST netbeans-trunk-nightly-201604120001-src.zip 214308035 SHA256 c4ee83fc02814526c764bf7303438e59914fad937349cc0d1e9a74b57a3067a3 SHA512 f4b018d6133c2ea39cf6c027ee5ac227e2ea7eb28e5ee88a3413d2a50e3b2ddc57c90c20416a223ec312c059db6924679cbf8ef44c7db544037ce5791996b289 WHIRLPOOL df48d3e45091010c7b4987678c38ef34b534475bf1079b1901b506e1bafb3464f9ab9204a7d379a620df34965f854dc3afed6d9f9b77409c0a330cd8221a5380
+DIST netbeans-trunk-nightly-201604130001-src.zip 214317043 SHA256 f3f24013d19337cc3cc84b1a9b6b65e6add3a1c913cab5c1bcaf4a82afecae54 SHA512 1fe95e91c226177823f33f147967fbab0923afb81efda04a7414f2d45243b1fd5059542b4276513077dbbf1e7d13f4aa4b87510cf0d62806b3ad722a2ecb57a7 WHIRLPOOL f656cd4310a872404da8b734e0d328e0bc7a8cdba93da0180102f3dc4423290bf1c25ef97aa8bb9a18dacff9cc43c3bf499e85411f6c6235f7d1e7f44d2910cb
 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_p20160306.ebuild 6293 SHA256 90d8c9bf61988cc6c47b21bb5b23fba23ab984ce13c28435df975cfa27f5e430 SHA512 85d18c251da87b0d13a16144d45ebe3aad67e9a9b10736045c3a0ab8b27f9499e4bcd657d2f26214e2389ea8b3081ac7f217409ccdf66746175ea6b2994a2769 WHIRLPOOL 00256f06fc84b66983cb795d12c1dac96ee400c6bab6fbd6c11a3733bf32294e7bee29bee4639a3b43d76e6c8a663d3da75845bd3c84c93b85555c6570542a94
@@ -46,4 +47,5 @@ EBUILD netbeans-javadoc-9999_p20160406.ebuild 6293 SHA256 ae8bdb87c48ad3694bb97b
 EBUILD netbeans-javadoc-9999_p20160407.ebuild 6293 SHA256 13af3ef36414ae6901bb1854ff4a5b47c2c605d003ff22148ba86ac9ae1af145 SHA512 05fe42eb4e35094e6f7c37588dd4ac28bbcbf4c8820d34ceca44f7ebd4ca73ec37efd94dc6a36dd4e5cd23d8eda9a99b64e2a78861f15476dc595f69411d15db WHIRLPOOL 9eb0fce37235c7795c2fbac7f9d30b8c9e37efed34968fe945f133d282fb3a7961c441ba71921725bb23b1efa420965d6c19f30977a52dbd88a6fea3373750a6
 EBUILD netbeans-javadoc-9999_p20160411.ebuild 6293 SHA256 35cfc986b1131c87de9ae58fb240db9cb9a407cebecf04234fb8dd646cfd19df SHA512 64e9d9b294e71b5436cfd75cf78061a12c40dbacdee4857e5f246854a881386ed342e926b741aaf863ce0d911c118f5756a144f99e25b5ad43f2a0a6281976d9 WHIRLPOOL 31132fb093b2f2540a490e9ef0e51c5066b35040f40885d6228c68254608f04923db7366f5e1662d4ad3969b4be99fe9ab3cf5cc815879f321445120cf6db7a2
 EBUILD netbeans-javadoc-9999_p20160412.ebuild 6293 SHA256 510972c1bd51c23cad3f7c94418dd51c43312c316181e2c3d7a40e357cd3cd58 SHA512 cd8029f86d4ffdb2e69710d377ab4beaea03862378943ab6295e2522c0e627f8fe9671d5b605b18cfbf594b20735bc13ec52e26077dfb7d7bcb77a98502eeafa WHIRLPOOL 2d995dbae57722dd77d065d3d363347af357f0c9f5e03d34b6a76ff9792fba1748ed36d6d9991e9c42a9f733e84ee3f9f4e694f741248b4eaf7f54ee58afa04f
+EBUILD netbeans-javadoc-9999_p20160413.ebuild 6293 SHA256 707f6f1f4ad6d4f86f60adf4b4c43e3eb2a237b62e8a74bad2d634ead2ef97c9 SHA512 a88764568cae4b88384869816af73b785ca46d463b5527cb2c21d515e5b22a2a581fd97010d57a44a6d6313fc6e0f3ea081c9c74514a96ad58193263a05d731c WHIRLPOOL b3fc2cd23af0898aa0004e868c92105838bef0493d400019a348f83326c4abeb48a2bfa88f419f802a98b8eacf7c370709411d0b6214b0357193acb375c65a33
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160413.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160413.ebuild
new file mode 100644
index 0000000..f838a67
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160413.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-13_00-01-48/zip/netbeans-trunk-nightly-201604130001-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 6313a0a..00fbad9 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -32,6 +32,7 @@ DIST netbeans-trunk-nightly-201604060001-src.zip 210178912 SHA256 9cba66d0d2af5f
 DIST netbeans-trunk-nightly-201604070001-src.zip 210188037 SHA256 7092c74499a788c69c0cd6539a42939851f3af3d1e4e7412f484dd5b0cb31904 SHA512 58b2f347020c917f4eec46aa9de482d9f4c26592d11b8bea2393554cdc5f5420451468824c64389d56a8801925cf2b9d605b4ee4eba8ab59f0d43f392ff1737f WHIRLPOOL d8a978091f9511677606df39902b8f9aff6e26ef369a6410d74b11efd409455681257a90879ce883a6ae3cac671562bcbd25991c2c5e81b672dcfa981e1b476c
 DIST netbeans-trunk-nightly-201604110001-src.zip 214209797 SHA256 b77721e7845710305bcf251547970caa5220bbd3659d42ca22a5a479b453d061 SHA512 c9fdf9b8d727aa056af65cdbcb8e9bf4448c012d964282019f9e6c72e184fe93b149e57878cf36963e0d43e7fa62f35879eab76b5701d85d8fc1121fd3384314 WHIRLPOOL f33848fdc313b7cf10f56fa96e82408da7a8052e6c7bcf68b706afc7a059317105ffdb0f4769414061d3f351b7e9e6eaf7585260a11d0212071a93899b584aca
 DIST netbeans-trunk-nightly-201604120001-src.zip 214308035 SHA256 c4ee83fc02814526c764bf7303438e59914fad937349cc0d1e9a74b57a3067a3 SHA512 f4b018d6133c2ea39cf6c027ee5ac227e2ea7eb28e5ee88a3413d2a50e3b2ddc57c90c20416a223ec312c059db6924679cbf8ef44c7db544037ce5791996b289 WHIRLPOOL df48d3e45091010c7b4987678c38ef34b534475bf1079b1901b506e1bafb3464f9ab9204a7d379a620df34965f854dc3afed6d9f9b77409c0a330cd8221a5380
+DIST netbeans-trunk-nightly-201604130001-src.zip 214317043 SHA256 f3f24013d19337cc3cc84b1a9b6b65e6add3a1c913cab5c1bcaf4a82afecae54 SHA512 1fe95e91c226177823f33f147967fbab0923afb81efda04a7414f2d45243b1fd5059542b4276513077dbbf1e7d13f4aa4b87510cf0d62806b3ad722a2ecb57a7 WHIRLPOOL f656cd4310a872404da8b734e0d328e0bc7a8cdba93da0180102f3dc4423290bf1c25ef97aa8bb9a18dacff9cc43c3bf499e85411f6c6235f7d1e7f44d2910cb
 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_p20160306.ebuild 4717 SHA256 e3c89f0b2dffbc7dd781e0c2d8b4024f81cbbcbd38c5b8028b267b2afdb1dd53 SHA512 b696da538f2e25113e4ef7ce3abc3a85a3fe498d9de553a7a56e20cdebf1d0fe1396639640156aa608d637c5a84c40d9988c98f0dfd2cef9d3f71fc833ee5fa6 WHIRLPOOL bed549132e695b27148d8e4fcc17dfffb4567861b9378cf05cda1e58558dd0f43c2cdcb2ed93e0482f8af9ae2993facc47d6c880912664cb2e32b89020bc2936
@@ -53,4 +54,5 @@ EBUILD netbeans-javafx-9999_p20160406.ebuild 4717 SHA256 8dfb2e3b9b605f3a096faf0
 EBUILD netbeans-javafx-9999_p20160407.ebuild 4717 SHA256 b59bda1d0084764d94c1f7eced3c5785cc19646093eb1544f5c9854f457f55d4 SHA512 49ed568dcb3d6dff16a9a29af39a8f58a1530361dea995fa795e36dc6f226492297763e37300445af3c0f571f860f297e84462803484f7115bec14eaccd408bd WHIRLPOOL 283084e3013dc16225d9f7f6f116cdf558c4d56d6565c56c726876d6d14b3b356a6d15ca7ccfc132133a18b30478ebadb1e96d9d4bf589adbc7309a083b3393b
 EBUILD netbeans-javafx-9999_p20160411.ebuild 4717 SHA256 6243c6d808865713ebc9a839729fe1ed6b4b7b68c716387356c194c03679e62d SHA512 5da2befd7e646dba98c24ee4cd32314be7a987cda6c72a86fbf62cab5c543efab7b74a43da1c621e2ed05f2e5ca989de2d0bcd3b6933f125c139ca6fcf02e614 WHIRLPOOL 4508edf98c9b21670bf3a4f010431d7c1ad710df46ad2f3dee5f4e2bfd647175097b9af6076193f6e28ea20e6896d683628b7d2cadebd9dee44f0f525c31dcfe
 EBUILD netbeans-javafx-9999_p20160412.ebuild 4717 SHA256 31e4db095ff4b4d6f9e9772122a7072f21a71439d9dc3bedc637036bbbb6c2c8 SHA512 090c2518eb2b398733544cae7416f53453f4358f4630f66c04677e3ed01bdcfcbae22a5d32768aefaa4ebb64896d772ca6a6eed1357b9bb54609ce6d3c608cfa WHIRLPOOL 540329734e1736e477db576aa075ef8188bc853eb75b6a69226f2dea31c929197f988bba7f2a5cc83b10a59e3fd2ec9b8643ae16d34caa313d3a7c2541e504b5
+EBUILD netbeans-javafx-9999_p20160413.ebuild 4717 SHA256 68f0c4722d4f790bec3dc8e77a7ef5f22e3660669178605194f010b586db6fa8 SHA512 57d55508aea404184013e701a79e6f9adf7c96377d7dd25a9fb34cba89ce32cd1e712cd4be89d3873a1895a054594db70ceb42073a7969d77047404f918eb34b WHIRLPOOL 1177aa0152083c01e48e6c58a3dc7856a35c3eda5bbbccafe5d58d623c414288835748ed7b96c17da9ff67307d2563d16023bbad9099f431da6a38e329332d51
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160413.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160413.ebuild
new file mode 100644
index 0000000..11a1666
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160413.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-13_00-01-48/zip/netbeans-trunk-nightly-201604130001-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 d1609a1..7f395f3 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201604060001-src.zip 210178912 SHA256 9cba66d0d2af5f
 DIST netbeans-trunk-nightly-201604070001-src.zip 210188037 SHA256 7092c74499a788c69c0cd6539a42939851f3af3d1e4e7412f484dd5b0cb31904 SHA512 58b2f347020c917f4eec46aa9de482d9f4c26592d11b8bea2393554cdc5f5420451468824c64389d56a8801925cf2b9d605b4ee4eba8ab59f0d43f392ff1737f WHIRLPOOL d8a978091f9511677606df39902b8f9aff6e26ef369a6410d74b11efd409455681257a90879ce883a6ae3cac671562bcbd25991c2c5e81b672dcfa981e1b476c
 DIST netbeans-trunk-nightly-201604110001-src.zip 214209797 SHA256 b77721e7845710305bcf251547970caa5220bbd3659d42ca22a5a479b453d061 SHA512 c9fdf9b8d727aa056af65cdbcb8e9bf4448c012d964282019f9e6c72e184fe93b149e57878cf36963e0d43e7fa62f35879eab76b5701d85d8fc1121fd3384314 WHIRLPOOL f33848fdc313b7cf10f56fa96e82408da7a8052e6c7bcf68b706afc7a059317105ffdb0f4769414061d3f351b7e9e6eaf7585260a11d0212071a93899b584aca
 DIST netbeans-trunk-nightly-201604120001-src.zip 214308035 SHA256 c4ee83fc02814526c764bf7303438e59914fad937349cc0d1e9a74b57a3067a3 SHA512 f4b018d6133c2ea39cf6c027ee5ac227e2ea7eb28e5ee88a3413d2a50e3b2ddc57c90c20416a223ec312c059db6924679cbf8ef44c7db544037ce5791996b289 WHIRLPOOL df48d3e45091010c7b4987678c38ef34b534475bf1079b1901b506e1bafb3464f9ab9204a7d379a620df34965f854dc3afed6d9f9b77409c0a330cd8221a5380
+DIST netbeans-trunk-nightly-201604130001-src.zip 214317043 SHA256 f3f24013d19337cc3cc84b1a9b6b65e6add3a1c913cab5c1bcaf4a82afecae54 SHA512 1fe95e91c226177823f33f147967fbab0923afb81efda04a7414f2d45243b1fd5059542b4276513077dbbf1e7d13f4aa4b87510cf0d62806b3ad722a2ecb57a7 WHIRLPOOL f656cd4310a872404da8b734e0d328e0bc7a8cdba93da0180102f3dc4423290bf1c25ef97aa8bb9a18dacff9cc43c3bf499e85411f6c6235f7d1e7f44d2910cb
 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_p20160306.ebuild 4412 SHA256 5260cb87cd999409dae66829b23ba42a4cf44a62af524b9bec73e3741c5da84d SHA512 5b857fa3be723f2718b0c02b5f648e09b1803402b116592302c3aa1f4d5201a9db1e84d9c36b9ab1af178122d6abc5ffeef9937b1538b47ff5f888b1e88e0ae7 WHIRLPOOL 92e8bfab1bbe7d0b7fb69563ee865f5cea4be24a2a2eb30e6d70401c292bae59c59c03a6c9857a427780d1fd58062160e8e0464dbd540924cbbe20242629728c
@@ -45,4 +46,5 @@ EBUILD netbeans-mobility-9999_p20160406.ebuild 4412 SHA256 8071c094a2650214d7d05
 EBUILD netbeans-mobility-9999_p20160407.ebuild 4412 SHA256 614fa018df257073da93b90e6f4023673b3ac6d7891134673ebb0274108ae012 SHA512 3b66871711599be7ae31216fa8be03c5495b4f7ec5527a8e971a1386b5601eabfb8712574802f7256e402517ce264cc25e24ce1d30671202735d4099944dcc48 WHIRLPOOL bfe61830d4061b0ac2122e2edfa717c08a2915ffdf9e24baa22848b8e025ffbc4d6165442effa5b78cc67cc0a4a43b03b70ed99865034331ca481d49093c2eb5
 EBUILD netbeans-mobility-9999_p20160411.ebuild 4412 SHA256 3c7f2e5ce24c3402dfd02f71df51df8b1d7752fb191ea0193e55496460e968b0 SHA512 bce1a8dd9f374b8d180bc7f5553cf320dc35751c24335233bc77425c7fbc1c7140ea57fa12c416d1023f0ef032adbae1aed384fccc55b052e8dedb6ccf009878 WHIRLPOOL 0e3dc69c4265625c473e9f87662707d215d56f78eadc5aecb93b094b4672e8d16ec5e9d2e3463025abeb39c89f2e00811b727fc13d7945179e0501771348e7b7
 EBUILD netbeans-mobility-9999_p20160412.ebuild 4412 SHA256 8c417cadae66b93d45dcd1f56e21c8e1f39757c1440eaa731e3fe5a1b9d05036 SHA512 f5151d0f76263322a6836422f207e825808bbf2a033d5c9a7cb7be11b7014b54a57a1305617ae8ff1a93c74f2dbc13cd2ce4975abfdf591a8da872786e38f875 WHIRLPOOL a377e1cfc3211d131107d6f927138192d7180914f8c09854f232a5ef80db9f7af71e38dc2036b70f87b2f257405e6516ae5a82e95ce6ceb9f4fefa9c0e51a935
+EBUILD netbeans-mobility-9999_p20160413.ebuild 4412 SHA256 a96bfaf60f96c3869a888423e2fa2642d973ad420663412f64e6106af47b2709 SHA512 d4949978ada3b1fc3f217a808ebda8f9b196afca7495dbe85ac49c9c1e08589a2a7838bea42934654f5a472c69ced290585a84e2be31f79f2188a5ae48f10aef WHIRLPOOL 8fa2a0281227280757e63ca46fb9aeda97578a8217287f7bab2e468c66630b473b4c97f5225089227965ea82c61498ea3f9cf74340e4ccf1c256f6a47606212c
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160413.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160413.ebuild
new file mode 100644
index 0000000..17fd09a
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160413.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-13_00-01-48/zip/netbeans-trunk-nightly-201604130001-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 55d9604..bc875fc 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201604060001-src.zip 210178912 SHA256 9cba66d0d2af5f
 DIST netbeans-trunk-nightly-201604070001-src.zip 210188037 SHA256 7092c74499a788c69c0cd6539a42939851f3af3d1e4e7412f484dd5b0cb31904 SHA512 58b2f347020c917f4eec46aa9de482d9f4c26592d11b8bea2393554cdc5f5420451468824c64389d56a8801925cf2b9d605b4ee4eba8ab59f0d43f392ff1737f WHIRLPOOL d8a978091f9511677606df39902b8f9aff6e26ef369a6410d74b11efd409455681257a90879ce883a6ae3cac671562bcbd25991c2c5e81b672dcfa981e1b476c
 DIST netbeans-trunk-nightly-201604110001-src.zip 214209797 SHA256 b77721e7845710305bcf251547970caa5220bbd3659d42ca22a5a479b453d061 SHA512 c9fdf9b8d727aa056af65cdbcb8e9bf4448c012d964282019f9e6c72e184fe93b149e57878cf36963e0d43e7fa62f35879eab76b5701d85d8fc1121fd3384314 WHIRLPOOL f33848fdc313b7cf10f56fa96e82408da7a8052e6c7bcf68b706afc7a059317105ffdb0f4769414061d3f351b7e9e6eaf7585260a11d0212071a93899b584aca
 DIST netbeans-trunk-nightly-201604120001-src.zip 214308035 SHA256 c4ee83fc02814526c764bf7303438e59914fad937349cc0d1e9a74b57a3067a3 SHA512 f4b018d6133c2ea39cf6c027ee5ac227e2ea7eb28e5ee88a3413d2a50e3b2ddc57c90c20416a223ec312c059db6924679cbf8ef44c7db544037ce5791996b289 WHIRLPOOL df48d3e45091010c7b4987678c38ef34b534475bf1079b1901b506e1bafb3464f9ab9204a7d379a620df34965f854dc3afed6d9f9b77409c0a330cd8221a5380
+DIST netbeans-trunk-nightly-201604130001-src.zip 214317043 SHA256 f3f24013d19337cc3cc84b1a9b6b65e6add3a1c913cab5c1bcaf4a82afecae54 SHA512 1fe95e91c226177823f33f147967fbab0923afb81efda04a7414f2d45243b1fd5059542b4276513077dbbf1e7d13f4aa4b87510cf0d62806b3ad722a2ecb57a7 WHIRLPOOL f656cd4310a872404da8b734e0d328e0bc7a8cdba93da0180102f3dc4423290bf1c25ef97aa8bb9a18dacff9cc43c3bf499e85411f6c6235f7d1e7f44d2910cb
 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_p20160306.ebuild 4111 SHA256 5d40bd23a8dcc2d9e92175922e3ee431ffbfd0f8e2cdab82e984c32069cdaac7 SHA512 c3da0c98ecb2105a43b9029b5f438dcdab23b1657af0d31cabf9954d9bb7d27112e1cf8f03bde004eaa13f8db6db45ff0942ebfef0736c862a8116ebc2bc951a WHIRLPOOL 7f14f203817ad8c8029b3abc771a6069bf17383123e4e6b3b59e123b183f53b887aeca6f6ae17bb50500071533f10585c0c8a5313497c4edd2c49c19c0d47b54
@@ -48,4 +49,5 @@ EBUILD netbeans-nb-9999_p20160406.ebuild 4111 SHA256 9942fc5958fc44c3f7a92f51be8
 EBUILD netbeans-nb-9999_p20160407.ebuild 4111 SHA256 9732fbe09e35cf95af8235312c5710014a27646596acde6203341333cec527fb SHA512 571a1dc295fd3f696ba6c55fb82814c28d8d2e9aeb197ff09181dc6501255abf5500a3f7821167bae0f52b7b4fe652147da5f6e030295bf59d2dec3294580eb5 WHIRLPOOL 69669893eed55f3bd008527630f2ee56fa5c7674d2f45966c4eac04575a6a713201f49961a1cb20814f39cbd55dfc4caf53620f43252c1b68bc61e79ff250949
 EBUILD netbeans-nb-9999_p20160411.ebuild 4111 SHA256 a6a1a483f2c9b88e4b5937649d8a6f09f6f7059b5c68ec3798d7e498eb8da15a SHA512 42a6ed115a35eff4cd6e077172d7adba2ff1f087309c2214c53b7ea48a310fd5d0ceba4a3e23f63f32cce7125b08c721ed4f1eb22c3b9fa2d16ede58c47d748e WHIRLPOOL 3299f7d5a067fd95598d7216e9a8d90013a14911a7c7065cdffc683148e497c9287c2866045ed6d6c62ab6c4cdeffc0dea878e9c9b43ef446f3d235b9c0ecbb5
 EBUILD netbeans-nb-9999_p20160412.ebuild 4111 SHA256 b588703589f224a8bf948bbde2c394d48a044dc3c1807ae2f6f491556c5a51a1 SHA512 1b5241dec13480d196694a5a7616788316bcf96b6c96d600f9b0beb856ca0ecd85e6a28d881d759d256dac532128c2cc35bdf944d247a42c0113e21dd3f6b31a WHIRLPOOL e9b5ce070fa6522af02661bbe39721a6f9e1f3f2cc53af1f0cd2a41c6e155dccf28ed2aea58b4987a8ce0048a3054cd880696fc4713753a76684e0c911130f81
+EBUILD netbeans-nb-9999_p20160413.ebuild 4111 SHA256 4b4c59503402a4813766afcb1174855c3b0209ec6e266d4196e1e7fb4d318499 SHA512 9fd5ba2c1ba8099b02cd178ad4ccedcb6d41724825061f8b8bbafb9e01fae1c6d694a8441ce660f42473f8b1162c404a94e1fc7eb378b31d605b108bccf43e27 WHIRLPOOL b2275c47a9b5f6ee53eb2bfc14faa0237e75fbcb78a46784dd6ac5a74efaa5f5acbd0b6ec5989c2caec8abad1716ba17e9a89c45c7390581144e1f7b82e9227d
 MISC metadata.xml 392 SHA256 01cdbcc83099b97486bd7b8e813e5b19c1138eb0d8d3e8a5683aafd579820435 SHA512 4d2f9160baa022d6a48b61d5f42e71cfd411d244e7a36436629bc5ee4036e4ce19079134d9a6c704ebe942306c2e0199d0591c1e54f92f8f3c8835147e639246 WHIRLPOOL c1131764e1cec66c56b977ebe36014b29e5a68e35ccc326c0cbadd050a6c625cf191c85c212e0a733661c008dab0d99f9a4cdc4c4ae0cc9d775ba1de554795a9

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160413.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160413.ebuild
new file mode 100644
index 0000000..8017215
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20160413.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-13_00-01-48/zip/netbeans-trunk-nightly-201604130001-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 5dd382a..9b76943 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201604060001-src.zip 210178912 SHA256 9cba66d0d2af5f
 DIST netbeans-trunk-nightly-201604070001-src.zip 210188037 SHA256 7092c74499a788c69c0cd6539a42939851f3af3d1e4e7412f484dd5b0cb31904 SHA512 58b2f347020c917f4eec46aa9de482d9f4c26592d11b8bea2393554cdc5f5420451468824c64389d56a8801925cf2b9d605b4ee4eba8ab59f0d43f392ff1737f WHIRLPOOL d8a978091f9511677606df39902b8f9aff6e26ef369a6410d74b11efd409455681257a90879ce883a6ae3cac671562bcbd25991c2c5e81b672dcfa981e1b476c
 DIST netbeans-trunk-nightly-201604110001-src.zip 214209797 SHA256 b77721e7845710305bcf251547970caa5220bbd3659d42ca22a5a479b453d061 SHA512 c9fdf9b8d727aa056af65cdbcb8e9bf4448c012d964282019f9e6c72e184fe93b149e57878cf36963e0d43e7fa62f35879eab76b5701d85d8fc1121fd3384314 WHIRLPOOL f33848fdc313b7cf10f56fa96e82408da7a8052e6c7bcf68b706afc7a059317105ffdb0f4769414061d3f351b7e9e6eaf7585260a11d0212071a93899b584aca
 DIST netbeans-trunk-nightly-201604120001-src.zip 214308035 SHA256 c4ee83fc02814526c764bf7303438e59914fad937349cc0d1e9a74b57a3067a3 SHA512 f4b018d6133c2ea39cf6c027ee5ac227e2ea7eb28e5ee88a3413d2a50e3b2ddc57c90c20416a223ec312c059db6924679cbf8ef44c7db544037ce5791996b289 WHIRLPOOL df48d3e45091010c7b4987678c38ef34b534475bf1079b1901b506e1bafb3464f9ab9204a7d379a620df34965f854dc3afed6d9f9b77409c0a330cd8221a5380
+DIST netbeans-trunk-nightly-201604130001-src.zip 214317043 SHA256 f3f24013d19337cc3cc84b1a9b6b65e6add3a1c913cab5c1bcaf4a82afecae54 SHA512 1fe95e91c226177823f33f147967fbab0923afb81efda04a7414f2d45243b1fd5059542b4276513077dbbf1e7d13f4aa4b87510cf0d62806b3ad722a2ecb57a7 WHIRLPOOL f656cd4310a872404da8b734e0d328e0bc7a8cdba93da0180102f3dc4423290bf1c25ef97aa8bb9a18dacff9cc43c3bf499e85411f6c6235f7d1e7f44d2910cb
 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_p20160306.ebuild 4418 SHA256 ab8c05574707013fd5e00eb917ba143b42cc7f983093480e74bad2cc782579ae SHA512 2602299d7e95a616cc0aa33755ae8d068404b14ac1e4b998e2fb07eff811064221a6df9f7a4c76a3ad42c1f3bf1bc0fcead56657e7152fa17a873af67167061f WHIRLPOOL 589b76999f72bd4054202f86672e1f282147e8162dd6d48dd7ee71f30c6f81a6f52479d19a35a90d03478e1c1f0a663f2bacb9028ef6592b051e474019a6df33
@@ -49,4 +50,5 @@ EBUILD netbeans-php-9999_p20160406.ebuild 4418 SHA256 4bd3cd8732a3491847ed3434ea
 EBUILD netbeans-php-9999_p20160407.ebuild 4418 SHA256 c18b90d15ed5470bd9f96d4586838a977b80c3174bee65a2146e9e8cf05a39d7 SHA512 4e6cdc36c7f1e641a91d02a892f583e8fce13941fca42e10a5c74ccf253ad0ae20c9472943fc22b7639a23d9fd911c26272de88a4953ed558c933d0543463b1e WHIRLPOOL ff278bcfbc222276c3783bb6d8a4b021571190c08f7b6d95085f73d3cfd3c16f7cde4904dd02b722b908431669769e9f825a215e5ad375f688ba79f7f426db07
 EBUILD netbeans-php-9999_p20160411.ebuild 4418 SHA256 3ec1cc4f4dc879f39f36461e2ebf928a1733a2adc80ff2e36b33a58a65c5506d SHA512 5b068c411728327966b4cabe6dc721dc91579f478514fa5cabe89e44496c37d7ceb0d9c8674b99a2cf1528174369e8f9fedea04a875994b6cb50d812557ed93b WHIRLPOOL 2fe8ec6421b12a96736919ccb0b63109a6187546f436ac087ecdeca16314fcefa9accc5607fc24f34351801c8e03c10d1437076636dc74eaddd8aa39b3abf3c0
 EBUILD netbeans-php-9999_p20160412.ebuild 4418 SHA256 3334cf30767e8de30eb9b782d5d3b0c358d4b98ae58a026cec8ec1e0360444f5 SHA512 4e3bd3195f09074617ba91da83c72a589c88fbf68b82baa7799bc158e68f7a88e9972569578731963e4c3ce64369e114011084bac7d814a419e2a775fd3fce3b WHIRLPOOL 5eecf7efe5fe4a42c54bd817c497e7e5821b18ce46d115df0733c8f8caf5624dc94b69c83a62c9daf31cdf705999db2522e2f98494960c97c4851ababf4cb6e5
+EBUILD netbeans-php-9999_p20160413.ebuild 4418 SHA256 375e05ade76f55c375dfa87f835a4c31e1b80f2b49c70853db99290baf0844e1 SHA512 b48386ffaf7c44f4528e3c1fa54bea2cef175bc24dabdd03a9e1a4c373850cd2f4c2d4f114d5a013bd1b0c202b0851deb7a7c1410a2eefa54e7d72aeaea1a8dd WHIRLPOOL 770051ee084148cd3471eef2be4421070e55aab9ac3742fda98a11f46eae4f2596be67e1df9d82a9cf3ee93d43c87e3d25bccfe873aab6409819fe95f241c129
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160413.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160413.ebuild
new file mode 100644
index 0000000..e426f2f
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20160413.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-13_00-01-48/zip/netbeans-trunk-nightly-201604130001-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 7925316..3fe7499 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -51,6 +51,7 @@ DIST netbeans-trunk-nightly-201604060001-src.zip 210178912 SHA256 9cba66d0d2af5f
 DIST netbeans-trunk-nightly-201604070001-src.zip 210188037 SHA256 7092c74499a788c69c0cd6539a42939851f3af3d1e4e7412f484dd5b0cb31904 SHA512 58b2f347020c917f4eec46aa9de482d9f4c26592d11b8bea2393554cdc5f5420451468824c64389d56a8801925cf2b9d605b4ee4eba8ab59f0d43f392ff1737f WHIRLPOOL d8a978091f9511677606df39902b8f9aff6e26ef369a6410d74b11efd409455681257a90879ce883a6ae3cac671562bcbd25991c2c5e81b672dcfa981e1b476c
 DIST netbeans-trunk-nightly-201604110001-src.zip 214209797 SHA256 b77721e7845710305bcf251547970caa5220bbd3659d42ca22a5a479b453d061 SHA512 c9fdf9b8d727aa056af65cdbcb8e9bf4448c012d964282019f9e6c72e184fe93b149e57878cf36963e0d43e7fa62f35879eab76b5701d85d8fc1121fd3384314 WHIRLPOOL f33848fdc313b7cf10f56fa96e82408da7a8052e6c7bcf68b706afc7a059317105ffdb0f4769414061d3f351b7e9e6eaf7585260a11d0212071a93899b584aca
 DIST netbeans-trunk-nightly-201604120001-src.zip 214308035 SHA256 c4ee83fc02814526c764bf7303438e59914fad937349cc0d1e9a74b57a3067a3 SHA512 f4b018d6133c2ea39cf6c027ee5ac227e2ea7eb28e5ee88a3413d2a50e3b2ddc57c90c20416a223ec312c059db6924679cbf8ef44c7db544037ce5791996b289 WHIRLPOOL df48d3e45091010c7b4987678c38ef34b534475bf1079b1901b506e1bafb3464f9ab9204a7d379a620df34965f854dc3afed6d9f9b77409c0a330cd8221a5380
+DIST netbeans-trunk-nightly-201604130001-src.zip 214317043 SHA256 f3f24013d19337cc3cc84b1a9b6b65e6add3a1c913cab5c1bcaf4a82afecae54 SHA512 1fe95e91c226177823f33f147967fbab0923afb81efda04a7414f2d45243b1fd5059542b4276513077dbbf1e7d13f4aa4b87510cf0d62806b3ad722a2ecb57a7 WHIRLPOOL f656cd4310a872404da8b734e0d328e0bc7a8cdba93da0180102f3dc4423290bf1c25ef97aa8bb9a18dacff9cc43c3bf499e85411f6c6235f7d1e7f44d2910cb
 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_p20160306.ebuild 9360 SHA256 697d2a9ed77e74047949310de5cd862863c75b00e4f8449a2067520b2f137087 SHA512 5666338be76e6bf2d95051597b389429ef3dd9d798e4f438a5771a954b76f315a31fb5f8f9d628ac40cb6b6fb65ff7bd077523845df2191b24c70cedd1dfd71e WHIRLPOOL b4e1315ad4f4a64af397263c3dc42289960d5d364d34946c0707ba7c65c2b863f7c1e64166e292fe1e0cf61aa9e51016b94cfe5b0627a3dbbe344f7fd95728df
@@ -72,4 +73,5 @@ EBUILD netbeans-platform-9999_p20160406.ebuild 9511 SHA256 bafb25e1f8a2e71609ca5
 EBUILD netbeans-platform-9999_p20160407.ebuild 9511 SHA256 8499d31229ae975e65c03f11f225811ec5230f5dbaf8287a813a1b71833d285b SHA512 9ed45017ca85f93c426d4b53908707612b9bd1f610542e9b24e7647c64c9650b7b6a035d5721a5eb0fdf24884b4696399bc32a89c2c4881c86ae31999163e678 WHIRLPOOL da6be4bd192db07c266b660181f18abc7e5c38fb5702d7feb53a4ee125d3d451ebd279138d4b206e5500a9bdcc8f68eb3527258aee013130483e03b2a13808d9
 EBUILD netbeans-platform-9999_p20160411.ebuild 9511 SHA256 6cccdbbb6aba51cdaa0d976cae6590289f4b7a5c5497dd71e9222d4ddbffe685 SHA512 9e1c1094a7726889d794185984b294a98449948a6230075d86bbace76b29b162476d107e9330c42b0dc32656de5969820303693e06eff293b7cd189c9dc9e13c WHIRLPOOL ee836ee5c922ec49656d41983e443a15e8ef17296353255a037044604248e33c7d4af3d2e32a6d1e435d8a3453cf1821f13a754fd7a4ce62645b6231d450b7d9
 EBUILD netbeans-platform-9999_p20160412.ebuild 9511 SHA256 7817712d5f73eab829b795e8a3ed22d272d548bf0a8145404cc2eae62d91cf77 SHA512 83856ce63277951e0019d86bb6e6aab87005da213af495190db37f13151dea3839759b558dbf67a0b07ed2134772fbcc588174d8c7a9850030ce85f5113f0eef WHIRLPOOL b14807d025724fdeb714e2543eb6cca235fbcab7283846df5ef740701fde3798c16bd061e2be9c05cbeecfdcb11b1564da9ad76cdf53ee0c7c3f1654c28a481b
+EBUILD netbeans-platform-9999_p20160413.ebuild 9511 SHA256 eb8e9a33d0d3ded9d57cf9672ca4015ae07cf85fb91540e57a7a7e4220595d84 SHA512 a0a00d7e63d63e0c35a07cfb4d9afa05058c97f45c9c4c68cf732c588bf435ea5a635ca7cc60bbce8140a5980ee8e09bfccf975a312bc6546925688f6fe2b230 WHIRLPOOL d5d71605f6697627feebcb6c0c4d45a7b4ec167566463419f331faa490eb2e8dced95ed642e4e72b6db5048c78e3ef7e41bc4fb9a6df2f4a66a9f87eaf40aaa4
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 28a1740..bb2409b 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201604060001-src.zip 210178912 SHA256 9cba66d0d2af5f
 DIST netbeans-trunk-nightly-201604070001-src.zip 210188037 SHA256 7092c74499a788c69c0cd6539a42939851f3af3d1e4e7412f484dd5b0cb31904 SHA512 58b2f347020c917f4eec46aa9de482d9f4c26592d11b8bea2393554cdc5f5420451468824c64389d56a8801925cf2b9d605b4ee4eba8ab59f0d43f392ff1737f WHIRLPOOL d8a978091f9511677606df39902b8f9aff6e26ef369a6410d74b11efd409455681257a90879ce883a6ae3cac671562bcbd25991c2c5e81b672dcfa981e1b476c
 DIST netbeans-trunk-nightly-201604110001-src.zip 214209797 SHA256 b77721e7845710305bcf251547970caa5220bbd3659d42ca22a5a479b453d061 SHA512 c9fdf9b8d727aa056af65cdbcb8e9bf4448c012d964282019f9e6c72e184fe93b149e57878cf36963e0d43e7fa62f35879eab76b5701d85d8fc1121fd3384314 WHIRLPOOL f33848fdc313b7cf10f56fa96e82408da7a8052e6c7bcf68b706afc7a059317105ffdb0f4769414061d3f351b7e9e6eaf7585260a11d0212071a93899b584aca
 DIST netbeans-trunk-nightly-201604120001-src.zip 214308035 SHA256 c4ee83fc02814526c764bf7303438e59914fad937349cc0d1e9a74b57a3067a3 SHA512 f4b018d6133c2ea39cf6c027ee5ac227e2ea7eb28e5ee88a3413d2a50e3b2ddc57c90c20416a223ec312c059db6924679cbf8ef44c7db544037ce5791996b289 WHIRLPOOL df48d3e45091010c7b4987678c38ef34b534475bf1079b1901b506e1bafb3464f9ab9204a7d379a620df34965f854dc3afed6d9f9b77409c0a330cd8221a5380
+DIST netbeans-trunk-nightly-201604130001-src.zip 214317043 SHA256 f3f24013d19337cc3cc84b1a9b6b65e6add3a1c913cab5c1bcaf4a82afecae54 SHA512 1fe95e91c226177823f33f147967fbab0923afb81efda04a7414f2d45243b1fd5059542b4276513077dbbf1e7d13f4aa4b87510cf0d62806b3ad722a2ecb57a7 WHIRLPOOL f656cd4310a872404da8b734e0d328e0bc7a8cdba93da0180102f3dc4423290bf1c25ef97aa8bb9a18dacff9cc43c3bf499e85411f6c6235f7d1e7f44d2910cb
 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_p20160306.ebuild 3472 SHA256 d243c6c57755c1fac5e730acf33dbb92ba0f036ffc0e271ac149eb8de44b8cef SHA512 7a7b3f9e80c1c4924ecb4b69f5244fb41f59b412bbf91a296cb0dffc3792c65f01bf5f7bfcaf18ffcb331f223ba2d90cf8bc48955e1dd82cfcfc13937e8d3d79 WHIRLPOOL 4111399bba2da5fffa24eb443ab95b99e37e41449aff1c2d6a0bb207f5916540ef30840e28f8725c2a26a7e7df2b6ff5c17e8071ae6e20a3ea634d8e8ae25ad6
@@ -45,4 +46,5 @@ EBUILD netbeans-profiler-9999_p20160406.ebuild 3472 SHA256 d936e4d07d1eb82e2643c
 EBUILD netbeans-profiler-9999_p20160407.ebuild 3472 SHA256 7ef4ed30cff796a7bc209582719447dcc4f74377c5c1551858a56650690a1281 SHA512 024bacb7962c4eab4fee10fa2bcc89e6f239fb74c3fe8e8a2ece3827f864c3b167cf3e2405a98585e30ed3714b4b313b3a47cae76a906e9170c534ee698ec991 WHIRLPOOL 52218b9bda0db57fdd3369790761bc45925d97a2c8b887598e424622b9e3334d6ab5f546fd6f0614aa0d235d70ef14e94fa0f2aef6be6d7e8534d7b491640e2f
 EBUILD netbeans-profiler-9999_p20160411.ebuild 3472 SHA256 0258dd47de17a35663c454ba04486573975468af379ff26ccef913e42d712a7d SHA512 200913fb7441c4c516da5f171c7118600b5b477bdcda98612a6c00611c221c4d73c77f7c9f72dcccddfea27c1225241e769ffef8ed0ec5abf0c8b438546dddf6 WHIRLPOOL 64f9c3e40d6adb15cf16fe0b0871c8b65628ffe275f821f215d1da3b9483335937c57eba8f5f7a1cc70d5ba942ca0b20b466cdb07b7a0a9b334919468d17f903
 EBUILD netbeans-profiler-9999_p20160412.ebuild 3472 SHA256 e9ca0a95e17ca6628ef42310543b3163a9d9e6dcfcb257c12c41c054fac98a6e SHA512 e7b0786d29dffff5ca96eb94365f0e5179781beeefd3e1348b58fdd10597890a7f9ace32b18332fafacdcba16637a98f58dd935c3afb05bd18552f0a36f90095 WHIRLPOOL 55a76397abe0ce45ec2442a2f7da367c72c7724f12d4c84f3c89da533ba9f793ea91972013b81d3cf45cb7b6e6af46fa4f75f60303a65ba732eb781edb0f77cb
+EBUILD netbeans-profiler-9999_p20160413.ebuild 3472 SHA256 baa0f2ebf9a2de03a25a164fbc5b64a5b6b61b532f474a08058f6109c5969820 SHA512 3627144449b8d11885a8905e1f825cc0115c1603f1bfb355836764ca7e208b4fc78b718affc3fdf5a8deba3b3c046c4d2ae8b2ba69b3dac2584e93f56347b4d9 WHIRLPOOL d03e408a7e4fe293d59a791dde0d79a3bf0bae74be5d755f5dd44ee1d7b9a5442aaffaf80d7403f7df2db5666706a9de596ee2d2b34a1e668ba5d087f49e4c7d
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160413.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160413.ebuild
new file mode 100644
index 0000000..44d0e82
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160413.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-13_00-01-48/zip/netbeans-trunk-nightly-201604130001-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 025a033..42657e6 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -40,6 +40,7 @@ DIST netbeans-trunk-nightly-201604060001-src.zip 210178912 SHA256 9cba66d0d2af5f
 DIST netbeans-trunk-nightly-201604070001-src.zip 210188037 SHA256 7092c74499a788c69c0cd6539a42939851f3af3d1e4e7412f484dd5b0cb31904 SHA512 58b2f347020c917f4eec46aa9de482d9f4c26592d11b8bea2393554cdc5f5420451468824c64389d56a8801925cf2b9d605b4ee4eba8ab59f0d43f392ff1737f WHIRLPOOL d8a978091f9511677606df39902b8f9aff6e26ef369a6410d74b11efd409455681257a90879ce883a6ae3cac671562bcbd25991c2c5e81b672dcfa981e1b476c
 DIST netbeans-trunk-nightly-201604110001-src.zip 214209797 SHA256 b77721e7845710305bcf251547970caa5220bbd3659d42ca22a5a479b453d061 SHA512 c9fdf9b8d727aa056af65cdbcb8e9bf4448c012d964282019f9e6c72e184fe93b149e57878cf36963e0d43e7fa62f35879eab76b5701d85d8fc1121fd3384314 WHIRLPOOL f33848fdc313b7cf10f56fa96e82408da7a8052e6c7bcf68b706afc7a059317105ffdb0f4769414061d3f351b7e9e6eaf7585260a11d0212071a93899b584aca
 DIST netbeans-trunk-nightly-201604120001-src.zip 214308035 SHA256 c4ee83fc02814526c764bf7303438e59914fad937349cc0d1e9a74b57a3067a3 SHA512 f4b018d6133c2ea39cf6c027ee5ac227e2ea7eb28e5ee88a3413d2a50e3b2ddc57c90c20416a223ec312c059db6924679cbf8ef44c7db544037ce5791996b289 WHIRLPOOL df48d3e45091010c7b4987678c38ef34b534475bf1079b1901b506e1bafb3464f9ab9204a7d379a620df34965f854dc3afed6d9f9b77409c0a330cd8221a5380
+DIST netbeans-trunk-nightly-201604130001-src.zip 214317043 SHA256 f3f24013d19337cc3cc84b1a9b6b65e6add3a1c913cab5c1bcaf4a82afecae54 SHA512 1fe95e91c226177823f33f147967fbab0923afb81efda04a7414f2d45243b1fd5059542b4276513077dbbf1e7d13f4aa4b87510cf0d62806b3ad722a2ecb57a7 WHIRLPOOL f656cd4310a872404da8b734e0d328e0bc7a8cdba93da0180102f3dc4423290bf1c25ef97aa8bb9a18dacff9cc43c3bf499e85411f6c6235f7d1e7f44d2910cb
 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_p20160306.ebuild 5280 SHA256 832a6ee7bab01af1654dd2308b0acc7948b22c9dcd26e9e26e658c988e9169b7 SHA512 da7e9a02a7da0e75569cbad24ecbdfd4c750036ad6f85d1b2d2b9a1a7ee4bc1592cc2d156d3d4f7b7c203d6b8f36ff85fcacd2587649a1da2341cc76f0ef65a2 WHIRLPOOL acad7aec8ae2ae3a68b53ff4806bad056c79e08c22eead5dc39797d78a8f1059aef27d183887dad4ae6b3aa73aaa2c1813762524c33e38a8775fd18433a2a288
@@ -61,4 +62,5 @@ EBUILD netbeans-webcommon-9999_p20160406.ebuild 5343 SHA256 31a68c2dfa36897c9af9
 EBUILD netbeans-webcommon-9999_p20160407.ebuild 5343 SHA256 80c10ced8e6ad69ad4b5bbe0a85c57e37057b839d0e383a421c1fb7b7badfa87 SHA512 cd6b1af710c1fab1ef6f95a2b7fe69c9aae2a0d32c5ccfa1be1c19cb54dbd61438fe8100c880ff367c7ad6d4b9a09630534ef07552035df549b2107afb5b792f WHIRLPOOL 9ba0546d7a5b1014dd990db179e3451d020b8c0e465b57f8994c7303ac3caa5b541b31ffaea7aae920df1f318476fbc5ac438ccb9f2e3be95c3ca1277f273e71
 EBUILD netbeans-webcommon-9999_p20160411.ebuild 5343 SHA256 15611aa982ccbb82a29fc4f6842d0d6fe9748b0180dc40775c208639db835202 SHA512 c045053e9902d1da54d4f388945df91140b846635698bc3af0699bf67b854bd18bc11d328438d71b5cc11249a7ec4f9c8061a8be2b41b37d5d10fc82ce901021 WHIRLPOOL fdfd56019b50b413fe800a25995929927bfeae72c9622cbe28b332726946b6d5caa983c42c2af733b1d01b6c076a7e06489c7691c2c3917b559912d8f030675a
 EBUILD netbeans-webcommon-9999_p20160412.ebuild 5343 SHA256 86b3f2e70ff23e7efc53f52db5cecc2ea43123f93738c07dfef27803976cd49b SHA512 092f5e4234072be33dc9a8160b1c6f7f61f8f3fba75938f3f394be4c65ed1966b2d0c3e19ed338653fc0efab2df62018aaa753188a0e8a43a0668acf70042b05 WHIRLPOOL 97221cf5fe7aac4685525fd71c6b9477b6277aa7189cb7045bb7e3c631c3121c49155b40d9ab76ac0768bcdf5556509f64953628d99535cbf76fdc3a3c319644
+EBUILD netbeans-webcommon-9999_p20160413.ebuild 5343 SHA256 d292aa688b9dc341caa7794f31968015fbf02114b21ca593287c1f59fe5bb602 SHA512 2557ba8d2d05f92065b4e927f89d3283db9656eb20992869064a4554bf474da173ac7d4f1bf4aeda269f85ec92611f24df600d7129d385412acbfca88574a57b WHIRLPOOL e36046506443419df9a55841790906da295edbb90b62776c69017e34ed4daf2b23b31c7610eeabf139c5b0b137e7650d9db568b294fbf09a19c94e5b37d6827d
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160413.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160413.ebuild
new file mode 100644
index 0000000..4676239
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160413.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-13_00-01-48/zip/netbeans-trunk-nightly-201604130001-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 3c40954..b835f3c 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201604060001-src.zip 210178912 SHA256 9cba66d0d2af5f
 DIST netbeans-trunk-nightly-201604070001-src.zip 210188037 SHA256 7092c74499a788c69c0cd6539a42939851f3af3d1e4e7412f484dd5b0cb31904 SHA512 58b2f347020c917f4eec46aa9de482d9f4c26592d11b8bea2393554cdc5f5420451468824c64389d56a8801925cf2b9d605b4ee4eba8ab59f0d43f392ff1737f WHIRLPOOL d8a978091f9511677606df39902b8f9aff6e26ef369a6410d74b11efd409455681257a90879ce883a6ae3cac671562bcbd25991c2c5e81b672dcfa981e1b476c
 DIST netbeans-trunk-nightly-201604110001-src.zip 214209797 SHA256 b77721e7845710305bcf251547970caa5220bbd3659d42ca22a5a479b453d061 SHA512 c9fdf9b8d727aa056af65cdbcb8e9bf4448c012d964282019f9e6c72e184fe93b149e57878cf36963e0d43e7fa62f35879eab76b5701d85d8fc1121fd3384314 WHIRLPOOL f33848fdc313b7cf10f56fa96e82408da7a8052e6c7bcf68b706afc7a059317105ffdb0f4769414061d3f351b7e9e6eaf7585260a11d0212071a93899b584aca
 DIST netbeans-trunk-nightly-201604120001-src.zip 214308035 SHA256 c4ee83fc02814526c764bf7303438e59914fad937349cc0d1e9a74b57a3067a3 SHA512 f4b018d6133c2ea39cf6c027ee5ac227e2ea7eb28e5ee88a3413d2a50e3b2ddc57c90c20416a223ec312c059db6924679cbf8ef44c7db544037ce5791996b289 WHIRLPOOL df48d3e45091010c7b4987678c38ef34b534475bf1079b1901b506e1bafb3464f9ab9204a7d379a620df34965f854dc3afed6d9f9b77409c0a330cd8221a5380
+DIST netbeans-trunk-nightly-201604130001-src.zip 214317043 SHA256 f3f24013d19337cc3cc84b1a9b6b65e6add3a1c913cab5c1bcaf4a82afecae54 SHA512 1fe95e91c226177823f33f147967fbab0923afb81efda04a7414f2d45243b1fd5059542b4276513077dbbf1e7d13f4aa4b87510cf0d62806b3ad722a2ecb57a7 WHIRLPOOL f656cd4310a872404da8b734e0d328e0bc7a8cdba93da0180102f3dc4423290bf1c25ef97aa8bb9a18dacff9cc43c3bf499e85411f6c6235f7d1e7f44d2910cb
 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_p20160306.ebuild 2721 SHA256 6883a676beb19101a91d8c6f89944179972db1b790ce9135578db3e8f03f6e07 SHA512 67a15b7e306aea2b759798a979b7011d0c30d910b80b24e15c10edfa6183d4e99c8dd58ea151a96c65a74a0c5a7151792c132080390394dc47a913f1fee1b87c WHIRLPOOL 72f17c8dfc4cf789a9e8bb030572736c4690d8a4a5d52513cdf804551d220e7919f2ff00e5289bb782ecd079e56861b71be9f3cc7a17b5488abe2806933da8dd
@@ -45,4 +46,5 @@ EBUILD netbeans-websvccommon-9999_p20160406.ebuild 2721 SHA256 b157d6ef6275b5993
 EBUILD netbeans-websvccommon-9999_p20160407.ebuild 2721 SHA256 7512d394a7baf04adf5b7ea7ca6663513af42d91f1a9e82a82017ff1cacace7e SHA512 7a7efa60234eb9dc521dfd6ec258f13b82cbc5bd2d6a9971d94f40a109031c1b72d473006f501e1db43657e7b4dea00e7a769e3a7926063f1341c03b264bd7a3 WHIRLPOOL d3443d06522ad389c39afead46dfaab35e62653c722dd351f87adb10c31cc64a9ac01e7f4d56e66427af518360beac62df0a3b838e6eeee5f0a112cfbc1fa2d3
 EBUILD netbeans-websvccommon-9999_p20160411.ebuild 2721 SHA256 195c20eec7d31a7ff35d2872f167ed032e10d2deb48762fdc02327721491c597 SHA512 4a5368120751aaad6220604b5d352eaaed88dc2ad8741606a36ad59d0e10aa47c8c5c600bcc41036b6a30830115a4f5f9c90c06a8cd72209a9777eb7998b6dc4 WHIRLPOOL 9b86c1387925a764f8f83e73f3fa031258c92f1dbe22666ff86a1d039489d399331075e7d1c0422141fcd71c116250fa61ed1029267e22ac758163727cf98115
 EBUILD netbeans-websvccommon-9999_p20160412.ebuild 2721 SHA256 858a338600d1a79e28d6d143a4ad1b851ca2fd3ee64a250c0246c6d3aa51996a SHA512 2d88f6c8405c0b41e05484df4dd73b31c5ee0779df786ce2c83db35b1503e0e194538d8e18e7b944aafd97af9421f38fff91440b9d02db371ea087f78285e6ed WHIRLPOOL 35406477ba0d43feac72c50d589e0cd7f5add9c2a5bf8c248b6c471bceab42d5b4eb3e5e3444981d67a2a831c8cd6fa7b8f93d527751d65941d85dbb3af43be1
+EBUILD netbeans-websvccommon-9999_p20160413.ebuild 2721 SHA256 a28f074c61e070020da34ab839ec13412aec0ac93ac98f2cea83256fae430aa5 SHA512 bfdd9037688f591e0e9610c97db77699b49d3796fae514ee74ae16894a0b2ae483e12211a72a536779fc47bf873c0c4ba4762bc1d39c11fae1e776e5dc8284ce WHIRLPOOL 94a4e74e01738330f2ecc556c4c4e2ba680feacbaa1587b3d2cb4ddee86e179ffe799a90d0d0fe169514acd7a9ecd87f686c574f7c7cbac1b4c712be38bd9872
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160413.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160413.ebuild
new file mode 100644
index 0000000..e71b036
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160413.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-13_00-01-48/zip/netbeans-trunk-nightly-201604130001-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 40148f2..5697523 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201604060001-src.zip 210178912 SHA256 9cba66d0d2af5f
 DIST netbeans-trunk-nightly-201604070001-src.zip 210188037 SHA256 7092c74499a788c69c0cd6539a42939851f3af3d1e4e7412f484dd5b0cb31904 SHA512 58b2f347020c917f4eec46aa9de482d9f4c26592d11b8bea2393554cdc5f5420451468824c64389d56a8801925cf2b9d605b4ee4eba8ab59f0d43f392ff1737f WHIRLPOOL d8a978091f9511677606df39902b8f9aff6e26ef369a6410d74b11efd409455681257a90879ce883a6ae3cac671562bcbd25991c2c5e81b672dcfa981e1b476c
 DIST netbeans-trunk-nightly-201604110001-src.zip 214209797 SHA256 b77721e7845710305bcf251547970caa5220bbd3659d42ca22a5a479b453d061 SHA512 c9fdf9b8d727aa056af65cdbcb8e9bf4448c012d964282019f9e6c72e184fe93b149e57878cf36963e0d43e7fa62f35879eab76b5701d85d8fc1121fd3384314 WHIRLPOOL f33848fdc313b7cf10f56fa96e82408da7a8052e6c7bcf68b706afc7a059317105ffdb0f4769414061d3f351b7e9e6eaf7585260a11d0212071a93899b584aca
 DIST netbeans-trunk-nightly-201604120001-src.zip 214308035 SHA256 c4ee83fc02814526c764bf7303438e59914fad937349cc0d1e9a74b57a3067a3 SHA512 f4b018d6133c2ea39cf6c027ee5ac227e2ea7eb28e5ee88a3413d2a50e3b2ddc57c90c20416a223ec312c059db6924679cbf8ef44c7db544037ce5791996b289 WHIRLPOOL df48d3e45091010c7b4987678c38ef34b534475bf1079b1901b506e1bafb3464f9ab9204a7d379a620df34965f854dc3afed6d9f9b77409c0a330cd8221a5380
+DIST netbeans-trunk-nightly-201604130001-src.zip 214317043 SHA256 f3f24013d19337cc3cc84b1a9b6b65e6add3a1c913cab5c1bcaf4a82afecae54 SHA512 1fe95e91c226177823f33f147967fbab0923afb81efda04a7414f2d45243b1fd5059542b4276513077dbbf1e7d13f4aa4b87510cf0d62806b3ad722a2ecb57a7 WHIRLPOOL f656cd4310a872404da8b734e0d328e0bc7a8cdba93da0180102f3dc4423290bf1c25ef97aa8bb9a18dacff9cc43c3bf499e85411f6c6235f7d1e7f44d2910cb
 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_p20160306.ebuild 6939 SHA256 027d8fbdc821845b140e2209c1299fcbe12e1c76a82d5e5ad1982e1ed4b4fe30 SHA512 8936c1bf3b6af07290ce8e0d1029b57414f97cdf6f5a7fa8a18c79001c55f9c1f17be77df8468ad9cd14ad8ccc89a395b6962412f5cc8ec7d8a546dc6813db22 WHIRLPOOL df94942f14846b08901d82b8ea56b69fe1ae87b45cae4a535bd7fecf44bdb831569ada6f0da704215bd8a1737feb70244e00a34282e5142368d744a41a4f67ea
@@ -48,4 +49,5 @@ EBUILD netbeans-9999_p20160406.ebuild 6939 SHA256 210ec45f9be030b9e65f4fcaaadc2e
 EBUILD netbeans-9999_p20160407.ebuild 6939 SHA256 3c11c578773405c09851fe1b590fd1c042cd3cc61a2776632180f1cd700b5f17 SHA512 1ca96b7e849322f66b7160e9a7cc02ed71ff6d74c636a231205b8d5427dc5ca46059841f5deb9bb2b915401445623065b7aee1d9de92f8be791855f5fec9f5f7 WHIRLPOOL 036e0b6abdcacac1b5df1e29d556e5ec8e96859be75677effb45e7bd6bb89b3d06e8c81e91c0ad18b6630c77854fefe20fb4196bcfc37dca40bb4cb140953543
 EBUILD netbeans-9999_p20160411.ebuild 6939 SHA256 8aee73872f3e7144bdd7a5a7420aa53f24d6d58bc9fc178731cefc26014b1396 SHA512 63987f53e08d3fd0985b1d25de95a3016f28089941ffa1cd4660d7ddeb1cdd13c7dcf8cfd4c119369406eeb50c39a05905b2c51239ede567ca7719690f715be8 WHIRLPOOL ded736a5b3be31e70070f0698389bba077be0d92a48abe88691e95f5c1c7a73dea33bcb767a218d30d3555d2cf9e4d0b4c72bca0633d985638f039d2b32d1718
 EBUILD netbeans-9999_p20160412.ebuild 6939 SHA256 8086b81d131c664acf85fb31b57e89b9629c7267cf195439d58eadb764cdd2d7 SHA512 7b274251f10a4b1377f80a128044f899f387d60db794f608d75e786f08a2cd24f093f6f6f97ee3ce3151fafa3d36059067d749364eec8f78c0d146023b46919b WHIRLPOOL 30df4c491f9775559f3d797dd88e8a4d4b22e84ef51ef8fa65ebb94717a79de3f5701463a25ab0a078a9e38f98ad607ba1964ac5b7c3f56752f8752904e90170
+EBUILD netbeans-9999_p20160413.ebuild 6939 SHA256 5dec97e88269d3aa436cb0a9ab9d4c429512b3d3aa818cd4fbe0a138e3d716b6 SHA512 4c06e2c39cda08bbb2123c17ee5b0217da59362ed95bfe4a84ad5d2b3cad23d5014df4a22cf1591ed6667666fe886a013d425775bb2c65597f8764a0237a844a WHIRLPOOL 92319e96fc82e2178f28f8ad82bf85ed6e0f70647f2e99ba3fc3b6c1339a7f9ac9beac918abf666eccb601a209a133fa225f0e028365edad7600792ce246b178
 MISC metadata.xml 329 SHA256 8aeaf2a0228f15c2e4140f401b30f083509bd99d0a578873069f3595cd8555f3 SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640 WHIRLPOOL 799a9b79b1b447bda9631f67e2dfaf722376740e1d2037796528a05f9745eeed00d9990a74a65ce09f74bc5e1d60a887abde540c3c62487d7dd49b8377c15834

diff --git a/dev-util/netbeans/netbeans-9999_p20160413.ebuild b/dev-util/netbeans/netbeans-9999_p20160413.ebuild
new file mode 100644
index 0000000..9215f6e
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20160413.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-13_00-01-48/zip/netbeans-trunk-nightly-201604130001-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-13  8:09 UTC | newest]

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

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