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

[Miroslav Šulc]

commit:     a66feb834df66a65c327195202f0ff966cd2ec72
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 13 16:04:01 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Dec 13 16:04:01 2015 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=a66feb83

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.2.26

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 0f72239..5b146ea 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd231
 DIST netbeans-trunk-nightly-201512090002-src.zip 209228578 SHA256 dedd023e1e8fe3ad332bf923abf62814f76a02e484733b724d16754f3da958a1 SHA512 c7aa770074a8f4f4fa13190a4facf829d2dc6de5a3c8045ba79e9f5689332b506ff1330470dea33b38b1b7cb9e17361eff71d2b221f0fc906bdb8cd918ff2e8b WHIRLPOOL 96be2ab1293f0ab957b7da2c3266f2b4d77ec7b724a9c1c40045f512ad7ec9c99919d29643aaf1ecd8a7667321d0468eebb71f3219e117d214da618ca105dedb
 DIST netbeans-trunk-nightly-201512100002-src.zip 209233507 SHA256 2fb62cd1de0008f085b2559062e0ee25bffa593694042ab198c5c7aaf3f2c6f3 SHA512 75ae18ae344585faf93b2532e4aa16787b6e69d7a2a7402af3cb80a3585d1ae8e80efa981713e314c0c6c51c1d6a81d4bd5a91a1ca0ef1aaa17862bbdf84ce74 WHIRLPOOL 2d6cb6235ddf4a7a8c2157b517c4ae26cd50d272923d26f040e9bc5f4f664d91aa0b7815df40c75e812f6aa7c3c05289e538e20a5b0ce593b7e0736c9bd40e93
 DIST netbeans-trunk-nightly-201512110002-src.zip 209266196 SHA256 fa400d1944c8710ac2c26b9d63660e83b596b7fbe71d99c028871676a6ae2777 SHA512 ecd22150fb26c940240a9183f27d9a850850ddaadaf0646941f919fcfe9344734eb1883ec91027c909b88ab3efbe48e426fe99b4a404e0d803162d833ad9e41d WHIRLPOOL 9fc37da17f6e1d8727be1ed41513cd50c70991c75f404b665bf3d2c5bcc28afef5ff71ae09b0e77ee00663aadaca1f42841ef214a4e33926d50fa927de52c6eb
+DIST netbeans-trunk-nightly-201512130002-src.zip 209278259 SHA256 94c60bfa105a3f5f8a5227f79bae5e4795668b49443e66a164dd86b3d74ce84c SHA512 0b6cd638150f3bde87c9d6ce1c5b1c59b4330392ac76661cb20167305536ed3eb94307a2a3feaa7e5a727008a565723117bc78d9fb22a60565d99060a8da9600 WHIRLPOOL 98d0dde6bb37df4cff8269796caaa7c2066e91e4651b6aeeb6dd5bd7a5047420e89e257e581d316e705b39d6a5b5ed6371b8b9c84f8240cae1217a4d5e7adb58
 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_p20151108.ebuild 3384 SHA256 7b7543c1bdfb6b521b2bbb97773c564a4b7812591d578f3846a5093d895936b7 SHA512 7abf322a078aab58707f493acf54cfb465d1e62c57ca87eaf545d5386d93658cf8c924dae52ca728712221d4ca25329291e619cac1923a0c40d4f8544a63e7af WHIRLPOOL e9bff954fdc7a8730f9be90402996e66a7c393fbc18c3a58c74df25bcb15f6485de5a6b2d6943a59d642cf49bc90ff48f29aadf1d3c588c9c9faa20f7cae4065
@@ -65,4 +66,5 @@ EBUILD netbeans-apisupport-9999_p20151208.ebuild 3384 SHA256 8423ef681314c69c978
 EBUILD netbeans-apisupport-9999_p20151209.ebuild 3384 SHA256 808e7a88e35dd567d02d669dcea1ede30e156bbe934f30b258f7920e3e0494ff SHA512 86c295df60b4aeea7890a4756a53b2f027ee3f64438acb2bb2ff3ffd33f0607b0421163bf3b53144af4ef78b5b536abc2acb238a8184086e6f09590e2c5c49bb WHIRLPOOL eaf8bea7415662abea3b6d532ae1d73e2e9bb77aa44d896a68ab74abffbbf485cb77a18440a9642c9f066ab10450759940983ae80eec478444c6624ad5722097
 EBUILD netbeans-apisupport-9999_p20151210.ebuild 3384 SHA256 7668f3c93058f8e5097cfeaaa621eb2b0bf8af3ae390020c11a15b3b748dbf1d SHA512 7d20a1b87a0b0d7146b3b34f4234ab0e468601afd8d2118d463bc8cdc2a523c1a7c7c8962b21d187274965d6b6f0bb151ceadf91f718c1b937695791ea511564 WHIRLPOOL 937c85615048a5579319bc263f9bd645baa42fee2d89dacf645a314007bb3ec24866248abe23469d4d48993e03bace1c8e07e44a70337e371e25669895540dce
 EBUILD netbeans-apisupport-9999_p20151211.ebuild 3384 SHA256 7edcf5b8f2e11833deded0da244f09472d9ce0d22f4407c3dd22eac11cb9f627 SHA512 9cb39c3fc4cc6bd1becdd513dd0b900d323cb6e370337bb02554deaf0c37b9086015cfabb3a1993fa5b3cbb17df1c62d2828cff72df4c72fe6569230e81d3c13 WHIRLPOOL 9b9394f3d25d19413d4c9e06d59b013c2d005d4b2b6c208942f6caf4d2d780c56751f98687bd23c0e8f603789d4993e3f9e50c3866ce8c93a328103dab15949d
+EBUILD netbeans-apisupport-9999_p20151213.ebuild 3384 SHA256 4cf514873436b8eaf275580317e5bda98531439e28b1970620efea79e2eb7c72 SHA512 76a3709eb3fd9fec1e258fa472931ace026a3ef3f43c562f7830115cf3f7cd870eb5ab5adf32996a087614a768b7f2141c87080bcc50d85b6fe71898ea3c2fac WHIRLPOOL 2b9ad48203aafe4a67af9fc2315fdf34d41bc620cd5ddd2ca80cad0bbbdfa8b92b114c4eecc5c08c48f5e9acaef1eaceffc4db1cf91585dd665e98bec2357ba2
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20151213.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20151213.ebuild
new file mode 100644
index 0000000..03a8d09
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20151213.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 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/2015-12-13_00-02-04/zip/netbeans-trunk-nightly-201512130002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-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 a938340..ebdba08 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -44,6 +44,7 @@ DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd231
 DIST netbeans-trunk-nightly-201512090002-src.zip 209228578 SHA256 dedd023e1e8fe3ad332bf923abf62814f76a02e484733b724d16754f3da958a1 SHA512 c7aa770074a8f4f4fa13190a4facf829d2dc6de5a3c8045ba79e9f5689332b506ff1330470dea33b38b1b7cb9e17361eff71d2b221f0fc906bdb8cd918ff2e8b WHIRLPOOL 96be2ab1293f0ab957b7da2c3266f2b4d77ec7b724a9c1c40045f512ad7ec9c99919d29643aaf1ecd8a7667321d0468eebb71f3219e117d214da618ca105dedb
 DIST netbeans-trunk-nightly-201512100002-src.zip 209233507 SHA256 2fb62cd1de0008f085b2559062e0ee25bffa593694042ab198c5c7aaf3f2c6f3 SHA512 75ae18ae344585faf93b2532e4aa16787b6e69d7a2a7402af3cb80a3585d1ae8e80efa981713e314c0c6c51c1d6a81d4bd5a91a1ca0ef1aaa17862bbdf84ce74 WHIRLPOOL 2d6cb6235ddf4a7a8c2157b517c4ae26cd50d272923d26f040e9bc5f4f664d91aa0b7815df40c75e812f6aa7c3c05289e538e20a5b0ce593b7e0736c9bd40e93
 DIST netbeans-trunk-nightly-201512110002-src.zip 209266196 SHA256 fa400d1944c8710ac2c26b9d63660e83b596b7fbe71d99c028871676a6ae2777 SHA512 ecd22150fb26c940240a9183f27d9a850850ddaadaf0646941f919fcfe9344734eb1883ec91027c909b88ab3efbe48e426fe99b4a404e0d803162d833ad9e41d WHIRLPOOL 9fc37da17f6e1d8727be1ed41513cd50c70991c75f404b665bf3d2c5bcc28afef5ff71ae09b0e77ee00663aadaca1f42841ef214a4e33926d50fa927de52c6eb
+DIST netbeans-trunk-nightly-201512130002-src.zip 209278259 SHA256 94c60bfa105a3f5f8a5227f79bae5e4795668b49443e66a164dd86b3d74ce84c SHA512 0b6cd638150f3bde87c9d6ce1c5b1c59b4330392ac76661cb20167305536ed3eb94307a2a3feaa7e5a727008a565723117bc78d9fb22a60565d99060a8da9600 WHIRLPOOL 98d0dde6bb37df4cff8269796caaa7c2066e91e4651b6aeeb6dd5bd7a5047420e89e257e581d316e705b39d6a5b5ed6371b8b9c84f8240cae1217a4d5e7adb58
 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_p20151108.ebuild 4790 SHA256 b75b8a94f1300ec264731cfc6ec36b77f65abc8265d7996fa7c21648e144e39a SHA512 4ae859af5260b72d5f226522c0f06cf4ebb5ee2856e0b61d57a3bc4bad284e0fcb8f61a2d1d5b31028100d84b6f7b684553c02fbb70b66d10a0c9cb31952537b WHIRLPOOL c9c88b19273a07659308cdf5a2156702e18a7bcf88213db8b0540beaaaa66af4050e72cd74722209f0f330664dafd99ab34df31b58c2ee789dcb9ea4c94020e0
@@ -76,4 +77,5 @@ EBUILD netbeans-cnd-9999_p20151208.ebuild 4790 SHA256 417a8c7790a36f8c407390ec8c
 EBUILD netbeans-cnd-9999_p20151209.ebuild 4790 SHA256 182e98298b62601fdd3d03207e292a7c858ca09ffab4de277dd4ec0ff60e4fb4 SHA512 eebf6afd8e3790ca8ea9b2f68b1e11dea9fffcb3f263e36622a4c15779edc3f5fc44fde1ddfbb94a647ec90a2b4baed78f7a45947f2d63809b52023767820197 WHIRLPOOL b2fd3b9746fd0cc53b96c5d376d6431c063909880894c88e827583560ac06a286792a325c17144d9eea5214b2a0543f27d6d0d027581f06e53b17623c2ebd301
 EBUILD netbeans-cnd-9999_p20151210.ebuild 4790 SHA256 a52f26182ac4f7b05f9cd8d73d31cd2d987a93dd9c215f79c77df666712fb617 SHA512 f405ebdc3de5badc3631a0f8870beaad90f743c9431f3d681f1418fb92f49b98b1b5ffe31ed5a0b4d2f7e345d649b6ac93c534d724dad4d7cde7b74b0c65fc47 WHIRLPOOL 6d54ffeef22acf465aeca507c9428d2c28b37c79097eed3679614aa7d28b4e7736624400f6b6e1a1ccb41b4d5c4bb1abef7b5b28a1d93a9a174f8b8b52f3c332
 EBUILD netbeans-cnd-9999_p20151211.ebuild 4790 SHA256 061743c79aa1e9b3abeb43e46b829c10259b7774f30db84a911b4c34377822b5 SHA512 4ee018ab83258e3b1e0be224f573d10847afbca66f9a1455efb9805b51ebe67dcb11ea34039cc07c015af4941a6f21f118c1c02f13940e6670a31e4df2250f8a WHIRLPOOL b61e7586b09211c05f46cb00cd6f8246d9ee36bc4fa5915f9c841ae5942e9f1be2f683cb329099bcecb8004c4541f47f85105d5bb6a54d5823269ef23b9847c6
+EBUILD netbeans-cnd-9999_p20151213.ebuild 4790 SHA256 0931cff9b4608a4e5ac08e4578a1a8ab3015f6241bc03db40a5fc46064cd17b4 SHA512 7f690d5aed78d08c0523ac256d3146bb107fc04412ba44178d3e2340a51b596902beaff5706aeb5ae1916c3951e9dbd2991f71b26990d0d1ec7478f0b51396fd WHIRLPOOL 6f6821ba6b7adc27a714ff97ae9a4662e5edf680b6d29e807504b58a0092f31744aa112380d1c5deb31bf0240a23859a1d66b2b6e1fa5d2f2003eb761c4d1d07
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20151213.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20151213.ebuild
new file mode 100644
index 0000000..9e6477f
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20151213.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2015 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/2015-12-13_00-02-04/zip/netbeans-trunk-nightly-201512130002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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/9A133B99ABDA40B3A17B23DFA79A91AF5FC429B1-clank_0.3.6.zip
+	http://hg.netbeans.org/binaries/BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip
+	http://hg.netbeans.org/binaries/BB83D4F8047D608858154CB041054F5CAE35B903-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-r14-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}"/9A133B99ABDA40B3A17B23DFA79A91AF5FC429B1-clank_0.3.6.zip libs.clank/external/clank_0.3.6.zip || die
+	ln -s "${DISTDIR}"/BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip cnd.discovery/external/cnd-build-trace-1.0.zip || die
+	ln -s "${DISTDIR}"/BB83D4F8047D608858154CB041054F5CAE35B903-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-r14-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.1.0.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 fa6dd95..6a4c4a3 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd231
 DIST netbeans-trunk-nightly-201512090002-src.zip 209228578 SHA256 dedd023e1e8fe3ad332bf923abf62814f76a02e484733b724d16754f3da958a1 SHA512 c7aa770074a8f4f4fa13190a4facf829d2dc6de5a3c8045ba79e9f5689332b506ff1330470dea33b38b1b7cb9e17361eff71d2b221f0fc906bdb8cd918ff2e8b WHIRLPOOL 96be2ab1293f0ab957b7da2c3266f2b4d77ec7b724a9c1c40045f512ad7ec9c99919d29643aaf1ecd8a7667321d0468eebb71f3219e117d214da618ca105dedb
 DIST netbeans-trunk-nightly-201512100002-src.zip 209233507 SHA256 2fb62cd1de0008f085b2559062e0ee25bffa593694042ab198c5c7aaf3f2c6f3 SHA512 75ae18ae344585faf93b2532e4aa16787b6e69d7a2a7402af3cb80a3585d1ae8e80efa981713e314c0c6c51c1d6a81d4bd5a91a1ca0ef1aaa17862bbdf84ce74 WHIRLPOOL 2d6cb6235ddf4a7a8c2157b517c4ae26cd50d272923d26f040e9bc5f4f664d91aa0b7815df40c75e812f6aa7c3c05289e538e20a5b0ce593b7e0736c9bd40e93
 DIST netbeans-trunk-nightly-201512110002-src.zip 209266196 SHA256 fa400d1944c8710ac2c26b9d63660e83b596b7fbe71d99c028871676a6ae2777 SHA512 ecd22150fb26c940240a9183f27d9a850850ddaadaf0646941f919fcfe9344734eb1883ec91027c909b88ab3efbe48e426fe99b4a404e0d803162d833ad9e41d WHIRLPOOL 9fc37da17f6e1d8727be1ed41513cd50c70991c75f404b665bf3d2c5bcc28afef5ff71ae09b0e77ee00663aadaca1f42841ef214a4e33926d50fa927de52c6eb
+DIST netbeans-trunk-nightly-201512130002-src.zip 209278259 SHA256 94c60bfa105a3f5f8a5227f79bae5e4795668b49443e66a164dd86b3d74ce84c SHA512 0b6cd638150f3bde87c9d6ce1c5b1c59b4330392ac76661cb20167305536ed3eb94307a2a3feaa7e5a727008a565723117bc78d9fb22a60565d99060a8da9600 WHIRLPOOL 98d0dde6bb37df4cff8269796caaa7c2066e91e4651b6aeeb6dd5bd7a5047420e89e257e581d316e705b39d6a5b5ed6371b8b9c84f8240cae1217a4d5e7adb58
 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_p20151108.ebuild 2968 SHA256 78719f4f666c2c79009f3c1cd648bb96e90620d41e7d508eb1c5ffa16dc3c8a2 SHA512 84ef2bc1b88da9af976377b499f219eaee1f484b6d75ca0ce1284deca5f8681a4a88679f093e22aac547dcd103432bd30b7bcbbc7c89c2313a66a8e9e2dbe482 WHIRLPOOL 6c05c9d65c210de2786afda1f09f9cce2cb0e13c09525bcb8cb630109d5f49a86748d04ed816d15cc1ea8be5625a3b306f3c8c858c5fdc65a70c4513766a0a05
@@ -68,4 +69,5 @@ EBUILD netbeans-dlight-9999_p20151208.ebuild 2968 SHA256 d71feb506bfc89c2d439e20
 EBUILD netbeans-dlight-9999_p20151209.ebuild 2968 SHA256 2418a3b96a05e717e9e5da15eaa2a86b05878a15c52c5922946895f57210bfce SHA512 b2c16c1518361ac989a67dd6fd45ad26f2389edc813e444a61131494b999e2ff6ccd498a16c0bded9052009a63e5383c2e098e8c348bbf66a9cc8bb303388054 WHIRLPOOL 8447baea8e1e636d8da048bb0eb1258ebf0c4c90ddeaa165bc6ab9faa731a912bb8a49e3cb6e5a5335b4ea0ae4997919bf0c724c8749c28af4d8869edabfa0f0
 EBUILD netbeans-dlight-9999_p20151210.ebuild 2968 SHA256 e4ba54a954d7f1aeb2088ec2a8638f78b5ef1541488a7ded86f74b026fd2ec79 SHA512 04a72146f40a4c75209f6832bc503ab146005a3e983e9eb60a2a1d94ec5303b8b49cbf57a51bc90fc405209b8652bd08242641123a0773d7aa0ed8c959b61727 WHIRLPOOL 5c003719c78bf62959dbc59524bbe4468d04124192531640a1b72f640103d3d5a9a5c68a343285db51b41a2626a1056bd373befb309d5fcb21f1322e22acb3d8
 EBUILD netbeans-dlight-9999_p20151211.ebuild 2968 SHA256 3e219c1d4bb0ddbf5fbfeb94f99a32fe65e71cae8e43d3028b9f1efdf92c30f9 SHA512 aa7761123a5888efbfef65b102906cb4d21c22620899e1bd897817869304720a2f41663e679ed0f50f4647de02e4fd27c849569e79cb7b6181bab1c24f9704a2 WHIRLPOOL 00e9d00f250ca383e29b7b20543a60e561949ff4f4ce9b251d387a406cea0bfa798ba1690994918d2ee6172872796bb514077588f90c47b8a46f1a19073bb6b0
+EBUILD netbeans-dlight-9999_p20151213.ebuild 2968 SHA256 6f222a960ac075017b8d2b5b5aea17dd4548b161383edf5e4efa6b5a8424d730 SHA512 1d838185a8488f83b1bb931645fc63954bb10112eb8b1e7de40f184cc28d8d4839db6cfb94dab40ddc63f283dcaaabbfde4a726c4f357e1ad2b65bd0b3d76bbc WHIRLPOOL 31da9fe9a513fd556cfa67eb0697a503721a2962428edfd16ad80a1d610c62ec29c72321e91a08a0a47ceb6a6fc7d5c69eb353ae4212f38613e3499f539f8970
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20151213.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20151213.ebuild
new file mode 100644
index 0000000..b82f337
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20151213.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 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/2015-12-13_00-02-04/zip/netbeans-trunk-nightly-201512130002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/D84D17804FB0587297CCB4CFF3918561212671A0-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-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/D84D17804FB0587297CCB4CFF3918561212671A0-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-r14-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 f3a132c..3bca423 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -65,6 +65,7 @@ DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd231
 DIST netbeans-trunk-nightly-201512090002-src.zip 209228578 SHA256 dedd023e1e8fe3ad332bf923abf62814f76a02e484733b724d16754f3da958a1 SHA512 c7aa770074a8f4f4fa13190a4facf829d2dc6de5a3c8045ba79e9f5689332b506ff1330470dea33b38b1b7cb9e17361eff71d2b221f0fc906bdb8cd918ff2e8b WHIRLPOOL 96be2ab1293f0ab957b7da2c3266f2b4d77ec7b724a9c1c40045f512ad7ec9c99919d29643aaf1ecd8a7667321d0468eebb71f3219e117d214da618ca105dedb
 DIST netbeans-trunk-nightly-201512100002-src.zip 209233507 SHA256 2fb62cd1de0008f085b2559062e0ee25bffa593694042ab198c5c7aaf3f2c6f3 SHA512 75ae18ae344585faf93b2532e4aa16787b6e69d7a2a7402af3cb80a3585d1ae8e80efa981713e314c0c6c51c1d6a81d4bd5a91a1ca0ef1aaa17862bbdf84ce74 WHIRLPOOL 2d6cb6235ddf4a7a8c2157b517c4ae26cd50d272923d26f040e9bc5f4f664d91aa0b7815df40c75e812f6aa7c3c05289e538e20a5b0ce593b7e0736c9bd40e93
 DIST netbeans-trunk-nightly-201512110002-src.zip 209266196 SHA256 fa400d1944c8710ac2c26b9d63660e83b596b7fbe71d99c028871676a6ae2777 SHA512 ecd22150fb26c940240a9183f27d9a850850ddaadaf0646941f919fcfe9344734eb1883ec91027c909b88ab3efbe48e426fe99b4a404e0d803162d833ad9e41d WHIRLPOOL 9fc37da17f6e1d8727be1ed41513cd50c70991c75f404b665bf3d2c5bcc28afef5ff71ae09b0e77ee00663aadaca1f42841ef214a4e33926d50fa927de52c6eb
+DIST netbeans-trunk-nightly-201512130002-src.zip 209278259 SHA256 94c60bfa105a3f5f8a5227f79bae5e4795668b49443e66a164dd86b3d74ce84c SHA512 0b6cd638150f3bde87c9d6ce1c5b1c59b4330392ac76661cb20167305536ed3eb94307a2a3feaa7e5a727008a565723117bc78d9fb22a60565d99060a8da9600 WHIRLPOOL 98d0dde6bb37df4cff8269796caaa7c2066e91e4651b6aeeb6dd5bd7a5047420e89e257e581d316e705b39d6a5b5ed6371b8b9c84f8240cae1217a4d5e7adb58
 EBUILD netbeans-enterprise-8.0.2-r1.ebuild 15075 SHA256 41d376117ad1d8d59c8194debfd29dc42f5fd4de70aee12a2134ec143a604dda SHA512 4cd9de88e9a401cc0be88e3e2605abc411c47307818376b2bcc00f9ae570b21324f2bf00fd83e819bfa076da0fb07811fa1f0f9362a6cd0ee05b63221a199000 WHIRLPOOL 73f4518c14430fe7aa3614ebf1b11a06ba0e9bce7479af2770db3a114f149d575a16a655218f757ed416b5149228ac56dac700f5a8d5e034cc838bfa4092e636
 EBUILD netbeans-enterprise-8.0.2.ebuild 15071 SHA256 84621e3bb946cfa254bb70ca3c3f61202882a7e6d631769ad2f0f4639b0de875 SHA512 6ad38e840764661e6bc5b89b5925e9665871009ba0b640c0a78c555ec104214dbee1200a93cb48e655bc620e07bb6e4d8932b23a00fe458f8a5e9e5c3200d79d WHIRLPOOL b2c2bbf2ff72f8cd9b4cdbe039fdbf7cd074b0fdc20f634aa0b6f79f5c639be358c61fab30854a6e3ab9714a285d9461ac4e39e94e10c14c5068422d6c873c56
 EBUILD netbeans-enterprise-8.1-r1.ebuild 15888 SHA256 d4c04ccfee01a46819020cb7cf8fd8297618f3c0431ae2d9dd7eec8131f988ab SHA512 6c7c39c378cb79d3f382cb80d07710a8c5233aaf0df8fb58889ee6aa6bde73624efa6aa49b43f84105685094a7aff89e4b6367ffd1fd113da27b42d50d07e983 WHIRLPOOL e678e2a6957e428c1b6e51469c0e7cc6a08da2c797f1575b6bb660a7f3281c00f071179de459e27c983304915b005baaf94ad4fae0a4c08162f218bf53b7d821
@@ -99,4 +100,5 @@ EBUILD netbeans-enterprise-9999_p20151208.ebuild 15936 SHA256 a3dbc3edeb761078c8
 EBUILD netbeans-enterprise-9999_p20151209.ebuild 15936 SHA256 e7e73e9a9e3154367d6d6f032231ab847673032748c38dbb6d465143f2e933af SHA512 e481855803571f98bdcd2a9b38ddaa137ce554bb0c5d920acb6e826f2005bc2ade80e7fdf7d53823c9b382e2d8c0e21ae46e40aaa41b408b244d9d7c10fd41c1 WHIRLPOOL ed3ff0699f174591d89e12f94b047140df3b65310a5c1a7380175aa0213b31c03c42b6a66fa7321d9deab699dd057fe543ff1ba2f16602d1d1be504ac9f90197
 EBUILD netbeans-enterprise-9999_p20151210.ebuild 15936 SHA256 30e71003a8c9aa133ee33b53243434267baec30419bedfb34eba920247a3b76d SHA512 35ae1c6a5e0a943beff7042c07aa4097aee01d12cadfd438be49b99e2328ec9820a56f1da2e58aaf1e5590cef73cb31b367997e116ca4e7dc16826627ec23bcd WHIRLPOOL e09cf993977b0180b8193ce7c255f31e693c4ac60bab37293f4cbd96762bc54b4cec2bb62891975ff97515543a5cc0c6317ad8368bff449ba5260719145aac61
 EBUILD netbeans-enterprise-9999_p20151211.ebuild 15936 SHA256 e48b74ef239579e559f8cb9f1fd1bdb377e8c0ecff46d1e8176e2175a06355b4 SHA512 d63ed88d1b797d7e0cad129fb1384714c313d587555888da95d4b034387c8e47484bf12481b4582158556612b33ab874168fbe8596903dd4f06a3a0d3bd819d2 WHIRLPOOL d57993b9bbb219f98b3c05ab3dbdd103fd64623d7fa1ef5989b2eaf2c8d7cba7f6d24b6a9efc591d19d3e37c86c747860d29afa021b38652eed6f17dfcc4cf53
+EBUILD netbeans-enterprise-9999_p20151213.ebuild 15936 SHA256 700ba22578766ad22616c3f91031f12454476d0d010121230a805ab879c9fb1b SHA512 d250fc5918f6b503e1cd46e504c813cc2e98150da0dedeee78c45d22f7d781e0a849d3c9e3cb28d9f90b482495b6e076128aefd0ee3f14f718967dba5399b63f WHIRLPOOL 417350c8710a3d1c406aa238c1c8fbf0984ac5fdd46fb6309b209bd1d837ad326437615cc1027713fe20cb21cc63dd2b5fdccf6da89789fefb1926238cae8fb5
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20151213.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20151213.ebuild
new file mode 100644
index 0000000..4f10a6b
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20151213.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2015 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/2015-12-13_00-02-04/zip/netbeans-trunk-nightly-201512130002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	dev-java/jsr181: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-r14-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-r14-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 --build-only --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=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-fileupload-1.3.jar && dosym /usr/share/commons-fileupload/lib/commons-fileupload.jar ${instdir}/commons-fileupload-1.3.jar || die
+	rm jsr88javax.jar && dosym /usr/share/glassfish-deployment-api-1.2/lib/glassfish-deployment-api.jar ${instdir}/jsr88javax.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/aws-sdk
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-codec-1.3.jar && dosym /usr/share/commons-codec/lib/commons-codec.jar ${instdir}/commons-codec-1.3.jar || die
+	rm commons-logging-1.1.1.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.1.1.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/javaee7-endorsed
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jersey2/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm cglib-2.2.0-b21.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.0-b21.jar || die
+	rm guava-14.0.1.jar && dosym /usr/share/guava-14/lib/guava.jar ${instdir}/guava-14.0.1.jar || die
+	rm org.osgi.core-4.2.0.jar && dosym /usr/share/osgi-core-api/lib/osgi-core-api.jar ${instdir}/org.osgi.core-4.2.0.jar || die
+	rm persistence-api-1.0.jar && dosym /usr/share/glassfish-persistence/lib/glassfish-persistence.jar ${instdir}/persistence-api-1.0.jar || die
+	rm validation-api-1.1.0.Final.jar && dosym /usr/share/validation-api-1.0/lib/validation-api.jar ${instdir}/validation-api-1.1.0.Final.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jsf-1_2
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-beanutils.jar && dosym /usr/share/commons-beanutils-1.7/lib/commons-beanutils.jar ${instdir}/commons-beanutils.jar || die
+	rm commons-collections.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections.jar || die
+	rm commons-digester.jar && dosym /usr/share/commons-digester/lib/commons-digester.jar ${instdir}/commons-digester.jar || die
+	rm commons-logging.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/struts
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm antlr-2.7.2.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.2.jar || die
+	rm bsf-2.3.0.jar && dosym /usr/share/bsf-2.3/lib/bsf.jar ${instdir}/bsf-2.3.0.jar || die
+	rm commons-beanutils-1.8.0.jar && dosym /usr/share/commons-beanutils-1.7/lib/commons-beanutils.jar ${instdir}/commons-beanutils-1.8.0.jar || die
+	rm commons-digester-1.8.jar && dosym /usr/share/commons-digester/lib/commons-digester.jar ${instdir}/commons-digester-1.8.jar || die
+	rm commons-fileupload-1.1.1.jar && dosym /usr/share/commons-fileupload/lib/commons-fileupload.jar ${instdir}/commons-fileupload-1.1.1.jar || die
+	rm commons-io-1.1.jar && dosym /usr/share/commons-io-1/lib/commons-io.jar ${instdir}/commons-io-1.1.jar || die
+	rm commons-logging-1.0.4.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.0.4.jar || die
+	rm commons-validator-1.3.1.jar && dosym /usr/share/commons-validator/lib/commons-validator.jar ${instdir}/commons-validator-1.3.1.jar || die
+	rm oro-2.0.8.jar && dosym /usr/share/jakarta-oro-2.0/lib/jakarta-oro.jar ${instdir}/oro-2.0.8.jar || die
+	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 349f2f6..b75a089 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd231
 DIST netbeans-trunk-nightly-201512090002-src.zip 209228578 SHA256 dedd023e1e8fe3ad332bf923abf62814f76a02e484733b724d16754f3da958a1 SHA512 c7aa770074a8f4f4fa13190a4facf829d2dc6de5a3c8045ba79e9f5689332b506ff1330470dea33b38b1b7cb9e17361eff71d2b221f0fc906bdb8cd918ff2e8b WHIRLPOOL 96be2ab1293f0ab957b7da2c3266f2b4d77ec7b724a9c1c40045f512ad7ec9c99919d29643aaf1ecd8a7667321d0468eebb71f3219e117d214da618ca105dedb
 DIST netbeans-trunk-nightly-201512100002-src.zip 209233507 SHA256 2fb62cd1de0008f085b2559062e0ee25bffa593694042ab198c5c7aaf3f2c6f3 SHA512 75ae18ae344585faf93b2532e4aa16787b6e69d7a2a7402af3cb80a3585d1ae8e80efa981713e314c0c6c51c1d6a81d4bd5a91a1ca0ef1aaa17862bbdf84ce74 WHIRLPOOL 2d6cb6235ddf4a7a8c2157b517c4ae26cd50d272923d26f040e9bc5f4f664d91aa0b7815df40c75e812f6aa7c3c05289e538e20a5b0ce593b7e0736c9bd40e93
 DIST netbeans-trunk-nightly-201512110002-src.zip 209266196 SHA256 fa400d1944c8710ac2c26b9d63660e83b596b7fbe71d99c028871676a6ae2777 SHA512 ecd22150fb26c940240a9183f27d9a850850ddaadaf0646941f919fcfe9344734eb1883ec91027c909b88ab3efbe48e426fe99b4a404e0d803162d833ad9e41d WHIRLPOOL 9fc37da17f6e1d8727be1ed41513cd50c70991c75f404b665bf3d2c5bcc28afef5ff71ae09b0e77ee00663aadaca1f42841ef214a4e33926d50fa927de52c6eb
+DIST netbeans-trunk-nightly-201512130002-src.zip 209278259 SHA256 94c60bfa105a3f5f8a5227f79bae5e4795668b49443e66a164dd86b3d74ce84c SHA512 0b6cd638150f3bde87c9d6ce1c5b1c59b4330392ac76661cb20167305536ed3eb94307a2a3feaa7e5a727008a565723117bc78d9fb22a60565d99060a8da9600 WHIRLPOOL 98d0dde6bb37df4cff8269796caaa7c2066e91e4651b6aeeb6dd5bd7a5047420e89e257e581d316e705b39d6a5b5ed6371b8b9c84f8240cae1217a4d5e7adb58
 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_p20151108.ebuild 2913 SHA256 5f26e9884f2f293c0d9211c7e18bb1dd9799542fdcde9b5aee58e02e7448b96b SHA512 084f456a44b0fff030a53981fbbac08489bd8bae462b43dc66e93113abc3f78ad4c5b4149924d68b505bf42d7249324d5aaaeae812737a4f1eb7f9236cf4f3ae WHIRLPOOL 20827596fdee335384231a4ee8d9253f73ed11eb50a43024658eed3c7548917f7f1d779cda99bd16a48560175a1df4b75eddb52a9c7408efbf3eb4b0585b1445
@@ -65,4 +66,5 @@ EBUILD netbeans-ergonomics-9999_p20151208.ebuild 2913 SHA256 a37a47c51effa8d5427
 EBUILD netbeans-ergonomics-9999_p20151209.ebuild 2913 SHA256 1ff83b56a86b49d0a2cb33935e257dc29bac915b3587dacb6d8761c741a50573 SHA512 b6b33a0118281c3cc98949cb386bd011f78532c731fdee41e44f42e5c79f0ea90453dead4b7bad1b593055133d82cfbd5bd302010f6b16bc2df56004a1313beb WHIRLPOOL 5d1cd2b5f6ded4aca1cb9f7b68dfb0169360bec4ce8fce98a06a03aa5a49efea311ea3439572f0973435cf0f898711093da491ffd2ea7fc04d4555c43c1b6b81
 EBUILD netbeans-ergonomics-9999_p20151210.ebuild 2913 SHA256 3bf3897785ff616118f00335c4395c09702720aa8546d99b2dd3354f67f9638b SHA512 27dd9b273874fcdea2af175cfe410fe20a0501643d79fa866b841ef97db97e431a7b289dc81e5907476239ff4ff68bb98ff5da55d5abb176c922b423cea2798e WHIRLPOOL c6aa2cc7156d41de1b093cfc0ecc586aa4f199ff7475351dfb9d8100ac1597c54e56b42c4990fd6ed9aac3167a82ccdbb41f6e2ce829260f70a04a9545ee5878
 EBUILD netbeans-ergonomics-9999_p20151211.ebuild 2913 SHA256 5bc02a2683287023f58ec59a82585d8fd53daddf1812d6374a87611a38ccbfc7 SHA512 ebb3820d8490efcb3f87ce459e81d76ee00a4e062791e7d8588c6f090d2f2f2811a20c77dc7c34846d76c0dc234f2a3e4ca3821ed88a1c1094e911bb644660e4 WHIRLPOOL a9fd5903608b40a06ae80e6900b53e16ed03b14e67df0d5b23fb7af19fd9f2ed4a4b28682be100d7ca7cafb06f657bd441a885327ef309c9d0e54a96c798c573
+EBUILD netbeans-ergonomics-9999_p20151213.ebuild 2913 SHA256 b5221a8afc782d1a6d371181b6551b3a00ae2d693865531f182cb947625ac058 SHA512 9ea30d711ab33dd5a6c0e8be6702c03ef4cc846793b96595596a41696a1f8863a89bcd46a9339f66327182e46feef22f898a5e084ff8b89385b166a633f4de9b WHIRLPOOL e5674fc668a36edea1f0617ec02ca5d8eb2a42ef46041b46b80982ca4bbb7b3525ff203d6416a6cf9aac648fb85c9aa4cc5bf5ff72dccc8a1756277645df9d7e
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20151213.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20151213.ebuild
new file mode 100644
index 0000000..6942cd3
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20151213.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 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/2015-12-13_00-02-04/zip/netbeans-trunk-nightly-201512130002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-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 1fc5e04..718bd0e 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd231
 DIST netbeans-trunk-nightly-201512090002-src.zip 209228578 SHA256 dedd023e1e8fe3ad332bf923abf62814f76a02e484733b724d16754f3da958a1 SHA512 c7aa770074a8f4f4fa13190a4facf829d2dc6de5a3c8045ba79e9f5689332b506ff1330470dea33b38b1b7cb9e17361eff71d2b221f0fc906bdb8cd918ff2e8b WHIRLPOOL 96be2ab1293f0ab957b7da2c3266f2b4d77ec7b724a9c1c40045f512ad7ec9c99919d29643aaf1ecd8a7667321d0468eebb71f3219e117d214da618ca105dedb
 DIST netbeans-trunk-nightly-201512100002-src.zip 209233507 SHA256 2fb62cd1de0008f085b2559062e0ee25bffa593694042ab198c5c7aaf3f2c6f3 SHA512 75ae18ae344585faf93b2532e4aa16787b6e69d7a2a7402af3cb80a3585d1ae8e80efa981713e314c0c6c51c1d6a81d4bd5a91a1ca0ef1aaa17862bbdf84ce74 WHIRLPOOL 2d6cb6235ddf4a7a8c2157b517c4ae26cd50d272923d26f040e9bc5f4f664d91aa0b7815df40c75e812f6aa7c3c05289e538e20a5b0ce593b7e0736c9bd40e93
 DIST netbeans-trunk-nightly-201512110002-src.zip 209266196 SHA256 fa400d1944c8710ac2c26b9d63660e83b596b7fbe71d99c028871676a6ae2777 SHA512 ecd22150fb26c940240a9183f27d9a850850ddaadaf0646941f919fcfe9344734eb1883ec91027c909b88ab3efbe48e426fe99b4a404e0d803162d833ad9e41d WHIRLPOOL 9fc37da17f6e1d8727be1ed41513cd50c70991c75f404b665bf3d2c5bcc28afef5ff71ae09b0e77ee00663aadaca1f42841ef214a4e33926d50fa927de52c6eb
+DIST netbeans-trunk-nightly-201512130002-src.zip 209278259 SHA256 94c60bfa105a3f5f8a5227f79bae5e4795668b49443e66a164dd86b3d74ce84c SHA512 0b6cd638150f3bde87c9d6ce1c5b1c59b4330392ac76661cb20167305536ed3eb94307a2a3feaa7e5a727008a565723117bc78d9fb22a60565d99060a8da9600 WHIRLPOOL 98d0dde6bb37df4cff8269796caaa7c2066e91e4651b6aeeb6dd5bd7a5047420e89e257e581d316e705b39d6a5b5ed6371b8b9c84f8240cae1217a4d5e7adb58
 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_p20151108.ebuild 3377 SHA256 57f3d4ef3c78aaade90dc6334c76d57b06687724fcdde19cae2e6c75a87abd82 SHA512 5e376105cd6c60454a7d050a3baec5bd5c678c40a35a86ea6bddbd06e0d0b4017be007a76ec3a2328a92364e96c7a47887afd88af7e88f576eae67f1244a1098 WHIRLPOOL 5c9dfb045cda8c08e028021e902b81fa8a5cd6691b0f0a9ee5a18303b041fcc333572400b975a9315817bff4c3eb96d7cbb5c72cbc140c79960e99a864335c36
@@ -67,4 +68,5 @@ EBUILD netbeans-extide-9999_p20151208.ebuild 3377 SHA256 b0011a68d558f7eacc310f8
 EBUILD netbeans-extide-9999_p20151209.ebuild 3377 SHA256 0a7bb82f7fc3e9fffb249dee9e7ce60a1f87df86eb94da956562b808b3759d0d SHA512 1878a9cdab10754f58b2d6c50909fa0bc2d4025a400b4d59d0e1c10f59b243e60db73c77a8973eaa748a092ad49193e8621e8c8fc14300d18d6e94ef095aa0b7 WHIRLPOOL d6180ead44195d9c273bffa0afce5774de1dd2683b5af4ca566abd62f64050ca6faedecbc9892ffd4481a8129984767899b0d6c00069466ab025dcdb60b6663d
 EBUILD netbeans-extide-9999_p20151210.ebuild 3377 SHA256 3680c898cbf7197035ab84632647c7c7c9e285f2ae94ecf9eebab0c9d97995eb SHA512 6d6ac31e44332c400329ab9daf67cca2bc9a17cba5b338f6b3bb406c744697778f68446cda04d34fb47d7e2cc0ff2e4fd2148b98baeab9c5c40d98eefc5ef39f WHIRLPOOL e1a9326e8a46bdf24f93c401652d886d93b8e1ec6c567b4543b61a7e6e4c5131d8e38cc1cfa472f2169fd350175b2ec50b60a6078bc8d58572ddcb8b511ee621
 EBUILD netbeans-extide-9999_p20151211.ebuild 3377 SHA256 cbdf2a6020a4f9c265df57e16bef23df2df8961fa62a587b1f16547d1b81b5bb SHA512 fee445a18f59c82c969edd61e3fa2023a8aa3149844dbc9cef1cc7a22618ca2175031467cc93aeef32cf729df9b00a5856521a4324d266135caa2df15bf2b943 WHIRLPOOL c84e5d1c95b247c695e24a00495f4c22f321d1cc749c6764c4bbd3a39823c5d898b8d3a2a246a5cf358d7d5efc3e2a47d0f72dd79171b3b2d0ad734605afcc1e
+EBUILD netbeans-extide-9999_p20151213.ebuild 3377 SHA256 a82760352094eb91f9db8c1f2f481b2e38cd545ae8017d203a7642713ff09ac7 SHA512 6587f7b30332c50641ceba2314d991c481b9b5ea996e1d9d82156f80da9a502924ffd4d5c5a8cc48300ef0f5b695135bab221c9b0a6a445f28fd4855783f92a6 WHIRLPOOL c6abaa52a9569c79e76b7b7a681da4bcef5999dae73d4113a84dc3a597a4d5848810e82355b6165442a80e57d4356faec27bb67546efb3343cd2eab39a82d5e9
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20151213.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20151213.ebuild
new file mode 100644
index 0000000..111f132
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20151213.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2015 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/2015-12-13_00-02-04/zip/netbeans-trunk-nightly-201512130002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip
+	http://hg.netbeans.org/binaries/95CCE237B1E9390FBED0440B601822813DB220E6-ant-misc-1.9.4.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	dev-java/javahelp:0
+	${CDEPEND}"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.extide -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip o.apache.tools.ant.module/external/ant-libs-1.9.4.zip || die
+	ln -s "${DISTDIR}"/95CCE237B1E9390FBED0440B601822813DB220E6-ant-misc-1.9.4.zip o.apache.tools.ant.module/external/ant-misc-1.9.4.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-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 06f786f..a1e15a8 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd231
 DIST netbeans-trunk-nightly-201512090002-src.zip 209228578 SHA256 dedd023e1e8fe3ad332bf923abf62814f76a02e484733b724d16754f3da958a1 SHA512 c7aa770074a8f4f4fa13190a4facf829d2dc6de5a3c8045ba79e9f5689332b506ff1330470dea33b38b1b7cb9e17361eff71d2b221f0fc906bdb8cd918ff2e8b WHIRLPOOL 96be2ab1293f0ab957b7da2c3266f2b4d77ec7b724a9c1c40045f512ad7ec9c99919d29643aaf1ecd8a7667321d0468eebb71f3219e117d214da618ca105dedb
 DIST netbeans-trunk-nightly-201512100002-src.zip 209233507 SHA256 2fb62cd1de0008f085b2559062e0ee25bffa593694042ab198c5c7aaf3f2c6f3 SHA512 75ae18ae344585faf93b2532e4aa16787b6e69d7a2a7402af3cb80a3585d1ae8e80efa981713e314c0c6c51c1d6a81d4bd5a91a1ca0ef1aaa17862bbdf84ce74 WHIRLPOOL 2d6cb6235ddf4a7a8c2157b517c4ae26cd50d272923d26f040e9bc5f4f664d91aa0b7815df40c75e812f6aa7c3c05289e538e20a5b0ce593b7e0736c9bd40e93
 DIST netbeans-trunk-nightly-201512110002-src.zip 209266196 SHA256 fa400d1944c8710ac2c26b9d63660e83b596b7fbe71d99c028871676a6ae2777 SHA512 ecd22150fb26c940240a9183f27d9a850850ddaadaf0646941f919fcfe9344734eb1883ec91027c909b88ab3efbe48e426fe99b4a404e0d803162d833ad9e41d WHIRLPOOL 9fc37da17f6e1d8727be1ed41513cd50c70991c75f404b665bf3d2c5bcc28afef5ff71ae09b0e77ee00663aadaca1f42841ef214a4e33926d50fa927de52c6eb
+DIST netbeans-trunk-nightly-201512130002-src.zip 209278259 SHA256 94c60bfa105a3f5f8a5227f79bae5e4795668b49443e66a164dd86b3d74ce84c SHA512 0b6cd638150f3bde87c9d6ce1c5b1c59b4330392ac76661cb20167305536ed3eb94307a2a3feaa7e5a727008a565723117bc78d9fb22a60565d99060a8da9600 WHIRLPOOL 98d0dde6bb37df4cff8269796caaa7c2066e91e4651b6aeeb6dd5bd7a5047420e89e257e581d316e705b39d6a5b5ed6371b8b9c84f8240cae1217a4d5e7adb58
 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_p20151108.ebuild 3416 SHA256 4fb424b882a2f6118f564ba5bf21e4bf829478ba8930a4f41961f1e9ec14a453 SHA512 12493704fdb0ca9796baa44ce91185d67e329c76272e9c2058b6b4199182492b6480d1d5ee07c0cd87ee4908ec3d31055eba8fae527af1b8535f70ac6d9e4aeb WHIRLPOOL 4161bc28cd287ba360c833ff380d6ca48a4c51311c429d6a4a17a88ad4ec77344a5a9314ed6b7dc96e9c7aba8987da0012e740c68226fd5ef4a826138b672231
@@ -66,4 +67,5 @@ EBUILD netbeans-groovy-9999_p20151208.ebuild 3416 SHA256 bb48440d3492a350625be02
 EBUILD netbeans-groovy-9999_p20151209.ebuild 3416 SHA256 0e308947517cee94d4cf470c015464c5ee7f5d26851729eda68b6d4060c5da5f SHA512 dac269f8d9ef64bd54139d25caa53275c84ed2d89745188a48115e039adc879cbb3966852e32cbdb0b6e2fff5e9f489d405612093514a85f1618973b82d2a0f3 WHIRLPOOL 7cb5c07aceee2d21fbae897ac26b6480f1690d4f3aeb7b0aa2a37a14753dfa70c88c54b471b7a5228a11a47357f0ef527fc2c25f15625a6151f3df1d7a5ec3b1
 EBUILD netbeans-groovy-9999_p20151210.ebuild 3416 SHA256 158475683162d3dfb9a591a20e4f435368f2cea224a72c16c1f9d47fdc639dab SHA512 54773b5f8f2e8dfb9b4de279b1d6e34e34f361e6d7636fda98b93a1e8b0e1653bd044c802a00018ee2ab2b62eb2aa715501addf82f344e0e0d192b16d5e16529 WHIRLPOOL d172d61ec1c5e1ac59324e072622113fe832a156850c359b41313fb623d6b9096ee94260302eb7821a06530c51e45e0e142cc75b99d963e91ef548621382ee1f
 EBUILD netbeans-groovy-9999_p20151211.ebuild 3416 SHA256 9a848afb3c50e8c4ed531f2f047ac85a4a0b227a1a95a050289e3eb115818083 SHA512 b0aad6e2b8cbe4f4191e687487db668624ff3c9e48d81d033b5f0aeb14ae6ed84e12aaea0a923cf5e1b15195265ad48c2bf078dc0f079fd27ea93cff7cb700b8 WHIRLPOOL 4443602275f375547911a7bd9c25d3e3dff7b32dc1bc1dc0eb00cf0b4cba66f80be28539a78c13953259da6bf27151c0265782ae8018770dea73862a4252ab4b
+EBUILD netbeans-groovy-9999_p20151213.ebuild 3416 SHA256 66f76a69747aec3e7a437ea627490daae1a67320c32e78b14698f286369b661b SHA512 6bd15b282dd220b55af16c74325d5ff05954e5534260a0b912bd73378d0c4ba1d208e3d6804ede15bd7490fff244c62f352c8c6b45dddfafb2de42c0edace75c WHIRLPOOL 7f1e559586df7054f42844b21c9799697ce75de202ed70988eac7cb46dd37555c5c3d7b4d8d61741b0c10c1c8ac22b2d668c99608b02390b792f5ef38a6b9be2
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20151213.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20151213.ebuild
new file mode 100644
index 0000000..ba0730d
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20151213.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 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/2015-12-13_00-02-04/zip/netbeans-trunk-nightly-201512130002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/C136AE67C3C40740AE986582BAF65BA5C5CE69A0-groovy-all-2.1.7.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-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/C136AE67C3C40740AE986582BAF65BA5C5CE69A0-groovy-all-2.1.7.jar libs.groovy/external/groovy-all-2.1.7.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-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 5604ce9..ab0630d 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd231
 DIST netbeans-trunk-nightly-201512090002-src.zip 209228578 SHA256 dedd023e1e8fe3ad332bf923abf62814f76a02e484733b724d16754f3da958a1 SHA512 c7aa770074a8f4f4fa13190a4facf829d2dc6de5a3c8045ba79e9f5689332b506ff1330470dea33b38b1b7cb9e17361eff71d2b221f0fc906bdb8cd918ff2e8b WHIRLPOOL 96be2ab1293f0ab957b7da2c3266f2b4d77ec7b724a9c1c40045f512ad7ec9c99919d29643aaf1ecd8a7667321d0468eebb71f3219e117d214da618ca105dedb
 DIST netbeans-trunk-nightly-201512100002-src.zip 209233507 SHA256 2fb62cd1de0008f085b2559062e0ee25bffa593694042ab198c5c7aaf3f2c6f3 SHA512 75ae18ae344585faf93b2532e4aa16787b6e69d7a2a7402af3cb80a3585d1ae8e80efa981713e314c0c6c51c1d6a81d4bd5a91a1ca0ef1aaa17862bbdf84ce74 WHIRLPOOL 2d6cb6235ddf4a7a8c2157b517c4ae26cd50d272923d26f040e9bc5f4f664d91aa0b7815df40c75e812f6aa7c3c05289e538e20a5b0ce593b7e0736c9bd40e93
 DIST netbeans-trunk-nightly-201512110002-src.zip 209266196 SHA256 fa400d1944c8710ac2c26b9d63660e83b596b7fbe71d99c028871676a6ae2777 SHA512 ecd22150fb26c940240a9183f27d9a850850ddaadaf0646941f919fcfe9344734eb1883ec91027c909b88ab3efbe48e426fe99b4a404e0d803162d833ad9e41d WHIRLPOOL 9fc37da17f6e1d8727be1ed41513cd50c70991c75f404b665bf3d2c5bcc28afef5ff71ae09b0e77ee00663aadaca1f42841ef214a4e33926d50fa927de52c6eb
+DIST netbeans-trunk-nightly-201512130002-src.zip 209278259 SHA256 94c60bfa105a3f5f8a5227f79bae5e4795668b49443e66a164dd86b3d74ce84c SHA512 0b6cd638150f3bde87c9d6ce1c5b1c59b4330392ac76661cb20167305536ed3eb94307a2a3feaa7e5a727008a565723117bc78d9fb22a60565d99060a8da9600 WHIRLPOOL 98d0dde6bb37df4cff8269796caaa7c2066e91e4651b6aeeb6dd5bd7a5047420e89e257e581d316e705b39d6a5b5ed6371b8b9c84f8240cae1217a4d5e7adb58
 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_p20151108.ebuild 4125 SHA256 8b77c860ea2cf5b42d2d9d1675f84259a5a7390f4e6e47521f905dc3b8219c87 SHA512 dc9395156d0bede6bbdf3a887f359fb37d61a00264d0be866fb562099b3fc204fc8f9b353ab57a46bf277f08f0a2ce90b794bf76a231e96c92293296a22599f8 WHIRLPOOL 54dca30ce0e248b5c14dcdbd7912a60f82693ab1a23ccb8703b2a88c7670d636cb1b274bc734131bc1c006a620de8f0f4a6765ddbadbbfbf458a14b2c7bacdb7
@@ -70,4 +71,5 @@ EBUILD netbeans-harness-9999_p20151208.ebuild 4125 SHA256 3a05e0258ab5a4fb99f09a
 EBUILD netbeans-harness-9999_p20151209.ebuild 4125 SHA256 e05d07c3bbff98572ad218ded02752944c7de422b9330186541319a743812d99 SHA512 cfa090426a8ae44a90ea8eb532748a93c30dc9ab49ad751dfd14ed2efea5b60a6ac3d0d3328aa33861d5a994ef552bad88aec4f8a2c3c5f1b994a05d4b78f34a WHIRLPOOL 17343468f68d665db81581343bd57b44c64c0f9b4112014312a8942d3bec96b5284f28a30641b1266a376a6a76ec11f9569e5d87b191cb4a1152ed1b0effcb1f
 EBUILD netbeans-harness-9999_p20151210.ebuild 4125 SHA256 2103a4ac66ecad2d675ff0cf9e2c6f85a491d790f7743b9cbd4da9658f143d29 SHA512 2d476e53d5eb5c8336493cb2ecee08f9af0ab277abcb1a75a903b867689a91837ebdfe88bb6d717beb0d5e1df3b5531c22a334bbc492e52b7a5f7cc41d5934f2 WHIRLPOOL dca4c7caafb96af3d025c06f33b9731e9c77da457e73495698f8f9153534e915f8ab63122e4d79c73b676ecc4bc8a82df94485a5e604e89cfe979477f36d7d86
 EBUILD netbeans-harness-9999_p20151211.ebuild 4125 SHA256 94ec5a23a2d3579d0bae626ec054a50741f761894c5ddbee48be23498af90ea7 SHA512 07a8d1748bf5a9e066766fdf2dedf2235d073d88a98901e17a525599baca1266a0fc17fdabdef8323c51eb834847b0bfca7cb1fb4c671ab095b57717d1466f57 WHIRLPOOL 9b980a3756adccbe3a3504f9778b167092adf75eb16a86c39e61b5c2b3dd356d460a58d0a4054754977bd2afa1287a755f1df516a80d290615963da29e49937c
+EBUILD netbeans-harness-9999_p20151213.ebuild 4125 SHA256 fb326b252eabb03a590e766ad105f4ade19436001dda681910a98b966422eed6 SHA512 2b167091930daecdd0ffadfee18c4da62e1fed837c6a2e7621222ea42c4233ff6823b296587998831dc939a55b505fb162f9b71c5f6b250883ce8d913f7c746e WHIRLPOOL 4089fd230392625026e42c1461045ac14bfcf2e025dad9fe838ca2682809edd1f0ea28781cdd1344ccaabfc79efffa3c2f0e548b97cd185a719a5e865052ea69
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20151213.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20151213.ebuild
new file mode 100644
index 0000000..1e60b58
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20151213.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2015 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/2015-12-13_00-02-04/zip/netbeans-trunk-nightly-201512130002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-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-r14-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=${INSTALL_DIR}/antlib
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsearch-2.0_05.jar && dosym /usr/share/javahelp/lib/jsearch.jar ${instdir}/jsearch-2.0_05.jar || die
+	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 622dbae..52bf138 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -164,6 +164,7 @@ DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd231
 DIST netbeans-trunk-nightly-201512090002-src.zip 209228578 SHA256 dedd023e1e8fe3ad332bf923abf62814f76a02e484733b724d16754f3da958a1 SHA512 c7aa770074a8f4f4fa13190a4facf829d2dc6de5a3c8045ba79e9f5689332b506ff1330470dea33b38b1b7cb9e17361eff71d2b221f0fc906bdb8cd918ff2e8b WHIRLPOOL 96be2ab1293f0ab957b7da2c3266f2b4d77ec7b724a9c1c40045f512ad7ec9c99919d29643aaf1ecd8a7667321d0468eebb71f3219e117d214da618ca105dedb
 DIST netbeans-trunk-nightly-201512100002-src.zip 209233507 SHA256 2fb62cd1de0008f085b2559062e0ee25bffa593694042ab198c5c7aaf3f2c6f3 SHA512 75ae18ae344585faf93b2532e4aa16787b6e69d7a2a7402af3cb80a3585d1ae8e80efa981713e314c0c6c51c1d6a81d4bd5a91a1ca0ef1aaa17862bbdf84ce74 WHIRLPOOL 2d6cb6235ddf4a7a8c2157b517c4ae26cd50d272923d26f040e9bc5f4f664d91aa0b7815df40c75e812f6aa7c3c05289e538e20a5b0ce593b7e0736c9bd40e93
 DIST netbeans-trunk-nightly-201512110002-src.zip 209266196 SHA256 fa400d1944c8710ac2c26b9d63660e83b596b7fbe71d99c028871676a6ae2777 SHA512 ecd22150fb26c940240a9183f27d9a850850ddaadaf0646941f919fcfe9344734eb1883ec91027c909b88ab3efbe48e426fe99b4a404e0d803162d833ad9e41d WHIRLPOOL 9fc37da17f6e1d8727be1ed41513cd50c70991c75f404b665bf3d2c5bcc28afef5ff71ae09b0e77ee00663aadaca1f42841ef214a4e33926d50fa927de52c6eb
+DIST netbeans-trunk-nightly-201512130002-src.zip 209278259 SHA256 94c60bfa105a3f5f8a5227f79bae5e4795668b49443e66a164dd86b3d74ce84c SHA512 0b6cd638150f3bde87c9d6ce1c5b1c59b4330392ac76661cb20167305536ed3eb94307a2a3feaa7e5a727008a565723117bc78d9fb22a60565d99060a8da9600 WHIRLPOOL 98d0dde6bb37df4cff8269796caaa7c2066e91e4651b6aeeb6dd5bd7a5047420e89e257e581d316e705b39d6a5b5ed6371b8b9c84f8240cae1217a4d5e7adb58
 EBUILD netbeans-ide-8.0.2.ebuild 29317 SHA256 42218788ab0fc7c7cd1bb42a8b0c72a66543a3260b752aa55365833c355bcc63 SHA512 c712b66b6bee654390a45e5c616479df2be624bb770f3838d4fcce875f71a8d165703dffd55c4fd7d30e19c392784203e5fe01e2404907d88c935d439efaf578 WHIRLPOOL 67763e4a36215ac002fd321556ce2269affc15ba48ad5069d7ccc746d918179994f174e09305a9d9ddadddbea690778c2769e0ea1993eafc09e01580485e2292
 EBUILD netbeans-ide-8.1.ebuild 30288 SHA256 783332022c33a787ededc22d5250e30e1a91676508076fddc69ec64bbe5a6e7c SHA512 402d72f8b1a4e849dfe86054d466afeb0ab3987cd5ee747d3173874cd875fe3572be9e3ccd639fadf9e329db92e7543fd68dffc497805aa4d40b1d008c4a79ad WHIRLPOOL fd2cd798a1763af3fae44bb0eef0a4c4d932ffead6427e27d3483639348d969598b9c81d8949a3950ace1e68d3dfa0e08fe0c787b201b0cc9a95ea0040d156bf
 EBUILD netbeans-ide-9999_p20151108.ebuild 30334 SHA256 24b9aebad086fa6e37302b8aa33842151196196ab6d801703b132296c1d864fd SHA512 789d1a0670231d3fb0c9bc77621c6ae36d5b79a78909a56b5f1b9f202c90b4726c754a58b07a039910de6ed789b14a064e3bfb1b44293111dd52af070361bd3f WHIRLPOOL d26f9aea87810f2bac16c3c2ee4442bb79823b428e750d7e6404e63c839097fbd5ccfac48732f9fb35bc32f1b1e5fb3ef9a751afe63ca3747da02bb47bc7f4bc
@@ -196,4 +197,5 @@ EBUILD netbeans-ide-9999_p20151208.ebuild 30890 SHA256 b9afda72df571a38f28518313
 EBUILD netbeans-ide-9999_p20151209.ebuild 30890 SHA256 4f4ea0a40dc095bf0aac7b472bce1442dfceb365f380dd5f8df800651152ab80 SHA512 8cee4736cc52f2fdc31a1e8fde06e31b3db02456ceb503666c6029e6292b4c223a36ffd76c82deb1980181890df33df18ec81dae0ec62f89e881e8b145b4cb6a WHIRLPOOL 052463f32b4f857500780fbb244cb1aef17aec914ba1c272af267d6d9b88693a67eabce123f97b93a74183228ce68c1de7b7bc8f88d721b4be2fa4830ece31c5
 EBUILD netbeans-ide-9999_p20151210.ebuild 30890 SHA256 168a0aed6caf6df09d0731505276a24e5e2acc0fca7696ad650946f51ab8481c SHA512 4e8a19ff0877afb50e43eb8805531af77a50e7e78fd7eb0e0fce0c9e17e147c92d0fa6f6e41b682980759b70071727f6423d8e0576595a553b09a1c25d0e8516 WHIRLPOOL 474aded7d5ddce8c30af7ec64a3b033a669ed7be49118b65855f6a3c1de1621d0d36950c878603aa569748009a482a9aa3bdb36457b910b92b048f4436c25229
 EBUILD netbeans-ide-9999_p20151211.ebuild 30890 SHA256 c749f0fbd1dd8df6af7137355e266426d7b3c6bb8b70ab569ab47356576e802c SHA512 86d5d4053ad4e8652736d28199087d0a79a5c35695f178477baeabaf221d43486b2b6920a5cb03053abd52acea9c189f59b71a79948733ddd1eddb01da89ba1d WHIRLPOOL 535c45044cb4c6bb1feea0736427baba8abd8639be4ed4cc9b87fe51e3cf6d7a8662ef3fc7cd348ceaf08266a38c8f50a418b313ae56747c279430dbf3efed4a
+EBUILD netbeans-ide-9999_p20151213.ebuild 30890 SHA256 498a64a4db3e843bb2b820241672808c5978f27ac8422c0d3868739048c56f33 SHA512 479f1da58d720a74b33ce1a07e61ae8f98cda139f119831b8a3dc933740e410b4ff70c0109c5833c46e2134717915d0eaca95e55beb63eb6ed118919ee76c075 WHIRLPOOL 25a32c29d01dfdb7ef43bae32c0fbfc3121c5fdb338c41183b7aac79473da7d0d347e1e6a59c14d9138b0d5da128750cee77920c55980e79bb3c082065619f13
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20151213.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20151213.ebuild
new file mode 100644
index 0000000..9534b90
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20151213.ebuild
@@ -0,0 +1,384 @@
+# Copyright 1999-2015 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/2015-12-13_00-02-04/zip/netbeans-trunk-nightly-201512130002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
+	http://hg.netbeans.org/binaries/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar
+	http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
+	http://hg.netbeans.org/binaries/ACAB7C860DF78C4A528FD8A64F2C62A0A96639E5-com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar
+	http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar
+	http://hg.netbeans.org/binaries/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar
+	http://hg.netbeans.org/binaries/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar
+	http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip
+	http://hg.netbeans.org/binaries/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip
+	http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip
+	http://hg.netbeans.org/binaries/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip
+	http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar
+	http://hg.netbeans.org/binaries/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar
+	http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
+	http://hg.netbeans.org/binaries/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar
+	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/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar
+	http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar
+	http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip
+	http://hg.netbeans.org/binaries/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar
+	http://hg.netbeans.org/binaries/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar
+	http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip
+	http://hg.netbeans.org/binaries/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar
+	http://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar
+	http://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar
+	http://hg.netbeans.org/binaries/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar
+	http://hg.netbeans.org/binaries/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar
+	http://hg.netbeans.org/binaries/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-js-corestubs.zip
+	http://hg.netbeans.org/binaries/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip
+	http://hg.netbeans.org/binaries/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip
+	http://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar
+	http://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar
+	http://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar
+	http://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar
+	http://hg.netbeans.org/binaries/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar
+	http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
+	http://hg.netbeans.org/binaries/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar
+	http://hg.netbeans.org/binaries/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.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/3A7012C03E61CAF9539DAD8326659EB4CE3EA436-org.eclipse.mylyn.wikitext.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/8307A44D3F150F1BB317532097A0C7D125C00F2D-org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar
+	http://hg.netbeans.org/binaries/6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar
+	http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar
+	http://hg.netbeans.org/binaries/D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar
+	http://hg.netbeans.org/binaries/2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar
+	http://hg.netbeans.org/binaries/5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar
+	http://hg.netbeans.org/binaries/24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.jar
+	http://hg.netbeans.org/binaries/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar
+	http://hg.netbeans.org/binaries/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar
+	http://hg.netbeans.org/binaries/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar
+	http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar
+	http://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar
+	http://hg.netbeans.org/binaries/6FC6098C230D7CBA5730106D379CBBB42F6EC48A-validator.jar
+	http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar
+	http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar
+	http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar
+	http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-platform-${PV}
+	dev-java/commons-compress:0
+	dev-java/commons-httpclient:3
+	dev-java/commons-logging:0
+	dev-java/icu4j:4.4
+	dev-java/iso-relax:0
+	dev-java/jdbc-mysql:0
+	dev-java/jdbc-postgresql:0
+	>=dev-java/jsch-0.1.46:0
+	>=dev-java/json-simple-1.1:0
+	dev-java/jsr173:0
+	dev-java/jvyamlb:0
+	dev-java/log4j:0
+	dev-java/lucene:3.5
+	dev-java/rhino:1.6
+	dev-java/saxon:9
+	dev-java/smack:2.2
+	dev-java/sun-jaf:0
+	dev-java/tomcat-servlet-api:2.2
+	dev-java/ws-commons-util:0
+	dev-java/xerces:2"
+#	dev-vcs/subversion>=1.8.4:0[java] missing from the tree
+#	app-text/jing:0 our version is probably too old
+#	dev-java/commons-io:1 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/commons-lang:2.1 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/freemarker:2.3
+#	dev-java/guava:15 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/ini4j:0 our version is too old
+#	dev-java/jaxb:2 upstream version contains more stuff so websvccommon does not compile with ours
+#	dev-java/jzlib:0 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/trilead-ssh2:0 in overlay
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	dev-java/commons-codec:0
+	${CDEPEND}
+	dev-java/javacc:0
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ide -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+JAVA_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
+	ln -s "${DISTDIR}"/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar libs.nashorn/external/asm-all-4.0.jar || die
+	ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die
+	ln -s "${DISTDIR}"/ACAB7C860DF78C4A528FD8A64F2C62A0A96639E5-com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar || die
+	ln -s "${DISTDIR}"/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar o.apache.commons.io/external/commons-io-1.4.jar || die
+	ln -s "${DISTDIR}"/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar o.apache.commons.lang/external/commons-lang-2.6.jar || die
+	ln -s "${DISTDIR}"/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar libs.commons_net/external/commons-net-3.3.jar || die
+	ln -s "${DISTDIR}"/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip css.editor/external/css21-spec.zip || die
+	ln -s "${DISTDIR}"/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip css.editor/external/css3-spec.zip || die
+	ln -s "${DISTDIR}"/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip derby/external/derbysampledb.zip || die
+	ln -s "${DISTDIR}"/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip dlight.nativeexecution/external/exechlp-1.0.zip || die
+	ln -s "${DISTDIR}"/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar libs.freemarker/external/freemarker-2.3.19.jar || die
+	ln -s "${DISTDIR}"/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar c.google.guava/external/guava-15.0.jar || die
+	ln -s "${DISTDIR}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || die
+	ln -s "${DISTDIR}"/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar html.validation/external/html5-datatypes.jar || 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}"/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar html.validation/external/io-xml-util.jar || die
+	ln -s "${DISTDIR}"/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar html.validation/external/iri.jar || die
+	ln -s "${DISTDIR}"/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip spellchecker.dictionary_en/external/ispell-enwl-3.1.20.zip || die
+	ln -s "${DISTDIR}"/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar c.googlecode.javaewah.JavaEWAH/external/JavaEWAH-0.7.9.jar || die
+	ln -s "${DISTDIR}"/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar xml.jaxb.api/external/jaxb-api.jar || die
+	ln -s "${DISTDIR}"/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip libs.jaxb/external/jaxb-api-doc.zip || die
+	ln -s "${DISTDIR}"/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar libs.jaxb/external/jaxb-impl.jar || die
+	ln -s "${DISTDIR}"/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar libs.jaxb/external/jaxb-xjc.jar || die
+	ln -s "${DISTDIR}"/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar libs.jaxb/external/jaxb1-impl.jar || die
+	ln -s "${DISTDIR}"/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar libs.javafx/external/jfxrt.jar || die
+	ln -s "${DISTDIR}"/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar html.validation/external/jing.jar || die
+	ln -s "${DISTDIR}"/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-js-corestubs.zip javascript2.editor/external/js-corestubs.zip || die
+	ln -s "${DISTDIR}"/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip javascript2.editor/external/js-domstubs.zip || die
+	ln -s "${DISTDIR}"/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip javascript2.editor/external/js-reststubs.zip || die
+	ln -s "${DISTDIR}"/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.core-0.0.7.jar || die
+	ln -s "${DISTDIR}"/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.sshagent-0.0.7.jar || die
+	ln -s "${DISTDIR}"/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.pageant-0.0.7.jar || die
+	ln -s "${DISTDIR}"/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.usocket-jna-0.0.7.jar || die
+	ln -s "${DISTDIR}"/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar c.jcraft.jzlib/external/jzlib-1.0.7.jar || die
+	ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.process/external/libpam4j-1.1.jar || die
+	ln -s "${DISTDIR}"/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar libs.nashorn/external/nashorn-02f810c26ff9-patched.jar || die
+	ln -s "${DISTDIR}"/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar html.validation/external/non-schema.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}"/3A7012C03E61CAF9539DAD8326659EB4CE3EA436-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.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}"/8307A44D3F150F1BB317532097A0C7D125C00F2D-org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar || die
+	ln -s "${DISTDIR}"/6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar extexecution.process/external/processtreekiller-1.0.7.jar || die
+	ln -s "${DISTDIR}"/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar libs.svnClientAdapter.svnkit/external/svnkit_1.7.8.r9538_v20130107_2001.jar || die
+	ln -s "${DISTDIR}"/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar o.apache.xml.resolver/external/resolver-1.2.jar || die
+	ln -s "${DISTDIR}"/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar libs.svnClientAdapter.svnkit/external/sqljet-1.1.10.jar || die
+	ln -s "${DISTDIR}"/D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-javahl-1.10.3.jar || die
+	ln -s "${DISTDIR}"/2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.10.3.jar || die
+	ln -s "${DISTDIR}"/5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.10.3.jar || die
+	ln -s "${DISTDIR}"/24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.jar libs.svnClientAdapter.javahl/external/svnjavahl-1.8.4.jar || die
+	ln -s "${DISTDIR}"/3B91269E9055504778F57744D24F505856698602-svnkit-1.7.0-beta4-20120316.233307-1.jar libs.svnClientAdapter.svnkit/external/svnkit-1.7.0-beta4-20120316.233307-1.jar || die
+	ln -s "${DISTDIR}"/015525209A02BD74254930FF844C7C13498B7FB9-svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar libs.svnClientAdapter.svnkit/external/svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar || die
+	ln -s "${DISTDIR}"/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar libs.swingx/external/swingx-all-1.6.4.jar || die
+	ln -s "${DISTDIR}"/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar httpserver/external/tomcat-webserver-3.2.jar || die
+	ln -s "${DISTDIR}"/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar swing.validation/external/ValidationAPI.jar || die
+	ln -s "${DISTDIR}"/6FC6098C230D7CBA5730106D379CBBB42F6EC48A-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-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	popd >/dev/null || die
+
+	java-pkg_jar-from --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.53.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar
+	java-pkg_jar-from --build-only --into db.sql.visualeditor/external javacc javacc.jar javacc-3.2.jar
+	java-pkg_jar-from --into html.parser/external icu4j-4.4 icu4j.jar icu4j-4_4_2.jar
+	java-pkg_jar-from --into html.validation/external iso-relax isorelax.jar isorelax.jar
+	java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar
+	java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar
+	java-pkg_jar-from --into libs.commons_compress/external commons-compress commons-compress.jar commons-compress-1.8.1.jar
+	# java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.19.jar
+	java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
+	java-pkg_jar-from --into libs.lucene/external lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
+	java-pkg_jar-from --into libs.smack/external smack-2.2 smack.jar smack.jar
+	java-pkg_jar-from --into libs.smack/external smack-2.2 smackx.jar smackx.jar
+	# java-pkg_jar-from --into libs.svnClientAdapter.javahl/external subversion svn-javahl.jar svnjavahl-1.8.4.jar
+	java-pkg_jar-from --into libs.xerces/external xerces-2 xercesImpl.jar xerces-2.8.0.jar
+	java-pkg_jar-from --build-only --into o.apache.commons.codec/external commons-codec commons-codec.jar apache-commons-codec-1.3.jar
+	java-pkg_jar-from --into o.apache.commons.httpclient/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.1.jar
+	java-pkg_jar-from --into o.apache.commons.logging/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
+	java-pkg_jar-from --into o.apache.ws.commons.util/external ws-commons-util ws-commons-util.jar ws-commons-util-1.0.1.jar
+	java-pkg_jar-from --into servletapi/external tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
+	java-pkg_jar-from --into xml.jaxb.api/external sun-jaf activation.jar activation.jar
+	java-pkg_jar-from --into xml.jaxb.api/external jsr173 jsr173.jar jsr173_1.0_api.jar
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	unset DISPLAY
+	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+	pushd nbbuild/netbeans/ide >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/ide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	rm -fr "${D}"/${INSTALL_DIR}/bin/nativeexecution || die
+	rm -fr "${D}"/${INSTALL_DIR}/modules/lib || die
+
+	insinto ${INSTALL_DIR}/bin/nativeexecution
+	doins bin/nativeexecution/*
+
+	pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution >/dev/null || die
+	for file in *.sh ; do
+		fperms 755 ${file}
+	done
+	popd >/dev/null || die
+
+	if use x86 ; then
+		doins -r bin/nativeexecution/Linux-x86
+		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86 >/dev/null || die
+		for file in * ; do
+			fperms 755 ${file}
+		done
+		popd >/dev/null || die
+	elif use amd64 ; then
+		doins -r bin/nativeexecution/Linux-x86_64
+		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86_64 >/dev/null || die
+		for file in * ; do
+			fperms 755 ${file}
+		done
+		popd >/dev/null || die
+	fi
+
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm com-jcraft-jsch.jar && dosym /usr/share/jsch/lib/jsch.jar ${instdir}/com-jcraft-jsch.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-compress-1.8.1.jar && dosym /usr/share/commons-compress/lib/commons-compress.jar ${instdir}/commons-compress-1.8.1.jar || die
+	# 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 && dosym /usr/share/icu4j-4.4/lib/icu4j.jar ${instdir}/icu4j-4_4_2.jar || die
+	rm isorelax.jar && dosym /usr/share/iso-relax/lib/isorelax.jar ${instdir}/isorelax.jar || die
+	rm json-simple-1.1.1.jar && dosym /usr/share/json-simple/lib/json-simple.jar ${instdir}/json-simple-1.1.1.jar || die
+	rm jvyamlb-0.2.7.jar && dosym /usr/share/jvyamlb/lib/jvyamlb.jar ${instdir}/jvyamlb-0.2.7.jar || die
+	rm log4j-1.2.15.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.15.jar || die
+	rm lucene-core-3.5.0.jar && dosym /usr/share/lucene-3.5/lib/lucene-core.jar ${instdir}/lucene-core-3.5.0.jar || die
+	rm mysql-connector-java-5.1.23-bin.jar && dosym /usr/share/jdbc-mysql/lib/jdbc-mysql.jar ${instdir}/mysql-connector-java-5.1.23-bin.jar || die
+	rm postgresql-9.2-1002.jdbc4.jar && dosym /usr/share/jdbc-postgresql/lib/jdbc-postgresql.jar ${instdir}/postgresql-9.2-1002.jdbc4.jar || die
+	rm saxon9B.jar && dosym /usr/share/saxon-9/lib/saxon.jar ${instdir}/saxon9B.jar || die
+	rm servlet-2.2.jar && dosym /usr/share/tomcat-servlet-api-2.2/lib/servlet.jar ${instdir}/servlet-2.2.jar || die
+	rm smack.jar && dosym /usr/share/smack-2.2/lib/smack.jar ${instdir}/smack.jar || die
+	rm smackx.jar && dosym /usr/share/smack-2.2/lib/smackx.jar ${instdir}/smackx.jar || die
+	# rm svnjavahl.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl.jar || die
+	rm xerces-2.8.0.jar && dosym /usr/share/xerces-2/lib/xercesImpl.jar ${instdir}/xerces-2.8.0.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxb
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm activation.jar && dosym /usr/share/sun-jaf/lib/activation.jar ${instdir}/activation.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxb/api
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsr173_1.0_api.jar && dosym /usr/share/jsr173/lib/jsr173.jar ${instdir}/jsr173_1.0_api.jar || die
+	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 3448bfc..48a7ccd 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -68,6 +68,7 @@ DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd231
 DIST netbeans-trunk-nightly-201512090002-src.zip 209228578 SHA256 dedd023e1e8fe3ad332bf923abf62814f76a02e484733b724d16754f3da958a1 SHA512 c7aa770074a8f4f4fa13190a4facf829d2dc6de5a3c8045ba79e9f5689332b506ff1330470dea33b38b1b7cb9e17361eff71d2b221f0fc906bdb8cd918ff2e8b WHIRLPOOL 96be2ab1293f0ab957b7da2c3266f2b4d77ec7b724a9c1c40045f512ad7ec9c99919d29643aaf1ecd8a7667321d0468eebb71f3219e117d214da618ca105dedb
 DIST netbeans-trunk-nightly-201512100002-src.zip 209233507 SHA256 2fb62cd1de0008f085b2559062e0ee25bffa593694042ab198c5c7aaf3f2c6f3 SHA512 75ae18ae344585faf93b2532e4aa16787b6e69d7a2a7402af3cb80a3585d1ae8e80efa981713e314c0c6c51c1d6a81d4bd5a91a1ca0ef1aaa17862bbdf84ce74 WHIRLPOOL 2d6cb6235ddf4a7a8c2157b517c4ae26cd50d272923d26f040e9bc5f4f664d91aa0b7815df40c75e812f6aa7c3c05289e538e20a5b0ce593b7e0736c9bd40e93
 DIST netbeans-trunk-nightly-201512110002-src.zip 209266196 SHA256 fa400d1944c8710ac2c26b9d63660e83b596b7fbe71d99c028871676a6ae2777 SHA512 ecd22150fb26c940240a9183f27d9a850850ddaadaf0646941f919fcfe9344734eb1883ec91027c909b88ab3efbe48e426fe99b4a404e0d803162d833ad9e41d WHIRLPOOL 9fc37da17f6e1d8727be1ed41513cd50c70991c75f404b665bf3d2c5bcc28afef5ff71ae09b0e77ee00663aadaca1f42841ef214a4e33926d50fa927de52c6eb
+DIST netbeans-trunk-nightly-201512130002-src.zip 209278259 SHA256 94c60bfa105a3f5f8a5227f79bae5e4795668b49443e66a164dd86b3d74ce84c SHA512 0b6cd638150f3bde87c9d6ce1c5b1c59b4330392ac76661cb20167305536ed3eb94307a2a3feaa7e5a727008a565723117bc78d9fb22a60565d99060a8da9600 WHIRLPOOL 98d0dde6bb37df4cff8269796caaa7c2066e91e4651b6aeeb6dd5bd7a5047420e89e257e581d316e705b39d6a5b5ed6371b8b9c84f8240cae1217a4d5e7adb58
 EBUILD netbeans-java-8.0.2-r3.ebuild 13294 SHA256 4abac657cff75400e92b1f2b19bca696113cdc37611c8c0f49dfa8c82fec4296 SHA512 32e41d7acc3aca026993e5edc791f1314f2bfda47413538af655b0335973c4fe50d998c67f129307b164075c3e0503280b4c1729d700431644ca6610d7f0f635 WHIRLPOOL d7f99c13421d08529b54085138fcffd2959a3c3f97d94a1dbe6e726a6dbc2cded69ec0bf97e1458b56847ac121954e8f173c1adde0703fd2969defa53ac37c51
 EBUILD netbeans-java-8.0.2-r4.ebuild 13298 SHA256 d4172dfdec5afecb1cd099e18a21aa872c7822bff40b192b5f4ec4d35e6e0ef8 SHA512 48ae6f7141117fbf58123ded750d76f2e7311211a6be3b62bd491349817460da11f781ec5694da91584315547c32008f568fac3bfb406dbdb5ed7fd825ff694e WHIRLPOOL 73fb68aec003707c14b2b390c2de80f24e1e5413cf7e16cf7e661af47c908e2d559214580379e45e21d316767987ac906b5a119a61ae39f03c3d01dafad49b7c
 EBUILD netbeans-java-8.1-r1.ebuild 14775 SHA256 1bbcc19358e42931f2ebcffbc234ba4f903506bb255142f5dc8a6a3dfaac621a SHA512 9578fbd4732edfeca9d6abc6da147af8fe5bae2f740405b28bf82d403f7952a4f9302605dab07f4ad1e42b525d1562579d0b84de0b0a73c06113eaa8a617924e WHIRLPOOL 77e4d2a188b2aafb2506cc47abf98619edc783cd82c19d1c89c6278a4a3136c3f157e164354588fe6b6cc5889934380353b59e68cbe28f3e49d2c5989a7e4628
@@ -102,4 +103,5 @@ EBUILD netbeans-java-9999_p20151208.ebuild 14983 SHA256 ec7a9eefd90863fb53c80eb5
 EBUILD netbeans-java-9999_p20151209.ebuild 14983 SHA256 397762c34ccff09aaab8dc546271ff700a78a47b803365a7161440d5e109b78a SHA512 1716c7fcbf35768ff6fcf889edbca041d93a5901241be3398ce9ba0ac5ae2f0555ba0c3596e66457d256e192b25f504bf286fbb4a6bb341d5ee05dc6bbb82fa6 WHIRLPOOL b5f6b309c60f7c64c4bf352ff76d4be67d00e217df45ba1b58cc5eee2d4135acaf974cfe7cf33d3fb7fb6a56f7979c5f55e741c2c3323198194e338e67996af2
 EBUILD netbeans-java-9999_p20151210.ebuild 14983 SHA256 aaf668e3b24fae3d19967b9dfc3efbd2efe8c2ae723bb69855d25b31a8433e8c SHA512 81f15f5d4b46c4059cca8ea8bacc27c4d3088de5014e3e888fb9824415476d4939b6417b30476e168822623452c66e122be32e2246d4985cdec36089c0dc9c4e WHIRLPOOL dc4741caa24f355a2679a43edf5d557846ed841dd5be409a95a51af68cf97c9b7b42ce2c9850034a77b243d5e2a6985a3c89659c2e9f2cf753ab01daeee91eab
 EBUILD netbeans-java-9999_p20151211.ebuild 14983 SHA256 f67bed8eed366dcec9820112cb4382ff875240818946943df45084c60cb2b4c4 SHA512 17a71a68aa801077ed61953764a68ccbb7a8d5d668ca897b10b58b160fd992529c8daae6c10f4d2e36f2541f0be4fc6175b8b3e8e89958fab6406a7f25ade5a3 WHIRLPOOL 57cd4907189aecbbf58b06e587268b196ff2298e2c11715b25f97c2e8c023158460e70a1309201a19c6428eac024206c41c530a3e75a0478885039eafe125175
+EBUILD netbeans-java-9999_p20151213.ebuild 14983 SHA256 37c8da5f8681611a45b0d3a6893f22e04269f100acf0bf5f253dae11ae1c4bf0 SHA512 e9efaacbc5814be9c743555b0a0b1fd878985e47e0c0fafb1f3b6acb2550d8c18832376d81efc7476cee79975ae13af4fc0a2d919b4fcf325f14b54956d7d6f7 WHIRLPOOL 24e471622344e96c3767b0fea01d3d93cab7c74555d95e785c29ea92f68337aa819c7fd3ae6d65eb70ba2a923d47ff9d7d01b166c74433309b8c178253f73a77
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20151213.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20151213.ebuild
new file mode 100644
index 0000000..3756aa9
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20151213.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2015 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/2015-12-13_00-02-04/zip/netbeans-trunk-nightly-201512130002-src.zip"
+# jarjar-1.4 contains also asm libraries
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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/450929B1252E7AFEAFD7FCCBE7D1DCA6AE153ED5-nb-javac-impl.jar
+	http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
+	http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar
+	http://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip
+	http://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip
+	http://hg.netbeans.org/binaries/B572007A07023ADF7ECBDB7FC2D572BF1BDED20D-wagon-http-2.8-shaded.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/beansbinding:0
+	dev-java/cglib:3
+	dev-java/jdom:0"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	dev-java/json-simple:0
+	dev-java/junit:4"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}
+	dev-java/absolutelayout:0
+	>=dev-java/antlr-2.7.7-r7:0
+	dev-java/c3p0:0
+	dev-java/commons-cli:1
+	dev-java/commons-collections:0
+	dev-java/dom4j:1
+	dev-java/fastinfoset:0
+	dev-java/glassfish-transaction-api:0
+	dev-java/javassist:3
+	dev-java/jboss-logging:0
+	dev-java/jsr67:0
+	dev-java/jsr181:0
+	dev-java/jtidy: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-r14-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}"/450929B1252E7AFEAFD7FCCBE7D1DCA6AE153ED5-nb-javac-impl.jar libs.javacimpl/external/nb-javac-impl.jar || die
+	ln -s "${DISTDIR}"/CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.jar maven/external/netbeans-cos.jar || die
+	ln -s "${DISTDIR}"/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselink/external/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar || die
+	ln -s "${DISTDIR}"/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselinkmodelgen/external/org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar || die
+	ln -s "${DISTDIR}"/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip libs.springframework/external/spring-framework-3.2.7.RELEASE.zip || die
+	ln -s "${DISTDIR}"/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip libs.springframework/external/spring-framework-4.0.1.RELEASE.zip || die
+	ln -s "${DISTDIR}"/B572007A07023ADF7ECBDB7FC2D572BF1BDED20D-wagon-http-2.8-shaded.jar maven.embedder/external/wagon-http-2.8-shaded.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-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=/${INSTALL_DIR}/maven/lib
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-cli-1.2.jar && dosym /usr/share/commons-cli-1/lib/commons-cli.jar ${instdir}/commons-cli-1.2.jar || die
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm AbsoluteLayout.jar  && dosym /usr/share/absolutelayout/lib/absolutelayout.jar ${instdir}/AbsoluteLayout.jar || die
+	rm beansbinding-1.2.1.jar && dosym /usr/share/beansbinding/lib/beansbinding.jar ${instdir}/beansbinding-1.2.1.jar || die
+	rm cglib-2.2.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/hibernate4
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm antlr-2.7.7.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.7.jar || die
+	rm c3p0-0.9.2.1.jar && dosym /usr/share/c3p0/lib/c3p0.jar ${instdir}/c3p0-0.9.2.1.jar || die
+	rm cglib-2.2.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
+	rm commons-collections-3.2.1.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections-3.2.1.jar || die
+	rm dom4j-1.6.1.jar && dosym /usr/share/dom4j-1/lib/dom4j.jar ${instdir}/dom4j-1.6.1.jar || die
+	rm javassist-3.18.1-GA.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist-3.18.1-GA.jar || die
+	rm jboss-logging-3.1.3.GA.jar && dosym /usr/share/jboss-logging/lib/jboss-logging.jar ${instdir}/jboss-logging-3.1.3.GA.jar || die
+	rm jboss-transaction-api_1.2_spec-1.0.0.Final.jar && dosym /usr/share/glassfish-transaction-api/lib/jta.jar ${instdir}/jboss-transaction-api_1.2_spec-1.0.0.Final.jar || die
+	rm jtidy-r8-20060801.jar && dosym /usr/share/jtidy/lib/jtidy.jar ${instdir}/jtidy-r8-20060801.jar || die
+	rm log4j-1.2.12.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.12.jar || die
+	rm slf4j-api-1.6.1.jar && dosym /usr/share/slf4j-api/lib/slf4j-api.jar ${instdir}/slf4j-api-1.6.1.jar || die
+	rm slf4j-log4j12-1.6.1.jar && dosym /usr/share/slf4j-log4j12/lib/slf4j-log4j12.jar ${instdir}/slf4j-log4j12-1.6.1.jar || die
+	rm slf4j-simple-1.6.1.jar && dosym /usr/share/slf4j-simple/lib/slf4j-simple.jar ${instdir}/slf4j-simple-1.6.1.jar || die
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/modules/ext/jaxws22
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm FastInfoset.jar && dosym /usr/share/fastinfoset/lib/fastinfoset.jar ${instdir}/FastInfoset.jar || die
+	rm javax.mail_1.4.jar && dosym /usr/share/oracle-javamail/lib/mail.jar ${instdir}/javax.mail_1.4.jar || die
+	rm mimepull.jar && dosym /usr/share/mimepull/lib/mimepull.jar ${instdir}/mimepull.jar || die
+	rm saaj-impl.jar && dosym /usr/share/saaj/lib/saaj.jar ${instdir}/saaj-impl.jar || die
+	rm stax-ex.jar && dosym /usr/share/stax-ex/lib/stax-ex.jar ${instdir}/stax-ex.jar || die
+	rm stax2-api.jar && dosym /usr/share/stax2-api/lib/stax2-api.jar ${instdir}/stax2-api.jar || die
+	rm streambuffer.jar && dosym /usr/share/xmlstreambuffer/lib/xmlstreambuffer.jar ${instdir}/streambuffer.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxws22/api
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
+	rm saaj-api.jar && dosym /usr/share/jsr67/lib/jsr67.jar ${instdir}/saaj-api.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/maven
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jdom-1.0.jar && dosym /usr/share/jdom/lib/jdom.jar ${instdir}/jdom-1.0.jar || die
+	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 2f972f7..f2e0533 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd231
 DIST netbeans-trunk-nightly-201512090002-src.zip 209228578 SHA256 dedd023e1e8fe3ad332bf923abf62814f76a02e484733b724d16754f3da958a1 SHA512 c7aa770074a8f4f4fa13190a4facf829d2dc6de5a3c8045ba79e9f5689332b506ff1330470dea33b38b1b7cb9e17361eff71d2b221f0fc906bdb8cd918ff2e8b WHIRLPOOL 96be2ab1293f0ab957b7da2c3266f2b4d77ec7b724a9c1c40045f512ad7ec9c99919d29643aaf1ecd8a7667321d0468eebb71f3219e117d214da618ca105dedb
 DIST netbeans-trunk-nightly-201512100002-src.zip 209233507 SHA256 2fb62cd1de0008f085b2559062e0ee25bffa593694042ab198c5c7aaf3f2c6f3 SHA512 75ae18ae344585faf93b2532e4aa16787b6e69d7a2a7402af3cb80a3585d1ae8e80efa981713e314c0c6c51c1d6a81d4bd5a91a1ca0ef1aaa17862bbdf84ce74 WHIRLPOOL 2d6cb6235ddf4a7a8c2157b517c4ae26cd50d272923d26f040e9bc5f4f664d91aa0b7815df40c75e812f6aa7c3c05289e538e20a5b0ce593b7e0736c9bd40e93
 DIST netbeans-trunk-nightly-201512110002-src.zip 209266196 SHA256 fa400d1944c8710ac2c26b9d63660e83b596b7fbe71d99c028871676a6ae2777 SHA512 ecd22150fb26c940240a9183f27d9a850850ddaadaf0646941f919fcfe9344734eb1883ec91027c909b88ab3efbe48e426fe99b4a404e0d803162d833ad9e41d WHIRLPOOL 9fc37da17f6e1d8727be1ed41513cd50c70991c75f404b665bf3d2c5bcc28afef5ff71ae09b0e77ee00663aadaca1f42841ef214a4e33926d50fa927de52c6eb
+DIST netbeans-trunk-nightly-201512130002-src.zip 209278259 SHA256 94c60bfa105a3f5f8a5227f79bae5e4795668b49443e66a164dd86b3d74ce84c SHA512 0b6cd638150f3bde87c9d6ce1c5b1c59b4330392ac76661cb20167305536ed3eb94307a2a3feaa7e5a727008a565723117bc78d9fb22a60565d99060a8da9600 WHIRLPOOL 98d0dde6bb37df4cff8269796caaa7c2066e91e4651b6aeeb6dd5bd7a5047420e89e257e581d316e705b39d6a5b5ed6371b8b9c84f8240cae1217a4d5e7adb58
 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_p20151108.ebuild 4976 SHA256 59ad7e95c5e72c64acc607af2739b869d108b7b747f005e1d04a15631a3c37f0 SHA512 2e690ec4c96403e5c4761aff631bd9a89d6affbe5495ef64ac32998126da5473fe84b9339aaad147d2b821cf6ac48ba17962003a0959a86c12aadc414aaff524 WHIRLPOOL 04ed5af1355876ec8ac4c0b28d5c61652544dc351861aae7b8e04600acc2ce1cdd55c2e6fa38f455f30414c995c383323c5b73f1f9dc33c5d37273b9216d5aaf
@@ -68,4 +69,5 @@ EBUILD netbeans-javacard-9999_p20151208.ebuild 4976 SHA256 e51df73075fbc3d1aa3d9
 EBUILD netbeans-javacard-9999_p20151209.ebuild 4976 SHA256 976f26760de8aa7d71229ffebd441cdeca7eb54dee289e766d574a1d4196879e SHA512 1964ec1b2b7a06718d58e20b6023b4d7a1de9d5ae546a7f560e096e4dc4b0f02319489ff24c3a4ce1885f9cebb747c82829cbf24d452c55458f2e62435fd5c6e WHIRLPOOL d27ec64b2df5caf7b383718107c97c781bbb3b79ddc1b49b36043b4182ffe9613240a3ce5370b86e2e893d43d83c9d04dce2b4e13a19bb4fcf18e1480500b7c5
 EBUILD netbeans-javacard-9999_p20151210.ebuild 4976 SHA256 d9ebe200e152c78579ffce98ae515ad5a9ec41119ae7694d05175f43f051d782 SHA512 5591408d92a86aa54db65cbc055ee8603767174162f1b3caacc170dc6199f2fc3b2b8e5ac19a93118fe3f83e66f99c5281dd34663579f20e247ae40fae148f63 WHIRLPOOL a3dde0f3eff5671c18697a99877a5073924110d8de11aea178de4e3e2f13ea36e6002d4f3637f270336079724b61df12166cb26b177499dc8fdb825c9ccf5a6e
 EBUILD netbeans-javacard-9999_p20151211.ebuild 4976 SHA256 791aec4c51c86f1fe8768279c8460da6aa344360f21cf6799c14f4d9bd22fa58 SHA512 c2f1900e82a24ff0b977152de9d15dd12b0bf17fc060a8113203192c64136bfd87f4374a655006d987c9af556bc90dc3725431053a2da9545e3487c2f42f8e9a WHIRLPOOL aa9ead808d3ff5b915857196819b96e187fff740008aa9da7d6932b2b1d897429c1a3fd13b50da5936e72b87e808860730e79ed1d07411668d20e421927d510d
+EBUILD netbeans-javacard-9999_p20151213.ebuild 4976 SHA256 32e9e9596139810b58c3ba9a2b9f5a1104febe35c3b2d01367d5f4247f4f1f4a SHA512 8a31e5621b5b3f6c2b7b5e4e7a2c22f662dedd833090e298c6abac91fd4e6908af5d3384a9b3da03bee14fee392c642c06555e9320ca3a453111af1b4d970253 WHIRLPOOL 59eec3492a0587c70918e95d4d27f8b330d592228f0c454c879b8286462b32b7c6f82fd8d27baafdae437a8fcb78cf7bd9476d819802a7082f06d8fcc693ea0f
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20151213.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20151213.ebuild
new file mode 100644
index 0000000..07024b4
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20151213.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2015 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/2015-12-13_00-02-04/zip/netbeans-trunk-nightly-201512130002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-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-r14-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=${INSTALL_DIR}/JCDK3.0.2_ConnectedEdition/lib
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm ant-contrib-1.0b3.jar && dosym /usr/share/ant-contrib/lib/ant-contrib.jar ${instdir}/ant-contrib-1.0b3.jar || die
+	rm asm-all-3.1.jar && dosym /usr/share/asm-3/lib/asm.jar ${instdir}/asm-all-3.1.jar || die
+	rm bcel-5.2.jar && dosym /usr/share/bcel/lib/bcel.jar ${instdir}/bcel-5.2.jar || die
+	rm commons-cli-1.0.jar && dosym /usr/share/commons-cli-1/lib/commons-cli.jar ${instdir}/commons-cli-1.0.jar || die
+	rm commons-codec-1.3.jar && dosym /usr/share/commons-codec/lib/commons-codec.jar ${instdir}/commons-codec-1.3.jar || die
+	rm commons-httpclient-3.0.jar && dosym /usr/share/commons-httpclient-3/lib/commons-httpclient.jar ${instdir}/commons-httpclient-3.0.jar || die
+	rm commons-logging-1.1.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.1.jar || die
+	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 7fee982..e7eeb01 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd231
 DIST netbeans-trunk-nightly-201512090002-src.zip 209228578 SHA256 dedd023e1e8fe3ad332bf923abf62814f76a02e484733b724d16754f3da958a1 SHA512 c7aa770074a8f4f4fa13190a4facf829d2dc6de5a3c8045ba79e9f5689332b506ff1330470dea33b38b1b7cb9e17361eff71d2b221f0fc906bdb8cd918ff2e8b WHIRLPOOL 96be2ab1293f0ab957b7da2c3266f2b4d77ec7b724a9c1c40045f512ad7ec9c99919d29643aaf1ecd8a7667321d0468eebb71f3219e117d214da618ca105dedb
 DIST netbeans-trunk-nightly-201512100002-src.zip 209233507 SHA256 2fb62cd1de0008f085b2559062e0ee25bffa593694042ab198c5c7aaf3f2c6f3 SHA512 75ae18ae344585faf93b2532e4aa16787b6e69d7a2a7402af3cb80a3585d1ae8e80efa981713e314c0c6c51c1d6a81d4bd5a91a1ca0ef1aaa17862bbdf84ce74 WHIRLPOOL 2d6cb6235ddf4a7a8c2157b517c4ae26cd50d272923d26f040e9bc5f4f664d91aa0b7815df40c75e812f6aa7c3c05289e538e20a5b0ce593b7e0736c9bd40e93
 DIST netbeans-trunk-nightly-201512110002-src.zip 209266196 SHA256 fa400d1944c8710ac2c26b9d63660e83b596b7fbe71d99c028871676a6ae2777 SHA512 ecd22150fb26c940240a9183f27d9a850850ddaadaf0646941f919fcfe9344734eb1883ec91027c909b88ab3efbe48e426fe99b4a404e0d803162d833ad9e41d WHIRLPOOL 9fc37da17f6e1d8727be1ed41513cd50c70991c75f404b665bf3d2c5bcc28afef5ff71ae09b0e77ee00663aadaca1f42841ef214a4e33926d50fa927de52c6eb
+DIST netbeans-trunk-nightly-201512130002-src.zip 209278259 SHA256 94c60bfa105a3f5f8a5227f79bae5e4795668b49443e66a164dd86b3d74ce84c SHA512 0b6cd638150f3bde87c9d6ce1c5b1c59b4330392ac76661cb20167305536ed3eb94307a2a3feaa7e5a727008a565723117bc78d9fb22a60565d99060a8da9600 WHIRLPOOL 98d0dde6bb37df4cff8269796caaa7c2066e91e4651b6aeeb6dd5bd7a5047420e89e257e581d316e705b39d6a5b5ed6371b8b9c84f8240cae1217a4d5e7adb58
 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_p20151108.ebuild 6293 SHA256 a3bf9ac77a27f5ce486aec02f93e29203b98d7e26826ee9f7134892d439cf5be SHA512 13817b356e57cc1fd8e8531e334b77a20f4f31904cb7da53ce1e7c8eaae5d2412508f54d8c67611489ba21fd6cc90dc00088d92137ac63f0201bb5a9b48fcf54 WHIRLPOOL 80a1861fe34e6258f85f08b292fe020e9f4d99d630f0970ee7d734bc59249a1f7efcd6e93ed4b9556c678b4bde8dfe2e208df40d26738624ccbd8a1b44d44c16
@@ -66,4 +67,5 @@ EBUILD netbeans-javadoc-9999_p20151208.ebuild 6293 SHA256 2c848c37c910372d392a0b
 EBUILD netbeans-javadoc-9999_p20151209.ebuild 6293 SHA256 cca92611983b925b9d052e7aa0986d62f80950fd84b02219c613b75efc789b4a SHA512 b67989062a556763be45f1eb9174da6677ab1c3cb32874073abb29000c460a87593b5dfd92db18a7036543a94d5fdee311054d4bbbb2d489239f3e32a376bbe7 WHIRLPOOL bd65f49b10d1838ccd6d98b2a52e9b890b0b1aa912efb389429fb5c6f975ef60b0b37d3a7d8e563b011a939addb5413e055d04ce18ee2033c38fd6e298737d0a
 EBUILD netbeans-javadoc-9999_p20151210.ebuild 6293 SHA256 111f348146bf2192bb1822e7a80020abf048c085137fe205c236401f5dba4e42 SHA512 fcd1e641ecdece88b986218c0183af7a8b05dd9797cc9adea7151abbdfd90c150e81ef9828784541ab90d019163f546ed74f6b4a92cc049541774efe6792434f WHIRLPOOL adfa0339bfd9b22deb72f8c7e76d87913fb3af26a2b8e0c2490c2ddf21c7e7a2454f2358e99016b17607a0a90875f8a866d61586b574636914e3958ca78fbf99
 EBUILD netbeans-javadoc-9999_p20151211.ebuild 6293 SHA256 886794241011eaa3a37c878921653e12be6e10cef439364ecf351a0461ef4b17 SHA512 13ef0580d782fc3e751d242ac1edaf647becdfe5a2f65b1ee218a24d3048f6aac604b04b76b164c4bcb2baba7fbdf4132274cf89cddcdc17019f471202be584c WHIRLPOOL 370b920e66c6148c19df47fbab027f76c93ef98a3d8d05510e86d883b3c2c63d39138d394f2cc654eacf33a80f4bebdbdfaea956b11309242ff78be01233c319
+EBUILD netbeans-javadoc-9999_p20151213.ebuild 6293 SHA256 4aa94cf4a4a1d7a97d5f20a6a0dc5b12e40c4c991d854da4fa1f2b094e6320f8 SHA512 e5882253dbfd1c55026fddea2e9fa471fb52f400e9ffc117ead933e6b7a22601a1e021fbfe3f26b2fdbad2415c8a3626e894587dc0b1f7d851f303a3f735a247 WHIRLPOOL 0246330dbca1de1f237475e739cf3e033ab2fe6006d87271dbe2ad1602c802078175a58a4ef2166fb364e95b743aa3f8a0637cfb23401f6ff60015029495fc87
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20151213.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20151213.ebuild
new file mode 100644
index 0000000..19894d7
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20151213.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2015 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/2015-12-13_00-02-04/zip/netbeans-trunk-nightly-201512130002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+# oracle-jdk-bin is needed because of javafx which is not currently packaged separately
+DEPEND="dev-java/oracle-jdk-bin:1.8[javafx]
+	app-arch/unzip
+	dev-java/javahelp:0
+	dev-java/junit:4
+	~dev-java/netbeans-apisupport-${PV}
+	~dev-java/netbeans-cnd-${PV}
+	~dev-java/netbeans-dlight-${PV}
+	~dev-java/netbeans-enterprise-${PV}
+	~dev-java/netbeans-ergonomics-${PV}
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-groovy-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-javacard-${PV}
+	~dev-java/netbeans-mobility-${PV}
+	~dev-java/netbeans-nb-${PV}
+	~dev-java/netbeans-php-${PV}
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-profiler-${PV}
+	~dev-java/netbeans-websvccommon-${PV}"
+RDEPEND=""
+
+JAVA_PKG_BSFIX="off"
+JAVA_PKG_WANT_BUILD_VM="oracle-jdk-bin-1.8"
+JAVA_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip o.apache.tools.ant.module/external/ant-libs-1.9.4.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-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 ad073b1..d10ee16 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -42,6 +42,7 @@ DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd231
 DIST netbeans-trunk-nightly-201512090002-src.zip 209228578 SHA256 dedd023e1e8fe3ad332bf923abf62814f76a02e484733b724d16754f3da958a1 SHA512 c7aa770074a8f4f4fa13190a4facf829d2dc6de5a3c8045ba79e9f5689332b506ff1330470dea33b38b1b7cb9e17361eff71d2b221f0fc906bdb8cd918ff2e8b WHIRLPOOL 96be2ab1293f0ab957b7da2c3266f2b4d77ec7b724a9c1c40045f512ad7ec9c99919d29643aaf1ecd8a7667321d0468eebb71f3219e117d214da618ca105dedb
 DIST netbeans-trunk-nightly-201512100002-src.zip 209233507 SHA256 2fb62cd1de0008f085b2559062e0ee25bffa593694042ab198c5c7aaf3f2c6f3 SHA512 75ae18ae344585faf93b2532e4aa16787b6e69d7a2a7402af3cb80a3585d1ae8e80efa981713e314c0c6c51c1d6a81d4bd5a91a1ca0ef1aaa17862bbdf84ce74 WHIRLPOOL 2d6cb6235ddf4a7a8c2157b517c4ae26cd50d272923d26f040e9bc5f4f664d91aa0b7815df40c75e812f6aa7c3c05289e538e20a5b0ce593b7e0736c9bd40e93
 DIST netbeans-trunk-nightly-201512110002-src.zip 209266196 SHA256 fa400d1944c8710ac2c26b9d63660e83b596b7fbe71d99c028871676a6ae2777 SHA512 ecd22150fb26c940240a9183f27d9a850850ddaadaf0646941f919fcfe9344734eb1883ec91027c909b88ab3efbe48e426fe99b4a404e0d803162d833ad9e41d WHIRLPOOL 9fc37da17f6e1d8727be1ed41513cd50c70991c75f404b665bf3d2c5bcc28afef5ff71ae09b0e77ee00663aadaca1f42841ef214a4e33926d50fa927de52c6eb
+DIST netbeans-trunk-nightly-201512130002-src.zip 209278259 SHA256 94c60bfa105a3f5f8a5227f79bae5e4795668b49443e66a164dd86b3d74ce84c SHA512 0b6cd638150f3bde87c9d6ce1c5b1c59b4330392ac76661cb20167305536ed3eb94307a2a3feaa7e5a727008a565723117bc78d9fb22a60565d99060a8da9600 WHIRLPOOL 98d0dde6bb37df4cff8269796caaa7c2066e91e4651b6aeeb6dd5bd7a5047420e89e257e581d316e705b39d6a5b5ed6371b8b9c84f8240cae1217a4d5e7adb58
 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_p20151108.ebuild 4717 SHA256 bc814f556e9b79b9142fa8cba19904bd39a11e374996a49b850460f2af16996d SHA512 265ebee5e207e46a179a1d7effcc8f8f76f0aba7efa6f29158a91f4f58625572fe739922e22c8770ded127ee4653500bf8fb372af19fcecc6b00943089866fd1 WHIRLPOOL 52647b1f92d2f52248e8376780115605b76d74c37d7e6c83f792a5380c9a65ab297bd1559d1784f0d21384e635d3a6ecbfee7a8b27c6fa9a7bf7cbfcde284520
@@ -74,4 +75,5 @@ EBUILD netbeans-javafx-9999_p20151208.ebuild 4717 SHA256 127bd9de9b83acce1e716b0
 EBUILD netbeans-javafx-9999_p20151209.ebuild 4717 SHA256 1612965449b1772a1e354594645a57b4ae8a6e850f783f4b616e6f57e8ea7fc9 SHA512 173d6e31fcfab3e814b4aa2fa8984e0afc25d685f454c6c5301fe9aa6d65df253ccc65eeb74fbdc2efaa16838985c3942b0f5aaa354fd75d43a1c9f459b84819 WHIRLPOOL f5e41376362f2635eee8d6d3d5815eecba4673deb162c7d742d2f49a1dfbfd03bd9a6071fe215576a9111aaed21ef6d6d467cdf0b83029193ee9ac7b74c1ba60
 EBUILD netbeans-javafx-9999_p20151210.ebuild 4717 SHA256 44a2c5631c5062b541c25c16963974fcf9aaead1c9ea6aad957c6429a84d5ee6 SHA512 32d9b1447c88d1419f05d1c16640b0926abeb5990e3962bfae0fe435d50c6382e9a6d9fe3da65a03067036530f737ecd7f9a171d95f225b2e498d3161c67e712 WHIRLPOOL 8600da0e95a1dfca69f8f696482e8b628d2f66618e9f35c09ce5b51807b343b61ab688e174d8582f50e1db58def3e5ceabcfd170cdcf3fe44c6226924b5fce7b
 EBUILD netbeans-javafx-9999_p20151211.ebuild 4717 SHA256 ea8797841d510208cff7bf4309381d07c757018abbd115d94602e4704fb1c2b2 SHA512 d22c150281c7292b34aeb9c69a7a95a35a5c31d85a4cb1eb8bbef2448fbcffda6796c96108b33ba0353ec7b722b20f42d3a4da28a75d217be5df8c5d952b8c48 WHIRLPOOL 95359a19b043d876ff1116e853b93a4dae1b0535fbb57690554aa6d7846840e6d56a635c5903021b4ab3b5e349c74a4ccb452a55f64657e95c3f15850ddd7f73
+EBUILD netbeans-javafx-9999_p20151213.ebuild 4717 SHA256 3767126fcda01de7795495d7537396ae2fecded7f34cb1899118087ffb81a11f SHA512 237ae42a5757e8f7f024821a9e906b6e2f7da091bd3e45d183e8aadab26044ff1215e714c938e5e41ef1d077fe407a349c5da6d47019b041d94334a40f169de3 WHIRLPOOL dd92ca2cb9a3984785bbe75b687bcef512a59b3c725d259e4f42ac54732aa81173173949ec51f43f851561e78eba5c9429a04655569bc6f3d8a8212599fd4e94
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20151213.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20151213.ebuild
new file mode 100644
index 0000000..91350cd
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20151213.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2015 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/2015-12-13_00-02-04/zip/netbeans-trunk-nightly-201512130002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-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-r14-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 a623b73..95f7cd3 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd231
 DIST netbeans-trunk-nightly-201512090002-src.zip 209228578 SHA256 dedd023e1e8fe3ad332bf923abf62814f76a02e484733b724d16754f3da958a1 SHA512 c7aa770074a8f4f4fa13190a4facf829d2dc6de5a3c8045ba79e9f5689332b506ff1330470dea33b38b1b7cb9e17361eff71d2b221f0fc906bdb8cd918ff2e8b WHIRLPOOL 96be2ab1293f0ab957b7da2c3266f2b4d77ec7b724a9c1c40045f512ad7ec9c99919d29643aaf1ecd8a7667321d0468eebb71f3219e117d214da618ca105dedb
 DIST netbeans-trunk-nightly-201512100002-src.zip 209233507 SHA256 2fb62cd1de0008f085b2559062e0ee25bffa593694042ab198c5c7aaf3f2c6f3 SHA512 75ae18ae344585faf93b2532e4aa16787b6e69d7a2a7402af3cb80a3585d1ae8e80efa981713e314c0c6c51c1d6a81d4bd5a91a1ca0ef1aaa17862bbdf84ce74 WHIRLPOOL 2d6cb6235ddf4a7a8c2157b517c4ae26cd50d272923d26f040e9bc5f4f664d91aa0b7815df40c75e812f6aa7c3c05289e538e20a5b0ce593b7e0736c9bd40e93
 DIST netbeans-trunk-nightly-201512110002-src.zip 209266196 SHA256 fa400d1944c8710ac2c26b9d63660e83b596b7fbe71d99c028871676a6ae2777 SHA512 ecd22150fb26c940240a9183f27d9a850850ddaadaf0646941f919fcfe9344734eb1883ec91027c909b88ab3efbe48e426fe99b4a404e0d803162d833ad9e41d WHIRLPOOL 9fc37da17f6e1d8727be1ed41513cd50c70991c75f404b665bf3d2c5bcc28afef5ff71ae09b0e77ee00663aadaca1f42841ef214a4e33926d50fa927de52c6eb
+DIST netbeans-trunk-nightly-201512130002-src.zip 209278259 SHA256 94c60bfa105a3f5f8a5227f79bae5e4795668b49443e66a164dd86b3d74ce84c SHA512 0b6cd638150f3bde87c9d6ce1c5b1c59b4330392ac76661cb20167305536ed3eb94307a2a3feaa7e5a727008a565723117bc78d9fb22a60565d99060a8da9600 WHIRLPOOL 98d0dde6bb37df4cff8269796caaa7c2066e91e4651b6aeeb6dd5bd7a5047420e89e257e581d316e705b39d6a5b5ed6371b8b9c84f8240cae1217a4d5e7adb58
 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_p20151108.ebuild 4412 SHA256 857804ae3d16327feb3473f2d0d9cb072c4be1dd974c9cb47904b7702a69161f SHA512 76f80c4ea18be345164d38080d2d6292cfaeff7e9004e5debf67f2b885f8c99776b1ebd3a3174a4a2624ee47d4ebb58723bc7a9e79b57e8cc7edd6f9913efea6 WHIRLPOOL fe3b440f32f2decbeae43c0cc4e7ef34612ae6cb3c0dca7e6987150b7ea91afb3392155eedeafa0c1e5d3c6bd62785334fb667885bbffffad15d5af81b5c5ed5
@@ -65,4 +66,5 @@ EBUILD netbeans-mobility-9999_p20151208.ebuild 4412 SHA256 2ca425d5b080a13ad206d
 EBUILD netbeans-mobility-9999_p20151209.ebuild 4412 SHA256 f51333786854a908e56d1b09ebe2d026a9b90474d56042b7245334e7eb55d1d0 SHA512 e8f051ce8b9a28d2159851b749bf0e9c46ade71df40e7b9b993a5a17fb979ae5d4d80c71cb9581fcbb4d565a6f8e855f6dc1f5e7e5ad74b858d3c02ef41aad31 WHIRLPOOL f6bf882566307b3f71a812428659ab9b090b5822cb78ee1a443198a52664f537bbce022b659ac5eda1fb74d332f8736fad87a238cd5fc3555270e84e11948478
 EBUILD netbeans-mobility-9999_p20151210.ebuild 4412 SHA256 24aa2aaff3a5f2696b812a173378641abff3a033ce612ff973b0ec41d8ce9807 SHA512 af54ccc084d647fa7f72878f7b86fd29b804d008eaf68006d8c096b439b2558e31d787c7a56b4379bf28766a604ecf5078ad2a89d4f3e54bb24b9e95f0c2971a WHIRLPOOL cfbc410994df31c021304eff12c72c1c3f7469966e7344395ee43763f069f54952b587142bcbadd639467e6ef1c305b368c8f3c9d42675bd8c7ac7cf70c60dd1
 EBUILD netbeans-mobility-9999_p20151211.ebuild 4412 SHA256 c21b9dad55c81e17b2e379b5c37b562bbc88ac2ab1352f3a3242d754e87f4120 SHA512 05d84aa4f2e6e9fc7ccb980abf0fb0928fd1ede9346fdb29839704a8dd7bf781a12950ea366c18c2ee78c22bfbf429e69511d59980a0cdb4d386675760fbb224 WHIRLPOOL 9a17fa2b8a7794bcc30d8ca7b99f83cfcb4a761b69941ea1fe21ab5ec1386010870ef601041c2317dc831c6925c3356a92200301321e7da5411a993c287f00b9
+EBUILD netbeans-mobility-9999_p20151213.ebuild 4412 SHA256 5876fc6d30179b139abeb8761c03cca867e417ffba269b7599eacb677cef1fc4 SHA512 60d5b0ba6fe8cc75e73f8020db618926d4a13dd9fe89285f4359fdc3b0a1176b2259ea02459ccbd977a5a35f834d7bf434049a064b5c802282de5262efbb0289 WHIRLPOOL 197520b9541a94dc55293f69134c1610bd0d6c588187a648a5434e4ed2b50d891973e25ff1584ac6dccaeb7f22281978652d77c4cb21b987ab030c0378b7d4c5
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20151213.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20151213.ebuild
new file mode 100644
index 0000000..8ea45f1
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20151213.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2015 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/2015-12-13_00-02-04/zip/netbeans-trunk-nightly-201512130002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-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 ef9e70f..b3680b7 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd231
 DIST netbeans-trunk-nightly-201512090002-src.zip 209228578 SHA256 dedd023e1e8fe3ad332bf923abf62814f76a02e484733b724d16754f3da958a1 SHA512 c7aa770074a8f4f4fa13190a4facf829d2dc6de5a3c8045ba79e9f5689332b506ff1330470dea33b38b1b7cb9e17361eff71d2b221f0fc906bdb8cd918ff2e8b WHIRLPOOL 96be2ab1293f0ab957b7da2c3266f2b4d77ec7b724a9c1c40045f512ad7ec9c99919d29643aaf1ecd8a7667321d0468eebb71f3219e117d214da618ca105dedb
 DIST netbeans-trunk-nightly-201512100002-src.zip 209233507 SHA256 2fb62cd1de0008f085b2559062e0ee25bffa593694042ab198c5c7aaf3f2c6f3 SHA512 75ae18ae344585faf93b2532e4aa16787b6e69d7a2a7402af3cb80a3585d1ae8e80efa981713e314c0c6c51c1d6a81d4bd5a91a1ca0ef1aaa17862bbdf84ce74 WHIRLPOOL 2d6cb6235ddf4a7a8c2157b517c4ae26cd50d272923d26f040e9bc5f4f664d91aa0b7815df40c75e812f6aa7c3c05289e538e20a5b0ce593b7e0736c9bd40e93
 DIST netbeans-trunk-nightly-201512110002-src.zip 209266196 SHA256 fa400d1944c8710ac2c26b9d63660e83b596b7fbe71d99c028871676a6ae2777 SHA512 ecd22150fb26c940240a9183f27d9a850850ddaadaf0646941f919fcfe9344734eb1883ec91027c909b88ab3efbe48e426fe99b4a404e0d803162d833ad9e41d WHIRLPOOL 9fc37da17f6e1d8727be1ed41513cd50c70991c75f404b665bf3d2c5bcc28afef5ff71ae09b0e77ee00663aadaca1f42841ef214a4e33926d50fa927de52c6eb
+DIST netbeans-trunk-nightly-201512130002-src.zip 209278259 SHA256 94c60bfa105a3f5f8a5227f79bae5e4795668b49443e66a164dd86b3d74ce84c SHA512 0b6cd638150f3bde87c9d6ce1c5b1c59b4330392ac76661cb20167305536ed3eb94307a2a3feaa7e5a727008a565723117bc78d9fb22a60565d99060a8da9600 WHIRLPOOL 98d0dde6bb37df4cff8269796caaa7c2066e91e4651b6aeeb6dd5bd7a5047420e89e257e581d316e705b39d6a5b5ed6371b8b9c84f8240cae1217a4d5e7adb58
 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_p20151108.ebuild 4111 SHA256 10a177f43fba7cf511becb6840f638f0ce27bd6a8dc60509dfed3a04c761ae3e SHA512 4b4c737f85e4a777cc44591ef735ed75939abb396151a3f944a5660ee7ee4962694e766f2b3a7af931c63247e0e10420b4f3d4685e9781b68c0059f6dd079b3f WHIRLPOOL f1869f2d8f20f4506669a5164fef9dfe30e9575027c96abba4af4687c19645dff8b441acda31d2edadbbaba7cbfe94edaa37a1638715275b5a9b7cb647f5ec7b
@@ -68,4 +69,5 @@ EBUILD netbeans-nb-9999_p20151208.ebuild 4111 SHA256 3a9629e60cd92a3db9a6456ce88
 EBUILD netbeans-nb-9999_p20151209.ebuild 4111 SHA256 70264bb632f7a011078ab38adb8f68ceedf11e70d9e27b5d20a2106195d0f38a SHA512 8a1292f169c3211bdf3d10db6c366655a2caec78b3b7fc3e09a80ee3ec311d986f1ec9d1be0dd7827394431a420c2d3b9879a31f2a47faae2bae896b044fe72c WHIRLPOOL e571ac29879db7693d55b87a86236f1392d2bc53538b78ee243a4d4837c1c5a28ad3f2dbf8b1ceb6bdcb11edfc1d09ca0bd253065c5c78154ecdcabef9863b5f
 EBUILD netbeans-nb-9999_p20151210.ebuild 4111 SHA256 dc890938d0e91599aec3b9dbf55d58220f5c834409b6cae8ad19f95bc70677b9 SHA512 3940d39bdec8a248d946e84e332871d70f9728b1138fbad84a16e31b5ea8607575a9d6998eb621e3486ab4587f81462c14243e60388b7135a106e5da7ddd8889 WHIRLPOOL ead3d84140ca4fe3d7e8ce89366c7d7ea08a794ba7c37db03a1c538b268365bd32577e50c217009e1789a4cc602807fb0e2a6a63f416d1d541d65b1ba0f1f361
 EBUILD netbeans-nb-9999_p20151211.ebuild 4111 SHA256 21f02d15a7feffbd034484ff2b7d0520241accccc3ceabf4215bffbd94d46fb7 SHA512 0863e9c5d4a036b3e49dd31f9554ab89eed2821f9a4f524a76e594aec1ad37417031f6221a73aa30aafef3cb06e7643986d47bbfa9309365cc1ab940c8baf397 WHIRLPOOL cc93ae13da12395f29ecf17d963fc75ed2ba3f17b13f99bf5c188c957072c0d6130c68384b922d78967e361259b7240295f7c07f8db6895ad6c3fe430b06fccc
+EBUILD netbeans-nb-9999_p20151213.ebuild 4111 SHA256 251b87c8a1de915da5ff8d587586e46445971c07b5af35f1bc6fb204e01abe43 SHA512 41db18383f57d55088c501e5b04ea5c935cc572ad2ad35854b676cf9e213e4d6fdd56896ce054fbf3db9b9bc6ab364871a7c445ef346c787bd955d9a40baa293 WHIRLPOOL 532a949e5f97a6cd96e7b802632e2559827e2d923875daf257aab25b9ed7d267e1d9aed89e75d1df9faa984f8df5aaad6869939b902062f5725023fac1142a42
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20151213.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20151213.ebuild
new file mode 100644
index 0000000..762a436
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20151213.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 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/2015-12-13_00-02-04/zip/netbeans-trunk-nightly-201512130002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-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 a835e07..8c16805 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -37,6 +37,7 @@ DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd231
 DIST netbeans-trunk-nightly-201512090002-src.zip 209228578 SHA256 dedd023e1e8fe3ad332bf923abf62814f76a02e484733b724d16754f3da958a1 SHA512 c7aa770074a8f4f4fa13190a4facf829d2dc6de5a3c8045ba79e9f5689332b506ff1330470dea33b38b1b7cb9e17361eff71d2b221f0fc906bdb8cd918ff2e8b WHIRLPOOL 96be2ab1293f0ab957b7da2c3266f2b4d77ec7b724a9c1c40045f512ad7ec9c99919d29643aaf1ecd8a7667321d0468eebb71f3219e117d214da618ca105dedb
 DIST netbeans-trunk-nightly-201512100002-src.zip 209233507 SHA256 2fb62cd1de0008f085b2559062e0ee25bffa593694042ab198c5c7aaf3f2c6f3 SHA512 75ae18ae344585faf93b2532e4aa16787b6e69d7a2a7402af3cb80a3585d1ae8e80efa981713e314c0c6c51c1d6a81d4bd5a91a1ca0ef1aaa17862bbdf84ce74 WHIRLPOOL 2d6cb6235ddf4a7a8c2157b517c4ae26cd50d272923d26f040e9bc5f4f664d91aa0b7815df40c75e812f6aa7c3c05289e538e20a5b0ce593b7e0736c9bd40e93
 DIST netbeans-trunk-nightly-201512110002-src.zip 209266196 SHA256 fa400d1944c8710ac2c26b9d63660e83b596b7fbe71d99c028871676a6ae2777 SHA512 ecd22150fb26c940240a9183f27d9a850850ddaadaf0646941f919fcfe9344734eb1883ec91027c909b88ab3efbe48e426fe99b4a404e0d803162d833ad9e41d WHIRLPOOL 9fc37da17f6e1d8727be1ed41513cd50c70991c75f404b665bf3d2c5bcc28afef5ff71ae09b0e77ee00663aadaca1f42841ef214a4e33926d50fa927de52c6eb
+DIST netbeans-trunk-nightly-201512130002-src.zip 209278259 SHA256 94c60bfa105a3f5f8a5227f79bae5e4795668b49443e66a164dd86b3d74ce84c SHA512 0b6cd638150f3bde87c9d6ce1c5b1c59b4330392ac76661cb20167305536ed3eb94307a2a3feaa7e5a727008a565723117bc78d9fb22a60565d99060a8da9600 WHIRLPOOL 98d0dde6bb37df4cff8269796caaa7c2066e91e4651b6aeeb6dd5bd7a5047420e89e257e581d316e705b39d6a5b5ed6371b8b9c84f8240cae1217a4d5e7adb58
 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_p20151108.ebuild 4417 SHA256 a0254e853c17919272b8953983e5380722ca61694c2299d95901da4c7a061de6 SHA512 9dc2cee1e97f916296059991a7f2c0a6057d7c51c188ccd4018e33245777c3172d34a805640927fe084ed2e46c7e1b5261c5a81f1b376fa6f23a9d4bc4955072 WHIRLPOOL 637516617ddf1d98479a7c90313a768037788320b887bc4269d338e107e3f393fb242a7a4f7329b818897fc32f115584d0ad191f5255a2e9b5b327d964dc8cee
@@ -69,4 +70,5 @@ EBUILD netbeans-php-9999_p20151208.ebuild 4417 SHA256 cf9c79d65e3a3a5ab1f55871cc
 EBUILD netbeans-php-9999_p20151209.ebuild 4417 SHA256 346c9093386643585e28d4543ff407735db5022ba7f0bf47ca0bd3c48eb44eab SHA512 143485c1cc0ecd68cf098e5bf915039688f99365dd1ee8abad2472447bfff8a099574db72e60e6717a449f7172354644cec090556132a02301515fbc1d24395b WHIRLPOOL b3d82fddb958d74475e9a302dd955b97bc7eaf76c7e61000b00586e89de65ba569859e6edf02e87067b4e52d8ffab8309b023442394ff38cb9a8813b029cf510
 EBUILD netbeans-php-9999_p20151210.ebuild 4417 SHA256 5a34ac5b1363b3a26835a8714f18842c04ca12c9089265480739f62de400e80c SHA512 a08bdd1504617edfb58c5faa6fb1e79b384979c2750e98658eab40ed680806ceda8cc5d4a1c52183b5bb8b52a462b76547ee2748b2b3308c3a9d37cbe5115cf4 WHIRLPOOL f03cf153bf3b5b00fd92a6dbbda50b7e82c791f0429c5b139bf790935489104eab6c8f1ba54ca51d7216f40a43d78ee53d9b4687a84a0f65414f2bd418c8a97e
 EBUILD netbeans-php-9999_p20151211.ebuild 4417 SHA256 c554226c8f2d95ae1786b592ba5866e6bb0c871876fd2a4dbc1f7ecc418de550 SHA512 2412f631f5b03b6f7507f767c5239bd019a981d0d3e1f01c12b093fd4878586d5abd62916b120f2bcac7f34a34708a8497625a9ced610022fd9b758d648f9eb0 WHIRLPOOL 60d0b448b4b879020723d9ec30008f881f8f83fec22447b0d5fd6535931614e5679ed98f916ba3f5151de88ce3a9ad56358caf812696c52a81a4ffded5a1c6a2
+EBUILD netbeans-php-9999_p20151213.ebuild 4417 SHA256 0862fa2ba1d7dada0389be0529b0aa6eaf72468b9b7b7aaa010b419c51034756 SHA512 0d39d58d1c1530dd0c7b3361981d4946f4ae29b15c85c9ba93bc3fe2ee34ff39631ae61d6608b02833ed88bc767fda47091ce7ea10de287a4dc01be76887a065 WHIRLPOOL 305475bf05ae59da34e2c65829e107c8a95ad9c0b83a93750c22f07de46cb58363b2700604fb2913f0d895c5e92cbf5a9409ee8e3709c592fbc2e2eec08705fe
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20151213.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20151213.ebuild
new file mode 100644
index 0000000..a32bb0e
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20151213.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2015 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/2015-12-13_00-02-04/zip/netbeans-trunk-nightly-201512130002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip
+	http://hg.netbeans.org/binaries/73E9BC8A7AF36E0C95210F61A85AFEF212AEE1A9-phpsigfiles.zip
+	http://hg.netbeans.org/binaries/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-webcommon-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/javacup:0"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.php -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip php.phpdoc.documentation/external/phpdocdesc.zip || die
+	ln -s "${DISTDIR}"/73E9BC8A7AF36E0C95210F61A85AFEF212AEE1A9-phpsigfiles.zip php.project/external/phpsigfiles.zip || die
+	ln -s "${DISTDIR}"/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip php.editor/external/predefined_vars.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-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=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm java-cup-11a.jar && dosym /usr/share/javacup/lib/javacup.jar ${instdir}/java-cup-11a.jar || die
+	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 c97a62e..de33a52 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -50,6 +50,7 @@ DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd231
 DIST netbeans-trunk-nightly-201512090002-src.zip 209228578 SHA256 dedd023e1e8fe3ad332bf923abf62814f76a02e484733b724d16754f3da958a1 SHA512 c7aa770074a8f4f4fa13190a4facf829d2dc6de5a3c8045ba79e9f5689332b506ff1330470dea33b38b1b7cb9e17361eff71d2b221f0fc906bdb8cd918ff2e8b WHIRLPOOL 96be2ab1293f0ab957b7da2c3266f2b4d77ec7b724a9c1c40045f512ad7ec9c99919d29643aaf1ecd8a7667321d0468eebb71f3219e117d214da618ca105dedb
 DIST netbeans-trunk-nightly-201512100002-src.zip 209233507 SHA256 2fb62cd1de0008f085b2559062e0ee25bffa593694042ab198c5c7aaf3f2c6f3 SHA512 75ae18ae344585faf93b2532e4aa16787b6e69d7a2a7402af3cb80a3585d1ae8e80efa981713e314c0c6c51c1d6a81d4bd5a91a1ca0ef1aaa17862bbdf84ce74 WHIRLPOOL 2d6cb6235ddf4a7a8c2157b517c4ae26cd50d272923d26f040e9bc5f4f664d91aa0b7815df40c75e812f6aa7c3c05289e538e20a5b0ce593b7e0736c9bd40e93
 DIST netbeans-trunk-nightly-201512110002-src.zip 209266196 SHA256 fa400d1944c8710ac2c26b9d63660e83b596b7fbe71d99c028871676a6ae2777 SHA512 ecd22150fb26c940240a9183f27d9a850850ddaadaf0646941f919fcfe9344734eb1883ec91027c909b88ab3efbe48e426fe99b4a404e0d803162d833ad9e41d WHIRLPOOL 9fc37da17f6e1d8727be1ed41513cd50c70991c75f404b665bf3d2c5bcc28afef5ff71ae09b0e77ee00663aadaca1f42841ef214a4e33926d50fa927de52c6eb
+DIST netbeans-trunk-nightly-201512130002-src.zip 209278259 SHA256 94c60bfa105a3f5f8a5227f79bae5e4795668b49443e66a164dd86b3d74ce84c SHA512 0b6cd638150f3bde87c9d6ce1c5b1c59b4330392ac76661cb20167305536ed3eb94307a2a3feaa7e5a727008a565723117bc78d9fb22a60565d99060a8da9600 WHIRLPOOL 98d0dde6bb37df4cff8269796caaa7c2066e91e4651b6aeeb6dd5bd7a5047420e89e257e581d316e705b39d6a5b5ed6371b8b9c84f8240cae1217a4d5e7adb58
 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_p20151108.ebuild 9367 SHA256 d5aec523f8d91216485e5f4198d3493c628da1308c2b65475a3bf0efd66c2cc2 SHA512 3b5c10dceae2fbd2074356031f84028d1b95ba971a5ea58f24979a87f090d914d6c87f73d7babaf63b6c023b09e7a04a5eef83609a903c39445423091dfdf362 WHIRLPOOL 4c0628fda6dffcfad790fb6ab3b6027b94c18f78fc012db8f0a891474b78d727d31a8afa28a7fac3848101b3f605cba0c81e3f31498214b4078fd10e2a48675d
@@ -82,4 +83,5 @@ EBUILD netbeans-platform-9999_p20151208.ebuild 9367 SHA256 65be17e12f8cd8dc3918d
 EBUILD netbeans-platform-9999_p20151209.ebuild 9367 SHA256 696bdb169fadab488309f1cd152c0c1d1f7e2688f1a707cad6ab36b4706378e4 SHA512 67e5e7d6832b4dd2ba68e74a9ff705ce6c1d9fa17e90211e3a4bd2667de3fe7e968fc790a39626303dc66d90a27ae0e3ecc3b402dd79133cd0e77a059ff91476 WHIRLPOOL d1b161f337e75fcc384fc914b62fcc250889d732bf9edff71d0ce7b216a6fa3bab5215e40d6ea649f32a1fdc0fa6aaafda2fa202b4225cc4b62ad4c40f0498a1
 EBUILD netbeans-platform-9999_p20151210.ebuild 9367 SHA256 ba09c24265ae30260cea3e50939c9d28bd5fb8c2d4aa213e06963b7a7c2f9ab8 SHA512 46eaf15856eb88bf337e0ebbd27002251e0253d3e2ddba76671f7f8ca4bbc96c11b365f0d6084a7ef4c0d27b1fb7e63452153b39eac643e3077c121370dc9c5b WHIRLPOOL 43d27df27927076a56dc1a21a351b0b87e7fd1e498d2780286dc262f350637d9ba6280c5c1f3467c21f54be18ce99576967fcefb0ec0baa8da89372a90db3826
 EBUILD netbeans-platform-9999_p20151211.ebuild 9367 SHA256 e30cd7cce5fb060206185e5faabea00c58f082f7696613906d8655297d83368f SHA512 facd3336b1f7f61269af8a9c51dfb59dd4b8809fdc45dc73ecbfae4f872e84b1155c710f04e584da57fff32d9f36aa6187cb888c114307dce136fd82104633d2 WHIRLPOOL 36cbce7b389ef5dc24563ea2c9894706795a09bc99712116309a9c5b0ee537178b72efe98d18defdb6ab1f540b3c366137c9e885b40b32efebda3f426113105b
+EBUILD netbeans-platform-9999_p20151213.ebuild 9367 SHA256 728a29d298f94f5cbae603e048e0eb872de518363ca81bc60d2e92a00e53cd38 SHA512 ae99336973f609581a09b2fc00467b29ed97b7af036165d583cfc9f27dd48d5b5e0d5ed21b16599a6de2a6fec24e264dc35ba360ef3955519ffde2823e3feb7c WHIRLPOOL 7164e332ebfc50b408d8cfad386c5db5afd2e0e91a5a280e4ae96d1a5a2af97a188b544b6989d6009b40048c67a179402ae50cba2b98b8db81e67083de11c197
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20151213.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20151213.ebuild
new file mode 100644
index 0000000..bbb8762
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20151213.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2015 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/2015-12-13_00-02-04/zip/netbeans-trunk-nightly-201512130002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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/A3432F57D9B3B4AD62CB0B294EEC43D12FCF3F62-ko4j-1.2.3.jar
+	http://hg.netbeans.org/binaries/78DD1C0B4EDC348FF4DCD0616597BB809AAE248D-net.java.html-1.2.3.jar
+	http://hg.netbeans.org/binaries/7BA1E1C450BCD0AD9D0D2F6797A2EB50A4822E0E-net.java.html.boot-1.2.3.jar
+	http://hg.netbeans.org/binaries/068B9902E65F2292C9EA30E5423E41FB6B30D8AA-net.java.html.boot.fx-1.2.3.jar
+	http://hg.netbeans.org/binaries/8621531E83EC4850DA61AA2266FE41105C304F40-net.java.html.boot.script-1.2.3.jar
+	http://hg.netbeans.org/binaries/24824B1E8C2A2D3A5C471F5875BF61F27E8916DB-net.java.html.geo-1.2.3.jar
+	http://hg.netbeans.org/binaries/F41518385DA4B5682C864F19B82C3BA4AF65AE83-net.java.html.json-1.2.3.jar
+	http://hg.netbeans.org/binaries/989A81454D4FA962EB1C158FE794D2EB060AB9F6-net.java.html.sound-1.2.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"
+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-r14-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}"/A3432F57D9B3B4AD62CB0B294EEC43D12FCF3F62-ko4j-1.2.3.jar o.n.html.ko4j/external/ko4j-1.2.3.jar || die
+	ln -s "${DISTDIR}"/78DD1C0B4EDC348FF4DCD0616597BB809AAE248D-net.java.html-1.2.3.jar net.java.html/external/net.java.html-1.2.3.jar || die
+	ln -s "${DISTDIR}"/7BA1E1C450BCD0AD9D0D2F6797A2EB50A4822E0E-net.java.html.boot-1.2.3.jar net.java.html.boot/external/net.java.html.boot-1.2.3.jar || die
+	ln -s "${DISTDIR}"/068B9902E65F2292C9EA30E5423E41FB6B30D8AA-net.java.html.boot.fx-1.2.3.jar net.java.html.boot.fx/external/net.java.html.boot.fx-1.2.3.jar || die
+	ln -s "${DISTDIR}"/8621531E83EC4850DA61AA2266FE41105C304F40-net.java.html.boot.script-1.2.3.jar net.java.html.boot.script/external/net.java.html.boot.script-1.2.3.jar || die
+	ln -s "${DISTDIR}"/24824B1E8C2A2D3A5C471F5875BF61F27E8916DB-net.java.html.geo-1.2.3.jar net.java.html.geo/external/net.java.html.geo-1.2.3.jar || die
+	ln -s "${DISTDIR}"/F41518385DA4B5682C864F19B82C3BA4AF65AE83-net.java.html.json-1.2.3.jar net.java.html.json/external/net.java.html.json-1.2.3.jar || die
+	ln -s "${DISTDIR}"/989A81454D4FA962EB1C158FE794D2EB060AB9F6-net.java.html.sound-1.2.3.jar net.java.html.sound/external/net.java.html.sound-1.2.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
+	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-r14-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 libs.jna.platform/external jna platform.jar jna-platform-4.1.0.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.1.0.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=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm hamcrest-core-1.3.jar && dosym /usr/share/hamcrest-core-1.3/lib/hamcrest-core.jar ${instdir}/hamcrest-core-1.3.jar || die
+	rm jhall-2.0_05.jar && dosym /usr/share/javahelp/lib/jhall.jar ${instdir}/jhall-2.0_05.jar || die
+	rm jna-4.1.0.jar && dosym /usr/share/jna/lib/jna.jar ${instdir}/jna-4.1.0.jar || die
+	rm jna-platform-4.1.0.jar && dosym /usr/share/jna/lib/platform.jar ${instdir}/jna-platform-4.1.0.jar || die
+	rm junit-4.12.jar && dosym /usr/share/junit-4/lib/junit.jar ${instdir}/junit-4.12.jar || die
+	rm osgi.cmpn-4.2.jar && dosym /usr/share/osgi-compendium/lib/osgi-compendium.jar ${instdir}/osgi.cmpn-4.2.jar || die
+	rm osgi.core-5.0.0.jar && dosym /usr/share/osgi-core-api/lib/osgi-core-api.jar ${instdir}/osgi.core-5.0.0.jar || die
+	rm swing-layout-1.0.4.jar && dosym /usr/share/swing-layout-1/lib/swing-layout.jar ${instdir}/swing-layout-1.0.4.jar || die
+	rm testng-6.8.1-dist.jar && dosym /usr/share/testng/lib/testng.jar ${instdir}/testng-6.8.1-dist.jar || die
+	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 ced2f0c..5e22ef8 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd231
 DIST netbeans-trunk-nightly-201512090002-src.zip 209228578 SHA256 dedd023e1e8fe3ad332bf923abf62814f76a02e484733b724d16754f3da958a1 SHA512 c7aa770074a8f4f4fa13190a4facf829d2dc6de5a3c8045ba79e9f5689332b506ff1330470dea33b38b1b7cb9e17361eff71d2b221f0fc906bdb8cd918ff2e8b WHIRLPOOL 96be2ab1293f0ab957b7da2c3266f2b4d77ec7b724a9c1c40045f512ad7ec9c99919d29643aaf1ecd8a7667321d0468eebb71f3219e117d214da618ca105dedb
 DIST netbeans-trunk-nightly-201512100002-src.zip 209233507 SHA256 2fb62cd1de0008f085b2559062e0ee25bffa593694042ab198c5c7aaf3f2c6f3 SHA512 75ae18ae344585faf93b2532e4aa16787b6e69d7a2a7402af3cb80a3585d1ae8e80efa981713e314c0c6c51c1d6a81d4bd5a91a1ca0ef1aaa17862bbdf84ce74 WHIRLPOOL 2d6cb6235ddf4a7a8c2157b517c4ae26cd50d272923d26f040e9bc5f4f664d91aa0b7815df40c75e812f6aa7c3c05289e538e20a5b0ce593b7e0736c9bd40e93
 DIST netbeans-trunk-nightly-201512110002-src.zip 209266196 SHA256 fa400d1944c8710ac2c26b9d63660e83b596b7fbe71d99c028871676a6ae2777 SHA512 ecd22150fb26c940240a9183f27d9a850850ddaadaf0646941f919fcfe9344734eb1883ec91027c909b88ab3efbe48e426fe99b4a404e0d803162d833ad9e41d WHIRLPOOL 9fc37da17f6e1d8727be1ed41513cd50c70991c75f404b665bf3d2c5bcc28afef5ff71ae09b0e77ee00663aadaca1f42841ef214a4e33926d50fa927de52c6eb
+DIST netbeans-trunk-nightly-201512130002-src.zip 209278259 SHA256 94c60bfa105a3f5f8a5227f79bae5e4795668b49443e66a164dd86b3d74ce84c SHA512 0b6cd638150f3bde87c9d6ce1c5b1c59b4330392ac76661cb20167305536ed3eb94307a2a3feaa7e5a727008a565723117bc78d9fb22a60565d99060a8da9600 WHIRLPOOL 98d0dde6bb37df4cff8269796caaa7c2066e91e4651b6aeeb6dd5bd7a5047420e89e257e581d316e705b39d6a5b5ed6371b8b9c84f8240cae1217a4d5e7adb58
 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_p20151108.ebuild 3472 SHA256 b644fc21c4f8f889dd91ff8b42af083262989ab30f090f9271a317cb3812b375 SHA512 8b056259a81f39fb47dcfe274344d0b5f71db673c3f06dd620e6074960f74a588e8417ad2887110d0793bcd08227a5cc907336d973654b912a33d4a261e368b3 WHIRLPOOL 762a3ed39e9883af2a86eea0a9d75f3725eb5a793520a91c6dff61a641b68b34325aebc747f264ea535e3e0974dc6b2cc513238effe79d2d65785bd051648412
@@ -65,4 +66,5 @@ EBUILD netbeans-profiler-9999_p20151208.ebuild 3472 SHA256 12064cc2c9fad68586559
 EBUILD netbeans-profiler-9999_p20151209.ebuild 3472 SHA256 9fcb04294cb3340227b7e8384ac308d576290adfcb336c928394d1b531badd81 SHA512 28e794d35255cb1ddfa2071cb6e7885ecf734dc48654fb52a6c521748c0a2a807d92d3647b4cb28d442f85d1a80300c72125019c53f88338a072af05a30993a3 WHIRLPOOL 6634e6e16e3addf23d2b47e12d1b4ca39cfa147003c3ce7b71efc4fa14e2213a54af555ee077414d8cdfd07c102f08843b48982ef11942fb2545725c0442c2b2
 EBUILD netbeans-profiler-9999_p20151210.ebuild 3472 SHA256 9c1d330418770835f88ef77162689acb4bbad4a5a2a7534fb39e10fd0660e7f1 SHA512 5f352cb3b00a360672de0e164349f313377c255566b5dfae9516aca8c0e19ef8d3b1bfcba6d8d7e7282f6cafecd95cb032d705b4451e2860a7db7aa0d54885d1 WHIRLPOOL 2ea80c7be201e065243f96dc08695c08b319e1fbbcf78239eecfd2d9c4635284d978637774b37ac22cb457100fcdb814c1ae17039e4efb30c1447808bc89d41a
 EBUILD netbeans-profiler-9999_p20151211.ebuild 3472 SHA256 e03795e33fd350ba8d574579ca5b8927da4054073a435dd4e3c964867a26e84d SHA512 72709c482dcd835cf7bb54df3ab3dea182eb8d9fda3e196e0d8d5636c7ee1af67858a70de42d753aabe9d58d73fad14d8a89f2b413653978b062b90c7c07e3ef WHIRLPOOL 61e5e213a1727aab2138a950b403ba47878ee0392a990488bd1b918ac92da5db7f28b2932bc72ddfd5710d4b8c492b3739f213c76b291f680b13268cd6aa467d
+EBUILD netbeans-profiler-9999_p20151213.ebuild 3472 SHA256 c356dfce5ccd08103552a27cfc25f39f0c96996326de8fd0788061274dc662a3 SHA512 468001f7b5a418d297b2d72fbdf05946d273c71b92fe29c5644a5de394790adb61098075690b23c2f731886249c9eef7c6fbe1f48a8f8527f8ed5cb031b97751 WHIRLPOOL 92ade9e4e9626db3dd5d45584ff572a474faf7ccfeb8ffa1877fd5c0325d55776523662728ebbb41fa3aa72a0d758d6d76b82cb9ae93e96e5164fd44464978eb
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20151213.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20151213.ebuild
new file mode 100644
index 0000000..79242a7
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20151213.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2015 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/2015-12-13_00-02-04/zip/netbeans-trunk-nightly-201512130002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-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 b21acaf..a7bd2e2 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -42,6 +42,7 @@ DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd231
 DIST netbeans-trunk-nightly-201512090002-src.zip 209228578 SHA256 dedd023e1e8fe3ad332bf923abf62814f76a02e484733b724d16754f3da958a1 SHA512 c7aa770074a8f4f4fa13190a4facf829d2dc6de5a3c8045ba79e9f5689332b506ff1330470dea33b38b1b7cb9e17361eff71d2b221f0fc906bdb8cd918ff2e8b WHIRLPOOL 96be2ab1293f0ab957b7da2c3266f2b4d77ec7b724a9c1c40045f512ad7ec9c99919d29643aaf1ecd8a7667321d0468eebb71f3219e117d214da618ca105dedb
 DIST netbeans-trunk-nightly-201512100002-src.zip 209233507 SHA256 2fb62cd1de0008f085b2559062e0ee25bffa593694042ab198c5c7aaf3f2c6f3 SHA512 75ae18ae344585faf93b2532e4aa16787b6e69d7a2a7402af3cb80a3585d1ae8e80efa981713e314c0c6c51c1d6a81d4bd5a91a1ca0ef1aaa17862bbdf84ce74 WHIRLPOOL 2d6cb6235ddf4a7a8c2157b517c4ae26cd50d272923d26f040e9bc5f4f664d91aa0b7815df40c75e812f6aa7c3c05289e538e20a5b0ce593b7e0736c9bd40e93
 DIST netbeans-trunk-nightly-201512110002-src.zip 209266196 SHA256 fa400d1944c8710ac2c26b9d63660e83b596b7fbe71d99c028871676a6ae2777 SHA512 ecd22150fb26c940240a9183f27d9a850850ddaadaf0646941f919fcfe9344734eb1883ec91027c909b88ab3efbe48e426fe99b4a404e0d803162d833ad9e41d WHIRLPOOL 9fc37da17f6e1d8727be1ed41513cd50c70991c75f404b665bf3d2c5bcc28afef5ff71ae09b0e77ee00663aadaca1f42841ef214a4e33926d50fa927de52c6eb
+DIST netbeans-trunk-nightly-201512130002-src.zip 209278259 SHA256 94c60bfa105a3f5f8a5227f79bae5e4795668b49443e66a164dd86b3d74ce84c SHA512 0b6cd638150f3bde87c9d6ce1c5b1c59b4330392ac76661cb20167305536ed3eb94307a2a3feaa7e5a727008a565723117bc78d9fb22a60565d99060a8da9600 WHIRLPOOL 98d0dde6bb37df4cff8269796caaa7c2066e91e4651b6aeeb6dd5bd7a5047420e89e257e581d316e705b39d6a5b5ed6371b8b9c84f8240cae1217a4d5e7adb58
 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_p20151108.ebuild 4991 SHA256 f07bba087f8e27e54fd7da8b1048d3a8ef508f4fe73d95a58de0f69b43bb24b3 SHA512 ad625edcc7465d8edc6dc2b6d79d21eaf8d9c399ddb2a9fe1e525ad5c6020795cf3e50dcaf20f185d5e2a13c32d763e935aa77a181819c1ee62fdea9ae28276c WHIRLPOOL f27de56df620ce524d4a7e8e4506f43c90afbcd7cd54808368594fea6abf2fbbdd0aa92ddf0cfe3fa8ebd984f8679d1aa8cda6bd720f0bfc1d7908917d6b7e01
@@ -74,4 +75,5 @@ EBUILD netbeans-webcommon-9999_p20151208.ebuild 4590 SHA256 70aca054ee50ae9e1687
 EBUILD netbeans-webcommon-9999_p20151209.ebuild 4590 SHA256 7ede7f60d16ec3919a1be694477c90800d93df65d1ebba21cb5d4b7210a05daa SHA512 06a8c9d381985b6e3c497cf51b2e6ad3ff243115eece071a08cd5f18d6618bafeea6e52904960b4139ca1df074c34e6f2f58b77665fa9c2dabe72cab3114f1ad WHIRLPOOL d30e18aff9f2219028e5ff27802dff816ee3a1c9c7853e55ff40cc9aac98b99d59420439244a9e4debb9ead0a706f96339ddcc178ba7f0fe0e221ad0cc4dfc38
 EBUILD netbeans-webcommon-9999_p20151210.ebuild 4590 SHA256 a6243964670c3d85ac343a58ec818a64ca9be8d0cce8ef94f5aea328c6d69317 SHA512 56f5240d6f659998007d9369f04d5d43505a71e461a2b62a4e299c147ae2ec56f56d5fb1d8272ef7f00873b5a9f1055ec5cd2ef1544701f4920bb48aafa5f49e WHIRLPOOL 554650d2733238aa323e13ac2908d9f5e6ff844d7afb09149f3cf5c2b2633e82bf29b06780885e86abc10d62ec206463ed01134184b33c316eb0c9e231a29eae
 EBUILD netbeans-webcommon-9999_p20151211.ebuild 4590 SHA256 c4097785598998f18dde077a5071f38dc922d372be23c3dab0b3a2faa02a4bf1 SHA512 40c33008b579af8424bbcf0c6cbeca48f6ca0f4482686ae7bfde1ec9d5075d5da5b4f3e2f9dea4383b69656dfbc519992c44852496da049e04eca14e9bd6b9e6 WHIRLPOOL d060e89b850690b1a02bf83c4b831529fcc8ebbf0ce02ee69ecb5168ed818189b6242b1d5239671a99bc963ce854cf710094ea038bb6e67d6bf139e49808a83d
+EBUILD netbeans-webcommon-9999_p20151213.ebuild 4590 SHA256 2f234615c9ba1a4baff5de241184a4617f729afb5f8c5c33d13bedf658f6b5dc SHA512 b4802c10d4045b7e15ec0d499b531b41b6b1d66d5cecfbbb64796836acd2da660173b401af5b8b1ba1a3cc505a6154dec7f8849a10dbaee1038d452000747e07 WHIRLPOOL 0557fe490f385afa1150b41d8ba991b3078434e99a7f09fddabe1237c539a9c1927cc350dcc7e0ace50a5a5271c59fea8dd621e271b7550ec2c5c03b97a2f0b0
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20151213.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20151213.ebuild
new file mode 100644
index 0000000..be0da8b
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20151213.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2015 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/2015-12-13_00-02-04/zip/netbeans-trunk-nightly-201512130002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar
+	http://hg.netbeans.org/binaries/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim
+	http://hg.netbeans.org/binaries/9D29F2A9722C91A403F32971E97DD0E49E97B02E-libiDeviceNativeBinding.dylib
+	http://hg.netbeans.org/binaries/9F0D0D95F57E73C0110FA023813A4F9756D543B1-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/D05B7274396C8EED185207399B6D0400DE347DB7-libusbmuxd.2.dylib"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.webcommon -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar libs.plist/external/dd-plist.jar || die
+	ln -s "${DISTDIR}"/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim cordova.platforms.ios/external/ios-sim || die
+	ln -s "${DISTDIR}"/9D29F2A9722C91A403F32971E97DD0E49E97B02E-libiDeviceNativeBinding.dylib cordova.platforms.ios/external/libiDeviceNativeBinding.dylib || die
+	ln -s "${DISTDIR}"/9F0D0D95F57E73C0110FA023813A4F9756D543B1-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}"/D05B7274396C8EED185207399B6D0400DE347DB7-libusbmuxd.2.dylib cordova.platforms.ios/external/libusbmuxd.2.dylib || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/webcommon >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+	grep -E "/webcommon$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/webcommon
+}

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 2008d8c..117b4fe 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd231
 DIST netbeans-trunk-nightly-201512090002-src.zip 209228578 SHA256 dedd023e1e8fe3ad332bf923abf62814f76a02e484733b724d16754f3da958a1 SHA512 c7aa770074a8f4f4fa13190a4facf829d2dc6de5a3c8045ba79e9f5689332b506ff1330470dea33b38b1b7cb9e17361eff71d2b221f0fc906bdb8cd918ff2e8b WHIRLPOOL 96be2ab1293f0ab957b7da2c3266f2b4d77ec7b724a9c1c40045f512ad7ec9c99919d29643aaf1ecd8a7667321d0468eebb71f3219e117d214da618ca105dedb
 DIST netbeans-trunk-nightly-201512100002-src.zip 209233507 SHA256 2fb62cd1de0008f085b2559062e0ee25bffa593694042ab198c5c7aaf3f2c6f3 SHA512 75ae18ae344585faf93b2532e4aa16787b6e69d7a2a7402af3cb80a3585d1ae8e80efa981713e314c0c6c51c1d6a81d4bd5a91a1ca0ef1aaa17862bbdf84ce74 WHIRLPOOL 2d6cb6235ddf4a7a8c2157b517c4ae26cd50d272923d26f040e9bc5f4f664d91aa0b7815df40c75e812f6aa7c3c05289e538e20a5b0ce593b7e0736c9bd40e93
 DIST netbeans-trunk-nightly-201512110002-src.zip 209266196 SHA256 fa400d1944c8710ac2c26b9d63660e83b596b7fbe71d99c028871676a6ae2777 SHA512 ecd22150fb26c940240a9183f27d9a850850ddaadaf0646941f919fcfe9344734eb1883ec91027c909b88ab3efbe48e426fe99b4a404e0d803162d833ad9e41d WHIRLPOOL 9fc37da17f6e1d8727be1ed41513cd50c70991c75f404b665bf3d2c5bcc28afef5ff71ae09b0e77ee00663aadaca1f42841ef214a4e33926d50fa927de52c6eb
+DIST netbeans-trunk-nightly-201512130002-src.zip 209278259 SHA256 94c60bfa105a3f5f8a5227f79bae5e4795668b49443e66a164dd86b3d74ce84c SHA512 0b6cd638150f3bde87c9d6ce1c5b1c59b4330392ac76661cb20167305536ed3eb94307a2a3feaa7e5a727008a565723117bc78d9fb22a60565d99060a8da9600 WHIRLPOOL 98d0dde6bb37df4cff8269796caaa7c2066e91e4651b6aeeb6dd5bd7a5047420e89e257e581d316e705b39d6a5b5ed6371b8b9c84f8240cae1217a4d5e7adb58
 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_p20151108.ebuild 2721 SHA256 64c807ca4e7b5ee3279a095a873981d08f888f3bf1ff47d0ef9082abb243764c SHA512 f9cab2e5d6b724bd9ca4580147ec840759fe7a699f46930cdd38e30244062e77a6acd780d1c5d04142b4696a0eaa44bf41faf869a590eb37b8c94f3eb96d62b3 WHIRLPOOL 9811147b40aad18f99d2e6517d716b9edb15721cae9660478cf57b054ef81bbd170a74229bae4f3d870c8e035a807ca632b87d4e884890a35d42c61082a7af94
@@ -65,4 +66,5 @@ EBUILD netbeans-websvccommon-9999_p20151208.ebuild 2721 SHA256 6b1b9f15fa7895faa
 EBUILD netbeans-websvccommon-9999_p20151209.ebuild 2721 SHA256 fe4c3c202ea8decc24de3d1ed81ff1e53bacde414e76efc6b48c6098590190c3 SHA512 f29252ed0aa5ecb967b2db31b647674ef359005d06918f4a6d2fbf25c21f1fc63e72b437193c0e7901d90a898ed44193c063539a115a7d2fbd15aca27d807051 WHIRLPOOL a797f1885940b4269f80932917ca6dd18b2288ea1bdda06baa7dbc0670955f107c7e7d57e18ef124c917dab8aa064df125c3d99ef66eee9686538012ea0c7009
 EBUILD netbeans-websvccommon-9999_p20151210.ebuild 2721 SHA256 e65dff2e62c6388c775fefb5e79c5f16f343d81d10f6ca63f2b0b1fe7a9fb731 SHA512 73e2d0d84349930747ef9679ef6ab8b65f80f8b8c334fdb05fa2cc20e8d639b3bd2bec24fc17e8b8426d727fc49cd7c1ea9ec14a4e13ebef8f8bd2d0a3085c47 WHIRLPOOL d6215538aedcaea47e0efed77dc69ab8c021450d62fdfbc0b8d1ec57c6eed58ccfdd0d32c8cf6e7e9576b296d002b7a81da7b659a68497fe78ebe4e11bec1a73
 EBUILD netbeans-websvccommon-9999_p20151211.ebuild 2721 SHA256 1a0e0625cfa21d557802a11f76804c7067a21d24024e64134ea4efc8390d910a SHA512 55fb9c9daac90f607adfcd435ad091bef57d0d658fa5a981ca24b043a7facd6d0a36e2e4c339d5efd244d62ed4ab2c840d76e89b75faa59bcddeaa71c5164c75 WHIRLPOOL 6ccde2c66438ce014e6f218a3bbef5d846fda864320d2b73acd4b41c4a1185bdbbdc892dc989495fa954beac9ad0772eefb522a74ef832da85cfc1fed5af9a7e
+EBUILD netbeans-websvccommon-9999_p20151213.ebuild 2721 SHA256 1ffe9d910696b34b526dc0b858a0c7d48c98e8cc9694fffb81dc394325b72844 SHA512 a1300e3ebea5d8484f632a58c19eecc4a9a1dacd0a92d5d6bac1ba55314153cd056c17d4b9ffee85bce404869762bac35555afe31601158eb8a6b393c2138e62 WHIRLPOOL 5006febab26f75498237c0dc0defa34a6adf096ad19b4e98ccdcd57963ca7183b6067f9ef5faea5d65e1ef00a16294321019f81caf7b38bece7858e787373477
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20151213.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20151213.ebuild
new file mode 100644
index 0000000..d18afdb
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20151213.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 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/2015-12-13_00-02-04/zip/netbeans-trunk-nightly-201512130002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-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 dc46f69..12c1c11 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd231
 DIST netbeans-trunk-nightly-201512090002-src.zip 209228578 SHA256 dedd023e1e8fe3ad332bf923abf62814f76a02e484733b724d16754f3da958a1 SHA512 c7aa770074a8f4f4fa13190a4facf829d2dc6de5a3c8045ba79e9f5689332b506ff1330470dea33b38b1b7cb9e17361eff71d2b221f0fc906bdb8cd918ff2e8b WHIRLPOOL 96be2ab1293f0ab957b7da2c3266f2b4d77ec7b724a9c1c40045f512ad7ec9c99919d29643aaf1ecd8a7667321d0468eebb71f3219e117d214da618ca105dedb
 DIST netbeans-trunk-nightly-201512100002-src.zip 209233507 SHA256 2fb62cd1de0008f085b2559062e0ee25bffa593694042ab198c5c7aaf3f2c6f3 SHA512 75ae18ae344585faf93b2532e4aa16787b6e69d7a2a7402af3cb80a3585d1ae8e80efa981713e314c0c6c51c1d6a81d4bd5a91a1ca0ef1aaa17862bbdf84ce74 WHIRLPOOL 2d6cb6235ddf4a7a8c2157b517c4ae26cd50d272923d26f040e9bc5f4f664d91aa0b7815df40c75e812f6aa7c3c05289e538e20a5b0ce593b7e0736c9bd40e93
 DIST netbeans-trunk-nightly-201512110002-src.zip 209266196 SHA256 fa400d1944c8710ac2c26b9d63660e83b596b7fbe71d99c028871676a6ae2777 SHA512 ecd22150fb26c940240a9183f27d9a850850ddaadaf0646941f919fcfe9344734eb1883ec91027c909b88ab3efbe48e426fe99b4a404e0d803162d833ad9e41d WHIRLPOOL 9fc37da17f6e1d8727be1ed41513cd50c70991c75f404b665bf3d2c5bcc28afef5ff71ae09b0e77ee00663aadaca1f42841ef214a4e33926d50fa927de52c6eb
+DIST netbeans-trunk-nightly-201512130002-src.zip 209278259 SHA256 94c60bfa105a3f5f8a5227f79bae5e4795668b49443e66a164dd86b3d74ce84c SHA512 0b6cd638150f3bde87c9d6ce1c5b1c59b4330392ac76661cb20167305536ed3eb94307a2a3feaa7e5a727008a565723117bc78d9fb22a60565d99060a8da9600 WHIRLPOOL 98d0dde6bb37df4cff8269796caaa7c2066e91e4651b6aeeb6dd5bd7a5047420e89e257e581d316e705b39d6a5b5ed6371b8b9c84f8240cae1217a4d5e7adb58
 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_p20151108.ebuild 6938 SHA256 09590df8e01073033870c56208c690284a011d219e5a9bd2971c738c2b479059 SHA512 0aad12265eff96c0a821300abb77fcc8028f92a8a534a440cd10280a37df61691b75c4e6ec5a937a076689c2919c51e22b773ac0f4028a1be201642ceb60c4b8 WHIRLPOOL ea5902f79f79cf1fba78cada2bfeae11d63c2c33bb5f72d389cf9e4669601d8aa603bf80a802b19a11da60211d17f90d51ca522883cfbded412f3e6002f25478
@@ -68,4 +69,5 @@ EBUILD netbeans-9999_p20151208.ebuild 6938 SHA256 6c6d3bdf12e570a411aecb3f0bd542
 EBUILD netbeans-9999_p20151209.ebuild 6938 SHA256 1effd8addb5cdd60454605e6353dffd3a8deb208b72c88687d88a76dcdaaf718 SHA512 c862525835100b2f7ecdd9b8b35aedc8fef14ba8f7233c97fe2ebeb621d9b15245b131562ad55e89646de2c004366d1e6289b5c780056138e51887c529f94f7a WHIRLPOOL 65b50bf9e347b375d8a9080175a8a20cc407f30ca403095f9e92cc3601df9bf39b1a7600300be58b8a18db2a89c05bd42772b1c697cb8b0d2cda476cf27aead6
 EBUILD netbeans-9999_p20151210.ebuild 6938 SHA256 35b8965aa69c1b3650b4df98b6aa48ec7aa963ba092888e4ed88fb3397e2db93 SHA512 8e63b6de8b36a4f93c30171b2a0ec3e2ea46c2d6fb3ffa68b553f063f2f8135a7162f385d58187f21ffb0a1525d3f5ecd27b8baf4c5cc1f013a927a617582365 WHIRLPOOL 9e9328ee7a8404318d5691369d16ad6b5d244625e33cdfd0e10804c30f61e91fb2e2f97bc77d04d3b25167d078e9b070f1a7123beccff4095709fdb338f94075
 EBUILD netbeans-9999_p20151211.ebuild 6938 SHA256 d430230560774f345b916bd8f2da6991cdb901eeb15f6618c1465ad3ddf49209 SHA512 8f07feec93d8060e3363dde1e7f22997b34ab33ad06ec018c96527972c149383fe07302bd09977187e183f3c4c3a7b1f8ca61c105030436e3bd5f46dcb339448 WHIRLPOOL 87bed4b448bc085f9998d96fff019b49daca0f9328b6e3d7658f252e8757ae278627896eecc96890a8c9a6e988d5ad4b465941d385dcb56d775e6d57ad99cd3d
+EBUILD netbeans-9999_p20151213.ebuild 6938 SHA256 fcbb5862b6b2d7065ed5b4ac7f89a158ea9798b5841e2843038128eb488408ab SHA512 f8d7cc684186eaa641b4ef00a4644682081d6a0a5785f25929f13cce075e17bb8c21fa9c1dc32ceb9d2c7ce225245ef18a72b9701abe25dcef6b366ebdf5b3d5 WHIRLPOOL 55fca28bc4a8495f6b58f7f21a04c973480d9475545ce3008cac1f0653c697dabdb447c7ba9aa2db2a1a9d3130244dc7e9c207ddabd304aa45720389103998fd
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

diff --git a/dev-util/netbeans/netbeans-9999_p20151213.ebuild b/dev-util/netbeans/netbeans-9999_p20151213.ebuild
new file mode 100644
index 0000000..a5947fe
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20151213.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2015 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/2015-12-13_00-02-04/zip/netbeans-trunk-nightly-201512130002-src.zip"
+PATCHES_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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-r14-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-r14-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
+}