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

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

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-dlight/, dev-java/netbeans-webcommon/, ...
@ 2014-12-15 10:21 Miroslav Šulc
  0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2014-12-15 10:21 UTC (permalink / raw
  To: gentoo-commits

commit:     8210b94db88f30fd2c96164a110868aa3690c15e
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 15 10:21:24 2014 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Dec 15 10:21:24 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=dev/fordfrog.git;a=commit;h=8210b94d

netbeans: bumped to the latest sources

---
 dev-java/netbeans-apisupport/ChangeLog             |   6 +
 dev-java/netbeans-apisupport/Manifest              |   4 +-
 .../netbeans-apisupport-9999_p20141215.ebuild      | 111 ++++++
 dev-java/netbeans-cnd/ChangeLog                    |   6 +
 dev-java/netbeans-cnd/Manifest                     |   4 +-
 .../netbeans-cnd-9999_p20141215.ebuild             | 125 +++++++
 dev-java/netbeans-dlight/ChangeLog                 |   6 +
 dev-java/netbeans-dlight/Manifest                  |   4 +-
 .../netbeans-dlight-9999_p20141215.ebuild          | 101 ++++++
 dev-java/netbeans-enterprise/ChangeLog             |   6 +
 dev-java/netbeans-enterprise/Manifest              |   4 +-
 .../netbeans-enterprise-9999_p20141215.ebuild      | 249 ++++++++++++++
 dev-java/netbeans-ergonomics/ChangeLog             |   6 +
 dev-java/netbeans-ergonomics/Manifest              |   4 +-
 .../netbeans-ergonomics-9999_p20141215.ebuild      | 101 ++++++
 dev-java/netbeans-extide/ChangeLog                 |   6 +
 dev-java/netbeans-extide/Manifest                  |   4 +-
 .../netbeans-extide-9999_p20141215.ebuild          | 108 ++++++
 dev-java/netbeans-groovy/ChangeLog                 |   6 +
 dev-java/netbeans-groovy/Manifest                  |   4 +-
 .../netbeans-groovy-9999_p20141215.ebuild          | 111 ++++++
 dev-java/netbeans-harness/ChangeLog                |   6 +
 dev-java/netbeans-harness/Manifest                 |   4 +-
 .../netbeans-harness-9999_p20141215.ebuild         | 114 +++++++
 dev-java/netbeans-ide/ChangeLog                    |   6 +
 dev-java/netbeans-ide/Manifest                     |   4 +-
 .../netbeans-ide-9999_p20141215.ebuild             | 373 +++++++++++++++++++++
 dev-java/netbeans-java/ChangeLog                   |   6 +
 dev-java/netbeans-java/Manifest                    |   4 +-
 .../netbeans-java-9999_p20141215.ebuild            | 253 ++++++++++++++
 dev-java/netbeans-javacard/ChangeLog               |   6 +
 dev-java/netbeans-javacard/Manifest                |   4 +-
 .../netbeans-javacard-9999_p20141215.ebuild        | 134 ++++++++
 dev-java/netbeans-javadoc/ChangeLog                |   6 +
 dev-java/netbeans-javadoc/Manifest                 |   4 +-
 .../netbeans-javadoc-9999_p20141215.ebuild         | 168 ++++++++++
 dev-java/netbeans-javafx/ChangeLog                 |   6 +
 dev-java/netbeans-javafx/Manifest                  |   4 +-
 .../netbeans-javafx-9999_p20141215.ebuild          | 124 +++++++
 dev-java/netbeans-mobility/ChangeLog               |   6 +
 dev-java/netbeans-mobility/Manifest                |   4 +-
 .../netbeans-mobility-9999_p20141215.ebuild        | 126 +++++++
 dev-java/netbeans-nb/ChangeLog                     |   6 +
 dev-java/netbeans-nb/Manifest                      |   4 +-
 .../netbeans-nb/netbeans-nb-9999_p20141215.ebuild  | 148 ++++++++
 dev-java/netbeans-php/ChangeLog                    |   6 +
 dev-java/netbeans-php/Manifest                     |   4 +-
 .../netbeans-php-9999_p20141215.ebuild             | 127 +++++++
 dev-java/netbeans-platform/ChangeLog               |   6 +
 dev-java/netbeans-platform/Manifest                |   4 +-
 .../netbeans-platform-9999_p20141215.ebuild        | 155 +++++++++
 dev-java/netbeans-profiler/ChangeLog               |   6 +
 dev-java/netbeans-profiler/Manifest                |   4 +-
 .../netbeans-profiler-9999_p20141215.ebuild        | 121 +++++++
 dev-java/netbeans-webcommon/ChangeLog              |   6 +
 dev-java/netbeans-webcommon/Manifest               |   4 +-
 .../netbeans-webcommon-9999_p20141215.ebuild       | 123 +++++++
 dev-java/netbeans-websvccommon/ChangeLog           |   6 +
 dev-java/netbeans-websvccommon/Manifest            |   4 +-
 .../netbeans-websvccommon-9999_p20141215.ebuild    |  94 ++++++
 dev-util/netbeans/ChangeLog                        |   6 +
 dev-util/netbeans/Manifest                         |   4 +-
 dev-util/netbeans/netbeans-9999_p20141215.ebuild   | 264 +++++++++++++++
 63 files changed, 3419 insertions(+), 21 deletions(-)

diff --git a/dev-java/netbeans-apisupport/ChangeLog b/dev-java/netbeans-apisupport/ChangeLog
index 69753d5..02682cb 100644
--- a/dev-java/netbeans-apisupport/ChangeLog
+++ b/dev-java/netbeans-apisupport/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-apisupport-9999_p20141215 (15 Dec 2014)
+
+  15 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-apisupport-9999_p20141215.ebuild:
+  bumped to the latest sources
+
 *netbeans-apisupport-9999_p20141214 (14 Dec 2014)
 
   14 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 9b1a5c0..17f3797 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -62,6 +62,7 @@ DIST netbeans-trunk-nightly-201412100001-src.zip 199725425 SHA256 31aac95459128b
 DIST netbeans-trunk-nightly-201412120001-src.zip 199804828 SHA256 aa8ddaee11569408ef6f38113a995220cba4f131302d3728bdaaf04f313e8fa7 SHA512 0740ce76fa636162d994fd7c620d8e00cbe86f5771f1e4a4e2801b6c1ae0dc2955626dad7469db8638ba2d373a1c3ad3291ccac736175e7a232aba97183fc68d WHIRLPOOL 0e373351fbea69764c227bed93d7c046f64a9345bc27d257804f0418cece75fa479be2ae89fefbbd2f5df3e7db0e4fa9e7aded25c3d88e3239008c314b5a1f73
 DIST netbeans-trunk-nightly-201412130001-src.zip 200994486 SHA256 30939e6630fc6feff490e95cb8880194e4508f8acb4abc2c4708545ee01ed8d2 SHA512 2983b84987fcf644a4eed9ae47ff5afce4dcb4e7088e56624b0be59575b6ed49f4e17b95b1d80f0d0179686d059b49d636a988362c4aafd96e02748edcbdc2b3 WHIRLPOOL bd1aea7fc97e1d091b79dc86c1998131a9ba431fbd321cd80fa89f9cc873652f36cda2af8e90d64ef09fb3f20c491e3b97108475cd8c717cfceef08d307a51de
 DIST netbeans-trunk-nightly-201412140001-src.zip 201028548 SHA256 ef045a9d2f46bff6971bde7ec89836a2f243693f85dcc5deb350d8e4988f18d9 SHA512 329f1804defa15b31fd93312079a517b56da7b39576d453090a79eaf51c5fa0176cc0520fcbe9f6a4fc089c63c6420923a340de46328101d7601b4fad8818ace WHIRLPOOL dbb3d020ac8b9d4e0abd8aacb2348f3a3a673a6399c12243ee8030e11be335c862df0edf60ca6df4aadaf83fb1b0e3f8670d8d37d2029ed7e14ce712b11e11c9
+DIST netbeans-trunk-nightly-201412150001-src.zip 201028954 SHA256 e127b68dbb59e5ed8cd10b09b4f4bd458dc054f42994329681041e27a75f52fc SHA512 2782abd4e52073dfb471fb29567886b10a254b629368f66c3a573fd5d9bf08f95945bb38d63970f5a9a07c27ecdcf0c6e10aab0517dd79adcf36da207670d534 WHIRLPOOL c9059f24fa8d68046ff5ce1981b821f3ebce476c9ef7742bbe0bd32f9996d26fd893a606479ea8664ce99ab384dd1d0d92702dd3a6727ef1ec954df5fd392148
 EBUILD netbeans-apisupport-7.0.1.ebuild 3134 SHA256 41c32033c9945a39c0aebb6b0271767031d53a47e5c8365d9e3a7c86712e24cd SHA512 dd4bdde9574a87b46b02fd7204b1e90394bd87dc572dfa015b601203b026b35571f20323db834a310f90aefe6e4a822044b0d71d535a7351137219b50ecb2aa8 WHIRLPOOL f3721521a33b337d7dc24d6b49b0b2fe723f5ec446a5a4befb085051140a41bfd2d3081876e9f02f8b9932a3a0997b92211cd964fe372e40b42813df5db5170e
 EBUILD netbeans-apisupport-7.1.2.ebuild 3143 SHA256 cf24048c0ecca98a7d6371624bb0ddfb78663bead073d515a7c84229dbec00a8 SHA512 ec44c263e786210fd64c9ebb253bc9d4fc34d3be9493157dad06007c19734672bfd767765c003393d1e5cc6755fd5d1eda956b00c2092e98592a73ec1af4e729 WHIRLPOOL d619c304a994a2b818d892fb6315d092588f2ebf95e566f7a909f92daf21bb368a28c4e1af876ae585980dc82996e62aba30b12c41461103c23620a215480b76
 EBUILD netbeans-apisupport-7.2.ebuild 3126 SHA256 b0d64795b8403a932e3e20721a116c755c4de66fc36f7191476fcb4a226bad13 SHA512 cea062a72a8e75a9c2fe91c323f83d542a70149336360e1c41479f401fcae5ead6a301c8a7d5704d5beb27f7810b5d1e3cff0196cce7a26890a001c570179f6a WHIRLPOOL c286f4e4d3a02cbeb1a6e13b2005dc5435a6e9ec026a98fcc00bb83222014b800cd83f437c69352b48d16bdf442a6c7ebbed6aff86f10b3c5e6cdfb7edd9e184
@@ -118,5 +119,6 @@ EBUILD netbeans-apisupport-9999_p20141210.ebuild 3390 SHA256 7f05c204c8e1b29a810
 EBUILD netbeans-apisupport-9999_p20141212.ebuild 3390 SHA256 d7d37b8116c7d94e62e451932db82a662ce7404bd3b7de35dc6d6e326d7513ee SHA512 aa30d62a6d84593f6ec8aecaca675ca54dd92539a4373b03732342ef9b2e99dcf7e9100eb49df15ca409b42e2792d686b6ef3d6a41f5a40c2b95c755842d5ba3 WHIRLPOOL 6eec503d2cf0dcc2f7272242ebceb4bac83e6d928bee80c3f780a0c573348ec0627b90cb1db4aff086cf23c7fa2d150826bdba45e419f1b28d437dd07ba8ca8a
 EBUILD netbeans-apisupport-9999_p20141213.ebuild 3390 SHA256 e7467a6d7b093eb1ffe435a25a0825f24a78c6bbdb36b1b7779a0f49551b170e SHA512 37df0bb9e2a124ba0d3b7c25e0c73fe6456dae91c0cd5adea9b9664e34207a3995fd9911bf67327b3f110cc0845ea4160ffc15146e6164ff4f52eaa94dabdc18 WHIRLPOOL c32ab8f63c71ef5cbc92d4561cf9d671c2402108dc8d701ac57a683735522585b2cbc7d47f608e5c21dd96db15b7b2ed33af938bbf537dc70ee6c6421da71d51
 EBUILD netbeans-apisupport-9999_p20141214.ebuild 3390 SHA256 cc0580db484bb618e2d8cc4ad96b0160fe212347091d5636432cb4b44eec9adf SHA512 06c3eac0146fba1062b94104c579652c724adb377c70a845aa80399a0aec79afd4bf09d8a18128552e6ec7648d61074f42b6d7bded977f30b69cd7fa31d62a75 WHIRLPOOL 18d96bc824762106114ba3d2ea9b16e0cf0ce346b563341ffd752452ef9695466b30549b63a70aa0e9fedc0c038dabda0ac9bd0f6ba5fa366a80ffe20c1403dc
-MISC ChangeLog 146314 SHA256 50fc40922040d6451f05cc7936baa9b896e7234a355bf823936540d2fa60ec60 SHA512 a5664ca4a9ebfd5314f0ae74d2afbdee74003305649083ace1caa15d50676dbf94639da2c90f308127fc25edc4f178a52ff8b273f96187a97d0ad5c623e9a5ae WHIRLPOOL f37172782a72c4eda475aa6d224f93a6e35a82b946bc5ad21216ed28f05e124b551ec952c024436bcb0eae192c4ed46b4d70244577457899c9ea0546aab32d55
+EBUILD netbeans-apisupport-9999_p20141215.ebuild 3390 SHA256 49e3d71857bb249f4bb60b2675eb143e6242597d97e99a88590bbd55b4fba065 SHA512 c68fd2c5944b02b8b523a2b1d6fdedb251cfd9b81926c2515815984a24f35235933eb7ed33cf50a840fc840bcf768c1143bb24985d6ab294b4a968dfa1b4dd8a WHIRLPOOL 26f8ad3399525417873473cf2e844f244e2efbc87ebc4c0a9dd8ec4175de3c7bd984f0ab38fa103a887c61e7d4a6508cae56faa4a46565d6f8590aa7966eb966
+MISC ChangeLog 146495 SHA256 ef146a73158386298299227c1c746d0ab608904133a451863be1077424217823 SHA512 79124215ac1e563f2149454e2643ae0036d6a2a2eb697fde872c906ddfd749563d1922f2e3547bfee48614ebe169888a0d18f8ff9bfff251117160c6dad18055 WHIRLPOOL d1d3c1425194897edc61e20bf88ff5766ae3b48bd2791ec1aee747bf6714eab4eccc71e451857d0ba3e2b62f5f013621c9e09775d5d883a654b2c6edb319da81
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20141215.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20141215.ebuild
new file mode 100644
index 0000000..f075d33
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20141215.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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/2014-12-15_00-01-53/zip/netbeans-trunk-nightly-201412150001-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/ChangeLog b/dev-java/netbeans-cnd/ChangeLog
index b293f93..2af424c 100644
--- a/dev-java/netbeans-cnd/ChangeLog
+++ b/dev-java/netbeans-cnd/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-cnd-9999_p20141215 (15 Dec 2014)
+
+  15 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-cnd-9999_p20141215.ebuild:
+  bumped to the latest sources
+
 *netbeans-cnd-9999_p20141214 (14 Dec 2014)
 
   14 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index 1028ee1..1c9e24d 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -75,6 +75,7 @@ DIST netbeans-trunk-nightly-201412100001-src.zip 199725425 SHA256 31aac95459128b
 DIST netbeans-trunk-nightly-201412120001-src.zip 199804828 SHA256 aa8ddaee11569408ef6f38113a995220cba4f131302d3728bdaaf04f313e8fa7 SHA512 0740ce76fa636162d994fd7c620d8e00cbe86f5771f1e4a4e2801b6c1ae0dc2955626dad7469db8638ba2d373a1c3ad3291ccac736175e7a232aba97183fc68d WHIRLPOOL 0e373351fbea69764c227bed93d7c046f64a9345bc27d257804f0418cece75fa479be2ae89fefbbd2f5df3e7db0e4fa9e7aded25c3d88e3239008c314b5a1f73
 DIST netbeans-trunk-nightly-201412130001-src.zip 200994486 SHA256 30939e6630fc6feff490e95cb8880194e4508f8acb4abc2c4708545ee01ed8d2 SHA512 2983b84987fcf644a4eed9ae47ff5afce4dcb4e7088e56624b0be59575b6ed49f4e17b95b1d80f0d0179686d059b49d636a988362c4aafd96e02748edcbdc2b3 WHIRLPOOL bd1aea7fc97e1d091b79dc86c1998131a9ba431fbd321cd80fa89f9cc873652f36cda2af8e90d64ef09fb3f20c491e3b97108475cd8c717cfceef08d307a51de
 DIST netbeans-trunk-nightly-201412140001-src.zip 201028548 SHA256 ef045a9d2f46bff6971bde7ec89836a2f243693f85dcc5deb350d8e4988f18d9 SHA512 329f1804defa15b31fd93312079a517b56da7b39576d453090a79eaf51c5fa0176cc0520fcbe9f6a4fc089c63c6420923a340de46328101d7601b4fad8818ace WHIRLPOOL dbb3d020ac8b9d4e0abd8aacb2348f3a3a673a6399c12243ee8030e11be335c862df0edf60ca6df4aadaf83fb1b0e3f8670d8d37d2029ed7e14ce712b11e11c9
+DIST netbeans-trunk-nightly-201412150001-src.zip 201028954 SHA256 e127b68dbb59e5ed8cd10b09b4f4bd458dc054f42994329681041e27a75f52fc SHA512 2782abd4e52073dfb471fb29567886b10a254b629368f66c3a573fd5d9bf08f95945bb38d63970f5a9a07c27ecdcf0c6e10aab0517dd79adcf36da207670d534 WHIRLPOOL c9059f24fa8d68046ff5ce1981b821f3ebce476c9ef7742bbe0bd32f9996d26fd893a606479ea8664ce99ab384dd1d0d92702dd3a6727ef1ec954df5fd392148
 EBUILD netbeans-cnd-7.0.1.ebuild 4602 SHA256 1336b76de715719ef59a3601dd5ad3b24992f58096f874f0e37935ec0d088d8e SHA512 38745c3ad6364198516ebb64002185fd05c34dee75acdb3933221d772177d5d6fcda853bb63991f0d071b21079fdab0c090db93e59cddd8daeb8f8d571a18a41 WHIRLPOOL cc196275289a01c1168b8c2710e0be0c2483cc86dc47b8fb3383ce1141f7bc11565e2b2feb95436cf448c09aaac7ee8c8804316ce6782d8853c0742367c0963a
 EBUILD netbeans-cnd-7.1.2.ebuild 4218 SHA256 6c80020e4204226274f4a24413dad8bf134f5beb7aee4ecc53d6b4d709093bb2 SHA512 299c07f5e5d930045e8c8ef3d04009beee7035daa2022a803e6dcb16b380096bbf5014c2d684094705d06b4608afcf6925266ef609a483a86452b03505dcb67c WHIRLPOOL 6d6c8bddf3490282b9134315f9bc94ff55675160056fa4c98c302a59d943a9cb38f23ffb9ca313c82061d84d0ae86898ce72d16756d41c468737e319e68f06ce
 EBUILD netbeans-cnd-7.2.ebuild 4201 SHA256 0f77a1a343d437e2eb1236722b27b2f2f03901ecc1afde29e1d38e54aef7c81d SHA512 b5fc985d1280ab900cb5125691a0ff99bab075ff5e93ded9af256310a7dcbea87a28a52ba383875caa24fd0ff28bc8dff4fc0fa0242987a673fdc729f7234b58 WHIRLPOOL 19e79dc426fb05ffb48ff9b13de3bab40f483b6dd9d79514e8f819029c278ee47a09c9531b5b4dba2014f805d502e66745f3355e2932e24e0dd9b5e3e273d2c2
@@ -131,5 +132,6 @@ EBUILD netbeans-cnd-9999_p20141210.ebuild 4586 SHA256 10c07c5eab6cc2e54110b5de68
 EBUILD netbeans-cnd-9999_p20141212.ebuild 4586 SHA256 4b472c80ce0e1176d3956298ad00efa8ec7757c9590789cb9137e55228b86b33 SHA512 1842e265249faba20f5472787a25a2caf75d9aa5a72ae134e801d394b1623126ec61f435a0f2674fcfb9e1593a6b00d85a67ca83cb73dc00157b31f5a16c9b4a WHIRLPOOL 8d41e800d32135f19cc002b8abf6b3aad7ac26f4adba1ec6a524ddc40664eb6bba4b90b339f4d42c7448ffe9fab7edafa6b03e5b5b704241a0cacd75364a1190
 EBUILD netbeans-cnd-9999_p20141213.ebuild 4586 SHA256 daef3dd099e9fa5b37eb07679bc0fbf84508b189cee1ae8f6eeccbc33f2f280c SHA512 eb4af4b0dab11aa85fc253601cc007d5840bdea2c219f5e6f76ca90f3e61bf50ae24a9a70c0b17b0d0342315436aef1e8b44d663002f080ed9aedeb403f0b444 WHIRLPOOL 6d09063db691f4398072f0ac8da6f6024a589085fb09b9ae6b5df957d2d7b48046358b61849aa59593d56185e2c910fde12f8c17c656ab69f6fc405e134ad0e8
 EBUILD netbeans-cnd-9999_p20141214.ebuild 4586 SHA256 3e40636cd96b89d7a3dfb3459d78dd4bd9571f81d3f42eb656330dd2d31caa9d SHA512 ecd1b2e325edb6bdd854e5b1562c2ace15ed768bf3367453af70ce0f8aea624935e5d437b868fc5b615af2e0087799b43c9864103a69861b51b659bd7582a0e6 WHIRLPOOL 8780719b1bbf1220ea0d53cf4a3b8d7063a023e457abcd75389d850e16146b4b2a201695afb29e0c2688bc693088c77384ead5da444d812d033859aac70dd436
-MISC ChangeLog 133802 SHA256 7cd50b5d9b44cd7d3a89092ae61d94c408b8c6545c680dca8fff2c8877b28107 SHA512 7618f0135fcd9b17170b795682af2f1469b798d2f3829bdc77a72b0e7b3a31c8e2e7a5e8f98c0f02abfaf41ec65b977f8fe87fe114ac9ac5848800ae93c12ff7 WHIRLPOOL b23f39bfa3deb167a898b984de0f1a37bc5f77a3f5a63467cf549ed35ec3a57142bc87ea55b2046136278c8ba57dcb64eadded004577204c2d9e81a965867dea
+EBUILD netbeans-cnd-9999_p20141215.ebuild 4586 SHA256 a0cf1d3a42ef3df36ed6462c8f5a802b1aa4a76e62a9c8ac33a8629aae902c2b SHA512 9d74d84a917a8a3585bb372fea96599f6bda8091489dab9aad8a9801b171d295f3e263db1f05ae12607cf9e22b0467809886810a53cdf0a91e6e90d1447b2f04 WHIRLPOOL d0da03e2a132527d864a78b7ff74f80875cc7895e59d68965139618f1169dc5117a96e6f306b3eb326bb939c3025b85fbed36fbb325f1157f27fe093cafea4f0
+MISC ChangeLog 133969 SHA256 f5e3a5673b7d7f9b166a71291ee6f9d41f3afc51dac133fc4fe4d167b4fe1247 SHA512 2a5d335e366b7414c202e08a419c9a4b38238f3f96586a0518e717ee6fe5109c9ba29a0ce0988e3ab316d37386ca71f0b07a69ca5ae11552fd658c6b46415f81 WHIRLPOOL 69621d008e23fec4d8771769dd2d8882ff55bdc8e550a76c1a9a9f89adde70465b3caf2a118ad4126253139df416448c3fc2a1e36bd12479fc45d1cadf3e9f3d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20141215.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20141215.ebuild
new file mode 100644
index 0000000..70b0e5f
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20141215.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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/2014-12-15_00-01-53/zip/netbeans-trunk-nightly-201412150001-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/24C58A1D3C410AD3E23CD828871630C17068B238-cnd-build-trace-1.0.zip
+	http://hg.netbeans.org/binaries/2BCF2047382FB68A2F275677745C80E79B4046AB-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}"/24C58A1D3C410AD3E23CD828871630C17068B238-cnd-build-trace-1.0.zip cnd.discovery/external/cnd-build-trace-1.0.zip || die
+	ln -s "${DISTDIR}"/2BCF2047382FB68A2F275677745C80E79B4046AB-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/ChangeLog b/dev-java/netbeans-dlight/ChangeLog
index 0d43ecb..0808854 100644
--- a/dev-java/netbeans-dlight/ChangeLog
+++ b/dev-java/netbeans-dlight/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-dlight-9999_p20141215 (15 Dec 2014)
+
+  15 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-dlight-9999_p20141215.ebuild:
+  bumped to the latest sources
+
 *netbeans-dlight-9999_p20141214 (14 Dec 2014)
 
   14 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 4723f9a..39fdba2 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -69,6 +69,7 @@ DIST netbeans-trunk-nightly-201412100001-src.zip 199725425 SHA256 31aac95459128b
 DIST netbeans-trunk-nightly-201412120001-src.zip 199804828 SHA256 aa8ddaee11569408ef6f38113a995220cba4f131302d3728bdaaf04f313e8fa7 SHA512 0740ce76fa636162d994fd7c620d8e00cbe86f5771f1e4a4e2801b6c1ae0dc2955626dad7469db8638ba2d373a1c3ad3291ccac736175e7a232aba97183fc68d WHIRLPOOL 0e373351fbea69764c227bed93d7c046f64a9345bc27d257804f0418cece75fa479be2ae89fefbbd2f5df3e7db0e4fa9e7aded25c3d88e3239008c314b5a1f73
 DIST netbeans-trunk-nightly-201412130001-src.zip 200994486 SHA256 30939e6630fc6feff490e95cb8880194e4508f8acb4abc2c4708545ee01ed8d2 SHA512 2983b84987fcf644a4eed9ae47ff5afce4dcb4e7088e56624b0be59575b6ed49f4e17b95b1d80f0d0179686d059b49d636a988362c4aafd96e02748edcbdc2b3 WHIRLPOOL bd1aea7fc97e1d091b79dc86c1998131a9ba431fbd321cd80fa89f9cc873652f36cda2af8e90d64ef09fb3f20c491e3b97108475cd8c717cfceef08d307a51de
 DIST netbeans-trunk-nightly-201412140001-src.zip 201028548 SHA256 ef045a9d2f46bff6971bde7ec89836a2f243693f85dcc5deb350d8e4988f18d9 SHA512 329f1804defa15b31fd93312079a517b56da7b39576d453090a79eaf51c5fa0176cc0520fcbe9f6a4fc089c63c6420923a340de46328101d7601b4fad8818ace WHIRLPOOL dbb3d020ac8b9d4e0abd8aacb2348f3a3a673a6399c12243ee8030e11be335c862df0edf60ca6df4aadaf83fb1b0e3f8670d8d37d2029ed7e14ce712b11e11c9
+DIST netbeans-trunk-nightly-201412150001-src.zip 201028954 SHA256 e127b68dbb59e5ed8cd10b09b4f4bd458dc054f42994329681041e27a75f52fc SHA512 2782abd4e52073dfb471fb29567886b10a254b629368f66c3a573fd5d9bf08f95945bb38d63970f5a9a07c27ecdcf0c6e10aab0517dd79adcf36da207670d534 WHIRLPOOL c9059f24fa8d68046ff5ce1981b821f3ebce476c9ef7742bbe0bd32f9996d26fd893a606479ea8664ce99ab384dd1d0d92702dd3a6727ef1ec954df5fd392148
 EBUILD netbeans-dlight-7.0.1.ebuild 3624 SHA256 499a9303a1972ee89dfa2685e1dc1e4511c7531ff3b29caadd1136ba25dee82e SHA512 ad60adc5d64f93d03e27170311ce7bd0a6952c8b41cdc51385f8efc9140593201064d162b3130bff7a003570de11963d375d3676476115b1129ac74632d4a227 WHIRLPOOL d68dcdba50b2565d40e1adc484b51c1ed0171c2fcf99fbee08a221e6d9767f96d161d45eda612eb4c4d62e0db6826e2cd124b83e11ee2f7c9bfb6a440ec6821d
 EBUILD netbeans-dlight-7.1.2.ebuild 2935 SHA256 dc7d110b80174b1baeaca9c005e2cc9167540f186c7794067cfb45d335251b9a SHA512 7dc2db63ee40a3e64375eb49e669c54f88cc532d7ac8c7320329f8378a3be15ebc4536208ea2975c7fe4a9b3f2ac60d0ec5b8c9a9da392587fb04838f101e0ec WHIRLPOOL 1801653d9e146eba02642dbdb0a39c235a40e5d3d5ac8d4d5b8d2a570aa62330638355ee8df76693db177c58bbf31271342215c70d7e198e4b6bd905984ed9c7
 EBUILD netbeans-dlight-7.2.ebuild 2650 SHA256 9b0c0049b7cf6894cd44327c3697d4ddfb0dba2aebd6aabc1821b550932cd69d SHA512 0584c2a1cc65193673bded284c454b430fa3f5774c33d704922977d25ed26bf88d090670e330299c85ada2e897e5f124ae9f635a6f8be7d7fd10740482df7eae WHIRLPOOL 1c27b0c84a34865cb8a84062127f49aefcd245fa16fb825d7ee57d24c3f5841935242c16b3250319078762ce4e8aa5bc8dbd8dbe497b39af8e027b9e39ee585f
@@ -125,5 +126,6 @@ EBUILD netbeans-dlight-9999_p20141210.ebuild 2995 SHA256 3106b661b38a2a5156de6d2
 EBUILD netbeans-dlight-9999_p20141212.ebuild 2995 SHA256 e43531fddeb93530393d0e5706b0a6e61d57e7fbe9ec81d428f280ca9b580b36 SHA512 0430e218c5e1019b87601af890fcef6af429ebdc9f4dbf3d9be011e94e6ac20d41899c3c36930df1cfa296cdad6b195312a9b092c91da3e83f9aa6872a44f451 WHIRLPOOL a87625a8d0f97cd491ac7928b62c7dd9f90d9ddac02b4dcd7812a958e44c17a3e523ed0e010387e7fdd1ae833eb10c24438dba8886d1e090e248acdd1e4f60ef
 EBUILD netbeans-dlight-9999_p20141213.ebuild 2995 SHA256 9e776c035310099e0b15f89fa07a95264bfa49cb50152265a3e740cfee242753 SHA512 8ec07e89feb18247f23f1b5b3b2f650f27b58e9af651ee69445bb0df43bec6ae9aa66d9756e017219974160e27371150bf66660e3ea6a3c99d09c5d25cbee0be WHIRLPOOL 4436bafd315f34492aa1078d1f62d0eb71f192b643813bf6f0dfce11def93295cae1cce94acd38a631dbf35934ab94a03083bdb8f716446022b3dbce2aad5a4f
 EBUILD netbeans-dlight-9999_p20141214.ebuild 2995 SHA256 06a59b20ad934f77c14d33106921936d2bc3357e8fc793b93ce1ba66bc2a847c SHA512 e22aab7409159c91478beb412f0ec74e04a05c953ac705b430927fbc4f23833caf49bb9c1b5fb5b5a363d6a778b10b7b09c68f486a8ae45ba8d4a0d2d2edcdb8 WHIRLPOOL e7072481b6eae1b1764caca1f44b87bb97c9567056c52a8c9953716e948a98c7935d68dd08bc4e19c867227caa791329e2bbdbda55bb6128643da5a091657b51
-MISC ChangeLog 139417 SHA256 5a4103d807f286d93ec866d6b10d16437efe702431bf417e74a6bae8e9db64a1 SHA512 017040ff07c3906a50a169ac5124dc5bb944985dacb28b33ac80285dca04fe9d25171d6ce21f74c630edec7978c91ee5a2cb9b8b4e502e9261791bd47e225041 WHIRLPOOL 25444ddc1175038e0edb8f053875be90c5ae11602f11b675041c0655498ce2521e92512fc5f67296a2444e7408bf5152f0b3e8081c310e35b8bff8bd62acaf8d
+EBUILD netbeans-dlight-9999_p20141215.ebuild 2995 SHA256 6c13e748e703c97c6f4589ba6d6e4ac789537c699b8e005ffcf2787be26538d5 SHA512 72279422df36a5da9fb109c5ad731726b6a6f42d6ecbe201101c335af1344df1d547da2df555a034ae66e3aab2fa6c16e8cd22c9af46ff337e68bc3e04d93472 WHIRLPOOL 3eca79082181a0a302df450fc411a093472a856746772670de7951bc93b365eb266a08e8c4e71bb94612953f17bc21a6e3dcc5f6e3b37b8d949bc367b0b3c580
+MISC ChangeLog 139590 SHA256 4acf6afb82c8f12bb4ede23ed64fc1152fe8c5049565ccf1b4acca47ba6cb613 SHA512 774d479e5282a409765e5d9f506cf87430e7b3d237eb92710183f852683954adc6c34b5f367120c7d9b37fccd5c421edcea22c3186307d806f69b4139a6f6cea WHIRLPOOL c9c30c4a26fd141bd43cdef47914912a0b8320aea554c6eae0ea56f93353eb70cccd1d39efff656457c7c9eca36fd5f90e23342cf3ec51c43ad35a0b166acb15
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20141215.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20141215.ebuild
new file mode 100644
index 0000000..2fa48fb
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20141215.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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/2014-12-15_00-01-53/zip/netbeans-trunk-nightly-201412150001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/A7B9C1A891AB76385CC8DB62A50A3B7603517751-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}"/A7B9C1A891AB76385CC8DB62A50A3B7603517751-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/ChangeLog b/dev-java/netbeans-enterprise/ChangeLog
index 73497c9..d2e6ff8 100644
--- a/dev-java/netbeans-enterprise/ChangeLog
+++ b/dev-java/netbeans-enterprise/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-enterprise-9999_p20141215 (15 Dec 2014)
+
+  15 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-enterprise-9999_p20141215.ebuild:
+  bumped to the latest sources
+
 *netbeans-enterprise-9999_p20141214 (14 Dec 2014)
 
   14 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 3658122..28b9549 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -151,6 +151,7 @@ DIST netbeans-trunk-nightly-201412100001-src.zip 199725425 SHA256 31aac95459128b
 DIST netbeans-trunk-nightly-201412120001-src.zip 199804828 SHA256 aa8ddaee11569408ef6f38113a995220cba4f131302d3728bdaaf04f313e8fa7 SHA512 0740ce76fa636162d994fd7c620d8e00cbe86f5771f1e4a4e2801b6c1ae0dc2955626dad7469db8638ba2d373a1c3ad3291ccac736175e7a232aba97183fc68d WHIRLPOOL 0e373351fbea69764c227bed93d7c046f64a9345bc27d257804f0418cece75fa479be2ae89fefbbd2f5df3e7db0e4fa9e7aded25c3d88e3239008c314b5a1f73
 DIST netbeans-trunk-nightly-201412130001-src.zip 200994486 SHA256 30939e6630fc6feff490e95cb8880194e4508f8acb4abc2c4708545ee01ed8d2 SHA512 2983b84987fcf644a4eed9ae47ff5afce4dcb4e7088e56624b0be59575b6ed49f4e17b95b1d80f0d0179686d059b49d636a988362c4aafd96e02748edcbdc2b3 WHIRLPOOL bd1aea7fc97e1d091b79dc86c1998131a9ba431fbd321cd80fa89f9cc873652f36cda2af8e90d64ef09fb3f20c491e3b97108475cd8c717cfceef08d307a51de
 DIST netbeans-trunk-nightly-201412140001-src.zip 201028548 SHA256 ef045a9d2f46bff6971bde7ec89836a2f243693f85dcc5deb350d8e4988f18d9 SHA512 329f1804defa15b31fd93312079a517b56da7b39576d453090a79eaf51c5fa0176cc0520fcbe9f6a4fc089c63c6420923a340de46328101d7601b4fad8818ace WHIRLPOOL dbb3d020ac8b9d4e0abd8aacb2348f3a3a673a6399c12243ee8030e11be335c862df0edf60ca6df4aadaf83fb1b0e3f8670d8d37d2029ed7e14ce712b11e11c9
+DIST netbeans-trunk-nightly-201412150001-src.zip 201028954 SHA256 e127b68dbb59e5ed8cd10b09b4f4bd458dc054f42994329681041e27a75f52fc SHA512 2782abd4e52073dfb471fb29567886b10a254b629368f66c3a573fd5d9bf08f95945bb38d63970f5a9a07c27ecdcf0c6e10aab0517dd79adcf36da207670d534 WHIRLPOOL c9059f24fa8d68046ff5ce1981b821f3ebce476c9ef7742bbe0bd32f9996d26fd893a606479ea8664ce99ab384dd1d0d92702dd3a6727ef1ec954df5fd392148
 EBUILD netbeans-enterprise-7.0.1.ebuild 16338 SHA256 03ea08daaf5d4c5592937929bac33b4af3bac00a23f2167a7ef7b3c172a72abe SHA512 4d24162c7920b9a1c65e6c6753900ead387a4941c2db98b522631bb09889c281bce048a74e2e584f8b5732cfaad1d7125e0cfd37aa2dc81fe85160b0e123ccd8 WHIRLPOOL 35eb648c37cb6e59aca7969c1074c2c280814529aa7ec3c3191b0d3f2a92fa24e1a8d981f343e4217fff52f6100b4884b970df734c45145759889aa6e6661ff2
 EBUILD netbeans-enterprise-7.1.2.ebuild 18060 SHA256 f63721b8ce5e1afbc58f783348f66f1e3501be519a1c9c1287ef860acc64ceda SHA512 2ca89ec8f89f106a284136d4d0ed52fe3bcf49c650d56ded6e62306c531e5e41f62b8aa923cb544842cf6e34e5f433fecb278bc1515abac987e2d00fb68ffa26 WHIRLPOOL 879067d72285aa6c7273e84ddc3dfef7d09c7cb9f9a6c279fddfbd3eea6439dea053d3c648fcd56d47ef2292db14d101307eb1aa8b3081dfcdbc3dac4d0c3ed9
 EBUILD netbeans-enterprise-7.2.ebuild 17752 SHA256 2f46916df731fe33c5d4626ae580a77686c392932a3388f755324bc3184bd636 SHA512 3543d033b971108fa2b8e6633ed640e812a83b34807e1cb5a69d425823d1fec1c13ecba3cc36fa4504fbfd6297e7eff1ecabe07d01725d9f13c99ffd70d220ba WHIRLPOOL 512753153bbf714ae3fbf9c580f350234d88bd5ce5690e7bc0fadd1c355bd38c2a5c1e9adb7993c3678d759661bbfb1654b0630e3535a2fb9198742fa7fd2c1e
@@ -207,5 +208,6 @@ EBUILD netbeans-enterprise-9999_p20141210.ebuild 15147 SHA256 067286b12a6612a189
 EBUILD netbeans-enterprise-9999_p20141212.ebuild 15147 SHA256 1e667fa79f183ee7af3aad42f4894e78660f80e46aef512b12ad77468c400791 SHA512 5bced9ec9c81ac8782fd7a009d77f0a7d55796ec8e74c906f22e344a7534a21a08f1a630d228e24f975459944d12c058e89321f82fecfcc293a07d9a4d9b591e WHIRLPOOL 0f172fa05a959b79594dd771c27582036674966ff884fd20406960ad52137991125a9920b3f7c67d4f7e9483b92f1c266915139cd369008436d57bd14ff6d371
 EBUILD netbeans-enterprise-9999_p20141213.ebuild 15147 SHA256 4a8e3024203451042a86e7ce51bf1af99195df47eec145f8113f22aa425773f3 SHA512 8bc5caa7a2e77066ec65347d2bf2c68873c8879eab9b4642c22e3feb588b69053556659cdea1535d46d2198bc8d7f04c94e4c638abea85c357a018ebc56f81a0 WHIRLPOOL 4c23fcd4d91a8b355f7b335107370a1be05139cd89a257623ad8b1049c8b9fe75a4675639e71e457ae05aeaa272c183aa8dd2a62ed4246b4b4881646f9805390
 EBUILD netbeans-enterprise-9999_p20141214.ebuild 15147 SHA256 daf4995d1a7e3826df33e9596ebf2f1d1cbaf80cbfdff501749ae5b818487c2c SHA512 116489b2dcb51998fd25118144052977b8127e374c082273312b991ef23cb49ca22be8d416025212b255eeee04a210a2c5b5543beaa15d1a44dfa367c79c92dd WHIRLPOOL 15076363f371cd858f281b8e91d5226d6b33a7bc2e32b629fccb3c3ab1c92aa59b7fbc7d874c1fafac0533704db483896c51aa5627c2c390657e3897a827b126
-MISC ChangeLog 146839 SHA256 9068b1dea48e8d78781dcd0951ba07e85710709927a2d470aaa2d7df299f9f6b SHA512 914aecdeb02b516410b3abad7eccd6a8b1e90891ef47597e2b794ff52aa17b43188da327dce430262b469e9c0e582dcf24bc1fb1a34c8a2c3b78abba3f39f537 WHIRLPOOL 769e9a3844483b30804c01c270b7ad9838d8b2ca3c12e22b17920c99518991b71dfa3015629d2f930c548cae6c2623a152f7a80f9f5f47cf5e58a2b1070fea93
+EBUILD netbeans-enterprise-9999_p20141215.ebuild 15147 SHA256 de8254dba13a2460be6e7a2fd63a43d6f77957dfa460713934bfdc441a20aeee SHA512 664ecc6a17699eef34ed9a657c84945fb416a123f922b9092361088f0b974b79b6699f89484da8e621b718c3cceb27aa2a3cad7678c616864ce44abca5f410be WHIRLPOOL a2d57c4bab14fe80745a1a1a486683a59c1c5d55590f712983f2c7577893d17f53b3f260972181e2f7380806ea3ffd809c3426debe7b882bc9057c8bc8eaac1e
+MISC ChangeLog 147020 SHA256 29375125f0d02f37196e5d4376b2b51afa67a7a3f9e47f087608e64fcf08f73c SHA512 39a3355f870eb92b7d0d25b379bdfc911af731dd9a063450b3843bc62bfefeb3e8182dba45201aecb24a7b74ed9ae4509746df0cb28a99f25952309d5d670938 WHIRLPOOL 0431b33530965bc23868fb2c067672772446e0284a4d7c675809d9a4970dc7ab889af63afee7e67ffa50819c8c4ed8745506728a7345697bbf3f79ecec26397e
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20141215.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20141215.ebuild
new file mode 100644
index 0000000..f97ab70
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20141215.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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/2014-12-15_00-01-53/zip/netbeans-trunk-nightly-201412150001-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/75C30C488AD2A18A82C7FE3829F4A33FC7841643-glassfish-tooling-sdk-0.3-b054-246345.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:0[java]
+	dev-java/bsf:2.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/jakarta-oro:2.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}"/75C30C488AD2A18A82C7FE3829F4A33FC7841643-glassfish-tooling-sdk-0.3-b054-246345.jar libs.glassfish.sdk/external/glassfish-tooling-sdk-0.3-b054-246345.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.10.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/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/ChangeLog b/dev-java/netbeans-ergonomics/ChangeLog
index 6bc52df..ebbc693 100644
--- a/dev-java/netbeans-ergonomics/ChangeLog
+++ b/dev-java/netbeans-ergonomics/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-ergonomics-9999_p20141215 (15 Dec 2014)
+
+  15 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ergonomics-9999_p20141215.ebuild:
+  bumped to the latest sources
+
 *netbeans-ergonomics-9999_p20141214 (14 Dec 2014)
 
   14 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 1607f55..92fe708 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -62,6 +62,7 @@ DIST netbeans-trunk-nightly-201412100001-src.zip 199725425 SHA256 31aac95459128b
 DIST netbeans-trunk-nightly-201412120001-src.zip 199804828 SHA256 aa8ddaee11569408ef6f38113a995220cba4f131302d3728bdaaf04f313e8fa7 SHA512 0740ce76fa636162d994fd7c620d8e00cbe86f5771f1e4a4e2801b6c1ae0dc2955626dad7469db8638ba2d373a1c3ad3291ccac736175e7a232aba97183fc68d WHIRLPOOL 0e373351fbea69764c227bed93d7c046f64a9345bc27d257804f0418cece75fa479be2ae89fefbbd2f5df3e7db0e4fa9e7aded25c3d88e3239008c314b5a1f73
 DIST netbeans-trunk-nightly-201412130001-src.zip 200994486 SHA256 30939e6630fc6feff490e95cb8880194e4508f8acb4abc2c4708545ee01ed8d2 SHA512 2983b84987fcf644a4eed9ae47ff5afce4dcb4e7088e56624b0be59575b6ed49f4e17b95b1d80f0d0179686d059b49d636a988362c4aafd96e02748edcbdc2b3 WHIRLPOOL bd1aea7fc97e1d091b79dc86c1998131a9ba431fbd321cd80fa89f9cc873652f36cda2af8e90d64ef09fb3f20c491e3b97108475cd8c717cfceef08d307a51de
 DIST netbeans-trunk-nightly-201412140001-src.zip 201028548 SHA256 ef045a9d2f46bff6971bde7ec89836a2f243693f85dcc5deb350d8e4988f18d9 SHA512 329f1804defa15b31fd93312079a517b56da7b39576d453090a79eaf51c5fa0176cc0520fcbe9f6a4fc089c63c6420923a340de46328101d7601b4fad8818ace WHIRLPOOL dbb3d020ac8b9d4e0abd8aacb2348f3a3a673a6399c12243ee8030e11be335c862df0edf60ca6df4aadaf83fb1b0e3f8670d8d37d2029ed7e14ce712b11e11c9
+DIST netbeans-trunk-nightly-201412150001-src.zip 201028954 SHA256 e127b68dbb59e5ed8cd10b09b4f4bd458dc054f42994329681041e27a75f52fc SHA512 2782abd4e52073dfb471fb29567886b10a254b629368f66c3a573fd5d9bf08f95945bb38d63970f5a9a07c27ecdcf0c6e10aab0517dd79adcf36da207670d534 WHIRLPOOL c9059f24fa8d68046ff5ce1981b821f3ebce476c9ef7742bbe0bd32f9996d26fd893a606479ea8664ce99ab384dd1d0d92702dd3a6727ef1ec954df5fd392148
 EBUILD netbeans-ergonomics-7.0.1.ebuild 2884 SHA256 e8e4a785fc11b6d0d3c722826761581b8c9c779c5460dc7d1487b3154f4402ab SHA512 3ba2810e650726f48fbdb1bc0c58b6ee1e7d9d29d4be3b27c00bc981b773f26d979fd90154184276e044eafd1d4d8940b47d6f0f58589f9cff7fbadef5fbb05f WHIRLPOOL 5fab7fe6492f91bd0e97a8a95c0652266d771e9b60957e16ce6ff683c1e38081372151cd8c7bea44ee1f1dd7bf435f8b00b9a1a23e4c6106c990794c6093ba10
 EBUILD netbeans-ergonomics-7.1.2.ebuild 2893 SHA256 cd56250980429160b8fa9deb17f15050d016394d5fdef19bf772cf29988c86d8 SHA512 32d4556218791a32efb8cf8ec8303f7e8f27bfb03b97af0c66cee717563c7e02fcd9e350b0425ec0cec28ab09865d4815aba1471ee958e05e7c42e421a7f71c2 WHIRLPOOL 318c8528c2338c1e2f6e342c263be52753fa74c9ac934b0ee60fe0fff2146e86d1761fef8eaeca8eab844709bea2196fbe181fad1f689a9d5b9994da3271b4db
 EBUILD netbeans-ergonomics-7.2.ebuild 2876 SHA256 ca7184ac24c255941c4ec3e686c4237ef0af4be7242c44417fa799813083515e SHA512 c6537bedf2fed4ea914c74a208124fe692af837ab2c81c98b8aa0347cb9d5af496378a8c042437facced26d3b42b101225dfa8b81dfc3d6ec4e3e5613e359f72 WHIRLPOOL c7e4c08ace118690f454dbf6a9040bff3e7013c646947fd02b05bca2b4d802393b6eca3234c6228f8e4df4da1ed193ecfd93c848038e4dd9ae3f50959692aa15
@@ -118,5 +119,6 @@ EBUILD netbeans-ergonomics-9999_p20141210.ebuild 2919 SHA256 abf4148955f06ee0ea7
 EBUILD netbeans-ergonomics-9999_p20141212.ebuild 2919 SHA256 f77cf2753c5d9be464ce96dceba17090d0fd0b37391c4a0f14542636c3ba0d2d SHA512 446bfc02e6830f955da69006fe46b9eb0932f900aa6620792c1b67a661ccd47d548eb9e3496a094ab6076e6618a105102f319fc000232200196235590f399a79 WHIRLPOOL c37f0e151d2b4e108597eff64e7e02fab19dc01f2e6915e8c7157431cbcb16efc51466ee3365495070801107b9d3869c754c86f12e2879ccb1f8c0e69bc6af33
 EBUILD netbeans-ergonomics-9999_p20141213.ebuild 2919 SHA256 ae3a0ed3bbab7fed679274884fb679f6cca641b32fdf33e8af1f039458287ebe SHA512 d95c4ec22d01729ebff0424f4e26beb9ac89aaf5f39dddc906053428d9dcfedaa1122abd6b63e5315b2a8f2f609793b06ba8a01bebc7717cd3293faf8d941e87 WHIRLPOOL 79cd2a88f6634f07d0fb293a5c5b9999f86a7453373c14ad5364beb52f52ec377ef4e7b0328a8576c40bd49e63b6d7bfee270cf6c15e9134c04ba9979e083d87
 EBUILD netbeans-ergonomics-9999_p20141214.ebuild 2919 SHA256 e36395c7afe8be3fa5db6eccf33a3ecfbeb52cf28fd4278a0ac607a9bde51b80 SHA512 af88d24a5beeb7a47a6f39fbd07ae664e701acde3f182736b1acbd2664ab7ea34e4aae51fb45c8a618e56bf79a44076b57e763f96f8d2369237f563c42a14fff WHIRLPOOL 936e578679df4b50536294051134d888e24591e8475a76c401673ea8db36f3ebde6b33c852f811db7afad17f719f14f0ee5cba1e67771ad5dab86181a47fef4b
-MISC ChangeLog 146314 SHA256 2f8bdec39dd33b1bd30689bfef57bba892d9d4801f96e978fe9c5a569a4ecb67 SHA512 4257f79b3ad1a1c42d0d4db1c35be3e599ecfeabab93f4ecc61973b3eeca6834e26b4661859ce328583d7615969d09dc1a5301f97212964d6be75c1844bc81a1 WHIRLPOOL d2c02883dd9deea56e7391805d78d129758054699f3c454cec334b293bd369a16ea522be906d2e6730a51b036a592617661352d1ea9506f751d4e696ac9ce90f
+EBUILD netbeans-ergonomics-9999_p20141215.ebuild 2919 SHA256 d8131ea656947195c16c84cee47ac71706f9bb1d3d1d1f2a9bf73ad7cf64b45c SHA512 e60100107d860e645159f8d14d42befaf677f1510d795e2511e947a9aea676ca24c0cf06d7d1f1aa5204556e0371d055a682a6ae99a7119ff04f3daa17704203 WHIRLPOOL 2f0bdd417244ba941724bb0bb66e1984a7ecd897d3f98bf16360c56c74c8e4f75f82d8f65548b5978d49f848623766d32124ec16fdc67e7d29cab1c9481f71e6
+MISC ChangeLog 146495 SHA256 ec2345eb5b2eae08af9a6ff312493c9096d6f9e2d508a026d4d439fe15963e3c SHA512 c689d704d14aacedd2fc52f3ab1dff40f3811bef28cb94433048afab68e2b80bb887c515848acb853a58f71133b31cfaa25f9df9e6ef4e1614d275c736d310bf WHIRLPOOL eff24733d0fe25ff7ef535f88c155c2a4abacd37624619f23c17d6e8d48a66dff8c176aa764e410bc5300f2cb1eb476500c70d0b65b0c3e2ef4e424cf5c7e734
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20141215.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20141215.ebuild
new file mode 100644
index 0000000..1bc5162
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20141215.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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/2014-12-15_00-01-53/zip/netbeans-trunk-nightly-201412150001-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/ChangeLog b/dev-java/netbeans-extide/ChangeLog
index bd5f92c..672409d 100644
--- a/dev-java/netbeans-extide/ChangeLog
+++ b/dev-java/netbeans-extide/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-extide-9999_p20141215 (15 Dec 2014)
+
+  15 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-extide-9999_p20141215.ebuild:
+  bumped to the latest sources
+
 *netbeans-extide-9999_p20141214 (14 Dec 2014)
 
   14 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index 7f823da..2150586 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -60,6 +60,7 @@ DIST netbeans-trunk-nightly-201412100001-src.zip 199725425 SHA256 31aac95459128b
 DIST netbeans-trunk-nightly-201412120001-src.zip 199804828 SHA256 aa8ddaee11569408ef6f38113a995220cba4f131302d3728bdaaf04f313e8fa7 SHA512 0740ce76fa636162d994fd7c620d8e00cbe86f5771f1e4a4e2801b6c1ae0dc2955626dad7469db8638ba2d373a1c3ad3291ccac736175e7a232aba97183fc68d WHIRLPOOL 0e373351fbea69764c227bed93d7c046f64a9345bc27d257804f0418cece75fa479be2ae89fefbbd2f5df3e7db0e4fa9e7aded25c3d88e3239008c314b5a1f73
 DIST netbeans-trunk-nightly-201412130001-src.zip 200994486 SHA256 30939e6630fc6feff490e95cb8880194e4508f8acb4abc2c4708545ee01ed8d2 SHA512 2983b84987fcf644a4eed9ae47ff5afce4dcb4e7088e56624b0be59575b6ed49f4e17b95b1d80f0d0179686d059b49d636a988362c4aafd96e02748edcbdc2b3 WHIRLPOOL bd1aea7fc97e1d091b79dc86c1998131a9ba431fbd321cd80fa89f9cc873652f36cda2af8e90d64ef09fb3f20c491e3b97108475cd8c717cfceef08d307a51de
 DIST netbeans-trunk-nightly-201412140001-src.zip 201028548 SHA256 ef045a9d2f46bff6971bde7ec89836a2f243693f85dcc5deb350d8e4988f18d9 SHA512 329f1804defa15b31fd93312079a517b56da7b39576d453090a79eaf51c5fa0176cc0520fcbe9f6a4fc089c63c6420923a340de46328101d7601b4fad8818ace WHIRLPOOL dbb3d020ac8b9d4e0abd8aacb2348f3a3a673a6399c12243ee8030e11be335c862df0edf60ca6df4aadaf83fb1b0e3f8670d8d37d2029ed7e14ce712b11e11c9
+DIST netbeans-trunk-nightly-201412150001-src.zip 201028954 SHA256 e127b68dbb59e5ed8cd10b09b4f4bd458dc054f42994329681041e27a75f52fc SHA512 2782abd4e52073dfb471fb29567886b10a254b629368f66c3a573fd5d9bf08f95945bb38d63970f5a9a07c27ecdcf0c6e10aab0517dd79adcf36da207670d534 WHIRLPOOL c9059f24fa8d68046ff5ce1981b821f3ebce476c9ef7742bbe0bd32f9996d26fd893a606479ea8664ce99ab384dd1d0d92702dd3a6727ef1ec954df5fd392148
 EBUILD netbeans-extide-7.4.ebuild 3311 SHA256 8585e0b9eac3b9bb35d5b5e0152936f84708a824d76831930a3dfd3d196556b0 SHA512 19eceec7a634923b4712eb277a1ff9900a2eb4d9ac0a2c699175333c263f0c02baaf24eb30bd7919444f5c9df751186689b2d4359ca1c88dca02884d7c18c3cd WHIRLPOOL e64509f198c4d09851f98d5bd2ddd5b469b0a7c0f3122f391c17833e5d6d77b7a6c2fd9e942e34f2df42047504ad40593f97af9b2898450e769c7b012355c316
 EBUILD netbeans-extide-8.0.2.ebuild 3315 SHA256 91d5ece7097d8bff6d04ebbfd12b6fefb787b41ef33b4288e31e9babc49feca1 SHA512 42f4767cf06a9528d02db53f4d487a495135934302e33bcac9384cfd174260ff922638c9a0e659c537c50a81f91372aaf9d2585b4505b999e681dca9acaea4e0 WHIRLPOOL c55f05d55e8dc22478d29cf9e8ecd15de3e402f19e2d41cd302ec8f0b0d0f23dd434fded92761d5bbc55e1219a6d424afe8754b146f8312248e3a53dfede3b2d
 EBUILD netbeans-extide-8.0.ebuild 3305 SHA256 b2d57e2e2d92760ead3d383fe4dd5b4fb9fc2807a9b58c6f40b44fc24072b8bb SHA512 6e7f12758188a564ef6b5cf8b0ffdf79e30d1021172d10f215d04e727bc4001e4385fd0961a26a6bb42638089e0919b1d4628a13ba11a3deac94d4693c7210d5 WHIRLPOOL adac8461de43669b7bb98ea8920c0a2944837211a37503b957221149d4b91c4bd92b6db160191990b838c474495c65f62c8a4bb9fdbcaa371b4648a335b1afa9
@@ -112,5 +113,6 @@ EBUILD netbeans-extide-9999_p20141210.ebuild 3383 SHA256 c02c11a3cefffcde4abe1f6
 EBUILD netbeans-extide-9999_p20141212.ebuild 3383 SHA256 f0f3b4c82bc08b4e55e1d2ba9308da82f180cc03c6fba0f1842a6bbb37b4a8c8 SHA512 d2cb6b70da3cf2f5fb17d4f07681f98dbe01989c29af893da89cf059afd71d612bd4a8bb6069c5a9b7e2e0b457a1210adfe1b8890e80e8213669c2d09d34e37a WHIRLPOOL ca5c2e8544ed0aaf71cb2a0029801a28cc8226b7808e9ad8f6573511f0043afba866893487fb749d5837892112128f605247537ed484605902ebc3032fc99905
 EBUILD netbeans-extide-9999_p20141213.ebuild 3383 SHA256 5113da7d61a6f688ed0c4427a38a54ef99a0e9dc9346bea6ee37aba5867249bc SHA512 ee06b02f91381edbc3874a6567c53d962d05265909470e8c3caa6f00206532447860024adabf7d719ea00c3e3b50eaf927531e4bdb328a12ace7f13f383dc498 WHIRLPOOL 47ba3e0017f34d02980460c234d0260734af1df1f1e4dc66e268be31981c0e18e37dbe32f37036816c9a2cac9d0d63323a11d2c4171a5f8521b1355881346b64
 EBUILD netbeans-extide-9999_p20141214.ebuild 3383 SHA256 e388ba20488d462bceaa2968d1d1635b9d42e66dfc6c41904f52d017c503844f SHA512 ed0c7721886d921d972d84d24da439b2a4e3fae01117e5ab477f91864d3d9f39f757488bcb6ded28a21508be574f0a33ddeb244c75438917daf63932c65835ca WHIRLPOOL 40e25e68e128c871e0e832d254165047efc28fb76cdb003cd2c64444fbea296b7a334c47d15d9308a8bf1ccd0fd89b3e9c0570ccd1b37142a25c6d5d8910532d
-MISC ChangeLog 71429 SHA256 a347570feee6b2b7bd0749dd78f741aea1e87dc5489bdac5538ba3fa60244f64 SHA512 91f8e3be4dcfd72fe6e966df515b04277101d0fca1e5cedb3c00a23ba2e31bf9388eec051d6051efbbe465e6c0693b9846893e0ca8d64d188de1678f5adb1f2d WHIRLPOOL 8524bc469e080a0d943b032122f4e857f87e5444b0c0b6f9c0189ba519555201eb7f39b694a5eb6166445357a46ec3a93c0a802a89633cf94e756afe5e0b1d8d
+EBUILD netbeans-extide-9999_p20141215.ebuild 3383 SHA256 e2efebf52bcba14e6c3729e6ec4c770eeddbc86431482fb9f811230df429a61d SHA512 49c48bdf8b37794156ddeb1ab50b7bea87b88d153f5ca9163a85402fbb2313499e18fc512cfa1d44495a04dd63a97f3449fa8af71aa4dd9ff8f0758d81a09c75 WHIRLPOOL 7f69e10c86e32261f4c3c7374880758c3835e7ef5959014b3d6a98174c131bf54ccc3352fb30eee3448d69419db8fbfddb4b655f144b4c553695eadcabab877a
+MISC ChangeLog 71602 SHA256 67bf2941c24c3aaff0cfa197e6243afb2ab1d8c91b307f5b781310a742efaca2 SHA512 cd779c05e21f925820a8783168eacc05800117ce506df4625b930d283b583c303c806e31afb29a2804ef0ded5f1ff6df423fbc8eb1fff534dce7835e8c3252c4 WHIRLPOOL 118609c6c90b2e7ef6ba275d9c614b2f20764c27983c1546b3ef9b919e03644cdf8c5e03439f5bb404d301152ec0c43dac53d4c693afc722a8f42b2b23d2b5c6
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20141215.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20141215.ebuild
new file mode 100644
index 0000000..e05d40a
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20141215.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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/2014-12-15_00-01-53/zip/netbeans-trunk-nightly-201412150001-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/ChangeLog b/dev-java/netbeans-groovy/ChangeLog
index 743e66e..d1e4db7 100644
--- a/dev-java/netbeans-groovy/ChangeLog
+++ b/dev-java/netbeans-groovy/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-groovy-9999_p20141215 (15 Dec 2014)
+
+  15 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-groovy-9999_p20141215.ebuild:
+  bumped to the latest sources
+
 *netbeans-groovy-9999_p20141214 (14 Dec 2014)
 
   14 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index aec0dd1..906e2f4 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -66,6 +66,7 @@ DIST netbeans-trunk-nightly-201412100001-src.zip 199725425 SHA256 31aac95459128b
 DIST netbeans-trunk-nightly-201412120001-src.zip 199804828 SHA256 aa8ddaee11569408ef6f38113a995220cba4f131302d3728bdaaf04f313e8fa7 SHA512 0740ce76fa636162d994fd7c620d8e00cbe86f5771f1e4a4e2801b6c1ae0dc2955626dad7469db8638ba2d373a1c3ad3291ccac736175e7a232aba97183fc68d WHIRLPOOL 0e373351fbea69764c227bed93d7c046f64a9345bc27d257804f0418cece75fa479be2ae89fefbbd2f5df3e7db0e4fa9e7aded25c3d88e3239008c314b5a1f73
 DIST netbeans-trunk-nightly-201412130001-src.zip 200994486 SHA256 30939e6630fc6feff490e95cb8880194e4508f8acb4abc2c4708545ee01ed8d2 SHA512 2983b84987fcf644a4eed9ae47ff5afce4dcb4e7088e56624b0be59575b6ed49f4e17b95b1d80f0d0179686d059b49d636a988362c4aafd96e02748edcbdc2b3 WHIRLPOOL bd1aea7fc97e1d091b79dc86c1998131a9ba431fbd321cd80fa89f9cc873652f36cda2af8e90d64ef09fb3f20c491e3b97108475cd8c717cfceef08d307a51de
 DIST netbeans-trunk-nightly-201412140001-src.zip 201028548 SHA256 ef045a9d2f46bff6971bde7ec89836a2f243693f85dcc5deb350d8e4988f18d9 SHA512 329f1804defa15b31fd93312079a517b56da7b39576d453090a79eaf51c5fa0176cc0520fcbe9f6a4fc089c63c6420923a340de46328101d7601b4fad8818ace WHIRLPOOL dbb3d020ac8b9d4e0abd8aacb2348f3a3a673a6399c12243ee8030e11be335c862df0edf60ca6df4aadaf83fb1b0e3f8670d8d37d2029ed7e14ce712b11e11c9
+DIST netbeans-trunk-nightly-201412150001-src.zip 201028954 SHA256 e127b68dbb59e5ed8cd10b09b4f4bd458dc054f42994329681041e27a75f52fc SHA512 2782abd4e52073dfb471fb29567886b10a254b629368f66c3a573fd5d9bf08f95945bb38d63970f5a9a07c27ecdcf0c6e10aab0517dd79adcf36da207670d534 WHIRLPOOL c9059f24fa8d68046ff5ce1981b821f3ebce476c9ef7742bbe0bd32f9996d26fd893a606479ea8664ce99ab384dd1d0d92702dd3a6727ef1ec954df5fd392148
 EBUILD netbeans-groovy-7.0.1.ebuild 3296 SHA256 29c3d304eca5999e78550fd715dbcbef9d15639d4e4f17fa0e45a46803080729 SHA512 43a0ddb43354bb3c0b8e29004ab547da508662d037b0006dfd24250c49470ddc0384bfffb6423f1e3eeaca98410c5de8b314a69970189306869a16380ab098a1 WHIRLPOOL bf626cecf6dec0c51e7e0b95ac4ff26a795e44a5dabd25719eeb2244742d96d33cb20ebbd9a68728dc27d28b8e558a7e2a3ee318c2e4fde234e0b5e8d32e6a58
 EBUILD netbeans-groovy-7.1.2.ebuild 3305 SHA256 1e00f335b8cc1e90deec3c3251629ba699286b25be5b6945d135d271004dc34b SHA512 3a1d67d02054478ed15e11789292fcce3fcfd343b8feebde5e07a9463c380c644310603a3f9f984e8071b0b097075809dce423b888e1f2aed316cb90a562d20e WHIRLPOOL a790c1e186c4d1949de6b4dd975b929c132e3e7b7c455c7867bd1445f59fb6ace72b5c9adf09d0c6079718fdc6c34a0c5f0c9c437517b55b7ae109ce3e20b064
 EBUILD netbeans-groovy-7.2.ebuild 3160 SHA256 6d709b7cc07d7ebb59c3ede0a19c9890ca3230144d7f455cf24d984ac2f633b0 SHA512 e30c8d58165b87a39a356f8b813c593910cd2c247de41420369fee21157c2f2881db34612711f77c9ecd9501aa6d7235ab7bc41d4092be1e68fab778c16d8288 WHIRLPOOL 4a6495ca077f3c374105b25698c8251aaa89daf56c2749bdc73867b0ea1ae404cfc7b2a8b435ef7b19f00aee8128be051c04d6a24fb631379fbe98d6854a507b
@@ -122,5 +123,6 @@ EBUILD netbeans-groovy-9999_p20141210.ebuild 3422 SHA256 ae3e5a2a8249f52e07be03d
 EBUILD netbeans-groovy-9999_p20141212.ebuild 3422 SHA256 2795e3ef0fac86418ce24b78c0a09f426b68f9595d5ae2b067a78b08e5c2a2ad SHA512 b0db84c01f021822712222d873cb17f295c08d516bfdb568e9ab86701d1141d6be1ba18d2bc44ee291dcd19d6320b33b0e5ad03868b11c558afcff58a2505973 WHIRLPOOL 848dd133de25801c6ecfd9881d80a20d6fbdb6e0d25292b52afa7efa111c52b89886f524d2aed74eacfa4c0951d6bc208bc0437e7ac5916c6929d2175c956e84
 EBUILD netbeans-groovy-9999_p20141213.ebuild 3422 SHA256 4f96dca9eb8ce8e64959d3d9117edeae27f9d41e5801d9630577a438ee076059 SHA512 3e53553fbe420f9b2384bbbf6e95eeeb37d98e334c6b5334443bd4071fae46d7826ad88b482098fc27bb0004490fc8b5317a4ddd0ff5bad88ad6f43b94ddf759 WHIRLPOOL dc984df6709c9620602b49884a6987a51484f1cb46d20e1755bb2de18f15e83739c465e91aed521d857e1538a71d0e94d23e50559beb59ff08e6cbf9de209f9d
 EBUILD netbeans-groovy-9999_p20141214.ebuild 3422 SHA256 54a3c454ce20674fb2fc8fa09deb8003a4b2b55cf66555eb7a8d53a46d812cc2 SHA512 8b731c70373a3e075c652d62ad15584fd8ef213c92f23c3f88e9c1d488e64b5296b3d688f43d357c2889d6bba510ae1e2d52a099880ad4e8d8305dddf54c5129 WHIRLPOOL 8efaf6f0b8f1b74250bae2d3a1835dc03b0a1914b6ba31ffceb0ea66a91727ae6a2e3f2265c04d84f0a868cf15615fd405bb7f155f2729a006c9ac809ff6008b
-MISC ChangeLog 139409 SHA256 2a1df5b55ed14a41cc8e937110e384dcfbb84156d6e846300e8d5942499920f1 SHA512 e9f8d1ca5dc509c1922550a242fb534f05c80c944301ac0bf85895633757dc05ffa9191399d2c95fe8e5917a08bc3538867b4ce357d1ced9eefbcb6323e509c4 WHIRLPOOL ad41784a3476ccd101d5c357dc7df7921f7d71002d00287fc83a0eb340440f9ca464c852ee790b03cd2c381f8de6d465495932b180111faf85671f0e06e08965
+EBUILD netbeans-groovy-9999_p20141215.ebuild 3422 SHA256 614e9b44507dc2ef5753d627159ac96bb4bba7536cf9ccded4fbef3d7c552732 SHA512 de2634c5082f68673ce0e1f0b372fca59ae7a06d615132b6f022cdc4135d47158ed492433564da9f67082c03102e6bbe2949627a895b253aa06d35ce664ee90d WHIRLPOOL 1a608408214b2787dc40aa70c9b734363badc4f529a78310beea770b2d019b24326b59a692266e86383ed8171f340267e671578e7d54104acc00ea1363863703
+MISC ChangeLog 139582 SHA256 1e41024bc5bb488e2118928ad33718e107371f3193bc2affd6ef65138402d92f SHA512 90e131a38b8a3f2e1f81e153f93b0dbc5aefcd6f62d31c2024f588b0fdfc2e4c06af1c35e4303181eb2db676f2e28fafacffc38d5f09fbd4b38e71bc2a248140 WHIRLPOOL 7302323c5d39f07029b5483f7be7b9b8dda891286d3e45ed115f7f01f02566c8b5cba163f9535e0dc05f2bc08b1ceca47a5b7659374f43a9cbb0013f831ef914
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20141215.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20141215.ebuild
new file mode 100644
index 0000000..37f941a
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20141215.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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/2014-12-15_00-01-53/zip/netbeans-trunk-nightly-201412150001-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/ChangeLog b/dev-java/netbeans-harness/ChangeLog
index ebabe57..87b266c 100644
--- a/dev-java/netbeans-harness/ChangeLog
+++ b/dev-java/netbeans-harness/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-harness-9999_p20141215 (15 Dec 2014)
+
+  15 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-harness-9999_p20141215.ebuild:
+  bumped to the latest sources
+
 *netbeans-harness-9999_p20141214 (14 Dec 2014)
 
   14 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 1fe625e..4db0bc1 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -68,6 +68,7 @@ DIST netbeans-trunk-nightly-201412100001-src.zip 199725425 SHA256 31aac95459128b
 DIST netbeans-trunk-nightly-201412120001-src.zip 199804828 SHA256 aa8ddaee11569408ef6f38113a995220cba4f131302d3728bdaaf04f313e8fa7 SHA512 0740ce76fa636162d994fd7c620d8e00cbe86f5771f1e4a4e2801b6c1ae0dc2955626dad7469db8638ba2d373a1c3ad3291ccac736175e7a232aba97183fc68d WHIRLPOOL 0e373351fbea69764c227bed93d7c046f64a9345bc27d257804f0418cece75fa479be2ae89fefbbd2f5df3e7db0e4fa9e7aded25c3d88e3239008c314b5a1f73
 DIST netbeans-trunk-nightly-201412130001-src.zip 200994486 SHA256 30939e6630fc6feff490e95cb8880194e4508f8acb4abc2c4708545ee01ed8d2 SHA512 2983b84987fcf644a4eed9ae47ff5afce4dcb4e7088e56624b0be59575b6ed49f4e17b95b1d80f0d0179686d059b49d636a988362c4aafd96e02748edcbdc2b3 WHIRLPOOL bd1aea7fc97e1d091b79dc86c1998131a9ba431fbd321cd80fa89f9cc873652f36cda2af8e90d64ef09fb3f20c491e3b97108475cd8c717cfceef08d307a51de
 DIST netbeans-trunk-nightly-201412140001-src.zip 201028548 SHA256 ef045a9d2f46bff6971bde7ec89836a2f243693f85dcc5deb350d8e4988f18d9 SHA512 329f1804defa15b31fd93312079a517b56da7b39576d453090a79eaf51c5fa0176cc0520fcbe9f6a4fc089c63c6420923a340de46328101d7601b4fad8818ace WHIRLPOOL dbb3d020ac8b9d4e0abd8aacb2348f3a3a673a6399c12243ee8030e11be335c862df0edf60ca6df4aadaf83fb1b0e3f8670d8d37d2029ed7e14ce712b11e11c9
+DIST netbeans-trunk-nightly-201412150001-src.zip 201028954 SHA256 e127b68dbb59e5ed8cd10b09b4f4bd458dc054f42994329681041e27a75f52fc SHA512 2782abd4e52073dfb471fb29567886b10a254b629368f66c3a573fd5d9bf08f95945bb38d63970f5a9a07c27ecdcf0c6e10aab0517dd79adcf36da207670d534 WHIRLPOOL c9059f24fa8d68046ff5ce1981b821f3ebce476c9ef7742bbe0bd32f9996d26fd893a606479ea8664ce99ab384dd1d0d92702dd3a6727ef1ec954df5fd392148
 EBUILD netbeans-harness-7.0.1.ebuild 3579 SHA256 f4d09cb7bd5e8485caf75a3020ddb8102d3ea326878ac384ef4aecb011a1f6a5 SHA512 390c26b4a3dbc81ad1ef210b3ea668926398cb38ea13fa37dceb6782b4478b1ceb7a49e9db300f691fb8b31c21c56b25f4c3237c0890f0c637ca45f596c88294 WHIRLPOOL ae1e34af6dd61c30f645f39a825b6235e3eb1f9a42dd23431225513733209a2eb225a741b75342f827a4be0ffbf41b9786a6a6430051f543c321abe3c20da6bd
 EBUILD netbeans-harness-7.1.2.ebuild 3587 SHA256 e0adc470109009641bf48569623bf0fc51a400ac1ba686475c7dae1a5b561c96 SHA512 e4157a6b294c17fd7430802b33253d473120dc16173557e0d7840078f4043a383d5e3672af64f124509e54cc85d590abfa4375f181a32ab8b49e976cb6613cea WHIRLPOOL 423a5844a2c55ea99db4ac78e1c605a55a04f634601c0ac054e739c0ab4a3e9c765778dbd81ccf4a1e50e9d9e4cc29ecfad2ec64b483197927f434b67cd4d773
 EBUILD netbeans-harness-7.2.ebuild 3421 SHA256 47a5281d140b47e0235592c58657a9065d1827175ccca7d0c73fd81e90710090 SHA512 403fd1f49e11b27ef8002c4066fc911dbeadcccc7adddcdded86c6cd95e8bddaf0603c0ccafd0e91ef31a0909508deab1eb326e98e621bcbae7304413acca291 WHIRLPOOL fe3c5f95a606db39861a80201c185cb5a25e2d80698ac78ff724587b54e859f861b834b89aa79aac22f2c5da700532eaafae67fbcc33259ee07d578ba5c7f9ee
@@ -124,5 +125,6 @@ EBUILD netbeans-harness-9999_p20141210.ebuild 4131 SHA256 3393aee82bb3acfa371801
 EBUILD netbeans-harness-9999_p20141212.ebuild 4131 SHA256 5a552f9929477931e4353723e8bddd6a4c8bd29292da2fdf7170d0f11af1d00c SHA512 edfc8d3cb28ff0c61a77f4fafef97fbc57e60ddae9c0009e75e2ee3c6005946604e48e4798a8e09b3c6e0d35b1f0e38d62e3f4d3951673d25d0f4cffca419785 WHIRLPOOL 4a78e4c6a316efa803e7500ecd297e266e855133e87fb83f603428bcea301a61ceab8af8ef5e37bfde73b173a996d7ff01deaca4fca06a30302d7fd96aadf2db
 EBUILD netbeans-harness-9999_p20141213.ebuild 4131 SHA256 4209fabd988806ba76833502e1233b26602268638ad379d2fe11d35134d1195d SHA512 a49b823d6546ebfdc3f2e03bac9b2aed1aa8f6e2fb157ac8c2b66e5a0b4ef131bb0388e27f175ae44993b48aba154e03e70cb885a76ea50162e25a60b52e6ec0 WHIRLPOOL ab8fea25fb23d31c1542165b58e34bee028ba515fca4d922f56a57da7313cd7aa39678bda6c6ac456ccaba1a2f2023d9671cc155dada65d97f09903f4fa72d2d
 EBUILD netbeans-harness-9999_p20141214.ebuild 4131 SHA256 e88cca641fe44a59216bd302d57a30769556cd290cbd92a11ee8a0f187982de2 SHA512 bab3ea7c0ded249798efa4ffc5580015c5512cc6b78f362f62bf20ae46928ab6d54bfbf641cb55e48281a34c277dd634fb4f732b728c22e251ab6089d62fd00a WHIRLPOOL 6a64e31dbbbd1be4a99979187d433c3d65b1f4118fc7f5e6e6dc0bfe54e4b53902d59301f1401c6fc9c383c8f9a9d319b344eaf801686ba4ccbbf9391de8bd56
-MISC ChangeLog 141164 SHA256 c3951379c0c913a105da6f1e3dd7dfa03564846fba198ef14a16cc7fda166a48 SHA512 a5124b84ec0b48df6d501f9520e8932111f6df52d9f0215c961c05018ba457282d8708ee251e27463486260a80c0fc473e1d384604f138e036bc9ad352822626 WHIRLPOOL e48fcc8090a8fd092f4135a127aa74dfa0857e5af067c492fe1f26210273240ebc9f080a5df2c88b465f710eef98a68e1d1eead8734e54449c48f7f7abd3ad3d
+EBUILD netbeans-harness-9999_p20141215.ebuild 4131 SHA256 c10793603b0fd20a1ee1dd7246adb56c2cf9c21bee7e32225ee0d5b0465e0b69 SHA512 729cb9b93d3c3eb32355194924009d5c0c60341f70d2d6d9d90d74dfbfe9af219906d4e96f57a1988cd648007b3d237bd184cb123e8043b57ad11049bf8749cd WHIRLPOOL 609fa4daec1e9452e34226e3deee1bbea1bfea3dc472a9de466a33975a7aa44877471bc0fad5873b91953c0fe14b88444b9b18d8cb9cedab0d94fb199332c5d6
+MISC ChangeLog 141339 SHA256 d7b73eb9020cd84582ceec0e2e9f3eb5f7008fa0765e4ac10eb1ed662a6f889d SHA512 9d34beb614430a7ee4294791c6c4927d28322b503e76fe062799ecdbf3e5a90b0e86406f1049be02b579cdb4e902deb64e86d44a72ed85fe5013fe01b763112f WHIRLPOOL ee78cc088164b4d9f89741c8383c968a3aaf7202f26f41d874794283d7d889beeb14631f4244f6a4d230fc943e5d7f8617e58a3055d0fd644fd5c1fade66866c
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20141215.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20141215.ebuild
new file mode 100644
index 0000000..ec9bd7b
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20141215.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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/2014-12-15_00-01-53/zip/netbeans-trunk-nightly-201412150001-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.10.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/ChangeLog b/dev-java/netbeans-ide/ChangeLog
index 0bf9c89..9bb2877 100644
--- a/dev-java/netbeans-ide/ChangeLog
+++ b/dev-java/netbeans-ide/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-ide-9999_p20141215 (15 Dec 2014)
+
+  15 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ide-9999_p20141215.ebuild:
+  bumped to the latest sources
+
 *netbeans-ide-9999_p20141214 (14 Dec 2014)
 
   14 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 66b7446..2c05110 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -244,6 +244,7 @@ DIST netbeans-trunk-nightly-201412100001-src.zip 199725425 SHA256 31aac95459128b
 DIST netbeans-trunk-nightly-201412120001-src.zip 199804828 SHA256 aa8ddaee11569408ef6f38113a995220cba4f131302d3728bdaaf04f313e8fa7 SHA512 0740ce76fa636162d994fd7c620d8e00cbe86f5771f1e4a4e2801b6c1ae0dc2955626dad7469db8638ba2d373a1c3ad3291ccac736175e7a232aba97183fc68d WHIRLPOOL 0e373351fbea69764c227bed93d7c046f64a9345bc27d257804f0418cece75fa479be2ae89fefbbd2f5df3e7db0e4fa9e7aded25c3d88e3239008c314b5a1f73
 DIST netbeans-trunk-nightly-201412130001-src.zip 200994486 SHA256 30939e6630fc6feff490e95cb8880194e4508f8acb4abc2c4708545ee01ed8d2 SHA512 2983b84987fcf644a4eed9ae47ff5afce4dcb4e7088e56624b0be59575b6ed49f4e17b95b1d80f0d0179686d059b49d636a988362c4aafd96e02748edcbdc2b3 WHIRLPOOL bd1aea7fc97e1d091b79dc86c1998131a9ba431fbd321cd80fa89f9cc873652f36cda2af8e90d64ef09fb3f20c491e3b97108475cd8c717cfceef08d307a51de
 DIST netbeans-trunk-nightly-201412140001-src.zip 201028548 SHA256 ef045a9d2f46bff6971bde7ec89836a2f243693f85dcc5deb350d8e4988f18d9 SHA512 329f1804defa15b31fd93312079a517b56da7b39576d453090a79eaf51c5fa0176cc0520fcbe9f6a4fc089c63c6420923a340de46328101d7601b4fad8818ace WHIRLPOOL dbb3d020ac8b9d4e0abd8aacb2348f3a3a673a6399c12243ee8030e11be335c862df0edf60ca6df4aadaf83fb1b0e3f8670d8d37d2029ed7e14ce712b11e11c9
+DIST netbeans-trunk-nightly-201412150001-src.zip 201028954 SHA256 e127b68dbb59e5ed8cd10b09b4f4bd458dc054f42994329681041e27a75f52fc SHA512 2782abd4e52073dfb471fb29567886b10a254b629368f66c3a573fd5d9bf08f95945bb38d63970f5a9a07c27ecdcf0c6e10aab0517dd79adcf36da207670d534 WHIRLPOOL c9059f24fa8d68046ff5ce1981b821f3ebce476c9ef7742bbe0bd32f9996d26fd893a606479ea8664ce99ab384dd1d0d92702dd3a6727ef1ec954df5fd392148
 EBUILD netbeans-ide-7.0.1.ebuild 22653 SHA256 4c1b3e46e2a6cb89d902c7f4fe6ad9306cbd0c9463a514e87d4c6ec019dc0356 SHA512 5dd526a85a70720686c612efb3aa5602c395111d507b91ae4db04c5814b27bafd1480ab7e44e1148b7412f768543110ff58abdf676de303cd3be9d87b87bd373 WHIRLPOOL abaedc56df115c6050ad7824929ee959ba1669fc1f3f9d4cd1eb9f9f948a608828621f46aeedd0b6062c85b1ad4481d12f952a504559e52c110ff37b88ae0d72
 EBUILD netbeans-ide-7.1.2-r1.ebuild 26831 SHA256 2643a4435aa093e292a2728583d8ffbf213dac6a13dad8e47029ed13a2478493 SHA512 5ba14c7b820f2daae788588ae2fdebdc8af6bb870d6ed56adcc2d43810e5dbd2ea21ae639e6b864d6d0b1e69c9aa4f86dfb15e99eb4a170434aadf0109ad876a WHIRLPOOL c9367735f073f9fcf6bb992b6d481aaea1ebe8526907cb6366d432a3f47a0c4d76bc9224206e0e512708dfe896b465878a2a1ad68836c7cd9b51a3a4efa2aecc
 EBUILD netbeans-ide-7.1.2.ebuild 26834 SHA256 1e57e60a1a00b4530f917319b5d8eef915b9669b9dd3ab82b5afabe171d8959a SHA512 4242265c0783a87c028f955425c86596038aa477e3256ff8ba244220a573486bb7f2e47b07b3c94fbef07940a3b32c313a1320b58656a67cb15a490e7307b1ca WHIRLPOOL 1e23b1e4370292500f154527ecd7a0e7ca315ee73588806413f630355677ee8fe9318a0e672b5f6ad60f829c0a5579b37eedbd737bc8ec154aba9f59c53bd337
@@ -302,5 +303,6 @@ EBUILD netbeans-ide-9999_p20141210.ebuild 29641 SHA256 200d9696306e82a5843ea4495
 EBUILD netbeans-ide-9999_p20141212.ebuild 29641 SHA256 4c0abe7b37cd359fae0ed63e6a091def0fcf1b52811cc271aac36fc0a2ee4cda SHA512 4dd27fa63e96d4f920554ea126fa0d9e7f91630dfd21b61549c1d825ef1b667e4c4e86e43e95d414b889fdc867242cca7b4d33407a5ad54bdafcd1b9920ccced WHIRLPOOL a1d3a1abf49524c77db60d095075caf13725df306c47a3e4f2627397bdc0e5233357cebb032748e400b4c7bfbcd8c10fb021515ccda393837e675863d0f3d791
 EBUILD netbeans-ide-9999_p20141213.ebuild 29641 SHA256 aa278a64234c3423b181e49242922cb0499767744eed0cc288992972541b2af8 SHA512 0e55aaa76fdeb9771ae6acaee67f568084939ff108269b39c591bba49655a9b846000a6b5e4f55a12643ed26fce4d4d7b30f6dca1c28524ae05b8af2bb98771b WHIRLPOOL 7887683767a66b35de4bc682716ebb0af5121f59af024d364d05057602be54e23a5523ceea7f2a5a4c749f63305e0eb32a0b9be376903d37b499875bbe569885
 EBUILD netbeans-ide-9999_p20141214.ebuild 29641 SHA256 f3bd26ac52eda8a8031b5491b41ceba8777a6769ee70b778f47faddbdebab308 SHA512 67f9a5e1164e4407a733649a5abc025fbc1fe557514a225e50b521da3ed7fe3d6a716577ea1ea9bad09dcbe9c8b46d93ced0b405d6719ae3a3c38f34b059dbab WHIRLPOOL a4a2bff3b087b106592ffadb35fa9e5793310e76ab017c8bf15a31cdad976abb5d9c22873ee9ae6ace8d38780facbcc305fca94ab73b2b6d6361592b4677ba0c
-MISC ChangeLog 134716 SHA256 d7b9a7c3a8dcd841ca303b118fa61d83178022ddb51b476023a4cfe5073b7145 SHA512 2fae776282a10ed46f2d88af77c5a0d482f8aacfb360531ce7d92e628a14255d65344dddce06740ef81f3b7af0717968f0c465be8979feff4506267475cf548d WHIRLPOOL 1f79b85e6cf4d69c12ee92e7742fd0478f949216a13fbbeea110d2b6909a40509be416968eb930f6bc41e53289dd955dad3fb9fbe4fd9978c832b58e77010b10
+EBUILD netbeans-ide-9999_p20141215.ebuild 29641 SHA256 ce008ddcc3d45e030731dbaca8c2922528ef173a830c764db9197936db1dca40 SHA512 a26c3b74b42094a929bdcd84728046aff8480432fb0f51ece6d30353c038eba63f710a99ad5695555ba7a96d4c3a9adf5929b5d722a2f0c894880853039c66f0 WHIRLPOOL d9397210f9ec8e5779e74fcaa0ea26ae6a82e83fb58a67c74471e7c59db4f708a13e4f7cb3494e3cff01fbabb3537916c970cd4b9519bf26a585cc2711e3406c
+MISC ChangeLog 134883 SHA256 e0a04c27ce9f12918741c8479f875817e92e7e8df8a4519697f7abe6f1ba13d1 SHA512 cdc605b85ab358bbf62ea003612bb6a6eb70b538ce86b77e1ae84587a34923ce4306c0c5fb6f1d0012421fe20a8e0c2b97599fe333a26d4e68fb1a47d267b2bf WHIRLPOOL 77e7a3f3de73542cd5d264d65820374ca20515a854e5a2f1414072608f7a34302e6e5150546c129001842c8b213706a6119d699b7650e989253a5084a830a407
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20141215.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20141215.ebuild
new file mode 100644
index 0000000..825c147
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20141215.ebuild
@@ -0,0 +1,373 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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/2014-12-15_00-01-53/zip/netbeans-trunk-nightly-201412150001-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/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.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/53AFD6CAA1B476204557B0626E7D673FBD5D245C-css3-spec.zip
+	http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip
+	http://hg.netbeans.org/binaries/C40DFDACDF892D1BA14B540B32C11B6F34659931-exechlp-1.0.zip
+	http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar
+	http://hg.netbeans.org/binaries/75C30C488AD2A18A82C7FE3829F4A33FC7841643-glassfish-tooling-sdk-0.3-b054-246345.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/4388C34B9F085A42FBEA06C5B00FDF0A251171EC-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/DA6CE3C2EB334DB61EFA99CD66134619867368FA-js-corestubs.zip
+	http://hg.netbeans.org/binaries/997BF4A93B8A99E37AB51C9016D1D18CF5FF4B60-js-domstubs.zip
+	http://hg.netbeans.org/binaries/291540295937BAC426A5A5BDDB6D86604075F4C0-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/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/7052E115041D04410A4519A61307502FB7C138E6-org.eclipse.core.contenttype_3.4.100.v20110423-0524.jar
+	http://hg.netbeans.org/binaries/B19A4D998C76FE7A30830C96B9E3A47682F320FC-org.eclipse.core.jobs-3.5.101.jar
+	http://hg.netbeans.org/binaries/E64EF6A3FC5DB01AD95632B843706CCE56614C90-org.eclipse.core.net_1.2.100.I20110511-0800.jar
+	http://hg.netbeans.org/binaries/6658C235056134F7E86295E751129508802D71F2-org.eclipse.core.runtime-3.7.0.jar
+	http://hg.netbeans.org/binaries/0CA9B9DF8A8E4C6805C60A5761C470FCE8AE828F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110.jar
+	http://hg.netbeans.org/binaries/9C74D245214DB08E7EB9BC07A951B41CFE3E3648-org.eclipse.equinox.app-1.3.100.jar
+	http://hg.netbeans.org/binaries/78E5D0B8516B042495660DA36CE5114650F8F156-org.eclipse.equinox.common_3.6.0.v20110523.jar
+	http://hg.netbeans.org/binaries/FD94003A1BCE42008753522BFED68E5A84B92644-org.eclipse.equinox.preferences-3.4.2.jar
+	http://hg.netbeans.org/binaries/54AE046B40C9095C2637F8D21664C5CD76E34485-org.eclipse.equinox.registry_3.5.200.v20120522-1841.jar
+	http://hg.netbeans.org/binaries/0FFB9B1D7CD992CE6C8AAEEC2F6F98DFBB1D2F91-org.eclipse.equinox.security-1.1.1.jar
+	http://hg.netbeans.org/binaries/7FE73A21F4A078ABAAFACE4D2B03B5EB3D306F63-org.eclipse.jgit-3.4.1.201406201815-r.jar
+	http://hg.netbeans.org/binaries/49F1EFEBC8CECA5D514209BE18A048EB5707C0A7-org.eclipse.jgit.java7-3.4.1.201406201815-r.jar
+	http://hg.netbeans.org/binaries/A94F8F805202B28236FFBC03C1CA149129DAEA1C-org.eclipse.mylyn.bugzilla.core_3.10.0.20131024-1218.jar
+	http://hg.netbeans.org/binaries/19D64C17A692D2023E22B16AD515118DF6427790-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710.jar
+	http://hg.netbeans.org/binaries/A1BF01D1DD09274446738C3F83360314B8881CD5-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210.jar
+	http://hg.netbeans.org/binaries/136A7EB3BB9B2559C5F9184B438F108C959B3C03-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116.jar
+	http://hg.netbeans.org/binaries/531746EBE57071AB7F8CCC7ACB0E806F25893916-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116.jar
+	http://hg.netbeans.org/binaries/D3ED088A49DE9E5163457E9279181DD4185BFBE6-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023.jar
+	http://hg.netbeans.org/binaries/8D4278A9F47D17A104182E59CF06D682B3DE0B3E-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055.jar
+	http://hg.netbeans.org/binaries/1FC011B8A350B70950B3F1D722D7F2890C6E76D8-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055.jar
+	http://hg.netbeans.org/binaries/6E914CA3075C8FDF7652F04A02868CF32F2EDCE3-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055.jar
+	http://hg.netbeans.org/binaries/8A2F6232978E0330A5D36F19BA0686F96FB980B5-org.tmatesoft.svnkit_1.8.4.r10218_v20140302_1242.jar
+	http://hg.netbeans.org/binaries/820FD32B3FB7F885996B15474F220BDCCACD6D27-processtreekiller-1.0.2.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/CE9A1C96875443F2FDD5127B750DA39CF4CE818B-com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.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-httpclient:3
+	dev-java/commons-lang:2.1
+	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/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/freemarker:2.3
+#	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/trilead-ssh2:0 in overlay
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	dev-java/commons-codec:0
+	>=dev-java/jsch-0.1.46:0
+	dev-java/jzlib: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}"/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar o.apache.commons.io/external/commons-io-1.4.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}"/53AFD6CAA1B476204557B0626E7D673FBD5D245C-css3-spec.zip css.editor/external/css3-spec.zip || die
+	ln -s "${DISTDIR}"/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip derby/external/derbysampledb.zip || die
+	ln -s "${DISTDIR}"/C40DFDACDF892D1BA14B540B32C11B6F34659931-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}"/75C30C488AD2A18A82C7FE3829F4A33FC7841643-glassfish-tooling-sdk-0.3-b054-246345.jar libs.glassfish.sdk/external/glassfish-tooling-sdk-0.3-b054-246345.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}"/4388C34B9F085A42FBEA06C5B00FDF0A251171EC-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}"/DA6CE3C2EB334DB61EFA99CD66134619867368FA-js-corestubs.zip javascript2.editor/external/js-corestubs.zip || die
+	ln -s "${DISTDIR}"/997BF4A93B8A99E37AB51C9016D1D18CF5FF4B60-js-domstubs.zip javascript2.editor/external/js-domstubs.zip || die
+	ln -s "${DISTDIR}"/291540295937BAC426A5A5BDDB6D86604075F4C0-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}"/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}"/7052E115041D04410A4519A61307502FB7C138E6-org.eclipse.core.contenttype_3.4.100.v20110423-0524.jar o.eclipse.core.contenttype/external/org.eclipse.core.contenttype_3.4.100.v20110423-0524.jar || die
+	ln -s "${DISTDIR}"/B19A4D998C76FE7A30830C96B9E3A47682F320FC-org.eclipse.core.jobs-3.5.101.jar o.eclipse.core.jobs/external/org.eclipse.core.jobs-3.5.101.jar || die
+	ln -s "${DISTDIR}"/E64EF6A3FC5DB01AD95632B843706CCE56614C90-org.eclipse.core.net_1.2.100.I20110511-0800.jar o.eclipse.core.net/external/org.eclipse.core.net_1.2.100.I20110511-0800.jar || die
+	ln -s "${DISTDIR}"/6658C235056134F7E86295E751129508802D71F2-org.eclipse.core.runtime-3.7.0.jar o.eclipse.core.runtime/external/org.eclipse.core.runtime-3.7.0.jar || die
+	ln -s "${DISTDIR}"/0CA9B9DF8A8E4C6805C60A5761C470FCE8AE828F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110.jar o.eclipse.core.runtime.compatibility.auth/external/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110.jar || die
+	ln -s "${DISTDIR}"/9C74D245214DB08E7EB9BC07A951B41CFE3E3648-org.eclipse.equinox.app-1.3.100.jar o.eclipse.equinox.app/external/org.eclipse.equinox.app-1.3.100.jar || die
+	ln -s "${DISTDIR}"/78E5D0B8516B042495660DA36CE5114650F8F156-org.eclipse.equinox.common_3.6.0.v20110523.jar o.eclipse.equinox.common/external/org.eclipse.equinox.common_3.6.0.v20110523.jar || die
+	ln -s "${DISTDIR}"/FD94003A1BCE42008753522BFED68E5A84B92644-org.eclipse.equinox.preferences-3.4.2.jar o.eclipse.equinox.preferences/external/org.eclipse.equinox.preferences-3.4.2.jar || die
+	ln -s "${DISTDIR}"/54AE046B40C9095C2637F8D21664C5CD76E34485-org.eclipse.equinox.registry_3.5.200.v20120522-1841.jar o.eclipse.equinox.registry/external/org.eclipse.equinox.registry_3.5.200.v20120522-1841.jar || die
+	ln -s "${DISTDIR}"/0FFB9B1D7CD992CE6C8AAEEC2F6F98DFBB1D2F91-org.eclipse.equinox.security-1.1.1.jar o.eclipse.equinox.security/external/org.eclipse.equinox.security-1.1.1.jar || die
+	ln -s "${DISTDIR}"/7FE73A21F4A078ABAAFACE4D2B03B5EB3D306F63-org.eclipse.jgit-3.4.1.201406201815-r.jar o.eclipse.jgit/external/org.eclipse.jgit-3.4.1.201406201815-r.jar || die
+	ln -s "${DISTDIR}"/49F1EFEBC8CECA5D514209BE18A048EB5707C0A7-org.eclipse.jgit.java7-3.4.1.201406201815-r.jar o.eclipse.jgit.java7/external/org.eclipse.jgit.java7-3.4.1.201406201815-r.jar || die
+	ln -s "${DISTDIR}"/A94F8F805202B28236FFBC03C1CA149129DAEA1C-org.eclipse.mylyn.bugzilla.core_3.10.0.20131024-1218.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core_3.10.0.20131024-1218.jar || die
+	ln -s "${DISTDIR}"/19D64C17A692D2023E22B16AD515118DF6427790-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core_3.10.0.20130926-1710.jar || die
+	ln -s "${DISTDIR}"/A1BF01D1DD09274446738C3F83360314B8881CD5-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net_3.10.0.20131018-1210.jar || die
+	ln -s "${DISTDIR}"/136A7EB3BB9B2559C5F9184B438F108C959B3C03-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116.jar o.eclipse.mylyn.commons.repositories.core/external/org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116.jar || die
+	ln -s "${DISTDIR}"/531746EBE57071AB7F8CCC7ACB0E806F25893916-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116.jar || die
+	ln -s "${DISTDIR}"/D3ED088A49DE9E5163457E9279181DD4185BFBE6-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023.jar || die
+	ln -s "${DISTDIR}"/8D4278A9F47D17A104182E59CF06D682B3DE0B3E-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055.jar o.eclipse.mylyn.wikitext.confluence.core/external/org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055.jar || die
+	ln -s "${DISTDIR}"/1FC011B8A350B70950B3F1D722D7F2890C6E76D8-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055.jar || die
+	ln -s "${DISTDIR}"/6E914CA3075C8FDF7652F04A02868CF32F2EDCE3-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055.jar o.eclipse.mylyn.wikitext.textile.core/external/org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055.jar  || die
+	ln -s "${DISTDIR}"/8A2F6232978E0330A5D36F19BA0686F96FB980B5-org.tmatesoft.svnkit_1.8.4.r10218_v20140302_1242.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.4.r10218_v20140302_1242.jar || die
+	ln -s "${DISTDIR}"/820FD32B3FB7F885996B15474F220BDCCACD6D27-processtreekiller-1.0.2.jar extexecution.process/external/processtreekiller-1.0.2.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}"/CE9A1C96875443F2FDD5127B750DA39CF4CE818B-com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.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 --build-only --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.49.jar
+	java-pkg_jar-from --build-only --into c.jcraft.jzlib/external jzlib jzlib.jar jzlib-1.0.7.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.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.3.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.lang/external commons-lang-2.1 commons-lang.jar commons-lang-2.4.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/ext
+	pushd "${D}"/${instdir} >/dev/null || 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.3.jar && dosym /usr/share/jvyamlb/lib/jvyamlb.jar ${instdir}/jvyamlb-0.2.3.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/ChangeLog b/dev-java/netbeans-java/ChangeLog
index 946fee6..cf00033 100644
--- a/dev-java/netbeans-java/ChangeLog
+++ b/dev-java/netbeans-java/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-java-9999_p20141215 (15 Dec 2014)
+
+  15 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-java-9999_p20141215.ebuild:
+  bumped to the latest sources
+
 *netbeans-java-9999_p20141214 (14 Dec 2014)
 
   14 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 2a454cb..01093f7 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -141,6 +141,7 @@ DIST netbeans-trunk-nightly-201412100001-src.zip 199725425 SHA256 31aac95459128b
 DIST netbeans-trunk-nightly-201412120001-src.zip 199804828 SHA256 aa8ddaee11569408ef6f38113a995220cba4f131302d3728bdaaf04f313e8fa7 SHA512 0740ce76fa636162d994fd7c620d8e00cbe86f5771f1e4a4e2801b6c1ae0dc2955626dad7469db8638ba2d373a1c3ad3291ccac736175e7a232aba97183fc68d WHIRLPOOL 0e373351fbea69764c227bed93d7c046f64a9345bc27d257804f0418cece75fa479be2ae89fefbbd2f5df3e7db0e4fa9e7aded25c3d88e3239008c314b5a1f73
 DIST netbeans-trunk-nightly-201412130001-src.zip 200994486 SHA256 30939e6630fc6feff490e95cb8880194e4508f8acb4abc2c4708545ee01ed8d2 SHA512 2983b84987fcf644a4eed9ae47ff5afce4dcb4e7088e56624b0be59575b6ed49f4e17b95b1d80f0d0179686d059b49d636a988362c4aafd96e02748edcbdc2b3 WHIRLPOOL bd1aea7fc97e1d091b79dc86c1998131a9ba431fbd321cd80fa89f9cc873652f36cda2af8e90d64ef09fb3f20c491e3b97108475cd8c717cfceef08d307a51de
 DIST netbeans-trunk-nightly-201412140001-src.zip 201028548 SHA256 ef045a9d2f46bff6971bde7ec89836a2f243693f85dcc5deb350d8e4988f18d9 SHA512 329f1804defa15b31fd93312079a517b56da7b39576d453090a79eaf51c5fa0176cc0520fcbe9f6a4fc089c63c6420923a340de46328101d7601b4fad8818ace WHIRLPOOL dbb3d020ac8b9d4e0abd8aacb2348f3a3a673a6399c12243ee8030e11be335c862df0edf60ca6df4aadaf83fb1b0e3f8670d8d37d2029ed7e14ce712b11e11c9
+DIST netbeans-trunk-nightly-201412150001-src.zip 201028954 SHA256 e127b68dbb59e5ed8cd10b09b4f4bd458dc054f42994329681041e27a75f52fc SHA512 2782abd4e52073dfb471fb29567886b10a254b629368f66c3a573fd5d9bf08f95945bb38d63970f5a9a07c27ecdcf0c6e10aab0517dd79adcf36da207670d534 WHIRLPOOL c9059f24fa8d68046ff5ce1981b821f3ebce476c9ef7742bbe0bd32f9996d26fd893a606479ea8664ce99ab384dd1d0d92702dd3a6727ef1ec954df5fd392148
 EBUILD netbeans-java-7.0.1-r2.ebuild 14932 SHA256 3d8eeb5c3aea368c5064e83e9519b2982a3d0f999db11344ba33605f46f865b0 SHA512 0c99037f44aa968f357724650189fe0f6fc89496fbf73f6c5a9bcd589afa5af4974f058a8eea2b6a97e1884f4cabba8b5ecf0214b7e840870358f0e55abbc595 WHIRLPOOL 4c1ccada62d0c8883033500ead9586e5bfcd360e6030b3d8368b0b16b9ed01cc03d3c3d5888de437a16d5382b5fe9ec7c02f3e200c3c19bc9a43f011f32d3a68
 EBUILD netbeans-java-7.1.2-r1.ebuild 14936 SHA256 6082d8d5022e011e7aa9d4ff92bf9a144a4f733b879127552c0ca55566b0f18c SHA512 c03a674b6d93a4261bff40ad9aaad6fa9bc0451d6017aeb51f14c42113cc2ff12f84ff5a6cc01c01b43c7ce1b4d885da5c9cb4c0e13601c8ff780eb140060ac6 WHIRLPOOL d32f06a7bd7d4924f14fcb2ed67fd2f5a1766087e4f46ed77d12d472c4c133eef5431d75a709da1abcf8b8cff5afef303dd57e82e4022651a7278076502300d6
 EBUILD netbeans-java-7.2.ebuild 12206 SHA256 da05f74f2c02e4aac745dcf1be75069cc7070f241d063c19c40465e139ac135f SHA512 62be228321e175ad03c2a7d9270065445ba9e1ca08a1a51927027ddbc78aa43a0c57c6b4193add993764235068c7128655f2f12e00fcd17fbac807334f2483c6 WHIRLPOOL 5f518535df8a5f1e1e4f0bc5c845ca063317221c619c3e8928c89a4f2bb30be5a03838f5a610bcda58959d535e4fb152f92f4edd780bcd423918b448d7ddf2e1
@@ -197,5 +198,6 @@ EBUILD netbeans-java-9999_p20141210.ebuild 13429 SHA256 8639b53e84d61a49dade1d34
 EBUILD netbeans-java-9999_p20141212.ebuild 13429 SHA256 daef45b77d781416289ca5036315f882e75ff70e1d7f5a59a535bd87778d4828 SHA512 ce61cc922db653902fe1b4213c5953bb0cb113add2dde68070688bbeda5d06cad4d6921d65d4dd074bf9fcf536ce8dd0d45e2f16dbf80814ee58b9c5fb815f0c WHIRLPOOL d2ba225b5fb8cdccef5766a8f23a931111fb3bf5dc7462c535c0fc63298a28025114aae05d77f0caf398cfe3993b4ad681706c21683fffa24958673616eeb4f1
 EBUILD netbeans-java-9999_p20141213.ebuild 13429 SHA256 7a60da72fa54834d29b8b510fbcf8dc8e16440a383c376c5926665695eeb8f0e SHA512 07433b0100f228111975a59c2051b12e06a03d309bb0a16f068c4a52c71ebc15616e40becc16f2c5e75d53cc01d0dda9050778b28785a12e7e82cce8751c0aa5 WHIRLPOOL a082d08051d783429a8b8447e760b5ed253c566110185e3e85ed89a290d259a78468d4b876e9422033e7d51907af562108481f72407d1e4f791258e113f7fb68
 EBUILD netbeans-java-9999_p20141214.ebuild 13429 SHA256 717f7e6c2598153067f91c4aa5d7583643492bd40748a23713cabcdb705cfde3 SHA512 982d3c9d97d8b56e17199069b2fe0810673cb484b3a3f0e01c5ade557addbacc67a032097b572c9d288a450f9b63b749ef7a7061dff0d287654e9ae9652c329c WHIRLPOOL 7be971621e085dabe2c9e4f0863b3f293db672f3cda858365c44556373e650ee869b7faa0356570fa54ee5cbaa52b5ecb57e83d4ed997c8a8fa14ac815a6af00
-MISC ChangeLog 137245 SHA256 aa41e9fd098fd7c61acc36ed8962765354628f2db5e038dee20f2ae452e28799 SHA512 de836aa8add560806a74139a295ce8ac1aea670d4a6903de2463a43530f6e2ed2144c1c5a31697ff2bc50e50a9b89c532c5fb894f2a7f9730955edf9b2060464 WHIRLPOOL 79784066cacc7f084728a9f3695f3de2443960a9c52ae134cb88dae68c50cd39bd3f5b012cb5f637441b7a5f63bca8f0eef34de27b0c5bd436a3b6ef1f7234a5
+EBUILD netbeans-java-9999_p20141215.ebuild 13429 SHA256 83b918f1ef6cc4016ef9ba0bee2755f1dc69bfd130f52cddbb7b763fe5680647 SHA512 490e7db4f5f2c49d69dba06f9a9b0be3d9bb69bbd65ea10fb6f24202d46af24c1f06e8f0e1ca130c2db6db398cd89e19138e7adb60e64ec5cac913386323d06e WHIRLPOOL a49526ffc1ba3d9962ad32768ef4f2b0b6b4b7bf01c5ad76a3084f90ac7f1b207fe650179ef399d77bc774a18c78943add4ebdc4c5648ad6537e8e865a5c8a54
+MISC ChangeLog 137414 SHA256 b9312e29ed745aa4ecbb9520c7fd5903fecaa258ff42b2c848838d06ce29618b SHA512 206de5bb749f5a734b4b8fee6a111b61f8240dde5416b003d40aaa9789ff0941c7b2318d92514c192cfe65e8f4fcb43f7e0f66887d3a33180b78f2245046ef53 WHIRLPOOL 8d87fd72fcfbb07ee9d8dee0e887ef293718987572eedce11b99014682dd891ca644bb1246b7a9c247dd7fd1055c9a16674c76f4e84f942ddd2a1948a2ffaa8f
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20141215.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20141215.ebuild
new file mode 100644
index 0000000..21cdc0d
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20141215.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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/2014-12-15_00-01-53/zip/netbeans-trunk-nightly-201412150001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	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/E5579EF3B0C1EF2F43562DD0C3B32F8E1F603B49-nb-javac-api.jar
+	http://hg.netbeans.org/binaries/38F9F426B1CE20EDC709424F51EDA1C87F13F420-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"
+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:2.2
+	dev-java/jdom:1.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:0[java]
+	dev-java/c3p0:0
+	dev-java/cglib:2.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/saaj:0
+	dev-java/stax-ex: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}"/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}"/E5579EF3B0C1EF2F43562DD0C3B32F8E1F603B49-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
+	ln -s "${DISTDIR}"/38F9F426B1CE20EDC709424F51EDA1C87F13F420-nb-javac-impl.jar libs.javacimpl/external/nb-javac-impl.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
+	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-2.2 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.10.jar
+	java-pkg_jar-from --into maven.embedder/external jdom-1.0 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}/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-2.2/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-2.1/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/Tidy.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
+	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 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 streambuffer.jar && dosym /usr/share/xmlstreambuffer/lib/streambuffer.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-1.0/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/ChangeLog b/dev-java/netbeans-javacard/ChangeLog
index 90fac9c..5253580 100644
--- a/dev-java/netbeans-javacard/ChangeLog
+++ b/dev-java/netbeans-javacard/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javacard-9999_p20141215 (15 Dec 2014)
+
+  15 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javacard-9999_p20141215.ebuild:
+  bumped to the latest sources
+
 *netbeans-javacard-9999_p20141214 (14 Dec 2014)
 
   14 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index 78cea22..c3fb2b2 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -65,6 +65,7 @@ DIST netbeans-trunk-nightly-201412100001-src.zip 199725425 SHA256 31aac95459128b
 DIST netbeans-trunk-nightly-201412120001-src.zip 199804828 SHA256 aa8ddaee11569408ef6f38113a995220cba4f131302d3728bdaaf04f313e8fa7 SHA512 0740ce76fa636162d994fd7c620d8e00cbe86f5771f1e4a4e2801b6c1ae0dc2955626dad7469db8638ba2d373a1c3ad3291ccac736175e7a232aba97183fc68d WHIRLPOOL 0e373351fbea69764c227bed93d7c046f64a9345bc27d257804f0418cece75fa479be2ae89fefbbd2f5df3e7db0e4fa9e7aded25c3d88e3239008c314b5a1f73
 DIST netbeans-trunk-nightly-201412130001-src.zip 200994486 SHA256 30939e6630fc6feff490e95cb8880194e4508f8acb4abc2c4708545ee01ed8d2 SHA512 2983b84987fcf644a4eed9ae47ff5afce4dcb4e7088e56624b0be59575b6ed49f4e17b95b1d80f0d0179686d059b49d636a988362c4aafd96e02748edcbdc2b3 WHIRLPOOL bd1aea7fc97e1d091b79dc86c1998131a9ba431fbd321cd80fa89f9cc873652f36cda2af8e90d64ef09fb3f20c491e3b97108475cd8c717cfceef08d307a51de
 DIST netbeans-trunk-nightly-201412140001-src.zip 201028548 SHA256 ef045a9d2f46bff6971bde7ec89836a2f243693f85dcc5deb350d8e4988f18d9 SHA512 329f1804defa15b31fd93312079a517b56da7b39576d453090a79eaf51c5fa0176cc0520fcbe9f6a4fc089c63c6420923a340de46328101d7601b4fad8818ace WHIRLPOOL dbb3d020ac8b9d4e0abd8aacb2348f3a3a673a6399c12243ee8030e11be335c862df0edf60ca6df4aadaf83fb1b0e3f8670d8d37d2029ed7e14ce712b11e11c9
+DIST netbeans-trunk-nightly-201412150001-src.zip 201028954 SHA256 e127b68dbb59e5ed8cd10b09b4f4bd458dc054f42994329681041e27a75f52fc SHA512 2782abd4e52073dfb471fb29567886b10a254b629368f66c3a573fd5d9bf08f95945bb38d63970f5a9a07c27ecdcf0c6e10aab0517dd79adcf36da207670d534 WHIRLPOOL c9059f24fa8d68046ff5ce1981b821f3ebce476c9ef7742bbe0bd32f9996d26fd893a606479ea8664ce99ab384dd1d0d92702dd3a6727ef1ec954df5fd392148
 EBUILD netbeans-javacard-7.0.1.ebuild 4961 SHA256 566bc7e3275c97d0fe3d68c843b53aee641548ec39a8143aebd56d248da3c32c SHA512 5973c8d4254943473209b0881c0fbe40ac6b61563d508e58adc248dd40c8c2d6b742bd6c1667ee11fb404f9d2e62f08a8e4d822a2a3db9fccab254f73828c3b0 WHIRLPOOL fd1e08943ce754a2abfe8c8b83954399287500ce574a46fe0d76f94b300fd2a5978957f94a3ac1d85781330248a46fefacfbae25db95669c3de910145ef96424
 EBUILD netbeans-javacard-7.1.2.ebuild 4970 SHA256 15ff13152b140edaa549ea6515949d99cdb2a4656918566179836ab2277f01b8 SHA512 b7e52b477f6ba645084034eb27e848fb48361351937fc45455bf4b7d74acbdd257427ec589286f0edc71cc98c8cdb114e55988b6d3dc92143e13f407e3b45a52 WHIRLPOOL 85ab6dc2c230ea89fd19d7602ac24e3d2b0f226590998e6a6e277c24ef60a7e86874f7e95e90921d255e84f05e04ad1998ee7361b4d26c6f14828076792a933c
 EBUILD netbeans-javacard-7.2.ebuild 4718 SHA256 d173c848e825b342a52073ba16b7784016f92124d4bc3b5ad8beebb7a7dda772 SHA512 019183c236c59ec2b961445c49643c6da0b376048f1be1d58677a753890bcb03db126f6441221c7572a74fe45c4c27aeee4acb38db620f9203ad04ae8ff2c426 WHIRLPOOL f2a10183045edd22ef4419b630cedafc093b326eb593178a0f50e8d82ebb25ab732fb8c561d49969073d9fce551c5b9150fb1900b49458ed53f0234baa29a78e
@@ -121,5 +122,6 @@ EBUILD netbeans-javacard-9999_p20141210.ebuild 4982 SHA256 61c78aa2d9b6a79f785ef
 EBUILD netbeans-javacard-9999_p20141212.ebuild 4982 SHA256 c8ee1b3ace60b73b159cafbfbe41c395b0d6ae36baa6f57d4942ea7113b9e64c SHA512 f92d8d64a1a657c6ce2112a2cf9dd514c7c8abb136b6f0eb0de4a23275b3c81dc64e061f11c4595ab82a5bb6662b5b74f121a606a0a470f2b596e7cf95f279d6 WHIRLPOOL f5597a03baad47ac510111e93d8350e70f962a81383f945cc9c30d98b8769f9283ab6eaa0c05e23cf8c63b2570631b121a3e609eabbb1b3c1ba3b8387a4f10de
 EBUILD netbeans-javacard-9999_p20141213.ebuild 4982 SHA256 1f4833b57e273fe4e90f541923fdd71f4b10e77cef4d4f99036a9f2f121f36a3 SHA512 3aa23d827b23b2bfa1f06ca1a9221316a830ee8c8e970d63424297fc7ddc7e3bb961a5c28b2887a797d1dff268dabb85fb1e1c1cb9eb8a99a6ed50760026c5c9 WHIRLPOOL 1c079d9ba55778407eb0aa849e28f5683d8366310bd6f4dfcb81884bc0350668b8f6c08f9b77695d9d69a6795c101c8922f967b01195306a87e2f7ccf97a82d0
 EBUILD netbeans-javacard-9999_p20141214.ebuild 4982 SHA256 1a0046e359743585e8fc0c08cb459e5e0a0065d1328cefea59c4a91fa6f29d3a SHA512 4de614f2085525dda8eceec0cc964ffd7514a60868ca8b10256771daf9259d38038ed20b3578b1a7f172b148edf1ad5b77fb7e429d1fad4875808829e02c904d WHIRLPOOL 6bf1684a4edda0cf1173cdced923c58f0f228d4a49be6c92626aa6a9b494b1efbdbf59e80ba345ba3425e4b5e3753d405d0d387f3c4c81a7bde573d1f8213709
-MISC ChangeLog 142919 SHA256 9628959b9c2065b8c2ea0839da05b459aa005d36d35023df9918b11b689313c6 SHA512 1e757a14ebe8e7a52ed640a6b2ee92d1fabd860cd4f37bd49929b7cca2f821b404a6c087237ff52b9f9506bf71770643c3141362fb5a71a6e64f6ca98b0065ad WHIRLPOOL 43015626edae9545e8e6990e11e910d21e4d6aaa63500f92bcfd3b10627ac072e1728069cf75e4c287f323fa5d2e8b77202ec296aba64a17b31f2de9ffe8fcc5
+EBUILD netbeans-javacard-9999_p20141215.ebuild 4982 SHA256 ce4e0bfa45f63a32b96aba0d6672766469b4143fb33b315a15165af28c38ddf4 SHA512 6eb9f392dfd005152e44ed84c7185e523e4ac4d76a2050f4ccae3d411f07fbc5222082525bcd9c73ab07d914e50874461f6cfe0b7149a333ec855e258e808e65 WHIRLPOOL 47b5bd6704feb03cf76de13daf0ab341c6cb2c267831b71f01907de43de04248c69e190e4c6603752c7b88b50dea28dcccbbae49edafd4a53e81761f2c19337d
+MISC ChangeLog 143096 SHA256 c0b111a48061645f19e1e1adf9633a8ed4a432a1d06532a2bd994c8c97535b0d SHA512 26d0e0bfbd0980f55b9919b4daa81fc9a27e8ce4a3ab801749d1b0e509f5b51b774b4bce347545bb3fdd6a5f2a5487b52fa1ab89375e6cd41c474ca153ed73cf WHIRLPOOL d33008a6fd24e2cae1b6e7f41c7be929d76b5d786bcdb175e61632a69576378e1046e84f49e9ff77b90dff71be6b28956b3080992f829b8862b1b51ae6bb0fd2
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20141215.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20141215.ebuild
new file mode 100644
index 0000000..d50919f
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20141215.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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/2014-12-15_00-01-53/zip/netbeans-trunk-nightly-201412150001-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/ChangeLog b/dev-java/netbeans-javadoc/ChangeLog
index 457eb52..eec1443 100644
--- a/dev-java/netbeans-javadoc/ChangeLog
+++ b/dev-java/netbeans-javadoc/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javadoc-9999_p20141215 (15 Dec 2014)
+
+  15 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javadoc-9999_p20141215.ebuild:
+  bumped to the latest sources
+
 *netbeans-javadoc-9999_p20141214 (14 Dec 2014)
 
   14 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index 73170a5..2c56e07 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -68,6 +68,7 @@ DIST netbeans-trunk-nightly-201412100001-src.zip 199725425 SHA256 31aac95459128b
 DIST netbeans-trunk-nightly-201412120001-src.zip 199804828 SHA256 aa8ddaee11569408ef6f38113a995220cba4f131302d3728bdaaf04f313e8fa7 SHA512 0740ce76fa636162d994fd7c620d8e00cbe86f5771f1e4a4e2801b6c1ae0dc2955626dad7469db8638ba2d373a1c3ad3291ccac736175e7a232aba97183fc68d WHIRLPOOL 0e373351fbea69764c227bed93d7c046f64a9345bc27d257804f0418cece75fa479be2ae89fefbbd2f5df3e7db0e4fa9e7aded25c3d88e3239008c314b5a1f73
 DIST netbeans-trunk-nightly-201412130001-src.zip 200994486 SHA256 30939e6630fc6feff490e95cb8880194e4508f8acb4abc2c4708545ee01ed8d2 SHA512 2983b84987fcf644a4eed9ae47ff5afce4dcb4e7088e56624b0be59575b6ed49f4e17b95b1d80f0d0179686d059b49d636a988362c4aafd96e02748edcbdc2b3 WHIRLPOOL bd1aea7fc97e1d091b79dc86c1998131a9ba431fbd321cd80fa89f9cc873652f36cda2af8e90d64ef09fb3f20c491e3b97108475cd8c717cfceef08d307a51de
 DIST netbeans-trunk-nightly-201412140001-src.zip 201028548 SHA256 ef045a9d2f46bff6971bde7ec89836a2f243693f85dcc5deb350d8e4988f18d9 SHA512 329f1804defa15b31fd93312079a517b56da7b39576d453090a79eaf51c5fa0176cc0520fcbe9f6a4fc089c63c6420923a340de46328101d7601b4fad8818ace WHIRLPOOL dbb3d020ac8b9d4e0abd8aacb2348f3a3a673a6399c12243ee8030e11be335c862df0edf60ca6df4aadaf83fb1b0e3f8670d8d37d2029ed7e14ce712b11e11c9
+DIST netbeans-trunk-nightly-201412150001-src.zip 201028954 SHA256 e127b68dbb59e5ed8cd10b09b4f4bd458dc054f42994329681041e27a75f52fc SHA512 2782abd4e52073dfb471fb29567886b10a254b629368f66c3a573fd5d9bf08f95945bb38d63970f5a9a07c27ecdcf0c6e10aab0517dd79adcf36da207670d534 WHIRLPOOL c9059f24fa8d68046ff5ce1981b821f3ebce476c9ef7742bbe0bd32f9996d26fd893a606479ea8664ce99ab384dd1d0d92702dd3a6727ef1ec954df5fd392148
 EBUILD netbeans-javadoc-7.0.1.ebuild 5814 SHA256 68531c51838c95012830f5ae09e2386ea3179c2b31bfd5191f67993e3b3dbe2f SHA512 3bfe0ecc46f371d2553b031a5699229fb874dad1e94415635558b7d46b6764c31337d03444753e687b19a7c0976c68cb72007ccc82df7d1e5848a81f241f80c3 WHIRLPOOL 6571f7a73c262b3b67407840523b79eecc14bad9678cff05fb32a2811049158400870de51bbcef97ecb3f18f8ff59f965bdca8e788918d53822b92e2f20f75f5
 EBUILD netbeans-javadoc-7.1.2.ebuild 5855 SHA256 af28efb956ac3b7147e254ca3083dfaab11b84ea42e20677ebdd18aa29ff87e0 SHA512 ee06c552782170b51cfe70d603792b4240aef6064ba0a5074f394701a43285ed1e4030f539622c616be3175dab013e791c1a3a1193ad379193f5fa3e92eefa40 WHIRLPOOL dfcc63d6c9fcf094e2998ce1c08e29b4d4acbefbe9bea6498c2e28f84576f628da50164a1e0ab3ff5528720fe54cae71f2f5e6f84aedca5b639f13053464e6c1
 EBUILD netbeans-javadoc-7.2.ebuild 5805 SHA256 20d01deae745a7e8d84ffe55ca63ad74342bd8528c0dd15a20aac6570a1a83e3 SHA512 3947f1ab3efc236b8faa14736406ee3e537bbdbe377ea1bbd4f1eafa06a36d2863f8700dc7c84e6c8501abdf130a78e87ad6a0f52c5172bf0ab52f288617bc86 WHIRLPOOL 8301cce0679ed5f68a09e2e968ab2ba0955547f438758b042a04744539324fd79d83d853dfb8b48421f6dac616362cf1a9dd2a0e0ff8763dc2e12a470d16b95f
@@ -124,5 +125,6 @@ EBUILD netbeans-javadoc-9999_p20141210.ebuild 6234 SHA256 4a36133484154b5615193e
 EBUILD netbeans-javadoc-9999_p20141212.ebuild 6234 SHA256 ef223cd99b3d7516a89d1f73c0b96e79255c0eb4f134bb6c6e76dfe4990a5c37 SHA512 9f3b596ea1266a1b152e67dcd0dfe0bbab4d4fcbc74cf3d020004617be586bfb750427cb53b8648ddaf79939c617558143f83e2448a05a9ddbe48c1e74e00bcb WHIRLPOOL 9130e1d4b7cc271b103a374dd540a9c8275a0403cb6eb7c012be6442d7a9e3bf06ec4d0e5185b6a07acea5dac6e3cff3032da3fb2452916949482a2f82da4a84
 EBUILD netbeans-javadoc-9999_p20141213.ebuild 6234 SHA256 2646058d5d9181d68b66f43d0d8306ae144a1fdec3bfdcedc5655b5d972dd0a2 SHA512 d856034f982ae56298758eea24294b6191ef2b7eb8be1f55d43920b00f392ba5183cacd04fd8d92e9114d861504320fceaa6a577d85be05baa7b1661c6ac07c3 WHIRLPOOL e56f4d9695e28aac60259c2806d241c9769bb32852ace65d9d1a5f4785daef64923862d621e0a751407405ad1bc966a0c77677bc05b5b72761b000b58783124a
 EBUILD netbeans-javadoc-9999_p20141214.ebuild 6234 SHA256 9d3683c7b42a005b707c4d9a5273a0561c9cf2d2c859fb6010d524cc88360822 SHA512 5a3fdc1c83192cfc62eb7cef09a3251988fd68d1eed943b97cc9f7320aadeb3e76470cd535a4261ea54296d042b7a6486895ee18eb1a19ab61b134b544f0d1d4 WHIRLPOOL c84c0220c6560b9c4dc9efd12ac6e3ba887d557a0e95e99f845b3cd04987af4aa8934ef64ca4a2fd6741b226e5a2b6c1694ec8033142b611d91d0ff931e7b60a
-MISC ChangeLog 140990 SHA256 81c6c41c99c76b7325339924bc629c38b5c605f7f7145fb7539e53970cdb78cd SHA512 62008d0a93894df4b9d3db1384112df054b8498aea3504e2627703ea64ca42c34cee54a25e73f745877db018ed8f1973563c6b8f9a18d39bb8b3d987eed7ceb1 WHIRLPOOL f7cc781e2229763a38f317cc3265208dfc2ce3c331caa634bb2abce0568cd2ea322cd0d3bad51791c235a320bbe2371d162d65a5516bceaef0329ecd1523a101
+EBUILD netbeans-javadoc-9999_p20141215.ebuild 6234 SHA256 2f6d46fc30b7d8eff0fa316080a1bfad8d9dd7e1e598af26cf96c0b14021b698 SHA512 5a2a60f7f5103aac5ab53e0c547d02fa1dbec1d81c8b4d3eae0deb7626f4718f41ccda3254d48ee5fe5f504f999b5f2f2bb8cb91ec94344c219ae335526c8bb5 WHIRLPOOL 637f663d49ee331d45563b50af5d994cd6a4cac70052a584ca7eaf3dbe7efbc69b3bc585241d628b66f97fc658147e6f07368cdab87e4f42d3da3c8cf7b57e85
+MISC ChangeLog 141165 SHA256 6bac583bd6d9a08df35270566e21691bf52dd2108df26cf74d2a7575a034f9c0 SHA512 51d3bb6b0873d470100deda5260318f527d74f8d60b20e591fd40611f87bccefd9bb7efbb7193a429e3e329f015423112d985aa657e3699f55c841f30e553bf0 WHIRLPOOL 7be66a03562bc14970d5ef0a907adb5bd9e36f1f12b392500ad647f348bf664d2bdf7459ec76af7d5c2684b6136e62919d3708754ae48548c22c74dce99679b0
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20141215.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20141215.ebuild
new file mode 100644
index 0000000..55fe99b
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20141215.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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/2014-12-15_00-01-53/zip/netbeans-trunk-nightly-201412150001-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 other jdks do not contain jre/lib/ext/jfxrt.jar
+DEPEND="dev-java/oracle-jdk-bin:1.7
+	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.7"
+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.10.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 -f nbbuild/build.xml bootstrap || die
+	ANT_OPTS="-Xmx1536m" eant -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/ChangeLog b/dev-java/netbeans-javafx/ChangeLog
index 8208cc2..a3248a5 100644
--- a/dev-java/netbeans-javafx/ChangeLog
+++ b/dev-java/netbeans-javafx/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javafx-9999_p20141215 (15 Dec 2014)
+
+  15 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javafx-9999_p20141215.ebuild:
+  bumped to the latest sources
+
 *netbeans-javafx-9999_p20141214 (14 Dec 2014)
 
   14 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index 8bd75c4..6e4a9ab 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -67,6 +67,7 @@ DIST netbeans-trunk-nightly-201412100001-src.zip 199725425 SHA256 31aac95459128b
 DIST netbeans-trunk-nightly-201412120001-src.zip 199804828 SHA256 aa8ddaee11569408ef6f38113a995220cba4f131302d3728bdaaf04f313e8fa7 SHA512 0740ce76fa636162d994fd7c620d8e00cbe86f5771f1e4a4e2801b6c1ae0dc2955626dad7469db8638ba2d373a1c3ad3291ccac736175e7a232aba97183fc68d WHIRLPOOL 0e373351fbea69764c227bed93d7c046f64a9345bc27d257804f0418cece75fa479be2ae89fefbbd2f5df3e7db0e4fa9e7aded25c3d88e3239008c314b5a1f73
 DIST netbeans-trunk-nightly-201412130001-src.zip 200994486 SHA256 30939e6630fc6feff490e95cb8880194e4508f8acb4abc2c4708545ee01ed8d2 SHA512 2983b84987fcf644a4eed9ae47ff5afce4dcb4e7088e56624b0be59575b6ed49f4e17b95b1d80f0d0179686d059b49d636a988362c4aafd96e02748edcbdc2b3 WHIRLPOOL bd1aea7fc97e1d091b79dc86c1998131a9ba431fbd321cd80fa89f9cc873652f36cda2af8e90d64ef09fb3f20c491e3b97108475cd8c717cfceef08d307a51de
 DIST netbeans-trunk-nightly-201412140001-src.zip 201028548 SHA256 ef045a9d2f46bff6971bde7ec89836a2f243693f85dcc5deb350d8e4988f18d9 SHA512 329f1804defa15b31fd93312079a517b56da7b39576d453090a79eaf51c5fa0176cc0520fcbe9f6a4fc089c63c6420923a340de46328101d7601b4fad8818ace WHIRLPOOL dbb3d020ac8b9d4e0abd8aacb2348f3a3a673a6399c12243ee8030e11be335c862df0edf60ca6df4aadaf83fb1b0e3f8670d8d37d2029ed7e14ce712b11e11c9
+DIST netbeans-trunk-nightly-201412150001-src.zip 201028954 SHA256 e127b68dbb59e5ed8cd10b09b4f4bd458dc054f42994329681041e27a75f52fc SHA512 2782abd4e52073dfb471fb29567886b10a254b629368f66c3a573fd5d9bf08f95945bb38d63970f5a9a07c27ecdcf0c6e10aab0517dd79adcf36da207670d534 WHIRLPOOL c9059f24fa8d68046ff5ce1981b821f3ebce476c9ef7742bbe0bd32f9996d26fd893a606479ea8664ce99ab384dd1d0d92702dd3a6727ef1ec954df5fd392148
 EBUILD netbeans-javafx-7.1.2.ebuild 3593 SHA256 76a29b37765000745794e6ae20c6b8528d8637507a257ffef3bef2ce648f05cc SHA512 a04618bda036e6652c7208f90a4dd91e07e75b85243580263f6ec846425ab907a87c318117990d4e8d9044bcd7a0ca8b63bc32bdd0d84e5373a10e67a77b79c0 WHIRLPOOL 11acad585f7315ae6b4edd53c764167567a948cb0e2037d95f2f4de34765909b71d095540c054f4cef3ba70224d294b42720536566e445cbdd06ebf2ad903841
 EBUILD netbeans-javafx-7.2.ebuild 3576 SHA256 3441b901a5074013351bc6c7ba6c424455e2affe52e448f2cfac0058c82345e2 SHA512 ee384d6e4ac767ade82b5d337d7a1c5d2b463c15a7596d91e1a850b37349f88d7867a0ffa11a118c48e2ed463f38dcfa791ec42b3fe85ea1e6bf7c4b27f9b073 WHIRLPOOL 15c7d20f2caa39c6cfcba2f846736754b049483f135ac90ced399672932a6a73467f0b4016550c3b2d8583be20d1467486f5652111893ec16111095a3e9c941c
 EBUILD netbeans-javafx-7.3.ebuild 4476 SHA256 9f268a852d45f37f9d22c3bb58d36be17f438e4b4cb5105d88ac4404731facb3 SHA512 3fa0e48e949d0df0a4404c04379623529f73ff15259f4164fddd10afb9faa046ceed16aac1a7b14728af89bf3a4ed7037638fb7e7e932a64cc71e84f7ecaa44a WHIRLPOOL 0395ca679fa41610c61dceb6ac018d7a76b62c08ca740de2fa2d98523f8e5f840a2d0a8c357b674d171841f93d980b536a671a1f12b5261d402c03b691ac6504
@@ -122,5 +123,6 @@ EBUILD netbeans-javafx-9999_p20141210.ebuild 4723 SHA256 e8d4a5c9d106279231c7449
 EBUILD netbeans-javafx-9999_p20141212.ebuild 4723 SHA256 405380c1a30e56b372700a64db93385e82632e5941acf081d2824679e72ed78f SHA512 00416d96e508ffcdc7db1e145ca7ba7eeee60eeebf010b6fba1daf30513eede6a780a1469920f87d2716f501fb5b92dd9e8e03e265b7d1c79217b82fe55e6578 WHIRLPOOL 3421384bd10002d080d475c3ec2afce867ed87522e50d6eb9b109d2b465b37f7aa05b3bd0c24f1064e3475674f95f403bb8cb7759575797cfffb24e918ea7090
 EBUILD netbeans-javafx-9999_p20141213.ebuild 4723 SHA256 8d5b1880cb200f091dea7ad3e3be18666dbe1497a02490fad4b6a95ea694271a SHA512 4a9fc1937850f9c0f036b69f477db9818eeff6c96af9832d7d9c370ff0a5801e22d5cf01a1a00368d66a394b55d3944fde873f3b23d08aa95ec29b9ebbfe3f1f WHIRLPOOL 247c8ceefed59c9a5a72a960560c95748f0d10cbee096899156a76abdd6141c8b17c58910fad5faada1517a05652522cf8d95eb8c1b84838a9adc78992e36a7b
 EBUILD netbeans-javafx-9999_p20141214.ebuild 4723 SHA256 7007cdbde41331bef07bf5679d4f6e995aaa8edab712460c528d352507e432a3 SHA512 209a4ed29ba28274aa6306e002143bdd41ed8efcd668e29b94c0476d284811525ddd1d9c977883f8f871644ddb748d9ae3d3894dace8b9734178c642ce1119f9 WHIRLPOOL 546d6253eb981777217d522c3b11cd4f119e02841fcd392be09c57433d36645160f1ab55507d2c63fbfba3743f6c00f5a0fc3506e553dc4f1631e28256b296af
-MISC ChangeLog 125928 SHA256 bf05e89aa3b2cf363b8d81781aab40d4a7d635ebf7ca86165ea4016927b76ae2 SHA512 422a8e9bd79ca02740f82c7947ac65c2287370f4062be45d56b9ebdceb4a8598a9e40df5f94d0cba64664f9dd5cdfd211d811137924256d9bc9789caa5d2554b WHIRLPOOL 88687972d1a7c66ff08c4eb7505cb332269fd3ee2384fd91d2b209044ba93393d374ce1ff63725eb2eedd6eb6f2cb4bfda40e941a091c0d8ec5ab64ed23ebcde
+EBUILD netbeans-javafx-9999_p20141215.ebuild 4723 SHA256 04fe74649fb3467a9e03c573fb8cea162d3278528b8a9834a990c679c4f2db42 SHA512 c21642aec8f223b931ac9bfa92dc6bd21f6f1946c1907b3f739479dfcbca67d9bdf42485b2dd13742bf5b7123bcb7f0f1adabfc4472e617a95efb70478d248c5 WHIRLPOOL 481f99ca0d7fd892f59a1603adb0386b36f11101231f66c701cd500809feb18bddecdb1011ef3aade0bf9ea5372259f7a42ba0475e9494e2c143dcce97785ba0
+MISC ChangeLog 126101 SHA256 83b123fd2716b92dd0bd17a5226ab5dde13e5303eee3266f8923c559d73d9981 SHA512 cfb825a41bedc31be78f5019924d588f9cb3d8611e4822152e1479b04f951889f62aad5182e5a6676083c82b1aca5ae115b7e5da0b0f438036f49ade08ee177c WHIRLPOOL 8b37ba388a77e4fc56f14679daae69e7125a9d3cfec93f05ce881d194b4427e49de6206d9969db1a71fd8005825a2f7d1d07ff7d387c09ac369e87e96bb382d0
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20141215.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20141215.ebuild
new file mode 100644
index 0000000..1a2b88d
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20141215.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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/2014-12-15_00-01-53/zip/netbeans-trunk-nightly-201412150001-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/0F7FC8D69950B86D5F67529B5C551DB84C5BCF87-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}"/0F7FC8D69950B86D5F67529B5C551DB84C5BCF87-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.10.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/ChangeLog b/dev-java/netbeans-mobility/ChangeLog
index 01a8da6..c495d12 100644
--- a/dev-java/netbeans-mobility/ChangeLog
+++ b/dev-java/netbeans-mobility/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-mobility-9999_p20141215 (15 Dec 2014)
+
+  15 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-mobility-9999_p20141215.ebuild:
+  bumped to the latest sources
+
 *netbeans-mobility-9999_p20141214 (14 Dec 2014)
 
   14 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 8cad3af..7c05b75 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -71,6 +71,7 @@ DIST netbeans-trunk-nightly-201412100001-src.zip 199725425 SHA256 31aac95459128b
 DIST netbeans-trunk-nightly-201412120001-src.zip 199804828 SHA256 aa8ddaee11569408ef6f38113a995220cba4f131302d3728bdaaf04f313e8fa7 SHA512 0740ce76fa636162d994fd7c620d8e00cbe86f5771f1e4a4e2801b6c1ae0dc2955626dad7469db8638ba2d373a1c3ad3291ccac736175e7a232aba97183fc68d WHIRLPOOL 0e373351fbea69764c227bed93d7c046f64a9345bc27d257804f0418cece75fa479be2ae89fefbbd2f5df3e7db0e4fa9e7aded25c3d88e3239008c314b5a1f73
 DIST netbeans-trunk-nightly-201412130001-src.zip 200994486 SHA256 30939e6630fc6feff490e95cb8880194e4508f8acb4abc2c4708545ee01ed8d2 SHA512 2983b84987fcf644a4eed9ae47ff5afce4dcb4e7088e56624b0be59575b6ed49f4e17b95b1d80f0d0179686d059b49d636a988362c4aafd96e02748edcbdc2b3 WHIRLPOOL bd1aea7fc97e1d091b79dc86c1998131a9ba431fbd321cd80fa89f9cc873652f36cda2af8e90d64ef09fb3f20c491e3b97108475cd8c717cfceef08d307a51de
 DIST netbeans-trunk-nightly-201412140001-src.zip 201028548 SHA256 ef045a9d2f46bff6971bde7ec89836a2f243693f85dcc5deb350d8e4988f18d9 SHA512 329f1804defa15b31fd93312079a517b56da7b39576d453090a79eaf51c5fa0176cc0520fcbe9f6a4fc089c63c6420923a340de46328101d7601b4fad8818ace WHIRLPOOL dbb3d020ac8b9d4e0abd8aacb2348f3a3a673a6399c12243ee8030e11be335c862df0edf60ca6df4aadaf83fb1b0e3f8670d8d37d2029ed7e14ce712b11e11c9
+DIST netbeans-trunk-nightly-201412150001-src.zip 201028954 SHA256 e127b68dbb59e5ed8cd10b09b4f4bd458dc054f42994329681041e27a75f52fc SHA512 2782abd4e52073dfb471fb29567886b10a254b629368f66c3a573fd5d9bf08f95945bb38d63970f5a9a07c27ecdcf0c6e10aab0517dd79adcf36da207670d534 WHIRLPOOL c9059f24fa8d68046ff5ce1981b821f3ebce476c9ef7742bbe0bd32f9996d26fd893a606479ea8664ce99ab384dd1d0d92702dd3a6727ef1ec954df5fd392148
 EBUILD netbeans-mobility-7.0.1.ebuild 8655 SHA256 992e214ff2926e2f0db623d96b717bf8f8e4ceb47e96e69b3c6b8f67d6a8d130 SHA512 d51bc003f4b637cfe71c9f49a96427e535596542ac195a9621bc4f92c04a6f720a87fac6eb267732f869ba105f263d9d36f848b54a89c734b6a68a78ed323808 WHIRLPOOL 515da7153b12c3b5779cfad16e3800b4d26ba4b174027d9a7b06a26754fad065751c7eda137ba6199315d024a322d59e7ea39a1b2f4244ea75b30770ac505791
 EBUILD netbeans-mobility-7.1.2.ebuild 7543 SHA256 bb3f1245ad68133798fa507f06dd1ffbc1d55f6ba38f4cccc29ff0240e5b5f22 SHA512 41f663977a0716c5449db597d5f90054717ff3579a9137a910d1943d3e0b39379c34c0d9aa9c98d231037a042074c8ecf5fc62c018cd7cd5e8680734ff854c51 WHIRLPOOL c3c6feb41ce3df356f617ca80530673ac653cdf50da0aead00518854d0850d6420333529aa6591e15ddd4053249191fcb47100c5f39a804352722e54f802bae4
 EBUILD netbeans-mobility-7.2.ebuild 6571 SHA256 58af97ca9a6adc56fa6abe91777a1ac35a3a9b7d68af1e73c23a45dc5631abb2 SHA512 ac42c3a3daa7d55c9c13d1c99dd6880d5d99741f80cfceb683da27e30c70d6228d9434571f2405d0dbbf27d2203e3f877da6347794b07b98331edd1631d3a69d WHIRLPOOL 5a6af3cbcd08180dcdf708a038f3119faacb9c78532b4bb1945c7260fb0a8232af57745e41a73311fafffe185c969e0c88ac34970caab7708313f53417695374
@@ -127,5 +128,6 @@ EBUILD netbeans-mobility-9999_p20141210.ebuild 4418 SHA256 d1be55372c9cd7fbd6ca9
 EBUILD netbeans-mobility-9999_p20141212.ebuild 4418 SHA256 6ba57f5bd98a66467c6f0cf37d783e8b7dd6c18804037d14e07f626d51a90537 SHA512 139601be6dc609c897a08d62d76d1ed9a60945cb5258f134976be1552b60c9dc7753891dc4a65b35c08a76f4bd0d22e36b3afd2122128c602686649ac0e3cad7 WHIRLPOOL 897d6d7cae89f48d95810ac1e583a0f595b8945ce08347ba2a9669de9ec19733367988c6ef38ec5858142cfbdb44f5101db3776b740993d943d72946bf2a471a
 EBUILD netbeans-mobility-9999_p20141213.ebuild 4418 SHA256 5fddc1585bab0d4906da4aec5b470ba9116d707abbfa33d56d063c890fb6b632 SHA512 6fc23d33df65fc23ca9af1c43a6cc92cc40cc88de0946557bd36f6ecda701e4b0b5be4e47dc18c6f2813fac675332874b0ab8199102ad4871c8cc97475b91c72 WHIRLPOOL 7a88dd836a5b871f3f06f0d8f23566dd0856fa74e9567e8c36189fa4132364981919f8f1f5a09fd3faebe92ffdd05e5ec50da3b64938f8f64834bac62daa347f
 EBUILD netbeans-mobility-9999_p20141214.ebuild 4418 SHA256 1ab5bf2e41fcec994620c616a9a22826e2702dd4705efde11207f1a04b157133 SHA512 de9b6600cd9a29b725a9b352aad8a53c3c7cfffffe8572fbe6334bba9b625a8c3a2ae58f309c6d966aedc6083a0c229112070a9eb0d55d53cc929b2b335bcd0a WHIRLPOOL f7517781c262ee56a6d52388c5241cafdd967114f1a75e878437f26ad9721163a28202c47a512892548e88eadb8024614b3a6bf42e35271ae0236cf4c0125467
-MISC ChangeLog 143060 SHA256 1b7804073073737ece6b45ef34e73bd9a2075a4a43871497ede3867d82a01611 SHA512 389abae072abcdb55384e5378464413d45c1f82939bf4ec54319ba75f6243f7cf01e37c589c24a11b82e8f2ddb959126c8665239f200819ad2af4434c087d63b WHIRLPOOL 00fa5d8422ce46ad360e147afa23271133dd72c7c537f8d5f23c4583ecc3ea56612fd80cb6ed69e0aa8c3c3e1999d44a3b06089f3ed4ebdd5491c434a1b0aa5a
+EBUILD netbeans-mobility-9999_p20141215.ebuild 4418 SHA256 a264bc77be55997982448593c0a4f19d06944c99ae5764a87cf333b5994ab9dd SHA512 bf26472b56e4a74f098eb2f8087975f9af0163ddfa193623109fc50575620591fc0af67428b1c0385756f441d8d3cfcdfddb6aca82fa3c31cbcf8aafdbfd4634 WHIRLPOOL 839eeda0077cef8535bf78b30cf3f0f4e323d0725878ee8dc0db7c33a19fd91505a911656f55bcd77ae164a57e14ada977263cd5c27bc76b301742ee26239ef9
+MISC ChangeLog 143237 SHA256 ae232da0531a8581baed75b78bc8019da4e56538b77d63c12df81ea4cc68dca3 SHA512 370ba2efb8c01aacdbf288cbe47c3e61687b1a1b709b9dd4695316ac76a176a49882fa66ce577f342cffed64d43326013b1f9ced9613056bfb2700ff7c16b437 WHIRLPOOL 8c0a53c7832956b0c7ada14fbd6a50dff32385981617bef3268acc1cce00952d9c8e7b40092f4b14f45fd7305e3a22b7edcc06139e6ffed2b966d81431e67d12
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20141215.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20141215.ebuild
new file mode 100644
index 0000000..d6c52bc
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20141215.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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/2014-12-15_00-01-53/zip/netbeans-trunk-nightly-201412150001-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/ChangeLog b/dev-java/netbeans-nb/ChangeLog
index a5ad854..e336cd8 100644
--- a/dev-java/netbeans-nb/ChangeLog
+++ b/dev-java/netbeans-nb/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-nb-9999_p20141215 (15 Dec 2014)
+
+  15 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-nb-9999_p20141215.ebuild:
+  bumped to the latest sources
+
 *netbeans-nb-9999_p20141214 (14 Dec 2014)
 
   14 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index 48539de..479fd16 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -70,6 +70,7 @@ DIST netbeans-trunk-nightly-201412100001-src.zip 199725425 SHA256 31aac95459128b
 DIST netbeans-trunk-nightly-201412120001-src.zip 199804828 SHA256 aa8ddaee11569408ef6f38113a995220cba4f131302d3728bdaaf04f313e8fa7 SHA512 0740ce76fa636162d994fd7c620d8e00cbe86f5771f1e4a4e2801b6c1ae0dc2955626dad7469db8638ba2d373a1c3ad3291ccac736175e7a232aba97183fc68d WHIRLPOOL 0e373351fbea69764c227bed93d7c046f64a9345bc27d257804f0418cece75fa479be2ae89fefbbd2f5df3e7db0e4fa9e7aded25c3d88e3239008c314b5a1f73
 DIST netbeans-trunk-nightly-201412130001-src.zip 200994486 SHA256 30939e6630fc6feff490e95cb8880194e4508f8acb4abc2c4708545ee01ed8d2 SHA512 2983b84987fcf644a4eed9ae47ff5afce4dcb4e7088e56624b0be59575b6ed49f4e17b95b1d80f0d0179686d059b49d636a988362c4aafd96e02748edcbdc2b3 WHIRLPOOL bd1aea7fc97e1d091b79dc86c1998131a9ba431fbd321cd80fa89f9cc873652f36cda2af8e90d64ef09fb3f20c491e3b97108475cd8c717cfceef08d307a51de
 DIST netbeans-trunk-nightly-201412140001-src.zip 201028548 SHA256 ef045a9d2f46bff6971bde7ec89836a2f243693f85dcc5deb350d8e4988f18d9 SHA512 329f1804defa15b31fd93312079a517b56da7b39576d453090a79eaf51c5fa0176cc0520fcbe9f6a4fc089c63c6420923a340de46328101d7601b4fad8818ace WHIRLPOOL dbb3d020ac8b9d4e0abd8aacb2348f3a3a673a6399c12243ee8030e11be335c862df0edf60ca6df4aadaf83fb1b0e3f8670d8d37d2029ed7e14ce712b11e11c9
+DIST netbeans-trunk-nightly-201412150001-src.zip 201028954 SHA256 e127b68dbb59e5ed8cd10b09b4f4bd458dc054f42994329681041e27a75f52fc SHA512 2782abd4e52073dfb471fb29567886b10a254b629368f66c3a573fd5d9bf08f95945bb38d63970f5a9a07c27ecdcf0c6e10aab0517dd79adcf36da207670d534 WHIRLPOOL c9059f24fa8d68046ff5ce1981b821f3ebce476c9ef7742bbe0bd32f9996d26fd893a606479ea8664ce99ab384dd1d0d92702dd3a6727ef1ec954df5fd392148
 EBUILD netbeans-nb-7.0.1.ebuild 5116 SHA256 17ac4a9aa7931d052a899ad8649bed42d5c37a06d913e0dc8ded118d7ef01c47 SHA512 932964fcc4d8d614a2ad8531eecd9298b89f06ac97db68e140e77bceb5d9c08c35524ae4766c18f5467bb01391a9c9f29cd4c5e45c29664b91340a33b0804d7e WHIRLPOOL 0e935fc1c63b61a97e60941111cd30fe4f7b740743013074f7722f3556473ccdba8bcd70ac6f544c67e2a60dd2d7c96abc9bf6bfc51aa6e9ff3135d041ebf3a1
 EBUILD netbeans-nb-7.1.2.ebuild 4987 SHA256 075ef11ab57b236061e4df3e905524ecfba2966c5d735d113b878a03219a9cc1 SHA512 321182e1780acfdbff56c1c84748897cf8c4dcf9fc94d0a6db71a018968e8f96e479a2dbb2f97655d50ee836ac1a81fdd62f6f04ba1b2d54157158e577c2b986 WHIRLPOOL 3d3742c6e90f0231ecabf5200446d00900204f51b9fb2be92954668dae86584d8ef477be11cad462a9721a04a1bc97673b8d8d808ef49f0345d979022471d919
 EBUILD netbeans-nb-7.2.ebuild 4970 SHA256 79d73ca57dd63e25afccd44816dd248e79f6974dd7e9ebbf4b3b11eb659092d9 SHA512 083317f6944c5fe38507fbca18804888e25c23070420a3080bb68bf00be95e520541c381482a6c55ff60656b36f8dd3fac60f2c605e4e3ee0ae92427faa468da WHIRLPOOL 7f02ab258612c5035b26326f25aaa08bf60fc0ff3108a2bf61dbcde9fe845e647f91319938206742a5f131fe905678833f3ad2449f68efef7e6ed4203f7538f3
@@ -126,5 +127,6 @@ EBUILD netbeans-nb-9999_p20141210.ebuild 5013 SHA256 5dc00b693737e38a54e7097c3e9
 EBUILD netbeans-nb-9999_p20141212.ebuild 5013 SHA256 177a188f6b2e1c61f67de204d0762f0334f57eb1c5983d5f0cc9dca934d13688 SHA512 6a2e5af3617e8ef0d44c084427c17868d8e05c30fa61d763e50ec95503122011675cb8e134821908fc331d9636338bf474f45e10e1d796b8192481f8ad4abdbc WHIRLPOOL f5444acfefa73ded57e4267a8a1a850e7976f471b56a8c45a7651ca60196e288ad0b2409b327f5ad659d15d780f6f547382d9ee6008f242ce05487c7da6e2a1f
 EBUILD netbeans-nb-9999_p20141213.ebuild 5013 SHA256 10c921b390ac5b1b796b618d08941cb7b960133df9d8ef7ea2817971d5899891 SHA512 8c1cd1a3588478736ac4fdab176e45769c815725da0138a1517aece351138d3f021cc3a7935c4544550980a8b6a2295c3c63a24b21505764597fee3760dffa6e WHIRLPOOL cde6db0584b0dc778d5225e91dbe013f7f4d965ed53c93fd4f7627a423bb2fe8ddf98ff154e39ccb84db52d71d76b5e50c6358840b716467291946f58f463cba
 EBUILD netbeans-nb-9999_p20141214.ebuild 5013 SHA256 706b2c9c0be53716e3443bb71252de74caf97860bcdfc2464700fda244776576 SHA512 c0d730748e3fb9231639c74a0a8455fd022acbefc03c2a19cbc48610cc59d72f2bb7be348dfb8d11309972a1874921324dd266a40ed205c77530dbcae6059545 WHIRLPOOL 7d0cab2dbd08adbb3849ad6d5fe9c7948e0ef35218009900eb096088bc34242d0d7edd31c06c1085717552ba435b551967e729002ef0200c28e5b0f415ba5e9a
-MISC ChangeLog 132825 SHA256 4efac83afab4cf2b9997de8cbc9a62e2e55a2b53e7b53b272896661e79ef17c8 SHA512 567f37a8b7ad78ad3d2a4a7661bb32d3ab4385a2888d0d402c707a45e5f0594ec12fc964114ec1e6a1f1477d410d04aa9ae45de7c14a7c57b7cfe137fd836603 WHIRLPOOL e996e6b8c13d527723873b9ce353a8bd7ee4058c0f763207232d36c9970dc43b65c701aaf29249985447db441d82addc0271c194b0055fed3d249036abf5ac36
+EBUILD netbeans-nb-9999_p20141215.ebuild 5013 SHA256 0f26f775d6f551bebff0a198bcf781bd3f1d1b5480ac53feff4193fefc06062e SHA512 527f536592547a320a2abbc9ca9193455d401af553dc721c6145cf0473129d3c7115af4f3f30f378fdd9bf304a246af51f00a99ba5be655492e74fbca37eb701 WHIRLPOOL 85ddbe588fe030b1c0b3aabe46e3f2ddaa6417b0d2f2b6f98960ce2c2c0f4bfdd27e3b754f25a80d2e963039abeffbdaaaac742dee315765aa7b9c36a6d6af08
+MISC ChangeLog 132990 SHA256 eab592af0ab92800f57e56290a71c6c7da1c1b29c6b27c5a73ea0761cf98851a SHA512 c4c5a907b19c4b17150c225891a6501a3e34765437208e91ce45b0b427802d8289c4c955526157feb979587c5af58464ccd83c85359c170ed04ebbe490317ddb WHIRLPOOL cfd5335127407d2ad1a52159173d3b8df7d72249ebf12a8970aae99432dde3bd9bb2cd4323e36e67ed0314fe4f50d738592b40b390249e759bdb286835eb7efe
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20141215.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20141215.ebuild
new file mode 100644
index 0000000..774bca3
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20141215.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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/2014-12-15_00-01-53/zip/netbeans-trunk-nightly-201412150001-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="keychain"
+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}
+	keychain? (
+		net-misc/keychain:0
+		net-misc/x11-ssh-askpass:0
+	)"
+
+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
+	use keychain && epatch "${FILESDIR}"/${SLOT}/keychain-support.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
+}
+
+pkg_postinst() {
+	if use keychain ; then
+		einfo "You enabled keychain support, that means NetBeans will use keychain for managing"
+		einfo "your keys while connecting to ssh protected repositories. If you want to load some"
+		einfo "keys on NetBeans startup, create file keychain-keys.txt in your userdir"
+		einfo "(~/.netbeans/${SLOT}/keychain-keys.txt) and put names of your keys in the file,"
+		einfo "each key on single line, for example:"
+		einfo "id_dsa"
+		einfo "id_dsa_gentoo"
+		einfo "If on NetBeans startup key will not be handled by keychain yet, you will be asked"
+		einfo "for key password (only this time and never again). You can find more information"
+		einfo "about keychain at http://www.gentoo.org/doc/en/keychain-guide.xml"
+	fi
+}

diff --git a/dev-java/netbeans-php/ChangeLog b/dev-java/netbeans-php/ChangeLog
index 9a29ed3..2f5e585 100644
--- a/dev-java/netbeans-php/ChangeLog
+++ b/dev-java/netbeans-php/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-php-9999_p20141215 (15 Dec 2014)
+
+  15 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-php-9999_p20141215.ebuild:
+  bumped to the latest sources
+
 *netbeans-php-9999_p20141214 (14 Dec 2014)
 
   14 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index 7cc093c..ba9ab5f 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -73,6 +73,7 @@ DIST netbeans-trunk-nightly-201412100001-src.zip 199725425 SHA256 31aac95459128b
 DIST netbeans-trunk-nightly-201412120001-src.zip 199804828 SHA256 aa8ddaee11569408ef6f38113a995220cba4f131302d3728bdaaf04f313e8fa7 SHA512 0740ce76fa636162d994fd7c620d8e00cbe86f5771f1e4a4e2801b6c1ae0dc2955626dad7469db8638ba2d373a1c3ad3291ccac736175e7a232aba97183fc68d WHIRLPOOL 0e373351fbea69764c227bed93d7c046f64a9345bc27d257804f0418cece75fa479be2ae89fefbbd2f5df3e7db0e4fa9e7aded25c3d88e3239008c314b5a1f73
 DIST netbeans-trunk-nightly-201412130001-src.zip 200994486 SHA256 30939e6630fc6feff490e95cb8880194e4508f8acb4abc2c4708545ee01ed8d2 SHA512 2983b84987fcf644a4eed9ae47ff5afce4dcb4e7088e56624b0be59575b6ed49f4e17b95b1d80f0d0179686d059b49d636a988362c4aafd96e02748edcbdc2b3 WHIRLPOOL bd1aea7fc97e1d091b79dc86c1998131a9ba431fbd321cd80fa89f9cc873652f36cda2af8e90d64ef09fb3f20c491e3b97108475cd8c717cfceef08d307a51de
 DIST netbeans-trunk-nightly-201412140001-src.zip 201028548 SHA256 ef045a9d2f46bff6971bde7ec89836a2f243693f85dcc5deb350d8e4988f18d9 SHA512 329f1804defa15b31fd93312079a517b56da7b39576d453090a79eaf51c5fa0176cc0520fcbe9f6a4fc089c63c6420923a340de46328101d7601b4fad8818ace WHIRLPOOL dbb3d020ac8b9d4e0abd8aacb2348f3a3a673a6399c12243ee8030e11be335c862df0edf60ca6df4aadaf83fb1b0e3f8670d8d37d2029ed7e14ce712b11e11c9
+DIST netbeans-trunk-nightly-201412150001-src.zip 201028954 SHA256 e127b68dbb59e5ed8cd10b09b4f4bd458dc054f42994329681041e27a75f52fc SHA512 2782abd4e52073dfb471fb29567886b10a254b629368f66c3a573fd5d9bf08f95945bb38d63970f5a9a07c27ecdcf0c6e10aab0517dd79adcf36da207670d534 WHIRLPOOL c9059f24fa8d68046ff5ce1981b821f3ebce476c9ef7742bbe0bd32f9996d26fd893a606479ea8664ce99ab384dd1d0d92702dd3a6727ef1ec954df5fd392148
 EBUILD netbeans-php-7.0.1.ebuild 4151 SHA256 3aee393fe89aa4788ccd17af46f1df43a5681c28af6d580724d8db0f5e804ff0 SHA512 60106805595338b83e17d906c199c54dc4cc5d979f964a41f9938a508e8514670f4e5538eeecd91f8cd06dd2b4376119674f9a7a9f2fac6c1255e14929f2bc19 WHIRLPOOL 1a09962a5bd67a4fd4eed48af3f185146d2de6f506952f626756aabf6a157678fe71e0752ed5988ff414803b83150d9b8b4de956895667e331659bb59f94e09c
 EBUILD netbeans-php-7.1.2.ebuild 3940 SHA256 779f3bceb2b5a49e923fff28c36c653e31e2d11e186fabab1e656c3314b48d28 SHA512 1296c8ccbec945e66588c2a1a490d3ea93a28672e77751e16c3dff1f1aa6e3a00b454345f0b888c684a0d31fe05aad4f44310998eb72bf1febba85da1bcdd08b WHIRLPOOL b0238f8c5aa4a8c0a5cff82b0daa29860fe39712e96110916cd8a26938ca07b8e05c308e1387c84e7d693026590846392227e95668d150bbc7f1cbc660676eec
 EBUILD netbeans-php-7.2.ebuild 4159 SHA256 bb5c66ed19c9341332e1e42efb29a4ab5d19a22c995bae93efc952ec105ad493 SHA512 c919b120bdc51b56f58b390e9a017f9e059c6b5709220e80138caf7ca3e58d432f53c9ed28f899dc9537851a4cb8cafa9e7067eaefc5d5798b05fb0be9d5bd5f WHIRLPOOL 9857d2e6ac50c4daf5c8afc0a5b65b068b6010ecf2ef04f063bc184810c18b50feda683d2d80c84c0e621909bb05b19731135f2a69f1e56db927c42e8057a658
@@ -129,5 +130,6 @@ EBUILD netbeans-php-9999_p20141210.ebuild 4423 SHA256 94c8465ef0ae7b696d04c79856
 EBUILD netbeans-php-9999_p20141212.ebuild 4423 SHA256 f9f6ce85608b3aae71a0ef4f762c7e060c010cacb60e4e5d7d68375659630d4b SHA512 65795353a9481b475f67092590e5b69a5a6baddc7a8153b74aced8d2a4b128c27aa95570c07872e1f3756e74e1233fe25e1595892b1b3a87bc0e994f4d823614 WHIRLPOOL e759ec5493da5ba40d851e077ae1be8423f278e1ba0d381417f6ecf97f13d759d4e089d8bc4b4c1f4a88ffe3b1f6824074b4083224273baa2381f3aac11118c7
 EBUILD netbeans-php-9999_p20141213.ebuild 4423 SHA256 a3d13465d650190695f23d7172cfeaeee21b38af48b3bd92fbb27067248f3bf0 SHA512 27a4549d6889f473bf61326c244f4ac4daf271f717ee1487f7cff3e3bb65ca50e086f7c3536ac6b10a48c51a5a3b0dd1bfcac4b2f977b2ef4727fafee4b71111 WHIRLPOOL 96dbcad00430a7db5637c60cd889994a5a91c6e85f84ff1236cfe8cadcb4db12b0c1bf91652cd98954022a6bdc5b5b6f2594b441a828c087664ae242433aba21
 EBUILD netbeans-php-9999_p20141214.ebuild 4423 SHA256 5e42b3a9b09230e44293d9400d06487bdee500da943f18a37e4038c2e897de4c SHA512 7c4ec2284ab9547b3f755512eecb1030e26b91c3c6bc6d4a82e850940fac586c6b0eb59527344e69c2242e6b3e8022f41540afc8cf741741d458f364fce18f8b WHIRLPOOL 9e2c8f4848352369e7cee154700eea0d72789e91478a72c80c3b986c3c2c66aaa9308116063b6b81ea90dc47f766cd277298179e07c4d74bb4a02d3c510838c2
-MISC ChangeLog 133545 SHA256 a6b8c779de85f3a1ecc90da283381a5af1ee3fb35c2728503d828b932c88aeaa SHA512 d96a59bd3251d3de7cca9b5f864bdaed9e4e33fc66bb85856a76ae71e62142f15bd145a9054fa5f0a89125d5b7b655f805a9f48ac1b740c6231b92bea2f58f4f WHIRLPOOL 94f7f429137079c6d194fd09c2d568d58910a8ce434704568a633d43a1ba7d56878e39b6bfd1c4bb2a05d1436cdfdd1b4105d344e2c1a04db304b19941464933
+EBUILD netbeans-php-9999_p20141215.ebuild 4423 SHA256 d0692ea76897a768a459f287a11538724f4a553cd96d77de5a286a89ad1aa905 SHA512 e75398ce4ff79e064ce3c7a1bdf1063fdaf6c1f07ac3332b0b4108764b1fb887b0f5e2e22dc5e42037f304d90da17ee8b0b2873b9661e4de006b46a938080a23 WHIRLPOOL 7f1be587439f92d99ccb2e32395f4b8edb60a4bdb47ddd3fa281a53a141a063c46b338f0bf88b5d8c42f7689ccb82dc8b7a5d62536f2d809c4fece2401e7f223
+MISC ChangeLog 133712 SHA256 e5cd3b4a59ba71edc574db4ec71973c311a3bf99f8356f81381beb3019902ae9 SHA512 445f8597112da400a4b69e7bacbc9eb486b1defe124fa7e1b24b93c6b7a69638d4ccfe255490ed4c9be8c9896d0aebd9f38c8882f8efcd3f27183f16e90e2fa6 WHIRLPOOL e9412bcf5a29a982fcffabb5be79a8d8299696c8c7c83ec108af92b84e07d4c44a4dbdf3cb3f59e72b019725c9169bcbd13ac7e8bc624bcaf588e21de1fe5dfa
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20141215.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20141215.ebuild
new file mode 100644
index 0000000..7df3d3c
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20141215.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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/2014-12-15_00-01-53/zip/netbeans-trunk-nightly-201412150001-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/BFB982F9B33E2F1A1766C212C8208793F9B7E77C-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}"/BFB982F9B33E2F1A1766C212C8208793F9B7E77C-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/ChangeLog b/dev-java/netbeans-platform/ChangeLog
index f55ff72..8ac2235 100644
--- a/dev-java/netbeans-platform/ChangeLog
+++ b/dev-java/netbeans-platform/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-platform-9999_p20141215 (15 Dec 2014)
+
+  15 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-platform-9999_p20141215.ebuild:
+  bumped to the latest sources
+
 *netbeans-platform-9999_p20141214 (14 Dec 2014)
 
   14 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index eb3e498..9da14de 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -88,6 +88,7 @@ DIST netbeans-trunk-nightly-201412100001-src.zip 199725425 SHA256 31aac95459128b
 DIST netbeans-trunk-nightly-201412120001-src.zip 199804828 SHA256 aa8ddaee11569408ef6f38113a995220cba4f131302d3728bdaaf04f313e8fa7 SHA512 0740ce76fa636162d994fd7c620d8e00cbe86f5771f1e4a4e2801b6c1ae0dc2955626dad7469db8638ba2d373a1c3ad3291ccac736175e7a232aba97183fc68d WHIRLPOOL 0e373351fbea69764c227bed93d7c046f64a9345bc27d257804f0418cece75fa479be2ae89fefbbd2f5df3e7db0e4fa9e7aded25c3d88e3239008c314b5a1f73
 DIST netbeans-trunk-nightly-201412130001-src.zip 200994486 SHA256 30939e6630fc6feff490e95cb8880194e4508f8acb4abc2c4708545ee01ed8d2 SHA512 2983b84987fcf644a4eed9ae47ff5afce4dcb4e7088e56624b0be59575b6ed49f4e17b95b1d80f0d0179686d059b49d636a988362c4aafd96e02748edcbdc2b3 WHIRLPOOL bd1aea7fc97e1d091b79dc86c1998131a9ba431fbd321cd80fa89f9cc873652f36cda2af8e90d64ef09fb3f20c491e3b97108475cd8c717cfceef08d307a51de
 DIST netbeans-trunk-nightly-201412140001-src.zip 201028548 SHA256 ef045a9d2f46bff6971bde7ec89836a2f243693f85dcc5deb350d8e4988f18d9 SHA512 329f1804defa15b31fd93312079a517b56da7b39576d453090a79eaf51c5fa0176cc0520fcbe9f6a4fc089c63c6420923a340de46328101d7601b4fad8818ace WHIRLPOOL dbb3d020ac8b9d4e0abd8aacb2348f3a3a673a6399c12243ee8030e11be335c862df0edf60ca6df4aadaf83fb1b0e3f8670d8d37d2029ed7e14ce712b11e11c9
+DIST netbeans-trunk-nightly-201412150001-src.zip 201028954 SHA256 e127b68dbb59e5ed8cd10b09b4f4bd458dc054f42994329681041e27a75f52fc SHA512 2782abd4e52073dfb471fb29567886b10a254b629368f66c3a573fd5d9bf08f95945bb38d63970f5a9a07c27ecdcf0c6e10aab0517dd79adcf36da207670d534 WHIRLPOOL c9059f24fa8d68046ff5ce1981b821f3ebce476c9ef7742bbe0bd32f9996d26fd893a606479ea8664ce99ab384dd1d0d92702dd3a6727ef1ec954df5fd392148
 EBUILD netbeans-platform-7.0.1.ebuild 5049 SHA256 b67cf0867358fea808614c02b8b6ea2ab88223f8642175ac3f91dc8c610aca4e SHA512 611b8e831a95d1b4e1c3a1f5e4904c84f9606298a94eb0900ac06cc88670849d218a3a03cce07b2463e206da01ce2931cdb6677948d20d8326908a36851589e6 WHIRLPOOL 01769eca4eb20c2702a432a6180eed16a9a50687016e307e585ab5de5cab8b3b664e456d489ff15d9f5af349f791b161eecb9fef7bfaba09a70e1eaab5d545a0
 EBUILD netbeans-platform-7.1.2.ebuild 5034 SHA256 a069e7e45f768e590e5b30fdda26185d8fde492355e4c530ce44169def991cc6 SHA512 31cfb0d9f13eacfcafd49be995bc456d17a689776e032f68ed4585e068a49f6e992c37c57f23c5e27176fb060996bcfc86b0446ae26efbc488909102fc10c979 WHIRLPOOL 1bd35ac39366fd13192e4a6a177280727bceb2f5f12ff684a288725954a29a240f2d264c3ef2ca38fa3e133063cdd943cce1d0f493f0f8ea9a621833c8f0031b
 EBUILD netbeans-platform-7.2.ebuild 5432 SHA256 227add7f41117667d8487f2bf8eb846c21529e7b2c49dac46e4b3b33062f69b0 SHA512 e49958f21358fe9689336d5cd5edbe435d0a2fd12c315174dcb408bf6ed4e6515d39d458554fb576c342a43f0af50c327bada8fa0b2eb485e14c01ddcdb6248d WHIRLPOOL 4f9101a2d5495fb6002b7791822f85091309c04d6c475060c116725f8da32f9ed270f0c27a9f6a2bd2aa0bd7417b18e9165d1feff7e98f6205bdafff3223e5a3
@@ -144,5 +145,6 @@ EBUILD netbeans-platform-9999_p20141210.ebuild 8508 SHA256 357ec4397981407edbfec
 EBUILD netbeans-platform-9999_p20141212.ebuild 8508 SHA256 40035a968c15ef909bcf651a489443b042397ab8d27411fa9dc42b2dcb2fb55f SHA512 75a902ca8ef18ebc372036bde8c8543c02ded0281f8f700ff5490ecced12d92fdd92062fac0725aa7d07c622166cc939ee5cca9675673081d1e30f73c4e91d75 WHIRLPOOL b340d6e434f86931583735599df3058ff4e16ce6919f156e9ed906336bc0560acaefa8eb0229d091330cccef817557f626153fa5b015c629da52115afb70d205
 EBUILD netbeans-platform-9999_p20141213.ebuild 8508 SHA256 813a5d725458382ea6741a6a82ec80d9f1a8cc0ec7684eb9c25c7a83592627fd SHA512 d7a35b093a562a224139bce6658b04ba74aac24cddc32b2124541afd15974de6176e929e1620c9d437ee23474a50ebce9353d884439bcee004de4a769c98466f WHIRLPOOL 537925adcf15c827a00025539f244822a91f16837bdcb95380e25677433315753a5c8cbf80c7e9cf098071a5ddef3e9f3b9cc588df6f905edeb8e141b5709ba1
 EBUILD netbeans-platform-9999_p20141214.ebuild 8508 SHA256 70c07bbf58a97c0e3e49fb530c4a0c203c115b2710e1765693aa4dbf0ef22e00 SHA512 3eedb00afb268d0be10ea2593a4fa0217583c93d9a54d48ca6d3049197af5f900b86a0068d13d6a7fe0ee824bbc317786aa418be5d6e60bdffe1a65f09c58d41 WHIRLPOOL fa274fce215e3d7492861b90b92158c3d6bcd4a8b1c057736fe93013662a57e71d4fc8861c3d389b45d277d8d8a4768fcdc4d3d6b03dbb41e4327d46b4b1d938
-MISC ChangeLog 143656 SHA256 7925cde57482af49678d13b8d79cf5f046e3ff788379c0a910b31de0c9dac58c SHA512 99091aa5979f592bcbe897d94049766797540dde02b8aeeb4be4d1e66bdd0f6df401cf93a29a08301b98f06fd814f89c50cc55ceb81a3251df6c71980271b9b1 WHIRLPOOL 0c7ffb8bc4f24d091eec15222929e7ddce51c925727cff8f3c09cf88fef7c4bb44dc34e7957895a1c5dd529d94dcd55cddb8d6804ff6831c80ebf7fc3039916e
+EBUILD netbeans-platform-9999_p20141215.ebuild 8508 SHA256 3d2b4ef80a6cb322599bc9f88f48c3716e7ade30c56e1ac70be44f279e7b93e1 SHA512 bfefa89224dd9b2eb391ce00d0a157a9f1704971ceccc7e4ee5732278f6a9b7a5be68375eadd532f7a7462a9cd44d79bc61a8c8e08d95fbc2d16f84fd3754196 WHIRLPOOL 7fa7eb93e1945f47a11aeed2c166d09e320ab6a29e691dcf506f0909d5159a0dda8a3049b86b1e365080f2729430e1ad893a48b58cb7a92506983775117bea7d
+MISC ChangeLog 143833 SHA256 97f0407bc888aecfa813fdf4c522c33db697798dc097b6682030796bfb65b94a SHA512 80a7ab436a888b7015e6d298054458e3e32b21a76cc466caa99de10a1982869511b9cf9156d875dffe30d0e8324a64f402ef10c15e1c34220d8d3b8fd78a47ec WHIRLPOOL 0ba1064e1f442ed1dbb7a8bfff4d4eee57c469864a3a7bdbe497c86fd285016cb3fefedb8bfffde0a0169e85eab27cb4eb7f51d83ba7b1502ea9cffa64c4f757
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20141215.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20141215.ebuild
new file mode 100644
index 0000000..9717fe3
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20141215.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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/2014-12-15_00-01-53/zip/netbeans-trunk-nightly-201412150001-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/8B5627E4907808B25628C64F2876B2E64ECDF750-ko4j.jar
+	http://hg.netbeans.org/binaries/4C8F273EB7D02845F42CFBE3DE4EB2BA22AF6357-net-java-html.jar
+	http://hg.netbeans.org/binaries/72B71E13ADC08732D8274083908D47ED9CC37B55-net-java-html-boot.jar
+	http://hg.netbeans.org/binaries/29388BB216B2463DB0B7AD403392C0F7EA7A4260-net-java-html-boot-fx.jar
+	http://hg.netbeans.org/binaries/37B1B513D8E7A2689A92188DABE950E0D63176D3-net-java-html-boot-script.jar
+	http://hg.netbeans.org/binaries/51ADBD6B0FE548E15BD10AFC345CAD48589E960E-net-java-html-geo.jar
+	http://hg.netbeans.org/binaries/D9E741F404CE0751B97A343A665666A441008E4F-net-java-html-json.jar
+	http://hg.netbeans.org/binaries/A89F8D030A3BFCA10880C3274E86D683FCB92062-net-java-html-sound.jar
+	http://hg.netbeans.org/binaries/B27F1304F18FEDE876F940AEFA6C9EB5632619D7-org.eclipse.osgi_3.9.1.v20140110-1610.jar
+	http://hg.netbeans.org/binaries/AD568238EE36A820BD6C6806807E8A14EA34684D-org-ow2-asm.jar
+	http://hg.netbeans.org/binaries/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar
+	http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip
+	http://hg.netbeans.org/binaries/AC97B566699146713B3CF0ABC226B5C08EF7CF33-testng-6.8.1-dist.jar
+	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}"
+
+CDEPEND="dev-java/javahelp:0
+	>=dev-java/jna-3.4:0
+	>=dev-java/osgi-core-api-5:0
+	dev-java/swing-layout:1[source]"
+# oracle-jdk-bin is needed because other jdks do not contain file jre/lib/ext/jfxrt.jar
+# the error:
+#  [parseprojectxml] Distilling /var/tmp/portage/dev-java/netbeans-platform-9999_p20140922/work/nbbuild/build/public-package-jars/org-netbeans-libs-javafx.jar from [/var/tmp/portage/dev-java/netbeans-platform-9999_p20140922/work/nbbuild/netbeans/platform/modules/org-netbeans-libs-javafx.jar, /opt/icedtea-bin-7.2.4.7/jre/lib/ext/jfxrt.jar]
+#  [parseprojectxml] Classpath entry /opt/icedtea-bin-7.2.4.7/jre/lib/ext/jfxrt.jar does not exist; skipping
+#  [nbmerge] Failed to build target: all-api.html4j
+
+DEPEND="dev-java/oracle-jdk-bin:1.7
+	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.7"
+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}"/8B5627E4907808B25628C64F2876B2E64ECDF750-ko4j.jar o.n.html.ko4j/external/ko4j.jar || die
+	ln -s "${DISTDIR}"/4C8F273EB7D02845F42CFBE3DE4EB2BA22AF6357-net-java-html.jar net.java.html/external/net-java-html.jar || die
+	ln -s "${DISTDIR}"/72B71E13ADC08732D8274083908D47ED9CC37B55-net-java-html-boot.jar net.java.html.boot/external/net-java-html-boot.jar || die
+	ln -s "${DISTDIR}"/29388BB216B2463DB0B7AD403392C0F7EA7A4260-net-java-html-boot-fx.jar net.java.html.boot.fx/external/net-java-html-boot-fx.jar || die
+	ln -s "${DISTDIR}"/37B1B513D8E7A2689A92188DABE950E0D63176D3-net-java-html-boot-script.jar net.java.html.boot.script/external/net-java-html-boot-script.jar || die
+	ln -s "${DISTDIR}"/51ADBD6B0FE548E15BD10AFC345CAD48589E960E-net-java-html-geo.jar net.java.html.geo/external/net-java-html-geo.jar || die
+	ln -s "${DISTDIR}"/D9E741F404CE0751B97A343A665666A441008E4F-net-java-html-json.jar net.java.html.json/external/net-java-html-json.jar || die
+	ln -s "${DISTDIR}"/A89F8D030A3BFCA10880C3274E86D683FCB92062-net-java-html-sound.jar net.java.html.sound/external/net-java-html-sound.jar || die
+	ln -s "${DISTDIR}"/B27F1304F18FEDE876F940AEFA6C9EB5632619D7-org.eclipse.osgi_3.9.1.v20140110-1610.jar netbinox/external/org.eclipse.osgi_3.9.1.v20140110-1610.jar || die
+	ln -s "${DISTDIR}"/AD568238EE36A820BD6C6806807E8A14EA34684D-org-ow2-asm.jar o.objectweb.asm/external/org-ow2-asm.jar || die
+	ln -s "${DISTDIR}"/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar libs.osgi/external/osgi.cmpn-4.2.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}"/AC97B566699146713B3CF0ABC226B5C08EF7CF33-testng-6.8.1-dist.jar libs.testng/external/testng-6.8.1-dist.jar || 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.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.osgi/external osgi-core-api osgi-core-api.jar osgi.core-5.0.0.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-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/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 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 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
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/platform
+}

diff --git a/dev-java/netbeans-profiler/ChangeLog b/dev-java/netbeans-profiler/ChangeLog
index e23a7cb..cbe9421 100644
--- a/dev-java/netbeans-profiler/ChangeLog
+++ b/dev-java/netbeans-profiler/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-profiler-9999_p20141215 (15 Dec 2014)
+
+  15 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-profiler-9999_p20141215.ebuild:
+  bumped to the latest sources
+
 *netbeans-profiler-9999_p20141214 (14 Dec 2014)
 
   14 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index e46efb9..13426d0 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -62,6 +62,7 @@ DIST netbeans-trunk-nightly-201412100001-src.zip 199725425 SHA256 31aac95459128b
 DIST netbeans-trunk-nightly-201412120001-src.zip 199804828 SHA256 aa8ddaee11569408ef6f38113a995220cba4f131302d3728bdaaf04f313e8fa7 SHA512 0740ce76fa636162d994fd7c620d8e00cbe86f5771f1e4a4e2801b6c1ae0dc2955626dad7469db8638ba2d373a1c3ad3291ccac736175e7a232aba97183fc68d WHIRLPOOL 0e373351fbea69764c227bed93d7c046f64a9345bc27d257804f0418cece75fa479be2ae89fefbbd2f5df3e7db0e4fa9e7aded25c3d88e3239008c314b5a1f73
 DIST netbeans-trunk-nightly-201412130001-src.zip 200994486 SHA256 30939e6630fc6feff490e95cb8880194e4508f8acb4abc2c4708545ee01ed8d2 SHA512 2983b84987fcf644a4eed9ae47ff5afce4dcb4e7088e56624b0be59575b6ed49f4e17b95b1d80f0d0179686d059b49d636a988362c4aafd96e02748edcbdc2b3 WHIRLPOOL bd1aea7fc97e1d091b79dc86c1998131a9ba431fbd321cd80fa89f9cc873652f36cda2af8e90d64ef09fb3f20c491e3b97108475cd8c717cfceef08d307a51de
 DIST netbeans-trunk-nightly-201412140001-src.zip 201028548 SHA256 ef045a9d2f46bff6971bde7ec89836a2f243693f85dcc5deb350d8e4988f18d9 SHA512 329f1804defa15b31fd93312079a517b56da7b39576d453090a79eaf51c5fa0176cc0520fcbe9f6a4fc089c63c6420923a340de46328101d7601b4fad8818ace WHIRLPOOL dbb3d020ac8b9d4e0abd8aacb2348f3a3a673a6399c12243ee8030e11be335c862df0edf60ca6df4aadaf83fb1b0e3f8670d8d37d2029ed7e14ce712b11e11c9
+DIST netbeans-trunk-nightly-201412150001-src.zip 201028954 SHA256 e127b68dbb59e5ed8cd10b09b4f4bd458dc054f42994329681041e27a75f52fc SHA512 2782abd4e52073dfb471fb29567886b10a254b629368f66c3a573fd5d9bf08f95945bb38d63970f5a9a07c27ecdcf0c6e10aab0517dd79adcf36da207670d534 WHIRLPOOL c9059f24fa8d68046ff5ce1981b821f3ebce476c9ef7742bbe0bd32f9996d26fd893a606479ea8664ce99ab384dd1d0d92702dd3a6727ef1ec954df5fd392148
 EBUILD netbeans-profiler-7.0.1.ebuild 3222 SHA256 b1bab800a27c30aaea26b8ff5ab21abdd1bec16b9890133429eca9ea77c018fe SHA512 d6198f44a06561b7e2598fdd6a37f8a3dc13c38f63dfbf6a86a083adbf71e9c62af87cb4e1b5b8dd2dc99feeeb99a7afcbb8f7747c378ad92c71263cc91a6c54 WHIRLPOOL c62613f511636b1f0393ac32c6b50641cdf7df9f9fdc95fd5acbe1a602ffe42fdabb556f989552b05b0607a5ad9d324a2019440c3ae66c50995ef3fc8775f385
 EBUILD netbeans-profiler-7.1.2.ebuild 3231 SHA256 94d87bf6f86add3bdc27f9f20084f35fe584fc2bd697acafa8c23cce16a0d1ee SHA512 dcc8da918a6b6e07ccae513fb4296d16891e205b49098fb8269d16beb9b1367b1920797cc78053b83f4321c1b69faa393365265c72213bb2abfb9d3f84f66319 WHIRLPOOL 18325a1df836e7242838920483c41d43f37b9dae8322d36a2a562b414baa0dc76971f581204ce76a6d64196dd60643089e8704da69617590cda61ce54ce82e8d
 EBUILD netbeans-profiler-7.2.ebuild 3214 SHA256 ddcba9ba672ad566ef256538fc8631ae691aa7c6574269199f26df5382c37f4b SHA512 1bb7eb95381861b8265ab366fe3c7a9b99971d1c4600eb6c7bffb521f4cebb32bcf3d662f82c811d47fe95e77cd39e48f3665f0fcabf9145eb171c2746d89684 WHIRLPOOL 7f74c2be9ec4e7ff419086f1da3b1a12b1c187102def004316ef89ed28f30da62542ed3409a51473a8d9d68d18a30de36b1d0307cd8eeb7e580668fe896c5aa5
@@ -118,5 +119,6 @@ EBUILD netbeans-profiler-9999_p20141210.ebuild 3478 SHA256 37d5ae85c2842617784dc
 EBUILD netbeans-profiler-9999_p20141212.ebuild 3478 SHA256 0b29fdd7e0b57239aaa7e9f18763aefb520a56909f995c398cf7044d2a80d0c3 SHA512 dcab2c8f4fe23e9bc4ea12d8e9bf97fd7a9064604062b834945d0569bf38e50ced7f5c10e13f8b8969c1c9e9ce871cab8e5ffcfd6206188073f2c79509f1ce23 WHIRLPOOL ea02251f89e3fd7e2b5df70a5dd2dc35d43dd40496dd4a44ed4f34ab26b3ec22b68039dd300e59754cca6320c64083c887fdb78e66354966af00903a0989b32c
 EBUILD netbeans-profiler-9999_p20141213.ebuild 3478 SHA256 2dede7372dec80abe6b5e489b7d599ef6f0913423d866d51a70b2256443f3fe5 SHA512 b3b2f46b456d8340735973910d47f6b716eec2160fbe97decf33e177691a22c0707828132c3d13f090a682b416ba565d12328b4bebe3f9243b74b07c2d95d4f2 WHIRLPOOL 8555be6f10a489b696497a90d5bbbdb96347db14e3a6d5daded433be30467f48a72184fef90b117e887b469f8911cfd3dd562eeda1d65403d33d337c1167e4f7
 EBUILD netbeans-profiler-9999_p20141214.ebuild 3478 SHA256 62552571cd2184455a09afe80cf830837783222aaf2e4f09014b9e6961f037e1 SHA512 6ebdf7139d9de280e09d9f259112f0ba5ba4da2d5c490348ac6f37dadccc852f91aaec511fc1d44dbd8cd6c05deabb3512c621af2e297da9d9be8401936d457c WHIRLPOOL f8d7cf94ae31047be76bc1bdf386318f09235820630783a6ffae520ee4855a583ea11ddb1cfc99998e75f385aef20773cc51c6280843af143775796762c2b228
-MISC ChangeLog 143117 SHA256 90ae4bc5ac008183f8e0aa61cb0d82d4162c2f7a194ce960a15ed502f0020d08 SHA512 55ad7e826fe2ddc8574743f95381fe1973f9ac43dd3abfa4266b86c6c39668dceee6a3c59860c52ad90c1818538b72a6d28e26133dfe985fa377ce6922bdc9eb WHIRLPOOL c690f819999327ad928f4d6dd2fa8422650769e1ad4507067bf1b69de31b5427296847fe6aa7c788f77cf6ec011bedcee2a4b26ab5c4098b4183ad846832f927
+EBUILD netbeans-profiler-9999_p20141215.ebuild 3478 SHA256 f336b9ddf81747607d152d85ab5b78328613f45866e6baf30ac6e2b2c085854c SHA512 a881b1391df96a54e8de52043d02fe62da2e67f36eb88aca10460cf33813225fe0b6bb9912b85e7e540baecb38f4b93be7ea32f2e864f86f66fdef8fadf613f6 WHIRLPOOL 98c0fef34eaf8084f9338158babfa1360f629dad7698d68dbac4059012d4e9b63c8330c49cde97a503a80d81088ff156bdb59714535cc4e208fd6dfc6883479d
+MISC ChangeLog 143294 SHA256 86d9bb73bdeb7d8ea12913ac7cf2ac4459afe94c094aa7994e78d6dcee506a39 SHA512 13cd6524fc8d464fb1d27eef23057115f1ba0e7a4fb01e26f1b734ea6b66f079c1fa92302ac5e4e4c3ed1ff165ad1956aaaefa8598329c498f2b351f8d68c839 WHIRLPOOL ed094b76c270fa83696de59e2f5bf80281d7d595ce06452d60557f371098fec6a4e0cb68acea6fa78daef0caa9a2bf0200054a87b27c9221afaaf4fb699e8621
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20141215.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20141215.ebuild
new file mode 100644
index 0000000..02a3e5a
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20141215.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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/2014-12-15_00-01-53/zip/netbeans-trunk-nightly-201412150001-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/ChangeLog b/dev-java/netbeans-webcommon/ChangeLog
index 379b02e..d55f292 100644
--- a/dev-java/netbeans-webcommon/ChangeLog
+++ b/dev-java/netbeans-webcommon/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-webcommon-9999_p20141215 (15 Dec 2014)
+
+  15 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-webcommon-9999_p20141215.ebuild:
+  bumped to the latest sources
+
 *netbeans-webcommon-9999_p20141214 (14 Dec 2014)
 
   14 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index 6807ac0..394bdd9 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -68,6 +68,7 @@ DIST netbeans-trunk-nightly-201412100001-src.zip 199725425 SHA256 31aac95459128b
 DIST netbeans-trunk-nightly-201412120001-src.zip 199804828 SHA256 aa8ddaee11569408ef6f38113a995220cba4f131302d3728bdaaf04f313e8fa7 SHA512 0740ce76fa636162d994fd7c620d8e00cbe86f5771f1e4a4e2801b6c1ae0dc2955626dad7469db8638ba2d373a1c3ad3291ccac736175e7a232aba97183fc68d WHIRLPOOL 0e373351fbea69764c227bed93d7c046f64a9345bc27d257804f0418cece75fa479be2ae89fefbbd2f5df3e7db0e4fa9e7aded25c3d88e3239008c314b5a1f73
 DIST netbeans-trunk-nightly-201412130001-src.zip 200994486 SHA256 30939e6630fc6feff490e95cb8880194e4508f8acb4abc2c4708545ee01ed8d2 SHA512 2983b84987fcf644a4eed9ae47ff5afce4dcb4e7088e56624b0be59575b6ed49f4e17b95b1d80f0d0179686d059b49d636a988362c4aafd96e02748edcbdc2b3 WHIRLPOOL bd1aea7fc97e1d091b79dc86c1998131a9ba431fbd321cd80fa89f9cc873652f36cda2af8e90d64ef09fb3f20c491e3b97108475cd8c717cfceef08d307a51de
 DIST netbeans-trunk-nightly-201412140001-src.zip 201028548 SHA256 ef045a9d2f46bff6971bde7ec89836a2f243693f85dcc5deb350d8e4988f18d9 SHA512 329f1804defa15b31fd93312079a517b56da7b39576d453090a79eaf51c5fa0176cc0520fcbe9f6a4fc089c63c6420923a340de46328101d7601b4fad8818ace WHIRLPOOL dbb3d020ac8b9d4e0abd8aacb2348f3a3a673a6399c12243ee8030e11be335c862df0edf60ca6df4aadaf83fb1b0e3f8670d8d37d2029ed7e14ce712b11e11c9
+DIST netbeans-trunk-nightly-201412150001-src.zip 201028954 SHA256 e127b68dbb59e5ed8cd10b09b4f4bd458dc054f42994329681041e27a75f52fc SHA512 2782abd4e52073dfb471fb29567886b10a254b629368f66c3a573fd5d9bf08f95945bb38d63970f5a9a07c27ecdcf0c6e10aab0517dd79adcf36da207670d534 WHIRLPOOL c9059f24fa8d68046ff5ce1981b821f3ebce476c9ef7742bbe0bd32f9996d26fd893a606479ea8664ce99ab384dd1d0d92702dd3a6727ef1ec954df5fd392148
 EBUILD netbeans-webcommon-7.2.ebuild 2665 SHA256 9328ea550dfeca5be5c2b03aa5f512d451f1673e49a40994155fca0b2fb2f79d SHA512 d8b80b79e78769a70d01605a79a8a91f7e839d4138b4cbf28cafca6f56ae3d7003c2f5f40aff77bbe3f2882f43a7d7dca3f0428f0f2723a42ae5b49e4c71ffff WHIRLPOOL 31254cbd2fc6cfb2d1bed4d22958595dbbf73032439f19e684463efbe466ee80c144f77ab00ced7a07815b1cdc1d45a87ceda83e7a2fd20ac2ce65e45d30a093
 EBUILD netbeans-webcommon-7.3.ebuild 2986 SHA256 327c0a73fb20778d9fbe4a12024fa065e4102a7aff3fcbda7448874656a46420 SHA512 3d270e940424b3bcdc8c7f8ff2016d33eb55420ac4037f4e406b688c2acea1b07a04625772265ac293d80c0d1afe3bbe6f865051ed9234b700619bd0781d8b39 WHIRLPOOL 5bc288949ed3aa9c3c4cd4cd33b817fe317754229ad30e80da8cfea817bfb77e988a1d6d3280aaef90619968e0309fad212deff0f7970f04438494a893a30a5b
 EBUILD netbeans-webcommon-7.4.ebuild 4727 SHA256 54a0b63527001da34a21ae3ed69c2cfbf9a446ee69bda4bb6ac5ebb939ebb68d SHA512 96895c972cf7092426ec8bc06dccc6ab4f33334da4e67fd4da01e586801110bda8d955f2f29ecd93b8bb58ae64c4af4139e9954a784c10dec925e2beaeab2394 WHIRLPOOL aa7b3b59d315bd37553052470b1f56f435979569e5ef033493cf6f93c29827f2ecd30f6b874f07a0cd8824469c6546982ac3ed360bf3b6cbf211d95943a3398a
@@ -122,5 +123,6 @@ EBUILD netbeans-webcommon-9999_p20141210.ebuild 4997 SHA256 f26e9734c19b9ea895ff
 EBUILD netbeans-webcommon-9999_p20141212.ebuild 4997 SHA256 06e47925673cd4a0caa02f16f502456f8a56e52b6de095d0ec47b30ff74b306b SHA512 34eb662cef4cae126d4d1801cfdad478f5e76be35e5c9c155407fb3509abbab789694355cb8f9556c1c8f1ba3b40f78e552622136bff70044868425e02a8f542 WHIRLPOOL f82884169a43a65aa261852052529e6a0295a0f24c09c243dbb0393493209a9adc341305cd39af60029894e995da2ae2237d83ecf4d72c855b05b37c8ff16bdb
 EBUILD netbeans-webcommon-9999_p20141213.ebuild 4997 SHA256 7bdaad6aa17d38d3b2a83c2e653ceab633720a71f9f3a7dc87ab95558372d6a7 SHA512 26897b4c274aa168d2d364e73b309d58de820a929fd25876ce0fe9bf65a3cb5bd238f2dcd8d372a5524ac57d02fdaf9b8161a8ad615eac39c527141b02a9c277 WHIRLPOOL c112994593f55daca3919bc7e48a894c3536b63bcef8fc230dd8279c9f3c391e40c79ba9774700ec8c8b83ec9bcf01562aaa74cb10b10bf03053704e9a2d8ef3
 EBUILD netbeans-webcommon-9999_p20141214.ebuild 4997 SHA256 5ab2a6fefa482806255e20b01bc8407e2adbcf808221f78f7cfb90ce74dc2b12 SHA512 15be486e1cd8045c9f1d501706b7738f4ffaa3e976d9d41041f15d3d9de919792fef4fb167e6f414d1d226b75721126b502e513d072f1fc838bb61ffd5302e27 WHIRLPOOL 3048b91dadad11e057ba836ab7d00a0691fc66babdaaff302e7b35959e50921b14a4700e6a4f3fa063e290f14a2dabf2456cbf70e6bb68a5261da8ca193253d7
-MISC ChangeLog 115859 SHA256 2c7ca7a77060fdac320d7a4324c2e597f0e496b4abc8b6c665227373185d8601 SHA512 caaeb0e9fe6bde45bd4d99194b703619dde110239b3bb04b6a0331d848fa5457d9b550260880b304e02d246c52325d6ab8d9a426af441e98cc2d2700f5fe6082 WHIRLPOOL 6d1535ad3001bc45d1012681642aed2f55986db65205612e4c95f8348f5bd0ee96aabdd574eb3b947643752b623376c95a771bf0f20a72df99c16c0a42383916
+EBUILD netbeans-webcommon-9999_p20141215.ebuild 4997 SHA256 66cd364272005c50abcfa285331b4c50b8f0b5aa05abd25d27232d250a1f4368 SHA512 64dc23933def6abd824b274253d29264177a18bb25da6e1d363443e59691bac53122076acd861e8b58f433fb382d085f18a190b65bcf1c6c2eb858e43b26110d WHIRLPOOL 459c612360901aa237f641ec41a2fdcae10112caf72ea8805035f71400eac17b355fcaa77ef204440ee00fee8613fafbdca105d2dde124b996555aaa9bd83e67
+MISC ChangeLog 116038 SHA256 b97fbfe4b1ece0cf48e32d7a7f13b78b7163fe4dd2e95960a5d019873934738d SHA512 c571870915eb447141e00c24ac87702a386790c11a6f69283d35826afd4d088a318307c2142e6c3f600ffa9120b195fad0461a59d74054b073aeea95ef54da0c WHIRLPOOL 5f85fe03f5ca3606acfc83b0e5fbf9581dd173288cb7fdf178a97b8be989404d514faee2a46fe22f709d31917220702ff16b81197a7789653e7a200b6cda5618
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20141215.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20141215.ebuild
new file mode 100644
index 0000000..6f4a03a
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20141215.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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/2014-12-15_00-01-53/zip/netbeans-trunk-nightly-201412150001-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}
+	dev-java/commons-compress: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.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 --into libs.commons_compress/external commons-compress commons-compress.jar commons-compress-1.8.1.jar
+	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
+
+	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
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/webcommon
+}

diff --git a/dev-java/netbeans-websvccommon/ChangeLog b/dev-java/netbeans-websvccommon/ChangeLog
index 4161bfb..36ceb09 100644
--- a/dev-java/netbeans-websvccommon/ChangeLog
+++ b/dev-java/netbeans-websvccommon/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-websvccommon-9999_p20141215 (15 Dec 2014)
+
+  15 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-websvccommon-9999_p20141215.ebuild:
+  bumped to the latest sources
+
 *netbeans-websvccommon-9999_p20141214 (14 Dec 2014)
 
   14 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index bf55967..95702a5 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -62,6 +62,7 @@ DIST netbeans-trunk-nightly-201412100001-src.zip 199725425 SHA256 31aac95459128b
 DIST netbeans-trunk-nightly-201412120001-src.zip 199804828 SHA256 aa8ddaee11569408ef6f38113a995220cba4f131302d3728bdaaf04f313e8fa7 SHA512 0740ce76fa636162d994fd7c620d8e00cbe86f5771f1e4a4e2801b6c1ae0dc2955626dad7469db8638ba2d373a1c3ad3291ccac736175e7a232aba97183fc68d WHIRLPOOL 0e373351fbea69764c227bed93d7c046f64a9345bc27d257804f0418cece75fa479be2ae89fefbbd2f5df3e7db0e4fa9e7aded25c3d88e3239008c314b5a1f73
 DIST netbeans-trunk-nightly-201412130001-src.zip 200994486 SHA256 30939e6630fc6feff490e95cb8880194e4508f8acb4abc2c4708545ee01ed8d2 SHA512 2983b84987fcf644a4eed9ae47ff5afce4dcb4e7088e56624b0be59575b6ed49f4e17b95b1d80f0d0179686d059b49d636a988362c4aafd96e02748edcbdc2b3 WHIRLPOOL bd1aea7fc97e1d091b79dc86c1998131a9ba431fbd321cd80fa89f9cc873652f36cda2af8e90d64ef09fb3f20c491e3b97108475cd8c717cfceef08d307a51de
 DIST netbeans-trunk-nightly-201412140001-src.zip 201028548 SHA256 ef045a9d2f46bff6971bde7ec89836a2f243693f85dcc5deb350d8e4988f18d9 SHA512 329f1804defa15b31fd93312079a517b56da7b39576d453090a79eaf51c5fa0176cc0520fcbe9f6a4fc089c63c6420923a340de46328101d7601b4fad8818ace WHIRLPOOL dbb3d020ac8b9d4e0abd8aacb2348f3a3a673a6399c12243ee8030e11be335c862df0edf60ca6df4aadaf83fb1b0e3f8670d8d37d2029ed7e14ce712b11e11c9
+DIST netbeans-trunk-nightly-201412150001-src.zip 201028954 SHA256 e127b68dbb59e5ed8cd10b09b4f4bd458dc054f42994329681041e27a75f52fc SHA512 2782abd4e52073dfb471fb29567886b10a254b629368f66c3a573fd5d9bf08f95945bb38d63970f5a9a07c27ecdcf0c6e10aab0517dd79adcf36da207670d534 WHIRLPOOL c9059f24fa8d68046ff5ce1981b821f3ebce476c9ef7742bbe0bd32f9996d26fd893a606479ea8664ce99ab384dd1d0d92702dd3a6727ef1ec954df5fd392148
 EBUILD netbeans-websvccommon-7.0.1.ebuild 2692 SHA256 a18cf7fe0a1e38749826cb12651be06c210b038be50117647496ee6cbd184cda SHA512 32b32894713d7235ebd03446c5c411d22eb8701b96e3d3ac54eca78b2abc833babf279085cea3b74bb7bddc6d89a283a21c58a0b0462042ddd10e22dfcadeb84 WHIRLPOOL 59c18168245767acd1f8e53046f8942698237aa6fd903a669c626b7f17cf3d39247b7ae57f2984562230267885a4b6a62be43dc8a330f1dfeb2cc7acbbd7d3c6
 EBUILD netbeans-websvccommon-7.1.2.ebuild 2701 SHA256 3b2a1cf0d32db3c55b66d1c6b8c4ae2ad5487d3fdb27752468ce5c860f9b9515 SHA512 b9be64755f00157c2d6984887b8c0fdc1e34470f21df1fd72b3e399d3ec894af01c9b79fd604778213ac2086a6c96bf66366e8c2c8bf97f7fee23d16ceb36974 WHIRLPOOL 91559de8c8f6391c3c69888854778a91a1a7e0052ae69eb9762bcbd64d8bc5587fb84ebb55d7d0375da5a7855aa8672abfd035b6a38b3eeb5c23a4cd59b3cdce
 EBUILD netbeans-websvccommon-7.2.ebuild 2684 SHA256 8bf8cad1e0469713c63280620fed089600191230f501a78b834b010f8fa9b3e9 SHA512 fe885f92a7c6cfac532c8e40e4df6283253c43294e9d82ee4d0d070425496eee3792479c268b46bf1fd484f753ca1f21e7ca38a5d71816b6d4fd219082e8e276 WHIRLPOOL 9d2d622d4a800470c874d8751e9c2055e0a4ef72ad01a01aefda4e95a7f295d55fc95fdb55fdd1f631212e1f610bdc7a6b4ee631b92492bb85f73b0d9fb4ba26
@@ -118,5 +119,6 @@ EBUILD netbeans-websvccommon-9999_p20141210.ebuild 2727 SHA256 16db8808a43bdac53
 EBUILD netbeans-websvccommon-9999_p20141212.ebuild 2727 SHA256 bda216099cba3ab548e6be155fd75e6c139f9c002f9b8e5062627993b3d21ead SHA512 14b086c131e94f2753fdc9d43454591a446b2ed180ff51a1b6bb8cd1abbb19808f631405e02235f54c17eb4be24f4efa9f1fe7080c1ced3e695ca215b7bd136b WHIRLPOOL 99999cb187433818a8e8dbe097b19ddd01fca6e3ed8582be5d66ef95d4552ec7c900aca3fcbd6a6c04f2bc5c54ae2d602cbddc629561f4ac096fefe7d13b82ef
 EBUILD netbeans-websvccommon-9999_p20141213.ebuild 2727 SHA256 cdea44dbd0f8bbf7947405c4a5141d98770c75182ec9fc716170838d1594ac07 SHA512 10d1c408651bf1ee3288ed00ca86e8cc5e38bdb1b4644ff9a0e314dd93033aad7656698eac136d259673b3e35c54e9c18b2010975d1236c99bdf23b8a015c834 WHIRLPOOL dd2f3f6686000704ea08920adde004433c1ff577671ed5e1538345a696271867b5310e85518563e8741632ec1226166f4e2a06da28cd6f77fb140ebc70e40017
 EBUILD netbeans-websvccommon-9999_p20141214.ebuild 2727 SHA256 cd4b5c3a528e66d1c1ea5013fc2cf220a784eccc35a73a8c0788bca8a72825a7 SHA512 4bcbb9278724ba507cdad86a898e5702d0415556fea31bd98885e81139f7d501cfce3cd8970bf28c71eaa1c84cb33c9e6cc4814e7712492816da9e04b47bef1d WHIRLPOOL ce3c6bf722b97e09f99ad1bb56596454e030f6de487b479b028f726f2dcf2c316e79eb05a3167e1dfbc3c3efc0e739c07866796ceb10f28e8f7a0c304bb12448
-MISC ChangeLog 149826 SHA256 679f0f798cf804fdaa031133d7c9c84eb176c509fad18d3404c5b48dd66b9191 SHA512 d4edda0df49e40551fce75ecfb43304fa198180c4b2fd82e680109ed2ecd61c3250e985ff416868ec318e9cc72868f826c7d956e844b55a74e21198058a933af WHIRLPOOL 2632b03c41db91ea61210b808830ef6aaf40f76328ef6b18effb9e6533331b3c738cbd4f4566518c334f53736613c16f6aaf265a70b37843b618414bd089e8d7
+EBUILD netbeans-websvccommon-9999_p20141215.ebuild 2727 SHA256 d26be131e4d6bed75cc8f5e4e7f043d21509768e4704e758b091d4ea4de9475f SHA512 11c23d1883387350baff0f8d32eaf9e191dd73500db07b434397e3009c4c37d4481c9a9e880f050717fd5914a8028162b981da08b4bc029e86bb382e1ad41bd8 WHIRLPOOL 6b97be02fad051d58725ee9effb0482ddd1d57c59561866eda48d7e84ab65ac47f123c9b6457865ad0d3bab9c54cdc1284f3386feb2d0a11af059b9e23facf19
+MISC ChangeLog 150011 SHA256 0695780660c108faabef0b8e44ca32bf3f8f2ce4bca32ecafc127fba9e77de49 SHA512 66f074fda21c5a9ef71f4c4ff7ca90117053f5306eff01f7fb97bb738134e3bbc767bf733642aaaeba2811019205c9096c1f4a99361a97e666d4dba090f7b382 WHIRLPOOL 906a99ce2b5eae0699a2994b34ef780dbcaef2f9a771f8e4da777a33c79f47e76d56ac1bb8db841e6aa40b2d48c3b3c3a251b54b6254a556254373335e5f0306
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20141215.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20141215.ebuild
new file mode 100644
index 0000000..9a04abd
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20141215.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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/2014-12-15_00-01-53/zip/netbeans-trunk-nightly-201412150001-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/ChangeLog b/dev-util/netbeans/ChangeLog
index 729cd62..3cc407d 100644
--- a/dev-util/netbeans/ChangeLog
+++ b/dev-util/netbeans/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-9999_p20141215 (15 Dec 2014)
+
+  15 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-9999_p20141215.ebuild:
+  bumped to the latest sources
+
 *netbeans-9999_p20141214 (14 Dec 2014)
 
   14 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index ba74311..a61b028 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -70,6 +70,7 @@ DIST netbeans-trunk-nightly-201412100001-src.zip 199725425 SHA256 31aac95459128b
 DIST netbeans-trunk-nightly-201412120001-src.zip 199804828 SHA256 aa8ddaee11569408ef6f38113a995220cba4f131302d3728bdaaf04f313e8fa7 SHA512 0740ce76fa636162d994fd7c620d8e00cbe86f5771f1e4a4e2801b6c1ae0dc2955626dad7469db8638ba2d373a1c3ad3291ccac736175e7a232aba97183fc68d WHIRLPOOL 0e373351fbea69764c227bed93d7c046f64a9345bc27d257804f0418cece75fa479be2ae89fefbbd2f5df3e7db0e4fa9e7aded25c3d88e3239008c314b5a1f73
 DIST netbeans-trunk-nightly-201412130001-src.zip 200994486 SHA256 30939e6630fc6feff490e95cb8880194e4508f8acb4abc2c4708545ee01ed8d2 SHA512 2983b84987fcf644a4eed9ae47ff5afce4dcb4e7088e56624b0be59575b6ed49f4e17b95b1d80f0d0179686d059b49d636a988362c4aafd96e02748edcbdc2b3 WHIRLPOOL bd1aea7fc97e1d091b79dc86c1998131a9ba431fbd321cd80fa89f9cc873652f36cda2af8e90d64ef09fb3f20c491e3b97108475cd8c717cfceef08d307a51de
 DIST netbeans-trunk-nightly-201412140001-src.zip 201028548 SHA256 ef045a9d2f46bff6971bde7ec89836a2f243693f85dcc5deb350d8e4988f18d9 SHA512 329f1804defa15b31fd93312079a517b56da7b39576d453090a79eaf51c5fa0176cc0520fcbe9f6a4fc089c63c6420923a340de46328101d7601b4fad8818ace WHIRLPOOL dbb3d020ac8b9d4e0abd8aacb2348f3a3a673a6399c12243ee8030e11be335c862df0edf60ca6df4aadaf83fb1b0e3f8670d8d37d2029ed7e14ce712b11e11c9
+DIST netbeans-trunk-nightly-201412150001-src.zip 201028954 SHA256 e127b68dbb59e5ed8cd10b09b4f4bd458dc054f42994329681041e27a75f52fc SHA512 2782abd4e52073dfb471fb29567886b10a254b629368f66c3a573fd5d9bf08f95945bb38d63970f5a9a07c27ecdcf0c6e10aab0517dd79adcf36da207670d534 WHIRLPOOL c9059f24fa8d68046ff5ce1981b821f3ebce476c9ef7742bbe0bd32f9996d26fd893a606479ea8664ce99ab384dd1d0d92702dd3a6727ef1ec954df5fd392148
 EBUILD netbeans-7.0.1-r2.ebuild 6736 SHA256 e808fba2ddb516270d93b5cf67cff60d98b37ca58a158878f2e3b3ad696cfc82 SHA512 653fb585d9eaa20fcf88d778a7f34d63c9f29f2af2153a432fcab6d977ef9619c699b19587a48b148ccf717f4b31a43859b81cff80d5d84ad273c5fa16e8f565 WHIRLPOOL 257f2466c3ad198a05db9d5e377cad2707f8a4daf1f421e516d7435670a85fd4bb5f6b3ab657ebda8cc23937e1b4e1f4acce8cccd85bccddc5a7b1f9abbde0ce
 EBUILD netbeans-7.1.2.ebuild 6976 SHA256 4222e248dfb664ccfea85d4938ad691d3685f32d8e9b33289d1dda088057261b SHA512 cc0a20bd542b61621fe08d5413611f7bcbbebf0c37d5f67c590c31324e74eb5594e72efacc86d843ff3abffc98c4859c2733c63ce6f993baf51e24d69197b64d WHIRLPOOL 30fb7b0cbf22fc39a8dabefd27a0073ce73e62ef082d55839fb7f815bb73bc5c3c24c3418ce175f355d7c64138ef7e9616da41c68b3b57a70353d16c6113daf7
 EBUILD netbeans-7.2.ebuild 7057 SHA256 29140b2779f1a24722499605101c286d05415b4f97d2363afedef711cc586067 SHA512 0776f530f9530c533b13019f7b34fc664990a16926bcff768d0a9f3b9035de82dcd2ed66425ad8da27c65aa69fe3e6be966e0a1ee1bc222949e5d42e14f7f7f1 WHIRLPOOL 9fcb95348171fb0bd8d794b80b51b2e3ce36fd84ccc81653bdd0172cbfa99791e527b33c895ebf7b4d81c228f17d4afab367eb55ceffe28df835b2d09dc8f778
@@ -126,5 +127,6 @@ EBUILD netbeans-9999_p20141210.ebuild 7216 SHA256 66ce096f3624ce992a1e13b26c0efb
 EBUILD netbeans-9999_p20141212.ebuild 7216 SHA256 5cda59e93aab4cf266670aa1649ccec53da4761ea4c0b0f58fa2832d63a22f75 SHA512 a194a76bb36312c08c98d65bb8c91a0c41c460c3a2a262d020821f3c93510b161140e9fc42d4c13e42a3b1be5823bbd5451c65fdd3c59018fa9d3cc1bb025f4c WHIRLPOOL a15b5beee68d3100d63969be48981ceb6c2278e09f491b04e7a33b03f1602a50fc24b71ad2d59cffa820ec503bdaef931fcc5d3dc4270bf5d1e81c1766ab8b88
 EBUILD netbeans-9999_p20141213.ebuild 7216 SHA256 a3270a757b6608af8923dbc7e803c00120163b65eca9227713b0061dee76096e SHA512 2596107629304c30f75edd25d9c2e696e56a97e9d8664096eb65017c4f746d9373ba446b7e16270a4f02db40b33dcedec57bc9ee8b23b1ef75d2bc8e0dc8e568 WHIRLPOOL 3e5b0a81a0bc7acf2e4126bc0c3cc77dab9b5d334e14fd4546cd2764ae7d6f5645fee5c7b1dd8e829ad99cbb4bd4f22434784e9a9984829df4ec9a78d3e5352d
 EBUILD netbeans-9999_p20141214.ebuild 7216 SHA256 35d8d285a602df324753826a1eb1bf21c4f9c39771ef6cdceff80ac96d6e7bb8 SHA512 2041867d9a8616760f2e4104465639fa9096b9277e60a49a246fcbbcf12599a4c99acbebd3f36c2bcdebd8269255a7e24790c9e3f3644c1d7edf4f86f9545c16 WHIRLPOOL 2e0a6975de190beda2b07b68064b6ffbb44c283b5177b22e5ecfd19ee133f0e12eaf682ac6cb7fbf4fce179dcc0fdc306a7c08a21a4b88382251d4ffe6e1b757
-MISC ChangeLog 127910 SHA256 213c2a4ea3d4602bd33e79a9c223941bba3ed5d0a8d50983f6c28aeafb58331b SHA512 ee999e1ad8856dc932ad21a3b1de04665381e356796e8b3a35557697a82b6097abd089fb3018bdddada284dd341c2cdd260dd0e47c6b4ab2b0c56057d048f1fa WHIRLPOOL 46477bcb91e4296921d6b8152cb2a39ef30da7e826670db9eaafcadf60b30b4e82ea415b01ebcd72c0ead9d7ed7f75919bdb6f558438b26d7f89b0fcb5f7031b
+EBUILD netbeans-9999_p20141215.ebuild 7216 SHA256 e8aea2ecb0c7fed5548365ffde70a50de6c96dc8ff3210badcf5ee1b771f0201 SHA512 2f5c9e1951109b53b1f389cfbd2a96aaa1b4e424f039b3e253b11be0e29d8ed6f7f1dd84d71d8dcecbcff9b81080a595f07f86d8e985b635bbad4e3c05621074 WHIRLPOOL 1cfc074dfc7cf78b82600f1e9788aaee3414f2e24ab5a9ebe620f728c19f6351aeab0eb8f820fbad4dbb44a1cfebbe115ee077cc195513649df6285e910f9e60
+MISC ChangeLog 128069 SHA256 4f0646ab4578a4be4d7e125ec40f4d49c6c6c9c7e0819de37a5f8c4f8846152a SHA512 933723eff6d75bb996bbc1e2ff77f86afe514757cf4bdb1adaf4f43df26e3830065af69ea4c8f967ceb1521c2c2c1e1369c049a36bc21208bb8260ab281eaaae WHIRLPOOL 9c7aa901d0de381f2b32644640fbb1965a2ee6547b839c0749b662b4c051660b342c6966496109b09a69cf698c50023d4a4ca40a4f2e25b64796ba100a088728
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

diff --git a/dev-util/netbeans/netbeans-9999_p20141215.ebuild b/dev-util/netbeans/netbeans-9999_p20141215.ebuild
new file mode 100644
index 0000000..9fa0c6b
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20141215.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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/2014-12-15_00-01-53/zip/netbeans-trunk-nightly-201412150001-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_bg? ( ${ALL_URLS} )
+	linguas_ca? ( ${ALL_URLS} )
+	linguas_cs? ( ${ALL_URLS} )
+	linguas_de? ( ${ALL_URLS} )
+	linguas_el? ( ${ALL_URLS} )
+	linguas_es? ( ${ALL_URLS} )
+	linguas_fr? ( ${ALL_URLS} )
+	linguas_gl? ( ${ALL_URLS} )
+	linguas_hi_IN? ( ${ALL_URLS} )
+	linguas_id? ( ${ALL_URLS} )
+	linguas_it? ( ${ALL_URLS} )
+	linguas_ja? ( ${ALL_URLS} )
+	linguas_ko? ( ${ALL_URLS} )
+	linguas_lt? ( ${ALL_URLS} )
+	linguas_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_tl? ( ${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_bg
+	linguas_ca
+	linguas_cs
+	linguas_de
+	linguas_el
+	linguas_es
+	linguas_fr
+	linguas_gl
+	linguas_hi_IN
+	linguas_id
+	linguas_it
+	linguas_ja
+	linguas_ko
+	linguas_lt
+	linguas_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_tl
+	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}" = "gl" ]] ; then
+			lang="gl_ES"
+		elif [[ "${lang}" = "id" ]] ; then
+			lang="in_ID"
+		elif [[ "${lang}" = "nl" ]] ; then
+			lang="nl_BE,nl_NL"
+		elif [[ "${lang}" = "tl" ]] ; then
+			lang="fil_PH"
+		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_gl ; then
+		einfo
+		einfo "You selected Galician locale which has locale code gl:ES in Netbeans."
+	fi
+
+	if use linguas_id ; then
+		einfo
+		einfo "You selected Indonesian locale which has locale code in:ID in Netbeans."
+	fi
+
+	if use linguas_nl ; then
+		einfo
+		einfo "You selected Dutch locale so you can choose either nl:BE or nl:NL variant."
+	fi
+
+	if use linguas_tl ; then
+		einfo
+		einfo "You selected Tagalog locale which has for Filipino locale code fil:PH in Netbeans."
+	fi
+}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-dlight/, dev-java/netbeans-webcommon/, ...
@ 2015-10-02  9:51 Miroslav Šulc
  0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2015-10-02  9:51 UTC (permalink / raw
  To: gentoo-commits

commit:     8d58f63635b2d769a630e3bfcc6d1eebd655abf5
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  2 09:49:13 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Oct  2 09:49:13 2015 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=8d58f636

netbeans: version bump

Package-Manager: portage-2.2.22

 dev-java/netbeans-apisupport/Manifest              |   2 +
 .../netbeans-apisupport-9999_p20151002.ebuild      | 111 ++++++
 dev-java/netbeans-cnd/Manifest                     |   3 +
 .../netbeans-cnd-9999_p20151002.ebuild             | 127 +++++++
 dev-java/netbeans-dlight/Manifest                  |   2 +
 .../netbeans-dlight-9999_p20151002.ebuild          | 101 ++++++
 dev-java/netbeans-enterprise/Manifest              |   2 +
 .../netbeans-enterprise-9999_p20151002.ebuild      | 266 +++++++++++++++
 dev-java/netbeans-ergonomics/Manifest              |   2 +
 .../netbeans-ergonomics-9999_p20151002.ebuild      | 101 ++++++
 dev-java/netbeans-extide/Manifest                  |   2 +
 .../netbeans-extide-9999_p20151002.ebuild          | 108 ++++++
 dev-java/netbeans-groovy/Manifest                  |   2 +
 .../netbeans-groovy-9999_p20151002.ebuild          | 111 ++++++
 dev-java/netbeans-harness/Manifest                 |   2 +
 .../netbeans-harness-9999_p20151002.ebuild         | 114 +++++++
 dev-java/netbeans-ide/Manifest                     |   2 +
 .../netbeans-ide-9999_p20151002.ebuild             | 377 +++++++++++++++++++++
 dev-java/netbeans-java/Manifest                    |   2 +
 .../netbeans-java-9999_p20151002.ebuild            | 273 +++++++++++++++
 dev-java/netbeans-javacard/Manifest                |   2 +
 .../netbeans-javacard-9999_p20151002.ebuild        | 134 ++++++++
 dev-java/netbeans-javadoc/Manifest                 |   2 +
 .../netbeans-javadoc-9999_p20151002.ebuild         | 168 +++++++++
 dev-java/netbeans-javafx/Manifest                  |   2 +
 .../netbeans-javafx-9999_p20151002.ebuild          | 124 +++++++
 dev-java/netbeans-mobility/Manifest                |   2 +
 .../netbeans-mobility-9999_p20151002.ebuild        | 126 +++++++
 dev-java/netbeans-nb/Manifest                      |   2 +
 .../netbeans-nb/netbeans-nb-9999_p20151002.ebuild  | 148 ++++++++
 dev-java/netbeans-php/Manifest                     |   2 +
 .../netbeans-php-9999_p20151002.ebuild             | 127 +++++++
 dev-java/netbeans-platform/Manifest                |   2 +
 .../netbeans-platform-9999_p20151002.ebuild        | 166 +++++++++
 dev-java/netbeans-profiler/Manifest                |   2 +
 .../netbeans-profiler-9999_p20151002.ebuild        | 121 +++++++
 dev-java/netbeans-webcommon/Manifest               |   2 +
 .../netbeans-webcommon-9999_p20151002.ebuild       | 123 +++++++
 dev-java/netbeans-websvccommon/Manifest            |   2 +
 .../netbeans-websvccommon-9999_p20151002.ebuild    |  94 +++++
 dev-util/netbeans/Manifest                         |   2 +
 dev-util/netbeans/netbeans-9999_p20151002.ebuild   | 264 +++++++++++++++
 42 files changed, 3327 insertions(+)

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index e734658..f458069 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -18,6 +18,7 @@ DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2
 DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
 DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
+DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
 EBUILD netbeans-apisupport-8.0.2.ebuild 3314 SHA256 b68fe791f275fe4fcc8b00888688949b8927cb39db2cf9ad7860017c6d20adee SHA512 35c4bbcd34ec0eaef8a2de86c13333d2bf092db61af48558c3e173bb17dbf8fcd15001307bd7c498f4ccdbaa4277e1ee42ff0909af6170039165b547f646c383 WHIRLPOOL 206fe8d5f64e76827d3eb958a629ba087e8a16c2797752f5d9e62dff4166653677587a81be19e0a2c6adcf49292255d532e1f542c02550b1cf6ffd51467bde3c
 EBUILD netbeans-apisupport-9999_p20150901.ebuild 3384 SHA256 187e107dda837afe5fdc0b321a4bba2e5fc6f18dff1eb359c64c122ad04b9e86 SHA512 ea07d62ef5f4ee8d68f17f69fb3b10924e37ff38a6c15147f432232f354d3475f4fc768a535503cd12da6a3d6b2ad303abec714e362506bd723ff23cbef4b36c WHIRLPOOL 9fc6fb1c7f4bbbf79d15eef81c9c440c3a98a2ed8ff4f04e73ba4a0e36b9c54cad45e50ea89e04e5a8b175a3d9d56c9f3e3af47fbe9dd21b9d8c367bb3623ea2
 EBUILD netbeans-apisupport-9999_p20150903.ebuild 3384 SHA256 13a7a16b6a12ed08e9ad7234bec1ad5e5fe209e4f13e4587bfcf4d28a8869b22 SHA512 cbd2dbb4d8c01b1f6c70ca8a7835a58c2ecf94a0ec084ef2b2c73b675734ec61497925791bc2045fe7b36d372676309057a520a669828d604d93dd279306e9db WHIRLPOOL 08fc78eac704d29500bec5772b64ed2b159130e3414c9f7beeddb786ad3233afa0b74086d7de80d66ca335af56b22eafe254513a847839cc1ecf7584cbad832d
@@ -36,4 +37,5 @@ EBUILD netbeans-apisupport-9999_p20150924.ebuild 3384 SHA256 309feaf4f8cc24c494a
 EBUILD netbeans-apisupport-9999_p20150925.ebuild 3384 SHA256 aa5fa670a547df953726f37bcdc18deaf4843277912312a62edadc6024e2d215 SHA512 54ca38f1f15f0fb970190d10988eb720482bc9796410430fd8df9526579e2f80904fbf8995e33d0cf9dc04cb56c30e224cb1bfa51974217db23f67429c0ad1fd WHIRLPOOL 8a4f0a7f5afa62ca0f734c20b59b6ba5b3300bef190a8b0feb42504d26b2c35792cd81c1317164f66786479488ec661de86279e652beda4a8098a9808e3b5903
 EBUILD netbeans-apisupport-9999_p20150929.ebuild 3384 SHA256 cff9f5c21fc857af535175ae3d3bfd7f5d444a11d8ca84cafcd5808433f4426c SHA512 4aa8b0f28b022e9a03afd15a6eed0f28c8ad3e716e76de0dfabb8cfde3bd7f215fd026406dbf0821145abda79615327ff4c959bf01c6e85018b1968f0a8c1daf WHIRLPOOL 4614d7bd4d8ddcc358794b6761e7882c677136e5d4f4910c8ab8dc32f0bb4ec240e0ab16bc556c48ad85d9187bac92c37980ca1983d3f7b43046c59b019c3905
 EBUILD netbeans-apisupport-9999_p20151001.ebuild 3384 SHA256 9b0a84fced88d25678a0fda5fd8bf40be0b9c7a8dccc17f70087ad49c187979f SHA512 696c46f929a272dfdebb76a2b969819106b60dd416df1cf0f040fcdd422b47d99eb55c6d7ad4d9c6a18b7ed5aeb87a4b5ff2cc7574be21c8fc20574b4ce3d514 WHIRLPOOL 1a5108cff46424afc2cbceddf570482bf8912e8565444b5e76e886f179e04bcec29b64844e0b5576812c6390a80f6e73c942acee0130075da483152b254d1c90
+EBUILD netbeans-apisupport-9999_p20151002.ebuild 3384 SHA256 6f24772ec5ccf5cecd52bf4588d161adea100ddf121627b8a111ec3d203bc92b SHA512 fdbd10eb251e5faea44dce3a785de04af6a755f5b6a43e355330f7bfe8880b0ff079f1a30eccb490ada2b5c5aee93caa6204caed5dd0d998deaa1e5659423ecc WHIRLPOOL a9b99f47e816623e00c60a2e3f7514032703df6072a5df5fb127ea0c146866524e216f4e83b925c3ef93a732f62b6a96105ec78c337061f8f78a7c49b49edaaf
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20151002.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20151002.ebuild
new file mode 100644
index 0000000..8a442b7
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20151002.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-10-02_00-02-28/zip/netbeans-trunk-nightly-201510020002-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 71927e6..5dfe9b9 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -6,6 +6,7 @@ DIST 23CB1F69F8E645CCD8C436D59F5FDB676A96A9D7-clank_0.3.6.zip 7712458 SHA256 36c
 DIST 24C58A1D3C410AD3E23CD828871630C17068B238-cnd-build-trace-1.0.zip 28980 SHA256 205a14a41fb7232c2a20779278ee1e303e6d3dedb3c84496b370ae397a7767b5 SHA512 0e570745cfb163cb54ac8b6b0f6feb6c76e3c414f03eab213f93637dc84471c0bb5b786af096acdd6265383474bf26db763ebda066add398efe601e5749a51b9 WHIRLPOOL 2d0042e180eba66269d4ccdf6279dcd166b4a34947406b5f7279b0017ebed27b2ea95f1565e57908e3567b303fb69d2cb5ca6504653126611ced84f103650a0c
 DIST 266E6F59C67F78B1044BD8E026D2940DE322904E-clank_0.3.6.zip 7522214 SHA256 c70dccfe70362a94e4e0ef76d4fecfb7fa9b7c933f50052511c108503dc0e94e SHA512 f4cc763cf585b406f5370f6d85dad3077c23978f33ddcc3a417a8f1b215a68db4fed546992588c85220347dffb22153f081ccd44c4e1929106ecdce1d7211c8f WHIRLPOOL ee7f59f7d30e0f1c35ad223ab82256be7752d81693038e1eb362345ed23ff01bb6c0dcadd261320052c8019be6c0fb98536db4c10b359d25b80a1e92b0c02bb6
 DIST 2BCF2047382FB68A2F275677745C80E79B4046AB-cnd-rfs-1.0.zip 152701 SHA256 ee454c52dab7af01a0c292bbbd9bd5fa62e07480d4284a34e38746aba4bb501b SHA512 222ae7d6fc8a1f5610a107264fd249180a7a865094979dd5426fb266b94e1d24ef421199cdcb923ab58577c292a183863c45a1434b4dcb35bd67dbdcde945e54 WHIRLPOOL 821c0e5e9534955ee9b4200476fa1fe65b453520551cb71a71a225bb96ac69ba6c408e9d59b5df7008ec1b8d173035e76358172cf3ebafbbd50d0971db3a8983
+DIST 36E4640519B7F44D81F3DAE57DE7B4407C09A382-clank_0.3.6.zip 8562464 SHA256 fbca7b3eef20d4eb2e8d87bfdfc10e434449ce60d60f9158c6a75dadb60a8b9e SHA512 31867a01d17ed6ae080c1c946141f031332538c49d7472002abbf2699834a7f065a83e7b527a59eb861dfdb99637c4680e9bc2ccafc27af0fa25b961d6570db2 WHIRLPOOL f7f68c49320cbfb64b985e6aad48c3e8edae6a0d5eaadd1a41b4273b1257b226d753c6c00a7526fcb04ec633521aac96f147a801f6aa918c5493c6425fa13542
 DIST 3E8BABDBD19DBDC2EC829ACEBBB3F44B5E6FC620-clank_0.3.6.zip 7485362 SHA256 c0edc7f32a682614b893e43726f0526e2002f0ecbfd98a429577926be0803c78 SHA512 81c0d4b4d7bc89d2eea35309c7f55f45dae73d21b935c9199d1de5f5c27d32feef9a8e709a8c62b33929095169f901a92c8342668871276094cb64955d240b29 WHIRLPOOL 93871b7fd9db2e25246083305c7fac9464f35f84573b1ae3568326892e3f8706937f3bf54d0d211372847fec7d856bd2c13a2b72c1e67e4d5d78a108bdb05960
 DIST 4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar 164365 SHA256 8633aa79a2566f51a089195e09a4581af3ee71bfc13eb234af5e0cf6383078b4 SHA512 f1300e2d1e47659f6113a0a3dcc953766b5a8ab32f13bedf4d6ac652ffcf828c17474d47edec08d7ad9039d7abb8570770b48fa53b8ff6b47a028836490777bc WHIRLPOOL 765c87803d9cf622ae7936cb922ad9bff8823a09baf01a6c8b4a81df8ba5fd7cd17b513b36da9910b75349de45185f4641680f35be8335e08b9c30283b6d3345
 DIST 5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar 2388361 SHA256 9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7 SHA512 04be4dfba3a21f3ab9d9e439a64958bd8e844a9f151b798383bd9e0dd6ebc416783ae7cb1d1dbb27fb7288ab9756b13b8338cdb8ceb41a10949c852ad45ab1f2 WHIRLPOOL 488b7b9af1d1d06cca163d43e7be190730e2f0421796c21a26ace11196ee37a16b1bdeea78a1e2e64f8ca0e87f67a2aecd066af21505f3dd92dd76de40a94fa0
@@ -40,6 +41,7 @@ DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2
 DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
 DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
+DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
 EBUILD netbeans-cnd-8.0.2.ebuild 4510 SHA256 0a9a4e58e28f395b5bcb017016b6ddb1b77afe393d0e5bd81cc05e3a32076c71 SHA512 2b1fedfe292fa140920fd11829e77127f9535e08b8307886accfa37e6d11195a1204e6b71b2640937da0711c3ce0bbf80c0eaa3c248a64fd61b6a3d99d5de14e WHIRLPOOL 10b1518360ade5d6f1f27c79a10f630b94a2ec5062e18df11f9828d4b374e6cbdea0b9f770e01c117ca90fa194dff9bd3be6a468075c2d35167fb78a7bb32794
 EBUILD netbeans-cnd-9999_p20150901.ebuild 4790 SHA256 0be3c11a9af46d2d8aba83d0e15c09b935bd598464f43d5030887464d3f96f9b SHA512 f3b2e7de31f3434d6390bec0382fd6d77d2075470543cb9052572c91483ccfd026822a5db6f10932cb86b5974a0d2c5f390551873dac6cbd1f463b62560ab196 WHIRLPOOL f158e99c020c4e0f67c3ceec7a59d5f2cc455c52db4a9301bce821a123b7c8f3e570467aabe9281ac440d067dac36525b864dabd0c06b88ad86a2464d4e5140a
 EBUILD netbeans-cnd-9999_p20150903.ebuild 4790 SHA256 57a5694dab810fdf15990d575c3270fb7338837550ba4598e21703e4d904e85c SHA512 b5073782475520ba9126954d5341c0977a73f4b838ea4484835558b821baab49cbb52e3e07705f611e879b3eefedccb1e9a0817bbf9b98d80d17018e5888ad1d WHIRLPOOL 408c5a25c4877204b5e3a9ae8c4b7b23464a68527a8bd37e37df89a5fddf71fd23cc4e80610981dd72325d9289cfe2c5b3172986e3aff240be9911354b7d8946
@@ -58,4 +60,5 @@ EBUILD netbeans-cnd-9999_p20150924.ebuild 4790 SHA256 1e6242df1437ee478cd4bb7925
 EBUILD netbeans-cnd-9999_p20150925.ebuild 4790 SHA256 0442eb9d63835aa3ace4ec5fac2ee030e4821dce54376011399dc817276f372c SHA512 939d64a173e4a1ee037891cdfbdc11fa593894ef146cdd00845012d49f015df76cb72fbf05502d290cf1b4028716cceae8ed81d81afeb286349ef53d4bf0e81e WHIRLPOOL 03311a53adb48ad4c559d7d539d00829d65d0631b3a992bf0a1e6da947fd33fdde566122b62ff98fc74df1acfbf3f8a0f30b6b6cde0bcfa6443e6751e0b7d196
 EBUILD netbeans-cnd-9999_p20150929.ebuild 4790 SHA256 87d109d9568049b9a036f1b6c90f6bfb18cd7d2753719f1eabe78f841f66b26e SHA512 1974287975c2949e59fac98769fba4e605516e29dab8dfe12a9b34501100a0703901adf158ce1898e266d084228158e614e1c9550f089f5ae1e64e75f4e4f526 WHIRLPOOL 25b27509f3246e85c43a3f92e500d04e4b8cdb393759c379ba2cf78c9752d4f3acb60fde27f02eeb1b0a0196c38ef0946310b3744d0ae59ffcd3f7260fa117c5
 EBUILD netbeans-cnd-9999_p20151001.ebuild 4790 SHA256 b699f830d6365a79195b7b411d5b764aeb1c67c243c633fc8ec9076ccecd387a SHA512 0488b2027a00ece43bbda93220c366926d4a96a87c380db3157495c45e0ef1c6da70725882d7c449b555a1eb641f066b8868100ef112da0ad66ad80ec79fce0b WHIRLPOOL c13484878e87d25a9ca8ce0556b464778c47528b345971101b870291787b2b2835e5ba06cbe31e29fbcb2964eed15a5259041c344cc96f6546d78f4f51365f56
+EBUILD netbeans-cnd-9999_p20151002.ebuild 4790 SHA256 b594fe449b56ca1f3ea527c8825fca3180ede5c6e25d039af2cfeeb1243f6116 SHA512 f1b447f992183aad7180ef5630ca225d2b93b5c874c9e282d6565ca89129c43372f4535557cfcb81a47c27815997c6e051df224a8e9527d67c1ccb588e8e7129 WHIRLPOOL cc7c3c4d969c9a970ce0d1b3ff758fb934655e50326d32f11ed825fca008d089cede1201172872508bbda377e6266f5572e9e1e0199abb886093d566fbc04e5b
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20151002.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20151002.ebuild
new file mode 100644
index 0000000..c8b4ccb
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20151002.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-10-02_00-02-28/zip/netbeans-trunk-nightly-201510020002-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/36E4640519B7F44D81F3DAE57DE7B4407C09A382-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}"/36E4640519B7F44D81F3DAE57DE7B4407C09A382-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 2cf085f..345608b 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -20,6 +20,7 @@ DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2
 DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
 DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
+DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
 EBUILD netbeans-dlight-8.0.2.ebuild 2898 SHA256 08402481b573b90396431be03bda45904b2dd29f0086e09a111fe362e310c3f7 SHA512 3f6d6c9ea0043382562fbe47ad16e3273032407a74cb44ec7ff26736f96483835af4be8674361e910912a550b9fe592cc5a28c2b93b6b993076553195c35eac5 WHIRLPOOL 9d8706ccbc0d97b0f5d64ebf22c36316b08d8fbccd57408119ca5f5faef08c7f82677bf67488ff611eabeaa730e4c9a730c50966d94d738cfe79330ac147863d
 EBUILD netbeans-dlight-9999_p20150901.ebuild 2968 SHA256 f24ed1a628b18c080f9e06c1b488b101ebc2cf6cf0aa44c5b86f168fe52f912a SHA512 0fa494a731edd4f27e36d537e0a57ab868b8a04db394777b191d8352c452f75d06900ec23b0e25e4d08b18cfe9a8d9245890b01e24e510e52b2b218ebb91d2e8 WHIRLPOOL 439d07e76a1cb3967a1ef46540bfde542e11ffd7e4fbeb6fde5f198fa5f203703b6df26c4ba764d11d6299849fc8d4c5b7eb9f2133de02ccc586deee4cc34c34
 EBUILD netbeans-dlight-9999_p20150903.ebuild 2968 SHA256 e798582769fa118385293ad20cfcdeb51a4e10be437941396b37a71faf72bf3a SHA512 3080e3c87c9668b8c1646a61f2106ae937e1b8c9049e9d08aa933458b8e4dc4721c1caf84e12c37c397c4982cecfd53e39f2516c05617a59905182aa4e4190c1 WHIRLPOOL 5ea9f447ee4cd7a398db727ce0e3dd2944c58979d8af5f5a9c686732fd6dabf2403c2357c2e5d4d088ee36655b403dc6d574e2676d032e639b9cab3faf00bf70
@@ -38,4 +39,5 @@ EBUILD netbeans-dlight-9999_p20150924.ebuild 2968 SHA256 e74b2e1e4f2473d588949d9
 EBUILD netbeans-dlight-9999_p20150925.ebuild 2968 SHA256 aad2e8a17a258ef0a163cb5c6d1926c6086273d9b9f339f5943d09fb55c74e5c SHA512 751b9692a9fc416b6f2597278ffeccc6c157f5167bebc5ead143ada9efe1c1f1b728c437db4d493cb5ffa2539483df1bd1971e6368e683179150d73f98304e96 WHIRLPOOL 0bc902ce4756029153908effdeda559ef96005c23a094665402008358b269a3c2ebb35376c52c0c6647d230f8717ea8ce2933c285640c20d4bf918ff2f0485f2
 EBUILD netbeans-dlight-9999_p20150929.ebuild 2968 SHA256 2faba25efcb7eaf80d0fda7d0b40dde2eba9cb606660a7349c07ac02a82f98bd SHA512 d795e0e6cc884530f4f7b4e93d945535e0dc6c5635793a48f0d9999b2a189fda056e9348876e41d39321b8e6d86d15a1eb0e138b5c8f6d00b8a6eed27468aaf0 WHIRLPOOL ba3292c9c38a767525608e6022d3372d1a087fc40b60b1e1724ea39c125ebac09b3489d06b3860c5d81707c2b015637975ed6064fb635881ace0f032e9046672
 EBUILD netbeans-dlight-9999_p20151001.ebuild 2968 SHA256 2662d9bd51c05b8c97c5be11ffaa9afd8e290d6be1f9c8e766267d1a945359d3 SHA512 f30c71dab1c3cc99c31885997c2e3a85912e1b34ce2dcd46fdcee3a7f76b8a50f50d3bac170d7055f268969bb13cfd5ad3564ff0df57cab88ab2c5f92b712edd WHIRLPOOL 44e5db72ef794b2fc8a26d1c1e3558d7420756a907fc2ff599922a36c65bf2c2de5423a328c7131ecf1637ef27965179aca5983359b7c678d8e50d8ce5a68981
+EBUILD netbeans-dlight-9999_p20151002.ebuild 2968 SHA256 bb30a82d5a88b90855c74166981189f2e78b9a8421f730bb4c4d67362ca9ad67 SHA512 33ed0667c9696c2c57ff4884afd50876e2990a790e843ef10ca6d999dace666adb02376c5f1b9e3089d0ffa5bcf9f0669cddee584a2540a92406ca24d6487fe4 WHIRLPOOL d2846314b3702b53e947899006d3e5b19f98d405ab622e4253b6f7e931957ac5529a00362c1ea15905f95bdacd3359a3bd993102cf5fbabaa93a292198cecda8
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20151002.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20151002.ebuild
new file mode 100644
index 0000000..fc39504
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20151002.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-10-02_00-02-28/zip/netbeans-trunk-nightly-201510020002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/6396ED8427E5068B5331C0A3A03A2235135D6D75-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}"/6396ED8427E5068B5331C0A3A03A2235135D6D75-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 7369dca..02dba35 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -50,6 +50,7 @@ DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2
 DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
 DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
+DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
 EBUILD netbeans-enterprise-8.0.2.ebuild 15071 SHA256 84621e3bb946cfa254bb70ca3c3f61202882a7e6d631769ad2f0f4639b0de875 SHA512 6ad38e840764661e6bc5b89b5925e9665871009ba0b640c0a78c555ec104214dbee1200a93cb48e655bc620e07bb6e4d8932b23a00fe458f8a5e9e5c3200d79d WHIRLPOOL b2c2bbf2ff72f8cd9b4cdbe039fdbf7cd074b0fdc20f634aa0b6f79f5c639be358c61fab30854a6e3ab9714a285d9461ac4e39e94e10c14c5068422d6c873c56
 EBUILD netbeans-enterprise-9999_p20150901.ebuild 15931 SHA256 44c06fa71678bc9434d41c8f580375f0e56c4756da1ad14de658574360a4ca8a SHA512 0e0800cd6259f4e4524d328a593ad4d1a40cb0b129ef53088403c0fe90b732f15eb897686485f629501cdaf4efbbaa69c60ce648e655a016abf4d24588a9191a WHIRLPOOL ee6d2a407a2d6e124f21912a7a0b1c6dfc8155cf228f9f451554c1c40ab63d497070d0264360aded0de23e7c03a52825593fde03dc4ed092b65789cbe083d47a
 EBUILD netbeans-enterprise-9999_p20150903.ebuild 15931 SHA256 2d15c63f7b1c6b590dfbda9cc26aa44ee36c043a695ad4ae06bac98b17f9f73a SHA512 6ca976ec3cb4b96d4d9794abaaadaa7e42dc0d4537e02a6cd0a65b0df7c2789a5eeeaabdb33b42df134271d4f8f0b5d54ddbeffb18a704e36c6e8a25f6d5245b WHIRLPOOL b0927d3c4aedd46698cba83fb07e35d5d0796ec9a50b65cc828534da1c45ab9b75701c58003583af3f999a2d4fa69a6b4a62abc3225d7591444dfca0353e3bf8
@@ -68,4 +69,5 @@ EBUILD netbeans-enterprise-9999_p20150924.ebuild 15931 SHA256 68b6cb8a497d46a59c
 EBUILD netbeans-enterprise-9999_p20150925.ebuild 15931 SHA256 49b14b170a1eacc6eced325d759248f967fba69c4f48b3dbad2c43cde1733165 SHA512 884ef667b2fc27fb09e1405bb79ca7dc1d7dde99192b0a24847d7a72451eaaef4aaf32946c1ff182c1f61ee6d1cdbaea341af85d2df0dc6814210dbd27b8fd0c WHIRLPOOL 3031bb949cc147fb1e853bb77860342d38a7c398357af60125fc838519595560064ccca44db0658334c7206876f550b38669889460832f9c3b5a998fbbf05fff
 EBUILD netbeans-enterprise-9999_p20150929.ebuild 15931 SHA256 c4832834e7177dd02b4c6ea73155b86c4183b0be3b6bf31f85b75fbcb85333a9 SHA512 3aa244ed6c0df566530ad591aa84776bb011231b94e7c52279e10e717ebee18245bb798b57971ca555054b4bcd7308ba34af06b59d756951bcb711b65472ac29 WHIRLPOOL 4708419729c5f94ef86a10300c1c5eae37959e890fb1f7e3443c67bb41663b07343ad07fde358314aad0e3ce0be06ae1586d09386481f5cd574918fb7f8323dc
 EBUILD netbeans-enterprise-9999_p20151001.ebuild 15931 SHA256 0149922936b3fbf9c74723ede45a126dd4715025589ea8cb8b90ecb12499b16a SHA512 85c65a25883f3161a04524139128f726d2ba672ea17eca95541be54c1a5ce779003de558cbb22df4935b498500a675661a96b2cd24caa0b85906aa1857b23023 WHIRLPOOL 24b427e9eb51d20f7c06dbdfb31476bf9a01b0a9934ad177c7175510cb61d7d5e847a96211b268cd4cca26221b9a5c64e64902258388b39512e3391003753013
+EBUILD netbeans-enterprise-9999_p20151002.ebuild 15931 SHA256 4d8b137e7f98d1360c3dc67bbdbafb9ecc5f56cacd291f2ee8ec93571e127700 SHA512 b5cc45431d637b59204c6fe4dc92bc37f7a349e79e53afcab1f11551a315666192be86eae9b92023e4f5ef65bc40b815f63306becf04f56a71b2a24d31f92f1d WHIRLPOOL 7a8d0002b9783cbd3ded70084d1e0ade55f5db6adb9815c7a2f9f56db2819a20d4f9f539e7742e029c04994fa11ab7d597e9cb3b3e60506e6b715adea584e579
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20151002.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20151002.ebuild
new file mode 100644
index 0000000..6e54476
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20151002.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-10-02_00-02-28/zip/netbeans-trunk-nightly-201510020002-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:0[java]
+	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 cc803d1..d31f8ba 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -18,6 +18,7 @@ DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2
 DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
 DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
+DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
 EBUILD netbeans-ergonomics-8.0.2.ebuild 2843 SHA256 f9262f6ee7f2aed1fab9bf4cf756f565272e9894afa50b349735e39961e7acc3 SHA512 f158c27640541f7aef31da050e0811c07a251ae4797cc663b95a074a47eaf9d6bb7a9aa11ba38ea55e75c185f7dba74629ba6716a819e8ad68eb3db9ada71451 WHIRLPOOL 4fe9634fb673fb05dbba25996efc3a212ef3bb23ab6e7c732cb75de076feb930735e3901806fd9c801abc7ee8aa8eb800718065325d415371255a886474061d4
 EBUILD netbeans-ergonomics-9999_p20150901.ebuild 2913 SHA256 5c3c619373ecaa4361d21b0686e634abd8e4f94f1d73aedbdc57307d50c64ba3 SHA512 d83f039014436f6e26b1f6fab2391ad2ecc33c184847574ea9c646a1b028f22ce3b566e4976a28d5b6bb00fd671043ff81bc718be76304077caa016613ef1edc WHIRLPOOL d0dbd357622f050e0b18a5c1262057050b740ce60069bdf6450cbdab0cdc4a78c81fc28e3837bd1fa1ab571666d3c2885fb975f5e26d50550b7c30ddbe17f547
 EBUILD netbeans-ergonomics-9999_p20150903.ebuild 2913 SHA256 08d2510fcb31a4ff36c702493e7a028659225e1678b6ad519c625b11220286c9 SHA512 5c5917f2498717d6d404145d13f2e1e75e1e93b08baaa451fbfa4c8e9b518f6207ec1eb86d7f6d57cc96ebaf55c0926f14b8601d7c2ea036c6566e95b2c5deb0 WHIRLPOOL 0e82e1fc32f080535e2b621f69111f0b5f453e08613b916c6fa1eb741cd9dfdb72651b31ac8f5c7bcf31b0b968aed41c3c6d9de6fa272b6d06851853beb1d57b
@@ -36,4 +37,5 @@ EBUILD netbeans-ergonomics-9999_p20150924.ebuild 2913 SHA256 bfdcef4d4fa4557bc70
 EBUILD netbeans-ergonomics-9999_p20150925.ebuild 2913 SHA256 d8a77a9dae947a38f83d532c97d51e4217553cbbd4651b79a6bea4090a696c52 SHA512 94b0136ef3c99095abae7cbf88dbe8572f97a0656e0870738baa26d2f90b8cb894062bcb913cb2ee7a5cb0666364c566ee67c6029c1c45440fcb29781e147e1d WHIRLPOOL c2e861874d370a8e3149d7f833c16c544f866b2c8bdd33f8dcc23cede14c27d29eb4d5e98ae71761f762e674be48d541cd4cccaaacbda7c9c705b03b8593b6b9
 EBUILD netbeans-ergonomics-9999_p20150929.ebuild 2913 SHA256 0260fc62f5450f7cbb7b91be981c41fb8d2e5054270ec9d89f649cb35f42c915 SHA512 02ab4b0b92bdf9cd6f15e67f88ceb3a70940e61f9c550893836b6a4ec51b7ac3aa96b5d40aec6566ecda2960a1f76df7b74b332ae480bd409f6c711b612c9db2 WHIRLPOOL e25e35a5b1627d4a217bfafd89b9339604ce781685eaab301aa1bc39e7d078d072ea5b01c78923aef6f9b2c00252c36be6612f8db8564b9cdd6e1123689bc357
 EBUILD netbeans-ergonomics-9999_p20151001.ebuild 2913 SHA256 298a7adb7de6b3d67d0e0766d3d15ff94d15e5a8cc3158452a397d0861975685 SHA512 eb5d42a9417b03e97e556b78a345fae80121d191f528a10fc0589d1b9e90a8cf673fa75b0bce1cf7c8c8cdcc9d08f40a130f4eff48a898bd758cc836ee6011a1 WHIRLPOOL 62f9172cf7a7670932270e567606adf3a5624f542f0c174887fd8be6ff61b8376899ae5b3711aa0eb766c4a718675e116afe71246dbeae2b619a460b9d8ce8a6
+EBUILD netbeans-ergonomics-9999_p20151002.ebuild 2913 SHA256 a339af6e44667c67ae5f00b6dfb130b1f3ea3e6d5bbad20a7c3ab2ae37681059 SHA512 74851d3beee09bf4bae478271756ceca819a57dee328791bde5a2a27afe32b4540c4ec5c9fbbf3bfe4d769f69b2c52cf365dbab4b4dfc8e24b46d8c1efbdd211 WHIRLPOOL 6ce40af3d909d24ad3b17d664515cc052e8cc8799616a5cea1f675e6f55de9a76f5ab286fab9bc1909e478c551bc4c0fe69cda85171781316641180f6ec94805
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20151002.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20151002.ebuild
new file mode 100644
index 0000000..18178d6
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20151002.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-10-02_00-02-28/zip/netbeans-trunk-nightly-201510020002-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 043d066..dce19e9 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -20,6 +20,7 @@ DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2
 DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
 DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
+DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
 EBUILD netbeans-extide-8.0.2.ebuild 3307 SHA256 084e952eae1708b0fab785fd34313985e864dbc74a8531a0d5cdcf906e88f85a SHA512 ade8dc37aa932d7ec20966199e521311716061c23df08d02635f78efd2776f1d7bf040b0f9c9488b947bbbdfb3e33fa764723e3dfffa2214892bc6d685428f6f WHIRLPOOL ad2c26b005675ebca7d902ff1e6caa28552f3fda6795e327cc3584cf109f0ad6efad6516e15af5e70d689be236298b0948003e09a3da4991b3e29a1c85607b2f
 EBUILD netbeans-extide-9999_p20150901.ebuild 3377 SHA256 a459e45e713807b3565add526bbbca698d49b86ec31dfdb90dde5de79a98bf4f SHA512 7221a46804530530304a4cb1a36d58a82c19717e9d6a61c4e5c35a28ad3cb58d108fb11341a5ef9005557b1c7e891478e64f38aa12efffc652ddb684ba94c0d3 WHIRLPOOL 8b4d65a5d5c72f544ea83b43681136ba08678b20a71a15d336e9f8cf235331e01d6ba21bb7bf8147deb638d9e857006eb1ead0a0016e47c3c21262012c03e8ff
 EBUILD netbeans-extide-9999_p20150903.ebuild 3377 SHA256 e0a7a1f3704f2521ff54dbaa7eb9672a10bb8b866026d359c6fd4ae287937afa SHA512 c0f77e05c7a78608804126a10738d46e337f38b0124e30f50d14fedb24e984bca9a94bf31ee8ff6cc3931ca8b74527d521a27384dba09f555f7d59bafc366642 WHIRLPOOL 73fe4c7dc37d7b1ab2794cc55864dad1a5c1408a14c028df00c9f26c5049f08ccb5b8d2a88d3b0f2ad72d5fc927513692157e38b943db69fce602f6256638ab8
@@ -38,4 +39,5 @@ EBUILD netbeans-extide-9999_p20150924.ebuild 3377 SHA256 1188da08cbc5da731416edb
 EBUILD netbeans-extide-9999_p20150925.ebuild 3377 SHA256 8df930f5181319c8ab5191b750e96c82397258d61c61ee3822184aac6827770d SHA512 9f65400999b48ae34931d9b5cb9b0e4cd24d76860038603eae415098a5d87ebd86283a2c907d32a7c7fbdfb089d31abfb405811ae7673fc08e0e726a0ed29c81 WHIRLPOOL a9362bd03e7f2e2a2883c46e1d63b660fb0a252c4545acb57036e5083d4c5ce8c3ee072e3bf01d0ff80d168e9b150b44551104a816ede1890353a608b06135c4
 EBUILD netbeans-extide-9999_p20150929.ebuild 3377 SHA256 2d7dd2b719df3c5796435269dd65c1a4bac427cdd023efb15e873c92ec444c15 SHA512 399652fa635bb8b5a5a779ae766e9b8d2c0337e3c416db4e9e18b86b2156b60c0151e5ad228b145811554d8e0321f1234629de46bd4b48eb385220ef99a890b4 WHIRLPOOL 596a0202c30b0a8ab8a9aa8a85ce737f2d99b7899986b4cf000f64467a817c75ef263e59384d91117b9618e84e868694d10e4b43dca2ca71df1e311e39de554e
 EBUILD netbeans-extide-9999_p20151001.ebuild 3377 SHA256 c6e0674a87d64595344e0dd9011ec485b3aaf1c900d67ba14e6ea766c0e8efc0 SHA512 7c36b2a7932e8002a80a776dd14d2bfb82677e90cda7531295bac39063a354bd0d1fd2e587774c2d484ea75d2a88f4d4f37684dafab23ba700aebd23de8cd03c WHIRLPOOL 498bfe06ea235fb7c4588426e69fa3aa31595283231488c7d4612810af791cdc580f270b23f382108e549c3150765d191f57cf159e39f9203725cc269a770c1f
+EBUILD netbeans-extide-9999_p20151002.ebuild 3377 SHA256 5a475e917cb56e6afae58d3fd8c8c1c9d5a5652faaf6715ff3b6af9f336a2a2a SHA512 765e312a4739a14965f534f9e3951eee000dda22c167f47e27df7b88509f4ed36febb87ec791dcb2e09a7e0a5e7b6a14281ce2116aad4cada577bb70f79dec33 WHIRLPOOL b1e783f4b5f208ee3f95299c39044b184d38201f9d8eb16628cc9f9319ba9291d8ed493408bc5b4896d60fc3bd65aa05fde4edd94e96d2d1bb4ebc35665cfa69
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20151002.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20151002.ebuild
new file mode 100644
index 0000000..16f167e
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20151002.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-10-02_00-02-28/zip/netbeans-trunk-nightly-201510020002-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 c344afe..e417089 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -19,6 +19,7 @@ DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2
 DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
 DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
+DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
 EBUILD netbeans-groovy-8.0.2.ebuild 3346 SHA256 907e6cd11c222f15c826494b44929483803f0e4249de0d54db51e6855b574148 SHA512 8bb37121e7e32621959318d109b1d982e2c705a9deb7171f5fef1dcaed55fc5718b0bc9e6bbb2592cdaa5e96d874bb6e6bfa96d06fe09f14d5250c1485eb1da5 WHIRLPOOL d5e09fa1e975835f05c6132c091fee4ae9fc9dd671af9f5f88a9195d5cd4a93804f96687ed3f2bd741117fa65773f2c464b3cfd6697425039cc51a940efa2a31
 EBUILD netbeans-groovy-9999_p20150901.ebuild 3416 SHA256 bd899df99a2dfaf3081354ae331ad0494b5f2cdda81dc9039cef398ff8fcb10d SHA512 5753e9033ecb74072aae302ac814e5e8f3c264b159f4d82f7d41467f552b8089ad4a02141a277f154d8f48145a925b4214898e188d69f38d50dbb28af5b45b60 WHIRLPOOL ff875fab2e82d6fe6dcbabcccf334ff8056939ea7502773191ba622ecf597acbb49ac0a685ddca883bee01a890c220d9d531b6daa01189dc9b4a58cf41144c80
 EBUILD netbeans-groovy-9999_p20150903.ebuild 3416 SHA256 52900724587824fe2970ef01a4f6e2478d2b43f8068473edce228ae26f295f11 SHA512 15387a879c00dc1262cfe45c5d4d4bed353a15606531a1942a4921eaa7e947d89624bf81ed25a75bc9d76c1f8d7d729478e31f5dff416f08ba5c81280d1b88ab WHIRLPOOL fe65f7e8120c3586e0e35c49008c85296237f69eeac8f6f383a0bf47c86407e66c6f17c3ff01dbdb921ecd9bb4c71e57e106a1f779b276239b9fa3ccefa8d2ab
@@ -37,4 +38,5 @@ EBUILD netbeans-groovy-9999_p20150924.ebuild 3416 SHA256 508d788fe407dde8973b878
 EBUILD netbeans-groovy-9999_p20150925.ebuild 3416 SHA256 2bb58f38747a3a37402f5586c5a6f04cc95df0eaeb57701767a91c1fb51a2b69 SHA512 3c6bf667321908beeda115f69790b4e869e90ea7a34748df82f261de8184f897890ee3042242efbadc3606d75272c59684d95de5f2e0149a04ac4aadd1d914a1 WHIRLPOOL 807d0f95e4dda163d4fb6ba984fb40192c70be8130f208274c23f56fa6dc8c290f45836a0a7ffd2fb1878929db717343f24df00e083827eacb0913386cfc9a16
 EBUILD netbeans-groovy-9999_p20150929.ebuild 3416 SHA256 2c20201dbbb456a22ca66f74703bbf35b31be0e748ef4501c356de13ce557223 SHA512 22cc755a4e43f9bda36a702f9bc65eb7e6c831ab938dc55a9378b3a4116dc87cfd0728f3017c806b9a6b7ca11227b1f1398e3de5d402160253783bca11b5244e WHIRLPOOL ea336706ddf6f13367d1fbc5e5d936857c67960e5238f84d6ab54b8d0f42d188c4910aec790fdb3caa81e76de0615ef208ba140c94b2090f901d76835bb0f7b7
 EBUILD netbeans-groovy-9999_p20151001.ebuild 3416 SHA256 3a45101e291ed46b58227eb22e6350d10249826f237793009cd9c68b4a13be49 SHA512 bef697cadc1a6ccb36be3b449cb1cf56bb644c2c5ed7189bb69daed9d16c18b18ba4b903362e1d80e9d8fe29702b5ccff58250c6efbf9bfefa968f94e2105abc WHIRLPOOL cdcc6244e9e24c0d7b7b0ae2d592f95813e3d8f1b5ce63d3f24315b5f4af559b3ca6668cc5ae5bdfd6817b2c7ed3b82fae1737123156ed597ada2e10d7e3c5df
+EBUILD netbeans-groovy-9999_p20151002.ebuild 3416 SHA256 a885a118d6bc446213eee0f4172d618b85908c7eba446e9267cc25a8d8a17d8d SHA512 be8c07d5a041141d597086eb1a8ee64f43edb30f12dc2aa040fa11fb61bc6a79ae235682d9c42d4dbfc356ecd85e1c06c651c3679a66293d1c887f6960f79a86 WHIRLPOOL 13b663a9186c990fb0570d8a767b699c027403b3e4037ad85f5e139cdb7b25edc5ead649be02fd7c88f7ea942a090d4b996e18875db1fa6b1c44039acf2ad7d3
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20151002.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20151002.ebuild
new file mode 100644
index 0000000..b49228a
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20151002.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-10-02_00-02-28/zip/netbeans-trunk-nightly-201510020002-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 5372349..235ff13 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2
 DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
 DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
+DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
 EBUILD netbeans-harness-8.0.2.ebuild 4055 SHA256 2674d562adc57648c82cac9f714f74f9d29dd7b7ff7fa7f0ef37c43ef0975489 SHA512 7d72bed5b955b2365a4c11fcd97a2d6f2372ab939fb9a03b3ff7915053f24d695373c1aa154f6e6916d37ef3ace7b38864d575419460382760500576dae52e49 WHIRLPOOL 72f54a6cb83f282a75f0abb073109414a7b8bcd4e9263466281e68ff34148a7343ed3bd78ebdc8afd109b6b9f5b9f15bfd0e250f418fcaa4986a7c886b57b9f6
 EBUILD netbeans-harness-9999_p20150901.ebuild 4125 SHA256 c9189bd6d9b770dcc22627aedb7041e6dd80a0464b4b3649a6cebf1352fd7dea SHA512 154f820f3b07192e4d8b35fd473cdedd3dcee70d81f8484e95a33846fd6c3e8474acbad1ee99ca2ee29574da125521ca695bed8a471e5fd10ab7724ef9d8f7d4 WHIRLPOOL 8b4a9ff80f36f06108df4508abd091b99e5ed96c6b297c1efe5b18b3f798890f6f23313c02d543d89fcde5169631bf3cdca15cc54a086747f8f52eda303d8f09
 EBUILD netbeans-harness-9999_p20150903.ebuild 4125 SHA256 68de6c9e0f914b0db958bcb0a48f9e74170cef31e65dcea5e8996f8796df32d1 SHA512 93a557e04df4f9fc4bc068b087e3b91d5fb409c30e8c16b625f2973b28e3f5f36474fa7d36ca9fc72c154bb2a2bd84b696a95241cd02ec14cf7ae4800291d545 WHIRLPOOL 4bbdb9c03f2b21ce25eba8f4ac8abe8144c4f315dc2a608d2ec4cb3a6adcd7020f4bae313924024eaba580e245d1e8e3e3cd19f3d1e6f90db4c6ca6f7c90ad3c
@@ -41,4 +42,5 @@ EBUILD netbeans-harness-9999_p20150924.ebuild 4125 SHA256 ea1aa6d115ace52b0e6b22
 EBUILD netbeans-harness-9999_p20150925.ebuild 4125 SHA256 ec043c193907209f28dea43a159c3da3e2d01bd511058d78f7e9111b04bf84cc SHA512 8f645244bfa6ce883e55fb8110150924ac98059a8015eee55557f96a3f7324a89cf443fd34e1e8e8d204dc691d2a33906e45116316e269f14871289bfc4400ac WHIRLPOOL ca02f532d539da47fe19b5752530c48dec2c4d90bffd3bcf31e1bebb84a9a9183353df6f01246f0867209273d72429417f1d32918289d75d0f064ac7a9bad56c
 EBUILD netbeans-harness-9999_p20150929.ebuild 4125 SHA256 fef9bca6ffd87b35570d593e14c78b27a10f3a1499cd5c1e9afd2f7d61bdf6f9 SHA512 436f495476bcb81b80563e89f14e82960d92c84aeae05b088517638997cb4253aaf3edb57be73781734206ff4806285f6590c51e02cc95f7e4d2644f9ec9d3d5 WHIRLPOOL dd9cbd92b68529df70ac2963f0aeda23b1301d02f290828e8490a725050b330d5a10216a769f6bf71a2260dfded13ea988a8928e4e649ccc7a7e4a375fcae917
 EBUILD netbeans-harness-9999_p20151001.ebuild 4125 SHA256 13f8d1786b191f9fc161f267d8fee56c14846964eb8f6a9b9d7731c0d90a7a1c SHA512 d36a32bf08585f17658b0dc5b38b0a8a2ef6d1265ebb9feb93feeb1e0e3c900b85101b3572e8a63edaf07cb8623907ba9e775a643623ac3d8f0f52de7b2a5a64 WHIRLPOOL f891e812e45303986bbc9be420811fecf008450e16507747299aad4cafc6ecf7ec09e7a3803bd25374033cb4cbf5ff9f901c678612f6cc134e65b9640ff3bc1b
+EBUILD netbeans-harness-9999_p20151002.ebuild 4125 SHA256 c82d8f80bddf85498b7f74ce03091988896de0e56b35f0c45adc68f7c2c852ab SHA512 45959abac3fce686701af5d9e812b5d3d8764c59f4278c91db17d2deb4fb9bdd4a7f840b9ea3240bd69c1258ea36a1cd9b3a5aa5ed494e0afa536b3b4b4770f0 WHIRLPOOL d4cc543b085739b1615319793ba2ee6deacd53c85d96103fc9c075ffec54dec68b00ac54028a1d7128e97a29825be9ebbc549f6e82cf0e368d4c4c60d4a39957
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20151002.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20151002.ebuild
new file mode 100644
index 0000000..54ec1cf
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20151002.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-10-02_00-02-28/zip/netbeans-trunk-nightly-201510020002-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 e231e0f..b1c9f24 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -124,6 +124,7 @@ DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2
 DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
 DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
+DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
 EBUILD netbeans-ide-8.0.2.ebuild 29317 SHA256 42218788ab0fc7c7cd1bb42a8b0c72a66543a3260b752aa55365833c355bcc63 SHA512 c712b66b6bee654390a45e5c616479df2be624bb770f3838d4fcce875f71a8d165703dffd55c4fd7d30e19c392784203e5fe01e2404907d88c935d439efaf578 WHIRLPOOL 67763e4a36215ac002fd321556ce2269affc15ba48ad5069d7ccc746d918179994f174e09305a9d9ddadddbea690778c2769e0ea1993eafc09e01580485e2292
 EBUILD netbeans-ide-9999_p20150901.ebuild 30334 SHA256 a2430eba1da126a548c390a52701aa5a9ff7f3c5afcf591492704f6270f49ee2 SHA512 ee3b7c4d773f16ae78341f8393397d6090055d11b2b45a579afc23e020cda5bf0f86b1348d47b99fe94280885db4869b3f54a15e5f70aafb62c2ead0e63bc9f6 WHIRLPOOL dae179c3bed6fdbfa5527a31d3b15a9e8f1eb7a805ce872b9fa512be27b1ee4e3393a0713bec6e461fdaf7d09c04857c68cca5b497f772559491a4f32f2ef4cc
 EBUILD netbeans-ide-9999_p20150903.ebuild 30334 SHA256 ae41f1ecbbaf9cfc10fa655a7ac439d418a40d7cd2ae2cf8e40009035c839f22 SHA512 c8d03b4c44ed1855b06f861347078aadbbaed51e42eced7f35f02c438440a269b055042aa44666ebd2c0d1fb16c626f07a70c751025bce97735393e4faf9c387 WHIRLPOOL 45c00d9dcc84161a15412652088d25e5f220b7d499da453ef2f482960c7e51cef8d6ac3e6b343e9a9b5b78f6cc8f68ba7aaab15c557c2734c0335bf27e48a531
@@ -142,4 +143,5 @@ EBUILD netbeans-ide-9999_p20150924.ebuild 30334 SHA256 2b2f51c1c488b85fdf07e9b5a
 EBUILD netbeans-ide-9999_p20150925.ebuild 30334 SHA256 f00c2a190c4e0d8891a5201e4ec4de8ef89640db272c6c69856ba031ae5ecf95 SHA512 af182e1926a28f11fc6478f6238bbf7c908800984086121ea830e0558efbd063e331a80a1a6936da2bb352944850691fe48c9b5977883f95b7b1335cbaae6547 WHIRLPOOL baa696f2a5643110fdfac99245cb5ac62f2e31e130dda561abf82df7f05d253df131ba4663b1c4c9c20c99cf2da31405141b5f77d281c5195eafcccee2e3bbc6
 EBUILD netbeans-ide-9999_p20150929.ebuild 30334 SHA256 e48c57411bd1c03f0598aafa6820617ffaec85336229250ec6e45cf61dbc3e2d SHA512 de86c553caa4bb24eb7d87634793812f2af58b64f58bfaa35cda638f816cd543a332f51e15b4784de656d9b7210c1a0443b72e6bd30663fd3c328f4f08cec5bc WHIRLPOOL 16a5a122390eb893b5bddab3f18ef1b302a93d9239c07f955272741653748cfb2f258bc8eb13a880cb59426f7d658a0d082dd4e50bc9bc5c70c62e47f55f9db7
 EBUILD netbeans-ide-9999_p20151001.ebuild 30334 SHA256 b78d36ee165147dbfba19a14e77783963c4f7377b4c418d6bfb1738507973bd4 SHA512 4c9ef09a23a310badc7c2f119d9ef7a9ce450a719a0d2b112af157b22aaccea8e5806e2ba015951b9be1c4ea38e6f27c071d025e22cb5c017f83cb009e4bf748 WHIRLPOOL 20a7706618dfccad4c186f512c05206516f92aeb8ee1243f924bc63fbc3b560e21fe8bf2f5cd976e8763dc08693be81ad961168197efbf054d2c5efc864754de
+EBUILD netbeans-ide-9999_p20151002.ebuild 30334 SHA256 77ef9c2ee951343d8d1fa0b3e46ff55d5c2e7ee485a5f57db84925d148ba8590 SHA512 fe793e1ef37e789aa6e47fea9dd92e82c7b2678c2c5dd63a033349a62e229d5a586b4064bdf69fcc888531b3956465e955f070a25eb9c7f7734c7457c0186e39 WHIRLPOOL 2641f7d21223b53871b77d57b74d16bf73d984f936fe187ed3221a9267f18bf30642dd1011d360647766e806cc4ba785c66ad1074b99999be602b7bb1791469c
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20151002.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20151002.ebuild
new file mode 100644
index 0000000..a12a951
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20151002.ebuild
@@ -0,0 +1,377 @@
+# 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-10-02_00-02-28/zip/netbeans-trunk-nightly-201510020002-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/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/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/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/DAA45A7EE529A7532F5DC08625A5A3E81DB2D4CB-org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar
+	http://hg.netbeans.org/binaries/F5AC8FBA216A8C52F319EC2CB455B44FFD734B38-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar
+	http://hg.netbeans.org/binaries/B43E7CE55F0DECA3BE1A6E695A3E3ABC6D62567F-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar
+	http://hg.netbeans.org/binaries/1B9CBEC0FCB47C279519E52D360199C24EC99B01-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar
+	http://hg.netbeans.org/binaries/6B0A6E9F9179E314944E4ADB831A9D6FCADED3DC-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar
+	http://hg.netbeans.org/binaries/B28B8EE777232102471EA5334FD70E20851845DD-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar
+	http://hg.netbeans.org/binaries/24A15BD37950663933CC4975EE6E518BEB2C28A3-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar
+	http://hg.netbeans.org/binaries/01CD242F06F6F7E4E61C9E05ABBE07318E501D51-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar
+	http://hg.netbeans.org/binaries/75928E4368CA748131A6767BA1A97D9DA643C306-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar
+	http://hg.netbeans.org/binaries/8307A44D3F150F1BB317532097A0C7D125C00F2D-org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar
+	http://hg.netbeans.org/binaries/E90EF50215FFD23928B3308DC76A17B7DADE5F33-processtreekiller-1.0.5.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-httpclient:3
+	dev-java/commons-lang:2.1
+	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/jzlib: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/freemarker:2.3
+#	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/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}"/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}"/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}"/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}"/DAA45A7EE529A7532F5DC08625A5A3E81DB2D4CB-org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar || die
+	ln -s "${DISTDIR}"/F5AC8FBA216A8C52F319EC2CB455B44FFD734B38-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar || die
+	ln -s "${DISTDIR}"/B43E7CE55F0DECA3BE1A6E695A3E3ABC6D62567F-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar || die
+	ln -s "${DISTDIR}"/1B9CBEC0FCB47C279519E52D360199C24EC99B01-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar o.eclipse.mylyn.commons.repositories.core/external/org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar || die
+	ln -s "${DISTDIR}"/6B0A6E9F9179E314944E4ADB831A9D6FCADED3DC-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar || die
+	ln -s "${DISTDIR}"/B28B8EE777232102471EA5334FD70E20851845DD-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar || die
+	ln -s "${DISTDIR}"/24A15BD37950663933CC4975EE6E518BEB2C28A3-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.confluence.core/external/org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar || die
+	ln -s "${DISTDIR}"/01CD242F06F6F7E4E61C9E05ABBE07318E501D51-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar || die
+	ln -s "${DISTDIR}"/75928E4368CA748131A6767BA1A97D9DA643C306-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.textile.core/external/org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.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}"/E90EF50215FFD23928B3308DC76A17B7DADE5F33-processtreekiller-1.0.5.jar extexecution.process/external/processtreekiller-1.0.5.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 c.jcraft.jzlib/external jzlib jzlib.jar jzlib-1.0.7.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.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.lang/external commons-lang-2.1 commons-lang.jar commons-lang-2.4.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
+	rm com-jcraft-jzlib.jar && dosym /usr/share/jzlib/lib/jzlib.jar ${instdir}/com-jcraft-jzlib.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || 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 35b6121..c353ded 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -47,6 +47,7 @@ DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2
 DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
 DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
+DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
 EBUILD netbeans-java-8.0.2-r3.ebuild 13294 SHA256 4abac657cff75400e92b1f2b19bca696113cdc37611c8c0f49dfa8c82fec4296 SHA512 32e41d7acc3aca026993e5edc791f1314f2bfda47413538af655b0335973c4fe50d998c67f129307b164075c3e0503280b4c1729d700431644ca6610d7f0f635 WHIRLPOOL d7f99c13421d08529b54085138fcffd2959a3c3f97d94a1dbe6e726a6dbc2cded69ec0bf97e1458b56847ac121954e8f173c1adde0703fd2969defa53ac37c51
 EBUILD netbeans-java-9999_p20150901.ebuild 14818 SHA256 2e650037a388a620e743e8212f0099878e8908fe4dc1680b36f6ae8e9a72fa54 SHA512 b7d8475055812c78ee45ceec123fc103641b4070972f0f7e3572a0b07efee2ca2cbcd16600fcfc7f30dff461fc235ccbbc1fde941f528e27f4a2f742f3ee5cdd WHIRLPOOL bb23d595159c481696ba4fefba3e398797db9cea44e4c2f00eef7929fbe1f442362c470163bc460d349da5cb18f627a3892c6d63b17439112becf538352785e2
 EBUILD netbeans-java-9999_p20150903.ebuild 14818 SHA256 f34ba8d98927651ec621ec445d4760fc596073f6857194bfceb5688b2910089b SHA512 ce7c86a52990ec26660a9eee1bc7588a2e069e80e42eb5b521699a9784e1da41411d5e9965c4f77bd4771b7046e9bd99e6563511336744404dd716e54c11faae WHIRLPOOL 5477f4bda878bfa48ba3851b740e5d9f06f594fa953f5ea0fab0a37917c7462b7356f96aaeca5847e85623c37e4bb46df81217451aace87cbcde7c50c38146a6
@@ -65,4 +66,5 @@ EBUILD netbeans-java-9999_p20150924.ebuild 14818 SHA256 cfcdfc64c907fe1a594e997f
 EBUILD netbeans-java-9999_p20150925.ebuild 14818 SHA256 8009633b2894840b5c4405358400690e05d1bfa8ebdb5729dfc8d9b1bdddbc21 SHA512 99ff05cd7d9a28dad280bd45243754ebea442fcfe60a1091aeb31be6e4cbcee34d8c6218995032e631bd12858b04098e4c8671329b8b35ee9ef54521e84836ce WHIRLPOOL 1e817112d9a171419afa1569149c8406a90c75ad261c7f3364469e2cdab72f969d4530c52102ab10d43116566453cce59afcec2da3c0246ba3cbf170967ddd8a
 EBUILD netbeans-java-9999_p20150929.ebuild 14818 SHA256 e746cd4a38e63f882c42e022c8635b0daa17205de2bc484df92ffad88fc91b6f SHA512 1250330f5b76235fa42455fe5dc022d42090a989251c03a2e85755321aba68a76153cc46975af20b409de3cdc441031bb6db7bd668324117389bc10b8ecd20e0 WHIRLPOOL a65e0257e2d06b7099ff605f1fc5d177aee6055a635176cb7003c28efc67cb9a1086763aa63e9175f0def4f7a350490059446e7176209849176a4ef36d786a02
 EBUILD netbeans-java-9999_p20151001.ebuild 14818 SHA256 9ab4fd89bdaaad622116497f3e113e05b29acbbb83bc36fa6062b7eeff7c13f9 SHA512 060b6d6b4852fca9830f0067c218e775bd23854affbd4b254d6148e80f696e9704df24af93ff962c3419d3bf62157ccc54032647e6b84c8beb3d16596dd355b8 WHIRLPOOL a02fffb34b3439853100d5630559ee832d617140b3f52e81f789abfa2787835d7e13f74cde0d8ba8af9556bc23d4b032f188d1b16facc5abadddb7465b098c98
+EBUILD netbeans-java-9999_p20151002.ebuild 14818 SHA256 75fabd2d1daa267b808eb69b3efc6ae9392d61bb39ba579a12d7f6c2d34d8438 SHA512 0903e337632ec3328a0847727d13f04f5813275a7da9c653f8ded21847ec7fd97c79e16559de23fbbea69c30156c53a3477aca4b91f02ab7a55d19a8681eb3dc WHIRLPOOL b11fe21dce01e1b22a2a0e4b2cb8c1ef86a315e67dfac782b1ffd1dd7eed1eb6de6c67ed589d42a392d59f2999df359d2ea29535dc18778a05823ddc872a71f9
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20151002.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20151002.ebuild
new file mode 100644
index 0000000..6492aa1
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20151002.ebuild
@@ -0,0 +1,273 @@
+# 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-10-02_00-02-28/zip/netbeans-trunk-nightly-201510020002-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/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/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar
+	http://hg.netbeans.org/binaries/7B98BEC9E6D1A447C9C3DDC61EF6658BA000008C-nb-javac-impl.jar
+	http://hg.netbeans.org/binaries/CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.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:0[java]
+	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}"/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}"/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
+	ln -s "${DISTDIR}"/7B98BEC9E6D1A447C9C3DDC61EF6658BA000008C-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/Tidy.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 398f27e..75365f0 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -21,6 +21,7 @@ DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2
 DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
 DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
+DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
 EBUILD netbeans-javacard-8.0.2.ebuild 4906 SHA256 944fee40d693c2c287e748f70ba565f3cd84bb7c19110f8be716134ec20694a7 SHA512 1f66cd2756effbfde7d43f9da7d8d93cb6252c58a02ee3d821f6faeaf63bf3c63e28f80c6eb44689e3aa954452a2f3893c65e75de84158dff1da0d94cafea14a WHIRLPOOL 88197e03008b8acb1ce62f72783bb096d9a3fc2a289b83367841a8adbee2bf822031f9bd6051831515ee44b1d5d2a109c5646f98ca723506f27c874301fb4189
 EBUILD netbeans-javacard-9999_p20150901.ebuild 4976 SHA256 f8bbd7f2419ccc07c17b05c295359dc07c55f3cfca78d7760105b82903fa2b79 SHA512 53bb2b9edbe87daecc4feb6b063579517ccea53b52168fc4a6ed03d8351d3f254a819125937aec58f551aa926b4b5a567b5bde3850fc390fad437f45194add80 WHIRLPOOL 9403f1dc9c3042fb5981d340b02d3615db9aefde73f1b2ade96b9010bdd6a37f610387aa303625ae0c979f20ccffd57ca87115321bd42ff9b6dcb39bcff03580
 EBUILD netbeans-javacard-9999_p20150903.ebuild 4976 SHA256 20835b1551b3382cd7a6b3f97fcf7725597e77317e8a5ede489954f99f0eb4e4 SHA512 93dc8f950ec2d8d8ad83eba39699436121729915ceca17ab3a4593ea2ec0a9cbeb81263f52cde443fb2ebe43658620c438664cd112b30774290a8cc03f2dfdb6 WHIRLPOOL 69670cab1e9e12e074a2874ade1cec66b08313763f7380b1839395becdab4bbd617172987d0ddb021dfa29241654119fa2d6d61cb34d507584c3c8e7670f6b83
@@ -39,4 +40,5 @@ EBUILD netbeans-javacard-9999_p20150924.ebuild 4976 SHA256 db09ee755db06f77e212e
 EBUILD netbeans-javacard-9999_p20150925.ebuild 4976 SHA256 e8bdd18777ea9dbaf9127a86f5b1446959e4843e8811d8bce83915e2772e3fd6 SHA512 273de50e8d0a3b78c8a20785373c39e51b0edb7f584a3b793e221cd3f7e4330d9a9f528d5929c0dccf2eae177d7c166f76e8e49a448799adab05fc2659584555 WHIRLPOOL 1a8582d3d574290ed2d85024d8ace16593e4fc18b1ffd76e63b5352accd77e312bcb3d982cafada9339e9b1d91b9fabb1b51c707c5c263263b439bf0da8286ab
 EBUILD netbeans-javacard-9999_p20150929.ebuild 4976 SHA256 01561b45f5a730b0d5cca539d2c2193ad8f42b62b3fdf8b14eaa4805217f1fa3 SHA512 899000c51813f9dbf4545b511f177f0900b0dadacdeba9d01051d82c569df4a65a2c92c4fdb710f35491c938bea0104d665426efcb1fcea01725cd06c1b1f950 WHIRLPOOL 427097b8ae5fb4487fdb375c3658b239c0466653b7619ff547f9e28579ef49e05a561b3bc79b0e7b387c0c66433b3b056cb1742555b6e4827ef8cd342de364da
 EBUILD netbeans-javacard-9999_p20151001.ebuild 4976 SHA256 714a98fde31d797fa8e50c0564ef66829e9e51f9fd740df1441b09bad904f433 SHA512 fd6dfd7720bb16541a2c0938ed5debc3c7ec313ceed2f8006d6aa801b89dd9d8ac12f6b865a6571fffe7fecf24720c34a10b4c50718cf6b505bcc7b659abbeca WHIRLPOOL f332fcb29ae308cec3c6ecf6b1b637742d5b8bcd420dcce3926b7ff3301f1949c2db7d1eb12ca06813aeb449d4526b4272e58d30f2c8a7c9003218e05479efbf
+EBUILD netbeans-javacard-9999_p20151002.ebuild 4976 SHA256 f82032cb69c8bdfabdd873e04b1ee11fe8cb04dbc3291f2eb4868731fa7457d9 SHA512 d45ffafe072f2f0cff7c4a369289196fbf789d3f694b3772c771a3579636d289d9f86a8e83c5a440707322c8361a9457c2ac91d08cfc1eabe533ed75af631ebd WHIRLPOOL c6f13eea72bd4a848f3d250b6f9c9c5fb1ad01444ae96c785740c45561a0333faf13fe6376ecd80eec0ff615b5eaee53a0ba6b5d253e6904fd2873139418ce79
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20151002.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20151002.ebuild
new file mode 100644
index 0000000..974fcf7
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20151002.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-10-02_00-02-28/zip/netbeans-trunk-nightly-201510020002-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 3793f8e..8f56bc0 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -19,6 +19,7 @@ DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2
 DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
 DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
+DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
 EBUILD netbeans-javadoc-8.0.2.ebuild 5993 SHA256 baf9da38d87b86eb8ed10ef46017361f36ca8583dd90885c9d1667a51851bc52 SHA512 892bc25b30dc26e3ee7c8be9aaf8542c00a7fa1d1d8f883d82bebb816edfa93e1ee9abeac1b0c47ecc8b4169bcaded56c5c71f18151fdc22fe241fcee0fd4521 WHIRLPOOL 2012f28f3ba5074b4d262b20e9a1c8ddf590ce444339ec1a404c890867c1271e38f9f9e09717d0648fae061553f5c8da3d97a70c35c8e853fe4894fb6fd4ec96
 EBUILD netbeans-javadoc-9999_p20150901.ebuild 6228 SHA256 70adb18643384a52dbe2b88467c14663a755609b1a5098cf816c5c0b88994e9e SHA512 529fa63d125fe04aa06c4f444924b0e1390680092ff4a474810b6ede97925cdf907b14283016f9000f54bc9cc1a1d0e89835ca681940152a029eee0f370c2fba WHIRLPOOL e117f345fd2dde9298afd3f8b2f7ac1a699936336a68dee80c50cc33193aba40b069ed8867a1af84efe3a4621fea35daf8b0835bf89f7ca7f35278b60ddaa56a
 EBUILD netbeans-javadoc-9999_p20150903.ebuild 6228 SHA256 9f0dd0e792cbe63c9dad51f0b445a2245ac2931123c3de1fc8079631e3dd4b77 SHA512 76e8762c17b07fdbe1ab65cef9b6b6c0e26355deb5f1827b7d864cf582d1aeecac57c579d439a49f19cbadd6db7f92e626e0c97ef5ddf0b1b883cfdd6282ee6b WHIRLPOOL 0efef7d57f10a275fda7f97c209ae41fc61f8f9961de19325e34c117378d97e7d1b362ffab93e1ac71ce38b13881823937fb8ef10fb014c84e1cd61ae42b3d2c
@@ -37,4 +38,5 @@ EBUILD netbeans-javadoc-9999_p20150924.ebuild 6228 SHA256 7a074717de8d444c14278f
 EBUILD netbeans-javadoc-9999_p20150925.ebuild 6228 SHA256 9da2acae57f47e7029ef3a37d2d853990aeb74404da75e5e33822560112f55fd SHA512 3de58070e7cd7debee8e2d4587df6fa72884ce591d1c414bfb3b4e9106c28f8bd1f36a45f3be5c7afe862eb92bd034b941a192679c60acb70d20071514fb6b39 WHIRLPOOL 7fcadfc16e3e41f74cd539e89a2b2add49b721ef2cee7cffd64c6c4307dc82f862af425779f7c3e148c0a3c624237680ec269ec54c5191b4b80aafc85971a457
 EBUILD netbeans-javadoc-9999_p20150929.ebuild 6228 SHA256 3035638cf50308bd9b82ceeae22615d518d618476b78be9ab9f9fec366b18f0c SHA512 cf994c65cbea24f104261f38bf96f858cceaedb7acd5f2800405ca59921375fdb3a467ddbeef73d50f76dad684df1554d6e9acd818b8b1f23af6469764fc5b79 WHIRLPOOL 847b01a3bfb1503eb98446c8a25ca81786b3944e34beb02109332a1fa1bd1dde8f11efd63b5612e7f8a562125326c79226b9f79e0685dbf7416ad70e185165ed
 EBUILD netbeans-javadoc-9999_p20151001.ebuild 6228 SHA256 e1a3b029266e3b470f00a50bdfd40ae55bd55704e05c349b61f95d634b61dd16 SHA512 46ca2c05feaffb2bc02ef2b13db9ed0f73c250dc9264a72045680c75c31a78eeff3afba43cf4a491bc6f06740b817cc4a69cad1ced802d7760be20450a2b56a3 WHIRLPOOL f81a54053408f205ca6b71b67977ffd3ccfc12173334713c7f604fe805da3db7e588ca002043e83a4f45cc62408d0a1b093538536481545f3e8f925a91b5f0f3
+EBUILD netbeans-javadoc-9999_p20151002.ebuild 6228 SHA256 a687fddec18e191fecbb9aed6a6a2390688e8f2ee2a73ee10691c5062eeb933c SHA512 75ed80ad34847f6b20974067f47bae25e2ab9e1c2e7e24ed29e1a10a95c3178764f6bd51bfff1ec9c8a52fc6691b834b7854eeed0762f041db644a99bba8dc6f WHIRLPOOL f8c57073ce593060d8829bbe8e6174082797dcd11665733d86b5548d29b9e7c4b76bf777fb18bc6b123bad55d92c37753b772ec490e9553f937a4d26a8412f12
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20151002.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20151002.ebuild
new file mode 100644
index 0000000..0023795
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20151002.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-10-02_00-02-28/zip/netbeans-trunk-nightly-201510020002-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 other jdks do not contain jre/lib/ext/jfxrt.jar
+DEPEND="dev-java/oracle-jdk-bin:1.7
+	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.7"
+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 -f nbbuild/build.xml bootstrap || die
+	ANT_OPTS="-Xmx1536m" eant -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 87f9da2..e9c85e2 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2
 DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
 DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
+DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
 EBUILD netbeans-javafx-8.0.2.ebuild 4647 SHA256 15e5e0b1c4729852dd55e5bfb2dcb520ba7c959bd9927d315c0abcb3f94e4ecc SHA512 520c60264fee67b0ccfd50ced0cc8586d5653d5186fa75c6b7cd8b400aae834de446b7e6145ad38df7e68207391fb360ef4834140e096d48add568fed387ac98 WHIRLPOOL 416a56ceb2ba85e3923ada0c8ef485cdd6fa16b3423b8fd0de523fa54dd082cbaedee5da4f1a92b50e440195f9256376f50e99a850d70ccdcb8c0ff370007f7c
 EBUILD netbeans-javafx-9999_p20150901.ebuild 4717 SHA256 e95804f3d997f20e45ff63e57182227513494d00f034115bfea0fb80f7b06f86 SHA512 20431b8026fbcca039f412ab076e9aeea22745f964858dee0cebb070c08113cdabe35edefdb998efd0d146b0a9d055de441b21620e1beadfeb9970009e479eab WHIRLPOOL 1352d5de66acd787070011681f7800e37f7bc9f9420b7e957a16c490b7b0419d88408c13ce930f2e2507ff8a84308a93ed50434ed80c9f26b21e28356b73a716
 EBUILD netbeans-javafx-9999_p20150903.ebuild 4717 SHA256 f8dcd19435adff0ba1a386857b8a0d2624ba16b64e36bfd40f58a2da8616be5f SHA512 776aa675ae3ee669bff503e9ac240e801dd080c34a18f46a53ee9308044152eb4dd067b0ce9b3d89708a56f533426c2010e06d63d2c7465bd3e461193a71c082 WHIRLPOOL 12f7d33492850172e803a4c2fac724d0b6e196bc7d64746fb51f1382cc1d82df5714511dadc1167e5921d6a492e47d5e879f8f5fdcd1bb2d2501e14e2425407c
@@ -43,4 +44,5 @@ EBUILD netbeans-javafx-9999_p20150924.ebuild 4717 SHA256 766cd1df0358aded64dbd39
 EBUILD netbeans-javafx-9999_p20150925.ebuild 4717 SHA256 8c1627c4c59d97318b19668429b125071cf92509b9530ecfa3b9ce04ea292ea4 SHA512 36ca1292c6cd05f932a0eb40af6321769772c67ff35ba97d6dc9cc187d7caaef30aefcc21bfddd93a0b413cc911517b183ec75099e74d58c5988232cba1cdcba WHIRLPOOL 5aeb6008a854e15f824f0f3e87612c80beda26550f537494be310e7b940131bb339441410afc7b6e7d8dc9bbf8ba27b5c668304e6ead91d4f37b6c506ee71ea8
 EBUILD netbeans-javafx-9999_p20150929.ebuild 4717 SHA256 682c527ca8852d8e2dc0bab8f04a915b63a479d5a29bee4d1129b24d91f9e6b4 SHA512 cb5593d381c0258350ff1e9bee77fa4062afe371882f88557e512463791a1236c34cc070c3f63c615beaad7ee0500790afb03ea8b778385fd3f139503165d05e WHIRLPOOL a80bacad9c52faf4b1ea851134b87677713f7f9bc668ef42484d867c46f420c7cda7c6f2c1883b5bebee60a8ff05f648637a14591e4d3480ff5f0ceed05f8814
 EBUILD netbeans-javafx-9999_p20151001.ebuild 4717 SHA256 f7d20a14f73084dd20657f4a6980f669648914eeb87b664570b6b48c2d130430 SHA512 20c414a6f5586949a115c142c0f2500162796eb64784e2bcd05ce611c5a709859994bceeba670ca45dfe1a9ca3e7b3506642347654e15b1336a3da1b466a5123 WHIRLPOOL 936b577abd4722aeb2e35a82422d5490fbf687875759052a635e90a1b6cc9839d67ce65e1de660381e61f9d865ea2583bc8a09f5779a7427274738523c6223cb
+EBUILD netbeans-javafx-9999_p20151002.ebuild 4717 SHA256 9a6e99d919c51b950269a7211ba0706b34e8089fb8597945b255382126897634 SHA512 727f3c917c81692c65527a7c0e5d85898614ca1d84ff3c3cb5eb57656b3f04529abb43c1db2c52074b1a52f99631d88d69c7680b1d01fedd3b827fd4ccf903d0 WHIRLPOOL 4bdef0a6873f39f737d892e8b32a0e2f5af57f52c268b97a0590dd512d27052756fa1f184a9eb27d0a02705a7eab5188e423933a6a13ef7f2ee526a710fe6ee5
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20151002.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20151002.ebuild
new file mode 100644
index 0000000..e6f6a27
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20151002.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-10-02_00-02-28/zip/netbeans-trunk-nightly-201510020002-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/B2EB2006BCDB022420BDB4C2D596564539C65699-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}"/B2EB2006BCDB022420BDB4C2D596564539C65699-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 7f13c54..6cd2dc5 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -18,6 +18,7 @@ DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2
 DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
 DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
+DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
 EBUILD netbeans-mobility-8.0.2.ebuild 4342 SHA256 e9b4ff8fe38904346bc21a82219696e97322bf9df4e9d4cad2259b6f08bbe7f9 SHA512 338711fe61c469cee80e499ddf8c3ad70a3a38e6658311afcd1d24edd1a99b87566fafcbd392bb958b589796e0913d2574b07570870c8d3382a91a324227082f WHIRLPOOL 855b2817c36bea67c8fb368a0740be18b71dbebb2b98a154552f002a56eaff34f54eee2698379d7200a6042c1de699df23e7717b5b6c532776852d8757b74cb0
 EBUILD netbeans-mobility-9999_p20150901.ebuild 4412 SHA256 24385dc623efa0f82a8ac6b377c867cc43863d1ef24a67cf0a55840d22d24fc8 SHA512 cef8f1359a5a8607376cf3db54b737a637a2efb7e08a3ec34ef911403c3cbe7c3f6201674522554875d96e8870a6a53b9fa54f9bb4d920575b7fd870d00f4448 WHIRLPOOL 7ab52bd93e70de0c6b3c184bce62b22086e81d736224ce66a157c40a052a57d9963030916f96fa54c5be7abfbec33536fe6be968696eff0461d1900366c0acb1
 EBUILD netbeans-mobility-9999_p20150903.ebuild 4412 SHA256 7ba27bee1e24a5cae28b92bd03db76751ef9815e6b9ca1f48e93302e33753edd SHA512 90aa1332c367f89d6fd7cd562376baac469928b71d878f6974bd0435eac1238c49a8215a53286092331fe2b87dff24357928e4811b093bcef8307bbe90d6eb87 WHIRLPOOL cf8378b155e8661bc366ea56ae4078e2e5c0209f9eb1363202b3daa3a9ab531ad21ecee420ac96e62a6ecd006f4e80ef9da8095cce60e9a293c644923e432656
@@ -36,4 +37,5 @@ EBUILD netbeans-mobility-9999_p20150924.ebuild 4412 SHA256 527eefabc406e61cf74da
 EBUILD netbeans-mobility-9999_p20150925.ebuild 4412 SHA256 e443173e1940e1f0fc4c4ae5ae6180c2bc861e454d3a2a3cda2c1f62a44069d3 SHA512 7ecd9c061b21c51254804c083b85a03bcb549a301e4eb7529f25f764248743f0a573e1ee4a0f8b6722e3139e7ef3fef15ddb179342d3007aa80feb7605a8e995 WHIRLPOOL 8979eeffdee61861b05abc470b4c4a4feb4ca09b1730ccecacd3e761ecf4ce27d165aedcca1ee7a7b5a7ed2ec883010032a7dda5a8cf1b97fa46d6c1231d7ba3
 EBUILD netbeans-mobility-9999_p20150929.ebuild 4412 SHA256 ccf44b1222add6a7a1d0d73122438b43e8cd467849f208d32c23121bc3f79656 SHA512 b08c4d586f6200925bd6fd2e43c9068778a5f355617690b6e6c07c1a05aa903637b8624dff647d171f5f585f2cbb66e10567564ba39225851dbb572e113d1884 WHIRLPOOL 76fe5de816c67035600d006e222846814605a98e21af29c1110695684f1095d10698cbda466fb0276a5fd1ed58ec196f13e2712ca9427a201b94fcae60dc33c2
 EBUILD netbeans-mobility-9999_p20151001.ebuild 4412 SHA256 fa37c54076909decb1265c7a0f659d19ccb7f66021dc55262bb840d238bdf5ec SHA512 03783d0b84678f37f31e5739113ec02438161775854a05abd52decf8438cbcc29be6126d2926edfa8f65788a293884ea638b6a442f3552f1f0547cbb58560de4 WHIRLPOOL 534bb40d4aefca1435202edb8e4602a6aff3579043f404e7da65badc9dac4fcbb7821c5462d975cbea66bfa9a3e9ae84a8ca28428433385747455b61726e1eb4
+EBUILD netbeans-mobility-9999_p20151002.ebuild 4412 SHA256 df00ff89ea7e700ba86d2fa5200cfe2acebb3dd7e701e73ea0b46f7bf0bb0f01 SHA512 fdf208e110fbcdf52f7c3056348c1927d1442ca9186a432ea84b4d4650723d46f33bbeee7e3a291659675340f102c5f2b009115e68dfc604804c231be27d6c51 WHIRLPOOL db8eff616a20bbcfdd284974501986f19822e098fee0cb8825912b80c512ce6068e1c26cbf1e6f0917edc01a603f6f85ee2b1e5504a106b828c7a78531252692
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20151002.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20151002.ebuild
new file mode 100644
index 0000000..9afbf35
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20151002.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-10-02_00-02-28/zip/netbeans-trunk-nightly-201510020002-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 5053daa..75bbbc9 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -21,6 +21,7 @@ DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2
 DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
 DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
+DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
 EBUILD netbeans-nb-8.0.2.ebuild 4927 SHA256 7531e50c4d76608bf925efdba4f54f522de3a8ceeef4d48807fb4ee48bfabdf6 SHA512 925734f331cf228066c5c9e614f48b756af31cac8b559cfe756347b6a2cb0ce362c7c41489a25084f2ed3f2e415baefd148a54f39fc00269fb14179efe056cb9 WHIRLPOOL e3224c5f22bb8e4792a5f98bbe819e071ff18c99533ce05a3fc1c5898ddcca1e3ce34487ba78159bb4d60155acdf15ae4fe81189ff2d5b1bc77ffd9ee4e20aca
 EBUILD netbeans-nb-9999_p20150901.ebuild 4997 SHA256 4bc20abbd79e622dae684777ea3942b19cdb96e94d76cae254b9bae919055997 SHA512 9eac2a9adbcb86bde4662b9edbb874ba820db2e622a0f4e436a570081cb49e664958e3e8fe6900dbfcfd44a0e1b33047fc25a536e93781b8e9b303ae9738bc83 WHIRLPOOL b83b659bbbd93f830039465b737c190e5031e88a634523f3e2647715e4a5b953d3469ac1c760db9613f3d6987157d89b14f0e740da228c0436950fd339d53ab9
 EBUILD netbeans-nb-9999_p20150903.ebuild 4997 SHA256 f2cbf0e344be20488551d7ad04e8c1f2452c03bc7f6f1e3db68527924c3a9b4f SHA512 f7eb44514e61a0e30d546d43caf3e2239da9faa0e59d6c224df6a102fd194589079833b980fcc719982faa9a35c2fb60dec1cf77f327926955e984e633fafba1 WHIRLPOOL 4995f7d9e24ca16d1d7d5a863692fa221b252f2185beac1c6ca908b3ea731a94f7f150affd8cfd03d16f2f7eb620be60833286d37a8d4b71a1e6b8eadbb32f50
@@ -39,4 +40,5 @@ EBUILD netbeans-nb-9999_p20150924.ebuild 4997 SHA256 7f9f40d6d726ec69db027e2c4fa
 EBUILD netbeans-nb-9999_p20150925.ebuild 4997 SHA256 dff8097023e878707cd6204eee0dec09cd963a04df2768e6d3c0cf9b889331fa SHA512 3be846befd1ca0775eccf9c919dea7b0154e9f7cc246a8d1579697b00b5039f9cac27e1617437acf971c001b6e3d6325521301a94471d41dfecbee4d0b838aec WHIRLPOOL 4a819d4e19da883392043817f7a3b95c2430bf1f10cac39183e70b10c6039c668541953602c1d54d52645081ae129f0847ff214bb8d5fe49af2f8e9bc0723798
 EBUILD netbeans-nb-9999_p20150929.ebuild 4997 SHA256 cab36248dc89114c1bb44ef8d7192ce16c893115c5a03a26dc24518e2ee795fa SHA512 5751c433804a46b8f3b7bf86f6299e50ea9d6c073101dbe73a1b28dc6ba822e5d9b77be21fe3b7c8d6d21f4aea09917a3e35438247782986665ae9f6b85e2e38 WHIRLPOOL 75afd81d5c8255c8415b125506624ab3ca80dc4fa387511460bbfb21559a59ed28bf5041dced0bba86f1d98c875a0982ec64d9b63654b620cceeb9ae72ef6456
 EBUILD netbeans-nb-9999_p20151001.ebuild 4997 SHA256 beee62184543011b39e38178684cb39843804f4c34e3296fdf163da2288891a6 SHA512 d21f566eff13f763bcb2c99d16f7a713254d3251eb6c9131acae6b28bc4658055e20d137eb6d526fd77bec7f76d42c1ab7fcba967891e68c42ccd0e44d0d46f3 WHIRLPOOL dbc5168e83e57f4e137b5d29606a10f800bfe50861b3ba80ff05bcf6f8fb74840dec8a10d9717875bfaf32aed11a978169e41962443724c090c5e35230a2003a
+EBUILD netbeans-nb-9999_p20151002.ebuild 4997 SHA256 9ab3d3fd8b6c8ed179f38eb1b4b91adb1097bafce9fdb19fcd070f6e012a846d SHA512 b4f77eedd60ad27e2b79c979da933504c796531078d7b31537a04a16e471baff40fd64866445afdad95c780e27c19d6e898b411c947f84fb6eaf81ba70720a51 WHIRLPOOL fa901af75d59511cff43f7dd67a01ec4dffdbaacb77f64efe08ae28b7d765b377350bb17c7353b285f150bfad33bc9bdff032c08655c9209c506722cf540db35
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20151002.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20151002.ebuild
new file mode 100644
index 0000000..f9c52da
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20151002.ebuild
@@ -0,0 +1,148 @@
+# 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-10-02_00-02-28/zip/netbeans-trunk-nightly-201510020002-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="keychain"
+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}
+	keychain? (
+		net-misc/keychain:0
+		net-misc/x11-ssh-askpass:0
+	)"
+
+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
+	use keychain && epatch "${FILESDIR}"/${SLOT}/keychain-support.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
+}
+
+pkg_postinst() {
+	if use keychain ; then
+		einfo "You enabled keychain support, that means NetBeans will use keychain for managing"
+		einfo "your keys while connecting to ssh protected repositories. If you want to load some"
+		einfo "keys on NetBeans startup, create file keychain-keys.txt in your userdir"
+		einfo "(~/.netbeans/${SLOT}/keychain-keys.txt) and put names of your keys in the file,"
+		einfo "each key on single line, for example:"
+		einfo "id_dsa"
+		einfo "id_dsa_gentoo"
+		einfo "If on NetBeans startup key will not be handled by keychain yet, you will be asked"
+		einfo "for key password (only this time and never again). You can find more information"
+		einfo "about keychain at https://wiki.gentoo.org/wiki/Keychain"
+	fi
+}

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index 63ea7df..8d4dbd6 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2
 DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
 DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
+DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
 EBUILD netbeans-php-8.0.2.ebuild 4347 SHA256 585b2488d748f3d0f87c17c951870e167aac7bf10847428add786e4a8a446583 SHA512 1431305d4f340cb0a2c7c896c54d45f6f02ef82a4201f82053278b98511a5a4a68210317530e9cdf5cf1f495996d3a3f9c4b2c3c479aa407abd375072ab3182f WHIRLPOOL af8476f2ff2d119f2657e6be03cfea1160f86e41bd791f40609f1bc8a8aada46ba1081e4f2417b0fddde931fa4e43d20956c0fe1d4fdf3617b78d01afd23f9b4
 EBUILD netbeans-php-9999_p20150901.ebuild 4417 SHA256 b6f52a63053c7f6d74829800396e15d463a7316c2de194bb0e243385eb8cc95b SHA512 b783d245589b2f43d616f3e3af5ab8bb0d9c5097974c640f8d22996b8185eb921edb851c174bd02a17ef0d29c50f0db03c595b5f23bc717dd3b2c4944c7fbf73 WHIRLPOOL 00d18b2b7f6bff0fcf8852a6137df8eebaa99885091a6363628b7ae18dd9c4ec18e3dfb75f214092be4cde7fe7c1150889ee8c173751089af52e8710f67446b7
 EBUILD netbeans-php-9999_p20150903.ebuild 4417 SHA256 e7c715d04d186e6e62d408485f33ee6c94ec5a76969d95de552d10e590b94940 SHA512 44abb97abf1ae49840e20575bd05374f301870892bde53213df37d5a0b21bd6d9691bfc9f36120225d357572ba6df840cd4ef5f5f5492c24e5ef25f57f64624a WHIRLPOOL 35a1dcede6c295345409ac71f20c53c41b772a523d91d91bcd9b20369bc203e5f7f79e1ce7e2a72bb3cbb50ad693dfd8ad77a4ba22eea72000d70dfa593dfc00
@@ -41,4 +42,5 @@ EBUILD netbeans-php-9999_p20150924.ebuild 4417 SHA256 bb6880b20a6741929d144699be
 EBUILD netbeans-php-9999_p20150925.ebuild 4417 SHA256 ffb384a595a952da0310361c0cf9c28a240df0ace754f7700d408cb179f9d610 SHA512 d345ca7f88afa4cd1d8398648eaa9bcbbc352be0b08a4924ef2e87eb6bbbf4c03fdb514efcc98b96059a06cb1bd23eab15ad3ba420eabaeaf3606057ca86030d WHIRLPOOL 58888a34eb736bb35a89470ff75aea47a64f0d2a657bdf158f2f296df7d9733aff9dfa486c2090f8fd44e89f4065a1be10cb573871121594111046c89d28ce06
 EBUILD netbeans-php-9999_p20150929.ebuild 4417 SHA256 5fd717c5b28d9317a83f6a634ad143f592c7749caf9f51d63a9d85b5ca0e145a SHA512 699074f43790af084f366351616b2c864b65e928a26838445d018d01f6bfb031601afd2296e0ff2d483b6b2b5dfcec79c5abb75f3ac050e578e1405c6465bd8e WHIRLPOOL 2f2315a187732006df6b26f2b633fea1cab8d6290e164f8ddfb567d20a577b3aee4d1fe4d02c1b828fe8e8def28ed2959977aa3c0354a90c8092fa425771a40c
 EBUILD netbeans-php-9999_p20151001.ebuild 4417 SHA256 df6044e54831ad66583fe0f1e8ae27d25a6dbb768829230ad2f21e3602807732 SHA512 fb840cf50a278f6afb1189e3263405b6dc2404317d677b046e923e01631b5ee1afb476bce60ad647f74cbf0b3560963689cd6c369215a29033620c971d8f94dd WHIRLPOOL 9ebefcf91e9c7e6dfb5d095df07267405caa3f15f5e103f612704cd3658ebaf6c83a2e06b448517c4adddbb34bc6fc0dac4d87f8f9d1c2f54a03bd7878d2fc2a
+EBUILD netbeans-php-9999_p20151002.ebuild 4417 SHA256 d8723db67e98daabf5df80b39d3ccbbf3b657f74b61e79d6676f2af21fdd2fd6 SHA512 fcbe482a156e5933203a13e6c1f54c565fe842cdec988c114c0d69a6c30df680eab745b1b8cf7be68840e8579c9ca8c4fb5938c91436549d509e37300f05a839 WHIRLPOOL 0f390b8e7ce548787ef87a36edbc417f3a436fa0503871fcc11d6d884e37ec0a7ddd2a9a1481c316a11d575b001eab10e34437277474bf0e990c9fa6241d20e1
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20151002.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20151002.ebuild
new file mode 100644
index 0000000..408ee28
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20151002.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-10-02_00-02-28/zip/netbeans-trunk-nightly-201510020002-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 22e5890..a8d0ad0 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -58,6 +58,7 @@ DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2
 DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
 DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
+DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
 EBUILD netbeans-platform-8.0.2.ebuild 5406 SHA256 98e9861da45ead0d2d975a0527315df5282870b2d7e71a089724d91c18852e81 SHA512 cadbe66132d3ad81f6d149e20731b558c11c529e2ec15b1fe47ff97d99a3f4b4612fa5c98c435c4ff979eaefab6702721db009a03162202c96b4b411cf9f872a WHIRLPOOL 9552948e8bbad308f4379eaae69d8c214da9fbfab87d75226949b69ddca3e68c2d36c4d05738196073e5b959ab0b764064c9186d421198937122aa4bdc4988dc
 EBUILD netbeans-platform-9999_p20150901.ebuild 9238 SHA256 85c58de49e8cf1c2202b5f892c9d9283587f255c58c4835f2169dce8b767967a SHA512 5d90e804870b94de49cf76db7e99bd2564f2fcd9984e9dc0b1f0ba02c5a66a2b97e0e59ad0b986d8ef055fb1184ab35998248379b76a456f576df5f87b90f81e WHIRLPOOL 4a74b24b3e8a975f1eff66d95406c629bf860b1956937a44f33eb2d92291d2dd95fb91dd8c34f730a35d6daafa9d16a67f2ed2a300c691d5dcacfd8f435b5185
 EBUILD netbeans-platform-9999_p20150903.ebuild 9334 SHA256 2e3f4bc8579db348c5b81fb1460caec924efd1c59ee4e980f0606673944d0efe SHA512 21e7cd36c60d7ac8d6ac919203d9d0fe800bf02c5d44d7f450f2005a6da86c1ec3ce50cc8a3577af144618964e0d2b9a9183f2957fdfbe087e2e5eefc4ff4186 WHIRLPOOL 1989aeedda0e97d37a5e99ec99899862d057fae52eafa789ef100c80f5ef30339a01f9155c9fb3be7fd3d91a693136eaad259b8706723a7fda51ee2949378eb2
@@ -76,4 +77,5 @@ EBUILD netbeans-platform-9999_p20150924.ebuild 9382 SHA256 0e1f7b2689bcd2efeecd7
 EBUILD netbeans-platform-9999_p20150925.ebuild 9382 SHA256 fd582358cbf972f4b8f45709cb9eb0023b265757a94eecc5b33b241cbf770335 SHA512 60b22bbae546c8fe32caf5bb32d553eaf1e520a472ae8b899e1774164733975f5564e7308c7bef2dc8419f7e67e5ce2d1a6c3ecc554fe77c8aa877bc246dc382 WHIRLPOOL 139a03a2fd6fe8bf3a0ccb38af42dc9ada0a44ccd4cfbf25ea0d15026a1e56342d21b8e795bd5c2ba6b1cbe56989d15f04293dcd7bc64b352c9ff39ef214b490
 EBUILD netbeans-platform-9999_p20150929.ebuild 9382 SHA256 b29cf8cb3b38d906e7d870b2e8a0f79de51b59a8ed082a55ec01129ed53a5ff2 SHA512 a0053fba65bc66c9b2f76686ec34f56b07b83e85421af3c2ff2a9b072e2194ecd0e4721f10dc3331ebfa41adeb3176216bd0b0f36a2af494d5277a2d24aba743 WHIRLPOOL b22bfb92f917d71a3b4d82710a8baefb0d1223152f0e3e49c854dc1bdd3210860d47294989719aca12027139d6b81f23628b9d979a8849db1238f6cf22787584
 EBUILD netbeans-platform-9999_p20151001.ebuild 9382 SHA256 b240d296480c76bbb7064369bd251082dce9e7022846023f345c298d6918e6bd SHA512 7352181ac30b2c867f1a194a36b9ed8bb7df74b2b6b34995327455bcb64603cb94d74c6c8c19f7e0cc8ffefd190731c377e2212661238eb5a0522af5fdd2cf06 WHIRLPOOL d69c8f39aba08877130d96a9a5230be8a201a1cc078648bfb88e718a2042896ffc12d3f2834f40c277cdeefc6f1c25db27dbb3043bceda2c9752d8c044804ef4
+EBUILD netbeans-platform-9999_p20151002.ebuild 9382 SHA256 c854dedc40e4b219058d81b09e6da2efd6ece66af76c1adaef5fbb99c410fb49 SHA512 e3bcb6d9cd44f8987ba9735b0f229123bd3936b070ac81938911c26112961f84c7fba8131ca8557f23a53524f0959074cd928391c1a9718b40ae3dd6d4455c63 WHIRLPOOL f0d6d44be2b67bb4ec1919c704bcd8da4f6160d133cf1e469ced3383dab50a04b9d5a3ca96c134e165913931f322234cd0aa649beb21e1a1d95b99c1906b1ece
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20151002.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20151002.ebuild
new file mode 100644
index 0000000..67308c6
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20151002.ebuild
@@ -0,0 +1,166 @@
+# 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-10-02_00-02-28/zip/netbeans-trunk-nightly-201510020002-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/B27F1304F18FEDE876F940AEFA6C9EB5632619D7-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}"
+
+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"
+# oracle-jdk-bin is needed because other jdks do not contain file jre/lib/ext/jfxrt.jar
+# the error:
+#  [parseprojectxml] Distilling /var/tmp/portage/dev-java/netbeans-platform-9999_p20140922/work/nbbuild/build/public-package-jars/org-netbeans-libs-javafx.jar from [/var/tmp/portage/dev-java/netbeans-platform-9999_p20140922/work/nbbuild/netbeans/platform/modules/org-netbeans-libs-javafx.jar, /opt/icedtea-bin-7.2.4.7/jre/lib/ext/jfxrt.jar]
+#  [parseprojectxml] Classpath entry /opt/icedtea-bin-7.2.4.7/jre/lib/ext/jfxrt.jar does not exist; skipping
+#  [nbmerge] Failed to build target: all-api.html4j
+
+DEPEND="dev-java/oracle-jdk-bin:1.7
+	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.7"
+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}"/B27F1304F18FEDE876F940AEFA6C9EB5632619D7-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 fac0c98..f2001df 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -18,6 +18,7 @@ DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2
 DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
 DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
+DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
 EBUILD netbeans-profiler-8.0.2.ebuild 3402 SHA256 8021dea620d1bc26214ff0ec285f8061c24693dd28a62a97a48ac3223707e920 SHA512 2660390337a973256b1aac3a02b14e16782c230fa2714ae695213b0cabc0eb60621c6a1ae234f9e57259a19de22a87447f9a89ab846bd59bcedd2be313c35072 WHIRLPOOL 5d1053ded03143b2de05b64cfbe59b515cb786d60bfa65566be795567bfaf5feb88a2f8e7161a05da512fafd523f871778d5ddeb3c6b89fc95885096e379f65d
 EBUILD netbeans-profiler-9999_p20150901.ebuild 3472 SHA256 2463f091c9f090fd538ea9a18cb2fc00819c7e8d8b3780e0bbdff4a426fb361d SHA512 40e7d264ee795e18ea90278e8e1d792abbe6ad4c4339d76ffbf63dd1126b0c5bedcd259741dff47c624a415aa7e8c57c3d8ef192d74b69373b6bf3ec574d6691 WHIRLPOOL 1d33cc1f24c6b8e3dca00668fa152b5956490d4eabc60bcae55adcee1c45950c02c0ab19daadb7b3691fc0bc908be618f56af9119243770298307a398b181442
 EBUILD netbeans-profiler-9999_p20150903.ebuild 3472 SHA256 9c439061ab5f353d42cd066cc5793626222b9e9e9b40b4217427498e7036ac4b SHA512 0c0cf3b94565f9dbad4cca20fb9abc672655e8a032c4d53794d9db03cde7b400d41126d3eeca82304952f488d232f041675fea7ad417b4f2faa9c5e24bead22a WHIRLPOOL 97d96c8613ed98c787251b8a0d4a556ffb47cd477449044c9dd8b535c9b632650870b70ee6816604701884a83c19f869db0256cb7c1ff83c6af986a22d21a5fa
@@ -36,4 +37,5 @@ EBUILD netbeans-profiler-9999_p20150924.ebuild 3472 SHA256 8cd244916c5b32f8f8ae7
 EBUILD netbeans-profiler-9999_p20150925.ebuild 3472 SHA256 fa9dccd6939559f3155e97a6db4acffa4542bfab9e05aab2b339c4ab2e2e743e SHA512 8b986d1e9cfda6b04495ee94665c0bac82bb2efd61ea2446db7904df779e7070535b8276cbfe183007e11e7333d8ee1ece841052b0eb6d4c77bf2691934f924f WHIRLPOOL de707c41f5e0450f9442fb5b64a09ed4a0fc360d89e2dcfc685923715ba06e80eeb0b8b5667143030ffbe920821e0101d704724ddfd6f5026f33664add50dda8
 EBUILD netbeans-profiler-9999_p20150929.ebuild 3472 SHA256 b82e95aa6e5265eac887b1552e68e10c3884174df66c447248444eeb2d90b48c SHA512 f4d5664b8161020fe6f360dddea06da25b089d690eacce71024d3e4e8a4ad7b3bac0b07ef15729755869e260937b2af80aabe71b06e386bfd85bac0acb548171 WHIRLPOOL d8e774ebefc407e6ce206c282abdf00b6517ba236445d334b1d9028d7d50eba0b011fb19d1c46894e3c94d4f5551fd374ddd5c5c7030abf3d62c890032431fbd
 EBUILD netbeans-profiler-9999_p20151001.ebuild 3472 SHA256 1b18ebd1d0c854f9c64c65a1a28feaf75ed2a361ea47e30504efd1c1b31380fa SHA512 81ae8b10fcded109712ffbafb154be971dac86ce1085f54b94bf3cdd67e2b9af749fd0d4aa2810cf0cada6dfed42a704b92230251a3ace47068030ca6aea5dff WHIRLPOOL 37b00b190b836c33666ce47d6f36d8cf9b4f32e0e812fc4f3642f5d2eb154780019cac3228f88ecd83ed796c79d5628ce72a5f69a350241e7d5d7496ec6f0f5c
+EBUILD netbeans-profiler-9999_p20151002.ebuild 3472 SHA256 9720248bf90bbc4decb48481ec3e8c4ffa1c84b6b7feb728781a171540bcce0e SHA512 4e3a9f84c42dca79952c2ed8d6fa19e536d46fda7c8f3a6626ef764b31c5d8903831f9e3a3d665840ec8ee3c730cf5c613bb27000040518c6d74f92081274b30 WHIRLPOOL 27c33660b378c52a89adc216a468c740fa45fee8bab23e861b7dbf3b18c5400acad65dc16c6c22b94e8822dc7a62ab1996d84475ab723eb5db832805963683fd
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20151002.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20151002.ebuild
new file mode 100644
index 0000000..26b3a5b
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20151002.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-10-02_00-02-28/zip/netbeans-trunk-nightly-201510020002-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 6832dac..31d54fd 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2
 DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
 DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
+DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
 EBUILD netbeans-webcommon-8.0.2.ebuild 4723 SHA256 e2ba39cb6f22c990acf9a492eac5707f130382d56f9bc1e3636e82cbe4d61938 SHA512 61955d38f829b3ed54bc5cb9a71da07f05676a2bf7219fa8073aeee0f0e2d0e73f7aa6ec1636be39fb071d3d2b9de7ceb813a247a61961874f4cc78697d4e568 WHIRLPOOL 1a272650fc2394716a790b79cb85a9322929c7cc96ea4776cc639fb869c5b536140dbdc632b1a8aa9cb1fc8e740050125c2ebe9390de7a8f4207e88e24924206
 EBUILD netbeans-webcommon-9999_p20150901.ebuild 4991 SHA256 6a58d046976202f9630b42e133fac192593354c8620dfca0bc5f6d5eefb41b63 SHA512 c7d0da7bf9bacf40c8afc1ee6543749b0f30969abd398bddc9109f18e29f93416496d0e31c837358412f1de192953972b3a4ed7f709789dd6abcff9f63b871c6 WHIRLPOOL eb9eefc3b2fa66241f1035309856f3b68c3373cd355d3d275b5dae7bef26d53a93628863b081e4cbde480371dd72a037ce275af31947069fce424c563866e267
 EBUILD netbeans-webcommon-9999_p20150903.ebuild 4991 SHA256 b12f68d20eb276d5787e83ba650885835308517e4de0553dc4bf16487ef5d974 SHA512 5f4fb009a589c9bc36a2908d16009b6d72f476e5fcbea52fd21385448a58335a033ad3e58a410173c0ac029e892db0d2ca2081ae8bd16bed98b62d121690d237 WHIRLPOOL 1deef8a500b05468cf6f3c2623cc38eec880bcaab1dae9ab51ff4424018465db71ed37c7146b289451558d54d858f4246ec3cfb80feecea0e1f42306c105b4a4
@@ -45,4 +46,5 @@ EBUILD netbeans-webcommon-9999_p20150924.ebuild 4991 SHA256 38c67c9551280d6d8790
 EBUILD netbeans-webcommon-9999_p20150925.ebuild 4991 SHA256 898ffb39893f2b26f35726e6d112086431ff2c331cc737924e2c0aa93269652b SHA512 e48a70e0de0f4a62d8b03245fbab7be3516f949f38fec4124093689c9ce419415274daacbd0bd14b43ad8b5fbb9ce04b0896f8a3d44a293aa9279ba82814f771 WHIRLPOOL 925262c0ca50c99c370aa1f91270c545e4b6c318d28c315c07f634d19d93c466238061238da49f6669ca4f5a600ab177189ed77f2d5c1cc53d824422176f2529
 EBUILD netbeans-webcommon-9999_p20150929.ebuild 4991 SHA256 b9fdbe32b8e5dc4b1e1a4f16a2d80bb2f425e507c6b1689106aab8b351da11d7 SHA512 f1e52cfe14c29bf4e1fb46ef7b3301ff8b652eaab11042eb028ea5cd8c7c88c5b04cde2b4be80ce875a43d20add697b92e816b6651114f22957800ac59f45b18 WHIRLPOOL 6fae77bb36b63aac4978569e0280c60f9cf518accfe13242b62429550b4f2706bed53ca25b9242099bf30826a193ebf313462747622681f1ae5f48e2cc9ddd20
 EBUILD netbeans-webcommon-9999_p20151001.ebuild 4991 SHA256 03578dcdaffc4652a45f2a97a08c8f283bb1e009f819b0f82d597077e74ba12e SHA512 03100ced6d732824efe800c39fc46c2d021bc1888f6c8b957130ce2adbf70b1abb45ab10f40c5329f3c097b85273177ed791a3740cd154b6d4681b4eacaed29a WHIRLPOOL 0696f5932e0b798bbd1c58c3e88994ed8c77cc32432228ddca59308c79bdc6908dfa3e2dc52a3b5e2a7a0aa028c8437848603f18459f2f66bcae2fcb312dc07a
+EBUILD netbeans-webcommon-9999_p20151002.ebuild 4991 SHA256 54fee490d088d97cfd8e125ed8357016a754a5b2683be61b85a54435156f41df SHA512 6231875af243909443999f7bda9c6fa199ed02258d8ae96406231c197b4facf3f4745c7c1dcec251b5c6117b5c209508becf8d6fb42d550a178e73c4b8562d71 WHIRLPOOL 0d1f347ad7ccb52246fc38d8a09b68067b98bf7c9c46ca73e7533dd499c5246914b0523b60f680bd518308617caeced87edd49157a4b255460d7ecefc35f9b68
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20151002.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20151002.ebuild
new file mode 100644
index 0000000..de70fc4
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20151002.ebuild
@@ -0,0 +1,123 @@
+# 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-10-02_00-02-28/zip/netbeans-trunk-nightly-201510020002-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}
+	dev-java/commons-compress: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.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 --into libs.commons_compress/external commons-compress commons-compress.jar commons-compress-1.8.1.jar
+	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
+
+	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
+	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 fbc0a6d..5a15330 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -18,6 +18,7 @@ DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2
 DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
 DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
+DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
 EBUILD netbeans-websvccommon-8.0.2.ebuild 2651 SHA256 a195b307847c466dbb5f46eb04240358ce3c92cadeecb8fda1562304de46820f SHA512 933626bd2073f58e3508180c042e237b9e61ba6f3c992cf37ea43978ac2fc972d2dcc3ef0b5c390b3867296e197ed2605c43452c98e36acf0982e7338b6d1eb7 WHIRLPOOL c3db8f0b50116d0129f50778e1961166e76601d8c165e20e73d75c91b02c8a095067e0f13e18178d849dd29adcedaeee7d3e0e62f99be592d7ce159fd6af632e
 EBUILD netbeans-websvccommon-9999_p20150901.ebuild 2721 SHA256 1b1853b108ea504ea98052027c51e2ab8e55853bc016e1b288f7d5fdfa937ba9 SHA512 f914e9d3d8060c6740ab305233379a6c5cda835a09d1ad9c2d5e4a37fe7154f560899b4dc4e375b4a1d8b724102b522eb02529d65ce562afb914cdabbeebceff WHIRLPOOL 2eb7a4627b93b6bb8bbc033a6e941a64452a5c6377e28b86abcaca6b6be76ddec7df0950e7ef5234f5e3d6addb3dd191cfa00f6fc18b4442a2d7c1e6b27fa19b
 EBUILD netbeans-websvccommon-9999_p20150903.ebuild 2721 SHA256 5b548eaf95bd714f2b32bdbf189f8a5967ebb9ff9f4472b7dec07165540a4bf2 SHA512 d4e19899b1df32711eb649b10bb66ee7daeb463ce87bf330f3405e02788e7acea6a8573aacd2f17c5e09c93762e627dfc88b1f331c40280761cd0bd1d2b0339c WHIRLPOOL e6914d11ecf33f57de66f4bba5f8689f0ffc0ff40df29ec98cc6a0b731cf7c73096124e67433205a3fafaf744cc8b9c0a0361c905be1823b0dbde7e85bd52a66
@@ -36,4 +37,5 @@ EBUILD netbeans-websvccommon-9999_p20150924.ebuild 2721 SHA256 a4643b09c82200531
 EBUILD netbeans-websvccommon-9999_p20150925.ebuild 2721 SHA256 fe270a017f4b6b3dd3d72a555285f3d29ace622e7ddc9bcb3d76fd1ca916da5e SHA512 8b5bbebc7927709576b96bc2e16bcdaa67eb8ecb7e701ce79f3a7acc6ee2f212b3214b7e428e65fbae8e145081a0f33640b1911546789ceb278aadd631167c16 WHIRLPOOL 20cc9c986c891fe69eb0a4462a95f8221256587166fb4a486b1eb9b1ebaffabf519063e1d712bfc2cdf92d5ea2e7c98252eec2f1177f391d4a72d053866d01e2
 EBUILD netbeans-websvccommon-9999_p20150929.ebuild 2721 SHA256 d15de36d53545f1c122f54f381b40daa574e5cfada795c9158b87634e9bc9928 SHA512 5a55315891a9f0364ba24c461b55e2d5eaa63c1fa4d01f4d722fc4eafecdb5888497f7b1a8f9fae87f523883c1bef7c6f40ca35d5f991efaa4c54f5f463459fa WHIRLPOOL e749767e1816d6dbae0cb14b0e8a64d7ebe664cf2d79b1cbc2741aff0e20cfb8304fc68b20feb8c7532345711d1de8ce58fbbbcfbb2be50760f1912ad1596e22
 EBUILD netbeans-websvccommon-9999_p20151001.ebuild 2721 SHA256 d9ac82f799c5e4846187b6eafc244d07065c2dc90ed1d291a75878f13b389dc8 SHA512 c6306a45f10908f3d1858ac840ae9a8b6f68928a0a048213915772516c7a321061a48bf6dbea85e51cc03f91082aa6c381a339356df0d8325fe1d1ece56e5294 WHIRLPOOL 5f0921b9e5e07014ca30bfb5acb988d6c44517436fb8e16977a446eccd203605e7caaa79fe9484caffcebe512a4ecac1c261b238324a0c2404829cc48e94bb97
+EBUILD netbeans-websvccommon-9999_p20151002.ebuild 2721 SHA256 5fd1f31664e98cc5083e865ec1b21c5901970dd393b1cad78e854f6edc6bc523 SHA512 36b92cbd7cfb19bdbdbcfd102e83608000c32c241e32e30bebbbce639c0edc145c3d22c0a91682a0401fcae5def48f89dd58fab049b057cb144f5e050c14999e WHIRLPOOL df9eb78699ef7b80661600e6afb4a705b7673b74289468ebaf18880453bcbb1492f322b974670ac726695aa785eb9b3b5582d519a771f0cafedff1a4f42632ba
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20151002.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20151002.ebuild
new file mode 100644
index 0000000..70ffc1f
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20151002.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-10-02_00-02-28/zip/netbeans-trunk-nightly-201510020002-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 24caacd..ae82690 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -20,6 +20,7 @@ DIST netbeans-trunk-nightly-201509240002-src.zip 209224757 SHA256 ef684ac017deb2
 DIST netbeans-trunk-nightly-201509250002-src.zip 209232289 SHA256 c7dbf49adf27c29644eec92a7701f9afbc140bc346d2395a5108688459ac75a1 SHA512 117334fb22e613d8313c12053e0ea1101986d94bd1397be47573a2a84b3ca17f7ddafa4e805e379e06cf4db25aefdb8adbdc2533b476daccc4e27f1d9d85d0e0 WHIRLPOOL 76cd3220dd077fc2d3d66fa5f317ec83172ad427362f04c0ce56e6e92339306c254e4e0958f8accaf70776a13364d25ccfe87181013324caaf209595bda2c149
 DIST netbeans-trunk-nightly-201509290002-src.zip 208668668 SHA256 d16969e9381db349d7c8c62cf3b2d07552f19d4cb30eaf7334152b8544117002 SHA512 6847a9ccf9f20d1a9e0785f2cd2c57e4a6b5f35c8ffc07193c6fe7deb65a11b9ac25ef92b44bc9b8781a9ab75b492f38c7d85f271732b8acefcbfae7fb22624d WHIRLPOOL 1de1815f7cb5c73e330b11c3eef31495de0418d37918748b4367fbaf2288f3f8427d4ba6985468a8dac7e30b831de10d2e1846dde96cfdfbf9e36d994d57a3f9
 DIST netbeans-trunk-nightly-201510010328-src.zip 208670089 SHA256 5dd1fbe2d0b45e47ef41a2ac76242986f5b20a93416bbe5df49ff43a27aa5208 SHA512 dca72b094b18d1606cd4eda641c266654cd09fb14ae0cf8bfde7894b09c882a14b56f6f3e5237ba9af88b437734b60e3b8e32399c4a18911a4d1bdbc428274a6 WHIRLPOOL 98bb0105533a0c990c7523090d5cfbeca1996f1bf30725ddf080cce5af3d376a9eee328b3624c23b73edfaadbdf190159f2b6e9e9ba18cffc192c52316e59de3
+DIST netbeans-trunk-nightly-201510020002-src.zip 208671327 SHA256 41bb5622f6f316be2432a38d25bbe58a922b02ebc3ff73cf6240c43fe37904fe SHA512 1054823afdb69e7dd591c785f8315508df20ea275b4ee191340e8ae2e308147247649ac0e374e639d2eec836782a810310345bf287608f74e98273d5e579c922 WHIRLPOOL 78264b1b587dda9d8c0088a64523a7e4e02a40fd43dd2ffe2fa3899c12bceaf49e2d58233f54d48dcc650897c3da5d63d118d182ed0f2270351f1ea7f0bd6074
 EBUILD netbeans-8.0.2.ebuild 7167 SHA256 80e31382a0ceb680c2a055dc5c78c1dce8edf32c50bbae6a1c14a2c568492519 SHA512 0ab466ca247ec953896ef0ab3b01b43ffea3a9f37e9bcdacecfc0476226d45cef35e4ddf27f2b85628d9512ed304e6cc6cfe963a5e547217d08cad400eefc4b9 WHIRLPOOL d09668e669f4f8d7987ab02cf26104fc6e54ba29b8b497fe0013cc8816a2d7560c99e6e1b02db77ead872d5240b84c09e3fabbc3465587d1d1ca7d6fcae114c1
 EBUILD netbeans-9999_p20150901.ebuild 7210 SHA256 aa601ee01f6fb1485234688933becffe18ee2d30af5045951a2bffc2f24f849a SHA512 98f00da7d90c3425cd718c34d65aa46980a9c10f50dd34a01a1776d1a1488e92b9e657210f61e45724b6c9358a36a44a2fbf8ac5b7012012d163c6c91f7ec421 WHIRLPOOL 008820f5bbb9077bc739629262c1e24bbece9c55b50c270c76c3900424ea77e0dca4a33bdf32535b506d61dacd951f65d669485321837dd83234404ad9143594
 EBUILD netbeans-9999_p20150903.ebuild 7210 SHA256 73a22280e3cd8d717bb224ba8c243faa59493011739522863e3e93b83def156d SHA512 87214a421b60dbe51dd45b0124ba463585096fe7f7820fa48e0cbf7d55b3d3080645ecd9dbd4679d7968a9b90d1ed60b88bbc3e50109a00e3c2a7ea8192ef0b2 WHIRLPOOL b820124da7676168df3529566db7b2ca095972189a1ba848da238caae7a93947c0c664af310edc722146d2daaa9fdab9bbcc5b3477207664a5193c003f289c09
@@ -38,4 +39,5 @@ EBUILD netbeans-9999_p20150924.ebuild 7210 SHA256 6cd02bda976b99813c50c9cab0a692
 EBUILD netbeans-9999_p20150925.ebuild 7210 SHA256 024e11a350dda40eab393cc84e6a9b0bc793f74dde30f8a718c932121c916be8 SHA512 60809e6b64e957542b30c73c5ceb7d30c805a5667ba9dd06c880fa97f105d1218ecdc3c7132c9d98d9fb9a88b689fff54d815e513d0a28e7086ed216db1b44c5 WHIRLPOOL 1cfa6f83cd7bc654d9c3cab64db148dbe88c330dd152331b9285d99236dafcef3938543905c6700f11e2c3dff00a36bb8bcc6a5aa47df782c513e5ce3c0e7d67
 EBUILD netbeans-9999_p20150929.ebuild 7210 SHA256 102d914cac1aef4bb6da019493079610246f7b4414012277a68123bfe8147bde SHA512 b1603770130c0de5689f44e9539571142a8bc36546626996d59263f6ea5baad37a15ff2da3b5db1a11bad48ad3780bd92593b4e4fcf82b790762441ee70c39e2 WHIRLPOOL 3bf996c82f96a0b1ab99790de6e6fe57bd9967c6f497bbb214f82f271c73af60eea2cb5a664a263fd6e3ca7e6c27100e4948eadc484822dbce2c3f491983734b
 EBUILD netbeans-9999_p20151001.ebuild 7210 SHA256 def45859122eef44a348c1c45f165a664bf7490d2b86f0a3eedb856f59aae4d2 SHA512 5bf3d55dd64c75d567bbce039c729d924964f3ea8daf2b39bbd370f2c1f830bf8ce571281caa22654a43a39dc2f909736bece02b0c58ad020d3fee7d650fdd80 WHIRLPOOL 4c134a94ecb6dd5a35944ff0108135f4e0795bbb792bb6617b29db3a3348a41c001e28b2321bd0b69207e10e69942e18826213fce7f50cd0d526ae8cdf1ba8fa
+EBUILD netbeans-9999_p20151002.ebuild 7210 SHA256 c35dc91ef0201c2f45dbc2478914a7e4c89a7008fbee4a64d21595c26546266d SHA512 7f00d3e89966b3e713f9a888f5de7d5a1312e56079e18d5e5a9cf6eaf31ec52455f3d3fe0075e0df719f1419aeba0d9d39d906854dda5c22c0f4319206cce55a WHIRLPOOL 3c69bd92e9031c4e1fd32ce6e65538693a3493ca3c43571c6b3d8ca8519337409bdab4388054f30c15def817b7b02375b6b3fa095c9f943d81b54e2b9f7a6a52
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

diff --git a/dev-util/netbeans/netbeans-9999_p20151002.ebuild b/dev-util/netbeans/netbeans-9999_p20151002.ebuild
new file mode 100644
index 0000000..f1ce469
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20151002.ebuild
@@ -0,0 +1,264 @@
+# 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-10-02_00-02-28/zip/netbeans-trunk-nightly-201510020002-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_bg? ( ${ALL_URLS} )
+	linguas_ca? ( ${ALL_URLS} )
+	linguas_cs? ( ${ALL_URLS} )
+	linguas_de? ( ${ALL_URLS} )
+	linguas_el? ( ${ALL_URLS} )
+	linguas_es? ( ${ALL_URLS} )
+	linguas_fr? ( ${ALL_URLS} )
+	linguas_gl? ( ${ALL_URLS} )
+	linguas_hi_IN? ( ${ALL_URLS} )
+	linguas_id? ( ${ALL_URLS} )
+	linguas_it? ( ${ALL_URLS} )
+	linguas_ja? ( ${ALL_URLS} )
+	linguas_ko? ( ${ALL_URLS} )
+	linguas_lt? ( ${ALL_URLS} )
+	linguas_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_tl? ( ${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_bg
+	linguas_ca
+	linguas_cs
+	linguas_de
+	linguas_el
+	linguas_es
+	linguas_fr
+	linguas_gl
+	linguas_hi_IN
+	linguas_id
+	linguas_it
+	linguas_ja
+	linguas_ko
+	linguas_lt
+	linguas_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_tl
+	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}" = "gl" ]] ; then
+			lang="gl_ES"
+		elif [[ "${lang}" = "id" ]] ; then
+			lang="in_ID"
+		elif [[ "${lang}" = "nl" ]] ; then
+			lang="nl_BE,nl_NL"
+		elif [[ "${lang}" = "tl" ]] ; then
+			lang="fil_PH"
+		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_gl ; then
+		einfo
+		einfo "You selected Galician locale which has locale code gl:ES in Netbeans."
+	fi
+
+	if use linguas_id ; then
+		einfo
+		einfo "You selected Indonesian locale which has locale code in:ID in Netbeans."
+	fi
+
+	if use linguas_nl ; then
+		einfo
+		einfo "You selected Dutch locale so you can choose either nl:BE or nl:NL variant."
+	fi
+
+	if use linguas_tl ; then
+		einfo
+		einfo "You selected Tagalog locale which has for Filipino locale code fil:PH in Netbeans."
+	fi
+}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-dlight/, dev-java/netbeans-webcommon/, ...
@ 2016-09-11 10:52 Miroslav Šulc
  0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2016-09-11 10:52 UTC (permalink / raw
  To: gentoo-commits

commit:     9749993f9d8750d5c800a8efac2555310b70dbee
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 11 10:52:17 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Sep 11 10:52:17 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=9749993f

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.3.0

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index b6f8a67..2423598 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201609070002-src.zip 217397241 SHA256 3bceadb91b07bc
 DIST netbeans-trunk-nightly-201609080002-src.zip 217783700 SHA256 ab0b7304f146613a482d4fd73f09610061fb619211e399d251e16f584473b8de SHA512 da4540bf465bcb052ff0a8edd21918927b1d20749b819d7de2aa175eb2d1101805f0f9ce0e4ecefe7e90d36372d803fb23c5ea5e34bbecfcadfa29c443af1657 WHIRLPOOL c65c0fb15e93b30f8afc0e1a3baef98335797cde9b2dc1519a8062c9fdab14fec325d556b103928ec0576b3abd1340215293e800a782cb5f346dfb46625071c1
 DIST netbeans-trunk-nightly-201609090002-src.zip 217786172 SHA256 35a6f3cc108ed4505b5a8a8c075a1a3ebed0c31b829bcef321f9226dbb5b7504 SHA512 404a03d4a4e6da24591c388c9adb91d529c491e2f07880a027dc35e572859504aa5ed3532360375f921ec9411fc19169f714b6aee51fec3efccd2d6c43a97c82 WHIRLPOOL de26751daf9eb39713bc674fd0250e98fc4ce0714a64cdaba2ab0d04b78d4b4207165f1b11c30083fa79bc2b7073f0c9531b07917317b5b057b2d6e63fb959df
 DIST netbeans-trunk-nightly-201609100002-src.zip 217975100 SHA256 aed7feef3dd16e20fd04c6372f799b8c8ff728986899f89a70b21c81b5f47286 SHA512 226e2ec1c3283e088dfe278e607d65346b95150a698d6d5efef4be9d12fe23d7c3c0a8253994d6ef15c292c56579929624f7f12822a8c4689298b6132af74640 WHIRLPOOL 69d4aded277251d09fb671300dd4694ae54b59bc9e1fa66a492ca6ea427c5a219acaa88a64f2adbac07b5d6d2d1a53c6c284ae4c10c9af8eb3a18be072875982
+DIST netbeans-trunk-nightly-201609110002-src.zip 217975022 SHA256 834a359c4c5118302c97a0153372b559714be528e6f44f5655785a61dbc5d75a SHA512 b4921684195901b073df590ae0ec688965af5dd5bccad68ed7aa9d6a4e9fb0e9658115a17119da12c7d93edea457a7bcf921415c501d4df8e6db6b704c24aaa8 WHIRLPOOL 661191465cf6f92a925a07549c48b7d0c7acbad6a80235d4a73dbf1b3bce5f2eef5f43412df24a4c5933e648aeee11aa738fb5e8479d4d3c38bcd0174902abf6
 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_p20160809.ebuild 3384 SHA256 9d7f86575797bdab5e9ef47550df786fc94f8582cb24cdb15015d679b21a1623 SHA512 05d842a5f9bacb4717c1c1e7bfc46d3a38e376b4d82c4454f301f3a44a127a57c6194dc39e7698b2e8059c27fca3c74b9ed4fde25c4e9a6f94192247094d4f68 WHIRLPOOL 8e6e9545fb98ea88baf8ce6296216ddd1a1bb1f2bd6310e7bceb81c94551a64574e930fa985a4f4baa1dc774570b2a9f30ed521c3d6ab626733fab474f9007c1
@@ -61,4 +62,5 @@ EBUILD netbeans-apisupport-9999_p20160907.ebuild 3384 SHA256 b9c38b1f824155f31b9
 EBUILD netbeans-apisupport-9999_p20160908.ebuild 3384 SHA256 3ea479bd1bd943317d600bc65c2a16432176f625ac5932b2f757616aa8500bd0 SHA512 ec9387c02f0eec93747b2cf1cfd631084c268f9e08101fb2fd894be826f344a4670d2842775c0908e7dde8bb288b2c48adac38d24d7147bd746e603d180a5092 WHIRLPOOL 5b61ee909b0f74b704b909ea8463359fac62d09ffc8abf130953454645d3dcae527c83db490109e52dfefe3c1665912b8fee8ea9f5bf90ac4158b8060e134094
 EBUILD netbeans-apisupport-9999_p20160909.ebuild 3384 SHA256 f2f6d532bf90048b002538e5ee38f1a8b39b32ab556cb58659ac06c925e65770 SHA512 8041d5fe3f8d842d8cf00799177c2fd9bef3a80deb853a046f2c374f17189491714bb43ac5c1e10ce8d44c56ad6bf2e2f5808e54c7d994fc450cec542cf7e16f WHIRLPOOL 4a836bec78098fb4db5b6522fe254153116ee0f62d0491ee034903683f79b258470025fb9b96330b9457d984a92f18c52e332b7c35b7e5f43de93a8a23c347e4
 EBUILD netbeans-apisupport-9999_p20160910.ebuild 3384 SHA256 ec5126fbadd20d35b5d936964d724a4babc7758f5eb24f8ee3faffef0f063102 SHA512 e966c1ae14cc1870e455787435a579e1e3ebc6091585997bb1d805e07133fbc352fb6506f8d75810a56c9d51c6683b3340d7df6b9d895cee5b5c52454fecb7e5 WHIRLPOOL e5db56281bbbbdd4a73ca2da25d0b5c9acf71a38a15080354a518d522566d92ed27a20488362cc0dd75d12090a4574dc0878015fc5456e674c86c57d789767d9
+EBUILD netbeans-apisupport-9999_p20160911.ebuild 3384 SHA256 51c0cc74033ab64a57bdba9d7d48cc23e4c9e28cdb08b5a4fe7189db6aa16239 SHA512 bddd96ed09828993fef8a754b0b63110956ff39ee1db83ac9ee370a92a2bbd0c3bcf62737a01616a9364a4209251c28aae89a7f5943e415701e15a19e26a9f59 WHIRLPOOL 2be55148b07f6bda2d9b9d9868038773d50e069d3c7adc2b7f551f74287f9c0609ca8e2954c0c3b784b1b27876645577393777fe518e7c140a94e9848c95f857
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160911.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160911.ebuild
new file mode 100644
index 0000000..c0ac627
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160911.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans API Support Cluster"
+HOMEPAGE="http://netbeans.org/projects/apisupport"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-09-11_00-02-33/zip/netbeans-trunk-nightly-201609110002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.apisupport -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r16-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/apisupport >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/apisupport$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/apisupport
+}

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index 0fcb6ca..fb43d45 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -11,6 +11,7 @@ DIST BB83D4F8047D608858154CB041054F5CAE35B903-cnd-rfs-1.0.zip 177647 SHA256 c92c
 DIST BC155E7BC6F6CC456E726C11AF33CF2C1974E7F8-clank_0.3.6.zip 11604028 SHA256 9b6acb91170db994088afdbd065cf371b3823c51ded7e51904f5940abbbbba5b SHA512 8c9d3eda576a39976f1b351ab8203feb5daeacf7599fd365032b4e6a3ca506340d12fcdac82813f002e1b88242feb8baac6c5b09384b78df663efe76fcc90636 WHIRLPOOL d6843771f3fde24b90c905ef1a17bb2dbe4e4960fb6a79b8629afc6e5c71c7724d14d908d8016f0b51e7db395b2ff4254fd62415152b64e3790c1a97b6d335a2
 DIST BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip 31891 SHA256 dd9105ad309b56d22ef08573ec48a5f21baa2c50f8606df9c7b6245abd9dbe72 SHA512 288229a85536a45fbae6ba5a4dc085fa2053264259f14833cd435f64191a4b2f4b93c3e9981589087ec293afbb0fc76e97d2b5312a196e3b3fed11a605ab650a WHIRLPOOL 69379d331a68e1c4eb15aa8b1ff5256c9b98d9fad4688f2d306841973b151fd22ddbca25c5388af39b487b8810a2e521ffefbbb9775cf02271626179c3810c04
 DIST C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip 92177 SHA256 71e6d46d9c7e624bc83dbfa4edde20bfdcb47ae76dc2b19dd553d23f22b454e7 SHA512 64b15aa898a45c1dce0d9c58ec4ef8c3dc1a32e1213543d98002cbf5419d67b3caf4357c8a252e36951197f3edd70e34a226c989e5479ce3b2d1405783d3d530 WHIRLPOOL 675db7f81ecadcecfe52f18cf8bd465867c1dac12f818717248da9a7d071d45adeb3c6af2e6ac1863bb5ccca36ae9383722d2361c28af52e51e5f2ac34736e89
+DIST D43D5D67A1D7DC1E62ABA7C01F90BEFFD8A74A65-clank_0.3.6.zip 11781480 SHA256 8b331d6efd19c29163d9d884a4de19f35a7133288c5993198011b7a993c79af7 SHA512 e5498fc96f0f2b3dcb8b6980520efc2ddedbe6fa61076b9d307e7721cf475d0b238592a599e5975fbe10b44e1e0db4af57b58d20e8257097891220f05155b17b WHIRLPOOL 885c0478851fe7072b0a7ca0b7e025d25c104a7c142ee8f16fb468f48537de13fe34a3e0c0507f45a865fd4e18c3ec8ee32a4c0f351bdfdd0c8a04150e1c4016
 DIST E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip 179656 SHA256 33d046408ce7a59158c550c672de03dba87485e0e83ca2e408b704e7a2a60591 SHA512 748979d810751d570087dc60bc02cb5969c6f713cba87d32004c505b9a92150d518c6dcf66caca61841ca8f28c16cf3cd2a5a40b370f5dec5c9482b57bd051d8 WHIRLPOOL 12cc51c73f8511b84d4860ed8c2545e96c72477755d6027a086537187ac3c16322305a0158480498968a4f71a72ff6513d91d9f7d37ab2c38c8293dceced0da6
 DIST netbeans-8.0.2-201411181905-src.zip 196585461 SHA256 581f80d3c2e8d87a0f007dd3f358ce0534a0bb2e4b3312cd6c8c7263713bc530 SHA512 9533de5b3c45e4a5b025213dd5602344e16d024e0cdb013f207ac3c7a9d8e63da19279f97910ad136777d75780c620224953f2974070d5c9833d1d6ef3fd427c WHIRLPOOL 2e45e83309743df167ddd1d58068848166d01ef6d9eec99ddf72b9ba7664cb182a04d6420ab03a9270842b3cd9a16a161c1eebb66953ef09158d8d521fb96516
 DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e7763fd93b4acef04ff0365e18f178706ea83bb SHA512 b61adf29bcb139207241c68513724f352420078583ca5e6d7856a4dd335ad36b7d05311eb6e14ff1c568aaf090de4ca083c32f6db1dec0b6f50d66a388bbedf7 WHIRLPOOL fb4d63329aa450a1b387fa45b59fa3c18d1a1ca8ecf9443111a3056d409a6d928d15dae275e9c564558f4b2abd54cc0f8db2df653ac432d9f58f8ef4dd747dff
@@ -45,6 +46,7 @@ DIST netbeans-trunk-nightly-201609070002-src.zip 217397241 SHA256 3bceadb91b07bc
 DIST netbeans-trunk-nightly-201609080002-src.zip 217783700 SHA256 ab0b7304f146613a482d4fd73f09610061fb619211e399d251e16f584473b8de SHA512 da4540bf465bcb052ff0a8edd21918927b1d20749b819d7de2aa175eb2d1101805f0f9ce0e4ecefe7e90d36372d803fb23c5ea5e34bbecfcadfa29c443af1657 WHIRLPOOL c65c0fb15e93b30f8afc0e1a3baef98335797cde9b2dc1519a8062c9fdab14fec325d556b103928ec0576b3abd1340215293e800a782cb5f346dfb46625071c1
 DIST netbeans-trunk-nightly-201609090002-src.zip 217786172 SHA256 35a6f3cc108ed4505b5a8a8c075a1a3ebed0c31b829bcef321f9226dbb5b7504 SHA512 404a03d4a4e6da24591c388c9adb91d529c491e2f07880a027dc35e572859504aa5ed3532360375f921ec9411fc19169f714b6aee51fec3efccd2d6c43a97c82 WHIRLPOOL de26751daf9eb39713bc674fd0250e98fc4ce0714a64cdaba2ab0d04b78d4b4207165f1b11c30083fa79bc2b7073f0c9531b07917317b5b057b2d6e63fb959df
 DIST netbeans-trunk-nightly-201609100002-src.zip 217975100 SHA256 aed7feef3dd16e20fd04c6372f799b8c8ff728986899f89a70b21c81b5f47286 SHA512 226e2ec1c3283e088dfe278e607d65346b95150a698d6d5efef4be9d12fe23d7c3c0a8253994d6ef15c292c56579929624f7f12822a8c4689298b6132af74640 WHIRLPOOL 69d4aded277251d09fb671300dd4694ae54b59bc9e1fa66a492ca6ea427c5a219acaa88a64f2adbac07b5d6d2d1a53c6c284ae4c10c9af8eb3a18be072875982
+DIST netbeans-trunk-nightly-201609110002-src.zip 217975022 SHA256 834a359c4c5118302c97a0153372b559714be528e6f44f5655785a61dbc5d75a SHA512 b4921684195901b073df590ae0ec688965af5dd5bccad68ed7aa9d6a4e9fb0e9658115a17119da12c7d93edea457a7bcf921415c501d4df8e6db6b704c24aaa8 WHIRLPOOL 661191465cf6f92a925a07549c48b7d0c7acbad6a80235d4a73dbf1b3bce5f2eef5f43412df24a4c5933e648aeee11aa738fb5e8479d4d3c38bcd0174902abf6
 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_p20160809.ebuild 4790 SHA256 f683f40acf8c74e290d7db666eff24b79c81393e5d5513e545a2a3d3c15219f9 SHA512 07da221c809e2e0adfec30a13b88274b1b799deeb28bc6fb299f8b634707c0f37eeb71537b58a2183d1ed17b1171278e0b45476bc5a3ba8e05f694aed94af3be WHIRLPOOL fbd1464a83ac991c618206141a13a3edd1af130146f9dabd52d0e73dd275f54b5f01011abd1560cba2565a9ebb88c05b2e4c699ac177cbcc52a9d2f349917ec4
@@ -75,4 +77,5 @@ EBUILD netbeans-cnd-9999_p20160907.ebuild 4790 SHA256 32088ffd9e93afcd59d035c01b
 EBUILD netbeans-cnd-9999_p20160908.ebuild 4790 SHA256 99f043e2808bf5a6aed9f64da8741e5fb925bf778430f20a0e584fc65137866a SHA512 3d0ac7a5476655b9848b2126f62c8226f98d02ca6a4760b94c7294f5ba7886c8119c0c7fc165b0a07189675512c9888c7ebbec1cdb7fff354853914649c7c2df WHIRLPOOL eb56e0e2e78be780c1eef7076baf20e72646e073b1a79ac83a39e7109667d5c5840db3a10103ffaa94fdbc2eb8b2c12e4732f7be6890130716b23d0510deb09f
 EBUILD netbeans-cnd-9999_p20160909.ebuild 4790 SHA256 86e9a2f833c50be2b0cc2843dd5ab5d0f357fa97e0d9d0278d04feacdbd71ac3 SHA512 7c5832b65543c6cd0d792413bb48b54db00e8f529f0f71900ad69e87a7783f1423e1b7dcfb8bc1922788297c1764ce68e89c352561362b923bfdd5b84ce06d08 WHIRLPOOL c97854530015c82886946f99bf89cd08fac6ed84a2ec1ea31bc05a0f1cc00f06178f363f9ad149c946596c6ea674b05fd58c9839f1b029424c3aba89376e8d36
 EBUILD netbeans-cnd-9999_p20160910.ebuild 4790 SHA256 6a481f7ff287444529ce334152201d63a1c8d9f7d0925007292415eab4b11900 SHA512 6f231749b64be38e48fe5bb8ff95d223698f7bf900b1d189f43fc3abf4d2f5ebf9a635b56ecf4a477b1ce421272a473511f3a762c122967c89e983cd71954de6 WHIRLPOOL b8ee16e45a583ea072ad336ab37f935a4299fdff8a4453792d025140de88387a635fc707edc03f53660455ce4f3913ca7e08c41d4cc9f521be9ff7285163a31f
+EBUILD netbeans-cnd-9999_p20160911.ebuild 4790 SHA256 29b824cd47e9ecdca72e385821d29031565418b4b408d5efe618bda0bc38192f SHA512 9efe507ac99695de5ec3d3158bd48bc6559c93a911482bd176d7f6c005d836b40da65e5fd942a2c0f7f5f165c5b751bcb8debebe35c733f1b6642f52c2116f43 WHIRLPOOL a8265f213ca5a1a704e6c1585ff88595e6dee280559d9d6fc74c8bb2620d0c0319dba62b148e1da6df7909e37126efb6f51797113396b526d210ef0a229a2b67
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160911.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160911.ebuild
new file mode 100644
index 0000000..3f04794
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160911.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans CND Cluster"
+HOMEPAGE="http://netbeans.org/projects/cnd"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-09-11_00-02-33/zip/netbeans-trunk-nightly-201609110002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar
+	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
+	http://hg.netbeans.org/binaries/D43D5D67A1D7DC1E62ABA7C01F90BEFFD8A74A65-clank_0.3.6.zip
+	http://hg.netbeans.org/binaries/43A82EB3CE61B9B0B1C60586C7D84729BD5BE3E0-cnd-build-trace-1.0.zip
+	http://hg.netbeans.org/binaries/E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip
+	http://hg.netbeans.org/binaries/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+# These files are for remote development and debugging
+QA_PREBUILT="usr/share/netbeans-cnd-${SLOT}/bin/*"
+
+CDEPEND="~dev-java/netbeans-dlight-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	>=dev-java/jna-3.4.0
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.cnd -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r16-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar libs.antlr3.devel/external/antlr-3.4.jar || die
+	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
+	ln -s "${DISTDIR}"/D43D5D67A1D7DC1E62ABA7C01F90BEFFD8A74A65-clank_0.3.6.zip libs.clank/external/clank_0.3.6.zip || die
+	ln -s "${DISTDIR}"/43A82EB3CE61B9B0B1C60586C7D84729BD5BE3E0-cnd-build-trace-1.0.zip cnd.discovery/external/cnd-build-trace-1.0.zip || die
+	ln -s "${DISTDIR}"/E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip cnd.remote/external/cnd-rfs-1.0.zip || die
+	ln -s "${DISTDIR}"/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip cnd.modelimpl/external/open-fortran-parser-0.7.1.2.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.jna/external jna jna.jar jna-4.2.2.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-dlight-${SLOT} dlight || die
+	cat /usr/share/netbeans-dlight-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.dlight.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/cnd >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/cnd$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	fperms 755 bin/dorun.sh
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/cnd
+}

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index b0db4b7..01ec349 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201609070002-src.zip 217397241 SHA256 3bceadb91b07bc
 DIST netbeans-trunk-nightly-201609080002-src.zip 217783700 SHA256 ab0b7304f146613a482d4fd73f09610061fb619211e399d251e16f584473b8de SHA512 da4540bf465bcb052ff0a8edd21918927b1d20749b819d7de2aa175eb2d1101805f0f9ce0e4ecefe7e90d36372d803fb23c5ea5e34bbecfcadfa29c443af1657 WHIRLPOOL c65c0fb15e93b30f8afc0e1a3baef98335797cde9b2dc1519a8062c9fdab14fec325d556b103928ec0576b3abd1340215293e800a782cb5f346dfb46625071c1
 DIST netbeans-trunk-nightly-201609090002-src.zip 217786172 SHA256 35a6f3cc108ed4505b5a8a8c075a1a3ebed0c31b829bcef321f9226dbb5b7504 SHA512 404a03d4a4e6da24591c388c9adb91d529c491e2f07880a027dc35e572859504aa5ed3532360375f921ec9411fc19169f714b6aee51fec3efccd2d6c43a97c82 WHIRLPOOL de26751daf9eb39713bc674fd0250e98fc4ce0714a64cdaba2ab0d04b78d4b4207165f1b11c30083fa79bc2b7073f0c9531b07917317b5b057b2d6e63fb959df
 DIST netbeans-trunk-nightly-201609100002-src.zip 217975100 SHA256 aed7feef3dd16e20fd04c6372f799b8c8ff728986899f89a70b21c81b5f47286 SHA512 226e2ec1c3283e088dfe278e607d65346b95150a698d6d5efef4be9d12fe23d7c3c0a8253994d6ef15c292c56579929624f7f12822a8c4689298b6132af74640 WHIRLPOOL 69d4aded277251d09fb671300dd4694ae54b59bc9e1fa66a492ca6ea427c5a219acaa88a64f2adbac07b5d6d2d1a53c6c284ae4c10c9af8eb3a18be072875982
+DIST netbeans-trunk-nightly-201609110002-src.zip 217975022 SHA256 834a359c4c5118302c97a0153372b559714be528e6f44f5655785a61dbc5d75a SHA512 b4921684195901b073df590ae0ec688965af5dd5bccad68ed7aa9d6a4e9fb0e9658115a17119da12c7d93edea457a7bcf921415c501d4df8e6db6b704c24aaa8 WHIRLPOOL 661191465cf6f92a925a07549c48b7d0c7acbad6a80235d4a73dbf1b3bce5f2eef5f43412df24a4c5933e648aeee11aa738fb5e8479d4d3c38bcd0174902abf6
 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_p20160809.ebuild 2968 SHA256 7f9f63fc29ed563678c5ea9bccf0342b306105a878137a45c216a5005a33233a SHA512 93b53e272f359f7f137e88d7da9896f070a6719954395f6d2bd42c330c9242eeaf9d956739e241cf92d4ad50e9d7aff1c0e276d411cb65dd77e950abdc136993 WHIRLPOOL 574b4774580825c565d2028ca552c0b2700c4ac8aeef6fcf53a9fd8b16ed9f65cb5a2ad9d477a535492d6ea3caf151a24ba80b59a82fc9197c9b086382170c7d
@@ -65,4 +66,5 @@ EBUILD netbeans-dlight-9999_p20160907.ebuild 2968 SHA256 4a605bf1232703ec2588a8d
 EBUILD netbeans-dlight-9999_p20160908.ebuild 2968 SHA256 3ef08c332242b3c55da86d1742acdd388c35eec94493f1879b110e20a620648a SHA512 b1e98a86c60e0ef58a1a8e2323bfddf529a474d0abca2b0f5ee0537b6883c7f47d65eb3e33c27a8816655a4dac2451cc51d9e61c3c072869b2e0c96fbfd6c9d2 WHIRLPOOL a5f723a53e10218cfc7527fbe9e2ed38190b5a361ede169cca50ce2b23f20a0d21d1c4e4677808a69de895d36523fbb7749f3a7c872f952df04ffea19c5adf24
 EBUILD netbeans-dlight-9999_p20160909.ebuild 2968 SHA256 eeb455cef6b0e685d680060c513ee1e24fafe4b3dd4e323a4d20844b8ce6a913 SHA512 f081d6311780959487a6ccf7a39f494fbaa2ee691c470496b13a2319be7acce7ec245894ec316d2f21c06cf266c1582f055070cef699e4f32ff71384fd01d9ae WHIRLPOOL ca29f40595f3606127652eaf8b4b370ba863b2b6ca8c6e786b7f7002a3efb73495850e0ba2ce186f2ca23e938d967354dee096b1230219fbd46cd5a9f2679a54
 EBUILD netbeans-dlight-9999_p20160910.ebuild 2968 SHA256 81c9e4faab7548b797a65444480bb1cc6a80e72f1308a2523b8225da72b8485e SHA512 0bf5b1f5ea6003e27c844f10b6572a0529b28f72fd435549b15604b03aa2eefeaed91969f68bd70214291b4c46280efb53366231f3ad871ce3e6e30a43a60dc8 WHIRLPOOL 5b77b934eef295c62c6cd38b280bb3d0152d2eb3a5a7464625ccf13fbf1547b41cb15d882cd411668f2fc920540925d7af9c6a870a544a91d88c2757aa6411eb
+EBUILD netbeans-dlight-9999_p20160911.ebuild 2968 SHA256 4532a768a966367c21780c75c5835e56a26ab26526487ed2c533b5f6df712140 SHA512 037663f548cc18036870d94f8b476075f33254a03414bff6dc2c35495259bd47517ca2f3735bca367cb2c137ea0bc0894ef47a80cbc86cd0743148c9efa82433 WHIRLPOOL 9d0f7b189be7b926cafbb0de2130b69a90581903a2a6615d8712c725c0602434834269b962361b63b6c223e715254a17cd9849b7cf6ed8e15ac8a291f6e2413d
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160911.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160911.ebuild
new file mode 100644
index 0000000..74cbc25
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160911.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans D-Light Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-09-11_00-02-33/zip/netbeans-trunk-nightly-201609110002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/C9EE1ACA53AA71183590274D658ABD0A6AD6B2BE-fs_server-1.0.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.dlight -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r16-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/C9EE1ACA53AA71183590274D658ABD0A6AD6B2BE-fs_server-1.0.zip dlight.remote.impl/external/fs_server-1.0.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/dlight >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/dlight$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/dlight
+}

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 357dfc9..7cbf587 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -63,6 +63,7 @@ DIST netbeans-trunk-nightly-201609070002-src.zip 217397241 SHA256 3bceadb91b07bc
 DIST netbeans-trunk-nightly-201609080002-src.zip 217783700 SHA256 ab0b7304f146613a482d4fd73f09610061fb619211e399d251e16f584473b8de SHA512 da4540bf465bcb052ff0a8edd21918927b1d20749b819d7de2aa175eb2d1101805f0f9ce0e4ecefe7e90d36372d803fb23c5ea5e34bbecfcadfa29c443af1657 WHIRLPOOL c65c0fb15e93b30f8afc0e1a3baef98335797cde9b2dc1519a8062c9fdab14fec325d556b103928ec0576b3abd1340215293e800a782cb5f346dfb46625071c1
 DIST netbeans-trunk-nightly-201609090002-src.zip 217786172 SHA256 35a6f3cc108ed4505b5a8a8c075a1a3ebed0c31b829bcef321f9226dbb5b7504 SHA512 404a03d4a4e6da24591c388c9adb91d529c491e2f07880a027dc35e572859504aa5ed3532360375f921ec9411fc19169f714b6aee51fec3efccd2d6c43a97c82 WHIRLPOOL de26751daf9eb39713bc674fd0250e98fc4ce0714a64cdaba2ab0d04b78d4b4207165f1b11c30083fa79bc2b7073f0c9531b07917317b5b057b2d6e63fb959df
 DIST netbeans-trunk-nightly-201609100002-src.zip 217975100 SHA256 aed7feef3dd16e20fd04c6372f799b8c8ff728986899f89a70b21c81b5f47286 SHA512 226e2ec1c3283e088dfe278e607d65346b95150a698d6d5efef4be9d12fe23d7c3c0a8253994d6ef15c292c56579929624f7f12822a8c4689298b6132af74640 WHIRLPOOL 69d4aded277251d09fb671300dd4694ae54b59bc9e1fa66a492ca6ea427c5a219acaa88a64f2adbac07b5d6d2d1a53c6c284ae4c10c9af8eb3a18be072875982
+DIST netbeans-trunk-nightly-201609110002-src.zip 217975022 SHA256 834a359c4c5118302c97a0153372b559714be528e6f44f5655785a61dbc5d75a SHA512 b4921684195901b073df590ae0ec688965af5dd5bccad68ed7aa9d6a4e9fb0e9658115a17119da12c7d93edea457a7bcf921415c501d4df8e6db6b704c24aaa8 WHIRLPOOL 661191465cf6f92a925a07549c48b7d0c7acbad6a80235d4a73dbf1b3bce5f2eef5f43412df24a4c5933e648aeee11aa738fb5e8479d4d3c38bcd0174902abf6
 EBUILD netbeans-enterprise-8.0.2-r1.ebuild 15075 SHA256 41d376117ad1d8d59c8194debfd29dc42f5fd4de70aee12a2134ec143a604dda SHA512 4cd9de88e9a401cc0be88e3e2605abc411c47307818376b2bcc00f9ae570b21324f2bf00fd83e819bfa076da0fb07811fa1f0f9362a6cd0ee05b63221a199000 WHIRLPOOL 73f4518c14430fe7aa3614ebf1b11a06ba0e9bce7479af2770db3a114f149d575a16a655218f757ed416b5149228ac56dac700f5a8d5e034cc838bfa4092e636
 EBUILD netbeans-enterprise-8.1-r1.ebuild 15888 SHA256 d4c04ccfee01a46819020cb7cf8fd8297618f3c0431ae2d9dd7eec8131f988ab SHA512 6c7c39c378cb79d3f382cb80d07710a8c5233aaf0df8fb58889ee6aa6bde73624efa6aa49b43f84105685094a7aff89e4b6367ffd1fd113da27b42d50d07e983 WHIRLPOOL e678e2a6957e428c1b6e51469c0e7cc6a08da2c797f1575b6bb660a7f3281c00f071179de459e27c983304915b005baaf94ad4fae0a4c08162f218bf53b7d821
 EBUILD netbeans-enterprise-9999_p20160809.ebuild 15825 SHA256 3e6bfb1e8d2316047ac43e3ead0cbfbe2e0f320979ecc37fb58812d034b130ac SHA512 f24751a2f5dc8a6079cb2acb3bf627614c260a44ee33fd179243e18feaaac8460cd2faa5f2efefe43de41e12d22f647d7b6c4a4376f368d2676e637e2ae3221f WHIRLPOOL f523a7249d8634f4a8763d59c9d5635c13bea9ac3e73d8efdd912a6b55d2a06548f32e445f863fcf2b50c3ff3fa720783e8ec1cb2e094b35160c105668ec5aae
@@ -93,4 +94,5 @@ EBUILD netbeans-enterprise-9999_p20160907.ebuild 15825 SHA256 0fa63d9dc6697891f5
 EBUILD netbeans-enterprise-9999_p20160908.ebuild 15825 SHA256 26cecef971a3bde0bbabb54320dd12682aa5a9727ae60e1a1aa6ccbc8c15c870 SHA512 a6680a1e7aaf919f61f991adf03d2edea3c20e147d3386f29c3a83df1f659a94fa1c109d9c4c454ece80bf09ed65412b4650940a90e6863fb318022e35d56763 WHIRLPOOL 5761c298acae2818efd6a78289dfdbf7111c17eabc5dfd26f34dee1d66902293dc9740212e10f51ca2f301ddc853a73a634f303c13b1a0d6250789795f388579
 EBUILD netbeans-enterprise-9999_p20160909.ebuild 15825 SHA256 401969f905179d9556366962f93d67c8bae750cae3dcbed7de9842ff7680d149 SHA512 500edc75ebba0c8c607ac6fe73c94ed9cbcd9ceeb6150d29af078d36fddea322c23a0a6f3c2413d1ce113f9dff8987db644a9320e79aeed9edd82f92dccb3e08 WHIRLPOOL 73394ce457275430895a3b007cf03a398356dac138dd737882157172f9221512217f79dc0c913749aa38d96a707ede1e87dd7bfd2fc5ff780ff27d31fa1a4b51
 EBUILD netbeans-enterprise-9999_p20160910.ebuild 15825 SHA256 c6e99e0429090f8aa17586c55dde2d22603f363100c75800262a9d7ea2e824eb SHA512 07c07e5ee0ba738febce1497c8931b870b467a2f56f01da396be0e2ff76b7dc037d806f1df22f98e93ed69667c3cf70cd378f0bd0c6128d9f9363729d50b90a6 WHIRLPOOL 4b8e4f643e65900d7632c65aa30c2b12c87581146844f666c98b0838c100004641631dec5c7d88999ec1ac482c3ca0bad3397b4f6f3d0d7f800dd798d4fcf0f6
+EBUILD netbeans-enterprise-9999_p20160911.ebuild 15825 SHA256 cd97537a937e7a7523219766978d783f05b220d2c2e3304b03450609599d1fa9 SHA512 968a3a7f99a195b3a3a6fa64cd8fd53278461e86d6e280e022c6f8ee43ca3102c61fd2a7e19d20cd0bb60c9b4c2f2023b7185b777a6dbec456a0b7e91bc88244 WHIRLPOOL 5983bd06469becf64907f22f414e0568bab9a74dc62a5669f7c45ed1ef3152a5a87f487d6c498564bd2feaef7668eaa1ba08fb408735c010b4c7a23203cb1e9d
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 39aa8a8..0eab49c 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201609070002-src.zip 217397241 SHA256 3bceadb91b07bc
 DIST netbeans-trunk-nightly-201609080002-src.zip 217783700 SHA256 ab0b7304f146613a482d4fd73f09610061fb619211e399d251e16f584473b8de SHA512 da4540bf465bcb052ff0a8edd21918927b1d20749b819d7de2aa175eb2d1101805f0f9ce0e4ecefe7e90d36372d803fb23c5ea5e34bbecfcadfa29c443af1657 WHIRLPOOL c65c0fb15e93b30f8afc0e1a3baef98335797cde9b2dc1519a8062c9fdab14fec325d556b103928ec0576b3abd1340215293e800a782cb5f346dfb46625071c1
 DIST netbeans-trunk-nightly-201609090002-src.zip 217786172 SHA256 35a6f3cc108ed4505b5a8a8c075a1a3ebed0c31b829bcef321f9226dbb5b7504 SHA512 404a03d4a4e6da24591c388c9adb91d529c491e2f07880a027dc35e572859504aa5ed3532360375f921ec9411fc19169f714b6aee51fec3efccd2d6c43a97c82 WHIRLPOOL de26751daf9eb39713bc674fd0250e98fc4ce0714a64cdaba2ab0d04b78d4b4207165f1b11c30083fa79bc2b7073f0c9531b07917317b5b057b2d6e63fb959df
 DIST netbeans-trunk-nightly-201609100002-src.zip 217975100 SHA256 aed7feef3dd16e20fd04c6372f799b8c8ff728986899f89a70b21c81b5f47286 SHA512 226e2ec1c3283e088dfe278e607d65346b95150a698d6d5efef4be9d12fe23d7c3c0a8253994d6ef15c292c56579929624f7f12822a8c4689298b6132af74640 WHIRLPOOL 69d4aded277251d09fb671300dd4694ae54b59bc9e1fa66a492ca6ea427c5a219acaa88a64f2adbac07b5d6d2d1a53c6c284ae4c10c9af8eb3a18be072875982
+DIST netbeans-trunk-nightly-201609110002-src.zip 217975022 SHA256 834a359c4c5118302c97a0153372b559714be528e6f44f5655785a61dbc5d75a SHA512 b4921684195901b073df590ae0ec688965af5dd5bccad68ed7aa9d6a4e9fb0e9658115a17119da12c7d93edea457a7bcf921415c501d4df8e6db6b704c24aaa8 WHIRLPOOL 661191465cf6f92a925a07549c48b7d0c7acbad6a80235d4a73dbf1b3bce5f2eef5f43412df24a4c5933e648aeee11aa738fb5e8479d4d3c38bcd0174902abf6
 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_p20160809.ebuild 2913 SHA256 c92e2ff4b194e526bdf5308bf24e70a4027054634cdbc0c8b12445dd63a30e7a SHA512 d85fb971e7089c48f7d481458c0b274b6c69a552523aa1190546e5d1b9e44b91e229641d289b00126a299733bb9dcba74f70af0aad8170dd0a21f2a93e8599d9 WHIRLPOOL 0f8f39654e28a39fb16c6c00f0240eacf30a2c5ab2956344a0b4709b4fb0446727d4acb25f257fc2db7ab25979f2934efe2ebf1d723062816b02f476433f73c3
@@ -61,4 +62,5 @@ EBUILD netbeans-ergonomics-9999_p20160907.ebuild 2913 SHA256 3a2221f208dfe877377
 EBUILD netbeans-ergonomics-9999_p20160908.ebuild 2913 SHA256 86c84d1d0df41069b2b51873dd30961aa58723a85ac0491b8f507f4b6702535b SHA512 24f941e12f8f1dacc31704bc9c053b54a1c0c50e17f4694b846bd8ef5ad7ee693f65c4a4e2ac7eef4aab3444691f2766c1c8039a380cfacfdef8165ba39c4da9 WHIRLPOOL 15ad6cf115196dbb51c1ccbc4095a22fa2b6c19cf4eb9bad853d5bfdffab4df3ed491bdc2d5ee153c27f1031ca1e69813b2c84532532b5ef8bc71bd29c9ab320
 EBUILD netbeans-ergonomics-9999_p20160909.ebuild 2913 SHA256 124a1969f1c4666708c10143eed2bdacaff5e09f090932f2aadf7a7cac314a29 SHA512 cfa0f7bd6b0d65eb298e739859187dcd7ebbf2acf7cbbffdc651eb9be0532037e7b2e9447f9f431192fa7602a23a7c4838006f59156ae385215c4cb3f9126121 WHIRLPOOL 40d35a4d31715bd850bcb80668595c9755f791c6b56b8a661863df360e1417081081c77083e6a92263216056af717c63f817cf7bed5bf6784bba5cb8dc810e29
 EBUILD netbeans-ergonomics-9999_p20160910.ebuild 2913 SHA256 b8439ce0667540f28e79e59f335469165898f5677b02e09b799ef8d6efe07c58 SHA512 431b40d547c4b1bdf8f16bff97a7b80a58ddfb028ee21b13f42b8f3f1f9d14fa8a4b211e24c2f0f2f2d404cb3b7b6fd6aea214d02007a4300e50fea55b5458a5 WHIRLPOOL ede71e9f7ba63440accf835c7a3a18d7cbef62d4023d2831a8b74834abd57648750c0aa5b8e950f295a3f9f81d9acea0490b1c21a100ce206c9137b41b3f6cd5
+EBUILD netbeans-ergonomics-9999_p20160911.ebuild 2913 SHA256 1ae9ffe90dcb490534a6cb2eba98849cb3293bc55aca9350eca29bc0bd4d6abd SHA512 2abcc20351608a0bddc3fc8505043e1cc54d3a0a78b8f88e9499cad530e396436e214868d0d7acdaee966b92d20390423e5aa53f827646534720da094e7312ad WHIRLPOOL a6b8ece0094ba96c858a112c304bfd665d3fe37a0d0dd037d163d392a85e54582c9eca298b04b26d55d0c585b55230505e3643dfa2a9b2584071b9e6fff67f69
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160911.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160911.ebuild
new file mode 100644
index 0000000..a3dbc14
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160911.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Ergonomics Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-09-11_00-02-33/zip/netbeans-trunk-nightly-201609110002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-nb-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ergonomics -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r16-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-nb-${SLOT}/nb nb || die
+	cat /usr/share/netbeans-nb-${SLOT}/nb/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.nb.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/ergonomics >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/ergonomics$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ergonomics
+}

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index fee454a..becee11 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201609070002-src.zip 217397241 SHA256 3bceadb91b07bc
 DIST netbeans-trunk-nightly-201609080002-src.zip 217783700 SHA256 ab0b7304f146613a482d4fd73f09610061fb619211e399d251e16f584473b8de SHA512 da4540bf465bcb052ff0a8edd21918927b1d20749b819d7de2aa175eb2d1101805f0f9ce0e4ecefe7e90d36372d803fb23c5ea5e34bbecfcadfa29c443af1657 WHIRLPOOL c65c0fb15e93b30f8afc0e1a3baef98335797cde9b2dc1519a8062c9fdab14fec325d556b103928ec0576b3abd1340215293e800a782cb5f346dfb46625071c1
 DIST netbeans-trunk-nightly-201609090002-src.zip 217786172 SHA256 35a6f3cc108ed4505b5a8a8c075a1a3ebed0c31b829bcef321f9226dbb5b7504 SHA512 404a03d4a4e6da24591c388c9adb91d529c491e2f07880a027dc35e572859504aa5ed3532360375f921ec9411fc19169f714b6aee51fec3efccd2d6c43a97c82 WHIRLPOOL de26751daf9eb39713bc674fd0250e98fc4ce0714a64cdaba2ab0d04b78d4b4207165f1b11c30083fa79bc2b7073f0c9531b07917317b5b057b2d6e63fb959df
 DIST netbeans-trunk-nightly-201609100002-src.zip 217975100 SHA256 aed7feef3dd16e20fd04c6372f799b8c8ff728986899f89a70b21c81b5f47286 SHA512 226e2ec1c3283e088dfe278e607d65346b95150a698d6d5efef4be9d12fe23d7c3c0a8253994d6ef15c292c56579929624f7f12822a8c4689298b6132af74640 WHIRLPOOL 69d4aded277251d09fb671300dd4694ae54b59bc9e1fa66a492ca6ea427c5a219acaa88a64f2adbac07b5d6d2d1a53c6c284ae4c10c9af8eb3a18be072875982
+DIST netbeans-trunk-nightly-201609110002-src.zip 217975022 SHA256 834a359c4c5118302c97a0153372b559714be528e6f44f5655785a61dbc5d75a SHA512 b4921684195901b073df590ae0ec688965af5dd5bccad68ed7aa9d6a4e9fb0e9658115a17119da12c7d93edea457a7bcf921415c501d4df8e6db6b704c24aaa8 WHIRLPOOL 661191465cf6f92a925a07549c48b7d0c7acbad6a80235d4a73dbf1b3bce5f2eef5f43412df24a4c5933e648aeee11aa738fb5e8479d4d3c38bcd0174902abf6
 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_p20160809.ebuild 3377 SHA256 19f32c2ec58805a8ba4d2626cca16543af1b554eb709d9bb102ba068ad108d11 SHA512 78fcc396162fb6cb46638d9b09f83759859af91cd6bc4ff1210542ac98638a08118a6995fe05578cf5b03e8eeb18a0ddfac5ac4eb8f127a5b401aab2414c0cda WHIRLPOOL b63cb58123d05051f60fc751f682e334540f28e236816290ee890f22e46fba73a66422a289088caf8a81d04ff862d8a96c53f8cc7d36d737b81d1e3f1a9f3284
@@ -65,4 +66,5 @@ EBUILD netbeans-extide-9999_p20160907.ebuild 3377 SHA256 37390f031dc148d2d005592
 EBUILD netbeans-extide-9999_p20160908.ebuild 3377 SHA256 eac4724515cfad1cb8bda5e19c502394eb10181518c8a478ca9baa012827d45e SHA512 131bcd33bedddb2dc360adf4caae18b92d8daae5355bbd2e1cff274f23f195c56359d3bf40cf9c3d651d7f82a084a7d480dee37396df74a498d62695973e09c0 WHIRLPOOL 783dd47b763cd315a128e00fdc6663226ad875bfccfe02733635f2268a0f35bdb3a752138f100974cbe387db8d75f06efd92aab32df5e902c88a2a0afc8317be
 EBUILD netbeans-extide-9999_p20160909.ebuild 3377 SHA256 f63a33c2e435be0d0181699e7f5d05c0a1908a67d6477bd34bc5f1b9a000155a SHA512 1aec510a68dd1bf344f32bc9c093913b07529acbc1a2d6988b1c6e83d37b9907ae614b255d061c83fbadad6d685608192469bba486a9a15a63cc90946c3f84c5 WHIRLPOOL d6cf1dae64c7117ee58ead04950caaa4bec7ce53efe2480b59f6e55dbe37ddcdbb4555ecef90479d31d8b867bc5e3170bd787d94b9f8090941f7efb64e63f5d1
 EBUILD netbeans-extide-9999_p20160910.ebuild 3377 SHA256 9a0ebfc1cb63213a8e0b27ff4e2af2d13399f8cd55dd68a634900fac0aebba85 SHA512 49fcbd436b5096093ada35ea76daa032b36f083cb7c70fb06cbbda8c264626f6c0b2e3f88efa122b48d699cff990bf96a4aec54278703f20488448a4a6d6f4f7 WHIRLPOOL 8b9ed5dc41b6c5e2f2276ae4c5be1ff7b3a3f1bcc4aac283d30ee6098cbc0d6447d4d974992609cfca1ea4cfad0bcee3872a3ed6977aea3bb41fd9723e39c933
+EBUILD netbeans-extide-9999_p20160911.ebuild 3377 SHA256 362ef358d8ad1dafd6bdcd6d89e5c356fefbbd74ab9feccddcbe27573b32763e SHA512 437b0393c416ce785163fd272edb5d39eed1c99f3fc37860cd3047ca333a296a8fbe0d56cfd9191fbbf79ba449cd111b2661a786b5583b8240656077ccbcd978 WHIRLPOOL ab3bbb3d7acd85d64991e01d3db7b5d94542d1d32e4f84c74131e261e925911b98d23920c276e59203669834b5117efdde40b413bd72a848743fe0b50a4bec1f
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160911.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160911.ebuild
new file mode 100644
index 0000000..2f42679
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20160911.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans ExtIDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-09-11_00-02-33/zip/netbeans-trunk-nightly-201609110002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip
+	http://hg.netbeans.org/binaries/545E2B7AB1BD579CC76E3836055877982C5CD0C6-ant-misc-1.9.7.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	dev-java/javahelp:0
+	${CDEPEND}"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.extide -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r16-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip o.apache.tools.ant.module/external/ant-libs-1.9.7.zip || die
+	ln -s "${DISTDIR}"/545E2B7AB1BD579CC76E3836055877982C5CD0C6-ant-misc-1.9.7.zip o.apache.tools.ant.module/external/ant-misc-1.9.7.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	unset DISPLAY
+	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+	pushd nbbuild/netbeans/extide >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/extide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/extide
+}

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index e5f5184..1130a0b 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201609070002-src.zip 217397241 SHA256 3bceadb91b07bc
 DIST netbeans-trunk-nightly-201609080002-src.zip 217783700 SHA256 ab0b7304f146613a482d4fd73f09610061fb619211e399d251e16f584473b8de SHA512 da4540bf465bcb052ff0a8edd21918927b1d20749b819d7de2aa175eb2d1101805f0f9ce0e4ecefe7e90d36372d803fb23c5ea5e34bbecfcadfa29c443af1657 WHIRLPOOL c65c0fb15e93b30f8afc0e1a3baef98335797cde9b2dc1519a8062c9fdab14fec325d556b103928ec0576b3abd1340215293e800a782cb5f346dfb46625071c1
 DIST netbeans-trunk-nightly-201609090002-src.zip 217786172 SHA256 35a6f3cc108ed4505b5a8a8c075a1a3ebed0c31b829bcef321f9226dbb5b7504 SHA512 404a03d4a4e6da24591c388c9adb91d529c491e2f07880a027dc35e572859504aa5ed3532360375f921ec9411fc19169f714b6aee51fec3efccd2d6c43a97c82 WHIRLPOOL de26751daf9eb39713bc674fd0250e98fc4ce0714a64cdaba2ab0d04b78d4b4207165f1b11c30083fa79bc2b7073f0c9531b07917317b5b057b2d6e63fb959df
 DIST netbeans-trunk-nightly-201609100002-src.zip 217975100 SHA256 aed7feef3dd16e20fd04c6372f799b8c8ff728986899f89a70b21c81b5f47286 SHA512 226e2ec1c3283e088dfe278e607d65346b95150a698d6d5efef4be9d12fe23d7c3c0a8253994d6ef15c292c56579929624f7f12822a8c4689298b6132af74640 WHIRLPOOL 69d4aded277251d09fb671300dd4694ae54b59bc9e1fa66a492ca6ea427c5a219acaa88a64f2adbac07b5d6d2d1a53c6c284ae4c10c9af8eb3a18be072875982
+DIST netbeans-trunk-nightly-201609110002-src.zip 217975022 SHA256 834a359c4c5118302c97a0153372b559714be528e6f44f5655785a61dbc5d75a SHA512 b4921684195901b073df590ae0ec688965af5dd5bccad68ed7aa9d6a4e9fb0e9658115a17119da12c7d93edea457a7bcf921415c501d4df8e6db6b704c24aaa8 WHIRLPOOL 661191465cf6f92a925a07549c48b7d0c7acbad6a80235d4a73dbf1b3bce5f2eef5f43412df24a4c5933e648aeee11aa738fb5e8479d4d3c38bcd0174902abf6
 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_p20160809.ebuild 3416 SHA256 9cba6475ec6bf0d0049177f8402330f98368da55a51cba8617233facd39e0010 SHA512 ef530a4b6b5df55635e969f8b871f7672801aab549254e5f59f77aa070e0b4d9ef0e25026c7a0d0ec7ee1f37ab2574a5653c4de9d8b7c776067d3fe29a2f7133 WHIRLPOOL ddc4e71bdb1ad1f7f5e78401cc573ebb4c2bad0aeaff2cb4bad139e3765678acb2d9f47b6b4a28223347f218c0e55fb41edd8b3e7177543a524b9df8e4de9a53
@@ -63,4 +64,5 @@ EBUILD netbeans-groovy-9999_p20160907.ebuild 3416 SHA256 98dcf419c4abcfb84740b85
 EBUILD netbeans-groovy-9999_p20160908.ebuild 3416 SHA256 7f4272fb899c15d2b12b1008db561746aafc0a5a927678ff8a16c41d230e5000 SHA512 50915d29a262d792c026fc5d960e6dd039f330cbd90eae15adbe10bde61fd1cfc0121619f0458fbd059062b66fd16e10cfc9e56289b833524c8c652fbab774fb WHIRLPOOL 44c8d794a73131e6b8c0765521ca36f2d86aad13aad50c743cc7455e5eba63f4bb3d6d01b69674722108c3dcb4916546b3c29f611a26dcfc3aa596478a48c971
 EBUILD netbeans-groovy-9999_p20160909.ebuild 3416 SHA256 709c17c79677dee937b54d7e179988873ffb05f40c633e4e916735736a938400 SHA512 272546374585a4665a59a0458fbd57a3b9632a3c9b85a475bf8015a0aa2d968d147886a488b40cc5d6c9e44ce43b35b0245bbeb00cb8627f12e59c24bd9a7ae3 WHIRLPOOL cb7c29a349976653bffe2bc2a0946bbcf24c8fcbe14550b1c4ed34e590d46001456053aa584f719ae9d87064effb36e958ea7de116c07fc077db0ba0aee68b37
 EBUILD netbeans-groovy-9999_p20160910.ebuild 3416 SHA256 87ef2735d023db47e0637ae0c637013ca92d98a9ccb54d223cd184e9137e9fc7 SHA512 8c1ae81428bdf954b106a38196baae7a42ced4005fe0ed7e5effe63d9f8b55c479229af67e4f030128da4927688c04e42eb1296308f51785ce826351d6dea13e WHIRLPOOL ee9b93919212af24ecce6cbb47ed0b77f7ead5818fb81d7fd4a097387c721287e786bb7a2ef3dc15f4340ca945c1f1b640116fbc59918e27265c4d73056ef34e
+EBUILD netbeans-groovy-9999_p20160911.ebuild 3416 SHA256 e036722360f3924a344da0aa07f2c768cb2fee38c8db2a80d97f0d989b401eba SHA512 f38d19a5d643d27294d26bd58009c27199f702ad0626e7a2df2bf3cef59994934662597786aa38e29a4374e3ae159723edc0eb33224d528392d600b9a69287a0 WHIRLPOOL c66bda4aa394d5ba8c984ec0907c738d92d41838bace86feeca228f7451a3b3059e45a1445e0c6c0b56ad7e5aba56b1e405b1846f40a51070dcefddaefc19fc1
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160911.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160911.ebuild
new file mode 100644
index 0000000..7945925
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160911.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Groovy Cluster"
+HOMEPAGE="http://netbeans.org/projects/groovy"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-09-11_00-02-33/zip/netbeans-trunk-nightly-201609110002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/01730F61E9C9E59FD1B814371265334D7BE0B8D2-groovy-all-2.4.5.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.groovy -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r16-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/01730F61E9C9E59FD1B814371265334D7BE0B8D2-groovy-all-2.4.5.jar libs.groovy/external/groovy-all-2.4.5.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/groovy >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/groovy$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/groovy
+}

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 094a890..81f9e46 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201609070002-src.zip 217397241 SHA256 3bceadb91b07bc
 DIST netbeans-trunk-nightly-201609080002-src.zip 217783700 SHA256 ab0b7304f146613a482d4fd73f09610061fb619211e399d251e16f584473b8de SHA512 da4540bf465bcb052ff0a8edd21918927b1d20749b819d7de2aa175eb2d1101805f0f9ce0e4ecefe7e90d36372d803fb23c5ea5e34bbecfcadfa29c443af1657 WHIRLPOOL c65c0fb15e93b30f8afc0e1a3baef98335797cde9b2dc1519a8062c9fdab14fec325d556b103928ec0576b3abd1340215293e800a782cb5f346dfb46625071c1
 DIST netbeans-trunk-nightly-201609090002-src.zip 217786172 SHA256 35a6f3cc108ed4505b5a8a8c075a1a3ebed0c31b829bcef321f9226dbb5b7504 SHA512 404a03d4a4e6da24591c388c9adb91d529c491e2f07880a027dc35e572859504aa5ed3532360375f921ec9411fc19169f714b6aee51fec3efccd2d6c43a97c82 WHIRLPOOL de26751daf9eb39713bc674fd0250e98fc4ce0714a64cdaba2ab0d04b78d4b4207165f1b11c30083fa79bc2b7073f0c9531b07917317b5b057b2d6e63fb959df
 DIST netbeans-trunk-nightly-201609100002-src.zip 217975100 SHA256 aed7feef3dd16e20fd04c6372f799b8c8ff728986899f89a70b21c81b5f47286 SHA512 226e2ec1c3283e088dfe278e607d65346b95150a698d6d5efef4be9d12fe23d7c3c0a8253994d6ef15c292c56579929624f7f12822a8c4689298b6132af74640 WHIRLPOOL 69d4aded277251d09fb671300dd4694ae54b59bc9e1fa66a492ca6ea427c5a219acaa88a64f2adbac07b5d6d2d1a53c6c284ae4c10c9af8eb3a18be072875982
+DIST netbeans-trunk-nightly-201609110002-src.zip 217975022 SHA256 834a359c4c5118302c97a0153372b559714be528e6f44f5655785a61dbc5d75a SHA512 b4921684195901b073df590ae0ec688965af5dd5bccad68ed7aa9d6a4e9fb0e9658115a17119da12c7d93edea457a7bcf921415c501d4df8e6db6b704c24aaa8 WHIRLPOOL 661191465cf6f92a925a07549c48b7d0c7acbad6a80235d4a73dbf1b3bce5f2eef5f43412df24a4c5933e648aeee11aa738fb5e8479d4d3c38bcd0174902abf6
 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_p20160809.ebuild 4126 SHA256 f032777e233a90ecf88886af0faa49c9b9fe5be788c186f1eb1622f90fdf4b73 SHA512 8f50148c2c8978ccdcd3495fab8cc541170fbe09f76003af1e8e6fe54efdcd4056922ba3351dab7d19b4c3deb593f3ab75e60693fc869ba9fcf33823690710e8 WHIRLPOOL f636f5eafb4bbfa624df6d5d1978c1814f0e780ea045119ee0aa9a28fc8d659c10be77794531db83870f5aa768adbe756f184d54de877236409d2f91ab004de4
@@ -66,4 +67,5 @@ EBUILD netbeans-harness-9999_p20160907.ebuild 4126 SHA256 d270fe5a094e815a16a59c
 EBUILD netbeans-harness-9999_p20160908.ebuild 4126 SHA256 66119c7c8d1b080dcd1f473ae6900706089ddce65fa850f5666c31ded217222c SHA512 418ca0d9b09ebeb63b7784eadc50f5b1a69201c350598655950e9e89a3ecd4a7151bbefc33842b645977dbf3fb4de4ffc82d56daa8b6d3a9ea692c4e411dd528 WHIRLPOOL 7f6eab75f92ebfec6d674c4397e27ebb6844ac5dec599837a87670903b15b70b438d242db8d7a52fd9c3d510b34313e4ccaddc739eecbf518da4c2326210da0a
 EBUILD netbeans-harness-9999_p20160909.ebuild 4126 SHA256 c69d80354b7d09399837b3c24594534d3c49d1ab4b363a692dbbe96e59de20ba SHA512 29ee7cd3c3a8e4a417ed555b76cfb345efbc8bf2438b03ecb6ecc17b46bd9dd215d42174553ff10229035935cea036613ed782c55b3154e29b3f59298bc6d0da WHIRLPOOL f0f70fe978777ecb6ad9ea48c351aeaa1e04be6e197b14ef3f4a3878624ecd56f6807973ec6ca64427aa74acdd55084ab9826b7d1e5589653156d4ae3ea3a3f9
 EBUILD netbeans-harness-9999_p20160910.ebuild 4126 SHA256 611eb507931f19d131c6bec455ac31be3abda9e9c450fbe2a69d135e4974c154 SHA512 de1f514e479663cc352851f088ff558ed1b09f1a18e8b4abb727f309ec7bbd2e9ae3a51f40abf0e8aebc58d528dd7b63e876a4413dc95bf59cef7da24ca5b83f WHIRLPOOL bc76257d05dc9db08b246005d38bebac1d6ec275842672d56b9400a1f9dc8c0eefcd3d0da86a6b1b064e6a1e8cb5dacda3b1cbc493b2d15f4a6a356a177979d9
+EBUILD netbeans-harness-9999_p20160911.ebuild 4126 SHA256 068b82ab012974eebd4a605aa179f6c17e5be4005b659f9ea7fbe06353d5d5bb SHA512 44e62d545c3b26eb43c74f77ffb2926ac3afe3d0d7dd7e27939eb1cbf3d42c0bf406d2ab033c81a57c231c94c6056134e555917c8f5660a79ec3af86339a98ae WHIRLPOOL 3f63d2257f42e27f435f89861331a3429cf151d0c5acc48532883feaa52b015ec7b0edf1ab6321e00cd0ec44dc10a15228519277e2f72e29b76b6c45354f9aa7
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index e0b9274..eb1c4d9 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -170,6 +170,7 @@ DIST netbeans-trunk-nightly-201609070002-src.zip 217397241 SHA256 3bceadb91b07bc
 DIST netbeans-trunk-nightly-201609080002-src.zip 217783700 SHA256 ab0b7304f146613a482d4fd73f09610061fb619211e399d251e16f584473b8de SHA512 da4540bf465bcb052ff0a8edd21918927b1d20749b819d7de2aa175eb2d1101805f0f9ce0e4ecefe7e90d36372d803fb23c5ea5e34bbecfcadfa29c443af1657 WHIRLPOOL c65c0fb15e93b30f8afc0e1a3baef98335797cde9b2dc1519a8062c9fdab14fec325d556b103928ec0576b3abd1340215293e800a782cb5f346dfb46625071c1
 DIST netbeans-trunk-nightly-201609090002-src.zip 217786172 SHA256 35a6f3cc108ed4505b5a8a8c075a1a3ebed0c31b829bcef321f9226dbb5b7504 SHA512 404a03d4a4e6da24591c388c9adb91d529c491e2f07880a027dc35e572859504aa5ed3532360375f921ec9411fc19169f714b6aee51fec3efccd2d6c43a97c82 WHIRLPOOL de26751daf9eb39713bc674fd0250e98fc4ce0714a64cdaba2ab0d04b78d4b4207165f1b11c30083fa79bc2b7073f0c9531b07917317b5b057b2d6e63fb959df
 DIST netbeans-trunk-nightly-201609100002-src.zip 217975100 SHA256 aed7feef3dd16e20fd04c6372f799b8c8ff728986899f89a70b21c81b5f47286 SHA512 226e2ec1c3283e088dfe278e607d65346b95150a698d6d5efef4be9d12fe23d7c3c0a8253994d6ef15c292c56579929624f7f12822a8c4689298b6132af74640 WHIRLPOOL 69d4aded277251d09fb671300dd4694ae54b59bc9e1fa66a492ca6ea427c5a219acaa88a64f2adbac07b5d6d2d1a53c6c284ae4c10c9af8eb3a18be072875982
+DIST netbeans-trunk-nightly-201609110002-src.zip 217975022 SHA256 834a359c4c5118302c97a0153372b559714be528e6f44f5655785a61dbc5d75a SHA512 b4921684195901b073df590ae0ec688965af5dd5bccad68ed7aa9d6a4e9fb0e9658115a17119da12c7d93edea457a7bcf921415c501d4df8e6db6b704c24aaa8 WHIRLPOOL 661191465cf6f92a925a07549c48b7d0c7acbad6a80235d4a73dbf1b3bce5f2eef5f43412df24a4c5933e648aeee11aa738fb5e8479d4d3c38bcd0174902abf6
 EBUILD netbeans-ide-8.0.2-r2.ebuild 29330 SHA256 4822cbe26fc19685164c35d69e75bc20578ca8a5ce3394fe97bde6acc721fd2d SHA512 552f35cb1aa5429beb70c72a0cd2a3aa3a006f5870ec4084e88632a39e2ccdc05d0b2b15a87f26c72cdffb3c9a6fa0a124a8d501edeef9aa9580396922071e8d WHIRLPOOL 4c9bce3ca21d5ae61ef9392b9282c2dff9de7f82f2e83d2944a2906ca2180ef0ffab59489bdbb6afc7ba88d5143d77b47a0cf6b219a5a4d385b68afcacd3fe6d
 EBUILD netbeans-ide-8.1-r2.ebuild 30301 SHA256 892f20531352d85b5b72b1c85352eefa444917b515b0b564f04c4f91d1e654f9 SHA512 50af4873fd3ea7755b0d33b086be7e07766b6c009a46ec3954a67a1da9930378bcf9da6d18b7e60078b31af4b36ccf060f22378a8ef26b3829ccf30a529dd023 WHIRLPOOL 1024af16e7cae7f4728dd37f88031be33253b7c62548a095d3e827abeccb6c183d34ce312bd1a0f808f0d107aff217e4b81b7a17eecc6842e1d914d7061df2c9
 EBUILD netbeans-ide-9999_p20160809.ebuild 29867 SHA256 b15bdd68bbc3ab11e44f9db65d37d5c6c84b75c7593c8693703a41da9c6bbccc SHA512 06d5280069e4082154254b318f0826954d08d364b8141b50fbf38b3fc92543f143ed0ebc271ede7cacc93d846c6a3b535d0abb1a3b2877932f26fb9f0af59439 WHIRLPOOL d677c6393fd1d476948f61a14fcf31146418d2ece0508f6ed12ba368ad5e421fe1f14e767cebeff075c693626d029ee6f8d9ea7ce165e0a5cde7ee439e9e11ca
@@ -200,4 +201,5 @@ EBUILD netbeans-ide-9999_p20160907.ebuild 29849 SHA256 3f65161dfbae804db283fce06
 EBUILD netbeans-ide-9999_p20160908.ebuild 29849 SHA256 2862f148199076d9b173fb103c93e0ae7142bae1419d7dfccac5c5f0ec4a23a0 SHA512 ab1da5ad1764d16fdfd49329268e3bb625a7a092394ec62346b1c9240d0ba231826d9b0ec023f00c4722f17ad618bd5ab7982e41f789a05d0b1d30720ebd2d09 WHIRLPOOL 1edd2716aed77817b44ea6389194c741153b4682f65478f717e20ecf4b3632f75f7dd54f45863d110f4e95ef65a88661201844156271c5122608d1acc27583be
 EBUILD netbeans-ide-9999_p20160909.ebuild 29849 SHA256 bed4cac3cb5b47b27e89053eeea9cfa2174202dbba065ca4a2e4f8a02648d9a4 SHA512 5104580f144116411be5d8ac750dbf7379f86c720a4eb78f856fb0a04eecc2ea6e245cd9f338d32f4c06004d5018eb5f23acde0d7150b1c5f6ecfda1503332ad WHIRLPOOL 23c01198df724769d16f2c901f3d873cd92e97ebb65bf87aa7134f4c9e62c55fb7873a6e8f3e3f084b28fed2b2013cb741dc0aeff239324ffe6d67c07e1b7b41
 EBUILD netbeans-ide-9999_p20160910.ebuild 29849 SHA256 3ecc2d137a721ddaa5b00b75a9165f73816bb2a3c34fda3699aa043729a9688d SHA512 df11485d34279d3c9f5fedc0e6dc9c2bfa72e541daa08d0fe66d850428e4ff7e2904bbdae5acc8b261065fea6760b2c806fc42b2532b8fafe0b05b3646030a4d WHIRLPOOL 8ea20994ba2682d7f0108ef2010fddc49d64f819fe1614bdf81b08e61621b2fb49aac871ebd18f6573c68453422cdd0df0b8568ef6ea68d1f4889362a6ec97ff
+EBUILD netbeans-ide-9999_p20160911.ebuild 29849 SHA256 10cdb5b0df325cebe0f979222c665de348cc86490dc8ca5011497bb41b88e882 SHA512 720321cbac1e0c1af23afbbdc27036206114c93698a5c3a5ec1a565bc6f000509dabff79d6e1642eff5843cc90b940c7058ffd064e8a7c74aaccf41006db99fe WHIRLPOOL 878d7817eeaa2b6960132c8b0e9d7093b284de72103a7a83929ff76f733f0f93267defd4e663a852a05f4c82fe1cf4cbb8f5e6de2ef6506050b8daf7cecc787a
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160911.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160911.ebuild
new file mode 100644
index 0000000..f01f125
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20160911.ebuild
@@ -0,0 +1,374 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-09-11_00-02-33/zip/netbeans-trunk-nightly-201609110002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
+	http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
+	http://hg.netbeans.org/binaries/DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8-com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar
+	http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar
+	http://hg.netbeans.org/binaries/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar
+	http://hg.netbeans.org/binaries/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar
+	http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip
+	http://hg.netbeans.org/binaries/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip
+	http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip
+	http://hg.netbeans.org/binaries/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip
+	http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar
+	http://hg.netbeans.org/binaries/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar
+	http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
+	http://hg.netbeans.org/binaries/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip
+	http://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar
+	http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar
+	http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar
+	http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip
+	http://hg.netbeans.org/binaries/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar
+	http://hg.netbeans.org/binaries/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar
+	http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip
+	http://hg.netbeans.org/binaries/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar
+	http://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar
+	http://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar
+	http://hg.netbeans.org/binaries/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar
+	http://hg.netbeans.org/binaries/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar
+	http://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar
+	http://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar
+	http://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar
+	http://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar
+	http://hg.netbeans.org/binaries/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar
+	http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
+	http://hg.netbeans.org/binaries/AA2671239EBB762FEEE8B908E9F35473A72AFE1B-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar
+	http://hg.netbeans.org/binaries/1605B38BB28EAE32C11EAB8F9E238A497754A5B8-org.eclipse.core.jobs-3.5.101_nosignature.jar
+	http://hg.netbeans.org/binaries/20800206EB8B490F3CE5BB8AC8A7C3B9E8004A30-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar
+	http://hg.netbeans.org/binaries/D2D2105B1E3C9E2FA6240AD088237A57590DDA8D-org.eclipse.core.runtime-3.7.0_nosignature.jar
+	http://hg.netbeans.org/binaries/16507EAFDC2B95121AA718895BDB54D616EE4B0F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar
+	http://hg.netbeans.org/binaries/BD55836AABD558DC643A7844B78866AD990544BC-org.eclipse.equinox.app-1.3.100_nosignature.jar
+	http://hg.netbeans.org/binaries/4EE275AE73A140A403903D7E4DBA68C8FBB07001-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar
+	http://hg.netbeans.org/binaries/B7001D9CC2E2AC4E167D22A13063F0350C71AAA9-org.eclipse.equinox.preferences-3.4.2_nosignature.jar
+	http://hg.netbeans.org/binaries/C647079E36A4EB7A24AED2C545E4F0F94194C4D1-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar
+	http://hg.netbeans.org/binaries/9267CF311F979078211A70C1B19AF8A8EE71DC8E-org.eclipse.equinox.security-1.1.1_nosignature.jar
+	http://hg.netbeans.org/binaries/B580E446B543A8DD2F5AA368B07F9C4C9C2E7029-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar
+	http://hg.netbeans.org/binaries/244560B99152F3F9BC75DF2D6FAFA8A5216B06B6-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar
+	http://hg.netbeans.org/binaries/8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar
+	http://hg.netbeans.org/binaries/D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar
+	http://hg.netbeans.org/binaries/4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar
+	http://hg.netbeans.org/binaries/8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar
+	http://hg.netbeans.org/binaries/50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar
+	http://hg.netbeans.org/binaries/4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar
+	http://hg.netbeans.org/binaries/11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar
+	http://hg.netbeans.org/binaries/A3FEF6144ED1622E4CDD506B9D745527CC675D8D-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar
+	http://hg.netbeans.org/binaries/825DC870D1D423E347F4F8229A211A2C297BB15D-org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar
+	http://hg.netbeans.org/binaries/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar
+	http://hg.netbeans.org/binaries/17C0C8D6DEBF5EBE734881C131888D8088BD9E7D-org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar
+	http://hg.netbeans.org/binaries/6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar
+	http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar
+	http://hg.netbeans.org/binaries/DAAEFA7A5F3AF75FE4CDC86A1B5904C9F3B5BBF8-svnClientAdapter-javahl-1.10.12.jar
+	http://hg.netbeans.org/binaries/C47ED3BCD8CEAECDE3BDEEB7D8D14B577B26F9C8-svnClientAdapter-main-1.10.12.jar
+	http://hg.netbeans.org/binaries/AD4A88D99AB7C5B64C8893CA2FF2CBCFCEFC51C8-svnClientAdapter-svnkit-1.10.12.jar
+	http://hg.netbeans.org/binaries/5C47A97F05F761F190D87ED5FCBB08D1E05A7FB5-svnjavahl-1.9.3.jar
+	http://hg.netbeans.org/binaries/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar
+	http://hg.netbeans.org/binaries/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar
+	http://hg.netbeans.org/binaries/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar
+	http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar
+	http://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar
+	http://hg.netbeans.org/binaries/15ACB06E2E3A70FC188782BA51369CA81ACFE860-validator.jar
+	http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar
+	http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar
+	http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar
+	http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-platform-${PV}
+	dev-java/antlr:4
+	dev-java/commons-compress:0
+	dev-java/commons-httpclient:3
+	dev-java/commons-logging:0
+	dev-java/icu4j:55
+	dev-java/iso-relax:0
+	dev-java/jdbc-mysql:0
+	dev-java/jdbc-postgresql:0
+	>=dev-java/jsch-0.1.46:0
+	>=dev-java/json-simple-1.1:0
+	dev-java/jsr173:0
+	dev-java/jvyamlb:0
+	dev-java/log4j:0
+	dev-java/lucene:3.5
+	dev-java/rhino:1.6
+	dev-java/saxon:9
+	dev-java/smack:2.2
+	dev-java/sun-jaf:0
+	dev-java/tomcat-servlet-api:2.2
+	dev-java/ws-commons-util:0
+	dev-java/xerces:2"
+#	dev-vcs/subversion>=1.8.4:0[java] missing from the tree
+#	app-text/jing:0 our version is probably too old
+#	dev-java/commons-io:1 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/commons-lang:2.1 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/freemarker:2.3
+#	dev-java/guava:15 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/ini4j:0 our version is too old
+#	dev-java/jaxb:2 upstream version contains more stuff so websvccommon does not compile with ours
+#	dev-java/jzlib:0 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/trilead-ssh2:0 in overlay
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	dev-java/commons-codec:0
+	${CDEPEND}
+	dev-java/javacc:0
+	dev-java/javahelp:0
+	dev-java/jna:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ide -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+JAVA_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r16-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
+	ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die
+	ln -s "${DISTDIR}"/DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8-com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar || die
+	ln -s "${DISTDIR}"/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar o.apache.commons.io/external/commons-io-1.4.jar || die
+	ln -s "${DISTDIR}"/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar o.apache.commons.lang/external/commons-lang-2.6.jar || die
+	ln -s "${DISTDIR}"/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar libs.commons_net/external/commons-net-3.3.jar || die
+	ln -s "${DISTDIR}"/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip css.editor/external/css21-spec.zip || die
+	ln -s "${DISTDIR}"/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip css.editor/external/css3-spec.zip || die
+	ln -s "${DISTDIR}"/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip derby/external/derbysampledb.zip || die
+	ln -s "${DISTDIR}"/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip dlight.nativeexecution/external/exechlp-1.0.zip || die
+	ln -s "${DISTDIR}"/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar libs.freemarker/external/freemarker-2.3.19.jar || die
+	ln -s "${DISTDIR}"/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar c.google.guava/external/guava-15.0.jar || die
+	ln -s "${DISTDIR}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || die
+	ln -s "${DISTDIR}"/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip html.parser/external/html5doc.zip || die
+	ln -s "${DISTDIR}"/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar html.parser/external/htmlparser-1.2.1.jar || die
+	ln -s "${DISTDIR}"/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar libs.ini4j/external/ini4j-0.5.1.jar || die
+	ln -s "${DISTDIR}"/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar html.validation/external/iri.jar || die
+	ln -s "${DISTDIR}"/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip spellchecker.dictionary_en/external/ispell-enwl-3.1.20.zip || die
+	ln -s "${DISTDIR}"/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar c.googlecode.javaewah.JavaEWAH/external/JavaEWAH-0.7.9.jar || die
+	ln -s "${DISTDIR}"/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar xml.jaxb.api/external/jaxb-api.jar || die
+	ln -s "${DISTDIR}"/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip libs.jaxb/external/jaxb-api-doc.zip || die
+	ln -s "${DISTDIR}"/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar libs.jaxb/external/jaxb-impl.jar || die
+	ln -s "${DISTDIR}"/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar libs.jaxb/external/jaxb-xjc.jar || die
+	ln -s "${DISTDIR}"/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar libs.jaxb/external/jaxb1-impl.jar || die
+	ln -s "${DISTDIR}"/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar libs.javafx/external/jfxrt.jar || die
+	ln -s "${DISTDIR}"/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar html.validation/external/jing.jar || die
+	ln -s "${DISTDIR}"/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.core-0.0.7.jar || die
+	ln -s "${DISTDIR}"/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.sshagent-0.0.7.jar || die
+	ln -s "${DISTDIR}"/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.pageant-0.0.7.jar || die
+	ln -s "${DISTDIR}"/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.usocket-jna-0.0.7.jar || die
+	ln -s "${DISTDIR}"/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar c.jcraft.jzlib/external/jzlib-1.0.7.jar || die
+	ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.process/external/libpam4j-1.1.jar || die
+	ln -s "${DISTDIR}"/AA2671239EBB762FEEE8B908E9F35473A72AFE1B-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar o.eclipse.core.contenttype/external/org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar || die
+	ln -s "${DISTDIR}"/1605B38BB28EAE32C11EAB8F9E238A497754A5B8-org.eclipse.core.jobs-3.5.101_nosignature.jar o.eclipse.core.jobs/external/org.eclipse.core.jobs-3.5.101_nosignature.jar || die
+	ln -s "${DISTDIR}"/20800206EB8B490F3CE5BB8AC8A7C3B9E8004A30-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar o.eclipse.core.net/external/org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar || die
+	ln -s "${DISTDIR}"/D2D2105B1E3C9E2FA6240AD088237A57590DDA8D-org.eclipse.core.runtime-3.7.0_nosignature.jar o.eclipse.core.runtime/external/org.eclipse.core.runtime-3.7.0_nosignature.jar || die
+	ln -s "${DISTDIR}"/16507EAFDC2B95121AA718895BDB54D616EE4B0F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar o.eclipse.core.runtime.compatibility.auth/external/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar || die
+	ln -s "${DISTDIR}"/BD55836AABD558DC643A7844B78866AD990544BC-org.eclipse.equinox.app-1.3.100_nosignature.jar o.eclipse.equinox.app/external/org.eclipse.equinox.app-1.3.100_nosignature.jar || die
+	ln -s "${DISTDIR}"/4EE275AE73A140A403903D7E4DBA68C8FBB07001-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar o.eclipse.equinox.common/external/org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar || die
+	ln -s "${DISTDIR}"/B7001D9CC2E2AC4E167D22A13063F0350C71AAA9-org.eclipse.equinox.preferences-3.4.2_nosignature.jar o.eclipse.equinox.preferences/external/org.eclipse.equinox.preferences-3.4.2_nosignature.jar || die
+	ln -s "${DISTDIR}"/C647079E36A4EB7A24AED2C545E4F0F94194C4D1-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar o.eclipse.equinox.registry/external/org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar || die
+	ln -s "${DISTDIR}"/9267CF311F979078211A70C1B19AF8A8EE71DC8E-org.eclipse.equinox.security-1.1.1_nosignature.jar o.eclipse.equinox.security/external/org.eclipse.equinox.security-1.1.1_nosignature.jar || die
+	ln -s "${DISTDIR}"/B580E446B543A8DD2F5AA368B07F9C4C9C2E7029-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit/external/org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar || die
+	ln -s "${DISTDIR}"/244560B99152F3F9BC75DF2D6FAFA8A5216B06B6-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit.java7/external/org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar || die
+	ln -s "${DISTDIR}"/8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar || die
+	ln -s "${DISTDIR}"/D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar || die
+	ln -s "${DISTDIR}"/4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar || die
+	ln -s "${DISTDIR}"/8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar o.eclipse.mylyn.commons.repositories.core/external/org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar || die
+	ln -s "${DISTDIR}"/50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar || die
+	ln -s "${DISTDIR}"/4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar || die
+	ln -s "${DISTDIR}"/11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.confluence.core/external/org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar || die
+	ln -s "${DISTDIR}"/A3FEF6144ED1622E4CDD506B9D745527CC675D8D-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar || die
+	ln -s "${DISTDIR}"/825DC870D1D423E347F4F8229A211A2C297BB15D-org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.markdown.core/external/org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar || die
+	ln -s "${DISTDIR}"/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.textile.core/external/org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar || die
+	ln -s "${DISTDIR}"/17C0C8D6DEBF5EBE734881C131888D8088BD9E7D-org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar || die
+	ln -s "${DISTDIR}"/6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar extexecution.process/external/processtreekiller-1.0.7.jar || die
+	ln -s "${DISTDIR}"/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar libs.svnClientAdapter.svnkit/external/svnkit_1.7.8.r9538_v20130107_2001.jar || die
+	ln -s "${DISTDIR}"/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar o.apache.xml.resolver/external/resolver-1.2.jar || die
+	ln -s "${DISTDIR}"/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar libs.svnClientAdapter.svnkit/external/sqljet-1.1.10.jar || die
+	ln -s "${DISTDIR}"/DAAEFA7A5F3AF75FE4CDC86A1B5904C9F3B5BBF8-svnClientAdapter-javahl-1.10.12.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-javahl-1.10.12.jar || die
+	ln -s "${DISTDIR}"/C47ED3BCD8CEAECDE3BDEEB7D8D14B577B26F9C8-svnClientAdapter-main-1.10.12.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.10.12.jar || die
+	ln -s "${DISTDIR}"/AD4A88D99AB7C5B64C8893CA2FF2CBCFCEFC51C8-svnClientAdapter-svnkit-1.10.12.jar libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.10.12.jar || die
+	ln -s "${DISTDIR}"/5C47A97F05F761F190D87ED5FCBB08D1E05A7FB5-svnjavahl-1.9.3.jar libs.svnClientAdapter.javahl/external/svnjavahl-1.9.3.jar || die
+	ln -s "${DISTDIR}"/3B91269E9055504778F57744D24F505856698602-svnkit-1.7.0-beta4-20120316.233307-1.jar libs.svnClientAdapter.svnkit/external/svnkit-1.7.0-beta4-20120316.233307-1.jar || die
+	ln -s "${DISTDIR}"/015525209A02BD74254930FF844C7C13498B7FB9-svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar libs.svnClientAdapter.svnkit/external/svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar || die
+	ln -s "${DISTDIR}"/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar libs.swingx/external/swingx-all-1.6.4.jar || die
+	ln -s "${DISTDIR}"/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar httpserver/external/tomcat-webserver-3.2.jar || die
+	ln -s "${DISTDIR}"/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar swing.validation/external/ValidationAPI.jar || die
+	ln -s "${DISTDIR}"/15ACB06E2E3A70FC188782BA51369CA81ACFE860-validator.jar html.validation/external/validator.jar || die
+	ln -s "${DISTDIR}"/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar extexecution.process/external/winp-1.14-patched.jar || die
+	ln -s "${DISTDIR}"/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar o.apache.xmlrpc/external/xmlrpc-client-3.0.jar || die
+	ln -s "${DISTDIR}"/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar o.apache.xmlrpc/external/xmlrpc-common-3.0.jar || die
+	ln -s "${DISTDIR}"/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar o.apache.xmlrpc/external/xmlrpc-server-3.0.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.53.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-postgresql jdbc-postgresql.jar postgresql-9.4.1209.jar
+	java-pkg_jar-from --build-only --into db.sql.visualeditor/external javacc javacc.jar javacc-3.2.jar
+	java-pkg_jar-from --into html.parser/external icu4j-55 icu4j.jar icu4j-4_4_2.jar
+	java-pkg_jar-from --into html.validation/external iso-relax iso-relax.jar isorelax.jar
+	java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar
+	java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.antlr4.runtime/external antlr-4 antlr-runtime.jar antlr-runtime-4.5.3.jar
+	java-pkg_jar-from --into libs.commons_compress/external commons-compress commons-compress.jar commons-compress-1.8.1.jar
+	# java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.19.jar
+	java-pkg_jar-from --build-only --into libs.jna/external jna jna.jar jna-4.2.2.jar
+	java-pkg_jar-from --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
+	java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
+	java-pkg_jar-from --into libs.lucene/external lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
+	java-pkg_jar-from --into libs.smack/external smack-2.2 smack.jar smack.jar
+	java-pkg_jar-from --into libs.smack/external smack-2.2 smackx.jar smackx.jar
+	# java-pkg_jar-from --into libs.svnClientAdapter.javahl/external subversion svn-javahl.jar svnjavahl-1.8.4.jar
+	java-pkg_jar-from --into libs.xerces/external xerces-2 xercesImpl.jar xerces-2.8.0.jar
+	java-pkg_jar-from --build-only --into o.apache.commons.codec/external commons-codec commons-codec.jar apache-commons-codec-1.3.jar
+	java-pkg_jar-from --into o.apache.commons.httpclient/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.1.jar
+	java-pkg_jar-from --into o.apache.commons.logging/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
+	java-pkg_jar-from --into o.apache.ws.commons.util/external ws-commons-util ws-commons-util.jar ws-commons-util-1.0.1.jar
+	java-pkg_jar-from --into servletapi/external tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
+	java-pkg_jar-from --into xml.jaxb.api/external sun-jaf activation.jar activation.jar
+	java-pkg_jar-from --into xml.jaxb.api/external jsr173 jsr173.jar jsr173_1.0_api.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	unset DISPLAY
+	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+	pushd nbbuild/netbeans/ide >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/ide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	rm -fr "${D}"/${INSTALL_DIR}/bin/nativeexecution || die
+	rm -fr "${D}"/${INSTALL_DIR}/modules/lib || die
+
+	insinto ${INSTALL_DIR}/bin/nativeexecution
+	doins bin/nativeexecution/*
+
+	pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution >/dev/null || die
+	for file in *.sh ; do
+		fperms 755 ${file}
+	done
+	popd >/dev/null || die
+
+	if use x86 ; then
+		doins -r bin/nativeexecution/Linux-x86
+		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86 >/dev/null || die
+		for file in * ; do
+			fperms 755 ${file}
+		done
+		popd >/dev/null || die
+	elif use amd64 ; then
+		doins -r bin/nativeexecution/Linux-x86_64
+		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86_64 >/dev/null || die
+		for file in * ; do
+			fperms 755 ${file}
+		done
+		popd >/dev/null || die
+	fi
+
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules
+	pushd "${instdir}" >/dev/null || die
+	rm com-jcraft-jsch.jar && java-pkg_jar-from --into "${instdir}" jsch jsch.jar com-jcraft-jsch.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext
+	pushd "${instdir}" >/dev/null || die
+	rm antlr-runtime-4.5.3.jar && java-pkg_jar-from --into "${instdir}" antlr-4 antlr-runtime.jar antlr-runtime-4.5.3.jar
+	rm commons-compress-1.8.1.jar && java-pkg_jar-from --into "${instdir}" commons-compress commons-compress.jar commons-compress-1.8.1.jar
+	# rm freemarker-2.3.19.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.19.jar || die
+	rm icu4j-4_4_2.jar && java-pkg_jar-from --into "${instdir}" icu4j-55 icu4j.jar icu4j-4_4_2.jar
+	rm isorelax.jar && java-pkg_jar-from --into "${instdir}" iso-relax iso-relax.jar isorelax.jar
+	rm json-simple-1.1.1.jar && java-pkg_jar-from --into "${instdir}" json-simple json-simple.jar json-simple-1.1.1.jar
+	rm jvyamlb-0.2.7.jar && java-pkg_jar-from --into "${instdir}" jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
+	rm log4j-1.2.15.jar && java-pkg_jar-from --into "${instdir}" log4j log4j.jar log4j-1.2.15.jar
+	rm lucene-core-3.5.0.jar && java-pkg_jar-from --into "${instdir}" lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
+	rm mysql-connector-java-5.1.23-bin.jar && java-pkg_jar-from --into "${instdir}" jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
+	rm postgresql-9.4.1209.jar && java-pkg_jar-from --into "${instdir}" jdbc-postgresql jdbc-postgresql.jar postgresql-9.4.1209.jar
+	rm saxon9B.jar && java-pkg_jar-from --into "${instdir}" saxon-9 saxon.jar saxon9B.jar
+	rm servlet-2.2.jar && java-pkg_jar-from --into "${instdir}" tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
+	rm smack.jar && java-pkg_jar-from --into "${instdir}" smack-2.2 smack.jar
+	rm smackx.jar && java-pkg_jar-from --into "${instdir}" smack-2.2 smackx.jar
+	# rm svnjavahl.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl.jar || die
+	rm xerces-2.8.0.jar && java-pkg_jar-from --into "${instdir}" xerces-2 xercesImpl.jar xerces-2.8.0.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxb
+	pushd "${instdir}" >/dev/null || die
+	rm activation.jar && java-pkg_jar-from --into "${instdir}" sun-jaf activation.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxb/api
+	pushd "${instdir}" >/dev/null || die
+	rm jsr173_1.0_api.jar && java-pkg_jar-from --into "${instdir}" jsr173 jsr173.jar jsr173_1.0_api.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ide
+}

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index eaf036d..5bb9110 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -66,6 +66,7 @@ DIST netbeans-trunk-nightly-201609070002-src.zip 217397241 SHA256 3bceadb91b07bc
 DIST netbeans-trunk-nightly-201609080002-src.zip 217783700 SHA256 ab0b7304f146613a482d4fd73f09610061fb619211e399d251e16f584473b8de SHA512 da4540bf465bcb052ff0a8edd21918927b1d20749b819d7de2aa175eb2d1101805f0f9ce0e4ecefe7e90d36372d803fb23c5ea5e34bbecfcadfa29c443af1657 WHIRLPOOL c65c0fb15e93b30f8afc0e1a3baef98335797cde9b2dc1519a8062c9fdab14fec325d556b103928ec0576b3abd1340215293e800a782cb5f346dfb46625071c1
 DIST netbeans-trunk-nightly-201609090002-src.zip 217786172 SHA256 35a6f3cc108ed4505b5a8a8c075a1a3ebed0c31b829bcef321f9226dbb5b7504 SHA512 404a03d4a4e6da24591c388c9adb91d529c491e2f07880a027dc35e572859504aa5ed3532360375f921ec9411fc19169f714b6aee51fec3efccd2d6c43a97c82 WHIRLPOOL de26751daf9eb39713bc674fd0250e98fc4ce0714a64cdaba2ab0d04b78d4b4207165f1b11c30083fa79bc2b7073f0c9531b07917317b5b057b2d6e63fb959df
 DIST netbeans-trunk-nightly-201609100002-src.zip 217975100 SHA256 aed7feef3dd16e20fd04c6372f799b8c8ff728986899f89a70b21c81b5f47286 SHA512 226e2ec1c3283e088dfe278e607d65346b95150a698d6d5efef4be9d12fe23d7c3c0a8253994d6ef15c292c56579929624f7f12822a8c4689298b6132af74640 WHIRLPOOL 69d4aded277251d09fb671300dd4694ae54b59bc9e1fa66a492ca6ea427c5a219acaa88a64f2adbac07b5d6d2d1a53c6c284ae4c10c9af8eb3a18be072875982
+DIST netbeans-trunk-nightly-201609110002-src.zip 217975022 SHA256 834a359c4c5118302c97a0153372b559714be528e6f44f5655785a61dbc5d75a SHA512 b4921684195901b073df590ae0ec688965af5dd5bccad68ed7aa9d6a4e9fb0e9658115a17119da12c7d93edea457a7bcf921415c501d4df8e6db6b704c24aaa8 WHIRLPOOL 661191465cf6f92a925a07549c48b7d0c7acbad6a80235d4a73dbf1b3bce5f2eef5f43412df24a4c5933e648aeee11aa738fb5e8479d4d3c38bcd0174902abf6
 EBUILD netbeans-java-8.0.2-r4.ebuild 13298 SHA256 d4172dfdec5afecb1cd099e18a21aa872c7822bff40b192b5f4ec4d35e6e0ef8 SHA512 48ae6f7141117fbf58123ded750d76f2e7311211a6be3b62bd491349817460da11f781ec5694da91584315547c32008f568fac3bfb406dbdb5ed7fd825ff694e WHIRLPOOL 73fb68aec003707c14b2b390c2de80f24e1e5413cf7e16cf7e661af47c908e2d559214580379e45e21d316767987ac906b5a119a61ae39f03c3d01dafad49b7c
 EBUILD netbeans-java-8.1-r2.ebuild 14814 SHA256 1f49212c90fcaa9a6483f19bb60c963520f20aa08c2a509aa19cc7fda12e4564 SHA512 2d6b225f5d32f0ce1801124808b0cc2101f16a703540877c4818be06694742cfa262c3a2e7018761254f9244a7992eb7fe9bc15cdb20f6f4cb83958789c0ef42 WHIRLPOOL 8557163a46ea91a47efec3c272b8a8a0f2acbf9eaa8f6c280d0ddaac6dd8b2185f06716ab12ebf76fb87fe6c05ab1a14bfd281875ebef586f1304d2162e5f2dc
 EBUILD netbeans-java-9999_p20160809.ebuild 15656 SHA256 3b109093b32816e9b0e387739bd464e29cc86ace8d7c17d7741e3d942e52cfe6 SHA512 efa59fdb0d73f67d7728b027b421bf16b542ac69ac01a1802cf0098e7e0fbd6dee6bf0c44371ca9387a34dde1b626e9737ad274240f2413211b06b2869acb390 WHIRLPOOL 6d992d6df38cdeb9fafcb9bbafbd2f5f1608ab45a7d616692aa19860bf3e5c11d3ea903cbfe9fbb8e45130434b01ccb40446838a28be0a81ffe7bdaf7f5fb8a3
@@ -96,4 +97,5 @@ EBUILD netbeans-java-9999_p20160907.ebuild 15656 SHA256 029d9007610e32cff119af32
 EBUILD netbeans-java-9999_p20160908.ebuild 15656 SHA256 872bf31689b2dc2f7c513f13f3134f5a257845168062c257f068c1fbb62720c1 SHA512 b1bed955ef7800dd16c23b789d4ff2f0d5bdd1a9a12186ad4e309444dc24c9e73e79ccb2a08418a0de0b180280ee0ecf7a07926378009858c2403a3b0413af10 WHIRLPOOL 08f887a0f8e1575f039ff2f40b8d3e888e41143a91af6276e28a7afb2f2cb0df3234dca181af00f1223709520d88956288fe33f8e0ee9d7a6ef6400941a02c3b
 EBUILD netbeans-java-9999_p20160909.ebuild 15656 SHA256 5258b7341561799fe841a6cb047b69c92981bc78934ecfeac99d011b3ecc8547 SHA512 22c50629c97c3f2b90ba0762d64e06fae6ea484b26576d99e3c54df4c57a163adad3404255b96d42bcf02e34125e89b2326248fc96f107245945214dfa14212b WHIRLPOOL 307eb6a1d3607d28910ad1be0009423fd412982946d3cbd2fdfde27c541c1c9d36fe00cfe04a62e396c4d83cbb670cf9f5728569a6d106e7a8867f302d6c4acb
 EBUILD netbeans-java-9999_p20160910.ebuild 15656 SHA256 ecaaa36ae67078921c4cae297af3c57c547129f8846d2557d9a2139559031629 SHA512 07b840fc3f008dfc127807e879cfbb7c9a5ec978d1a361ae232225b63ba61dd77f1ceaf1afc69619f6770f3e2f0e20a8ee75fb8aaecae7760b870e67384f8233 WHIRLPOOL 4cb94b09f2a7b556861572b04334c50cf0afdabcbffe51e6c23970b5eef8c9c7127752615f88321f8068495a7261697304e6dd49434b22ee57f59978bc33b728
+EBUILD netbeans-java-9999_p20160911.ebuild 15656 SHA256 474bc5ef71c867d71c4ef228ed33b8dd5215c0d8e59e3d963e1635e3f76fa7c6 SHA512 70dd2c05d26fb65b37cdf4f04442495908143340f519d1ac0f0208a2ff17851e83208e7b0e3cc6eb11251a6abb146af9ee32629f1ed1dc854893543c62b91947 WHIRLPOOL 12cf806719370ba7e8e47fac4fe856bc8fef02b3ee2b9edca06f2fdf7ffbb3300fb5fee1f2b51ba49569c20b7d3b0a67f8adba7b9cd94ceaec042bacdfe4fb93
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index c426686..1c4231e 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201609070002-src.zip 217397241 SHA256 3bceadb91b07bc
 DIST netbeans-trunk-nightly-201609080002-src.zip 217783700 SHA256 ab0b7304f146613a482d4fd73f09610061fb619211e399d251e16f584473b8de SHA512 da4540bf465bcb052ff0a8edd21918927b1d20749b819d7de2aa175eb2d1101805f0f9ce0e4ecefe7e90d36372d803fb23c5ea5e34bbecfcadfa29c443af1657 WHIRLPOOL c65c0fb15e93b30f8afc0e1a3baef98335797cde9b2dc1519a8062c9fdab14fec325d556b103928ec0576b3abd1340215293e800a782cb5f346dfb46625071c1
 DIST netbeans-trunk-nightly-201609090002-src.zip 217786172 SHA256 35a6f3cc108ed4505b5a8a8c075a1a3ebed0c31b829bcef321f9226dbb5b7504 SHA512 404a03d4a4e6da24591c388c9adb91d529c491e2f07880a027dc35e572859504aa5ed3532360375f921ec9411fc19169f714b6aee51fec3efccd2d6c43a97c82 WHIRLPOOL de26751daf9eb39713bc674fd0250e98fc4ce0714a64cdaba2ab0d04b78d4b4207165f1b11c30083fa79bc2b7073f0c9531b07917317b5b057b2d6e63fb959df
 DIST netbeans-trunk-nightly-201609100002-src.zip 217975100 SHA256 aed7feef3dd16e20fd04c6372f799b8c8ff728986899f89a70b21c81b5f47286 SHA512 226e2ec1c3283e088dfe278e607d65346b95150a698d6d5efef4be9d12fe23d7c3c0a8253994d6ef15c292c56579929624f7f12822a8c4689298b6132af74640 WHIRLPOOL 69d4aded277251d09fb671300dd4694ae54b59bc9e1fa66a492ca6ea427c5a219acaa88a64f2adbac07b5d6d2d1a53c6c284ae4c10c9af8eb3a18be072875982
+DIST netbeans-trunk-nightly-201609110002-src.zip 217975022 SHA256 834a359c4c5118302c97a0153372b559714be528e6f44f5655785a61dbc5d75a SHA512 b4921684195901b073df590ae0ec688965af5dd5bccad68ed7aa9d6a4e9fb0e9658115a17119da12c7d93edea457a7bcf921415c501d4df8e6db6b704c24aaa8 WHIRLPOOL 661191465cf6f92a925a07549c48b7d0c7acbad6a80235d4a73dbf1b3bce5f2eef5f43412df24a4c5933e648aeee11aa738fb5e8479d4d3c38bcd0174902abf6
 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_p20160809.ebuild 4971 SHA256 5a599eaef3e6108e43252f2c30e9d13a1212694e9a4ea11079b5c065fc6d093d SHA512 d2abdec1e7dacf600afc396e66f36f230711178b1709901ccf09e06a4cf957599ce1fe996ea91326af57bfeb2c5ae9967f36dbaeef984dad76c99b1b01f8dfd6 WHIRLPOOL 3d5069ee3a244b27988f6584f06dd9e0c680f25588f07a51b09104970c8acffa95bbf3fef04ebbb477056adc2a6db77906a8b6e87a2a955b891791d367c10236
@@ -64,4 +65,5 @@ EBUILD netbeans-javacard-9999_p20160907.ebuild 4971 SHA256 9bd49bea722d0d9a4bb00
 EBUILD netbeans-javacard-9999_p20160908.ebuild 4971 SHA256 41e5dd87555d1c30fe6fe084f8116c1701bbf668b2ab903ec4138344972249ae SHA512 22ba0c946c837f58e8391f9612d121e195fbafb1143f24272ed45d3adb0d95a339f34a190fa9361b1e5c565f7d4cf177ca2fbd07406f73c9c532f06cf8862198 WHIRLPOOL 3d6f9924eb052499d1183567290c7d7472f437f0092cc0051bbb461f3f515d4f9da064328be57989cb5100f07430f67edbf41c83ff959fccb348e2ac13f4da50
 EBUILD netbeans-javacard-9999_p20160909.ebuild 4971 SHA256 5124f956730860fde93e4f1210fc82602cad40363317d99cc4cc522b9f5220e4 SHA512 7f03c7445b134a5125a0e23b6f09e50a48f6353ac1863405125e7dac678dbe37fc97011c5085eed403436a65c2c913a22979f0c3a3033f00eb4fca32d1bd5402 WHIRLPOOL fa4c6f8b36d56b19151d8ec817a82924b490a0272726b4e3c599c1737f547fbb2de6e9c40e0b4df8d036d8cd050b33f9194405951886e32935d40756fa64b2e1
 EBUILD netbeans-javacard-9999_p20160910.ebuild 4971 SHA256 fb4eb5320a0c5ffa543456455ad3000b9c44f9bd18cefea511f7d6c4c04d25b7 SHA512 8427ee615d677ea67458692e635bc3886a99469226c424525b5af21122aa0036214ca6efc6c80390839fb3993bd7e6bb5ed23378638512b04bd8bfa49b272fd1 WHIRLPOOL 2ba69834efa2b25605cc2fd360551f56bd0d562a9aaa0b8cbb2ec06343432e74f803b4c4883576e84c56eac674be567030031023b3403b2733b8ab179eff3482
+EBUILD netbeans-javacard-9999_p20160911.ebuild 4971 SHA256 ff8ba70e3b3019b95a778a328811c6e72a12909b4e027ea6ba2697168f7cd0e0 SHA512 6dfe8ec95296cd00bb13c46ece381323bb4994f358d8fd188c0237e35efd9d6cdcd68c1c775e22c8710c950d80aa96ebd21de9d933acd04b5faed0e266822782 WHIRLPOOL 74eabee2e64ba0aa03623a6af0483cb85397cd97c5f93209137a32b2d280b1d27b23cf6b7aa665b812c9ceae26c6814ba9903fd4fe7844b701ed4838e8864707
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index 1af8df7..a60048c 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201609070002-src.zip 217397241 SHA256 3bceadb91b07bc
 DIST netbeans-trunk-nightly-201609080002-src.zip 217783700 SHA256 ab0b7304f146613a482d4fd73f09610061fb619211e399d251e16f584473b8de SHA512 da4540bf465bcb052ff0a8edd21918927b1d20749b819d7de2aa175eb2d1101805f0f9ce0e4ecefe7e90d36372d803fb23c5ea5e34bbecfcadfa29c443af1657 WHIRLPOOL c65c0fb15e93b30f8afc0e1a3baef98335797cde9b2dc1519a8062c9fdab14fec325d556b103928ec0576b3abd1340215293e800a782cb5f346dfb46625071c1
 DIST netbeans-trunk-nightly-201609090002-src.zip 217786172 SHA256 35a6f3cc108ed4505b5a8a8c075a1a3ebed0c31b829bcef321f9226dbb5b7504 SHA512 404a03d4a4e6da24591c388c9adb91d529c491e2f07880a027dc35e572859504aa5ed3532360375f921ec9411fc19169f714b6aee51fec3efccd2d6c43a97c82 WHIRLPOOL de26751daf9eb39713bc674fd0250e98fc4ce0714a64cdaba2ab0d04b78d4b4207165f1b11c30083fa79bc2b7073f0c9531b07917317b5b057b2d6e63fb959df
 DIST netbeans-trunk-nightly-201609100002-src.zip 217975100 SHA256 aed7feef3dd16e20fd04c6372f799b8c8ff728986899f89a70b21c81b5f47286 SHA512 226e2ec1c3283e088dfe278e607d65346b95150a698d6d5efef4be9d12fe23d7c3c0a8253994d6ef15c292c56579929624f7f12822a8c4689298b6132af74640 WHIRLPOOL 69d4aded277251d09fb671300dd4694ae54b59bc9e1fa66a492ca6ea427c5a219acaa88a64f2adbac07b5d6d2d1a53c6c284ae4c10c9af8eb3a18be072875982
+DIST netbeans-trunk-nightly-201609110002-src.zip 217975022 SHA256 834a359c4c5118302c97a0153372b559714be528e6f44f5655785a61dbc5d75a SHA512 b4921684195901b073df590ae0ec688965af5dd5bccad68ed7aa9d6a4e9fb0e9658115a17119da12c7d93edea457a7bcf921415c501d4df8e6db6b704c24aaa8 WHIRLPOOL 661191465cf6f92a925a07549c48b7d0c7acbad6a80235d4a73dbf1b3bce5f2eef5f43412df24a4c5933e648aeee11aa738fb5e8479d4d3c38bcd0174902abf6
 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_p20160809.ebuild 6293 SHA256 5711af550cd9374b2402e3bb9231a2104432bb22667419732be1861bf94b4cec SHA512 cfde64bbac9043c08250e517d7440943f5dc9133591ec3e02be98e58e7d87311dcff5ab0cd9f45e99218b16f7a88f325767a0deb0b877f7759d566ce4319f022 WHIRLPOOL 546091d899c116f531b1f4a531e469ca5274ce9cbc20b3c42ba231cb776f5bbbf44770821a6c05a831accce31a29b4688f4cec33c238d8e1de90851e9ca1a842
@@ -63,4 +64,5 @@ EBUILD netbeans-javadoc-9999_p20160907.ebuild 6293 SHA256 d3786b07bb30e22ed6deaa
 EBUILD netbeans-javadoc-9999_p20160908.ebuild 6293 SHA256 2eb5083f6582346944cb92a11f5271d79ccc3aa71d91e6afb951acbf25a7a41a SHA512 354674239d8b8a0394bf3d101c47453f65ba621701317d1fa84c4ff04e28d0f476214042349abb4483457f28bd8b0c121c123b29fc7cecad617dcce5cc6cd56f WHIRLPOOL d052171ab2dd2a033cc03de9fefb705dfa1ecef05f20ecb440bcdfab3f0ea3351cc1c4a12be4dea71c8be9b594d260478246b46571a3b4808eb2c74e4f75ac22
 EBUILD netbeans-javadoc-9999_p20160909.ebuild 6293 SHA256 6601f6795207416c099b8f90cedbad41e4aaa4f3ca827bc57b36b40d40e1c040 SHA512 c7489a0e074bec0249bbcb108281430609ba2e036a9caf1c866ffca20062eea1cef3ab46177578dd822913c6bf072a13f8fec00b6aac0505f9c995ddfaed42a1 WHIRLPOOL be1c39b4bbae85e503b33d062692b10be75f7954cd8ee3cfc619f1fcd97029648e73c41a893d23cbb068d220c0dada539b515ef025793cce287a72a1c2f83021
 EBUILD netbeans-javadoc-9999_p20160910.ebuild 6293 SHA256 3aae5218fa288eb116fdc92d89b686de2183dfb4be0ac5c91c99d7a7adca144e SHA512 2f1c437a5825b0bba866b8ae5309df2621007e372130239dfe58d45ee1a6bd3b8347525b553aab0ef30142b4b28bffe9b045df07fcbb97cf993b7f63a0b388c4 WHIRLPOOL 95eacdc898e60ea7ea74253525934ef34ec4dbaacae66192e5a33ab6783d61735c33f5a74f8c1edba265cbf164bf56572e8104e9113c380ad59457616056bc4e
+EBUILD netbeans-javadoc-9999_p20160911.ebuild 6293 SHA256 109356cb83014d359b603a7fe786c1ef9caaaaedf85c647df17a054206038a28 SHA512 9e28472bebc4ea990a217820146d59fcf509279b400745ac629e48750eb7c5a8d1d04f285fca04a260347a5388abd91f5365230aee991cb042e02890a55628a0 WHIRLPOOL 6c64e77d633ab516bc75480fa5d89fc68dcfe55b9ccf6efa86562a2145fed044801062049b13a0bd90c5397fe9e99f5eb6bb9a4acd7d7f17763d951bf8956b0b
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160911.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160911.ebuild
new file mode 100644
index 0000000..e70e498
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160911.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaDocs"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-09-11_00-02-33/zip/netbeans-trunk-nightly-201609110002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+# oracle-jdk-bin is needed because of javafx which is not currently packaged separately
+DEPEND="dev-java/oracle-jdk-bin:1.8[javafx]
+	app-arch/unzip
+	dev-java/javahelp:0
+	dev-java/junit:4
+	~dev-java/netbeans-apisupport-${PV}
+	~dev-java/netbeans-cnd-${PV}
+	~dev-java/netbeans-dlight-${PV}
+	~dev-java/netbeans-enterprise-${PV}
+	~dev-java/netbeans-ergonomics-${PV}
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-groovy-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-javacard-${PV}
+	~dev-java/netbeans-mobility-${PV}
+	~dev-java/netbeans-nb-${PV}
+	~dev-java/netbeans-php-${PV}
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-profiler-${PV}
+	~dev-java/netbeans-websvccommon-${PV}"
+RDEPEND=""
+
+JAVA_PKG_BSFIX="off"
+JAVA_PKG_WANT_BUILD_VM="oracle-jdk-bin-1.8"
+JAVA_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r16-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip o.apache.tools.ant.module/external/ant-libs-1.9.7.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-apisupport-${SLOT} apisupport || die
+	cat /usr/share/netbeans-apisupport-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.apisupport.built
+
+	ln -s /usr/share/netbeans-cnd-${SLOT} cnd || die
+	cat /usr/share/netbeans-cnd-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.cnd.built
+
+	ln -s /usr/share/netbeans-dlight-${SLOT} dlight || die
+	cat /usr/share/netbeans-dlight-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.dlight.built
+
+	ln -s /usr/share/netbeans-enterprise-${SLOT} enterprise || die
+	cat /usr/share/netbeans-enterprise-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.enterprise.built
+
+	ln -s /usr/share/netbeans-ergonomics-${SLOT} ergonomics || die
+	cat /usr/share/netbeans-ergonomics-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ergonomics.built
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-groovy-${SLOT} groovy || die
+	cat /usr/share/netbeans-groovy-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.groovy.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-javacard-${SLOT} javacard || die
+	cat /usr/share/netbeans-javacard-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.javacard.built
+
+	ln -s /usr/share/netbeans-mobility-${SLOT} mobility || die
+	cat /usr/share/netbeans-mobility-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.mobility.built
+
+	ln -s /usr/share/netbeans-nb-${SLOT}/nb nb || die
+	cat /usr/share/netbeans-nb-${SLOT}/nb/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.nb.built
+
+	ln -s /usr/share/netbeans-php-${SLOT} php || die
+	cat /usr/share/netbeans-php-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.php.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-profiler-${SLOT} profiler || die
+	cat /usr/share/netbeans-profiler-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.profiler.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	eant -Dpermit.jdk8.builds=true -f nbbuild/build.xml bootstrap || die
+	ANT_OPTS="-Xmx1536m" eant -Dpermit.jdk8.builds=true -f nbbuild/javadoctools/build.xml build-javadoc
+}
+
+src_install() {
+	rm nbbuild/build/javadoc/*.zip
+	java-pkg_dojavadoc nbbuild/build/javadoc
+}

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index 144f075..c1ccd10 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201609070002-src.zip 217397241 SHA256 3bceadb91b07bc
 DIST netbeans-trunk-nightly-201609080002-src.zip 217783700 SHA256 ab0b7304f146613a482d4fd73f09610061fb619211e399d251e16f584473b8de SHA512 da4540bf465bcb052ff0a8edd21918927b1d20749b819d7de2aa175eb2d1101805f0f9ce0e4ecefe7e90d36372d803fb23c5ea5e34bbecfcadfa29c443af1657 WHIRLPOOL c65c0fb15e93b30f8afc0e1a3baef98335797cde9b2dc1519a8062c9fdab14fec325d556b103928ec0576b3abd1340215293e800a782cb5f346dfb46625071c1
 DIST netbeans-trunk-nightly-201609090002-src.zip 217786172 SHA256 35a6f3cc108ed4505b5a8a8c075a1a3ebed0c31b829bcef321f9226dbb5b7504 SHA512 404a03d4a4e6da24591c388c9adb91d529c491e2f07880a027dc35e572859504aa5ed3532360375f921ec9411fc19169f714b6aee51fec3efccd2d6c43a97c82 WHIRLPOOL de26751daf9eb39713bc674fd0250e98fc4ce0714a64cdaba2ab0d04b78d4b4207165f1b11c30083fa79bc2b7073f0c9531b07917317b5b057b2d6e63fb959df
 DIST netbeans-trunk-nightly-201609100002-src.zip 217975100 SHA256 aed7feef3dd16e20fd04c6372f799b8c8ff728986899f89a70b21c81b5f47286 SHA512 226e2ec1c3283e088dfe278e607d65346b95150a698d6d5efef4be9d12fe23d7c3c0a8253994d6ef15c292c56579929624f7f12822a8c4689298b6132af74640 WHIRLPOOL 69d4aded277251d09fb671300dd4694ae54b59bc9e1fa66a492ca6ea427c5a219acaa88a64f2adbac07b5d6d2d1a53c6c284ae4c10c9af8eb3a18be072875982
+DIST netbeans-trunk-nightly-201609110002-src.zip 217975022 SHA256 834a359c4c5118302c97a0153372b559714be528e6f44f5655785a61dbc5d75a SHA512 b4921684195901b073df590ae0ec688965af5dd5bccad68ed7aa9d6a4e9fb0e9658115a17119da12c7d93edea457a7bcf921415c501d4df8e6db6b704c24aaa8 WHIRLPOOL 661191465cf6f92a925a07549c48b7d0c7acbad6a80235d4a73dbf1b3bce5f2eef5f43412df24a4c5933e648aeee11aa738fb5e8479d4d3c38bcd0174902abf6
 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_p20160809.ebuild 4717 SHA256 4e91d25d04a3f331a53833868405ae4241c07622f11cf44dd2f5513b8e2cbcd5 SHA512 ab6d7690c79dc32455e655bcacfcf4053a98cadb5ef05301bf4d115170711a233623a64808a6258f8ebe0baf586643b9d79a236ebf3beddaca67d9f463e5619e WHIRLPOOL 148f3a8b439f428ace496edfcf014dc5500f343d1a758bb58d355bdd3694e0b9026359f7adaf3cfdc56614dd43c54e2a88515f0fbb38c1311363e980f21f9dbc
@@ -69,4 +70,5 @@ EBUILD netbeans-javafx-9999_p20160907.ebuild 4717 SHA256 3633ed9d2a433512946c052
 EBUILD netbeans-javafx-9999_p20160908.ebuild 4717 SHA256 574781d0bd500b62f6e51042448480601cf258448cf6def70f0f4c68ccfcc4af SHA512 ec963af0a1ab6f96fe631831e5b61911bc7ed9f85bd280b3efa8b4b6c3f51dbfbefa10ba5b04fdcab29f76ff017c77e4a9454d7b12317d0a78e1a7796b2ce8c2 WHIRLPOOL eaf3336b916602f5b75d4dce3d537f9228bd6f80e7c41975dd4d03f664b1dfb6a46e6308a26a12716f77c28881e814f7e025d0b96617c6b579bc2e27614e9cd9
 EBUILD netbeans-javafx-9999_p20160909.ebuild 4717 SHA256 418777e0f69a7d9faef3493252e735a893a322f4137f197e6f774979dcb416d1 SHA512 88d0407eccd6b02563269cc052ff941f4bc47a099c37fcfd9dde69b9465ff32dab95e977d762eabd0befe79ebf617f2f063cea2c6df320695dc27b087efa4822 WHIRLPOOL 941f8130ac335c487de30105e032e42e5ffa79bdbfd2678e6aedb520ed5507eda86267861a9f7e386f819153da6b8a6102fd489d873394944605d9427ea950b1
 EBUILD netbeans-javafx-9999_p20160910.ebuild 4717 SHA256 71b4fae2536aecef6f218f06494b1be4b5ccfbaf75f3a90759aa5afe7534e63e SHA512 a04f816f57826042c3f8ff935478efc78b007fe4946c90fb05d68875dfaebff59356fc40ef4dfe6f2cce191c873da16dc4245f3b00430131bad2c425171f47aa WHIRLPOOL b18e8eec7994fe8fdb4cdf672b655ce9a24992f48bca89c99136f9785b74a0d697448ba917c77e61a29686055adf817e2c02b2e1ae095cd25db260b655185ad2
+EBUILD netbeans-javafx-9999_p20160911.ebuild 4717 SHA256 4c63738755851d39eefa810057993024d498fa396b10b01e5f1ae3b8d3b46d32 SHA512 a43d8225fb016eaa1d63a0af6ad950ba2ca51cf6788f63027578e7a395415b2b10b33e26274c7bc2877b777dd4ec83e98074b403c8defb13d42a71e9c9147bec WHIRLPOOL c8aa2994baf669e8ae75831d4485187ab1917479a3957bcfa344010cd83ddcb81fe1a18036c9566f326163a443a74acacb6c6358e6a7f0a556110d3631167566
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160911.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160911.ebuild
new file mode 100644
index 0000000..b8c6f25
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160911.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaFX Cluster"
+HOMEPAGE="http://netbeans.org/projects/javafx"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-09-11_00-02-33/zip/netbeans-trunk-nightly-201609110002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
+	http://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar
+	http://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip
+	http://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip
+	http://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar
+	http://hg.netbeans.org/binaries/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	dev-java/junit:4"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.javafx -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r16-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar apisupport.harness/external/bindex-2.2.jar || die
+	ln -s "${DISTDIR}"/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar apisupport.harness/external/jnlp-servlet.jar || die
+	ln -s "${DISTDIR}"/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar jemmy/external/jemmy-2.3.1.1.jar || die
+	ln -s "${DISTDIR}"/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip jemmy/external/jemmy-2.3.1.1-doc.zip || die
+	ln -s "${DISTDIR}"/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip jemmy/external/jemmy-2.3.1.1-src.zip || die
+	ln -s "${DISTDIR}"/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into apisupport.harness/external javahelp jsearch.jar jsearch-2.0_05.jar
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/javafx >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/javafx$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/javafx
+}

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 0e7d3bc..f4b1016 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201609070002-src.zip 217397241 SHA256 3bceadb91b07bc
 DIST netbeans-trunk-nightly-201609080002-src.zip 217783700 SHA256 ab0b7304f146613a482d4fd73f09610061fb619211e399d251e16f584473b8de SHA512 da4540bf465bcb052ff0a8edd21918927b1d20749b819d7de2aa175eb2d1101805f0f9ce0e4ecefe7e90d36372d803fb23c5ea5e34bbecfcadfa29c443af1657 WHIRLPOOL c65c0fb15e93b30f8afc0e1a3baef98335797cde9b2dc1519a8062c9fdab14fec325d556b103928ec0576b3abd1340215293e800a782cb5f346dfb46625071c1
 DIST netbeans-trunk-nightly-201609090002-src.zip 217786172 SHA256 35a6f3cc108ed4505b5a8a8c075a1a3ebed0c31b829bcef321f9226dbb5b7504 SHA512 404a03d4a4e6da24591c388c9adb91d529c491e2f07880a027dc35e572859504aa5ed3532360375f921ec9411fc19169f714b6aee51fec3efccd2d6c43a97c82 WHIRLPOOL de26751daf9eb39713bc674fd0250e98fc4ce0714a64cdaba2ab0d04b78d4b4207165f1b11c30083fa79bc2b7073f0c9531b07917317b5b057b2d6e63fb959df
 DIST netbeans-trunk-nightly-201609100002-src.zip 217975100 SHA256 aed7feef3dd16e20fd04c6372f799b8c8ff728986899f89a70b21c81b5f47286 SHA512 226e2ec1c3283e088dfe278e607d65346b95150a698d6d5efef4be9d12fe23d7c3c0a8253994d6ef15c292c56579929624f7f12822a8c4689298b6132af74640 WHIRLPOOL 69d4aded277251d09fb671300dd4694ae54b59bc9e1fa66a492ca6ea427c5a219acaa88a64f2adbac07b5d6d2d1a53c6c284ae4c10c9af8eb3a18be072875982
+DIST netbeans-trunk-nightly-201609110002-src.zip 217975022 SHA256 834a359c4c5118302c97a0153372b559714be528e6f44f5655785a61dbc5d75a SHA512 b4921684195901b073df590ae0ec688965af5dd5bccad68ed7aa9d6a4e9fb0e9658115a17119da12c7d93edea457a7bcf921415c501d4df8e6db6b704c24aaa8 WHIRLPOOL 661191465cf6f92a925a07549c48b7d0c7acbad6a80235d4a73dbf1b3bce5f2eef5f43412df24a4c5933e648aeee11aa738fb5e8479d4d3c38bcd0174902abf6
 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_p20160809.ebuild 4412 SHA256 64a8d1049e3af6e36e2386a9ee1c2c59f789a24fec8df688fbe55b44e969ea1b SHA512 ffac090bbfb9c23db4d22652481bfec5631389d4e9f1ebe4cbbd59cd5829f3469cbea811f4e108c1b0172369954aec46e1e269d9ef25ce4175a1a04084d14500 WHIRLPOOL 77f45d36aacd88ad501435092784b17b2f79eeaf1ed654d571a6e7ba78f59f6ac8301064fb58f3324f484bb5fd1f34192649ff02269d9d63ac0c6db9ced4ba73
@@ -61,4 +62,5 @@ EBUILD netbeans-mobility-9999_p20160907.ebuild 4412 SHA256 d4eb077cd0d3fac37225d
 EBUILD netbeans-mobility-9999_p20160908.ebuild 4412 SHA256 1aeed1256f92f122e029d8e889135f20b4a6187494030d287c01cd8f532f1f82 SHA512 7b84d5ade11870885e3efe198100e1f2174cacd9a921b655e119d03d72200c9238c9fdc0e57acc3d878520913b3f0f15acddb6f997d0fe6bb186e636907dde5f WHIRLPOOL 5960d8542d6f0f835cfc27ff63c022311f7e14319f82a7d78c6250b8a55cb04b7672002fa57e011a9133f930670c958d0ff932ea5088bfb15aba50611ed95dda
 EBUILD netbeans-mobility-9999_p20160909.ebuild 4412 SHA256 67a37ad0b5d69fa4b1d49eb28998479840eb2e37cc33d70f41f6632fbc85438d SHA512 413c9f0d06b8280bbcb2860e2a133f0bdee0d4d1ba5fb735e70af5fdd9014025082f7aa0448dc33cd286b871e64389943e8db4dd2a2ec3e78b04320b1bcfc69d WHIRLPOOL 96fb79db51bb646f162c021ae71338e84320e235e04bcb3001a8fbcd78db69247e20c94a315fee209d3bece0b055d67ed7954d42b1cfe186ad8a5311333c67dc
 EBUILD netbeans-mobility-9999_p20160910.ebuild 4412 SHA256 6122fc84f20c58ecbc1d7536d879d87bad9c52826ff0f25e71a4ef47813a85b6 SHA512 49b8372c92f676c043dcbf409acafd817bf60a63adab2570c48f3ea82c38db65cb5fd95769d3a61f52b696e65dfc96fbdaf4456732d718a898739bef9b9f751b WHIRLPOOL f24f0bc05b4474314acbabfa52453b52cfc39470290facccd93d1220869e0f732efd0c7022b3d9821cd14f2ecf35be618cb8dbdd9002e3a7188b91fa53ac121f
+EBUILD netbeans-mobility-9999_p20160911.ebuild 4412 SHA256 23da3ca892cd904e924dbef4f25e34b518d00d38a6084c7fb5d5919fc4a4378f SHA512 24074c6e02cc3b1c2a2b8e36b61272475d25de71eddef0c6b1d78db24ee62da2d28467c2d56543c7d628f70ea3778a67eec4357e71ae4ae58595dc5463850182 WHIRLPOOL b7d64f82cb6b285df1d34c6463479624e26eb5b1b535539c7ba11db3a12deae4f9782bbc6a71666a1f767e0a30cc3e3d5fe61a95922eb4465c6ad39590706fe9
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160911.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160911.ebuild
new file mode 100644
index 0000000..2201211
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160911.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Mobility Cluster"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-09-11_00-02-33/zip/netbeans-trunk-nightly-201609110002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-apisupport-${PV}
+	~dev-java/netbeans-enterprise-${PV}
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-websvccommon-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.mobility -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f | grep -vE "mobility.databindingme/lib/netbeans_databindingme.*\.jar" \
+		| grep -v "vmd.components.midp/netbeans_midp_components_basic/dist/netbeans_midp_components_basic.jar" \
+		| grep -v "vmd.components.midp.pda/netbeans_midp_components_pda/dist/netbeans_midp_components_pda.jar" \
+		| grep -v "vmd.components.midp.wma/netbeans_midp_components_wma/dist/netbeans_midp_components_wma.jar" \
+		| grep -v "vmd.components.svg/nb_svg_midp_components/dist/nb_svg_midp_components.jar" | xargs rm
+
+	unpack netbeans-9999-r16-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-apisupport-${SLOT} apisupport || die
+	cat /usr/share/netbeans-apisupport-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.apisupport.built
+
+	ln -s /usr/share/netbeans-enterprise-${SLOT} enterprise || die
+	cat /usr/share/netbeans-enterprise-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.enterprise.built
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/mobility >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/mobility$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	rm -rf "${D}"/${INSTALL_DIR}/modules/lib || die
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/mobility
+}

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index 9968c14..fc162e1 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201609070002-src.zip 217397241 SHA256 3bceadb91b07bc
 DIST netbeans-trunk-nightly-201609080002-src.zip 217783700 SHA256 ab0b7304f146613a482d4fd73f09610061fb619211e399d251e16f584473b8de SHA512 da4540bf465bcb052ff0a8edd21918927b1d20749b819d7de2aa175eb2d1101805f0f9ce0e4ecefe7e90d36372d803fb23c5ea5e34bbecfcadfa29c443af1657 WHIRLPOOL c65c0fb15e93b30f8afc0e1a3baef98335797cde9b2dc1519a8062c9fdab14fec325d556b103928ec0576b3abd1340215293e800a782cb5f346dfb46625071c1
 DIST netbeans-trunk-nightly-201609090002-src.zip 217786172 SHA256 35a6f3cc108ed4505b5a8a8c075a1a3ebed0c31b829bcef321f9226dbb5b7504 SHA512 404a03d4a4e6da24591c388c9adb91d529c491e2f07880a027dc35e572859504aa5ed3532360375f921ec9411fc19169f714b6aee51fec3efccd2d6c43a97c82 WHIRLPOOL de26751daf9eb39713bc674fd0250e98fc4ce0714a64cdaba2ab0d04b78d4b4207165f1b11c30083fa79bc2b7073f0c9531b07917317b5b057b2d6e63fb959df
 DIST netbeans-trunk-nightly-201609100002-src.zip 217975100 SHA256 aed7feef3dd16e20fd04c6372f799b8c8ff728986899f89a70b21c81b5f47286 SHA512 226e2ec1c3283e088dfe278e607d65346b95150a698d6d5efef4be9d12fe23d7c3c0a8253994d6ef15c292c56579929624f7f12822a8c4689298b6132af74640 WHIRLPOOL 69d4aded277251d09fb671300dd4694ae54b59bc9e1fa66a492ca6ea427c5a219acaa88a64f2adbac07b5d6d2d1a53c6c284ae4c10c9af8eb3a18be072875982
+DIST netbeans-trunk-nightly-201609110002-src.zip 217975022 SHA256 834a359c4c5118302c97a0153372b559714be528e6f44f5655785a61dbc5d75a SHA512 b4921684195901b073df590ae0ec688965af5dd5bccad68ed7aa9d6a4e9fb0e9658115a17119da12c7d93edea457a7bcf921415c501d4df8e6db6b704c24aaa8 WHIRLPOOL 661191465cf6f92a925a07549c48b7d0c7acbad6a80235d4a73dbf1b3bce5f2eef5f43412df24a4c5933e648aeee11aa738fb5e8479d4d3c38bcd0174902abf6
 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_p20160809.ebuild 4111 SHA256 6d55df0ddaba364166e03ccaca27601db8078d105e0428d0f746215b91c94826 SHA512 9b89877aa985d8ea34f12a51cacd1a5d987a6972b8b2cec78adbdf1d69b633a26843c35c7019ccc2580e2081ceb9f73b959d6d7aa45f1e35569a3b365ed36a67 WHIRLPOOL 920a5db9e591874cd639ace9ad8306dec85dd60e8fc0dde304bfe55fbc37a73e59fe3f66b2b965f303e68bb9b376992503bc9dbe6b048454904a71bc08c3cbdd
@@ -64,4 +65,5 @@ EBUILD netbeans-nb-9999_p20160907.ebuild 4111 SHA256 ffd2a344c525ddb53e32a6c3842
 EBUILD netbeans-nb-9999_p20160908.ebuild 4111 SHA256 232cb382c83d4d2bb97bc4a2c9e091b5d1db64d5aa3843cfba46ecaf7b88fb6b SHA512 d6aba3bc1dc8986e8bf5cf32283a9c56e349e0fafd2af2e4ba6ac769d02b528afa47664acd119aa38c292dfccced4320d0ae489d89c3c0609771111b6195c300 WHIRLPOOL e3ae5a167040a99e51f05331ea18d662f71dc3361a75169e7b24a7181685954e416fdd850846cb0288384e86ae7abe2fe0189ca66e9975e1511ebd3e928f6d31
 EBUILD netbeans-nb-9999_p20160909.ebuild 4111 SHA256 4626410a5b83b231c19f9eec4f28380cff8735f20e7e37e5c273261377a6c11d SHA512 a31362acf0a9f8074b262d327ae94088f00fe84bc4cc72840131f749d75affa301144e761345deae0f1094839a3794550caecfb662c7372863028f5304970209 WHIRLPOOL 12f85b127f658d5a4aa4afe59f94b8956ad0f53b3574b2ba8ba8574cbdb0df0f6116696eaae8352134cff22afef75aa95483bc2e50d42e979d5a2db115a8ebd9
 EBUILD netbeans-nb-9999_p20160910.ebuild 4111 SHA256 647d36c04568801aac2a3bf77936197b30324a2a50cb5db3867ee765275f6696 SHA512 ad22ac2318d722b29a5f48d3f5f02fcc552bf6f8a22511fc178e7c27718a95b684de6cd1adb5bf6c91872478698a1654c4b23c81a91adf38ae211c882eecac2e WHIRLPOOL ec7f9bb7b586191596be3c5b41f930d05ca296f683f7cbaf1ac442e14bdc93e10c960d7e5ba4517bf494cc29cfaefc3c2ddd1b204495ca56868c029503dd482a
+EBUILD netbeans-nb-9999_p20160911.ebuild 4111 SHA256 92a3d60f65a1d6bb1930460847f603508ab1d0a083f362b8f630db7d1843f018 SHA512 4f0d7fe3b348dc8b56ecb53723b228d73b349ad8ad452fcc3f3fd8044ae001e0507b3cb1a15d6cc99b8e606bc3210064301baeffeca9934a5c40ed861fa4cdec WHIRLPOOL 1755f328989a31c706ce714ed416198e4e5e37cd2abe456bb2dd2e366ceac58bb349054c55969e5cdff934fdebd785efd66ad8369a32385c12468e18ee578e10
 MISC metadata.xml 392 SHA256 01cdbcc83099b97486bd7b8e813e5b19c1138eb0d8d3e8a5683aafd579820435 SHA512 4d2f9160baa022d6a48b61d5f42e71cfd411d244e7a36436629bc5ee4036e4ce19079134d9a6c704ebe942306c2e0199d0591c1e54f92f8f3c8835147e639246 WHIRLPOOL c1131764e1cec66c56b977ebe36014b29e5a68e35ccc326c0cbadd050a6c625cf191c85c212e0a733661c008dab0d99f9a4cdc4c4ae0cc9d775ba1de554795a9

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160911.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160911.ebuild
new file mode 100644
index 0000000..b3e40ea
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20160911.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Branding"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-09-11_00-02-33/zip/netbeans-trunk-nightly-201609110002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0.png"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster create-netbeans-import finish-build"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.nb -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r16-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans >/dev/null || die
+
+	insinto ${INSTALL_DIR}/nb
+
+	grep -E "/nb$" moduleCluster.properties > "${D}"/${INSTALL_DIR}/nb/moduleCluster.properties || die
+
+	insinto ${INSTALL_DIR}
+	doins -r nb
+	dodoc *.txt
+	dohtml *.html *.css
+
+	insinto ${INSTALL_DIR}/bin
+	doins bin/netbeans
+	dosym ${INSTALL_DIR}/bin/netbeans /usr/bin/netbeans-${SLOT}
+	fperms 755 ${INSTALL_DIR}/bin/netbeans
+
+	insinto /etc/netbeans-${SLOT}
+	doins etc/*
+	dosym /etc/netbeans-${SLOT} ${INSTALL_DIR}/etc
+
+	# fix paths per bug# 163483
+	if [[ -e "${D}"/${INSTALL_DIR}/bin/netbeans ]]; then
+		sed -i -e "s:\"\$progdir\"/../etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans
+		sed -i -e "s:\"\${userdir}\"/etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans
+	fi
+
+	dodir /usr/share/icons/hicolor/32x32/apps
+	dosym ${INSTALL_DIR}/nb/netbeans.png /usr/share/icons/hicolor/32x32/apps/netbeans-${SLOT}.png
+	dodir /usr/share/icons/hicolor/128x128/apps
+	cp "${DISTDIR}"/netbeans-7.0.png "${D}"/usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png || die
+	dosym /usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png /usr/share/pixmaps/netbeans-${SLOT}.png
+
+	popd >/dev/null || die
+
+	make_desktop_entry netbeans-${SLOT} "Netbeans ${PV}" netbeans-${SLOT} Development
+
+	mkdir -p  "${D}"/${INSTALL_DIR}/nb/config || die
+	echo "NBGNT" > "${D}"/${INSTALL_DIR}/nb/config/productid || die
+}

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index f535373..37f1dd8 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201609070002-src.zip 217397241 SHA256 3bceadb91b07bc
 DIST netbeans-trunk-nightly-201609080002-src.zip 217783700 SHA256 ab0b7304f146613a482d4fd73f09610061fb619211e399d251e16f584473b8de SHA512 da4540bf465bcb052ff0a8edd21918927b1d20749b819d7de2aa175eb2d1101805f0f9ce0e4ecefe7e90d36372d803fb23c5ea5e34bbecfcadfa29c443af1657 WHIRLPOOL c65c0fb15e93b30f8afc0e1a3baef98335797cde9b2dc1519a8062c9fdab14fec325d556b103928ec0576b3abd1340215293e800a782cb5f346dfb46625071c1
 DIST netbeans-trunk-nightly-201609090002-src.zip 217786172 SHA256 35a6f3cc108ed4505b5a8a8c075a1a3ebed0c31b829bcef321f9226dbb5b7504 SHA512 404a03d4a4e6da24591c388c9adb91d529c491e2f07880a027dc35e572859504aa5ed3532360375f921ec9411fc19169f714b6aee51fec3efccd2d6c43a97c82 WHIRLPOOL de26751daf9eb39713bc674fd0250e98fc4ce0714a64cdaba2ab0d04b78d4b4207165f1b11c30083fa79bc2b7073f0c9531b07917317b5b057b2d6e63fb959df
 DIST netbeans-trunk-nightly-201609100002-src.zip 217975100 SHA256 aed7feef3dd16e20fd04c6372f799b8c8ff728986899f89a70b21c81b5f47286 SHA512 226e2ec1c3283e088dfe278e607d65346b95150a698d6d5efef4be9d12fe23d7c3c0a8253994d6ef15c292c56579929624f7f12822a8c4689298b6132af74640 WHIRLPOOL 69d4aded277251d09fb671300dd4694ae54b59bc9e1fa66a492ca6ea427c5a219acaa88a64f2adbac07b5d6d2d1a53c6c284ae4c10c9af8eb3a18be072875982
+DIST netbeans-trunk-nightly-201609110002-src.zip 217975022 SHA256 834a359c4c5118302c97a0153372b559714be528e6f44f5655785a61dbc5d75a SHA512 b4921684195901b073df590ae0ec688965af5dd5bccad68ed7aa9d6a4e9fb0e9658115a17119da12c7d93edea457a7bcf921415c501d4df8e6db6b704c24aaa8 WHIRLPOOL 661191465cf6f92a925a07549c48b7d0c7acbad6a80235d4a73dbf1b3bce5f2eef5f43412df24a4c5933e648aeee11aa738fb5e8479d4d3c38bcd0174902abf6
 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_p20160809.ebuild 4418 SHA256 ba12af974c54f01510fb34d85c8ccee40e3049c1faf013547264c0f433df8965 SHA512 b1797ef8b7b8fddf51e539b2dccf39b04f4df50f3f7f75d7717be2da1cb14ea91dbef8f5bd652f946d8a54285d99846275af2e5e47807ffe1dffba3bf41d41c2 WHIRLPOOL dca0cbbb2ae9c298152087ee9a17e760639c04b06b560928e6d474dd1d5c168df956036c09aa33de81a9133c354dea96598c3f0cd4fdf5dfd1d4a5204b7902ba
@@ -66,4 +67,5 @@ EBUILD netbeans-php-9999_p20160907.ebuild 4418 SHA256 4aee4218cd6567d4b6d7876b58
 EBUILD netbeans-php-9999_p20160908.ebuild 4418 SHA256 439dfa9bdfa43a22b1c28090911f0079cdd6d9d13ed55a637aa083bc59c1117c SHA512 fa97e24f5aa31d0ef0a503ec6c47639a04345424c67cea7a25f6b5a7005f015e08af1316a126d23363884d4e4240eaf4333074cec71b5a0f1e979b5161b37029 WHIRLPOOL d3ffa77f3372ae9841c18b80b30e1e831b6de9a73920d28c4e760747eb9b6c28bf8be70c5d1afd3e601cba0f3240720d283cb186c84b739a71d70121f7d015b0
 EBUILD netbeans-php-9999_p20160909.ebuild 4418 SHA256 66360f8ec83a8762077071b694a2821b3edbe816a943dd9ea43126976fe041a9 SHA512 b5d4aabfbe65e08298fb356225eb8fff954efaff18d92ddb0f95a20e5ac4443be837decf41bd725824dcc474a4ae6050142c45d7271d6eeeb1228a7c8608df45 WHIRLPOOL c68f0b433c308038130186600510b3e651ade5574e1d371c4f141e9d046589b855696fc6099bc284c6ab349dabd5d9ddc7ab67238ed8562007fb71a66456dc30
 EBUILD netbeans-php-9999_p20160910.ebuild 4418 SHA256 749665b95b05eeb1bba5ebf88523953c4224cb0867ed8368a5fc72741e0a5610 SHA512 38095f25c05b1acdaf3cedf9305fe4d19e4457f7ec785aefd45a233deb1dcc10fb9f12c215d3cffd6f1a6ebec26cb99f13878abd47cea718a7dc3323517cb5ab WHIRLPOOL 7d5f53dc7a2170818a4123246468b0256da2270f20ec44a7064beb70e8bf2c2710d75d7beb15921e60a9a98587bac4bd6212ea4be801d03159f183bbfb362eed
+EBUILD netbeans-php-9999_p20160911.ebuild 4418 SHA256 8aa8e60e4a00df70dffcb16ff351f739799d993f65c4c5f4259b7b4ba8f7f367 SHA512 7f75750f4dd7ea38b5182205a588064f6cb5e265d8ad28a4741b83f23724e0eed73fcebe5fc47efe2ce062da92493ab7488700493ae92180b56b851722ef004d WHIRLPOOL 72980b93c741a933de67fdad83f06090dd40d7e12ba3f9c33a047de3dcb5f5660e60ddb57cfd9c491561f61d037115c31d16560c14ee6d6ae9443f1beddcf11d
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160911.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160911.ebuild
new file mode 100644
index 0000000..e2642c6
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20160911.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans PHP Cluster"
+HOMEPAGE="http://netbeans.org/projects/php"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-09-11_00-02-33/zip/netbeans-trunk-nightly-201609110002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip
+	http://hg.netbeans.org/binaries/472A52636BE09823B4E5F707071B31FB990A7375-phpsigfiles.zip
+	http://hg.netbeans.org/binaries/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-webcommon-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/javacup:0"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.php -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r16-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip php.phpdoc.documentation/external/phpdocdesc.zip || die
+	ln -s "${DISTDIR}"/472A52636BE09823B4E5F707071B31FB990A7375-phpsigfiles.zip php.project/external/phpsigfiles.zip || die
+	ln -s "${DISTDIR}"/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip php.editor/external/predefined_vars.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.javacup/external javacup javacup.jar java-cup-11a.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-webcommon-${SLOT} webcommon || die
+	cat /usr/share/netbeans-webcommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.webcommon.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/php >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/php$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext
+	pushd "${instdir}" >/dev/null || die
+	rm java-cup-11a.jar && java-pkg_jar-from --into "${instdir}" javacup javacup.jar java-cup-11a.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/php
+}

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index 4d3b728..42cabb6 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -57,6 +57,7 @@ DIST netbeans-trunk-nightly-201609070002-src.zip 217397241 SHA256 3bceadb91b07bc
 DIST netbeans-trunk-nightly-201609080002-src.zip 217783700 SHA256 ab0b7304f146613a482d4fd73f09610061fb619211e399d251e16f584473b8de SHA512 da4540bf465bcb052ff0a8edd21918927b1d20749b819d7de2aa175eb2d1101805f0f9ce0e4ecefe7e90d36372d803fb23c5ea5e34bbecfcadfa29c443af1657 WHIRLPOOL c65c0fb15e93b30f8afc0e1a3baef98335797cde9b2dc1519a8062c9fdab14fec325d556b103928ec0576b3abd1340215293e800a782cb5f346dfb46625071c1
 DIST netbeans-trunk-nightly-201609090002-src.zip 217786172 SHA256 35a6f3cc108ed4505b5a8a8c075a1a3ebed0c31b829bcef321f9226dbb5b7504 SHA512 404a03d4a4e6da24591c388c9adb91d529c491e2f07880a027dc35e572859504aa5ed3532360375f921ec9411fc19169f714b6aee51fec3efccd2d6c43a97c82 WHIRLPOOL de26751daf9eb39713bc674fd0250e98fc4ce0714a64cdaba2ab0d04b78d4b4207165f1b11c30083fa79bc2b7073f0c9531b07917317b5b057b2d6e63fb959df
 DIST netbeans-trunk-nightly-201609100002-src.zip 217975100 SHA256 aed7feef3dd16e20fd04c6372f799b8c8ff728986899f89a70b21c81b5f47286 SHA512 226e2ec1c3283e088dfe278e607d65346b95150a698d6d5efef4be9d12fe23d7c3c0a8253994d6ef15c292c56579929624f7f12822a8c4689298b6132af74640 WHIRLPOOL 69d4aded277251d09fb671300dd4694ae54b59bc9e1fa66a492ca6ea427c5a219acaa88a64f2adbac07b5d6d2d1a53c6c284ae4c10c9af8eb3a18be072875982
+DIST netbeans-trunk-nightly-201609110002-src.zip 217975022 SHA256 834a359c4c5118302c97a0153372b559714be528e6f44f5655785a61dbc5d75a SHA512 b4921684195901b073df590ae0ec688965af5dd5bccad68ed7aa9d6a4e9fb0e9658115a17119da12c7d93edea457a7bcf921415c501d4df8e6db6b704c24aaa8 WHIRLPOOL 661191465cf6f92a925a07549c48b7d0c7acbad6a80235d4a73dbf1b3bce5f2eef5f43412df24a4c5933e648aeee11aa738fb5e8479d4d3c38bcd0174902abf6
 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_p20160809.ebuild 9520 SHA256 d4e9b26a05bb74dc0537ef1cff826eb21dd881c0de1ea1f4d65c6ffac6a13ce9 SHA512 050917dce2edf1fb10571f4e91d24d62c0e3ff317dc9e96109105695de646c4d76151486501a4ef98bec17fda8e6c97e6eb409e265a93fdd46646b8948b860a2 WHIRLPOOL ce6543e916a0e55fcde658c11a3f9bd29cf59a336b1ad5fd7186de5778cd5a2c515b1c1be80136a876188e236b9d1668304ad945c1987d512af96b396a2f8240
@@ -87,4 +88,5 @@ EBUILD netbeans-platform-9999_p20160907.ebuild 9520 SHA256 449cabb4137d1b00a1176
 EBUILD netbeans-platform-9999_p20160908.ebuild 9520 SHA256 98fc8b7e4fe8e80df038030da5d63771ae4bafd722e82992404c7bd63324c333 SHA512 cc5f32fe120f77790904effdaed33c2962cf0a41b671e53ff8b9b112944977b9816da3c73d044c730832062a8df3c289496d4cd45e938515dffecffc3ae3da73 WHIRLPOOL 02ffcfb32183fcb2cb2be5dfc53ab9f79cc05d89b92c0a694cbb8a98fef5bf280faead0a5980a2a4f6507895262c607cdf17c006a66f3cd24b47f749d06efb3b
 EBUILD netbeans-platform-9999_p20160909.ebuild 9520 SHA256 3e9d18aaffac1d04c2d6bd7543c2feefb138ab7567c6fc9a5e2b386433ef7439 SHA512 fddea3f3812f7ee5c6ab765422434a655ab22a1237031bb142573cb4947db2298f0697a50f88c92a75c25780270072f18bfb88ff089e43d1d3909c0b63335167 WHIRLPOOL 01f444ea92b583b97754736c68a94abf4b7227ce8e40294da26c9dfb56a8f565a2f3e2b7f55b0ddf6e11bfebf5ff82d95d0ce0adff0b7715ebf3d07afc4126a7
 EBUILD netbeans-platform-9999_p20160910.ebuild 9520 SHA256 16caedb4a8c33292d81ee224084085e383dd6c12bfff35c1284275c160755b0f SHA512 3de79cd722a33b59c5be55e08528608fc6b62f31b33bcd7ee0c1ee4ca6453a028cb83980fc21bb3665f5c9d292716a2310a9f4e3aac17556513ad02efa71ae87 WHIRLPOOL 95234cd88e095ac5628c0f0cccdb418b68522fb57511e5f911cf360d5e94550c1c18d73a21367f382a964f5039a94f4c921781bc024c0c37ab04ba4df2d6432c
+EBUILD netbeans-platform-9999_p20160911.ebuild 9520 SHA256 f853d9939d007f5cf708d7d33dc8597184fcf8bf9d2ceb952653dbea6b667d2a SHA512 9de58902ea8485bae6638eee13df6896ce1db3fca9bc40e3e6186568d059865af9dc4c7290d001e90c87cae8a940951d4d65a1c869400bf03d8b679030c39eb7 WHIRLPOOL 1272b78a96e30bf1d7dc35de7b83bb3ee869569d87a2bb11cabf109ca5a9a7e1befe8fcadcb5e10f0bedefbce20f9d6c6717c57954016434c4f310bdee82db6f
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160911.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160911.ebuild
new file mode 100644
index 0000000..981e001
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20160911.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Platform"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-09-11_00-02-33/zip/netbeans-trunk-nightly-201609110002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar
+	http://hg.netbeans.org/binaries/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar
+	http://hg.netbeans.org/binaries/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar
+	http://hg.netbeans.org/binaries/771CDCA0A3F2F3CE818E20CC2D707A3592422485-ko4j-1.3.jar
+	http://hg.netbeans.org/binaries/A3085BAA78C8EE7F55081E70C79ABE04CA38CE93-net.java.html-1.3.jar
+	http://hg.netbeans.org/binaries/7FC91530F4395FA0D58F9539F3B40858E766BFA3-net.java.html.boot-1.3.jar
+	http://hg.netbeans.org/binaries/5C992BAEC0111EE293BD44173140A9D8EC860765-net.java.html.boot.fx-1.3.jar
+	http://hg.netbeans.org/binaries/BF6C9BB0FFB78A6B846ECAEB880C460D883B4F72-net.java.html.boot.script-1.3.jar
+	http://hg.netbeans.org/binaries/10E4214A89082C70FCF9F721953001C0932037BA-net.java.html.geo-1.3.jar
+	http://hg.netbeans.org/binaries/D97314CE1869DD3B8B8942256A70673E2991C9DD-net.java.html.json-1.3.jar
+	http://hg.netbeans.org/binaries/6BDCE8349F83CD02F2942D4FBFA86A81A129F42A-net.java.html.sound-1.3.jar
+	http://hg.netbeans.org/binaries/E5DDC5E827D3D62E7BE9F7E32927CA01F2839971-org.eclipse.osgi_3.9.1.v20140110-1610.jar
+	http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip
+	http://hg.netbeans.org/binaries/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip
+	http://hg.netbeans.org/binaries/CEC2829EC391CB404AD32EB2D08F879C418B745B-xhr4j-1.3.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+# oracle-jdk-bin is needed for now because of javafx which is not packaged separately yet
+# [parseprojectxml] Distilling /var/tmp/portage/dev-java/netbeans-platform-9999_p20151108/work/nbbuild/build/public-package-jars/org-netbeans-libs-javafx.jar from [/var/tmp/portage/dev-java/netbeans-platform-9999_p20151108/work/nbbuild/netbeans/platform/modules/org-netbeans-libs-javafx.jar, /usr/lib64/icedtea8/jre/lib/ext/jfxrt.jar]
+# [parseprojectxml] Classpath entry /usr/lib64/icedtea8/jre/lib/ext/jfxrt.jar does not exist; skipping
+#  [nbmerge] Failed to build target: all-api.htmlui
+
+CDEPEND="dev-java/hamcrest-core:1.3
+	dev-java/javahelp:0
+	>=dev-java/jna-3.4:0
+	dev-java/junit:4[source]
+	>=dev-java/osgi-core-api-5:0
+	dev-java/osgi-compendium:0
+	dev-java/swing-layout:1[source]
+	dev-java/testng:0"
+DEPEND="dev-java/oracle-jdk-bin:1.8[javafx]
+	app-arch/unzip
+	${CDEPEND}"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.platform -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+JAVA_PKG_WANT_BUILD_VM="oracle-jdk-bin-1.8"
+JAVA_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r16-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar libs.asm/external/asm-all-5.0.1.jar || die
+	ln -s "${DISTDIR}"/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar libs.felix/external/felix-4.2.1.jar || die
+	ln -s "${DISTDIR}"/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar junitlib/external/junit-4.12-javadoc.jar || die
+	ln -s "${DISTDIR}"/771CDCA0A3F2F3CE818E20CC2D707A3592422485-ko4j-1.3.jar o.n.html.ko4j/external/ko4j-1.3.jar || die
+	ln -s "${DISTDIR}"/A3085BAA78C8EE7F55081E70C79ABE04CA38CE93-net.java.html-1.3.jar net.java.html/external/net.java.html-1.3.jar || die
+	ln -s "${DISTDIR}"/7FC91530F4395FA0D58F9539F3B40858E766BFA3-net.java.html.boot-1.3.jar net.java.html.boot/external/net.java.html.boot-1.3.jar || die
+	ln -s "${DISTDIR}"/5C992BAEC0111EE293BD44173140A9D8EC860765-net.java.html.boot.fx-1.3.jar net.java.html.boot.fx/external/net.java.html.boot.fx-1.3.jar || die
+	ln -s "${DISTDIR}"/BF6C9BB0FFB78A6B846ECAEB880C460D883B4F72-net.java.html.boot.script-1.3.jar net.java.html.boot.script/external/net.java.html.boot.script-1.3.jar || die
+	ln -s "${DISTDIR}"/10E4214A89082C70FCF9F721953001C0932037BA-net.java.html.geo-1.3.jar net.java.html.geo/external/net.java.html.geo-1.3.jar || die
+	ln -s "${DISTDIR}"/D97314CE1869DD3B8B8942256A70673E2991C9DD-net.java.html.json-1.3.jar net.java.html.json/external/net.java.html.json-1.3.jar || die
+	ln -s "${DISTDIR}"/6BDCE8349F83CD02F2942D4FBFA86A81A129F42A-net.java.html.sound-1.3.jar net.java.html.sound/external/net.java.html.sound-1.3.jar || die
+	ln -s "${DISTDIR}"/E5DDC5E827D3D62E7BE9F7E32927CA01F2839971-org.eclipse.osgi_3.9.1.v20140110-1610.jar netbinox/external/org.eclipse.osgi_3.9.1.v20140110-1610.jar || die
+	ln -s "${DISTDIR}"/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip o.jdesktop.layout/external/swing-layout-1.0.4-doc.zip || die
+	ln -s "${DISTDIR}"/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip libs.testng/external/testng-6.8.1-javadoc.zip || die
+	ln -s "${DISTDIR}"/CEC2829EC391CB404AD32EB2D08F879C418B745B-xhr4j-1.3.jar o.n.html.xhr4j/external/xhr4j-1.3.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	# upstream jna jar contains bundled binary libraries so we disable that feature
+	epatch netbeans-9999-r16-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --into libs.junit4/external hamcrest-core-1.3 hamcrest-core.jar hamcrest-core-1.3.jar
+	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.jna/external jna jna.jar jna-4.2.2.jar
+	java-pkg_jar-from --into libs.jna.platform/external jna platform.jar jna-platform-4.2.2.jar
+	java-pkg_jar-from --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+	ln -s /usr/share/junit-4/sources/junit-src.zip junitlib/external/junit-4.12-sources.jar || die
+	java-pkg_jar-from --into libs.osgi/external osgi-core-api osgi-core-api.jar osgi.core-5.0.0.jar
+	java-pkg_jar-from --into libs.osgi/external osgi-compendium osgi-compendium.jar osgi.cmpn-4.2.jar
+	java-pkg_jar-from --into o.jdesktop.layout/external swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
+	ln -s /usr/share/swing-layout-1/sources/swing-layout-src.zip o.jdesktop.layout/external/swing-layout-1.0.4-src.zip || die
+	java-pkg_jar-from --into libs.testng/external testng testng.jar testng-6.8.1-dist.jar
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	unset DISPLAY
+	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+	pushd nbbuild/netbeans/platform >/dev/null || die
+
+	java-pkg_dojar lib/*.jar
+	grep -E "/platform$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	insinto ${INSTALL_DIR}
+	doins -r *
+	rm "${D}"/${INSTALL_DIR}/docs/junit-4.12-sources.jar || die
+	dosym /usr/share/junit-4/sources/junit-src.zip ${INSTALL_DIR}/docs/junit-4.12-sources.jar
+	rm "${D}"/${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip || die
+	dosym /usr/share/swing-layout-1/sources/swing-layout-src.zip ${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip
+	find "${D}"/${INSTALL_DIR} -name "*.exe" -delete
+	find "${D}"/${INSTALL_DIR} -name "*.dll" -delete
+	rm -fr "${D}"/modules/lib || die
+
+	popd >/dev/null || die
+
+	fperms 775 ${INSTALL_DIR}/lib/nbexec
+	dosym ${INSTALL_DIR}/lib/nbexec /usr/bin/nbexec-${SLOT}
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext
+	pushd "${instdir}" >/dev/null || die
+	rm hamcrest-core-1.3.jar && java-pkg_jar-from --into "${instdir}" hamcrest-core-1.3 hamcrest-core.jar hamcrest-core-1.3.jar
+	rm jhall-2.0_05.jar && java-pkg_jar-from --into "${instdir}" javahelp jhall.jar jhall-2.0_05.jar
+	rm jna-4.2.2.jar && java-pkg_jar-from --into "${instdir}" jna jna.jar jna-4.2.2.jar
+	rm jna-platform-4.2.2.jar && java-pkg_jar-from --into "${instdir}" jna platform.jar jna-platform-4.2.2.jar
+	rm junit-4.12.jar && java-pkg_jar-from --into "${instdir}" junit-4 junit.jar junit-4.12.jar
+	rm osgi.cmpn-4.2.jar && java-pkg_jar-from --into "${instdir}" osgi-compendium osgi-compendium.jar osgi.cmpn-4.2.jar
+	rm osgi.core-5.0.0.jar && java-pkg_jar-from --into "${instdir}" osgi-core-api osgi-core-api.jar osgi.core-5.0.0.jar
+	rm swing-layout-1.0.4.jar && java-pkg_jar-from --into "${instdir}" swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
+	rm testng-6.8.1-dist.jar && java-pkg_jar-from --into "${instdir}" testng testng.jar testng-6.8.1-dist.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/platform
+}

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 0ea3c52..00174d3 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201609070002-src.zip 217397241 SHA256 3bceadb91b07bc
 DIST netbeans-trunk-nightly-201609080002-src.zip 217783700 SHA256 ab0b7304f146613a482d4fd73f09610061fb619211e399d251e16f584473b8de SHA512 da4540bf465bcb052ff0a8edd21918927b1d20749b819d7de2aa175eb2d1101805f0f9ce0e4ecefe7e90d36372d803fb23c5ea5e34bbecfcadfa29c443af1657 WHIRLPOOL c65c0fb15e93b30f8afc0e1a3baef98335797cde9b2dc1519a8062c9fdab14fec325d556b103928ec0576b3abd1340215293e800a782cb5f346dfb46625071c1
 DIST netbeans-trunk-nightly-201609090002-src.zip 217786172 SHA256 35a6f3cc108ed4505b5a8a8c075a1a3ebed0c31b829bcef321f9226dbb5b7504 SHA512 404a03d4a4e6da24591c388c9adb91d529c491e2f07880a027dc35e572859504aa5ed3532360375f921ec9411fc19169f714b6aee51fec3efccd2d6c43a97c82 WHIRLPOOL de26751daf9eb39713bc674fd0250e98fc4ce0714a64cdaba2ab0d04b78d4b4207165f1b11c30083fa79bc2b7073f0c9531b07917317b5b057b2d6e63fb959df
 DIST netbeans-trunk-nightly-201609100002-src.zip 217975100 SHA256 aed7feef3dd16e20fd04c6372f799b8c8ff728986899f89a70b21c81b5f47286 SHA512 226e2ec1c3283e088dfe278e607d65346b95150a698d6d5efef4be9d12fe23d7c3c0a8253994d6ef15c292c56579929624f7f12822a8c4689298b6132af74640 WHIRLPOOL 69d4aded277251d09fb671300dd4694ae54b59bc9e1fa66a492ca6ea427c5a219acaa88a64f2adbac07b5d6d2d1a53c6c284ae4c10c9af8eb3a18be072875982
+DIST netbeans-trunk-nightly-201609110002-src.zip 217975022 SHA256 834a359c4c5118302c97a0153372b559714be528e6f44f5655785a61dbc5d75a SHA512 b4921684195901b073df590ae0ec688965af5dd5bccad68ed7aa9d6a4e9fb0e9658115a17119da12c7d93edea457a7bcf921415c501d4df8e6db6b704c24aaa8 WHIRLPOOL 661191465cf6f92a925a07549c48b7d0c7acbad6a80235d4a73dbf1b3bce5f2eef5f43412df24a4c5933e648aeee11aa738fb5e8479d4d3c38bcd0174902abf6
 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_p20160809.ebuild 3472 SHA256 e48396e4beb2dce00ebd932c68cecbbc7fe2ce22727ec8318f70538b1d49cea9 SHA512 4a3f3abbcce7ecbbc226a3bed28347c2dbf434b8ecc34c9c61507f20d42f9eb8b74ef2a39307672be681920505bb2d2aca4ef934ff567c2bda6bec941ef5a9e8 WHIRLPOOL feb603f6cd04c67bc0308f1a54a7c5acc83fe325b089d0f01d06c3c99119b6649a76330a659d56b22d976afbd9de6c39f3b4e7a0a1416a1ae7370a0eb0503de6
@@ -61,4 +62,5 @@ EBUILD netbeans-profiler-9999_p20160907.ebuild 3472 SHA256 655b2a683213c4983ff09
 EBUILD netbeans-profiler-9999_p20160908.ebuild 3472 SHA256 1e374da400fe2b3560c92bc3e7131f558bc70af015d206609fa04ca9e1c99704 SHA512 c799308b0df1866a8c844d395f0b284a6ae0becc3d688e67d86eb7f30d46394d4b0aa3602e935e00d26798e4fc9386486a120c1a730f323f13848337251ed67d WHIRLPOOL 840106502e94919f25ea5245ceb63123b0ba92f35d435a630a743a3df36b580f8544ec62e467943b732a1d9690eed12c068c3c8ddc242f7fcd08b39eede6c66e
 EBUILD netbeans-profiler-9999_p20160909.ebuild 3472 SHA256 e4b7317cd1f28029ba2964c888569bc675a80bf12aa7b0e96f818f07a4b93688 SHA512 fce03c588e772131ee3b3061581b5f841eb33903f4d09ea5d520b64460fa418c90e274b13aba0a230b5a353f07faa04a297f3eec09f08a0b2599710c2896c740 WHIRLPOOL 3843fb5fa8d3a1edc1f4412c923a60071daf4bffa0dabe64d437127375801515c856cfaee2540d85abf25a7cc7cae71ce483097316632c7dcfdf953891e101b4
 EBUILD netbeans-profiler-9999_p20160910.ebuild 3472 SHA256 d2903c7eaa59216dff87cfb21b56d9cf14df8ed8b26b208e94fedd94072fa290 SHA512 26aab83aaa5b9de65e7bc6351460c418e4376fb37ee38b97a76e8259f6ee9c82a49e46f063ffa93cbdef070b3c41497ee9dd4302eeec4d77b1d749c52fa2b98d WHIRLPOOL 647111db2b27141b56029ead4753a70f2f6d98decf779be89b6ed2f12c49428d103c588cae3399291ec14e6274392ca6faac58ad5461d658fc4873c56bef4ece
+EBUILD netbeans-profiler-9999_p20160911.ebuild 3472 SHA256 15abae1bcc6416c50962473553151acd9e58f336c57a41b27d4a61518b51d8a8 SHA512 0f33e162777907474229171a5e5b5432b9f0b43a6712f6b31fa0ae88985bdf1868f1e8d199b17fff6556bc4a76f708a0859f15c4b56d358224f649f2ae279eef WHIRLPOOL 593e8fa4fbd8f036cdad2a08689569008b5f4b8075107b65fcce5b36510650eccf49cca3c1173b663e7b40e0f8e6825e772f4a1edb536d7c90ba154031c02389
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160911.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160911.ebuild
new file mode 100644
index 0000000..c06a19d
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160911.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Profiler Cluster"
+HOMEPAGE="http://netbeans.org/projects/profiler"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-09-11_00-02-33/zip/netbeans-trunk-nightly-201609110002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+# Binary files needed for remote profiling
+QA_PREBUILT="usr/share/netbeans-profiler-${SLOT}/lib/deployed/*"
+
+CDEPEND="~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.profiler -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r16-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/profiler >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/profiler$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	for file in lib/deployed/cvm/linux/*.so ; do
+		fperms 755 ${file}
+	done
+
+	for file in lib/deployed/jdk*/linux*/*.so ; do
+		fperms 755 ${file}
+	done
+
+	for file in remote-pack-defs/*.sh ; do
+		fperms 755 ${file}
+	done
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/profiler
+}

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index 55baa88..e5c0c14 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -50,6 +50,7 @@ DIST netbeans-trunk-nightly-201609070002-src.zip 217397241 SHA256 3bceadb91b07bc
 DIST netbeans-trunk-nightly-201609080002-src.zip 217783700 SHA256 ab0b7304f146613a482d4fd73f09610061fb619211e399d251e16f584473b8de SHA512 da4540bf465bcb052ff0a8edd21918927b1d20749b819d7de2aa175eb2d1101805f0f9ce0e4ecefe7e90d36372d803fb23c5ea5e34bbecfcadfa29c443af1657 WHIRLPOOL c65c0fb15e93b30f8afc0e1a3baef98335797cde9b2dc1519a8062c9fdab14fec325d556b103928ec0576b3abd1340215293e800a782cb5f346dfb46625071c1
 DIST netbeans-trunk-nightly-201609090002-src.zip 217786172 SHA256 35a6f3cc108ed4505b5a8a8c075a1a3ebed0c31b829bcef321f9226dbb5b7504 SHA512 404a03d4a4e6da24591c388c9adb91d529c491e2f07880a027dc35e572859504aa5ed3532360375f921ec9411fc19169f714b6aee51fec3efccd2d6c43a97c82 WHIRLPOOL de26751daf9eb39713bc674fd0250e98fc4ce0714a64cdaba2ab0d04b78d4b4207165f1b11c30083fa79bc2b7073f0c9531b07917317b5b057b2d6e63fb959df
 DIST netbeans-trunk-nightly-201609100002-src.zip 217975100 SHA256 aed7feef3dd16e20fd04c6372f799b8c8ff728986899f89a70b21c81b5f47286 SHA512 226e2ec1c3283e088dfe278e607d65346b95150a698d6d5efef4be9d12fe23d7c3c0a8253994d6ef15c292c56579929624f7f12822a8c4689298b6132af74640 WHIRLPOOL 69d4aded277251d09fb671300dd4694ae54b59bc9e1fa66a492ca6ea427c5a219acaa88a64f2adbac07b5d6d2d1a53c6c284ae4c10c9af8eb3a18be072875982
+DIST netbeans-trunk-nightly-201609110002-src.zip 217975022 SHA256 834a359c4c5118302c97a0153372b559714be528e6f44f5655785a61dbc5d75a SHA512 b4921684195901b073df590ae0ec688965af5dd5bccad68ed7aa9d6a4e9fb0e9658115a17119da12c7d93edea457a7bcf921415c501d4df8e6db6b704c24aaa8 WHIRLPOOL 661191465cf6f92a925a07549c48b7d0c7acbad6a80235d4a73dbf1b3bce5f2eef5f43412df24a4c5933e648aeee11aa738fb5e8479d4d3c38bcd0174902abf6
 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_p20160809.ebuild 6242 SHA256 be4bbfe8b2da33a58e613abc7a1392bf87ad4ea4db306d9a195c79577ecee91a SHA512 7ce16484c42d7410a345e6863e235da5684b41a213d4443bc9a7a54504221263e174d4a19f3a7a5f60a2221f0104952852ea0d11d94704f549fd6de63a234f02 WHIRLPOOL b9196a94d64e4ce1622bae5d60c567307393bba074797f106a5d4f94419d6ea406d30524305fabf1655e88f7ca5cde99448a2d6b6ea0e0a732278829289ccb1a
@@ -80,4 +81,5 @@ EBUILD netbeans-webcommon-9999_p20160907.ebuild 6242 SHA256 7b42af85378f7ef61b2a
 EBUILD netbeans-webcommon-9999_p20160908.ebuild 6242 SHA256 d36a31e1dcd0f4914319e37a681938f3c20f0756d1b7eee3b0dde7271f895c7f SHA512 4e1c741b8c5564d631eb4a9d5712bb9ce8e9d7b6d445458387a740eeb771dca1b991b919f17d966a29557abddff244db064725aeb45a0417cca25d514b0b335d WHIRLPOOL 1a4f712872598f382decaf468021c60c697cc70418bdf26e88c553c97cd3d49f405d3b9164422d8ff5b7436a2385183f124740ff1b641d1c72fbfdaceefbceaa
 EBUILD netbeans-webcommon-9999_p20160909.ebuild 6242 SHA256 a2f9cd74250d96553873d6177a5f5570483f3ba4fbd3fe173abb2231079ef738 SHA512 954a9a6ba77ae51b1ca92addad65cfb48d5210eb3d00ad73294482893b332f16cfb3fcb20f9c22a03274d8527c621c98ee17f55f4d3eaa3518f1cb03dcfe5a3e WHIRLPOOL 8fab2a0b1a0ae78122f0c49abbf0c9a7656e4706a3808ecf2b031563bfdf45a115cc6ece16103c737667169c7b253c6c87f90621554c68efdff3e0405626c4d8
 EBUILD netbeans-webcommon-9999_p20160910.ebuild 6242 SHA256 257c5081ee935f61285a86a76df4981405a809cfdea73abb963fe3215080ae15 SHA512 646a1873793203b3174285bf94eba09f9c7b85415c049de36fa8749150a87dc77f56d701723946a152dfd71b918aa07cfae10640b768ec994aaa4b1e51b5f4cd WHIRLPOOL 63912b56bc011bba104ebcbfbb9c5c02650dab8b56f27d66f338ac3dc176bef60f27110c4473c6dee1f2d66d60ea9a6bfd9050975f096d3992c5745b0713f3c6
+EBUILD netbeans-webcommon-9999_p20160911.ebuild 6242 SHA256 60777427a203d4617001dd9ac7d7623a50a0cb57b33acbaa52eefcd3d75e4bcb SHA512 8a8e31693edd042095c19b6c49df2b07b7ea891accc4157da7cedd0ceb63943eb115fc6f7e42d9cd1d97399deddc976394e5ca72326ba91b0ec65a5fc76bb378 WHIRLPOOL 1f147b3bf6c6dc09bc413188501590ed107b14d3c25add21d003ce0080cec8f73ddb9331aba083bc3f2c64888358e1b24bef7030313301e06549f5c5cde6d4db
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index cb55cfd..377aea3 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201609070002-src.zip 217397241 SHA256 3bceadb91b07bc
 DIST netbeans-trunk-nightly-201609080002-src.zip 217783700 SHA256 ab0b7304f146613a482d4fd73f09610061fb619211e399d251e16f584473b8de SHA512 da4540bf465bcb052ff0a8edd21918927b1d20749b819d7de2aa175eb2d1101805f0f9ce0e4ecefe7e90d36372d803fb23c5ea5e34bbecfcadfa29c443af1657 WHIRLPOOL c65c0fb15e93b30f8afc0e1a3baef98335797cde9b2dc1519a8062c9fdab14fec325d556b103928ec0576b3abd1340215293e800a782cb5f346dfb46625071c1
 DIST netbeans-trunk-nightly-201609090002-src.zip 217786172 SHA256 35a6f3cc108ed4505b5a8a8c075a1a3ebed0c31b829bcef321f9226dbb5b7504 SHA512 404a03d4a4e6da24591c388c9adb91d529c491e2f07880a027dc35e572859504aa5ed3532360375f921ec9411fc19169f714b6aee51fec3efccd2d6c43a97c82 WHIRLPOOL de26751daf9eb39713bc674fd0250e98fc4ce0714a64cdaba2ab0d04b78d4b4207165f1b11c30083fa79bc2b7073f0c9531b07917317b5b057b2d6e63fb959df
 DIST netbeans-trunk-nightly-201609100002-src.zip 217975100 SHA256 aed7feef3dd16e20fd04c6372f799b8c8ff728986899f89a70b21c81b5f47286 SHA512 226e2ec1c3283e088dfe278e607d65346b95150a698d6d5efef4be9d12fe23d7c3c0a8253994d6ef15c292c56579929624f7f12822a8c4689298b6132af74640 WHIRLPOOL 69d4aded277251d09fb671300dd4694ae54b59bc9e1fa66a492ca6ea427c5a219acaa88a64f2adbac07b5d6d2d1a53c6c284ae4c10c9af8eb3a18be072875982
+DIST netbeans-trunk-nightly-201609110002-src.zip 217975022 SHA256 834a359c4c5118302c97a0153372b559714be528e6f44f5655785a61dbc5d75a SHA512 b4921684195901b073df590ae0ec688965af5dd5bccad68ed7aa9d6a4e9fb0e9658115a17119da12c7d93edea457a7bcf921415c501d4df8e6db6b704c24aaa8 WHIRLPOOL 661191465cf6f92a925a07549c48b7d0c7acbad6a80235d4a73dbf1b3bce5f2eef5f43412df24a4c5933e648aeee11aa738fb5e8479d4d3c38bcd0174902abf6
 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_p20160809.ebuild 2721 SHA256 83c47f4cd0e28ca7c088d4dba8a311892d0313d0528bb38cabad89e1a5018a5f SHA512 b1dadd45bf979a8f8e351d82eda8f8445c049c77655d889415e7d6418667d368f3d38e5428ff866559e12fa6f0c15529e65deb16e4f9039007d0e1c55458f05f WHIRLPOOL 82fbec856d51fd38e1e055dd7eacd1109867ba97b865488313cde171c37c288846898c25c9eb229ed3868728b619fc35c0f6561a24a20e18cda3db18bdcb2805
@@ -61,4 +62,5 @@ EBUILD netbeans-websvccommon-9999_p20160907.ebuild 2721 SHA256 8d684bbb5115f085a
 EBUILD netbeans-websvccommon-9999_p20160908.ebuild 2721 SHA256 6f2466b4e24437681227cf095f8d6d91e55c83df868b3a76e7ac6d59ec137453 SHA512 be033425eba4a6c2b1b96da61ec7e6986e958e2cfe61520cfd5c221162fd0b46bf0ad7d3329e1f3f052972f589efc6a08eaa1e57fe2d9fbd18497371edd03d2e WHIRLPOOL 95d65806fbb93fed2a2f0322bfe3d90010b54655456e99907337885ac05f03db9aee8fb2e587f0dc54a6511e41e46815113781c87624f42f96128214d4e7e8eb
 EBUILD netbeans-websvccommon-9999_p20160909.ebuild 2721 SHA256 fc33d57c28150637f021cd5e17a25a572519e1669b96a13fc42875a5999abe01 SHA512 42e0b3ab401a3beb8dafd6cab0bf769281ab142e906d7b3d4f17dea8dcd133908d1ac6beabc97802f535f16c7b31595ae2c4eb50fac3c01ce1a715b8c2479935 WHIRLPOOL d4268bab7bd236b6c5e61ba04eb9866201ee5e2a73a5984ec1bc9310cc17b45ac526e5f44c88543862a788606211818e8dcd06fcb7c9d553526021367c8157ae
 EBUILD netbeans-websvccommon-9999_p20160910.ebuild 2721 SHA256 0f832fb022c42a123c7583fb0f6a7ca063408c0a3b45b1ea495cb201ace1181c SHA512 a8092538958fd285a6edd976a8c91379b8ffd94c2ec1c646f739d96655524c895b4d61b6c0681796518ad47f7edbca82a383af3e311b407ca31792ad00bd71f5 WHIRLPOOL 110e44e7524156d0e02f0c31a47d4ef067710b2c954d72a26a5294fe7f32bf87e5d987041a873def1bad9fa77093807ede051d5653579a848bb2a9d7b62f8b07
+EBUILD netbeans-websvccommon-9999_p20160911.ebuild 2721 SHA256 3b552a4804d6c3a57611843cd3ec92afb47c99008bda464977edb0e42f174c63 SHA512 de428f9edca4e4544c79407089457db7728fc1210d4050687bdd9795e27b35c7cb01e83381e77c582a50ed90a014584def026dd0d329d97332140932966058ce WHIRLPOOL 27e9c88c440a15246ed2a40bf0a23691acd39977e36dc00fcf3fc7373f59e745ce85065652413b740c359de9416285a3c9840b0f427aeefce59bdf30355421e1
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 9481884..9946a4a 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201609070002-src.zip 217397241 SHA256 3bceadb91b07bc
 DIST netbeans-trunk-nightly-201609080002-src.zip 217783700 SHA256 ab0b7304f146613a482d4fd73f09610061fb619211e399d251e16f584473b8de SHA512 da4540bf465bcb052ff0a8edd21918927b1d20749b819d7de2aa175eb2d1101805f0f9ce0e4ecefe7e90d36372d803fb23c5ea5e34bbecfcadfa29c443af1657 WHIRLPOOL c65c0fb15e93b30f8afc0e1a3baef98335797cde9b2dc1519a8062c9fdab14fec325d556b103928ec0576b3abd1340215293e800a782cb5f346dfb46625071c1
 DIST netbeans-trunk-nightly-201609090002-src.zip 217786172 SHA256 35a6f3cc108ed4505b5a8a8c075a1a3ebed0c31b829bcef321f9226dbb5b7504 SHA512 404a03d4a4e6da24591c388c9adb91d529c491e2f07880a027dc35e572859504aa5ed3532360375f921ec9411fc19169f714b6aee51fec3efccd2d6c43a97c82 WHIRLPOOL de26751daf9eb39713bc674fd0250e98fc4ce0714a64cdaba2ab0d04b78d4b4207165f1b11c30083fa79bc2b7073f0c9531b07917317b5b057b2d6e63fb959df
 DIST netbeans-trunk-nightly-201609100002-src.zip 217975100 SHA256 aed7feef3dd16e20fd04c6372f799b8c8ff728986899f89a70b21c81b5f47286 SHA512 226e2ec1c3283e088dfe278e607d65346b95150a698d6d5efef4be9d12fe23d7c3c0a8253994d6ef15c292c56579929624f7f12822a8c4689298b6132af74640 WHIRLPOOL 69d4aded277251d09fb671300dd4694ae54b59bc9e1fa66a492ca6ea427c5a219acaa88a64f2adbac07b5d6d2d1a53c6c284ae4c10c9af8eb3a18be072875982
+DIST netbeans-trunk-nightly-201609110002-src.zip 217975022 SHA256 834a359c4c5118302c97a0153372b559714be528e6f44f5655785a61dbc5d75a SHA512 b4921684195901b073df590ae0ec688965af5dd5bccad68ed7aa9d6a4e9fb0e9658115a17119da12c7d93edea457a7bcf921415c501d4df8e6db6b704c24aaa8 WHIRLPOOL 661191465cf6f92a925a07549c48b7d0c7acbad6a80235d4a73dbf1b3bce5f2eef5f43412df24a4c5933e648aeee11aa738fb5e8479d4d3c38bcd0174902abf6
 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_p20160809.ebuild 6939 SHA256 14fa042412f2449b87aba41ca4810563119707c2a7c87c7a54a1db64767ae506 SHA512 70021add22dccf7c1025dea3ece4cc3ce4f34c130f7df3d27f76e995d13ad0b8659692c8fd81fd3e3d61282b001551992c1468b76fa0c7f45e106c4ce5d2a2c8 WHIRLPOOL 60190142aa282065144f7453cab9e5f2e64dbe9f20d1e16f546a9d191a30ac19f358771311c4994a4910c2e7dfadf86abcf2f9e9cc1b34efd83c865a285f0e1e
@@ -64,4 +65,5 @@ EBUILD netbeans-9999_p20160907.ebuild 6939 SHA256 564f7db43887b1c11be220e83c5377
 EBUILD netbeans-9999_p20160908.ebuild 6939 SHA256 1dbdf21b6f0e036dfd305f6c28b06d4865e8d7b3b99bf75ab2e9d02c00900a68 SHA512 b34d10633613ac448c8a374c7fe31112075faf44a3da0241376f21378e6452282060fece1c225513a46d54b5050f33cec25f4756725c740ccc51ddf1d5fa5466 WHIRLPOOL 72feb639c1e2684f6a39ec7718e109aafaf23f2a5e28220eec6cc772970f455cd061c7431d07d5b9edfc82a2b242ba08b3ab3148f7060572edb64badc2561e03
 EBUILD netbeans-9999_p20160909.ebuild 6939 SHA256 0634e062ebb1619a7c92ad217a177f3d641985d354b0642a00986ee15c517190 SHA512 1c6596c228f8bb152cb5a057123c96317a66c04ffb40c331801a6beee894b82935c199bdcba74ec967b74f9b84e048c288aaa105c23728b398c332b808470606 WHIRLPOOL 466ded4e2b45759c4ee0549977f3334c3f79391bba8152481a79baaec506d73d0727a72995907204e2d182fb21bed77bdecef01e174b704849288292160f3463
 EBUILD netbeans-9999_p20160910.ebuild 6939 SHA256 63069878160f6856413223e8f1a0676b955c30717ffce94ee23684aeb80b4555 SHA512 880db422027a4634a9df55a03dfc39cffc2821b847f1686fdb99bfaa8ac7b93fd2080f325a3122da086a04f49ec6f0ca498834b1cfea1b9bd9dadd7cd261437b WHIRLPOOL 2746c9cdbb4b0c3144729e774c7b84010bfeaa2b6414e48ae4889518e38778c533fb9b9213c6e18bc005cfd25111cfed54d630d024637c5fcb9456899025ec6e
+EBUILD netbeans-9999_p20160911.ebuild 6939 SHA256 ae1602b2b377fb370a0784518b35cb47a9c63f5beeeee8f957a5bc9912e64594 SHA512 ec9f8dda143a2bcf977b41303f71cb9788073fc1e8ceb27cd042c18fdeedd95e55651619605e938c0daffe34a899a1d2655c29af6609a356dda83e9422d91860 WHIRLPOOL 79fe1b272c83d6ba1f11ffa079f5ee51908bdad1e397085312d491f0a15802600e5f41c12feb4f6a1d7b3f7f9c66351e47512a39fb6ac12271474c49ff8164ff
 MISC metadata.xml 329 SHA256 8aeaf2a0228f15c2e4140f401b30f083509bd99d0a578873069f3595cd8555f3 SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640 WHIRLPOOL 799a9b79b1b447bda9631f67e2dfaf722376740e1d2037796528a05f9745eeed00d9990a74a65ce09f74bc5e1d60a887abde540c3c62487d7dd49b8377c15834

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


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2016-09-11 10:52 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-15 10:21 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-dlight/, dev-java/netbeans-webcommon/, Miroslav Šulc
  -- strict thread matches above, loose matches on Subject: below --
2015-10-02  9:51 Miroslav Šulc
2016-09-11 10:52 Miroslav Šulc

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