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

[Miroslav Šulc]

commit:     ad42a4dd008b94b9580c1c98c501f8066058f4d4
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  7 12:51:32 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Dec  7 12:51:32 2015 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=ad42a4dd

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.2.26

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 15e1648..f3b9b7a 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201512010002-src.zip 209149379 SHA256 9030cb0fd9a50b
 DIST netbeans-trunk-nightly-201512020002-src.zip 209149151 SHA256 4e95492815119f865a36948128503e0bbafe7ba46ec3a9d265fa8d65692890a2 SHA512 521444ba55da0d18b12483d5065978b6b90504ac73c65f7c14e982bdb6ad130b44da190fc05de971da9f33394a0cddd92fba01ab42483334148323671f5fbcc9 WHIRLPOOL 6631ae3b7e9cce61e051519de5855640554f44779a18d4ac1c86ad5db153b810e28d1a090d720d09b93254a8d35a5da8992ef2ef979c0e956520c1c800c224cd
 DIST netbeans-trunk-nightly-201512030002-src.zip 209171687 SHA256 d79cd2853d8d347e4b2d42daf178b21d60cef8fb0221292d599818482fa5b48a SHA512 eed19fadd98ac6d458ef187613ee6f0088d692adb9b1dde171b3e2daeb7d9a0975c97441e9a6053a8071d97f70d1a1f90296dd88ac98c92e9e67de3a905afefe WHIRLPOOL e8c370eb715e3996000e8fa44cfaae14bde4402fecb010237987c0139d60a7730e63455ca5ea179836bb417165fb675b2fd19ce3b2ff3f8863dc3e135ed8798a
 DIST netbeans-trunk-nightly-201512040002-src.zip 209178833 SHA256 9fbb70be4c026ac0ef12f1a44a361fdee99cce6234920c68b045526d00d4fd75 SHA512 90bc8fb97442a61215613021d27bd20e71e5b5ecd63ce41710d761f70faba8d4229ff6e5d023439070a62ad862e497b7f2e4b244e2b7b1183f55c217572b01ca WHIRLPOOL c231908df004a9e519e92827b36aaed93aca4a7802c8b85593c2849c94bfa422744fdb015ac38c07eeac56304443068b612f426fd5455c25b822f68ed8ad0bc1
+DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc64965bd5b8803c50b183bde52daab55dd4a4aa6c7b29bb624f83a SHA512 33072bd5bf9251678c2a28f7418e23569f2012d41c6b9518f3099f58abef39ef7da8285cfd3d96ae4dbb01258a4b6656d6bcc3ea26439eba3fb4b504ef61d761 WHIRLPOOL dac893869ef4aa8f582de77ce8d7117682a981e0e4f68156426eb41d31d2f0a55b08438979e9ad176efe0f86285d0af43ada75f34283a7deb40f56a8827d00fd
 EBUILD netbeans-apisupport-8.0.2.ebuild 3314 SHA256 b68fe791f275fe4fcc8b00888688949b8927cb39db2cf9ad7860017c6d20adee SHA512 35c4bbcd34ec0eaef8a2de86c13333d2bf092db61af48558c3e173bb17dbf8fcd15001307bd7c498f4ccdbaa4277e1ee42ff0909af6170039165b547f646c383 WHIRLPOOL 206fe8d5f64e76827d3eb958a629ba087e8a16c2797752f5d9e62dff4166653677587a81be19e0a2c6adcf49292255d532e1f542c02550b1cf6ffd51467bde3c
 EBUILD netbeans-apisupport-8.1.ebuild 3338 SHA256 d249a09cd1a527bfc4f0dc87b1768aad9f05fc7fe7079fad0094c27d416d030c SHA512 47e5db58581625b23157ef7a7b6e340fce1327db85e015369ac32791178a0836af3348397ac6ff4439ab246170d3318c2062994c81019ff361084f00d432c9c8 WHIRLPOOL 8e379c9219b7730a15c10216bed00c3ec104f84b252d32da629f066095897398a4d8818e07cda5afdf94b115b97ead8de6a9529f38c81c1c41144067f119e54e
 EBUILD netbeans-apisupport-9999_p20151101.ebuild 3384 SHA256 b3f926315b537a1251a52f68858d9dd21d2b77c54366aa23825b90c4d954bd77 SHA512 24367c9d4c2be458fa0aaf1e1d367834a32fce2db8853384b590643005371355a1ff98b5f3da5417cf4e316485cd18528779db2b6ae7ae857eb6fe6888ca99a0 WHIRLPOOL 295d1ad2b6c0c714aa77647feec6c3f9183325884a49142e49c787389b390481bee547287d3539508b3aef69e9141440d2dfefee393ab3333c5e3e6715d04249
@@ -61,4 +62,5 @@ EBUILD netbeans-apisupport-9999_p20151201.ebuild 3384 SHA256 9426ab6379951136b91
 EBUILD netbeans-apisupport-9999_p20151202.ebuild 3384 SHA256 b97f8701eb788326f8755d802c7f7f42883f2f67626152aafc496dd595863088 SHA512 8b94a9b6fb937d2a8a3a1233cfbc2e413fc3c3a76981ff3fd5793c54041e2f33d4ed21727aa08f8d8e2b7019c2788f778ee6e4c4feca58559ab0345641d49f9a WHIRLPOOL b224af39a082485f3ffc4342e76f5f2d668815dc8df9c9a794ae24c51842b8e0bbe25c90b8754d872498a01414d0f506af154ad331e7947fe0ce2f3ab72d4595
 EBUILD netbeans-apisupport-9999_p20151203.ebuild 3384 SHA256 156c211322547df64934f901a8fc3c4b449f30e4e7ea1b3894e6ae94a9f980c4 SHA512 45e4e304ef5cabf05788cbc59b35929ae44db73ea91b4ec996412e087638aeca1dbe7e427a761f7d43572a964c5114a089a0485ae9df079cc369a83fc30b2686 WHIRLPOOL 2e8888c65d07265f15c2638560f830519c5bdd9109f5979420d978ea2ebd2d38882d277e8adc5553a7520e261cb38bdeeed2c6cd7f042e8a3315412d0d0d22c4
 EBUILD netbeans-apisupport-9999_p20151204.ebuild 3384 SHA256 b8c6ab3ec620cf4f7428f72d9dd27687587430e5540d2912f9655af29947828a SHA512 021d7584df6460e2ca35386ede5d56566af1cc1bbbea61c30ca3a24e1c14e06b778c7528ff978952204e4e5c96553ba416c2a2ffe511562fe44b23cfa5f1a71a WHIRLPOOL c71112170e0526f837f8d4bc0a7005403ab3d83ed4857658116b5c2a7470c24016430434eb9cafc0f404217962bb6a21f5279b54de5a3e722bdbdc476fe71cf7
+EBUILD netbeans-apisupport-9999_p20151207.ebuild 3384 SHA256 dbcd0e96f73e86641ef181083643ff9cb78f595c82dad006a2dd83603bdc5ca8 SHA512 f61a593866ffc58ca54df3f34675549f653bf28139a4ec1c75a9681f76767d165803507131b88780ea3bcd06b3708ced24d9fb63725dcc7b39e38051e6bb9b1b WHIRLPOOL 19d8dd2d65f42056db70358ae2f3244a595dea8881c0455e817079b8928ad0c74457468ec972c614e371d66b46342ba3f15814f62ec719a668c39ecfb7af304f
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20151207.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20151207.ebuild
new file mode 100644
index 0000000..e204851
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20151207.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-07_00-02-04/zip/netbeans-trunk-nightly-201512070002-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 5095705..0521073 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -42,6 +42,7 @@ DIST netbeans-trunk-nightly-201512010002-src.zip 209149379 SHA256 9030cb0fd9a50b
 DIST netbeans-trunk-nightly-201512020002-src.zip 209149151 SHA256 4e95492815119f865a36948128503e0bbafe7ba46ec3a9d265fa8d65692890a2 SHA512 521444ba55da0d18b12483d5065978b6b90504ac73c65f7c14e982bdb6ad130b44da190fc05de971da9f33394a0cddd92fba01ab42483334148323671f5fbcc9 WHIRLPOOL 6631ae3b7e9cce61e051519de5855640554f44779a18d4ac1c86ad5db153b810e28d1a090d720d09b93254a8d35a5da8992ef2ef979c0e956520c1c800c224cd
 DIST netbeans-trunk-nightly-201512030002-src.zip 209171687 SHA256 d79cd2853d8d347e4b2d42daf178b21d60cef8fb0221292d599818482fa5b48a SHA512 eed19fadd98ac6d458ef187613ee6f0088d692adb9b1dde171b3e2daeb7d9a0975c97441e9a6053a8071d97f70d1a1f90296dd88ac98c92e9e67de3a905afefe WHIRLPOOL e8c370eb715e3996000e8fa44cfaae14bde4402fecb010237987c0139d60a7730e63455ca5ea179836bb417165fb675b2fd19ce3b2ff3f8863dc3e135ed8798a
 DIST netbeans-trunk-nightly-201512040002-src.zip 209178833 SHA256 9fbb70be4c026ac0ef12f1a44a361fdee99cce6234920c68b045526d00d4fd75 SHA512 90bc8fb97442a61215613021d27bd20e71e5b5ecd63ce41710d761f70faba8d4229ff6e5d023439070a62ad862e497b7f2e4b244e2b7b1183f55c217572b01ca WHIRLPOOL c231908df004a9e519e92827b36aaed93aca4a7802c8b85593c2849c94bfa422744fdb015ac38c07eeac56304443068b612f426fd5455c25b822f68ed8ad0bc1
+DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc64965bd5b8803c50b183bde52daab55dd4a4aa6c7b29bb624f83a SHA512 33072bd5bf9251678c2a28f7418e23569f2012d41c6b9518f3099f58abef39ef7da8285cfd3d96ae4dbb01258a4b6656d6bcc3ea26439eba3fb4b504ef61d761 WHIRLPOOL dac893869ef4aa8f582de77ce8d7117682a981e0e4f68156426eb41d31d2f0a55b08438979e9ad176efe0f86285d0af43ada75f34283a7deb40f56a8827d00fd
 EBUILD netbeans-cnd-8.0.2.ebuild 4510 SHA256 0a9a4e58e28f395b5bcb017016b6ddb1b77afe393d0e5bd81cc05e3a32076c71 SHA512 2b1fedfe292fa140920fd11829e77127f9535e08b8307886accfa37e6d11195a1204e6b71b2640937da0711c3ce0bbf80c0eaa3c248a64fd61b6a3d99d5de14e WHIRLPOOL 10b1518360ade5d6f1f27c79a10f630b94a2ec5062e18df11f9828d4b374e6cbdea0b9f770e01c117ca90fa194dff9bd3be6a468075c2d35167fb78a7bb32794
 EBUILD netbeans-cnd-8.1.ebuild 4744 SHA256 e008e92761489558e039a07d4858b5a9745aa38c38c57668cba8b5f6a28dbd9b SHA512 724af3f292851fa1a04ccc95fe0a4f9d0fab5503ce31d2ff11be73779d67bd0f38835b334684f628f8eea2dde44543e6b872611b2bd6c01191ccfe26e69f4ec2 WHIRLPOOL 59ddd65a105dafeb8b783f457ec7a8c67a5a3aceb78ca60ac7c4f45f330b28b429ba6236a643ca0023189a9ebdb1ca0182ec0546943ec2494693859aa8f95515
 EBUILD netbeans-cnd-9999_p20151101.ebuild 4790 SHA256 94dacae8078cd932314c67fddf63b942d26f2be2cd253c7c7edf4474f7a6a9cf SHA512 503d648dc3116dd856e4e8df0c73c8ced5c05cf590e6ba959bb4b217c48c9b3fb901e9a87ccf7646f5f7a3d373fb503e63d585d1a2c47c94354dbe85ff696a83 WHIRLPOOL d8f6bd7e0af32c57776e4c5bf9d7741c4f74b331124e7a62e76c70e296c3d73b17c36e2c84fe9e9f3ffb90837e8764d30b5628c9312be8b1aa7fea51d11a0220
@@ -72,4 +73,5 @@ EBUILD netbeans-cnd-9999_p20151201.ebuild 4790 SHA256 b9bf5d25cdbb28a5e6202728fb
 EBUILD netbeans-cnd-9999_p20151202.ebuild 4790 SHA256 b589b2790f86395f95bdd9f78d7df1bd9b1e6de4dfaeb3aae9a7d2473284f996 SHA512 8766151316ee1d0f9e00d230f42665340b25ea46b93ab97867524a92e4180301612be208d05f92f7046d6bfad127962ab0d68a82b86202424870a665a05374e9 WHIRLPOOL 6693b129ce7efe74d8a97b8f95b5a86f6f6e4804681cc69545823919575cb1a7dd258c46587fe0dced2fd8f789b53b2dc7c5cf99a8f39ea780d2b80b8bf7e8b9
 EBUILD netbeans-cnd-9999_p20151203.ebuild 4790 SHA256 f43035b11a89035b352aaac1d30fd322350cc19f59c6f6cc04e90f8f34ca5802 SHA512 2ebfedb6aae413fa4ae96194e06bdf770a63f77f31bd27df4a9a4a59cd36c68797c40c1eba7626dafdb1580ca32dc7002022c1b99ef37fd06f7ec86fa5bf582b WHIRLPOOL 49426027f5a56dc83f635ccf6fb7f88d074732b1845fbcf24f08894886f918d93c73cc51686d06adb0f1cb12a665420d63ff2450d87134b8da92f917cf88aa7a
 EBUILD netbeans-cnd-9999_p20151204.ebuild 4790 SHA256 ef98f2558a13e241a72fcd51fbe73a62ce2e43b8d1602523da432da7af6f58a5 SHA512 2d9ad5bdefe982a8047544e3c489fb14d0474815b1d517b56d41a3170cb552baa1574b5d287eaa8d93007ee6e080caad76fba9b7c7cd6c6babef0ae46bf3e8bd WHIRLPOOL 5bdf4c4b62ce39a3958f7a0e20dad53e78385cd85747f4dbb2d3d363389022a180239b77320e651c7ad220070d18e484706400fd89ef381ebcbce05502c51de7
+EBUILD netbeans-cnd-9999_p20151207.ebuild 4790 SHA256 a7c2735a4a90e20a509cea1a82ecc5a10ce5c620bfd69459c434766b129a448b SHA512 7c740b59902520b4c743bf31830595eb8a7be6a3bfa216c47a84acea5275b5f13cd10b37c3aa391d7c095572335b074bf900a89cc63d157fbab63c2ccaf1fdd9 WHIRLPOOL 4d942e74919b077b3de2303dd862a8262d0630264bec2816f9e3c353c41e8b3c8d66fb49063c4ae53255f4c2fdabc9dbfdc865e5c358803607467d4a89a36157
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index a2a26b5..73f749e 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201512010002-src.zip 209149379 SHA256 9030cb0fd9a50b
 DIST netbeans-trunk-nightly-201512020002-src.zip 209149151 SHA256 4e95492815119f865a36948128503e0bbafe7ba46ec3a9d265fa8d65692890a2 SHA512 521444ba55da0d18b12483d5065978b6b90504ac73c65f7c14e982bdb6ad130b44da190fc05de971da9f33394a0cddd92fba01ab42483334148323671f5fbcc9 WHIRLPOOL 6631ae3b7e9cce61e051519de5855640554f44779a18d4ac1c86ad5db153b810e28d1a090d720d09b93254a8d35a5da8992ef2ef979c0e956520c1c800c224cd
 DIST netbeans-trunk-nightly-201512030002-src.zip 209171687 SHA256 d79cd2853d8d347e4b2d42daf178b21d60cef8fb0221292d599818482fa5b48a SHA512 eed19fadd98ac6d458ef187613ee6f0088d692adb9b1dde171b3e2daeb7d9a0975c97441e9a6053a8071d97f70d1a1f90296dd88ac98c92e9e67de3a905afefe WHIRLPOOL e8c370eb715e3996000e8fa44cfaae14bde4402fecb010237987c0139d60a7730e63455ca5ea179836bb417165fb675b2fd19ce3b2ff3f8863dc3e135ed8798a
 DIST netbeans-trunk-nightly-201512040002-src.zip 209178833 SHA256 9fbb70be4c026ac0ef12f1a44a361fdee99cce6234920c68b045526d00d4fd75 SHA512 90bc8fb97442a61215613021d27bd20e71e5b5ecd63ce41710d761f70faba8d4229ff6e5d023439070a62ad862e497b7f2e4b244e2b7b1183f55c217572b01ca WHIRLPOOL c231908df004a9e519e92827b36aaed93aca4a7802c8b85593c2849c94bfa422744fdb015ac38c07eeac56304443068b612f426fd5455c25b822f68ed8ad0bc1
+DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc64965bd5b8803c50b183bde52daab55dd4a4aa6c7b29bb624f83a SHA512 33072bd5bf9251678c2a28f7418e23569f2012d41c6b9518f3099f58abef39ef7da8285cfd3d96ae4dbb01258a4b6656d6bcc3ea26439eba3fb4b504ef61d761 WHIRLPOOL dac893869ef4aa8f582de77ce8d7117682a981e0e4f68156426eb41d31d2f0a55b08438979e9ad176efe0f86285d0af43ada75f34283a7deb40f56a8827d00fd
 EBUILD netbeans-dlight-8.0.2.ebuild 2898 SHA256 08402481b573b90396431be03bda45904b2dd29f0086e09a111fe362e310c3f7 SHA512 3f6d6c9ea0043382562fbe47ad16e3273032407a74cb44ec7ff26736f96483835af4be8674361e910912a550b9fe592cc5a28c2b93b6b993076553195c35eac5 WHIRLPOOL 9d8706ccbc0d97b0f5d64ebf22c36316b08d8fbccd57408119ca5f5faef08c7f82677bf67488ff611eabeaa730e4c9a730c50966d94d738cfe79330ac147863d
 EBUILD netbeans-dlight-8.1.ebuild 2922 SHA256 f003a099e3f82f5ab53dcc56d86c00a662c98f47480feacac2a77ffea90ccd0f SHA512 94706ac4d8570deb8860236300cfeddfb2c3cbfd385ecb438a039991deeb018f292f6dbb2267d7c701b7f1b5b88d200f2c25696fb3204fcf205c15155b26d1fc WHIRLPOOL 1e44f40c8e2c03b7aa7385ef20a3247ea15a4d4705ce4b5f860bffe236eb578ab3d912f2cc2457e5906158ae747edc3b6b92463336c69af9cd58eca3fccb223d
 EBUILD netbeans-dlight-9999_p20151101.ebuild 2968 SHA256 06c21031f7d09c2e9370e34a30a3b16221ccfdc7f46a2df689eb4da864f3f5ce SHA512 b10e952eaaefdd08d70e4e5ecc03fb8aa9ee82ff55b141907cad269144c89cd97b7a10135e586bf814d4bf5f060c88dcd009a57ed6f5ab55e4784b36b77c0179 WHIRLPOOL 84038d5517651f7f92856e57d4847041ed8105ca606723121b548a20ae973f058497aa910d4ec244d29e3c8f56dd54fac1568ac108405ae007115496d2e65f0a
@@ -64,4 +65,5 @@ EBUILD netbeans-dlight-9999_p20151201.ebuild 2968 SHA256 659b9af709041279c91c89e
 EBUILD netbeans-dlight-9999_p20151202.ebuild 2968 SHA256 6f9e8d428045cda12e85c644d735c9280f9e07f2e697fb2e752c574cce5f0825 SHA512 cc1835ce659a019fbb1af8edfb4083debf060f00dc75f087859c036d2e32c07875dea18a8af8bd1ec620a31431262b4c2a56cfefd816a9dd83d18b8e6ebc9df6 WHIRLPOOL 291941f5327c9e127cdfa6992e9bb102a020f09b4db08a3b74aa5c8da1a80be4ff48a9dc282f96ac38d758841056f847449d5f9eafd2f818c38d4fda3e2beac1
 EBUILD netbeans-dlight-9999_p20151203.ebuild 2968 SHA256 4a24c3ce471e5ac85820e27e36665cb3cb31f382924e0da6e669323e3335c35b SHA512 99f5ba13454283e5154955dda787cf03ee91d6a127e8aba00e61380f1db48a785984c59eb5feabce2f62062db97a454940a77a90576bb115e14ad1855f0fb232 WHIRLPOOL c9500c55fa1b918d84829d1a9596f7052525854760baa576fa2ee764da075a3319cdbf15a56128e7dc1ab33dae8c11614dada133f3fe90247478e1aa97db8428
 EBUILD netbeans-dlight-9999_p20151204.ebuild 2968 SHA256 93bef6707831b30b39d030088704e2e4b9b1f0ad78bd3c6eb02463dc799540c2 SHA512 ad47946ef23d14ceac87c60d9870886d762626065bda08db638e5dd8585bab414d5ad22e3d0dae6d68e7926db1fdb7b9b01b7506ac4c851536fae450aa0e65d0 WHIRLPOOL 7c829f1595b26ebd0b3b0da1ebcb707f83dac377744bea4bc4576f2c6201880aa0ca6337dcc1dee47c32633a86602c2c01ffb3d6f33e8a6df32e43feee7c47a6
+EBUILD netbeans-dlight-9999_p20151207.ebuild 2968 SHA256 a1ce05646b14c2f90ae9dfc3a3fe0fac72a635dd88379de7a2d1beb5fc6bb045 SHA512 b4146704af1b25c37f0af80a8fe59628eebfc1657942d3d841bc65e5c19dd3f4951b1e4c59e5ce53a31579bff26ed984f57c2db68ca319bcdf56f18e6fb0a7c2 WHIRLPOOL 397eace446f0a06f474d94e16e3a23d6b4f63e79a6f2c242ec81d920caaffa39b77f73c2f03c51de451d24e7a8b4ddc7e26ba48a5d941a69091d2fbd4320ba65
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20151207.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20151207.ebuild
new file mode 100644
index 0000000..985182b
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20151207.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-07_00-02-04/zip/netbeans-trunk-nightly-201512070002-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 c1dd690..1981564 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -63,6 +63,10 @@ DIST netbeans-trunk-nightly-201512010002-src.zip 209149379 SHA256 9030cb0fd9a50b
 DIST netbeans-trunk-nightly-201512020002-src.zip 209149151 SHA256 4e95492815119f865a36948128503e0bbafe7ba46ec3a9d265fa8d65692890a2 SHA512 521444ba55da0d18b12483d5065978b6b90504ac73c65f7c14e982bdb6ad130b44da190fc05de971da9f33394a0cddd92fba01ab42483334148323671f5fbcc9 WHIRLPOOL 6631ae3b7e9cce61e051519de5855640554f44779a18d4ac1c86ad5db153b810e28d1a090d720d09b93254a8d35a5da8992ef2ef979c0e956520c1c800c224cd
 DIST netbeans-trunk-nightly-201512030002-src.zip 209171687 SHA256 d79cd2853d8d347e4b2d42daf178b21d60cef8fb0221292d599818482fa5b48a SHA512 eed19fadd98ac6d458ef187613ee6f0088d692adb9b1dde171b3e2daeb7d9a0975c97441e9a6053a8071d97f70d1a1f90296dd88ac98c92e9e67de3a905afefe WHIRLPOOL e8c370eb715e3996000e8fa44cfaae14bde4402fecb010237987c0139d60a7730e63455ca5ea179836bb417165fb675b2fd19ce3b2ff3f8863dc3e135ed8798a
 DIST netbeans-trunk-nightly-201512040002-src.zip 209178833 SHA256 9fbb70be4c026ac0ef12f1a44a361fdee99cce6234920c68b045526d00d4fd75 SHA512 90bc8fb97442a61215613021d27bd20e71e5b5ecd63ce41710d761f70faba8d4229ff6e5d023439070a62ad862e497b7f2e4b244e2b7b1183f55c217572b01ca WHIRLPOOL c231908df004a9e519e92827b36aaed93aca4a7802c8b85593c2849c94bfa422744fdb015ac38c07eeac56304443068b612f426fd5455c25b822f68ed8ad0bc1
+<<<<<<< Updated upstream
+=======
+DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc64965bd5b8803c50b183bde52daab55dd4a4aa6c7b29bb624f83a SHA512 33072bd5bf9251678c2a28f7418e23569f2012d41c6b9518f3099f58abef39ef7da8285cfd3d96ae4dbb01258a4b6656d6bcc3ea26439eba3fb4b504ef61d761 WHIRLPOOL dac893869ef4aa8f582de77ce8d7117682a981e0e4f68156426eb41d31d2f0a55b08438979e9ad176efe0f86285d0af43ada75f34283a7deb40f56a8827d00fd
+>>>>>>> Stashed changes
 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
@@ -95,4 +99,5 @@ EBUILD netbeans-enterprise-9999_p20151201.ebuild 15931 SHA256 587ebef736999f30c9
 EBUILD netbeans-enterprise-9999_p20151202.ebuild 15931 SHA256 9a97e8b90e55e1ffa6a910ee5b275290f4cd46a68d90a4b86e34b7612c8f90ea SHA512 2450357da6c551c4a6099cc963ebcf4cb0b6e7abbd6efc9e8fd2968c42a1ac7a87c41efdc597c591bbb4e323be224736d650f897ef0289698c986e1772713190 WHIRLPOOL 8cf782f6b0b26218f96c268d9d080d976c8f45ef0941155c965c07d3a8b08c5c98df2162b5e12c996c30e83e9ff17753de11728dc8fd8396590a2bb172001cdb
 EBUILD netbeans-enterprise-9999_p20151203.ebuild 15931 SHA256 4f5ac6510345a99bd03719929e90f5153449d16474522242694fcd39befb1cac SHA512 5f862e3f3be66de93808188b3d4ba747384e8e72a11a5f4c58ccc9566c98f2f0e36df39e65c9c09bbd9c21d3ba0572734d17ae9e5b01d517a44cd9a17c680eec WHIRLPOOL f56fae395d24e8873c9b5ad500a4ff169de002f5f6d528958550c0a17118152e0b6d4b1ac10efd05b45828a1f2c0f093ec7be01c423d0214b3150d699354d764
 EBUILD netbeans-enterprise-9999_p20151204.ebuild 15931 SHA256 3b8a45e6d080d799a599ae19e64782e3261e9f48a54a00b21c497b5846a6bed6 SHA512 602be79fc3dca4b21d9ce6bf5b399c8c81ae3f54374affb4e6572242e6670dcd00a951072420be103d628c8d186fda19f41dc79550bfe26a0ffd80cf79881ff6 WHIRLPOOL a6d70b2a7a2c47e9ba5754342d398c108a6ff78a2d6f8cb2b0354922a14edce2f98221cce7ed73ea3276d651760bc24dd8f67fc9b1a5051af240cd88b9c5dec7
+EBUILD netbeans-enterprise-9999_p20151207.ebuild 15936 SHA256 d0df2f25fbd06b8f8bb3f8dfea972c77dc14a3df0ba2b0debae16ec2dbabc3be SHA512 486aaf4f5164046a43b0fada4016ce678837a6633e1438c369c8acfc3ea7b32741183292db9a094d305d7106935960aa399087ee8332c99e141ebfe02f8194d8 WHIRLPOOL 2ec44aebd99be8bf99d4af3b8c78bbe0dafaf2fd92b62f2108ad7df8b1cc8d464354b17e278d5cef4f52af1c617261bd862ee54121d7af489049ba2ed718bfee
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20151207.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20151207.ebuild
new file mode 100644
index 0000000..26b5993
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20151207.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-07_00-02-04/zip/netbeans-trunk-nightly-201512070002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar
+	http://hg.netbeans.org/binaries/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar
+	http://hg.netbeans.org/binaries/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar
+	http://hg.netbeans.org/binaries/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar
+	http://hg.netbeans.org/binaries/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar
+	http://hg.netbeans.org/binaries/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar
+	http://hg.netbeans.org/binaries/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar
+	http://hg.netbeans.org/binaries/51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar
+	http://hg.netbeans.org/binaries/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar
+	http://hg.netbeans.org/binaries/B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar
+	http://hg.netbeans.org/binaries/27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar
+	http://hg.netbeans.org/binaries/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar
+	http://hg.netbeans.org/binaries/1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar
+	http://hg.netbeans.org/binaries/E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar
+	http://hg.netbeans.org/binaries/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar
+	http://hg.netbeans.org/binaries/45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar
+	http://hg.netbeans.org/binaries/C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip
+	http://hg.netbeans.org/binaries/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar
+	http://hg.netbeans.org/binaries/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip
+	http://hg.netbeans.org/binaries/99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip
+	http://hg.netbeans.org/binaries/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip
+	http://hg.netbeans.org/binaries/F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar
+	http://hg.netbeans.org/binaries/5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar
+	http://hg.netbeans.org/binaries/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip
+	http://hg.netbeans.org/binaries/F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip
+	http://hg.netbeans.org/binaries/065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar
+	http://hg.netbeans.org/binaries/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar
+	http://hg.netbeans.org/binaries/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip
+	http://hg.netbeans.org/binaries/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip
+	http://hg.netbeans.org/binaries/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip
+	http://hg.netbeans.org/binaries/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-profiler-${PV}
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-webcommon-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/commons-codec:0
+	dev-java/commons-fileupload:0
+	dev-java/commons-logging:0
+	dev-java/glassfish-deployment-api:1.2"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	dev-java/jsr181:0
+	>=dev-java/junit-4.4:4
+	dev-java/tomcat-servlet-api:2.3"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}
+	>=dev-java/antlr-2.7.7-r7:0
+	dev-java/bsf:2.3
+	dev-java/cglib:3
+	dev-java/commons-beanutils:1.7
+	dev-java/commons-collections:0
+	dev-java/commons-digester:0
+	dev-java/commons-io:1
+	dev-java/commons-validator:0
+	dev-java/glassfish-persistence:0
+	dev-java/guava:14
+	dev-java/jakarta-oro:2.0
+	dev-java/osgi-core-api:0
+	dev-java/validation-api:1.0"
+#	dev-java/commons-chain:1.1 in overlay
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.enterprise -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar libs.amazon/external/aws-java-sdk-1.2.1.jar || die
+	ln -s "${DISTDIR}"/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar libs.elimpl/external/el-impl.jar || die
+	ln -s "${DISTDIR}"/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar web.jspparser/external/glassfish-jspparser-4.0.jar || die
+	ln -s "${DISTDIR}"/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar libs.glassfish_logging/external/glassfish-logging-2.0.jar || die
+	ln -s "${DISTDIR}"/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar libs.amazon/external/httpclient-4.1.1.jar || die
+	ln -s "${DISTDIR}"/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar libs.amazon/external/httpcore-4.1.jar || die
+	ln -s "${DISTDIR}"/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar javaee.api/external/javaee-api-6.0.jar || die
+	ln -s "${DISTDIR}"/51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar javaee7.api/external/javaee-api-7.0.jar || die
+	ln -s "${DISTDIR}"/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar javaee.api/external/javaee-web-api-6.0.jar || die
+	ln -s "${DISTDIR}"/B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar javaee7.api/external/javaee-web-api-7.0.jar || die
+	ln -s "${DISTDIR}"/27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar j2ee.platform/external/javaee-doc-api.jar || die
+	ln -s "${DISTDIR}"/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar javaee.api/external/javax.annotation.jar || die
+	ln -s "${DISTDIR}"/1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar javaee7.api/external/javax.annotation-api.jar || die
+	ln -s "${DISTDIR}"/E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar javaee7.api/external/javax.xml.soap-api.jar || die
+	ln -s "${DISTDIR}"/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar javaee.api/external/jaxb-api-osgi.jar || die
+	ln -s "${DISTDIR}"/45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar javaee7.api/external/jaxb-api-osgi.jar || die
+	ln -s "${DISTDIR}"/C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip websvc.restlib/external/jaxrs-ri-2.5.1.zip || die
+	ln -s "${DISTDIR}"/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar javaee7.api/external/jaxws-api.jar || die
+	ln -s "${DISTDIR}"/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip web.jsf12/external/jsf-1.2.zip || die
+	ln -s "${DISTDIR}"/99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip web.jsf20/external/jsf-2.2.zip || die
+	ln -s "${DISTDIR}"/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip web.jsf.editor/external/jsf-api-docs.zip || die
+	ln -s "${DISTDIR}"/F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar libs.jstl/external/jstl-api.jar || die
+	ln -s "${DISTDIR}"/5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar libs.jstl/external/jstl-impl.jar || die
+	ln -s "${DISTDIR}"/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip websvc.metro.lib/external/metro-1.4-doc.zip || die
+	ln -s "${DISTDIR}"/F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip websvc.metro.lib/external/metro-2.0.zip || die
+	ln -s "${DISTDIR}"/065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar web.primefaces/external/primefaces-5.0.jar || die
+	ln -s "${DISTDIR}"/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar servletjspapi/external/servlet3.1-jsp2.3-api.jar || die
+	ln -s "${DISTDIR}"/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip web.struts/external/struts-1.3.10-javadoc.zip || die
+	ln -s "${DISTDIR}"/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip web.struts/external/struts-1.3.10-lib.zip || die
+	ln -s "${DISTDIR}"/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip web.core.syntax/external/syntaxref20.zip || die
+	ln -s "${DISTDIR}"/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar javaee.api/external/webservices-api-osgi.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into j2eeapis/external glassfish-deployment-api-1.2 glassfish-deployment-api.jar jsr88javax.jar
+	java-pkg_jar-from --into libs.amazon/external commons-codec commons-codec.jar commons-codec-1.3.jar
+	java-pkg_jar-from --into libs.amazon/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
+	java-pkg_jar-from --into libs.commons_fileupload/external commons-fileupload commons-fileupload.jar commons-fileupload-1.3.jar
+	java-pkg_jar-from --build-only --into javaee7.api/external jsr181 jsr181.jar jsr181-api.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+	java-pkg_jar-from --build-only --into web.monitor/external tomcat-servlet-api-2.3 servlet.jar servlet-2.3.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-profiler-${SLOT} profiler || die
+	cat /usr/share/netbeans-profiler-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.profiler.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-webcommon-${SLOT} webcommon || die
+	cat /usr/share/netbeans-webcommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.webcommon.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/enterprise >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/enterprise$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-fileupload-1.3.jar && dosym /usr/share/commons-fileupload/lib/commons-fileupload.jar ${instdir}/commons-fileupload-1.3.jar || die
+	rm jsr88javax.jar && dosym /usr/share/glassfish-deployment-api-1.2/lib/glassfish-deployment-api.jar ${instdir}/jsr88javax.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/aws-sdk
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-codec-1.3.jar && dosym /usr/share/commons-codec/lib/commons-codec.jar ${instdir}/commons-codec-1.3.jar || die
+	rm commons-logging-1.1.1.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.1.1.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/javaee7-endorsed
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jersey2/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm cglib-2.2.0-b21.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.0-b21.jar || die
+	rm guava-14.0.1.jar && dosym /usr/share/guava-14/lib/guava.jar ${instdir}/guava-14.0.1.jar || die
+	rm org.osgi.core-4.2.0.jar && dosym /usr/share/osgi-core-api/lib/osgi-core-api.jar ${instdir}/org.osgi.core-4.2.0.jar || die
+	rm persistence-api-1.0.jar && dosym /usr/share/glassfish-persistence/lib/glassfish-persistence.jar ${instdir}/persistence-api-1.0.jar || die
+	rm validation-api-1.1.0.Final.jar && dosym /usr/share/validation-api-1.0/lib/validation-api.jar ${instdir}/validation-api-1.1.0.Final.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jsf-1_2
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-beanutils.jar && dosym /usr/share/commons-beanutils-1.7/lib/commons-beanutils.jar ${instdir}/commons-beanutils.jar || die
+	rm commons-collections.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections.jar || die
+	rm commons-digester.jar && dosym /usr/share/commons-digester/lib/commons-digester.jar ${instdir}/commons-digester.jar || die
+	rm commons-logging.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/struts
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm antlr-2.7.2.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.2.jar || die
+	rm bsf-2.3.0.jar && dosym /usr/share/bsf-2.3/lib/bsf.jar ${instdir}/bsf-2.3.0.jar || die
+	rm commons-beanutils-1.8.0.jar && dosym /usr/share/commons-beanutils-1.7/lib/commons-beanutils.jar ${instdir}/commons-beanutils-1.8.0.jar || die
+	rm commons-digester-1.8.jar && dosym /usr/share/commons-digester/lib/commons-digester.jar ${instdir}/commons-digester-1.8.jar || die
+	rm commons-fileupload-1.1.1.jar && dosym /usr/share/commons-fileupload/lib/commons-fileupload.jar ${instdir}/commons-fileupload-1.1.1.jar || die
+	rm commons-io-1.1.jar && dosym /usr/share/commons-io-1/lib/commons-io.jar ${instdir}/commons-io-1.1.jar || die
+	rm commons-logging-1.0.4.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.0.4.jar || die
+	rm commons-validator-1.3.1.jar && dosym /usr/share/commons-validator/lib/commons-validator.jar ${instdir}/commons-validator-1.3.1.jar || die
+	rm oro-2.0.8.jar && dosym /usr/share/jakarta-oro-2.0/lib/jakarta-oro.jar ${instdir}/oro-2.0.8.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/enterprise
+}

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index f9628d8..202ce4e 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201512010002-src.zip 209149379 SHA256 9030cb0fd9a50b
 DIST netbeans-trunk-nightly-201512020002-src.zip 209149151 SHA256 4e95492815119f865a36948128503e0bbafe7ba46ec3a9d265fa8d65692890a2 SHA512 521444ba55da0d18b12483d5065978b6b90504ac73c65f7c14e982bdb6ad130b44da190fc05de971da9f33394a0cddd92fba01ab42483334148323671f5fbcc9 WHIRLPOOL 6631ae3b7e9cce61e051519de5855640554f44779a18d4ac1c86ad5db153b810e28d1a090d720d09b93254a8d35a5da8992ef2ef979c0e956520c1c800c224cd
 DIST netbeans-trunk-nightly-201512030002-src.zip 209171687 SHA256 d79cd2853d8d347e4b2d42daf178b21d60cef8fb0221292d599818482fa5b48a SHA512 eed19fadd98ac6d458ef187613ee6f0088d692adb9b1dde171b3e2daeb7d9a0975c97441e9a6053a8071d97f70d1a1f90296dd88ac98c92e9e67de3a905afefe WHIRLPOOL e8c370eb715e3996000e8fa44cfaae14bde4402fecb010237987c0139d60a7730e63455ca5ea179836bb417165fb675b2fd19ce3b2ff3f8863dc3e135ed8798a
 DIST netbeans-trunk-nightly-201512040002-src.zip 209178833 SHA256 9fbb70be4c026ac0ef12f1a44a361fdee99cce6234920c68b045526d00d4fd75 SHA512 90bc8fb97442a61215613021d27bd20e71e5b5ecd63ce41710d761f70faba8d4229ff6e5d023439070a62ad862e497b7f2e4b244e2b7b1183f55c217572b01ca WHIRLPOOL c231908df004a9e519e92827b36aaed93aca4a7802c8b85593c2849c94bfa422744fdb015ac38c07eeac56304443068b612f426fd5455c25b822f68ed8ad0bc1
+DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc64965bd5b8803c50b183bde52daab55dd4a4aa6c7b29bb624f83a SHA512 33072bd5bf9251678c2a28f7418e23569f2012d41c6b9518f3099f58abef39ef7da8285cfd3d96ae4dbb01258a4b6656d6bcc3ea26439eba3fb4b504ef61d761 WHIRLPOOL dac893869ef4aa8f582de77ce8d7117682a981e0e4f68156426eb41d31d2f0a55b08438979e9ad176efe0f86285d0af43ada75f34283a7deb40f56a8827d00fd
 EBUILD netbeans-ergonomics-8.0.2.ebuild 2843 SHA256 f9262f6ee7f2aed1fab9bf4cf756f565272e9894afa50b349735e39961e7acc3 SHA512 f158c27640541f7aef31da050e0811c07a251ae4797cc663b95a074a47eaf9d6bb7a9aa11ba38ea55e75c185f7dba74629ba6716a819e8ad68eb3db9ada71451 WHIRLPOOL 4fe9634fb673fb05dbba25996efc3a212ef3bb23ab6e7c732cb75de076feb930735e3901806fd9c801abc7ee8aa8eb800718065325d415371255a886474061d4
 EBUILD netbeans-ergonomics-8.1.ebuild 2867 SHA256 6d2c0b7221d47b64c77b243c8c5232c6d8c24d3199eae5799adafeac609b2e2a SHA512 6302c8c13d43ec51048e8b0439916746a01bb67f14e7cd21be95b4179df6106dcff1d3973b9191f7a36cf6f29d53b1d2308864f5f64d9f87f980ea264b1a97c0 WHIRLPOOL 63ceaad04323d9085dfb90d1e5075ad13f6e14e8991b13aafaf3fc174440152054f32498ac8d03f57917744887db3bc1efdfc30b473b8d1a33b514ec4960ea6f
 EBUILD netbeans-ergonomics-9999_p20151101.ebuild 2913 SHA256 e64dee7f488bc65ba05180351382835cda20706db8003176f2b222f44bd3a640 SHA512 2b96d3ba92763a5a4e3ab74ce3a36a3a8fda683773707655887d5e3648762ee179604898ac4eead36bbc407f6cf6575ccbb2eaf3ecd121699d15a71bfc28d7c5 WHIRLPOOL a46077092b9fee72f162c841db3f0ef1cd56b92ae3ef830982cc1149c21abae2fc59069199c57eefa3c46919cb7b7b22e354222aac3d02815a02bc05c5563518
@@ -61,4 +62,5 @@ EBUILD netbeans-ergonomics-9999_p20151201.ebuild 2913 SHA256 ab46548fc409e2478fb
 EBUILD netbeans-ergonomics-9999_p20151202.ebuild 2913 SHA256 dfd6238af35ae2e2b482e26518b68526380e3c3568383e6ea55ccff4168758b3 SHA512 ae53c8485273421767184bad167a850ec03820a21792b534230b9359373c311bf6085843a99d61f20af538464f95a67a1cebadc0200434170c947984259344e4 WHIRLPOOL d019bd6a5d706aa79179d5c66c6f72906b20e4dbcf3907e3a6eb68d636d2fb1c60d2a3dcc3807c91eb8d38c4f34adbecb6bca381e4674b16a9feb346eb9f7e1f
 EBUILD netbeans-ergonomics-9999_p20151203.ebuild 2913 SHA256 fbd211427699be2d2b9c954909e491739f3c5e2293313dd115c48dfcfd4e2408 SHA512 a6e025cbcbb01b41837f80d41891f2135ee494b8b13e68ee45f957e76eacf9267aea791cc04d0dfd3c51faaed2a64b26616b17390704b4e921932540300d03d6 WHIRLPOOL 714f1e16ad30dbad43c370e168c2293eb9e75fd6a9a30fd7aec7791688b4f2384439c9792440c34f5ef12e7dc3856e30b1c32c8c0bf70316e52707e6ef7bef88
 EBUILD netbeans-ergonomics-9999_p20151204.ebuild 2913 SHA256 b0f6fe2b939846e0c51464fb0b64e0319707c874264b08c6f924d6b504d23f65 SHA512 03a541e6cc26ed59ffefcf558c7622bb0224ae650070608b49a617749e6340b9bb96fb1a0c03fdc94d5c8febd969bbd39d9ec9b5e589e85cde50c68fd2d7d658 WHIRLPOOL d640309856df1c2a1fd1fdb97b5ce7a1ee354c6791953ea76d17f36b5489771f781f0fd546e6a06c5b29912798323bebd41cdc4618ba44d60db3372c5f414776
+EBUILD netbeans-ergonomics-9999_p20151207.ebuild 2913 SHA256 a5f0d445d144c808adf1da66456da2fa9a3ade308ca7f8ac75b0b1bf406bb3e9 SHA512 9191bf223438c57b4b04ff40f83fb9391ced8bb9213a662be2283a925c30acea212c6218abef458fc6d79d23b47e4168f4613e41f6f6b23fb44f324471c99805 WHIRLPOOL e0fd77105c9bbafabfadadd46a4251b43e4acc33a8945a713e7b4e4e4599591252e1543d3e43682892d477313155e95ca1bd4e530f273acee9455a2a171fc176
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20151207.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20151207.ebuild
new file mode 100644
index 0000000..542eeb9
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20151207.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-07_00-02-04/zip/netbeans-trunk-nightly-201512070002-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 1d95d49..94171a4 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201512010002-src.zip 209149379 SHA256 9030cb0fd9a50b
 DIST netbeans-trunk-nightly-201512020002-src.zip 209149151 SHA256 4e95492815119f865a36948128503e0bbafe7ba46ec3a9d265fa8d65692890a2 SHA512 521444ba55da0d18b12483d5065978b6b90504ac73c65f7c14e982bdb6ad130b44da190fc05de971da9f33394a0cddd92fba01ab42483334148323671f5fbcc9 WHIRLPOOL 6631ae3b7e9cce61e051519de5855640554f44779a18d4ac1c86ad5db153b810e28d1a090d720d09b93254a8d35a5da8992ef2ef979c0e956520c1c800c224cd
 DIST netbeans-trunk-nightly-201512030002-src.zip 209171687 SHA256 d79cd2853d8d347e4b2d42daf178b21d60cef8fb0221292d599818482fa5b48a SHA512 eed19fadd98ac6d458ef187613ee6f0088d692adb9b1dde171b3e2daeb7d9a0975c97441e9a6053a8071d97f70d1a1f90296dd88ac98c92e9e67de3a905afefe WHIRLPOOL e8c370eb715e3996000e8fa44cfaae14bde4402fecb010237987c0139d60a7730e63455ca5ea179836bb417165fb675b2fd19ce3b2ff3f8863dc3e135ed8798a
 DIST netbeans-trunk-nightly-201512040002-src.zip 209178833 SHA256 9fbb70be4c026ac0ef12f1a44a361fdee99cce6234920c68b045526d00d4fd75 SHA512 90bc8fb97442a61215613021d27bd20e71e5b5ecd63ce41710d761f70faba8d4229ff6e5d023439070a62ad862e497b7f2e4b244e2b7b1183f55c217572b01ca WHIRLPOOL c231908df004a9e519e92827b36aaed93aca4a7802c8b85593c2849c94bfa422744fdb015ac38c07eeac56304443068b612f426fd5455c25b822f68ed8ad0bc1
+DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc64965bd5b8803c50b183bde52daab55dd4a4aa6c7b29bb624f83a SHA512 33072bd5bf9251678c2a28f7418e23569f2012d41c6b9518f3099f58abef39ef7da8285cfd3d96ae4dbb01258a4b6656d6bcc3ea26439eba3fb4b504ef61d761 WHIRLPOOL dac893869ef4aa8f582de77ce8d7117682a981e0e4f68156426eb41d31d2f0a55b08438979e9ad176efe0f86285d0af43ada75f34283a7deb40f56a8827d00fd
 EBUILD netbeans-extide-8.0.2.ebuild 3307 SHA256 084e952eae1708b0fab785fd34313985e864dbc74a8531a0d5cdcf906e88f85a SHA512 ade8dc37aa932d7ec20966199e521311716061c23df08d02635f78efd2776f1d7bf040b0f9c9488b947bbbdfb3e33fa764723e3dfffa2214892bc6d685428f6f WHIRLPOOL ad2c26b005675ebca7d902ff1e6caa28552f3fda6795e327cc3584cf109f0ad6efad6516e15af5e70d689be236298b0948003e09a3da4991b3e29a1c85607b2f
 EBUILD netbeans-extide-8.1.ebuild 3331 SHA256 7d81adb3cba102e13678052bfe288e8417753ebceb69f69ce528ede3fedcef04 SHA512 ae445552036799069f31b40c145879ac55cf0964e168f328ac84f2d434171de8c4848e3416ad7425563e8565c09f798c9520bb3cb7511348f5d6a7522b878e40 WHIRLPOOL 44142233d4d3047ebb5c152992b484e5fef1fddd04cf274cc370f00beece5a75a986e5fadedd4bc18a01559c4f6cb58289cefbfc24d8d098d70056707e8b8f57
 EBUILD netbeans-extide-9999_p20151101.ebuild 3377 SHA256 50670db3b1a181e311ca642fdf2a0aefad271252e2db7b25c60197997fe789ad SHA512 74e53c74b461ffe9baa000a079909373851a5f2289f74df9e9b8cddff9c3a17205c0098c6ac446fa5a349cc0763c56d197bec4ffb96c494e4c64436e9aa1f235 WHIRLPOOL 4f50a5f170721bc52784510cdc55ef87e2a65e14bed00831d100920fd696effba0f7a9f3752244e7eb0fb7daa326dc12c4777b76eea95959701517e5e6af20aa
@@ -63,4 +64,5 @@ EBUILD netbeans-extide-9999_p20151201.ebuild 3377 SHA256 7fdbf048f404f473c536db1
 EBUILD netbeans-extide-9999_p20151202.ebuild 3377 SHA256 96b904b79d8e1709438cdf645f90e24d7267c5c1aaefbfe6ccad46014bff9844 SHA512 b85f410612de224e38ef73e944886329387c8d2f6894375aa60670debfcabf6799280c56a2c2bcfc1168011065a21682796f665374e025823ac98e950461f662 WHIRLPOOL 957e3a2dda660b6008754607404d16fc341697de1c4202b67ed1894396bb04b071837277489a13fde45a93f5eb1e571f13a9d6e148a19792581615727b45b9e3
 EBUILD netbeans-extide-9999_p20151203.ebuild 3377 SHA256 2699cfeedb2a98a97155f54ddd6aea8adca0e2ea7b5dbb43ff4222de00f0eb3b SHA512 71857c85cc959ddcefbf9f72779c4f3b03b54f1479e3ec6fa78f1dd6781e11294d6e2c5834aa86cbfb37fec2d15d70bef2ef535f0621b8463286efd4fba11518 WHIRLPOOL be76ee652e141988893d8b8a039c4c3f355639aebc8d074dbc7caeb62d640945b3cdcbc138d64a6af51a60f8521f3947f4a7345770d488d9269fcb420bcf52b7
 EBUILD netbeans-extide-9999_p20151204.ebuild 3377 SHA256 1d3eabc7f609c1e51ca01c9abfc9afde2c07e9b0612304fac4d3730df17acfbc SHA512 ab42dca1b582c40876fe5cf0bb163acce8b9c711423181cdccbea85cf5beebbafdd90477dfd0d22500c149f60e95c554dedf2496b8522b2724598b99a2381aee WHIRLPOOL c7d1d91002e65626dd775d6f6898865313c3185bfec884023673a06bdaac224998171e3ecec0ebb7b33b26c97ccfb649cbdd2c833f007fe523aa344da5f3cdd1
+EBUILD netbeans-extide-9999_p20151207.ebuild 3377 SHA256 95ddb8bc31ba9277a7c61093ec4b027c0e95ce91eedf7873d6fa82a1bf5b74d6 SHA512 3413900e32a97e98b337396cbdb7cc943b34318c8c0eb48d3dd2d24c235a6c3ecc2f2e70438613917052be8a56adae7b3e4277f146a9302def109a83b620a716 WHIRLPOOL efe90a2502c1f39e6d688e61c6e7849d35ac22b013d99d482a6b69cd3bc2b1fa45cca745d98bed03c3392ea01ef6fb3f9cf107d97edda27598d3bc081476dbcb
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20151207.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20151207.ebuild
new file mode 100644
index 0000000..13d1c96
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20151207.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-07_00-02-04/zip/netbeans-trunk-nightly-201512070002-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 e921251..917ffe7 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -32,6 +32,7 @@ DIST netbeans-trunk-nightly-201512010002-src.zip 209149379 SHA256 9030cb0fd9a50b
 DIST netbeans-trunk-nightly-201512020002-src.zip 209149151 SHA256 4e95492815119f865a36948128503e0bbafe7ba46ec3a9d265fa8d65692890a2 SHA512 521444ba55da0d18b12483d5065978b6b90504ac73c65f7c14e982bdb6ad130b44da190fc05de971da9f33394a0cddd92fba01ab42483334148323671f5fbcc9 WHIRLPOOL 6631ae3b7e9cce61e051519de5855640554f44779a18d4ac1c86ad5db153b810e28d1a090d720d09b93254a8d35a5da8992ef2ef979c0e956520c1c800c224cd
 DIST netbeans-trunk-nightly-201512030002-src.zip 209171687 SHA256 d79cd2853d8d347e4b2d42daf178b21d60cef8fb0221292d599818482fa5b48a SHA512 eed19fadd98ac6d458ef187613ee6f0088d692adb9b1dde171b3e2daeb7d9a0975c97441e9a6053a8071d97f70d1a1f90296dd88ac98c92e9e67de3a905afefe WHIRLPOOL e8c370eb715e3996000e8fa44cfaae14bde4402fecb010237987c0139d60a7730e63455ca5ea179836bb417165fb675b2fd19ce3b2ff3f8863dc3e135ed8798a
 DIST netbeans-trunk-nightly-201512040002-src.zip 209178833 SHA256 9fbb70be4c026ac0ef12f1a44a361fdee99cce6234920c68b045526d00d4fd75 SHA512 90bc8fb97442a61215613021d27bd20e71e5b5ecd63ce41710d761f70faba8d4229ff6e5d023439070a62ad862e497b7f2e4b244e2b7b1183f55c217572b01ca WHIRLPOOL c231908df004a9e519e92827b36aaed93aca4a7802c8b85593c2849c94bfa422744fdb015ac38c07eeac56304443068b612f426fd5455c25b822f68ed8ad0bc1
+DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc64965bd5b8803c50b183bde52daab55dd4a4aa6c7b29bb624f83a SHA512 33072bd5bf9251678c2a28f7418e23569f2012d41c6b9518f3099f58abef39ef7da8285cfd3d96ae4dbb01258a4b6656d6bcc3ea26439eba3fb4b504ef61d761 WHIRLPOOL dac893869ef4aa8f582de77ce8d7117682a981e0e4f68156426eb41d31d2f0a55b08438979e9ad176efe0f86285d0af43ada75f34283a7deb40f56a8827d00fd
 EBUILD netbeans-groovy-8.0.2.ebuild 3346 SHA256 907e6cd11c222f15c826494b44929483803f0e4249de0d54db51e6855b574148 SHA512 8bb37121e7e32621959318d109b1d982e2c705a9deb7171f5fef1dcaed55fc5718b0bc9e6bbb2592cdaa5e96d874bb6e6bfa96d06fe09f14d5250c1485eb1da5 WHIRLPOOL d5e09fa1e975835f05c6132c091fee4ae9fc9dd671af9f5f88a9195d5cd4a93804f96687ed3f2bd741117fa65773f2c464b3cfd6697425039cc51a940efa2a31
 EBUILD netbeans-groovy-8.1.ebuild 3370 SHA256 ca32569d438060704e4d5d5e46be2ebf20bffdb0ae2471d8718ada8676f32082 SHA512 40555d2ffa0ddab1e55ca514eddbd98c6e721caa230cd174050fb56f144def46f389b0ac018068c9f509936c83235b2d3423cae8676db7c96e8782b0da73e4ad WHIRLPOOL 7b2b021581db21aa8ff90ea188ddeea0974ec84fdb064cf367a56a6fa53487affe89edb1880a83934a2cf0c586060a9192838687ffebf33b55e79d9ddc7ac986
 EBUILD netbeans-groovy-9999_p20151101.ebuild 3416 SHA256 2513cc485b3ab336ca2cba343e13a040690933fc67db717b5ad998f1c0fadebd SHA512 a662009f5fe30f174ecd56d48e2944ca8b2015cb055e165b37b9bf74b00d5eafb028acf1a29033cc93671d2354e12515d76f63ea4c37b0183bbbfe03058cde91 WHIRLPOOL 9fe7eb4a9206ccb18573d885d17333417bd19bb5ba543e658c18dd58150f768c356b8590e323d0fccb14f2adf65fd6d54c7a3ef07d88e6a7138927e646153ef1
@@ -62,4 +63,5 @@ EBUILD netbeans-groovy-9999_p20151201.ebuild 3416 SHA256 2d0ef42d752cb8701285802
 EBUILD netbeans-groovy-9999_p20151202.ebuild 3416 SHA256 3c378c58b1c58be1b31154656628073d8a9e3aee549c815be48a2de78b532a29 SHA512 bc612b4ef853e80de6f6e128da66e35fb98de5fb4599282a544d6fc0c01fa8dc534d2895980ad734c610fd06c9c4e0b8acaa0bcebaee4726e30e8b20951f76cc WHIRLPOOL 3cf207713af4647e9f393239a2ec8c22b3c6d121d16db5ec034d7646b0d46a2e906c3729aa168bb70f085b4732956b309ec01158ad62a77adce46c0d9eb282e7
 EBUILD netbeans-groovy-9999_p20151203.ebuild 3416 SHA256 2e8908b04228bc44397a9168467b3549f2c5f4898214a61b63a0a4fab10f5531 SHA512 53e48303710c341f7683ecb44db59280c9604ffce87c2012e7593b80c75c40530530d7d96996768bcac34105192c9f0dba68bfd064e66e8bf05b4179e5a82622 WHIRLPOOL 0f5b1668c94b2fb69bc05a750d2065e23353e59f2704117f7b75937d9377ba73c76959ec4f75dbbc3f0890ca1ba190c96079654b9edb578ea6d15bbc6b95aa48
 EBUILD netbeans-groovy-9999_p20151204.ebuild 3416 SHA256 bcbc7c377f32f00ab955a63efd419ebf142a331b2470150f929be102a9ee4716 SHA512 617678f7079f2c5e9f105632bd9175f808927489a0215d496fc788afc078ab1826b59d7e0643416cd91a4d6e5bd9ac487efe019b6eea85bddb9cde552dc5773f WHIRLPOOL 454912dfd9e2545b95240f1eee576d02d3c5de019cbd000350c367b3236f70412105c8e9412329353072d900fe5d2543ec691a02e7ba79d585f577de6325656b
+EBUILD netbeans-groovy-9999_p20151207.ebuild 3416 SHA256 88634cc16af83497755e56c5226c1c5ace9a3dd34813bf113b5e9f7f370c3e7d SHA512 cc64e85998d122bea6a2e63407df9c266bb739f7557be9925dd0f0607dd2fbb42b08385f5a7736f2ac7158d95e4bca7b51c85503d0e8a3b17499802183f95bf4 WHIRLPOOL b3f561142a832217b73f7d26e876236031fd7eb24ff9991dae2abd61cb02f081d31e9e1af4080a8b8aae750bf2b557ce2457dfc47098ee029b4720f6c49a065f
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20151207.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20151207.ebuild
new file mode 100644
index 0000000..798b2cb
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20151207.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-07_00-02-04/zip/netbeans-trunk-nightly-201512070002-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 9c8f82a..88cd887 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201512010002-src.zip 209149379 SHA256 9030cb0fd9a50b
 DIST netbeans-trunk-nightly-201512020002-src.zip 209149151 SHA256 4e95492815119f865a36948128503e0bbafe7ba46ec3a9d265fa8d65692890a2 SHA512 521444ba55da0d18b12483d5065978b6b90504ac73c65f7c14e982bdb6ad130b44da190fc05de971da9f33394a0cddd92fba01ab42483334148323671f5fbcc9 WHIRLPOOL 6631ae3b7e9cce61e051519de5855640554f44779a18d4ac1c86ad5db153b810e28d1a090d720d09b93254a8d35a5da8992ef2ef979c0e956520c1c800c224cd
 DIST netbeans-trunk-nightly-201512030002-src.zip 209171687 SHA256 d79cd2853d8d347e4b2d42daf178b21d60cef8fb0221292d599818482fa5b48a SHA512 eed19fadd98ac6d458ef187613ee6f0088d692adb9b1dde171b3e2daeb7d9a0975c97441e9a6053a8071d97f70d1a1f90296dd88ac98c92e9e67de3a905afefe WHIRLPOOL e8c370eb715e3996000e8fa44cfaae14bde4402fecb010237987c0139d60a7730e63455ca5ea179836bb417165fb675b2fd19ce3b2ff3f8863dc3e135ed8798a
 DIST netbeans-trunk-nightly-201512040002-src.zip 209178833 SHA256 9fbb70be4c026ac0ef12f1a44a361fdee99cce6234920c68b045526d00d4fd75 SHA512 90bc8fb97442a61215613021d27bd20e71e5b5ecd63ce41710d761f70faba8d4229ff6e5d023439070a62ad862e497b7f2e4b244e2b7b1183f55c217572b01ca WHIRLPOOL c231908df004a9e519e92827b36aaed93aca4a7802c8b85593c2849c94bfa422744fdb015ac38c07eeac56304443068b612f426fd5455c25b822f68ed8ad0bc1
+DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc64965bd5b8803c50b183bde52daab55dd4a4aa6c7b29bb624f83a SHA512 33072bd5bf9251678c2a28f7418e23569f2012d41c6b9518f3099f58abef39ef7da8285cfd3d96ae4dbb01258a4b6656d6bcc3ea26439eba3fb4b504ef61d761 WHIRLPOOL dac893869ef4aa8f582de77ce8d7117682a981e0e4f68156426eb41d31d2f0a55b08438979e9ad176efe0f86285d0af43ada75f34283a7deb40f56a8827d00fd
 EBUILD netbeans-harness-8.0.2.ebuild 4055 SHA256 2674d562adc57648c82cac9f714f74f9d29dd7b7ff7fa7f0ef37c43ef0975489 SHA512 7d72bed5b955b2365a4c11fcd97a2d6f2372ab939fb9a03b3ff7915053f24d695373c1aa154f6e6916d37ef3ace7b38864d575419460382760500576dae52e49 WHIRLPOOL 72f54a6cb83f282a75f0abb073109414a7b8bcd4e9263466281e68ff34148a7343ed3bd78ebdc8afd109b6b9f5b9f15bfd0e250f418fcaa4986a7c886b57b9f6
 EBUILD netbeans-harness-8.1.ebuild 4079 SHA256 116b90d6e6fd1b1ad8ce99c81104262a416a485b3a3110beed70e9381333cec2 SHA512 77ca4bbaf078adf6e13c0fea0a8e673262aaed60dd799ec161584589fb4c791d9bd758c87f4272297d863d3992b54a66b77b7bf05135cada530d111e1c428e68 WHIRLPOOL d385cd6292f31a5817a2c096f960330186a68242b51ed26e4272f33a690a98175e0b622a5d5309e1e6a72ff824662964785b7d235cf3a73ba4d715cd19e89dbb
 EBUILD netbeans-harness-9999_p20151101.ebuild 4125 SHA256 2f6a68f7628e7fc73a6f852e5e0d372e8f922d3d14d3aa510bd3654ad4f2ad1d SHA512 b4e74e591ca42f4129e56fd882ec31c620eb211553091451adab0f494cac91dd8bb81fb3895dc15886b523f4d018994b195ae30aa192f9c98aa885d1ccc33d69 WHIRLPOOL 3559903610cf06401108e6fbae3651ff2eea5b923317e0837413bf262b24938eafa13f2e0d8effe7b86d44362fe586d58575ff8eaf72996df240820cfa504e6f
@@ -66,4 +67,5 @@ EBUILD netbeans-harness-9999_p20151201.ebuild 4125 SHA256 93b4dfc89cf27f62e08a76
 EBUILD netbeans-harness-9999_p20151202.ebuild 4125 SHA256 8cd3e2ebb7d6300dbc359eed232ef0b20335465d1b0d2571a6f97bb36068eae2 SHA512 e97332c5227c47c177e17ebd5c249c4fe0f93c7ebef45894d2e0c1e15ef5752a25e742febb3a1c170eb661f9455f9e820345842881692f7996423c045216cacc WHIRLPOOL d3c89fd0bbd8a7deff861efceea142abe7d470f3671f31d14934b3039d5558cd4639defa8c4336279497dbe58be96ffda6ade4731005ac4f0ffbe46ab11cba35
 EBUILD netbeans-harness-9999_p20151203.ebuild 4125 SHA256 6a85243c2cfd2cac93a479cadd4bae7d6e9282491407deff4c48fee6549f7f79 SHA512 5e213e3fd4723b4a713abc35b650cd4175ebfa16f69b7531e06ab15c23698ab0a375d228a54f4295530358021ae5b144f77a47b98a6f58946afa5a6a353373ed WHIRLPOOL 2ac5fda35112fbd28698f9f67dd1ddea25524a0beb5b320003db262dc3999c864a712818ee6a632e3df66de97c269b478c174f3724196acf1038d71e49e1dc01
 EBUILD netbeans-harness-9999_p20151204.ebuild 4125 SHA256 62d55aa91e87e1c70b4312528d07dfc269141e92d7899369e3d6f97cf3766e0f SHA512 59cbc4a92536ee1fafefb99db91196574672e0b6a3f289f76ebc1a3152f63618c5da243120ed44f2f7953843f4739d7f4e6986fc107638f8849241f072c9454f WHIRLPOOL ec4fd2334bf565cea7f73ee69b983f439adb71532640890eb2cee943b82d9529ab3cf4e7d4684e00ec4df0389f78fad2f4479dc4312499402ce945689198a774
+EBUILD netbeans-harness-9999_p20151207.ebuild 4125 SHA256 68f32c6a67fbd8f1ff45a9099b8b3ead7444539caab2e9cee524e54f1f58ccb5 SHA512 634b123dea44d9f295f2cc7ece2d5f5f0c72e8ac0cf6a5e41a65bd94121ddb0fc6f38400cc2a07de5f8fe521fd5f857c08d5279f38a05a25efcd6fdb3fee499b WHIRLPOOL fc3ec5b8e96433238b3edf946c1fdd08761c9aed98239e1cd8593ddd1175b2295e0f93667088fbee94190c1b7d776a0416a84771db9e4354714bb9015622f68a
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20151207.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20151207.ebuild
new file mode 100644
index 0000000..502e719
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20151207.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-07_00-02-04/zip/netbeans-trunk-nightly-201512070002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
+	http://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar
+	http://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip
+	http://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip
+	http://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	dev-java/javahelp:0"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	>=dev-java/junit-4.4:4"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.harness -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar apisupport.harness/external/bindex-2.2.jar || die
+	ln -s "${DISTDIR}"/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar apisupport.harness/external/jnlp-servlet.jar || die
+	ln -s "${DISTDIR}"/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar jemmy/external/jemmy-2.3.1.1.jar || die
+	ln -s "${DISTDIR}"/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip jemmy/external/jemmy-2.3.1.1-doc.zip || die
+	ln -s "${DISTDIR}"/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip jemmy/external/jemmy-2.3.1.1-src.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into apisupport.harness/external javahelp jsearch.jar jsearch-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/harness >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/harness$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	fperms 755 launchers/app.sh
+	find "${D}" -name "*.exe" -type f -delete
+
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/antlib
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsearch-2.0_05.jar && dosym /usr/share/javahelp/lib/jsearch.jar ${instdir}/jsearch-2.0_05.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/harness
+}

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index d467ad5..78bbfde 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -150,6 +150,7 @@ DIST netbeans-trunk-nightly-201512010002-src.zip 209149379 SHA256 9030cb0fd9a50b
 DIST netbeans-trunk-nightly-201512020002-src.zip 209149151 SHA256 4e95492815119f865a36948128503e0bbafe7ba46ec3a9d265fa8d65692890a2 SHA512 521444ba55da0d18b12483d5065978b6b90504ac73c65f7c14e982bdb6ad130b44da190fc05de971da9f33394a0cddd92fba01ab42483334148323671f5fbcc9 WHIRLPOOL 6631ae3b7e9cce61e051519de5855640554f44779a18d4ac1c86ad5db153b810e28d1a090d720d09b93254a8d35a5da8992ef2ef979c0e956520c1c800c224cd
 DIST netbeans-trunk-nightly-201512030002-src.zip 209171687 SHA256 d79cd2853d8d347e4b2d42daf178b21d60cef8fb0221292d599818482fa5b48a SHA512 eed19fadd98ac6d458ef187613ee6f0088d692adb9b1dde171b3e2daeb7d9a0975c97441e9a6053a8071d97f70d1a1f90296dd88ac98c92e9e67de3a905afefe WHIRLPOOL e8c370eb715e3996000e8fa44cfaae14bde4402fecb010237987c0139d60a7730e63455ca5ea179836bb417165fb675b2fd19ce3b2ff3f8863dc3e135ed8798a
 DIST netbeans-trunk-nightly-201512040002-src.zip 209178833 SHA256 9fbb70be4c026ac0ef12f1a44a361fdee99cce6234920c68b045526d00d4fd75 SHA512 90bc8fb97442a61215613021d27bd20e71e5b5ecd63ce41710d761f70faba8d4229ff6e5d023439070a62ad862e497b7f2e4b244e2b7b1183f55c217572b01ca WHIRLPOOL c231908df004a9e519e92827b36aaed93aca4a7802c8b85593c2849c94bfa422744fdb015ac38c07eeac56304443068b612f426fd5455c25b822f68ed8ad0bc1
+DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc64965bd5b8803c50b183bde52daab55dd4a4aa6c7b29bb624f83a SHA512 33072bd5bf9251678c2a28f7418e23569f2012d41c6b9518f3099f58abef39ef7da8285cfd3d96ae4dbb01258a4b6656d6bcc3ea26439eba3fb4b504ef61d761 WHIRLPOOL dac893869ef4aa8f582de77ce8d7117682a981e0e4f68156426eb41d31d2f0a55b08438979e9ad176efe0f86285d0af43ada75f34283a7deb40f56a8827d00fd
 EBUILD netbeans-ide-8.0.2.ebuild 29317 SHA256 42218788ab0fc7c7cd1bb42a8b0c72a66543a3260b752aa55365833c355bcc63 SHA512 c712b66b6bee654390a45e5c616479df2be624bb770f3838d4fcce875f71a8d165703dffd55c4fd7d30e19c392784203e5fe01e2404907d88c935d439efaf578 WHIRLPOOL 67763e4a36215ac002fd321556ce2269affc15ba48ad5069d7ccc746d918179994f174e09305a9d9ddadddbea690778c2769e0ea1993eafc09e01580485e2292
 EBUILD netbeans-ide-8.1.ebuild 30288 SHA256 783332022c33a787ededc22d5250e30e1a91676508076fddc69ec64bbe5a6e7c SHA512 402d72f8b1a4e849dfe86054d466afeb0ab3987cd5ee747d3173874cd875fe3572be9e3ccd639fadf9e329db92e7543fd68dffc497805aa4d40b1d008c4a79ad WHIRLPOOL fd2cd798a1763af3fae44bb0eef0a4c4d932ffead6427e27d3483639348d969598b9c81d8949a3950ace1e68d3dfa0e08fe0c787b201b0cc9a95ea0040d156bf
 EBUILD netbeans-ide-9999_p20151101.ebuild 30334 SHA256 72a40468cc80008e8aaf6351b8f473e976e96e554b4c7d685874089571548d1a SHA512 bf57fd175dddb4f6590f011aff65af9464b48cdb5332f73b6e486d4dbd9e4d65f3bc65727493b47fad701f91b61e6b9d2435f419ee67e0977fe11ed378e84305 WHIRLPOOL 32c8b9f2887c68105b9cb19bb8c747efabfc9a89e9c28f763a37c5cb4e09e935f16aef6d078817ae3093adffe0e6986718c77e74b2ae51512d5cc30f73be2ee0
@@ -180,4 +181,5 @@ EBUILD netbeans-ide-9999_p20151201.ebuild 31270 SHA256 7303302ed5bae64ba02c0a6e6
 EBUILD netbeans-ide-9999_p20151202.ebuild 31348 SHA256 5e890e4715c5960d33b354e48c3149f2c81ee29a131fe49f9890e4f0d71fa394 SHA512 2daaa6d2a387f9356c964375fd976ccfb85be1e9cc4d7bf72474a75b11a0418fb7446d1eac4b4c9b79e0ac699d10265e10be4d2080951309974394df038de86f WHIRLPOOL 0e0739a8ea5485452f2dd87d8239bd199cc17406641fceff01012e3a1e2fa587520ebb5a3911ab2ce35b22e0a23b247eba9f0c60e0898b425da85ec9f3eb64e7
 EBUILD netbeans-ide-9999_p20151203.ebuild 30890 SHA256 ffa707e76fba78af941f6b185a858702704d7b7996af176208bd2213523eafbd SHA512 3492f1f043a4beb4129d88695fb1dc16a23a21d7823eea2c6bad58aa4320b28a9dd29f015a00caceaacf9e6f6801e14dc6ddfe0d510a6a0186765dd59e696327 WHIRLPOOL 2f647e5e8c3b7fa496ca398b4b998aabbc6fcb5ece1bac85e61d3d136ee9f83f43a51411c296710748de0702811474a41f390bcd87a14f00c68ff7da53f23c7b
 EBUILD netbeans-ide-9999_p20151204.ebuild 30890 SHA256 9732c676d4f448e5ee8c7795ec04487465b4bb172197ffbafe4d678678ce92c3 SHA512 a6cdc35c9c8d2bf7b26adcf7ca9c3cd90cea4677e1cde8bd7b852000b6f7eaaf838f75be4d5f629f06e1f378d1dd98c8021e55ab8c34e269dbd842640ef23520 WHIRLPOOL c0bb6a9be9a2dc69b335b50b42b952aa8ad0190b26362b69217521185dd2c6e585e1dcc7ffaa13d6fb629b23ec99467b2b9e277f2fb717511aceb8ffdf8fa475
+EBUILD netbeans-ide-9999_p20151207.ebuild 30890 SHA256 936670a38886b870408db0b76e6facbd72650acba1c266e8968f8b3c8157f82c SHA512 3bbd3607d00e0e408670e4160e421c2471e4f9d4fe2e12beb2a73e26a246f61b6f660d555369be32f3f33209257291179d56c1a3ff2d0221b9f6c13e577de03a WHIRLPOOL 9fb436d024c1146ff5e0f8f6e1e077d1e13fe2fc2a9b65bfcaea4bbdd8a5333cccce57ef427e322d1c3783119b505ac326f278c36d6b1b03a7e3fe84ed986a5f
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20151207.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20151207.ebuild
new file mode 100644
index 0000000..26f9ec5
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20151207.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-07_00-02-04/zip/netbeans-trunk-nightly-201512070002-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/F27BF427BE72709F3094BF76ECA8C5A2B9AC6DA9-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar
+	http://hg.netbeans.org/binaries/9BC512C5BB9A9F5276B9E8672F6B30AD0BD97D88-org.eclipse.core.jobs-3.5.101_nosignature.jar
+	http://hg.netbeans.org/binaries/105DC9A1A93E6EA9A6CD368AD12897B1F247D6AE-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar
+	http://hg.netbeans.org/binaries/E99C3C29A90F8AB29078A38CF8EBC3860249640C-org.eclipse.core.runtime-3.7.0_nosignature.jar
+	http://hg.netbeans.org/binaries/84FC6D443CD0816FA87093B6B7AD6876ADFC4207-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar
+	http://hg.netbeans.org/binaries/74069BFD03B2C66A9EBB4370C0B8064E3F5B6594-org.eclipse.equinox.app-1.3.100_nosignature.jar
+	http://hg.netbeans.org/binaries/A7953EEE9D4D7CD896C7D0AD6D21902E6259979B-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar
+	http://hg.netbeans.org/binaries/3FB169C95F095B70F05B96BE9496DA63FAE7F707-org.eclipse.equinox.preferences-3.4.2_nosignature.jar
+	http://hg.netbeans.org/binaries/CD5919A707EB6B5C1FC29964C8EF5E2CF3F5A3D4-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar
+	http://hg.netbeans.org/binaries/A4634373DC60650C49CC98AEA2090889F7ADC68F-org.eclipse.equinox.security-1.1.1_nosignature.jar
+	http://hg.netbeans.org/binaries/278049664FFA5447191BD5FE96B0B62B0CFD15D1-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar
+	http://hg.netbeans.org/binaries/9039A0C1FA0E56CB56A1A192908814478FA747C5-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}"/F27BF427BE72709F3094BF76ECA8C5A2B9AC6DA9-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}"/9BC512C5BB9A9F5276B9E8672F6B30AD0BD97D88-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}"/105DC9A1A93E6EA9A6CD368AD12897B1F247D6AE-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}"/E99C3C29A90F8AB29078A38CF8EBC3860249640C-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}"/84FC6D443CD0816FA87093B6B7AD6876ADFC4207-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}"/74069BFD03B2C66A9EBB4370C0B8064E3F5B6594-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}"/A7953EEE9D4D7CD896C7D0AD6D21902E6259979B-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}"/3FB169C95F095B70F05B96BE9496DA63FAE7F707-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}"/CD5919A707EB6B5C1FC29964C8EF5E2CF3F5A3D4-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}"/A4634373DC60650C49CC98AEA2090889F7ADC68F-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}"/278049664FFA5447191BD5FE96B0B62B0CFD15D1-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}"/9039A0C1FA0E56CB56A1A192908814478FA747C5-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit.java7/external/org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar || die
+	ln -s "${DISTDIR}"/8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar || die
+	ln -s "${DISTDIR}"/D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar || die
+	ln -s "${DISTDIR}"/4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar || die
+	ln -s "${DISTDIR}"/8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar o.eclipse.mylyn.commons.repositories.core/external/org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar || die
+	ln -s "${DISTDIR}"/50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar || die
+	ln -s "${DISTDIR}"/4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar || die
+	ln -s "${DISTDIR}"/11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.confluence.core/external/org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar || die
+	ln -s "${DISTDIR}"/3A7012C03E61CAF9539DAD8326659EB4CE3EA436-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143.jar || die
+	ln -s "${DISTDIR}"/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.textile.core/external/org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar || die
+	ln -s "${DISTDIR}"/8307A44D3F150F1BB317532097A0C7D125C00F2D-org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar || die
+	ln -s "${DISTDIR}"/6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar extexecution.process/external/processtreekiller-1.0.7.jar || die
+	ln -s "${DISTDIR}"/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar libs.svnClientAdapter.svnkit/external/svnkit_1.7.8.r9538_v20130107_2001.jar || die
+	ln -s "${DISTDIR}"/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar o.apache.xml.resolver/external/resolver-1.2.jar || die
+	ln -s "${DISTDIR}"/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar libs.svnClientAdapter.svnkit/external/sqljet-1.1.10.jar || die
+	ln -s "${DISTDIR}"/D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-javahl-1.10.3.jar || die
+	ln -s "${DISTDIR}"/2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.10.3.jar || die
+	ln -s "${DISTDIR}"/5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.10.3.jar || die
+	ln -s "${DISTDIR}"/24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.jar libs.svnClientAdapter.javahl/external/svnjavahl-1.8.4.jar || die
+	ln -s "${DISTDIR}"/3B91269E9055504778F57744D24F505856698602-svnkit-1.7.0-beta4-20120316.233307-1.jar libs.svnClientAdapter.svnkit/external/svnkit-1.7.0-beta4-20120316.233307-1.jar || die
+	ln -s "${DISTDIR}"/015525209A02BD74254930FF844C7C13498B7FB9-svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar libs.svnClientAdapter.svnkit/external/svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar || die
+	ln -s "${DISTDIR}"/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar libs.swingx/external/swingx-all-1.6.4.jar || die
+	ln -s "${DISTDIR}"/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar httpserver/external/tomcat-webserver-3.2.jar || die
+	ln -s "${DISTDIR}"/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar swing.validation/external/ValidationAPI.jar || die
+	ln -s "${DISTDIR}"/6FC6098C230D7CBA5730106D379CBBB42F6EC48A-validator.jar html.validation/external/validator.jar || die
+	ln -s "${DISTDIR}"/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar extexecution.process/external/winp-1.14-patched.jar || die
+	ln -s "${DISTDIR}"/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar o.apache.xmlrpc/external/xmlrpc-client-3.0.jar || die
+	ln -s "${DISTDIR}"/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar o.apache.xmlrpc/external/xmlrpc-common-3.0.jar || die
+	ln -s "${DISTDIR}"/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar o.apache.xmlrpc/external/xmlrpc-server-3.0.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	popd >/dev/null || die
+
+	java-pkg_jar-from --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.53.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar
+	java-pkg_jar-from --build-only --into db.sql.visualeditor/external javacc javacc.jar javacc-3.2.jar
+	java-pkg_jar-from --into html.parser/external icu4j-4.4 icu4j.jar icu4j-4_4_2.jar
+	java-pkg_jar-from --into html.validation/external iso-relax isorelax.jar isorelax.jar
+	java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar
+	java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar
+	java-pkg_jar-from --into libs.commons_compress/external commons-compress commons-compress.jar commons-compress-1.8.1.jar
+	# java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.19.jar
+	java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
+	java-pkg_jar-from --into libs.lucene/external lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
+	java-pkg_jar-from --into libs.smack/external smack-2.2 smack.jar smack.jar
+	java-pkg_jar-from --into libs.smack/external smack-2.2 smackx.jar smackx.jar
+	# java-pkg_jar-from --into libs.svnClientAdapter.javahl/external subversion svn-javahl.jar svnjavahl-1.8.4.jar
+	java-pkg_jar-from --into libs.xerces/external xerces-2 xercesImpl.jar xerces-2.8.0.jar
+	java-pkg_jar-from --build-only --into o.apache.commons.codec/external commons-codec commons-codec.jar apache-commons-codec-1.3.jar
+	java-pkg_jar-from --into o.apache.commons.httpclient/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.1.jar
+	java-pkg_jar-from --into o.apache.commons.logging/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
+	java-pkg_jar-from --into o.apache.ws.commons.util/external ws-commons-util ws-commons-util.jar ws-commons-util-1.0.1.jar
+	java-pkg_jar-from --into servletapi/external tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
+	java-pkg_jar-from --into xml.jaxb.api/external sun-jaf activation.jar activation.jar
+	java-pkg_jar-from --into xml.jaxb.api/external jsr173 jsr173.jar jsr173_1.0_api.jar
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	unset DISPLAY
+	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+	pushd nbbuild/netbeans/ide >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/ide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	rm -fr "${D}"/${INSTALL_DIR}/bin/nativeexecution || die
+	rm -fr "${D}"/${INSTALL_DIR}/modules/lib || die
+
+	insinto ${INSTALL_DIR}/bin/nativeexecution
+	doins bin/nativeexecution/*
+
+	pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution >/dev/null || die
+	for file in *.sh ; do
+		fperms 755 ${file}
+	done
+	popd >/dev/null || die
+
+	if use x86 ; then
+		doins -r bin/nativeexecution/Linux-x86
+		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86 >/dev/null || die
+		for file in * ; do
+			fperms 755 ${file}
+		done
+		popd >/dev/null || die
+	elif use amd64 ; then
+		doins -r bin/nativeexecution/Linux-x86_64
+		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86_64 >/dev/null || die
+		for file in * ; do
+			fperms 755 ${file}
+		done
+		popd >/dev/null || die
+	fi
+
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm com-jcraft-jsch.jar && dosym /usr/share/jsch/lib/jsch.jar ${instdir}/com-jcraft-jsch.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-compress-1.8.1.jar && dosym /usr/share/commons-compress/lib/commons-compress.jar ${instdir}/commons-compress-1.8.1.jar || die
+	# rm freemarker-2.3.19.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.19.jar || die
+	rm icu4j-4_4_2.jar && dosym /usr/share/icu4j-4.4/lib/icu4j.jar ${instdir}/icu4j-4_4_2.jar || die
+	rm isorelax.jar && dosym /usr/share/iso-relax/lib/isorelax.jar ${instdir}/isorelax.jar || die
+	rm json-simple-1.1.1.jar && dosym /usr/share/json-simple/lib/json-simple.jar ${instdir}/json-simple-1.1.1.jar || die
+	rm jvyamlb-0.2.7.jar && dosym /usr/share/jvyamlb/lib/jvyamlb.jar ${instdir}/jvyamlb-0.2.7.jar || die
+	rm log4j-1.2.15.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.15.jar || die
+	rm lucene-core-3.5.0.jar && dosym /usr/share/lucene-3.5/lib/lucene-core.jar ${instdir}/lucene-core-3.5.0.jar || die
+	rm mysql-connector-java-5.1.23-bin.jar && dosym /usr/share/jdbc-mysql/lib/jdbc-mysql.jar ${instdir}/mysql-connector-java-5.1.23-bin.jar || die
+	rm postgresql-9.2-1002.jdbc4.jar && dosym /usr/share/jdbc-postgresql/lib/jdbc-postgresql.jar ${instdir}/postgresql-9.2-1002.jdbc4.jar || die
+	rm saxon9B.jar && dosym /usr/share/saxon-9/lib/saxon.jar ${instdir}/saxon9B.jar || die
+	rm servlet-2.2.jar && dosym /usr/share/tomcat-servlet-api-2.2/lib/servlet.jar ${instdir}/servlet-2.2.jar || die
+	rm smack.jar && dosym /usr/share/smack-2.2/lib/smack.jar ${instdir}/smack.jar || die
+	rm smackx.jar && dosym /usr/share/smack-2.2/lib/smackx.jar ${instdir}/smackx.jar || die
+	# rm svnjavahl.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl.jar || die
+	rm xerces-2.8.0.jar && dosym /usr/share/xerces-2/lib/xercesImpl.jar ${instdir}/xerces-2.8.0.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxb
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm activation.jar && dosym /usr/share/sun-jaf/lib/activation.jar ${instdir}/activation.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxb/api
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsr173_1.0_api.jar && dosym /usr/share/jsr173/lib/jsr173.jar ${instdir}/jsr173_1.0_api.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ide
+}

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index b8310f1..0c26430 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -4,8 +4,10 @@ DIST 2B9EAB164D8748F9793F6A0D29B6463E97B284DA-indexer-core-5.1.1.jar 227233 SHA2
 DIST 3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar 45718 SHA256 18a77f915276751b01ed8e7feaf344e78f5ea62bf53b7bb6a821a22865165044 SHA512 1abad0ebdb35d8fd4eec1350ac497cc6a372239aea9eb6c45a94265f46e4e5c2458fe5e4d0e1e067effc9ba8629451abf169bb4820274484f9c2404271b21727 WHIRLPOOL 7aeb90a8661d8eaa2ee2a5953932e3b829187554bf605bb5e55abb42edb82ff13a6e4b4acb8f3615a74961f044ebaf19343e3d403a476a019890cadeead73dd5
 DIST 562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar 23838 SHA256 0c05ac203cfc63f1a6d59dea84d915220e18e8e37a57cfbb317e769f992f3e8f SHA512 a39da963b1e0c0111870bc3989e10c70dd136c0276099b48cadc70706f76b0b2ba1ece6df67c05bf8e26a4638b19b28b454df6c23ed5a9d4936d3cc5506ec4b1 WHIRLPOOL 88043adc7057b68647d9205782e46a2d7824533b9a46366e7949459e88fd2ac7be6dcd1bc1c7371e071c7efc5fcf6d3956c211f97932cee0e0a4f47c58db6983
 DIST 5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar 162126 SHA256 227c4888011550cad0aed4c07e187b9f8e873c01558a08f014d288987415a9a9 SHA512 de26d1e19a625adb040b6aa870762ecf8f1ffdfb2c82f58cc7a82f1a029249862dcfd39b6a995f63f04d9b36ef23a8ba8518c9cff1b5e2242e6ad5268790b5ba WHIRLPOOL 20dff7b96369cda98dace4dc38f7e013de9ccf7119047183f936bd58e1d8c6154fa913f906dd1996d8e989d16a4e92502aacf937f730a8b63728208b96455a7f
+DIST 5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar 187846 SHA256 40a7cdedd5a9724b07dadfb3e4e8cc71d6117052f59f13badd1bbf60370e45fd SHA512 548dcb27bc8aa61f17573e0e9896c361466a5d226b8e6b0d5f9a0181d17ce61ad5d137caa268c33da17e8541978427c3faa34be99d96817d09f22277f99dfda2 WHIRLPOOL 4cc8b27be4c5c9715b4103b7022290f9b84a554070de088035a1b80024c5540a456b04a3a80902ff345b1aa5d5b200157b3016b6023e7b62b6a0b1c80caa481f
 DIST 61EFAA681DB4565984F8FB85AA95CCA5F7CE88D1-nb-javac-impl.jar 2766903 SHA256 b0000d2aa1948aa9039bec0be29b546ef25fefd59ac5c6fb2733fad4ff4b17d5 SHA512 bf2cf4ac9687a6d6be0a2672a7efcca48838860084f32d5b0fc519e60aa9738de9fcf431c5ad580256f5f3bb8da65fd8c6f5598b006433a40f199a5151c72405 WHIRLPOOL 87f3a6b70f4336d58176cb91ed44ed10989ad7a0954f0642e6f2f411c59884187b5f94c61c87d5f9ace47144e8016fff27b897a14d40de7a597e574993fc3114
 DIST 694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip 5870668 SHA256 91370093a4dcf8fc434f06039da0ca1a359530c665da110a97e0e2fe3ea84028 SHA512 49a0854318678ec52641babca57bbf57ce8d67825dc9b0565df77b8fc6bc90a2b02a3ace7dce737de49de2eb7d1f2885ca901350e8826a63c4dd5381f03fcaa6 WHIRLPOOL afbd6831d26e66b9a318e2ed060b2147a51493be68ec8c97ebaa6b38808bf55d52ad54ad20f520299d471cd461bcfcd70a48142035a51ed9732c37c075f3a970
+DIST 700901A0DEADED8B0CB89B6B3DFE3F52B030C061-nb-javac-impl.jar 3035973 SHA256 d1b1d900d968cbb8ef4fb757fb65d767aa3085c260830f413b96d6e0a642af67 SHA512 88f1081b37edfb811a2c87069e13fff6310540a33c052c3ebcf042758d2f04db02c57a438ce8f330d3ba49821ccc7183486a0a69f3a93d94bb7accb6c8501ad0 WHIRLPOOL 2265f53a16fcf136ae88e67445b20768ce2ef6ce0eab08d142978bf9d7bcd275b0f1d62329b9051fd77ba667a0178554e5d4dc1617397cb0fd6b639db6c00fbd
 DIST 7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip 5678488 SHA256 368284af56e08cbd0c4a696663ce6f484eeddf4d710a14066da470ac9ee2709b SHA512 d49f22b3ce2bd49f3ddfc35f86c0c21accd45a07b710b0787560b9969e40700d408a25e8e02d10f0d937ce642cbcab222d4e8fa28bd442e34c768b63e5583b41 WHIRLPOOL ec07b768abdbe9aa8608c36aa6bb4641dc18bdfd21d93974f82ddb9074b1f03da17fd043a6bfbfb98a8715c8ba16b5fc2585e9b0d47119a6573fb0b446ae9487
 DIST 839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar 136324 SHA256 3f74c7c7b9c924769cf3c5b4d52d21aa63e9a2ccbf16f5d26c30ebb31b99699d SHA512 c75746a1b82ef2c7ae13a33f06ec82292934e4348ead4a57d0e6b356ba79903e4658d031dd347e1e2c627288de6585c125a70e0f1d47a696db1eb967cbc36da3 WHIRLPOOL e34c8337c9cf7f43d8d219471b12beca1c7cf2bf9a310ee2dce49fc35bf819d47bbeb92ffeb7bf45bca640a987ce8d5337505938b44e83537a078478d8737f79
 DIST 84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip 4599034 SHA256 0a4a0c3e24bfe028a7741950347086e5aa49d8ed1fa59cff5c74c23f28bf8685 SHA512 5058624cadecf56182afe021b94b4ef10375b217000155a30d6f16d24286e985d472deaf47271a8239c15b5941a412b58c918e5f0684f5045690be322e0acc5d WHIRLPOOL 4258ce692b381cabe0b2e345c99f0a0e6bba7e5ee7eeef2604bb1bf686d549199a270fbe9d380197d5ede660da20269fe2ec75bdb01950dd0e71b73ba096ea50
@@ -63,6 +65,7 @@ DIST netbeans-trunk-nightly-201512010002-src.zip 209149379 SHA256 9030cb0fd9a50b
 DIST netbeans-trunk-nightly-201512020002-src.zip 209149151 SHA256 4e95492815119f865a36948128503e0bbafe7ba46ec3a9d265fa8d65692890a2 SHA512 521444ba55da0d18b12483d5065978b6b90504ac73c65f7c14e982bdb6ad130b44da190fc05de971da9f33394a0cddd92fba01ab42483334148323671f5fbcc9 WHIRLPOOL 6631ae3b7e9cce61e051519de5855640554f44779a18d4ac1c86ad5db153b810e28d1a090d720d09b93254a8d35a5da8992ef2ef979c0e956520c1c800c224cd
 DIST netbeans-trunk-nightly-201512030002-src.zip 209171687 SHA256 d79cd2853d8d347e4b2d42daf178b21d60cef8fb0221292d599818482fa5b48a SHA512 eed19fadd98ac6d458ef187613ee6f0088d692adb9b1dde171b3e2daeb7d9a0975c97441e9a6053a8071d97f70d1a1f90296dd88ac98c92e9e67de3a905afefe WHIRLPOOL e8c370eb715e3996000e8fa44cfaae14bde4402fecb010237987c0139d60a7730e63455ca5ea179836bb417165fb675b2fd19ce3b2ff3f8863dc3e135ed8798a
 DIST netbeans-trunk-nightly-201512040002-src.zip 209178833 SHA256 9fbb70be4c026ac0ef12f1a44a361fdee99cce6234920c68b045526d00d4fd75 SHA512 90bc8fb97442a61215613021d27bd20e71e5b5ecd63ce41710d761f70faba8d4229ff6e5d023439070a62ad862e497b7f2e4b244e2b7b1183f55c217572b01ca WHIRLPOOL c231908df004a9e519e92827b36aaed93aca4a7802c8b85593c2849c94bfa422744fdb015ac38c07eeac56304443068b612f426fd5455c25b822f68ed8ad0bc1
+DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc64965bd5b8803c50b183bde52daab55dd4a4aa6c7b29bb624f83a SHA512 33072bd5bf9251678c2a28f7418e23569f2012d41c6b9518f3099f58abef39ef7da8285cfd3d96ae4dbb01258a4b6656d6bcc3ea26439eba3fb4b504ef61d761 WHIRLPOOL dac893869ef4aa8f582de77ce8d7117682a981e0e4f68156426eb41d31d2f0a55b08438979e9ad176efe0f86285d0af43ada75f34283a7deb40f56a8827d00fd
 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
@@ -95,4 +98,5 @@ EBUILD netbeans-java-9999_p20151201.ebuild 14977 SHA256 7f2291c572530a1e168a894b
 EBUILD netbeans-java-9999_p20151202.ebuild 14978 SHA256 bec55001726d99f29df8abede23acc33a4e66a620f17eef6caf0e7015fd5c0e9 SHA512 5b5b57dc743131eb3dabb815de5987471918fdd07678c0f6539ba177b0687edbf03c69b2666061a9e966175f246af21831d78677c1d9874a253e273592b223d9 WHIRLPOOL 6341ce285cdf901d5e011609f91f6f1b23ac78be0739861aaa28d1f33d496e700431c161b509dafaabbe5a168592ca8f0f525e694c437b7bba3e4532422d190b
 EBUILD netbeans-java-9999_p20151203.ebuild 14978 SHA256 79ffb05a5b73d277f55f9639b6e178b1258b7a466de49a76252855c5b4a317c4 SHA512 c5476313181e1ecb908b86e9ed4a9ac715cff46fdd20ef7fe446733d7d87d693a4947580db2ee1716fc61ad739e47ee4834cdcc7ee30740e91bbfa774b703db0 WHIRLPOOL afad5bb37d1a08c506125693fc6cbcb474caf7960dbb030285fbd954e9a28ec31f8ef812d807c83ee6870b76745982c374467bc456dab3610ef5eef5ba0064c9
 EBUILD netbeans-java-9999_p20151204.ebuild 14978 SHA256 65803bc69a463790a2b8d0de2cb81861f0d61f686e97e25ca14cd86b8ac20b9a SHA512 7be75cbe682bcc31f06c5f67ae0e7d70f8888fc8651e6b92d7fc47a7b71d76d655691a8c124badcf266b16f154d8ba74286118e6781432f4e7a67e8f07a00325 WHIRLPOOL f03f368a870348df389784f2f9da48e5dabc523180deec8a8efe0843cb0a15ee8c853de39c6a3230f92dbf49b051b88fac068e49ad63f399a0dba44e3be33c84
+EBUILD netbeans-java-9999_p20151207.ebuild 14983 SHA256 30efff019e9294fdb6487ad24cebee757c1b89b375540b3822cb5ffcff851c2e SHA512 1ae68e5897d14fc591e6cd1a4530dab3f2042db90840c12b369929078eff0be45b85ebf712df594293b6f8f698a12344c439f06ac86e5668074177ef1253278b WHIRLPOOL 92d8c027b9c8bb502e94f8ebd0efbf5212609250965ff6b9f1f70a098c762ad81af5f815039849d95ae23c816527e3b1089ee8ca4c25f9e7a85516ebd1dcb777
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20151207.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20151207.ebuild
new file mode 100644
index 0000000..de77c7c
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20151207.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-07_00-02-04/zip/netbeans-trunk-nightly-201512070002-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/700901A0DEADED8B0CB89B6B3DFE3F52B030C061-nb-javac-impl.jar
+	http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
+	http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar
+	http://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip
+	http://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip
+	http://hg.netbeans.org/binaries/B572007A07023ADF7ECBDB7FC2D572BF1BDED20D-wagon-http-2.8-shaded.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/beansbinding:0
+	dev-java/cglib:3
+	dev-java/jdom:0"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	dev-java/json-simple:0
+	dev-java/junit:4"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}
+	dev-java/absolutelayout:0
+	>=dev-java/antlr-2.7.7-r7:0
+	dev-java/c3p0:0
+	dev-java/commons-cli:1
+	dev-java/commons-collections:0
+	dev-java/dom4j:1
+	dev-java/fastinfoset:0
+	dev-java/glassfish-transaction-api:0
+	dev-java/javassist:3
+	dev-java/jboss-logging:0
+	dev-java/jsr67:0
+	dev-java/jsr181:0
+	dev-java/jtidy:0
+	dev-java/log4j:0
+	dev-java/mimepull:0
+	dev-java/oracle-javamail:0
+	dev-java/saaj:0
+	dev-java/slf4j-api:0
+	dev-java/slf4j-log4j12:0
+	dev-java/slf4j-simple:0
+	dev-java/stax-ex:0
+	dev-java/stax2-api:0
+	dev-java/xmlstreambuffer:0"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.java -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+pkg_pretend() {
+	local die_now=""
+
+	if [ -d /usr/share/netbeans-java-${SLOT}/ant ]; then
+		if [ -n "$(find /usr/share/netbeans-java-${SLOT}/ant -type l)" ]; then
+			eerror "Please remove following symlinks and run emerge again:"
+			find /usr/share/netbeans-java-${SLOT}/ant -type l
+			die_now="1"
+		fi
+	fi
+
+	if [ -L /usr/share/netbeans-java-${SLOT}/maven ]; then
+		if [ -z "${die_now}" ]; then
+			eerror "Please remove following symlinks and run emerge again:"
+		fi
+
+		echo "/usr/share/netbeans-java-${SLOT}/maven"
+		die_now="1"
+	fi
+
+	if [ -n "${die_now}" ]; then
+		die "Symlinks exist"
+	fi
+}
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar maven/external/aether-api-1.0.2.v20150114.jar || die
+	ln -s "${DISTDIR}"/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip maven.embedder/external/apache-maven-3.0.5-bin.zip || die
+	ln -s "${DISTDIR}"/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip o.jdesktop.beansbinding/external/beansbinding-1.2.1-doc.zip || die
+	ln -s "${DISTDIR}"/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar j2ee.eclipselink/external/eclipselink.jar || die
+	ln -s "${DISTDIR}"/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip hibernate4lib/external/hibernate-release-4.3.1-lib.zip || die
+	ln -s "${DISTDIR}"/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar maven.indexer/external/indexer-artifact-5.1.1.jar || die
+	ln -s "${DISTDIR}"/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar maven.indexer/external/indexer-core-5.1.1-patched.jar || die
+	ln -s "${DISTDIR}"/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar maven/external/jarjar-1.4.jar || die
+	ln -s "${DISTDIR}"/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar j2ee.eclipselink/external/javax.persistence_2.1.0.v201304241213.jar || die
+	ln -s "${DISTDIR}"/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip websvc.jaxws21/external/jaxws-2.2.6.zip || die
+	ln -s "${DISTDIR}"/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip websvc.jaxws21api/external/jaxws-2.2.6-api.zip || die
+	ln -s "${DISTDIR}"/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip websvc.jaxws21/external/jaxws-api-doc.zip || die
+	ln -s "${DISTDIR}"/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip j2ee.eclipselink/external/JPAjavadocs04032013.zip || die
+	ln -s "${DISTDIR}"/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar maven.indexer/external/lucene-core-3.6.2.jar || die
+	ln -s "${DISTDIR}"/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar maven.indexer/external/lucene-highlighter-3.6.2.jar || die
+	ln -s "${DISTDIR}"/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar maven.embedder/external/maven-dependency-tree-2.0.jar || die
+	ln -s "${DISTDIR}"/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
+	ln -s "${DISTDIR}"/700901A0DEADED8B0CB89B6B3DFE3F52B030C061-nb-javac-impl.jar libs.javacimpl/external/nb-javac-impl.jar || die
+	ln -s "${DISTDIR}"/CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.jar maven/external/netbeans-cos.jar || die
+	ln -s "${DISTDIR}"/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselink/external/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar || die
+	ln -s "${DISTDIR}"/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselinkmodelgen/external/org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar || die
+	ln -s "${DISTDIR}"/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip libs.springframework/external/spring-framework-3.2.7.RELEASE.zip || die
+	ln -s "${DISTDIR}"/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip libs.springframework/external/spring-framework-4.0.1.RELEASE.zip || die
+	ln -s "${DISTDIR}"/B572007A07023ADF7ECBDB7FC2D572BF1BDED20D-wagon-http-2.8-shaded.jar maven.embedder/external/wagon-http-2.8-shaded.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.cglib/external cglib-3 cglib.jar cglib-2.2.jar
+	java-pkg_jar-from --build-only --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+	java-pkg_jar-from --into maven.embedder/external jdom jdom.jar jdom-1.0.jar
+	java-pkg_jar-from --into o.jdesktop.beansbinding/external beansbinding beansbinding.jar beansbinding-1.2.1.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/java >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+	grep -E "/java$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	chmod 755 "${D}"/${INSTALL_DIR}/maven/bin/mvn* || die
+	rm -fr "${D}"/${INSTALL_DIR}/maven/bin/*.bat || die
+
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/maven/lib
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-cli-1.2.jar && dosym /usr/share/commons-cli-1/lib/commons-cli.jar ${instdir}/commons-cli-1.2.jar || die
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm AbsoluteLayout.jar  && dosym /usr/share/absolutelayout/lib/absolutelayout.jar ${instdir}/AbsoluteLayout.jar || die
+	rm beansbinding-1.2.1.jar && dosym /usr/share/beansbinding/lib/beansbinding.jar ${instdir}/beansbinding-1.2.1.jar || die
+	rm cglib-2.2.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/hibernate4
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm antlr-2.7.7.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.7.jar || die
+	rm c3p0-0.9.2.1.jar && dosym /usr/share/c3p0/lib/c3p0.jar ${instdir}/c3p0-0.9.2.1.jar || die
+	rm cglib-2.2.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
+	rm commons-collections-3.2.1.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections-3.2.1.jar || die
+	rm dom4j-1.6.1.jar && dosym /usr/share/dom4j-1/lib/dom4j.jar ${instdir}/dom4j-1.6.1.jar || die
+	rm javassist-3.18.1-GA.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist-3.18.1-GA.jar || die
+	rm jboss-logging-3.1.3.GA.jar && dosym /usr/share/jboss-logging/lib/jboss-logging.jar ${instdir}/jboss-logging-3.1.3.GA.jar || die
+	rm jboss-transaction-api_1.2_spec-1.0.0.Final.jar && dosym /usr/share/glassfish-transaction-api/lib/jta.jar ${instdir}/jboss-transaction-api_1.2_spec-1.0.0.Final.jar || die
+	rm jtidy-r8-20060801.jar && dosym /usr/share/jtidy/lib/jtidy.jar ${instdir}/jtidy-r8-20060801.jar || die
+	rm log4j-1.2.12.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.12.jar || die
+	rm slf4j-api-1.6.1.jar && dosym /usr/share/slf4j-api/lib/slf4j-api.jar ${instdir}/slf4j-api-1.6.1.jar || die
+	rm slf4j-log4j12-1.6.1.jar && dosym /usr/share/slf4j-log4j12/lib/slf4j-log4j12.jar ${instdir}/slf4j-log4j12-1.6.1.jar || die
+	rm slf4j-simple-1.6.1.jar && dosym /usr/share/slf4j-simple/lib/slf4j-simple.jar ${instdir}/slf4j-simple-1.6.1.jar || die
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/modules/ext/jaxws22
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm FastInfoset.jar && dosym /usr/share/fastinfoset/lib/fastinfoset.jar ${instdir}/FastInfoset.jar || die
+	rm javax.mail_1.4.jar && dosym /usr/share/oracle-javamail/lib/mail.jar ${instdir}/javax.mail_1.4.jar || die
+	rm mimepull.jar && dosym /usr/share/mimepull/lib/mimepull.jar ${instdir}/mimepull.jar || die
+	rm saaj-impl.jar && dosym /usr/share/saaj/lib/saaj.jar ${instdir}/saaj-impl.jar || die
+	rm stax-ex.jar && dosym /usr/share/stax-ex/lib/stax-ex.jar ${instdir}/stax-ex.jar || die
+	rm stax2-api.jar && dosym /usr/share/stax2-api/lib/stax2-api.jar ${instdir}/stax2-api.jar || die
+	rm streambuffer.jar && dosym /usr/share/xmlstreambuffer/lib/xmlstreambuffer.jar ${instdir}/streambuffer.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxws22/api
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
+	rm saaj-api.jar && dosym /usr/share/jsr67/lib/jsr67.jar ${instdir}/saaj-api.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/maven
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jdom-1.0.jar && dosym /usr/share/jdom/lib/jdom.jar ${instdir}/jdom-1.0.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java
+}

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index f94bf00..5911999 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201512010002-src.zip 209149379 SHA256 9030cb0fd9a50b
 DIST netbeans-trunk-nightly-201512020002-src.zip 209149151 SHA256 4e95492815119f865a36948128503e0bbafe7ba46ec3a9d265fa8d65692890a2 SHA512 521444ba55da0d18b12483d5065978b6b90504ac73c65f7c14e982bdb6ad130b44da190fc05de971da9f33394a0cddd92fba01ab42483334148323671f5fbcc9 WHIRLPOOL 6631ae3b7e9cce61e051519de5855640554f44779a18d4ac1c86ad5db153b810e28d1a090d720d09b93254a8d35a5da8992ef2ef979c0e956520c1c800c224cd
 DIST netbeans-trunk-nightly-201512030002-src.zip 209171687 SHA256 d79cd2853d8d347e4b2d42daf178b21d60cef8fb0221292d599818482fa5b48a SHA512 eed19fadd98ac6d458ef187613ee6f0088d692adb9b1dde171b3e2daeb7d9a0975c97441e9a6053a8071d97f70d1a1f90296dd88ac98c92e9e67de3a905afefe WHIRLPOOL e8c370eb715e3996000e8fa44cfaae14bde4402fecb010237987c0139d60a7730e63455ca5ea179836bb417165fb675b2fd19ce3b2ff3f8863dc3e135ed8798a
 DIST netbeans-trunk-nightly-201512040002-src.zip 209178833 SHA256 9fbb70be4c026ac0ef12f1a44a361fdee99cce6234920c68b045526d00d4fd75 SHA512 90bc8fb97442a61215613021d27bd20e71e5b5ecd63ce41710d761f70faba8d4229ff6e5d023439070a62ad862e497b7f2e4b244e2b7b1183f55c217572b01ca WHIRLPOOL c231908df004a9e519e92827b36aaed93aca4a7802c8b85593c2849c94bfa422744fdb015ac38c07eeac56304443068b612f426fd5455c25b822f68ed8ad0bc1
+DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc64965bd5b8803c50b183bde52daab55dd4a4aa6c7b29bb624f83a SHA512 33072bd5bf9251678c2a28f7418e23569f2012d41c6b9518f3099f58abef39ef7da8285cfd3d96ae4dbb01258a4b6656d6bcc3ea26439eba3fb4b504ef61d761 WHIRLPOOL dac893869ef4aa8f582de77ce8d7117682a981e0e4f68156426eb41d31d2f0a55b08438979e9ad176efe0f86285d0af43ada75f34283a7deb40f56a8827d00fd
 EBUILD netbeans-javacard-8.0.2.ebuild 4906 SHA256 944fee40d693c2c287e748f70ba565f3cd84bb7c19110f8be716134ec20694a7 SHA512 1f66cd2756effbfde7d43f9da7d8d93cb6252c58a02ee3d821f6faeaf63bf3c63e28f80c6eb44689e3aa954452a2f3893c65e75de84158dff1da0d94cafea14a WHIRLPOOL 88197e03008b8acb1ce62f72783bb096d9a3fc2a289b83367841a8adbee2bf822031f9bd6051831515ee44b1d5d2a109c5646f98ca723506f27c874301fb4189
 EBUILD netbeans-javacard-8.1.ebuild 4930 SHA256 5342d0d3f4207da3d36eb19f0fa78015f33b4a6e6435fcf43b7f568afabb9d02 SHA512 5275ae0fd617e26cd8580f6256a766bdd9cc0299f5a488be5a97744ec6abddf262e5fb1db358b9ac00203bbedfe7ac152828b174856d9cf6fa06e1e2128e219b WHIRLPOOL 427bfed5b61a421340acf7ec0cfb5e88a8b4a68cb546b9d0546b7c69ab0e29700d03e2bf58641bde63a2a43579b0521c028cf57dbf25af280fb0732565a30617
 EBUILD netbeans-javacard-9999_p20151101.ebuild 4976 SHA256 74dfe35637320661d3f26c0de6a0459e67abb6c79754fa85213ed2ad9eac872a SHA512 fe707726a2a25f8e85509246facaddabc57d540f7971971714f3a1c5ea9ddca59c14f7211103d227b3b27f3d05f50c03cc132f587ecaed26ced0bf1416be4b72 WHIRLPOOL 7f194c4f154b65f110be8f9ef230c7cfc1a308361573dd576e8d7a0765f12d72130fddcb564b25da92f0c077764710c6d9a4731428aacd6d18e8ac80630d7cfa
@@ -64,4 +65,5 @@ EBUILD netbeans-javacard-9999_p20151201.ebuild 4976 SHA256 7d09384ad6388668ae67e
 EBUILD netbeans-javacard-9999_p20151202.ebuild 4976 SHA256 7b2de33eba365dea61e1645ff46d7042093ef9648fbe367d5421204bb1796287 SHA512 5a5eee7c332412e968d4253589827b82eb3cbce6c71c56d07aa1c5c04f09646ef3ba444ad3ecec95bfc8b4d0b497bd7b663337dd831ee424f0de5ac4fca75ac4 WHIRLPOOL 8160dc66c42998c37920a42050a8d06da285588cbbcef1928feeb16b0de2893fb5bc87e1295eed35f73c8659f928a6b5a611bab6d2c681cfd403123eb8520094
 EBUILD netbeans-javacard-9999_p20151203.ebuild 4976 SHA256 1116148261dbe80f672b609727e5562d7bad37b860947ceb3edf1593a8af8a82 SHA512 404d56272edf16dbfd8b3807bc235f4e744774b137731f1ab3068ec4b3c2e514f11a0f0e46aab9706de148aa5bf622a4d23c0e4e0089bdaf383a60126bd4dfd3 WHIRLPOOL d17ebaed0a8ccdf34cc970b5c73a2f95b7951d36be51eeab27aa6153a8235a68571e6b4512c8507a58c3781b916091bc9a6f77e2835f0b7fcec4bf51e4063658
 EBUILD netbeans-javacard-9999_p20151204.ebuild 4976 SHA256 b6a55692327e63f53e1a8a26cca5df10eb6660946835ef65276ec3cab4f3448a SHA512 00727c8b13e7529032ac60d1c804f89509a8dab7202e61b27a5e7b73c5ed52036b4d9389e17a73d8998f152e331abeaf6e0da0ea83f9478f4a8c30ec5c1b42b9 WHIRLPOOL 0e8fc0defb09b2304d40bd4add6242b6ea2f3d890d7e2fa4af4bb26f3bc7f26778bc257c290375b4081e933e1387ff769778aec54357ebcf321a3d0169e33b00
+EBUILD netbeans-javacard-9999_p20151207.ebuild 4976 SHA256 7a2801f10de550be0f3bef976fa94fd86b8ed01eed31c76d0e954572174dd0a1 SHA512 afd95d1b829f39069c52cfa9f05533d163b1d0b9fd37b01c76917963df0ca45975fe8c5ae8f5d3a13426c391fb74c65a9c7c3f7668830aa37b1ced6c71710123 WHIRLPOOL 5be8de66a1bddbfec7a66d2596ea0eba0cb12cf56b7a5f672e3da4c40b3ed9e2d44568a9b9cadcccd3465c2001c4b45410c2cff15cf47998451143bf536a5580
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20151207.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20151207.ebuild
new file mode 100644
index 0000000..6a73354
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20151207.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-07_00-02-04/zip/netbeans-trunk-nightly-201512070002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar
+	http://hg.netbeans.org/binaries/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar
+	http://hg.netbeans.org/binaries/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}
+	dev-java/ant-contrib:0
+	dev-java/asm:3
+	dev-java/bcel:0
+	dev-java/commons-cli:1
+	dev-java/commons-codec:0
+	dev-java/commons-httpclient:3
+	dev-java/commons-logging:0"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.javacard -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar javacard.ri.platform/external/anttasks.jar || die
+	ln -s "${DISTDIR}"/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar javacard.apdu.io/external/apduio.jar || die
+	ln -s "${DISTDIR}"/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip javacard.ri.bundle/external/javacard_ri.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/javacard >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/javacard$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	rm -fr "${D}"/${INSTALL_DIR}/bin || die
+
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/JCDK3.0.2_ConnectedEdition/lib
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm ant-contrib-1.0b3.jar && dosym /usr/share/ant-contrib/lib/ant-contrib.jar ${instdir}/ant-contrib-1.0b3.jar || die
+	rm asm-all-3.1.jar && dosym /usr/share/asm-3/lib/asm.jar ${instdir}/asm-all-3.1.jar || die
+	rm bcel-5.2.jar && dosym /usr/share/bcel/lib/bcel.jar ${instdir}/bcel-5.2.jar || die
+	rm commons-cli-1.0.jar && dosym /usr/share/commons-cli-1/lib/commons-cli.jar ${instdir}/commons-cli-1.0.jar || die
+	rm commons-codec-1.3.jar && dosym /usr/share/commons-codec/lib/commons-codec.jar ${instdir}/commons-codec-1.3.jar || die
+	rm commons-httpclient-3.0.jar && dosym /usr/share/commons-httpclient-3/lib/commons-httpclient.jar ${instdir}/commons-httpclient-3.0.jar || die
+	rm commons-logging-1.1.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.1.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/javacard
+}

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index cd3527e..0e65c9a 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -32,6 +32,7 @@ DIST netbeans-trunk-nightly-201512010002-src.zip 209149379 SHA256 9030cb0fd9a50b
 DIST netbeans-trunk-nightly-201512020002-src.zip 209149151 SHA256 4e95492815119f865a36948128503e0bbafe7ba46ec3a9d265fa8d65692890a2 SHA512 521444ba55da0d18b12483d5065978b6b90504ac73c65f7c14e982bdb6ad130b44da190fc05de971da9f33394a0cddd92fba01ab42483334148323671f5fbcc9 WHIRLPOOL 6631ae3b7e9cce61e051519de5855640554f44779a18d4ac1c86ad5db153b810e28d1a090d720d09b93254a8d35a5da8992ef2ef979c0e956520c1c800c224cd
 DIST netbeans-trunk-nightly-201512030002-src.zip 209171687 SHA256 d79cd2853d8d347e4b2d42daf178b21d60cef8fb0221292d599818482fa5b48a SHA512 eed19fadd98ac6d458ef187613ee6f0088d692adb9b1dde171b3e2daeb7d9a0975c97441e9a6053a8071d97f70d1a1f90296dd88ac98c92e9e67de3a905afefe WHIRLPOOL e8c370eb715e3996000e8fa44cfaae14bde4402fecb010237987c0139d60a7730e63455ca5ea179836bb417165fb675b2fd19ce3b2ff3f8863dc3e135ed8798a
 DIST netbeans-trunk-nightly-201512040002-src.zip 209178833 SHA256 9fbb70be4c026ac0ef12f1a44a361fdee99cce6234920c68b045526d00d4fd75 SHA512 90bc8fb97442a61215613021d27bd20e71e5b5ecd63ce41710d761f70faba8d4229ff6e5d023439070a62ad862e497b7f2e4b244e2b7b1183f55c217572b01ca WHIRLPOOL c231908df004a9e519e92827b36aaed93aca4a7802c8b85593c2849c94bfa422744fdb015ac38c07eeac56304443068b612f426fd5455c25b822f68ed8ad0bc1
+DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc64965bd5b8803c50b183bde52daab55dd4a4aa6c7b29bb624f83a SHA512 33072bd5bf9251678c2a28f7418e23569f2012d41c6b9518f3099f58abef39ef7da8285cfd3d96ae4dbb01258a4b6656d6bcc3ea26439eba3fb4b504ef61d761 WHIRLPOOL dac893869ef4aa8f582de77ce8d7117682a981e0e4f68156426eb41d31d2f0a55b08438979e9ad176efe0f86285d0af43ada75f34283a7deb40f56a8827d00fd
 EBUILD netbeans-javadoc-8.0.2.ebuild 5993 SHA256 baf9da38d87b86eb8ed10ef46017361f36ca8583dd90885c9d1667a51851bc52 SHA512 892bc25b30dc26e3ee7c8be9aaf8542c00a7fa1d1d8f883d82bebb816edfa93e1ee9abeac1b0c47ecc8b4169bcaded56c5c71f18151fdc22fe241fcee0fd4521 WHIRLPOOL 2012f28f3ba5074b4d262b20e9a1c8ddf590ce444339ec1a404c890867c1271e38f9f9e09717d0648fae061553f5c8da3d97a70c35c8e853fe4894fb6fd4ec96
 EBUILD netbeans-javadoc-8.1.ebuild 6247 SHA256 5f0ab01cbea85353ac471a46e341750785f4889732c9da111d77b87bbd1bcc2d SHA512 4a4636f4f58a9baba9d9f5bac4ee7d4f57c0e07d6790902d34974383660f2926c4c4b16a27bacc2a3a7a0a6d5b7699caae90bb2ac513ac8e0535e46d11ec345e WHIRLPOOL 9cbac0234b9f1a8122df116512d5154b7e85561fd9541e0a77dc5c2b5863cf3238400ac17d05499e950705309faa97caace6da00c912ea07d6a74b0076f683ed
 EBUILD netbeans-javadoc-9999_p20151101.ebuild 6228 SHA256 dad5cb4a17d24ac57e3d35b1c359acc75c81b122d382fa352d09a10c8a962b1b SHA512 e328af4b6650d46dfce20174f116447806dc06c8c9bca5faeb04bf7dd4d8ffccccd4decb47fc8b5e16e3182509d14a05004d098309a5098ddcb84b2493596424 WHIRLPOOL 759cce5b290a643f421bc2da40c3b6ebe2616948d6a537858fb83c9d8e6822b83575e743307dd6b1a314bfd87a8720d405b6a028214d62b58c223fe50375086a
@@ -62,4 +63,5 @@ EBUILD netbeans-javadoc-9999_p20151201.ebuild 6293 SHA256 ced18dfea94e8b276a895a
 EBUILD netbeans-javadoc-9999_p20151202.ebuild 6293 SHA256 53afeb779377a06eec84a9eaaa079c8e7f8146c45f24ec8839abbc37bc484f16 SHA512 40881e83bbf5a68ea7d14b131065acb29d3aa3c2dc9c8fa6f9ce26b8a5baee287c63ff965d9a1c5f418519b07f8ec865a81fe6f41a76754cede3481742310228 WHIRLPOOL 705aa46d2b76c371062dc25a6658fbf57118cc3d5fa83dd77756ff192e82284553229ec7e2b77c228aef61307cbef0696e08709694cc429a127cad4d8fc05d9e
 EBUILD netbeans-javadoc-9999_p20151203.ebuild 6293 SHA256 b527430a761d83ddce339d67884b8eacb2af767b095d477f36b35d681fda2b8f SHA512 3e52d92ea8bc3a042425cfd1b011ab37a640666d4fc08aa59bfe2aa5a9a1bbb9b3055b5498e1c989f22803e28c961be2f78f7d7b64a80406017dcbad08a38528 WHIRLPOOL fecb032cf6637c5905b0db69a5ff1b882b7245c0d64edb646ea25039ccec8cee3a78d8883db4988a23752d153aab9c4c6c493c53e1fece42c98bedacfe1ce26e
 EBUILD netbeans-javadoc-9999_p20151204.ebuild 6293 SHA256 6dc87090bd3e093cc2ba25c85cf7c7b0db47562604d9fadb57919dad0e46046e SHA512 59be219d4d73c53e0e82e7c692e7ccc1d061da91c1010a40bf71b77babb15cfc97405017fdb98561398f92727ef7f6e65b3c5b4508510431d6c738ef7bf6c415 WHIRLPOOL dc6e460f022694725f8f1c28b1765745f732202e99a9e91f17423efb594518acc2a6ca27faed625f1fb149296ce5f4a5baab87edd765e93eee16d19ad4ec89f4
+EBUILD netbeans-javadoc-9999_p20151207.ebuild 6293 SHA256 d333a1ce7e3bc4e68591a9c1407bcfc13dd20acbd817230c7a7ac1217be71e8b SHA512 33318407cf8d8e76347c1de6d1fc57e4646c6c0fa85988ee2623696867eab211761019ad1dae8ef3b0640b24be04bedc4be129afeda50790c5627c17bf6db0e2 WHIRLPOOL 77725d5d00a362ff40d9079cf45fb80cd89d60d8803ef9026dfbadd9f7eeab3c4535a53e79490f060b86570e0391e662f225bdba5b5f916088e44cede7527e5c
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20151207.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20151207.ebuild
new file mode 100644
index 0000000..4a0cb75
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20151207.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-07_00-02-04/zip/netbeans-trunk-nightly-201512070002-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 e1ed8f4..e10ba08 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -1,6 +1,7 @@
 DIST 0F7FC8D69950B86D5F67529B5C551DB84C5BCF87-nb-javac-api.jar 132323 SHA256 e3591d9a40c8829eca5f12a12513f3919be4b07923b0aabad1ba4b9f472d79d1 SHA512 4aacd1a1bf7a177e496d604af5d55a05efeeb3c3d2aa6ebe7606bab9278980dc7ef37ef6debb405bf71bf4d4907b8ad2792a7a224987f2ca02fe7fa1be6808d4 WHIRLPOOL 23406d70f15bf7ddcda79a86985b9978a3b72fafcab6e8e3c665cf0958cc07aa095e9a857e5d9c097de52fe6d2bc4f0216f7cb50d4984d83e14d9fad1eba3e53
 DIST 20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar 61713 SHA256 38bf23ed74459460f3f0b91735455e9b74d406c72612b6aef7278161db119545 SHA512 2d06db5267ac5d8fd227819014177f0d5cc345583628f1ff2fff89f180a4269936a136af0b4649cf43603b0adab6ce3e3f525ef2033537c6f035b558c356d900 WHIRLPOOL acd74c6edad1c0e74d6475aecd0a00d2b0760bde5a76b9846b466ac03087d814a9bbb1c0b4ab3f2bc29a25c465fe1875f6a45e544c7468c4d60793795c37dd37
 DIST 49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip 579550 SHA256 e173ba926f93e89bbb9c76bd2190b01e0af2d2b3223d2c78b4ed5bdaebbd78a0 SHA512 3de7720a392813cbbbc73a6ce2a745e10054c0888df61b1e623bf327f8a4584a9eaa07303fc41d01d2088fd6c868e7273c6355d23839dfaa9009d1f672520d58 WHIRLPOOL b6e2a6ca1bcea47dcff7d8a9ea043a5b76834bde9d9f715d5d3eb52211e5c0d8a9d0575c326fa2f1d4d2a5dd93bccdcaf20af45788e7e3032829ac85a83b64da
+DIST 5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar 187846 SHA256 40a7cdedd5a9724b07dadfb3e4e8cc71d6117052f59f13badd1bbf60370e45fd SHA512 548dcb27bc8aa61f17573e0e9896c361466a5d226b8e6b0d5f9a0181d17ce61ad5d137caa268c33da17e8541978427c3faa34be99d96817d09f22277f99dfda2 WHIRLPOOL 4cc8b27be4c5c9715b4103b7022290f9b84a554070de088035a1b80024c5540a456b04a3a80902ff345b1aa5d5b200157b3016b6023e7b62b6a0b1c80caa481f
 DIST A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar 109823 SHA256 18050686d2da634f3612a8100c405eb092dc06d86b8917c6b945d096daf49f94 SHA512 5a0089c36c35ffa2c243cbaee376a246dbfd3dd3f170fa233946b6134f9c80dda610f2900e8bbd1553c3e8bdd3b5548145c881745acc720ec1e059d8252b8399 WHIRLPOOL b01f2a78d653aea3f7a2369a66bef0ccda6026a38efe8f52616eed75df8ef80852ba509a4319ba183ab08d9141a138cde48addd910199f47b2ada7bfc5b24efb
 DIST B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar 173819 SHA256 4f2dbc36ec77519df339846cf5333e874d6f147f5d46ccdfabb18af34ee3bd5b SHA512 ccd48f9fe445b669763428dace1a02d5820a33d872c952d3a74608f868ca225c017999ae15857ed544799d467068b759d216121ba79d3288f323aa2cffb95fa8 WHIRLPOOL 02e8556df81839b0b90c912b9e22c22c9f10c54ee0aabda4768eaf6956f7e3e29c9b24a46e20bb264f2ea186c1642ec7baeb375b2a8951737543ac16e73f9260
 DIST D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip 1647417 SHA256 8c6fa603283582893aed25c247a4748eab38f3e6ce9c59f31b2bb8f3f217a317 SHA512 ffad7d45643015d178cdb1b5bb075f0232470f5f7b82acd87d3dbf88e2034aed04fa9fadadbf7831d3c57fe0c4bc9684d841aebaa8a99ba1d6c1f6cb13f80359 WHIRLPOOL c4df551c83984a2b5cfbe60363ff4d9de2b88f87ed4dcf9b8b91615c62cfe04274736ca29186b8541bc11b1cda8c79ddfd07f3ebcfd146664d9f1c46954696ea
@@ -39,6 +40,7 @@ DIST netbeans-trunk-nightly-201512010002-src.zip 209149379 SHA256 9030cb0fd9a50b
 DIST netbeans-trunk-nightly-201512020002-src.zip 209149151 SHA256 4e95492815119f865a36948128503e0bbafe7ba46ec3a9d265fa8d65692890a2 SHA512 521444ba55da0d18b12483d5065978b6b90504ac73c65f7c14e982bdb6ad130b44da190fc05de971da9f33394a0cddd92fba01ab42483334148323671f5fbcc9 WHIRLPOOL 6631ae3b7e9cce61e051519de5855640554f44779a18d4ac1c86ad5db153b810e28d1a090d720d09b93254a8d35a5da8992ef2ef979c0e956520c1c800c224cd
 DIST netbeans-trunk-nightly-201512030002-src.zip 209171687 SHA256 d79cd2853d8d347e4b2d42daf178b21d60cef8fb0221292d599818482fa5b48a SHA512 eed19fadd98ac6d458ef187613ee6f0088d692adb9b1dde171b3e2daeb7d9a0975c97441e9a6053a8071d97f70d1a1f90296dd88ac98c92e9e67de3a905afefe WHIRLPOOL e8c370eb715e3996000e8fa44cfaae14bde4402fecb010237987c0139d60a7730e63455ca5ea179836bb417165fb675b2fd19ce3b2ff3f8863dc3e135ed8798a
 DIST netbeans-trunk-nightly-201512040002-src.zip 209178833 SHA256 9fbb70be4c026ac0ef12f1a44a361fdee99cce6234920c68b045526d00d4fd75 SHA512 90bc8fb97442a61215613021d27bd20e71e5b5ecd63ce41710d761f70faba8d4229ff6e5d023439070a62ad862e497b7f2e4b244e2b7b1183f55c217572b01ca WHIRLPOOL c231908df004a9e519e92827b36aaed93aca4a7802c8b85593c2849c94bfa422744fdb015ac38c07eeac56304443068b612f426fd5455c25b822f68ed8ad0bc1
+DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc64965bd5b8803c50b183bde52daab55dd4a4aa6c7b29bb624f83a SHA512 33072bd5bf9251678c2a28f7418e23569f2012d41c6b9518f3099f58abef39ef7da8285cfd3d96ae4dbb01258a4b6656d6bcc3ea26439eba3fb4b504ef61d761 WHIRLPOOL dac893869ef4aa8f582de77ce8d7117682a981e0e4f68156426eb41d31d2f0a55b08438979e9ad176efe0f86285d0af43ada75f34283a7deb40f56a8827d00fd
 EBUILD netbeans-javafx-8.0.2.ebuild 4647 SHA256 15e5e0b1c4729852dd55e5bfb2dcb520ba7c959bd9927d315c0abcb3f94e4ecc SHA512 520c60264fee67b0ccfd50ced0cc8586d5653d5186fa75c6b7cd8b400aae834de446b7e6145ad38df7e68207391fb360ef4834140e096d48add568fed387ac98 WHIRLPOOL 416a56ceb2ba85e3923ada0c8ef485cdd6fa16b3423b8fd0de523fa54dd082cbaedee5da4f1a92b50e440195f9256376f50e99a850d70ccdcb8c0ff370007f7c
 EBUILD netbeans-javafx-8.1.ebuild 4671 SHA256 2a12bebaca0ddbb03b84c33de7f5933f76a8381db3c40013fc4014687ded6cd4 SHA512 ff410f96e808c414e3e9485461866239080098e46e843ee771a78a0afffddc1c776697dccb276daf7f87dadf915a212bfe9c2a07b3a8a9057cb3ea19b77163fb WHIRLPOOL 51729142255a16d4cd949d4bf5f3b681d36bc83f30dad39aad9d1dd56f7dcec0dae4377817350e7947d518129a74eec7f227c3cb1600ac168ea90d056b87d195
 EBUILD netbeans-javafx-9999_p20151101.ebuild 4717 SHA256 bea25b3b5c80353aa32794ac60d83a291a3e46c3fa39979f0b47d9a6f3ca8213 SHA512 ddc6a5e580b4e868b089d376875fd55680795853156dcf9cfb28021d38383f81068474d06491dd5401f96df6e6e5efc46056247cb7f90c6632e076305ed89b02 WHIRLPOOL f1322bec9fbc6f93a1964b469860e86bfeac88b700d66db25069d2dd9268fde7ee756299d9ddc790173d48a4fb2b18cf65b2b4c350332a45c56d9ea5b09ffcf1
@@ -69,4 +71,5 @@ EBUILD netbeans-javafx-9999_p20151201.ebuild 4717 SHA256 130d96f932c38bdce3d6ee8
 EBUILD netbeans-javafx-9999_p20151202.ebuild 4717 SHA256 b9001fc03f22a6d4a5e203036268a4707cf1a5b4484cba57d1eaa62c0ac37396 SHA512 ee56925e1d2de8bc988be01ca868d7585f861997717645d976e35db4004e375f9d878667cd8ac064727e8ae0d920e034c255e5b28815dc7fbe48731d9a09e326 WHIRLPOOL 78ec062e771d8525a9b716d36aaf144a6666fb5bbfa5d556fdf351b0180d74fb8c39cf98a2f1743c97da4e4a1349d7463289c5f5637a93b4760ec5041b86c257
 EBUILD netbeans-javafx-9999_p20151203.ebuild 4717 SHA256 3f8995931045c1298b6b839e247f5875df7b6fe80a447112a6e85442a1891391 SHA512 d224f2deb82fc009691d79c2138ba9622b725828cdcdb48793ed464e44415b64889224cf4cf60dd3190ad987ad49920ceeeaa0f5fb94b7ff5a775ae0fb54615b WHIRLPOOL d17d4209edae01a503db6ddbc49b0ac18ff8d2c00f8be428cac47892c1a0df47d041081305255c63b57dff0f86e4f89002907f6a22b60dae6a75d62a4562425b
 EBUILD netbeans-javafx-9999_p20151204.ebuild 4717 SHA256 70ab18a9f6ae96d4d916842cbbbd63c6cbe2e5a2febde0e6107b8636b8846d89 SHA512 1d6db63eebf3595e901cb59c64e323fe870a0790cf80cfeae249bd78b3be9417b498a9d89d59fd9b46ed5c825f47e0faa0b2391c95e3216be8319fc85b5dcb11 WHIRLPOOL 1f0238a56715dfa57f3806e343b1b7bee7320e2727996760ae9232415f0567fe05bffa849d0c5f97d3f93bf3e7b4794833e3adad0e5ca953fb01ee8faa04b2a8
+EBUILD netbeans-javafx-9999_p20151207.ebuild 4717 SHA256 3cb8d54e102662ddf8ca83772e7c48db1ff3f16c13a207755bf3c9e64970ec54 SHA512 e23f095a782d965fb8cf40621d8f373fe3f650fa6984b7e7af2026210d00ecfa8f157c9c1e4c28ddb4f1732f758201b28aaef3721fcd6e10845526d3e1975118 WHIRLPOOL 88f7d8678dbaf76862884b7af66e03aeba78ac3367c0ca326d89dcf65642974c22cbd200c964611c6c315095a2bfaf1a4361bbd6fdb098b6f588b92ef9ae48b4
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20151207.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20151207.ebuild
new file mode 100644
index 0000000..8b355cd
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20151207.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-07_00-02-04/zip/netbeans-trunk-nightly-201512070002-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 b2275c3..55f7eac 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201512010002-src.zip 209149379 SHA256 9030cb0fd9a50b
 DIST netbeans-trunk-nightly-201512020002-src.zip 209149151 SHA256 4e95492815119f865a36948128503e0bbafe7ba46ec3a9d265fa8d65692890a2 SHA512 521444ba55da0d18b12483d5065978b6b90504ac73c65f7c14e982bdb6ad130b44da190fc05de971da9f33394a0cddd92fba01ab42483334148323671f5fbcc9 WHIRLPOOL 6631ae3b7e9cce61e051519de5855640554f44779a18d4ac1c86ad5db153b810e28d1a090d720d09b93254a8d35a5da8992ef2ef979c0e956520c1c800c224cd
 DIST netbeans-trunk-nightly-201512030002-src.zip 209171687 SHA256 d79cd2853d8d347e4b2d42daf178b21d60cef8fb0221292d599818482fa5b48a SHA512 eed19fadd98ac6d458ef187613ee6f0088d692adb9b1dde171b3e2daeb7d9a0975c97441e9a6053a8071d97f70d1a1f90296dd88ac98c92e9e67de3a905afefe WHIRLPOOL e8c370eb715e3996000e8fa44cfaae14bde4402fecb010237987c0139d60a7730e63455ca5ea179836bb417165fb675b2fd19ce3b2ff3f8863dc3e135ed8798a
 DIST netbeans-trunk-nightly-201512040002-src.zip 209178833 SHA256 9fbb70be4c026ac0ef12f1a44a361fdee99cce6234920c68b045526d00d4fd75 SHA512 90bc8fb97442a61215613021d27bd20e71e5b5ecd63ce41710d761f70faba8d4229ff6e5d023439070a62ad862e497b7f2e4b244e2b7b1183f55c217572b01ca WHIRLPOOL c231908df004a9e519e92827b36aaed93aca4a7802c8b85593c2849c94bfa422744fdb015ac38c07eeac56304443068b612f426fd5455c25b822f68ed8ad0bc1
+DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc64965bd5b8803c50b183bde52daab55dd4a4aa6c7b29bb624f83a SHA512 33072bd5bf9251678c2a28f7418e23569f2012d41c6b9518f3099f58abef39ef7da8285cfd3d96ae4dbb01258a4b6656d6bcc3ea26439eba3fb4b504ef61d761 WHIRLPOOL dac893869ef4aa8f582de77ce8d7117682a981e0e4f68156426eb41d31d2f0a55b08438979e9ad176efe0f86285d0af43ada75f34283a7deb40f56a8827d00fd
 EBUILD netbeans-mobility-8.0.2.ebuild 4342 SHA256 e9b4ff8fe38904346bc21a82219696e97322bf9df4e9d4cad2259b6f08bbe7f9 SHA512 338711fe61c469cee80e499ddf8c3ad70a3a38e6658311afcd1d24edd1a99b87566fafcbd392bb958b589796e0913d2574b07570870c8d3382a91a324227082f WHIRLPOOL 855b2817c36bea67c8fb368a0740be18b71dbebb2b98a154552f002a56eaff34f54eee2698379d7200a6042c1de699df23e7717b5b6c532776852d8757b74cb0
 EBUILD netbeans-mobility-8.1.ebuild 4366 SHA256 fe10d103a284b8f82b67179ea52d51d57b43cfc4a4084b97e3f9650526621497 SHA512 36bdf0948b41bfe4f9c66fe093030d5f27b90f5a89be94dfbd176e3887b249d5aa3eb9b0924df142291f0d693f274eef840ed3a7f658106847327befd0374710 WHIRLPOOL f9dd44e6401367b2df73c5f1428bff53547ac012068297667666d0241c29310aed4413a368e5350a996af37ad026e875325467b1a165cba6953d99a5da3a0d76
 EBUILD netbeans-mobility-9999_p20151101.ebuild 4412 SHA256 e25b7d637bc5cd7559b322247edb504909a865ee29190103a06a89fd1e7d259a SHA512 68666ff1854f0529e6919069c4e4e5c05efd639e327787cfd031e7f8d19c8d86e3617ad112714225486250f07e7e3c8b4c14a91f9217e0a7e97a7b78af8695e1 WHIRLPOOL 72302d7a42ceae3d1e671a0955d0777c66b1343a3b7eed66fdd41e82a15508c1a0a71af2c5055dbfa724ed99bdd045d769ab3582f88092ee7db56bcb54b05192
@@ -61,4 +62,5 @@ EBUILD netbeans-mobility-9999_p20151201.ebuild 4412 SHA256 96ce6b8cb574783d25755
 EBUILD netbeans-mobility-9999_p20151202.ebuild 4412 SHA256 83c7d74a70ebf1b0a5f2713db75b52bc4af2bda540f53bc22ff9e788ae6cedd5 SHA512 9499fb76b1272af8fd0c848ea3720020074915bfc471bf0b5163ff20f31bf71f26a9c39b894923bcdf5986f912a7c4709aba252b83e82865cdb59e36816e88f7 WHIRLPOOL e85af6a7b97dd269f569913bddd74b6212b0a8c1622af8be8cc686bd82119b0c5434f63292e72851bdaf14f90c3026764898eea8f0a1b43fcb1eccbe6b451abf
 EBUILD netbeans-mobility-9999_p20151203.ebuild 4412 SHA256 76fdb528d4aac18c096e96db458d46299486797aa8f6d59ccc4ba5450d0d37db SHA512 5da7cd77bad6f20a6e28a4c33c6ff22d48eee0ac5d9e5934f3a82b3874bf369e875250d7fd812a2c7fbe83e1fb8a26e50469f7d3a0b3b4682ffe307bd226c476 WHIRLPOOL bf7974ceef89db649cdef23410fa4a7e35ea741f082dfebbb5bcdb3679a019470e537378e53d5e2adbb5a3d20c99dc5b3e31a5d15550be152ec1ae5d853a13a9
 EBUILD netbeans-mobility-9999_p20151204.ebuild 4412 SHA256 1a3dd0501e35502689f8d34a6f7b2be2788a496bae64c33aeb1604d5fbdf236a SHA512 0057bc977d2baf83603b1f5c19a96f2bbc7f7f1e8f6951732f1c75dcaf9009ebe5ab04657aaa03b4fd3255d0dfc4a843be2a392fac893fe5a3ea743481e8c0c9 WHIRLPOOL 1025f8ed544e7d6dbdb2d71414cbfb6efac8414ce9b5a310edb8dadb15d3ecf1d5de366088d91aa5ed17d145a6b55b2811f74c793b0e49aa6dd24750e8d75567
+EBUILD netbeans-mobility-9999_p20151207.ebuild 4412 SHA256 0b5a060406dde1e986fb6b936bf42f35d6bc3ef6058880fb9d70b20920481aab SHA512 c8389cd146eea72bb9b3a1e4bc9a4577b9920efada66ff7b5c2f6524ff17781e8c9854a7801c0c634608f3ebe16315a6eba1ad40c77d033dc2ecdad129d1c3ba WHIRLPOOL 93cdb3667b393d8be6508569db90ab5ece1b8b096f80ca038eaf42b03e91aadd750c0ee8685f72f57add39cc2e9b337b6210be9f57c7fdc3e26671c2e1a847c8
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20151207.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20151207.ebuild
new file mode 100644
index 0000000..100b298
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20151207.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-07_00-02-04/zip/netbeans-trunk-nightly-201512070002-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 06a21f4..202c393 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201512010002-src.zip 209149379 SHA256 9030cb0fd9a50b
 DIST netbeans-trunk-nightly-201512020002-src.zip 209149151 SHA256 4e95492815119f865a36948128503e0bbafe7ba46ec3a9d265fa8d65692890a2 SHA512 521444ba55da0d18b12483d5065978b6b90504ac73c65f7c14e982bdb6ad130b44da190fc05de971da9f33394a0cddd92fba01ab42483334148323671f5fbcc9 WHIRLPOOL 6631ae3b7e9cce61e051519de5855640554f44779a18d4ac1c86ad5db153b810e28d1a090d720d09b93254a8d35a5da8992ef2ef979c0e956520c1c800c224cd
 DIST netbeans-trunk-nightly-201512030002-src.zip 209171687 SHA256 d79cd2853d8d347e4b2d42daf178b21d60cef8fb0221292d599818482fa5b48a SHA512 eed19fadd98ac6d458ef187613ee6f0088d692adb9b1dde171b3e2daeb7d9a0975c97441e9a6053a8071d97f70d1a1f90296dd88ac98c92e9e67de3a905afefe WHIRLPOOL e8c370eb715e3996000e8fa44cfaae14bde4402fecb010237987c0139d60a7730e63455ca5ea179836bb417165fb675b2fd19ce3b2ff3f8863dc3e135ed8798a
 DIST netbeans-trunk-nightly-201512040002-src.zip 209178833 SHA256 9fbb70be4c026ac0ef12f1a44a361fdee99cce6234920c68b045526d00d4fd75 SHA512 90bc8fb97442a61215613021d27bd20e71e5b5ecd63ce41710d761f70faba8d4229ff6e5d023439070a62ad862e497b7f2e4b244e2b7b1183f55c217572b01ca WHIRLPOOL c231908df004a9e519e92827b36aaed93aca4a7802c8b85593c2849c94bfa422744fdb015ac38c07eeac56304443068b612f426fd5455c25b822f68ed8ad0bc1
+DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc64965bd5b8803c50b183bde52daab55dd4a4aa6c7b29bb624f83a SHA512 33072bd5bf9251678c2a28f7418e23569f2012d41c6b9518f3099f58abef39ef7da8285cfd3d96ae4dbb01258a4b6656d6bcc3ea26439eba3fb4b504ef61d761 WHIRLPOOL dac893869ef4aa8f582de77ce8d7117682a981e0e4f68156426eb41d31d2f0a55b08438979e9ad176efe0f86285d0af43ada75f34283a7deb40f56a8827d00fd
 EBUILD netbeans-nb-8.0.2.ebuild 4927 SHA256 7531e50c4d76608bf925efdba4f54f522de3a8ceeef4d48807fb4ee48bfabdf6 SHA512 925734f331cf228066c5c9e614f48b756af31cac8b559cfe756347b6a2cb0ce362c7c41489a25084f2ed3f2e415baefd148a54f39fc00269fb14179efe056cb9 WHIRLPOOL e3224c5f22bb8e4792a5f98bbe819e071ff18c99533ce05a3fc1c5898ddcca1e3ce34487ba78159bb4d60155acdf15ae4fe81189ff2d5b1bc77ffd9ee4e20aca
 EBUILD netbeans-nb-8.1.ebuild 4065 SHA256 c1bfd704ecaa1fd62b149114b7391b4633a90a8a1d87645b833731920aa6efbb SHA512 56bda99c3d05522d5becb032177e4b4411d862d18a069e2d4343ddc8b08d05ed6c3199588e28aece7e583ccc9f95517621780a246bdd65c7d3edf072a61ef1cb WHIRLPOOL b9a43e6b4ada929bcf2aaed0bffe9cdfe0b9dbbf001e8ee4f2ab3cf8a08e27d318ea435d0580c80fd23cf921d261ca9b54d54a2b2e7a53173f955bde03aa0a12
 EBUILD netbeans-nb-9999_p20151101.ebuild 4997 SHA256 9c42522f7debe07d0511b8127fcd144fee5acb66fc17888eed697d0723e4ebf1 SHA512 6c34b949c1b8e6c7263fa5c463e43bdedd832d4ff0e82272da4d53f6971a82fc086869309332757a44ac25e68909392b1a37f270bd389cb089418679e133f34c WHIRLPOOL 2ed2078031e3cfb031eb6a06536835269b3dd568740cd083b4bbaee92d1f70c60a795d143c4e6b9e271eea1a023e249732b03c97fbab9af876b7175fced04139
@@ -64,4 +65,5 @@ EBUILD netbeans-nb-9999_p20151201.ebuild 4111 SHA256 50b4e9ace3334c94b5175b93fdf
 EBUILD netbeans-nb-9999_p20151202.ebuild 4111 SHA256 fef1332c6b6e996379eaca09acdb6f7443b9122c262405c7e99ad835da98a507 SHA512 6bfad46469fdfa95953e3507eb58ed0de92b2c3018035baa0427d3a32dd48142fdaec1f11c37c111c4fa8986e694c8218b59564083446c6b941102b16e90f79c WHIRLPOOL ba5b8ae55513ad0bd60e9253e67dcabf5bac14009353288c45d198128e2b805934270aa44b1d17450e51b288f51dc25afd0bfe5b2ec0360e8a5a26de2720b603
 EBUILD netbeans-nb-9999_p20151203.ebuild 4111 SHA256 8d3fddf5fbe888b2da5bf5fc6153b34f6d95cce9713bf7a695b19b3916cbe62e SHA512 8a9ab64168c571743852771f74e4a37e8dc65916486007bbc31fd566410613d88ac6b36924e50d804feb32a05d1e72179fe33169f2c2f2d498da260cae4fb7d2 WHIRLPOOL 0647fc22ecba5d66b07c8ff5439589d5173b2330ab3c8e462963d010cbaf3d138cc12ecfa6ffb38e801188f9de2add5639d870d89df13f4e7386e78a80349bfd
 EBUILD netbeans-nb-9999_p20151204.ebuild 4111 SHA256 5ea4bea92f6da91731c7a05c7686c3c5025339bd2483340863b03bac248e6550 SHA512 cf3aea409c9e068205e523d57c5f1fa3365ef28b2819d5a8bde9141ad78b00482c02765c975698a092b2cb5f3cdb8dcc1c8ea0eea463b351af86e58e51513b64 WHIRLPOOL 1f660a2afa8610acb58835d44344de4db5d2107e570ae41824c2410058145e842b2568181b02163e7307221a55006301f7799962d1222ac8c688e8c608461e03
+EBUILD netbeans-nb-9999_p20151207.ebuild 4111 SHA256 9a9d3685c7825825b99a5a545cd33158d6d38ca6eda4f8b81ff272e8fb453055 SHA512 8e94c30243dde85d6763d5e86870a13e30710ff9b7d753d83974479046c1a417f3f816cc2d53abe9204bfcc86c720f5630de9e4aed539d251ca666c1c4410cc2 WHIRLPOOL 7b4b2aa426c2938ffd2a1c5ecadb01243cb5c53cd5a246880204b4aab2a86d4ff353cf21af04b04e0f216996c7c68481e42141126824efcc01b09ff0d5121daa
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20151207.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20151207.ebuild
new file mode 100644
index 0000000..de35b8f
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20151207.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-07_00-02-04/zip/netbeans-trunk-nightly-201512070002-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 52b8622..d1ec527 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201512010002-src.zip 209149379 SHA256 9030cb0fd9a50b
 DIST netbeans-trunk-nightly-201512020002-src.zip 209149151 SHA256 4e95492815119f865a36948128503e0bbafe7ba46ec3a9d265fa8d65692890a2 SHA512 521444ba55da0d18b12483d5065978b6b90504ac73c65f7c14e982bdb6ad130b44da190fc05de971da9f33394a0cddd92fba01ab42483334148323671f5fbcc9 WHIRLPOOL 6631ae3b7e9cce61e051519de5855640554f44779a18d4ac1c86ad5db153b810e28d1a090d720d09b93254a8d35a5da8992ef2ef979c0e956520c1c800c224cd
 DIST netbeans-trunk-nightly-201512030002-src.zip 209171687 SHA256 d79cd2853d8d347e4b2d42daf178b21d60cef8fb0221292d599818482fa5b48a SHA512 eed19fadd98ac6d458ef187613ee6f0088d692adb9b1dde171b3e2daeb7d9a0975c97441e9a6053a8071d97f70d1a1f90296dd88ac98c92e9e67de3a905afefe WHIRLPOOL e8c370eb715e3996000e8fa44cfaae14bde4402fecb010237987c0139d60a7730e63455ca5ea179836bb417165fb675b2fd19ce3b2ff3f8863dc3e135ed8798a
 DIST netbeans-trunk-nightly-201512040002-src.zip 209178833 SHA256 9fbb70be4c026ac0ef12f1a44a361fdee99cce6234920c68b045526d00d4fd75 SHA512 90bc8fb97442a61215613021d27bd20e71e5b5ecd63ce41710d761f70faba8d4229ff6e5d023439070a62ad862e497b7f2e4b244e2b7b1183f55c217572b01ca WHIRLPOOL c231908df004a9e519e92827b36aaed93aca4a7802c8b85593c2849c94bfa422744fdb015ac38c07eeac56304443068b612f426fd5455c25b822f68ed8ad0bc1
+DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc64965bd5b8803c50b183bde52daab55dd4a4aa6c7b29bb624f83a SHA512 33072bd5bf9251678c2a28f7418e23569f2012d41c6b9518f3099f58abef39ef7da8285cfd3d96ae4dbb01258a4b6656d6bcc3ea26439eba3fb4b504ef61d761 WHIRLPOOL dac893869ef4aa8f582de77ce8d7117682a981e0e4f68156426eb41d31d2f0a55b08438979e9ad176efe0f86285d0af43ada75f34283a7deb40f56a8827d00fd
 EBUILD netbeans-php-8.0.2.ebuild 4347 SHA256 585b2488d748f3d0f87c17c951870e167aac7bf10847428add786e4a8a446583 SHA512 1431305d4f340cb0a2c7c896c54d45f6f02ef82a4201f82053278b98511a5a4a68210317530e9cdf5cf1f495996d3a3f9c4b2c3c479aa407abd375072ab3182f WHIRLPOOL af8476f2ff2d119f2657e6be03cfea1160f86e41bd791f40609f1bc8a8aada46ba1081e4f2417b0fddde931fa4e43d20956c0fe1d4fdf3617b78d01afd23f9b4
 EBUILD netbeans-php-8.1.ebuild 4371 SHA256 a9e7565a8cbcc5dfca4d9449f43b959911c47ad8da59648e383ecce55c4b0064 SHA512 67d43532ea43abf007adce73e7da2345d9cc42229189ba90d254d7764e19e3fd3c86b990ea2fe08cf52e49422def481046fe6e0e447fdc1de1680ac59f51d9d3 WHIRLPOOL 433275570fd81db477180e58909ebd50b83cde03bd5df807cc9ee213e2f3a44f65f3ec4877851aa6322e7752969aa72313ee7b35b8ee07446e8c22be4321d536
 EBUILD netbeans-php-9999_p20151101.ebuild 4417 SHA256 599a80da65a7ae6b22860d0b70acb49a8c55ab034ffc56352074fc434b54f74b SHA512 e0e7105401c7bab851e7e917c5a6ba4530fe24961084c20051adebff4691bd1e01bf7c885ac5aca6ae7326675190208aa0bc18fda6afc4d525490e1bd69015d9 WHIRLPOOL e0f3c7fceaa1b782320e938a6b246855f1b8b419f3991a43e5f3208b306b37b4bba29bd80bb58a1fff0998fe781c70d0ef036468001a21edac79ccb460ea4399
@@ -65,4 +66,5 @@ EBUILD netbeans-php-9999_p20151201.ebuild 4417 SHA256 193c065b3aa9d6fda73d29575b
 EBUILD netbeans-php-9999_p20151202.ebuild 4417 SHA256 71081cd268f6583587c840326705b24de5529e5b14c82ab2a5b1c7b365bcd7a5 SHA512 74ca77d2ecf2848b5702fb857724415a1c527acf1781aad64f1a1a8f5d1136ef04f9469a44d8588568fd7d6e3eb7bd66417ffb088f8ab823f1a9a10a329a6f9d WHIRLPOOL 158278ed199bd9ea5641504160dbb120eaf73715994a6c5b942779b56fa602df1292a7a7e9083437f51f61b63515714fd5935b17cfbf3e5347bc413e95a16f62
 EBUILD netbeans-php-9999_p20151203.ebuild 4417 SHA256 0012163173c92bb380460e4ce0e7e07b2a463742826a077ab327bb7b184f3004 SHA512 bf2056d51c2e3ecd249065446e35efe451e432c80733b710900c894f0c0d6dd61c13fbe971b51b57e1595e45bb8c44ff70acfe33bd00ebf507f262d526a4284d WHIRLPOOL cbd0932d648f671732cc86965fed349e9860c887f52a038f5a8d37118e4bc016279c8ebf761d3d141f6faf3c93e98a69b393ad914e06742e85bfd63ec398cf08
 EBUILD netbeans-php-9999_p20151204.ebuild 4417 SHA256 ea48a1680c940cc8d677bf07e7f08ccd0ee9f4662c51385d21fcc27020e06602 SHA512 4b277859f728083320e0a43d1ee8c043cc23187e8d0918dddb7ac49310377a16134a8fad687ed3514fe0be30d3c6d68c4661380ebb4c58bce014e9f031406b22 WHIRLPOOL fdae4fcb13f97ec1aaf3bf954da6ced76dd467a253e548226b2146d1e087cab8bba1f1d7f00ef8722ebd74293966efe5d72a2ea3e098ead1964f1032aabec58a
+EBUILD netbeans-php-9999_p20151207.ebuild 4417 SHA256 6c180873b454acb18871518ac6f4af3572ac1c9faa3110aabb63318fe762aaba SHA512 641b7ec1c598cb866e7334a3f590cd9b8d10fd0d03b348c0d89bf71c5fbb87169b60b9508a6aa313fe2af346ae79eee26a35c9b0730bbdf5dc138f62be0a55cc WHIRLPOOL 44578d745a2d7170249409eba752e7443afb8345711ea9bf7d5883870305ef40e2754979b0399b6621b654610e4242380336635f0152457b381862904113008e
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index 86f8553..a8334a4 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -48,6 +48,7 @@ DIST netbeans-trunk-nightly-201512010002-src.zip 209149379 SHA256 9030cb0fd9a50b
 DIST netbeans-trunk-nightly-201512020002-src.zip 209149151 SHA256 4e95492815119f865a36948128503e0bbafe7ba46ec3a9d265fa8d65692890a2 SHA512 521444ba55da0d18b12483d5065978b6b90504ac73c65f7c14e982bdb6ad130b44da190fc05de971da9f33394a0cddd92fba01ab42483334148323671f5fbcc9 WHIRLPOOL 6631ae3b7e9cce61e051519de5855640554f44779a18d4ac1c86ad5db153b810e28d1a090d720d09b93254a8d35a5da8992ef2ef979c0e956520c1c800c224cd
 DIST netbeans-trunk-nightly-201512030002-src.zip 209171687 SHA256 d79cd2853d8d347e4b2d42daf178b21d60cef8fb0221292d599818482fa5b48a SHA512 eed19fadd98ac6d458ef187613ee6f0088d692adb9b1dde171b3e2daeb7d9a0975c97441e9a6053a8071d97f70d1a1f90296dd88ac98c92e9e67de3a905afefe WHIRLPOOL e8c370eb715e3996000e8fa44cfaae14bde4402fecb010237987c0139d60a7730e63455ca5ea179836bb417165fb675b2fd19ce3b2ff3f8863dc3e135ed8798a
 DIST netbeans-trunk-nightly-201512040002-src.zip 209178833 SHA256 9fbb70be4c026ac0ef12f1a44a361fdee99cce6234920c68b045526d00d4fd75 SHA512 90bc8fb97442a61215613021d27bd20e71e5b5ecd63ce41710d761f70faba8d4229ff6e5d023439070a62ad862e497b7f2e4b244e2b7b1183f55c217572b01ca WHIRLPOOL c231908df004a9e519e92827b36aaed93aca4a7802c8b85593c2849c94bfa422744fdb015ac38c07eeac56304443068b612f426fd5455c25b822f68ed8ad0bc1
+DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc64965bd5b8803c50b183bde52daab55dd4a4aa6c7b29bb624f83a SHA512 33072bd5bf9251678c2a28f7418e23569f2012d41c6b9518f3099f58abef39ef7da8285cfd3d96ae4dbb01258a4b6656d6bcc3ea26439eba3fb4b504ef61d761 WHIRLPOOL dac893869ef4aa8f582de77ce8d7117682a981e0e4f68156426eb41d31d2f0a55b08438979e9ad176efe0f86285d0af43ada75f34283a7deb40f56a8827d00fd
 EBUILD netbeans-platform-8.0.2.ebuild 5406 SHA256 98e9861da45ead0d2d975a0527315df5282870b2d7e71a089724d91c18852e81 SHA512 cadbe66132d3ad81f6d149e20731b558c11c529e2ec15b1fe47ff97d99a3f4b4612fa5c98c435c4ff979eaefab6702721db009a03162202c96b4b411cf9f872a WHIRLPOOL 9552948e8bbad308f4379eaae69d8c214da9fbfab87d75226949b69ddca3e68c2d36c4d05738196073e5b959ab0b764064c9186d421198937122aa4bdc4988dc
 EBUILD netbeans-platform-8.1.ebuild 9320 SHA256 4a03fc6a399aaab949edb3df7c629da5bc7ce6288d44dbc848097352c2b4ae3a SHA512 7015cb042dd4e371cdcad49838eb2e4109d1ec505ac618f3a6f98d4dce328ab34be90a3cb0820896bd75337a180a1bd9c91c842a143fdffdf033696d5f496402 WHIRLPOOL 8c5311df396a374bf9d8c994b37c5c9fe6aa3c82a9e9e0824a5caefb0006fd9b44f4fdddd387ee12da48592929d5c4dd7e7fb2d866c9ddaf76acf5b3adbe310e
 EBUILD netbeans-platform-9999_p20151101.ebuild 9382 SHA256 caf47d0f6b7b4e6aa9db3f4f9ba522dfbf8bfeee811dff5133087657432f0b35 SHA512 0b737b39c8122b84dcd8311c51146cedcaa5c69ceaa159abe305d773c300be913cd3c1d3de14391cf75e5d4b06f8489edf66fe555efe5a44db95fea80e74c97a WHIRLPOOL d1dd018cbe4741f126e3408f041f8377f4fa1af914353cd248f5d70b5a6c6fcb3a481cc9bffe06617e45911d462d79dd40c8ac15fb0650d0a7db0a13e1d4bbde
@@ -78,4 +79,5 @@ EBUILD netbeans-platform-9999_p20151201.ebuild 9367 SHA256 6aa784f5efbe6ae29315c
 EBUILD netbeans-platform-9999_p20151202.ebuild 9367 SHA256 3b33fc5d43426ca595c18ae936734010b0af5bbfd399b1d4b4303adcc5792db3 SHA512 ab21535615adaf2f6f22cf221827b0da0a171668d8b1daa6fef68c3c0715017abf8f793bcd528f7e6cec97a0cadeac641b2ed694f1fecc23ebf4ef23ba81a84c WHIRLPOOL 845e8a629d6b99d17de0d39d3b243ff947f0367fb81894e383a9321eb7b885d99fb4483ee3987868184fe4cb20c211584268e52a9b62f7a809fd2cc27a4babd9
 EBUILD netbeans-platform-9999_p20151203.ebuild 9367 SHA256 cfdf9284f9dfb5f16cbb18f71d748ef1219ecb02236687f85df9f1130f9782d9 SHA512 56d9c4b7a70c9a20c609bc2f0ac3e9e94d54c86d5e88243706403017613c36869314db1a0023a409058a527b554872447f570dbe6bf9402c4b1216c43f67dc44 WHIRLPOOL 67e79f739580defa49016643106279cec1cb27e9c6cfb204bf7ba2efd1242a87c44e5b8caf05e418d5673b9042b1eae7cfbf273807ac916795635560eab1c1da
 EBUILD netbeans-platform-9999_p20151204.ebuild 9367 SHA256 0a2ed298a22e2caac321d1a17e9ab89e305ea7d91c82f51c36809ba3de4813ec SHA512 37dd492d427384561075157670d98e5577bf592176b16ebfdf5851547be80dfe652e433ae816d731ad6b4721ed9a6efbfedbbb37e7142b471c769fdec3913d37 WHIRLPOOL 20cfa57a697060809e4e2e944901707d43bdb35a6fc6f063cab70354e032cd06c9fb923ae12388f37108e195b5bb1a3bb7e6597a020d398328b09a5f0fdad755
+EBUILD netbeans-platform-9999_p20151207.ebuild 9367 SHA256 b5f4e4041fd3147045c8311ce31c4b0e69f8059b8a00efaed0a4035e5b0e5189 SHA512 45af527f5ed13d444beea99d137f09d86b5202cb0f9794810b7e8beed8719a4d68c67a17f3c606d0ce9150668b69bbd34f3bb7c11d59c14cd4dfdd052bc4a67e WHIRLPOOL 95ca2cbc2bcd50103266d2cd01bad184e3509ae6dd0c1b6d4e1943a4da7188f76e548915719c23a22e976ae27a03479d834b85769d35fa069c1ac0a70ad1bf02
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 74d430d..1c8611e 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201512010002-src.zip 209149379 SHA256 9030cb0fd9a50b
 DIST netbeans-trunk-nightly-201512020002-src.zip 209149151 SHA256 4e95492815119f865a36948128503e0bbafe7ba46ec3a9d265fa8d65692890a2 SHA512 521444ba55da0d18b12483d5065978b6b90504ac73c65f7c14e982bdb6ad130b44da190fc05de971da9f33394a0cddd92fba01ab42483334148323671f5fbcc9 WHIRLPOOL 6631ae3b7e9cce61e051519de5855640554f44779a18d4ac1c86ad5db153b810e28d1a090d720d09b93254a8d35a5da8992ef2ef979c0e956520c1c800c224cd
 DIST netbeans-trunk-nightly-201512030002-src.zip 209171687 SHA256 d79cd2853d8d347e4b2d42daf178b21d60cef8fb0221292d599818482fa5b48a SHA512 eed19fadd98ac6d458ef187613ee6f0088d692adb9b1dde171b3e2daeb7d9a0975c97441e9a6053a8071d97f70d1a1f90296dd88ac98c92e9e67de3a905afefe WHIRLPOOL e8c370eb715e3996000e8fa44cfaae14bde4402fecb010237987c0139d60a7730e63455ca5ea179836bb417165fb675b2fd19ce3b2ff3f8863dc3e135ed8798a
 DIST netbeans-trunk-nightly-201512040002-src.zip 209178833 SHA256 9fbb70be4c026ac0ef12f1a44a361fdee99cce6234920c68b045526d00d4fd75 SHA512 90bc8fb97442a61215613021d27bd20e71e5b5ecd63ce41710d761f70faba8d4229ff6e5d023439070a62ad862e497b7f2e4b244e2b7b1183f55c217572b01ca WHIRLPOOL c231908df004a9e519e92827b36aaed93aca4a7802c8b85593c2849c94bfa422744fdb015ac38c07eeac56304443068b612f426fd5455c25b822f68ed8ad0bc1
+DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc64965bd5b8803c50b183bde52daab55dd4a4aa6c7b29bb624f83a SHA512 33072bd5bf9251678c2a28f7418e23569f2012d41c6b9518f3099f58abef39ef7da8285cfd3d96ae4dbb01258a4b6656d6bcc3ea26439eba3fb4b504ef61d761 WHIRLPOOL dac893869ef4aa8f582de77ce8d7117682a981e0e4f68156426eb41d31d2f0a55b08438979e9ad176efe0f86285d0af43ada75f34283a7deb40f56a8827d00fd
 EBUILD netbeans-profiler-8.0.2.ebuild 3402 SHA256 8021dea620d1bc26214ff0ec285f8061c24693dd28a62a97a48ac3223707e920 SHA512 2660390337a973256b1aac3a02b14e16782c230fa2714ae695213b0cabc0eb60621c6a1ae234f9e57259a19de22a87447f9a89ab846bd59bcedd2be313c35072 WHIRLPOOL 5d1053ded03143b2de05b64cfbe59b515cb786d60bfa65566be795567bfaf5feb88a2f8e7161a05da512fafd523f871778d5ddeb3c6b89fc95885096e379f65d
 EBUILD netbeans-profiler-8.1.ebuild 3426 SHA256 81f8b3b135f021a2dbe7b5ccb53fc7fcf79908ab83ef14ca0e912732b7fb4b53 SHA512 210bc0c5214aa8f79f559cccf69f1ed885dd2d14dc55cd17bd89c8a7f04f1a76de5b414426337b2ba6e99576850f0753f13e41e0f424b3f0adc58001dffc217a WHIRLPOOL 293d12a03294532dc9ce10503b030282cb636f08af6300ea796885eb6a3fe36c9d37c2a07138d03e9c4d45b31352ce160901a96f659f26d50a0fe5caee3bf0fa
 EBUILD netbeans-profiler-9999_p20151101.ebuild 3472 SHA256 2c453e505d57cb36f64db7c697a5abd69b230a177264d581db7c74827773ec3a SHA512 568e1855872d4ee90609a8b2f0dce9963d78ac4d43f3abc30adacf00a958e388f2742d55c284583501049b98e95d9d50e989c14495ee3ca0a928c6a68e7818e5 WHIRLPOOL a35708d9626767c3a1385292af47c44589784e18d62c4f8c7551c7210fff535613831ddde45992658778fbcdec389ac4dc5cc7921dbad2e70d7dba5ade8f3da8
@@ -61,4 +62,5 @@ EBUILD netbeans-profiler-9999_p20151201.ebuild 3472 SHA256 5de184b2afe1ae017f58c
 EBUILD netbeans-profiler-9999_p20151202.ebuild 3472 SHA256 5530eae8ce88c1c38bbe61749d84d16da27a1d8733e4dc9748e62a05a4591708 SHA512 1ad12e699c8650ea81460f810abaebdd31c805c0a28a40cd5a8e4b60226b43975b980ead6dc5af5ce134979f394a4c70cc13792048b6a6c30faf2ed5b9e91e21 WHIRLPOOL fd0f444ebb138864431596406a3abfadb12332abab027f5583b3b670eec79d6cf76a68032b89e88db4169844267cbdead90342bc81f3e4d4ccb8872529dc4ab0
 EBUILD netbeans-profiler-9999_p20151203.ebuild 3472 SHA256 599301b838d23b52de1a1a8d39f392aae64535aed4395c47d65057d6a169a4a3 SHA512 7e4971759ad4b85d3d65036311d89e482acce89d2c7077c32ebf9353a0f9d207b526babf2d58abbc1e97ff06b462052e656e1055c8bd19b3eec276b93a311031 WHIRLPOOL b8f426d5486bd3373d70e8f93805ecc75b1f80ac3035556363a7e87f980e51e0f09c8c0012ca0e84a61fdd88e524f01bf4fb0fcd23b654076fa15e39f8daa994
 EBUILD netbeans-profiler-9999_p20151204.ebuild 3472 SHA256 6eabb02129c81b7846d864abed5ed421d523c2b46b6ce9f55d943f2ab07911f9 SHA512 d71c993098df40de26abaaf12adf35aad3f698cac6061945e013c83ec1611d437c979173ac5d3d9845909990d96477a023842ce4e049111c41e7903c81e5303f WHIRLPOOL ff1496a757c22c860edf962ceab198a8e3cd92b2ab6c595eb8c19c493c32a1bfafd689cb4347cc3bc6e90d788384117d2ad152e2a177d5c31d4d90ad5c727c46
+EBUILD netbeans-profiler-9999_p20151207.ebuild 3472 SHA256 01a60410a6ccd20f7b34aa9ef02d9de87e2802fea74a829efebc0a9e0b9a4998 SHA512 b142787445ae08bf86b8d5173cbd7ea191bc78f9ebd5f95d89eb7836d4120b6fe607d711e1b504bd1ee21296c9931b685691bb37b2f7e96a31bff82659044934 WHIRLPOOL b33c8b816f51d4737bf8ba6c57e31430a76ee8c4a28eac3a1c6835dd595273dc75f82c440368a858f766a705fa7f4e9d811097cc7ca36c64979964f3cd3f2dbe
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20151207.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20151207.ebuild
new file mode 100644
index 0000000..f0c20c1
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20151207.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-07_00-02-04/zip/netbeans-trunk-nightly-201512070002-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 ad65797..308f99c 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -40,6 +40,7 @@ DIST netbeans-trunk-nightly-201512010002-src.zip 209149379 SHA256 9030cb0fd9a50b
 DIST netbeans-trunk-nightly-201512020002-src.zip 209149151 SHA256 4e95492815119f865a36948128503e0bbafe7ba46ec3a9d265fa8d65692890a2 SHA512 521444ba55da0d18b12483d5065978b6b90504ac73c65f7c14e982bdb6ad130b44da190fc05de971da9f33394a0cddd92fba01ab42483334148323671f5fbcc9 WHIRLPOOL 6631ae3b7e9cce61e051519de5855640554f44779a18d4ac1c86ad5db153b810e28d1a090d720d09b93254a8d35a5da8992ef2ef979c0e956520c1c800c224cd
 DIST netbeans-trunk-nightly-201512030002-src.zip 209171687 SHA256 d79cd2853d8d347e4b2d42daf178b21d60cef8fb0221292d599818482fa5b48a SHA512 eed19fadd98ac6d458ef187613ee6f0088d692adb9b1dde171b3e2daeb7d9a0975c97441e9a6053a8071d97f70d1a1f90296dd88ac98c92e9e67de3a905afefe WHIRLPOOL e8c370eb715e3996000e8fa44cfaae14bde4402fecb010237987c0139d60a7730e63455ca5ea179836bb417165fb675b2fd19ce3b2ff3f8863dc3e135ed8798a
 DIST netbeans-trunk-nightly-201512040002-src.zip 209178833 SHA256 9fbb70be4c026ac0ef12f1a44a361fdee99cce6234920c68b045526d00d4fd75 SHA512 90bc8fb97442a61215613021d27bd20e71e5b5ecd63ce41710d761f70faba8d4229ff6e5d023439070a62ad862e497b7f2e4b244e2b7b1183f55c217572b01ca WHIRLPOOL c231908df004a9e519e92827b36aaed93aca4a7802c8b85593c2849c94bfa422744fdb015ac38c07eeac56304443068b612f426fd5455c25b822f68ed8ad0bc1
+DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc64965bd5b8803c50b183bde52daab55dd4a4aa6c7b29bb624f83a SHA512 33072bd5bf9251678c2a28f7418e23569f2012d41c6b9518f3099f58abef39ef7da8285cfd3d96ae4dbb01258a4b6656d6bcc3ea26439eba3fb4b504ef61d761 WHIRLPOOL dac893869ef4aa8f582de77ce8d7117682a981e0e4f68156426eb41d31d2f0a55b08438979e9ad176efe0f86285d0af43ada75f34283a7deb40f56a8827d00fd
 EBUILD netbeans-webcommon-8.0.2.ebuild 4723 SHA256 e2ba39cb6f22c990acf9a492eac5707f130382d56f9bc1e3636e82cbe4d61938 SHA512 61955d38f829b3ed54bc5cb9a71da07f05676a2bf7219fa8073aeee0f0e2d0e73f7aa6ec1636be39fb071d3d2b9de7ceb813a247a61961874f4cc78697d4e568 WHIRLPOOL 1a272650fc2394716a790b79cb85a9322929c7cc96ea4776cc639fb869c5b536140dbdc632b1a8aa9cb1fc8e740050125c2ebe9390de7a8f4207e88e24924206
 EBUILD netbeans-webcommon-8.1.ebuild 4945 SHA256 55c57b638481134d659763154a7820467a9866707112cba0e60dbd9ba8cd2840 SHA512 a98987535f60b533bf0df701f83693a58584dfa9a10d5c8646186165d884fb7e8a3348ec77cbf25d1a8cc8cfd947bf54cdb30d251ae1a3fffb74947070d76579 WHIRLPOOL 36fe1b7b9b34a02fcda227aaeebed8a33562e6fe4a014c78e9a464d709bf5120322a35bd54a0ffa15c4dd4f3ae605cf6fc2d35c5652f7162ae646c61ad69210a
 EBUILD netbeans-webcommon-9999_p20151101.ebuild 4991 SHA256 57d2c07add5da1320895fd12fb6a4d3472a5bc94dd6725779fcc2b7c7f3f00e7 SHA512 071ecbf0f2c0af22ad78c0f5fc65df75861029b0769271233b84ca4b750a36df2e6aaa771283ed451f841faf437ba5b28c4ace809e7797352b17fa31287c0366 WHIRLPOOL be27b42140da851ad5cf395edcf3075dc65517da0db88046d1c2b9245bc7214e77acf0441690fc7cc0cf397146657568db3a597148d6b7b54961a088dd36a74d
@@ -70,4 +71,5 @@ EBUILD netbeans-webcommon-9999_p20151201.ebuild 4590 SHA256 9a85798fda3749da05f8
 EBUILD netbeans-webcommon-9999_p20151202.ebuild 4590 SHA256 506eca75f8cf09788ad7c8c7bc9fc97a7a431a7e6517ca4f132b113c08332c5c SHA512 53896822b8906f45b2e73829ed6d3a3dffbab984bcacd0a45c694f6dbee9eaa56da035a4b6f353a8ac468c9eca765d646f0635faea92df490971e12cce3392a6 WHIRLPOOL 041710058f6a3d33e68c615f26c0c8d70babd31c86226238e0a4dea63e7f3baa2739d313803f7fada381cab190427fe5bb2ffc10a271fc04862026a27e94eaf9
 EBUILD netbeans-webcommon-9999_p20151203.ebuild 4590 SHA256 034ffedd026ad9c6809a36909f0bc5fa1edcbf6846e61bcaa936a01dd050cd5c SHA512 d0b110d32e9113a06ebbc85534a9947dfd310a6da54c5b64f56bfc22e3e11f5d6105433b092d6aec5d1f1aea8e298d90dc0cc1d963f63b460ddbc236539ce7b4 WHIRLPOOL 2e416a726d9b50652b0d7e13f92de5e2653ed4c0399c097667278b590ce8f7057ec646bbee13fd15419a5c8b4b2ff0b820bdb8df672e2e4171b85b40ca1d268e
 EBUILD netbeans-webcommon-9999_p20151204.ebuild 4590 SHA256 5f8cb9c39e158e9cb19867a37619f69ac1bb35c3f65e391bd700051ce4641834 SHA512 0437baa39a9f64bca911c6665e96962e9ddb4275e9295b429aa27bdab5b6bdb846eed848fcc5f0d9a755ac69ab5c86d053218846b76028ee02ddd548c67c4175 WHIRLPOOL 882c8978d3d17eb6bcfd34511fcb271aecf8156365f7e7470d3579596091e8fa000abdf74e41ed2fe86775cda1ec0ffc6bb4cc2d86975d0a4b1b2c2ced30d3ce
+EBUILD netbeans-webcommon-9999_p20151207.ebuild 4590 SHA256 83f3423ebedcba37f457231149c44365d1fe62dd2563ae8349997d65cf61bedd SHA512 3b7b75854baa68ef0412d88a82a546aa9c796ca10fe103e3bbf86be2886e0dfcefa90d105a67a3af078e6f7c612f1e8335a6cfa99521a70be5435dbd5ec877a6 WHIRLPOOL 24f1c9ea0b0e843e4b750da5fd8b221da0b3c966ed531775d2adb78779788a801d05a3ab3a3283f404c652868c869d39730e583c86a790ad42d51f0c52e853cb
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 689b21f..93d6793 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201512010002-src.zip 209149379 SHA256 9030cb0fd9a50b
 DIST netbeans-trunk-nightly-201512020002-src.zip 209149151 SHA256 4e95492815119f865a36948128503e0bbafe7ba46ec3a9d265fa8d65692890a2 SHA512 521444ba55da0d18b12483d5065978b6b90504ac73c65f7c14e982bdb6ad130b44da190fc05de971da9f33394a0cddd92fba01ab42483334148323671f5fbcc9 WHIRLPOOL 6631ae3b7e9cce61e051519de5855640554f44779a18d4ac1c86ad5db153b810e28d1a090d720d09b93254a8d35a5da8992ef2ef979c0e956520c1c800c224cd
 DIST netbeans-trunk-nightly-201512030002-src.zip 209171687 SHA256 d79cd2853d8d347e4b2d42daf178b21d60cef8fb0221292d599818482fa5b48a SHA512 eed19fadd98ac6d458ef187613ee6f0088d692adb9b1dde171b3e2daeb7d9a0975c97441e9a6053a8071d97f70d1a1f90296dd88ac98c92e9e67de3a905afefe WHIRLPOOL e8c370eb715e3996000e8fa44cfaae14bde4402fecb010237987c0139d60a7730e63455ca5ea179836bb417165fb675b2fd19ce3b2ff3f8863dc3e135ed8798a
 DIST netbeans-trunk-nightly-201512040002-src.zip 209178833 SHA256 9fbb70be4c026ac0ef12f1a44a361fdee99cce6234920c68b045526d00d4fd75 SHA512 90bc8fb97442a61215613021d27bd20e71e5b5ecd63ce41710d761f70faba8d4229ff6e5d023439070a62ad862e497b7f2e4b244e2b7b1183f55c217572b01ca WHIRLPOOL c231908df004a9e519e92827b36aaed93aca4a7802c8b85593c2849c94bfa422744fdb015ac38c07eeac56304443068b612f426fd5455c25b822f68ed8ad0bc1
+DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc64965bd5b8803c50b183bde52daab55dd4a4aa6c7b29bb624f83a SHA512 33072bd5bf9251678c2a28f7418e23569f2012d41c6b9518f3099f58abef39ef7da8285cfd3d96ae4dbb01258a4b6656d6bcc3ea26439eba3fb4b504ef61d761 WHIRLPOOL dac893869ef4aa8f582de77ce8d7117682a981e0e4f68156426eb41d31d2f0a55b08438979e9ad176efe0f86285d0af43ada75f34283a7deb40f56a8827d00fd
 EBUILD netbeans-websvccommon-8.0.2.ebuild 2651 SHA256 a195b307847c466dbb5f46eb04240358ce3c92cadeecb8fda1562304de46820f SHA512 933626bd2073f58e3508180c042e237b9e61ba6f3c992cf37ea43978ac2fc972d2dcc3ef0b5c390b3867296e197ed2605c43452c98e36acf0982e7338b6d1eb7 WHIRLPOOL c3db8f0b50116d0129f50778e1961166e76601d8c165e20e73d75c91b02c8a095067e0f13e18178d849dd29adcedaeee7d3e0e62f99be592d7ce159fd6af632e
 EBUILD netbeans-websvccommon-8.1.ebuild 2675 SHA256 c9ff3d598c5f76c2b69dd5488a80c63025acc3cd0cc99321a0e84a493502df36 SHA512 89daec44b860aa8011d9e5533230f89dad7bcc50a119664122d2718db3e53501d1319ae4b27eac1d71596671e9a7c21315a641346e6cbab22edb3c7232bf5ce3 WHIRLPOOL 521521094b396c98687e2054742e4c019023045f19b01a6cc3a5f826f4cabe9448254db8b834448f3b33368c76dd667942554e1bae459c55de2c571bb5cfb4f5
 EBUILD netbeans-websvccommon-9999_p20151101.ebuild 2721 SHA256 959463c779becd38e659a2f1d1d269c2513198340e73ac0e660f3d4ecd24d11a SHA512 2880822c6d429cbff2711cd206ce551cabb8be4b65c3c2c6f82f33810608670f7b4b755a5f87d104678f87386031845a88e4a5dfabfc6bff531ba7c27d50664c WHIRLPOOL 071067ddd51734eddd427511073b2762086e8f5031bad54d3f2de15390a558d5028500d2238836cd269844c30d83348377e5d9a5758e0af0aa5348dd6924c1a9
@@ -61,4 +62,5 @@ EBUILD netbeans-websvccommon-9999_p20151201.ebuild 2721 SHA256 cd4b74880988ca16e
 EBUILD netbeans-websvccommon-9999_p20151202.ebuild 2721 SHA256 1cafc0619ee9f9570cebc0fcbd63c5872479501bb1a369dedea21d3ff7df9859 SHA512 c8e51e182c80f87661cbfbab8502fd1c77983b8518178b80bf2475f068813d8a5bc6a4f8318ae374c34ed2ea0c1c3e469c45cc0ed28dd583306af50174f26f5c WHIRLPOOL e4f9e5ee9de82c9106dec93935b61bfd33ec2e30b812e5047c4781b0ce8b9365a46adca1db17e5cda293607a3151aa221af82b72d37586d2d117d1d52a52f1d3
 EBUILD netbeans-websvccommon-9999_p20151203.ebuild 2721 SHA256 71f29055fc3d762614b11d2004b3ba993e2aeda1da618f881db6571baccb77b3 SHA512 22b169ece6dd6530b8344922b200343c71eb613a92d1c16a20f85c30f0541ce42a2663874adad60fd4d2ef32eff3e26132d2feb4e857325e0d1a24aa6c9224f7 WHIRLPOOL d52c82a48597ee5a00e9fc6832984f560f3d6e90fcb14ddc210f859620c1887fe87a1bea59559bd141d381dd90be4908daf0d6b160c775057fc856c57579cf4e
 EBUILD netbeans-websvccommon-9999_p20151204.ebuild 2721 SHA256 e782964ee7456cfeb4c2c6432210ea8523f033fbbbd3f44c1a3181f61e209a97 SHA512 a9a5a59a0a312c2bc480a92b61499c1e83e79e293c3a6679af69f7dd9206f596c8d7ca654674bcb817b201bbd94e6eee820b3823eaa449108a93b57a279acbd4 WHIRLPOOL 97c868198b88a9a3c1b064400e1eb656c404c47d0c674b7464b71367902ef37a19a087410b023c0a6c11dc2d087f966f4d0b377ec3c7732d1a44d479dca9234a
+EBUILD netbeans-websvccommon-9999_p20151207.ebuild 2721 SHA256 f2cc1397326d95920aecd5fdb92f73563e9d91dcace56084d978b1e5d2eb5aee SHA512 cc42d429c8e42d3d87fc1d6e6164533be948f427b4497de889aad8fd63dd41a253edf6726dbe76acabe3ebc60de8c68c866078c3822e589584926ddbac76471c WHIRLPOOL ffeacec3ab4ba8ed4588255303447f26e2c6180ffa204e53359c0d8deb7864aea39c22287b08154fee6821bb0a89435ef0a348079f95245b77fc07ad0706b3cb
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20151207.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20151207.ebuild
new file mode 100644
index 0000000..6d6e8e8
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20151207.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-07_00-02-04/zip/netbeans-trunk-nightly-201512070002-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 01b234c..e4426d5 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201512010002-src.zip 209149379 SHA256 9030cb0fd9a50b
 DIST netbeans-trunk-nightly-201512020002-src.zip 209149151 SHA256 4e95492815119f865a36948128503e0bbafe7ba46ec3a9d265fa8d65692890a2 SHA512 521444ba55da0d18b12483d5065978b6b90504ac73c65f7c14e982bdb6ad130b44da190fc05de971da9f33394a0cddd92fba01ab42483334148323671f5fbcc9 WHIRLPOOL 6631ae3b7e9cce61e051519de5855640554f44779a18d4ac1c86ad5db153b810e28d1a090d720d09b93254a8d35a5da8992ef2ef979c0e956520c1c800c224cd
 DIST netbeans-trunk-nightly-201512030002-src.zip 209171687 SHA256 d79cd2853d8d347e4b2d42daf178b21d60cef8fb0221292d599818482fa5b48a SHA512 eed19fadd98ac6d458ef187613ee6f0088d692adb9b1dde171b3e2daeb7d9a0975c97441e9a6053a8071d97f70d1a1f90296dd88ac98c92e9e67de3a905afefe WHIRLPOOL e8c370eb715e3996000e8fa44cfaae14bde4402fecb010237987c0139d60a7730e63455ca5ea179836bb417165fb675b2fd19ce3b2ff3f8863dc3e135ed8798a
 DIST netbeans-trunk-nightly-201512040002-src.zip 209178833 SHA256 9fbb70be4c026ac0ef12f1a44a361fdee99cce6234920c68b045526d00d4fd75 SHA512 90bc8fb97442a61215613021d27bd20e71e5b5ecd63ce41710d761f70faba8d4229ff6e5d023439070a62ad862e497b7f2e4b244e2b7b1183f55c217572b01ca WHIRLPOOL c231908df004a9e519e92827b36aaed93aca4a7802c8b85593c2849c94bfa422744fdb015ac38c07eeac56304443068b612f426fd5455c25b822f68ed8ad0bc1
+DIST netbeans-trunk-nightly-201512070002-src.zip 209213201 SHA256 cbadd102ebc64965bd5b8803c50b183bde52daab55dd4a4aa6c7b29bb624f83a SHA512 33072bd5bf9251678c2a28f7418e23569f2012d41c6b9518f3099f58abef39ef7da8285cfd3d96ae4dbb01258a4b6656d6bcc3ea26439eba3fb4b504ef61d761 WHIRLPOOL dac893869ef4aa8f582de77ce8d7117682a981e0e4f68156426eb41d31d2f0a55b08438979e9ad176efe0f86285d0af43ada75f34283a7deb40f56a8827d00fd
 EBUILD netbeans-8.0.2.ebuild 7167 SHA256 80e31382a0ceb680c2a055dc5c78c1dce8edf32c50bbae6a1c14a2c568492519 SHA512 0ab466ca247ec953896ef0ab3b01b43ffea3a9f37e9bcdacecfc0476226d45cef35e4ddf27f2b85628d9512ed304e6cc6cfe963a5e547217d08cad400eefc4b9 WHIRLPOOL d09668e669f4f8d7987ab02cf26104fc6e54ba29b8b497fe0013cc8816a2d7560c99e6e1b02db77ead872d5240b84c09e3fabbc3465587d1d1ca7d6fcae114c1
 EBUILD netbeans-8.1.ebuild 6891 SHA256 22a19f05bdcea85475c0451df867367b69363bfbc6280f78b087248d9f8e9513 SHA512 812b6cdae3e5feaf37db5ca8b5efa1b374d5492f11cfa1df2adbd3617986cdca6a79d2d4dffd024c8c48492fc8a21704190242f5741c5699b12070620cea2c87 WHIRLPOOL baf5f750574c01effa0d02c72194139fb2757be932054f4900ceb0534607064af10f2b5b38063ff2cca34e75ab5be23d00c7e5d90d1c724339666d20f1bb10d3
 EBUILD netbeans-9999_p20151101.ebuild 7210 SHA256 ce70a22341c06aee959f4c4174364727ca76ec31040c0d36837d29c89cdc379a SHA512 75dd70f7da4e719cf1c8e95ff5e84d8a17d538cfc8cb7f084898f18a37dca0650b91d9e2e3de5718c5ca743e6eb0f4ead21fe5a794477aac9ae59c5082430850 WHIRLPOOL 8ecbf1297f6a3764ed4ddff7745b53083f9e1cf3ace71254944bff18fa28d2155e2f45ae1a4b50611ed8fe2f58b1a78ce449b550f95057cdffabc08c75f7eb4a
@@ -64,4 +65,5 @@ EBUILD netbeans-9999_p20151201.ebuild 6938 SHA256 e123016a32ffcaf48caad0b57c5578
 EBUILD netbeans-9999_p20151202.ebuild 6938 SHA256 229e2b1b9058a3e1f4093e7a62e85418bb4dbdc928932364c1c1d1ac25694368 SHA512 105270dde938109c8f44ea73530f30ba661fa335bfd0b88c70156d27c025dcb8f9ef4ab53de79acb001aa04c35c45c0ddfc7f55636f5334cf7a14116a28c6e39 WHIRLPOOL 6919eda354afd09aa26bf4d63c51f6a2585905bdfc2b979eb5eb92f6d2d37cd80fc282f82eddbee639ae43a6a1fb74a7534a8929d25e25b528950feceed0996f
 EBUILD netbeans-9999_p20151203.ebuild 6938 SHA256 da3c6c66e618429f94bb9a2164d42b40add7fa2433da0fab472b036069980013 SHA512 644f5d0a2acd61f186bf1a2f30053b5b75cc74573e1019b805f4bc8002346ad693e1e5b9a68d78873636a35e045bab6f91901bcb5e022c47df1af11ecb9c160b WHIRLPOOL 51b5d39b4c5e920d563b2b89cdbd5fab1ed1bcf3d5ebefba64d994cc2e9ffd6c83da7649a97fffe50581aa4723153c6ec7a21c78be2f113b2ddf1c0a260229ef
 EBUILD netbeans-9999_p20151204.ebuild 6938 SHA256 788cd72729057a8bd0cc54db9bce1bc67726d4ceade9b4978a01c5d855c22760 SHA512 214984459897ef42441598dc98d770ef6c7a626ed0079c5f13d90e5f5361fe6d17217444782dbf5d9cafb15d7a58bcacc28ff9dfcc355b0359544adee6fe1a69 WHIRLPOOL c96a1bb5852e3ab2024530de9ce95918c0bc44d748372b75d735e14c2d8ac19ca0b47ffb46cc7e469b0baadb7d99db3ed1281793c5d01c2586b83bf964e9985a
+EBUILD netbeans-9999_p20151207.ebuild 6938 SHA256 7ac11fbcaf3edce5b7a8e137c46454b92d9c97278a46dc4dd1a17fd3a4ffd633 SHA512 b798790408dac52685cbb15c55cfa5ed3a7b3d25aa39807d14b2c5c5218de4e0cc328023f2c32fa59cb331652f7d542588997c35fc6962095a56db8db6cf3326 WHIRLPOOL de57f69a4740a1012eea6aefa9bb47ec6b9adc6f64d4d7b638d724751413370899f11c00f37a5658b5e3828606d30687e69604cc1a44af6f109a2306ff95dbba
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

diff --git a/dev-util/netbeans/netbeans-9999_p20151207.ebuild b/dev-util/netbeans/netbeans-9999_p20151207.ebuild
new file mode 100644
index 0000000..3c88e00
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20151207.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-07_00-02-04/zip/netbeans-trunk-nightly-201512070002-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
+}