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

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

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

commit:     2ef1066061dec1f997456dcdeb0a0828ed6e8d43
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 12 08:45:19 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Sep 12 08:45:19 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=2ef10660

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.3.0

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index f2fc82d..d2b861a 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201609080002-src.zip 217783700 SHA256 ab0b7304f14661
 DIST netbeans-trunk-nightly-201609090002-src.zip 217786172 SHA256 35a6f3cc108ed4505b5a8a8c075a1a3ebed0c31b829bcef321f9226dbb5b7504 SHA512 404a03d4a4e6da24591c388c9adb91d529c491e2f07880a027dc35e572859504aa5ed3532360375f921ec9411fc19169f714b6aee51fec3efccd2d6c43a97c82 WHIRLPOOL de26751daf9eb39713bc674fd0250e98fc4ce0714a64cdaba2ab0d04b78d4b4207165f1b11c30083fa79bc2b7073f0c9531b07917317b5b057b2d6e63fb959df
 DIST netbeans-trunk-nightly-201609100002-src.zip 217975100 SHA256 aed7feef3dd16e20fd04c6372f799b8c8ff728986899f89a70b21c81b5f47286 SHA512 226e2ec1c3283e088dfe278e607d65346b95150a698d6d5efef4be9d12fe23d7c3c0a8253994d6ef15c292c56579929624f7f12822a8c4689298b6132af74640 WHIRLPOOL 69d4aded277251d09fb671300dd4694ae54b59bc9e1fa66a492ca6ea427c5a219acaa88a64f2adbac07b5d6d2d1a53c6c284ae4c10c9af8eb3a18be072875982
 DIST netbeans-trunk-nightly-201609110002-src.zip 217975022 SHA256 834a359c4c5118302c97a0153372b559714be528e6f44f5655785a61dbc5d75a SHA512 b4921684195901b073df590ae0ec688965af5dd5bccad68ed7aa9d6a4e9fb0e9658115a17119da12c7d93edea457a7bcf921415c501d4df8e6db6b704c24aaa8 WHIRLPOOL 661191465cf6f92a925a07549c48b7d0c7acbad6a80235d4a73dbf1b3bce5f2eef5f43412df24a4c5933e648aeee11aa738fb5e8479d4d3c38bcd0174902abf6
+DIST netbeans-trunk-nightly-201609120002-src.zip 218010356 SHA256 265ec87ec62f15d8112229caf357bb081ad75359c131a4c47545f35563136641 SHA512 644685d3172272328048eb4cb91de128541cac95fbade58364f0d8841f0ed54a2578ef24be3749b960a39097c7849f6b553ae17e9cf9082b82deff93dfd5fee5 WHIRLPOOL 048bf90567bdd58598a4cecb78289b621a93736cd78c834cf329387b59fc645778bd610df1d8e403df26e2fee72c542e4f9cab54593208c81a5c6e9edc5e991b
 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_p20160810.ebuild 3384 SHA256 c96f93c027531ca90fa836b7cb98c8da0eb0c6596da2e9a1d632df318b754da7 SHA512 4af39da27d86e3ca7bfd1485712c6e62233cf9e62e63de2248f7c50a1bd7ca9c1368d1b577b4ebfc5a5acafaf4673cad850127878a6c6fc35b8b6520fb2a5e24 WHIRLPOOL d69578cbbf28592055c54ebe17d8231431bae61b37b1a726c87718cd22c5486104a8cdbe53b814b5109f3e411ab4b1aaa4b90cac2ab2a8d5cffe03ee9e82b2b6
@@ -61,4 +62,5 @@ EBUILD netbeans-apisupport-9999_p20160908.ebuild 3384 SHA256 3ea479bd1bd943317d6
 EBUILD netbeans-apisupport-9999_p20160909.ebuild 3384 SHA256 f2f6d532bf90048b002538e5ee38f1a8b39b32ab556cb58659ac06c925e65770 SHA512 8041d5fe3f8d842d8cf00799177c2fd9bef3a80deb853a046f2c374f17189491714bb43ac5c1e10ce8d44c56ad6bf2e2f5808e54c7d994fc450cec542cf7e16f WHIRLPOOL 4a836bec78098fb4db5b6522fe254153116ee0f62d0491ee034903683f79b258470025fb9b96330b9457d984a92f18c52e332b7c35b7e5f43de93a8a23c347e4
 EBUILD netbeans-apisupport-9999_p20160910.ebuild 3384 SHA256 ec5126fbadd20d35b5d936964d724a4babc7758f5eb24f8ee3faffef0f063102 SHA512 e966c1ae14cc1870e455787435a579e1e3ebc6091585997bb1d805e07133fbc352fb6506f8d75810a56c9d51c6683b3340d7df6b9d895cee5b5c52454fecb7e5 WHIRLPOOL e5db56281bbbbdd4a73ca2da25d0b5c9acf71a38a15080354a518d522566d92ed27a20488362cc0dd75d12090a4574dc0878015fc5456e674c86c57d789767d9
 EBUILD netbeans-apisupport-9999_p20160911.ebuild 3384 SHA256 51c0cc74033ab64a57bdba9d7d48cc23e4c9e28cdb08b5a4fe7189db6aa16239 SHA512 bddd96ed09828993fef8a754b0b63110956ff39ee1db83ac9ee370a92a2bbd0c3bcf62737a01616a9364a4209251c28aae89a7f5943e415701e15a19e26a9f59 WHIRLPOOL 2be55148b07f6bda2d9b9d9868038773d50e069d3c7adc2b7f551f74287f9c0609ca8e2954c0c3b784b1b27876645577393777fe518e7c140a94e9848c95f857
+EBUILD netbeans-apisupport-9999_p20160912.ebuild 3384 SHA256 5bda5ba0ef1ff041ad74f91400875abeac53513891a378263d6c3ef074e03dab SHA512 10ee047511797e7ca2461b4bd8258f955b65d45d5f4ee74506d54f4ded268987fdb1b49009aa7bb1e9e25871b83a30de8b81ea3e60f86553f69ce680a0a8a8f4 WHIRLPOOL 13dbf7b9f084ef0340158541038de0e703569bebed5dd5590f481bef9baf2ece47389922e33a7e09e989e2c963b3595001e8615944a5ee42b621f42252da620e
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160912.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160912.ebuild
new file mode 100644
index 0000000..59928ad
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160912.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-12_00-02-33/zip/netbeans-trunk-nightly-201609120002-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 0a9dea6..c9a1eba 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -46,6 +46,7 @@ DIST netbeans-trunk-nightly-201609080002-src.zip 217783700 SHA256 ab0b7304f14661
 DIST netbeans-trunk-nightly-201609090002-src.zip 217786172 SHA256 35a6f3cc108ed4505b5a8a8c075a1a3ebed0c31b829bcef321f9226dbb5b7504 SHA512 404a03d4a4e6da24591c388c9adb91d529c491e2f07880a027dc35e572859504aa5ed3532360375f921ec9411fc19169f714b6aee51fec3efccd2d6c43a97c82 WHIRLPOOL de26751daf9eb39713bc674fd0250e98fc4ce0714a64cdaba2ab0d04b78d4b4207165f1b11c30083fa79bc2b7073f0c9531b07917317b5b057b2d6e63fb959df
 DIST netbeans-trunk-nightly-201609100002-src.zip 217975100 SHA256 aed7feef3dd16e20fd04c6372f799b8c8ff728986899f89a70b21c81b5f47286 SHA512 226e2ec1c3283e088dfe278e607d65346b95150a698d6d5efef4be9d12fe23d7c3c0a8253994d6ef15c292c56579929624f7f12822a8c4689298b6132af74640 WHIRLPOOL 69d4aded277251d09fb671300dd4694ae54b59bc9e1fa66a492ca6ea427c5a219acaa88a64f2adbac07b5d6d2d1a53c6c284ae4c10c9af8eb3a18be072875982
 DIST netbeans-trunk-nightly-201609110002-src.zip 217975022 SHA256 834a359c4c5118302c97a0153372b559714be528e6f44f5655785a61dbc5d75a SHA512 b4921684195901b073df590ae0ec688965af5dd5bccad68ed7aa9d6a4e9fb0e9658115a17119da12c7d93edea457a7bcf921415c501d4df8e6db6b704c24aaa8 WHIRLPOOL 661191465cf6f92a925a07549c48b7d0c7acbad6a80235d4a73dbf1b3bce5f2eef5f43412df24a4c5933e648aeee11aa738fb5e8479d4d3c38bcd0174902abf6
+DIST netbeans-trunk-nightly-201609120002-src.zip 218010356 SHA256 265ec87ec62f15d8112229caf357bb081ad75359c131a4c47545f35563136641 SHA512 644685d3172272328048eb4cb91de128541cac95fbade58364f0d8841f0ed54a2578ef24be3749b960a39097c7849f6b553ae17e9cf9082b82deff93dfd5fee5 WHIRLPOOL 048bf90567bdd58598a4cecb78289b621a93736cd78c834cf329387b59fc645778bd610df1d8e403df26e2fee72c542e4f9cab54593208c81a5c6e9edc5e991b
 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_p20160810.ebuild 4790 SHA256 32920b60d0473593e3e2333ba7520a831b095633a17c999194f14d8a66e0543b SHA512 7e1b813e083a85ce3bdb733cd224ee6bae7f6cb2665934cb4e2dd2ec6931e80147147607f4f2c6f0c846cf0301ff4e05ded13e58c30268e995253ac12a47ee30 WHIRLPOOL f831a9bb9addd68fbb2aea61a2a7e76049b9a11bb0af4246406f2d5a176b30bc26fd076f59fded6421232865ac526ab00dfe86acf7784b28472e687a732428e2
@@ -76,4 +77,5 @@ EBUILD netbeans-cnd-9999_p20160908.ebuild 4790 SHA256 99f043e2808bf5a6aed9f64da8
 EBUILD netbeans-cnd-9999_p20160909.ebuild 4790 SHA256 86e9a2f833c50be2b0cc2843dd5ab5d0f357fa97e0d9d0278d04feacdbd71ac3 SHA512 7c5832b65543c6cd0d792413bb48b54db00e8f529f0f71900ad69e87a7783f1423e1b7dcfb8bc1922788297c1764ce68e89c352561362b923bfdd5b84ce06d08 WHIRLPOOL c97854530015c82886946f99bf89cd08fac6ed84a2ec1ea31bc05a0f1cc00f06178f363f9ad149c946596c6ea674b05fd58c9839f1b029424c3aba89376e8d36
 EBUILD netbeans-cnd-9999_p20160910.ebuild 4790 SHA256 6a481f7ff287444529ce334152201d63a1c8d9f7d0925007292415eab4b11900 SHA512 6f231749b64be38e48fe5bb8ff95d223698f7bf900b1d189f43fc3abf4d2f5ebf9a635b56ecf4a477b1ce421272a473511f3a762c122967c89e983cd71954de6 WHIRLPOOL b8ee16e45a583ea072ad336ab37f935a4299fdff8a4453792d025140de88387a635fc707edc03f53660455ce4f3913ca7e08c41d4cc9f521be9ff7285163a31f
 EBUILD netbeans-cnd-9999_p20160911.ebuild 4790 SHA256 29b824cd47e9ecdca72e385821d29031565418b4b408d5efe618bda0bc38192f SHA512 9efe507ac99695de5ec3d3158bd48bc6559c93a911482bd176d7f6c005d836b40da65e5fd942a2c0f7f5f165c5b751bcb8debebe35c733f1b6642f52c2116f43 WHIRLPOOL a8265f213ca5a1a704e6c1585ff88595e6dee280559d9d6fc74c8bb2620d0c0319dba62b148e1da6df7909e37126efb6f51797113396b526d210ef0a229a2b67
+EBUILD netbeans-cnd-9999_p20160912.ebuild 4790 SHA256 47efe4c327c3f92b94bb0d0670807c69199ebd907276de47b440aea0de152e56 SHA512 c7c40c1cb4698fb45a6bbb6975af6820adfc960ffb0363bf31d02a580df4679a65d19a3204b2230a7263d94435ae9dd2206eb0aacf59f3b52687cd386796060d WHIRLPOOL 561206ac31a2c60c69ca999c40ecbe72e22ac19fc84cf7c243abe623f01cd0197f851d552ac1f6d19aa68d04ec453a2030fffdc337fad860abe0ea223a9150e2
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160912.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160912.ebuild
new file mode 100644
index 0000000..4b1f410
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160912.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-12_00-02-33/zip/netbeans-trunk-nightly-201609120002-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/D43D5D67A1D7DC1E62ABA7C01F90BEFFD8A74A65-clank_0.3.6.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}"/D43D5D67A1D7DC1E62ABA7C01F90BEFFD8A74A65-clank_0.3.6.zip libs.clank/external/clank_0.3.6.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 47cf61b..042a1c0 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201609080002-src.zip 217783700 SHA256 ab0b7304f14661
 DIST netbeans-trunk-nightly-201609090002-src.zip 217786172 SHA256 35a6f3cc108ed4505b5a8a8c075a1a3ebed0c31b829bcef321f9226dbb5b7504 SHA512 404a03d4a4e6da24591c388c9adb91d529c491e2f07880a027dc35e572859504aa5ed3532360375f921ec9411fc19169f714b6aee51fec3efccd2d6c43a97c82 WHIRLPOOL de26751daf9eb39713bc674fd0250e98fc4ce0714a64cdaba2ab0d04b78d4b4207165f1b11c30083fa79bc2b7073f0c9531b07917317b5b057b2d6e63fb959df
 DIST netbeans-trunk-nightly-201609100002-src.zip 217975100 SHA256 aed7feef3dd16e20fd04c6372f799b8c8ff728986899f89a70b21c81b5f47286 SHA512 226e2ec1c3283e088dfe278e607d65346b95150a698d6d5efef4be9d12fe23d7c3c0a8253994d6ef15c292c56579929624f7f12822a8c4689298b6132af74640 WHIRLPOOL 69d4aded277251d09fb671300dd4694ae54b59bc9e1fa66a492ca6ea427c5a219acaa88a64f2adbac07b5d6d2d1a53c6c284ae4c10c9af8eb3a18be072875982
 DIST netbeans-trunk-nightly-201609110002-src.zip 217975022 SHA256 834a359c4c5118302c97a0153372b559714be528e6f44f5655785a61dbc5d75a SHA512 b4921684195901b073df590ae0ec688965af5dd5bccad68ed7aa9d6a4e9fb0e9658115a17119da12c7d93edea457a7bcf921415c501d4df8e6db6b704c24aaa8 WHIRLPOOL 661191465cf6f92a925a07549c48b7d0c7acbad6a80235d4a73dbf1b3bce5f2eef5f43412df24a4c5933e648aeee11aa738fb5e8479d4d3c38bcd0174902abf6
+DIST netbeans-trunk-nightly-201609120002-src.zip 218010356 SHA256 265ec87ec62f15d8112229caf357bb081ad75359c131a4c47545f35563136641 SHA512 644685d3172272328048eb4cb91de128541cac95fbade58364f0d8841f0ed54a2578ef24be3749b960a39097c7849f6b553ae17e9cf9082b82deff93dfd5fee5 WHIRLPOOL 048bf90567bdd58598a4cecb78289b621a93736cd78c834cf329387b59fc645778bd610df1d8e403df26e2fee72c542e4f9cab54593208c81a5c6e9edc5e991b
 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_p20160810.ebuild 2968 SHA256 4be39c2451f4a8834aae0b265d4af3ae07a4dcffa45e1ca6a496d8b06460d81e SHA512 7c1761aff6b01da9fe0c8971bab18141b091a13e1b9b59fd302fcc9299c8213cac6acbb8386032cdbe044ee6d71662864c7c0dd30c6c1eee99a6a1eeaf389aff WHIRLPOOL 9eb3e6fb7c3081dece27b7fe00ae8354cc834f0f3c54a172e9816b53adee2d456b4eb3c914d411f1abb9f1e3acf085d3f24377585886bcc7db51f62681677415
@@ -65,4 +66,5 @@ EBUILD netbeans-dlight-9999_p20160908.ebuild 2968 SHA256 3ef08c332242b3c55da86d1
 EBUILD netbeans-dlight-9999_p20160909.ebuild 2968 SHA256 eeb455cef6b0e685d680060c513ee1e24fafe4b3dd4e323a4d20844b8ce6a913 SHA512 f081d6311780959487a6ccf7a39f494fbaa2ee691c470496b13a2319be7acce7ec245894ec316d2f21c06cf266c1582f055070cef699e4f32ff71384fd01d9ae WHIRLPOOL ca29f40595f3606127652eaf8b4b370ba863b2b6ca8c6e786b7f7002a3efb73495850e0ba2ce186f2ca23e938d967354dee096b1230219fbd46cd5a9f2679a54
 EBUILD netbeans-dlight-9999_p20160910.ebuild 2968 SHA256 81c9e4faab7548b797a65444480bb1cc6a80e72f1308a2523b8225da72b8485e SHA512 0bf5b1f5ea6003e27c844f10b6572a0529b28f72fd435549b15604b03aa2eefeaed91969f68bd70214291b4c46280efb53366231f3ad871ce3e6e30a43a60dc8 WHIRLPOOL 5b77b934eef295c62c6cd38b280bb3d0152d2eb3a5a7464625ccf13fbf1547b41cb15d882cd411668f2fc920540925d7af9c6a870a544a91d88c2757aa6411eb
 EBUILD netbeans-dlight-9999_p20160911.ebuild 2968 SHA256 4532a768a966367c21780c75c5835e56a26ab26526487ed2c533b5f6df712140 SHA512 037663f548cc18036870d94f8b476075f33254a03414bff6dc2c35495259bd47517ca2f3735bca367cb2c137ea0bc0894ef47a80cbc86cd0743148c9efa82433 WHIRLPOOL 9d0f7b189be7b926cafbb0de2130b69a90581903a2a6615d8712c725c0602434834269b962361b63b6c223e715254a17cd9849b7cf6ed8e15ac8a291f6e2413d
+EBUILD netbeans-dlight-9999_p20160912.ebuild 2968 SHA256 cc3a89a8905ee467e8a8ad55586a1783da326789e9e6ecbef5cca77a538f0485 SHA512 8587368cfbd7c15cd555f2bcae1312f4ef44acc86359484a3e4ab85ffcb1b987bc7f3cd9b0ea6c3cff711b73edbcad1fd6c551bf7ea69c8f2c4fd514871747a3 WHIRLPOOL ca7322bb3494067d255299124bd1c93f42ef298b8b62f55c5bd57aa0d32d55a8d2fd33d37e3700aa1063d1b2bf0db5c1f448c04725bf648c75798a5f6be394a0
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160912.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160912.ebuild
new file mode 100644
index 0000000..4d233e9
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160912.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-12_00-02-33/zip/netbeans-trunk-nightly-201609120002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/C9EE1ACA53AA71183590274D658ABD0A6AD6B2BE-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}"/C9EE1ACA53AA71183590274D658ABD0A6AD6B2BE-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 6e9b23f..eb12466 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -63,6 +63,7 @@ DIST netbeans-trunk-nightly-201609080002-src.zip 217783700 SHA256 ab0b7304f14661
 DIST netbeans-trunk-nightly-201609090002-src.zip 217786172 SHA256 35a6f3cc108ed4505b5a8a8c075a1a3ebed0c31b829bcef321f9226dbb5b7504 SHA512 404a03d4a4e6da24591c388c9adb91d529c491e2f07880a027dc35e572859504aa5ed3532360375f921ec9411fc19169f714b6aee51fec3efccd2d6c43a97c82 WHIRLPOOL de26751daf9eb39713bc674fd0250e98fc4ce0714a64cdaba2ab0d04b78d4b4207165f1b11c30083fa79bc2b7073f0c9531b07917317b5b057b2d6e63fb959df
 DIST netbeans-trunk-nightly-201609100002-src.zip 217975100 SHA256 aed7feef3dd16e20fd04c6372f799b8c8ff728986899f89a70b21c81b5f47286 SHA512 226e2ec1c3283e088dfe278e607d65346b95150a698d6d5efef4be9d12fe23d7c3c0a8253994d6ef15c292c56579929624f7f12822a8c4689298b6132af74640 WHIRLPOOL 69d4aded277251d09fb671300dd4694ae54b59bc9e1fa66a492ca6ea427c5a219acaa88a64f2adbac07b5d6d2d1a53c6c284ae4c10c9af8eb3a18be072875982
 DIST netbeans-trunk-nightly-201609110002-src.zip 217975022 SHA256 834a359c4c5118302c97a0153372b559714be528e6f44f5655785a61dbc5d75a SHA512 b4921684195901b073df590ae0ec688965af5dd5bccad68ed7aa9d6a4e9fb0e9658115a17119da12c7d93edea457a7bcf921415c501d4df8e6db6b704c24aaa8 WHIRLPOOL 661191465cf6f92a925a07549c48b7d0c7acbad6a80235d4a73dbf1b3bce5f2eef5f43412df24a4c5933e648aeee11aa738fb5e8479d4d3c38bcd0174902abf6
+DIST netbeans-trunk-nightly-201609120002-src.zip 218010356 SHA256 265ec87ec62f15d8112229caf357bb081ad75359c131a4c47545f35563136641 SHA512 644685d3172272328048eb4cb91de128541cac95fbade58364f0d8841f0ed54a2578ef24be3749b960a39097c7849f6b553ae17e9cf9082b82deff93dfd5fee5 WHIRLPOOL 048bf90567bdd58598a4cecb78289b621a93736cd78c834cf329387b59fc645778bd610df1d8e403df26e2fee72c542e4f9cab54593208c81a5c6e9edc5e991b
 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_p20160810.ebuild 15825 SHA256 b2df82439b685ef1071a7e6a221d6d45272fbb7057527843b1d3c3aece7fe3be SHA512 215a517c26216a60e3855143e34892afb8bb3e497b8ec00a32c10d425c015a3e60e5c5d2ed8e33a9ee8f704eef9990cd6db9efd3f0dac9864d293176496af36c WHIRLPOOL 3ee60409163fcccc81582465dc00690f48341b60a6e04f42591ac7925642e417a39f92fe17e8af4d6b63b294d3f9df6cc35bb7c72b9897c892276f85adfc72ed
@@ -93,4 +94,5 @@ EBUILD netbeans-enterprise-9999_p20160908.ebuild 15825 SHA256 26cecef971a3bde0bb
 EBUILD netbeans-enterprise-9999_p20160909.ebuild 15825 SHA256 401969f905179d9556366962f93d67c8bae750cae3dcbed7de9842ff7680d149 SHA512 500edc75ebba0c8c607ac6fe73c94ed9cbcd9ceeb6150d29af078d36fddea322c23a0a6f3c2413d1ce113f9dff8987db644a9320e79aeed9edd82f92dccb3e08 WHIRLPOOL 73394ce457275430895a3b007cf03a398356dac138dd737882157172f9221512217f79dc0c913749aa38d96a707ede1e87dd7bfd2fc5ff780ff27d31fa1a4b51
 EBUILD netbeans-enterprise-9999_p20160910.ebuild 15825 SHA256 c6e99e0429090f8aa17586c55dde2d22603f363100c75800262a9d7ea2e824eb SHA512 07c07e5ee0ba738febce1497c8931b870b467a2f56f01da396be0e2ff76b7dc037d806f1df22f98e93ed69667c3cf70cd378f0bd0c6128d9f9363729d50b90a6 WHIRLPOOL 4b8e4f643e65900d7632c65aa30c2b12c87581146844f666c98b0838c100004641631dec5c7d88999ec1ac482c3ca0bad3397b4f6f3d0d7f800dd798d4fcf0f6
 EBUILD netbeans-enterprise-9999_p20160911.ebuild 15825 SHA256 cd97537a937e7a7523219766978d783f05b220d2c2e3304b03450609599d1fa9 SHA512 968a3a7f99a195b3a3a6fa64cd8fd53278461e86d6e280e022c6f8ee43ca3102c61fd2a7e19d20cd0bb60c9b4c2f2023b7185b777a6dbec456a0b7e91bc88244 WHIRLPOOL 5983bd06469becf64907f22f414e0568bab9a74dc62a5669f7c45ed1ef3152a5a87f487d6c498564bd2feaef7668eaa1ba08fb408735c010b4c7a23203cb1e9d
+EBUILD netbeans-enterprise-9999_p20160912.ebuild 15825 SHA256 6f7d4e0af40d3fded18e3ac65d3c6dfed44d305e5a65b39af1f3da9eb2261a5a SHA512 e58021475bac36116408ad1451d5afe8ac9f88368284116cb2d2ad398d8115deda0bbc446cefcc32af157d23475041952fb8f54fb53663ff539734d56fe3351a WHIRLPOOL 5eb90a5d484d711b392819b1c628c1d793b54031cc24f3013ae43faacbacbc568a11ff3d14022c30a434b9202898203a7139e8b6845daee21136d24920f01dd8
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160912.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160912.ebuild
new file mode 100644
index 0000000..a888aeb
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160912.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-12_00-02-33/zip/netbeans-trunk-nightly-201609120002-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 2624c7a..0fba723 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201609080002-src.zip 217783700 SHA256 ab0b7304f14661
 DIST netbeans-trunk-nightly-201609090002-src.zip 217786172 SHA256 35a6f3cc108ed4505b5a8a8c075a1a3ebed0c31b829bcef321f9226dbb5b7504 SHA512 404a03d4a4e6da24591c388c9adb91d529c491e2f07880a027dc35e572859504aa5ed3532360375f921ec9411fc19169f714b6aee51fec3efccd2d6c43a97c82 WHIRLPOOL de26751daf9eb39713bc674fd0250e98fc4ce0714a64cdaba2ab0d04b78d4b4207165f1b11c30083fa79bc2b7073f0c9531b07917317b5b057b2d6e63fb959df
 DIST netbeans-trunk-nightly-201609100002-src.zip 217975100 SHA256 aed7feef3dd16e20fd04c6372f799b8c8ff728986899f89a70b21c81b5f47286 SHA512 226e2ec1c3283e088dfe278e607d65346b95150a698d6d5efef4be9d12fe23d7c3c0a8253994d6ef15c292c56579929624f7f12822a8c4689298b6132af74640 WHIRLPOOL 69d4aded277251d09fb671300dd4694ae54b59bc9e1fa66a492ca6ea427c5a219acaa88a64f2adbac07b5d6d2d1a53c6c284ae4c10c9af8eb3a18be072875982
 DIST netbeans-trunk-nightly-201609110002-src.zip 217975022 SHA256 834a359c4c5118302c97a0153372b559714be528e6f44f5655785a61dbc5d75a SHA512 b4921684195901b073df590ae0ec688965af5dd5bccad68ed7aa9d6a4e9fb0e9658115a17119da12c7d93edea457a7bcf921415c501d4df8e6db6b704c24aaa8 WHIRLPOOL 661191465cf6f92a925a07549c48b7d0c7acbad6a80235d4a73dbf1b3bce5f2eef5f43412df24a4c5933e648aeee11aa738fb5e8479d4d3c38bcd0174902abf6
+DIST netbeans-trunk-nightly-201609120002-src.zip 218010356 SHA256 265ec87ec62f15d8112229caf357bb081ad75359c131a4c47545f35563136641 SHA512 644685d3172272328048eb4cb91de128541cac95fbade58364f0d8841f0ed54a2578ef24be3749b960a39097c7849f6b553ae17e9cf9082b82deff93dfd5fee5 WHIRLPOOL 048bf90567bdd58598a4cecb78289b621a93736cd78c834cf329387b59fc645778bd610df1d8e403df26e2fee72c542e4f9cab54593208c81a5c6e9edc5e991b
 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_p20160810.ebuild 2913 SHA256 c9ca71d7b77d25f3af16d9df03c2538febf63b88f5868bb3a2606e189f12c3f5 SHA512 c3a2b8caec00b0505e94fc60d56be03f816c319f3a142f88b4e9b65a507bdafd4e4dcdbf57a6bb9d3b1960df1581d07a3732f608014f415c21815e4be4852c71 WHIRLPOOL 3360d518a3e3ce9373d7ff145818a9a4bf5da50be08dfa27c275661c595fe68072cff6d316821428e3ab42f6e27fd88ad41d773a79bb0bcc0c6a435bf4cbfa1c
@@ -61,4 +62,5 @@ EBUILD netbeans-ergonomics-9999_p20160908.ebuild 2913 SHA256 86c84d1d0df41069b2b
 EBUILD netbeans-ergonomics-9999_p20160909.ebuild 2913 SHA256 124a1969f1c4666708c10143eed2bdacaff5e09f090932f2aadf7a7cac314a29 SHA512 cfa0f7bd6b0d65eb298e739859187dcd7ebbf2acf7cbbffdc651eb9be0532037e7b2e9447f9f431192fa7602a23a7c4838006f59156ae385215c4cb3f9126121 WHIRLPOOL 40d35a4d31715bd850bcb80668595c9755f791c6b56b8a661863df360e1417081081c77083e6a92263216056af717c63f817cf7bed5bf6784bba5cb8dc810e29
 EBUILD netbeans-ergonomics-9999_p20160910.ebuild 2913 SHA256 b8439ce0667540f28e79e59f335469165898f5677b02e09b799ef8d6efe07c58 SHA512 431b40d547c4b1bdf8f16bff97a7b80a58ddfb028ee21b13f42b8f3f1f9d14fa8a4b211e24c2f0f2f2d404cb3b7b6fd6aea214d02007a4300e50fea55b5458a5 WHIRLPOOL ede71e9f7ba63440accf835c7a3a18d7cbef62d4023d2831a8b74834abd57648750c0aa5b8e950f295a3f9f81d9acea0490b1c21a100ce206c9137b41b3f6cd5
 EBUILD netbeans-ergonomics-9999_p20160911.ebuild 2913 SHA256 1ae9ffe90dcb490534a6cb2eba98849cb3293bc55aca9350eca29bc0bd4d6abd SHA512 2abcc20351608a0bddc3fc8505043e1cc54d3a0a78b8f88e9499cad530e396436e214868d0d7acdaee966b92d20390423e5aa53f827646534720da094e7312ad WHIRLPOOL a6b8ece0094ba96c858a112c304bfd665d3fe37a0d0dd037d163d392a85e54582c9eca298b04b26d55d0c585b55230505e3643dfa2a9b2584071b9e6fff67f69
+EBUILD netbeans-ergonomics-9999_p20160912.ebuild 2913 SHA256 da1229763b4096f6cd6091e911a1d668816138815b30516216ef5ec09139bd9b SHA512 90aee04fa68c2c5bd0b1728b19f5510aa477101039668c6fb4d8d185268c7be4ded61d306ef2fb6784c3dc5fd4ff9341d0e42a20acb10aad51d18f59ed278e87 WHIRLPOOL 078f70089d7b2cba78d1b382f00b7da7ef9bfa942029bc2ecb745927261c2f7a6878eaac0ab2cbdfa35e2625f739eccef86b9aa62afe48e470c8cbd7793d3ef7
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160912.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160912.ebuild
new file mode 100644
index 0000000..a4f7a6f
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160912.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-12_00-02-33/zip/netbeans-trunk-nightly-201609120002-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 9c90984..7f5ddde 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201609080002-src.zip 217783700 SHA256 ab0b7304f14661
 DIST netbeans-trunk-nightly-201609090002-src.zip 217786172 SHA256 35a6f3cc108ed4505b5a8a8c075a1a3ebed0c31b829bcef321f9226dbb5b7504 SHA512 404a03d4a4e6da24591c388c9adb91d529c491e2f07880a027dc35e572859504aa5ed3532360375f921ec9411fc19169f714b6aee51fec3efccd2d6c43a97c82 WHIRLPOOL de26751daf9eb39713bc674fd0250e98fc4ce0714a64cdaba2ab0d04b78d4b4207165f1b11c30083fa79bc2b7073f0c9531b07917317b5b057b2d6e63fb959df
 DIST netbeans-trunk-nightly-201609100002-src.zip 217975100 SHA256 aed7feef3dd16e20fd04c6372f799b8c8ff728986899f89a70b21c81b5f47286 SHA512 226e2ec1c3283e088dfe278e607d65346b95150a698d6d5efef4be9d12fe23d7c3c0a8253994d6ef15c292c56579929624f7f12822a8c4689298b6132af74640 WHIRLPOOL 69d4aded277251d09fb671300dd4694ae54b59bc9e1fa66a492ca6ea427c5a219acaa88a64f2adbac07b5d6d2d1a53c6c284ae4c10c9af8eb3a18be072875982
 DIST netbeans-trunk-nightly-201609110002-src.zip 217975022 SHA256 834a359c4c5118302c97a0153372b559714be528e6f44f5655785a61dbc5d75a SHA512 b4921684195901b073df590ae0ec688965af5dd5bccad68ed7aa9d6a4e9fb0e9658115a17119da12c7d93edea457a7bcf921415c501d4df8e6db6b704c24aaa8 WHIRLPOOL 661191465cf6f92a925a07549c48b7d0c7acbad6a80235d4a73dbf1b3bce5f2eef5f43412df24a4c5933e648aeee11aa738fb5e8479d4d3c38bcd0174902abf6
+DIST netbeans-trunk-nightly-201609120002-src.zip 218010356 SHA256 265ec87ec62f15d8112229caf357bb081ad75359c131a4c47545f35563136641 SHA512 644685d3172272328048eb4cb91de128541cac95fbade58364f0d8841f0ed54a2578ef24be3749b960a39097c7849f6b553ae17e9cf9082b82deff93dfd5fee5 WHIRLPOOL 048bf90567bdd58598a4cecb78289b621a93736cd78c834cf329387b59fc645778bd610df1d8e403df26e2fee72c542e4f9cab54593208c81a5c6e9edc5e991b
 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_p20160810.ebuild 3377 SHA256 5ca924f9357c6089d8d0cbe95f5c089abbb0f03c07f4e43d0758c7e75eda3617 SHA512 1b42655310733fd0152b2c99ad6285ca63a35bb91cd2c982a6c008c8a510020f5dba851bbe2b6be21a9e66242241428582f514e78149f49e5fe58144f2594f00 WHIRLPOOL f64b0aa1b63255c308bee28c8cfc41f696fc476f8d31b82f078f66d8211072fe4abe55d04ac416352229e42afb40e82d8a696a3215f326780d48409e5f1406eb
@@ -65,4 +66,5 @@ EBUILD netbeans-extide-9999_p20160908.ebuild 3377 SHA256 eac4724515cfad1cb8bda5e
 EBUILD netbeans-extide-9999_p20160909.ebuild 3377 SHA256 f63a33c2e435be0d0181699e7f5d05c0a1908a67d6477bd34bc5f1b9a000155a SHA512 1aec510a68dd1bf344f32bc9c093913b07529acbc1a2d6988b1c6e83d37b9907ae614b255d061c83fbadad6d685608192469bba486a9a15a63cc90946c3f84c5 WHIRLPOOL d6cf1dae64c7117ee58ead04950caaa4bec7ce53efe2480b59f6e55dbe37ddcdbb4555ecef90479d31d8b867bc5e3170bd787d94b9f8090941f7efb64e63f5d1
 EBUILD netbeans-extide-9999_p20160910.ebuild 3377 SHA256 9a0ebfc1cb63213a8e0b27ff4e2af2d13399f8cd55dd68a634900fac0aebba85 SHA512 49fcbd436b5096093ada35ea76daa032b36f083cb7c70fb06cbbda8c264626f6c0b2e3f88efa122b48d699cff990bf96a4aec54278703f20488448a4a6d6f4f7 WHIRLPOOL 8b9ed5dc41b6c5e2f2276ae4c5be1ff7b3a3f1bcc4aac283d30ee6098cbc0d6447d4d974992609cfca1ea4cfad0bcee3872a3ed6977aea3bb41fd9723e39c933
 EBUILD netbeans-extide-9999_p20160911.ebuild 3377 SHA256 362ef358d8ad1dafd6bdcd6d89e5c356fefbbd74ab9feccddcbe27573b32763e SHA512 437b0393c416ce785163fd272edb5d39eed1c99f3fc37860cd3047ca333a296a8fbe0d56cfd9191fbbf79ba449cd111b2661a786b5583b8240656077ccbcd978 WHIRLPOOL ab3bbb3d7acd85d64991e01d3db7b5d94542d1d32e4f84c74131e261e925911b98d23920c276e59203669834b5117efdde40b413bd72a848743fe0b50a4bec1f
+EBUILD netbeans-extide-9999_p20160912.ebuild 3377 SHA256 11e51f49b981eb23e72f539563acf603243ce59f7b2a6ff370ca9d26e5374b1f SHA512 1979b9b04efd1d5d4e948f23339bab20b3d0e6e320f0b06fe119707169c4ec29c51093051a6a153e11ebd4d9d27b8f1d7c51180d0c89ff7f12d9cd05b421c0a0 WHIRLPOOL 82b699afdda070e7473f28a036a526965bf3c7c4e060e0987e6c17d111b3f4daef2a806024806d9d2e30cb5912a8dff028db3cd36dd51a763b21760526766c12
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160912.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160912.ebuild
new file mode 100644
index 0000000..1fccb8e
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20160912.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-12_00-02-33/zip/netbeans-trunk-nightly-201609120002-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 2e082ed..b148d0d 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201609080002-src.zip 217783700 SHA256 ab0b7304f14661
 DIST netbeans-trunk-nightly-201609090002-src.zip 217786172 SHA256 35a6f3cc108ed4505b5a8a8c075a1a3ebed0c31b829bcef321f9226dbb5b7504 SHA512 404a03d4a4e6da24591c388c9adb91d529c491e2f07880a027dc35e572859504aa5ed3532360375f921ec9411fc19169f714b6aee51fec3efccd2d6c43a97c82 WHIRLPOOL de26751daf9eb39713bc674fd0250e98fc4ce0714a64cdaba2ab0d04b78d4b4207165f1b11c30083fa79bc2b7073f0c9531b07917317b5b057b2d6e63fb959df
 DIST netbeans-trunk-nightly-201609100002-src.zip 217975100 SHA256 aed7feef3dd16e20fd04c6372f799b8c8ff728986899f89a70b21c81b5f47286 SHA512 226e2ec1c3283e088dfe278e607d65346b95150a698d6d5efef4be9d12fe23d7c3c0a8253994d6ef15c292c56579929624f7f12822a8c4689298b6132af74640 WHIRLPOOL 69d4aded277251d09fb671300dd4694ae54b59bc9e1fa66a492ca6ea427c5a219acaa88a64f2adbac07b5d6d2d1a53c6c284ae4c10c9af8eb3a18be072875982
 DIST netbeans-trunk-nightly-201609110002-src.zip 217975022 SHA256 834a359c4c5118302c97a0153372b559714be528e6f44f5655785a61dbc5d75a SHA512 b4921684195901b073df590ae0ec688965af5dd5bccad68ed7aa9d6a4e9fb0e9658115a17119da12c7d93edea457a7bcf921415c501d4df8e6db6b704c24aaa8 WHIRLPOOL 661191465cf6f92a925a07549c48b7d0c7acbad6a80235d4a73dbf1b3bce5f2eef5f43412df24a4c5933e648aeee11aa738fb5e8479d4d3c38bcd0174902abf6
+DIST netbeans-trunk-nightly-201609120002-src.zip 218010356 SHA256 265ec87ec62f15d8112229caf357bb081ad75359c131a4c47545f35563136641 SHA512 644685d3172272328048eb4cb91de128541cac95fbade58364f0d8841f0ed54a2578ef24be3749b960a39097c7849f6b553ae17e9cf9082b82deff93dfd5fee5 WHIRLPOOL 048bf90567bdd58598a4cecb78289b621a93736cd78c834cf329387b59fc645778bd610df1d8e403df26e2fee72c542e4f9cab54593208c81a5c6e9edc5e991b
 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_p20160810.ebuild 3416 SHA256 fdb433e1756936d5efa59de59b1f2c65b92af1edb427823e31136ad5eb4cbdc6 SHA512 6181515dc59bfb2fc6de64d5f8df66e07df3ef17a4aa977ea8fcf8747241637025945cf658f113a53391c4545468ca49ad712e000e36de43d41098597652f890 WHIRLPOOL 70767b8a404d1ce09904bd9f54a71f8bacd2b5a96f1dc277ad10857a614bfbd29dd61f273194f8f90c4c5d538cd6db741c057d107e246a810230c5a6933d5790
@@ -63,4 +64,5 @@ EBUILD netbeans-groovy-9999_p20160908.ebuild 3416 SHA256 7f4272fb899c15d2b12b100
 EBUILD netbeans-groovy-9999_p20160909.ebuild 3416 SHA256 709c17c79677dee937b54d7e179988873ffb05f40c633e4e916735736a938400 SHA512 272546374585a4665a59a0458fbd57a3b9632a3c9b85a475bf8015a0aa2d968d147886a488b40cc5d6c9e44ce43b35b0245bbeb00cb8627f12e59c24bd9a7ae3 WHIRLPOOL cb7c29a349976653bffe2bc2a0946bbcf24c8fcbe14550b1c4ed34e590d46001456053aa584f719ae9d87064effb36e958ea7de116c07fc077db0ba0aee68b37
 EBUILD netbeans-groovy-9999_p20160910.ebuild 3416 SHA256 87ef2735d023db47e0637ae0c637013ca92d98a9ccb54d223cd184e9137e9fc7 SHA512 8c1ae81428bdf954b106a38196baae7a42ced4005fe0ed7e5effe63d9f8b55c479229af67e4f030128da4927688c04e42eb1296308f51785ce826351d6dea13e WHIRLPOOL ee9b93919212af24ecce6cbb47ed0b77f7ead5818fb81d7fd4a097387c721287e786bb7a2ef3dc15f4340ca945c1f1b640116fbc59918e27265c4d73056ef34e
 EBUILD netbeans-groovy-9999_p20160911.ebuild 3416 SHA256 e036722360f3924a344da0aa07f2c768cb2fee38c8db2a80d97f0d989b401eba SHA512 f38d19a5d643d27294d26bd58009c27199f702ad0626e7a2df2bf3cef59994934662597786aa38e29a4374e3ae159723edc0eb33224d528392d600b9a69287a0 WHIRLPOOL c66bda4aa394d5ba8c984ec0907c738d92d41838bace86feeca228f7451a3b3059e45a1445e0c6c0b56ad7e5aba56b1e405b1846f40a51070dcefddaefc19fc1
+EBUILD netbeans-groovy-9999_p20160912.ebuild 3416 SHA256 115aa71318d43a6ad90a373fdb314436379fa56ed3d1fb55fd9a0a3638bb2faf SHA512 f1ce97aca4e7c82d5ecb9655013c0a46d86daa04077e88156e84aea2528a6a2d89ef69b260326551e1c66ae426de5b4593967cebb8e63cb4d00e63e8732d3f4d WHIRLPOOL c37025a326fe50a2a3ef55b88a0aaa739ca0e5fb81d1fa03041e010d450273c107427ccb7541d7d3e40eb9ad2d85e8e0dc449e2cc720788575fde26e8621ecb9
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160912.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160912.ebuild
new file mode 100644
index 0000000..6b28ded
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160912.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-12_00-02-33/zip/netbeans-trunk-nightly-201609120002-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 4db2c5e..f108683 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201609080002-src.zip 217783700 SHA256 ab0b7304f14661
 DIST netbeans-trunk-nightly-201609090002-src.zip 217786172 SHA256 35a6f3cc108ed4505b5a8a8c075a1a3ebed0c31b829bcef321f9226dbb5b7504 SHA512 404a03d4a4e6da24591c388c9adb91d529c491e2f07880a027dc35e572859504aa5ed3532360375f921ec9411fc19169f714b6aee51fec3efccd2d6c43a97c82 WHIRLPOOL de26751daf9eb39713bc674fd0250e98fc4ce0714a64cdaba2ab0d04b78d4b4207165f1b11c30083fa79bc2b7073f0c9531b07917317b5b057b2d6e63fb959df
 DIST netbeans-trunk-nightly-201609100002-src.zip 217975100 SHA256 aed7feef3dd16e20fd04c6372f799b8c8ff728986899f89a70b21c81b5f47286 SHA512 226e2ec1c3283e088dfe278e607d65346b95150a698d6d5efef4be9d12fe23d7c3c0a8253994d6ef15c292c56579929624f7f12822a8c4689298b6132af74640 WHIRLPOOL 69d4aded277251d09fb671300dd4694ae54b59bc9e1fa66a492ca6ea427c5a219acaa88a64f2adbac07b5d6d2d1a53c6c284ae4c10c9af8eb3a18be072875982
 DIST netbeans-trunk-nightly-201609110002-src.zip 217975022 SHA256 834a359c4c5118302c97a0153372b559714be528e6f44f5655785a61dbc5d75a SHA512 b4921684195901b073df590ae0ec688965af5dd5bccad68ed7aa9d6a4e9fb0e9658115a17119da12c7d93edea457a7bcf921415c501d4df8e6db6b704c24aaa8 WHIRLPOOL 661191465cf6f92a925a07549c48b7d0c7acbad6a80235d4a73dbf1b3bce5f2eef5f43412df24a4c5933e648aeee11aa738fb5e8479d4d3c38bcd0174902abf6
+DIST netbeans-trunk-nightly-201609120002-src.zip 218010356 SHA256 265ec87ec62f15d8112229caf357bb081ad75359c131a4c47545f35563136641 SHA512 644685d3172272328048eb4cb91de128541cac95fbade58364f0d8841f0ed54a2578ef24be3749b960a39097c7849f6b553ae17e9cf9082b82deff93dfd5fee5 WHIRLPOOL 048bf90567bdd58598a4cecb78289b621a93736cd78c834cf329387b59fc645778bd610df1d8e403df26e2fee72c542e4f9cab54593208c81a5c6e9edc5e991b
 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_p20160810.ebuild 4126 SHA256 4c6fd4294b3aac8b9de84647536286e97dec144ac0f0fba5a937fb8269deed05 SHA512 06fb9a2c8607707ee00683b206d35c3279d311a353d8d9ec08a992e307a8452e97773e5127d49b6e0a590d8bf0290af7ff58b24dfc3ba3facce2f6e2d5727928 WHIRLPOOL 799fefca711c9dafb2729f825d19d5f2d98eaa258ec25fed22fc90fa770532d153f560a3d8e6bae6058734428ef205af71064a76ecf95912f9e4c5586da75339
@@ -66,4 +67,5 @@ EBUILD netbeans-harness-9999_p20160908.ebuild 4126 SHA256 66119c7c8d1b080dcd1f47
 EBUILD netbeans-harness-9999_p20160909.ebuild 4126 SHA256 c69d80354b7d09399837b3c24594534d3c49d1ab4b363a692dbbe96e59de20ba SHA512 29ee7cd3c3a8e4a417ed555b76cfb345efbc8bf2438b03ecb6ecc17b46bd9dd215d42174553ff10229035935cea036613ed782c55b3154e29b3f59298bc6d0da WHIRLPOOL f0f70fe978777ecb6ad9ea48c351aeaa1e04be6e197b14ef3f4a3878624ecd56f6807973ec6ca64427aa74acdd55084ab9826b7d1e5589653156d4ae3ea3a3f9
 EBUILD netbeans-harness-9999_p20160910.ebuild 4126 SHA256 611eb507931f19d131c6bec455ac31be3abda9e9c450fbe2a69d135e4974c154 SHA512 de1f514e479663cc352851f088ff558ed1b09f1a18e8b4abb727f309ec7bbd2e9ae3a51f40abf0e8aebc58d528dd7b63e876a4413dc95bf59cef7da24ca5b83f WHIRLPOOL bc76257d05dc9db08b246005d38bebac1d6ec275842672d56b9400a1f9dc8c0eefcd3d0da86a6b1b064e6a1e8cb5dacda3b1cbc493b2d15f4a6a356a177979d9
 EBUILD netbeans-harness-9999_p20160911.ebuild 4126 SHA256 068b82ab012974eebd4a605aa179f6c17e5be4005b659f9ea7fbe06353d5d5bb SHA512 44e62d545c3b26eb43c74f77ffb2926ac3afe3d0d7dd7e27939eb1cbf3d42c0bf406d2ab033c81a57c231c94c6056134e555917c8f5660a79ec3af86339a98ae WHIRLPOOL 3f63d2257f42e27f435f89861331a3429cf151d0c5acc48532883feaa52b015ec7b0edf1ab6321e00cd0ec44dc10a15228519277e2f72e29b76b6c45354f9aa7
+EBUILD netbeans-harness-9999_p20160912.ebuild 4126 SHA256 725c19938cf906efc3ba9032b1a9d3470f065a0e7caca3d90387d6c6483e05df SHA512 51bac752fa86446de56c26e313f72cd63de37a92570ee7feb0e9fdbfef4fb6a34c876d2c374852c1a4e82e1d68986871c1272b291855e7982a12f7a26971674d WHIRLPOOL 4107603d8919ead3c79b35e8ca60f7ea10f6a8fc9b28345963a2fedff945e4b7e6f6118dd2659822e31cae70203204fa3048880997244610c0e70289352a9074
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160912.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160912.ebuild
new file mode 100644
index 0000000..58bd38c
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20160912.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-12_00-02-33/zip/netbeans-trunk-nightly-201609120002-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 f840840..ea22582 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -170,6 +170,7 @@ DIST netbeans-trunk-nightly-201609080002-src.zip 217783700 SHA256 ab0b7304f14661
 DIST netbeans-trunk-nightly-201609090002-src.zip 217786172 SHA256 35a6f3cc108ed4505b5a8a8c075a1a3ebed0c31b829bcef321f9226dbb5b7504 SHA512 404a03d4a4e6da24591c388c9adb91d529c491e2f07880a027dc35e572859504aa5ed3532360375f921ec9411fc19169f714b6aee51fec3efccd2d6c43a97c82 WHIRLPOOL de26751daf9eb39713bc674fd0250e98fc4ce0714a64cdaba2ab0d04b78d4b4207165f1b11c30083fa79bc2b7073f0c9531b07917317b5b057b2d6e63fb959df
 DIST netbeans-trunk-nightly-201609100002-src.zip 217975100 SHA256 aed7feef3dd16e20fd04c6372f799b8c8ff728986899f89a70b21c81b5f47286 SHA512 226e2ec1c3283e088dfe278e607d65346b95150a698d6d5efef4be9d12fe23d7c3c0a8253994d6ef15c292c56579929624f7f12822a8c4689298b6132af74640 WHIRLPOOL 69d4aded277251d09fb671300dd4694ae54b59bc9e1fa66a492ca6ea427c5a219acaa88a64f2adbac07b5d6d2d1a53c6c284ae4c10c9af8eb3a18be072875982
 DIST netbeans-trunk-nightly-201609110002-src.zip 217975022 SHA256 834a359c4c5118302c97a0153372b559714be528e6f44f5655785a61dbc5d75a SHA512 b4921684195901b073df590ae0ec688965af5dd5bccad68ed7aa9d6a4e9fb0e9658115a17119da12c7d93edea457a7bcf921415c501d4df8e6db6b704c24aaa8 WHIRLPOOL 661191465cf6f92a925a07549c48b7d0c7acbad6a80235d4a73dbf1b3bce5f2eef5f43412df24a4c5933e648aeee11aa738fb5e8479d4d3c38bcd0174902abf6
+DIST netbeans-trunk-nightly-201609120002-src.zip 218010356 SHA256 265ec87ec62f15d8112229caf357bb081ad75359c131a4c47545f35563136641 SHA512 644685d3172272328048eb4cb91de128541cac95fbade58364f0d8841f0ed54a2578ef24be3749b960a39097c7849f6b553ae17e9cf9082b82deff93dfd5fee5 WHIRLPOOL 048bf90567bdd58598a4cecb78289b621a93736cd78c834cf329387b59fc645778bd610df1d8e403df26e2fee72c542e4f9cab54593208c81a5c6e9edc5e991b
 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_p20160810.ebuild 29867 SHA256 3de308abc5b0e975594c6c42b09bdaef87264a804fdf5cfd64f693dfb059a1b4 SHA512 cfc7b610cdbe12d19dedd564921f5a34f2d8d94341216bba7a8494712bbc4c807d2c4bd7afbb4500f4917ea11ffdae7f91248a7143e414b937a7e573b387a2f7 WHIRLPOOL 0689d2b81d0ccf47604cff29917f40fa9608fc2679fd4dfe50662bfa2f4268e74c43e899dedc307fd4f5edec83cda471a9dd424606b55c92baeaa619a9de720b
@@ -200,4 +201,5 @@ EBUILD netbeans-ide-9999_p20160908.ebuild 29849 SHA256 2862f148199076d9b173fb103
 EBUILD netbeans-ide-9999_p20160909.ebuild 29849 SHA256 bed4cac3cb5b47b27e89053eeea9cfa2174202dbba065ca4a2e4f8a02648d9a4 SHA512 5104580f144116411be5d8ac750dbf7379f86c720a4eb78f856fb0a04eecc2ea6e245cd9f338d32f4c06004d5018eb5f23acde0d7150b1c5f6ecfda1503332ad WHIRLPOOL 23c01198df724769d16f2c901f3d873cd92e97ebb65bf87aa7134f4c9e62c55fb7873a6e8f3e3f084b28fed2b2013cb741dc0aeff239324ffe6d67c07e1b7b41
 EBUILD netbeans-ide-9999_p20160910.ebuild 29849 SHA256 3ecc2d137a721ddaa5b00b75a9165f73816bb2a3c34fda3699aa043729a9688d SHA512 df11485d34279d3c9f5fedc0e6dc9c2bfa72e541daa08d0fe66d850428e4ff7e2904bbdae5acc8b261065fea6760b2c806fc42b2532b8fafe0b05b3646030a4d WHIRLPOOL 8ea20994ba2682d7f0108ef2010fddc49d64f819fe1614bdf81b08e61621b2fb49aac871ebd18f6573c68453422cdd0df0b8568ef6ea68d1f4889362a6ec97ff
 EBUILD netbeans-ide-9999_p20160911.ebuild 29849 SHA256 10cdb5b0df325cebe0f979222c665de348cc86490dc8ca5011497bb41b88e882 SHA512 720321cbac1e0c1af23afbbdc27036206114c93698a5c3a5ec1a565bc6f000509dabff79d6e1642eff5843cc90b940c7058ffd064e8a7c74aaccf41006db99fe WHIRLPOOL 878d7817eeaa2b6960132c8b0e9d7093b284de72103a7a83929ff76f733f0f93267defd4e663a852a05f4c82fe1cf4cbb8f5e6de2ef6506050b8daf7cecc787a
+EBUILD netbeans-ide-9999_p20160912.ebuild 29849 SHA256 20b52065b165661e4483a5c2eea0a13d93d1bc251dbf1c9fb7570cbdc0882e3d SHA512 2f38f703c22f4d0741a1a3046a33c281ecf8ad27cade808f3784b810995d50a2cdb8a56f547b9929fc8badb6c51e4205f2dc15dcf90b7dacd8061672e02c241c WHIRLPOOL 4e91e2789011966e04e8f02aefefa869169e35da53b139394adf2affcf1823c575445265e57c26e79696c98894f1b3cdb01644e65152d788d4ed0865069c5179
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160912.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160912.ebuild
new file mode 100644
index 0000000..575ebd1
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20160912.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-12_00-02-33/zip/netbeans-trunk-nightly-201609120002-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 a73af6d..e3e27a4 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -66,6 +66,7 @@ DIST netbeans-trunk-nightly-201609080002-src.zip 217783700 SHA256 ab0b7304f14661
 DIST netbeans-trunk-nightly-201609090002-src.zip 217786172 SHA256 35a6f3cc108ed4505b5a8a8c075a1a3ebed0c31b829bcef321f9226dbb5b7504 SHA512 404a03d4a4e6da24591c388c9adb91d529c491e2f07880a027dc35e572859504aa5ed3532360375f921ec9411fc19169f714b6aee51fec3efccd2d6c43a97c82 WHIRLPOOL de26751daf9eb39713bc674fd0250e98fc4ce0714a64cdaba2ab0d04b78d4b4207165f1b11c30083fa79bc2b7073f0c9531b07917317b5b057b2d6e63fb959df
 DIST netbeans-trunk-nightly-201609100002-src.zip 217975100 SHA256 aed7feef3dd16e20fd04c6372f799b8c8ff728986899f89a70b21c81b5f47286 SHA512 226e2ec1c3283e088dfe278e607d65346b95150a698d6d5efef4be9d12fe23d7c3c0a8253994d6ef15c292c56579929624f7f12822a8c4689298b6132af74640 WHIRLPOOL 69d4aded277251d09fb671300dd4694ae54b59bc9e1fa66a492ca6ea427c5a219acaa88a64f2adbac07b5d6d2d1a53c6c284ae4c10c9af8eb3a18be072875982
 DIST netbeans-trunk-nightly-201609110002-src.zip 217975022 SHA256 834a359c4c5118302c97a0153372b559714be528e6f44f5655785a61dbc5d75a SHA512 b4921684195901b073df590ae0ec688965af5dd5bccad68ed7aa9d6a4e9fb0e9658115a17119da12c7d93edea457a7bcf921415c501d4df8e6db6b704c24aaa8 WHIRLPOOL 661191465cf6f92a925a07549c48b7d0c7acbad6a80235d4a73dbf1b3bce5f2eef5f43412df24a4c5933e648aeee11aa738fb5e8479d4d3c38bcd0174902abf6
+DIST netbeans-trunk-nightly-201609120002-src.zip 218010356 SHA256 265ec87ec62f15d8112229caf357bb081ad75359c131a4c47545f35563136641 SHA512 644685d3172272328048eb4cb91de128541cac95fbade58364f0d8841f0ed54a2578ef24be3749b960a39097c7849f6b553ae17e9cf9082b82deff93dfd5fee5 WHIRLPOOL 048bf90567bdd58598a4cecb78289b621a93736cd78c834cf329387b59fc645778bd610df1d8e403df26e2fee72c542e4f9cab54593208c81a5c6e9edc5e991b
 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_p20160810.ebuild 15656 SHA256 85ad00e9a05857b51784471d25a3d5cd21d2a5cfca783bee39a94d428181a29f SHA512 5b26a631890eb63ae72f9376345f37f7cc66485a181b2991c2d07cfdda5d63c0d36e5388d88de4b24c0ee3e5c370270497f74bf496c7e145696b66d24a098779 WHIRLPOOL 89db94a716308f73e8f0ffcac1f8d9a936de04ba1b7850c9ae828f31df4838d8d8b33938bfdd1ff086f0aaef1c632c9c91c8da5d74cdf6f9e3932c966537952f
@@ -96,4 +97,5 @@ EBUILD netbeans-java-9999_p20160908.ebuild 15656 SHA256 872bf31689b2dc2f7c513f13
 EBUILD netbeans-java-9999_p20160909.ebuild 15656 SHA256 5258b7341561799fe841a6cb047b69c92981bc78934ecfeac99d011b3ecc8547 SHA512 22c50629c97c3f2b90ba0762d64e06fae6ea484b26576d99e3c54df4c57a163adad3404255b96d42bcf02e34125e89b2326248fc96f107245945214dfa14212b WHIRLPOOL 307eb6a1d3607d28910ad1be0009423fd412982946d3cbd2fdfde27c541c1c9d36fe00cfe04a62e396c4d83cbb670cf9f5728569a6d106e7a8867f302d6c4acb
 EBUILD netbeans-java-9999_p20160910.ebuild 15656 SHA256 ecaaa36ae67078921c4cae297af3c57c547129f8846d2557d9a2139559031629 SHA512 07b840fc3f008dfc127807e879cfbb7c9a5ec978d1a361ae232225b63ba61dd77f1ceaf1afc69619f6770f3e2f0e20a8ee75fb8aaecae7760b870e67384f8233 WHIRLPOOL 4cb94b09f2a7b556861572b04334c50cf0afdabcbffe51e6c23970b5eef8c9c7127752615f88321f8068495a7261697304e6dd49434b22ee57f59978bc33b728
 EBUILD netbeans-java-9999_p20160911.ebuild 15656 SHA256 474bc5ef71c867d71c4ef228ed33b8dd5215c0d8e59e3d963e1635e3f76fa7c6 SHA512 70dd2c05d26fb65b37cdf4f04442495908143340f519d1ac0f0208a2ff17851e83208e7b0e3cc6eb11251a6abb146af9ee32629f1ed1dc854893543c62b91947 WHIRLPOOL 12cf806719370ba7e8e47fac4fe856bc8fef02b3ee2b9edca06f2fdf7ffbb3300fb5fee1f2b51ba49569c20b7d3b0a67f8adba7b9cd94ceaec042bacdfe4fb93
+EBUILD netbeans-java-9999_p20160912.ebuild 15656 SHA256 0666b2876cc4aafa024de8fe6ecbf5f2a6fd02632cec3aa10cbfa6c8a88dccb5 SHA512 2cb031d5187f36ae0750b4f025102647d04a09198b777439d260f173622e559e17f5dcef1b839dbbef231a6907c29955c608144446f40a974b34b1e6793b8131 WHIRLPOOL 6ac5bb2ed241b55e206504b1d20c3cfd011400ee826c37fafb20789672391249557c7a516f13131fbf85c5efb0e242530a7add1580f87af33002251df413b737
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160912.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160912.ebuild
new file mode 100644
index 0000000..848cd92
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20160912.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-12_00-02-33/zip/netbeans-trunk-nightly-201609120002-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/99A1BD1870E7A06AF2E525ECE3DDEC7F4E5E54E4-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}"/99A1BD1870E7A06AF2E525ECE3DDEC7F4E5E54E4-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 78af0e7..548dfda 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201609080002-src.zip 217783700 SHA256 ab0b7304f14661
 DIST netbeans-trunk-nightly-201609090002-src.zip 217786172 SHA256 35a6f3cc108ed4505b5a8a8c075a1a3ebed0c31b829bcef321f9226dbb5b7504 SHA512 404a03d4a4e6da24591c388c9adb91d529c491e2f07880a027dc35e572859504aa5ed3532360375f921ec9411fc19169f714b6aee51fec3efccd2d6c43a97c82 WHIRLPOOL de26751daf9eb39713bc674fd0250e98fc4ce0714a64cdaba2ab0d04b78d4b4207165f1b11c30083fa79bc2b7073f0c9531b07917317b5b057b2d6e63fb959df
 DIST netbeans-trunk-nightly-201609100002-src.zip 217975100 SHA256 aed7feef3dd16e20fd04c6372f799b8c8ff728986899f89a70b21c81b5f47286 SHA512 226e2ec1c3283e088dfe278e607d65346b95150a698d6d5efef4be9d12fe23d7c3c0a8253994d6ef15c292c56579929624f7f12822a8c4689298b6132af74640 WHIRLPOOL 69d4aded277251d09fb671300dd4694ae54b59bc9e1fa66a492ca6ea427c5a219acaa88a64f2adbac07b5d6d2d1a53c6c284ae4c10c9af8eb3a18be072875982
 DIST netbeans-trunk-nightly-201609110002-src.zip 217975022 SHA256 834a359c4c5118302c97a0153372b559714be528e6f44f5655785a61dbc5d75a SHA512 b4921684195901b073df590ae0ec688965af5dd5bccad68ed7aa9d6a4e9fb0e9658115a17119da12c7d93edea457a7bcf921415c501d4df8e6db6b704c24aaa8 WHIRLPOOL 661191465cf6f92a925a07549c48b7d0c7acbad6a80235d4a73dbf1b3bce5f2eef5f43412df24a4c5933e648aeee11aa738fb5e8479d4d3c38bcd0174902abf6
+DIST netbeans-trunk-nightly-201609120002-src.zip 218010356 SHA256 265ec87ec62f15d8112229caf357bb081ad75359c131a4c47545f35563136641 SHA512 644685d3172272328048eb4cb91de128541cac95fbade58364f0d8841f0ed54a2578ef24be3749b960a39097c7849f6b553ae17e9cf9082b82deff93dfd5fee5 WHIRLPOOL 048bf90567bdd58598a4cecb78289b621a93736cd78c834cf329387b59fc645778bd610df1d8e403df26e2fee72c542e4f9cab54593208c81a5c6e9edc5e991b
 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_p20160810.ebuild 4971 SHA256 cfc5f679e90f1eb59ae1546de85035616c98a553462a87caf12f0d9b95423b4c SHA512 bfb0d35f5780a1b5e7cbb1a4fa627bd7a6c09a5648164c9c92f98529d770ce8db24580bdb01e0435686339eaed8ffd6f6534e889f2bed363f59a5626bbbd1616 WHIRLPOOL 3ba4deaeea01bd656b7bdcdbdf1a1e672956b629f93293ac2203612c086c8258c951c8351d5c371c5837098e57659dd19142c20eb123b07a407a622ad43613dc
@@ -64,4 +65,5 @@ EBUILD netbeans-javacard-9999_p20160908.ebuild 4971 SHA256 41e5dd87555d1c30fe6fe
 EBUILD netbeans-javacard-9999_p20160909.ebuild 4971 SHA256 5124f956730860fde93e4f1210fc82602cad40363317d99cc4cc522b9f5220e4 SHA512 7f03c7445b134a5125a0e23b6f09e50a48f6353ac1863405125e7dac678dbe37fc97011c5085eed403436a65c2c913a22979f0c3a3033f00eb4fca32d1bd5402 WHIRLPOOL fa4c6f8b36d56b19151d8ec817a82924b490a0272726b4e3c599c1737f547fbb2de6e9c40e0b4df8d036d8cd050b33f9194405951886e32935d40756fa64b2e1
 EBUILD netbeans-javacard-9999_p20160910.ebuild 4971 SHA256 fb4eb5320a0c5ffa543456455ad3000b9c44f9bd18cefea511f7d6c4c04d25b7 SHA512 8427ee615d677ea67458692e635bc3886a99469226c424525b5af21122aa0036214ca6efc6c80390839fb3993bd7e6bb5ed23378638512b04bd8bfa49b272fd1 WHIRLPOOL 2ba69834efa2b25605cc2fd360551f56bd0d562a9aaa0b8cbb2ec06343432e74f803b4c4883576e84c56eac674be567030031023b3403b2733b8ab179eff3482
 EBUILD netbeans-javacard-9999_p20160911.ebuild 4971 SHA256 ff8ba70e3b3019b95a778a328811c6e72a12909b4e027ea6ba2697168f7cd0e0 SHA512 6dfe8ec95296cd00bb13c46ece381323bb4994f358d8fd188c0237e35efd9d6cdcd68c1c775e22c8710c950d80aa96ebd21de9d933acd04b5faed0e266822782 WHIRLPOOL 74eabee2e64ba0aa03623a6af0483cb85397cd97c5f93209137a32b2d280b1d27b23cf6b7aa665b812c9ceae26c6814ba9903fd4fe7844b701ed4838e8864707
+EBUILD netbeans-javacard-9999_p20160912.ebuild 4971 SHA256 4a9e93da796cd23f5a72fb3275d75deab636a40dd1afe34df82ea5e5b9cc0f43 SHA512 a98f32ba36e5b4b32007ec153ab50c69e13c8751ab26b09f8d35048bdb633818cb13ba9c80592a2f66db9d5830aa62322f7d52864b263ae881dedd6a70d249c8 WHIRLPOOL 7612adde8802cc36123e745ffa49b4b8d2ba91108343c75ea90f8ac4993adac850cd2e90f869029af90f5609ec2cea2d4dfba9942ba33de50553c440b74210d5
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160912.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160912.ebuild
new file mode 100644
index 0000000..9de0473
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160912.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-12_00-02-33/zip/netbeans-trunk-nightly-201609120002-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 fbc9b82..c843a96 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201609080002-src.zip 217783700 SHA256 ab0b7304f14661
 DIST netbeans-trunk-nightly-201609090002-src.zip 217786172 SHA256 35a6f3cc108ed4505b5a8a8c075a1a3ebed0c31b829bcef321f9226dbb5b7504 SHA512 404a03d4a4e6da24591c388c9adb91d529c491e2f07880a027dc35e572859504aa5ed3532360375f921ec9411fc19169f714b6aee51fec3efccd2d6c43a97c82 WHIRLPOOL de26751daf9eb39713bc674fd0250e98fc4ce0714a64cdaba2ab0d04b78d4b4207165f1b11c30083fa79bc2b7073f0c9531b07917317b5b057b2d6e63fb959df
 DIST netbeans-trunk-nightly-201609100002-src.zip 217975100 SHA256 aed7feef3dd16e20fd04c6372f799b8c8ff728986899f89a70b21c81b5f47286 SHA512 226e2ec1c3283e088dfe278e607d65346b95150a698d6d5efef4be9d12fe23d7c3c0a8253994d6ef15c292c56579929624f7f12822a8c4689298b6132af74640 WHIRLPOOL 69d4aded277251d09fb671300dd4694ae54b59bc9e1fa66a492ca6ea427c5a219acaa88a64f2adbac07b5d6d2d1a53c6c284ae4c10c9af8eb3a18be072875982
 DIST netbeans-trunk-nightly-201609110002-src.zip 217975022 SHA256 834a359c4c5118302c97a0153372b559714be528e6f44f5655785a61dbc5d75a SHA512 b4921684195901b073df590ae0ec688965af5dd5bccad68ed7aa9d6a4e9fb0e9658115a17119da12c7d93edea457a7bcf921415c501d4df8e6db6b704c24aaa8 WHIRLPOOL 661191465cf6f92a925a07549c48b7d0c7acbad6a80235d4a73dbf1b3bce5f2eef5f43412df24a4c5933e648aeee11aa738fb5e8479d4d3c38bcd0174902abf6
+DIST netbeans-trunk-nightly-201609120002-src.zip 218010356 SHA256 265ec87ec62f15d8112229caf357bb081ad75359c131a4c47545f35563136641 SHA512 644685d3172272328048eb4cb91de128541cac95fbade58364f0d8841f0ed54a2578ef24be3749b960a39097c7849f6b553ae17e9cf9082b82deff93dfd5fee5 WHIRLPOOL 048bf90567bdd58598a4cecb78289b621a93736cd78c834cf329387b59fc645778bd610df1d8e403df26e2fee72c542e4f9cab54593208c81a5c6e9edc5e991b
 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_p20160810.ebuild 6293 SHA256 6066172e979b1695f0bea27fbf9eb055c714930e778b9453c4efe4c705e1f083 SHA512 21442bdecb0b18395c865c8d2e0ca8d6848accb53013f02fc0654ff06d1298d21cabd89df8bf6bb189981055ae8ae46c01664968c0ea4f01893070f46e1674fb WHIRLPOOL a4c8496320ffa5f9942cce21834e2c7d1ef067b5e2924ad754d18190d393fc86054da2b9be62f97ed7979614bdab0d8be37a6727f366e022312041904c998f49
@@ -63,4 +64,5 @@ EBUILD netbeans-javadoc-9999_p20160908.ebuild 6293 SHA256 2eb5083f6582346944cb92
 EBUILD netbeans-javadoc-9999_p20160909.ebuild 6293 SHA256 6601f6795207416c099b8f90cedbad41e4aaa4f3ca827bc57b36b40d40e1c040 SHA512 c7489a0e074bec0249bbcb108281430609ba2e036a9caf1c866ffca20062eea1cef3ab46177578dd822913c6bf072a13f8fec00b6aac0505f9c995ddfaed42a1 WHIRLPOOL be1c39b4bbae85e503b33d062692b10be75f7954cd8ee3cfc619f1fcd97029648e73c41a893d23cbb068d220c0dada539b515ef025793cce287a72a1c2f83021
 EBUILD netbeans-javadoc-9999_p20160910.ebuild 6293 SHA256 3aae5218fa288eb116fdc92d89b686de2183dfb4be0ac5c91c99d7a7adca144e SHA512 2f1c437a5825b0bba866b8ae5309df2621007e372130239dfe58d45ee1a6bd3b8347525b553aab0ef30142b4b28bffe9b045df07fcbb97cf993b7f63a0b388c4 WHIRLPOOL 95eacdc898e60ea7ea74253525934ef34ec4dbaacae66192e5a33ab6783d61735c33f5a74f8c1edba265cbf164bf56572e8104e9113c380ad59457616056bc4e
 EBUILD netbeans-javadoc-9999_p20160911.ebuild 6293 SHA256 109356cb83014d359b603a7fe786c1ef9caaaaedf85c647df17a054206038a28 SHA512 9e28472bebc4ea990a217820146d59fcf509279b400745ac629e48750eb7c5a8d1d04f285fca04a260347a5388abd91f5365230aee991cb042e02890a55628a0 WHIRLPOOL 6c64e77d633ab516bc75480fa5d89fc68dcfe55b9ccf6efa86562a2145fed044801062049b13a0bd90c5397fe9e99f5eb6bb9a4acd7d7f17763d951bf8956b0b
+EBUILD netbeans-javadoc-9999_p20160912.ebuild 6293 SHA256 154ce48a31dd9ad2161c680599f2ec79762cd17edb7a1c7b5c0d06c5d4433fd9 SHA512 e1e2de99dbd19eb362bd0ecd7666574dd4d2cce20b4d013f467ac2256b80ef1bb06e89fec743369b04fa20fe75adf9f59944713cf9a0c01d1ec3db97d966403c WHIRLPOOL 771b8b7e0f8af96260ce2041e6f22fd780abb704ea22ad9923c3b3b0c15a4f1f3eea2e4e29eea5c05148df5f0b3284865139e771d9ba2c0c044cdf841258d6f3
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160912.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160912.ebuild
new file mode 100644
index 0000000..704d8b4
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160912.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-12_00-02-33/zip/netbeans-trunk-nightly-201609120002-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 ca0bc95..c0db243 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201609080002-src.zip 217783700 SHA256 ab0b7304f14661
 DIST netbeans-trunk-nightly-201609090002-src.zip 217786172 SHA256 35a6f3cc108ed4505b5a8a8c075a1a3ebed0c31b829bcef321f9226dbb5b7504 SHA512 404a03d4a4e6da24591c388c9adb91d529c491e2f07880a027dc35e572859504aa5ed3532360375f921ec9411fc19169f714b6aee51fec3efccd2d6c43a97c82 WHIRLPOOL de26751daf9eb39713bc674fd0250e98fc4ce0714a64cdaba2ab0d04b78d4b4207165f1b11c30083fa79bc2b7073f0c9531b07917317b5b057b2d6e63fb959df
 DIST netbeans-trunk-nightly-201609100002-src.zip 217975100 SHA256 aed7feef3dd16e20fd04c6372f799b8c8ff728986899f89a70b21c81b5f47286 SHA512 226e2ec1c3283e088dfe278e607d65346b95150a698d6d5efef4be9d12fe23d7c3c0a8253994d6ef15c292c56579929624f7f12822a8c4689298b6132af74640 WHIRLPOOL 69d4aded277251d09fb671300dd4694ae54b59bc9e1fa66a492ca6ea427c5a219acaa88a64f2adbac07b5d6d2d1a53c6c284ae4c10c9af8eb3a18be072875982
 DIST netbeans-trunk-nightly-201609110002-src.zip 217975022 SHA256 834a359c4c5118302c97a0153372b559714be528e6f44f5655785a61dbc5d75a SHA512 b4921684195901b073df590ae0ec688965af5dd5bccad68ed7aa9d6a4e9fb0e9658115a17119da12c7d93edea457a7bcf921415c501d4df8e6db6b704c24aaa8 WHIRLPOOL 661191465cf6f92a925a07549c48b7d0c7acbad6a80235d4a73dbf1b3bce5f2eef5f43412df24a4c5933e648aeee11aa738fb5e8479d4d3c38bcd0174902abf6
+DIST netbeans-trunk-nightly-201609120002-src.zip 218010356 SHA256 265ec87ec62f15d8112229caf357bb081ad75359c131a4c47545f35563136641 SHA512 644685d3172272328048eb4cb91de128541cac95fbade58364f0d8841f0ed54a2578ef24be3749b960a39097c7849f6b553ae17e9cf9082b82deff93dfd5fee5 WHIRLPOOL 048bf90567bdd58598a4cecb78289b621a93736cd78c834cf329387b59fc645778bd610df1d8e403df26e2fee72c542e4f9cab54593208c81a5c6e9edc5e991b
 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_p20160810.ebuild 4717 SHA256 be2ff064c773cccb936570329c34a9e7ded8b2f828900f8e1dc5ee795ca90cb8 SHA512 7388c4e446611d732fd99a19feb0d40642f14f24b31bb925f145abb0e021af94650e4332b958c8a3735711987f7cccba5e6d43605900211a0df3492cb39fd516 WHIRLPOOL e3d6a4e2e04ddb9168b8ffa7f160b940fc4c7bdc1fa01ba8503cf864d2cccd91269ccd732573e286c358dbebb7b9a7af9d508f1682e4d20b448c7c14d7581aea
@@ -69,4 +70,5 @@ EBUILD netbeans-javafx-9999_p20160908.ebuild 4717 SHA256 574781d0bd500b62f6e5104
 EBUILD netbeans-javafx-9999_p20160909.ebuild 4717 SHA256 418777e0f69a7d9faef3493252e735a893a322f4137f197e6f774979dcb416d1 SHA512 88d0407eccd6b02563269cc052ff941f4bc47a099c37fcfd9dde69b9465ff32dab95e977d762eabd0befe79ebf617f2f063cea2c6df320695dc27b087efa4822 WHIRLPOOL 941f8130ac335c487de30105e032e42e5ffa79bdbfd2678e6aedb520ed5507eda86267861a9f7e386f819153da6b8a6102fd489d873394944605d9427ea950b1
 EBUILD netbeans-javafx-9999_p20160910.ebuild 4717 SHA256 71b4fae2536aecef6f218f06494b1be4b5ccfbaf75f3a90759aa5afe7534e63e SHA512 a04f816f57826042c3f8ff935478efc78b007fe4946c90fb05d68875dfaebff59356fc40ef4dfe6f2cce191c873da16dc4245f3b00430131bad2c425171f47aa WHIRLPOOL b18e8eec7994fe8fdb4cdf672b655ce9a24992f48bca89c99136f9785b74a0d697448ba917c77e61a29686055adf817e2c02b2e1ae095cd25db260b655185ad2
 EBUILD netbeans-javafx-9999_p20160911.ebuild 4717 SHA256 4c63738755851d39eefa810057993024d498fa396b10b01e5f1ae3b8d3b46d32 SHA512 a43d8225fb016eaa1d63a0af6ad950ba2ca51cf6788f63027578e7a395415b2b10b33e26274c7bc2877b777dd4ec83e98074b403c8defb13d42a71e9c9147bec WHIRLPOOL c8aa2994baf669e8ae75831d4485187ab1917479a3957bcfa344010cd83ddcb81fe1a18036c9566f326163a443a74acacb6c6358e6a7f0a556110d3631167566
+EBUILD netbeans-javafx-9999_p20160912.ebuild 4717 SHA256 32431b7a39a30809f01939340ea23bc0c243feb3b1092c9fe2d42a179f228d2b SHA512 34869465d0ada7acd4f1ad1b3f25a2e4ed84451171cc99ad77e1e27372e6a17b44aa15e6db61b5920ea7e2ac69822da0f27f2210ff17139f379e4e4d72d083cf WHIRLPOOL 4276715cd2af133089fd82c18d28baadeeb1d5a5f35fc18dede735b0eec4cc6b4a58556b19801be2456b12cb85fc5f6c1ea94918b48ccc0c590e1d44ccae6ea6
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160912.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160912.ebuild
new file mode 100644
index 0000000..44cc1cb
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160912.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-12_00-02-33/zip/netbeans-trunk-nightly-201609120002-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 61e2881..3738bca 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201609080002-src.zip 217783700 SHA256 ab0b7304f14661
 DIST netbeans-trunk-nightly-201609090002-src.zip 217786172 SHA256 35a6f3cc108ed4505b5a8a8c075a1a3ebed0c31b829bcef321f9226dbb5b7504 SHA512 404a03d4a4e6da24591c388c9adb91d529c491e2f07880a027dc35e572859504aa5ed3532360375f921ec9411fc19169f714b6aee51fec3efccd2d6c43a97c82 WHIRLPOOL de26751daf9eb39713bc674fd0250e98fc4ce0714a64cdaba2ab0d04b78d4b4207165f1b11c30083fa79bc2b7073f0c9531b07917317b5b057b2d6e63fb959df
 DIST netbeans-trunk-nightly-201609100002-src.zip 217975100 SHA256 aed7feef3dd16e20fd04c6372f799b8c8ff728986899f89a70b21c81b5f47286 SHA512 226e2ec1c3283e088dfe278e607d65346b95150a698d6d5efef4be9d12fe23d7c3c0a8253994d6ef15c292c56579929624f7f12822a8c4689298b6132af74640 WHIRLPOOL 69d4aded277251d09fb671300dd4694ae54b59bc9e1fa66a492ca6ea427c5a219acaa88a64f2adbac07b5d6d2d1a53c6c284ae4c10c9af8eb3a18be072875982
 DIST netbeans-trunk-nightly-201609110002-src.zip 217975022 SHA256 834a359c4c5118302c97a0153372b559714be528e6f44f5655785a61dbc5d75a SHA512 b4921684195901b073df590ae0ec688965af5dd5bccad68ed7aa9d6a4e9fb0e9658115a17119da12c7d93edea457a7bcf921415c501d4df8e6db6b704c24aaa8 WHIRLPOOL 661191465cf6f92a925a07549c48b7d0c7acbad6a80235d4a73dbf1b3bce5f2eef5f43412df24a4c5933e648aeee11aa738fb5e8479d4d3c38bcd0174902abf6
+DIST netbeans-trunk-nightly-201609120002-src.zip 218010356 SHA256 265ec87ec62f15d8112229caf357bb081ad75359c131a4c47545f35563136641 SHA512 644685d3172272328048eb4cb91de128541cac95fbade58364f0d8841f0ed54a2578ef24be3749b960a39097c7849f6b553ae17e9cf9082b82deff93dfd5fee5 WHIRLPOOL 048bf90567bdd58598a4cecb78289b621a93736cd78c834cf329387b59fc645778bd610df1d8e403df26e2fee72c542e4f9cab54593208c81a5c6e9edc5e991b
 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_p20160810.ebuild 4412 SHA256 cd280829cca6440251317ef25077c330b23e334f55ff96b803473fb48ab9be87 SHA512 87bc01755479a4afdd35ae93dedd132ef086e640985a5bc565417ca62288b0c88f110780efe5b783f26c2551b5dd27fa9535a71a6a25257e37703aa2a3374d46 WHIRLPOOL 07f03982cf41da8a1d60b2b8c53308c379074cfe5eb50cc35906b88b42ecff005dafe0fbffe5fc9341596f6fb7461e3144608a3c00b5b44a486c7c7ac7fcbe58
@@ -61,4 +62,5 @@ EBUILD netbeans-mobility-9999_p20160908.ebuild 4412 SHA256 1aeed1256f92f122e029d
 EBUILD netbeans-mobility-9999_p20160909.ebuild 4412 SHA256 67a37ad0b5d69fa4b1d49eb28998479840eb2e37cc33d70f41f6632fbc85438d SHA512 413c9f0d06b8280bbcb2860e2a133f0bdee0d4d1ba5fb735e70af5fdd9014025082f7aa0448dc33cd286b871e64389943e8db4dd2a2ec3e78b04320b1bcfc69d WHIRLPOOL 96fb79db51bb646f162c021ae71338e84320e235e04bcb3001a8fbcd78db69247e20c94a315fee209d3bece0b055d67ed7954d42b1cfe186ad8a5311333c67dc
 EBUILD netbeans-mobility-9999_p20160910.ebuild 4412 SHA256 6122fc84f20c58ecbc1d7536d879d87bad9c52826ff0f25e71a4ef47813a85b6 SHA512 49b8372c92f676c043dcbf409acafd817bf60a63adab2570c48f3ea82c38db65cb5fd95769d3a61f52b696e65dfc96fbdaf4456732d718a898739bef9b9f751b WHIRLPOOL f24f0bc05b4474314acbabfa52453b52cfc39470290facccd93d1220869e0f732efd0c7022b3d9821cd14f2ecf35be618cb8dbdd9002e3a7188b91fa53ac121f
 EBUILD netbeans-mobility-9999_p20160911.ebuild 4412 SHA256 23da3ca892cd904e924dbef4f25e34b518d00d38a6084c7fb5d5919fc4a4378f SHA512 24074c6e02cc3b1c2a2b8e36b61272475d25de71eddef0c6b1d78db24ee62da2d28467c2d56543c7d628f70ea3778a67eec4357e71ae4ae58595dc5463850182 WHIRLPOOL b7d64f82cb6b285df1d34c6463479624e26eb5b1b535539c7ba11db3a12deae4f9782bbc6a71666a1f767e0a30cc3e3d5fe61a95922eb4465c6ad39590706fe9
+EBUILD netbeans-mobility-9999_p20160912.ebuild 4412 SHA256 13006780d5ff78454c01851e8b8fd278205fb8c4d56be484eaefeec080b89303 SHA512 55dc342cb1d55f4850926cb6cc4372ecce042b8361aa072a794daa72fc5efd416835d08564e452e857dce5853ce845edd1e8acd903fad093b8ce03dc174ed605 WHIRLPOOL dab6b5ca05333a0e37f9dfeb5c2fcecb5b8da18c0c2dd4502b23027ee95dbee4a757dfed395e2d12f50baf5f6bec05ffd9f089d23a768d0b2a0df72646c95ac6
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160912.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160912.ebuild
new file mode 100644
index 0000000..ac526f9
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160912.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-12_00-02-33/zip/netbeans-trunk-nightly-201609120002-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 da22d57..7faed08 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201609080002-src.zip 217783700 SHA256 ab0b7304f14661
 DIST netbeans-trunk-nightly-201609090002-src.zip 217786172 SHA256 35a6f3cc108ed4505b5a8a8c075a1a3ebed0c31b829bcef321f9226dbb5b7504 SHA512 404a03d4a4e6da24591c388c9adb91d529c491e2f07880a027dc35e572859504aa5ed3532360375f921ec9411fc19169f714b6aee51fec3efccd2d6c43a97c82 WHIRLPOOL de26751daf9eb39713bc674fd0250e98fc4ce0714a64cdaba2ab0d04b78d4b4207165f1b11c30083fa79bc2b7073f0c9531b07917317b5b057b2d6e63fb959df
 DIST netbeans-trunk-nightly-201609100002-src.zip 217975100 SHA256 aed7feef3dd16e20fd04c6372f799b8c8ff728986899f89a70b21c81b5f47286 SHA512 226e2ec1c3283e088dfe278e607d65346b95150a698d6d5efef4be9d12fe23d7c3c0a8253994d6ef15c292c56579929624f7f12822a8c4689298b6132af74640 WHIRLPOOL 69d4aded277251d09fb671300dd4694ae54b59bc9e1fa66a492ca6ea427c5a219acaa88a64f2adbac07b5d6d2d1a53c6c284ae4c10c9af8eb3a18be072875982
 DIST netbeans-trunk-nightly-201609110002-src.zip 217975022 SHA256 834a359c4c5118302c97a0153372b559714be528e6f44f5655785a61dbc5d75a SHA512 b4921684195901b073df590ae0ec688965af5dd5bccad68ed7aa9d6a4e9fb0e9658115a17119da12c7d93edea457a7bcf921415c501d4df8e6db6b704c24aaa8 WHIRLPOOL 661191465cf6f92a925a07549c48b7d0c7acbad6a80235d4a73dbf1b3bce5f2eef5f43412df24a4c5933e648aeee11aa738fb5e8479d4d3c38bcd0174902abf6
+DIST netbeans-trunk-nightly-201609120002-src.zip 218010356 SHA256 265ec87ec62f15d8112229caf357bb081ad75359c131a4c47545f35563136641 SHA512 644685d3172272328048eb4cb91de128541cac95fbade58364f0d8841f0ed54a2578ef24be3749b960a39097c7849f6b553ae17e9cf9082b82deff93dfd5fee5 WHIRLPOOL 048bf90567bdd58598a4cecb78289b621a93736cd78c834cf329387b59fc645778bd610df1d8e403df26e2fee72c542e4f9cab54593208c81a5c6e9edc5e991b
 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_p20160810.ebuild 4111 SHA256 2f18c1e149f78993ee041d9b2d7e1fb1213e1370ad593ba93bf1f57929672160 SHA512 b30449fa75cd15901a7f55a33d04c78022d8894627779e2a3c395005bdfd2c0f3de2ea03ced4996e6e45afaf6a22ffd558df8599a38357715e96f50088b667a0 WHIRLPOOL f26cc4746d819dce6f2c7d7df9cb80945cb2306f55db927846fee00ee88f1285c0712fcc80f6f855ec5c9474786941beeeb6c2ca4793723df0fc819a832bb558
@@ -64,4 +65,5 @@ EBUILD netbeans-nb-9999_p20160908.ebuild 4111 SHA256 232cb382c83d4d2bb97bc4a2c9e
 EBUILD netbeans-nb-9999_p20160909.ebuild 4111 SHA256 4626410a5b83b231c19f9eec4f28380cff8735f20e7e37e5c273261377a6c11d SHA512 a31362acf0a9f8074b262d327ae94088f00fe84bc4cc72840131f749d75affa301144e761345deae0f1094839a3794550caecfb662c7372863028f5304970209 WHIRLPOOL 12f85b127f658d5a4aa4afe59f94b8956ad0f53b3574b2ba8ba8574cbdb0df0f6116696eaae8352134cff22afef75aa95483bc2e50d42e979d5a2db115a8ebd9
 EBUILD netbeans-nb-9999_p20160910.ebuild 4111 SHA256 647d36c04568801aac2a3bf77936197b30324a2a50cb5db3867ee765275f6696 SHA512 ad22ac2318d722b29a5f48d3f5f02fcc552bf6f8a22511fc178e7c27718a95b684de6cd1adb5bf6c91872478698a1654c4b23c81a91adf38ae211c882eecac2e WHIRLPOOL ec7f9bb7b586191596be3c5b41f930d05ca296f683f7cbaf1ac442e14bdc93e10c960d7e5ba4517bf494cc29cfaefc3c2ddd1b204495ca56868c029503dd482a
 EBUILD netbeans-nb-9999_p20160911.ebuild 4111 SHA256 92a3d60f65a1d6bb1930460847f603508ab1d0a083f362b8f630db7d1843f018 SHA512 4f0d7fe3b348dc8b56ecb53723b228d73b349ad8ad452fcc3f3fd8044ae001e0507b3cb1a15d6cc99b8e606bc3210064301baeffeca9934a5c40ed861fa4cdec WHIRLPOOL 1755f328989a31c706ce714ed416198e4e5e37cd2abe456bb2dd2e366ceac58bb349054c55969e5cdff934fdebd785efd66ad8369a32385c12468e18ee578e10
+EBUILD netbeans-nb-9999_p20160912.ebuild 4111 SHA256 f03932123ba0b2f07ea5fcfff7b4d821a93a3a98d411e5a603b41fc6d098cb42 SHA512 2117c281f7dd15e206427941067c7bce614fc72187cf512a285e30c16bb45a3ebc8f4266e8fc54ccdd597222d6fe55b22d472e545456142e471f882388290019 WHIRLPOOL 3add3eac03cf1af89b851b5e9ecdcadc8e8d91094bf1c67896bafef2a3f641c16a05d1f604d73b6af5c7ac92a8dacb1f8a09ebca780dde64f764ba7455712d60
 MISC metadata.xml 392 SHA256 01cdbcc83099b97486bd7b8e813e5b19c1138eb0d8d3e8a5683aafd579820435 SHA512 4d2f9160baa022d6a48b61d5f42e71cfd411d244e7a36436629bc5ee4036e4ce19079134d9a6c704ebe942306c2e0199d0591c1e54f92f8f3c8835147e639246 WHIRLPOOL c1131764e1cec66c56b977ebe36014b29e5a68e35ccc326c0cbadd050a6c625cf191c85c212e0a733661c008dab0d99f9a4cdc4c4ae0cc9d775ba1de554795a9

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160912.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160912.ebuild
new file mode 100644
index 0000000..a291daf
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20160912.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-12_00-02-33/zip/netbeans-trunk-nightly-201609120002-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 0fbe01d..f7a1993 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201609080002-src.zip 217783700 SHA256 ab0b7304f14661
 DIST netbeans-trunk-nightly-201609090002-src.zip 217786172 SHA256 35a6f3cc108ed4505b5a8a8c075a1a3ebed0c31b829bcef321f9226dbb5b7504 SHA512 404a03d4a4e6da24591c388c9adb91d529c491e2f07880a027dc35e572859504aa5ed3532360375f921ec9411fc19169f714b6aee51fec3efccd2d6c43a97c82 WHIRLPOOL de26751daf9eb39713bc674fd0250e98fc4ce0714a64cdaba2ab0d04b78d4b4207165f1b11c30083fa79bc2b7073f0c9531b07917317b5b057b2d6e63fb959df
 DIST netbeans-trunk-nightly-201609100002-src.zip 217975100 SHA256 aed7feef3dd16e20fd04c6372f799b8c8ff728986899f89a70b21c81b5f47286 SHA512 226e2ec1c3283e088dfe278e607d65346b95150a698d6d5efef4be9d12fe23d7c3c0a8253994d6ef15c292c56579929624f7f12822a8c4689298b6132af74640 WHIRLPOOL 69d4aded277251d09fb671300dd4694ae54b59bc9e1fa66a492ca6ea427c5a219acaa88a64f2adbac07b5d6d2d1a53c6c284ae4c10c9af8eb3a18be072875982
 DIST netbeans-trunk-nightly-201609110002-src.zip 217975022 SHA256 834a359c4c5118302c97a0153372b559714be528e6f44f5655785a61dbc5d75a SHA512 b4921684195901b073df590ae0ec688965af5dd5bccad68ed7aa9d6a4e9fb0e9658115a17119da12c7d93edea457a7bcf921415c501d4df8e6db6b704c24aaa8 WHIRLPOOL 661191465cf6f92a925a07549c48b7d0c7acbad6a80235d4a73dbf1b3bce5f2eef5f43412df24a4c5933e648aeee11aa738fb5e8479d4d3c38bcd0174902abf6
+DIST netbeans-trunk-nightly-201609120002-src.zip 218010356 SHA256 265ec87ec62f15d8112229caf357bb081ad75359c131a4c47545f35563136641 SHA512 644685d3172272328048eb4cb91de128541cac95fbade58364f0d8841f0ed54a2578ef24be3749b960a39097c7849f6b553ae17e9cf9082b82deff93dfd5fee5 WHIRLPOOL 048bf90567bdd58598a4cecb78289b621a93736cd78c834cf329387b59fc645778bd610df1d8e403df26e2fee72c542e4f9cab54593208c81a5c6e9edc5e991b
 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_p20160810.ebuild 4418 SHA256 4465cb2f456c38e86ebeb02d25086bf15d3a3c9f883199bec7ad21eb16484608 SHA512 2579a7da9c09d72be04e7ceb11dabfd257ca02ef39de344dcfc5f2bbe50c10eabca5193398f431a68d6843176b9444ac54775dc6596d38bb1b6ada87fc443f50 WHIRLPOOL c486d1e114367bcb03d7842e5547112813bfb58ffc420d0fb12f518ca6d3a03f4b2d8c59886a277d005c52f3a6d138ae9de3a4bf11e055bfde460c2417e50bc5
@@ -66,4 +67,5 @@ EBUILD netbeans-php-9999_p20160908.ebuild 4418 SHA256 439dfa9bdfa43a22b1c2809091
 EBUILD netbeans-php-9999_p20160909.ebuild 4418 SHA256 66360f8ec83a8762077071b694a2821b3edbe816a943dd9ea43126976fe041a9 SHA512 b5d4aabfbe65e08298fb356225eb8fff954efaff18d92ddb0f95a20e5ac4443be837decf41bd725824dcc474a4ae6050142c45d7271d6eeeb1228a7c8608df45 WHIRLPOOL c68f0b433c308038130186600510b3e651ade5574e1d371c4f141e9d046589b855696fc6099bc284c6ab349dabd5d9ddc7ab67238ed8562007fb71a66456dc30
 EBUILD netbeans-php-9999_p20160910.ebuild 4418 SHA256 749665b95b05eeb1bba5ebf88523953c4224cb0867ed8368a5fc72741e0a5610 SHA512 38095f25c05b1acdaf3cedf9305fe4d19e4457f7ec785aefd45a233deb1dcc10fb9f12c215d3cffd6f1a6ebec26cb99f13878abd47cea718a7dc3323517cb5ab WHIRLPOOL 7d5f53dc7a2170818a4123246468b0256da2270f20ec44a7064beb70e8bf2c2710d75d7beb15921e60a9a98587bac4bd6212ea4be801d03159f183bbfb362eed
 EBUILD netbeans-php-9999_p20160911.ebuild 4418 SHA256 8aa8e60e4a00df70dffcb16ff351f739799d993f65c4c5f4259b7b4ba8f7f367 SHA512 7f75750f4dd7ea38b5182205a588064f6cb5e265d8ad28a4741b83f23724e0eed73fcebe5fc47efe2ce062da92493ab7488700493ae92180b56b851722ef004d WHIRLPOOL 72980b93c741a933de67fdad83f06090dd40d7e12ba3f9c33a047de3dcb5f5660e60ddb57cfd9c491561f61d037115c31d16560c14ee6d6ae9443f1beddcf11d
+EBUILD netbeans-php-9999_p20160912.ebuild 4418 SHA256 a1322facdf33b1c6d2e8deb0b89b0836b90bf809133839ab6fa7925a2cf5e717 SHA512 b8ccdfd0cbf407d25093eb29875b6d4cd3b52dfa1314dd5423babe32b306219ef16c2552f486755156811e07c801e33c67787312b9c55a072c1f5cd7660bd885 WHIRLPOOL 9b34e404ec90d23984dbf0ef581e207c904e02ccbfbcb6730c3d75807ed1b2c0e76d11ceb2acd42e6779f3dad1fc5a2c01a0ad2326be25db68759a0674f5dc4a
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160912.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160912.ebuild
new file mode 100644
index 0000000..233e28a
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20160912.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-12_00-02-33/zip/netbeans-trunk-nightly-201609120002-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 0b698b0..fa8e152 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -57,6 +57,7 @@ DIST netbeans-trunk-nightly-201609080002-src.zip 217783700 SHA256 ab0b7304f14661
 DIST netbeans-trunk-nightly-201609090002-src.zip 217786172 SHA256 35a6f3cc108ed4505b5a8a8c075a1a3ebed0c31b829bcef321f9226dbb5b7504 SHA512 404a03d4a4e6da24591c388c9adb91d529c491e2f07880a027dc35e572859504aa5ed3532360375f921ec9411fc19169f714b6aee51fec3efccd2d6c43a97c82 WHIRLPOOL de26751daf9eb39713bc674fd0250e98fc4ce0714a64cdaba2ab0d04b78d4b4207165f1b11c30083fa79bc2b7073f0c9531b07917317b5b057b2d6e63fb959df
 DIST netbeans-trunk-nightly-201609100002-src.zip 217975100 SHA256 aed7feef3dd16e20fd04c6372f799b8c8ff728986899f89a70b21c81b5f47286 SHA512 226e2ec1c3283e088dfe278e607d65346b95150a698d6d5efef4be9d12fe23d7c3c0a8253994d6ef15c292c56579929624f7f12822a8c4689298b6132af74640 WHIRLPOOL 69d4aded277251d09fb671300dd4694ae54b59bc9e1fa66a492ca6ea427c5a219acaa88a64f2adbac07b5d6d2d1a53c6c284ae4c10c9af8eb3a18be072875982
 DIST netbeans-trunk-nightly-201609110002-src.zip 217975022 SHA256 834a359c4c5118302c97a0153372b559714be528e6f44f5655785a61dbc5d75a SHA512 b4921684195901b073df590ae0ec688965af5dd5bccad68ed7aa9d6a4e9fb0e9658115a17119da12c7d93edea457a7bcf921415c501d4df8e6db6b704c24aaa8 WHIRLPOOL 661191465cf6f92a925a07549c48b7d0c7acbad6a80235d4a73dbf1b3bce5f2eef5f43412df24a4c5933e648aeee11aa738fb5e8479d4d3c38bcd0174902abf6
+DIST netbeans-trunk-nightly-201609120002-src.zip 218010356 SHA256 265ec87ec62f15d8112229caf357bb081ad75359c131a4c47545f35563136641 SHA512 644685d3172272328048eb4cb91de128541cac95fbade58364f0d8841f0ed54a2578ef24be3749b960a39097c7849f6b553ae17e9cf9082b82deff93dfd5fee5 WHIRLPOOL 048bf90567bdd58598a4cecb78289b621a93736cd78c834cf329387b59fc645778bd610df1d8e403df26e2fee72c542e4f9cab54593208c81a5c6e9edc5e991b
 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_p20160810.ebuild 9520 SHA256 92043353007c246c8eeed16f8b530f3d97b73d81828fea5c6015d3cdc7c27b85 SHA512 0e18369a638ca9e9e97650a5f6ac04fde0c0ae8cc4c7b3a08284c01e8ab1ebce96b8c8bd50bab091c6e94d3d445bc0862fb98051cbee106a5cfad60afda97b86 WHIRLPOOL ce231df370b1b68a4f4e180d50c87a91378d830b92a724387bad2e57910318715cc702b67e266d4f3af9df3556fd24e711a4930b87590024f7dd65afef414529
@@ -87,4 +88,5 @@ EBUILD netbeans-platform-9999_p20160908.ebuild 9520 SHA256 98fc8b7e4fe8e80df0380
 EBUILD netbeans-platform-9999_p20160909.ebuild 9520 SHA256 3e9d18aaffac1d04c2d6bd7543c2feefb138ab7567c6fc9a5e2b386433ef7439 SHA512 fddea3f3812f7ee5c6ab765422434a655ab22a1237031bb142573cb4947db2298f0697a50f88c92a75c25780270072f18bfb88ff089e43d1d3909c0b63335167 WHIRLPOOL 01f444ea92b583b97754736c68a94abf4b7227ce8e40294da26c9dfb56a8f565a2f3e2b7f55b0ddf6e11bfebf5ff82d95d0ce0adff0b7715ebf3d07afc4126a7
 EBUILD netbeans-platform-9999_p20160910.ebuild 9520 SHA256 16caedb4a8c33292d81ee224084085e383dd6c12bfff35c1284275c160755b0f SHA512 3de79cd722a33b59c5be55e08528608fc6b62f31b33bcd7ee0c1ee4ca6453a028cb83980fc21bb3665f5c9d292716a2310a9f4e3aac17556513ad02efa71ae87 WHIRLPOOL 95234cd88e095ac5628c0f0cccdb418b68522fb57511e5f911cf360d5e94550c1c18d73a21367f382a964f5039a94f4c921781bc024c0c37ab04ba4df2d6432c
 EBUILD netbeans-platform-9999_p20160911.ebuild 9520 SHA256 f853d9939d007f5cf708d7d33dc8597184fcf8bf9d2ceb952653dbea6b667d2a SHA512 9de58902ea8485bae6638eee13df6896ce1db3fca9bc40e3e6186568d059865af9dc4c7290d001e90c87cae8a940951d4d65a1c869400bf03d8b679030c39eb7 WHIRLPOOL 1272b78a96e30bf1d7dc35de7b83bb3ee869569d87a2bb11cabf109ca5a9a7e1befe8fcadcb5e10f0bedefbce20f9d6c6717c57954016434c4f310bdee82db6f
+EBUILD netbeans-platform-9999_p20160912.ebuild 9520 SHA256 05b4825e4324788fb087b824368671477a890c3bfeb2b2c53126d570ff4d3c3c SHA512 3ef538c8b7b37c5d9c545f644bfc81b7fae08d5abecaad519465df368c197ff01d328ae1e86aed599ecae38fd5534ffc286f5f3eba74da0fa34627901e880d4f WHIRLPOOL eff13822ea8f7184206af238f34b0ea1a278e0d04c90a1edfabdb7850abe9a6146531d59c3e7ee5fb7f98959f88ae6e13abe55cfe496221a5a3df445849f0849
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160912.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160912.ebuild
new file mode 100644
index 0000000..8d7a6a9
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20160912.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-12_00-02-33/zip/netbeans-trunk-nightly-201609120002-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 7244e9e..9e8595b 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201609080002-src.zip 217783700 SHA256 ab0b7304f14661
 DIST netbeans-trunk-nightly-201609090002-src.zip 217786172 SHA256 35a6f3cc108ed4505b5a8a8c075a1a3ebed0c31b829bcef321f9226dbb5b7504 SHA512 404a03d4a4e6da24591c388c9adb91d529c491e2f07880a027dc35e572859504aa5ed3532360375f921ec9411fc19169f714b6aee51fec3efccd2d6c43a97c82 WHIRLPOOL de26751daf9eb39713bc674fd0250e98fc4ce0714a64cdaba2ab0d04b78d4b4207165f1b11c30083fa79bc2b7073f0c9531b07917317b5b057b2d6e63fb959df
 DIST netbeans-trunk-nightly-201609100002-src.zip 217975100 SHA256 aed7feef3dd16e20fd04c6372f799b8c8ff728986899f89a70b21c81b5f47286 SHA512 226e2ec1c3283e088dfe278e607d65346b95150a698d6d5efef4be9d12fe23d7c3c0a8253994d6ef15c292c56579929624f7f12822a8c4689298b6132af74640 WHIRLPOOL 69d4aded277251d09fb671300dd4694ae54b59bc9e1fa66a492ca6ea427c5a219acaa88a64f2adbac07b5d6d2d1a53c6c284ae4c10c9af8eb3a18be072875982
 DIST netbeans-trunk-nightly-201609110002-src.zip 217975022 SHA256 834a359c4c5118302c97a0153372b559714be528e6f44f5655785a61dbc5d75a SHA512 b4921684195901b073df590ae0ec688965af5dd5bccad68ed7aa9d6a4e9fb0e9658115a17119da12c7d93edea457a7bcf921415c501d4df8e6db6b704c24aaa8 WHIRLPOOL 661191465cf6f92a925a07549c48b7d0c7acbad6a80235d4a73dbf1b3bce5f2eef5f43412df24a4c5933e648aeee11aa738fb5e8479d4d3c38bcd0174902abf6
+DIST netbeans-trunk-nightly-201609120002-src.zip 218010356 SHA256 265ec87ec62f15d8112229caf357bb081ad75359c131a4c47545f35563136641 SHA512 644685d3172272328048eb4cb91de128541cac95fbade58364f0d8841f0ed54a2578ef24be3749b960a39097c7849f6b553ae17e9cf9082b82deff93dfd5fee5 WHIRLPOOL 048bf90567bdd58598a4cecb78289b621a93736cd78c834cf329387b59fc645778bd610df1d8e403df26e2fee72c542e4f9cab54593208c81a5c6e9edc5e991b
 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_p20160810.ebuild 3472 SHA256 ecfb457f27546ce9618e0eac877cb9d5c654c7a6c66688c38a168d1d496168e5 SHA512 4d479b91e225a32064afe3dca568d663d82c6293d4c6688ec816d99ede08d89911641c9c4de29cc547d62323e75387fac6120322f4d7aaf037a3157959e9762a WHIRLPOOL fcc8cc19b046c2af2df4f6962eabf94c2dff360c1ac4417c418907a488b470bd769374bc1b1b035b3e88a2fb8439b4b281efbfdebd1c920eefc0f737a94970ff
@@ -61,4 +62,5 @@ EBUILD netbeans-profiler-9999_p20160908.ebuild 3472 SHA256 1e374da400fe2b3560c92
 EBUILD netbeans-profiler-9999_p20160909.ebuild 3472 SHA256 e4b7317cd1f28029ba2964c888569bc675a80bf12aa7b0e96f818f07a4b93688 SHA512 fce03c588e772131ee3b3061581b5f841eb33903f4d09ea5d520b64460fa418c90e274b13aba0a230b5a353f07faa04a297f3eec09f08a0b2599710c2896c740 WHIRLPOOL 3843fb5fa8d3a1edc1f4412c923a60071daf4bffa0dabe64d437127375801515c856cfaee2540d85abf25a7cc7cae71ce483097316632c7dcfdf953891e101b4
 EBUILD netbeans-profiler-9999_p20160910.ebuild 3472 SHA256 d2903c7eaa59216dff87cfb21b56d9cf14df8ed8b26b208e94fedd94072fa290 SHA512 26aab83aaa5b9de65e7bc6351460c418e4376fb37ee38b97a76e8259f6ee9c82a49e46f063ffa93cbdef070b3c41497ee9dd4302eeec4d77b1d749c52fa2b98d WHIRLPOOL 647111db2b27141b56029ead4753a70f2f6d98decf779be89b6ed2f12c49428d103c588cae3399291ec14e6274392ca6faac58ad5461d658fc4873c56bef4ece
 EBUILD netbeans-profiler-9999_p20160911.ebuild 3472 SHA256 15abae1bcc6416c50962473553151acd9e58f336c57a41b27d4a61518b51d8a8 SHA512 0f33e162777907474229171a5e5b5432b9f0b43a6712f6b31fa0ae88985bdf1868f1e8d199b17fff6556bc4a76f708a0859f15c4b56d358224f649f2ae279eef WHIRLPOOL 593e8fa4fbd8f036cdad2a08689569008b5f4b8075107b65fcce5b36510650eccf49cca3c1173b663e7b40e0f8e6825e772f4a1edb536d7c90ba154031c02389
+EBUILD netbeans-profiler-9999_p20160912.ebuild 3472 SHA256 afaec82cc3fb3c93a0eff14db29ad78a132056239391bd912cef9e0cd5b1f76f SHA512 5bc425dec62f04423efda3f4bf64dff29beb63b42d4f624b66638c8a4743ff247b57513560cd62fcf241ce1005577f8faf7d1de8027c785ee88837f93aa7c6ec WHIRLPOOL 0d12cf95a70acd8a93dab0397646dbd6346c500d302fb33fcabd96f4369b5ffd6f8291853b40b8299c7e9ccaa6645866ee3cd8cc1f034fea8507c456c3a05e9a
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160912.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160912.ebuild
new file mode 100644
index 0000000..ae59516
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160912.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-12_00-02-33/zip/netbeans-trunk-nightly-201609120002-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 233b1e4..b31c73e 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -50,6 +50,7 @@ DIST netbeans-trunk-nightly-201609080002-src.zip 217783700 SHA256 ab0b7304f14661
 DIST netbeans-trunk-nightly-201609090002-src.zip 217786172 SHA256 35a6f3cc108ed4505b5a8a8c075a1a3ebed0c31b829bcef321f9226dbb5b7504 SHA512 404a03d4a4e6da24591c388c9adb91d529c491e2f07880a027dc35e572859504aa5ed3532360375f921ec9411fc19169f714b6aee51fec3efccd2d6c43a97c82 WHIRLPOOL de26751daf9eb39713bc674fd0250e98fc4ce0714a64cdaba2ab0d04b78d4b4207165f1b11c30083fa79bc2b7073f0c9531b07917317b5b057b2d6e63fb959df
 DIST netbeans-trunk-nightly-201609100002-src.zip 217975100 SHA256 aed7feef3dd16e20fd04c6372f799b8c8ff728986899f89a70b21c81b5f47286 SHA512 226e2ec1c3283e088dfe278e607d65346b95150a698d6d5efef4be9d12fe23d7c3c0a8253994d6ef15c292c56579929624f7f12822a8c4689298b6132af74640 WHIRLPOOL 69d4aded277251d09fb671300dd4694ae54b59bc9e1fa66a492ca6ea427c5a219acaa88a64f2adbac07b5d6d2d1a53c6c284ae4c10c9af8eb3a18be072875982
 DIST netbeans-trunk-nightly-201609110002-src.zip 217975022 SHA256 834a359c4c5118302c97a0153372b559714be528e6f44f5655785a61dbc5d75a SHA512 b4921684195901b073df590ae0ec688965af5dd5bccad68ed7aa9d6a4e9fb0e9658115a17119da12c7d93edea457a7bcf921415c501d4df8e6db6b704c24aaa8 WHIRLPOOL 661191465cf6f92a925a07549c48b7d0c7acbad6a80235d4a73dbf1b3bce5f2eef5f43412df24a4c5933e648aeee11aa738fb5e8479d4d3c38bcd0174902abf6
+DIST netbeans-trunk-nightly-201609120002-src.zip 218010356 SHA256 265ec87ec62f15d8112229caf357bb081ad75359c131a4c47545f35563136641 SHA512 644685d3172272328048eb4cb91de128541cac95fbade58364f0d8841f0ed54a2578ef24be3749b960a39097c7849f6b553ae17e9cf9082b82deff93dfd5fee5 WHIRLPOOL 048bf90567bdd58598a4cecb78289b621a93736cd78c834cf329387b59fc645778bd610df1d8e403df26e2fee72c542e4f9cab54593208c81a5c6e9edc5e991b
 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_p20160810.ebuild 6242 SHA256 33b37a35482f6494a9dad940e8df49a42d2ffc944d3cd14879bf568f9c478fd2 SHA512 494f1923e998bcc51d3d2ab2b0f321494d80d4a0b142f9f39cd0d0488b1ec0b1830bba00866080c99c9f70f9e89c6f66f50e6cbd8a748e717ecfcfb16f609298 WHIRLPOOL ed2a307b515cfe4b285c3cecbc0877f03aa65ef7b94c001090a382bb000b314c366c93aafda9053905694c7856608750e9e5cccd419da20b5fa2e302be8b22ec
@@ -80,4 +81,5 @@ EBUILD netbeans-webcommon-9999_p20160908.ebuild 6242 SHA256 d36a31e1dcd0f4914319
 EBUILD netbeans-webcommon-9999_p20160909.ebuild 6242 SHA256 a2f9cd74250d96553873d6177a5f5570483f3ba4fbd3fe173abb2231079ef738 SHA512 954a9a6ba77ae51b1ca92addad65cfb48d5210eb3d00ad73294482893b332f16cfb3fcb20f9c22a03274d8527c621c98ee17f55f4d3eaa3518f1cb03dcfe5a3e WHIRLPOOL 8fab2a0b1a0ae78122f0c49abbf0c9a7656e4706a3808ecf2b031563bfdf45a115cc6ece16103c737667169c7b253c6c87f90621554c68efdff3e0405626c4d8
 EBUILD netbeans-webcommon-9999_p20160910.ebuild 6242 SHA256 257c5081ee935f61285a86a76df4981405a809cfdea73abb963fe3215080ae15 SHA512 646a1873793203b3174285bf94eba09f9c7b85415c049de36fa8749150a87dc77f56d701723946a152dfd71b918aa07cfae10640b768ec994aaa4b1e51b5f4cd WHIRLPOOL 63912b56bc011bba104ebcbfbb9c5c02650dab8b56f27d66f338ac3dc176bef60f27110c4473c6dee1f2d66d60ea9a6bfd9050975f096d3992c5745b0713f3c6
 EBUILD netbeans-webcommon-9999_p20160911.ebuild 6242 SHA256 60777427a203d4617001dd9ac7d7623a50a0cb57b33acbaa52eefcd3d75e4bcb SHA512 8a8e31693edd042095c19b6c49df2b07b7ea891accc4157da7cedd0ceb63943eb115fc6f7e42d9cd1d97399deddc976394e5ca72326ba91b0ec65a5fc76bb378 WHIRLPOOL 1f147b3bf6c6dc09bc413188501590ed107b14d3c25add21d003ce0080cec8f73ddb9331aba083bc3f2c64888358e1b24bef7030313301e06549f5c5cde6d4db
+EBUILD netbeans-webcommon-9999_p20160912.ebuild 6242 SHA256 98c075489a2294f4b89b530a4578eac092f1e2fd27b8412f77a940cfa771e615 SHA512 e02d724e02c79313e77fd07297bf595c79bfbedbe03d1da83e42614472bf9cd105a28c16f7f8ef9b3ecfc9a1780689d575cea939e49842be708fb63c0c07e866 WHIRLPOOL 47962f662bec860f6f0905e1094428016fa428c7635553849545d7d9cc00465ef452974c8c08c096bf0e1cf18eace24cc3527ccd13ebd7bd81ca1f4129fef358
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160912.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160912.ebuild
new file mode 100644
index 0000000..2abe09a
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160912.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-12_00-02-33/zip/netbeans-trunk-nightly-201609120002-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 f67a6fe..de9a13f 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201609080002-src.zip 217783700 SHA256 ab0b7304f14661
 DIST netbeans-trunk-nightly-201609090002-src.zip 217786172 SHA256 35a6f3cc108ed4505b5a8a8c075a1a3ebed0c31b829bcef321f9226dbb5b7504 SHA512 404a03d4a4e6da24591c388c9adb91d529c491e2f07880a027dc35e572859504aa5ed3532360375f921ec9411fc19169f714b6aee51fec3efccd2d6c43a97c82 WHIRLPOOL de26751daf9eb39713bc674fd0250e98fc4ce0714a64cdaba2ab0d04b78d4b4207165f1b11c30083fa79bc2b7073f0c9531b07917317b5b057b2d6e63fb959df
 DIST netbeans-trunk-nightly-201609100002-src.zip 217975100 SHA256 aed7feef3dd16e20fd04c6372f799b8c8ff728986899f89a70b21c81b5f47286 SHA512 226e2ec1c3283e088dfe278e607d65346b95150a698d6d5efef4be9d12fe23d7c3c0a8253994d6ef15c292c56579929624f7f12822a8c4689298b6132af74640 WHIRLPOOL 69d4aded277251d09fb671300dd4694ae54b59bc9e1fa66a492ca6ea427c5a219acaa88a64f2adbac07b5d6d2d1a53c6c284ae4c10c9af8eb3a18be072875982
 DIST netbeans-trunk-nightly-201609110002-src.zip 217975022 SHA256 834a359c4c5118302c97a0153372b559714be528e6f44f5655785a61dbc5d75a SHA512 b4921684195901b073df590ae0ec688965af5dd5bccad68ed7aa9d6a4e9fb0e9658115a17119da12c7d93edea457a7bcf921415c501d4df8e6db6b704c24aaa8 WHIRLPOOL 661191465cf6f92a925a07549c48b7d0c7acbad6a80235d4a73dbf1b3bce5f2eef5f43412df24a4c5933e648aeee11aa738fb5e8479d4d3c38bcd0174902abf6
+DIST netbeans-trunk-nightly-201609120002-src.zip 218010356 SHA256 265ec87ec62f15d8112229caf357bb081ad75359c131a4c47545f35563136641 SHA512 644685d3172272328048eb4cb91de128541cac95fbade58364f0d8841f0ed54a2578ef24be3749b960a39097c7849f6b553ae17e9cf9082b82deff93dfd5fee5 WHIRLPOOL 048bf90567bdd58598a4cecb78289b621a93736cd78c834cf329387b59fc645778bd610df1d8e403df26e2fee72c542e4f9cab54593208c81a5c6e9edc5e991b
 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_p20160810.ebuild 2721 SHA256 b9c125ce2dfef4fe9f4deca1ceafae6a44cb617986dd9b5ff508015f4fdd289a SHA512 cf927e0af945f02a46b75b626a2235601362f6d1f38dfc029644f5c3b60005e6ff1dc6a919806a1d801f8d5cdd4f296d341bea1b6ddc15437e94cccc51a79a1d WHIRLPOOL 413bead7049b1a82bddf71011ce31c4ca5b193fddc4dd3b073ab81103cd365421623e013c122ccf5c05f7d59023167fbdb2394d11827125d864d33aa1eb17f8e
@@ -61,4 +62,5 @@ EBUILD netbeans-websvccommon-9999_p20160908.ebuild 2721 SHA256 6f2466b4e24437681
 EBUILD netbeans-websvccommon-9999_p20160909.ebuild 2721 SHA256 fc33d57c28150637f021cd5e17a25a572519e1669b96a13fc42875a5999abe01 SHA512 42e0b3ab401a3beb8dafd6cab0bf769281ab142e906d7b3d4f17dea8dcd133908d1ac6beabc97802f535f16c7b31595ae2c4eb50fac3c01ce1a715b8c2479935 WHIRLPOOL d4268bab7bd236b6c5e61ba04eb9866201ee5e2a73a5984ec1bc9310cc17b45ac526e5f44c88543862a788606211818e8dcd06fcb7c9d553526021367c8157ae
 EBUILD netbeans-websvccommon-9999_p20160910.ebuild 2721 SHA256 0f832fb022c42a123c7583fb0f6a7ca063408c0a3b45b1ea495cb201ace1181c SHA512 a8092538958fd285a6edd976a8c91379b8ffd94c2ec1c646f739d96655524c895b4d61b6c0681796518ad47f7edbca82a383af3e311b407ca31792ad00bd71f5 WHIRLPOOL 110e44e7524156d0e02f0c31a47d4ef067710b2c954d72a26a5294fe7f32bf87e5d987041a873def1bad9fa77093807ede051d5653579a848bb2a9d7b62f8b07
 EBUILD netbeans-websvccommon-9999_p20160911.ebuild 2721 SHA256 3b552a4804d6c3a57611843cd3ec92afb47c99008bda464977edb0e42f174c63 SHA512 de428f9edca4e4544c79407089457db7728fc1210d4050687bdd9795e27b35c7cb01e83381e77c582a50ed90a014584def026dd0d329d97332140932966058ce WHIRLPOOL 27e9c88c440a15246ed2a40bf0a23691acd39977e36dc00fcf3fc7373f59e745ce85065652413b740c359de9416285a3c9840b0f427aeefce59bdf30355421e1
+EBUILD netbeans-websvccommon-9999_p20160912.ebuild 2721 SHA256 64e370535db4e85ed3c362743f5a3a9afff0509bdf31c33321865b50850476c0 SHA512 0b0121a1ef270877ecd4b7fcb2d46004993d3c8a8195b35178d21cd55e8ea3b462ea217d4ef5742b94c28192c91f4c241852a4e4d646466c153dd8fe7ea7c793 WHIRLPOOL 592bc44c5e415ba0b67d68ca7421161adde7e5bca5f4306248b9e99a3166798d79903f084726e5d161ab01dfab3b1d186ccb8ac3aad629b439fafa3cd756f61d
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160912.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160912.ebuild
new file mode 100644
index 0000000..153fd45
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160912.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-12_00-02-33/zip/netbeans-trunk-nightly-201609120002-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 74cdf35..a72174b 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201609080002-src.zip 217783700 SHA256 ab0b7304f14661
 DIST netbeans-trunk-nightly-201609090002-src.zip 217786172 SHA256 35a6f3cc108ed4505b5a8a8c075a1a3ebed0c31b829bcef321f9226dbb5b7504 SHA512 404a03d4a4e6da24591c388c9adb91d529c491e2f07880a027dc35e572859504aa5ed3532360375f921ec9411fc19169f714b6aee51fec3efccd2d6c43a97c82 WHIRLPOOL de26751daf9eb39713bc674fd0250e98fc4ce0714a64cdaba2ab0d04b78d4b4207165f1b11c30083fa79bc2b7073f0c9531b07917317b5b057b2d6e63fb959df
 DIST netbeans-trunk-nightly-201609100002-src.zip 217975100 SHA256 aed7feef3dd16e20fd04c6372f799b8c8ff728986899f89a70b21c81b5f47286 SHA512 226e2ec1c3283e088dfe278e607d65346b95150a698d6d5efef4be9d12fe23d7c3c0a8253994d6ef15c292c56579929624f7f12822a8c4689298b6132af74640 WHIRLPOOL 69d4aded277251d09fb671300dd4694ae54b59bc9e1fa66a492ca6ea427c5a219acaa88a64f2adbac07b5d6d2d1a53c6c284ae4c10c9af8eb3a18be072875982
 DIST netbeans-trunk-nightly-201609110002-src.zip 217975022 SHA256 834a359c4c5118302c97a0153372b559714be528e6f44f5655785a61dbc5d75a SHA512 b4921684195901b073df590ae0ec688965af5dd5bccad68ed7aa9d6a4e9fb0e9658115a17119da12c7d93edea457a7bcf921415c501d4df8e6db6b704c24aaa8 WHIRLPOOL 661191465cf6f92a925a07549c48b7d0c7acbad6a80235d4a73dbf1b3bce5f2eef5f43412df24a4c5933e648aeee11aa738fb5e8479d4d3c38bcd0174902abf6
+DIST netbeans-trunk-nightly-201609120002-src.zip 218010356 SHA256 265ec87ec62f15d8112229caf357bb081ad75359c131a4c47545f35563136641 SHA512 644685d3172272328048eb4cb91de128541cac95fbade58364f0d8841f0ed54a2578ef24be3749b960a39097c7849f6b553ae17e9cf9082b82deff93dfd5fee5 WHIRLPOOL 048bf90567bdd58598a4cecb78289b621a93736cd78c834cf329387b59fc645778bd610df1d8e403df26e2fee72c542e4f9cab54593208c81a5c6e9edc5e991b
 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_p20160810.ebuild 6939 SHA256 1a7e0f19ea302986eed685b13f7e8c790af13b25883c33bd5a55b9f7c87e2c78 SHA512 b453e5cd1de539c7dce6a75965f3a50fc9db8ff2273a30a757adf9a37cf2bc427bafebf16b30f73aed616bcaea0b2d342353e2c396fcccf223a063010564c2df WHIRLPOOL 97ed4b0199631ef4ad11e9ea525c5189a7e5ba3bc16ec96e13dc306212042377b1f977f7f1e6a9a843aa658075fea2e3c535461e4a20514c217949cedc99f6f2
@@ -64,4 +65,5 @@ EBUILD netbeans-9999_p20160908.ebuild 6939 SHA256 1dbdf21b6f0e036dfd305f6c28b06d
 EBUILD netbeans-9999_p20160909.ebuild 6939 SHA256 0634e062ebb1619a7c92ad217a177f3d641985d354b0642a00986ee15c517190 SHA512 1c6596c228f8bb152cb5a057123c96317a66c04ffb40c331801a6beee894b82935c199bdcba74ec967b74f9b84e048c288aaa105c23728b398c332b808470606 WHIRLPOOL 466ded4e2b45759c4ee0549977f3334c3f79391bba8152481a79baaec506d73d0727a72995907204e2d182fb21bed77bdecef01e174b704849288292160f3463
 EBUILD netbeans-9999_p20160910.ebuild 6939 SHA256 63069878160f6856413223e8f1a0676b955c30717ffce94ee23684aeb80b4555 SHA512 880db422027a4634a9df55a03dfc39cffc2821b847f1686fdb99bfaa8ac7b93fd2080f325a3122da086a04f49ec6f0ca498834b1cfea1b9bd9dadd7cd261437b WHIRLPOOL 2746c9cdbb4b0c3144729e774c7b84010bfeaa2b6414e48ae4889518e38778c533fb9b9213c6e18bc005cfd25111cfed54d630d024637c5fcb9456899025ec6e
 EBUILD netbeans-9999_p20160911.ebuild 6939 SHA256 ae1602b2b377fb370a0784518b35cb47a9c63f5beeeee8f957a5bc9912e64594 SHA512 ec9f8dda143a2bcf977b41303f71cb9788073fc1e8ceb27cd042c18fdeedd95e55651619605e938c0daffe34a899a1d2655c29af6609a356dda83e9422d91860 WHIRLPOOL 79fe1b272c83d6ba1f11ffa079f5ee51908bdad1e397085312d491f0a15802600e5f41c12feb4f6a1d7b3f7f9c66351e47512a39fb6ac12271474c49ff8164ff
+EBUILD netbeans-9999_p20160912.ebuild 6939 SHA256 47f774a735de114b080a8111a9e844044717c3f23f7040fd164d3f921ca5a21a SHA512 a399f5c4a442f1cff5fdd77fdc4fc4d3d4e7252dfffcc85932f10f639f9e33e320f762aec906b53003eddc43428f34a73132b8fc869dd8fd21db085bf3a2d1e3 WHIRLPOOL 3992695dff34357774f54d63077aa154a22c67e71f2527a4c2b8047902bdef2e8a1d412dec48318830c56f2a897da2e95e10cdbfb7ea5ece05cdc86bd144a2cc
 MISC metadata.xml 329 SHA256 8aeaf2a0228f15c2e4140f401b30f083509bd99d0a578873069f3595cd8555f3 SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640 WHIRLPOOL 799a9b79b1b447bda9631f67e2dfaf722376740e1d2037796528a05f9745eeed00d9990a74a65ce09f74bc5e1d60a887abde540c3c62487d7dd49b8377c15834

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


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

only message in thread, other threads:[~2016-09-12  8:51 UTC | newest]

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

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