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

[Miroslav Šulc]

commit:     f111ea6b14d2d99c0868ee9718ec0d53b351546f
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 11 14:06:49 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Dec 11 14:06:49 2015 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=f111ea6b

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.2.26

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 5b6e420..4faf26f 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc649
 DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd2312ceee02e5b5175bf7f94ee13b0552e02be72250922326ae4d1 SHA512 f7a48ace418b6dfcb52c4dacbade6d7c675f431606927fb8a201ae091b6a2366cade7eaf756b108e5b0eb4f285c94d6228e74878d7fa5d3117c28e77df2caae1 WHIRLPOOL aeb5eafcedb7f2d108713f801cdc1f3972dbc1f9589d29f7d84f7eeebab6a970a48b05f2672eda41bf282faf3a6ed987917cfbfc30b0b1bf873af894c5bf18af
 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
 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_p20151101.ebuild 3384 SHA256 b3f926315b537a1251a52f68858d9dd21d2b77c54366aa23825b90c4d954bd77 SHA512 24367c9d4c2be458fa0aaf1e1d367834a32fce2db8853384b590643005371355a1ff98b5f3da5417cf4e316485cd18528779db2b6ae7ae857eb6fe6888ca99a0 WHIRLPOOL 295d1ad2b6c0c714aa77647feec6c3f9183325884a49142e49c787389b390481bee547287d3539508b3aef69e9141440d2dfefee393ab3333c5e3e6715d04249
@@ -69,4 +70,5 @@ EBUILD netbeans-apisupport-9999_p20151207.ebuild 3384 SHA256 dbcd0e96f73e86641ef
 EBUILD netbeans-apisupport-9999_p20151208.ebuild 3384 SHA256 8423ef681314c69c97817673ca84832a36cc1e7ef081f8cb297dcc1e6f5feddb SHA512 9d5a17df154fbabf6ae5c96e7e403892e53d2ccf70c40fcc99002518e65e86d192eb27731bfc35e4d7cb79ed21cfc6aefbbf41eef9ca40a0983955a17b963fe9 WHIRLPOOL fdebb42bf6e877969768846b96e914368ba09e2b39f18666babb43d1a5b78b3af442db35649f3c10b70c137ef3abf3e12985cdfd774c7850ec94b03f3f885997
 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
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20151211.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20151211.ebuild
new file mode 100644
index 0000000..cf85460
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20151211.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-11_00-02-04/zip/netbeans-trunk-nightly-201512110002-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 3344d4a..4500065 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -46,6 +46,7 @@ DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc649
 DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd2312ceee02e5b5175bf7f94ee13b0552e02be72250922326ae4d1 SHA512 f7a48ace418b6dfcb52c4dacbade6d7c675f431606927fb8a201ae091b6a2366cade7eaf756b108e5b0eb4f285c94d6228e74878d7fa5d3117c28e77df2caae1 WHIRLPOOL aeb5eafcedb7f2d108713f801cdc1f3972dbc1f9589d29f7d84f7eeebab6a970a48b05f2672eda41bf282faf3a6ed987917cfbfc30b0b1bf873af894c5bf18af
 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
 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_p20151101.ebuild 4790 SHA256 94dacae8078cd932314c67fddf63b942d26f2be2cd253c7c7edf4474f7a6a9cf SHA512 503d648dc3116dd856e4e8df0c73c8ced5c05cf590e6ba959bb4b217c48c9b3fb901e9a87ccf7646f5f7a3d373fb503e63d585d1a2c47c94354dbe85ff696a83 WHIRLPOOL d8f6bd7e0af32c57776e4c5bf9d7741c4f74b331124e7a62e76c70e296c3d73b17c36e2c84fe9e9f3ffb90837e8764d30b5628c9312be8b1aa7fea51d11a0220
@@ -80,4 +81,5 @@ EBUILD netbeans-cnd-9999_p20151207.ebuild 4790 SHA256 a7c2735a4a90e20a509cea1a82
 EBUILD netbeans-cnd-9999_p20151208.ebuild 4790 SHA256 417a8c7790a36f8c407390ec8c2e17ad83a56deb10b74ea700004eaa16c3a520 SHA512 e8ec7cfad2efc699a8cd62a4c603c5fb9166ab096c5eee8aee1c193585359aaf1575b0675c558767290dba879200d9ec7236bc6e1f2e5e98178a242cc3e4cd58 WHIRLPOOL ccd282f51bdacc2f4e751bb60a4fa13ffb6dfaacd1f9fdbe6bfa40276066ed3f65823f9fb2210e2946719fc2230512ca9893e757c83f7e0c5e7cdc6757d651d1
 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
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20151211.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20151211.ebuild
new file mode 100644
index 0000000..bbe1e6f
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20151211.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-11_00-02-04/zip/netbeans-trunk-nightly-201512110002-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 ab43c00..ae274b7 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc649
 DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd2312ceee02e5b5175bf7f94ee13b0552e02be72250922326ae4d1 SHA512 f7a48ace418b6dfcb52c4dacbade6d7c675f431606927fb8a201ae091b6a2366cade7eaf756b108e5b0eb4f285c94d6228e74878d7fa5d3117c28e77df2caae1 WHIRLPOOL aeb5eafcedb7f2d108713f801cdc1f3972dbc1f9589d29f7d84f7eeebab6a970a48b05f2672eda41bf282faf3a6ed987917cfbfc30b0b1bf873af894c5bf18af
 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
 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_p20151101.ebuild 2968 SHA256 06c21031f7d09c2e9370e34a30a3b16221ccfdc7f46a2df689eb4da864f3f5ce SHA512 b10e952eaaefdd08d70e4e5ecc03fb8aa9ee82ff55b141907cad269144c89cd97b7a10135e586bf814d4bf5f060c88dcd009a57ed6f5ab55e4784b36b77c0179 WHIRLPOOL 84038d5517651f7f92856e57d4847041ed8105ca606723121b548a20ae973f058497aa910d4ec244d29e3c8f56dd54fac1568ac108405ae007115496d2e65f0a
@@ -72,4 +73,5 @@ EBUILD netbeans-dlight-9999_p20151207.ebuild 2968 SHA256 a1ce05646b14c2f90ae9dfc
 EBUILD netbeans-dlight-9999_p20151208.ebuild 2968 SHA256 d71feb506bfc89c2d439e201c567a161bbb586c555267af5c124dd2fb3ec0cfe SHA512 c9d2de53126ae75e67564a38b835f4d4eb09414d4cf4bd4359f4a3d74a67d8607b3754ec667b654b5a5c097ce4da98470f3bbe5c687fe58703738ef04d945433 WHIRLPOOL 5800e21ffca3a72ecbc6d50e383fc069317f56df26780ea44b00bbf9b8e8260b00a25b347d34ab38a5d60056e2ee1bfd7b3711a02d51a18187c145c1c13c5e3f
 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
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20151211.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20151211.ebuild
new file mode 100644
index 0000000..a9a2ab4
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20151211.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-11_00-02-04/zip/netbeans-trunk-nightly-201512110002-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 afb0d95..92702df 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -67,6 +67,7 @@ DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc649
 DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd2312ceee02e5b5175bf7f94ee13b0552e02be72250922326ae4d1 SHA512 f7a48ace418b6dfcb52c4dacbade6d7c675f431606927fb8a201ae091b6a2366cade7eaf756b108e5b0eb4f285c94d6228e74878d7fa5d3117c28e77df2caae1 WHIRLPOOL aeb5eafcedb7f2d108713f801cdc1f3972dbc1f9589d29f7d84f7eeebab6a970a48b05f2672eda41bf282faf3a6ed987917cfbfc30b0b1bf873af894c5bf18af
 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
 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
@@ -103,4 +104,5 @@ EBUILD netbeans-enterprise-9999_p20151207.ebuild 15936 SHA256 d0df2f25fbd06b8f8b
 EBUILD netbeans-enterprise-9999_p20151208.ebuild 15936 SHA256 a3dbc3edeb761078c8ddd1aa2dcd75048539a0413ec36c26b2a4f1ceb6f7af41 SHA512 261aea85cebf3d5cc933c79daef79c9a547a8e5a4f6758895ceef834e701bfee0af3b970b71e6f75156b0ccd03de24adb82ed8db81b0d59648f91c615906395e WHIRLPOOL 0c5e360badbf350dcad3f641e504a956673b34c46add461db19d74da0f669b28965c4a9ac1fd208bc2edea2258e50a44909e2c790c2ac25e9671cd37ec6df4bd
 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
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20151211.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20151211.ebuild
new file mode 100644
index 0000000..e44d4bf
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20151211.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-11_00-02-04/zip/netbeans-trunk-nightly-201512110002-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 4ff86a9..5eea64e 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc649
 DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd2312ceee02e5b5175bf7f94ee13b0552e02be72250922326ae4d1 SHA512 f7a48ace418b6dfcb52c4dacbade6d7c675f431606927fb8a201ae091b6a2366cade7eaf756b108e5b0eb4f285c94d6228e74878d7fa5d3117c28e77df2caae1 WHIRLPOOL aeb5eafcedb7f2d108713f801cdc1f3972dbc1f9589d29f7d84f7eeebab6a970a48b05f2672eda41bf282faf3a6ed987917cfbfc30b0b1bf873af894c5bf18af
 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
 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_p20151101.ebuild 2913 SHA256 e64dee7f488bc65ba05180351382835cda20706db8003176f2b222f44bd3a640 SHA512 2b96d3ba92763a5a4e3ab74ce3a36a3a8fda683773707655887d5e3648762ee179604898ac4eead36bbc407f6cf6575ccbb2eaf3ecd121699d15a71bfc28d7c5 WHIRLPOOL a46077092b9fee72f162c841db3f0ef1cd56b92ae3ef830982cc1149c21abae2fc59069199c57eefa3c46919cb7b7b22e354222aac3d02815a02bc05c5563518
@@ -69,4 +70,5 @@ EBUILD netbeans-ergonomics-9999_p20151207.ebuild 2913 SHA256 a5f0d445d144c808adf
 EBUILD netbeans-ergonomics-9999_p20151208.ebuild 2913 SHA256 a37a47c51effa8d5427be1f7303cea9f6bbfe19b658d4c6b3c3687c1048dea8d SHA512 93167f7f8921e062a54f94b2f09127278512288ffb43690d41d0dccf508599caf94615b5fd8dbfa81ba475b9dffc775a17249804768bc097a308217abe15d282 WHIRLPOOL d8386fb7c41ed7d59ac5519247b7ddcfb3cc781e11c2559b4e634a9350b510bbe392cff44b155b2782c8c667c5387e9b51640e9896e5c31674907fe842a495f2
 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
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20151211.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20151211.ebuild
new file mode 100644
index 0000000..efd97b0
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20151211.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-11_00-02-04/zip/netbeans-trunk-nightly-201512110002-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 04c212c..3338acb 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -37,6 +37,7 @@ DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc649
 DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd2312ceee02e5b5175bf7f94ee13b0552e02be72250922326ae4d1 SHA512 f7a48ace418b6dfcb52c4dacbade6d7c675f431606927fb8a201ae091b6a2366cade7eaf756b108e5b0eb4f285c94d6228e74878d7fa5d3117c28e77df2caae1 WHIRLPOOL aeb5eafcedb7f2d108713f801cdc1f3972dbc1f9589d29f7d84f7eeebab6a970a48b05f2672eda41bf282faf3a6ed987917cfbfc30b0b1bf873af894c5bf18af
 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
 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_p20151101.ebuild 3377 SHA256 50670db3b1a181e311ca642fdf2a0aefad271252e2db7b25c60197997fe789ad SHA512 74e53c74b461ffe9baa000a079909373851a5f2289f74df9e9b8cddff9c3a17205c0098c6ac446fa5a349cc0763c56d197bec4ffb96c494e4c64436e9aa1f235 WHIRLPOOL 4f50a5f170721bc52784510cdc55ef87e2a65e14bed00831d100920fd696effba0f7a9f3752244e7eb0fb7daa326dc12c4777b76eea95959701517e5e6af20aa
@@ -71,4 +72,5 @@ EBUILD netbeans-extide-9999_p20151207.ebuild 3377 SHA256 95ddb8bc31ba9277a7c6109
 EBUILD netbeans-extide-9999_p20151208.ebuild 3377 SHA256 b0011a68d558f7eacc310f8b77d514c18609e253dd086ba353cfac8ca970120e SHA512 7cbbe1cd2a9a872b0dd84ed27521e3f00829978963a830cfc3349a2cee1f563b67b3f06799cdb160aedfa6b2fe5852ceff16134b656549aac62a5943175aa0cd WHIRLPOOL 5917a1f5930f3557188a9b60e569bab7b1108d672ecea1fb5a0b1f8399458abc10bb9241873fac4db9982fe1c8e442847f943fc017cffc92483a96a63a05c858
 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
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20151211.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20151211.ebuild
new file mode 100644
index 0000000..17b06a5
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20151211.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-11_00-02-04/zip/netbeans-trunk-nightly-201512110002-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 6596ff4..97fa69c 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc649
 DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd2312ceee02e5b5175bf7f94ee13b0552e02be72250922326ae4d1 SHA512 f7a48ace418b6dfcb52c4dacbade6d7c675f431606927fb8a201ae091b6a2366cade7eaf756b108e5b0eb4f285c94d6228e74878d7fa5d3117c28e77df2caae1 WHIRLPOOL aeb5eafcedb7f2d108713f801cdc1f3972dbc1f9589d29f7d84f7eeebab6a970a48b05f2672eda41bf282faf3a6ed987917cfbfc30b0b1bf873af894c5bf18af
 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
 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_p20151101.ebuild 3416 SHA256 2513cc485b3ab336ca2cba343e13a040690933fc67db717b5ad998f1c0fadebd SHA512 a662009f5fe30f174ecd56d48e2944ca8b2015cb055e165b37b9bf74b00d5eafb028acf1a29033cc93671d2354e12515d76f63ea4c37b0183bbbfe03058cde91 WHIRLPOOL 9fe7eb4a9206ccb18573d885d17333417bd19bb5ba543e658c18dd58150f768c356b8590e323d0fccb14f2adf65fd6d54c7a3ef07d88e6a7138927e646153ef1
@@ -70,4 +71,5 @@ EBUILD netbeans-groovy-9999_p20151207.ebuild 3416 SHA256 88634cc16af83497755e56c
 EBUILD netbeans-groovy-9999_p20151208.ebuild 3416 SHA256 bb48440d3492a350625be02e6adc7848a6eca433ed23c69b8e2869a8a3acb9e4 SHA512 17d43ed8e76342ca6bd329fa28ed1cc621ff12a9e13753fe95211071e281e0a2a15eb5d2c28b1ff359735352b816697208db3b351e850cb24b7f9f52c0059e90 WHIRLPOOL b2c884d7f1697ecefaab7d43b838cd9104ba9594e2c2323c692d2e4530f40f75cb852dcd6bac8afef897d6b1fa5a6b553201b1e8dd5ead1a3d44c8c0f05bea15
 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
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20151211.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20151211.ebuild
new file mode 100644
index 0000000..bab8aaf
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20151211.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-11_00-02-04/zip/netbeans-trunk-nightly-201512110002-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 4edc20f..eb7c9fd 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -40,6 +40,7 @@ DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc649
 DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd2312ceee02e5b5175bf7f94ee13b0552e02be72250922326ae4d1 SHA512 f7a48ace418b6dfcb52c4dacbade6d7c675f431606927fb8a201ae091b6a2366cade7eaf756b108e5b0eb4f285c94d6228e74878d7fa5d3117c28e77df2caae1 WHIRLPOOL aeb5eafcedb7f2d108713f801cdc1f3972dbc1f9589d29f7d84f7eeebab6a970a48b05f2672eda41bf282faf3a6ed987917cfbfc30b0b1bf873af894c5bf18af
 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
 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_p20151101.ebuild 4125 SHA256 2f6a68f7628e7fc73a6f852e5e0d372e8f922d3d14d3aa510bd3654ad4f2ad1d SHA512 b4e74e591ca42f4129e56fd882ec31c620eb211553091451adab0f494cac91dd8bb81fb3895dc15886b523f4d018994b195ae30aa192f9c98aa885d1ccc33d69 WHIRLPOOL 3559903610cf06401108e6fbae3651ff2eea5b923317e0837413bf262b24938eafa13f2e0d8effe7b86d44362fe586d58575ff8eaf72996df240820cfa504e6f
@@ -74,4 +75,5 @@ EBUILD netbeans-harness-9999_p20151207.ebuild 4125 SHA256 68f32c6a67fbd8f1ff45a9
 EBUILD netbeans-harness-9999_p20151208.ebuild 4125 SHA256 3a05e0258ab5a4fb99f09ac043092d6bf0fbbf64446f1b7b17de61cbd53216f5 SHA512 9e283b72dee9294ab634561188830642fec7ff8b5d4faba02ee2a1bf4500ceb8228c842dfcb41c0966240b345e57460a9f5f0af6c9407a3215abc773bf27ff79 WHIRLPOOL dfad8037522d4c2fa98dd0baf9a53cc158cc8b38c9faa76c3f0d76674c8711033596517781ee0047b6efc9ccb7b38f51a4d9eabf58089c7f201b1327f21333df
 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
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20151211.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20151211.ebuild
new file mode 100644
index 0000000..49adc95
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20151211.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-11_00-02-04/zip/netbeans-trunk-nightly-201512110002-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 9a2d02c..7ae3647 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -166,6 +166,7 @@ DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc649
 DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd2312ceee02e5b5175bf7f94ee13b0552e02be72250922326ae4d1 SHA512 f7a48ace418b6dfcb52c4dacbade6d7c675f431606927fb8a201ae091b6a2366cade7eaf756b108e5b0eb4f285c94d6228e74878d7fa5d3117c28e77df2caae1 WHIRLPOOL aeb5eafcedb7f2d108713f801cdc1f3972dbc1f9589d29f7d84f7eeebab6a970a48b05f2672eda41bf282faf3a6ed987917cfbfc30b0b1bf873af894c5bf18af
 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
 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_p20151101.ebuild 30334 SHA256 72a40468cc80008e8aaf6351b8f473e976e96e554b4c7d685874089571548d1a SHA512 bf57fd175dddb4f6590f011aff65af9464b48cdb5332f73b6e486d4dbd9e4d65f3bc65727493b47fad701f91b61e6b9d2435f419ee67e0977fe11ed378e84305 WHIRLPOOL 32c8b9f2887c68105b9cb19bb8c747efabfc9a89e9c28f763a37c5cb4e09e935f16aef6d078817ae3093adffe0e6986718c77e74b2ae51512d5cc30f73be2ee0
@@ -200,4 +201,5 @@ EBUILD netbeans-ide-9999_p20151207.ebuild 30890 SHA256 936670a38886b870408db0b76
 EBUILD netbeans-ide-9999_p20151208.ebuild 30890 SHA256 b9afda72df571a38f28518313694e0d23fe44232986b9461dcc37f7fbe1c20b9 SHA512 b8400349c5060e7211bd3157992f2ab0e9a4f94908af20f2c28d1015af82f9f5bf51dde5dc0998202f463e0c0bea3d9501ee578ed5031924bf1e1ce7649be773 WHIRLPOOL 4d6303e52fb4a2bd367442618a309b4f8f5bc888ab6ad47b49b18920f29f91d5337c0573ae258860fdb850730f49b811396ecf207bab302bb462056e3a2f8972
 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
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20151211.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20151211.ebuild
new file mode 100644
index 0000000..9bfa3a6
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20151211.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-11_00-02-04/zip/netbeans-trunk-nightly-201512110002-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 bb246af..06f3a92 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -70,6 +70,7 @@ DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc649
 DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd2312ceee02e5b5175bf7f94ee13b0552e02be72250922326ae4d1 SHA512 f7a48ace418b6dfcb52c4dacbade6d7c675f431606927fb8a201ae091b6a2366cade7eaf756b108e5b0eb4f285c94d6228e74878d7fa5d3117c28e77df2caae1 WHIRLPOOL aeb5eafcedb7f2d108713f801cdc1f3972dbc1f9589d29f7d84f7eeebab6a970a48b05f2672eda41bf282faf3a6ed987917cfbfc30b0b1bf873af894c5bf18af
 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
 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
@@ -106,4 +107,5 @@ EBUILD netbeans-java-9999_p20151207.ebuild 14983 SHA256 30efff019e9294fdb6487ad2
 EBUILD netbeans-java-9999_p20151208.ebuild 14983 SHA256 ec7a9eefd90863fb53c80eb53600c6a65f84578e61b8000569f7065e28fb2ab5 SHA512 ed56f59cabfba55d3fba448a84dfb099ecc3b9fdb6a6cb12fc67298e4c5ff2db5baed9b1ecd1c6a30a365dbc1d1f911fafe3dd74f482f73bd65e47e4386f8d07 WHIRLPOOL c698c22e23265ba577b5f9e4f3e82a9ef60fa5b5798d217a294eb9bf00cd02da85d592c823e8513fee2c53c3584cd3d6bd7e9ceb966b6c6d702a7bdff52021d3
 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
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20151211.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20151211.ebuild
new file mode 100644
index 0000000..2cde7e8
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20151211.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-11_00-02-04/zip/netbeans-trunk-nightly-201512110002-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 eb99574..c0d8faf 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc649
 DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd2312ceee02e5b5175bf7f94ee13b0552e02be72250922326ae4d1 SHA512 f7a48ace418b6dfcb52c4dacbade6d7c675f431606927fb8a201ae091b6a2366cade7eaf756b108e5b0eb4f285c94d6228e74878d7fa5d3117c28e77df2caae1 WHIRLPOOL aeb5eafcedb7f2d108713f801cdc1f3972dbc1f9589d29f7d84f7eeebab6a970a48b05f2672eda41bf282faf3a6ed987917cfbfc30b0b1bf873af894c5bf18af
 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
 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_p20151101.ebuild 4976 SHA256 74dfe35637320661d3f26c0de6a0459e67abb6c79754fa85213ed2ad9eac872a SHA512 fe707726a2a25f8e85509246facaddabc57d540f7971971714f3a1c5ea9ddca59c14f7211103d227b3b27f3d05f50c03cc132f587ecaed26ced0bf1416be4b72 WHIRLPOOL 7f194c4f154b65f110be8f9ef230c7cfc1a308361573dd576e8d7a0765f12d72130fddcb564b25da92f0c077764710c6d9a4731428aacd6d18e8ac80630d7cfa
@@ -72,4 +73,5 @@ EBUILD netbeans-javacard-9999_p20151207.ebuild 4976 SHA256 7a2801f10de550be0f3be
 EBUILD netbeans-javacard-9999_p20151208.ebuild 4976 SHA256 e51df73075fbc3d1aa3d9448c31335f400d0e78284bf025ef9697bf8e5e413df SHA512 9cb7819032dba4fd1bba944bec8f1f174e9c490357188f612bc7ffdb7f4607c8286d1578c0a54b381393e0f2ddbca2d098d29bba9529f587427f038bf48f1db1 WHIRLPOOL 0bbd424b6b0cb2d49bb25cbf29cb97e804f260f0716599c0cae7632b47a29fda39501e7e183438287117e0d5022b4e0e60947a9c4b429053ade2b23fbd687108
 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
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20151211.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20151211.ebuild
new file mode 100644
index 0000000..104cf69
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20151211.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-11_00-02-04/zip/netbeans-trunk-nightly-201512110002-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 3424ca4..c115114 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc649
 DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd2312ceee02e5b5175bf7f94ee13b0552e02be72250922326ae4d1 SHA512 f7a48ace418b6dfcb52c4dacbade6d7c675f431606927fb8a201ae091b6a2366cade7eaf756b108e5b0eb4f285c94d6228e74878d7fa5d3117c28e77df2caae1 WHIRLPOOL aeb5eafcedb7f2d108713f801cdc1f3972dbc1f9589d29f7d84f7eeebab6a970a48b05f2672eda41bf282faf3a6ed987917cfbfc30b0b1bf873af894c5bf18af
 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
 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_p20151101.ebuild 6228 SHA256 dad5cb4a17d24ac57e3d35b1c359acc75c81b122d382fa352d09a10c8a962b1b SHA512 e328af4b6650d46dfce20174f116447806dc06c8c9bca5faeb04bf7dd4d8ffccccd4decb47fc8b5e16e3182509d14a05004d098309a5098ddcb84b2493596424 WHIRLPOOL 759cce5b290a643f421bc2da40c3b6ebe2616948d6a537858fb83c9d8e6822b83575e743307dd6b1a314bfd87a8720d405b6a028214d62b58c223fe50375086a
@@ -70,4 +71,5 @@ EBUILD netbeans-javadoc-9999_p20151207.ebuild 6293 SHA256 d333a1ce7e3bc4e68591a9
 EBUILD netbeans-javadoc-9999_p20151208.ebuild 6293 SHA256 2c848c37c910372d392a0bb53f04fc0928692be668ee94886dcbb6918890e78c SHA512 2fdd72ab9de0f97a47cdefca4f91cc76c05b9a7e76b00bdc4fd3793a6f9f1f075ca27132ba98f4f048dce4a38cf05b8f0f9a66360c5820a9b8437f9e7e1a6721 WHIRLPOOL b035b930ebad6ef6a99a75a7bdf175230c424badfa18df23da12359f13be98253a53a0995ee9c4078b26f97ee6c2eb0c42fb1645ee108de90acfb329796eecb6
 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
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20151211.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20151211.ebuild
new file mode 100644
index 0000000..f6fa544
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20151211.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-11_00-02-04/zip/netbeans-trunk-nightly-201512110002-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 ee9430b..7f35582 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -44,6 +44,7 @@ DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc649
 DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd2312ceee02e5b5175bf7f94ee13b0552e02be72250922326ae4d1 SHA512 f7a48ace418b6dfcb52c4dacbade6d7c675f431606927fb8a201ae091b6a2366cade7eaf756b108e5b0eb4f285c94d6228e74878d7fa5d3117c28e77df2caae1 WHIRLPOOL aeb5eafcedb7f2d108713f801cdc1f3972dbc1f9589d29f7d84f7eeebab6a970a48b05f2672eda41bf282faf3a6ed987917cfbfc30b0b1bf873af894c5bf18af
 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
 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_p20151101.ebuild 4717 SHA256 bea25b3b5c80353aa32794ac60d83a291a3e46c3fa39979f0b47d9a6f3ca8213 SHA512 ddc6a5e580b4e868b089d376875fd55680795853156dcf9cfb28021d38383f81068474d06491dd5401f96df6e6e5efc46056247cb7f90c6632e076305ed89b02 WHIRLPOOL f1322bec9fbc6f93a1964b469860e86bfeac88b700d66db25069d2dd9268fde7ee756299d9ddc790173d48a4fb2b18cf65b2b4c350332a45c56d9ea5b09ffcf1
@@ -78,4 +79,5 @@ EBUILD netbeans-javafx-9999_p20151207.ebuild 4717 SHA256 3cb8d54e102662ddf8ca837
 EBUILD netbeans-javafx-9999_p20151208.ebuild 4717 SHA256 127bd9de9b83acce1e716b01fadbca29abde60cb47b1e5fafe8b02ea4ec32d7d SHA512 b6b30d3e0e31bd2ddbc01d7d97a5adb2fa59c49a5a46c9654e248f8e1bc06fb0fbf3e6b347ca9ebcd8796aa8c19f40022e76325f1904ce866a97d6453bc4569a WHIRLPOOL b7e52ace0e01d1508cb9e7bcd26f7db4bb6714ab651142dfaec9c20e7835313ebfba4627db257e95242423621dd7321ce2d3ceb1f988c8a996c3c4531bc76f86
 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
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20151211.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20151211.ebuild
new file mode 100644
index 0000000..aaa5b1f
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20151211.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-11_00-02-04/zip/netbeans-trunk-nightly-201512110002-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 e13d8ba..ba6e5e5 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc649
 DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd2312ceee02e5b5175bf7f94ee13b0552e02be72250922326ae4d1 SHA512 f7a48ace418b6dfcb52c4dacbade6d7c675f431606927fb8a201ae091b6a2366cade7eaf756b108e5b0eb4f285c94d6228e74878d7fa5d3117c28e77df2caae1 WHIRLPOOL aeb5eafcedb7f2d108713f801cdc1f3972dbc1f9589d29f7d84f7eeebab6a970a48b05f2672eda41bf282faf3a6ed987917cfbfc30b0b1bf873af894c5bf18af
 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
 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_p20151101.ebuild 4412 SHA256 e25b7d637bc5cd7559b322247edb504909a865ee29190103a06a89fd1e7d259a SHA512 68666ff1854f0529e6919069c4e4e5c05efd639e327787cfd031e7f8d19c8d86e3617ad112714225486250f07e7e3c8b4c14a91f9217e0a7e97a7b78af8695e1 WHIRLPOOL 72302d7a42ceae3d1e671a0955d0777c66b1343a3b7eed66fdd41e82a15508c1a0a71af2c5055dbfa724ed99bdd045d769ab3582f88092ee7db56bcb54b05192
@@ -69,4 +70,5 @@ EBUILD netbeans-mobility-9999_p20151207.ebuild 4412 SHA256 0b5a060406dde1e986fb6
 EBUILD netbeans-mobility-9999_p20151208.ebuild 4412 SHA256 2ca425d5b080a13ad206d50ead094dfff55f36de136d90ebb5655bd613d7ff1a SHA512 85f8843ad849c9004adfa3f27836ec5dedd095e30c2b9fbbefbeaab6c2fa6ffa3980050fd895c992ae7cc55e845098e8e9ae9193257571ed29358aaa138565bd WHIRLPOOL cccbd3fdf98267d67fe9a04b914fb20928bb8e4e2f373444cc5a29451a609bb6fd9f5ca1666e547e658496f7d0220de1ee0310bcc457aa518a0cd96367341650
 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
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20151211.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20151211.ebuild
new file mode 100644
index 0000000..4a7c280
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20151211.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-11_00-02-04/zip/netbeans-trunk-nightly-201512110002-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 a8d85c1..fbdbbad 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc649
 DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd2312ceee02e5b5175bf7f94ee13b0552e02be72250922326ae4d1 SHA512 f7a48ace418b6dfcb52c4dacbade6d7c675f431606927fb8a201ae091b6a2366cade7eaf756b108e5b0eb4f285c94d6228e74878d7fa5d3117c28e77df2caae1 WHIRLPOOL aeb5eafcedb7f2d108713f801cdc1f3972dbc1f9589d29f7d84f7eeebab6a970a48b05f2672eda41bf282faf3a6ed987917cfbfc30b0b1bf873af894c5bf18af
 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
 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_p20151101.ebuild 4997 SHA256 9c42522f7debe07d0511b8127fcd144fee5acb66fc17888eed697d0723e4ebf1 SHA512 6c34b949c1b8e6c7263fa5c463e43bdedd832d4ff0e82272da4d53f6971a82fc086869309332757a44ac25e68909392b1a37f270bd389cb089418679e133f34c WHIRLPOOL 2ed2078031e3cfb031eb6a06536835269b3dd568740cd083b4bbaee92d1f70c60a795d143c4e6b9e271eea1a023e249732b03c97fbab9af876b7175fced04139
@@ -72,4 +73,5 @@ EBUILD netbeans-nb-9999_p20151207.ebuild 4111 SHA256 9a9d3685c7825825b99a5a545cd
 EBUILD netbeans-nb-9999_p20151208.ebuild 4111 SHA256 3a9629e60cd92a3db9a6456ce888d301cf33bb45454a8f9d08eecab6d599f34c SHA512 16041ebce8c9649b60d4375b7f43145d27d2d16b8b77d4d4d5dc9b793205506c9bfd9b07086dee6e90d050cc7882eeee38c5fcf0f33b7e3f8468d43367da6dd7 WHIRLPOOL 6310db4f82b93ead0e2cf864fc1991b8f71925b2a4f60ecb51b270023c498d42d5bcb9d33a793c1e6950f426f15dc61ddd42aee02761aea8fdc547f1295a3b13
 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
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20151211.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20151211.ebuild
new file mode 100644
index 0000000..1463c0f
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20151211.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-11_00-02-04/zip/netbeans-trunk-nightly-201512110002-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 2258be2..1ff0b37 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc649
 DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd2312ceee02e5b5175bf7f94ee13b0552e02be72250922326ae4d1 SHA512 f7a48ace418b6dfcb52c4dacbade6d7c675f431606927fb8a201ae091b6a2366cade7eaf756b108e5b0eb4f285c94d6228e74878d7fa5d3117c28e77df2caae1 WHIRLPOOL aeb5eafcedb7f2d108713f801cdc1f3972dbc1f9589d29f7d84f7eeebab6a970a48b05f2672eda41bf282faf3a6ed987917cfbfc30b0b1bf873af894c5bf18af
 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
 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_p20151101.ebuild 4417 SHA256 599a80da65a7ae6b22860d0b70acb49a8c55ab034ffc56352074fc434b54f74b SHA512 e0e7105401c7bab851e7e917c5a6ba4530fe24961084c20051adebff4691bd1e01bf7c885ac5aca6ae7326675190208aa0bc18fda6afc4d525490e1bd69015d9 WHIRLPOOL e0f3c7fceaa1b782320e938a6b246855f1b8b419f3991a43e5f3208b306b37b4bba29bd80bb58a1fff0998fe781c70d0ef036468001a21edac79ccb460ea4399
@@ -73,4 +74,5 @@ EBUILD netbeans-php-9999_p20151207.ebuild 4417 SHA256 6c180873b454acb18871518ac6
 EBUILD netbeans-php-9999_p20151208.ebuild 4417 SHA256 cf9c79d65e3a3a5ab1f55871cc5ebd80eaf7b14b3c045ad48d6f4f20017ddd50 SHA512 ef1b93609811c893e630a064b8a445819fd40726444cb1ad80d288ae8c6960167234a044e9f808294797855ebaea71a119910b7f1326b7edf3d0660a1c2907b3 WHIRLPOOL d880121e0d4e088439633d442a4e9ebc3de7bd85359753cf6762c9a7904c52d0fb55c03080222f5903d94a3e47983b634601411b6a80fb08cf45883772c6a8d8
 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
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20151211.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20151211.ebuild
new file mode 100644
index 0000000..356880e
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20151211.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-11_00-02-04/zip/netbeans-trunk-nightly-201512110002-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 5bdb173..b7e2dcd 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -52,6 +52,7 @@ DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc649
 DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd2312ceee02e5b5175bf7f94ee13b0552e02be72250922326ae4d1 SHA512 f7a48ace418b6dfcb52c4dacbade6d7c675f431606927fb8a201ae091b6a2366cade7eaf756b108e5b0eb4f285c94d6228e74878d7fa5d3117c28e77df2caae1 WHIRLPOOL aeb5eafcedb7f2d108713f801cdc1f3972dbc1f9589d29f7d84f7eeebab6a970a48b05f2672eda41bf282faf3a6ed987917cfbfc30b0b1bf873af894c5bf18af
 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
 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_p20151101.ebuild 9382 SHA256 caf47d0f6b7b4e6aa9db3f4f9ba522dfbf8bfeee811dff5133087657432f0b35 SHA512 0b737b39c8122b84dcd8311c51146cedcaa5c69ceaa159abe305d773c300be913cd3c1d3de14391cf75e5d4b06f8489edf66fe555efe5a44db95fea80e74c97a WHIRLPOOL d1dd018cbe4741f126e3408f041f8377f4fa1af914353cd248f5d70b5a6c6fcb3a481cc9bffe06617e45911d462d79dd40c8ac15fb0650d0a7db0a13e1d4bbde
@@ -86,4 +87,5 @@ EBUILD netbeans-platform-9999_p20151207.ebuild 9367 SHA256 b5f4e4041fd3147045c83
 EBUILD netbeans-platform-9999_p20151208.ebuild 9367 SHA256 65be17e12f8cd8dc3918dd21e9bb684e3e2658cb4fd1abeec4e72472db07596d SHA512 4b54ff3f5da1e153fc47b2504390864bb08d8ccf087923f438e5cb26ed9f8183c0b6b31f660d48a9312aa31d5dc5dbed071bb1d7f383939dbdb4bdd183aa03c1 WHIRLPOOL 0f306216758e1231d43aed2bf54914c7387110eeca23b69a92fa1212521a7db49cec737b202f3b84acefcb27f5cede733fdb664eb4e5c8ae3b20c7cf4c6de87b
 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
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20151211.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20151211.ebuild
new file mode 100644
index 0000000..10ff762
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20151211.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-11_00-02-04/zip/netbeans-trunk-nightly-201512110002-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 24acb39..941f0e4 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc649
 DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd2312ceee02e5b5175bf7f94ee13b0552e02be72250922326ae4d1 SHA512 f7a48ace418b6dfcb52c4dacbade6d7c675f431606927fb8a201ae091b6a2366cade7eaf756b108e5b0eb4f285c94d6228e74878d7fa5d3117c28e77df2caae1 WHIRLPOOL aeb5eafcedb7f2d108713f801cdc1f3972dbc1f9589d29f7d84f7eeebab6a970a48b05f2672eda41bf282faf3a6ed987917cfbfc30b0b1bf873af894c5bf18af
 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
 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_p20151101.ebuild 3472 SHA256 2c453e505d57cb36f64db7c697a5abd69b230a177264d581db7c74827773ec3a SHA512 568e1855872d4ee90609a8b2f0dce9963d78ac4d43f3abc30adacf00a958e388f2742d55c284583501049b98e95d9d50e989c14495ee3ca0a928c6a68e7818e5 WHIRLPOOL a35708d9626767c3a1385292af47c44589784e18d62c4f8c7551c7210fff535613831ddde45992658778fbcdec389ac4dc5cc7921dbad2e70d7dba5ade8f3da8
@@ -69,4 +70,5 @@ EBUILD netbeans-profiler-9999_p20151207.ebuild 3472 SHA256 01a60410a6ccd20f7b34a
 EBUILD netbeans-profiler-9999_p20151208.ebuild 3472 SHA256 12064cc2c9fad68586559a097d690db00819e08dc1b8618c10c4c8010e2b85b5 SHA512 03b952aa54a0fa2c5d3add7883a6ce417c8aa5d5f0c261c4214804e43c307a1a9904bde024c4f6f98973bf18bdfa5bfb3ff1d98a5e7bc9d6f62e6ab61efa2912 WHIRLPOOL 4a4e49d4fd85e2385b70db1f6ef727a0083e59cdac004759896894c1b0cf18bfd446910b18b25213ed9cd11f3118302c9bbd7451cfdd922b9135df04af9a2a61
 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
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20151211.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20151211.ebuild
new file mode 100644
index 0000000..f5241fa
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20151211.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-11_00-02-04/zip/netbeans-trunk-nightly-201512110002-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 9df3c93..9e5a920 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -44,6 +44,7 @@ DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc649
 DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd2312ceee02e5b5175bf7f94ee13b0552e02be72250922326ae4d1 SHA512 f7a48ace418b6dfcb52c4dacbade6d7c675f431606927fb8a201ae091b6a2366cade7eaf756b108e5b0eb4f285c94d6228e74878d7fa5d3117c28e77df2caae1 WHIRLPOOL aeb5eafcedb7f2d108713f801cdc1f3972dbc1f9589d29f7d84f7eeebab6a970a48b05f2672eda41bf282faf3a6ed987917cfbfc30b0b1bf873af894c5bf18af
 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
 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_p20151101.ebuild 4991 SHA256 57d2c07add5da1320895fd12fb6a4d3472a5bc94dd6725779fcc2b7c7f3f00e7 SHA512 071ecbf0f2c0af22ad78c0f5fc65df75861029b0769271233b84ca4b750a36df2e6aaa771283ed451f841faf437ba5b28c4ace809e7797352b17fa31287c0366 WHIRLPOOL be27b42140da851ad5cf395edcf3075dc65517da0db88046d1c2b9245bc7214e77acf0441690fc7cc0cf397146657568db3a597148d6b7b54961a088dd36a74d
@@ -78,4 +79,5 @@ EBUILD netbeans-webcommon-9999_p20151207.ebuild 4590 SHA256 83f3423ebedcba37f457
 EBUILD netbeans-webcommon-9999_p20151208.ebuild 4590 SHA256 70aca054ee50ae9e1687fd0713f67e8823c42a1f6f6c1210244d8b3afa3fd32f SHA512 38efe62557788a23a23e93aa4575c34c33cf515cc7d8f93f8809bd56765937d129eaf540e0133c1887ff91757024f47dcf1eeda96af71a1d4d9161e3ea7b1b4b WHIRLPOOL 63b04f9e0f0b8b121d5855b806419add86fe63959a9ca0269bb2539386c5e089a8ec57647394aaf99e0155bd44a4cabfa50db973cca56b68c82f153a1397bdab
 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
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20151211.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20151211.ebuild
new file mode 100644
index 0000000..551ef35
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20151211.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-11_00-02-04/zip/netbeans-trunk-nightly-201512110002-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 7cee739..a16ebdf 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc649
 DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd2312ceee02e5b5175bf7f94ee13b0552e02be72250922326ae4d1 SHA512 f7a48ace418b6dfcb52c4dacbade6d7c675f431606927fb8a201ae091b6a2366cade7eaf756b108e5b0eb4f285c94d6228e74878d7fa5d3117c28e77df2caae1 WHIRLPOOL aeb5eafcedb7f2d108713f801cdc1f3972dbc1f9589d29f7d84f7eeebab6a970a48b05f2672eda41bf282faf3a6ed987917cfbfc30b0b1bf873af894c5bf18af
 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
 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_p20151101.ebuild 2721 SHA256 959463c779becd38e659a2f1d1d269c2513198340e73ac0e660f3d4ecd24d11a SHA512 2880822c6d429cbff2711cd206ce551cabb8be4b65c3c2c6f82f33810608670f7b4b755a5f87d104678f87386031845a88e4a5dfabfc6bff531ba7c27d50664c WHIRLPOOL 071067ddd51734eddd427511073b2762086e8f5031bad54d3f2de15390a558d5028500d2238836cd269844c30d83348377e5d9a5758e0af0aa5348dd6924c1a9
@@ -69,4 +70,5 @@ EBUILD netbeans-websvccommon-9999_p20151207.ebuild 2721 SHA256 f2cc1397326d95920
 EBUILD netbeans-websvccommon-9999_p20151208.ebuild 2721 SHA256 6b1b9f15fa7895faad398fcd33486f8a78d42562b4cf2b3bf2de715783109273 SHA512 49a90f72dce22bbab059c5c4611028a82841dd55b353316754b0b7c9cf2d81ea7afba08300cb1bb292c877fb327b813ef08d1672f0ded70d26e83f3ef625a214 WHIRLPOOL a5e904559b7e5e3adeb45ec775354b1cd5df3564a19e4de8a3f1870398a490836c161a978e29ad8ef65d56b2a360d614f39d03e3551c77c2b6a36c287fc4a77d
 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
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20151211.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20151211.ebuild
new file mode 100644
index 0000000..1851fd9
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20151211.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-11_00-02-04/zip/netbeans-trunk-nightly-201512110002-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 c58fc9c..acc94f0 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc649
 DIST netbeans-trunk-nightly-201512080311-src.zip 209224111 SHA256 37bc77c8edd2312ceee02e5b5175bf7f94ee13b0552e02be72250922326ae4d1 SHA512 f7a48ace418b6dfcb52c4dacbade6d7c675f431606927fb8a201ae091b6a2366cade7eaf756b108e5b0eb4f285c94d6228e74878d7fa5d3117c28e77df2caae1 WHIRLPOOL aeb5eafcedb7f2d108713f801cdc1f3972dbc1f9589d29f7d84f7eeebab6a970a48b05f2672eda41bf282faf3a6ed987917cfbfc30b0b1bf873af894c5bf18af
 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
 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_p20151101.ebuild 7210 SHA256 ce70a22341c06aee959f4c4174364727ca76ec31040c0d36837d29c89cdc379a SHA512 75dd70f7da4e719cf1c8e95ff5e84d8a17d538cfc8cb7f084898f18a37dca0650b91d9e2e3de5718c5ca743e6eb0f4ead21fe5a794477aac9ae59c5082430850 WHIRLPOOL 8ecbf1297f6a3764ed4ddff7745b53083f9e1cf3ace71254944bff18fa28d2155e2f45ae1a4b50611ed8fe2f58b1a78ce449b550f95057cdffabc08c75f7eb4a
@@ -72,4 +73,5 @@ EBUILD netbeans-9999_p20151207.ebuild 6938 SHA256 7ac11fbcaf3edce5b7a8e137c46454
 EBUILD netbeans-9999_p20151208.ebuild 6938 SHA256 6c6d3bdf12e570a411aecb3f0bd54268aaeb1293a264b7aa28350bcd6f25e382 SHA512 351ddb9fe2c421454fcbefa89f46f6c792db5a38de76fa61571d101ece5b25d1e8eaf45e591b2f44dfacc08e59d2cb81450093aa06834edec8f63a1628ceaada WHIRLPOOL 691646e4103a60a4f343e875294f533b30284abfdbc8d3447516181f19e3e4b74c03b77ca3ffe8d1ea2454b479678b5446334cb9d915d27957feaab2516ef2e4
 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
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

diff --git a/dev-util/netbeans/netbeans-9999_p20151211.ebuild b/dev-util/netbeans/netbeans-9999_p20151211.ebuild
new file mode 100644
index 0000000..15a0cc7
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20151211.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-11_00-02-04/zip/netbeans-trunk-nightly-201512110002-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
+}