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

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

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

commit:     23e99f0bc2178a8f5341800b791babee4ae9ab5a
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 24 09:23:35 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Mar 24 09:23:35 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=23e99f0b

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.2.28

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 52d5246..e2f5fd5 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c
 DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
 DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
+DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
 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_p20160223.ebuild 3384 SHA256 5daddd74a5e1320640ad7a6cea09ffce0c25a669d6fc44f8352dca5ec286a155 SHA512 dd285243d5a43cf86b74914c9b5ff70ec0bd07977e9288244202f17d19092d47bf4724298c3e9e3c75d8b9c3ec6d99fbd1999226c91aeb2f09266eaea4fc8d1d WHIRLPOOL a9ce0642d90e2a2870d0992e7198f18a0cb8d1523efca5d553320be5ed4f9ae6c408f34200bf354ce577c14065f35de81ada7c22a1ae57872b496f2d9e8001da
@@ -46,4 +47,5 @@ EBUILD netbeans-apisupport-9999_p20160316.ebuild 3384 SHA256 2b0dc286cd42bd6d61b
 EBUILD netbeans-apisupport-9999_p20160317.ebuild 3384 SHA256 1a071cabfe5f4815a401c0024b9c755e721528c6aa08e27f657003f61d43515b SHA512 ff5c867796d03be732d0e4877c2098c4c7287b7c140416b1f8e257492b5cab8c39eb355ccd28fbbe3cfcf1f0ccbf4b55d774608a76da8042d716f8a29ef5004e WHIRLPOOL 4b5ddeede7455c8163d340d95f40ebdc815bc64c26406b693991c731f56b512da3623b715727f7a517dce15d3a9292057cd3ff0f02d61fee60ad4b80365dfbf9
 EBUILD netbeans-apisupport-9999_p20160318.ebuild 3384 SHA256 a4bf2510eb7029190e63338a58d9527f53b1dbb65bcc9502b782df59d6faa157 SHA512 cb0795fdee3eded2db10d7da62009d0569315a15e2079520fee27077de26d576649c57345d93318837d4640dc3f095d0c8728a56c18bd0633b1540de64065495 WHIRLPOOL 0b04a21f24b2761b1c348053b0beefc87bb5d4151c91eeb9a348ef972e3a8e8671ec12e229437c8a62e708074844194759949964e74a4a57e05de8f72783d16c
 EBUILD netbeans-apisupport-9999_p20160323.ebuild 3384 SHA256 88eaedaad525293991e3452d337d3f9ccc7f53265450fd6ced94b3c7e4fc10f6 SHA512 6805198573b4ee320ff940bb6b1c0ee141053694593037a05ce6a497f1be71181a098b1bc99c7049297ca6b64bf126ecb427a856fa70e98370e15d2fde788df4 WHIRLPOOL d4811090e31e79712918c7ef184eecb13104eee5d1bd3b6927fdeff67fc28465eb9b8a77f39b3f6d7a911c21009a26ec8969c1fe890c1bae5bdd80a00f749bf7
+EBUILD netbeans-apisupport-9999_p20160324.ebuild 3384 SHA256 2963cc052879394b00589a73cd07f1a7dfd49d889b7200cdc92e79f5c9b5c4d3 SHA512 efe6718073360ee833c449fd64aed116b2ce5da98c548aa6aa5e31c6851a6614706a281fc554cb2da02f000b7facfdfc2fbd5134390778320a88b77834c86470 WHIRLPOOL 5cd254ba84de8043074573625db464e6101d6d1dee051b139c9f7ceabf10971feb87553965efdd38486aaae3834ee4957f8671b1fa71c04554464536dbe4f05c
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160324.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160324.ebuild
new file mode 100644
index 0000000..e922c09
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160324.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-03-24_00-01-48/zip/netbeans-trunk-nightly-201603240001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r15-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 34de38f..a1b45e3 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c
 DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
 DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
+DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
 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_p20160223.ebuild 4790 SHA256 bbeabbad72c5a0a2ca07c4c9c1d7573788751cc376176375df8de4e7aba4eeef SHA512 34848e0c3bfc54ab1a616d3a77b2d786eadd776a791cfce50c647535ad36e230635f6e8ebcb05d6c5e0a9d84256d76cbe39bb82a409827e27df64ca44a6e39d9 WHIRLPOOL a60479dfdea44d40d74e351b58f33322e921046a9e1a8a47e70b0df2739672a072e6d55f3a3ae7fe0de4a45edc528cd7381fc80142a1762e52687e23ef024aaf
@@ -60,4 +61,5 @@ EBUILD netbeans-cnd-9999_p20160316.ebuild 4790 SHA256 58fd8b3ccf7caf0f0e98d40c46
 EBUILD netbeans-cnd-9999_p20160317.ebuild 4790 SHA256 9033abd5562dc6e6da55eba4d73dce9eabf25b49f3da473e6eaefaaf203f261d SHA512 76aa042f77ef990617dbc9f4f719a2048dcfe32e5ea38ff4d17a0b7ea2c4dc8ff00ed0b5471f53882f0bbe4fc04980e8557dec6b1869b01cc7469ac0a9a9b39e WHIRLPOOL 1832ca113daa66150afdcd73c2af6b7dacb60b70ed298151ee13517dd4d2640a6b2607102573fbcbf50b7df30086ebaebef80aece1ffcdc014d5efe6a856cf32
 EBUILD netbeans-cnd-9999_p20160318.ebuild 4790 SHA256 df1601c74401f28b42e367cf55f93faf5c57eb1b342d5aaa47061dfac73b70cb SHA512 70848039871673c546e6956b30592628b91aa6510774f557a654cc06b0d09af69626573f3df68be91cbaa9de91c087a07fbff7370bace1dcec5731c5ec563a13 WHIRLPOOL 46de36701caf7f46ca010ca4890289d2dc74bbb6411194accf584ef68827f18bf92ef005fbf5f18abd51b36bbd0556635a933ab84d4fc2a47dfa21a9eac75c03
 EBUILD netbeans-cnd-9999_p20160323.ebuild 4790 SHA256 b45a5478c2329595bc11fe97e89a02d0732f5c8fd75a299292e29d7d5970a3f1 SHA512 cadb56df12a4544c795f56efe929e944c504d4a851144c0b959d7a8005a861186fbbc6fbb6fd05a7b6950af6a30224e3194bd1933a48baa2e36d785c4db6dd6c WHIRLPOOL 1b0368afa7fe0c42c52cd09eb2bfe698399cc0e749eddec1ad8924dfc1a7113de5e1f5329bb617b12064d232bbb55df232f0ffabe8793cb1f8bac7a83b827c1e
+EBUILD netbeans-cnd-9999_p20160324.ebuild 4790 SHA256 6615b7137dbebabf0cf45a58e945c0ac81ae3ecd6c3bb32235a76835586b60fa SHA512 9d89803cd8510c6fcb0ae87ba9fc1391906cfadc4e775432fb0219bc817083faee54f8dddd1326479eac84ed80e4dfaa501175a3fb1f5c1ded933e4b9cda33e4 WHIRLPOOL 389fee02b5f1975a47fcee54899bd4b4ffaa216f7bb7b09a113d22d1e8cfc73f506a6c030d14397cd5851774d8c89fb0d17e42cffba29160b6673f0068f556ce
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160324.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160324.ebuild
new file mode 100644
index 0000000..adc3f98
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160324.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-03-24_00-01-48/zip/netbeans-trunk-nightly-201603240001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar
+	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
+	http://hg.netbeans.org/binaries/38DAC4EB409E96D3AABD4D3F5807505BB751C043-clank_0.3.6.zip
+	http://hg.netbeans.org/binaries/BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip
+	http://hg.netbeans.org/binaries/E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip
+	http://hg.netbeans.org/binaries/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+# These files are for remote development and debugging
+QA_PREBUILT="usr/share/netbeans-cnd-${SLOT}/bin/*"
+
+CDEPEND="~dev-java/netbeans-dlight-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	>=dev-java/jna-3.4.0
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.cnd -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r15-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar libs.antlr3.devel/external/antlr-3.4.jar || die
+	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
+	ln -s "${DISTDIR}"/38DAC4EB409E96D3AABD4D3F5807505BB751C043-clank_0.3.6.zip libs.clank/external/clank_0.3.6.zip || die
+	ln -s "${DISTDIR}"/BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip cnd.discovery/external/cnd-build-trace-1.0.zip || die
+	ln -s "${DISTDIR}"/E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip cnd.remote/external/cnd-rfs-1.0.zip || die
+	ln -s "${DISTDIR}"/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip cnd.modelimpl/external/open-fortran-parser-0.7.1.2.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r15-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.1.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 3165cda..0dfb241 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c
 DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
 DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
+DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
 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_p20160223.ebuild 2968 SHA256 5c71a5d3b3984fdbcb1d2226f70acfb024f514090341bdb21320f294aa5f710c SHA512 53f8dd01002daef65a7aafaa1dcd8d16f5fa6e6679930eeea987fcfd0c1dd44eb1997eb4f765cb8a017eaf0549c27ceba876e9c3b25610ded868da8df1a2fb78 WHIRLPOOL ab9074b255f9e0041148f5a9d715a6ecff2ea3ce62b931f7eb588b3e71335c66ccd080bf01f8d14d3ad1608f790a3d47b61bef0bc1077ba4f3f667e538696bd0
@@ -49,4 +50,5 @@ EBUILD netbeans-dlight-9999_p20160316.ebuild 2968 SHA256 6d1c43401d93014a97b07f8
 EBUILD netbeans-dlight-9999_p20160317.ebuild 2968 SHA256 8915c4c2d0aa3cafe72d4b55c44cb6db5579e97f47717794c615b6df5343650f SHA512 ecda9c9ded00fbddd9da5b4e381783f10ef2b58e8b86e2128d6964c219539508bb80123291e91647cb65d33ebc4112117e1469390513db4429587067a9d79a42 WHIRLPOOL 8bfa9cd428c26c9e1c47a9b5363634f479671d2aebe3d3f42963ada537d467b57d1ba729a999c632a80170947bfe6fb811566db73c369c2326648b398622a79c
 EBUILD netbeans-dlight-9999_p20160318.ebuild 2968 SHA256 9fd185fed7b6965963c5b533347e7d63528235af613dadc2f348ab81cbfbe874 SHA512 bb1d6a4e63daaed2909179ba75375e7da5edc5ca73736166d2938af7094863d528eebdb197b8575abaf9578c10abc46be3d05d1b64973348db920568a7f30553 WHIRLPOOL 1f5ce94abe9a9202c8cfd11ffa6254e7b00ec3d4fd427436ed4aa3fb843fac6f70e98275f154fa4d78023805b73cbe67cee4135660e5f67f4ea9e925a4ce3770
 EBUILD netbeans-dlight-9999_p20160323.ebuild 2968 SHA256 91643a3d24626b8209a58899f272f0776f882d7e1330ed76fe83a2a72b985eaa SHA512 aefd98a2a7b88b6a4edca6876be5c83dab37c86312e16a7d7feccaf7ce956a08ff3e8381aa753a6fdef4c35937b69540076d07bf8e0cdc492b738caa7995920e WHIRLPOOL f135a3b61b8d03d2e466089c6d7abe5acde926a1dd60490d69257dc3142da7715bcb4143b59b14dec27fa7bb99ad10a2bae59db2a84f8950283d6a2460ddc111
+EBUILD netbeans-dlight-9999_p20160324.ebuild 2968 SHA256 8fb715281d7de1790f70125e7c28d26d53fd09b315f5edc1f7cd932a1bfb32db SHA512 28f7a7697ad50ef0f4d4911a6e97c7b0cf7f6c8567aceb5cc570ea1ba0851da7bdc406914dc95f72b6085b8d60a05adb229e2d0a84a5e5b4e979ae58990a1fa5 WHIRLPOOL fb50116043f6877ce33c8711f03b7fedb031720df837ee0446ae016b6a9956c87dd0d9a7ff42aabd663a9deeb712c87964a30ab910004c168e0e892d8e33e89b
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160324.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160324.ebuild
new file mode 100644
index 0000000..d076803
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160324.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-03-24_00-01-48/zip/netbeans-trunk-nightly-201603240001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-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-r15-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 4f8fcfe..d5607ae 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -56,6 +56,7 @@ DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c
 DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
 DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
+DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
 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_p20160223.ebuild 15825 SHA256 31e2790d5ab2f3cf60e63f961bd691819376197b39ad8280589d7002d2f2faea SHA512 93513a9390f16e5748fd9b51a219f9c7200206fcf3c4f2f40707549350b85a1af11151fdcd7d51cd97dfe27f4d2f9d92da6226bb3dedc23cfb9dd01bb1a45b33 WHIRLPOOL 9aebe0834717768a3f2f140c3b6af9d1c1d59036775f1ee27803b6db5ed3a863b6b1752b5c3a59cde27117ce5c0e09e6d74c4c4deeaae4ec243ecce328a8aced
@@ -78,4 +79,5 @@ EBUILD netbeans-enterprise-9999_p20160316.ebuild 15825 SHA256 ff3f2c1a3e30aacaa3
 EBUILD netbeans-enterprise-9999_p20160317.ebuild 15825 SHA256 4f2fa626c07ffeb3e1cb40e3c5c4087e30a16d842b8d7394568074bad37f1327 SHA512 2d75b7ae04cde94528f22e67661621f6a2128d9ac4cab2666f7d8b7dbb67c543202d391fec60587cf41b7c4ba77df7d223b0e63581606fda4fd9a74d2b284860 WHIRLPOOL 4957421c384f39bf9068af973a6b633d8293836ae3fafe4dc048cf0967f77d5445682591e9bc2e627230e8af559aa32ed250e3d86d065b17dc44c0683befc259
 EBUILD netbeans-enterprise-9999_p20160318.ebuild 15825 SHA256 e1153728673703675acd0655006d6d4414c130d47d1ef48ba3aa282e12ad2db4 SHA512 1f78c2496cbd01ea5ce4a06d626d978228ef75895508d4e88b7a3410a5ad1c2771ed53e81598a94e7adecb8744649d3314d8c5b0dbc05d274e7fb2eeac7ebf6c WHIRLPOOL 4acc2564cb3d2b6f2639000a673e83ca8830482dbfecf4b88db28a617d636b1b05faf45aa1760e82aa3fe4eb56cc07015ed22e7924fb8065391e7de3341f4a05
 EBUILD netbeans-enterprise-9999_p20160323.ebuild 15825 SHA256 ff658282faaf219891dbf9a1c2d95320f26a084fe1b38d123a7154c54eca36e7 SHA512 cf018a3be15ed0a97f6d5c8b1be2155085c57cefb65853013c25e7b94fde6ffc4dbcf016a50a40712b8b41f5f57786a9017f4d1f53ea1ab400775e986c8270bf WHIRLPOOL 0a1e3d705a21e2ab915cdfef89f8f362cd220540130a1019116f7c31d0861c2de2dc0089679243fa5289151fa57208aeb9733e8a906c25cce621695fee0b31a8
+EBUILD netbeans-enterprise-9999_p20160324.ebuild 15825 SHA256 37728049eaa9e52e9b79c1483769163e770f4c2314805dbc83cd6d7d342406a5 SHA512 7d202a74a29f2e1548e7a078a485a8db9cdf007774517cba99defe203379353a229dce42787e6c71fad1fe1cc67ff0e69bfca23e0ceb6334d5f8cf1355396e1d WHIRLPOOL c541d6d79a12d6eecb3c1d0207bac6dda0ab7f8d06b5b80862352104dec0e3f11a4b46b038c297b45a3f40393fc6088630d5c48b8019de9d43711a78839278c5
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160324.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160324.ebuild
new file mode 100644
index 0000000..f0bd4be
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160324.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-03-24_00-01-48/zip/netbeans-trunk-nightly-201603240001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-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-r15-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 d8c0ceb..b0ba0b4 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c
 DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
 DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
+DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
 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_p20160223.ebuild 2913 SHA256 6ff5f86044c351beff5dcefb88b1789dd0e92ce6202a958ee0e3e8bdc63604b8 SHA512 4a9c5cb7f7b45be903cc9005bd179dd7ac402f444669d0297cce4c4d5cacdab0e34db98a75795e29ec80a3b451607f0ef093e3bb58af8293a86caf6b876ca1a1 WHIRLPOOL be19765e738e8cee8298eb87efbe40dc3e037f6d1814a605e339dcdc4b4109cc20156c55b117c8b0cdc3532e2347b78d428729c87427bf1aba2559dc2bf10adf
@@ -46,4 +47,5 @@ EBUILD netbeans-ergonomics-9999_p20160316.ebuild 2913 SHA256 fdd9d8564ee09ebcd6a
 EBUILD netbeans-ergonomics-9999_p20160317.ebuild 2913 SHA256 52f165b1a959e0d0d1d49ed05825bb48851c8c61a2003b0373dacadd8a7a7dfc SHA512 f18c58e496bc0d2cc1865f3771e1ea33253758624bea93016092a4f8eae3c88df25530ce39624ef3b803ece62afe5ded9ff302c70c5dc6ac8945528b5c5e787c WHIRLPOOL c04d952c243d0e0be48d70d4fa92ad8cbb36e8191d44cf49ae0ec3f8228c71d3f691761bb2dd0539ca6ef3da79807247c439a645fd0102a9b07fb5cf034edd4d
 EBUILD netbeans-ergonomics-9999_p20160318.ebuild 2913 SHA256 2edf1ef963b14ced4503f9a90d5f984ea8c5b09124f46072ace319e2e6ca9f99 SHA512 8fff57c0c944ea948b82f2a64d01095259079e754baa5ce65fb4d3284981d2c57f2778537b4af4c7978137259bda90f332bde95106397f28827533d74967386f WHIRLPOOL 0f4a9588486f1661b795fca54479ecc9cadcb371712af38ad56473b5d7f1739c90fb532e7758a8b5085d1777ab4f422b255077dbe435f563f9564c0ae6b426e8
 EBUILD netbeans-ergonomics-9999_p20160323.ebuild 2913 SHA256 bed218767277e7c09f35753e37f5d6bc3eb7b6472d0ab86ff0b6a6dcb1bc3b3d SHA512 69840a6b0971ad77db60bfb34b59b3b33d355a1e98c8eac6d887429ae3cff4fa75521055f458cc47c9c35210e28ffafa6712634300ac626d4620939c97dcfa96 WHIRLPOOL d3cc043d84e34937ecb38ff653caeb817d26226b9c972d17d4e7e0723fd48a6e7e288e7dbfd07b42a53e8df4b86aeeb59d302e3d205013842f07b3a9922aabe9
+EBUILD netbeans-ergonomics-9999_p20160324.ebuild 2913 SHA256 e6c98bca21c43a04e9685d78b02deaeff6bff45126103b31618a0df224090830 SHA512 8d0076867f24cb09cea36a9348ff766351472efc39342a16209d43e98f5b400341a28fc753ead534d4f8540a1c025184c473b119973fdd6a00661a777cca4b79 WHIRLPOOL 3a48e023aaab8bca0d88e6d7bb50d1a713035d70e7db7f206e4d87140bafd700b815923e32b553b8cca57a30091ba6064ce121e987e34f5e1167207030b440cb
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160324.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160324.ebuild
new file mode 100644
index 0000000..a5f6529
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160324.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-03-24_00-01-48/zip/netbeans-trunk-nightly-201603240001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r15-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 6f9be47..de34839 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c
 DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
 DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
+DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
 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_p20160223.ebuild 3377 SHA256 d0c25e373788ffe46d79bae6d6d94588c767d48b9c37935cdfe8f5bed5ca93aa SHA512 4341073759bda3e69ca842de17b00235cd105a358a5a9c13386ef5aef3592dd632c5ccd0414bacead5537b065782ce1d4ac68ceef9f90ce63d46489aab7e3a76 WHIRLPOOL 383677b45d93edf0de469d73b148a9a24e9f02d2aec19a838065de72ea3199acbfa9af986f7e8d5600c422c7c2cff0b56edd065693c9e2d456a6e86b7e3e827f
@@ -48,4 +49,5 @@ EBUILD netbeans-extide-9999_p20160316.ebuild 3377 SHA256 109463728e454d659cadbc7
 EBUILD netbeans-extide-9999_p20160317.ebuild 3377 SHA256 f68c3456143ad28df02562514720a6baedeb7fa67223e43a979e937c1510bb8b SHA512 4ef90f0dac9ed68e2c071a3c75fec783434c6e506ae8a92e4e332725b11e063585e1ba983435ce2f526baaa42f37f777059eb79979700bfbed00352b860d3ea9 WHIRLPOOL e1db60ffa1dfb73e9c2b24c202bbe23ba0c10285c0d8cd76d9b717d0f3668cc229e4c8cce99bc8107473640d00c1fd550d5e73af140148ca6650e6d0c7e045d6
 EBUILD netbeans-extide-9999_p20160318.ebuild 3377 SHA256 b9a02da0791616ec505c1c2a2db90dbb61f96e916b13e1dca95935492bec7a9f SHA512 e49d40d1d4c10171f864b175ced60552d0840c8b226579d682d9b404b53532715a3541a1bcdf91f57b8e5cf9ee97201b2ee7e5a07dcfaf5f8601fc746402e4e2 WHIRLPOOL 9892c5c4d6c2729f6454912e48b1e42c0bcb4ca3aaa5693ecdb5ef2a31ee71e89de42093998a7e2523106e5eb5052715d559226c72c4decfe08da22bcf28c14b
 EBUILD netbeans-extide-9999_p20160323.ebuild 3377 SHA256 c583f98fb3dddfe84291425cc2475a5799f010089c83c7da06391d114fd87f58 SHA512 7ba61d1c8cf405daaf3da17d5a1f28c922c904852482e54c320281b78dc10f4c6531f0335d548fb563353aac976ca165b1603ceec24a54b773bb8d5408e3f513 WHIRLPOOL 95cfb50e92e1f654f70445a46b139385e716b2d170f6ddd1eb4e8f6aa724f1c9740dcac9d0f581165d41b8fe37e7f21366afb33b69386daeca4848721b41826c
+EBUILD netbeans-extide-9999_p20160324.ebuild 3377 SHA256 8148eecf86a1840a72a286808d9ad14afb1d0849666fdf0e496049824d6e2a97 SHA512 3ba646c52fb178d757d712f2734f2a3b706ca5cb90b96f5ae5434b11221d8ad7634b8525213f03a3deb751d165896dd59d71ae28bbd26b7bdc305be06ed11df2 WHIRLPOOL 2cd08fa3cf305bf6ef60a662a9dda4b4e2b6da471573ee8ecb3d78b08ad23ce29916e2757cfea5aa79c8e7dfe1800ac88064c4098d855d5c1c15f3c98b8452e0
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160324.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160324.ebuild
new file mode 100644
index 0000000..7bc8ddc
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20160324.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-03-24_00-01-48/zip/netbeans-trunk-nightly-201603240001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-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-r15-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 6021581..18dcc83 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c
 DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
 DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
+DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
 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_p20160223.ebuild 3416 SHA256 cc089bee4a8b4574f642ca131ed8c7bfb55588938f452ccdbb6d06fc46833085 SHA512 4ae13ae2b1b43c5f53c3119114bc184974cd402bf9d81d76a369a399d3402a6052ef650f016765310111b3be17a756713cab63a03f6e58056a87c72f1e1bd981 WHIRLPOOL e97e7198d220497f158caaf02f66aa606b05032484e9284d202637ff6d08da8a655a9e2aa5f911748fa3f3ac5b170674b8d4993bcc62d4e0ae2a73b545f59554
@@ -48,4 +49,5 @@ EBUILD netbeans-groovy-9999_p20160316.ebuild 3416 SHA256 98385adf344a4b4ebadb33a
 EBUILD netbeans-groovy-9999_p20160317.ebuild 3416 SHA256 c9c15ab6709d20709a6375fff328411d9cca28ab714eb05790fad5432a9a5514 SHA512 97202604f1e4db1a816a1b08fa41565c92c168a7ddbbaf09206f6f00ffdf484ecf5156f9b1985db1e8fda56a98f562192285e86300ff6703032f1ab3704aad1d WHIRLPOOL 8e1732891548a904861eb3be803a4e75a4f1cae2dfa547a07266336d3f1c3d324cf217c4536edbc14bd7e14f23425875c5a17f5b5cdf8eeda075e3b018cd7f36
 EBUILD netbeans-groovy-9999_p20160318.ebuild 3416 SHA256 4a926c35e0df3789d6403a6fdf761eb6f5d70c7634c3957b0d3ea8473bd987af SHA512 fb676c7154871b994cba18b40d70e12e9504f53465d3be27e095ee2a2702982f520fbafd3296e6f5cdb88c3cd57327caf6e59421c847fefdfdc79dd1fa38848c WHIRLPOOL 4589efafa72d8ffb90243e758597ae172d4c4d6e33e060b2210b3d266505235f09b63d3ffa7bc02571f8522ec3480c258a250e74184b6a3c76552b6aaee4041e
 EBUILD netbeans-groovy-9999_p20160323.ebuild 3416 SHA256 cae40b6dee59adc072b92f47ca65705df610e33f52c4a5419b3f4a588d7092e6 SHA512 061b3da802905ec04e2162e3802957df73d2b753be7f0c8abd5db73a16e9b5a150589792e30d7b017c23b522774f424cb2b5d6f12ec7ffebceea8bebd5d6bbee WHIRLPOOL d2a7c2648c7bfa42e4d79caaf38bcc6afac696b7d35af4407925d61b13c72941ccd2f832a65802590655eb86ccad014584227695419cdcb529b3c868e218d161
+EBUILD netbeans-groovy-9999_p20160324.ebuild 3416 SHA256 d1b0eb9dae7d7c44940c1c75f1b912dab879aee4ab606d09f1f447c87f981d07 SHA512 67ad98d92f2580f51c88416b6ec452151f498ff466dd5330eb8a1336d56eaf6c82b2def4bb2b11a76591d94fe56fcff83c3cc5de58bccf9667707ff5aa9c9d8f WHIRLPOOL 8f1674becbb39da6a11341120d1880234e74b7f4f4fcf0b0d18f701d4fa57ecc3c826d23b0434290964f6621cb630349d903a44db76085bba221a978e7e7bda7
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160324.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160324.ebuild
new file mode 100644
index 0000000..84b8ae6
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160324.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-03-24_00-01-48/zip/netbeans-trunk-nightly-201603240001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-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-r15-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 e1cfc1a..ba76998 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c
 DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
 DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
+DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
 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_p20160223.ebuild 4126 SHA256 57311330141b3f7b60f7e643652f8805bffbc170b1d4de9bb1caa55bd1c2d6c2 SHA512 60b4b0c90306a9249798047d43a152a64b03a13ad46ebd7a417262d69837adafc94b220539d06ec10ff54b1bab55593a90bcff5884c88c4c6b3e677f97f1a93f WHIRLPOOL 132160c30789f7f5a66c84f34555fbae7a76fdb1321e37f6a3559abeac25aba8463fd323a740eee3586c2fcb8b19fb2928a8ff57f562d55d1f1390e9d0cf0ac7
@@ -51,4 +52,5 @@ EBUILD netbeans-harness-9999_p20160316.ebuild 4126 SHA256 6deec86c975f542f29865f
 EBUILD netbeans-harness-9999_p20160317.ebuild 4126 SHA256 ce03fcd0de453da4e2a92e0f25cf46681fd64c403a5fddd5f4b745ae2eb067ef SHA512 73feb0a1fddc05fcfc8dbdda8ad541359bbd196862c575723c0d217b048d08d8c16d570e18e713299dc7bd0e19e053fccbffaa85d0fb6564f40fd50f0f9cf664 WHIRLPOOL f9cb2cf168be7f07c70c46103ff7d6cb9b649ff98b593ee021920407ff46f3e979b23e5403ed0badc7a13fead4024c557dca000476aec8fb6d99c1666184311d
 EBUILD netbeans-harness-9999_p20160318.ebuild 4126 SHA256 6ae8166ae7e7384b5e91bd09aa8e30bc0f830150a618c2c27db5319ee6c18851 SHA512 d06edabe7275a2a35f4b627bf33efc6147b859197a75f601a069684845d6ac9eac2ceb7710d43b4b0702041ae18fa1f7e4ae0449d41ee1cc0b1e5dbce5fb3105 WHIRLPOOL ed980870f12b1caf4ea2cef8878c06900d4fc3191f553b2441aec137251c4962590b524d3e8dec30864b48edcb435c4285b7d6a3d8a0b7fd43dd04c0c3490e24
 EBUILD netbeans-harness-9999_p20160323.ebuild 4126 SHA256 64a3e3eee2f5b7a30ced6a751742f0018eb14556d27af01342869f4acc59d179 SHA512 217c9adf60a041d2e8924b4a76a54e6454e7d1e0577d7a3329b16bda8741026fbed47af84627b606178d8b6c9ae287e8ab05b79640a875568febf1ad5afae8b3 WHIRLPOOL 2b05a70fe465352ed4a785aa8c4e654fdead5c8a8ffca2822aa068f6cc096f5404769abd87920e14e59f8999384c611cb64702f9a6a8b6c2a7aeb1ed8c8c52bc
+EBUILD netbeans-harness-9999_p20160324.ebuild 4126 SHA256 7b33730ce7e775358592b3fd4a75f5508efcf5180ed3b619cdc7f46197a24b2d SHA512 c89f6b8e2a6e1db0537292fa8388821c00587e8c1f324a0a292fd0b07a52570ad3ef612d372527f215fdda8c181662be44cd7b50d095fb7fa1d77a227fd70363 WHIRLPOOL 31d32dbd1a313a478641a89ef289f82ab86bd33226ceec3035ec366de71d68c2fb546e95f2766d837fa0e892345632c3aa8e76fa2abb0a8c2e21ad71e3ad8289
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160324.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160324.ebuild
new file mode 100644
index 0000000..040b4a2
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20160324.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-03-24_00-01-48/zip/netbeans-trunk-nightly-201603240001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-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-r15-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 6978c0e..30544a2 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -156,6 +156,7 @@ DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c
 DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
 DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
+DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
 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_p20160223.ebuild 30235 SHA256 42a75953a9bdeee192bf1f6ba62b4a7d9b2916656e49633c270025726e951844 SHA512 ef07e842663d9de4d43bf95a178f21a54e9ba50c42f77e2b6baf539cb8bed2d92fc277e5be568e6ad5c65cb84ec9f2f9c9d81e43783c222b00bac850fa7770b2 WHIRLPOOL d732d829d40f779573a6a4cb8f669844abf79985aa9afde6e32c0c643def9e0f007daeece0fd275268b44b161d65b7b92f78038c15d4b1655f53e493f566b2cc
@@ -178,4 +179,5 @@ EBUILD netbeans-ide-9999_p20160316.ebuild 30250 SHA256 1c00e9ce20992f520a4ed254d
 EBUILD netbeans-ide-9999_p20160317.ebuild 30250 SHA256 280833d0184aa941e05a2bf9ba7292ace7929536eb69b70f66e55e62640101d1 SHA512 84f301cd9a9e442c92f80b0217a553b9c6332355210a8699136d7975d4cb4f0b232285e6b5063825152f8c9814f14148a496d5f412136b69bbb62e5eb19da36a WHIRLPOOL 398ad8adde07f0d1f2c716adfc28078141d015fcf9a7587fe580b4f90558f88914ce9357e2029a20660108c5cacfcc82ace837401296a7b19d1ddc47f7b98b8c
 EBUILD netbeans-ide-9999_p20160318.ebuild 30250 SHA256 d9180327b8af7764ec36c8bb8bcd39f77776922482810290acf54d12af4c24b8 SHA512 5ceabfa4c585ba734aa8961d5ef65ed27f871e17c3f0f328add00ef6caa77d2dde7ec4f048a600a0f2e5211235fdc4cc00572c181b544e267a1e78fbd63e6247 WHIRLPOOL 2ae77f9a6a195fef9614ea7456907c0d9504bdaf43e5673d646300daab9888f56114a4e3dba07edd8c0f66c4df2daeafc6b6dd8b7f7f610c46466096ac35e9c5
 EBUILD netbeans-ide-9999_p20160323.ebuild 30250 SHA256 2bda5de8b196a6ffed491baea0330ab492b40d95510c336705ee8738255365bd SHA512 dbc858271d0823a30357b958abd0ed1b8374a2b31f946d6902e5d520006d5d3f37903f6d058082af71c226fb4034cfe41f40d7f336d7cb5df2097aaca9a672f0 WHIRLPOOL 10b0beb0952f480a5e22e7e1ad09d266e7952f399458132e2e41693ef606df64f5743caadb7a1bb6053a4bf47f336479b6ea732f7104c1bb465215ca18d5f86b
+EBUILD netbeans-ide-9999_p20160324.ebuild 30250 SHA256 04d607de1b06ae0204605a9efdb571c3ce8cbf03bbff115f348b63312d905855 SHA512 5f7cad19077abe7a4ee7c379a94c28b876f8afa3f97118d4103593a3ad5c05d3f347f64819cce11028a5ccf5e0859de42fd8908c09cc99d74b06a33860665d4a WHIRLPOOL 191534270b75b92f56a8907aa25b3de604cfb18923f2b186c12eb80e0e3727e3aaa3d262279e65e7b79e55808223dd7f21a5d6eb7f4f4f0a2d710042f2c51a14
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160324.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160324.ebuild
new file mode 100644
index 0000000..4930166
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20160324.ebuild
@@ -0,0 +1,378 @@
+# 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-03-24_00-01-48/zip/netbeans-trunk-nightly-201603240001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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/ACAB7C860DF78C4A528FD8A64F2C62A0A96639E5-com.trilead.ssh2_1.0.0.build219_t20150519_2322.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/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar
+	http://hg.netbeans.org/binaries/8307A44D3F150F1BB317532097A0C7D125C00F2D-org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.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/D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar
+	http://hg.netbeans.org/binaries/2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar
+	http://hg.netbeans.org/binaries/5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar
+	http://hg.netbeans.org/binaries/24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.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"
+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-r15-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}"/ACAB7C860DF78C4A528FD8A64F2C62A0A96639E5-com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build219_t20150519_2322.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}"/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}"/8307A44D3F150F1BB317532097A0C7D125C00F2D-org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.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}"/D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-javahl-1.10.3.jar || die
+	ln -s "${DISTDIR}"/2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.10.3.jar || die
+	ln -s "${DISTDIR}"/5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.10.3.jar || die
+	ln -s "${DISTDIR}"/24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.jar libs.svnClientAdapter.javahl/external/svnjavahl-1.8.4.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-r15-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 --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 35edc5e..345bc21 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -54,6 +54,7 @@ DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c
 DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
 DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
+DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
 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_p20160223.ebuild 14930 SHA256 b277782f4837d65401fb02c278256ec2644d66f890907769aa8f0723cf2e3680 SHA512 7586e79abd8e88ace311a543b52a76653d8d6d6a2f21c2d19f0ab0e0cd869538fa561552e591188f36d7a0aa5634d71cfbd7f2602deb3143a8deccfa66f49420 WHIRLPOOL e9d97aa78c4786b646e84dc50951b4818440517a328c74c32f59e665f8b775d425f4b9a83d56bf3230cadda12fe9708b676bea680a1f659fa66b068eeff49fc3
@@ -76,4 +77,5 @@ EBUILD netbeans-java-9999_p20160316.ebuild 14930 SHA256 825e6e76d356b0cac519ea8f
 EBUILD netbeans-java-9999_p20160317.ebuild 14930 SHA256 795be76cd0800c4bc46f7492e7f69efe55866f87f23e6e6add82ad1f2f22bf79 SHA512 c3da9f0a49e973db43b353c339247b73619787e8806a54178c4683cc15d5dd085ba5d3167bc639985a924fd30d2f71ad84bf3f73e303945a610650779049be70 WHIRLPOOL acf15d379a561863838b99a2816da85aee0a6248a1e5fc69992162be599cb6c4a1e95042907fcf013979cb7e8723b4356041775f449b91e8f831ede3ef73742b
 EBUILD netbeans-java-9999_p20160318.ebuild 14930 SHA256 ed99658a8aa6b5fff711e5117d68e428f79a789dba4bcfd5a1fe61805fdfcd59 SHA512 c1ca5e2c5d5862009fbc532f140b9b77ed6130edff37dbe069635d3ed7f3ea05f32c7e7336763807bf391cc75f67fa62ca5c2480ed4a8fa389aca86e153030eb WHIRLPOOL c9953168b1cb056079284e65196e0b10565a5bdaeb570639155cc2051a01e7a892f7110ee743db13ecb2b18e05f02a5a6ada48f42bd9be8b30b82b4c6a3045a1
 EBUILD netbeans-java-9999_p20160323.ebuild 14930 SHA256 c6ce42878879b67b80dde5580208c87c15391646f3df1866e8e1c73a2213b1c7 SHA512 3fcba554c4d3f22c093082393974885a329bb2d7ac3c3b9559e3307946a9a67f6c44b45b321448fe68a0b1e47d0db2262b6c8c3dac7f2c1df6e63b2e7a8b2201 WHIRLPOOL 32802eb70b582d546ca3a955146f007e9c6ed0919bf965693ca0da2b4de98cf6dce16fc4964ed6c893e0356994744a35ecf19507026850490895c2af58764562
+EBUILD netbeans-java-9999_p20160324.ebuild 14930 SHA256 6d2d83b1a29b2b515be25315319dd88c8f2d549c9f3207ded042d87144add95e SHA512 b9c0abb6265b022ef28197ed0ec826ae2428d00e4f4a747178f8fa6f8c6232c5164cb621e338abe3ddca85822306a97a55a4189d16eb2c4315a134732d6a3f7b WHIRLPOOL 52bfc7c68a7aa73f62367b43c9ffd02714a3f12ec059239b8e2db9558e6107fddfa0bf52677bbc07614daa10036dc33f38daa4d53747cf56c80034c91032186c
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160324.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160324.ebuild
new file mode 100644
index 0000000..5f94fb8
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20160324.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+# Maven cannot be unbundled because it depends on exact maven version and exact content of maven directory
+
+DESCRIPTION="Netbeans Java Cluster"
+HOMEPAGE="http://netbeans.org/projects/java"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-03-24_00-01-48/zip/netbeans-trunk-nightly-201603240001-src.zip"
+# jarjar-1.4 contains also asm libraries
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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/A53B309173366CAECC47E78F2B4B17121A9798CE-nb-javac-impl.jar
+	http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
+	http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar
+	http://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip
+	http://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip
+	http://hg.netbeans.org/binaries/B572007A07023ADF7ECBDB7FC2D572BF1BDED20D-wagon-http-2.8-shaded.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/beansbinding:0
+	dev-java/cglib:3
+	dev-java/jdom:0"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	dev-java/json-simple:0
+	dev-java/junit:4"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}
+	dev-java/absolutelayout:0
+	>=dev-java/antlr-2.7.7-r7:0
+	dev-java/c3p0:0
+	dev-java/commons-cli:1
+	dev-java/commons-collections:0
+	dev-java/dom4j:1
+	dev-java/fastinfoset:0
+	dev-java/glassfish-transaction-api:0
+	dev-java/javassist:3
+	dev-java/jboss-logging:0
+	dev-java/jsr67:0
+	dev-java/jsr181:0
+	>=dev-java/jtidy-1:0
+	dev-java/log4j:0
+	dev-java/mimepull:0
+	dev-java/oracle-javamail:0
+	dev-java/saaj:0
+	dev-java/slf4j-api:0
+	dev-java/slf4j-log4j12:0
+	dev-java/slf4j-simple:0
+	dev-java/stax-ex:0
+	dev-java/stax2-api:0
+	dev-java/xmlstreambuffer:0"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.java -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+pkg_pretend() {
+	local die_now=""
+
+	if [ -d /usr/share/netbeans-java-${SLOT}/ant ]; then
+		if [ -n "$(find /usr/share/netbeans-java-${SLOT}/ant -type l)" ]; then
+			eerror "Please remove following symlinks and run emerge again:"
+			find /usr/share/netbeans-java-${SLOT}/ant -type l
+			die_now="1"
+		fi
+	fi
+
+	if [ -L /usr/share/netbeans-java-${SLOT}/maven ]; then
+		if [ -z "${die_now}" ]; then
+			eerror "Please remove following symlinks and run emerge again:"
+		fi
+
+		echo "/usr/share/netbeans-java-${SLOT}/maven"
+		die_now="1"
+	fi
+
+	if [ -n "${die_now}" ]; then
+		die "Symlinks exist"
+	fi
+}
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r15-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}"/A53B309173366CAECC47E78F2B4B17121A9798CE-nb-javac-impl.jar libs.javacimpl/external/nb-javac-impl.jar || die
+	ln -s "${DISTDIR}"/CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.jar maven/external/netbeans-cos.jar || die
+	ln -s "${DISTDIR}"/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselink/external/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar || die
+	ln -s "${DISTDIR}"/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselinkmodelgen/external/org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar || die
+	ln -s "${DISTDIR}"/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip libs.springframework/external/spring-framework-3.2.7.RELEASE.zip || die
+	ln -s "${DISTDIR}"/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip libs.springframework/external/spring-framework-4.0.1.RELEASE.zip || die
+	ln -s "${DISTDIR}"/B572007A07023ADF7ECBDB7FC2D572BF1BDED20D-wagon-http-2.8-shaded.jar maven.embedder/external/wagon-http-2.8-shaded.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r15-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 9983d93..d8ccde1 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c
 DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
 DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
+DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
 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_p20160223.ebuild 4971 SHA256 81eaadb7b246ee0314f77557067d32da709ce6be3bb6f9fcaafddba33fd6129a SHA512 3c68f002019a464bcf5892befff75778eb4af2dcf63c922cda3f400c78e59eab65bc9034d71e1677d6c1ff54c4fc0bee464c5cb54bff2170f746b3a2306d92c7 WHIRLPOOL 0955a607abd596b29acfcb94a6bfaba00760e8da438b9cbf4ec7561696729078f9747615f68654d902c1be8e448a12256205e75cfadf5455b791b577e2c1bda2
@@ -49,4 +50,5 @@ EBUILD netbeans-javacard-9999_p20160316.ebuild 4971 SHA256 f49fc339a8fc9eb802540
 EBUILD netbeans-javacard-9999_p20160317.ebuild 4971 SHA256 491df3c98164a05ae23d9b5e73223b3b41dc9351feff5cacdb34b97f048c244d SHA512 cfd8484e25fa1695b0f63d230e13819abe002762cb45151e4484f736888dbc5f161adc07898c06e5af5062eb50018f03b05de8d92629153ccf288208c9504cc1 WHIRLPOOL ea3182004a92930e60b3c3ea3edf98a2e9e6610c91b45bb75721d07d1e15b10ed7cb2b23e99b3cd217f239f94c23ebb7b2f838629cffc22a30a9d3b519df38e9
 EBUILD netbeans-javacard-9999_p20160318.ebuild 4971 SHA256 056699e04063ee897948036907be6bf83365b0f8305e3dc516c75cfd22f935b8 SHA512 c00f7a769bb86713a7f6e08b10459972da5a8b0d64290316b11d0764302c851c08dcdf24d3c9a351d7921287395a17b75dafc2620c3df498b541b22c3e7e4627 WHIRLPOOL 06362f02d0a87760e59ed257a06c2d9df21c25fe38cae339e3fc424f813abb46a7ccab6197cc76131258ed6a78987e5764ea49842c0745a0562933f8ab4813fb
 EBUILD netbeans-javacard-9999_p20160323.ebuild 4971 SHA256 304241fa6209ff3e1cf3bfc82965b593e706860bdc9fdbf898428725b602b014 SHA512 cb95ddafcda3a2f94f4535e9d106f2ccf3a23e027cea3f510aafb508c13e899132bec1f89512805515fbec872a917b197425c9e5db80cb4f5637a16b7ba731ea WHIRLPOOL 001a3357ef99f759d08eba878eeb9d1f829338ab21e5a0806d02477419081663708c98a9f7c2d56d5b97b67d1a9cf457f5917f0e247764910114d4b2e34cdeb8
+EBUILD netbeans-javacard-9999_p20160324.ebuild 4971 SHA256 fa4b9ae984e18ce3dbe111254d82bd64fd5465ce8d9bc8db8a59ce3d5f3ab940 SHA512 7063b2c576bbc77aa98284b0929aaa4e17ce8317d22087c858503dd1ac55d743c8e337488469da6d76b6055b088f279105cbcbac7cda136f54ef13fb587078d5 WHIRLPOOL a38a74b0cdf930f2313ac2746d91120855090d2e2f4aca96049dae5a492a2e29c93aa25e5de1d7d3cd1e5cd6432467336d822ee35bdb23333eba3589aef27268
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160324.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160324.ebuild
new file mode 100644
index 0000000..8c2a237
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160324.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-03-24_00-01-48/zip/netbeans-trunk-nightly-201603240001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-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-r15-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 7742b92..58d7c2b 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c
 DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
 DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
+DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
 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_p20160223.ebuild 6293 SHA256 ab491f58251c66c9b1c0fc2daa7839dd5720ff13a841a34dc19a7b136fb3b747 SHA512 69dccbf92f435fee525321b3fe00e4d615ae89e4c92018492623e8c8c987220dd27bbc772707551c02e07e28e6a104c28d8f88f3fc93da319804190f0607cfbe WHIRLPOOL 52d861f5748d1a6542286c1422dd7a3f2973c531aceac0b23dfdf6da9fd19c3eea37c20555ddc14e7ebd928fe6fc156088b4e84351f116320dd0cffe24c8a5c7
@@ -47,4 +48,5 @@ EBUILD netbeans-javadoc-9999_p20160316.ebuild 6293 SHA256 522dc944441e51c7cef0fb
 EBUILD netbeans-javadoc-9999_p20160317.ebuild 6293 SHA256 ccba0cc3f2c9c218e249dbcb4212ede5a0cc3aab0ca730c098bb676af31e319f SHA512 0145f315f13f6a0b2ccde9945c1e28abfb060dd4bbb7150de508500bbdede9aa633e38027452c1b6e1a8854e5533f37adb0f4c5c26c49f03c4fe299f32291acd WHIRLPOOL 2c0dcdecb1682c057612b39d91b3eddaec685dda5277a8a1f438890659bd84f55932d6e80114062a9964e78135795ada6e47de7969942a7ee7f16a7b38a7ab97
 EBUILD netbeans-javadoc-9999_p20160318.ebuild 6293 SHA256 94c55bf82cc3a3c779f08957a2d8c0532bff6f9f9fd9f8bd691199c34ba17960 SHA512 a253b65835d939c2e88ff7f1d6d0f30992ccdff1d89f6a20517a74c1b76941b2cd4d5e279be7b28dd422b47d60f55911770ec5e5fa1f18b59f1ec5df1367b8ac WHIRLPOOL 2b7047fe8b601b61a3f4639f058bfd531e409a61a95bda0582d4c44d68e9e3c3c2be85a8faf4a750a95303f3ac8908703106576eeef571bb89b7da7e9e8f868c
 EBUILD netbeans-javadoc-9999_p20160323.ebuild 6293 SHA256 a0d7dfbb1f4ad34d6cfe54c149cdad842345449c3c640917bdbf96fa9b2e16e9 SHA512 09a676ab446a5b13157ca1290f034c8d85fc185f2fed5e62bbf2d47a005d5edad7fbe1df2c11e85e1267132d511ffef5237fa6dadc980f3688d108e199358406 WHIRLPOOL 4428da9319652f8000a3a83fefaf5eef6bb77364817c287c5565008962592074fb06e69f40b9d147ecfa7887f945d397a417e9e365fcc6c2bbefe08b6683652a
+EBUILD netbeans-javadoc-9999_p20160324.ebuild 6293 SHA256 8ad366e2a582d6278e1368fc110f6099445272bbcf88476f5296ec4149b4960d SHA512 a4f7fc8b05756d122a792ce2b6a8e2471185711b4c612d3434cd464dad9c8ddcf481fdeeb21645b607c4a4f002b0b444a6713b02b437d90f24fc3c199a98d9f6 WHIRLPOOL aba5fb3f4c6787673772306a653aeb979adfcdeeba1065bc41e3409f0006e5e35ac31e002684bfefa1b798bce29260e94a2ea5c8c3974dd17f29e00ff74de69f
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160324.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160324.ebuild
new file mode 100644
index 0000000..38f80b5
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160324.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-03-24_00-01-48/zip/netbeans-trunk-nightly-201603240001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-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-r15-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 8f0bfbb..ea515e7 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -32,6 +32,7 @@ DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c
 DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
 DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
+DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
 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_p20160223.ebuild 4717 SHA256 25d4a8912785b067f6dd613c6514cdfe999b0bebe59f22da20f626ccf2cbfaac SHA512 00f8e10a57e386752083fc639244212f709603d3013abc966b5db24996bbf347074d1ab7a6a37b7bb6faa94d38fe7cf39d93194afb8055ee65be5568c5f01ba2 WHIRLPOOL f7aa8804118828ffd06a2d5226d935d2dac3185ae7a369b6e407df90e89be86ddd3ba13ef7672414826f8e570f8a0507f89b2a7988c243c25157bc28f37063b2
@@ -54,4 +55,5 @@ EBUILD netbeans-javafx-9999_p20160316.ebuild 4717 SHA256 764340a3f0915bd67ef742d
 EBUILD netbeans-javafx-9999_p20160317.ebuild 4717 SHA256 fb1f635f5c5704857ea78a0a16da84600acc9fe2f60abef9e154c639ea8f4f16 SHA512 90b84a7e610f5c7d49eb119bec67cfbfea7bccba2a6d71e3db34e2176f249eda189066950788f4d67202b15ce47bfdd0c2a4c9cf6e56a13feb3cd04d7e32f92b WHIRLPOOL 741d79a2c97aa0e864a9fa8faf7da363b8b5d723060f6f712ca84cfb6f5dd4aeb57ab38c06b5813e349b05168f2228e65e43613945aa666fcca22cadedddd441
 EBUILD netbeans-javafx-9999_p20160318.ebuild 4717 SHA256 a98b52d8510e05b83888095205f09ca6e6aef0a8974e3f7e02f89db3d9b9ad4a SHA512 de84cda652907da0af796186bf487db82ec633899ed93d4e6d9df538bf0893aa97f364083707d573e115a2eaf3c4d85dabfca3586be6712c8098e883159eb8a5 WHIRLPOOL 3193c22d944a64b2f7b471098ae0ed136052a91b6f7ec2efc7bf4cde4b53cc8966a0c1a2e80b4ae78d16bbc3310ffab876f7577f13676442e0f3a8ec781a2c7e
 EBUILD netbeans-javafx-9999_p20160323.ebuild 4717 SHA256 acee79578d7f2ddc855790643f5c3cab5c04789a55609ee1748f112a28539bca SHA512 6ebf45a1e5db61d201d9131a1ce5b38105a2863b71b2ce8b8c6220d75505e874809f4a2f87ae7c0065458c896210b279d326cae108288797c0c23c84bda11c72 WHIRLPOOL f9a674934de5f0dc52a785884b0e7b746d9176f3d387ea3097e74ba8f8e093960ce5d5f7d2751caa05899e4d48773712283f68f5753b7a8bd300d984b04e135d
+EBUILD netbeans-javafx-9999_p20160324.ebuild 4717 SHA256 7aa6eaaef143638e949bb428afa2c01fe8b0a0df4e917bf58354c62dcea99582 SHA512 05c4d99f3cbe68fc9308a0289efad3ead6943de08d9ee2a632510491a4355452783daf2c5ae94b8f59a96c4e7d6541d95a377fcb820ec9c9de630cd460c5db9b WHIRLPOOL 3f7e4149b0c6eb55ec7d57f0b7f3b6698170b83778c8b3e81749fb1c5e7e66316b2f3406aa8cd5326063e762809d1839cea800522793e9f05d1323d9cf4c843c
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160324.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160324.ebuild
new file mode 100644
index 0000000..f2e1cee
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160324.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-03-24_00-01-48/zip/netbeans-trunk-nightly-201603240001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-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-r15-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 720ea68..dbd3e57 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c
 DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
 DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
+DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
 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_p20160223.ebuild 4412 SHA256 67e415144e9fce632d238454d32f3035f596c3bae87065d5a3b4a8702acbc3b2 SHA512 08b8f044ef846999e65c1fb928ca2f89088755694c87648b5e4de49321e03df67338a3e7cc5a6ef93207236de127074984e56e2c76b2b3ba3a68a7d82dba8a8e WHIRLPOOL 44f24e92b3d3aecf16ba3f5ceaf1caf0616c9ecf26b436690c8d33e6a29bb89717fc1f26d0b645d65edae12ddf4bb58606434f9878db53aa16886b7128a6c3f9
@@ -46,4 +47,5 @@ EBUILD netbeans-mobility-9999_p20160316.ebuild 4412 SHA256 ea5cfd184f876ba7820e0
 EBUILD netbeans-mobility-9999_p20160317.ebuild 4412 SHA256 c874d20f71d2227100460844e28bb4bc00bd19aa4d7483eea1b129f5c814e820 SHA512 75e6e3afc5a62312103a33b503208e0493307174fb50dddfa04723b7ce9eeb9fd6ac58a0cf7d688f93cb01671155ba5879fed235d8708dd5e9ebaf8c5b01c80b WHIRLPOOL d5fc34223f3b84d8af14f871b6589e47e0b5417a4446e74d50d088d67392e2944d5e3b690af0168be84310d963a4af03a62402419d21ab7873a7b4aa652ded7d
 EBUILD netbeans-mobility-9999_p20160318.ebuild 4412 SHA256 357ef62e12cdb2bf03ed092bdc0a11d1a438827263d12f34dbc4ed63ead26751 SHA512 1110898e3b5d77ab0c7237daa1091b2c34e2de0cb9b9f9bfce195be22e32e0b74e2c669aa94575cd45535fbcaa084694cae85c9378b79dd556d038ab5696f8dc WHIRLPOOL 72e4781b2ee1d5e067f461ae0559a6a9397284a93ed1a3d422c151f662a2756050efd2ca1762aec78401fe7ad9555f0d3bfe0db65b9cc484db34ee86bfb952ef
 EBUILD netbeans-mobility-9999_p20160323.ebuild 4412 SHA256 2c08c29b61f44d19335f0bf220f7ec820b0192d0ca47d769c711a2d72ead05d0 SHA512 4b398ca24c711f2f1bcf1afc481ed4a280afd96cb80a12f110b0e0413fe9b16d2d256675a10d40b7e53b70715487af45717513300268b97cc15d76228300e212 WHIRLPOOL 8c18bd51f1b207fc4e50bc627cb4486eb214cac313445bebabb1219a77df8c9f373a4be08b8653fa42a17c7f271ba29d0adf305adba642f9ec7726e351bcc5d8
+EBUILD netbeans-mobility-9999_p20160324.ebuild 4412 SHA256 7fe3799569385c9d5b492d941cd6e1291be71122c1d041fa3e85cd3f21a67efb SHA512 98c7cfbb2591f306d7e1c5f5f5be0dcbfecb24dc2f6686450088e2613bb64ff8edb3f259fb84246f526dbd4bfdbd3004d3074578485add9b0c10d304cd18c951 WHIRLPOOL 8289df14147a5e400f3ce83c471413ee1d6e1e2890045c35680b3096203eb51e705d4ffa34c7a94c67ac8ffb65b5b82c548efd93df0b93729fea28077d738ac0
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160324.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160324.ebuild
new file mode 100644
index 0000000..ab52341
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160324.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-03-24_00-01-48/zip/netbeans-trunk-nightly-201603240001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r15-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 65b6dd8..6a10223 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c
 DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
 DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
+DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
 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_p20160223.ebuild 4111 SHA256 d66c45ed0763ad788286b0c2fd3715a213fd405c04414cd2f92d45fcfdbfbdd1 SHA512 0c0e145c7b4b337d590d9cde5798e1797f90116ce61e79dd9aedffa5997c924e4e42d67e01e9d8b7624e76dce151f2e4ad19482ff3d58ec8a47ffb6f368e1310 WHIRLPOOL 2e8816fb5b5f533425570cce925ec834bb5ee5697ab05257949c27984f27cfe7f3e03cf8c582b0d6559d42e82ac9d41ca529cd04f1e65dd71eff0c4e675a8a31
@@ -49,4 +50,5 @@ EBUILD netbeans-nb-9999_p20160316.ebuild 4111 SHA256 a650d837db80676ff4197417482
 EBUILD netbeans-nb-9999_p20160317.ebuild 4111 SHA256 04f02792389acbeb49fe367ec5f4f238d337bfc5aff7a7c2fcce0c2c5eecb571 SHA512 8e41affc8d65fa3558d3644fdefca2eaf5c9497bc41169091ef7d963208865c8dec97935218e96bf9f94df01ce40563556df5852550f9fec55f86b4dfc6599a9 WHIRLPOOL d8c5103314289db1f845d4654b6c96f1bacb62cf992c2fe8829f16922bb56879d3bc13cca132aea66d75b5a54da28bea5a9d727b685ed7c457e5fac73ed2dc45
 EBUILD netbeans-nb-9999_p20160318.ebuild 4111 SHA256 0916bbee7a2fa8b2a97f17239c82fcf46272caad5ad403ab50902a31b1d7f756 SHA512 db4ffebc264b1d0d3ec384facf77d16d8e6ee702909cf3207c801813f766a223a38c75c443d579b09ec4fab809cc67e6b5354d388ef81ada89819f9a64c81c59 WHIRLPOOL 2eb654a9bcaac8eea74a496817a064da47edff2b61df8a1cc4e6468d841552eeac9f2b2af1f98a08df258ca336eaf73df0ae25ec3e2fd418d7a7ebf80db875df
 EBUILD netbeans-nb-9999_p20160323.ebuild 4111 SHA256 0623097b6d76f3290926cb3660f7d32c333894a546bd0cf0d6c48a9ec7f8cc3c SHA512 f00bea390fbc4ef045609a3bbe6475aa5ceea8ec257d63b349cb37f8075eaa3ff991f49e5814a11e18f2f7c92bdebda6faa62cc2f05f98abf7264bb0a41532b8 WHIRLPOOL 62132505d1da38d702ea426d82940b85b0229529995e5352b6a67868a9a29d1aae88846aff1257f524e63fc2a8e7fc32b47ba1e601c5d09148d82a22fe80bf4c
+EBUILD netbeans-nb-9999_p20160324.ebuild 4111 SHA256 10e8e442718b389956aee352fb5d6a4a86c90037738e42d27e57b06e4dcc2193 SHA512 169f92c78c7b5cc03454c33d4d1872895b4d4f30bec8b90180b197a4af50862554226dd898708db5fb7c8ed507fc904b1f25aaadbacb2cf883f7d750c9c65abb WHIRLPOOL 3dd6231a22792d864b50fcb3271e2ebf65a460c88bf2548f689e57ca3dbad4cdd9248f40a9885694dcc69bcbea8139ec8d5e1c1c9a483f9465b6396d93ab7102
 MISC metadata.xml 392 SHA256 01cdbcc83099b97486bd7b8e813e5b19c1138eb0d8d3e8a5683aafd579820435 SHA512 4d2f9160baa022d6a48b61d5f42e71cfd411d244e7a36436629bc5ee4036e4ce19079134d9a6c704ebe942306c2e0199d0591c1e54f92f8f3c8835147e639246 WHIRLPOOL c1131764e1cec66c56b977ebe36014b29e5a68e35ccc326c0cbadd050a6c625cf191c85c212e0a733661c008dab0d99f9a4cdc4c4ae0cc9d775ba1de554795a9

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160324.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160324.ebuild
new file mode 100644
index 0000000..cdd1e1c
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20160324.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-03-24_00-01-48/zip/netbeans-trunk-nightly-201603240001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r15-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 6b284e2..ce22200 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c
 DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
 DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
+DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
 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_p20160223.ebuild 4418 SHA256 52c28929af3a5a4f14c5b096e97f761274a3dbc4c7fa79d781f434ab7ec12251 SHA512 878af2b75881d71d5245309ab37fc30b2d674e7fc25caed52c8d3711df9225b845a6418747ad5f7323138d9ecf111906c798ad07cbecc303d9a9cf61a9bf2788 WHIRLPOOL 5400b24dd76b1276e97459e85b2290d69c96e86b6c5a1eea29b185d96435983e781e99ecf9293a87540738feb1fe578708b58b3dd90ef431ef1b85424941926e
@@ -50,4 +51,5 @@ EBUILD netbeans-php-9999_p20160316.ebuild 4418 SHA256 ce4a6d03d8de02b48d96c49370
 EBUILD netbeans-php-9999_p20160317.ebuild 4418 SHA256 cb50ef14aba92bd3390ecc90bcfb647a113193a3a6412dce24e6fc32d44a24ea SHA512 bafe62fffdf35eaef18d4bff566a0c4b03eff5401ae022827e24c7e4c7fe95cf30e702b275854ec56c58e7df77ee0cc75021db1fb0d20bb99fe7c536643b780f WHIRLPOOL 53921305b8544475cbffa331832ad9fbf82a521628dcacb051fd92ec0bda789ca2c1b205deb5715aa6179e1578dd08a369f52f907496f501eca20b02dcbf4c5d
 EBUILD netbeans-php-9999_p20160318.ebuild 4418 SHA256 675766ee5595a165e07df6435ccbc4c3b9fc06a04718f518f707a070f121cce5 SHA512 01c35192bb7d4bf5ed7fdc11249e02d3058fb69f0390c9dba1838cf61053a394a255999a40e69134c13c400061e49fded6928123e9b35f23522b44494170c7b0 WHIRLPOOL 2d9ea92b5e51dee994bd0353becede29f2b8053bb7f934368d322f3a815ca44a53ca7ff61e6e6fbfbcdc055a4df712623bbaf0289aa11504da3ba3a354566ad7
 EBUILD netbeans-php-9999_p20160323.ebuild 4418 SHA256 78af17d8ab7754bb43a899f0893624177e1e1c011d2c64868deeb3402f9ba9ee SHA512 8e88d0fb5b89a9b5546e3eeb22d78fa57a84ea9bac357b75e8add3e0a5367613e6af623df66e7eaf675018f21473264677adcdc0f73612d2f9754a7f35c5f8f5 WHIRLPOOL 635ba9612c20bf71236eb8481e1a69c835dfd24fc2d7f4331420f54c23a07a32361635512b25cd283b32cc54c7978555f59e25a42408827f8603623e3acc65d9
+EBUILD netbeans-php-9999_p20160324.ebuild 4418 SHA256 b0f98414bb7eca922a90d6881eea9c036bfd88db3bfbb272180a63104c1b0705 SHA512 b13d3e9b45aa5118350d15870edd543faea79bad4dc6e980ac951f9bad2b97a088130a750560969ddeafc01bfd4cb32a34659ea704c0a1e1c87d42d9421f05e5 WHIRLPOOL 61d2033daf1c4a34f6a2a9bb5bdc50ac6fbfab1ab2bde8022c87130dee0a81d55760b1cc2789c9f6ea0a1a076ee7bb4fb7e72098305b8383a07887e1e3ae2a12
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160324.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160324.ebuild
new file mode 100644
index 0000000..7c232e5
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20160324.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-03-24_00-01-48/zip/netbeans-trunk-nightly-201603240001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-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-r15-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 7f1b0dc..12e491c 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -51,6 +51,7 @@ DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c
 DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
 DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
+DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
 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_p20160223.ebuild 9360 SHA256 78c6427d97d0b1141709c88e2e30b02c68a6cf9474a6cab8830298b77ab8f025 SHA512 ba699c7ed9c2fb54e6cc8232f2214e7f96621cbf3858fca5d797627ce1d898534b21c9ee23ba6dcd91db931f5161d89c15463bb86387c74db66905b96f37603f WHIRLPOOL 750fa3cbccfa07bd00c64057c2f0d68469ea8db774fc975b19f4afe6d574f97adc2ad90cf73b780aff65b06f0a583f8db19dc9b0aab819b8f251e4c393a76b3a
@@ -73,4 +74,5 @@ EBUILD netbeans-platform-9999_p20160316.ebuild 9360 SHA256 9c44bd0fb5330b62798fb
 EBUILD netbeans-platform-9999_p20160317.ebuild 9421 SHA256 5d9828f5deccf0c5dc717bb6bbcd428a7d9c5ab91b867257a75ca1c933f9d6ba SHA512 ef8bd7e34f946c10a43821ff158a954a5cb118a56b1c3fdeefe63109a902c20ea624194013a9e749fd6998646d33e3808619f7bac8ed56f8c8b7007c7d434551 WHIRLPOOL fef24fc93996fbd6859bcb45a2a3030b16bded499149e0a717351d9e571ce5c50a35fc83bb24f9d5d8031ff340910b96a46ec102ddc267f849b71c9e511dd2ed
 EBUILD netbeans-platform-9999_p20160318.ebuild 9581 SHA256 db1a1733e25b6f13dd9f6e6a7e47ae32f309b7d0cd8cbdb0873c153b1886349a SHA512 ed8b7439fd46ee3c448f95f354e3943478a0de160c234df13b009880fa4b1782cd2f95c51f8319c48e523d13d2bdcb0fbf71906ae9cbdf2441ce746c7da549a0 WHIRLPOOL 259f65c4c0e9a26e6b4e30b63373d24cbceaec8c588192edb9ddc03fd60491b861548a53958261d2caad01cce2cf882d57c5b5752dbba103f56cdfa3bcd3768b
 EBUILD netbeans-platform-9999_p20160323.ebuild 9581 SHA256 730095d721f39328d68495a7f502926a74e84fa380fb77601a3262e6d92ea941 SHA512 8513599e2a2a702d1587f5e3d1029db274a097b5ee494864b99ecf77be56a178e7831a0d36220cd44f7403c705da59bc318d84687f5f137829bc9769d406655b WHIRLPOOL 7c4799c8bac08a30f1760e900a5fa11858481e240af05063f3af8c51ce7b23dbfaf5bfac74ee3a1ef6f5bbe9ef75e39f5553c66a7570ef877abc1739b70767ec
+EBUILD netbeans-platform-9999_p20160324.ebuild 9581 SHA256 79e91e77a24f99f831ff797b7ff20042e796d9f3757fc675acb07809a43e9473 SHA512 ffb2cd293239f5031979b96161f75b394fe48481e17f5dd4868b59b4381182f5434c6d9df33a7359a54fb9a2384f4a1a99f36638e2f195836917c0ef72c992a4 WHIRLPOOL f0b2434b81bb9d0197c2a88c72df03fdc1ac96bb59974314cbd954e95f3a2f1e3c1261a80b1341f13f0a452f9c3e9098ba6c7128e4077522e804dbe9e2d6f32a
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160324.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160324.ebuild
new file mode 100644
index 0000000..d872f26
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20160324.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-03-24_00-01-48/zip/netbeans-trunk-nightly-201603240001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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/0388CADD903570B9FE30140C0EC39DC573389B33-jna-platform-4.2.1-patched.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-r15-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}"/0388CADD903570B9FE30140C0EC39DC573389B33-jna-platform-4.2.1-patched.jar libs.jna.platform/external/jna-platform-4.2.1-patched.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-r15-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.1.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.1.0.jar && java-pkg_jar-from --into "${instdir}" jna jna.jar jna-4.1.0.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 8e66b18..c2918fc 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c
 DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
 DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
+DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
 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_p20160223.ebuild 3472 SHA256 c38a3b4ea35fb1d709b1fe432edd11de71481cfb45a28e0cf2e7e0468a7c1d8c SHA512 be3e9f9cda15a1ce7aa7503e12c20d43d7cb7761364de396d8b1e25782eba6201542d7687dd70f610ad6142c4f42ca00cebf41999b9026eab2fedeae65ce6219 WHIRLPOOL 6f8bf25def2259566b3c28377407cf49c9ead12e50cd3529bbdb5b10e9d3290c3c4510b982f6d299f144f2385210dc7dcc681ca45a3ad12629635f5507f3bf60
@@ -46,4 +47,5 @@ EBUILD netbeans-profiler-9999_p20160316.ebuild 3472 SHA256 9bcd46949afed478f5fac
 EBUILD netbeans-profiler-9999_p20160317.ebuild 3472 SHA256 a6f563645b63a5d2986310ad8ad0d0dd476c18a2d04dabbd66f91b97e3a55539 SHA512 a99e7bb7c86cccf41009044cd7cd03ee4afa0d1e5dd475fdae83461c1eb9b504c616eb09a05e4d0d2811bf22392dc51852ae5a01bb3b51714c6788545d4c78d9 WHIRLPOOL 0407b5a0283469dcfc0c22edd3f4e01fff5e81858ef328d4b00a75b4957e60c2d7653cedbba09a4fa9a5712c8e77c13b5affad23bf304998c748d1bdbe1e9e4f
 EBUILD netbeans-profiler-9999_p20160318.ebuild 3472 SHA256 1584a63dff37711ad3c3879c17552f7e5ab3ecfe6a084cda5c9c593b831c8fac SHA512 cfb693f3956903efad33c131d8fd80b063c52f37d27a3f4d09346b6999d042dafc7c904635a8f873d72b0a767d1f2604ac4d0582022fa9cae91246dd3401596e WHIRLPOOL e7bc6e161d78bd7753919dee47a2423ced0ca2fedc3ae75891f7803001c7c3c9ebb9bd30d9c3a625b6a350165eadaea29e28068226733bb9e739de9c56bac33c
 EBUILD netbeans-profiler-9999_p20160323.ebuild 3472 SHA256 c2de8a0f149e8d1a7c99e4b8e637ead8f11b71c54687e5ae8e9f572507e6c627 SHA512 f998d4f56921170e937ad9b888e891e87c182db5a726644ea382aa219e069b515f10c429d79e7cd358cfb69a937c416bee10c635372074b5e7cfe01e6da1faaa WHIRLPOOL e6c48f5a04bef7b83c99060c104c799397de85461539f8d158a78cbffee114950d498d7d412d47d1ccf493945b3d6691a0721e64c742312d45c1ae6a75202245
+EBUILD netbeans-profiler-9999_p20160324.ebuild 3472 SHA256 168d3a2897c5239e5b89f7affa406260cd49bcf6ccee9d65ed21f89b885af6d0 SHA512 13e3fedf60c79689c8c73660dea081944a0fbe7c762a096579d097e17e6f6a315eed339d53e0a192e850a41b56830e3c6f1314d83601ef850239f3e9ea4372b9 WHIRLPOOL 441a214ba22467ac680643d1e3a8814662ab9001348a482912020fa768a657bc2025ab8c5d68193c34213217b4d4375a71ae1e2cb7a427980ba37939f0254c74
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160324.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160324.ebuild
new file mode 100644
index 0000000..0a93991
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160324.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-03-24_00-01-48/zip/netbeans-trunk-nightly-201603240001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r15-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 39a8ce2..4b57b12 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -40,6 +40,7 @@ DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c
 DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
 DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
+DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
 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_p20160223.ebuild 5280 SHA256 46af50cc127d8757d9c497309373139aba8ef44c6b837d92a96da3b572e5972e SHA512 d2b5310e85cbafa3308117915050d326c28f613121d2e9a1ab0de5816b53a0720d3156dd6d6a679f6e28a107572f6e21dcf8736029d1f0043745793ae0c903ba WHIRLPOOL a47e42f5adf77bbe9ade116423dea10bb5e874ade3dcbe530d6d68f0b0aa8d9363548e907fac1faec32dc6c97f3bb5b704086e840e88ccec8f8d8592106f92da
@@ -62,4 +63,5 @@ EBUILD netbeans-webcommon-9999_p20160316.ebuild 5244 SHA256 10198edde545dd3cd708
 EBUILD netbeans-webcommon-9999_p20160317.ebuild 5244 SHA256 2700f7310a1ec5e460f25b50f9b6fdcfe104d815d74fda77c9646e039f24c71b SHA512 69ba1d2dc1f3ef5f84fb1da41715f3bf1457a41ef0ee217d35c12ef20efdb83dc7d452b1bc307f5052cc20880cce31d4e9afe63bb3a92d40e97b132ba58a6b2c WHIRLPOOL d2378a652d577bf271f76a80d927cd29100f2fc3a75699f0d40b33a47033ea7ab5557b50374a836965d91ec5e3e96016c23b63cef0965bbd8af242db369c3585
 EBUILD netbeans-webcommon-9999_p20160318.ebuild 5244 SHA256 c28b7fad684b23cc00ec1b404aacbf3656a80ef2adc7b92910b885f56b29984d SHA512 57e0cbeea116459c1fae1484cb874af830fe321ef3639e43129a01a3a7192b4b409e82818fb7c9c46c42d62c278dc6e32b43ece33287fca16763db002501855e WHIRLPOOL 628aae7addcdb8ce8fdc571c673bc1581839fcfc093c6804c4b48b9cd159615cf553d51c6b87c390e45722c306d759a62866bf39c3abb62af5fb34febe81a7d4
 EBUILD netbeans-webcommon-9999_p20160323.ebuild 5244 SHA256 f5303885a1987ffaae129cc10e43eaefd6c7e70ff139282a9eb9e86e24b28985 SHA512 aa5b7b80a499943507d6c415b505c9b02881dbabe45947d84f5400c6d9330d9fa43e15bd135055339349e5a84d93f105335ce8e7a380f7b0bd794bd7f09ddda5 WHIRLPOOL 75a4ffd50ae4cf02d298b04f05d1a1726639e9591f1a3ba16e1ebef187373dd792795b1ab69fbe5c62679f0e3f2fda1a92c79f0a9bfb8988c496a61afa6de026
+EBUILD netbeans-webcommon-9999_p20160324.ebuild 5244 SHA256 68e47a383d63da8f7db9efb8ec10ef6d049b081a422ef7eec679ef8a03cdf7a6 SHA512 6edcf74c4ac94f73ccb999bbcef8039688e04aef9516e881db89cee7fb682ab3381563a19a26992f7539a57d7757e97c09a5e2fabcc41b89018cc1fd89d36001 WHIRLPOOL a01a4440d32f5271f8e1635f23763f4f5fa1a71c0904f2a78e61bbd88e2666bc45b5aeb514478e319ea57a100726525d6680b11d8fcedebdcae01587b6608050
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160324.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160324.ebuild
new file mode 100644
index 0000000..97eb424
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160324.ebuild
@@ -0,0 +1,122 @@
+# 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-03-24_00-01-48/zip/netbeans-trunk-nightly-201603240001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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"
+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-r15-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-r15-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-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 70637cb..697c70c 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c
 DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
 DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
+DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
 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_p20160223.ebuild 2721 SHA256 91ae22880cf71f21a6686abe6303d38d1fbc352eab28aa6aceec838df867a617 SHA512 40a3dff775b85c8d392fb55534450e0605aa0cbe33edc7f0355357d8200c5c30656e665281f48897db132ccba682756b58d7a65c98c1bed120685520612f7b0b WHIRLPOOL 267a3ad3e95a7a2c26cc8460fec3a8e45156fad105e9da639cc2d2f33a355929421a0e1e7e7207aea8a0251095174e146f919ac5625453c481294021e25e4d1f
@@ -46,4 +47,5 @@ EBUILD netbeans-websvccommon-9999_p20160316.ebuild 2721 SHA256 8a07ef88583977f67
 EBUILD netbeans-websvccommon-9999_p20160317.ebuild 2721 SHA256 904ac318e98083851a60b0c19cbcf2d41304f7ef0f80976ca19af23c76405861 SHA512 2e69a65036eb87136767e3bd909434054afeaac3f3861f4524137ce0c32a81b41849462ef8814f35324f8aceca247d463974a8e065dd3f8fd8a3379b8c4a86c3 WHIRLPOOL d7a39c34337a08696fcf72a01920b99a036baa3d43c7a1c654ad56f087beda27a4d818ca1303333b2a6a769d92ca7855160a6b7fc5d7a1ad9c95e6bf9b2c22d0
 EBUILD netbeans-websvccommon-9999_p20160318.ebuild 2721 SHA256 f261ea6ee8ad3f4bf7f777a1517edf187dddf7dc4d307df50f5b2f229c8fb7b8 SHA512 999cc373f762a7c91780c5b62e2e6af3dd82c14c4f0167cc575c45a09122a94feb528563fc9b376ba1fdbe8f4e1d216d024f8155b0c53bc4995adf12626efd7d WHIRLPOOL 5cd9d416043483556147ca910919219268100496da2dda93c760190f5d4a7090376e2aaac514336e34168e10f61c28c47876fcc5960b06be030f78306403a0c0
 EBUILD netbeans-websvccommon-9999_p20160323.ebuild 2721 SHA256 711867c40a107ccc31f760f1bb5cd3957463dacf73941f56a6b1f0ae6f51dc63 SHA512 4928f51238e92f1ef03b72e91b5af73712c6afe2e10482bfe201d5d66a10d3602b12f4ebbf573a24c6bb3fbb4cf1d07c008b54c86b53738267d7f75070d83843 WHIRLPOOL 06ebddd26c8cfb1ae6bee59553c2e5e9d122a2df58b61e9380eb4dc982cd0661a24d27dd96decf56efe5f0d0c71d072f9fb912902471129b49a40bf3025b38d0
+EBUILD netbeans-websvccommon-9999_p20160324.ebuild 2721 SHA256 6f92ed2c034b804b696299c9ddd0aa4b979a3b25c6dd823691e3b954be5b7d39 SHA512 d00031236e9b41eee02b1d7a341dae013f2703ed92da99c0da1c0aa3c9a457e3a81192c07be1a0de7c85a39b9742250154a54f5d00a0b6099ad3e681d7e3f1d1 WHIRLPOOL a49ca571afd94a384bc44c0acc13e8ebe6323cd6dc10263c665b2fd67652918d5f55767e291c6c31ef24bf654792219ea7efb8b94a5cd903c24705aa79490911
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160324.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160324.ebuild
new file mode 100644
index 0000000..d3aea0a
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160324.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-03-24_00-01-48/zip/netbeans-trunk-nightly-201603240001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r15-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 cfcd93c..2bf0b2c 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c
 DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
 DIST netbeans-trunk-nightly-201603180001-src.zip 210042763 SHA256 28228314edea02fe1d6d07cb82cad7b1146635d7523ea5f52a1246f6b7d23de8 SHA512 687b12d299eea84a4b9acde9006304a9822686fecbf3df20ce2f18fa7008a42b4adb8bdcbc31d72abc3bb3a434a8b4ddc58377aa9ab1b53228c4a89a61d1ccad WHIRLPOOL 008d327accadf7ee64ff8b12f2d71ecad282bee6a0964815949bd5609b035cfae7be0d26e0b19d18d3a6997d5c7c9f508933f506f377d87cb7488402a8b59c67
 DIST netbeans-trunk-nightly-201603230001-src.zip 210048386 SHA256 4c00dfb9e00a18022cfbb6dfc856de70f76f608fa844dcc50fa0a86f897714ea SHA512 e228c048dd46da6810a92568e57f164d37e5845670013ca7eac8a6d9ba234f758a9691d75a78a9517f06052cc392a6ef5645d3e831cdc433af9534847b726e14 WHIRLPOOL dca834fa3054db92fcd19e69094764b9f95683b7a1a404b3965922df8495d6d0a01030646e1c17312b9a1645ea5c981e26ad2a8e65f53cce680e934093754375
+DIST netbeans-trunk-nightly-201603240001-src.zip 210050049 SHA256 8658a6a17a574759e07213ac3de6adb24dac6fd05a349f3ebe8e80d37aef1612 SHA512 af12ab96c13e1797e79f99dea5fa0aa4cf810fe29e7356847168c5abddb0558af76c673254b2ba0e501aa69c55f3fd646c3c446e4c970bd4ba41c73c7aaa2afa WHIRLPOOL b24492009a5b3680853406685357a317a125ecfccc751206a6de0f88d71b8240a9dc487bdf1abc51439683fa8b732a88c24aa259ae83522f1590d2276ddd42a2
 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_p20160223.ebuild 6939 SHA256 4983a26789624ec9422887100f322c64fe62af55cd7cc9a6dd539d37c475827d SHA512 352e85e53c08e87c671cac68ac2ad62247ed7df5f7c631e0d16cea5936e930e80d22f2e9d118f488faa5db5082d74defc38169dfee231f8771538aff6671b470 WHIRLPOOL de818ecc93fbacc632c4075a3cbfee90795d889eda7f71cfa8e192515025fa552b556482556d68d0e4eaad88ddef3348910ef092574ad2638f7bf1f0916642f5
@@ -49,4 +50,5 @@ EBUILD netbeans-9999_p20160316.ebuild 6939 SHA256 ec060ffffa8905bde4b4cabf768690
 EBUILD netbeans-9999_p20160317.ebuild 6939 SHA256 a897b7ae94ad8027afe154a2d8dca577d398e647a83220466917e31fed6e8348 SHA512 5d86321a4e2880d1559e7eacf8ffbd1cb3fda93e2864bed0a9070788595eb574eb7edcb403ba1addfa37ca1128bf90e42196c5f2f2d0b2a7dc68bbed864debc7 WHIRLPOOL b7019e854c34dd0fc04d77a7d1be75911828e6bb37dabeb937ed83805feab7f4ba03de0d704db7dd27760c3f9f027fce6cf7983e2aca4058fa01e442481a57ac
 EBUILD netbeans-9999_p20160318.ebuild 6939 SHA256 fbc2d450376c4bdeb779ae76020fbeea61a4591763505cddf4bdb9993cda3eca SHA512 d3d0e73641486fc9c608a8cb40e297d49bc23ec77b47eecde7251b88dde5108edb50d82cdf64fd738bd34b721b3a348db7712f5771663ed27e8287b6806538d4 WHIRLPOOL d668f8ad9a80289c7b05260d3c44af546b971cb67bb0371388ea3a782b60ab269078342bb050869276a932983ed051f01525c363766ae625ffc0e274fa7ffd4b
 EBUILD netbeans-9999_p20160323.ebuild 6939 SHA256 2058f071a7fc4ac7bcaaad80217741227698a3567c1f16221d44841e91ef6c95 SHA512 aeb4f33680687e96fceccc9d720d473f987b952a331e311bbd088bb1810bd4d3a2498f2ca1722ac0e3ec900faa7b8add4aaa68ea4fe803e61be8deb4d6692e36 WHIRLPOOL 880154f5145d6a7d6d0c8ca1b6071e14c038101b37fa9c7ed785c3afc0c9edde2cf1496181b3424035d1bb957dfe8598435d8cf1a41e6dcba4bb63d933f24a9f
+EBUILD netbeans-9999_p20160324.ebuild 6939 SHA256 6b17d7a80c248d7a2c3ce8e393b1aa57fcec9b09a246ca45e08e4ba1b9443b3b SHA512 e336f58f4dda5631c1461c15e8955e4c59e8f026446db1c44ab5da7089eb462d87cd45428d1f26bf0cf474f2c1c256de29716561b451f85ed63d2a0654b2e017 WHIRLPOOL fa88ec5604daf7f59a3295be11f49617dd36c79ca4bb1edeaea385baedd0eee87d763a2fee5080a02edec03679f60ee5d019ce308c0e52af19d5146429c4fe4b
 MISC metadata.xml 329 SHA256 8aeaf2a0228f15c2e4140f401b30f083509bd99d0a578873069f3595cd8555f3 SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640 WHIRLPOOL 799a9b79b1b447bda9631f67e2dfaf722376740e1d2037796528a05f9745eeed00d9990a74a65ce09f74bc5e1d60a887abde540c3c62487d7dd49b8377c15834

diff --git a/dev-util/netbeans/netbeans-9999_p20160324.ebuild b/dev-util/netbeans/netbeans-9999_p20160324.ebuild
new file mode 100644
index 0000000..c45e908
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20160324.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-03-24_00-01-48/zip/netbeans-trunk-nightly-201603240001-src.zip"
+PATCHES_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r15-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-r15-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-r15-build.xml.patch
+
+		# Support for custom patches
+		if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+			local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+			if [ -n "${files}" ] ; then
+				einfo "Applying custom patches:"
+
+				for file in ${files} ; do
+					epatch "${file}"
+				done
+			fi
+		fi
+
+		einfo "Symlinking external libraries..."
+		java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	fi
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	if [ -n "${NBLOCALES}" ] ; then
+		einfo "Compiling support for locales: ${NBLOCALES}"
+		eant -f nbbuild/build.xml bootstrap || die
+		eant -Dlocales=${NBLOCALES} -Ddist.dir=../nbbuild/netbeans -Dnbms.dir="" -Dnbms.dist.dir="" \
+			-Dpermit.jdk7.builds=true -f l10n/build.xml build || die
+	fi
+}
+
+src_install() {
+	if [ -n "${NBLOCALES}" ] ; then
+		pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+		for cluster in apisupport cnd dlight enterprise ergonomics groovy harness ide java javacard javafx mobility php platform profiler webcommon websvccommon ; do
+			if [ -d "${cluster}" ] ; then
+				insinto /usr/share/netbeans-${cluster}-${SLOT}
+				doins -r ${cluster}/*
+			fi
+		done
+
+		if [ -d nb ] ; then
+			insinto /usr/share/netbeans-nb-${SLOT}/nb
+			doins -r nb/*
+		fi
+
+		popd >/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	if [ -n "${NBLOCALES}" ] ; then
+		einfo "Netbeans automatically starts with the locale you have set in your user profile, if"
+		einfo "the locale is built for Netbeans."
+		einfo "If you want to force specific locale, use --locale argument, for example:"
+		einfo "${PN}-${SLOT} --locale de"
+		einfo "${PN}-${SLOT} --locale pt:BR"
+	fi
+
+	if use linguas_ar ; then
+		einfo
+		einfo "You selected Arabic locale so you can choose either ar:EG or ar:SA variant."
+	fi
+
+	if use linguas_es ; then
+		einfo
+		einfo "You selected Spanish locale so you can choose either es or es:CO variant."
+	fi
+
+	if use linguas_id_ID ; then
+		einfo
+		einfo "You selected Indonesian locale which has locale code in:ID in Netbeans."
+	fi
+}


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

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-ergonomics/, dev-java/netbeans-apisupport/, ...
@ 2016-09-30  8:54 Miroslav Šulc
  0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2016-09-30  8:54 UTC (permalink / raw
  To: gentoo-commits

commit:     fbbd647400d09d8aa5d6a0a3fdf437dbb856f861
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 30 08:54:20 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Sep 30 08:54:20 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=fbbd6474

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.3.1

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index b94ffa9..c92a4f2 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1b
 DIST netbeans-trunk-nightly-201609270002-src.zip 218005716 SHA256 c3fa3dc736f783a83a271884081217462cc31d4da6bfd1e7f069e4c5a3bc4a16 SHA512 ecb4885fb30f811901b1c443b4ca15952f1baf8926da411f6c937b8240af0adbd4fc42701b75f8e06a510d7dac9e393b5b799034885f07b3eccb0ef54f83af70 WHIRLPOOL 617347cc777545dfaa08b0731bc0e8aa2d363fa227c73914e79ad8a56e1d3ed8c224cb0560173a86c77937ce4174993cb31fc323d223fb91719ed32a75417496
 DIST netbeans-trunk-nightly-201609280002-src.zip 218005761 SHA256 367daea36555b453b8f12f89d0e75d20583869e3469f00db3c1c8c401e6ccfb1 SHA512 0eafbbedb1c1ea0ddfa1a52e235b7d681fcf9d1601a1ab07d42790bc5d02be3dcd8f0c3a7f71ad8e05f3450b3fdb7fcbd7810429ab5169c56fc777dca0e68e9c WHIRLPOOL 537016c960469b05459c054d4557ab710fd51f4cfe30bb5ff84ec1385bbc038a731eb44bd5d0dfb1426fe59bd4b4ede402242cb1d3dc138aaf0ed2dc80456c19
 DIST netbeans-trunk-nightly-201609290002-src.zip 218005780 SHA256 67f26255f3739c1e1c7c5efa90831c83a0fc4dc19c0b63b5259863abd0722eac SHA512 bfb83214f634186d3ed40dd6926a521fecdaedd59209a864e8c37490bc1e2bc7455a353c0e541a77350d3e54c5a7d194c33765a5ed7b2b0b6432e777d0f90545 WHIRLPOOL d886cb54f28a0607610318ace3e71a96f68233f0257a278063909de5a5ddd5d1735dab8083de19b52c8580c9c820f3ef73b88e2d16d39488d829996ec448c957
+DIST netbeans-trunk-nightly-201609300002-src.zip 218005837 SHA256 d3ecb5c388ebe8ea4ee762c9aff725eba2a94ed2d91d38b9d6a6c6a9fae6048a SHA512 24bd317bb8dd2b0b98dba21757b1335154c7a847a53cdb44226ae7d2012266b2c02eab00b8d2b55503f3612be894a49d3deaa16d579d251c0df5c090b9df918c WHIRLPOOL 3e9bae3a1264f83fd640189a5c3521647aff21e25d90ce6f620cdecd9ea9bc3e9c6133536e536936f6c7348421bc67f26ece7b06744344043b44e312185f22a5
 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_p20160901.ebuild 3384 SHA256 510bf247897091f2ad67b95928d5a23f8288a94f876cd96fa4ffb0526aac2ef5 SHA512 67f635482ff8cdcabe3e5e2f41f6ff3f4222de79ef4cc9dae6603ee4ae047728350baaaa35c056ef7de960178c9f73cbcebe377fff5a5afc8feaefb27b4cda53 WHIRLPOOL f3b2c08334b0a0c0c0d1653ee3f62a4de7093c81d54c77d1ccb47c992b9f9664542da94007fbd2210aa32f0f1656f577b1359b64985786ce72add2268700b3bb
@@ -61,4 +62,5 @@ EBUILD netbeans-apisupport-9999_p20160926.ebuild 3384 SHA256 771c2da22fee5c91df9
 EBUILD netbeans-apisupport-9999_p20160927.ebuild 3384 SHA256 636a496edde6e504c09aa6add8349f18845205d71f3dcc51e309b328ebfb2018 SHA512 2850f81407eda458e3eaaae2d95c94d69c8a2ff4f9267e567b74d58cb52579a6a83059e8b464abb231be5338f75ff490f5328807927dacddc36893bc2bbc6d3f WHIRLPOOL fcf05ece52271dbee90a21f6486331817ef6e06330e84d492afb81ee77f6ef1eb9783a94d9b2e899a5b4af1d083161c2cc5cea834433c85d78d567ea94a85482
 EBUILD netbeans-apisupport-9999_p20160928.ebuild 3384 SHA256 9b7e4db2fe5e2fc29254ad38509f889c72ffc93612d94dc2adaed27369c6cf7f SHA512 891809ff925e8fb0f89bc5c9d6177f833b7045aa927f1316fd91c8e4a735d8b409f6961e3ab535dd537b4e36b3c689d822a08799162035dbd009c768762a5059 WHIRLPOOL cadd652708faa7f5c7d6c0a6ecef7cacbf93b2ebc5d8d20eb0585191fe3b21f397a03e4fd226ab18bca00bac8dfd9364968e6c02d0137a2c633b046683c4fabf
 EBUILD netbeans-apisupport-9999_p20160929.ebuild 3384 SHA256 614c47097f61d16d351eb3e7196e0e47e06959788a79beadd8ecb17d81bda619 SHA512 0d831f38e4854d8165d422c1628a824a2c3bb697dad1cec12d19427524e307a97c78fb8482902f2585459516dbba23ce958e57fbd2c755bc10bc3b3b49aedf4b WHIRLPOOL 71139a5558b74ca3bc21993f14bd148ef91323a6d489fd8496e3dcec0d468072689992dfd4c50b21a6666ed08542a42c3ff1787926c60f0f67e891aa8fb8ce97
+EBUILD netbeans-apisupport-9999_p20160930.ebuild 3384 SHA256 b3b4b579a578a36974dc3833648444227353a782aba568ae651acf58cb71f9b5 SHA512 e45baaa66ac4698a0c39a00e18ad2c3e9fb7bdafdf59bceecde702abb6d209bff4a9b26e590a6b1eb32634e12e75da70e6ba68839a91eb85158e9eb834793ce8 WHIRLPOOL 7b472e7a994814fa3e3f52bc0aaa838e72650ad06de4fa7cb420b82eb000a0f272c81a9e18fbfa1553ebdbe71e497d2113824717c4f1f375bf636cb68bae7cbe
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160930.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160930.ebuild
new file mode 100644
index 0000000..ff08744
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160930.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-09-30_00-02-33/zip/netbeans-trunk-nightly-201609300002-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 9c49487..064afb3 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -46,6 +46,7 @@ DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1b
 DIST netbeans-trunk-nightly-201609270002-src.zip 218005716 SHA256 c3fa3dc736f783a83a271884081217462cc31d4da6bfd1e7f069e4c5a3bc4a16 SHA512 ecb4885fb30f811901b1c443b4ca15952f1baf8926da411f6c937b8240af0adbd4fc42701b75f8e06a510d7dac9e393b5b799034885f07b3eccb0ef54f83af70 WHIRLPOOL 617347cc777545dfaa08b0731bc0e8aa2d363fa227c73914e79ad8a56e1d3ed8c224cb0560173a86c77937ce4174993cb31fc323d223fb91719ed32a75417496
 DIST netbeans-trunk-nightly-201609280002-src.zip 218005761 SHA256 367daea36555b453b8f12f89d0e75d20583869e3469f00db3c1c8c401e6ccfb1 SHA512 0eafbbedb1c1ea0ddfa1a52e235b7d681fcf9d1601a1ab07d42790bc5d02be3dcd8f0c3a7f71ad8e05f3450b3fdb7fcbd7810429ab5169c56fc777dca0e68e9c WHIRLPOOL 537016c960469b05459c054d4557ab710fd51f4cfe30bb5ff84ec1385bbc038a731eb44bd5d0dfb1426fe59bd4b4ede402242cb1d3dc138aaf0ed2dc80456c19
 DIST netbeans-trunk-nightly-201609290002-src.zip 218005780 SHA256 67f26255f3739c1e1c7c5efa90831c83a0fc4dc19c0b63b5259863abd0722eac SHA512 bfb83214f634186d3ed40dd6926a521fecdaedd59209a864e8c37490bc1e2bc7455a353c0e541a77350d3e54c5a7d194c33765a5ed7b2b0b6432e777d0f90545 WHIRLPOOL d886cb54f28a0607610318ace3e71a96f68233f0257a278063909de5a5ddd5d1735dab8083de19b52c8580c9c820f3ef73b88e2d16d39488d829996ec448c957
+DIST netbeans-trunk-nightly-201609300002-src.zip 218005837 SHA256 d3ecb5c388ebe8ea4ee762c9aff725eba2a94ed2d91d38b9d6a6c6a9fae6048a SHA512 24bd317bb8dd2b0b98dba21757b1335154c7a847a53cdb44226ae7d2012266b2c02eab00b8d2b55503f3612be894a49d3deaa16d579d251c0df5c090b9df918c WHIRLPOOL 3e9bae3a1264f83fd640189a5c3521647aff21e25d90ce6f620cdecd9ea9bc3e9c6133536e536936f6c7348421bc67f26ece7b06744344043b44e312185f22a5
 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_p20160901.ebuild 4790 SHA256 10294fbb52396e0c50d7fa3e91583141798e0193b4ddf2e3a4b888ddb3bfed3e SHA512 bc12f02584a4f4cdb9d9b134f7c0b6233b714134316149555349afca3c7f14532321029175c6c185ff997a69f17eab40b794489c4c5b2fba2189b9006ebfeed6 WHIRLPOOL e1f4d41c146f3663a612dcfea0e2d325240bf86f7928ae994d9fdf5e73972c2802eaa0fdb4b7c4fa4d0d98a7c391218716158f4cb6cedcaad8e11bd42960995e
@@ -76,4 +77,5 @@ EBUILD netbeans-cnd-9999_p20160926.ebuild 4790 SHA256 7bd407102c1d13ae3f07c1fe80
 EBUILD netbeans-cnd-9999_p20160927.ebuild 4790 SHA256 2e66724369a81ce14f4d19a2ec37ec576097eeb410f9bc798d4505631b1302eb SHA512 5ea19f8dc610f3ff4fb78506e865d747aaddcf429ddbdb8ef380a36fd063cdf1a0eb72936c0182fb858ecd7aca59fb7bb3f699496cecd9c45d17c5e3fd499ec7 WHIRLPOOL 93ea6fffe4de232080c4a7e10f7d9e91cf666ddca52ba1b6127a285d2ff22f500f7df6b997ca5d116441f7512f6a0a6e433ddcb6aaa021b68621bd05c76c4b76
 EBUILD netbeans-cnd-9999_p20160928.ebuild 4790 SHA256 7bb2507cfb5975098f2336d41a4f5bcb9795baee634c1440d7d39c59b938bfd4 SHA512 09fbfccc5b7b4ae3f2827b0ee91217c9e755e960353ada9b0a9c767433caff33c24399a663fa675c98a7dfe70eefd739d962e338fc33ef8e90c5485158abdf6b WHIRLPOOL 5ab968503818f037c615f1b36cad69fe89bd1724ebcde14bfcd67e95d2fee21d0f77140846cd5fda46d6957dcdfa2d3fecea79b86cefb67107f8daf9f5cf9337
 EBUILD netbeans-cnd-9999_p20160929.ebuild 4790 SHA256 21614911a21f17d7e7496740284c23a2a584bf0f23df4547b77080406b1d60ee SHA512 6e23e467cbd5167bf76b246bc983e50ea7bebed0edce548f8647e830c83055224d708a71b000438b81f091abc0cdcea483a956ffad71296cc027929f1d35334c WHIRLPOOL 31c130d2b6cf28810f1db56587a9b6b782e80fee09b202a995d27b97abd3bdfa9d51a35c5c0a4e7d051d1a8d04070805ab815e90b0d44620bdfb053540c6b5c8
+EBUILD netbeans-cnd-9999_p20160930.ebuild 4790 SHA256 4a21ed37391091b545c2e7b9bf4e1400ed009d1af9f4cb6ae068c34f7c6fc0f0 SHA512 d941e7cbfcf9bafb5e30ec7c1fc24b2a22599e06b7fdd8da3c464c86e226ef0058e9826f854be3b2a46ff9aa1634e55a647f1873d30b3582248736f1ab854f35 WHIRLPOOL d32f8070531eb503435d7fc9cf839e426932bbb3bf034598b4a99d899483b31dda0cef5341e9288f2f7b3597dd7209a5e7383a72a67fc8de1032cb0a12ebbd38
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 7cae063..9a319e0 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1b
 DIST netbeans-trunk-nightly-201609270002-src.zip 218005716 SHA256 c3fa3dc736f783a83a271884081217462cc31d4da6bfd1e7f069e4c5a3bc4a16 SHA512 ecb4885fb30f811901b1c443b4ca15952f1baf8926da411f6c937b8240af0adbd4fc42701b75f8e06a510d7dac9e393b5b799034885f07b3eccb0ef54f83af70 WHIRLPOOL 617347cc777545dfaa08b0731bc0e8aa2d363fa227c73914e79ad8a56e1d3ed8c224cb0560173a86c77937ce4174993cb31fc323d223fb91719ed32a75417496
 DIST netbeans-trunk-nightly-201609280002-src.zip 218005761 SHA256 367daea36555b453b8f12f89d0e75d20583869e3469f00db3c1c8c401e6ccfb1 SHA512 0eafbbedb1c1ea0ddfa1a52e235b7d681fcf9d1601a1ab07d42790bc5d02be3dcd8f0c3a7f71ad8e05f3450b3fdb7fcbd7810429ab5169c56fc777dca0e68e9c WHIRLPOOL 537016c960469b05459c054d4557ab710fd51f4cfe30bb5ff84ec1385bbc038a731eb44bd5d0dfb1426fe59bd4b4ede402242cb1d3dc138aaf0ed2dc80456c19
 DIST netbeans-trunk-nightly-201609290002-src.zip 218005780 SHA256 67f26255f3739c1e1c7c5efa90831c83a0fc4dc19c0b63b5259863abd0722eac SHA512 bfb83214f634186d3ed40dd6926a521fecdaedd59209a864e8c37490bc1e2bc7455a353c0e541a77350d3e54c5a7d194c33765a5ed7b2b0b6432e777d0f90545 WHIRLPOOL d886cb54f28a0607610318ace3e71a96f68233f0257a278063909de5a5ddd5d1735dab8083de19b52c8580c9c820f3ef73b88e2d16d39488d829996ec448c957
+DIST netbeans-trunk-nightly-201609300002-src.zip 218005837 SHA256 d3ecb5c388ebe8ea4ee762c9aff725eba2a94ed2d91d38b9d6a6c6a9fae6048a SHA512 24bd317bb8dd2b0b98dba21757b1335154c7a847a53cdb44226ae7d2012266b2c02eab00b8d2b55503f3612be894a49d3deaa16d579d251c0df5c090b9df918c WHIRLPOOL 3e9bae3a1264f83fd640189a5c3521647aff21e25d90ce6f620cdecd9ea9bc3e9c6133536e536936f6c7348421bc67f26ece7b06744344043b44e312185f22a5
 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_p20160901.ebuild 2968 SHA256 d0b5fb71275970b2c852bd12c4216e7b07ca17920924aff5b7a009db73a8e18c SHA512 3229515011cc8336648deaa46e20fc16973cb2c10dbe4cb9d53d911d96dee22c68da598d8e1cbc128690accde68e025b052a23ff3bb0cc66c46b72cdfb02d138 WHIRLPOOL 93ecb0b678d5f9efb4eb18d7ae1a1a352816e8c798daf3f265dfc40c2585a45150f6d3d194fb58e283a9e6f7b85d3eb7e205b4d140c9be7559e4a514f16c146d
@@ -66,4 +67,5 @@ EBUILD netbeans-dlight-9999_p20160926.ebuild 2968 SHA256 442fa86ddf28e4d285fd499
 EBUILD netbeans-dlight-9999_p20160927.ebuild 2968 SHA256 c72fdb7133cfc553745f920b4b5286fec2137bcfb8faec3c3765fa4ea18f3d55 SHA512 358f9949ab34a98becf23e21a0e35314803c3107ab3a6598c98097a8dd81449260dc3b8420e7cd8d0945167f41fa7d74de21868456fc8b3a1b11515b84be729f WHIRLPOOL e387ee52a739b428845b2cb755bccb17e03321c9942f8adb2429c65fcc13e14e5dd6767d4d80094cafec6f77c2b90e68e15e26ae0689f066719214fc3db1fe4e
 EBUILD netbeans-dlight-9999_p20160928.ebuild 2968 SHA256 5c03af545be242a52aa6550caf810c3f85e3e31cf8d31a099aa008250f3ff2f0 SHA512 bae06c4cce74079523fb2d7f897124a7163de7a98ace4e8d8ff288d5a259f6029313e52b6871600826add10aa25a078599857bc34a4196da8a47d0f35837d9e6 WHIRLPOOL 15b77ef866033221455136f8409d578d42a66f69c72342b867dac836f2b7f62dd56cdf257a784b615f83bfac2e75cc7dce03e47d5396ebe96ccf644cb77a5586
 EBUILD netbeans-dlight-9999_p20160929.ebuild 2968 SHA256 23fd5a764dd09366f4cbb5d5a6f61ec7dfe7c8588c48713e9e35eb21a7906bd9 SHA512 211f3e8b01770ef3165b1a32a06c6af39b5f51f3e172363a1cc7c02b2afedfe9dde107b0c82aaa4e3791b3d71f8a9358127db931f690ef76217a11c49861b357 WHIRLPOOL a7d44a5d3e899d996b17165f01c6cfefe12423326e7a9e9b507c9d1d041def6ae1b8d8d9125c60032757a0818ae49cec61cdf1e2a23999112b62c76bd46fff5e
+EBUILD netbeans-dlight-9999_p20160930.ebuild 2968 SHA256 f092022a3fa4adde0dd6279d7a2d252b39bec72472bc21b6cc553424c81b6643 SHA512 9cb0ab3147f4e2e4a23c59c68db2adeb992a9884fcde985db153598d69450f5b029d2d7a293035f8b89a9bca9067636aa063e117e8432d2ff61ec8a78e96337d WHIRLPOOL 038af38b6c59efedb2d7ce7fb671538fafa6e937846d781d586567a5beb39b35c567fbf2188e536f59daea8c1b94aa44271dd0612cd6345d77cbfd2fd37449e6
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160930.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160930.ebuild
new file mode 100644
index 0000000..16adc1f
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160930.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-09-30_00-02-33/zip/netbeans-trunk-nightly-201609300002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/18E39A0D10357B72EDB76F2070E27019317792F1-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}"/18E39A0D10357B72EDB76F2070E27019317792F1-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 1a8880e..ebec56b 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -63,6 +63,7 @@ DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1b
 DIST netbeans-trunk-nightly-201609270002-src.zip 218005716 SHA256 c3fa3dc736f783a83a271884081217462cc31d4da6bfd1e7f069e4c5a3bc4a16 SHA512 ecb4885fb30f811901b1c443b4ca15952f1baf8926da411f6c937b8240af0adbd4fc42701b75f8e06a510d7dac9e393b5b799034885f07b3eccb0ef54f83af70 WHIRLPOOL 617347cc777545dfaa08b0731bc0e8aa2d363fa227c73914e79ad8a56e1d3ed8c224cb0560173a86c77937ce4174993cb31fc323d223fb91719ed32a75417496
 DIST netbeans-trunk-nightly-201609280002-src.zip 218005761 SHA256 367daea36555b453b8f12f89d0e75d20583869e3469f00db3c1c8c401e6ccfb1 SHA512 0eafbbedb1c1ea0ddfa1a52e235b7d681fcf9d1601a1ab07d42790bc5d02be3dcd8f0c3a7f71ad8e05f3450b3fdb7fcbd7810429ab5169c56fc777dca0e68e9c WHIRLPOOL 537016c960469b05459c054d4557ab710fd51f4cfe30bb5ff84ec1385bbc038a731eb44bd5d0dfb1426fe59bd4b4ede402242cb1d3dc138aaf0ed2dc80456c19
 DIST netbeans-trunk-nightly-201609290002-src.zip 218005780 SHA256 67f26255f3739c1e1c7c5efa90831c83a0fc4dc19c0b63b5259863abd0722eac SHA512 bfb83214f634186d3ed40dd6926a521fecdaedd59209a864e8c37490bc1e2bc7455a353c0e541a77350d3e54c5a7d194c33765a5ed7b2b0b6432e777d0f90545 WHIRLPOOL d886cb54f28a0607610318ace3e71a96f68233f0257a278063909de5a5ddd5d1735dab8083de19b52c8580c9c820f3ef73b88e2d16d39488d829996ec448c957
+DIST netbeans-trunk-nightly-201609300002-src.zip 218005837 SHA256 d3ecb5c388ebe8ea4ee762c9aff725eba2a94ed2d91d38b9d6a6c6a9fae6048a SHA512 24bd317bb8dd2b0b98dba21757b1335154c7a847a53cdb44226ae7d2012266b2c02eab00b8d2b55503f3612be894a49d3deaa16d579d251c0df5c090b9df918c WHIRLPOOL 3e9bae3a1264f83fd640189a5c3521647aff21e25d90ce6f620cdecd9ea9bc3e9c6133536e536936f6c7348421bc67f26ece7b06744344043b44e312185f22a5
 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_p20160901.ebuild 15825 SHA256 09a619ebd3bb9b72c41c7e06d0d55addad3d3a912bd12da537182e03900396b6 SHA512 213021feb7f6676d989c37c5c7495e94e0101a3c3694ac8980f897923c5d2373661f616521d34d5995f08b8ad7024e39bcd93346eb79f14647b4e0408f7a6e21 WHIRLPOOL a108e1734dd563ca2fdb910db89f7b4e21c98f6a0bffcfaae653d9d6af93f54cbd4d8c4460df0ea1dd98db03cbd40612adf7e6115bb00384121d58a33102d6dc
@@ -93,4 +94,5 @@ EBUILD netbeans-enterprise-9999_p20160926.ebuild 15825 SHA256 a7b01e9a811866fc5b
 EBUILD netbeans-enterprise-9999_p20160927.ebuild 15825 SHA256 f60122c0ec3908c8e741b83cc79ccae73ab38b62cac34e54af04d4dedab90d82 SHA512 c13fb7a3dfeb7fce38954da3a7296a31a2767be22cb78899bc628f2c8590cf56f3a6a1ae4b9b10175680e1d1f23958072480d5b1f0e435cce48855055df65178 WHIRLPOOL 1eb1774d1f2d6f4cb1ed354df86eb5625b74dcee187aa651d1898109e00e279626bc68938d1538036e6e9b4c4784a14f990570ff195db5a4182489e161cde9c9
 EBUILD netbeans-enterprise-9999_p20160928.ebuild 15825 SHA256 639ff6ade943b26adb19ba0ac543cdb7508cb410ea5808e9070af40982a7aed5 SHA512 d3fc7961b4595f0432d968eebd11dc781804bf54beea61765be0cfad33aabd1fb3f208ff6e492ee5becdf5d9325e4b7fca0a6f2b0f3c7f72c5fb82718ff981ab WHIRLPOOL 33eb1522221ddba70cf0966f2af4c042ffb48c344daf6fb8aba450b90a7777b792c559dd80133120999b53dc219c234854f55a74c9f6df3408d72088257c4cea
 EBUILD netbeans-enterprise-9999_p20160929.ebuild 15825 SHA256 370f6903e7d87ec541b7ae8b33855131597febb1a584be72f0aa4e024b460cf2 SHA512 c36b7054ba9baef08112099a2528304871785e6baeef2e13a4fdc8643eed36f59a108699c89e114fc66eb80b6a31f137ea322b9c76ebfb22e5a3111a224befa7 WHIRLPOOL 6d9606e3252c0577df4b6590f5669e2c140a4e6890f440ddbf14509856dc5d846b777ba623648d1cf7cd7aa9dd5a78934a2a4e8bf8c8b1537c22737bbbeee985
+EBUILD netbeans-enterprise-9999_p20160930.ebuild 15825 SHA256 9db12ae481401fbceee4db388cdc2bfad1077355e6c219650826793f4f749abe SHA512 5b342bb8ddad4dd2b7693b8f729ad998e864f4309c6c87e3101536be440489d3f7199a2e0b8dbbc398301943193898436a1f067bafb19cb1cbf4d89e261651e6 WHIRLPOOL 7b99bc14d6a4dd6dd1f1ebd85e2db41be44549a8ca78896795f245c0d3e0a533e69f033caae4a4fcab4d72d65abee5d2248f4e3a0228c7761947fe709cda4724
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160930.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160930.ebuild
new file mode 100644
index 0000000..7e9ae3d
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160930.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-09-30_00-02-33/zip/netbeans-trunk-nightly-201609300002-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 0bd3008..1329eef 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1b
 DIST netbeans-trunk-nightly-201609270002-src.zip 218005716 SHA256 c3fa3dc736f783a83a271884081217462cc31d4da6bfd1e7f069e4c5a3bc4a16 SHA512 ecb4885fb30f811901b1c443b4ca15952f1baf8926da411f6c937b8240af0adbd4fc42701b75f8e06a510d7dac9e393b5b799034885f07b3eccb0ef54f83af70 WHIRLPOOL 617347cc777545dfaa08b0731bc0e8aa2d363fa227c73914e79ad8a56e1d3ed8c224cb0560173a86c77937ce4174993cb31fc323d223fb91719ed32a75417496
 DIST netbeans-trunk-nightly-201609280002-src.zip 218005761 SHA256 367daea36555b453b8f12f89d0e75d20583869e3469f00db3c1c8c401e6ccfb1 SHA512 0eafbbedb1c1ea0ddfa1a52e235b7d681fcf9d1601a1ab07d42790bc5d02be3dcd8f0c3a7f71ad8e05f3450b3fdb7fcbd7810429ab5169c56fc777dca0e68e9c WHIRLPOOL 537016c960469b05459c054d4557ab710fd51f4cfe30bb5ff84ec1385bbc038a731eb44bd5d0dfb1426fe59bd4b4ede402242cb1d3dc138aaf0ed2dc80456c19
 DIST netbeans-trunk-nightly-201609290002-src.zip 218005780 SHA256 67f26255f3739c1e1c7c5efa90831c83a0fc4dc19c0b63b5259863abd0722eac SHA512 bfb83214f634186d3ed40dd6926a521fecdaedd59209a864e8c37490bc1e2bc7455a353c0e541a77350d3e54c5a7d194c33765a5ed7b2b0b6432e777d0f90545 WHIRLPOOL d886cb54f28a0607610318ace3e71a96f68233f0257a278063909de5a5ddd5d1735dab8083de19b52c8580c9c820f3ef73b88e2d16d39488d829996ec448c957
+DIST netbeans-trunk-nightly-201609300002-src.zip 218005837 SHA256 d3ecb5c388ebe8ea4ee762c9aff725eba2a94ed2d91d38b9d6a6c6a9fae6048a SHA512 24bd317bb8dd2b0b98dba21757b1335154c7a847a53cdb44226ae7d2012266b2c02eab00b8d2b55503f3612be894a49d3deaa16d579d251c0df5c090b9df918c WHIRLPOOL 3e9bae3a1264f83fd640189a5c3521647aff21e25d90ce6f620cdecd9ea9bc3e9c6133536e536936f6c7348421bc67f26ece7b06744344043b44e312185f22a5
 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_p20160901.ebuild 2913 SHA256 8efe7cf5c02e556106330c243ea525b618176cb83a9a7628e90fce30fbb13804 SHA512 8becc42d5249dd48752a77c8bfcaee83046b992d450d13c938352ef30e7e59f4db45df34403723e900f1136ff4d0fd46cfd817505424ad7ff86c8f3a0de99fc6 WHIRLPOOL 633a4624ecbb75c3addd5529bba726f32340ef5d1cc38d539cab0551af01a2b0b6c7f30ee85fd23bd4c773fbacd5f63cc8c813b0d8983f97371e057169b9b178
@@ -61,4 +62,5 @@ EBUILD netbeans-ergonomics-9999_p20160926.ebuild 2913 SHA256 6e95d664324346fb5fa
 EBUILD netbeans-ergonomics-9999_p20160927.ebuild 2913 SHA256 e6268fac9f9c0b6873337140148803d7526fe9b02297bd11446524556f0d4bef SHA512 f0f792b1393b2a27cecfe576284af3ceb99d3801006145eace0314d3b5cc5c195fa6e1e135168da5f1c9904e14b4157b688b6b52c810a61dbdca2369d3fcbfb6 WHIRLPOOL 42ee5cf1048d92ea9eca4ffddd1f57617714716b9bcdde8ecaa6eff2ea1d82740d8e973f51bd80c6aee0d218edc080c677de17eee4394423f4b10469b9188ff5
 EBUILD netbeans-ergonomics-9999_p20160928.ebuild 2913 SHA256 fae3ad7b93a6a089fb13cec8bec50d17c3220ae676bf9afb62204168606e7a75 SHA512 dcdcc9e29f981b09928a439cb8fb3fc5aaef2e87c49497e512c6665a8e9205c1645fd284467f53f57b9b06c2270a068e3eeb5504806c4e79b464d43281512554 WHIRLPOOL 4fe54dcdb17eb2fe8e51e63083a556035d3e9a626f0bac1a8b8d122cd411e7d0f6c496babf7a0c1c8e4fd7dde869f4f00b74e25ce637c72eefb61a158a070a15
 EBUILD netbeans-ergonomics-9999_p20160929.ebuild 2913 SHA256 001dcf2c21d0a9b3f2a83a5164eee722a25ab466ebc44510e3d99882547fd2dd SHA512 d465e29aa4cc327acab5b82bf8b7d0b18f35aeef3262180056f3a20add65bb8fc626e9d86e4e7f390e88921dc5ba0ab1ea5a83b1135db80ffaf64c540fc12ce6 WHIRLPOOL 74d2718122975d208127d1881a1b80d0f79bae54530da5adb320cbf85ac91ccfbcbdf12a245f469fedf6ea41b24bb8db7e64a4eb45d4223270ea1877e45b9bf8
+EBUILD netbeans-ergonomics-9999_p20160930.ebuild 2913 SHA256 24e898f67ce99f790befb3b911461f764e3cdbfaac2bc4b6d2c7e58a55d81372 SHA512 3590bfafe8f9d239810beffd1b82cbfa0d227fdec4923fdc5e34a40bf43fb5959f0c535e94de950931d63f6fb137569810eb97497239230088fcc701ad64b70e WHIRLPOOL 653d4f9aadf9368fea44f87e066d587a4ad043f084c885545746ec3380d021c8cb3b0ee6b874e394756df501aae8d2e8fa5b535755613abd9447ca67f528b9dc
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160930.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160930.ebuild
new file mode 100644
index 0000000..74baad3
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160930.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-09-30_00-02-33/zip/netbeans-trunk-nightly-201609300002-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 15fa5bd..b3b4c96 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1b
 DIST netbeans-trunk-nightly-201609270002-src.zip 218005716 SHA256 c3fa3dc736f783a83a271884081217462cc31d4da6bfd1e7f069e4c5a3bc4a16 SHA512 ecb4885fb30f811901b1c443b4ca15952f1baf8926da411f6c937b8240af0adbd4fc42701b75f8e06a510d7dac9e393b5b799034885f07b3eccb0ef54f83af70 WHIRLPOOL 617347cc777545dfaa08b0731bc0e8aa2d363fa227c73914e79ad8a56e1d3ed8c224cb0560173a86c77937ce4174993cb31fc323d223fb91719ed32a75417496
 DIST netbeans-trunk-nightly-201609280002-src.zip 218005761 SHA256 367daea36555b453b8f12f89d0e75d20583869e3469f00db3c1c8c401e6ccfb1 SHA512 0eafbbedb1c1ea0ddfa1a52e235b7d681fcf9d1601a1ab07d42790bc5d02be3dcd8f0c3a7f71ad8e05f3450b3fdb7fcbd7810429ab5169c56fc777dca0e68e9c WHIRLPOOL 537016c960469b05459c054d4557ab710fd51f4cfe30bb5ff84ec1385bbc038a731eb44bd5d0dfb1426fe59bd4b4ede402242cb1d3dc138aaf0ed2dc80456c19
 DIST netbeans-trunk-nightly-201609290002-src.zip 218005780 SHA256 67f26255f3739c1e1c7c5efa90831c83a0fc4dc19c0b63b5259863abd0722eac SHA512 bfb83214f634186d3ed40dd6926a521fecdaedd59209a864e8c37490bc1e2bc7455a353c0e541a77350d3e54c5a7d194c33765a5ed7b2b0b6432e777d0f90545 WHIRLPOOL d886cb54f28a0607610318ace3e71a96f68233f0257a278063909de5a5ddd5d1735dab8083de19b52c8580c9c820f3ef73b88e2d16d39488d829996ec448c957
+DIST netbeans-trunk-nightly-201609300002-src.zip 218005837 SHA256 d3ecb5c388ebe8ea4ee762c9aff725eba2a94ed2d91d38b9d6a6c6a9fae6048a SHA512 24bd317bb8dd2b0b98dba21757b1335154c7a847a53cdb44226ae7d2012266b2c02eab00b8d2b55503f3612be894a49d3deaa16d579d251c0df5c090b9df918c WHIRLPOOL 3e9bae3a1264f83fd640189a5c3521647aff21e25d90ce6f620cdecd9ea9bc3e9c6133536e536936f6c7348421bc67f26ece7b06744344043b44e312185f22a5
 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_p20160901.ebuild 3377 SHA256 044a6d90a3bbc5b2ea976a60626d163646258b8f9b607f48807c9e5fc205eacc SHA512 7299576b1232e56bc56eaf961a225e5d01bc16d45ac89640b8547c31c1342b77714c9fa9733c6a81d06e51cbad5422a896f101fcd80ccde50365c4d6adaebef6 WHIRLPOOL 7c638df833b0c52fc9bd3d47bdb324bffd3ff898ef849d472187328fb79b6cc5511e2eed7592762903439ef51863e809b001eb3df56d06d318f29fc1bb672faf
@@ -65,4 +66,5 @@ EBUILD netbeans-extide-9999_p20160926.ebuild 3377 SHA256 fb8ced417507b492bacb8c3
 EBUILD netbeans-extide-9999_p20160927.ebuild 3377 SHA256 cd105dba267eefb6ea10c543aeed183298f0fd9e66d4ce5cbd852018a0ebb568 SHA512 aee152ff7b227397db70c89029b7f088573ec520ba925baa55ff30e3cc86c75e5af6dc836921f286c97210274da6c7f8066cf2821f261c38ce453221e493184a WHIRLPOOL f0819ba3d8801239c142050b54446a6ea52321f0332ea46b4503e14dcdc66d96af838039e1c336a5ff50daaf3947337d577d9a53cd05c33b815e6f09f5f0b6f8
 EBUILD netbeans-extide-9999_p20160928.ebuild 3377 SHA256 1b642bb170f699bf881ab2f6e752be731ac7de49acdf2f9d49fbfe332ceef38b SHA512 5ffcf9f7d818e04cfb3b9453ea5c73a8d67f624395737e8c28725d88245134026e68fa4c96da97d0254c3387273f54060011ebe5f83a7433aa8664e312511690 WHIRLPOOL ab43663afee03f60305e9a14024a5eb3ac3c2bdc911b7201789d1eeea78a3be4eecefd3965b205e445ce199ce96de9a4e9e0edfa064794905a46d89a34d64ee1
 EBUILD netbeans-extide-9999_p20160929.ebuild 3377 SHA256 a74466f9092011357f462f4c349e5351ef18fc79c62a3dfc6e43eaebed4459e6 SHA512 286e692ee1a69fc49957672cd192a7e8c8dc1e7df2e4f77a63ff6a4174bf5fc62c1bcd44f29f591d62315dcbe07fbc5d972bb36a758bce75e2a422b144208e8f WHIRLPOOL ddf25c8c287148f6d7fd7c0b8d85d8a5a5312aaa98a444427981501b43bb3520dc07844f2aa695a8c406b32340b385eb18784e229eb1166ac9ff54d2fc0d90de
+EBUILD netbeans-extide-9999_p20160930.ebuild 3377 SHA256 18dbe949dd431a363980b6837cd2012b1a20d409d07d2cf9b498a5b5ab624f26 SHA512 ab79295aaf6cc97c4d273e905cb465f48660560840f21a85b7887a40730f8e53e45e42f4f01f930468a7246d68cafd63059425cd4a99ecbfb4135fa5e0109506 WHIRLPOOL ac83ddd9011145907352c2540706457c6af71d45ef9471c1c79eee01c13f8de36e16f5c5fe3ccefe1461f81078afd7acf043e702042478122a8206a1caf3672d
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index 584de8c..0027431 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1b
 DIST netbeans-trunk-nightly-201609270002-src.zip 218005716 SHA256 c3fa3dc736f783a83a271884081217462cc31d4da6bfd1e7f069e4c5a3bc4a16 SHA512 ecb4885fb30f811901b1c443b4ca15952f1baf8926da411f6c937b8240af0adbd4fc42701b75f8e06a510d7dac9e393b5b799034885f07b3eccb0ef54f83af70 WHIRLPOOL 617347cc777545dfaa08b0731bc0e8aa2d363fa227c73914e79ad8a56e1d3ed8c224cb0560173a86c77937ce4174993cb31fc323d223fb91719ed32a75417496
 DIST netbeans-trunk-nightly-201609280002-src.zip 218005761 SHA256 367daea36555b453b8f12f89d0e75d20583869e3469f00db3c1c8c401e6ccfb1 SHA512 0eafbbedb1c1ea0ddfa1a52e235b7d681fcf9d1601a1ab07d42790bc5d02be3dcd8f0c3a7f71ad8e05f3450b3fdb7fcbd7810429ab5169c56fc777dca0e68e9c WHIRLPOOL 537016c960469b05459c054d4557ab710fd51f4cfe30bb5ff84ec1385bbc038a731eb44bd5d0dfb1426fe59bd4b4ede402242cb1d3dc138aaf0ed2dc80456c19
 DIST netbeans-trunk-nightly-201609290002-src.zip 218005780 SHA256 67f26255f3739c1e1c7c5efa90831c83a0fc4dc19c0b63b5259863abd0722eac SHA512 bfb83214f634186d3ed40dd6926a521fecdaedd59209a864e8c37490bc1e2bc7455a353c0e541a77350d3e54c5a7d194c33765a5ed7b2b0b6432e777d0f90545 WHIRLPOOL d886cb54f28a0607610318ace3e71a96f68233f0257a278063909de5a5ddd5d1735dab8083de19b52c8580c9c820f3ef73b88e2d16d39488d829996ec448c957
+DIST netbeans-trunk-nightly-201609300002-src.zip 218005837 SHA256 d3ecb5c388ebe8ea4ee762c9aff725eba2a94ed2d91d38b9d6a6c6a9fae6048a SHA512 24bd317bb8dd2b0b98dba21757b1335154c7a847a53cdb44226ae7d2012266b2c02eab00b8d2b55503f3612be894a49d3deaa16d579d251c0df5c090b9df918c WHIRLPOOL 3e9bae3a1264f83fd640189a5c3521647aff21e25d90ce6f620cdecd9ea9bc3e9c6133536e536936f6c7348421bc67f26ece7b06744344043b44e312185f22a5
 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_p20160901.ebuild 3416 SHA256 46be5790e675abd9d835ef7863d357674bb0769ffbb1c4cba45ecf8610e4fca1 SHA512 e3719edef1d6820f322b928f4d99b363a4610cd9909f2d6b599f810af4b4f166c75612ffa9dd0627959d59fd96d773b958744ce314e97e9e43f8ae0d8d80321d WHIRLPOOL decd91bb91b98a18c6f7a7a49d3864db0f710cf09f8c1dfeaa31032481c80659e702d1096558ca298dd482dd48c350ffd3cab774f2645e6cb59d7e573695c34d
@@ -63,4 +64,5 @@ EBUILD netbeans-groovy-9999_p20160926.ebuild 3416 SHA256 8c6a6cddfc53bcba95fa0be
 EBUILD netbeans-groovy-9999_p20160927.ebuild 3416 SHA256 0b8aa3d0b9bcd985d729cffb1f397f90be4da9c80fc00386cbadd4b237018c34 SHA512 d5ee7cf21114da763d1276fc8abf19ad4a85a1ca8a9f2a1e74edcab32216d2dba59588b94a4f1f3935c57060a26ba3b39e9b324123c1a7e61e3edbb12d2988b9 WHIRLPOOL fac4a8ba14fa95968c58625f56f4aa3d3383c7b9d9e97b5292703b2df7de921230918b11139b68b14d4a52d39ec0b1d6419c275122b8a619619ed08de7cf1ed7
 EBUILD netbeans-groovy-9999_p20160928.ebuild 3416 SHA256 1e56272f239177762c943eb2128022a4b4de05314d405631af75119f9ae668ff SHA512 20a81407f39e23c333e400d9f3b567adb5ec1ddc08a37fe6b38e8933b239b27be5994234dc945d66b0e7a990b0ce1d968460afe923acb6b58224de7d11d5684c WHIRLPOOL 062dfeb9e0840b94b2928947a76e69531691a699b0a484bdf980848612b6ca6669891f838632f12a59a36a80f209c181ef15900a38150da80485974d4f67e820
 EBUILD netbeans-groovy-9999_p20160929.ebuild 3416 SHA256 7c8b0ea719074621948338c7f57dfc69a0c1f5cd137c9f02da983ceff11a8b35 SHA512 ea568480157e3a767bf223e13a75f1f7d560b87c86bd48212ac43ce9dd1a900bdc1fb425bb006a98849bb8920bd9c4c05ee85365283065209bf3624b9cd53ce6 WHIRLPOOL 14a876459f4fa66db067f158e67e769972dd66c6f7b71d50651a5b0dabd2abed3733e8d5703c134163cacfec3a04d2f398c788c26476b7b775e794ac2e82a8b5
+EBUILD netbeans-groovy-9999_p20160930.ebuild 3416 SHA256 61d6fe832e531da306b655838f355084c7707e161892567e50b8862f9f75ff95 SHA512 f5d8688a3679cdf60fd59b541d383f4325430439cbf32fefdc286261ae52df8e058b3f9f581c1e7f41d276f189dce12a1c3acaede4c9248c04acec9214b557de WHIRLPOOL a8969d7d52551a6e2a59ad057b3fadd2447e9fb6e3afb49eb9c192dbd94f49ff1a4e52c72c8aa456b1fc777a3b53b1259897e9fb1c9a78a8bf748c5600d77f61
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160930.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160930.ebuild
new file mode 100644
index 0000000..99073ff
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160930.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-09-30_00-02-33/zip/netbeans-trunk-nightly-201609300002-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 a504f12..42721a0 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1b
 DIST netbeans-trunk-nightly-201609270002-src.zip 218005716 SHA256 c3fa3dc736f783a83a271884081217462cc31d4da6bfd1e7f069e4c5a3bc4a16 SHA512 ecb4885fb30f811901b1c443b4ca15952f1baf8926da411f6c937b8240af0adbd4fc42701b75f8e06a510d7dac9e393b5b799034885f07b3eccb0ef54f83af70 WHIRLPOOL 617347cc777545dfaa08b0731bc0e8aa2d363fa227c73914e79ad8a56e1d3ed8c224cb0560173a86c77937ce4174993cb31fc323d223fb91719ed32a75417496
 DIST netbeans-trunk-nightly-201609280002-src.zip 218005761 SHA256 367daea36555b453b8f12f89d0e75d20583869e3469f00db3c1c8c401e6ccfb1 SHA512 0eafbbedb1c1ea0ddfa1a52e235b7d681fcf9d1601a1ab07d42790bc5d02be3dcd8f0c3a7f71ad8e05f3450b3fdb7fcbd7810429ab5169c56fc777dca0e68e9c WHIRLPOOL 537016c960469b05459c054d4557ab710fd51f4cfe30bb5ff84ec1385bbc038a731eb44bd5d0dfb1426fe59bd4b4ede402242cb1d3dc138aaf0ed2dc80456c19
 DIST netbeans-trunk-nightly-201609290002-src.zip 218005780 SHA256 67f26255f3739c1e1c7c5efa90831c83a0fc4dc19c0b63b5259863abd0722eac SHA512 bfb83214f634186d3ed40dd6926a521fecdaedd59209a864e8c37490bc1e2bc7455a353c0e541a77350d3e54c5a7d194c33765a5ed7b2b0b6432e777d0f90545 WHIRLPOOL d886cb54f28a0607610318ace3e71a96f68233f0257a278063909de5a5ddd5d1735dab8083de19b52c8580c9c820f3ef73b88e2d16d39488d829996ec448c957
+DIST netbeans-trunk-nightly-201609300002-src.zip 218005837 SHA256 d3ecb5c388ebe8ea4ee762c9aff725eba2a94ed2d91d38b9d6a6c6a9fae6048a SHA512 24bd317bb8dd2b0b98dba21757b1335154c7a847a53cdb44226ae7d2012266b2c02eab00b8d2b55503f3612be894a49d3deaa16d579d251c0df5c090b9df918c WHIRLPOOL 3e9bae3a1264f83fd640189a5c3521647aff21e25d90ce6f620cdecd9ea9bc3e9c6133536e536936f6c7348421bc67f26ece7b06744344043b44e312185f22a5
 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_p20160901.ebuild 4126 SHA256 7df8b62ce9b8e8d1f051aa05ffbc0b7e9f0dcb427983b01a14a114bf6e243400 SHA512 d5dbecf2dfbf2bfeedbc886c5abb76a81deeb8d5c1fe8b6d0bc9bbecad070c52eed91817361c620bf24a1c7b32b6420e8a296f153cdcda7f64f029e154d6eb3c WHIRLPOOL f2300981e99f99f11319d24c62249b064bb526b88650e6defeac73dfe4e3f142ed27d79a13fe1ba30f621eb1a87867d8f62c1a053daa2543a1177a0af6166d89
@@ -66,4 +67,5 @@ EBUILD netbeans-harness-9999_p20160926.ebuild 4126 SHA256 267948ab29fccaddf9386e
 EBUILD netbeans-harness-9999_p20160927.ebuild 4126 SHA256 1658f30d2b5efd99471add88d294e1186bd263349e7ebe9ce7bcc0bbd66e5750 SHA512 13c24a43405bb160085542f039a38cba4e5faf1b5162c696267663a5a9f6b24807f9a6096ebc1144840795888edd953c2a623e11def08986aede8f8069be78ad WHIRLPOOL 414e240897a20dd1ee04a89a18b166a2b7b7d09cbd9e4baa85912f87f7c83a4cdc4c63c433d4abbcf9f2b7f5563dac4035b1b82269950f3a86c806d6f41a058d
 EBUILD netbeans-harness-9999_p20160928.ebuild 4126 SHA256 a8adfc2758e4ef42acdd2f0c33e2fbf06e5312a76c33531f6a90977fd91de1b9 SHA512 3bdd778efbccd1b455cccfb54ee5e4023798b2c0cb8a2c15e1f011bce008f7fb6506000b0798a4b1a6b88d72e96aaba9a3f8fb149703b8701996bcbec063f039 WHIRLPOOL e61e674fd8445ca5dcea54f2af592a9fc1a8487752d0518e8c4d14c72ed2cf3469a0a11c62641cea3daf289c87f39ac9d0fc76f842f9613e5e12f5c8ab47b7b8
 EBUILD netbeans-harness-9999_p20160929.ebuild 4126 SHA256 cba9afd2f58c34f55e908e7351907a25e48294d685787353e81961de00f22c5a SHA512 f29ad3864d3eb0c51c99b512adcb51c1ef2475582f015c6881eda0659dbdcd8fa2526db97bec625e11e08761ab477519bca3eaa3d27a46618a2ed81042650e1c WHIRLPOOL cb36d6c80a2df57952944340da672fe0fe400be80ef83d599dd90a25f47287d089cd2f38c2ddad31e95bc293cd6d9c6b2dfedb7f3011f6ed4f434d521ec4d3d4
+EBUILD netbeans-harness-9999_p20160930.ebuild 4126 SHA256 ff13d102b9a47ae98e2cc5242d19008e0c57534ea69e92e9838eba45ac36a9a9 SHA512 41aaa7d9d595edb21838038707a9dc1d3b2947ab50b44108daf32b12a836cf1a507b4f0ab89fcefaf15d7e6efc398a040328ec1efc0fa9ee14240fe52dac0f37 WHIRLPOOL 3334ce9217c408b6e555c7f7f5a04399a5c2ad94ad4daa4916c02aca5829fce9daa17bdadd20f1ae5abad465c26b33a53bfcbf83dc298a2b42c5748a78a12162
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160930.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160930.ebuild
new file mode 100644
index 0000000..a288b9b
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20160930.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-09-30_00-02-33/zip/netbeans-trunk-nightly-201609300002-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 8e8dcc8..e6b8105 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -170,6 +170,7 @@ DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1b
 DIST netbeans-trunk-nightly-201609270002-src.zip 218005716 SHA256 c3fa3dc736f783a83a271884081217462cc31d4da6bfd1e7f069e4c5a3bc4a16 SHA512 ecb4885fb30f811901b1c443b4ca15952f1baf8926da411f6c937b8240af0adbd4fc42701b75f8e06a510d7dac9e393b5b799034885f07b3eccb0ef54f83af70 WHIRLPOOL 617347cc777545dfaa08b0731bc0e8aa2d363fa227c73914e79ad8a56e1d3ed8c224cb0560173a86c77937ce4174993cb31fc323d223fb91719ed32a75417496
 DIST netbeans-trunk-nightly-201609280002-src.zip 218005761 SHA256 367daea36555b453b8f12f89d0e75d20583869e3469f00db3c1c8c401e6ccfb1 SHA512 0eafbbedb1c1ea0ddfa1a52e235b7d681fcf9d1601a1ab07d42790bc5d02be3dcd8f0c3a7f71ad8e05f3450b3fdb7fcbd7810429ab5169c56fc777dca0e68e9c WHIRLPOOL 537016c960469b05459c054d4557ab710fd51f4cfe30bb5ff84ec1385bbc038a731eb44bd5d0dfb1426fe59bd4b4ede402242cb1d3dc138aaf0ed2dc80456c19
 DIST netbeans-trunk-nightly-201609290002-src.zip 218005780 SHA256 67f26255f3739c1e1c7c5efa90831c83a0fc4dc19c0b63b5259863abd0722eac SHA512 bfb83214f634186d3ed40dd6926a521fecdaedd59209a864e8c37490bc1e2bc7455a353c0e541a77350d3e54c5a7d194c33765a5ed7b2b0b6432e777d0f90545 WHIRLPOOL d886cb54f28a0607610318ace3e71a96f68233f0257a278063909de5a5ddd5d1735dab8083de19b52c8580c9c820f3ef73b88e2d16d39488d829996ec448c957
+DIST netbeans-trunk-nightly-201609300002-src.zip 218005837 SHA256 d3ecb5c388ebe8ea4ee762c9aff725eba2a94ed2d91d38b9d6a6c6a9fae6048a SHA512 24bd317bb8dd2b0b98dba21757b1335154c7a847a53cdb44226ae7d2012266b2c02eab00b8d2b55503f3612be894a49d3deaa16d579d251c0df5c090b9df918c WHIRLPOOL 3e9bae3a1264f83fd640189a5c3521647aff21e25d90ce6f620cdecd9ea9bc3e9c6133536e536936f6c7348421bc67f26ece7b06744344043b44e312185f22a5
 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_p20160901.ebuild 29849 SHA256 c1cbbcf929e5d8d7b4308f18929032c82a75de4cf674a52b44aa029a0e33fd7f SHA512 f70b98cb010431cf8389e111e023695abf8689721560252df25b9679d584f08dece3583327ea078404eea481bcee38d136d3221f93f766735cc6fc24170f2dcf WHIRLPOOL 448b751ab2996d8dc1989ad4211dd9a20a7e6d31e7a3cc2889994726ecd21df1417329f410810c918695f605117fafe89b123881ff5ef5c010ee42408ed71945
@@ -200,4 +201,5 @@ EBUILD netbeans-ide-9999_p20160926.ebuild 29849 SHA256 cc2a1c1130713980fd872ee3b
 EBUILD netbeans-ide-9999_p20160927.ebuild 29849 SHA256 5640d9de18f51fd75577c6c1da71e4dfc279217833cde89057f41da40f5ba082 SHA512 d65bd99f152ff60f2613e3070e6e408c67faaa72b93e090e6ec3f91311d251d347490ee5919d3f4834a3a4237e76be2c657384636244e317b403782b0faffc5a WHIRLPOOL 6f5bf57778d460fb62f9de9c6c6de7542620b9975ad19cd400519b13551d78fdf9d450c8ff92261bd1c8ef228adec4b052aa8686b84f097ba1c86f05b408387a
 EBUILD netbeans-ide-9999_p20160928.ebuild 29849 SHA256 67f3c25c7bb79e09e1167b0af48e56903abebdd773cacc7a98fbf342b7505768 SHA512 adcc54258693bec02dbfef133b887725168db184736e4ccb1d3fa67d2f13f078b2502eddccb56a73a64ccabaa44780db1de9329f272685b3c388dfb0a6af59c6 WHIRLPOOL d2d623df2c184e22fd9fb31c39f0ead52f31b96edb13b8e47e835f1e6196424c2f2ea8e5251ba441674692088b85d577bfafaab975ef84fa3e4f25454c1cab5c
 EBUILD netbeans-ide-9999_p20160929.ebuild 29849 SHA256 2f8a92841d6faca51da7a05fb95d4edf6b7d89d6b7f04a8510c5b74ef36608be SHA512 5f1b624866932b4e00c6143c641c0ee10bb6cc3ff745ba0b6c6ab614a415f8ff910eb44150cfb6136114fdc69b04bf33ea4141649520e8e47067f4fa9ccb32c2 WHIRLPOOL 857e15a821358e6164da1d74e233347455ca3cb008e6f2992534571d46933c868543f784f99240b2efeafc9bc4fc8f7aaa989d83c8f12776f7dde0d82cdae7cc
+EBUILD netbeans-ide-9999_p20160930.ebuild 29849 SHA256 5225f9e2bfbaf0be9c747928768f5c243d77245c361935ef1c7d050b26554924 SHA512 79d6a013c70908e709549253127cdf820bb8017efa2f05f0db4cedbdc83a8dc195e887bed74c0fa1358a970606a0dabfc31722209cd717a7cc66c3c3944abd55 WHIRLPOOL fbfffac7c5415ee7c9fb24002f9b8af7711a1671199872fed67a231e02d67070d07465d6496b9e27669b20062a7787010ab0bd4c151d8582bf2f3334138de53b
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160930.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160930.ebuild
new file mode 100644
index 0000000..9a61d58
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20160930.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-09-30_00-02-33/zip/netbeans-trunk-nightly-201609300002-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/5968566A351B28623DE4720B0ACB1E40338074D0-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}"/5968566A351B28623DE4720B0ACB1E40338074D0-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 183855f..5cd70be 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1b
 DIST netbeans-trunk-nightly-201609270002-src.zip 218005716 SHA256 c3fa3dc736f783a83a271884081217462cc31d4da6bfd1e7f069e4c5a3bc4a16 SHA512 ecb4885fb30f811901b1c443b4ca15952f1baf8926da411f6c937b8240af0adbd4fc42701b75f8e06a510d7dac9e393b5b799034885f07b3eccb0ef54f83af70 WHIRLPOOL 617347cc777545dfaa08b0731bc0e8aa2d363fa227c73914e79ad8a56e1d3ed8c224cb0560173a86c77937ce4174993cb31fc323d223fb91719ed32a75417496
 DIST netbeans-trunk-nightly-201609280002-src.zip 218005761 SHA256 367daea36555b453b8f12f89d0e75d20583869e3469f00db3c1c8c401e6ccfb1 SHA512 0eafbbedb1c1ea0ddfa1a52e235b7d681fcf9d1601a1ab07d42790bc5d02be3dcd8f0c3a7f71ad8e05f3450b3fdb7fcbd7810429ab5169c56fc777dca0e68e9c WHIRLPOOL 537016c960469b05459c054d4557ab710fd51f4cfe30bb5ff84ec1385bbc038a731eb44bd5d0dfb1426fe59bd4b4ede402242cb1d3dc138aaf0ed2dc80456c19
 DIST netbeans-trunk-nightly-201609290002-src.zip 218005780 SHA256 67f26255f3739c1e1c7c5efa90831c83a0fc4dc19c0b63b5259863abd0722eac SHA512 bfb83214f634186d3ed40dd6926a521fecdaedd59209a864e8c37490bc1e2bc7455a353c0e541a77350d3e54c5a7d194c33765a5ed7b2b0b6432e777d0f90545 WHIRLPOOL d886cb54f28a0607610318ace3e71a96f68233f0257a278063909de5a5ddd5d1735dab8083de19b52c8580c9c820f3ef73b88e2d16d39488d829996ec448c957
+DIST netbeans-trunk-nightly-201609300002-src.zip 218005837 SHA256 d3ecb5c388ebe8ea4ee762c9aff725eba2a94ed2d91d38b9d6a6c6a9fae6048a SHA512 24bd317bb8dd2b0b98dba21757b1335154c7a847a53cdb44226ae7d2012266b2c02eab00b8d2b55503f3612be894a49d3deaa16d579d251c0df5c090b9df918c WHIRLPOOL 3e9bae3a1264f83fd640189a5c3521647aff21e25d90ce6f620cdecd9ea9bc3e9c6133536e536936f6c7348421bc67f26ece7b06744344043b44e312185f22a5
 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_p20160901.ebuild 4971 SHA256 771e34db8c9fb8270fed4124ae9e3f9bcd968415afc1d62e6f53fb8e6ebfae80 SHA512 c5330952122e0cb95d56ffa19bd51216177179a3d9396bea5563b064b8f6392534a4415c4e2184c45f7fe6e1124ef718e5690b781328efd7b3f48f427e861256 WHIRLPOOL e876f88b48f8c06d81e0404158a3f688c03f409d89df3ed015a3cb709c9cf0dd68170f905c29f959df1024b416fd8853173b09ce7c2b3650cb98f55f8e7460ef
@@ -64,4 +65,5 @@ EBUILD netbeans-javacard-9999_p20160926.ebuild 4971 SHA256 d32cf3bd8dd10a4954743
 EBUILD netbeans-javacard-9999_p20160927.ebuild 4971 SHA256 90870579790314a58611324c4e8be8d8144613479e05d1aee67e9462edf2674d SHA512 3ea1eed13d7ee93540d96eb27fa22e90322e2f4799cc3ce0a74ee8bb8b768154e69b50c2e14eef228ea52e0bb3cd8d50707716a88fe31295b413a23e4f1c8ee5 WHIRLPOOL 803c4c6786572e5080b7c8386fd64dbb1f0a886e75ddd96112f165f6fd67b5b6a17781a94a39644fde193049700d36539541005d2c1934f6da7683fe6b4e27f0
 EBUILD netbeans-javacard-9999_p20160928.ebuild 4971 SHA256 c2436d04e37ff0e72c6ea25cb850f9c9d84e415a2a06291bc0bf288d060587b6 SHA512 4ec5ed5e1e162e0ffb4f8ccc24ea162f71c386fca4d297af31efe11478193e29602de0ccbce4f897626c436a0741aabe7603a6fbc9b6910abcdd4daf5f118045 WHIRLPOOL 53e3a87396c8760c9f5899de68aabb065953b22d9f60cc3e3216687dd08d52dbda6f53db9ca2a22d3e75aa5ad7876673e72dcaa0f849cdd849d34c6e047b9df3
 EBUILD netbeans-javacard-9999_p20160929.ebuild 4971 SHA256 009fb9bd4e6fc6df2c9c68e405ba6fc9bbb055dfbf99a9c667fadb60419b8c5b SHA512 91e6a5f1406653631ef81fc3aaf01e76c6f0991ae1f7ab374b48989e4658a99cd993db9471eeb1edaeec8ffb909a2f4b9995d6a2ed131025a8773feca9212378 WHIRLPOOL 615bea45ae3bf0e9be9a901fae1ffcb35978e753b576534f1cafb7bdaa7b721c62dd423a2adefc95044cfc3378e85312598618c5cc1da1a0c39a5f9ae9d268ad
+EBUILD netbeans-javacard-9999_p20160930.ebuild 4971 SHA256 47045f9e83c585c10a0d6c816f8e705a7e1dabd4a1d3b5fb0318c2bd94ed113b SHA512 02fca840a30a04901e8881e6d80ae409df427477169d0b182cabf5c704e2588028d3f077333a28ead5e684ed6b796a9dbc646fd3ee1f07e69731edb9368c3604 WHIRLPOOL 4ab64685359439eaedb20bc2f43d51ea6eaeda852e92dbabd61fcf10c362d6d1f3c460a477f6a8d0f4a1a4670ec1cbb8a64d6a06ae29c50bf5ffdbf85009e3cd
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160930.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160930.ebuild
new file mode 100644
index 0000000..f284f6d
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160930.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-09-30_00-02-33/zip/netbeans-trunk-nightly-201609300002-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 29ad0c7..d880d6e 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1b
 DIST netbeans-trunk-nightly-201609270002-src.zip 218005716 SHA256 c3fa3dc736f783a83a271884081217462cc31d4da6bfd1e7f069e4c5a3bc4a16 SHA512 ecb4885fb30f811901b1c443b4ca15952f1baf8926da411f6c937b8240af0adbd4fc42701b75f8e06a510d7dac9e393b5b799034885f07b3eccb0ef54f83af70 WHIRLPOOL 617347cc777545dfaa08b0731bc0e8aa2d363fa227c73914e79ad8a56e1d3ed8c224cb0560173a86c77937ce4174993cb31fc323d223fb91719ed32a75417496
 DIST netbeans-trunk-nightly-201609280002-src.zip 218005761 SHA256 367daea36555b453b8f12f89d0e75d20583869e3469f00db3c1c8c401e6ccfb1 SHA512 0eafbbedb1c1ea0ddfa1a52e235b7d681fcf9d1601a1ab07d42790bc5d02be3dcd8f0c3a7f71ad8e05f3450b3fdb7fcbd7810429ab5169c56fc777dca0e68e9c WHIRLPOOL 537016c960469b05459c054d4557ab710fd51f4cfe30bb5ff84ec1385bbc038a731eb44bd5d0dfb1426fe59bd4b4ede402242cb1d3dc138aaf0ed2dc80456c19
 DIST netbeans-trunk-nightly-201609290002-src.zip 218005780 SHA256 67f26255f3739c1e1c7c5efa90831c83a0fc4dc19c0b63b5259863abd0722eac SHA512 bfb83214f634186d3ed40dd6926a521fecdaedd59209a864e8c37490bc1e2bc7455a353c0e541a77350d3e54c5a7d194c33765a5ed7b2b0b6432e777d0f90545 WHIRLPOOL d886cb54f28a0607610318ace3e71a96f68233f0257a278063909de5a5ddd5d1735dab8083de19b52c8580c9c820f3ef73b88e2d16d39488d829996ec448c957
+DIST netbeans-trunk-nightly-201609300002-src.zip 218005837 SHA256 d3ecb5c388ebe8ea4ee762c9aff725eba2a94ed2d91d38b9d6a6c6a9fae6048a SHA512 24bd317bb8dd2b0b98dba21757b1335154c7a847a53cdb44226ae7d2012266b2c02eab00b8d2b55503f3612be894a49d3deaa16d579d251c0df5c090b9df918c WHIRLPOOL 3e9bae3a1264f83fd640189a5c3521647aff21e25d90ce6f620cdecd9ea9bc3e9c6133536e536936f6c7348421bc67f26ece7b06744344043b44e312185f22a5
 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_p20160901.ebuild 6293 SHA256 df11758b565df7b1870cccb82ca013f95107c10a8bcfea17d24f66d87402187b SHA512 8a9390acec77716d1cf5d346d76158a28ef9ad26d08d7809a11a76979f6b0ed14a5920fb70d6f8616c00207d535e11d7aab90bbd7a79d12d85448e97f90a604c WHIRLPOOL 8dc1ba9f260910815ec9e1d878a96c0a0a622cd6fb076eb5527d97aaff0487d8d017955463ec556ba8c29c01db1b0a32b19911649ab1d08f0130846d948e3b6a
@@ -63,4 +64,5 @@ EBUILD netbeans-javadoc-9999_p20160926.ebuild 6293 SHA256 0eed4465649deb22c778bd
 EBUILD netbeans-javadoc-9999_p20160927.ebuild 6293 SHA256 8fe53add602f000cd877f5065fa3cc2dc99176285df4536affed2f28cc7409e7 SHA512 ffb989eba1f261288eaf88bf7daac38e356f24eb06505eb89c0164968aa15529545f568fe31208f77b3d98b2f916de7f5676387de8200fab44d2b44cc2d4743e WHIRLPOOL 1643ab51124c935fc0d858e7ecd99db1325526589a3de9def3317bf0cae1357d5033925c95e910e8a6de99f2c27ee4ec773dea9f7ed83c805f13f88885a7be29
 EBUILD netbeans-javadoc-9999_p20160928.ebuild 6293 SHA256 e2a4fef36770a10ed164a9eb9b19e51dc5c2b0af00a5eca1232d4b3f65cd8d97 SHA512 0faf3ca6fe9fa2b4a893a35c6ff0c028e7712fc815187c3a8f9b444a5a9af662e483e1142ee1d8746e7ac8d45f615700c2a09656097da1f5b1dc1427dcfd15e3 WHIRLPOOL 8b7882dcb4f5424cb772a8a668f23fdc53c317f64802419ac6ccfb509240243e201c9e050d95da0480ceb6107b1f26002e2dee52ba4353f1f85fe8f74224df4c
 EBUILD netbeans-javadoc-9999_p20160929.ebuild 6293 SHA256 f35926c08712186b908fbb65825eb55dfa1b2522208e025bf6719c42b8c922ba SHA512 8116a2b1d2b6343c1431e2d98c60f4c13743c87ff05b4785b58204d5fae91e86ac8183a259bcc9007e50ad51832d6fdebc8fad276ba41aa059caa47b2557b76b WHIRLPOOL c822a9109612e53d0495316278248f44b5c2b8c31bd1b6105b4816a0d647c96898003b7c76e889f5a1c56c2a813b0025c65e873e154f1fe79f0daf06f8ad67c0
+EBUILD netbeans-javadoc-9999_p20160930.ebuild 6293 SHA256 373ee67e57a7232ea21dae5a9fc0fc4e61fe8ba028c2066fd817e0885a98ff4c SHA512 6c2c2a17c8744e1a52ef60d97516ab0bc580fd9356dbbf50e6bbd7132ea3bd815c14b55447237543eab2b1fbe8dad904c04935c55b52cc96a11fd188d0b71edf WHIRLPOOL 6198fb928a1c57894131d0062335f4e7f8ba6c8ff44c40639ce41d38d5202a0c37cf65a4eda6f344289b31c90ebeec8015bb85a2570542d6c22986f04b817097
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index 463cb1d..149adca 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1b
 DIST netbeans-trunk-nightly-201609270002-src.zip 218005716 SHA256 c3fa3dc736f783a83a271884081217462cc31d4da6bfd1e7f069e4c5a3bc4a16 SHA512 ecb4885fb30f811901b1c443b4ca15952f1baf8926da411f6c937b8240af0adbd4fc42701b75f8e06a510d7dac9e393b5b799034885f07b3eccb0ef54f83af70 WHIRLPOOL 617347cc777545dfaa08b0731bc0e8aa2d363fa227c73914e79ad8a56e1d3ed8c224cb0560173a86c77937ce4174993cb31fc323d223fb91719ed32a75417496
 DIST netbeans-trunk-nightly-201609280002-src.zip 218005761 SHA256 367daea36555b453b8f12f89d0e75d20583869e3469f00db3c1c8c401e6ccfb1 SHA512 0eafbbedb1c1ea0ddfa1a52e235b7d681fcf9d1601a1ab07d42790bc5d02be3dcd8f0c3a7f71ad8e05f3450b3fdb7fcbd7810429ab5169c56fc777dca0e68e9c WHIRLPOOL 537016c960469b05459c054d4557ab710fd51f4cfe30bb5ff84ec1385bbc038a731eb44bd5d0dfb1426fe59bd4b4ede402242cb1d3dc138aaf0ed2dc80456c19
 DIST netbeans-trunk-nightly-201609290002-src.zip 218005780 SHA256 67f26255f3739c1e1c7c5efa90831c83a0fc4dc19c0b63b5259863abd0722eac SHA512 bfb83214f634186d3ed40dd6926a521fecdaedd59209a864e8c37490bc1e2bc7455a353c0e541a77350d3e54c5a7d194c33765a5ed7b2b0b6432e777d0f90545 WHIRLPOOL d886cb54f28a0607610318ace3e71a96f68233f0257a278063909de5a5ddd5d1735dab8083de19b52c8580c9c820f3ef73b88e2d16d39488d829996ec448c957
+DIST netbeans-trunk-nightly-201609300002-src.zip 218005837 SHA256 d3ecb5c388ebe8ea4ee762c9aff725eba2a94ed2d91d38b9d6a6c6a9fae6048a SHA512 24bd317bb8dd2b0b98dba21757b1335154c7a847a53cdb44226ae7d2012266b2c02eab00b8d2b55503f3612be894a49d3deaa16d579d251c0df5c090b9df918c WHIRLPOOL 3e9bae3a1264f83fd640189a5c3521647aff21e25d90ce6f620cdecd9ea9bc3e9c6133536e536936f6c7348421bc67f26ece7b06744344043b44e312185f22a5
 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_p20160901.ebuild 4717 SHA256 afda23e506ad84f0c3b9faaa6f239f36b07e16eba600086efb7ebd2bf5a6f739 SHA512 1f8192151c037eb1ea1df568cd13ad3ccd92928ad5c4000de1a4f142c868fddcb72e23a78dd91bec1e9c6cdd049d55816d5af538def5221c628a80aae536a53a WHIRLPOOL 9b22ac91892e92287033d245ad630b0f03df805989fa0380b0254f1acc6693301553edaf074f70261ee2adde8de0f8898a18dca281b0d0fde7b80d47c509a09c
@@ -69,4 +70,5 @@ EBUILD netbeans-javafx-9999_p20160926.ebuild 4717 SHA256 d0d6f965f90ff3fd60a55c4
 EBUILD netbeans-javafx-9999_p20160927.ebuild 4717 SHA256 c54f67f2dbbb6c46d5469dcada2cd550380352abc5a34e2677feacd40e0f543b SHA512 9cb6da5d3f22f224f6906d1b0df5de2f996dee65ba750e6b943cfc0947f3badaa333a5800f0c9706e93b70c25417517b8d067565fc261b1854b3fad4750d1f1d WHIRLPOOL 634ee42e9decf3a3802d2f60cb90b782032b43546a05f58f8fc5fccabfd0f8f708b6da518a5e3f6620b7f7b8e0e03ef334e831a8a0f32c4bf69e7cc407d2b837
 EBUILD netbeans-javafx-9999_p20160928.ebuild 4717 SHA256 c11743b641116bc97c1497a52442f6ebbc915e9bb7b8c430751d4d9c69392f3c SHA512 097f2ea3047d63e039069be4afa7926f1ccd05fa1036c9c723e596478cb05decd48dc6e1a527d6d21ff76fcae57f5e2d397132e6ff1dc0a7016ec9457305c319 WHIRLPOOL 2a3903a7ed61126d68b810b21c88c9f22d899ff0bf09cf2ab645a9840650a0cb89e2e5fc22e458cef8ce38c6f9fd7b3e4b921a454ebc9a4ed4d61e6402d2cfdf
 EBUILD netbeans-javafx-9999_p20160929.ebuild 4717 SHA256 1971bd36da40c6da23aaca135b298ce274adcb3a772cbd77e5131728cc2e2973 SHA512 001431d9afba106b7f2496d4b9b9ae8d97c543ee1e05adf839efde4e7c48a88567360b82999eca1a8d2fc51e769b8d7082de5c16e9c84ff0566747574b7b4762 WHIRLPOOL 7b2f6a19a3deec08fb29c444a14b3b185f5bc6f7e89b5d020748ef14dd63745b179a58aa7ae1a8f69ff3bdbb37b4296892d711304e3b0aeb1e84e542e77684b3
+EBUILD netbeans-javafx-9999_p20160930.ebuild 4717 SHA256 89604045aef265d219465d7a827185d8c2292b15964b846a03bb9d793d10b42e SHA512 ecd88cf302ab0b05e50db0be1c95ebb4b093439976f42269e4640682599fa38a3e66b2e9226eeb5a6630dece094c8a2cc71f59f8c8b6d518e3a0db8a733b94a6 WHIRLPOOL 1f525e631330d92bbcdffaa193ffb89daae73cfb0b0b36a314941b1d78206a9e0bbb5a6a7de354f13ae3674b0d90e3a3c996ccff7eda63d061095bad4c143288
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160930.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160930.ebuild
new file mode 100644
index 0000000..ad5785b
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160930.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-09-30_00-02-33/zip/netbeans-trunk-nightly-201609300002-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 0b21f3a..f5e9fbc 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1b
 DIST netbeans-trunk-nightly-201609270002-src.zip 218005716 SHA256 c3fa3dc736f783a83a271884081217462cc31d4da6bfd1e7f069e4c5a3bc4a16 SHA512 ecb4885fb30f811901b1c443b4ca15952f1baf8926da411f6c937b8240af0adbd4fc42701b75f8e06a510d7dac9e393b5b799034885f07b3eccb0ef54f83af70 WHIRLPOOL 617347cc777545dfaa08b0731bc0e8aa2d363fa227c73914e79ad8a56e1d3ed8c224cb0560173a86c77937ce4174993cb31fc323d223fb91719ed32a75417496
 DIST netbeans-trunk-nightly-201609280002-src.zip 218005761 SHA256 367daea36555b453b8f12f89d0e75d20583869e3469f00db3c1c8c401e6ccfb1 SHA512 0eafbbedb1c1ea0ddfa1a52e235b7d681fcf9d1601a1ab07d42790bc5d02be3dcd8f0c3a7f71ad8e05f3450b3fdb7fcbd7810429ab5169c56fc777dca0e68e9c WHIRLPOOL 537016c960469b05459c054d4557ab710fd51f4cfe30bb5ff84ec1385bbc038a731eb44bd5d0dfb1426fe59bd4b4ede402242cb1d3dc138aaf0ed2dc80456c19
 DIST netbeans-trunk-nightly-201609290002-src.zip 218005780 SHA256 67f26255f3739c1e1c7c5efa90831c83a0fc4dc19c0b63b5259863abd0722eac SHA512 bfb83214f634186d3ed40dd6926a521fecdaedd59209a864e8c37490bc1e2bc7455a353c0e541a77350d3e54c5a7d194c33765a5ed7b2b0b6432e777d0f90545 WHIRLPOOL d886cb54f28a0607610318ace3e71a96f68233f0257a278063909de5a5ddd5d1735dab8083de19b52c8580c9c820f3ef73b88e2d16d39488d829996ec448c957
+DIST netbeans-trunk-nightly-201609300002-src.zip 218005837 SHA256 d3ecb5c388ebe8ea4ee762c9aff725eba2a94ed2d91d38b9d6a6c6a9fae6048a SHA512 24bd317bb8dd2b0b98dba21757b1335154c7a847a53cdb44226ae7d2012266b2c02eab00b8d2b55503f3612be894a49d3deaa16d579d251c0df5c090b9df918c WHIRLPOOL 3e9bae3a1264f83fd640189a5c3521647aff21e25d90ce6f620cdecd9ea9bc3e9c6133536e536936f6c7348421bc67f26ece7b06744344043b44e312185f22a5
 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_p20160901.ebuild 4412 SHA256 f89bb05601b815be0214a46e4b2f9e7629653fbb24d7c47fe8346dfc05805876 SHA512 5936e4e719ea10a3bd3469bf058dd18ea82a767868a238340d5cb38612db9e91ed02dec4ea89be94a523e0a4fcab44a2c056d0c8a6304ee263d19cebf0492986 WHIRLPOOL 6c7dba0c13eb79fd596efd755084072dd13e3a9a51d0fd48943f30ca00aa38b0b84416e013a67385690f03dc9fb347941864bbfca4ed093625149428281d5624
@@ -61,4 +62,5 @@ EBUILD netbeans-mobility-9999_p20160926.ebuild 4412 SHA256 bfe1a303c8d61b0fdbbfe
 EBUILD netbeans-mobility-9999_p20160927.ebuild 4412 SHA256 7e7f9936a892be4a45c088f64dc62838821a2416a0534ac4db284fbf5976c23f SHA512 3e9469222c7f189958b9e7f20d6b8b3aa9cf224b0f2a3f79e2389efe0ce058733140910c7fb1504bc9d51f120c80eef907658494643b93e1fccf9322c04974b5 WHIRLPOOL d48f21d76b3c8a6a68833a667c9ee764f94d3690e6f11239ebd3c6ca718629d101c1c9012f78ebc0e4c77e6b1576127dce6a6c082601735bc575532e2a0a55e1
 EBUILD netbeans-mobility-9999_p20160928.ebuild 4412 SHA256 c9a96a1ff20da96138d73f4195ea5cb55a928437bbf1fc267e4e3240930073a8 SHA512 a36d4bee50d7f8bd99812d73e38e1280969a32a1f1bf396891146fee362e9f518265aca54bd7401ae80c93bd0f2ddf6e6182339c4e629d44a4bd952e69023fc3 WHIRLPOOL 4da9819ff45054f9f7785514f2e024fa27993a72f212331c08c8552b68978e6f5f07b2f9a37bb673783f2eb654338dbb659ecf945b53e0c57034b4aca010d42f
 EBUILD netbeans-mobility-9999_p20160929.ebuild 4412 SHA256 c7b177099edc9a51383f89806ec9df462c61fe76a3022fdf630828d62b289d8c SHA512 f2df1c93d8079b5323258b027d1b9c06aa9bb888fc9ea333b0af1674caec773e837ff3c574898fa976b31c150bb8fa91fe57df5cf1df3a47cf276380899069a7 WHIRLPOOL 55843731c2ca44cdfcc7a97c981bb59654b03be66ad4e67fe54930a2b166b2141fa892578415dba622fa20cd6e83d5f4eec442728a32ec18279f049f00920c2a
+EBUILD netbeans-mobility-9999_p20160930.ebuild 4412 SHA256 aff1b2c1e67248c282b3db58a671e5d713491e60c46cc952c99794a662475911 SHA512 5df0c685d63299dc3788457974d66ebb08a700a08cb143e1ae1e3baac1791aeb46176114a9f3b310df6a8a51b8d60cd30d2c15cc17c9b7941edb13f86b4beb1a WHIRLPOOL 13b2aaf8c5dc387ba9cdcc1896288804a88454d5225540c82112759256429d451a71cf3c9727cac54776611697202901b28ebb6397513b09469940decb46d7f8
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160930.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160930.ebuild
new file mode 100644
index 0000000..2727652
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160930.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-09-30_00-02-33/zip/netbeans-trunk-nightly-201609300002-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 a50e796..60f405d 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1b
 DIST netbeans-trunk-nightly-201609270002-src.zip 218005716 SHA256 c3fa3dc736f783a83a271884081217462cc31d4da6bfd1e7f069e4c5a3bc4a16 SHA512 ecb4885fb30f811901b1c443b4ca15952f1baf8926da411f6c937b8240af0adbd4fc42701b75f8e06a510d7dac9e393b5b799034885f07b3eccb0ef54f83af70 WHIRLPOOL 617347cc777545dfaa08b0731bc0e8aa2d363fa227c73914e79ad8a56e1d3ed8c224cb0560173a86c77937ce4174993cb31fc323d223fb91719ed32a75417496
 DIST netbeans-trunk-nightly-201609280002-src.zip 218005761 SHA256 367daea36555b453b8f12f89d0e75d20583869e3469f00db3c1c8c401e6ccfb1 SHA512 0eafbbedb1c1ea0ddfa1a52e235b7d681fcf9d1601a1ab07d42790bc5d02be3dcd8f0c3a7f71ad8e05f3450b3fdb7fcbd7810429ab5169c56fc777dca0e68e9c WHIRLPOOL 537016c960469b05459c054d4557ab710fd51f4cfe30bb5ff84ec1385bbc038a731eb44bd5d0dfb1426fe59bd4b4ede402242cb1d3dc138aaf0ed2dc80456c19
 DIST netbeans-trunk-nightly-201609290002-src.zip 218005780 SHA256 67f26255f3739c1e1c7c5efa90831c83a0fc4dc19c0b63b5259863abd0722eac SHA512 bfb83214f634186d3ed40dd6926a521fecdaedd59209a864e8c37490bc1e2bc7455a353c0e541a77350d3e54c5a7d194c33765a5ed7b2b0b6432e777d0f90545 WHIRLPOOL d886cb54f28a0607610318ace3e71a96f68233f0257a278063909de5a5ddd5d1735dab8083de19b52c8580c9c820f3ef73b88e2d16d39488d829996ec448c957
+DIST netbeans-trunk-nightly-201609300002-src.zip 218005837 SHA256 d3ecb5c388ebe8ea4ee762c9aff725eba2a94ed2d91d38b9d6a6c6a9fae6048a SHA512 24bd317bb8dd2b0b98dba21757b1335154c7a847a53cdb44226ae7d2012266b2c02eab00b8d2b55503f3612be894a49d3deaa16d579d251c0df5c090b9df918c WHIRLPOOL 3e9bae3a1264f83fd640189a5c3521647aff21e25d90ce6f620cdecd9ea9bc3e9c6133536e536936f6c7348421bc67f26ece7b06744344043b44e312185f22a5
 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_p20160901.ebuild 4111 SHA256 ac43a3847c3a425129a9762b672638648e0adb1ead273f370f422ac8a40c5a00 SHA512 a9cdbf5243d3f0c99e35fe16384b23fbb3e678adf8e1adf3dc19a0e0befc653924d0b2d5b81f1d94cdb3c4de817544df1ce013569cc13f18851273da3c1d8509 WHIRLPOOL 72ab9db58379041a80fe899b6ca25a37194536ed2c0bd76ab43092d65817dff300cb03ff709e4765daec65be6745a6297844b7678b64185a4497309310bb9207
@@ -64,4 +65,5 @@ EBUILD netbeans-nb-9999_p20160926.ebuild 4111 SHA256 6722f2fb202b782b751ba07221b
 EBUILD netbeans-nb-9999_p20160927.ebuild 4111 SHA256 52b16718ad827bfe2cbc31ae42469deeeb2f41ca04f731774e7ee66d7dcf07cb SHA512 233412cc7c6c40ab72a441600bcf93298f0824503e73d3c6c9c02a505788cc7e0039424833341d7e65e6dbe01cebf3ce0a99bbd2bd0ccf19b0d7395310584d29 WHIRLPOOL d599372080af5efba1dcb35094c4940923d7dd22e4609e2360e960bbe5af0c5fb3957abc9f3eedd980f2ca8e16b21596530e989398dbf1a91b63b5c9ae46ff59
 EBUILD netbeans-nb-9999_p20160928.ebuild 4111 SHA256 1d00fa0fe422085e12dcefa695f57ed62234c650e6b818a15fb92b8b8d9caa49 SHA512 9c629ca42ca76ff8fc03f5b0a401e8709556580ec6d3bf1d4fa24c9216aa592c0bf37a2af1c824cb6ddbea397d5a13387a92340c8d26397cc7520a83905d80ae WHIRLPOOL eb14e282fd64e53a96ff9e4c9f0f44e46f90788ae27a9ebb7d380f155d2d20ad4e5bc4e04bd5c753e4b6466ae0f3cca53cea18d6032171640f8188a642612efe
 EBUILD netbeans-nb-9999_p20160929.ebuild 4111 SHA256 c2f6faee7b11bad69e84e9607ba6bbf2b0b18e1a4cc0ac482fb53a7f97fbfb4b SHA512 319b60b4fee261784b6bd3933505062d51805e354f55f9b4108ce1a81d29195ebc7e9114494bb8cce49f68638b44c2538a6dc13e07b6bb8f12137800f54853da WHIRLPOOL 8d067e68e079c8263979403adc0f25654ffe69e93b6ee14fa029efb76c7410255b1bb444a8b94629d1502a4fcd8e63c3f5d08871f423d865fdf560ffaf5f77b0
+EBUILD netbeans-nb-9999_p20160930.ebuild 4111 SHA256 f82a76fdfc826ff1e56ebb11b3efde00e620ea567f4bd2ede8f04fa97d6c858d SHA512 cdf4c188709395d3190fea1f075bff49172cad86799a21711a7a147fc24b193173dd6fd1bce44eb60e515fd426626f02af75f7066781ce7c8e22d073535172f4 WHIRLPOOL 2d18d39b1df66a75ec9f934644dc98d14db72eca9f45b19d9d1153433b9f4fe9cf3b3e623bdc827a3554dd3597a076f99fb8628e5ef7d0a23a652964cdf41d3e
 MISC metadata.xml 392 SHA256 01cdbcc83099b97486bd7b8e813e5b19c1138eb0d8d3e8a5683aafd579820435 SHA512 4d2f9160baa022d6a48b61d5f42e71cfd411d244e7a36436629bc5ee4036e4ce19079134d9a6c704ebe942306c2e0199d0591c1e54f92f8f3c8835147e639246 WHIRLPOOL c1131764e1cec66c56b977ebe36014b29e5a68e35ccc326c0cbadd050a6c625cf191c85c212e0a733661c008dab0d99f9a4cdc4c4ae0cc9d775ba1de554795a9

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160930.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160930.ebuild
new file mode 100644
index 0000000..53f8fee
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20160930.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-09-30_00-02-33/zip/netbeans-trunk-nightly-201609300002-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 2505344..fbf9c4c 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1b
 DIST netbeans-trunk-nightly-201609270002-src.zip 218005716 SHA256 c3fa3dc736f783a83a271884081217462cc31d4da6bfd1e7f069e4c5a3bc4a16 SHA512 ecb4885fb30f811901b1c443b4ca15952f1baf8926da411f6c937b8240af0adbd4fc42701b75f8e06a510d7dac9e393b5b799034885f07b3eccb0ef54f83af70 WHIRLPOOL 617347cc777545dfaa08b0731bc0e8aa2d363fa227c73914e79ad8a56e1d3ed8c224cb0560173a86c77937ce4174993cb31fc323d223fb91719ed32a75417496
 DIST netbeans-trunk-nightly-201609280002-src.zip 218005761 SHA256 367daea36555b453b8f12f89d0e75d20583869e3469f00db3c1c8c401e6ccfb1 SHA512 0eafbbedb1c1ea0ddfa1a52e235b7d681fcf9d1601a1ab07d42790bc5d02be3dcd8f0c3a7f71ad8e05f3450b3fdb7fcbd7810429ab5169c56fc777dca0e68e9c WHIRLPOOL 537016c960469b05459c054d4557ab710fd51f4cfe30bb5ff84ec1385bbc038a731eb44bd5d0dfb1426fe59bd4b4ede402242cb1d3dc138aaf0ed2dc80456c19
 DIST netbeans-trunk-nightly-201609290002-src.zip 218005780 SHA256 67f26255f3739c1e1c7c5efa90831c83a0fc4dc19c0b63b5259863abd0722eac SHA512 bfb83214f634186d3ed40dd6926a521fecdaedd59209a864e8c37490bc1e2bc7455a353c0e541a77350d3e54c5a7d194c33765a5ed7b2b0b6432e777d0f90545 WHIRLPOOL d886cb54f28a0607610318ace3e71a96f68233f0257a278063909de5a5ddd5d1735dab8083de19b52c8580c9c820f3ef73b88e2d16d39488d829996ec448c957
+DIST netbeans-trunk-nightly-201609300002-src.zip 218005837 SHA256 d3ecb5c388ebe8ea4ee762c9aff725eba2a94ed2d91d38b9d6a6c6a9fae6048a SHA512 24bd317bb8dd2b0b98dba21757b1335154c7a847a53cdb44226ae7d2012266b2c02eab00b8d2b55503f3612be894a49d3deaa16d579d251c0df5c090b9df918c WHIRLPOOL 3e9bae3a1264f83fd640189a5c3521647aff21e25d90ce6f620cdecd9ea9bc3e9c6133536e536936f6c7348421bc67f26ece7b06744344043b44e312185f22a5
 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_p20160901.ebuild 4418 SHA256 4c21387443b8257d5598bff2323ea12ee5f59bcbbece9aade5176ef8649bfc72 SHA512 92d4305f2a4260652df7ac8bde324305eab2d89f5061f91aab5b946d0c739cc832c08475a21c745aeb2999a8bb19508dec63cda7fd46b1beead680c81290b77d WHIRLPOOL 37b231db271985e5b1f187c7b51530f740159c0af14444adaa03bef9d1f39d440d3ea8195502c8c8de771a0af6ef89e593633ac52b3f476ea510ee302aec6da9
@@ -66,4 +67,5 @@ EBUILD netbeans-php-9999_p20160926.ebuild 4418 SHA256 8b475c916f7dd9c7c3c886e419
 EBUILD netbeans-php-9999_p20160927.ebuild 4418 SHA256 81138ba056466fd95ac3222d25d5bc9995acd9bce583ac38ca3de24484d8604e SHA512 aa82363df5107037a20464db471a01080cd2a5952674d094d7b25fdf80eccbdddd7d37f1f21fcfbfc18d01f9e0d71807991acb28a5cadcb1246e2f4bc0fbda52 WHIRLPOOL 7b614b16734059b4e560402da6f7ea06750ebb2e370f35750c2754573923d15fa417b58ce4297bec610c88316cbbf690aa02333c1f97b4a31c176edaacec60c6
 EBUILD netbeans-php-9999_p20160928.ebuild 4418 SHA256 30c0017482e19badcc24378d2de1b96c1c553bb6de25434515aa5ec876f8e3df SHA512 ba6abba825d36b5144736303f3f3406c9f1672d31fa4e5c3e3c25d9510c19c5ee277ba8bc78fdd88424d5ee03e46f1a4da1b814220fa20418518e7026626d744 WHIRLPOOL 748648c2b293a9a364021180fc93a1e5b501d53a9316cd544d62a60291d570c55ad84b45a8a38ab38412d06cca11027245d2e05abd06845c3738c019832f251e
 EBUILD netbeans-php-9999_p20160929.ebuild 4418 SHA256 42877703e484db8c935323674a9925eb73ffa246aab51a35da853cf6f219b514 SHA512 9e332f04e5e7737bc256fe3583434796ca4b8a0b22578a63db65b4d6c6bc5c0b664c76b5b08f8afe3ba6b9b58f5478cb00bd5b54105576a2310dc731fde7d3cb WHIRLPOOL 9212790f82d863d22cfc773c3fe83ccabd8afd0ad75aeff94b7def026fdca2b45f72deaa457cb0bd8d352e02e315d8c499d5b8f2ab05b10289f5d502a819aa82
+EBUILD netbeans-php-9999_p20160930.ebuild 4418 SHA256 3d3c8ac7c7561cd14d7275282cf89c59fcc4efe337acde34fee794b0c9d10ddf SHA512 f6c76700a5deee768a6289132061f571b1ede948ca6413767cc0326b1329edfaf248a13d6086574327d96c2e861befe1d3fbc9cf2613b1d11fb2334ab2b43b65 WHIRLPOOL ce92af081077ea78ac5d6573a36b0fd8ec9e44823365d6010d0b9075c5809f62b026bc696ec09d8b9dbdbee9d9031eb2b309cd9dea0033d7b88b3f710359cd7f
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160930.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160930.ebuild
new file mode 100644
index 0000000..68a1bfe
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20160930.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-09-30_00-02-33/zip/netbeans-trunk-nightly-201609300002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip
+	http://hg.netbeans.org/binaries/472A52636BE09823B4E5F707071B31FB990A7375-phpsigfiles.zip
+	http://hg.netbeans.org/binaries/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-webcommon-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/javacup:0"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.php -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r16-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip php.phpdoc.documentation/external/phpdocdesc.zip || die
+	ln -s "${DISTDIR}"/472A52636BE09823B4E5F707071B31FB990A7375-phpsigfiles.zip php.project/external/phpsigfiles.zip || die
+	ln -s "${DISTDIR}"/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip php.editor/external/predefined_vars.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.javacup/external javacup javacup.jar java-cup-11a.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-webcommon-${SLOT} webcommon || die
+	cat /usr/share/netbeans-webcommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.webcommon.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/php >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/php$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext
+	pushd "${instdir}" >/dev/null || die
+	rm java-cup-11a.jar && java-pkg_jar-from --into "${instdir}" javacup javacup.jar java-cup-11a.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/php
+}

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index 765efef..5bc13ac 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -57,6 +57,7 @@ DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1b
 DIST netbeans-trunk-nightly-201609270002-src.zip 218005716 SHA256 c3fa3dc736f783a83a271884081217462cc31d4da6bfd1e7f069e4c5a3bc4a16 SHA512 ecb4885fb30f811901b1c443b4ca15952f1baf8926da411f6c937b8240af0adbd4fc42701b75f8e06a510d7dac9e393b5b799034885f07b3eccb0ef54f83af70 WHIRLPOOL 617347cc777545dfaa08b0731bc0e8aa2d363fa227c73914e79ad8a56e1d3ed8c224cb0560173a86c77937ce4174993cb31fc323d223fb91719ed32a75417496
 DIST netbeans-trunk-nightly-201609280002-src.zip 218005761 SHA256 367daea36555b453b8f12f89d0e75d20583869e3469f00db3c1c8c401e6ccfb1 SHA512 0eafbbedb1c1ea0ddfa1a52e235b7d681fcf9d1601a1ab07d42790bc5d02be3dcd8f0c3a7f71ad8e05f3450b3fdb7fcbd7810429ab5169c56fc777dca0e68e9c WHIRLPOOL 537016c960469b05459c054d4557ab710fd51f4cfe30bb5ff84ec1385bbc038a731eb44bd5d0dfb1426fe59bd4b4ede402242cb1d3dc138aaf0ed2dc80456c19
 DIST netbeans-trunk-nightly-201609290002-src.zip 218005780 SHA256 67f26255f3739c1e1c7c5efa90831c83a0fc4dc19c0b63b5259863abd0722eac SHA512 bfb83214f634186d3ed40dd6926a521fecdaedd59209a864e8c37490bc1e2bc7455a353c0e541a77350d3e54c5a7d194c33765a5ed7b2b0b6432e777d0f90545 WHIRLPOOL d886cb54f28a0607610318ace3e71a96f68233f0257a278063909de5a5ddd5d1735dab8083de19b52c8580c9c820f3ef73b88e2d16d39488d829996ec448c957
+DIST netbeans-trunk-nightly-201609300002-src.zip 218005837 SHA256 d3ecb5c388ebe8ea4ee762c9aff725eba2a94ed2d91d38b9d6a6c6a9fae6048a SHA512 24bd317bb8dd2b0b98dba21757b1335154c7a847a53cdb44226ae7d2012266b2c02eab00b8d2b55503f3612be894a49d3deaa16d579d251c0df5c090b9df918c WHIRLPOOL 3e9bae3a1264f83fd640189a5c3521647aff21e25d90ce6f620cdecd9ea9bc3e9c6133536e536936f6c7348421bc67f26ece7b06744344043b44e312185f22a5
 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_p20160901.ebuild 9520 SHA256 9e58f6281f7dc2b135e95047be70133098c8aa8841e72a51942b88b50da5d51e SHA512 01e963910202ed93b07ac1b99dd9214fc88989d27904dddf2082cb7f334035281bfff2c4fa63a7d5ef115ce5fb43bd4d42e5d6d325f65c995e662e63fee6e969 WHIRLPOOL c6a57988c8c04a6c2efd4abee7719e7cea63e135b944e167109e343f47b3dfe3b44573b48e76aad2bc3e6270ff166d45daad99f250cad94f7d8229b96bbcb178
@@ -87,4 +88,5 @@ EBUILD netbeans-platform-9999_p20160926.ebuild 9520 SHA256 720abf80dd5953c9c6d43
 EBUILD netbeans-platform-9999_p20160927.ebuild 9520 SHA256 cb942350637448d88fcd9617b771ce891bdb23e532d26dbf730b7801dbf3cec3 SHA512 3430aaaba058ea5cbb40be1ad13732897108ec58319af8f37d0609bb95a91c21110b9e51132b9f426f64534bdccd10d71d17639f770e0b93785cbf028fcdc041 WHIRLPOOL e4d49fd15e4be3ab97981acdb30f0bf62daab5c7552e30bc9aee6c6c6704eb152cc59200094d4c29adb9c414be51711649789f00564c6fe9ff4c5d003a8b9b44
 EBUILD netbeans-platform-9999_p20160928.ebuild 9520 SHA256 8ef5dc2d48748a9067936595a58c370948a104444a801b070337c3f16831cc20 SHA512 ec0580901fc85ee033553f1cb452bcc3f4dfff0eb66b865e33b8929359f5fbae23ef6686a71c1c6ec958659385f966537902ffe5bfe04a39e1113da09c625ced WHIRLPOOL 60d3f459cbf78d08ba1a99103d0ea6b01ec416bd66b2aea856a2c6f10745533acf1862b54b37ccac874c79beb946cd117e5ca51ad48ef3972f19fb02603be846
 EBUILD netbeans-platform-9999_p20160929.ebuild 9520 SHA256 d5df9f2b92a703e10056b5f62be4cdf129378fbc92507f4224eff034ed4c308c SHA512 5d629aaa6feaefc73380d8013a0cf61ca2ce1c07f93ef872d3fa3486b926fa64b23c8d31facf75c0a275c7966bfedcc9096cee1836632c298c29359b5dd45730 WHIRLPOOL a5621ff6137f9b279e82aaaf6543a55520bbdb91702bb2a48adeca523a7849b0ce18c1499ea9c577157500418d34ebe3b9058c0e0a29d3fde4e4af7e52e57675
+EBUILD netbeans-platform-9999_p20160930.ebuild 9520 SHA256 bea5c93167f117697519aaeacae46a904907f6e5d9c50b58c156f5fafa46c2c6 SHA512 e66ab96d74df68022dffe78f74939c4c938b46c00abb5878213c727087bbf69721969d9e3069965cc6d8645ff4ffe185677e47b48de5038cecb1dbeeafc137e8 WHIRLPOOL 9ddf7dc0da9258530d68f65255d564fff6ad3a0777d9186f5632d03b249615ace1503e91c608aca1f48ac9732df012d54e30f3384688c6e9b639d15920efc1a5
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index f08f466..cc08f7c 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1b
 DIST netbeans-trunk-nightly-201609270002-src.zip 218005716 SHA256 c3fa3dc736f783a83a271884081217462cc31d4da6bfd1e7f069e4c5a3bc4a16 SHA512 ecb4885fb30f811901b1c443b4ca15952f1baf8926da411f6c937b8240af0adbd4fc42701b75f8e06a510d7dac9e393b5b799034885f07b3eccb0ef54f83af70 WHIRLPOOL 617347cc777545dfaa08b0731bc0e8aa2d363fa227c73914e79ad8a56e1d3ed8c224cb0560173a86c77937ce4174993cb31fc323d223fb91719ed32a75417496
 DIST netbeans-trunk-nightly-201609280002-src.zip 218005761 SHA256 367daea36555b453b8f12f89d0e75d20583869e3469f00db3c1c8c401e6ccfb1 SHA512 0eafbbedb1c1ea0ddfa1a52e235b7d681fcf9d1601a1ab07d42790bc5d02be3dcd8f0c3a7f71ad8e05f3450b3fdb7fcbd7810429ab5169c56fc777dca0e68e9c WHIRLPOOL 537016c960469b05459c054d4557ab710fd51f4cfe30bb5ff84ec1385bbc038a731eb44bd5d0dfb1426fe59bd4b4ede402242cb1d3dc138aaf0ed2dc80456c19
 DIST netbeans-trunk-nightly-201609290002-src.zip 218005780 SHA256 67f26255f3739c1e1c7c5efa90831c83a0fc4dc19c0b63b5259863abd0722eac SHA512 bfb83214f634186d3ed40dd6926a521fecdaedd59209a864e8c37490bc1e2bc7455a353c0e541a77350d3e54c5a7d194c33765a5ed7b2b0b6432e777d0f90545 WHIRLPOOL d886cb54f28a0607610318ace3e71a96f68233f0257a278063909de5a5ddd5d1735dab8083de19b52c8580c9c820f3ef73b88e2d16d39488d829996ec448c957
+DIST netbeans-trunk-nightly-201609300002-src.zip 218005837 SHA256 d3ecb5c388ebe8ea4ee762c9aff725eba2a94ed2d91d38b9d6a6c6a9fae6048a SHA512 24bd317bb8dd2b0b98dba21757b1335154c7a847a53cdb44226ae7d2012266b2c02eab00b8d2b55503f3612be894a49d3deaa16d579d251c0df5c090b9df918c WHIRLPOOL 3e9bae3a1264f83fd640189a5c3521647aff21e25d90ce6f620cdecd9ea9bc3e9c6133536e536936f6c7348421bc67f26ece7b06744344043b44e312185f22a5
 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_p20160901.ebuild 3472 SHA256 f5edd5388e32394979dc528bdf3818d27500a6ded3041c07a0e675bbb3274af3 SHA512 1c312dcc8754a84121916706864826e36283e73611744977b5821ab25cb6aa8c7768f1a42f1daf68a61a0b2b62a90fdc741d45a5855682c3b4292b75c02b5a12 WHIRLPOOL a792c1d76aab6d528d6a43b0e440fa74b75bcdda092d1ff994ef2d9b412e2a43dd9c5c81d51a06daa8ae51d7228b73994d882fb1bad2d39e04b5fff55fe38622
@@ -61,4 +62,5 @@ EBUILD netbeans-profiler-9999_p20160926.ebuild 3472 SHA256 b33dde4f2f495d528fe85
 EBUILD netbeans-profiler-9999_p20160927.ebuild 3472 SHA256 6d02241cfc5c593fa9e6b498d07f296f6a19fcb7a023842981c1ff8b30504e38 SHA512 3c1e63c276fec847372818204768bbc81d28ef54d1cf2d4f5ab2e7a1419fc9c0d16d770061dc87d22ef3055f475fb4d4a3b1a8a11b8b1f1643e831904a849c19 WHIRLPOOL 75879f0994eae04fd641de0da8f51ca741e67ec03f6107039982909c18d4192aa082412eb2481fa2233f65f6b900c750d0d6b3622d0233f1b2a66377070f6e07
 EBUILD netbeans-profiler-9999_p20160928.ebuild 3472 SHA256 88f0391a224168fca6544af0c3cf370b37f5a616568bda2ff5024fd53bbf418a SHA512 3ada11287b4b0aca78cb3ee03e20f5b4e7ac3e951a1da458e5e0ff9ddbf3249e5e2880f1f7bfa81b4180832d7c3f82aa81bf6372d148721a794a3ccfca782ca1 WHIRLPOOL 144fc9824b74b93292f8c0124e4ed4f825436786c763141f66ce96421b9fb1f891ee6ad4bc69dd0f2556e4abfd48eeb3b7eea0e6f3aaafcc998726f6b2885b5f
 EBUILD netbeans-profiler-9999_p20160929.ebuild 3472 SHA256 353ee61420e2a91cfa5caece5d88502ce4532652faa151bc6a184e95282ebb39 SHA512 f556a3363900d9d9a9e421d4950073bf65596bcdd6f92d018edd724c99f72156c3a8f66d13ced7a0186b4a1fa94aef90f1366e5667f6d543ed3461076bc27b26 WHIRLPOOL d82d75a7bd863abb0117703cd54370bd3fcb2271a50c47d076a02095e9b5143dbc8767b7abb398b5d71f76545756345ebb8182095b02892002dffdca65cdbc88
+EBUILD netbeans-profiler-9999_p20160930.ebuild 3472 SHA256 d4ddfb5b7d4579af181401243e600b7547e6348cd452a8405a24193b494c4c0b SHA512 753dac8ff8dad3d5066cb39ef7544b674fedca0a7f4910bed46d1f02d8a750f46b5f8f4b2870b0db0ac349bbd3da87ce8176cbbc82bd70533e92838733970513 WHIRLPOOL acaff530b352cc93431c7704dcc3087713b2cc7d0c86908c7d91ae5ee9539350ebd69c8c955c9556fba893c573cb924e627ca96debaf4bbe41e13ea213e3be5a
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160930.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160930.ebuild
new file mode 100644
index 0000000..d06e4f1
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160930.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-09-30_00-02-33/zip/netbeans-trunk-nightly-201609300002-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 392ae0c..909a6b6 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -50,6 +50,7 @@ DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1b
 DIST netbeans-trunk-nightly-201609270002-src.zip 218005716 SHA256 c3fa3dc736f783a83a271884081217462cc31d4da6bfd1e7f069e4c5a3bc4a16 SHA512 ecb4885fb30f811901b1c443b4ca15952f1baf8926da411f6c937b8240af0adbd4fc42701b75f8e06a510d7dac9e393b5b799034885f07b3eccb0ef54f83af70 WHIRLPOOL 617347cc777545dfaa08b0731bc0e8aa2d363fa227c73914e79ad8a56e1d3ed8c224cb0560173a86c77937ce4174993cb31fc323d223fb91719ed32a75417496
 DIST netbeans-trunk-nightly-201609280002-src.zip 218005761 SHA256 367daea36555b453b8f12f89d0e75d20583869e3469f00db3c1c8c401e6ccfb1 SHA512 0eafbbedb1c1ea0ddfa1a52e235b7d681fcf9d1601a1ab07d42790bc5d02be3dcd8f0c3a7f71ad8e05f3450b3fdb7fcbd7810429ab5169c56fc777dca0e68e9c WHIRLPOOL 537016c960469b05459c054d4557ab710fd51f4cfe30bb5ff84ec1385bbc038a731eb44bd5d0dfb1426fe59bd4b4ede402242cb1d3dc138aaf0ed2dc80456c19
 DIST netbeans-trunk-nightly-201609290002-src.zip 218005780 SHA256 67f26255f3739c1e1c7c5efa90831c83a0fc4dc19c0b63b5259863abd0722eac SHA512 bfb83214f634186d3ed40dd6926a521fecdaedd59209a864e8c37490bc1e2bc7455a353c0e541a77350d3e54c5a7d194c33765a5ed7b2b0b6432e777d0f90545 WHIRLPOOL d886cb54f28a0607610318ace3e71a96f68233f0257a278063909de5a5ddd5d1735dab8083de19b52c8580c9c820f3ef73b88e2d16d39488d829996ec448c957
+DIST netbeans-trunk-nightly-201609300002-src.zip 218005837 SHA256 d3ecb5c388ebe8ea4ee762c9aff725eba2a94ed2d91d38b9d6a6c6a9fae6048a SHA512 24bd317bb8dd2b0b98dba21757b1335154c7a847a53cdb44226ae7d2012266b2c02eab00b8d2b55503f3612be894a49d3deaa16d579d251c0df5c090b9df918c WHIRLPOOL 3e9bae3a1264f83fd640189a5c3521647aff21e25d90ce6f620cdecd9ea9bc3e9c6133536e536936f6c7348421bc67f26ece7b06744344043b44e312185f22a5
 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_p20160901.ebuild 6242 SHA256 46564b33607829cb2f0da5a2167f53a1be8a62c2c4f8754ef3fe384cf3bea584 SHA512 51558f03f77aa0c85ea437860a62f307b56187e43fc0a2bc1724011c62599a17b157b212e42c27b90cd4c7b2227cb541002ef4738d546afc6196175525e9458a WHIRLPOOL e41cac853513b3e3fa214ba2747fa32b0054dcd56c9d13f985c15400076180607ba7c953818a07165a979e584618d65b58bee623b80c103f739a9835762d79dd
@@ -80,4 +81,5 @@ EBUILD netbeans-webcommon-9999_p20160926.ebuild 6242 SHA256 f3baceb572908f908e0d
 EBUILD netbeans-webcommon-9999_p20160927.ebuild 6242 SHA256 3dae34fec2d3600651b4aaadf6bf69561da0d91fc0e362c211560bb2fd314e91 SHA512 1e620c59998665debb12cee3975bbc3fbf079f6dd93a10cb88da779317d511d1c4c45f7d19942d4d17c965d2c4cad8b812ba93e08f17ba5d081d392d837e5d8d WHIRLPOOL b68f86572c18df6546808ac0f78865a54a1f25cf9ea5b07be20d95731e9cfae6a04c171cf3de905a9c97985fcf4d16ebcb5eaaa2be374271ab69093f019b532f
 EBUILD netbeans-webcommon-9999_p20160928.ebuild 6242 SHA256 2bc069274305ef60fc36f51af1a825edcbbf77838c784e6994325aedd56cf913 SHA512 2f2072bc62eb305ffe52ed8d3aa4f288d8e9786f1d0339a429e2985a6e5bd8f5f8a63f4d7238014a501de81b2edae6841aa809559d5a13a7b1f379fd738f26d7 WHIRLPOOL 2cfce53963ee0aecd945974a63364b3591109c0b9a8eddfce0c829f75663303978248812ca600e089f36d2283773fd91f90d6c8f30856e07faeee9bb8861ab0d
 EBUILD netbeans-webcommon-9999_p20160929.ebuild 6242 SHA256 28af7eb81559e94403dbf14547232c7227a9ec9891b579731d2467aa6c6cfeab SHA512 09ef77050e6ee69530e5d395d44471d42f1724892f7734dc47178311599bb34abdb2de0a5432fa0635f29d235c7c746652926b28eaf69055b6c2fecc7dbb5ce5 WHIRLPOOL 0995be9c9cac490ffca6a4c803a2aa9fce0add65e753f6d6d731e257afa03441069fbea68b66d08afc88f3775e31d854485947b70ff7ae35ea3386266dd3ffbe
+EBUILD netbeans-webcommon-9999_p20160930.ebuild 6242 SHA256 f493da31a3c48bb8b942bc638eb085b4558cb0f9128d82d7909d38fca831e61a SHA512 5ba0687d5e6998af2247553e7ea793499cdf006fb75204612361c8a795e41816132e117438edb73d3c298c282eff2720b00e97a543ef0be06e4f6a088d7773f4 WHIRLPOOL 882fcfdf24d4a85a73c23cab18f01c02cb71015a5ac1d32f87e6a5c62d0377d1c76abc0c26f23e0c131237581327696dbb27c8a491f6b5efc737fbf0cf374332
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index d960171..ab3588b 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1b
 DIST netbeans-trunk-nightly-201609270002-src.zip 218005716 SHA256 c3fa3dc736f783a83a271884081217462cc31d4da6bfd1e7f069e4c5a3bc4a16 SHA512 ecb4885fb30f811901b1c443b4ca15952f1baf8926da411f6c937b8240af0adbd4fc42701b75f8e06a510d7dac9e393b5b799034885f07b3eccb0ef54f83af70 WHIRLPOOL 617347cc777545dfaa08b0731bc0e8aa2d363fa227c73914e79ad8a56e1d3ed8c224cb0560173a86c77937ce4174993cb31fc323d223fb91719ed32a75417496
 DIST netbeans-trunk-nightly-201609280002-src.zip 218005761 SHA256 367daea36555b453b8f12f89d0e75d20583869e3469f00db3c1c8c401e6ccfb1 SHA512 0eafbbedb1c1ea0ddfa1a52e235b7d681fcf9d1601a1ab07d42790bc5d02be3dcd8f0c3a7f71ad8e05f3450b3fdb7fcbd7810429ab5169c56fc777dca0e68e9c WHIRLPOOL 537016c960469b05459c054d4557ab710fd51f4cfe30bb5ff84ec1385bbc038a731eb44bd5d0dfb1426fe59bd4b4ede402242cb1d3dc138aaf0ed2dc80456c19
 DIST netbeans-trunk-nightly-201609290002-src.zip 218005780 SHA256 67f26255f3739c1e1c7c5efa90831c83a0fc4dc19c0b63b5259863abd0722eac SHA512 bfb83214f634186d3ed40dd6926a521fecdaedd59209a864e8c37490bc1e2bc7455a353c0e541a77350d3e54c5a7d194c33765a5ed7b2b0b6432e777d0f90545 WHIRLPOOL d886cb54f28a0607610318ace3e71a96f68233f0257a278063909de5a5ddd5d1735dab8083de19b52c8580c9c820f3ef73b88e2d16d39488d829996ec448c957
+DIST netbeans-trunk-nightly-201609300002-src.zip 218005837 SHA256 d3ecb5c388ebe8ea4ee762c9aff725eba2a94ed2d91d38b9d6a6c6a9fae6048a SHA512 24bd317bb8dd2b0b98dba21757b1335154c7a847a53cdb44226ae7d2012266b2c02eab00b8d2b55503f3612be894a49d3deaa16d579d251c0df5c090b9df918c WHIRLPOOL 3e9bae3a1264f83fd640189a5c3521647aff21e25d90ce6f620cdecd9ea9bc3e9c6133536e536936f6c7348421bc67f26ece7b06744344043b44e312185f22a5
 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_p20160901.ebuild 2721 SHA256 91c5896de81d6ec33f5170b1ae03eefdccc531fe717a7965b29b1307736fd2fc SHA512 dd006f9188a31b559f452b844b9e82fd221536d629c55a8ad0d617aeb20f9d4cc905edf7e640acb8fdf783282004bcb036d13ee0c744104b0028d29e8bf33d0a WHIRLPOOL d329b2bef5896dcb93946f8bd6f1495ad5b4e125c38ae449eead2e9491db0766fcd895254e3f95e2ace97c29771eac434c82744d35dcc025879b5b0986b27ee9
@@ -61,4 +62,5 @@ EBUILD netbeans-websvccommon-9999_p20160926.ebuild 2721 SHA256 e2f18c43d3ce6f8cd
 EBUILD netbeans-websvccommon-9999_p20160927.ebuild 2721 SHA256 1207f4450139cc29e60274acfd528b65d673f2e469ecf5b348685fac37931f65 SHA512 57d85e8a7c36412957a5b6c2d128650e4356b309938eeaf848877d2307f44fec436536e8910b20d446d12141c7ec0ca458de6d282d59fa6ee5f9519bb8d84d61 WHIRLPOOL ca2c035c4c5c93c019ee505e2677afa55a0d58a677444ba9d4708592f31cb4ff3cafd96b790e28b3b5c3ff5bf82bdcf6df9e8c87b44fd4ba84e0ed99beab5ab2
 EBUILD netbeans-websvccommon-9999_p20160928.ebuild 2721 SHA256 50d21f688b4e43a1e41fbc739ec143be6d5f3a7e74b8ad59e7b682c533d7a4d1 SHA512 3395b94bb748058c305cab027c19fd5c9e1b6ea46035caeb5a4be848ddcad2a367f71a606b4750add89ddb2167da63488ab28b9df82b1f612c85cff46e6ddb85 WHIRLPOOL 7fc6cd21a1cb6897b5a918257a2567ab47d68cae7b5b6da3a7395a3bce141eaacd0c76ce27111e0d2ebe52f7962f00211eaeb6894c076aa1ba65bf58051ec27d
 EBUILD netbeans-websvccommon-9999_p20160929.ebuild 2721 SHA256 7d5bc7e4b14f2e8f967ccf9ea08450b12721f610e0d029141991c1e9db495bd1 SHA512 f63107b6fb07170218861cde10f1231c8a3a5d2855f4aec34adece785c213bc0d332655f1c7b9ec29336851f96f861172703540087cc2ad174e7ce623ebdfb61 WHIRLPOOL 9fece29ed2e9145f8f64caf9ad7b60b5e815b80833f3b0ae6ec6c3cdab2dacefc7e916e23abb8ce95b1501736330cc47f9afab27c0ca1fed4b62f349d03d7489
+EBUILD netbeans-websvccommon-9999_p20160930.ebuild 2721 SHA256 b1ce86561ad2d003c8ef662679fb52819057115d88f748a58b9767d5b6a8835b SHA512 67f02319a82b6ff024833ae3899449e1e481b2afbe08b579287e04622a7c2e54fd8767b0ff87662e40a33c7a73cba271d3c0b5b67200ec52182b9c7cdff8aeae WHIRLPOOL 75efa315ad62a48a32e9d62b4b42b15bb0e5c1563f937b4dc02cf349b6e2b831451a8a11b038bca831bae3329998840415cec126ec0c5deee13afdb1e852ff5c
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160930.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160930.ebuild
new file mode 100644
index 0000000..1ed15d5
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160930.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-09-30_00-02-33/zip/netbeans-trunk-nightly-201609300002-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 cccde37..ae46ee7 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201609260002-src.zip 218005446 SHA256 3bf393d4387e1b
 DIST netbeans-trunk-nightly-201609270002-src.zip 218005716 SHA256 c3fa3dc736f783a83a271884081217462cc31d4da6bfd1e7f069e4c5a3bc4a16 SHA512 ecb4885fb30f811901b1c443b4ca15952f1baf8926da411f6c937b8240af0adbd4fc42701b75f8e06a510d7dac9e393b5b799034885f07b3eccb0ef54f83af70 WHIRLPOOL 617347cc777545dfaa08b0731bc0e8aa2d363fa227c73914e79ad8a56e1d3ed8c224cb0560173a86c77937ce4174993cb31fc323d223fb91719ed32a75417496
 DIST netbeans-trunk-nightly-201609280002-src.zip 218005761 SHA256 367daea36555b453b8f12f89d0e75d20583869e3469f00db3c1c8c401e6ccfb1 SHA512 0eafbbedb1c1ea0ddfa1a52e235b7d681fcf9d1601a1ab07d42790bc5d02be3dcd8f0c3a7f71ad8e05f3450b3fdb7fcbd7810429ab5169c56fc777dca0e68e9c WHIRLPOOL 537016c960469b05459c054d4557ab710fd51f4cfe30bb5ff84ec1385bbc038a731eb44bd5d0dfb1426fe59bd4b4ede402242cb1d3dc138aaf0ed2dc80456c19
 DIST netbeans-trunk-nightly-201609290002-src.zip 218005780 SHA256 67f26255f3739c1e1c7c5efa90831c83a0fc4dc19c0b63b5259863abd0722eac SHA512 bfb83214f634186d3ed40dd6926a521fecdaedd59209a864e8c37490bc1e2bc7455a353c0e541a77350d3e54c5a7d194c33765a5ed7b2b0b6432e777d0f90545 WHIRLPOOL d886cb54f28a0607610318ace3e71a96f68233f0257a278063909de5a5ddd5d1735dab8083de19b52c8580c9c820f3ef73b88e2d16d39488d829996ec448c957
+DIST netbeans-trunk-nightly-201609300002-src.zip 218005837 SHA256 d3ecb5c388ebe8ea4ee762c9aff725eba2a94ed2d91d38b9d6a6c6a9fae6048a SHA512 24bd317bb8dd2b0b98dba21757b1335154c7a847a53cdb44226ae7d2012266b2c02eab00b8d2b55503f3612be894a49d3deaa16d579d251c0df5c090b9df918c WHIRLPOOL 3e9bae3a1264f83fd640189a5c3521647aff21e25d90ce6f620cdecd9ea9bc3e9c6133536e536936f6c7348421bc67f26ece7b06744344043b44e312185f22a5
 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_p20160901.ebuild 6939 SHA256 e5770caa7f53a2d42a136a4eaf8ee427d6b160c097e3eeb9cd6edfa73d0f40c1 SHA512 e47e2aaf66892b07f9e4bbb31b2643fef1141c86d780d6d1d0666f1678674dda490fcfa8edebf4527943c1426531f423460b06499c1821abc3e38d784ac5e848 WHIRLPOOL 0b7dfc7134c5f3966a1299e128ee8257a59dc49a072e6faae9a2ea76ddda1fc6e7dd9d8ffd67e8091a74864817e340e06a2246822af903581c4ad59c953cb972
@@ -64,4 +65,5 @@ EBUILD netbeans-9999_p20160926.ebuild 6939 SHA256 b0cdc5fa51d3be1c35377db0aa4020
 EBUILD netbeans-9999_p20160927.ebuild 6939 SHA256 8d2ae46ad0f7e74bda10d7a14de18108cf40b9e295336e447dc0a9a54373276a SHA512 00b219b219a3688a2fb2ac3fcbc74180b4d31c0a6799c2c8f7f209d450afec2740d7329107766d0e2945a722b6736703c6cdd482cdf04bae7ce05eae7f9834ca WHIRLPOOL 9d1b4920a08f193946d7886321363000bf8bb425512923066d15f6a9271b2b0c16f5c80b10153f591270ad03811ca62fc0461c116adeb19e37797bc6c2b05393
 EBUILD netbeans-9999_p20160928.ebuild 6939 SHA256 e2ed1b99976afd5933756203c1a1f89c9e611c9e8ae3d10be6f3d20728671f94 SHA512 1a117773baf1fb3ccc1227d49115180ba01a350e7bea5c891c8a2257141c282883a4574450bd06afd9f117a9ed82a2b682749767ac0162718f699fec0f40a7bb WHIRLPOOL e937352d53dbd1eeddb03e71c30d3c1d12cbf9aacbfe496f44e262ef7bbce2522b9db0a203b3152820c83358a71c375ca994e97c86788acfc1ee6f90d4403b5f
 EBUILD netbeans-9999_p20160929.ebuild 6939 SHA256 af94da1645190787d70231b3e00dcf4285afef7a4aadb4bad7227fdf648d0cbd SHA512 655ad77edeafda5e5394da548b39fe7bffbc1f82a03cfd9b7e0686cbbe3f571c4a99bfedf03d5ead1e726315b1f2879ad97519829b3bfc3e348ab9ee8ba858e2 WHIRLPOOL 624c99d63037a58b9d2434257581c3edb8c58b37c47ae0019f5481231df66642c6dc4448cc921a8eb820b7720a62397a665c505e2154daca80d2df74d4e11af7
+EBUILD netbeans-9999_p20160930.ebuild 6939 SHA256 63a623b6b31c3182a03a0b16c1e4fccf4ed842b6e0c48472d43a7274fc06d9e2 SHA512 3b607e77067bf98a3b5b6f8fa8f8e72d5d53fd8ecbb8d7f26d42fc0fcaac9161c5b97eb0d4481db0cc4be293e3197114b3f90d9b7cd537e0abaca1849b7402a3 WHIRLPOOL cd4c4f718ca9941f800140b08d57d001449017c386f8928d73681b5c2dfac85210947bb4776da4688c1ad5f8a397f5b29d506257af918e1012444e71c96abd83
 MISC metadata.xml 329 SHA256 8aeaf2a0228f15c2e4140f401b30f083509bd99d0a578873069f3595cd8555f3 SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640 WHIRLPOOL 799a9b79b1b447bda9631f67e2dfaf722376740e1d2037796528a05f9745eeed00d9990a74a65ce09f74bc5e1d60a887abde540c3c62487d7dd49b8377c15834

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


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

end of thread, other threads:[~2016-09-30  8:54 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-30  8:54 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-ergonomics/, dev-java/netbeans-apisupport/, Miroslav Šulc
  -- strict thread matches above, loose matches on Subject: below --
2016-03-24 10:07 Miroslav Šulc

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