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

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

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-webcommon/, dev-java/netbeans-nb/, dev-java/netbeans-cnd/, ...
@ 2015-12-21 10:04 Miroslav Šulc
  0 siblings, 0 replies; only message in thread
From: Miroslav Šulc @ 2015-12-21 10:04 UTC (permalink / raw
  To: gentoo-commits

commit:     4aef1ac367db871d06000824c26097251b899a7e
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 21 09:04:41 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Dec 21 09:04:41 2015 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=4aef1ac3

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.2.26

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 8dd387d..4a49a47 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201512150002-src.zip 209278678 SHA256 5c97f3333dc701
 DIST netbeans-trunk-nightly-201512160002-src.zip 209284935 SHA256 b9de21df9893215edfd3aa66d19bba3ef4d712364457937ffca0eb2e1a01c311 SHA512 58b19c90c4f8f4edfef3741b7b05616a6aaad5fd1c81c68037ecf2d05f67c979400346773392ca34427ceec8ae7adf8f57d47c564025b4e531e52732ba102fd6 WHIRLPOOL b365748df55e76aaf285ba5d139157a04748359b204f4eec0e6d222df41df8882eda831b327b61b6e9476572402b2e84a4eb2cab057a4ac5d180e2f276ae7ac2
 DIST netbeans-trunk-nightly-201512170002-src.zip 209334699 SHA256 4bab0de756b2b1d61af59c5f5eac8fa6faefec1abe2f7f82eb50593776cbd7eb SHA512 660689d11454e2816f623e6ece3b7d23d6fef7a387ac080cdc138dc44b2110325dda37e74635c6f5883a586258167cc7720fe74896e25d3f25f15f3c9a2f3cfb WHIRLPOOL 8934b7be1fbc0253582ac16524ca185304557e1834681bb0abb6e615fe02f45a72cec662312ca44c5ca04e776116307c307b1ee08604d741f8e3aaf11b92c995
 DIST netbeans-trunk-nightly-201512180002-src.zip 209387619 SHA256 ee149de6b63dd36518dd78a8f28b0603b68a01b062d35c63d81f7742ed0fc805 SHA512 7aa9fcb6d7269264b76dd0eab66e0bc2e855ddb70de7a357dae5a5a3a8865da6979486acac421d351425e2c033ba689d4521cfc0353dc9ec62dd487b013e60cd WHIRLPOOL ab6b2385e651852bb383f7a9eaa5a24ac5f8deca8afd3dc8c0e0569acdb02ee54de89221a16fd93eea634df8011598270ae29f00c970edfecf6960d93846e9ac
+DIST netbeans-trunk-nightly-201512210002-src.zip 209401161 SHA256 82cc114d515412f1a828e622a467e747e8933ae2165da46a143073f2b9d0faaf SHA512 110c4a257904c61ee54e8ac97c09a6d67b2e39d82103fd5436d13cb1198c2bc15d15232d0434f0c0e6b2d828580be0d60d47067adbeb4ee7b753b193436d330d WHIRLPOOL 910a1938547e78e1469c878afc632b70a3fc2893f2cd7bc5cd2c207c565b1e2ff12b8bca517c1351d33b446ff5b3f1fa0ee652f058f7a10ef7c1603c45299c89
 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_p20151116.ebuild 3384 SHA256 6ee67d946293e1eb213e817954aa95b55afc199eb172e34ce5aea30e27a3aeec SHA512 78150ed3e78464c566fd8fe66e390b4177b6d0fc4a4a30161e91d62d579edc80a6420fae6cf98ca5c2a1febb7579516d603d57252c255e8385589094ecbecc11 WHIRLPOOL cb63600e3ebf934b45211dde1eca640de276caea0201b647760daa8df6b65a612069e2586f7b8843fea93641a02c2289dcd2004e25a1fb8cd6130ccf448e927b
@@ -65,4 +66,5 @@ EBUILD netbeans-apisupport-9999_p20151215.ebuild 3384 SHA256 ea97cef809cbfac7962
 EBUILD netbeans-apisupport-9999_p20151216.ebuild 3384 SHA256 48d9c5513163e4ea62a06ff78e3a4dd5ab4580974c3ca5c4c0ee3c7e083b7e64 SHA512 b9fe131056bdae7886fc87c4cc87f6c0e8143a9a709a35a7d66502e3e3a11af28a68bef4bb341bc08c7c6778716959f0a98d1d10ed7d8425436aeb9e2845e339 WHIRLPOOL 79326a4427cb965d1037a2d457e7246c6bd3174310e53cc6bf9e87a56f09cece11518e1965f1cee9fc1bc535e0a506ab12577cdba80c8adeec0d5fbd51991092
 EBUILD netbeans-apisupport-9999_p20151217.ebuild 3384 SHA256 34f539a8c4e4ac9fe54df00477f80bb7c48c3c674d45b2b5c70ba80c0c6ef467 SHA512 e4b56fffd7130d21086f4d2c6a59c7f09d66ed45557dddc2bb58104505e014a84ce9efcc78b5fb53579fce9c200b5bb40420db8fa2a243929c2a30d200919306 WHIRLPOOL 2fbec7076f9082de9f3d953af9c923c3907fe8d9b18fef95314081b429118987f458a67d0ba1093865ab69528a7cc05bf814b323cdaae16ba673fd1c08d35a52
 EBUILD netbeans-apisupport-9999_p20151218.ebuild 3384 SHA256 2bcfc4f11a826c246056d9fa225825bafac37ac20e7de1fbc55b7e12fb23eff0 SHA512 5adb8439642719f2a9660dce424e53c810af05aace22c4e2e2dd53962061ebb511e0d3b0bfc4f7eb3be8bd9d6c8b346c5b6550b8db46527607c928eea6ff433e WHIRLPOOL 665612c36db0a101e26c718dd9cc7a54f8342830600ca638054aa877a4c15fbaba04f18ced127480e3d13f0001ad90e0a5f21bc99eeafad80bf1fc68e97e1913
+EBUILD netbeans-apisupport-9999_p20151221.ebuild 3384 SHA256 a2828cf71b90c16564458c63c0d17dd4e76e2565ddd5d085dd88765c5edf9059 SHA512 64dd57c11fcc6ceb4eace2ffd0e90003bd997793a2f5de3503efbff33973e08ee044769e077ed230b9647742c9fcefa873c01c6324324a77442394f73c0c3d19 WHIRLPOOL 050e3998e9730f0a797304c93cd475aa7555eb460ffff9d4b6756837890d48f9eff496cd5e4576ae6d32c591595aad15b45570035374167966e5cde76676a4e1
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20151221.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20151221.ebuild
new file mode 100644
index 0000000..22903c9
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20151221.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-21_00-02-04/zip/netbeans-trunk-nightly-201512210002-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 8800045..8859e07 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -44,6 +44,7 @@ DIST netbeans-trunk-nightly-201512150002-src.zip 209278678 SHA256 5c97f3333dc701
 DIST netbeans-trunk-nightly-201512160002-src.zip 209284935 SHA256 b9de21df9893215edfd3aa66d19bba3ef4d712364457937ffca0eb2e1a01c311 SHA512 58b19c90c4f8f4edfef3741b7b05616a6aaad5fd1c81c68037ecf2d05f67c979400346773392ca34427ceec8ae7adf8f57d47c564025b4e531e52732ba102fd6 WHIRLPOOL b365748df55e76aaf285ba5d139157a04748359b204f4eec0e6d222df41df8882eda831b327b61b6e9476572402b2e84a4eb2cab057a4ac5d180e2f276ae7ac2
 DIST netbeans-trunk-nightly-201512170002-src.zip 209334699 SHA256 4bab0de756b2b1d61af59c5f5eac8fa6faefec1abe2f7f82eb50593776cbd7eb SHA512 660689d11454e2816f623e6ece3b7d23d6fef7a387ac080cdc138dc44b2110325dda37e74635c6f5883a586258167cc7720fe74896e25d3f25f15f3c9a2f3cfb WHIRLPOOL 8934b7be1fbc0253582ac16524ca185304557e1834681bb0abb6e615fe02f45a72cec662312ca44c5ca04e776116307c307b1ee08604d741f8e3aaf11b92c995
 DIST netbeans-trunk-nightly-201512180002-src.zip 209387619 SHA256 ee149de6b63dd36518dd78a8f28b0603b68a01b062d35c63d81f7742ed0fc805 SHA512 7aa9fcb6d7269264b76dd0eab66e0bc2e855ddb70de7a357dae5a5a3a8865da6979486acac421d351425e2c033ba689d4521cfc0353dc9ec62dd487b013e60cd WHIRLPOOL ab6b2385e651852bb383f7a9eaa5a24ac5f8deca8afd3dc8c0e0569acdb02ee54de89221a16fd93eea634df8011598270ae29f00c970edfecf6960d93846e9ac
+DIST netbeans-trunk-nightly-201512210002-src.zip 209401161 SHA256 82cc114d515412f1a828e622a467e747e8933ae2165da46a143073f2b9d0faaf SHA512 110c4a257904c61ee54e8ac97c09a6d67b2e39d82103fd5436d13cb1198c2bc15d15232d0434f0c0e6b2d828580be0d60d47067adbeb4ee7b753b193436d330d WHIRLPOOL 910a1938547e78e1469c878afc632b70a3fc2893f2cd7bc5cd2c207c565b1e2ff12b8bca517c1351d33b446ff5b3f1fa0ee652f058f7a10ef7c1603c45299c89
 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_p20151116.ebuild 4790 SHA256 0a490667388792859534cf4a008c20fadee30076a50860b13f3363e36508ac6b SHA512 b9e72723bff8a6a56ec4e93789074107beb01aff1defe329d1fbceacb7c578249fa7a567a07c049f62c941d258d3228098ee74603343353665446372591f8153 WHIRLPOOL 6529a91abdd88f68e08145a083e49b45d7aa36d6032b55d38d722d725e541813c04f7e9694d3efba76a31a23a946fa259f54d7229c0ae18f5d991e2c540e50e7
@@ -76,4 +77,5 @@ EBUILD netbeans-cnd-9999_p20151215.ebuild 4790 SHA256 086e6437ea510f4c272e487b08
 EBUILD netbeans-cnd-9999_p20151216.ebuild 4790 SHA256 c358d8c583d63f5252e667c5640ec4f2b43e5665b9d41149b6540b8611a34f09 SHA512 10d412390f823e6a4190287af14a85bbd1ce40a43ec38beb4ceeee689f65155d5328ea704f80af84099052a9da807958dc003251e4969588fce2f1f9e74f0fad WHIRLPOOL ea199179b5d72f8b671a3871dcf80825ac65daf2a1e5e4a95f27f18ed8102eb7ee697ca377fe23fe2722ca5f3f2edfe8b4267b6a21128f67d12e4aabe1cec7ac
 EBUILD netbeans-cnd-9999_p20151217.ebuild 4790 SHA256 99d9ebad64d7d6c00b2db3aa82cd40a2a95fc6488de7613cc27da476963f5479 SHA512 1391861d97ea0c24ded5bafa91a3f76577cc7577f0b676f7dd1ebf332f56295804a416fc0e84ce8b9eb5f8fd14d38386d64401555f3da353032530068be2fba3 WHIRLPOOL 34a14707030835df2afda6db5d34fa03e5323e3e91be430b89e56d1902356449f7806dc4ee60a3a0e5efa43cb2613317ec0a6fb6951125efe06fa7e055ee146c
 EBUILD netbeans-cnd-9999_p20151218.ebuild 4790 SHA256 ceb0aa5b381d0cb276f937d556012405d61b7cc23c6b01932b3e5a10b8eb0a37 SHA512 6e5a11ea0a0d5a49e0fda5849f96714d358cb83bd1a32e877a5114ba70d196193c9a07eb750aab209048bc25463a9f40fa532759d270a88194ad77315dc7eb1a WHIRLPOOL 14978d5842af4bb73b672a9eb4814233a0a90cf1a016c082d93e8bd9c4a94e20d723aa748437408626528fb535f1c9b800b366c5f685906f5571ab14824515c0
+EBUILD netbeans-cnd-9999_p20151221.ebuild 4790 SHA256 d5dc008a451297c93f4b5357656043c80bfa338f864fe1b7413f3cf84422a3bd SHA512 190736ec7e87a99bd457e5ca0f242a8bc6ef38468713d7acf5d3ad31609e2895ec67d9d34f44a3ec768feabf04ef037e5769c0f6f727992cc87bbde0bf5689b8 WHIRLPOOL 9c8e87bbb41c62f80fdf60277826c0768e41d107c73c0cdb1ec884116c4155641b315993dda2ca1de4357d782bfc12e1e250109fe5c2f434b90b870beec0c9bc
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20151221.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20151221.ebuild
new file mode 100644
index 0000000..c11acaf
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20151221.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-21_00-02-04/zip/netbeans-trunk-nightly-201512210002-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/6AE76DCC58313A6B48DDDDE3D19011AA4BE343CF-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}"/6AE76DCC58313A6B48DDDDE3D19011AA4BE343CF-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 a21c73e..6d0245b 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201512150002-src.zip 209278678 SHA256 5c97f3333dc701
 DIST netbeans-trunk-nightly-201512160002-src.zip 209284935 SHA256 b9de21df9893215edfd3aa66d19bba3ef4d712364457937ffca0eb2e1a01c311 SHA512 58b19c90c4f8f4edfef3741b7b05616a6aaad5fd1c81c68037ecf2d05f67c979400346773392ca34427ceec8ae7adf8f57d47c564025b4e531e52732ba102fd6 WHIRLPOOL b365748df55e76aaf285ba5d139157a04748359b204f4eec0e6d222df41df8882eda831b327b61b6e9476572402b2e84a4eb2cab057a4ac5d180e2f276ae7ac2
 DIST netbeans-trunk-nightly-201512170002-src.zip 209334699 SHA256 4bab0de756b2b1d61af59c5f5eac8fa6faefec1abe2f7f82eb50593776cbd7eb SHA512 660689d11454e2816f623e6ece3b7d23d6fef7a387ac080cdc138dc44b2110325dda37e74635c6f5883a586258167cc7720fe74896e25d3f25f15f3c9a2f3cfb WHIRLPOOL 8934b7be1fbc0253582ac16524ca185304557e1834681bb0abb6e615fe02f45a72cec662312ca44c5ca04e776116307c307b1ee08604d741f8e3aaf11b92c995
 DIST netbeans-trunk-nightly-201512180002-src.zip 209387619 SHA256 ee149de6b63dd36518dd78a8f28b0603b68a01b062d35c63d81f7742ed0fc805 SHA512 7aa9fcb6d7269264b76dd0eab66e0bc2e855ddb70de7a357dae5a5a3a8865da6979486acac421d351425e2c033ba689d4521cfc0353dc9ec62dd487b013e60cd WHIRLPOOL ab6b2385e651852bb383f7a9eaa5a24ac5f8deca8afd3dc8c0e0569acdb02ee54de89221a16fd93eea634df8011598270ae29f00c970edfecf6960d93846e9ac
+DIST netbeans-trunk-nightly-201512210002-src.zip 209401161 SHA256 82cc114d515412f1a828e622a467e747e8933ae2165da46a143073f2b9d0faaf SHA512 110c4a257904c61ee54e8ac97c09a6d67b2e39d82103fd5436d13cb1198c2bc15d15232d0434f0c0e6b2d828580be0d60d47067adbeb4ee7b753b193436d330d WHIRLPOOL 910a1938547e78e1469c878afc632b70a3fc2893f2cd7bc5cd2c207c565b1e2ff12b8bca517c1351d33b446ff5b3f1fa0ee652f058f7a10ef7c1603c45299c89
 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_p20151116.ebuild 2968 SHA256 79d2bd5a6a6cc375f783c9a0bf605b5e2ce4ebe419cc3b5a5d1357e80637d4df SHA512 e762e57413a6f98eb4216854945d5f12cf4c12359fa06effcfc1d5f6595ae3b0967c32b5cea47688ae49277a84e063d25b0f50ba965f2185bad80e974c2efc94 WHIRLPOOL 1c475b85749e14c3980b8003612fbd5cd6bbf61856eb0242b4e38fea6fae92ab0ad8aa83ca4b352516ed6fc95e58352d4b502247f35f673c1f2db8e4a68f659f
@@ -68,4 +69,5 @@ EBUILD netbeans-dlight-9999_p20151215.ebuild 2968 SHA256 41a845f408f915f17574092
 EBUILD netbeans-dlight-9999_p20151216.ebuild 2968 SHA256 31cd77557c5d518eb94c7c0742f4dbab4e34f4027609064badbad7356bf057cf SHA512 7e7d83d8c8e4651f4e1787f1415c051ffbf53a9cf47a5e31d98cb565b9acea79f9de5092dde6f261e344e61d7ca4efc5c3be0f965f111fa500f5b0c20b21d69a WHIRLPOOL b4bc02fd91e527591a2b2a383c3a5abb6155e6126ca12d154f01a0406eb75d394108a3d4ade18fa14a5fb11038219daaad0366fda02a54426c6334e6574a3c74
 EBUILD netbeans-dlight-9999_p20151217.ebuild 2968 SHA256 41984c050962617c5abee6e3925e7a683f65aec9bd9248944ac8444fc5033950 SHA512 cefd0a871fdd1e68372cfa3012010affba7d3f2a30b3abe6885771d2974a323b5a7107c8e780fe6c202e62e370576a28590df5479fb39b1b220e0cffc51846d7 WHIRLPOOL e5d2aae4aedb945809143906530a430c02bdb50d2a8a683a85b1df08772d4bd50b81efaec19cf3339065ad50aa359effc9ff3587320daa1591727935fc7be47d
 EBUILD netbeans-dlight-9999_p20151218.ebuild 2968 SHA256 7e5d8826d178d5a711447f8c5299ebd5d6f8909ff54815aa2f1fc6c6dc9cc01f SHA512 8f182d01081adb061e088e8f70274d773d0097cb60c4b74d9067beb3d4f95209f4eba5c2af2eb389307a1542c26e23cc775a8c927db43ec6c866563fdbfb7824 WHIRLPOOL 304a1a24e5cb83a84eca60f3a2806025c42406cfd8754d1ee37c033d5f5ab8a3b297dde787197b22754b3c8d6dad16185ade9029f58ec599c938e9eadf0a94d6
+EBUILD netbeans-dlight-9999_p20151221.ebuild 2968 SHA256 aa2d5cfe17ef190b176e22ab51c1ccc77adc9d5f1fde1ad5423a30f77af55ac1 SHA512 2b529dadc4c81e71e277a823888542a597200b8d891875f9b82f9a0d62cbe2844e52f0737412d4146e4fe8b01b735899210fb975c23a7895d02d5c27b7958379 WHIRLPOOL e884c688c78ed9506f738e39450c34580cc27801cd10c0ad1063b7d0598584d173fd2b75236299cd15649b0bd69610a73fa7081e1e14bc7cb91e895509f77eb6
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20151221.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20151221.ebuild
new file mode 100644
index 0000000..8d6ddfe
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20151221.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-21_00-02-04/zip/netbeans-trunk-nightly-201512210002-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 e89d921..eae2e56 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -65,6 +65,7 @@ DIST netbeans-trunk-nightly-201512150002-src.zip 209278678 SHA256 5c97f3333dc701
 DIST netbeans-trunk-nightly-201512160002-src.zip 209284935 SHA256 b9de21df9893215edfd3aa66d19bba3ef4d712364457937ffca0eb2e1a01c311 SHA512 58b19c90c4f8f4edfef3741b7b05616a6aaad5fd1c81c68037ecf2d05f67c979400346773392ca34427ceec8ae7adf8f57d47c564025b4e531e52732ba102fd6 WHIRLPOOL b365748df55e76aaf285ba5d139157a04748359b204f4eec0e6d222df41df8882eda831b327b61b6e9476572402b2e84a4eb2cab057a4ac5d180e2f276ae7ac2
 DIST netbeans-trunk-nightly-201512170002-src.zip 209334699 SHA256 4bab0de756b2b1d61af59c5f5eac8fa6faefec1abe2f7f82eb50593776cbd7eb SHA512 660689d11454e2816f623e6ece3b7d23d6fef7a387ac080cdc138dc44b2110325dda37e74635c6f5883a586258167cc7720fe74896e25d3f25f15f3c9a2f3cfb WHIRLPOOL 8934b7be1fbc0253582ac16524ca185304557e1834681bb0abb6e615fe02f45a72cec662312ca44c5ca04e776116307c307b1ee08604d741f8e3aaf11b92c995
 DIST netbeans-trunk-nightly-201512180002-src.zip 209387619 SHA256 ee149de6b63dd36518dd78a8f28b0603b68a01b062d35c63d81f7742ed0fc805 SHA512 7aa9fcb6d7269264b76dd0eab66e0bc2e855ddb70de7a357dae5a5a3a8865da6979486acac421d351425e2c033ba689d4521cfc0353dc9ec62dd487b013e60cd WHIRLPOOL ab6b2385e651852bb383f7a9eaa5a24ac5f8deca8afd3dc8c0e0569acdb02ee54de89221a16fd93eea634df8011598270ae29f00c970edfecf6960d93846e9ac
+DIST netbeans-trunk-nightly-201512210002-src.zip 209401161 SHA256 82cc114d515412f1a828e622a467e747e8933ae2165da46a143073f2b9d0faaf SHA512 110c4a257904c61ee54e8ac97c09a6d67b2e39d82103fd5436d13cb1198c2bc15d15232d0434f0c0e6b2d828580be0d60d47067adbeb4ee7b753b193436d330d WHIRLPOOL 910a1938547e78e1469c878afc632b70a3fc2893f2cd7bc5cd2c207c565b1e2ff12b8bca517c1351d33b446ff5b3f1fa0ee652f058f7a10ef7c1603c45299c89
 EBUILD netbeans-enterprise-8.0.2-r1.ebuild 15075 SHA256 41d376117ad1d8d59c8194debfd29dc42f5fd4de70aee12a2134ec143a604dda SHA512 4cd9de88e9a401cc0be88e3e2605abc411c47307818376b2bcc00f9ae570b21324f2bf00fd83e819bfa076da0fb07811fa1f0f9362a6cd0ee05b63221a199000 WHIRLPOOL 73f4518c14430fe7aa3614ebf1b11a06ba0e9bce7479af2770db3a114f149d575a16a655218f757ed416b5149228ac56dac700f5a8d5e034cc838bfa4092e636
 EBUILD netbeans-enterprise-8.0.2.ebuild 15071 SHA256 84621e3bb946cfa254bb70ca3c3f61202882a7e6d631769ad2f0f4639b0de875 SHA512 6ad38e840764661e6bc5b89b5925e9665871009ba0b640c0a78c555ec104214dbee1200a93cb48e655bc620e07bb6e4d8932b23a00fe458f8a5e9e5c3200d79d WHIRLPOOL b2c2bbf2ff72f8cd9b4cdbe039fdbf7cd074b0fdc20f634aa0b6f79f5c639be358c61fab30854a6e3ab9714a285d9461ac4e39e94e10c14c5068422d6c873c56
 EBUILD netbeans-enterprise-8.1-r1.ebuild 15888 SHA256 d4c04ccfee01a46819020cb7cf8fd8297618f3c0431ae2d9dd7eec8131f988ab SHA512 6c7c39c378cb79d3f382cb80d07710a8c5233aaf0df8fb58889ee6aa6bde73624efa6aa49b43f84105685094a7aff89e4b6367ffd1fd113da27b42d50d07e983 WHIRLPOOL e678e2a6957e428c1b6e51469c0e7cc6a08da2c797f1575b6bb660a7f3281c00f071179de459e27c983304915b005baaf94ad4fae0a4c08162f218bf53b7d821
@@ -99,4 +100,5 @@ EBUILD netbeans-enterprise-9999_p20151215.ebuild 15936 SHA256 80104fbcd1ccc20bf7
 EBUILD netbeans-enterprise-9999_p20151216.ebuild 15825 SHA256 a26094146a386542967794500e9427359c05c272a909d435b29fa9fd70cc1025 SHA512 96294b912d5638a6bd62d0b4405bd4bd6699ff2f015b2ff82a4896699a0081ee503076b016e034ae68f0309e6cca679b2fa03bee186391bcc877c5ac0366f4f9 WHIRLPOOL c7d27f20cbba15a954f8344a71d3ea08c952d913affc7719b321bec18c1152899c670101b448f37130f345e975a3f7570b6b2711ffc34120bcdfcc51521d5a3a
 EBUILD netbeans-enterprise-9999_p20151217.ebuild 15825 SHA256 0933e39d7b3cf865e6136128fb02ca6b28f9021e0b5e4468fb4100a554d3ca4d SHA512 8a8cee5390ed8eb217583c3eed15ce91f1e609413793b455b5471de5a79cb0948b616750616c1408953311e9672e92d57bb475834a0d7358236d37c05ba59d58 WHIRLPOOL dfe8207274e63972fded16ca408924518d4a1ee07d11c8d58357085c8948d8c926211a6698b9d28fc8b4367a8424df81740303453b8c3b5c815ad06a8104981d
 EBUILD netbeans-enterprise-9999_p20151218.ebuild 15825 SHA256 bb85311a18b79becd9190baf2798881eb21bb99da0b07fc78d397e8332a6499a SHA512 a46b2654010d9f3dbfdd2e90434d358ec09eab2ab123765b05f5957af315521c4b831250ba73e3e6101b4a734b422f94b09baa76cfacfe0d3383cd880494b98c WHIRLPOOL 2b4bc527a196899f20f3d3ba48543c8f10521b41a67744124e6b4bcd75345de4f0806b384b8bfa0a76f8263d05c578c096316765f9f5d467c8c234e2ea56bf11
+EBUILD netbeans-enterprise-9999_p20151221.ebuild 15825 SHA256 a41faec0f50758a5e85216084220028dbf96bb5aa345b2b7f256c035dcc806c8 SHA512 d78fc4a77dfde64beba34f1ee20959effc39036958e41e3cff93c619d45bea30a442f1a02b5114d6a175a4bb148a138d0ebe0599daa9bff92f0df96f0b70c54f WHIRLPOOL a3b8ede250e3a8bf3d166af4d45f36b7e527a3b8bc9304f04d5a0161eca48bf2d0aa00f69abcdec5b2d5d523f3ea88378e40d4fb792bcb94258b6cee8447ef35
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20151221.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20151221.ebuild
new file mode 100644
index 0000000..0cdd876
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20151221.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-21_00-02-04/zip/netbeans-trunk-nightly-201512210002-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
+	dev-java/jsr181:0"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	>=dev-java/junit-4.4:4
+	dev-java/tomcat-servlet-api:2.3"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}
+	>=dev-java/antlr-2.7.7-r7:0
+	dev-java/bsf:2.3
+	dev-java/cglib:3
+	dev-java/commons-beanutils:1.7
+	dev-java/commons-collections:0
+	dev-java/commons-digester:0
+	dev-java/commons-io:1
+	dev-java/commons-validator:0
+	dev-java/glassfish-persistence:0
+	dev-java/guava:14
+	dev-java/jakarta-oro:2.0
+	dev-java/osgi-core-api:0
+	dev-java/validation-api:1.0"
+#	dev-java/commons-chain:1.1 in overlay
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.enterprise -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-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 --into javaee7.api/external jsr181 jsr181.jar jsr181-api.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+	java-pkg_jar-from --build-only --into web.monitor/external tomcat-servlet-api-2.3 servlet.jar servlet-2.3.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-profiler-${SLOT} profiler || die
+	cat /usr/share/netbeans-profiler-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.profiler.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-webcommon-${SLOT} webcommon || die
+	cat /usr/share/netbeans-webcommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.webcommon.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/enterprise >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/enterprise$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext
+	pushd "${instdir}" >/dev/null || die
+	rm commons-fileupload-1.3.jar && java-pkg_jar-from --into "${instdir}" commons-fileupload commons-fileupload.jar commons-fileupload-1.3.jar
+	rm jsr88javax.jar && java-pkg_jar-from --into "${instdir}" glassfish-deployment-api-1.2 glassfish-deployment-api.jar jsr88javax.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/aws-sdk
+	pushd "${instdir}" >/dev/null || die
+	rm commons-codec-1.3.jar && java-pkg_jar-from --into "${instdir}" commons-codec commons-codec.jar commons-codec-1.3.jar
+	rm commons-logging-1.1.1.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar commons-logging-1.1.1.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/javaee7-endorsed
+	pushd "${instdir}" >/dev/null || die
+	rm jsr181-api.jar && java-pkg_jar-from --into "${instdir}" jsr181 jsr181.jar jsr181-api.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jersey2/ext
+	pushd "${instdir}" >/dev/null || die
+	rm cglib-2.2.0-b21.jar && java-pkg_jar-from --into "${instdir}" cglib-3 cglib.jar cglib-2.2.0-b21.jar
+	rm guava-14.0.1.jar && java-pkg_jar-from --into "${instdir}" guava-14 guava.jar guava-14.0.1.jar
+	rm org.osgi.core-4.2.0.jar && java-pkg_jar-from --into "${instdir}" osgi-core-api osgi-core-api.jar org.osgi.core-4.2.0.jar
+	rm persistence-api-1.0.jar && java-pkg_jar-from --into "${instdir}" glassfish-persistence glassfish-persistence.jar persistence-api-1.0.jar
+	rm validation-api-1.1.0.Final.jar && java-pkg_jar-from --into "${instdir}" validation-api-1.0 validation-api.jar validation-api-1.1.0.Final.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jsf-1_2
+	pushd "${instdir}" >/dev/null || die
+	rm commons-beanutils.jar && java-pkg_jar-from --into "${instdir}" commons-beanutils-1.7 commons-beanutils.jar
+	rm commons-collections.jar && java-pkg_jar-from --into "${instdir}" commons-collections commons-collections.jar
+	rm commons-digester.jar && java-pkg_jar-from --into "${instdir}" commons-digester commons-digester.jar
+	rm commons-logging.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/struts
+	pushd "${instdir}" >/dev/null || die
+	rm antlr-2.7.2.jar && java-pkg_jar-from --into "${instdir}" antlr antlr.jar antlr-2.7.2.jar
+	rm bsf-2.3.0.jar && java-pkg_jar-from --into "${instdir}" bsf-2.3 bsf.jar bsf-2.3.0.jar
+	rm commons-beanutils-1.8.0.jar && java-pkg_jar-from --into "${instdir}" commons-beanutils-1.7 commons-beanutils.jar commons-beanutils-1.8.0.jar
+	rm commons-digester-1.8.jar && java-pkg_jar-from --into "${instdir}" commons-digester commons-digester.jar commons-digester-1.8.jar
+	rm commons-fileupload-1.1.1.jar && java-pkg_jar-from --into "${instdir}" commons-fileupload commons-fileupload.jar commons-fileupload-1.1.1.jar
+	rm commons-io-1.1.jar && java-pkg_jar-from --into "${instdir}" commons-io-1 commons-io.jar commons-io-1.1.jar
+	rm commons-logging-1.0.4.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar commons-logging-1.0.4.jar
+	rm commons-validator-1.3.1.jar && java-pkg_jar-from --into "${instdir}" commons-validator commons-validator.jar commons-validator-1.3.1.jar
+	rm oro-2.0.8.jar && java-pkg_jar-from --into "${instdir}" jakarta-oro-2.0 jakarta-oro.jar oro-2.0.8.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/enterprise
+}

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 5787c58..32313ae 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201512150002-src.zip 209278678 SHA256 5c97f3333dc701
 DIST netbeans-trunk-nightly-201512160002-src.zip 209284935 SHA256 b9de21df9893215edfd3aa66d19bba3ef4d712364457937ffca0eb2e1a01c311 SHA512 58b19c90c4f8f4edfef3741b7b05616a6aaad5fd1c81c68037ecf2d05f67c979400346773392ca34427ceec8ae7adf8f57d47c564025b4e531e52732ba102fd6 WHIRLPOOL b365748df55e76aaf285ba5d139157a04748359b204f4eec0e6d222df41df8882eda831b327b61b6e9476572402b2e84a4eb2cab057a4ac5d180e2f276ae7ac2
 DIST netbeans-trunk-nightly-201512170002-src.zip 209334699 SHA256 4bab0de756b2b1d61af59c5f5eac8fa6faefec1abe2f7f82eb50593776cbd7eb SHA512 660689d11454e2816f623e6ece3b7d23d6fef7a387ac080cdc138dc44b2110325dda37e74635c6f5883a586258167cc7720fe74896e25d3f25f15f3c9a2f3cfb WHIRLPOOL 8934b7be1fbc0253582ac16524ca185304557e1834681bb0abb6e615fe02f45a72cec662312ca44c5ca04e776116307c307b1ee08604d741f8e3aaf11b92c995
 DIST netbeans-trunk-nightly-201512180002-src.zip 209387619 SHA256 ee149de6b63dd36518dd78a8f28b0603b68a01b062d35c63d81f7742ed0fc805 SHA512 7aa9fcb6d7269264b76dd0eab66e0bc2e855ddb70de7a357dae5a5a3a8865da6979486acac421d351425e2c033ba689d4521cfc0353dc9ec62dd487b013e60cd WHIRLPOOL ab6b2385e651852bb383f7a9eaa5a24ac5f8deca8afd3dc8c0e0569acdb02ee54de89221a16fd93eea634df8011598270ae29f00c970edfecf6960d93846e9ac
+DIST netbeans-trunk-nightly-201512210002-src.zip 209401161 SHA256 82cc114d515412f1a828e622a467e747e8933ae2165da46a143073f2b9d0faaf SHA512 110c4a257904c61ee54e8ac97c09a6d67b2e39d82103fd5436d13cb1198c2bc15d15232d0434f0c0e6b2d828580be0d60d47067adbeb4ee7b753b193436d330d WHIRLPOOL 910a1938547e78e1469c878afc632b70a3fc2893f2cd7bc5cd2c207c565b1e2ff12b8bca517c1351d33b446ff5b3f1fa0ee652f058f7a10ef7c1603c45299c89
 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_p20151116.ebuild 2913 SHA256 1ac479f9596d5721fc965083d9a42f42fa0dd21cc0c8524e6ac1b5861eff1c58 SHA512 4f75125af85d94f2d1c8e633da63fa3a05f54ed2ee10a4cc83a58eb8cdb1e587a40895c60bc4237ae71e775e5773bafe20b627db36b8aeee4ee771288ee77e17 WHIRLPOOL 96de94269882fde80eb303a7ce402c9dbcd2e59be74189cca7a290f0531d06a08e1afeddab7f65276ffa485f13033f9acade1d7c269e9bd8a83efb6614dd8186
@@ -65,4 +66,5 @@ EBUILD netbeans-ergonomics-9999_p20151215.ebuild 2913 SHA256 9e04478ac0b80741054
 EBUILD netbeans-ergonomics-9999_p20151216.ebuild 2913 SHA256 00e0b8f74bb5febbf9dc2cb6fb2bcca7575dbc3544a939630ebdf850d444f366 SHA512 ce8373df2ee22196ea043446a08f2f1009ae1358de68670d1f3e63fc15b9b803876471713da18b906dd09d607e23480596d9266f992ba5f2b0bd998b05469bfa WHIRLPOOL 566420f9ae5348eef3433b47e8bfa7cac7e5d44192dc74712d579eedcc82b382d95dd29862da558854d07cfec0f4e92a06e5b23b2ac8a8c583cee501a688865c
 EBUILD netbeans-ergonomics-9999_p20151217.ebuild 2913 SHA256 35a2ae6e9e965519d453351e802c4f5d378dfc6f9c60c99ca636fe85fe567330 SHA512 7a16da8f4e91bf72a26c46a9a9dfe3f48c23df43ebc6c657885fb8a4d7b5d2a09f5e72e4de8b70dd4ad6ccb7f690405f8fc4a21776d1f09eee11ff00b90e17d9 WHIRLPOOL 0c31e6aad0298a4a8ee6c0a05f53417d97030d1d91946dee27ad5a389ed21af83ea150928ce3666295330b79859df6e8046b51a5d584cd86ad040a77bdc5dacc
 EBUILD netbeans-ergonomics-9999_p20151218.ebuild 2913 SHA256 35d4d711c9aeb6d3ce1d9b20fbc30eb161430230c0eb178ac7cd0a98d064099c SHA512 dea49d0cecfbc4f7842c9fdc7a23d003668ec7823b29388023da04296b1da52c34f1febdb4eaa163711bffb296fdfabd5db9e2418f0fe145e898d31b224f347c WHIRLPOOL 62b56da94cfc6a0bf28ea1a47a2da7d64f75738f4818b66946b3b7ab72a8dba67de4d47213452ea96b98e1a53866611797c14d86287e9dbf1fba3dfd44f3e60e
+EBUILD netbeans-ergonomics-9999_p20151221.ebuild 2913 SHA256 9734afdfd62a39381460916ac49681a57103b3316a82710d2e86e58203447e1b SHA512 3ea4c649be853f53b13279c7d1f4fc1abbae7bfaf4aaec07828bb1b2410cac6863cb0ec5efa549198adf79de7c55c54377618dbd592e9d03ac8d0445b62d0df9 WHIRLPOOL 0a63054dcf06d46bcefb7a5a910c81a3ab15be1d0603d138850d5a580b5b25d982cb43dee3b84fb5e266920a51a666c13931785a37849704b8804a0a8b23061e
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20151221.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20151221.ebuild
new file mode 100644
index 0000000..3e100c8
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20151221.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-21_00-02-04/zip/netbeans-trunk-nightly-201512210002-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 cf491f3..3550bf1 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201512150002-src.zip 209278678 SHA256 5c97f3333dc701
 DIST netbeans-trunk-nightly-201512160002-src.zip 209284935 SHA256 b9de21df9893215edfd3aa66d19bba3ef4d712364457937ffca0eb2e1a01c311 SHA512 58b19c90c4f8f4edfef3741b7b05616a6aaad5fd1c81c68037ecf2d05f67c979400346773392ca34427ceec8ae7adf8f57d47c564025b4e531e52732ba102fd6 WHIRLPOOL b365748df55e76aaf285ba5d139157a04748359b204f4eec0e6d222df41df8882eda831b327b61b6e9476572402b2e84a4eb2cab057a4ac5d180e2f276ae7ac2
 DIST netbeans-trunk-nightly-201512170002-src.zip 209334699 SHA256 4bab0de756b2b1d61af59c5f5eac8fa6faefec1abe2f7f82eb50593776cbd7eb SHA512 660689d11454e2816f623e6ece3b7d23d6fef7a387ac080cdc138dc44b2110325dda37e74635c6f5883a586258167cc7720fe74896e25d3f25f15f3c9a2f3cfb WHIRLPOOL 8934b7be1fbc0253582ac16524ca185304557e1834681bb0abb6e615fe02f45a72cec662312ca44c5ca04e776116307c307b1ee08604d741f8e3aaf11b92c995
 DIST netbeans-trunk-nightly-201512180002-src.zip 209387619 SHA256 ee149de6b63dd36518dd78a8f28b0603b68a01b062d35c63d81f7742ed0fc805 SHA512 7aa9fcb6d7269264b76dd0eab66e0bc2e855ddb70de7a357dae5a5a3a8865da6979486acac421d351425e2c033ba689d4521cfc0353dc9ec62dd487b013e60cd WHIRLPOOL ab6b2385e651852bb383f7a9eaa5a24ac5f8deca8afd3dc8c0e0569acdb02ee54de89221a16fd93eea634df8011598270ae29f00c970edfecf6960d93846e9ac
+DIST netbeans-trunk-nightly-201512210002-src.zip 209401161 SHA256 82cc114d515412f1a828e622a467e747e8933ae2165da46a143073f2b9d0faaf SHA512 110c4a257904c61ee54e8ac97c09a6d67b2e39d82103fd5436d13cb1198c2bc15d15232d0434f0c0e6b2d828580be0d60d47067adbeb4ee7b753b193436d330d WHIRLPOOL 910a1938547e78e1469c878afc632b70a3fc2893f2cd7bc5cd2c207c565b1e2ff12b8bca517c1351d33b446ff5b3f1fa0ee652f058f7a10ef7c1603c45299c89
 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_p20151116.ebuild 3377 SHA256 f54a46a9e0d3988390d07c34b9cb679a16ac6a54027677b2c413a442f8313edd SHA512 122fd46178b2255d62544ad302848872e5a8d75681c0e6b8184bf49aa858516c70990eeccd854804b7c5c066526783db10bda4565c06cde553da9fdee0e48988 WHIRLPOOL dc76547527e75332ab0627e73daa6a1d34eae7700692a87c5bc82cb024003a1134fb86dde6d99a9fca627f9c3cc7a770a940a614df9f31fea5953816cb0e2bd3
@@ -67,4 +68,5 @@ EBUILD netbeans-extide-9999_p20151215.ebuild 3377 SHA256 ee1a3ffb3f78579a48ca609
 EBUILD netbeans-extide-9999_p20151216.ebuild 3377 SHA256 981c26b61c1243d2ebca2e453b2fed30f6e1daa6e47aa73c79bfcf4687902273 SHA512 c2539313506af4b8875774852241c86eb485bf29a493f94f53c9ceb24c7f9776c0f227eed786db0f0b5380fe771ef4ff5684445cd58731f407c90fc5e1fe75e5 WHIRLPOOL 8380cc150417ae02e7dc55f0df97ae1ea6e424a3fba0056d7c4aae69ea4d859112b033c6a09c5113674e3eac62dacc71708648d9ef0a1892459321f4bb6b2aae
 EBUILD netbeans-extide-9999_p20151217.ebuild 3377 SHA256 407badaa685de3ca2d6f106b4c54b0c677bf2d3aab1b616e893d47f3d0a8d7a5 SHA512 e27d5ce45b936d2b61c7c1c7dc88a5b98ca47086f518f79a652a4641a7f9589e68b34a740af22b513d30582f0db24507ac1457112753013d0b6efd7a1ea2ba90 WHIRLPOOL 7f1f9dc0265d6c96f164ec1d6280e9acd077f5327cfc0b0f148356e94894037d468036ba872edcd543936cc4ebac5f2248eb07976416207072a02aebe3ff27c2
 EBUILD netbeans-extide-9999_p20151218.ebuild 3377 SHA256 82c6715901fe807e7081c0a72b31fbaf9a392c53b2e33a5d7b350b081cd90559 SHA512 38febee3f7db581933ff40f409e3a21d06da6a7b3f673367bbd5d39359d4d5fb11b94c9d184a2d1c7d2780d60d9e9893d8b7f597b240c7f53f85837648239207 WHIRLPOOL f1ebd3f10e01c75ec595e869e18e788451311b0d7b27627f8e9a0e8c3735addcc7d01ca4c4143fc732440b7faf3ca30441642e6953eba392328f3da82f3b52c4
+EBUILD netbeans-extide-9999_p20151221.ebuild 3377 SHA256 422bed16c79da0630122898a2acf1c34d8d66f3790dd496e28f7227ef117b2b8 SHA512 d4e2190d0773ecb973f99fad4c4c61a00da47e2b9a8a98930a7d0eee0b8951733416c83510075d508b37b78a6d65efad999e5103029754b8d17a3a39b815eef8 WHIRLPOOL 0d0ec91cb6f908ffb7b431ab03e9949b362bf0a5c0e1cc1845715f11c63f85395a80bad2526d70a12c756f63455dd5d9af386551f1cf37e6b19f171417c10eb1
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20151221.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20151221.ebuild
new file mode 100644
index 0000000..c4ab6b6
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20151221.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-21_00-02-04/zip/netbeans-trunk-nightly-201512210002-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 1bffb64..4c60862 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201512150002-src.zip 209278678 SHA256 5c97f3333dc701
 DIST netbeans-trunk-nightly-201512160002-src.zip 209284935 SHA256 b9de21df9893215edfd3aa66d19bba3ef4d712364457937ffca0eb2e1a01c311 SHA512 58b19c90c4f8f4edfef3741b7b05616a6aaad5fd1c81c68037ecf2d05f67c979400346773392ca34427ceec8ae7adf8f57d47c564025b4e531e52732ba102fd6 WHIRLPOOL b365748df55e76aaf285ba5d139157a04748359b204f4eec0e6d222df41df8882eda831b327b61b6e9476572402b2e84a4eb2cab057a4ac5d180e2f276ae7ac2
 DIST netbeans-trunk-nightly-201512170002-src.zip 209334699 SHA256 4bab0de756b2b1d61af59c5f5eac8fa6faefec1abe2f7f82eb50593776cbd7eb SHA512 660689d11454e2816f623e6ece3b7d23d6fef7a387ac080cdc138dc44b2110325dda37e74635c6f5883a586258167cc7720fe74896e25d3f25f15f3c9a2f3cfb WHIRLPOOL 8934b7be1fbc0253582ac16524ca185304557e1834681bb0abb6e615fe02f45a72cec662312ca44c5ca04e776116307c307b1ee08604d741f8e3aaf11b92c995
 DIST netbeans-trunk-nightly-201512180002-src.zip 209387619 SHA256 ee149de6b63dd36518dd78a8f28b0603b68a01b062d35c63d81f7742ed0fc805 SHA512 7aa9fcb6d7269264b76dd0eab66e0bc2e855ddb70de7a357dae5a5a3a8865da6979486acac421d351425e2c033ba689d4521cfc0353dc9ec62dd487b013e60cd WHIRLPOOL ab6b2385e651852bb383f7a9eaa5a24ac5f8deca8afd3dc8c0e0569acdb02ee54de89221a16fd93eea634df8011598270ae29f00c970edfecf6960d93846e9ac
+DIST netbeans-trunk-nightly-201512210002-src.zip 209401161 SHA256 82cc114d515412f1a828e622a467e747e8933ae2165da46a143073f2b9d0faaf SHA512 110c4a257904c61ee54e8ac97c09a6d67b2e39d82103fd5436d13cb1198c2bc15d15232d0434f0c0e6b2d828580be0d60d47067adbeb4ee7b753b193436d330d WHIRLPOOL 910a1938547e78e1469c878afc632b70a3fc2893f2cd7bc5cd2c207c565b1e2ff12b8bca517c1351d33b446ff5b3f1fa0ee652f058f7a10ef7c1603c45299c89
 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_p20151116.ebuild 3416 SHA256 ce0507ceb49947d863caca538755622d0cd3a4156e7c32e79bbca0e06ced6b5e SHA512 448db8bdc9dbfca7e8b58bd5cf3b4d59f426c250e5983e0ae2ef3909cb35da9845d047d244c318f91433f65a42db9ac55e5b0d1eba314307ed56ebb48de992ea WHIRLPOOL a0c3e8a5d62c30ebe32677a9b3e320f6e2f5c49598daf5871c7d5ca824365ffbded0bfec2a31e4ab159a7e2fd2b68a6f00a735ab0769542e3ecc22ad69d60bc0
@@ -66,4 +67,5 @@ EBUILD netbeans-groovy-9999_p20151215.ebuild 3416 SHA256 528f698838f4fb67d2e3076
 EBUILD netbeans-groovy-9999_p20151216.ebuild 3416 SHA256 14645354d40399ec31f6365b37ee300c755bec9f1fdee01e33fcebab8b74cc0d SHA512 eef9f6a8e2c76d407960a4bd036f2ae7b16b765d64fa24e07bc57ccd72e5f5d5e1444dd96ba7eb34f81a762ed04f5f4e097596f2313f7fe95d69920daea6879f WHIRLPOOL 8f8e406295fed5faaa5a3ae80abac5776a40b36dd012cb8a6ca7fe35026cccc06f6aa3f8431c46019104f5b73aff00d1b719d94e670f4cd7aa3ace3ea9726a8c
 EBUILD netbeans-groovy-9999_p20151217.ebuild 3416 SHA256 ad3c7dcbde06ce299335db4307bd9f2f9892ffc8880d5b84b0b9b5396c934e86 SHA512 817d591f5a211c72e8907a403d4ea4380debd94ec74ee009cacf238ff48d2f99cad7f3ab92ab0b245cd7f089cb92ca7b19e9c79ded84f2bc6f77e7779635fa68 WHIRLPOOL 176a727f98f0edd4b10614e43d0bd7aaca1c787ff3939226f2b27559a2dba35e7d0d9bbc21eda372431ac87bebf5de889172e85c408516c0c6acef7c05df2f28
 EBUILD netbeans-groovy-9999_p20151218.ebuild 3416 SHA256 867bdb0a470dab1c152df49af536067aadce8a5dbe47a30806983aca34cbf4b1 SHA512 e4acbbdc4223878633f2b6daa8b2a3805421910520dc764fb32a598c5de87c2c8e4144e0db247b39db5a0637a277305bdf4176dced5a2316d2a786a3606131a9 WHIRLPOOL 47e414f6e97b828411946111712d873a40117d2d94071c14ff0aaffcf8e0b27961864d34d3a29c8b4b645fd2d626bd98456546bfccd0bb372155937c9a34db32
+EBUILD netbeans-groovy-9999_p20151221.ebuild 3416 SHA256 7c7805fd424df299760e69c468a94325c838bb890583026a5f1200711fba72bf SHA512 91de8a4389075b94c99ed913ed06a3336b761bd10032c5caeba4cdbbdd48977e3b396cece2f46cc899bb612dc78b5b9b9a961a7023e07a6e0ba020c5843b9a29 WHIRLPOOL d63af65a736cdc86d0e6a0a0206fd98031e385594d4edb29cc78c5f3ab73027701a14b6bfc5c53e42966ea76d3c79695296f5970fcb6820ad85cd96404c03d17
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20151221.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20151221.ebuild
new file mode 100644
index 0000000..2815799
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20151221.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-21_00-02-04/zip/netbeans-trunk-nightly-201512210002-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 b7e4bba..cf3dfaa 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201512150002-src.zip 209278678 SHA256 5c97f3333dc701
 DIST netbeans-trunk-nightly-201512160002-src.zip 209284935 SHA256 b9de21df9893215edfd3aa66d19bba3ef4d712364457937ffca0eb2e1a01c311 SHA512 58b19c90c4f8f4edfef3741b7b05616a6aaad5fd1c81c68037ecf2d05f67c979400346773392ca34427ceec8ae7adf8f57d47c564025b4e531e52732ba102fd6 WHIRLPOOL b365748df55e76aaf285ba5d139157a04748359b204f4eec0e6d222df41df8882eda831b327b61b6e9476572402b2e84a4eb2cab057a4ac5d180e2f276ae7ac2
 DIST netbeans-trunk-nightly-201512170002-src.zip 209334699 SHA256 4bab0de756b2b1d61af59c5f5eac8fa6faefec1abe2f7f82eb50593776cbd7eb SHA512 660689d11454e2816f623e6ece3b7d23d6fef7a387ac080cdc138dc44b2110325dda37e74635c6f5883a586258167cc7720fe74896e25d3f25f15f3c9a2f3cfb WHIRLPOOL 8934b7be1fbc0253582ac16524ca185304557e1834681bb0abb6e615fe02f45a72cec662312ca44c5ca04e776116307c307b1ee08604d741f8e3aaf11b92c995
 DIST netbeans-trunk-nightly-201512180002-src.zip 209387619 SHA256 ee149de6b63dd36518dd78a8f28b0603b68a01b062d35c63d81f7742ed0fc805 SHA512 7aa9fcb6d7269264b76dd0eab66e0bc2e855ddb70de7a357dae5a5a3a8865da6979486acac421d351425e2c033ba689d4521cfc0353dc9ec62dd487b013e60cd WHIRLPOOL ab6b2385e651852bb383f7a9eaa5a24ac5f8deca8afd3dc8c0e0569acdb02ee54de89221a16fd93eea634df8011598270ae29f00c970edfecf6960d93846e9ac
+DIST netbeans-trunk-nightly-201512210002-src.zip 209401161 SHA256 82cc114d515412f1a828e622a467e747e8933ae2165da46a143073f2b9d0faaf SHA512 110c4a257904c61ee54e8ac97c09a6d67b2e39d82103fd5436d13cb1198c2bc15d15232d0434f0c0e6b2d828580be0d60d47067adbeb4ee7b753b193436d330d WHIRLPOOL 910a1938547e78e1469c878afc632b70a3fc2893f2cd7bc5cd2c207c565b1e2ff12b8bca517c1351d33b446ff5b3f1fa0ee652f058f7a10ef7c1603c45299c89
 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_p20151116.ebuild 4125 SHA256 88de80f173a5789279d46b56b7bbb5c3a5dea2156dde023f81d3601fbc25b22f SHA512 8f00574dcb0599ea9ccc971350c9defcc98462c4f24fe5ed81f44705cca88562d3cb6c095c0f57e018efa6113cda879451e19a0041a36c864004cca24099b17f WHIRLPOOL 4df13602b9ff522b7fa9845052bbd6422513bd191685865859a2cfc6c1213dd9e13c6406eb0105af25e66490ab36dc7bdeef6d64f2e39cdab5a001f8c6817349
@@ -70,4 +71,5 @@ EBUILD netbeans-harness-9999_p20151215.ebuild 4125 SHA256 752289da6d779402c0a992
 EBUILD netbeans-harness-9999_p20151216.ebuild 4126 SHA256 45a124ed8c92c9a3777a636065ba44568ec420cc0f01a214f59043d36039c186 SHA512 e3b49e7d522401cb579ad9a300fa6b0aab3949dc099cb68ddad092c4e27a633b54ed9e11f0a325376a1d35a3560be1b864e6197acd02fa5d76c4de9c72de7d94 WHIRLPOOL f58b30490d732580b76e31daa039a6008d1ec0e804238435d6504c85416f41137531f66ac1bfd690f3e27e2da967ea1bae99fa51648b5d1e3a1fb90d5d9bcc88
 EBUILD netbeans-harness-9999_p20151217.ebuild 4126 SHA256 03bbb61a643620d751b59e0824fb6f8944ad3d025c0272520c07b85c8b249e23 SHA512 473239fd83f3ef13ea516c60e3b79cb1c80a8c7c4aa26d38b7e85bfe143a16662e9b3c45f8f56f53b2c3847535c44c04f426795f348c7b4d418edd95bbc1a674 WHIRLPOOL 6e5a1120adbadd42b95064afc78833c002085f3012693e978c917371ad76285324a0753163843f2c633813e38399107a49c76d636fb4ad5a7e5825add9ef689f
 EBUILD netbeans-harness-9999_p20151218.ebuild 4126 SHA256 beda2c2ec8b878435b2e0a3106f6b1dfebe041235c069add8dbc75f06dee489a SHA512 12fb053450437a8128dbc8d49bf106b471f3f386cca7e5f55a2862643dc45fc19c3291748c76bcabe5f8341d40233b9cb8813b099e088e7d63cbf6b8c5a60fe3 WHIRLPOOL f15cf96c3336df547c1adde56e9b462e4add4670705600c021378c6788c5c0f6ada0090ac21eb092756edbe0d7ef317176dd7ad4eda04a8f63112086af9a1ec6
+EBUILD netbeans-harness-9999_p20151221.ebuild 4126 SHA256 dcc8771abd1f8d317480afb56d8b4ebaeda79a0a9cf86e17196c1ccb9fffa4f4 SHA512 6cb0dd618f455f538bc3239aeff356c35ed967a674222986b70defa8590eae8a0005ddb3ce6acd50b11089f0a0d1cc2d1b572d7561cd3a2ea113cff0ee1cd449 WHIRLPOOL 5996eb5bb0fa9776b912764d00ceb6378775981df5e4479f02f6a9125f9f8f9827295b9675dc3ad7a1a2bf875b85700b5f62b8a622ee5f62352038869822fc36
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20151221.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20151221.ebuild
new file mode 100644
index 0000000..4d608b9
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20151221.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-21_00-02-04/zip/netbeans-trunk-nightly-201512210002-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="${D}"/${INSTALL_DIR}/antlib
+	pushd "${instdir}" >/dev/null || die
+	rm jsearch-2.0_05.jar && java-pkg_jar-from --into "${instdir}" javahelp jsearch.jar jsearch-2.0_05.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/harness
+}

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 0ebdd4d..113b0ad 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -164,6 +164,7 @@ DIST netbeans-trunk-nightly-201512150002-src.zip 209278678 SHA256 5c97f3333dc701
 DIST netbeans-trunk-nightly-201512160002-src.zip 209284935 SHA256 b9de21df9893215edfd3aa66d19bba3ef4d712364457937ffca0eb2e1a01c311 SHA512 58b19c90c4f8f4edfef3741b7b05616a6aaad5fd1c81c68037ecf2d05f67c979400346773392ca34427ceec8ae7adf8f57d47c564025b4e531e52732ba102fd6 WHIRLPOOL b365748df55e76aaf285ba5d139157a04748359b204f4eec0e6d222df41df8882eda831b327b61b6e9476572402b2e84a4eb2cab057a4ac5d180e2f276ae7ac2
 DIST netbeans-trunk-nightly-201512170002-src.zip 209334699 SHA256 4bab0de756b2b1d61af59c5f5eac8fa6faefec1abe2f7f82eb50593776cbd7eb SHA512 660689d11454e2816f623e6ece3b7d23d6fef7a387ac080cdc138dc44b2110325dda37e74635c6f5883a586258167cc7720fe74896e25d3f25f15f3c9a2f3cfb WHIRLPOOL 8934b7be1fbc0253582ac16524ca185304557e1834681bb0abb6e615fe02f45a72cec662312ca44c5ca04e776116307c307b1ee08604d741f8e3aaf11b92c995
 DIST netbeans-trunk-nightly-201512180002-src.zip 209387619 SHA256 ee149de6b63dd36518dd78a8f28b0603b68a01b062d35c63d81f7742ed0fc805 SHA512 7aa9fcb6d7269264b76dd0eab66e0bc2e855ddb70de7a357dae5a5a3a8865da6979486acac421d351425e2c033ba689d4521cfc0353dc9ec62dd487b013e60cd WHIRLPOOL ab6b2385e651852bb383f7a9eaa5a24ac5f8deca8afd3dc8c0e0569acdb02ee54de89221a16fd93eea634df8011598270ae29f00c970edfecf6960d93846e9ac
+DIST netbeans-trunk-nightly-201512210002-src.zip 209401161 SHA256 82cc114d515412f1a828e622a467e747e8933ae2165da46a143073f2b9d0faaf SHA512 110c4a257904c61ee54e8ac97c09a6d67b2e39d82103fd5436d13cb1198c2bc15d15232d0434f0c0e6b2d828580be0d60d47067adbeb4ee7b753b193436d330d WHIRLPOOL 910a1938547e78e1469c878afc632b70a3fc2893f2cd7bc5cd2c207c565b1e2ff12b8bca517c1351d33b446ff5b3f1fa0ee652f058f7a10ef7c1603c45299c89
 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_p20151116.ebuild 31262 SHA256 6c1e5a3c6d13d7c66e32a077137a59fc3279f163621dac02ac727fc1af8eec4c SHA512 dc5fe422781df350f18fef9ac2530688548e0d1e4f62b8eb8068a94ce2bba69c845b96887e7213f304ba1bd13d41576878811f8421ac13fad4a171c0393836d8 WHIRLPOOL 596f5db1509a29bf9e1955b0167a19bc067cc0c5da8e15c4c53bf2b2971558701a664c20de30069b755521b662879b57666628d138763a4d1260770d6c9863fe
@@ -196,4 +197,5 @@ EBUILD netbeans-ide-9999_p20151215.ebuild 30890 SHA256 286b1a0c026583850a35a855a
 EBUILD netbeans-ide-9999_p20151216.ebuild 30832 SHA256 31f8ad7534cf9819c8fa74a33be8ad91b78ad6485a5b11dc61643a840f3e5067 SHA512 3d887204e877b425f8d260489f62f575ec5c33ae5baf33e65dc054c1e54ca850e969aabc52aebd9f24d81cc9004894588d8c41b5f5cccdfb75fd0765e169fe8b WHIRLPOOL b071d968d0436defa4231785ff087670298d5148fa4be5dbc21be2d9827d3f70fe83ef3080860f38c46d56c6f13f1fa37b0118731d13a26504dc9951dba35ad6
 EBUILD netbeans-ide-9999_p20151217.ebuild 30832 SHA256 b8ae7ab46583a2cb73d36a22ffcb99c2fbbd0f73bdf259ca5b9cf1de56c6edbf SHA512 272dc64298f1fb5b30f601bf74d43d387b6694200b371ffaf15fb1b61318e052e98ca58ff633d96a3b89664ae4c8d4b0f7f6ba70d8e87470fd8338bb44d302ab WHIRLPOOL 5a4e1529b3403c17dd44ea26c3b37518e3089c307d24efe8e9b8ff097778114bbde8d42df752eeb894e49fd7e89dbd7ff38a5cc805c7c48efde2884d008127e2
 EBUILD netbeans-ide-9999_p20151218.ebuild 30832 SHA256 082efbe4db04c5d9d6eafdbe9748f0eb5e04895fa021f54ce719764cdd0b95bd SHA512 c9b54673aea1acab134f6ef754c2d9c8838c27bcc0cf754eaa6cbd1ecfadfb3b91eb47f1cddeaa2080e9674c2eefc3edd5bd49df62cda2dc40ec40685173073f WHIRLPOOL e4b60932b5baf3f89dd3c05d3140351ac3b8da8d709682dd5ebd6df7078438e8ef1c23cd46ccff6d415d7fd0110ff62ce81e13deea3e0afb9a96e7c0d553493f
+EBUILD netbeans-ide-9999_p20151221.ebuild 30832 SHA256 a71b84969bc373c3cd934cc9ce38ae232f5c4ac20108050253ac1a08a096f8e1 SHA512 28e5689b77005c9e8224d2c55936443c5dce22b057a43b3c76e2a1c00afd8d9381d97cb7b288fc867ea3ebb033a4a76717409ae26026711b83a312aaf7afcd4d WHIRLPOOL 937c9a4b1d4bdeacc034a93320746c2c1c7fb2c2b90fe1ed97dc0e7a2ba633a548ef91ff95054bdf29e4041bbb07297fa628c9d505537471912e0528c0ceb606
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20151221.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20151221.ebuild
new file mode 100644
index 0000000..3e2317a
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20151221.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-21_00-02-04/zip/netbeans-trunk-nightly-201512210002-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="${D}"/${INSTALL_DIR}/modules
+	pushd "${instdir}" >/dev/null || die
+	rm com-jcraft-jsch.jar && java-pkg_jar-from --into "${instdir}" jsch jsch.jar com-jcraft-jsch.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext
+	pushd "${instdir}" >/dev/null || die
+	rm commons-compress-1.8.1.jar && java-pkg_jar-from --into "${instdir}" commons-compress commons-compress.jar commons-compress-1.8.1.jar
+	# rm freemarker-2.3.19.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.19.jar || die
+	rm icu4j-4_4_2.jar && java-pkg_jar-from --into "${instdir}" icu4j-4.4 icu4j.jar icu4j-4_4_2.jar
+	rm isorelax.jar && java-pkg_jar-from --into "${instdir}" iso-relax isorelax.jar
+	rm json-simple-1.1.1.jar && java-pkg_jar-from --into "${instdir}" json-simple json-simple.jar json-simple-1.1.1.jar
+	rm jvyamlb-0.2.7.jar && java-pkg_jar-from --into "${instdir}" jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
+	rm log4j-1.2.15.jar && java-pkg_jar-from --into "${instdir}" log4j log4j.jar log4j-1.2.15.jar
+	rm lucene-core-3.5.0.jar && java-pkg_jar-from --into "${instdir}" lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
+	rm mysql-connector-java-5.1.23-bin.jar && java-pkg_jar-from --into "${instdir}" jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
+	rm postgresql-9.2-1002.jdbc4.jar && java-pkg_jar-from --into "${instdir}" jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar
+	rm saxon9B.jar && java-pkg_jar-from --into "${instdir}" saxon-9 saxon.jar saxon9B.jar
+	rm servlet-2.2.jar && java-pkg_jar-from --into "${instdir}" tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
+	rm smack.jar && java-pkg_jar-from --into "${instdir}" smack-2.2 smack.jar
+	rm smackx.jar && java-pkg_jar-from --into "${instdir}" smack-2.2 smackx.jar
+	# rm svnjavahl.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl.jar || die
+	rm xerces-2.8.0.jar && java-pkg_jar-from --into "${instdir}" xerces-2 xercesImpl.jar xerces-2.8.0.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxb
+	pushd "${instdir}" >/dev/null || die
+	rm activation.jar && java-pkg_jar-from --into "${instdir}" sun-jaf activation.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxb/api
+	pushd "${instdir}" >/dev/null || die
+	rm jsr173_1.0_api.jar && java-pkg_jar-from --into "${instdir}" jsr173 jsr173.jar jsr173_1.0_api.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ide
+}

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index b99e986..8b86e6d 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -68,6 +68,7 @@ DIST netbeans-trunk-nightly-201512150002-src.zip 209278678 SHA256 5c97f3333dc701
 DIST netbeans-trunk-nightly-201512160002-src.zip 209284935 SHA256 b9de21df9893215edfd3aa66d19bba3ef4d712364457937ffca0eb2e1a01c311 SHA512 58b19c90c4f8f4edfef3741b7b05616a6aaad5fd1c81c68037ecf2d05f67c979400346773392ca34427ceec8ae7adf8f57d47c564025b4e531e52732ba102fd6 WHIRLPOOL b365748df55e76aaf285ba5d139157a04748359b204f4eec0e6d222df41df8882eda831b327b61b6e9476572402b2e84a4eb2cab057a4ac5d180e2f276ae7ac2
 DIST netbeans-trunk-nightly-201512170002-src.zip 209334699 SHA256 4bab0de756b2b1d61af59c5f5eac8fa6faefec1abe2f7f82eb50593776cbd7eb SHA512 660689d11454e2816f623e6ece3b7d23d6fef7a387ac080cdc138dc44b2110325dda37e74635c6f5883a586258167cc7720fe74896e25d3f25f15f3c9a2f3cfb WHIRLPOOL 8934b7be1fbc0253582ac16524ca185304557e1834681bb0abb6e615fe02f45a72cec662312ca44c5ca04e776116307c307b1ee08604d741f8e3aaf11b92c995
 DIST netbeans-trunk-nightly-201512180002-src.zip 209387619 SHA256 ee149de6b63dd36518dd78a8f28b0603b68a01b062d35c63d81f7742ed0fc805 SHA512 7aa9fcb6d7269264b76dd0eab66e0bc2e855ddb70de7a357dae5a5a3a8865da6979486acac421d351425e2c033ba689d4521cfc0353dc9ec62dd487b013e60cd WHIRLPOOL ab6b2385e651852bb383f7a9eaa5a24ac5f8deca8afd3dc8c0e0569acdb02ee54de89221a16fd93eea634df8011598270ae29f00c970edfecf6960d93846e9ac
+DIST netbeans-trunk-nightly-201512210002-src.zip 209401161 SHA256 82cc114d515412f1a828e622a467e747e8933ae2165da46a143073f2b9d0faaf SHA512 110c4a257904c61ee54e8ac97c09a6d67b2e39d82103fd5436d13cb1198c2bc15d15232d0434f0c0e6b2d828580be0d60d47067adbeb4ee7b753b193436d330d WHIRLPOOL 910a1938547e78e1469c878afc632b70a3fc2893f2cd7bc5cd2c207c565b1e2ff12b8bca517c1351d33b446ff5b3f1fa0ee652f058f7a10ef7c1603c45299c89
 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
@@ -103,4 +104,5 @@ EBUILD netbeans-java-9999_p20151215.ebuild 14983 SHA256 481955ba0d522521b6b9ca74
 EBUILD netbeans-java-9999_p20151216.ebuild 14930 SHA256 b2d06430f0af429c7d1307fed2b888bf71c211852dcba01cf9d8fb89508ff36b SHA512 4e3ffac4a5a92fb5c590dc5b479c4ae1a6b8a1c0084167ffa987e5e1f73bc84f2c388b07b22ba4bf15af046b4c5db0f0ab9bfa62256414349730e6d084a09b50 WHIRLPOOL 233bc9b1b589940fdb6baff044852e0ab878ebe29e470491ed8e8c267be9744fdf8f037abc23ac42f1770ad4141391c5bacd55cd6fc43061edbe8fe585ec2dab
 EBUILD netbeans-java-9999_p20151217.ebuild 14930 SHA256 151909ff0a2b3102b96ca3d5daa971ca51453c4cfbd347d21f5ec5dc7b8738ed SHA512 c1b333450937318607518f0dff06c1757940f40ca239fdfb60f2e05eef45f6014d761cb45fab242bfcd8822913a33675e5f6a565f266daf0135a16cadb3c4f1f WHIRLPOOL 21cc8e563deeebe64fd26fc63fd372ec63737166d6b4fd9302b495a474e1a262c6dee0386a39378fa50ad9c5cd09a7b9947e1dc7fe042f55c22eca04c816f4e1
 EBUILD netbeans-java-9999_p20151218.ebuild 14930 SHA256 4dd047a73c549944d1ff39002173e051d2ea974d39a3825621e2e822c261e299 SHA512 bbd45809212c558a45e9ea345871163dc553fd3e2faf01aa550d9ac09743e7a13e221ed397de435a200683c84f3e1514c2bb13897288821106bddaef918cb5df WHIRLPOOL afe6f016299081fd9fc6ce2a65eba5278c0206c49be0c27cd9e39e2bacd98b455973e0680589ae5e0ee9a57c104d459a2b15d6ee00d2b35c47cc1107e8ed5f9e
+EBUILD netbeans-java-9999_p20151221.ebuild 14930 SHA256 c2bfd365218830d46f00b9da0c4232ef1f360eef2409189c2c1664956d60e13e SHA512 44e19a2afb6b5fa0e634134a3edfdc6a2489b927cd3e0618fcb21168d2864455ba160da5f05db36150e37a17aae2d292b217204da953b7dbb8c68f722fedee9d WHIRLPOOL 9dd538dfa951a20b2ccc2a844e200ad81aac2d336a58632881a832e7a500155a93c30a00d13f6fcb953883af8d6be3a65e8e974843027e00520b290e6bb2fce2
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20151221.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20151221.ebuild
new file mode 100644
index 0000000..d35652e
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20151221.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-21_00-02-04/zip/netbeans-trunk-nightly-201512210002-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-1:0
+	dev-java/log4j:0
+	dev-java/mimepull:0
+	dev-java/oracle-javamail:0
+	dev-java/saaj:0
+	dev-java/slf4j-api:0
+	dev-java/slf4j-log4j12:0
+	dev-java/slf4j-simple:0
+	dev-java/stax-ex:0
+	dev-java/stax2-api:0
+	dev-java/xmlstreambuffer:0"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.java -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+pkg_pretend() {
+	local die_now=""
+
+	if [ -d /usr/share/netbeans-java-${SLOT}/ant ]; then
+		if [ -n "$(find /usr/share/netbeans-java-${SLOT}/ant -type l)" ]; then
+			eerror "Please remove following symlinks and run emerge again:"
+			find /usr/share/netbeans-java-${SLOT}/ant -type l
+			die_now="1"
+		fi
+	fi
+
+	if [ -L /usr/share/netbeans-java-${SLOT}/maven ]; then
+		if [ -z "${die_now}" ]; then
+			eerror "Please remove following symlinks and run emerge again:"
+		fi
+
+		echo "/usr/share/netbeans-java-${SLOT}/maven"
+		die_now="1"
+	fi
+
+	if [ -n "${die_now}" ]; then
+		die "Symlinks exist"
+	fi
+}
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-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="${D}"/${INSTALL_DIR}/maven/lib
+	pushd "${instdir}" >/dev/null || die
+	rm commons-cli-1.2.jar && java-pkg_jar-from --into "${instdir}" commons-cli-1 commons-cli.jar commons-cli-1.2.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext
+	pushd "${instdir}" >/dev/null || die
+	rm AbsoluteLayout.jar  && java-pkg_jar-from --into "${instdir}" absolutelayout absolutelayout.jar AbsoluteLayout.jar
+	rm beansbinding-1.2.1.jar && java-pkg_jar-from --into "${instdir}" beansbinding beansbinding.jar beansbinding-1.2.1.jar
+	rm cglib-2.2.jar && java-pkg_jar-from --into "${instdir}" cglib-3 cglib.jar cglib-2.2.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/hibernate4
+	pushd "${instdir}" >/dev/null || die
+	rm antlr-2.7.7.jar && java-pkg_jar-from --into "${instdir}" antlr antlr.jar antlr-2.7.7.jar
+	rm c3p0-0.9.2.1.jar && java-pkg_jar-from --into "${instdir}" c3p0 c3p0.jar c3p0-0.9.2.1.jar
+	rm cglib-2.2.jar && java-pkg_jar-from --into "${instdir}" cglib-3 cglib.jar cglib-2.2.jar
+	rm commons-collections-3.2.1.jar && java-pkg_jar-from --into "${instdir}" commons-collections commons-collections.jar commons-collections-3.2.1.jar
+	rm dom4j-1.6.1.jar && java-pkg_jar-from --into "${instdir}" dom4j-1 dom4j.jar dom4j-1.6.1.jar
+	rm javassist-3.18.1-GA.jar && java-pkg_jar-from --into "${instdir}" javassist-3 javassist.jar javassist-3.18.1-GA.jar
+	rm jboss-logging-3.1.3.GA.jar && java-pkg_jar-from --into "${instdir}" jboss-logging jboss-logging.jar jboss-logging-3.1.3.GA.jar
+	rm jboss-transaction-api_1.2_spec-1.0.0.Final.jar && java-pkg_jar-from --into "${instdir}" glassfish-transaction-api jta.jar jboss-transaction-api_1.2_spec-1.0.0.Final.jar
+	rm jtidy-r8-20060801.jar && java-pkg_jar-from --into "${instdir}" jtidy jtidy.jar jtidy-r8-20060801.jar
+	rm log4j-1.2.12.jar && java-pkg_jar-from --into "${instdir}" log4j log4j.jar log4j-1.2.12.jar
+	rm slf4j-api-1.6.1.jar && java-pkg_jar-from --into "${instdir}" slf4j-api slf4j-api.jar slf4j-api-1.6.1.jar
+	rm slf4j-log4j12-1.6.1.jar && java-pkg_jar-from --into "${instdir}" slf4j-log4j12 slf4j-log4j12.jar slf4j-log4j12-1.6.1.jar
+	rm slf4j-simple-1.6.1.jar && java-pkg_jar-from --into "${instdir}" slf4j-simple slf4j-simple.jar slf4j-simple-1.6.1.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxws22
+	pushd "${instdir}" >/dev/null || die
+	rm FastInfoset.jar && java-pkg_jar-from --into "${instdir}" fastinfoset fastinfoset.jar FastInfoset.jar
+	rm javax.mail_1.4.jar && java-pkg_jar-from --into "${instdir}" oracle-javamail mail.jar javax.mail_1.4.jar
+	rm mimepull.jar && java-pkg_jar-from --into "${instdir}" mimepull mimepull.jar
+	rm saaj-impl.jar && java-pkg_jar-from --into "${instdir}" saaj saaj.jar saaj-impl.jar
+	rm stax-ex.jar && java-pkg_jar-from --into "${instdir}" stax-ex stax-ex.jar
+	rm stax2-api.jar && java-pkg_jar-from --into "${instdir}" stax2-api stax2-api.jar
+	rm streambuffer.jar && java-pkg_jar-from --into "${instdir}" xmlstreambuffer xmlstreambuffer.jar streambuffer.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxws22/api
+	pushd "${instdir}" >/dev/null || die
+	rm jsr181-api.jar && java-pkg_jar-from --into "${instdir}" jsr181 jsr181.jar jsr181-api.jar
+	rm saaj-api.jar && java-pkg_jar-from --into "${instdir}" jsr67 jsr67.jar saaj-api.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/maven
+	pushd "${instdir}" >/dev/null || die
+	rm jdom-1.0.jar && java-pkg_jar-from --into "${instdir}" jdom jdom.jar jdom-1.0.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java
+}

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index 1ca4637..7644323 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201512150002-src.zip 209278678 SHA256 5c97f3333dc701
 DIST netbeans-trunk-nightly-201512160002-src.zip 209284935 SHA256 b9de21df9893215edfd3aa66d19bba3ef4d712364457937ffca0eb2e1a01c311 SHA512 58b19c90c4f8f4edfef3741b7b05616a6aaad5fd1c81c68037ecf2d05f67c979400346773392ca34427ceec8ae7adf8f57d47c564025b4e531e52732ba102fd6 WHIRLPOOL b365748df55e76aaf285ba5d139157a04748359b204f4eec0e6d222df41df8882eda831b327b61b6e9476572402b2e84a4eb2cab057a4ac5d180e2f276ae7ac2
 DIST netbeans-trunk-nightly-201512170002-src.zip 209334699 SHA256 4bab0de756b2b1d61af59c5f5eac8fa6faefec1abe2f7f82eb50593776cbd7eb SHA512 660689d11454e2816f623e6ece3b7d23d6fef7a387ac080cdc138dc44b2110325dda37e74635c6f5883a586258167cc7720fe74896e25d3f25f15f3c9a2f3cfb WHIRLPOOL 8934b7be1fbc0253582ac16524ca185304557e1834681bb0abb6e615fe02f45a72cec662312ca44c5ca04e776116307c307b1ee08604d741f8e3aaf11b92c995
 DIST netbeans-trunk-nightly-201512180002-src.zip 209387619 SHA256 ee149de6b63dd36518dd78a8f28b0603b68a01b062d35c63d81f7742ed0fc805 SHA512 7aa9fcb6d7269264b76dd0eab66e0bc2e855ddb70de7a357dae5a5a3a8865da6979486acac421d351425e2c033ba689d4521cfc0353dc9ec62dd487b013e60cd WHIRLPOOL ab6b2385e651852bb383f7a9eaa5a24ac5f8deca8afd3dc8c0e0569acdb02ee54de89221a16fd93eea634df8011598270ae29f00c970edfecf6960d93846e9ac
+DIST netbeans-trunk-nightly-201512210002-src.zip 209401161 SHA256 82cc114d515412f1a828e622a467e747e8933ae2165da46a143073f2b9d0faaf SHA512 110c4a257904c61ee54e8ac97c09a6d67b2e39d82103fd5436d13cb1198c2bc15d15232d0434f0c0e6b2d828580be0d60d47067adbeb4ee7b753b193436d330d WHIRLPOOL 910a1938547e78e1469c878afc632b70a3fc2893f2cd7bc5cd2c207c565b1e2ff12b8bca517c1351d33b446ff5b3f1fa0ee652f058f7a10ef7c1603c45299c89
 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_p20151116.ebuild 4976 SHA256 110715f877ae8c2dec80dbd46d52166c5f61c71fb5e35ce28eb05befb59adac7 SHA512 619fae4b2f2c3079ab78f8b8127596da286632b35c4d155ba3ccf6bef9d3cbb00631d7712d26b2f7a516ba472fc4c697f1ddf8cda15c649ab2b342da113f7840 WHIRLPOOL bd1a5d7d749920dc4b7cc86acb6268fc2b6c8b8aff919a21661a3b64fcbcbf9a9ff5a3c1f006bd23a6f0e83c83f687e445bc87f2e39862d0088ff4713c80565b
@@ -68,4 +69,5 @@ EBUILD netbeans-javacard-9999_p20151215.ebuild 4976 SHA256 4968b0373e8a1d2345dcf
 EBUILD netbeans-javacard-9999_p20151216.ebuild 4971 SHA256 3419864bf36d8c3612cb8dca47352172ba044318e274aa03a1ad39a330527b9d SHA512 6ae58c974bc96f426777f196ab3cd067a7f83179f3b60e5db789beee49f6cb17c3838aa8469dac533e2080125c17afc4976ad29a766dc77bf76799006e83b711 WHIRLPOOL b57146062aa4273be720c7850eff85457c159a5fee6e7d5a7c35b8e54b6f089cbf2f1ba4ffbb0d8f47621843836fe587e50e917dc5aa52039742989241563ec2
 EBUILD netbeans-javacard-9999_p20151217.ebuild 4971 SHA256 efc23003544118dd941c8b240ef3596d4e9f2aeccd1743f0a3805512146c33b9 SHA512 71a34e840e6b6df170a70143c7ff196e3bc35c480be2e823bcb2b10a0df2ff114f1327dcd17d8ddf22c22848a9c307be609f2be5a96bb3c1ff82c543e07b94f1 WHIRLPOOL d55b53f3627a0e1cbb7e29c84379fad188cb6a8b8824df07bc85126b3be8463f703cd62edaf972872daa175f8689986e719e25003b11be284d5e90f859614d59
 EBUILD netbeans-javacard-9999_p20151218.ebuild 4971 SHA256 757949003b014067f82a3d370c75e761e690a2b66a3ec4b44e43bf457694f569 SHA512 6f5b708619b8981a71d13f09d0a177d59e8e56de5e98101305b1e1e14d9a775aeefd4ab9589e8ee4db1c0c7913dfc00ef7217822fe962467f2f8010646335300 WHIRLPOOL 665f75fc6fa57747296f92c2112d0b0f07e6db17940bcb35aa922c293078c688fda02431c2eb07cb0b04f9bf79e48866bcbe39d4bb586ca32ea8f1caac7d50c2
+EBUILD netbeans-javacard-9999_p20151221.ebuild 4971 SHA256 cffd0a7b65d6a3905c68599ac1eece9ab54fc4d6fc6a5424e18b1b33e8bf2e53 SHA512 2f72be326da962395453546cbccae8120fbd097609d9ba7040ac3e8ea705bc14171b85e41f99b93c58e3adc4df1279a0f023e6d8e16bac24c697937818abbab2 WHIRLPOOL b9b208803e0e1749fd88e892bb2ddad7c0fc64b3cad7dc20220dbc1609433a04207482c664eb0096cec2130c471a7f8ec741e6a21cbaff3d8564a53faa205df2
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20151221.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20151221.ebuild
new file mode 100644
index 0000000..790ac0f
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20151221.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-21_00-02-04/zip/netbeans-trunk-nightly-201512210002-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="${D}"/${INSTALL_DIR}/JCDK3.0.2_ConnectedEdition/lib
+	pushd "${instdir}" >/dev/null || die
+	rm ant-contrib-1.0b3.jar && java-pkg_jar-from --into "${instdir}" ant-contrib ant-contrib.jar ant-contrib-1.0b3.jar
+	rm asm-all-3.1.jar && java-pkg_jar-from --into "${instdir}" asm-3 asm.jar asm-all-3.1.jar
+	rm bcel-5.2.jar && java-pkg_jar-from --into "${instdir}" bcel bcel.jar bcel-5.2.jar
+	rm commons-cli-1.0.jar && java-pkg_jar-from --into "${instdir}" commons-cli-1 commons-cli.jar commons-cli-1.0.jar
+	rm commons-codec-1.3.jar && java-pkg_jar-from --into "${instdir}" commons-codec commons-codec.jar commons-codec-1.3.jar
+	rm commons-httpclient-3.0.jar && java-pkg_jar-from --into "${instdir}" commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.0.jar
+	rm commons-logging-1.1.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar commons-logging-1.1.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/javacard
+}

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index 21e58ca..6479f9a 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201512150002-src.zip 209278678 SHA256 5c97f3333dc701
 DIST netbeans-trunk-nightly-201512160002-src.zip 209284935 SHA256 b9de21df9893215edfd3aa66d19bba3ef4d712364457937ffca0eb2e1a01c311 SHA512 58b19c90c4f8f4edfef3741b7b05616a6aaad5fd1c81c68037ecf2d05f67c979400346773392ca34427ceec8ae7adf8f57d47c564025b4e531e52732ba102fd6 WHIRLPOOL b365748df55e76aaf285ba5d139157a04748359b204f4eec0e6d222df41df8882eda831b327b61b6e9476572402b2e84a4eb2cab057a4ac5d180e2f276ae7ac2
 DIST netbeans-trunk-nightly-201512170002-src.zip 209334699 SHA256 4bab0de756b2b1d61af59c5f5eac8fa6faefec1abe2f7f82eb50593776cbd7eb SHA512 660689d11454e2816f623e6ece3b7d23d6fef7a387ac080cdc138dc44b2110325dda37e74635c6f5883a586258167cc7720fe74896e25d3f25f15f3c9a2f3cfb WHIRLPOOL 8934b7be1fbc0253582ac16524ca185304557e1834681bb0abb6e615fe02f45a72cec662312ca44c5ca04e776116307c307b1ee08604d741f8e3aaf11b92c995
 DIST netbeans-trunk-nightly-201512180002-src.zip 209387619 SHA256 ee149de6b63dd36518dd78a8f28b0603b68a01b062d35c63d81f7742ed0fc805 SHA512 7aa9fcb6d7269264b76dd0eab66e0bc2e855ddb70de7a357dae5a5a3a8865da6979486acac421d351425e2c033ba689d4521cfc0353dc9ec62dd487b013e60cd WHIRLPOOL ab6b2385e651852bb383f7a9eaa5a24ac5f8deca8afd3dc8c0e0569acdb02ee54de89221a16fd93eea634df8011598270ae29f00c970edfecf6960d93846e9ac
+DIST netbeans-trunk-nightly-201512210002-src.zip 209401161 SHA256 82cc114d515412f1a828e622a467e747e8933ae2165da46a143073f2b9d0faaf SHA512 110c4a257904c61ee54e8ac97c09a6d67b2e39d82103fd5436d13cb1198c2bc15d15232d0434f0c0e6b2d828580be0d60d47067adbeb4ee7b753b193436d330d WHIRLPOOL 910a1938547e78e1469c878afc632b70a3fc2893f2cd7bc5cd2c207c565b1e2ff12b8bca517c1351d33b446ff5b3f1fa0ee652f058f7a10ef7c1603c45299c89
 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_p20151116.ebuild 6293 SHA256 f12854d36d40f464a2c5add3ece484787bcf691e15c3ffb4e59e85e75eb05ef7 SHA512 e325fb7ae5120f6e11738642654e146ca663b75f6e5d2d3e069cdf316200b19bb5a690737a2bbb97ca57f6fbe2e712f3daf61c01db3556a080dde67999d4c1e0 WHIRLPOOL 975ab0948eb04416a558309cf5c00afc2fe84004a023e8845ff54697a9aaeb7a7d019912d3bb62db32d750523edb5c16f5832094fcee3c14857f58bb2866b040
@@ -66,4 +67,5 @@ EBUILD netbeans-javadoc-9999_p20151215.ebuild 6293 SHA256 abd91a0b036498bcd40ecc
 EBUILD netbeans-javadoc-9999_p20151216.ebuild 6293 SHA256 1f9075708299de26611d6f85840dd1e8a58978880aa1286b6af921c55d5fb009 SHA512 c6e6ceadc4ec5ad5527821b1375fcb7850b4ea4b463ef3defd00b833363a11eba8234122d7ef4c66e986930c28cdc97dd2a615ec2b5620ae19fa99fe18a60c0c WHIRLPOOL 410e55cbbf52f706b2bc49fd35299e2490fd9de7bb099ea65a5eb0bcbe539eaa31e4d1a69ff1a04853f6573401809a320b4c541d7cc6fdf0b2f66bd9cdd3c1d4
 EBUILD netbeans-javadoc-9999_p20151217.ebuild 6293 SHA256 1aad1bcd9c2cafe8891c4a8ef242b15f81806a4b86135f6c56851aa4c0d56bab SHA512 afceb246f58bb3f00b805e221284968b70515a4a97c21d6d0f2fd96980daa0fadc2a99278d0f379b89ef0f8ba08bc381b77b060ca7edc385b20b574151ce778c WHIRLPOOL 1a94d68b709318c4f8a1ae6a8394a9b85cced95d0e0fb9f8478e7fc86248a91812c21b724aa5dcf6ee06ccef87790e9406baa29a62a95a72186503cc4203048b
 EBUILD netbeans-javadoc-9999_p20151218.ebuild 6293 SHA256 efe5acdd0d15b4ddeeabe151b10372aa3e723273a2e6a5ce99dffc2eaa837071 SHA512 002df54ef8cdd6c7fb6ca67d852d2fada6fee217691edba0146d97e4f4c4e56f5df67b39292ba51864a33bae6f6c927bcdb8c28676366262e9f67bbe0808c678 WHIRLPOOL f1943e6b25c22433d3d3a5e63de7b8a1dd307013b6c95a2e82eb70b6b9cd1c2dfdca2b57ac61b856e5625f3ca45da8d83519540c250a8fc8c92d81853b6de2cf
+EBUILD netbeans-javadoc-9999_p20151221.ebuild 6293 SHA256 eb0a30bb74b345418041c633bfacab5fecc9ebfd4781cba2db5dbe33f95b95e1 SHA512 dfd594993641e66ea3305a059de8b4132c352d96accb36e8104462ea880d0177e571cac0d68a10614d22a4316cb9249d3931ad7da7cd78b68c1b9c9ef89c4278 WHIRLPOOL 0620965bc91f1d6deb596bee39269f990fd0c8e7b35f6266f652303c855b9e9224bfde21fdb228bc5e8a5bcde38697b30f11b817f560fe18acfc13565035d201
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20151221.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20151221.ebuild
new file mode 100644
index 0000000..617d3cf
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20151221.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-21_00-02-04/zip/netbeans-trunk-nightly-201512210002-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 f925ed3..e5b8783 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -42,6 +42,7 @@ DIST netbeans-trunk-nightly-201512150002-src.zip 209278678 SHA256 5c97f3333dc701
 DIST netbeans-trunk-nightly-201512160002-src.zip 209284935 SHA256 b9de21df9893215edfd3aa66d19bba3ef4d712364457937ffca0eb2e1a01c311 SHA512 58b19c90c4f8f4edfef3741b7b05616a6aaad5fd1c81c68037ecf2d05f67c979400346773392ca34427ceec8ae7adf8f57d47c564025b4e531e52732ba102fd6 WHIRLPOOL b365748df55e76aaf285ba5d139157a04748359b204f4eec0e6d222df41df8882eda831b327b61b6e9476572402b2e84a4eb2cab057a4ac5d180e2f276ae7ac2
 DIST netbeans-trunk-nightly-201512170002-src.zip 209334699 SHA256 4bab0de756b2b1d61af59c5f5eac8fa6faefec1abe2f7f82eb50593776cbd7eb SHA512 660689d11454e2816f623e6ece3b7d23d6fef7a387ac080cdc138dc44b2110325dda37e74635c6f5883a586258167cc7720fe74896e25d3f25f15f3c9a2f3cfb WHIRLPOOL 8934b7be1fbc0253582ac16524ca185304557e1834681bb0abb6e615fe02f45a72cec662312ca44c5ca04e776116307c307b1ee08604d741f8e3aaf11b92c995
 DIST netbeans-trunk-nightly-201512180002-src.zip 209387619 SHA256 ee149de6b63dd36518dd78a8f28b0603b68a01b062d35c63d81f7742ed0fc805 SHA512 7aa9fcb6d7269264b76dd0eab66e0bc2e855ddb70de7a357dae5a5a3a8865da6979486acac421d351425e2c033ba689d4521cfc0353dc9ec62dd487b013e60cd WHIRLPOOL ab6b2385e651852bb383f7a9eaa5a24ac5f8deca8afd3dc8c0e0569acdb02ee54de89221a16fd93eea634df8011598270ae29f00c970edfecf6960d93846e9ac
+DIST netbeans-trunk-nightly-201512210002-src.zip 209401161 SHA256 82cc114d515412f1a828e622a467e747e8933ae2165da46a143073f2b9d0faaf SHA512 110c4a257904c61ee54e8ac97c09a6d67b2e39d82103fd5436d13cb1198c2bc15d15232d0434f0c0e6b2d828580be0d60d47067adbeb4ee7b753b193436d330d WHIRLPOOL 910a1938547e78e1469c878afc632b70a3fc2893f2cd7bc5cd2c207c565b1e2ff12b8bca517c1351d33b446ff5b3f1fa0ee652f058f7a10ef7c1603c45299c89
 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_p20151116.ebuild 4717 SHA256 3ba2907d81bb4ffff9f47b504d8e7fd4473dc078163755645ba1614b83c8c4d8 SHA512 d065c5e02e25e00e24d4b2f4d12a0b3ce97778bbb34a86225454ef0031996b97ce18f0af572a36b30c18549266c0ee777ac2346488ace75955270945cca202b3 WHIRLPOOL 38452ee71ad2b83080aba6eb228762249e7309c2efde09fe4ac9eb5eaa0686040a5d62cd2632a465b2b54e4d0db890fa1c81a12317c5fb51c0ba2ec664300c72
@@ -74,4 +75,5 @@ EBUILD netbeans-javafx-9999_p20151215.ebuild 4717 SHA256 29c48e058d7e37df19754dd
 EBUILD netbeans-javafx-9999_p20151216.ebuild 4717 SHA256 a96afadfa45ef4aec9679dc3b764478751cdcea6121174234676da6f26e85e45 SHA512 22a3378611c1e9391641b3f2d122d1f09ac583e6e16bf5bcb4eff6a13d9ed0920b499297c260203478a5e598dcd2e4ec3f47a65619f7840692787c73abc169c9 WHIRLPOOL a8eba0712d41358bf9e4c4e7e7afdefb3a8608c93fc89b076c0e485e3795908e38db33e8d1472c65d26616984c75cdcbf19067419921cc5b4004ef1089b81600
 EBUILD netbeans-javafx-9999_p20151217.ebuild 4717 SHA256 b847bf671f562d13e54a5849a09376860a3e53c00acb18057897a0001e161ce4 SHA512 2dbec2ac5b7f91e125a62998d8430fceda40c88f239f5adcf77c42f4c50b23f0efe5fe9493520a0c502ccf725b3be7ccdefeafa38ff085e65e988f26a652dc71 WHIRLPOOL 3db19d282f735f0457d552a115a53d1b0d5140fc436d4f9f77d5caa6cb8cd22ead8d2ec5fc4429503439cdedf06781e4f1c99ccc36eae21b087a5e6b336f3c9b
 EBUILD netbeans-javafx-9999_p20151218.ebuild 4717 SHA256 4722d2d82a1de722cb7c77ad1b90a443f293e0039dd52369fd2562066f7e744d SHA512 b842bda20455ca7d7786fc2d34aaf8137c54ad71b9e19568df20d6a9d5999b8b9fc114824ea2f4c4a93d8071955738181c3e9aff8d181a0afcfd314fc859bfdf WHIRLPOOL 7cfe44b855015a93664eb6fec4060b9b1df60f64ab1006a1cc239193ac998c771255b48f201c6258a77cf6b2313449bfe08ff0df9e427fa7afc7be228afe4f8b
+EBUILD netbeans-javafx-9999_p20151221.ebuild 4717 SHA256 c4dd9025e85080af3def7d06acc509049eaeb20fed5177a8c12f738a93f4daaf SHA512 92794dabc384e397040cc35756ff8b245e42ec83e33f79c9d394d9207121c3f021db20ffd330f6ebe63fa49c18e9311f49664f8e73221bdf6c9098f4541b7bde WHIRLPOOL 1e87b93a58731b388ec71745f2a73a25f16f8ca4f295042cbd6faf8709b6d24ec5e7d22008b0140d47eb2aef378d39898268fcfab9a58fd47e95a4a7f081ca72
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20151221.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20151221.ebuild
new file mode 100644
index 0000000..dbfdb1a
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20151221.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-21_00-02-04/zip/netbeans-trunk-nightly-201512210002-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 7a648d7..d9ae531 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201512150002-src.zip 209278678 SHA256 5c97f3333dc701
 DIST netbeans-trunk-nightly-201512160002-src.zip 209284935 SHA256 b9de21df9893215edfd3aa66d19bba3ef4d712364457937ffca0eb2e1a01c311 SHA512 58b19c90c4f8f4edfef3741b7b05616a6aaad5fd1c81c68037ecf2d05f67c979400346773392ca34427ceec8ae7adf8f57d47c564025b4e531e52732ba102fd6 WHIRLPOOL b365748df55e76aaf285ba5d139157a04748359b204f4eec0e6d222df41df8882eda831b327b61b6e9476572402b2e84a4eb2cab057a4ac5d180e2f276ae7ac2
 DIST netbeans-trunk-nightly-201512170002-src.zip 209334699 SHA256 4bab0de756b2b1d61af59c5f5eac8fa6faefec1abe2f7f82eb50593776cbd7eb SHA512 660689d11454e2816f623e6ece3b7d23d6fef7a387ac080cdc138dc44b2110325dda37e74635c6f5883a586258167cc7720fe74896e25d3f25f15f3c9a2f3cfb WHIRLPOOL 8934b7be1fbc0253582ac16524ca185304557e1834681bb0abb6e615fe02f45a72cec662312ca44c5ca04e776116307c307b1ee08604d741f8e3aaf11b92c995
 DIST netbeans-trunk-nightly-201512180002-src.zip 209387619 SHA256 ee149de6b63dd36518dd78a8f28b0603b68a01b062d35c63d81f7742ed0fc805 SHA512 7aa9fcb6d7269264b76dd0eab66e0bc2e855ddb70de7a357dae5a5a3a8865da6979486acac421d351425e2c033ba689d4521cfc0353dc9ec62dd487b013e60cd WHIRLPOOL ab6b2385e651852bb383f7a9eaa5a24ac5f8deca8afd3dc8c0e0569acdb02ee54de89221a16fd93eea634df8011598270ae29f00c970edfecf6960d93846e9ac
+DIST netbeans-trunk-nightly-201512210002-src.zip 209401161 SHA256 82cc114d515412f1a828e622a467e747e8933ae2165da46a143073f2b9d0faaf SHA512 110c4a257904c61ee54e8ac97c09a6d67b2e39d82103fd5436d13cb1198c2bc15d15232d0434f0c0e6b2d828580be0d60d47067adbeb4ee7b753b193436d330d WHIRLPOOL 910a1938547e78e1469c878afc632b70a3fc2893f2cd7bc5cd2c207c565b1e2ff12b8bca517c1351d33b446ff5b3f1fa0ee652f058f7a10ef7c1603c45299c89
 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_p20151116.ebuild 4412 SHA256 9af3932da1598b83481c777d4ba59d2d9475b297ef0be3a51f222e3e95e9fa80 SHA512 a5b5140d28dcef6d06ee910d0196aa505359ebd3a038ebf430e672e4d1eb50431fd41f8d9c7ae0cb2617fdfd3672355ab05497cc5edcbda9fccaf9c8bfcfeaba WHIRLPOOL 3603061913290484516b5586ad7d9289461bb969bdde63ca8ccbfef7747a95169e8ccc89e6d29d3fa69bc9973a99b12d8e8785156e374a74a48852576343f41c
@@ -65,4 +66,5 @@ EBUILD netbeans-mobility-9999_p20151215.ebuild 4412 SHA256 d585b2c11f7f1ca46f4e8
 EBUILD netbeans-mobility-9999_p20151216.ebuild 4412 SHA256 f1ddcb3b0f40aba75e2391ce4f1111d420738c2996a7570da7c84125ae012833 SHA512 445ca33030d665b3b56604787db012ab75097b22a7e1a42b36d43cae23513a117585b8f865db9b545ccfdbf8764133d3718db5cc846e0002833dcc8dadce25b5 WHIRLPOOL 4d9b3aca7ffc9168dc0bb8dc39a52a2cd2868474cea92525b2d944ce3a1ae521893c7208236a4b8ac7b3689fdb8da19071a5badbb7b28006d84bdca12925f333
 EBUILD netbeans-mobility-9999_p20151217.ebuild 4412 SHA256 ddd22a113e5b233650e58351bdc3ca9a91111f168b884e387ec4849086c8c6e0 SHA512 897b12ab78888f5f93cb690b7718ed3c5efbb9729de45f6a4d238b89135480ddd33ec4ad2271f4e3b1ea1605ee9fa302717f418f628d3905f14f94ffedc15d9d WHIRLPOOL 2606f03d83e2d239b451a0056ce5f41e5d6b7286778cbf8ed41e1cb19e4cf361819e70dd2153a516b2baafcfc26d128f5cc5388bc773b768d8d5ade705cf6e15
 EBUILD netbeans-mobility-9999_p20151218.ebuild 4412 SHA256 a900c2b772f6fd74ddff0b6b4bcfaaf4db896b53b3e7864fede6b92df57f6c6c SHA512 b8f4fe64dbf374db2cb891c8a1c34b49203d4c788961e5122cc5a3204daf191184165aca44f21ca92397970b1e947d93199ba974fb650cce9a0887db126e5811 WHIRLPOOL c774819621b2c76d220d574af74816a884e6c7d5bf1d519dd077b0b29036a67fb2484d32ff6cc3c7340a83a1e15800e4fb2811f7f753c92f9ce557239ed5ddf3
+EBUILD netbeans-mobility-9999_p20151221.ebuild 4412 SHA256 3393c8c860117970202fbd14738c1dbc56a54e2ee24bd308f5093d01c2f7fca9 SHA512 6d4e815bde2e3bec008b87744c41724e899816a7adff311ea50860fe88eb889adadea9cde3f371ffc7cdbd018c4ac9fee3e0e5960d503478381c7cb65873918c WHIRLPOOL 89e3b8de10aee7b73f8d1f77676f72bc5504a2ec81f24ae1b8e9e20b8bb7bfda5dd0dbc7bc3d207b5da17ce895f68bd1da7e0c4332e8f6cc844d0f760b267b39
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20151221.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20151221.ebuild
new file mode 100644
index 0000000..0528982
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20151221.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-21_00-02-04/zip/netbeans-trunk-nightly-201512210002-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 e925ff3..df65feb 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201512150002-src.zip 209278678 SHA256 5c97f3333dc701
 DIST netbeans-trunk-nightly-201512160002-src.zip 209284935 SHA256 b9de21df9893215edfd3aa66d19bba3ef4d712364457937ffca0eb2e1a01c311 SHA512 58b19c90c4f8f4edfef3741b7b05616a6aaad5fd1c81c68037ecf2d05f67c979400346773392ca34427ceec8ae7adf8f57d47c564025b4e531e52732ba102fd6 WHIRLPOOL b365748df55e76aaf285ba5d139157a04748359b204f4eec0e6d222df41df8882eda831b327b61b6e9476572402b2e84a4eb2cab057a4ac5d180e2f276ae7ac2
 DIST netbeans-trunk-nightly-201512170002-src.zip 209334699 SHA256 4bab0de756b2b1d61af59c5f5eac8fa6faefec1abe2f7f82eb50593776cbd7eb SHA512 660689d11454e2816f623e6ece3b7d23d6fef7a387ac080cdc138dc44b2110325dda37e74635c6f5883a586258167cc7720fe74896e25d3f25f15f3c9a2f3cfb WHIRLPOOL 8934b7be1fbc0253582ac16524ca185304557e1834681bb0abb6e615fe02f45a72cec662312ca44c5ca04e776116307c307b1ee08604d741f8e3aaf11b92c995
 DIST netbeans-trunk-nightly-201512180002-src.zip 209387619 SHA256 ee149de6b63dd36518dd78a8f28b0603b68a01b062d35c63d81f7742ed0fc805 SHA512 7aa9fcb6d7269264b76dd0eab66e0bc2e855ddb70de7a357dae5a5a3a8865da6979486acac421d351425e2c033ba689d4521cfc0353dc9ec62dd487b013e60cd WHIRLPOOL ab6b2385e651852bb383f7a9eaa5a24ac5f8deca8afd3dc8c0e0569acdb02ee54de89221a16fd93eea634df8011598270ae29f00c970edfecf6960d93846e9ac
+DIST netbeans-trunk-nightly-201512210002-src.zip 209401161 SHA256 82cc114d515412f1a828e622a467e747e8933ae2165da46a143073f2b9d0faaf SHA512 110c4a257904c61ee54e8ac97c09a6d67b2e39d82103fd5436d13cb1198c2bc15d15232d0434f0c0e6b2d828580be0d60d47067adbeb4ee7b753b193436d330d WHIRLPOOL 910a1938547e78e1469c878afc632b70a3fc2893f2cd7bc5cd2c207c565b1e2ff12b8bca517c1351d33b446ff5b3f1fa0ee652f058f7a10ef7c1603c45299c89
 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_p20151116.ebuild 4111 SHA256 83940b618f7e2b4e48dcb2b3f1b32a12039a3d802d1af898f845d2c658a5ca3a SHA512 c965e47c6641ef70b662b395750e8e61410ff4caee36d7b82131320c4928b4303d871ac37ff4211b2181a208b40d008699a3792368c77d8ec6b0ec5ada00eea4 WHIRLPOOL d2b3cdca8f5eb9c3e950164c4d10ae89e7d56c0acb1b233240549852f333754d290e7bddfe9fe3c7ba8295b35fff0c5ddc50fd3cce7a160fcf393874239c6647
@@ -68,4 +69,5 @@ EBUILD netbeans-nb-9999_p20151215.ebuild 4111 SHA256 d64089b84ba650fae4ed22fa4d0
 EBUILD netbeans-nb-9999_p20151216.ebuild 4111 SHA256 2a07493f910009172a632352308d2feebda1755edc6816f0346d38d1f9071063 SHA512 d1810f058a3615170524abf279aab752e0a4c4fb8bc10365d2f6174495773d89d9f990c198f3bd1953d392b3b9a9f6d626c5f63d3a644fb15405e5a2bc304328 WHIRLPOOL 0e9ce077c65f0300729474c39570e6e3894809a11927f4a583977b5ad430402ae15c0565521bc41b333e6941c94b0e3b7b276b4972c67a83674e962eb3d24a4b
 EBUILD netbeans-nb-9999_p20151217.ebuild 4111 SHA256 8cee1b1a41607064a3aec95dbac65f02e6c30e90be318dc0fb5fea3105c561d2 SHA512 f3610249bb68315628c1e758ec3fbff90b85560a0b355889587fb5941cfab83089e8c3e8acef821ad5dda77d225b2a24b7f19cdd53a2e7d73ea3c286df6ea240 WHIRLPOOL cdd6884d963955077d03856398774bcb7604e891d507fa2c35bd6caa67fc047266b0f3e4094962a4cb474c95b7e810d4ce83ed1edf2b7d44007c59e76a3751cb
 EBUILD netbeans-nb-9999_p20151218.ebuild 4111 SHA256 4a886a511220779d2552ef8767d0ddb6d6405712455a24613250a3493e3aeceb SHA512 1fa5194bb9303e9f789c26381597a7728c4a106f48e001e35c34041eea685634826174335d69638b39f4be973c1136a953a07d041534c7b5e756f83a66101872 WHIRLPOOL 2656c57aa9a01eb0e4ccc6cf8b7331fd837a3c20284a78c1930ba232bedac37ea18e0d7aad7dd714ae2b68b0496ccfa35f4b34b06c3979f7be9cbcb0770e946d
+EBUILD netbeans-nb-9999_p20151221.ebuild 4111 SHA256 04ce760d71c9dce3120e54062dfa807a5e2dadea49543b8ad96e81b0d4b55dab SHA512 07bfdcd7111f55029fe53d0317bd6b90dd0ca4fb5e2a5eac4592127c97b2be8d25ed20296c03708546a3c1b9d46bc01c81844aee781d0c3aa61f3918e237629f WHIRLPOOL edbc0f4107c52af1a47b414f44ed76be80bbe5ba9a15e35c68f7441410a51b0b45b32d1935a0f4d5760bdf04e028dde23324cae094c3aa6ef98034e5c57b9af1
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20151221.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20151221.ebuild
new file mode 100644
index 0000000..337c9f1
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20151221.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-21_00-02-04/zip/netbeans-trunk-nightly-201512210002-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 8cf3655..efc1b97 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -37,6 +37,7 @@ DIST netbeans-trunk-nightly-201512150002-src.zip 209278678 SHA256 5c97f3333dc701
 DIST netbeans-trunk-nightly-201512160002-src.zip 209284935 SHA256 b9de21df9893215edfd3aa66d19bba3ef4d712364457937ffca0eb2e1a01c311 SHA512 58b19c90c4f8f4edfef3741b7b05616a6aaad5fd1c81c68037ecf2d05f67c979400346773392ca34427ceec8ae7adf8f57d47c564025b4e531e52732ba102fd6 WHIRLPOOL b365748df55e76aaf285ba5d139157a04748359b204f4eec0e6d222df41df8882eda831b327b61b6e9476572402b2e84a4eb2cab057a4ac5d180e2f276ae7ac2
 DIST netbeans-trunk-nightly-201512170002-src.zip 209334699 SHA256 4bab0de756b2b1d61af59c5f5eac8fa6faefec1abe2f7f82eb50593776cbd7eb SHA512 660689d11454e2816f623e6ece3b7d23d6fef7a387ac080cdc138dc44b2110325dda37e74635c6f5883a586258167cc7720fe74896e25d3f25f15f3c9a2f3cfb WHIRLPOOL 8934b7be1fbc0253582ac16524ca185304557e1834681bb0abb6e615fe02f45a72cec662312ca44c5ca04e776116307c307b1ee08604d741f8e3aaf11b92c995
 DIST netbeans-trunk-nightly-201512180002-src.zip 209387619 SHA256 ee149de6b63dd36518dd78a8f28b0603b68a01b062d35c63d81f7742ed0fc805 SHA512 7aa9fcb6d7269264b76dd0eab66e0bc2e855ddb70de7a357dae5a5a3a8865da6979486acac421d351425e2c033ba689d4521cfc0353dc9ec62dd487b013e60cd WHIRLPOOL ab6b2385e651852bb383f7a9eaa5a24ac5f8deca8afd3dc8c0e0569acdb02ee54de89221a16fd93eea634df8011598270ae29f00c970edfecf6960d93846e9ac
+DIST netbeans-trunk-nightly-201512210002-src.zip 209401161 SHA256 82cc114d515412f1a828e622a467e747e8933ae2165da46a143073f2b9d0faaf SHA512 110c4a257904c61ee54e8ac97c09a6d67b2e39d82103fd5436d13cb1198c2bc15d15232d0434f0c0e6b2d828580be0d60d47067adbeb4ee7b753b193436d330d WHIRLPOOL 910a1938547e78e1469c878afc632b70a3fc2893f2cd7bc5cd2c207c565b1e2ff12b8bca517c1351d33b446ff5b3f1fa0ee652f058f7a10ef7c1603c45299c89
 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_p20151116.ebuild 4417 SHA256 8b537df88630c8aa734c445783668375795e7f2c67b3d46d385612e84cc441aa SHA512 4631cbc47b45813ace0ae31bd36d9ec60452aa9a46e72e4520c293ea8b348a217f663e94b343224b44acb9a2fccac339307601dd2291126e035bc636a97e685d WHIRLPOOL b234a010a5d3ab851d53f5b43824681a79b810a2844203f68dda4d6ea4d3ecd8a0e6a35173ae13967534f5ac82dc97438153456c2c551395191557bd987be143
@@ -69,4 +70,5 @@ EBUILD netbeans-php-9999_p20151215.ebuild 4417 SHA256 72e2299e4622c7601c41e0d95f
 EBUILD netbeans-php-9999_p20151216.ebuild 4418 SHA256 7eee557e337561a19b716120b7ad43f8e10517e0b020247528e64050ecbd318a SHA512 ea033dfdb95792b011531d1007112f81c71af9b7c3cb691082e289ab13c4a49112d9de2567d9019383b21267f501b9b51396be459b42cb7f96ddf1af0f8483e5 WHIRLPOOL bd69e18948e833b9be40a23a41d8480a9b5449fd7b151f401eb9029dec94df393dfe179bf1195dd649e1d7f9706dcd89122a373f4d7e268ad9480dd0e0db0508
 EBUILD netbeans-php-9999_p20151217.ebuild 4418 SHA256 ec3bfa089dfcd6fc5e6120f8162c5cbbd3c12142c53f1834fc7b42bbe520c81c SHA512 e81458847c1d0421d67b84c39e24978568149d248bd093111ff6dc8df5a86c001caaa0c3082d67e19b365a8826e404505cbfe9c28b82b873a60cf1bbf16c18af WHIRLPOOL 7175d92b68b7e8f183fab2e3bd7dfe550b20760f8bb2a3db6b4d0ea3d8581cef5cdedbb2760f5c9bdf66941ea2893f3e46175aceb5fecebac6ac8aa46d193ce6
 EBUILD netbeans-php-9999_p20151218.ebuild 4418 SHA256 236e31491a081a9204037f8d45b05552850e159b202d2d3a8a70e6dd895461dc SHA512 a8362692ac161b9f2c9bfc39016160ec8d9c6902f86be2c30e3c42408f4025ac9239e2e3265b3489da64d1dd7d2df2fd0f4cfac2e3a41653d7b66b449087d9e8 WHIRLPOOL fffd059926149a20a9656cc4f373c8ecd6ac93c1ea37cabe3d150fba072a317734376df310bbf5d4f877416f20de4e18d4af1902fa91a949739b063a739d0251
+EBUILD netbeans-php-9999_p20151221.ebuild 4418 SHA256 fce767d1f4b4257048b874eb1d55c1fd78dd4967975b4712bd5a6fbe20f6d844 SHA512 62e292dd6f5f592a2ad1bad9d6ec6b6c75042cbeddf1c25646b0939bf301d314f46b34440548573f33e01ae956d771cbba78c41fe94770ba3259e044a9f22f24 WHIRLPOOL dca332a6e39d4b6185a25c8583e3ad6a73f00d3a7ab74eda9c4a98e4b65d7216b315fbefcb378325c0e94d0e0e15b9c636e01c1ca62c35f5ccf1d10a7d43d3c9
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20151221.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20151221.ebuild
new file mode 100644
index 0000000..5042f13
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20151221.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-21_00-02-04/zip/netbeans-trunk-nightly-201512210002-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="${D}"/${INSTALL_DIR}/modules/ext
+	pushd "${instdir}" >/dev/null || die
+	rm java-cup-11a.jar && java-pkg_jar-from --into "${instdir}" javacup javacup.jar java-cup-11a.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/php
+}

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index 75c74b3..4dd9b70 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -50,6 +50,7 @@ DIST netbeans-trunk-nightly-201512150002-src.zip 209278678 SHA256 5c97f3333dc701
 DIST netbeans-trunk-nightly-201512160002-src.zip 209284935 SHA256 b9de21df9893215edfd3aa66d19bba3ef4d712364457937ffca0eb2e1a01c311 SHA512 58b19c90c4f8f4edfef3741b7b05616a6aaad5fd1c81c68037ecf2d05f67c979400346773392ca34427ceec8ae7adf8f57d47c564025b4e531e52732ba102fd6 WHIRLPOOL b365748df55e76aaf285ba5d139157a04748359b204f4eec0e6d222df41df8882eda831b327b61b6e9476572402b2e84a4eb2cab057a4ac5d180e2f276ae7ac2
 DIST netbeans-trunk-nightly-201512170002-src.zip 209334699 SHA256 4bab0de756b2b1d61af59c5f5eac8fa6faefec1abe2f7f82eb50593776cbd7eb SHA512 660689d11454e2816f623e6ece3b7d23d6fef7a387ac080cdc138dc44b2110325dda37e74635c6f5883a586258167cc7720fe74896e25d3f25f15f3c9a2f3cfb WHIRLPOOL 8934b7be1fbc0253582ac16524ca185304557e1834681bb0abb6e615fe02f45a72cec662312ca44c5ca04e776116307c307b1ee08604d741f8e3aaf11b92c995
 DIST netbeans-trunk-nightly-201512180002-src.zip 209387619 SHA256 ee149de6b63dd36518dd78a8f28b0603b68a01b062d35c63d81f7742ed0fc805 SHA512 7aa9fcb6d7269264b76dd0eab66e0bc2e855ddb70de7a357dae5a5a3a8865da6979486acac421d351425e2c033ba689d4521cfc0353dc9ec62dd487b013e60cd WHIRLPOOL ab6b2385e651852bb383f7a9eaa5a24ac5f8deca8afd3dc8c0e0569acdb02ee54de89221a16fd93eea634df8011598270ae29f00c970edfecf6960d93846e9ac
+DIST netbeans-trunk-nightly-201512210002-src.zip 209401161 SHA256 82cc114d515412f1a828e622a467e747e8933ae2165da46a143073f2b9d0faaf SHA512 110c4a257904c61ee54e8ac97c09a6d67b2e39d82103fd5436d13cb1198c2bc15d15232d0434f0c0e6b2d828580be0d60d47067adbeb4ee7b753b193436d330d WHIRLPOOL 910a1938547e78e1469c878afc632b70a3fc2893f2cd7bc5cd2c207c565b1e2ff12b8bca517c1351d33b446ff5b3f1fa0ee652f058f7a10ef7c1603c45299c89
 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_p20151116.ebuild 9367 SHA256 ac84de65f92df4340506b19129fae92c34c454ee690dc73684908081f322d585 SHA512 df1ce390bf25276a97cb0ef58646c2fcea9383aa03149ab478da092e290195cd11d510c7de0088f99fb0c3a7bc3049e5adb45bdd40dc632706af6d16da36c9fa WHIRLPOOL 645768a55c25c7c3f3dada9b2c0628f391528a8e575038f3a8a7dd80814d4798551248b6066a97b7538b61d49ab312d4dab3dab0d6bfac05b940a4fe63482c2b
@@ -82,4 +83,5 @@ EBUILD netbeans-platform-9999_p20151215.ebuild 9367 SHA256 68fa135908414b8dc49ce
 EBUILD netbeans-platform-9999_p20151216.ebuild 9360 SHA256 b1aba9c6afca2c5c9351d0f3267eb76cdcf9f2d54866e009d95b220712af4b9d SHA512 4335f21620595f657eaf73b2aec45ad9ccb882e6f7234be9f163791e17c3463e2a8841296e88348712613f3bcf488820fb5128aee8f5abdf743388cbb9999fd5 WHIRLPOOL 2d9b60c774a4d5165190ba6c1bfa798dce67da1d2c99051d3e5e71922acbd74d60b40d6a1816e0eb3f8b8506acf0ee7e94d71cb27f38f77665569eed28bc33d7
 EBUILD netbeans-platform-9999_p20151217.ebuild 9360 SHA256 f431ad11dba31e26ae46c7ff12f1b2164aaee337491c5ccc8d26c22e96f2ede3 SHA512 16af8104ae08f695379c41ab4108267af760a455146d2b51dd027f93ee66cf38d072854296c93e2c8778e9064e1b1e1f31af6d621a17d69df1776e8afd5faa8d WHIRLPOOL d51db0cfd12b0b03469048551bac50063812f83cdd85e1d930422031e8203347c9d415a41acef9471389e263fc8aca3954dfeddd8a4dfc52de76dcc51e92448a
 EBUILD netbeans-platform-9999_p20151218.ebuild 9360 SHA256 ce715f02ae8005dc40fadeccbc626d694c2db40517ee46b330ac3779d7190181 SHA512 062db936b8a5a42df6ae5468a1aa278dcef3841a39690c892333c95962bd7d48fd5f95ade214b717f7195abe6f914eaa3f62222b780832dc97d705331650bbcc WHIRLPOOL b40f95dfbb283547325ba30af2e9fa665e4f73c2c8645042c4b306f3c5392a9cc5d843bc04984b15760c16cc5298dd9106495d10d5e724628d963b8b0c6d0f36
+EBUILD netbeans-platform-9999_p20151221.ebuild 9360 SHA256 18568ca613b8c55e7294d03e87dbf58450267f05c40b76e01b8e1c503ea9cb59 SHA512 2b8269b6841cb6506a2f120351449fcdb9d933b7d121afd16bbae949b82b59a0c33483c4f58eadd776ca3092d3d07a470dc8b286cb52778e2fcb378bb640dda9 WHIRLPOOL 8efb379015bdc706de812f905a5a568d2c70dbafe7dbc82d8a586d75b0d7782c3c91fd03a0d52690059922e1ca1fab352bdb9b469eb217353ffbed73e58590d6
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20151221.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20151221.ebuild
new file mode 100644
index 0000000..1898d1c
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20151221.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-21_00-02-04/zip/netbeans-trunk-nightly-201512210002-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="${D}"/${INSTALL_DIR}/modules/ext
+	pushd "${instdir}" >/dev/null || die
+	rm hamcrest-core-1.3.jar && java-pkg_jar-from --into "${instdir}" hamcrest-core-1.3 hamcrest-core.jar hamcrest-core-1.3.jar
+	rm jhall-2.0_05.jar && java-pkg_jar-from --into "${instdir}" javahelp jhall.jar jhall-2.0_05.jar
+	rm jna-4.1.0.jar && java-pkg_jar-from --into "${instdir}" jna jna.jar jna-4.1.0.jar
+	rm jna-platform-4.1.0.jar && java-pkg_jar-from --into "${instdir}" jna platform.jar jna-platform-4.1.0.jar
+	rm junit-4.12.jar && java-pkg_jar-from --into "${instdir}" junit-4 junit.jar junit-4.12.jar
+	rm osgi.cmpn-4.2.jar && java-pkg_jar-from --into "${instdir}" osgi-compendium osgi-compendium.jar osgi.cmpn-4.2.jar
+	rm osgi.core-5.0.0.jar && java-pkg_jar-from --into "${instdir}" osgi-core-api osgi-core-api.jar osgi.core-5.0.0.jar
+	rm swing-layout-1.0.4.jar && java-pkg_jar-from --into "${instdir}" swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
+	rm testng-6.8.1-dist.jar && java-pkg_jar-from --into "${instdir}" testng testng.jar testng-6.8.1-dist.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/platform
+}

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index f70bd40..48b3fea 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201512150002-src.zip 209278678 SHA256 5c97f3333dc701
 DIST netbeans-trunk-nightly-201512160002-src.zip 209284935 SHA256 b9de21df9893215edfd3aa66d19bba3ef4d712364457937ffca0eb2e1a01c311 SHA512 58b19c90c4f8f4edfef3741b7b05616a6aaad5fd1c81c68037ecf2d05f67c979400346773392ca34427ceec8ae7adf8f57d47c564025b4e531e52732ba102fd6 WHIRLPOOL b365748df55e76aaf285ba5d139157a04748359b204f4eec0e6d222df41df8882eda831b327b61b6e9476572402b2e84a4eb2cab057a4ac5d180e2f276ae7ac2
 DIST netbeans-trunk-nightly-201512170002-src.zip 209334699 SHA256 4bab0de756b2b1d61af59c5f5eac8fa6faefec1abe2f7f82eb50593776cbd7eb SHA512 660689d11454e2816f623e6ece3b7d23d6fef7a387ac080cdc138dc44b2110325dda37e74635c6f5883a586258167cc7720fe74896e25d3f25f15f3c9a2f3cfb WHIRLPOOL 8934b7be1fbc0253582ac16524ca185304557e1834681bb0abb6e615fe02f45a72cec662312ca44c5ca04e776116307c307b1ee08604d741f8e3aaf11b92c995
 DIST netbeans-trunk-nightly-201512180002-src.zip 209387619 SHA256 ee149de6b63dd36518dd78a8f28b0603b68a01b062d35c63d81f7742ed0fc805 SHA512 7aa9fcb6d7269264b76dd0eab66e0bc2e855ddb70de7a357dae5a5a3a8865da6979486acac421d351425e2c033ba689d4521cfc0353dc9ec62dd487b013e60cd WHIRLPOOL ab6b2385e651852bb383f7a9eaa5a24ac5f8deca8afd3dc8c0e0569acdb02ee54de89221a16fd93eea634df8011598270ae29f00c970edfecf6960d93846e9ac
+DIST netbeans-trunk-nightly-201512210002-src.zip 209401161 SHA256 82cc114d515412f1a828e622a467e747e8933ae2165da46a143073f2b9d0faaf SHA512 110c4a257904c61ee54e8ac97c09a6d67b2e39d82103fd5436d13cb1198c2bc15d15232d0434f0c0e6b2d828580be0d60d47067adbeb4ee7b753b193436d330d WHIRLPOOL 910a1938547e78e1469c878afc632b70a3fc2893f2cd7bc5cd2c207c565b1e2ff12b8bca517c1351d33b446ff5b3f1fa0ee652f058f7a10ef7c1603c45299c89
 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_p20151116.ebuild 3472 SHA256 342c1580fea021a633874aec1f511e89634e6d88ead47c87f49a4a621280cd1e SHA512 8f2c543885a5e1121449d48f2f8089f3f36d963ecc3af19749c7ff8de31c2a5c1cf8395de3f7c6b021bd70f4b0a7108e36ba7aa5b1b6ad61cdf50eff44a2c224 WHIRLPOOL 4020e711bda53b437d21f78f700ba22cc99a79504884850f5c0f88b950754c7da35a79656a2472b91add63b937f8968df0d4704bac6f36d1410422fed15623b3
@@ -65,4 +66,5 @@ EBUILD netbeans-profiler-9999_p20151215.ebuild 3472 SHA256 9758edcb4d99ddfa1a317
 EBUILD netbeans-profiler-9999_p20151216.ebuild 3472 SHA256 533fe41e71a14d5242363a5397a1d9b4a089d575e8249b12a9adf1f06a148271 SHA512 decfb2d23a3bc74f78924b416a119414d0d56a2158e0c47d03fe1e39a373d5d71ac9a282ba1e14b3c4a89c0b612bd80606d7d75605148bc6c09a5f081dc2f83f WHIRLPOOL b0e0619d22755ee411664fd3511ab834fd53d045b90566014bddf61c0cf988f0a41632d84d873dc7278c940688d91eb85d632515b933279986c75f915819b987
 EBUILD netbeans-profiler-9999_p20151217.ebuild 3472 SHA256 f22ab14a5ca957f13ffa2d4d2f3b0de0b9c469ed655e49bd96b7b346d9686aaf SHA512 4758e3817be073d7e34a6c78182f3eaf23796486128c4809dcb72a52127fd24e5b33c509422ee7b97043bb99043c7448f5623f9763b3196f8bf3f6ea71ab473f WHIRLPOOL 8cbbb302acf35bd1eb030f9dbaddb4e988d3c2952c717226b7525e3fe8b24d5ae7c5d573be95a5f40177700e8c65aa2fdeb68c9a5dd5d648d72204a491a66417
 EBUILD netbeans-profiler-9999_p20151218.ebuild 3472 SHA256 b87938f685e20ebcef53341d62a43920580fe53a45568c0abcf63579ce4440a8 SHA512 5d658db621aeea13d81615d0897ba3e9b7a6285edf2d6228d5b869c151783fb571168cca1c4829ea14a9942c4c07b43472bafbfcc54c018b9c5e67786d6480ae WHIRLPOOL 84461088bd396fd351494bd16181487da29e3fbab41c9b307878e49fa3315b37a680ae67288e2a1933cf4b7be13a4463deea68daaaf626c6d0fea98debce1390
+EBUILD netbeans-profiler-9999_p20151221.ebuild 3472 SHA256 de38a0b378d4beb4dc32db0650f1024302db09f0bba14762123cc5a3d0d5b274 SHA512 092d5db7977f66907601137a3ce0baa608c14b326211d343dca054b9507b495603e8998b271454b08708cef65d4307f85d1d92a137cf8936f399942c09ddc5cc WHIRLPOOL aeb813e7bf27defe7e2ace8022e2960f9e488454f4b3757949f3aa257c3bb1cabbd6bf07f3907003febbef6d9d295ef8e76e2fd6db79354e133b004347bfd928
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20151221.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20151221.ebuild
new file mode 100644
index 0000000..61d5c21
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20151221.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-21_00-02-04/zip/netbeans-trunk-nightly-201512210002-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 7808654..fe45fb7 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -45,6 +45,7 @@ DIST netbeans-trunk-nightly-201512150002-src.zip 209278678 SHA256 5c97f3333dc701
 DIST netbeans-trunk-nightly-201512160002-src.zip 209284935 SHA256 b9de21df9893215edfd3aa66d19bba3ef4d712364457937ffca0eb2e1a01c311 SHA512 58b19c90c4f8f4edfef3741b7b05616a6aaad5fd1c81c68037ecf2d05f67c979400346773392ca34427ceec8ae7adf8f57d47c564025b4e531e52732ba102fd6 WHIRLPOOL b365748df55e76aaf285ba5d139157a04748359b204f4eec0e6d222df41df8882eda831b327b61b6e9476572402b2e84a4eb2cab057a4ac5d180e2f276ae7ac2
 DIST netbeans-trunk-nightly-201512170002-src.zip 209334699 SHA256 4bab0de756b2b1d61af59c5f5eac8fa6faefec1abe2f7f82eb50593776cbd7eb SHA512 660689d11454e2816f623e6ece3b7d23d6fef7a387ac080cdc138dc44b2110325dda37e74635c6f5883a586258167cc7720fe74896e25d3f25f15f3c9a2f3cfb WHIRLPOOL 8934b7be1fbc0253582ac16524ca185304557e1834681bb0abb6e615fe02f45a72cec662312ca44c5ca04e776116307c307b1ee08604d741f8e3aaf11b92c995
 DIST netbeans-trunk-nightly-201512180002-src.zip 209387619 SHA256 ee149de6b63dd36518dd78a8f28b0603b68a01b062d35c63d81f7742ed0fc805 SHA512 7aa9fcb6d7269264b76dd0eab66e0bc2e855ddb70de7a357dae5a5a3a8865da6979486acac421d351425e2c033ba689d4521cfc0353dc9ec62dd487b013e60cd WHIRLPOOL ab6b2385e651852bb383f7a9eaa5a24ac5f8deca8afd3dc8c0e0569acdb02ee54de89221a16fd93eea634df8011598270ae29f00c970edfecf6960d93846e9ac
+DIST netbeans-trunk-nightly-201512210002-src.zip 209401161 SHA256 82cc114d515412f1a828e622a467e747e8933ae2165da46a143073f2b9d0faaf SHA512 110c4a257904c61ee54e8ac97c09a6d67b2e39d82103fd5436d13cb1198c2bc15d15232d0434f0c0e6b2d828580be0d60d47067adbeb4ee7b753b193436d330d WHIRLPOOL 910a1938547e78e1469c878afc632b70a3fc2893f2cd7bc5cd2c207c565b1e2ff12b8bca517c1351d33b446ff5b3f1fa0ee652f058f7a10ef7c1603c45299c89
 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_p20151116.ebuild 4590 SHA256 c0c8a8a750e0e448a182657969cacf29267509a563f4b858abf8d5ca559df8c6 SHA512 03618c4b51f0c0a1be4d9cae2764fe591e9581bbe1ea9c41cf1ef304da75d5f02255de78023b5a8429964ccf97daf79d5e3eb0986dfcf547709f479007419ba2 WHIRLPOOL 56c898293c05fd73a018ef5f52ee8274d6d3af7db2901dd0f107b02199895084de3629e7ba8559117fbb218f245223d1d8cbd8a7f1bc781125ad24e0c3d38d50
@@ -77,4 +78,5 @@ EBUILD netbeans-webcommon-9999_p20151215.ebuild 4590 SHA256 5447c92be0ee1afe1fba
 EBUILD netbeans-webcommon-9999_p20151216.ebuild 4590 SHA256 56740758f92eda890e46f8dca3c5af2a35013bfbe848e7c52e7f4af9cc302960 SHA512 89f9f788d0b3d7f15433f71a67fa426e0003b5b6ae72e1d931c8f107794c32d43ec7d5924027a731ce5a9a7067a3e75deb3fad11145b3c055098debd103f1864 WHIRLPOOL ad66af950d116998612ea5dd572381b54054c3411013c55711223570cf71a29aa1da5e3fb06fffe0b556f169b4491197f0073564b1384acb36cae97353bd6444
 EBUILD netbeans-webcommon-9999_p20151217.ebuild 5280 SHA256 8b2ced74f4b45edec4c6f901c4d816c99cffd0730770dd115979c01d02cf70aa SHA512 d6c88d0afb1c426799877a14681c763f02ce70cbb56f570198d2720c5462730752c0c8c33fe3e99b4da908e6647398760e518ac80057997381f60f843d297a1e WHIRLPOOL 06c98e22f47572ff733513e551f9f8dbe3d1ada07203ffd875fc2a68f879e70ad993f2c2117b8aa7e01804ceae21da9a3574a232ef952dc8f24aa131c7c2e41f
 EBUILD netbeans-webcommon-9999_p20151218.ebuild 5280 SHA256 ff0b1b88f35e6af98a36b7dd3159aa172290e054798f2ef9f958224592eda3f1 SHA512 52c59ad59be85a6e53a44b2217d31edcd7964d288daa36b84faefa67a4ead38ef3908b66783fea0916127bd246fc70a3100185676ca39d09581c6b501e0c98a6 WHIRLPOOL b3ab1ad83975fa5ca3354b436cb4635d65a021fb557c47916d10e0666b0d283483ac7c3c5344b9e3dc411856b2a2e3e5bd04f22b6d79409da7094fcdb566336d
+EBUILD netbeans-webcommon-9999_p20151221.ebuild 5280 SHA256 005c5d438d83befd57036c903070af9a4797d87d0e310b00e7960be52f0aef4c SHA512 a9b360ce8e855af921a00d1658eeef24719fa176096abbcdaf9f14fcd86090056f47a44bb3f9180d891a9c3ec99a9457b3965c312fe0afbfb8948c90aa8cff55 WHIRLPOOL 01b36feeee09dedae8e9552f8006599cde80c1b024a3f8b575bdb5251053a8c2fa51ed4ed70d0e4647573fba23c6f8715608d0511911a2f28a3ef46f5c18a815
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20151221.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20151221.ebuild
new file mode 100644
index 0000000..2db76ef
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20151221.ebuild
@@ -0,0 +1,122 @@
+# 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-21_00-02-04/zip/netbeans-trunk-nightly-201512210002-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
+	http://hg.netbeans.org/binaries/D4BD3F62EADB61216A47EF96B3152EDD35A56005-ojetdocs-1_0_0.zip
+	http://hg.netbeans.org/binaries/1EFED55F8C442E4DB1C2338A5C35D494364F9ECD-ojetdocs-1_1_2.zip
+	http://hg.netbeans.org/binaries/456736E6988B164BFC5C740605237A76A18A963E-ojetdocs-1_2_0-Dev10192015.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.webcommon -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-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
+	ln -s "${DISTDIR}"/D4BD3F62EADB61216A47EF96B3152EDD35A56005-ojetdocs-1_0_0.zip html.ojet/external/ojetdocs-1_0_0.zip || die
+	ln -s "${DISTDIR}"/1EFED55F8C442E4DB1C2338A5C35D494364F9ECD-ojetdocs-1_1_2.zip html.ojet/external/ojetdocs-1_1_2.zip || die
+	ln -s "${DISTDIR}"/456736E6988B164BFC5C740605237A76A18A963E-ojetdocs-1_2_0-Dev10192015.zip html.ojet/external/ojetdocs-1_2_0-Dev10192015.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-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 b8de698..ef0e13c 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201512150002-src.zip 209278678 SHA256 5c97f3333dc701
 DIST netbeans-trunk-nightly-201512160002-src.zip 209284935 SHA256 b9de21df9893215edfd3aa66d19bba3ef4d712364457937ffca0eb2e1a01c311 SHA512 58b19c90c4f8f4edfef3741b7b05616a6aaad5fd1c81c68037ecf2d05f67c979400346773392ca34427ceec8ae7adf8f57d47c564025b4e531e52732ba102fd6 WHIRLPOOL b365748df55e76aaf285ba5d139157a04748359b204f4eec0e6d222df41df8882eda831b327b61b6e9476572402b2e84a4eb2cab057a4ac5d180e2f276ae7ac2
 DIST netbeans-trunk-nightly-201512170002-src.zip 209334699 SHA256 4bab0de756b2b1d61af59c5f5eac8fa6faefec1abe2f7f82eb50593776cbd7eb SHA512 660689d11454e2816f623e6ece3b7d23d6fef7a387ac080cdc138dc44b2110325dda37e74635c6f5883a586258167cc7720fe74896e25d3f25f15f3c9a2f3cfb WHIRLPOOL 8934b7be1fbc0253582ac16524ca185304557e1834681bb0abb6e615fe02f45a72cec662312ca44c5ca04e776116307c307b1ee08604d741f8e3aaf11b92c995
 DIST netbeans-trunk-nightly-201512180002-src.zip 209387619 SHA256 ee149de6b63dd36518dd78a8f28b0603b68a01b062d35c63d81f7742ed0fc805 SHA512 7aa9fcb6d7269264b76dd0eab66e0bc2e855ddb70de7a357dae5a5a3a8865da6979486acac421d351425e2c033ba689d4521cfc0353dc9ec62dd487b013e60cd WHIRLPOOL ab6b2385e651852bb383f7a9eaa5a24ac5f8deca8afd3dc8c0e0569acdb02ee54de89221a16fd93eea634df8011598270ae29f00c970edfecf6960d93846e9ac
+DIST netbeans-trunk-nightly-201512210002-src.zip 209401161 SHA256 82cc114d515412f1a828e622a467e747e8933ae2165da46a143073f2b9d0faaf SHA512 110c4a257904c61ee54e8ac97c09a6d67b2e39d82103fd5436d13cb1198c2bc15d15232d0434f0c0e6b2d828580be0d60d47067adbeb4ee7b753b193436d330d WHIRLPOOL 910a1938547e78e1469c878afc632b70a3fc2893f2cd7bc5cd2c207c565b1e2ff12b8bca517c1351d33b446ff5b3f1fa0ee652f058f7a10ef7c1603c45299c89
 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_p20151116.ebuild 2721 SHA256 2eb8fe4a4195f2e685ae985ceeefc264caac94c6fe079b7e201f66b9ac06efdb SHA512 6f8eaedb1c9bb54f4f17eeefc95c531d63ce21bf34d392ffd15438b74f442b886d0057509fb1ea9079f0db78d6919619e2a745b711313cb77c1efa7922c4462e WHIRLPOOL 2e683e0364909fa221d778176e20898a95dd66a785265f4849c30ee8e0c47c75ba155abea75dc93af8aa5a8950f6e925f8aec47eecb90abd8cbec3aca4969e81
@@ -65,4 +66,5 @@ EBUILD netbeans-websvccommon-9999_p20151215.ebuild 2721 SHA256 f732286bda9345270
 EBUILD netbeans-websvccommon-9999_p20151216.ebuild 2721 SHA256 bf33f74191873a72705facbde86639f17ee3d3b8e0ed554c368ea0f05fac0510 SHA512 8e907cfa3b6572f2467d85cb933e24662b2cf8e7be8323247e5a3dde496b3d7fdf66d2c6fc5471bb19c6250ff6820b3fc089d0550409268d1324ed76375022b0 WHIRLPOOL daafb5fbce78af7490b94c448065eeec1e7241a85fe0bc474efe73c5c9927d2767b11fc5408b8d40fa86bdb0724e7f83fb9e890f91dcdb6a0cd3e85b80590ecb
 EBUILD netbeans-websvccommon-9999_p20151217.ebuild 2721 SHA256 3747b7481605a9a6d77a49c6b2dd01b6c94a2cc42d0635b96cb711c09b8b64dd SHA512 b615b60ecd078631a94bca6b8c82be1c2cec8a96179c8d2e01e0fa85952d3b953a2f08745a92569f720ca5428b36f5d3322d23095e8664a86585bf552e07d1b4 WHIRLPOOL 309d779b6affd7dd00b713c97028c64170fd7a6e315f33137129db2de798aaffeb9d8394060bf12e9f3b904aa3fc8f214d67629262f6fa0cee6223f86706bc22
 EBUILD netbeans-websvccommon-9999_p20151218.ebuild 2721 SHA256 4f531dbe6f46bddd40217ebc323c8f827936095b9560fa97cacf01e85275091e SHA512 3407d81237a1b98de0378611447f5ca531edfd0e24aa3bb9126ee253f65f1f542a15b4910b10ad4d9fd9e962145a784d4a36b304ca53aefdf158f8567b8d8a02 WHIRLPOOL b03b0cd50f21c6a5b176185bb50bfbe1612f5a1700f66a9aedec8e8844b734c1c0867533fbc05bcefe318adf87b147fed6230c7ca2f2afde5c366eb2daa2f611
+EBUILD netbeans-websvccommon-9999_p20151221.ebuild 2721 SHA256 0432ef6f695245e3b1992eac57c3e457b1a2ce65f0afde9173f27be4a2c3ce94 SHA512 286146ae8f50b17a2eeda692fa26fdd999f35224cf75604371728869b489706c224ad4d70d57b7763a04a9f075e09bcad513cca0788cdf4116caf817bee1c504 WHIRLPOOL a06d609c1b37d78acb10db5e75e66ec56365ef7638b574411971c9f01a057c32ef89329363ad1bf2d6aee5313249fa905918f646bdc7ca5761d6a9c10f093b5f
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20151221.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20151221.ebuild
new file mode 100644
index 0000000..a1e37d5
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20151221.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-21_00-02-04/zip/netbeans-trunk-nightly-201512210002-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 26973b9..3d360fa 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201512150002-src.zip 209278678 SHA256 5c97f3333dc701
 DIST netbeans-trunk-nightly-201512160002-src.zip 209284935 SHA256 b9de21df9893215edfd3aa66d19bba3ef4d712364457937ffca0eb2e1a01c311 SHA512 58b19c90c4f8f4edfef3741b7b05616a6aaad5fd1c81c68037ecf2d05f67c979400346773392ca34427ceec8ae7adf8f57d47c564025b4e531e52732ba102fd6 WHIRLPOOL b365748df55e76aaf285ba5d139157a04748359b204f4eec0e6d222df41df8882eda831b327b61b6e9476572402b2e84a4eb2cab057a4ac5d180e2f276ae7ac2
 DIST netbeans-trunk-nightly-201512170002-src.zip 209334699 SHA256 4bab0de756b2b1d61af59c5f5eac8fa6faefec1abe2f7f82eb50593776cbd7eb SHA512 660689d11454e2816f623e6ece3b7d23d6fef7a387ac080cdc138dc44b2110325dda37e74635c6f5883a586258167cc7720fe74896e25d3f25f15f3c9a2f3cfb WHIRLPOOL 8934b7be1fbc0253582ac16524ca185304557e1834681bb0abb6e615fe02f45a72cec662312ca44c5ca04e776116307c307b1ee08604d741f8e3aaf11b92c995
 DIST netbeans-trunk-nightly-201512180002-src.zip 209387619 SHA256 ee149de6b63dd36518dd78a8f28b0603b68a01b062d35c63d81f7742ed0fc805 SHA512 7aa9fcb6d7269264b76dd0eab66e0bc2e855ddb70de7a357dae5a5a3a8865da6979486acac421d351425e2c033ba689d4521cfc0353dc9ec62dd487b013e60cd WHIRLPOOL ab6b2385e651852bb383f7a9eaa5a24ac5f8deca8afd3dc8c0e0569acdb02ee54de89221a16fd93eea634df8011598270ae29f00c970edfecf6960d93846e9ac
+DIST netbeans-trunk-nightly-201512210002-src.zip 209401161 SHA256 82cc114d515412f1a828e622a467e747e8933ae2165da46a143073f2b9d0faaf SHA512 110c4a257904c61ee54e8ac97c09a6d67b2e39d82103fd5436d13cb1198c2bc15d15232d0434f0c0e6b2d828580be0d60d47067adbeb4ee7b753b193436d330d WHIRLPOOL 910a1938547e78e1469c878afc632b70a3fc2893f2cd7bc5cd2c207c565b1e2ff12b8bca517c1351d33b446ff5b3f1fa0ee652f058f7a10ef7c1603c45299c89
 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_p20151116.ebuild 6938 SHA256 462af4cb823cbd78e133f26125f28b015093e0788411ca083e10db74ab6d02e4 SHA512 d8fb4f6c536a2d58db406142b5f7f32d0787fae0c987d9dcf8953a07b6a8138d81569b43255de5bb62bbcdb0c5dc50e4c8236b1a189a26e663b15baa5562993b WHIRLPOOL 775bebebd575abf83073d7f96f839b469a00a4a875494348ff3358df0407d95274c0e44e28d97a819b1dd3ebdfcad6d7bb5e55126ccc07a51b2c759767b53ee7
@@ -68,4 +69,5 @@ EBUILD netbeans-9999_p20151215.ebuild 6938 SHA256 9a45f2e225b9776e8052fba0adc086
 EBUILD netbeans-9999_p20151216.ebuild 6938 SHA256 bdce981cb8fc6f7f9458d07db311cb9b9a58b42f91025a927fabb26363c99ba1 SHA512 565b577aba2e221bbb75a46b1e32459acce3ded1ad67d5f8bba55e85d663fe77a28c15dd8ffe38c3daf3696ae6a97b836b5594fe0efbe083405c1e0a5a2b52e2 WHIRLPOOL fede09ec3451a0a38924d3a3ebf43735da26ac420bd01a6da80c44ec08c77d5dc0a53abef2baa50509fe3922ba5106ce441f41d05893b3941561015cf0777917
 EBUILD netbeans-9999_p20151217.ebuild 6938 SHA256 b5dedf4d4bef1686ead5dfbdc947957fd940092d6ff1dbef73b9612079bf4d2f SHA512 85e84aa57fd99bd8e683aa7a57e9cd91ae1a2ad7d2381d5e96820a61e5a5d5053d9498b6bb4a782c58d74d54bffe294cca77f309e44bac5f8e5cb6f57cdc1da4 WHIRLPOOL 361dea10358d03454c6ffc59b2d2569510f95befa0b77d09dd498307cb592d606bf6e19ad34e6f6df7632ded30fee7e631b17430ff907498a54c5ea78d1f1719
 EBUILD netbeans-9999_p20151218.ebuild 6938 SHA256 29c0a946fe57d0f675051cb211ca40ae3f0e56e25eadcbc9dd56c6b05660beca SHA512 b3fc37161cef9454723a31f1c257d18624f77d09d03a8ecd310157fcae9cf89ee73e2b752c1fc60061084b180435a2d693d8dd6184dd762af4ea6f75b5512859 WHIRLPOOL f9d5d92245c9ac1253c9cca34070956de0ea1b104e4ab90fca1c8d4d06a24b3c5b9c395a2ec03b94901264c2e32716bbe6d1940b9ffeef83089112d0114a427d
+EBUILD netbeans-9999_p20151221.ebuild 6938 SHA256 7fd102f7ab686afd9a198d5ec887acbbb31937868b08b7d31932229bd21eaf44 SHA512 8d350b3b8683ee3be086b44b40f35d3575d71260146aba921da6ab778268f0d4a7f86c851278c86e2d7ffae7ec86129c4dc70c12db2f78d815e211af69c3a0f0 WHIRLPOOL 8099bc1a899567596dea553302b1e7f7bb750c48a2e8a84295fffaab64d87eb5d6d736bfd31c4b40fcad552eaa33606d2ce42cf5083bcde3f02560a087ef51cc
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

diff --git a/dev-util/netbeans/netbeans-9999_p20151221.ebuild b/dev-util/netbeans/netbeans-9999_p20151221.ebuild
new file mode 100644
index 0000000..8d599d7
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20151221.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-21_00-02-04/zip/netbeans-trunk-nightly-201512210002-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
+}


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

only message in thread, other threads:[~2015-12-21 10:04 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-21 10:04 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-webcommon/, dev-java/netbeans-nb/, dev-java/netbeans-cnd/, Miroslav Šulc

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