public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-websvccommon/, dev-java/netbeans-extide/, ...
@ 2014-12-17  8:11 Miroslav Šulc
  0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2014-12-17  8:11 UTC (permalink / raw
  To: gentoo-commits

commit:     11a5307f2c09a8b84b6323c3a3a05746c256ffb6
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 17 08:10:45 2014 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Dec 17 08:10:45 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=dev/fordfrog.git;a=commit;h=11a5307f

netbeans: bumped to the latest sources

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

diff --git a/dev-java/netbeans-apisupport/ChangeLog b/dev-java/netbeans-apisupport/ChangeLog
index 4a3e7d0..6fb4aed 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_p20141217 (17 Dec 2014)
+
+  17 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-apisupport-9999_p20141217.ebuild:
+  bumped to the latest sources
+
 *netbeans-apisupport-9999_p20141216 (16 Dec 2014)
 
   16 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 0e79b68..8e66935 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -64,6 +64,7 @@ DIST netbeans-trunk-nightly-201412130001-src.zip 200994486 SHA256 30939e6630fc6f
 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
 DIST netbeans-trunk-nightly-201412160001-src.zip 201107782 SHA256 038363b1ab569308a58245000b840ed5b41d4a59325432f34819be9f946a1909 SHA512 dce19e10e9a7dc9811a5b455eeee75b158439642ab6bc45d9fb8168b4f127530f988959b9877223989745882ec3a7f342ab41365f1a3e08cd8389997296af002 WHIRLPOOL 98bc48650d52a0d92204efe214d8eb21d71c0e0db2a021b2660d314c2be730d998e006716a9037dc717fec850d7dfb4cccb25dad51b5e444e9bc229728721a43
+DIST netbeans-trunk-nightly-201412170001-src.zip 201113911 SHA256 2027f4cc789162e0693e1505b4ca1129f0114411a4369892639cbb96cc3445d9 SHA512 ceb29d9634c0983fe22ec2a318eba290c6a9b27e20faaf6258fb94f12184027556bbddc7d3be5c47c111b6241fb63e38c2ad726689ec43449087e6b6c20831c2 WHIRLPOOL 9b3327407877caf1bb9b838d6ecd7a08896e4f35fbffe3816c6ff3067fa9a29dd46b59340b7e1a28c3bca2a52a77cf44107266033cc336b21f21c2b9fc491042
 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
@@ -122,5 +123,6 @@ EBUILD netbeans-apisupport-9999_p20141213.ebuild 3390 SHA256 e7467a6d7b093eb1ffe
 EBUILD netbeans-apisupport-9999_p20141214.ebuild 3390 SHA256 cc0580db484bb618e2d8cc4ad96b0160fe212347091d5636432cb4b44eec9adf SHA512 06c3eac0146fba1062b94104c579652c724adb377c70a845aa80399a0aec79afd4bf09d8a18128552e6ec7648d61074f42b6d7bded977f30b69cd7fa31d62a75 WHIRLPOOL 18d96bc824762106114ba3d2ea9b16e0cf0ce346b563341ffd752452ef9695466b30549b63a70aa0e9fedc0c038dabda0ac9bd0f6ba5fa366a80ffe20c1403dc
 EBUILD netbeans-apisupport-9999_p20141215.ebuild 3390 SHA256 49e3d71857bb249f4bb60b2675eb143e6242597d97e99a88590bbd55b4fba065 SHA512 c68fd2c5944b02b8b523a2b1d6fdedb251cfd9b81926c2515815984a24f35235933eb7ed33cf50a840fc840bcf768c1143bb24985d6ab294b4a968dfa1b4dd8a WHIRLPOOL 26f8ad3399525417873473cf2e844f244e2efbc87ebc4c0a9dd8ec4175de3c7bd984f0ab38fa103a887c61e7d4a6508cae56faa4a46565d6f8590aa7966eb966
 EBUILD netbeans-apisupport-9999_p20141216.ebuild 3390 SHA256 72f75ccef16cc247b73e4183c15d7cc154e9d16f88c30caa3a4cd04146695794 SHA512 a7fef1e320634a66a790372a5b8d9d261149ade2c9f8d68c05e7cc87700a647269155e50beaea47ee7f5ed92b60dffd095b66155954c31a00938b0c7b0a0fdc7 WHIRLPOOL 3dd3d68849fe95723fb279ac4eebe1d460087116761b71be363fba1ad1f189420203c52d12ef0d9c58e3b5f402cebb54e62c30db27f30df02e6296f0ae7a75fa
-MISC ChangeLog 146676 SHA256 da72904740b9d5fd02a9fa327a98e5ebc93d9f0ca743dd1ca8f114e1a84ded4f SHA512 4af15ea19ddcb2134390ced9b2e98583d777a1c7e3079083f992e336a272d21e17e5d4795c93b1b60dd67e8dd588a48037fb8363ccc48db981f80f674650543c WHIRLPOOL 6336e252b18d4ba2b2d63cb1d0eef6560d41e821042d212bfafb393b2830efb3eb05b71c9d59c1a59f14a557d34488862a7249af7c03db536ff2c4d6158df93f
+EBUILD netbeans-apisupport-9999_p20141217.ebuild 3390 SHA256 4866f789110c9a294817f740a9d79f7954547a52c9cc92b8188b3818464cc636 SHA512 421bff8fba5eede7a24be7f2bcd32d82d66b01f572a0095088fed9da19a07e22913f229dc9fb5d5ed44da0545d1242cdbc1ed9092ce94b380063bb82d63de153 WHIRLPOOL 26e1674404ce960ce30af520e70da4fb8bd2466d03c4a369051c53056efd919f78392a26da09a1b69f86c0eb1dba129579cd54eba80df2dcb8964de8eb3e3794
+MISC ChangeLog 146857 SHA256 4f90b2ff0ee36f82bc7942554b92473c56333235c5ceb8283f2282e62add33a5 SHA512 2c1e8cebee37eaa103445d515a09484553c89445c1b55f1fd31c18e063c0d07abf24fc535f9357e012254c23cd3df423624b4d0c297090cabc07cd62bbcf8e11 WHIRLPOOL 3e46a8b712d30c3d4e377dd515a64bcc6044e45447837ba91c033c33f18f9b42f9655c56891ee157cda26d236505dd13eb78962cb6b1787c5b8382959dc23b90
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20141217.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20141217.ebuild
new file mode 100644
index 0000000..0966f6b
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20141217.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-17_00-01-53/zip/netbeans-trunk-nightly-201412170001-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 1751e01..4853f8b 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_p20141217 (17 Dec 2014)
+
+  17 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-cnd-9999_p20141217.ebuild:
+  bumped to the latest sources
+
 *netbeans-cnd-9999_p20141216 (16 Dec 2014)
 
   16 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index f5408c8..5748710 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -77,6 +77,7 @@ DIST netbeans-trunk-nightly-201412130001-src.zip 200994486 SHA256 30939e6630fc6f
 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
 DIST netbeans-trunk-nightly-201412160001-src.zip 201107782 SHA256 038363b1ab569308a58245000b840ed5b41d4a59325432f34819be9f946a1909 SHA512 dce19e10e9a7dc9811a5b455eeee75b158439642ab6bc45d9fb8168b4f127530f988959b9877223989745882ec3a7f342ab41365f1a3e08cd8389997296af002 WHIRLPOOL 98bc48650d52a0d92204efe214d8eb21d71c0e0db2a021b2660d314c2be730d998e006716a9037dc717fec850d7dfb4cccb25dad51b5e444e9bc229728721a43
+DIST netbeans-trunk-nightly-201412170001-src.zip 201113911 SHA256 2027f4cc789162e0693e1505b4ca1129f0114411a4369892639cbb96cc3445d9 SHA512 ceb29d9634c0983fe22ec2a318eba290c6a9b27e20faaf6258fb94f12184027556bbddc7d3be5c47c111b6241fb63e38c2ad726689ec43449087e6b6c20831c2 WHIRLPOOL 9b3327407877caf1bb9b838d6ecd7a08896e4f35fbffe3816c6ff3067fa9a29dd46b59340b7e1a28c3bca2a52a77cf44107266033cc336b21f21c2b9fc491042
 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
@@ -135,5 +136,6 @@ EBUILD netbeans-cnd-9999_p20141213.ebuild 4586 SHA256 daef3dd099e9fa5b37eb07679b
 EBUILD netbeans-cnd-9999_p20141214.ebuild 4586 SHA256 3e40636cd96b89d7a3dfb3459d78dd4bd9571f81d3f42eb656330dd2d31caa9d SHA512 ecd1b2e325edb6bdd854e5b1562c2ace15ed768bf3367453af70ce0f8aea624935e5d437b868fc5b615af2e0087799b43c9864103a69861b51b659bd7582a0e6 WHIRLPOOL 8780719b1bbf1220ea0d53cf4a3b8d7063a023e457abcd75389d850e16146b4b2a201695afb29e0c2688bc693088c77384ead5da444d812d033859aac70dd436
 EBUILD netbeans-cnd-9999_p20141215.ebuild 4586 SHA256 a0cf1d3a42ef3df36ed6462c8f5a802b1aa4a76e62a9c8ac33a8629aae902c2b SHA512 9d74d84a917a8a3585bb372fea96599f6bda8091489dab9aad8a9801b171d295f3e263db1f05ae12607cf9e22b0467809886810a53cdf0a91e6e90d1447b2f04 WHIRLPOOL d0da03e2a132527d864a78b7ff74f80875cc7895e59d68965139618f1169dc5117a96e6f306b3eb326bb939c3025b85fbed36fbb325f1157f27fe093cafea4f0
 EBUILD netbeans-cnd-9999_p20141216.ebuild 4586 SHA256 17587c19d9da703293b5e17fdac270fa591c247c7a3fc8be7a7123e1cf324900 SHA512 8d88a4470a098501f69559fce203bd898e4bd18070c7837bfdbee46b36dde3fe030279b098b8b1bb4bfa1e7e7a067fa5ea431c22da283d5d45f0de7c3b41b309 WHIRLPOOL 975e4862c686cf5c126ea92073753dbdea01b139c8469d162c94689505e0bc1fda32599054194b5d2c612fd1d9774d04c5afe78196b66da226d015e8b06eb185
-MISC ChangeLog 134136 SHA256 c18a3c0ef69ff628ce8542a90791c6a9d01b8fb64f2477ab0eb73b22f179629d SHA512 0fed5b65ebe8da0ba7b6ad925a61ec2b8c8c8b9f261f87b81dbc0dadc0d07a94b7de6d8a3841c1f2ce12b1f909bd234f1696ec95ab1ff971243abf4cf9e1acbe WHIRLPOOL 16c59fca11e3e413308ba3b4514c993e57852d5229464c394cd143c7053c2a72fac73aa703862bef8cd1bbfbd3df6d4ba3fee4aa355b98d5c6533cfdb005bdaf
+EBUILD netbeans-cnd-9999_p20141217.ebuild 4586 SHA256 48212040767b47960c388c34bf384fcdcc092bd66a5d7bfaf2f4041b592f9a0e SHA512 1ff844640fdcf0be2ba48bc219fd560104307dd9405fbb4672f4c6a4e0f09723cdfe63ecbd00b03bca25bbb98dd7de5ea799e3f23a3938137459fad6867a8711 WHIRLPOOL 895809822f771e864993b135849f61e01846f93a1b2c43b6fa3f39f1351e84248bd4f2734c007db5d268e017d5028c86393e5f966d08a5972cce4c371ea6ed70
+MISC ChangeLog 134303 SHA256 fea80f7df28d606faaf0ee0a064e7413c2f4968993c46fde0cdb02de16d5fe6f SHA512 0a2b260a9583b6ec3a19bb15cf19a87b243d89d75fe68af9eced9756d2abb286c7f57f8743fed93666fc11f4ff5ae417c3f5e4aa552aa69eddb889a3655de7f7 WHIRLPOOL cbbc5b606e7c08e7023d3dcc4a70b9e38b8551fcd2b12d3235ef538ca9b3b63b0824d16c3e7f4ce71412b0a3e86df66c869e80b62f13606e503edaf50116e40e
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20141217.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20141217.ebuild
new file mode 100644
index 0000000..6ce4f75
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20141217.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-17_00-01-53/zip/netbeans-trunk-nightly-201412170001-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 a63f295..45e9a12 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_p20141217 (17 Dec 2014)
+
+  17 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-dlight-9999_p20141217.ebuild:
+  bumped to the latest sources
+
 *netbeans-dlight-9999_p20141216 (16 Dec 2014)
 
   16 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 3473fb9..29c0af4 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -71,6 +71,7 @@ DIST netbeans-trunk-nightly-201412130001-src.zip 200994486 SHA256 30939e6630fc6f
 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
 DIST netbeans-trunk-nightly-201412160001-src.zip 201107782 SHA256 038363b1ab569308a58245000b840ed5b41d4a59325432f34819be9f946a1909 SHA512 dce19e10e9a7dc9811a5b455eeee75b158439642ab6bc45d9fb8168b4f127530f988959b9877223989745882ec3a7f342ab41365f1a3e08cd8389997296af002 WHIRLPOOL 98bc48650d52a0d92204efe214d8eb21d71c0e0db2a021b2660d314c2be730d998e006716a9037dc717fec850d7dfb4cccb25dad51b5e444e9bc229728721a43
+DIST netbeans-trunk-nightly-201412170001-src.zip 201113911 SHA256 2027f4cc789162e0693e1505b4ca1129f0114411a4369892639cbb96cc3445d9 SHA512 ceb29d9634c0983fe22ec2a318eba290c6a9b27e20faaf6258fb94f12184027556bbddc7d3be5c47c111b6241fb63e38c2ad726689ec43449087e6b6c20831c2 WHIRLPOOL 9b3327407877caf1bb9b838d6ecd7a08896e4f35fbffe3816c6ff3067fa9a29dd46b59340b7e1a28c3bca2a52a77cf44107266033cc336b21f21c2b9fc491042
 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
@@ -129,5 +130,6 @@ EBUILD netbeans-dlight-9999_p20141213.ebuild 2995 SHA256 9e776c035310099e0b15f89
 EBUILD netbeans-dlight-9999_p20141214.ebuild 2995 SHA256 06a59b20ad934f77c14d33106921936d2bc3357e8fc793b93ce1ba66bc2a847c SHA512 e22aab7409159c91478beb412f0ec74e04a05c953ac705b430927fbc4f23833caf49bb9c1b5fb5b5a363d6a778b10b7b09c68f486a8ae45ba8d4a0d2d2edcdb8 WHIRLPOOL e7072481b6eae1b1764caca1f44b87bb97c9567056c52a8c9953716e948a98c7935d68dd08bc4e19c867227caa791329e2bbdbda55bb6128643da5a091657b51
 EBUILD netbeans-dlight-9999_p20141215.ebuild 2995 SHA256 6c13e748e703c97c6f4589ba6d6e4ac789537c699b8e005ffcf2787be26538d5 SHA512 72279422df36a5da9fb109c5ad731726b6a6f42d6ecbe201101c335af1344df1d547da2df555a034ae66e3aab2fa6c16e8cd22c9af46ff337e68bc3e04d93472 WHIRLPOOL 3eca79082181a0a302df450fc411a093472a856746772670de7951bc93b365eb266a08e8c4e71bb94612953f17bc21a6e3dcc5f6e3b37b8d949bc367b0b3c580
 EBUILD netbeans-dlight-9999_p20141216.ebuild 2995 SHA256 cb72ced0b5d401fbe6a6840d38d7a7c62a1c6bb0c54111cf156534e91375dceb SHA512 3b06aa662ba9d0ad11b74c155f397927e90f28b99a211be1c996269e0e8f4b459a474e9085be4550fb17cdb51b8c5fc3dc0c4c14b535ee8fde3b3f988577a1bd WHIRLPOOL fd85e02187f348a951264b1bdb1b236b74ee7cb1d59d462dcd9d5a95b7e224e0ba895e6c8ee38bee1d4970a11a779200a0d8fa4db7b555a1d1a8333519f680fe
-MISC ChangeLog 139763 SHA256 58e8bae1f9eb52fe5a1c82d1b68e67d28cfabc2e87284dcdb165e1d73c9b190e SHA512 45baa1a7ceb3b4943379aab4ea40e78e5b586538d73bb2c5b25d8eede8e6b013f256df71a758989bd0233b54ae385127656eef382da37f98d9e915e373e33f8b WHIRLPOOL 66e6bca72ae63fa5803a26d778c2e3d3df20ea9bb192cc068725bb76e3c70949466cb7b37f2caa76b77ccc290d5762bb37d3fd79fc7bc95fa852a1663ffe985a
+EBUILD netbeans-dlight-9999_p20141217.ebuild 2995 SHA256 78a2f3883844d2b5db477c562cf42faeb4b5fb7e064cc015f6574a9168d16907 SHA512 cdec54d2673714cacfe047a0e0df4897b3fb768fbf865c354f44f25e2fb3703240686563e1ae35921a6961050a179d4f099e3c04d594f9294750e8650ab760be WHIRLPOOL d29cc7e0b507719cb62496b67197958b2446e65beec61fe16e736939ca70103ad076402216871a81d2ad7976350d9d627e9c65cf4258a3af8c74749a1594aee0
+MISC ChangeLog 139936 SHA256 43e721dd0ba272e00aa8158aa46cd87be667784982be4980e8ee9c22b6ab2b2f SHA512 22b2ea09052cad16d615ac388953d7e4527673d8052bb997bab18f2b92c2d9b0a0783ca40d98693ab7761db0eaa323d2eb2e5807858cb810bbd0c67c81c21698 WHIRLPOOL 22bfff0d98c06adfb4f427ce078b68f932c588faa0f51b9b8c7cad294aea3143693c210a68c9d17e913c518963ce376e75b059ada4fb676455c9db150f85eb86
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20141217.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20141217.ebuild
new file mode 100644
index 0000000..66ac37f
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20141217.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-17_00-01-53/zip/netbeans-trunk-nightly-201412170001-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 6c13006..31ac380 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_p20141217 (17 Dec 2014)
+
+  17 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-enterprise-9999_p20141217.ebuild:
+  bumped to the latest sources
+
 *netbeans-enterprise-9999_p20141216 (16 Dec 2014)
 
   16 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index d0e4e4f..5a19c3d 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -153,6 +153,7 @@ DIST netbeans-trunk-nightly-201412130001-src.zip 200994486 SHA256 30939e6630fc6f
 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
 DIST netbeans-trunk-nightly-201412160001-src.zip 201107782 SHA256 038363b1ab569308a58245000b840ed5b41d4a59325432f34819be9f946a1909 SHA512 dce19e10e9a7dc9811a5b455eeee75b158439642ab6bc45d9fb8168b4f127530f988959b9877223989745882ec3a7f342ab41365f1a3e08cd8389997296af002 WHIRLPOOL 98bc48650d52a0d92204efe214d8eb21d71c0e0db2a021b2660d314c2be730d998e006716a9037dc717fec850d7dfb4cccb25dad51b5e444e9bc229728721a43
+DIST netbeans-trunk-nightly-201412170001-src.zip 201113911 SHA256 2027f4cc789162e0693e1505b4ca1129f0114411a4369892639cbb96cc3445d9 SHA512 ceb29d9634c0983fe22ec2a318eba290c6a9b27e20faaf6258fb94f12184027556bbddc7d3be5c47c111b6241fb63e38c2ad726689ec43449087e6b6c20831c2 WHIRLPOOL 9b3327407877caf1bb9b838d6ecd7a08896e4f35fbffe3816c6ff3067fa9a29dd46b59340b7e1a28c3bca2a52a77cf44107266033cc336b21f21c2b9fc491042
 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
@@ -211,5 +212,6 @@ EBUILD netbeans-enterprise-9999_p20141213.ebuild 15147 SHA256 4a8e3024203451042a
 EBUILD netbeans-enterprise-9999_p20141214.ebuild 15147 SHA256 daf4995d1a7e3826df33e9596ebf2f1d1cbaf80cbfdff501749ae5b818487c2c SHA512 116489b2dcb51998fd25118144052977b8127e374c082273312b991ef23cb49ca22be8d416025212b255eeee04a210a2c5b5543beaa15d1a44dfa367c79c92dd WHIRLPOOL 15076363f371cd858f281b8e91d5226d6b33a7bc2e32b629fccb3c3ab1c92aa59b7fbc7d874c1fafac0533704db483896c51aa5627c2c390657e3897a827b126
 EBUILD netbeans-enterprise-9999_p20141215.ebuild 15147 SHA256 de8254dba13a2460be6e7a2fd63a43d6f77957dfa460713934bfdc441a20aeee SHA512 664ecc6a17699eef34ed9a657c84945fb416a123f922b9092361088f0b974b79b6699f89484da8e621b718c3cceb27aa2a3cad7678c616864ce44abca5f410be WHIRLPOOL a2d57c4bab14fe80745a1a1a486683a59c1c5d55590f712983f2c7577893d17f53b3f260972181e2f7380806ea3ffd809c3426debe7b882bc9057c8bc8eaac1e
 EBUILD netbeans-enterprise-9999_p20141216.ebuild 15147 SHA256 10cbb1debe69ab489153e70200124347919789f4a01a409825ba9b32905530f8 SHA512 ab90a0e503fb4cd8108289c04083c5a9c69bea428814af0a0cc40eded244e13516ea33cddcae72193f017b95ebccbe006b978ca393a364107bb3c0b85f0e4d6a WHIRLPOOL e8549d364c7f5ba62001730175e1541262e5a98ee0cb65f61cf1bc8ceb4df316c64c152fdd14e57ea3d3f6d6522c44b1b6b8ad027c7ddd553953d1d7b25e7d3f
-MISC ChangeLog 147201 SHA256 78caea337773c7fb636a4677c9189b73f4a7900a34addeca64c7c200e902527f SHA512 9d4282114c1e424051ae5eac3037d3537f3b8285ab6141be4855916667fed1b949440c994f31cdc2d56adf023a2b82ba61504e73f905a01228e3243b73445b4f WHIRLPOOL 7b57e67547c732677b1bf4e0e5bd255b6437a1bed8b438c8bac4d29d77ffedee4ab9d46675994227bbe4b5dbba53fe5aa59a341a1498a654a4444ce9019f3879
+EBUILD netbeans-enterprise-9999_p20141217.ebuild 15147 SHA256 a3f2ff4cead6d0783f2c818049b029d5de4895c356a395f53d5414bb1071efb5 SHA512 2d36a50d5a25ea5dc75b5e2c4f3365240ee1f1434654902e9f611e8e4668f8ab792130ccb81d41e84201da8e4a000b3985629e4e23f5726ee58dc892477c4029 WHIRLPOOL e794b2ff69b81145d85298545087121a4156c5bbd9b09a9100c1d5367ad5e644a3a773af7386f28447933e6fd88815042c5cbad156c2789d6e5c1d3122d6f8eb
+MISC ChangeLog 147382 SHA256 f322dd5f327a1e333c90674c6439530bf6404232bba8124375ca826bee9ae6ee SHA512 8825aedf90d6e96de719089a3dba9f4c075f2de1b07237095f2762cbcd1ff41891a1c275bac378cd1eeb7e14c94343bccd0942735bdea6a1970e4b5ea2c727f8 WHIRLPOOL 62ea5b07551b5338964c18284e24012985ef5709893bf8f88c2069d740dc7442c67c22f4de9cd837f746decd8caa84df7e1c7f1dbe441671bcb032e20b5608ad
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20141217.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20141217.ebuild
new file mode 100644
index 0000000..a0ef284
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20141217.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-17_00-01-53/zip/netbeans-trunk-nightly-201412170001-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 089d938..36a5c60 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_p20141217 (17 Dec 2014)
+
+  17 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ergonomics-9999_p20141217.ebuild:
+  bumped to the latest sources
+
 *netbeans-ergonomics-9999_p20141216 (16 Dec 2014)
 
   16 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index fbc9897..533a188 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -64,6 +64,7 @@ DIST netbeans-trunk-nightly-201412130001-src.zip 200994486 SHA256 30939e6630fc6f
 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
 DIST netbeans-trunk-nightly-201412160001-src.zip 201107782 SHA256 038363b1ab569308a58245000b840ed5b41d4a59325432f34819be9f946a1909 SHA512 dce19e10e9a7dc9811a5b455eeee75b158439642ab6bc45d9fb8168b4f127530f988959b9877223989745882ec3a7f342ab41365f1a3e08cd8389997296af002 WHIRLPOOL 98bc48650d52a0d92204efe214d8eb21d71c0e0db2a021b2660d314c2be730d998e006716a9037dc717fec850d7dfb4cccb25dad51b5e444e9bc229728721a43
+DIST netbeans-trunk-nightly-201412170001-src.zip 201113911 SHA256 2027f4cc789162e0693e1505b4ca1129f0114411a4369892639cbb96cc3445d9 SHA512 ceb29d9634c0983fe22ec2a318eba290c6a9b27e20faaf6258fb94f12184027556bbddc7d3be5c47c111b6241fb63e38c2ad726689ec43449087e6b6c20831c2 WHIRLPOOL 9b3327407877caf1bb9b838d6ecd7a08896e4f35fbffe3816c6ff3067fa9a29dd46b59340b7e1a28c3bca2a52a77cf44107266033cc336b21f21c2b9fc491042
 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
@@ -122,5 +123,6 @@ EBUILD netbeans-ergonomics-9999_p20141213.ebuild 2919 SHA256 ae3a0ed3bbab7fed679
 EBUILD netbeans-ergonomics-9999_p20141214.ebuild 2919 SHA256 e36395c7afe8be3fa5db6eccf33a3ecfbeb52cf28fd4278a0ac607a9bde51b80 SHA512 af88d24a5beeb7a47a6f39fbd07ae664e701acde3f182736b1acbd2664ab7ea34e4aae51fb45c8a618e56bf79a44076b57e763f96f8d2369237f563c42a14fff WHIRLPOOL 936e578679df4b50536294051134d888e24591e8475a76c401673ea8db36f3ebde6b33c852f811db7afad17f719f14f0ee5cba1e67771ad5dab86181a47fef4b
 EBUILD netbeans-ergonomics-9999_p20141215.ebuild 2919 SHA256 d8131ea656947195c16c84cee47ac71706f9bb1d3d1d1f2a9bf73ad7cf64b45c SHA512 e60100107d860e645159f8d14d42befaf677f1510d795e2511e947a9aea676ca24c0cf06d7d1f1aa5204556e0371d055a682a6ae99a7119ff04f3daa17704203 WHIRLPOOL 2f0bdd417244ba941724bb0bb66e1984a7ecd897d3f98bf16360c56c74c8e4f75f82d8f65548b5978d49f848623766d32124ec16fdc67e7d29cab1c9481f71e6
 EBUILD netbeans-ergonomics-9999_p20141216.ebuild 2919 SHA256 19eed6e359bb38dff7cfc73e448e33e263188b1b88258db8984016a0d2f764fe SHA512 91e74d408ab8bec6debebaf26929b5b59b1d7fbcdf8402421bafa63b7cd2de76fdd57e7932cc06fb2d129c67db3f65a26463da6930055203aebcd894034b1034 WHIRLPOOL ee292fea6e6ce4bd5e7b46e3566d863df71cdd55d3e0f7649a4fffe552178a7468d2d10732b7fed0ec108ee3855cfe6eb94abd78e6acd753fc7938327e5680e3
-MISC ChangeLog 146676 SHA256 6c0b8b1fa7628f9327024d3635510fc5deef74adc40b800754f1756caee4d8b1 SHA512 b48805cdaa9de1ed51193a31b7b1284b24ad47e5be6e3941e54186d411a8b66fef9bb00aa1e39b20886fcd5770f2fc89d287f42b831dc0956a0b0311efbab3f2 WHIRLPOOL d68bc0ce0031a49be8606e9f68b4806c8aa586c3c24957f95ef484f7609dab41e25598006a2c9b7cdbf5961b8349bba412148c36ae6e948f254cbb63f00f3932
+EBUILD netbeans-ergonomics-9999_p20141217.ebuild 2919 SHA256 cfbdc31381c1317847b87ff0ce8e2412e4ed4aaa6c8f392239441ced04ca54f3 SHA512 d7a6ebab6f33a46143746af893c6bc6ce97aaa77458d429cf1b5af44cfaf22b8feaaae66cdd5dd680c1b90d9251353cbebd80bf2f07214a6cb787dfc6f6d3f58 WHIRLPOOL 5a6f7e9bec7c26b7e1152ab8b162e5877e3e8abc6bfed7dc4ff70d84f9b3b4849a09808b0adce0f6a3d5dafbef3ee222978d54ba7b7adf95bef516a439709e96
+MISC ChangeLog 146857 SHA256 c44099bbbb4e1ca753db20b2a295fb537653db86f9ba5ba021482384abf79ca7 SHA512 58be3df7b28c914eeb9aef6630136657b8ae0cbea0dacece807e4917374150c051e59aa97221b791a3619838c931299bac90fd47ea9c51785123237dee63e4a0 WHIRLPOOL 7946dfefbf3d4bd891a32b8c589a717854a648578b2618598c245ed3900e60608ff9fa13f89d5106094479a851df6bee0a731a80343fb1121b9c6c348703759f
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20141217.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20141217.ebuild
new file mode 100644
index 0000000..4172651
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20141217.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-17_00-01-53/zip/netbeans-trunk-nightly-201412170001-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 3b07ec1..16f4574 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_p20141217 (17 Dec 2014)
+
+  17 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-extide-9999_p20141217.ebuild:
+  bumped to the latest sources
+
 *netbeans-extide-9999_p20141216 (16 Dec 2014)
 
   16 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index 5ed7252..6ebf830 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -62,6 +62,7 @@ DIST netbeans-trunk-nightly-201412130001-src.zip 200994486 SHA256 30939e6630fc6f
 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
 DIST netbeans-trunk-nightly-201412160001-src.zip 201107782 SHA256 038363b1ab569308a58245000b840ed5b41d4a59325432f34819be9f946a1909 SHA512 dce19e10e9a7dc9811a5b455eeee75b158439642ab6bc45d9fb8168b4f127530f988959b9877223989745882ec3a7f342ab41365f1a3e08cd8389997296af002 WHIRLPOOL 98bc48650d52a0d92204efe214d8eb21d71c0e0db2a021b2660d314c2be730d998e006716a9037dc717fec850d7dfb4cccb25dad51b5e444e9bc229728721a43
+DIST netbeans-trunk-nightly-201412170001-src.zip 201113911 SHA256 2027f4cc789162e0693e1505b4ca1129f0114411a4369892639cbb96cc3445d9 SHA512 ceb29d9634c0983fe22ec2a318eba290c6a9b27e20faaf6258fb94f12184027556bbddc7d3be5c47c111b6241fb63e38c2ad726689ec43449087e6b6c20831c2 WHIRLPOOL 9b3327407877caf1bb9b838d6ecd7a08896e4f35fbffe3816c6ff3067fa9a29dd46b59340b7e1a28c3bca2a52a77cf44107266033cc336b21f21c2b9fc491042
 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
@@ -116,5 +117,6 @@ EBUILD netbeans-extide-9999_p20141213.ebuild 3383 SHA256 5113da7d61a6f688ed0c442
 EBUILD netbeans-extide-9999_p20141214.ebuild 3383 SHA256 e388ba20488d462bceaa2968d1d1635b9d42e66dfc6c41904f52d017c503844f SHA512 ed0c7721886d921d972d84d24da439b2a4e3fae01117e5ab477f91864d3d9f39f757488bcb6ded28a21508be574f0a33ddeb244c75438917daf63932c65835ca WHIRLPOOL 40e25e68e128c871e0e832d254165047efc28fb76cdb003cd2c64444fbea296b7a334c47d15d9308a8bf1ccd0fd89b3e9c0570ccd1b37142a25c6d5d8910532d
 EBUILD netbeans-extide-9999_p20141215.ebuild 3383 SHA256 e2efebf52bcba14e6c3729e6ec4c770eeddbc86431482fb9f811230df429a61d SHA512 49c48bdf8b37794156ddeb1ab50b7bea87b88d153f5ca9163a85402fbb2313499e18fc512cfa1d44495a04dd63a97f3449fa8af71aa4dd9ff8f0758d81a09c75 WHIRLPOOL 7f69e10c86e32261f4c3c7374880758c3835e7ef5959014b3d6a98174c131bf54ccc3352fb30eee3448d69419db8fbfddb4b655f144b4c553695eadcabab877a
 EBUILD netbeans-extide-9999_p20141216.ebuild 3383 SHA256 ceccde423e63444f762d91f53504983605d98d51fb1666c518124d69cc09758f SHA512 874d31e116924bf728ad72e476983d3390cca0a33b4a28b1beea38d5aba03e6909ca5058d91d44ac6bcc1c44caa920ae259648846c8b89f4d9d73dbd48f59923 WHIRLPOOL 04406e3fc70a8a4564b01dafeaf9759a8665667282dfd77b27b26f0fe67fef41d806f57d272b22d283f3f7f5a5b1a618585b0cd9cd2e81a757736c4979b4a88a
-MISC ChangeLog 71775 SHA256 ef78a091e86bdfd5411104537bb8df962e0c72180af62b49f8a3debf59f8a3ef SHA512 c5ca5aaa8237bea54e88b3feb544748b02f25324ed1356ab6e263e2eb73a24f4bf5a716740732d5987063e21f3fcdd007a2c8edbd67d48190cb9e51908aef92e WHIRLPOOL 4c30194a8fad2f5d9a30d5a417038e0e540900e7d12f1fde23b07bc8b651753ea21b17084359b6b8ca9cd47cfee2ce237075ba43a7f2acb867c638a90c0144b5
+EBUILD netbeans-extide-9999_p20141217.ebuild 3383 SHA256 a4aab6e471343671fcaf9b23c4afd7b824b3b2386143ab0d89defed63c285a08 SHA512 d7ab9ec37a1920187db2d995d13d141086a77b6ae357d91058095cb1da42f90b91ceb9ca2993774cdb698ddcbdf4b8ec5b7f309e202251016e696e117d78dbb7 WHIRLPOOL 9a37b417f0c3f326217c4fdc82a6e6044a3cec33a0e247ea7d778c7a8db131fbef2865de9054e4860ebfdec47057cc67796c6e4223cc840deb1ef17888d17f86
+MISC ChangeLog 71948 SHA256 04920f7a44ffdd1eeca21be1735028c0498948ca2fa9ac73888e811518e8fa2c SHA512 fec874d3a405fd7bf32d22af836bed62ee28bf1149bab5e5bcd583a068b6bfe0a0c913fc8080650b99c783395ba84516af7cfcf361fc1b5ca19bd471b075147d WHIRLPOOL 3a0e716dd66a92dac1ce50726c5727f53b0b39abc1ebdbdd9c267909d8712fa584e5d83149919c66fb481e871ef52fd443594366226c177175d65e74fa2ecde7
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20141217.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20141217.ebuild
new file mode 100644
index 0000000..cdd0480
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20141217.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-17_00-01-53/zip/netbeans-trunk-nightly-201412170001-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 b8dd5d5..ffc8afe 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_p20141217 (17 Dec 2014)
+
+  17 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-groovy-9999_p20141217.ebuild:
+  bumped to the latest sources
+
 *netbeans-groovy-9999_p20141216 (16 Dec 2014)
 
   16 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index d193760..ae99e2f 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -68,6 +68,7 @@ DIST netbeans-trunk-nightly-201412130001-src.zip 200994486 SHA256 30939e6630fc6f
 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
 DIST netbeans-trunk-nightly-201412160001-src.zip 201107782 SHA256 038363b1ab569308a58245000b840ed5b41d4a59325432f34819be9f946a1909 SHA512 dce19e10e9a7dc9811a5b455eeee75b158439642ab6bc45d9fb8168b4f127530f988959b9877223989745882ec3a7f342ab41365f1a3e08cd8389997296af002 WHIRLPOOL 98bc48650d52a0d92204efe214d8eb21d71c0e0db2a021b2660d314c2be730d998e006716a9037dc717fec850d7dfb4cccb25dad51b5e444e9bc229728721a43
+DIST netbeans-trunk-nightly-201412170001-src.zip 201113911 SHA256 2027f4cc789162e0693e1505b4ca1129f0114411a4369892639cbb96cc3445d9 SHA512 ceb29d9634c0983fe22ec2a318eba290c6a9b27e20faaf6258fb94f12184027556bbddc7d3be5c47c111b6241fb63e38c2ad726689ec43449087e6b6c20831c2 WHIRLPOOL 9b3327407877caf1bb9b838d6ecd7a08896e4f35fbffe3816c6ff3067fa9a29dd46b59340b7e1a28c3bca2a52a77cf44107266033cc336b21f21c2b9fc491042
 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
@@ -126,5 +127,6 @@ EBUILD netbeans-groovy-9999_p20141213.ebuild 3422 SHA256 4f96dca9eb8ce8e64959d3d
 EBUILD netbeans-groovy-9999_p20141214.ebuild 3422 SHA256 54a3c454ce20674fb2fc8fa09deb8003a4b2b55cf66555eb7a8d53a46d812cc2 SHA512 8b731c70373a3e075c652d62ad15584fd8ef213c92f23c3f88e9c1d488e64b5296b3d688f43d357c2889d6bba510ae1e2d52a099880ad4e8d8305dddf54c5129 WHIRLPOOL 8efaf6f0b8f1b74250bae2d3a1835dc03b0a1914b6ba31ffceb0ea66a91727ae6a2e3f2265c04d84f0a868cf15615fd405bb7f155f2729a006c9ac809ff6008b
 EBUILD netbeans-groovy-9999_p20141215.ebuild 3422 SHA256 614e9b44507dc2ef5753d627159ac96bb4bba7536cf9ccded4fbef3d7c552732 SHA512 de2634c5082f68673ce0e1f0b372fca59ae7a06d615132b6f022cdc4135d47158ed492433564da9f67082c03102e6bbe2949627a895b253aa06d35ce664ee90d WHIRLPOOL 1a608408214b2787dc40aa70c9b734363badc4f529a78310beea770b2d019b24326b59a692266e86383ed8171f340267e671578e7d54104acc00ea1363863703
 EBUILD netbeans-groovy-9999_p20141216.ebuild 3422 SHA256 869ef5374cd8519694dc68a73851f68a754ecbecd8aceda3c1be791e191eb094 SHA512 e420a9e83381d7891c89f236311f48d30c1832a09c782fe3406c2acb68a8521a61049129abc8bb288e579e02a6dae0f8ce6ec79a2fd6986eeb28abe5fc43f4b9 WHIRLPOOL a5fcbdea6c5b3b6190e0cd27366ea368e465acf7be3461b5b40f6fcbcd40bb92eb70e2c4478b02d2de85c320e345053f1bf651c1be2cfc3e4dcf8dbe28f9b27e
-MISC ChangeLog 139755 SHA256 a98f4e9872f3c4592716316f019bcd60da07df5a5815c8b09e7c3e17b7dec06e SHA512 4a574c37fc1afe865d28ebd23e53160fb31ea52e85b4f9906b1e02a2fd96d05deb129f31d9b6e296a0772b9aa0fccc68b394165bb2929622fc1e6aaa086342f2 WHIRLPOOL 93b2a5fa6c02836d88c30dd6776d5b878815026aeccc4880ed9881963c7b1f326b6af0e3faeb92e74286c86a02f687cb8b440eed638e9a608797a350fac8fd65
+EBUILD netbeans-groovy-9999_p20141217.ebuild 3422 SHA256 1ae27033e61953707ef3c3275dd3b4379372614d460ddf4264bfc965fdf55f6a SHA512 6ac92eeec787bdf80ae7da918fab64b024df14991ec347becd90d1f62c23a938a05d2ab37631af244c9d6d940e13d9ff1ec13544ff0f3ab4ef7b8917c3fe18e0 WHIRLPOOL 3f88400a4e2da59006cc0a7486f3eb02f277c5ff1e584357bade8d95d0bd1b4a558f9bb89eb65d34736d3eab5aac5c964d0511368279005a5e325d1a1dd97f90
+MISC ChangeLog 139928 SHA256 550b1ee7831b6775d977a736b8e7eef389754d9a7a6a15aadb1843926a703eea SHA512 f1a7526b11027f86ac511de0477022d29923d625db2f78e738ed1b1fdbe1dcc2dc6c432201483ae9b21a0e8131a3489a71582beaedfcd145d1aae950e5aed416 WHIRLPOOL b0cc2a22543c142de2deabb91c48c2f6a02927e8eb6095801c090de3ddb2c6d9a7f8855faddbdacdb7d43c8d2cc5b0703ea85bb15120ba52e60d844728f2d6c0
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20141217.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20141217.ebuild
new file mode 100644
index 0000000..051954b
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20141217.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-17_00-01-53/zip/netbeans-trunk-nightly-201412170001-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 df44e14..d11e072 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_p20141217 (17 Dec 2014)
+
+  17 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-harness-9999_p20141217.ebuild:
+  bumped to the latest sources
+
 *netbeans-harness-9999_p20141216 (16 Dec 2014)
 
   16 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 1ad829d..07a4c2c 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -70,6 +70,7 @@ DIST netbeans-trunk-nightly-201412130001-src.zip 200994486 SHA256 30939e6630fc6f
 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
 DIST netbeans-trunk-nightly-201412160001-src.zip 201107782 SHA256 038363b1ab569308a58245000b840ed5b41d4a59325432f34819be9f946a1909 SHA512 dce19e10e9a7dc9811a5b455eeee75b158439642ab6bc45d9fb8168b4f127530f988959b9877223989745882ec3a7f342ab41365f1a3e08cd8389997296af002 WHIRLPOOL 98bc48650d52a0d92204efe214d8eb21d71c0e0db2a021b2660d314c2be730d998e006716a9037dc717fec850d7dfb4cccb25dad51b5e444e9bc229728721a43
+DIST netbeans-trunk-nightly-201412170001-src.zip 201113911 SHA256 2027f4cc789162e0693e1505b4ca1129f0114411a4369892639cbb96cc3445d9 SHA512 ceb29d9634c0983fe22ec2a318eba290c6a9b27e20faaf6258fb94f12184027556bbddc7d3be5c47c111b6241fb63e38c2ad726689ec43449087e6b6c20831c2 WHIRLPOOL 9b3327407877caf1bb9b838d6ecd7a08896e4f35fbffe3816c6ff3067fa9a29dd46b59340b7e1a28c3bca2a52a77cf44107266033cc336b21f21c2b9fc491042
 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
@@ -128,5 +129,6 @@ EBUILD netbeans-harness-9999_p20141213.ebuild 4131 SHA256 4209fabd988806ba768335
 EBUILD netbeans-harness-9999_p20141214.ebuild 4131 SHA256 e88cca641fe44a59216bd302d57a30769556cd290cbd92a11ee8a0f187982de2 SHA512 bab3ea7c0ded249798efa4ffc5580015c5512cc6b78f362f62bf20ae46928ab6d54bfbf641cb55e48281a34c277dd634fb4f732b728c22e251ab6089d62fd00a WHIRLPOOL 6a64e31dbbbd1be4a99979187d433c3d65b1f4118fc7f5e6e6dc0bfe54e4b53902d59301f1401c6fc9c383c8f9a9d319b344eaf801686ba4ccbbf9391de8bd56
 EBUILD netbeans-harness-9999_p20141215.ebuild 4131 SHA256 c10793603b0fd20a1ee1dd7246adb56c2cf9c21bee7e32225ee0d5b0465e0b69 SHA512 729cb9b93d3c3eb32355194924009d5c0c60341f70d2d6d9d90d74dfbfe9af219906d4e96f57a1988cd648007b3d237bd184cb123e8043b57ad11049bf8749cd WHIRLPOOL 609fa4daec1e9452e34226e3deee1bbea1bfea3dc472a9de466a33975a7aa44877471bc0fad5873b91953c0fe14b88444b9b18d8cb9cedab0d94fb199332c5d6
 EBUILD netbeans-harness-9999_p20141216.ebuild 4131 SHA256 b4f80a143f7d135362044c81ec27c87bea0782c41f9403e36bc002f4c98fc3fe SHA512 93ed720b6c0ad9e2cd7fb5efdb76257edf89296cc0574092b26b44fab5dd31f01614c8885bccbb2aef54fddd0885c7c71befd92340139ebfcedb030ec41bd5a6 WHIRLPOOL b2fdc08acf279ee947420be46003c031a2b568eb3db1f155b1832d4de4b1c0dca01d1eb4c18d3b1e6e58095e012f3aeac4939765aca3f23c3724d4c20f3fea87
-MISC ChangeLog 141514 SHA256 5ae35d6c13afb7aac714819650a14297da978a7c8afef10063693e94b7fd34d4 SHA512 c005a944e594c7709ab6cca456432fdff0b31c3bf9f4a5707faa9fdf353a1a0e533b98447cfde845c66a197fb7a108f879d8c557496bf3b74dc565004bfdf77e WHIRLPOOL db2706c94357910144f8780c2292005fdb257e86da05f3cc4d4458e335dac82a817b670fc5a76b5768e38ea3ef8005ee00adaa5d920359737a92d534f05102d0
+EBUILD netbeans-harness-9999_p20141217.ebuild 4131 SHA256 6834edca7bee301cc1f85c0274d5367288a1c8aeb3f564a5cb10bf1b05cc0d0a SHA512 cbdff37a0e5dd125fba7c3ed781826bbc5b18eae82505e7888f1af75af7d34fa3cd72fb31d5251a31dec04928cd7a9dd697d6b216f685d4023331ab0ee1a5569 WHIRLPOOL b3cef221b3c063727bcfb023696c252b74c2175942c799e45b615f1b9f3810498c9ec0d9a1b7a5f16af5e2f5245ca7030c05c709a0ed7d64d378809fa096d658
+MISC ChangeLog 141689 SHA256 3a1ac9beef1b2c43423a56643b12bd250e995b9ba2844a09ea72413fe9e3ab10 SHA512 66627d440871d1d1a146a976487cc05770118b8fb04918e6c742bbe4584b18ff3eeedc6f8c332fe3d0b37e37a7c699e34de299ab780ec7ab038d067eedefac29 WHIRLPOOL e8d9f545d8b23c75ea88914c51e0d97bdfb9fb0bf6a263ef71d83a85c00d54131f4e5d00375e456f24a5dd60bf044441ed2a7cd7831f59cd01c0e14aa9ce6c3f
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20141217.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20141217.ebuild
new file mode 100644
index 0000000..5c1fbf0
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20141217.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-17_00-01-53/zip/netbeans-trunk-nightly-201412170001-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 5e31bc0..76a732e 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_p20141217 (17 Dec 2014)
+
+  17 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ide-9999_p20141217.ebuild:
+  bumped to the latest sources
+
 *netbeans-ide-9999_p20141216 (16 Dec 2014)
 
   16 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 253dae6..51f882b 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -246,6 +246,7 @@ DIST netbeans-trunk-nightly-201412130001-src.zip 200994486 SHA256 30939e6630fc6f
 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
 DIST netbeans-trunk-nightly-201412160001-src.zip 201107782 SHA256 038363b1ab569308a58245000b840ed5b41d4a59325432f34819be9f946a1909 SHA512 dce19e10e9a7dc9811a5b455eeee75b158439642ab6bc45d9fb8168b4f127530f988959b9877223989745882ec3a7f342ab41365f1a3e08cd8389997296af002 WHIRLPOOL 98bc48650d52a0d92204efe214d8eb21d71c0e0db2a021b2660d314c2be730d998e006716a9037dc717fec850d7dfb4cccb25dad51b5e444e9bc229728721a43
+DIST netbeans-trunk-nightly-201412170001-src.zip 201113911 SHA256 2027f4cc789162e0693e1505b4ca1129f0114411a4369892639cbb96cc3445d9 SHA512 ceb29d9634c0983fe22ec2a318eba290c6a9b27e20faaf6258fb94f12184027556bbddc7d3be5c47c111b6241fb63e38c2ad726689ec43449087e6b6c20831c2 WHIRLPOOL 9b3327407877caf1bb9b838d6ecd7a08896e4f35fbffe3816c6ff3067fa9a29dd46b59340b7e1a28c3bca2a52a77cf44107266033cc336b21f21c2b9fc491042
 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
@@ -306,5 +307,6 @@ EBUILD netbeans-ide-9999_p20141213.ebuild 29641 SHA256 aa278a64234c3423b181e4924
 EBUILD netbeans-ide-9999_p20141214.ebuild 29641 SHA256 f3bd26ac52eda8a8031b5491b41ceba8777a6769ee70b778f47faddbdebab308 SHA512 67f9a5e1164e4407a733649a5abc025fbc1fe557514a225e50b521da3ed7fe3d6a716577ea1ea9bad09dcbe9c8b46d93ced0b405d6719ae3a3c38f34b059dbab WHIRLPOOL a4a2bff3b087b106592ffadb35fa9e5793310e76ab017c8bf15a31cdad976abb5d9c22873ee9ae6ace8d38780facbcc305fca94ab73b2b6d6361592b4677ba0c
 EBUILD netbeans-ide-9999_p20141215.ebuild 29641 SHA256 ce008ddcc3d45e030731dbaca8c2922528ef173a830c764db9197936db1dca40 SHA512 a26c3b74b42094a929bdcd84728046aff8480432fb0f51ece6d30353c038eba63f710a99ad5695555ba7a96d4c3a9adf5929b5d722a2f0c894880853039c66f0 WHIRLPOOL d9397210f9ec8e5779e74fcaa0ea26ae6a82e83fb58a67c74471e7c59db4f708a13e4f7cb3494e3cff01fbabb3537916c970cd4b9519bf26a585cc2711e3406c
 EBUILD netbeans-ide-9999_p20141216.ebuild 29641 SHA256 972183600aecdbcbbe91b9a85d734f5eee43823a0e154156ab576ee00dee0089 SHA512 98858a7bcd890e54f94df161b5d62c1aaa1cf78e1a4102b100a98102ca84e76c6f4bd73b38b431f1a75a9ac6b9da2f0221d31250e14bcf74e9edc29438fe7274 WHIRLPOOL c1f0478989431eec745f88fcf8a0af1b68cf21b3ff0bacf56f8e4f1e2e0cb69766309a4d6b3170ec2f1219e0ee6f30b478fa67a1766a873c294165182e29197b
-MISC ChangeLog 135050 SHA256 c9b4d4e612b12074fae2c7fca01627a181f909af9e642fada8258a88f685a314 SHA512 1fc4e88e5839fc9ec8bfbf6dc66b4867f5a4d43b5c3d05603a0d7ee35033201c57543d7f6f8e329827b9f0a5f7f36a88931e2485c6998ddbc77d2d64825c29fe WHIRLPOOL 1e80f40b559437a9fa7825753b8e23793055f8985edee73a6d5e172713da7f071b60ac0bc1414b9b8c37e765b398b330becc548891cd3848591080634854cae2
+EBUILD netbeans-ide-9999_p20141217.ebuild 29641 SHA256 77156bceff52c977ba0ba01f384b1a6f634d70d1eb9f5cc714eb39b4d3590a9c SHA512 ea124c1805d61fb30787be2f0e3c90df8b9b04421572ea620ea8f648453838e40f5767806b3b0df8545ff811ba3469d6d6195fb6e54316af7f4c721c3fc12f6f WHIRLPOOL 3b1ccb198d1741b49d99adfcfa077dfb0bed0de09986b0427e19cdd6a98bae312a935efa1b5733e88ae226fd82696c39bc8af4e215b76dcbfc455950d8f1a3e0
+MISC ChangeLog 135217 SHA256 8429d3a25ee0c4b12fe93712530d75478bb144d1c86034dbc4e8b32ff226b420 SHA512 5f47eadf374ce70374807c713d9dfbd22c4973d64f428b10ae2e6cdb5ebb0e13cf5ce49e0b909f32f349bed149a598eebf41bbad4cc8f0c8a40de62ef9fe54b5 WHIRLPOOL c353b40cb369902e4d26bb41ae496eae2497fb3be0ca996fb70bde1b220ac1a4020c3046e3da0519b4681eae88a42a934727b8d4a465af4fb9a89b5216669062
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20141217.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20141217.ebuild
new file mode 100644
index 0000000..5823218
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20141217.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-17_00-01-53/zip/netbeans-trunk-nightly-201412170001-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 e62b7f5..959827d 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_p20141217 (17 Dec 2014)
+
+  17 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-java-9999_p20141217.ebuild:
+  bumped to the latest sources
+
 *netbeans-java-9999_p20141216 (16 Dec 2014)
 
   16 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index e13ad0d..f0ea944 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -143,6 +143,7 @@ DIST netbeans-trunk-nightly-201412130001-src.zip 200994486 SHA256 30939e6630fc6f
 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
 DIST netbeans-trunk-nightly-201412160001-src.zip 201107782 SHA256 038363b1ab569308a58245000b840ed5b41d4a59325432f34819be9f946a1909 SHA512 dce19e10e9a7dc9811a5b455eeee75b158439642ab6bc45d9fb8168b4f127530f988959b9877223989745882ec3a7f342ab41365f1a3e08cd8389997296af002 WHIRLPOOL 98bc48650d52a0d92204efe214d8eb21d71c0e0db2a021b2660d314c2be730d998e006716a9037dc717fec850d7dfb4cccb25dad51b5e444e9bc229728721a43
+DIST netbeans-trunk-nightly-201412170001-src.zip 201113911 SHA256 2027f4cc789162e0693e1505b4ca1129f0114411a4369892639cbb96cc3445d9 SHA512 ceb29d9634c0983fe22ec2a318eba290c6a9b27e20faaf6258fb94f12184027556bbddc7d3be5c47c111b6241fb63e38c2ad726689ec43449087e6b6c20831c2 WHIRLPOOL 9b3327407877caf1bb9b838d6ecd7a08896e4f35fbffe3816c6ff3067fa9a29dd46b59340b7e1a28c3bca2a52a77cf44107266033cc336b21f21c2b9fc491042
 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
@@ -201,5 +202,6 @@ EBUILD netbeans-java-9999_p20141213.ebuild 13429 SHA256 7a60da72fa54834d29b8b510
 EBUILD netbeans-java-9999_p20141214.ebuild 13429 SHA256 717f7e6c2598153067f91c4aa5d7583643492bd40748a23713cabcdb705cfde3 SHA512 982d3c9d97d8b56e17199069b2fe0810673cb484b3a3f0e01c5ade557addbacc67a032097b572c9d288a450f9b63b749ef7a7061dff0d287654e9ae9652c329c WHIRLPOOL 7be971621e085dabe2c9e4f0863b3f293db672f3cda858365c44556373e650ee869b7faa0356570fa54ee5cbaa52b5ecb57e83d4ed997c8a8fa14ac815a6af00
 EBUILD netbeans-java-9999_p20141215.ebuild 13429 SHA256 83b918f1ef6cc4016ef9ba0bee2755f1dc69bfd130f52cddbb7b763fe5680647 SHA512 490e7db4f5f2c49d69dba06f9a9b0be3d9bb69bbd65ea10fb6f24202d46af24c1f06e8f0e1ca130c2db6db398cd89e19138e7adb60e64ec5cac913386323d06e WHIRLPOOL a49526ffc1ba3d9962ad32768ef4f2b0b6b4b7bf01c5ad76a3084f90ac7f1b207fe650179ef399d77bc774a18c78943add4ebdc4c5648ad6537e8e865a5c8a54
 EBUILD netbeans-java-9999_p20141216.ebuild 13429 SHA256 41eba41295f819a9c32d9a55f1cb3d1cc566dd26fa5dcb16f2e99c0487338fbe SHA512 30043c416e37ed49e500b5297857da34a119d5d2f6f75b6445e32299d80a717eaea34a4b45ff269734499e4358447462ab31d5a9624df899887615614a0f19fb WHIRLPOOL b85e4e074b6551d33a155b42bca4b5259762f46326af28a15862ffb61e43a5d8e2a014d9ea5ac5f48601fbad9a5ab078f9fda33f35eaaf812fe0b52d67dba7c1
-MISC ChangeLog 137583 SHA256 250a256918cb8780c0de4c640d8e5adf6f93ea8d99379d0318e9668ca72e56e3 SHA512 267dc9b4d088be7d861e9802881624a0e81ed55f329534eb18ff70643d5ed8d031a757afe13ea01a122914a0665b626e45503d23d186dfe4f308c5ee091a0615 WHIRLPOOL 6d065cd388d0eb2ede896dfebbac9ef9130ecc17132a57d9aed6ee19a8a289e95c52d985724700be646076a056d4dc3348e226b5366e673ce8bc9b85151db0b0
+EBUILD netbeans-java-9999_p20141217.ebuild 13429 SHA256 250cdbf7422ee0e067e7f7482f5c95812dc70dbcd3afb85bb28b5b26522f6c54 SHA512 8645bb366c7c2ed479927c7a32d0c8adc2f53e38a36c1467d8c2c14f103836df5580e3d14410c73e7a2b5438b14ba4ff1ff8fb48d6b505fcd88c055f47fd0ebe WHIRLPOOL 2bb95a589748108350c283c6095cda9ee918f716cf04661778858f77c12087833b0155aa5247de55c59d24d2714de2e3987ee7c9682716806b7dd183a2f68505
+MISC ChangeLog 137752 SHA256 b8a274788e970ce7c95e8e41345a2acd85183cc14e99babb8bc3078ad676c108 SHA512 9d04740473124cc9e09009b9013e93fafeda18955d2166d5f0611c92a144fe27a7ca48add574ac6fe9871ddd214248b21c9cd73735bac9060fa622f5d1673c67 WHIRLPOOL 3f241aff9f3fac5be8348d6dfe171c627586e4419f10eb5d2f4c85e13de808c71fc8f7a071b721f07ecefebd2c22e9cdcf59dadca0162c230b1b8b95d8c5c1c1
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20141217.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20141217.ebuild
new file mode 100644
index 0000000..0dc9459
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20141217.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-17_00-01-53/zip/netbeans-trunk-nightly-201412170001-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 342a24e..4767d58 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_p20141217 (17 Dec 2014)
+
+  17 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javacard-9999_p20141217.ebuild:
+  bumped to the latest sources
+
 *netbeans-javacard-9999_p20141216 (16 Dec 2014)
 
   16 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index 3751941..c4619f6 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -67,6 +67,7 @@ DIST netbeans-trunk-nightly-201412130001-src.zip 200994486 SHA256 30939e6630fc6f
 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
 DIST netbeans-trunk-nightly-201412160001-src.zip 201107782 SHA256 038363b1ab569308a58245000b840ed5b41d4a59325432f34819be9f946a1909 SHA512 dce19e10e9a7dc9811a5b455eeee75b158439642ab6bc45d9fb8168b4f127530f988959b9877223989745882ec3a7f342ab41365f1a3e08cd8389997296af002 WHIRLPOOL 98bc48650d52a0d92204efe214d8eb21d71c0e0db2a021b2660d314c2be730d998e006716a9037dc717fec850d7dfb4cccb25dad51b5e444e9bc229728721a43
+DIST netbeans-trunk-nightly-201412170001-src.zip 201113911 SHA256 2027f4cc789162e0693e1505b4ca1129f0114411a4369892639cbb96cc3445d9 SHA512 ceb29d9634c0983fe22ec2a318eba290c6a9b27e20faaf6258fb94f12184027556bbddc7d3be5c47c111b6241fb63e38c2ad726689ec43449087e6b6c20831c2 WHIRLPOOL 9b3327407877caf1bb9b838d6ecd7a08896e4f35fbffe3816c6ff3067fa9a29dd46b59340b7e1a28c3bca2a52a77cf44107266033cc336b21f21c2b9fc491042
 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
@@ -125,5 +126,6 @@ EBUILD netbeans-javacard-9999_p20141213.ebuild 4982 SHA256 1f4833b57e273fe4e90f5
 EBUILD netbeans-javacard-9999_p20141214.ebuild 4982 SHA256 1a0046e359743585e8fc0c08cb459e5e0a0065d1328cefea59c4a91fa6f29d3a SHA512 4de614f2085525dda8eceec0cc964ffd7514a60868ca8b10256771daf9259d38038ed20b3578b1a7f172b148edf1ad5b77fb7e429d1fad4875808829e02c904d WHIRLPOOL 6bf1684a4edda0cf1173cdced923c58f0f228d4a49be6c92626aa6a9b494b1efbdbf59e80ba345ba3425e4b5e3753d405d0d387f3c4c81a7bde573d1f8213709
 EBUILD netbeans-javacard-9999_p20141215.ebuild 4982 SHA256 ce4e0bfa45f63a32b96aba0d6672766469b4143fb33b315a15165af28c38ddf4 SHA512 6eb9f392dfd005152e44ed84c7185e523e4ac4d76a2050f4ccae3d411f07fbc5222082525bcd9c73ab07d914e50874461f6cfe0b7149a333ec855e258e808e65 WHIRLPOOL 47b5bd6704feb03cf76de13daf0ab341c6cb2c267831b71f01907de43de04248c69e190e4c6603752c7b88b50dea28dcccbbae49edafd4a53e81761f2c19337d
 EBUILD netbeans-javacard-9999_p20141216.ebuild 4982 SHA256 fb86c40328b8d1bf4b748f289ca660b0e0a0bf56477d68904c402912461b64c1 SHA512 74fc8d745eb93ed3d64ba634bc3cb9baf8f0de9228666c07696f9a7ade7ea34fa2f99c9d500d5d7a475ad6cfeffc119ee415fc576992fecec048caa0baaaa5b5 WHIRLPOOL a7bdb56a64d173be5ba476bad61639b55d97971fc2d6d02d98c50e907e13cc0971134d740099a720549356e6d39f65839ff003d0e314e292ccec989fda081248
-MISC ChangeLog 143273 SHA256 01809e75d43714e8eae5bbbff706e9959672eb7908ecc7dc1a77b04abee999cd SHA512 c24f180241695deab3aaf8f1416f3b8ae904156b20b3766defc64463e0d4ac9ed45fbf6e54eedcf465ed496ffbaa2d8c955706147bd584e3281901d5c6763116 WHIRLPOOL 5db65ba37860ddbc4a8874de65b21ad93023397346512590ce4f566f82420cb405d425a20a8ecd5825af56196a0c8286cf2f02134540bc2ead6489dbc2e55083
+EBUILD netbeans-javacard-9999_p20141217.ebuild 4982 SHA256 9e10fbf8db580f67eec378c228fcd61d9548650f3ffc61949a90c6eeead0dbb3 SHA512 9f78f85ee9d2688ee9b4c75701c41a320f5920871c0ac2fc2dba1fdfb685b9e60ef230eece964afdae25a5d7abb9780b996c02e0d323f8f3c4391da4a7d349da WHIRLPOOL 78090282178532a9efeb1042b43313c594f9ac455c9b7634e60e0cf0a99acba19a2ff6ab258e98c91fc83901175a69e0a5f2ab04b2f2d56c88f036f3b7ece8a0
+MISC ChangeLog 143450 SHA256 3e8ffe127eecaff23345b335945ce37f0714e212f39fa63457d6f5b79f11485f SHA512 567dbc4f54622f16d2ba9c3bf377b1102b21ceaa05cd0ef5db8b66400d58b02f9d5f68391485e2a9fa3b10edb50b472abdef5b6960b205d2dc5ceefa0bb1366d WHIRLPOOL a33b9b69ee343f68f16279a037ac24651c691d5d5b343dbee3f78bc7468a4883630895ae0a72a74548d27e7d2fd633923153e159d108ef7dc218718af223dc3c
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20141217.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20141217.ebuild
new file mode 100644
index 0000000..e3732e7
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20141217.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-17_00-01-53/zip/netbeans-trunk-nightly-201412170001-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 61dcb2b..0990b91 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_p20141217 (17 Dec 2014)
+
+  17 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javadoc-9999_p20141217.ebuild:
+  bumped to the latest sources
+
 *netbeans-javadoc-9999_p20141216 (16 Dec 2014)
 
   16 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index f22b503..3452be0 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -70,6 +70,7 @@ DIST netbeans-trunk-nightly-201412130001-src.zip 200994486 SHA256 30939e6630fc6f
 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
 DIST netbeans-trunk-nightly-201412160001-src.zip 201107782 SHA256 038363b1ab569308a58245000b840ed5b41d4a59325432f34819be9f946a1909 SHA512 dce19e10e9a7dc9811a5b455eeee75b158439642ab6bc45d9fb8168b4f127530f988959b9877223989745882ec3a7f342ab41365f1a3e08cd8389997296af002 WHIRLPOOL 98bc48650d52a0d92204efe214d8eb21d71c0e0db2a021b2660d314c2be730d998e006716a9037dc717fec850d7dfb4cccb25dad51b5e444e9bc229728721a43
+DIST netbeans-trunk-nightly-201412170001-src.zip 201113911 SHA256 2027f4cc789162e0693e1505b4ca1129f0114411a4369892639cbb96cc3445d9 SHA512 ceb29d9634c0983fe22ec2a318eba290c6a9b27e20faaf6258fb94f12184027556bbddc7d3be5c47c111b6241fb63e38c2ad726689ec43449087e6b6c20831c2 WHIRLPOOL 9b3327407877caf1bb9b838d6ecd7a08896e4f35fbffe3816c6ff3067fa9a29dd46b59340b7e1a28c3bca2a52a77cf44107266033cc336b21f21c2b9fc491042
 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
@@ -128,5 +129,6 @@ EBUILD netbeans-javadoc-9999_p20141213.ebuild 6234 SHA256 2646058d5d9181d68b66f4
 EBUILD netbeans-javadoc-9999_p20141214.ebuild 6234 SHA256 9d3683c7b42a005b707c4d9a5273a0561c9cf2d2c859fb6010d524cc88360822 SHA512 5a3fdc1c83192cfc62eb7cef09a3251988fd68d1eed943b97cc9f7320aadeb3e76470cd535a4261ea54296d042b7a6486895ee18eb1a19ab61b134b544f0d1d4 WHIRLPOOL c84c0220c6560b9c4dc9efd12ac6e3ba887d557a0e95e99f845b3cd04987af4aa8934ef64ca4a2fd6741b226e5a2b6c1694ec8033142b611d91d0ff931e7b60a
 EBUILD netbeans-javadoc-9999_p20141215.ebuild 6234 SHA256 2f6d46fc30b7d8eff0fa316080a1bfad8d9dd7e1e598af26cf96c0b14021b698 SHA512 5a2a60f7f5103aac5ab53e0c547d02fa1dbec1d81c8b4d3eae0deb7626f4718f41ccda3254d48ee5fe5f504f999b5f2f2bb8cb91ec94344c219ae335526c8bb5 WHIRLPOOL 637f663d49ee331d45563b50af5d994cd6a4cac70052a584ca7eaf3dbe7efbc69b3bc585241d628b66f97fc658147e6f07368cdab87e4f42d3da3c8cf7b57e85
 EBUILD netbeans-javadoc-9999_p20141216.ebuild 6234 SHA256 ee378aa6d6fc1e0dae6db88b52358cdb80132bf792dd22cd4f3bf442065dc369 SHA512 5ff00d47477c84671a37f954b295c03d00a6ef594e35e42ff6a9e560e2ec71751163159756253661875f38eab0a448a20edbca81881d214c818fa3adbaf254a1 WHIRLPOOL f0e4dc929e5e7e169c9d8f4dad476759ff60f5714da192a99174e9298f93873a929400ec13a4aee5ae89a2b0e1dc0a2457746c5d5b48167aa38871c923fa81ef
-MISC ChangeLog 141340 SHA256 bb2e296f2ac0849e0b98ab85cb142f9145b384bdf45b45ae0ccabf7af065059d SHA512 50080784986b9d809b60435c885e14787657a91aee3b65e7b80aa63440c99e9275be8a176cc0cf14b0158681bc942e30a904b37e5fee3029a48388e8297a0977 WHIRLPOOL f6f19e2e010d67b442b0fe74640aba9eadb58acf7faa03b36a2503e861b8ff1e589d0c5aeeee8b2f39228e804be8ad8360dae2ae8a52faee8e46838a3315497b
+EBUILD netbeans-javadoc-9999_p20141217.ebuild 6234 SHA256 2fc7b2fdcc42bc4dc2ccdd5f357790fe02cb11411b08aaa3104d6b989d022d10 SHA512 feae45b4f9a7c0b2b063990a71553e2dfe4027624602ded1ef27d8d92abdf1394e17b96c791e4cf0d4980eab3b1769a481f34973a72ff1232e3cd795308911f2 WHIRLPOOL 8982ac335ad943e6e65bf8313dca404b77ddf0bac3c7c86555d5d7ace4f6a2021fb17e16c055b018582e92f24a129a8a1fcea797bba183a0ceaa68ac91622fb8
+MISC ChangeLog 141515 SHA256 4b427d044a5e2d79ede7911c64caa5f55522c1d1334c91e17b07a380bd095afa SHA512 b2f70bbcebabff3c0b85be33ef15c6729f04d597c6a4b195cd4a4bc4e3bed80d09df095f673365f578234375dd53d726d0b668a5ea0110d2745c3150249da76a WHIRLPOOL 7180f930a152f1e51fafcd8e495495998ee6f533317035e513019311ab0cb9f675166be4fe47a53bc845d49bb7c6399dc5b2878be0c6be83ebfae8ee6fbf5c1c
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20141217.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20141217.ebuild
new file mode 100644
index 0000000..513dd53
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20141217.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-17_00-01-53/zip/netbeans-trunk-nightly-201412170001-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 41e2e8b..70c84ec 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_p20141217 (17 Dec 2014)
+
+  17 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javafx-9999_p20141217.ebuild:
+  bumped to the latest sources
+
 *netbeans-javafx-9999_p20141216 (16 Dec 2014)
 
   16 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index f5db4f5..7563837 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -69,6 +69,7 @@ DIST netbeans-trunk-nightly-201412130001-src.zip 200994486 SHA256 30939e6630fc6f
 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
 DIST netbeans-trunk-nightly-201412160001-src.zip 201107782 SHA256 038363b1ab569308a58245000b840ed5b41d4a59325432f34819be9f946a1909 SHA512 dce19e10e9a7dc9811a5b455eeee75b158439642ab6bc45d9fb8168b4f127530f988959b9877223989745882ec3a7f342ab41365f1a3e08cd8389997296af002 WHIRLPOOL 98bc48650d52a0d92204efe214d8eb21d71c0e0db2a021b2660d314c2be730d998e006716a9037dc717fec850d7dfb4cccb25dad51b5e444e9bc229728721a43
+DIST netbeans-trunk-nightly-201412170001-src.zip 201113911 SHA256 2027f4cc789162e0693e1505b4ca1129f0114411a4369892639cbb96cc3445d9 SHA512 ceb29d9634c0983fe22ec2a318eba290c6a9b27e20faaf6258fb94f12184027556bbddc7d3be5c47c111b6241fb63e38c2ad726689ec43449087e6b6c20831c2 WHIRLPOOL 9b3327407877caf1bb9b838d6ecd7a08896e4f35fbffe3816c6ff3067fa9a29dd46b59340b7e1a28c3bca2a52a77cf44107266033cc336b21f21c2b9fc491042
 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
@@ -126,5 +127,6 @@ EBUILD netbeans-javafx-9999_p20141213.ebuild 4723 SHA256 8d5b1880cb200f091dea7ad
 EBUILD netbeans-javafx-9999_p20141214.ebuild 4723 SHA256 7007cdbde41331bef07bf5679d4f6e995aaa8edab712460c528d352507e432a3 SHA512 209a4ed29ba28274aa6306e002143bdd41ed8efcd668e29b94c0476d284811525ddd1d9c977883f8f871644ddb748d9ae3d3894dace8b9734178c642ce1119f9 WHIRLPOOL 546d6253eb981777217d522c3b11cd4f119e02841fcd392be09c57433d36645160f1ab55507d2c63fbfba3743f6c00f5a0fc3506e553dc4f1631e28256b296af
 EBUILD netbeans-javafx-9999_p20141215.ebuild 4723 SHA256 04fe74649fb3467a9e03c573fb8cea162d3278528b8a9834a990c679c4f2db42 SHA512 c21642aec8f223b931ac9bfa92dc6bd21f6f1946c1907b3f739479dfcbca67d9bdf42485b2dd13742bf5b7123bcb7f0f1adabfc4472e617a95efb70478d248c5 WHIRLPOOL 481f99ca0d7fd892f59a1603adb0386b36f11101231f66c701cd500809feb18bddecdb1011ef3aade0bf9ea5372259f7a42ba0475e9494e2c143dcce97785ba0
 EBUILD netbeans-javafx-9999_p20141216.ebuild 4723 SHA256 cc3ac589b661779501ad7515024becd3ddd263015ede7f9bd1bc389b2b31f4bf SHA512 d698c84c98249f89e82cb5c1c2a5ae9cfd3713a2aed126195f0706c958a4aa0c40083c0fc2ab724bcda41553621098e95e6e416ca12e70d0cfb30bedefc0b6be WHIRLPOOL a9dbd2b35701a9b6decf708c658b68cda086c6e796f9d24b812d60257e8bf3876d1a9620f07ce316ae38f45dccc9ca247d3e24a8abec444b3abb4bf2c733fbd2
-MISC ChangeLog 126274 SHA256 651ca353016695375b02a02fd17ed837309bd34d92394b23abc285cf22c3f35c SHA512 089296c5be64a1e4c2884d4c9fa404d9e96c62724fae10af2c7ed6c0ce802bb4168c30a6056a081e0dffdb656d475b66efc99e24219e66e2d2c85273a43c5d9a WHIRLPOOL c3db72677057fbd076041a2ec4d4543be442ea3ef05f9daacee662d2302bfba2bbcd96684bf3f775b1c4f3a1f466e036bd3eaf06317b30ffadf4c300b0d7a7b5
+EBUILD netbeans-javafx-9999_p20141217.ebuild 4723 SHA256 d5c7abd992210d54dd29637f24cf478ae9d675a373c8df6adc23a24bb2949746 SHA512 dd23d56d945a995c73e3283285a8a20b1890516dd127183196a9c578a94f521d4ead3a2ae6c4ccb429c1bd8fd2c411eed284260b6b475067493fd704514db6f5 WHIRLPOOL 4e5e35a069805b58ef6da5a52929570110aa369a49925b964408745eb0c453841daa78d171811c928a7ea7d5eb0488f87ef7561c38bf80522dd87ea6de6956e3
+MISC ChangeLog 126447 SHA256 77dc7679a06353929ac05a0c1721451a9beff65d0335418a92e8a6a8301dfdbe SHA512 4d9fde427ff8105fe04d578d0c4d9162da62034745320ed1f8b7749cf871666ac6570d1f54da498a3548acb8d954654f2dd711a9aa9c9002cf2b66f677c3ebf6 WHIRLPOOL 909aa4df36ba2e4af72e1074222f8bbf0ffa6b226444578c57c155c8b34780361844fdeccd72a82d808744c81adaef78938db1697a68c75dd8c97b8916ef0a09
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20141217.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20141217.ebuild
new file mode 100644
index 0000000..18f043f
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20141217.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-17_00-01-53/zip/netbeans-trunk-nightly-201412170001-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 f0ef8d2..4cc019d 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_p20141217 (17 Dec 2014)
+
+  17 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-mobility-9999_p20141217.ebuild:
+  bumped to the latest sources
+
 *netbeans-mobility-9999_p20141216 (16 Dec 2014)
 
   16 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index ee60b41..6d81fbb 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -73,6 +73,7 @@ DIST netbeans-trunk-nightly-201412130001-src.zip 200994486 SHA256 30939e6630fc6f
 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
 DIST netbeans-trunk-nightly-201412160001-src.zip 201107782 SHA256 038363b1ab569308a58245000b840ed5b41d4a59325432f34819be9f946a1909 SHA512 dce19e10e9a7dc9811a5b455eeee75b158439642ab6bc45d9fb8168b4f127530f988959b9877223989745882ec3a7f342ab41365f1a3e08cd8389997296af002 WHIRLPOOL 98bc48650d52a0d92204efe214d8eb21d71c0e0db2a021b2660d314c2be730d998e006716a9037dc717fec850d7dfb4cccb25dad51b5e444e9bc229728721a43
+DIST netbeans-trunk-nightly-201412170001-src.zip 201113911 SHA256 2027f4cc789162e0693e1505b4ca1129f0114411a4369892639cbb96cc3445d9 SHA512 ceb29d9634c0983fe22ec2a318eba290c6a9b27e20faaf6258fb94f12184027556bbddc7d3be5c47c111b6241fb63e38c2ad726689ec43449087e6b6c20831c2 WHIRLPOOL 9b3327407877caf1bb9b838d6ecd7a08896e4f35fbffe3816c6ff3067fa9a29dd46b59340b7e1a28c3bca2a52a77cf44107266033cc336b21f21c2b9fc491042
 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
@@ -131,5 +132,6 @@ EBUILD netbeans-mobility-9999_p20141213.ebuild 4418 SHA256 5fddc1585bab0d4906da4
 EBUILD netbeans-mobility-9999_p20141214.ebuild 4418 SHA256 1ab5bf2e41fcec994620c616a9a22826e2702dd4705efde11207f1a04b157133 SHA512 de9b6600cd9a29b725a9b352aad8a53c3c7cfffffe8572fbe6334bba9b625a8c3a2ae58f309c6d966aedc6083a0c229112070a9eb0d55d53cc929b2b335bcd0a WHIRLPOOL f7517781c262ee56a6d52388c5241cafdd967114f1a75e878437f26ad9721163a28202c47a512892548e88eadb8024614b3a6bf42e35271ae0236cf4c0125467
 EBUILD netbeans-mobility-9999_p20141215.ebuild 4418 SHA256 a264bc77be55997982448593c0a4f19d06944c99ae5764a87cf333b5994ab9dd SHA512 bf26472b56e4a74f098eb2f8087975f9af0163ddfa193623109fc50575620591fc0af67428b1c0385756f441d8d3cfcdfddb6aca82fa3c31cbcf8aafdbfd4634 WHIRLPOOL 839eeda0077cef8535bf78b30cf3f0f4e323d0725878ee8dc0db7c33a19fd91505a911656f55bcd77ae164a57e14ada977263cd5c27bc76b301742ee26239ef9
 EBUILD netbeans-mobility-9999_p20141216.ebuild 4418 SHA256 5917d6483fd945b52a3a22b53d3f17e3f53061052c312896afb200133c142b90 SHA512 c99c07b264060c6caa8bd2aa138a58981e15b2b4a0ab52ec74d9cfcecbbf0f5ddd1ab87ddf5d1b02be0a4795d79894505530a18c3373c01a5ba6bafae298a997 WHIRLPOOL d3fc83759a4c33fa84d75d01e9338bdd04496ede6812fa932e9141651ba1c470061b4728fd1f6473a3bd56d2bd5de46244f21cf616a79473f7b772b02c28fb41
-MISC ChangeLog 143414 SHA256 3e072647894380bc434a1c523656ff2c4b8c98f3c9a9151c0731b6452762cd94 SHA512 bf6b1a46fcde72efc0b335d39016bd22f9f71c7045e22b6aa3794292f4e4ad66faa33f59b204f6ff34f74856bdd1db7e61a75e2bbd8a40db60de9121489057a0 WHIRLPOOL 2ba7dba7121b8d53fd2c6aa1c74aa02faa4ef686e09e5d74619c9f61c8e814ffdb2db371a8735f3bcb9f736c43bf1d9fd0e5bcedd1c2d1273130d0db2bf2e8ca
+EBUILD netbeans-mobility-9999_p20141217.ebuild 4418 SHA256 54611137a25b374d6ebc933d36f953372065af9453694f2260882829d126ab8c SHA512 ee6892b01b4c5356b7c7745909da78e5868d83389719861e614b84ca0cad87ad1ad0896800736503a73610470272559af2989b3a64f0fefacd1a8fc55b6f0864 WHIRLPOOL fcdef71a5999a6ee0d0349f2fcb1104cdbb12eb440658631e489f8aa0918f192665ba56fd84ce996e456d8bf85a8a169422679bc4f218440df3db0613d36bff3
+MISC ChangeLog 143591 SHA256 e4f43e1d39f1401f646307fd7f92874db3fed241e2cc2013fd7d2f89e39c0232 SHA512 b9addd2f673e6e3cfc0cbb466966cba97825396ea723963e9e3b94c76db2028fab7f82132e8a014bd26a39d2d5b41fbb7694e02474e1403882b9cda7861a1008 WHIRLPOOL 548bff863fcdc2a645586e34ab487f0a6594b98974886be83a3325c42ca738dcdcc101bb5458f66f24ba18b9c12dda50933f64e4acb35fec3b0a445d2a01dc5b
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20141217.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20141217.ebuild
new file mode 100644
index 0000000..4701633
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20141217.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-17_00-01-53/zip/netbeans-trunk-nightly-201412170001-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 7665f8a..6cc64f4 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_p20141217 (17 Dec 2014)
+
+  17 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-nb-9999_p20141217.ebuild:
+  bumped to the latest sources
+
 *netbeans-nb-9999_p20141216 (16 Dec 2014)
 
   16 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index 3d17b26..533c74e 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -72,6 +72,7 @@ DIST netbeans-trunk-nightly-201412130001-src.zip 200994486 SHA256 30939e6630fc6f
 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
 DIST netbeans-trunk-nightly-201412160001-src.zip 201107782 SHA256 038363b1ab569308a58245000b840ed5b41d4a59325432f34819be9f946a1909 SHA512 dce19e10e9a7dc9811a5b455eeee75b158439642ab6bc45d9fb8168b4f127530f988959b9877223989745882ec3a7f342ab41365f1a3e08cd8389997296af002 WHIRLPOOL 98bc48650d52a0d92204efe214d8eb21d71c0e0db2a021b2660d314c2be730d998e006716a9037dc717fec850d7dfb4cccb25dad51b5e444e9bc229728721a43
+DIST netbeans-trunk-nightly-201412170001-src.zip 201113911 SHA256 2027f4cc789162e0693e1505b4ca1129f0114411a4369892639cbb96cc3445d9 SHA512 ceb29d9634c0983fe22ec2a318eba290c6a9b27e20faaf6258fb94f12184027556bbddc7d3be5c47c111b6241fb63e38c2ad726689ec43449087e6b6c20831c2 WHIRLPOOL 9b3327407877caf1bb9b838d6ecd7a08896e4f35fbffe3816c6ff3067fa9a29dd46b59340b7e1a28c3bca2a52a77cf44107266033cc336b21f21c2b9fc491042
 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
@@ -130,5 +131,6 @@ EBUILD netbeans-nb-9999_p20141213.ebuild 5013 SHA256 10c921b390ac5b1b796b618d089
 EBUILD netbeans-nb-9999_p20141214.ebuild 5013 SHA256 706b2c9c0be53716e3443bb71252de74caf97860bcdfc2464700fda244776576 SHA512 c0d730748e3fb9231639c74a0a8455fd022acbefc03c2a19cbc48610cc59d72f2bb7be348dfb8d11309972a1874921324dd266a40ed205c77530dbcae6059545 WHIRLPOOL 7d0cab2dbd08adbb3849ad6d5fe9c7948e0ef35218009900eb096088bc34242d0d7edd31c06c1085717552ba435b551967e729002ef0200c28e5b0f415ba5e9a
 EBUILD netbeans-nb-9999_p20141215.ebuild 5013 SHA256 0f26f775d6f551bebff0a198bcf781bd3f1d1b5480ac53feff4193fefc06062e SHA512 527f536592547a320a2abbc9ca9193455d401af553dc721c6145cf0473129d3c7115af4f3f30f378fdd9bf304a246af51f00a99ba5be655492e74fbca37eb701 WHIRLPOOL 85ddbe588fe030b1c0b3aabe46e3f2ddaa6417b0d2f2b6f98960ce2c2c0f4bfdd27e3b754f25a80d2e963039abeffbdaaaac742dee315765aa7b9c36a6d6af08
 EBUILD netbeans-nb-9999_p20141216.ebuild 5013 SHA256 9c5587d7ddaa6b41ed68b17c93de1128695421c81f80ea59019672e98915b4c6 SHA512 7195aadde2819de6701dda2b1cc21d488761dcf570f761d8a1655dfdf264eba206a2b900cd442186df7b73522593f4b4436bea7961c96b83ac516884d068984b WHIRLPOOL bad066997a6d39a61dc678e4eeae755417f425fbf89f70468a047d32127edca721a907f3e2f2d8621ae63c9024703f69e17ce35ec79ec9a2ffa1a10c47548715
-MISC ChangeLog 133155 SHA256 3bc22c9f763db5970eaffc616d5fd04554751c238ea1b0cf634f41be9df62473 SHA512 7ea0bc69bb916a55b4786da1450d433d80e4be1f239a1b3199a2e9a8a847fda1f80b9c5a0c4997307fd2041d330e1072db14ea8d56fe57d55ed6edb1276d6c50 WHIRLPOOL eca3e0b724b795f80e50f22827830b6b4a690b416206aa5e4facdfd8961778ec55fea0dc03a75c952f0e725e79ea411d167cd79ea0c5359d7ff3a6012ea681ce
+EBUILD netbeans-nb-9999_p20141217.ebuild 5013 SHA256 052e3ca4a168a6a1b1715cdbfed5c2b8f88a1aea16d56f00c37ee57a0819aae4 SHA512 57fe52f6932802739dbdf8779cadb1c3a5456b4a27dbcae27fe30edbf6f8db33df8dcafa344b817fa0e77a5982d21e0d3f9710755cc157fb9645ce3603fedc90 WHIRLPOOL abac95fd8193eb8dd639c40b26fce34d7e88d2e2b451788770725cd3a52c2ee7c98f8e9e0ba47158a5d06027a33f33f5463e143874b7beb4b0d8883e7b7498fe
+MISC ChangeLog 133320 SHA256 e4915ac2447742fd0ced7636ae1948a0746295437a67b51ae5400cf118347e8d SHA512 6db6ec64e5ad5991f7d89de5820f9b242d7dbd631e4bef04514f0c5b1825b7c0e4151f33241486bfcda4e370e956c966279b503243f2a5174482a1f384a1ad38 WHIRLPOOL 14bd33335403eb3a92c07b36c57743e96c45d04225ea1f0b1b8668d9cc82c2725b86e2b622ce8271e20e49ff1144ac2059e8e8fedc184760c045638565a29147
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20141217.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20141217.ebuild
new file mode 100644
index 0000000..85e4745
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20141217.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-17_00-01-53/zip/netbeans-trunk-nightly-201412170001-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 0f21009..2907c69 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_p20141217 (17 Dec 2014)
+
+  17 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-php-9999_p20141217.ebuild:
+  bumped to the latest sources
+
 *netbeans-php-9999_p20141216 (16 Dec 2014)
 
   16 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index ab6735b..f208c80 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -75,6 +75,7 @@ DIST netbeans-trunk-nightly-201412130001-src.zip 200994486 SHA256 30939e6630fc6f
 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
 DIST netbeans-trunk-nightly-201412160001-src.zip 201107782 SHA256 038363b1ab569308a58245000b840ed5b41d4a59325432f34819be9f946a1909 SHA512 dce19e10e9a7dc9811a5b455eeee75b158439642ab6bc45d9fb8168b4f127530f988959b9877223989745882ec3a7f342ab41365f1a3e08cd8389997296af002 WHIRLPOOL 98bc48650d52a0d92204efe214d8eb21d71c0e0db2a021b2660d314c2be730d998e006716a9037dc717fec850d7dfb4cccb25dad51b5e444e9bc229728721a43
+DIST netbeans-trunk-nightly-201412170001-src.zip 201113911 SHA256 2027f4cc789162e0693e1505b4ca1129f0114411a4369892639cbb96cc3445d9 SHA512 ceb29d9634c0983fe22ec2a318eba290c6a9b27e20faaf6258fb94f12184027556bbddc7d3be5c47c111b6241fb63e38c2ad726689ec43449087e6b6c20831c2 WHIRLPOOL 9b3327407877caf1bb9b838d6ecd7a08896e4f35fbffe3816c6ff3067fa9a29dd46b59340b7e1a28c3bca2a52a77cf44107266033cc336b21f21c2b9fc491042
 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
@@ -133,5 +134,6 @@ EBUILD netbeans-php-9999_p20141213.ebuild 4423 SHA256 a3d13465d650190695f23d7172
 EBUILD netbeans-php-9999_p20141214.ebuild 4423 SHA256 5e42b3a9b09230e44293d9400d06487bdee500da943f18a37e4038c2e897de4c SHA512 7c4ec2284ab9547b3f755512eecb1030e26b91c3c6bc6d4a82e850940fac586c6b0eb59527344e69c2242e6b3e8022f41540afc8cf741741d458f364fce18f8b WHIRLPOOL 9e2c8f4848352369e7cee154700eea0d72789e91478a72c80c3b986c3c2c66aaa9308116063b6b81ea90dc47f766cd277298179e07c4d74bb4a02d3c510838c2
 EBUILD netbeans-php-9999_p20141215.ebuild 4423 SHA256 d0692ea76897a768a459f287a11538724f4a553cd96d77de5a286a89ad1aa905 SHA512 e75398ce4ff79e064ce3c7a1bdf1063fdaf6c1f07ac3332b0b4108764b1fb887b0f5e2e22dc5e42037f304d90da17ee8b0b2873b9661e4de006b46a938080a23 WHIRLPOOL 7f1be587439f92d99ccb2e32395f4b8edb60a4bdb47ddd3fa281a53a141a063c46b338f0bf88b5d8c42f7689ccb82dc8b7a5d62536f2d809c4fece2401e7f223
 EBUILD netbeans-php-9999_p20141216.ebuild 4423 SHA256 1a3103586df82cab8d1bc92a126ba0494ea0886bedca1653908d955d6b6e3c28 SHA512 9761c6fe8e8dca852b994e9038202b6a2d82dd00c55c0e984c0af2339dac2b9cc7e3261e1f0acaa08b5d8a90e47f17e384671ba4bf65b616f041f67dd5e30025 WHIRLPOOL fd85420651ddf31f0c6933bc2352f461900a33167b7ad7a35bd4e1ebc20afd199eab1215ab88d135c0a5106dec38d2bc2cfa3f39cfb6b5bc307580f009ccb0d4
-MISC ChangeLog 133879 SHA256 633f8b97e861fa56a3a39c6ae437825ce7992c462477253269991d9edd8262b6 SHA512 2aeb4745155b66387d14a9c13238d7313cab4588bfd7d1d98ac10449615f6d5c06bb14ef5044bbd554d30f3e918dfdd48e59637fe1ca35f65be23e9320ace73e WHIRLPOOL 8a58126948ce452a623bb264fc39252d2b6db77dd33a5763c37f8346df345183727263e9d344819b810ba875e83f2505e94e9c68a56312cd908bf2b7af4a9beb
+EBUILD netbeans-php-9999_p20141217.ebuild 4423 SHA256 427eb46324d98fee91f12fa63dcef9ddef50f8094fad0e3cd4e1e73a87d3a00e SHA512 c5d34916cffb072f21da3e46de87ed1c7ccad83ea6a58a12c76e4cf46f9ea4bf4106c883b71c420c3fbaf4ceb11205266a9718af2f13a9f667b281b1ff31574c WHIRLPOOL f65f953b43f2291fcd3ec95d00856582083992e32549f7505db719bdbde33a74f2b1bc417a183c4e21fb9c13295cf2946504665c15842a4bdca153fb738fc430
+MISC ChangeLog 134046 SHA256 709ccc802fd3b6c080257a17c423ad33596cb5fb072293a33b8cc3d18b3ffd29 SHA512 bf692cb17b1a3f609e8a10e2bdfed60ea1a4ed5eb06e62fcafe57b9177cf1c2adb32e605bbfdde3ac764f5089b8849d18358837aa975a4ab87e77f6bf72ac8eb WHIRLPOOL 422191c0d92e864fd84ff88e4100ab349d137c613af22c9144ca92c8c0172b1bcb4ab88b0f8158111cceeeffd29184cdf4c0ad342cdf2491364e02fcf5a7b13b
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20141217.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20141217.ebuild
new file mode 100644
index 0000000..806174a
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20141217.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-17_00-01-53/zip/netbeans-trunk-nightly-201412170001-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 b8e7b78..7c26f13 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_p20141217 (17 Dec 2014)
+
+  17 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-platform-9999_p20141217.ebuild:
+  bumped to the latest sources
+
 *netbeans-platform-9999_p20141216 (16 Dec 2014)
 
   16 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index 697a866..175143b 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -90,6 +90,7 @@ DIST netbeans-trunk-nightly-201412130001-src.zip 200994486 SHA256 30939e6630fc6f
 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
 DIST netbeans-trunk-nightly-201412160001-src.zip 201107782 SHA256 038363b1ab569308a58245000b840ed5b41d4a59325432f34819be9f946a1909 SHA512 dce19e10e9a7dc9811a5b455eeee75b158439642ab6bc45d9fb8168b4f127530f988959b9877223989745882ec3a7f342ab41365f1a3e08cd8389997296af002 WHIRLPOOL 98bc48650d52a0d92204efe214d8eb21d71c0e0db2a021b2660d314c2be730d998e006716a9037dc717fec850d7dfb4cccb25dad51b5e444e9bc229728721a43
+DIST netbeans-trunk-nightly-201412170001-src.zip 201113911 SHA256 2027f4cc789162e0693e1505b4ca1129f0114411a4369892639cbb96cc3445d9 SHA512 ceb29d9634c0983fe22ec2a318eba290c6a9b27e20faaf6258fb94f12184027556bbddc7d3be5c47c111b6241fb63e38c2ad726689ec43449087e6b6c20831c2 WHIRLPOOL 9b3327407877caf1bb9b838d6ecd7a08896e4f35fbffe3816c6ff3067fa9a29dd46b59340b7e1a28c3bca2a52a77cf44107266033cc336b21f21c2b9fc491042
 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
@@ -148,5 +149,6 @@ EBUILD netbeans-platform-9999_p20141213.ebuild 8508 SHA256 813a5d725458382ea6741
 EBUILD netbeans-platform-9999_p20141214.ebuild 8508 SHA256 70c07bbf58a97c0e3e49fb530c4a0c203c115b2710e1765693aa4dbf0ef22e00 SHA512 3eedb00afb268d0be10ea2593a4fa0217583c93d9a54d48ca6d3049197af5f900b86a0068d13d6a7fe0ee824bbc317786aa418be5d6e60bdffe1a65f09c58d41 WHIRLPOOL fa274fce215e3d7492861b90b92158c3d6bcd4a8b1c057736fe93013662a57e71d4fc8861c3d389b45d277d8d8a4768fcdc4d3d6b03dbb41e4327d46b4b1d938
 EBUILD netbeans-platform-9999_p20141215.ebuild 8508 SHA256 3d2b4ef80a6cb322599bc9f88f48c3716e7ade30c56e1ac70be44f279e7b93e1 SHA512 bfefa89224dd9b2eb391ce00d0a157a9f1704971ceccc7e4ee5732278f6a9b7a5be68375eadd532f7a7462a9cd44d79bc61a8c8e08d95fbc2d16f84fd3754196 WHIRLPOOL 7fa7eb93e1945f47a11aeed2c166d09e320ab6a29e691dcf506f0909d5159a0dda8a3049b86b1e365080f2729430e1ad893a48b58cb7a92506983775117bea7d
 EBUILD netbeans-platform-9999_p20141216.ebuild 8508 SHA256 d3f2312290000a971233f0f7640ba7f077c1a7242a8866566fff4a317f7cd1e2 SHA512 7dc585d410e22832d6cc74813699aae1148d817c97f5b14b28a680ba691796e7a11ac6559a611ae1763069632bdc9d79667a19392f06b231e1cb9448accc4ebd WHIRLPOOL 1e3f0cfd616f98407b7f9789ca0d5be0d543b3066b6f709d9e30d911ee73f98a0633bc3ff1f212770bb13f4ce05c310cd8e5a3eb404f6da4743cc7567bbc7603
-MISC ChangeLog 144010 SHA256 b6e3e7bca7b86b21a640ab8b4493f79f436b81a37abd53b518061706313ee3a7 SHA512 ac25625159ec3ffdf8370bea5f8c68f3e91900d1c46222037cf2bd4dee28d4f53985abc7f6213f826c8845519838e342a1019b4cb78d626c88dd8fd77ac47194 WHIRLPOOL 9b3b4ade85a24164772543e8e74ce02d1359090e6305b4204d84517994a6de3f001156b71566ee2be4e310fd89c56647fa619c515e06cd7bcc843cc7905d6253
+EBUILD netbeans-platform-9999_p20141217.ebuild 8508 SHA256 1609e574b1c0d05230094d7dff6c584fbda13a8a39dd293392ed343fe6b0e1e9 SHA512 32c8eb0b7aed184e20c3ed51af80761c38182346d4c79774111b8863e573eda4f612253c8dd3f48ac768c8baeac693778f8d79675d03daaaf95f8da183b3069d WHIRLPOOL 20d06d210444ba10f3a0a9726f8defc65bec743c6651a5bfe0f0c82ec5556ce91060adba5b5fc36ed838ed39a8cd1db589b5b17b2c063875e56f568e14c4934b
+MISC ChangeLog 144187 SHA256 9201dcf1c014e625c8c131217e451c157752ddf5a04f932eabb03f6b20bd61c8 SHA512 adc65c3d8d6fa6ae03755d189c92f6406c13280e5bd24f91708062c1a261925909c511443a37256faa6be330acd2a7f6472f1bca4ae0fe0a3465b0d5ede5f83a WHIRLPOOL b3e4aa38dc9eeb5148734ad6dbfbae3e83757809562fac845fb3b40986504237b4e774d7adb09e966732d4acaabc87abfee7c090bcd63f1c9604e7ff138570e9
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20141217.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20141217.ebuild
new file mode 100644
index 0000000..80e0110
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20141217.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-17_00-01-53/zip/netbeans-trunk-nightly-201412170001-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 7743983..a15a959 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_p20141217 (17 Dec 2014)
+
+  17 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-profiler-9999_p20141217.ebuild:
+  bumped to the latest sources
+
 *netbeans-profiler-9999_p20141216 (16 Dec 2014)
 
   16 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 6026200..bf26ae3 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -64,6 +64,7 @@ DIST netbeans-trunk-nightly-201412130001-src.zip 200994486 SHA256 30939e6630fc6f
 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
 DIST netbeans-trunk-nightly-201412160001-src.zip 201107782 SHA256 038363b1ab569308a58245000b840ed5b41d4a59325432f34819be9f946a1909 SHA512 dce19e10e9a7dc9811a5b455eeee75b158439642ab6bc45d9fb8168b4f127530f988959b9877223989745882ec3a7f342ab41365f1a3e08cd8389997296af002 WHIRLPOOL 98bc48650d52a0d92204efe214d8eb21d71c0e0db2a021b2660d314c2be730d998e006716a9037dc717fec850d7dfb4cccb25dad51b5e444e9bc229728721a43
+DIST netbeans-trunk-nightly-201412170001-src.zip 201113911 SHA256 2027f4cc789162e0693e1505b4ca1129f0114411a4369892639cbb96cc3445d9 SHA512 ceb29d9634c0983fe22ec2a318eba290c6a9b27e20faaf6258fb94f12184027556bbddc7d3be5c47c111b6241fb63e38c2ad726689ec43449087e6b6c20831c2 WHIRLPOOL 9b3327407877caf1bb9b838d6ecd7a08896e4f35fbffe3816c6ff3067fa9a29dd46b59340b7e1a28c3bca2a52a77cf44107266033cc336b21f21c2b9fc491042
 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
@@ -122,5 +123,6 @@ EBUILD netbeans-profiler-9999_p20141213.ebuild 3478 SHA256 2dede7372dec80abe6b5e
 EBUILD netbeans-profiler-9999_p20141214.ebuild 3478 SHA256 62552571cd2184455a09afe80cf830837783222aaf2e4f09014b9e6961f037e1 SHA512 6ebdf7139d9de280e09d9f259112f0ba5ba4da2d5c490348ac6f37dadccc852f91aaec511fc1d44dbd8cd6c05deabb3512c621af2e297da9d9be8401936d457c WHIRLPOOL f8d7cf94ae31047be76bc1bdf386318f09235820630783a6ffae520ee4855a583ea11ddb1cfc99998e75f385aef20773cc51c6280843af143775796762c2b228
 EBUILD netbeans-profiler-9999_p20141215.ebuild 3478 SHA256 f336b9ddf81747607d152d85ab5b78328613f45866e6baf30ac6e2b2c085854c SHA512 a881b1391df96a54e8de52043d02fe62da2e67f36eb88aca10460cf33813225fe0b6bb9912b85e7e540baecb38f4b93be7ea32f2e864f86f66fdef8fadf613f6 WHIRLPOOL 98c0fef34eaf8084f9338158babfa1360f629dad7698d68dbac4059012d4e9b63c8330c49cde97a503a80d81088ff156bdb59714535cc4e208fd6dfc6883479d
 EBUILD netbeans-profiler-9999_p20141216.ebuild 3478 SHA256 63adc6688514762c4d8a3983fa48dfb87089d50a3bb51cb46919d70a05caca38 SHA512 e94f77adfce31de177e45502c7b775bed2bfb8f998f0627d38d231f7e3d889531227c171dfa458195530279b202abd4e9c5bd58d441b860c2b910f1215b96eed WHIRLPOOL 7dacf7240428fc9d1cb8c9dbb0faf248bf0d622c1a52d256b450abc7a335b7edecade33d4704b0a531a71db0cbe47bb02f6e6083e00990dcf1bb8caec5c581ed
-MISC ChangeLog 143471 SHA256 6c88f7f9c48f9e25f11e37dd964f5a4c4f6243f073b9033b764ed18114080c39 SHA512 1737f84944b7d73907ed43e4d0930a4077d4bbe4af05f939265e4a9e48344df5470f049bb925bc86eb013a6ab66936a0bd3ca9779f481952c13b638138a24064 WHIRLPOOL 1ce935f11b873f09efd2f96cabc0c99c9d1d0f04789aaf1ed89899e1c8ffc86230059313022c2bd38dde6ed811bc60d94dcdb3a55e8122370a0ec9dbb00e9b8f
+EBUILD netbeans-profiler-9999_p20141217.ebuild 3478 SHA256 612ce8b01a058922225a84a1336c1a29a3d16ce97d12d5c1f7611eff48218fd3 SHA512 1aea9e1155dba4d84c660d4984393e5ab9c150c578324b8ea39ab03af319bcb8d1e13adc90fa2fb4b7d4785b5d19f4f707f07c1769d5486c6bed1788dc842c59 WHIRLPOOL 44ad824b9fcf6054fc6b0e968d6e68f657857211a926fc403427e09f51a9b027351600391b50301a4c37b17ffbb9f227a7e9d884acf499661f61dd6e899e9520
+MISC ChangeLog 143648 SHA256 1ba954899df1db7762031b5e7f19761bef1f8178dc1a14fc3925a887cb356235 SHA512 ec9c79fe386ca77d3b38de32667dc8b61e44c347d06c888d916cd0b15a17ff2d8c5778d51428e1d9775fc446f80e3aafa96a5eff83088ea8d95a50c7be74207c WHIRLPOOL 2c1363c179c34d935456121e856209f467b61e5b29e39fd542843913f06ac3b8cc6fa5427a6639cca7757f84be3ce81c09343b3c6379c3404907686536c8b4b3
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20141217.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20141217.ebuild
new file mode 100644
index 0000000..82d67e2
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20141217.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-17_00-01-53/zip/netbeans-trunk-nightly-201412170001-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 e5edb97..9f32440 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_p20141217 (17 Dec 2014)
+
+  17 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-webcommon-9999_p20141217.ebuild:
+  bumped to the latest sources
+
 *netbeans-webcommon-9999_p20141216 (16 Dec 2014)
 
   16 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index 1e7dea8..4db4d66 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -70,6 +70,7 @@ DIST netbeans-trunk-nightly-201412130001-src.zip 200994486 SHA256 30939e6630fc6f
 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
 DIST netbeans-trunk-nightly-201412160001-src.zip 201107782 SHA256 038363b1ab569308a58245000b840ed5b41d4a59325432f34819be9f946a1909 SHA512 dce19e10e9a7dc9811a5b455eeee75b158439642ab6bc45d9fb8168b4f127530f988959b9877223989745882ec3a7f342ab41365f1a3e08cd8389997296af002 WHIRLPOOL 98bc48650d52a0d92204efe214d8eb21d71c0e0db2a021b2660d314c2be730d998e006716a9037dc717fec850d7dfb4cccb25dad51b5e444e9bc229728721a43
+DIST netbeans-trunk-nightly-201412170001-src.zip 201113911 SHA256 2027f4cc789162e0693e1505b4ca1129f0114411a4369892639cbb96cc3445d9 SHA512 ceb29d9634c0983fe22ec2a318eba290c6a9b27e20faaf6258fb94f12184027556bbddc7d3be5c47c111b6241fb63e38c2ad726689ec43449087e6b6c20831c2 WHIRLPOOL 9b3327407877caf1bb9b838d6ecd7a08896e4f35fbffe3816c6ff3067fa9a29dd46b59340b7e1a28c3bca2a52a77cf44107266033cc336b21f21c2b9fc491042
 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
@@ -126,5 +127,6 @@ EBUILD netbeans-webcommon-9999_p20141213.ebuild 4997 SHA256 7bdaad6aa17d38d3b2a8
 EBUILD netbeans-webcommon-9999_p20141214.ebuild 4997 SHA256 5ab2a6fefa482806255e20b01bc8407e2adbcf808221f78f7cfb90ce74dc2b12 SHA512 15be486e1cd8045c9f1d501706b7738f4ffaa3e976d9d41041f15d3d9de919792fef4fb167e6f414d1d226b75721126b502e513d072f1fc838bb61ffd5302e27 WHIRLPOOL 3048b91dadad11e057ba836ab7d00a0691fc66babdaaff302e7b35959e50921b14a4700e6a4f3fa063e290f14a2dabf2456cbf70e6bb68a5261da8ca193253d7
 EBUILD netbeans-webcommon-9999_p20141215.ebuild 4997 SHA256 66cd364272005c50abcfa285331b4c50b8f0b5aa05abd25d27232d250a1f4368 SHA512 64dc23933def6abd824b274253d29264177a18bb25da6e1d363443e59691bac53122076acd861e8b58f433fb382d085f18a190b65bcf1c6c2eb858e43b26110d WHIRLPOOL 459c612360901aa237f641ec41a2fdcae10112caf72ea8805035f71400eac17b355fcaa77ef204440ee00fee8613fafbdca105d2dde124b996555aaa9bd83e67
 EBUILD netbeans-webcommon-9999_p20141216.ebuild 4997 SHA256 cd701fb75f26f95c2dc98fb203d4442eeb75fe3185284c614f598013d0cb86bf SHA512 03947b717203e8e273527c969d50ec3b32eccc145d72305efbfe0b447c891915ee3beb62f52846ea06fd0fdaa37dc670b91d6133c29d58e2010846c8401fa9e5 WHIRLPOOL 6bd69ed75b7840bb9f4c335856cf0b0474e36e3ab5f475cc28691cfd71b53e2fa7fad377d7dd128e97e8ab23d2465b7d2cc7eaedf46da8a06e844854453f32de
-MISC ChangeLog 116217 SHA256 93fd74ad47b273f237fd09952bd1e8eddf424941bbfddb9f2c19318465a594f7 SHA512 7e48f3932223a319777b2b18f5eefb4f67d804b51086ad3da50cf6b04e998fa633692027467b4e2e84d06033037e453581a4f3070661a7c6f7cab870f11a2d68 WHIRLPOOL ba739f2a1a13387be25d378a5de571411a0cc6dfee84d9713d1a043cde2e395b8dad73b6a250f95a2612173bc6292223876c74d0fc39f31a2e63ea15062c312e
+EBUILD netbeans-webcommon-9999_p20141217.ebuild 4997 SHA256 0c7a69f91ab72bc50644ea66cd69f42c6150187c628e9ac960b63ce9e613f671 SHA512 69abb42c4add312cd150506c8d34dd65d6ff727cf0db20ce7d9a4340c3c26e14754c2233a22ff847b74971348dccedbc0f003179946167c4e977e722b1e925a4 WHIRLPOOL 722e35d49f31c40986b09817385548248d4ead4e6e7a15b5478ea5798e2343477bc981c68c50edf7c003eabc9760e79766419b5d08b4f5b61e078a5f0d931777
+MISC ChangeLog 116396 SHA256 0430abf00c938a741a757c8095cb4ad979744257aa0518e8147a9a43653952e5 SHA512 4269b1529e666c412e246d16717c51bb583ac8a8f52131e8f084712bc15180c812a6188e2855413a9c82b6238925f24b0b6796f915100aa2a67df671ebb08281 WHIRLPOOL 4cbea1ae5de7148fd8e4bf4c587959c829a3fb71295ed51674abf3339901aaf29eb2de12e2f289736540eda11c868cb9356f9b00984de5752768241e356d446f
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20141217.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20141217.ebuild
new file mode 100644
index 0000000..87e89ce
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20141217.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-17_00-01-53/zip/netbeans-trunk-nightly-201412170001-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 5c873cd..b3852bb 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_p20141217 (17 Dec 2014)
+
+  17 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-websvccommon-9999_p20141217.ebuild:
+  bumped to the latest sources
+
 *netbeans-websvccommon-9999_p20141216 (16 Dec 2014)
 
   16 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 18b070b..1ae3bce 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -64,6 +64,7 @@ DIST netbeans-trunk-nightly-201412130001-src.zip 200994486 SHA256 30939e6630fc6f
 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
 DIST netbeans-trunk-nightly-201412160001-src.zip 201107782 SHA256 038363b1ab569308a58245000b840ed5b41d4a59325432f34819be9f946a1909 SHA512 dce19e10e9a7dc9811a5b455eeee75b158439642ab6bc45d9fb8168b4f127530f988959b9877223989745882ec3a7f342ab41365f1a3e08cd8389997296af002 WHIRLPOOL 98bc48650d52a0d92204efe214d8eb21d71c0e0db2a021b2660d314c2be730d998e006716a9037dc717fec850d7dfb4cccb25dad51b5e444e9bc229728721a43
+DIST netbeans-trunk-nightly-201412170001-src.zip 201113911 SHA256 2027f4cc789162e0693e1505b4ca1129f0114411a4369892639cbb96cc3445d9 SHA512 ceb29d9634c0983fe22ec2a318eba290c6a9b27e20faaf6258fb94f12184027556bbddc7d3be5c47c111b6241fb63e38c2ad726689ec43449087e6b6c20831c2 WHIRLPOOL 9b3327407877caf1bb9b838d6ecd7a08896e4f35fbffe3816c6ff3067fa9a29dd46b59340b7e1a28c3bca2a52a77cf44107266033cc336b21f21c2b9fc491042
 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
@@ -122,5 +123,6 @@ EBUILD netbeans-websvccommon-9999_p20141213.ebuild 2727 SHA256 cdea44dbd0f8bbf79
 EBUILD netbeans-websvccommon-9999_p20141214.ebuild 2727 SHA256 cd4b5c3a528e66d1c1ea5013fc2cf220a784eccc35a73a8c0788bca8a72825a7 SHA512 4bcbb9278724ba507cdad86a898e5702d0415556fea31bd98885e81139f7d501cfce3cd8970bf28c71eaa1c84cb33c9e6cc4814e7712492816da9e04b47bef1d WHIRLPOOL ce3c6bf722b97e09f99ad1bb56596454e030f6de487b479b028f726f2dcf2c316e79eb05a3167e1dfbc3c3efc0e739c07866796ceb10f28e8f7a0c304bb12448
 EBUILD netbeans-websvccommon-9999_p20141215.ebuild 2727 SHA256 d26be131e4d6bed75cc8f5e4e7f043d21509768e4704e758b091d4ea4de9475f SHA512 11c23d1883387350baff0f8d32eaf9e191dd73500db07b434397e3009c4c37d4481c9a9e880f050717fd5914a8028162b981da08b4bc029e86bb382e1ad41bd8 WHIRLPOOL 6b97be02fad051d58725ee9effb0482ddd1d57c59561866eda48d7e84ab65ac47f123c9b6457865ad0d3bab9c54cdc1284f3386feb2d0a11af059b9e23facf19
 EBUILD netbeans-websvccommon-9999_p20141216.ebuild 2727 SHA256 ecb73987208f9610875cb2cccfa13f936769651ce3663476f5f25072ecfe7aec SHA512 7431681f6fc038c47a3f0d2b7aee60f3ecb7c20922c7207096a88888af8bcc06dc23c2b6275fc56c1e4b43cda23efd41d25807fa01119d066642d8beb6d7b759 WHIRLPOOL 644537e84909c655201a2d4a70e18dea74b84b38a9732a364e37352067473a4763fd6cb98508420278e70de424ace8628bf651a5b7c6fa362befb0bec4b46599
-MISC ChangeLog 150196 SHA256 d1165472cb6187b356c3e2566789249ba7db3d899a30c7d2d1d5f3e9724229fb SHA512 911eb9dc8c1eb7abb69ad806f73f237cb5bd4ecaf7ec3a0a59aac96197b772f0cec9705fc974076bf9d6f9419053ed07b40c5aeeae60cf6012b4a652fbba6db5 WHIRLPOOL 37744de42ed0f5578cbe0da91a6db154f6f0d4fdf35c3d075728663ba792f00acf53353fd55d3d1f348dea7e7f3f1da14e3fcafd4bfcfad6dd76b6f33f4371d2
+EBUILD netbeans-websvccommon-9999_p20141217.ebuild 2727 SHA256 87983ecd15a0027853297b25515710c57a523d89e9ad4eee4956c5f0b9bdd2e8 SHA512 11c44c02294dbbabc5660dd487ac5c5a0a675dc1a720300be12e9b830273998c961bdc1ae2cfd1d17b7889453955e9a073e2c762f7c2a9d28e5375c49238b160 WHIRLPOOL adeaaa7e1e4a014d883ca10c37be742ed635477d1d1b0a0d8913067140c22011814fe9421f9bed12fed818d8038c5d308fa4e5387eb70020ce5997c6d64ef95c
+MISC ChangeLog 150381 SHA256 1bff8667f9df89f0613a5656250e97ff7919eda4289d51bcad97c5f50789093e SHA512 417918e05d22ed3817e736b4ded7bc3ad8659b769e0320f538e0cac77b7788bf898e4e7d5b77f6c8f734342cdc3764af58464f9b6e34b58785eb0e2c8494ab6a WHIRLPOOL d6addfdc57d5134de3b026a8f8f9cb987225b7d62f845d8403f0cbed17d9d27560818ed1a16cd51dadf42c0b6a0208c6b2b6d3da21df66555eb5981a29b35df4
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20141217.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20141217.ebuild
new file mode 100644
index 0000000..902f68f
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20141217.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-17_00-01-53/zip/netbeans-trunk-nightly-201412170001-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 ff5e3ca..0637d09 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_p20141217 (17 Dec 2014)
+
+  17 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-9999_p20141217.ebuild:
+  bumped to the latest sources
+
 *netbeans-9999_p20141216 (16 Dec 2014)
 
   16 Dec 2014; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index be2fea18..b662a54 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -72,6 +72,7 @@ DIST netbeans-trunk-nightly-201412130001-src.zip 200994486 SHA256 30939e6630fc6f
 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
 DIST netbeans-trunk-nightly-201412160001-src.zip 201107782 SHA256 038363b1ab569308a58245000b840ed5b41d4a59325432f34819be9f946a1909 SHA512 dce19e10e9a7dc9811a5b455eeee75b158439642ab6bc45d9fb8168b4f127530f988959b9877223989745882ec3a7f342ab41365f1a3e08cd8389997296af002 WHIRLPOOL 98bc48650d52a0d92204efe214d8eb21d71c0e0db2a021b2660d314c2be730d998e006716a9037dc717fec850d7dfb4cccb25dad51b5e444e9bc229728721a43
+DIST netbeans-trunk-nightly-201412170001-src.zip 201113911 SHA256 2027f4cc789162e0693e1505b4ca1129f0114411a4369892639cbb96cc3445d9 SHA512 ceb29d9634c0983fe22ec2a318eba290c6a9b27e20faaf6258fb94f12184027556bbddc7d3be5c47c111b6241fb63e38c2ad726689ec43449087e6b6c20831c2 WHIRLPOOL 9b3327407877caf1bb9b838d6ecd7a08896e4f35fbffe3816c6ff3067fa9a29dd46b59340b7e1a28c3bca2a52a77cf44107266033cc336b21f21c2b9fc491042
 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
@@ -130,5 +131,6 @@ EBUILD netbeans-9999_p20141213.ebuild 7216 SHA256 a3270a757b6608af8923dbc7e803c0
 EBUILD netbeans-9999_p20141214.ebuild 7216 SHA256 35d8d285a602df324753826a1eb1bf21c4f9c39771ef6cdceff80ac96d6e7bb8 SHA512 2041867d9a8616760f2e4104465639fa9096b9277e60a49a246fcbbcf12599a4c99acbebd3f36c2bcdebd8269255a7e24790c9e3f3644c1d7edf4f86f9545c16 WHIRLPOOL 2e0a6975de190beda2b07b68064b6ffbb44c283b5177b22e5ecfd19ee133f0e12eaf682ac6cb7fbf4fce179dcc0fdc306a7c08a21a4b88382251d4ffe6e1b757
 EBUILD netbeans-9999_p20141215.ebuild 7216 SHA256 e8aea2ecb0c7fed5548365ffde70a50de6c96dc8ff3210badcf5ee1b771f0201 SHA512 2f5c9e1951109b53b1f389cfbd2a96aaa1b4e424f039b3e253b11be0e29d8ed6f7f1dd84d71d8dcecbcff9b81080a595f07f86d8e985b635bbad4e3c05621074 WHIRLPOOL 1cfc074dfc7cf78b82600f1e9788aaee3414f2e24ab5a9ebe620f728c19f6351aeab0eb8f820fbad4dbb44a1cfebbe115ee077cc195513649df6285e910f9e60
 EBUILD netbeans-9999_p20141216.ebuild 7216 SHA256 e2490c04335daf288e56df5ed98d9c08f0d50058da53dcf9b0f8632c6a5a8278 SHA512 6368cf338a4dc3423b042cf7fee9b672b32c4bdc2664785cb1acc054785e70b8762a2dad494ab86f0b0f329cf8986f50bf6e8e8c74744fac6c45a407b70a89e9 WHIRLPOOL 0d9991015382133e45e29a58ff08bf8724d9ba9cdef6857e835b299f3ef31e7795cfdd2dff11ca034cea892e639b1dce17e50eac4fbb9319ebcc7de8523b0900
-MISC ChangeLog 128228 SHA256 b9cca4fa90079d20562a9e8d549f712d769e79a195c730bde668fac45d5e952d SHA512 24d9056dc50035882de65d35f41526232c6516128c478a27da0fbf227c2f699324e463cf734363c7cb6b940297338fa467da56e870c59cba7646bddb5acd3951 WHIRLPOOL 012506089b575e4ea01072db2274c5c5b3bc5754a11a846a22842e26a94b2e7e6c0dec15f40e4fc69d5197ef650c4d463c8fc424f60b9f78f29c7b6579353ed8
+EBUILD netbeans-9999_p20141217.ebuild 7216 SHA256 c66c3b25986f5f693916b41749d10a5ff951b8b8edb09ac7327e9de52110c2f0 SHA512 eef4f3948e98d47d88bd4d0739b0ff3e0e0d2f58d041ab32b109a10324822ba74c940ef9f714ef6e182bf7bf75ea5736526436b7917b37e1e10d4f1d566a1014 WHIRLPOOL 8b633ec421ff07e0ec8a4adbacd65b2f1caff87b3fd73a2ac0a73ebe8c5b543c87de81e124f0afa9a37369ecb52c7374d1bf25b3b57d7542b0bbb997898901a3
+MISC ChangeLog 128387 SHA256 df35fd854d794e2f6797c6049fd1c579a962b70996c36ba4c44a049721ad6775 SHA512 237a305fa05ddce6c6a84f1081f001b2962e536c58f684b34a1dc56c8aae91e5ad2d38177f4814560bf505cd35136d81e2abf13d692d7d047207cc16ef3c764f WHIRLPOOL ef192c6da88469e6c4caebd37ed278f2ede5e488b0eece7451816ce8491b671c934709cf6dd05e7b25c2c2b609950232d20f532c3df9e6c1b30727df6c497231
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

diff --git a/dev-util/netbeans/netbeans-9999_p20141217.ebuild b/dev-util/netbeans/netbeans-9999_p20141217.ebuild
new file mode 100644
index 0000000..c394e11
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20141217.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-17_00-01-53/zip/netbeans-trunk-nightly-201412170001-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] 2+ messages in thread
* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-websvccommon/, dev-java/netbeans-extide/, ...
@ 2016-06-19  9:06 Miroslav Šulc
  0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2016-06-19  9:06 UTC (permalink / raw
  To: gentoo-commits

commit:     52729003a4ecae68778c08f5174862e8e57abdcf
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 19 09:06:32 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Jun 19 09:06:32 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=52729003

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.3.0_rc1

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 845d7ee..4811c59 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
+DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
 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_p20160523.ebuild 3384 SHA256 f76c765f5b6be907e69359208b301b763b9cead85ce3242de7355994bd9ba315 SHA512 af4cbc420ab2e2d4a637be3214b1b24cfea752a548072cae392171f06445e80ef797740ad8dbdff177f499a2b3ea21a25050c83e2949c9e9bef39514133b7acc WHIRLPOOL 8754d4b8749e7f16af2ffccf046e893a9839f0d9a02226c9ed76a8f0608668bd5527dc58fd4e8338c582aec463d46693eb9e11bbbc5ee106ff29c7ee6fd608e3
@@ -49,4 +50,5 @@ EBUILD netbeans-apisupport-9999_p20160615.ebuild 3384 SHA256 de31ccbcdeeba9d8d40
 EBUILD netbeans-apisupport-9999_p20160616.ebuild 3384 SHA256 bc49b6a8adc59bad429c2eb36d051e35f84001396efc0f0f408e283c74ed3a40 SHA512 90f065ec7fb3b165c2fde3a74a75a403e484fce94e1a06b1fedb213955177c8ef405289f6f9a4fa9b082ad00ac8ff3918c4c5c7eb2cd6e0789cc72db844bbc78 WHIRLPOOL 5d754d206a00ea0688b06d70711d91a9e4a3f342f27f846e46810c8cb5c1af60a2956bc0c838b84c9ecdc1f36d0bc897f2a5f811897290a5ada6f8298ab38129
 EBUILD netbeans-apisupport-9999_p20160617.ebuild 3384 SHA256 a5b5da4b2f4bbac2539b0c0ef9f57e8a7db48468102979be697a9e73573570da SHA512 9d57fdb21863821bc5115d8dffb776045e752f2f74ecbd1db29cc377e21f29ed5a3c7b8e469e0b7532d1218eb75e7d25ed1f95cc680785cee64486ed1e7cb60b WHIRLPOOL be4d9ea7fb35426d8a00fff91dd1f9c8ec6906b9b2ed4e49e23ab592cb3345a066541b58f3b8b4bfe5b26907096253a6a08b977b13c82ade9cacab05126215e4
 EBUILD netbeans-apisupport-9999_p20160618.ebuild 3384 SHA256 653f6024a84998bac9ac3d9a9d6bbec0553361eb662a34a7b775e0ee8e1797cb SHA512 7915f179c34c6eac6a5234d4e7d8705470717281733ff4ac9082fb29127bb6355c9797c844f0d5e49bc7ee83b3212852d8572cacb530f4469409c15fa90f6240 WHIRLPOOL 6791903b7f2b437f8e6122c2b2f3db855ecb918abc9eb14501afb128667201ed803dc748015e3d0d5ed344d7420b98b459dc1d9c8010ea02241c8db552f0c334
+EBUILD netbeans-apisupport-9999_p20160619.ebuild 3384 SHA256 62d7250742c2f06f4115d173a3e43389467575b08a45c01ea0f184e1a554e0ef SHA512 bcac6290b100d2c4816955fda39dcc8aef4775559db5971df90aa669a078708161fc8afbf5ad2f7b1c5c52d058ce52e7df4ccc445688e5eb4fae71f621ef09e4 WHIRLPOOL 8ee0d9caf9d18bf3a81319cb3f4ee6260a49f9ee57411dc05eb1591773edecec136d57a21808dc1c0a1f4de08aeef6e75df8b2270436b1e5553310c46a7c3d68
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160619.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160619.ebuild
new file mode 100644
index 0000000..6d25109
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160619.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-06-19_00-02-33/zip/netbeans-trunk-nightly-201606190002-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 56ff026..1e0c2db 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
+DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
 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_p20160523.ebuild 4790 SHA256 ab62622126d237d801b7908c31c46da75943647053dc767da722c15c36c033c9 SHA512 600b0ca47dda255328befa12d2f615fb1bb4b4c598c2a36ce776bf38ac04a7fa1b037166aaf5bb9a8456c86ff278a20df09f7289a0b186423a78a07b170654cb WHIRLPOOL 47c173f4be068aaab6e855f0e19b58ecca2dacc73d4589f64928bec18aff7c6f9c921f3daa1c4790edbf94d63dd67af68847c93ea6716cf77cdca4d83baa3031
@@ -62,4 +63,5 @@ EBUILD netbeans-cnd-9999_p20160615.ebuild 4790 SHA256 38f8572e229753c2eabed5ff29
 EBUILD netbeans-cnd-9999_p20160616.ebuild 4790 SHA256 8e81c1d6df927f8e816c79073c2d50464893b359e1fa7353f81f9d29817544dd SHA512 07297874102c79c5c1e5d7e5d7f52ac3f9964912a937a5b0294656a13f0c93b5757ad684b688960b6b795439bd4cc3bf5ea69b56cc2b1b685a73035f083a646c WHIRLPOOL e03629cd10ec0ff49252650cc82046d95f90e54178a1cc74ffd116000f55deb4a84cc96491d68bf11781f9b1f0ed9c819c7cc7544ce607b591265ad916b30fb8
 EBUILD netbeans-cnd-9999_p20160617.ebuild 4790 SHA256 6f942202ab23b8565f06d1c53671d371ed9c41d106507746e3632255b1832e22 SHA512 975cefa161f05caa12a81afeeb413969351e73d43b207e8a1920302baed8e3cd65c6a3b7839c8955153538e04d8f5bb9ff7d5f7bfc022491d405bd415aef6761 WHIRLPOOL ea58a42c90e4050eebc95891602bb07b7c0c212318c9bbf773e69c8e84bd9ba459e2875fc7c3e68e56764d3e7fb336abab1e26a373940a6f2ab89b2e3f79b912
 EBUILD netbeans-cnd-9999_p20160618.ebuild 4790 SHA256 5da83ad7908207f88eb4f8e426a08d5d9f262b502fa3ce43b4a007eb5a071523 SHA512 c5e3c2e204927de2a6aecf8177a65ea026e56c31f1e42cc210efc2347b9926ff85a3d049a2c249bff377c1b9adcd8e8aad8cfdafe89cbaa29afd6377dc212036 WHIRLPOOL 47ba2893a13b8d09214508ef8896285826c5d11dc4ced55b19af1ac029821198a6a543d17669ec6a328cc492a304bfe1a5500f6fa94a785beeeb2f4fc7794efc
+EBUILD netbeans-cnd-9999_p20160619.ebuild 4790 SHA256 bad9a5191965dd8ce7f73f8a87a0cea2bedf32775b93d9c110bb8be6c31d5b0b SHA512 8b843cda21bdc47091ae05b531f3a5c2b953b05030f57f520cc963cdbd53422a18f4a4276f040fda4bd21bfc4722454d68a4400caf10532d7d74c2d46c9ecea4 WHIRLPOOL 6452dfd59f1f46eb96d1e7f365bd3235c81df6640129c834edb8f4f27b07dc9951e35c54f0fd8a852fd5108fe2e8c7029831ecd8e775f0a1f3a201cb4c3c73be
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160619.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160619.ebuild
new file mode 100644
index 0000000..51cd2ed
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160619.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-06-19_00-02-33/zip/netbeans-trunk-nightly-201606190002-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/1BD2563498D0E0BE1C7B3DD31FAD892B41EC041A-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}"/1BD2563498D0E0BE1C7B3DD31FAD892B41EC041A-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 e7f9465..95ac849 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
+DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
 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_p20160523.ebuild 2968 SHA256 7658035cfd5d24282c4ee1e79439d51563016cbbcf13f64a87fe67079a2126c6 SHA512 87281290a2b1ba86bb668f709248008b7f3ef1451bc8c2379d60020373290803ef3a43257819d196e45c9321e6e38a10edde69ac160c9bb1a9311f661a54eca8 WHIRLPOOL a0db1e947063e13cec47a9bf0f06960adaa4ddec9411ee1c49053f1b6daf62b8fcffe67e801f64d3d59b5598e16a4a3e354445f689fe9b67caddb97d5e4a2dfd
@@ -52,4 +53,5 @@ EBUILD netbeans-dlight-9999_p20160615.ebuild 2968 SHA256 13d25ae9bbe7ad583f2ce72
 EBUILD netbeans-dlight-9999_p20160616.ebuild 2968 SHA256 97e12ba216fa4cc3724ae0ecd226dd8193562c10109bef67d11ab13f25bf772c SHA512 dff90f1f42c224a0118393227edc0cf29b6c46bc8dbe8a147c30f66a6b7bcf3913387f4b3bf563a52de2f1a2e26677e6ade96bf3286bd5cce08b20430ff54047 WHIRLPOOL 91c2a62d695a76d9fef57c9cc0fe4aeaf2c911aab4114a62f7f9bad1bd40d5871608c00fb0eef449bdaee32feee39ec847f69b9e0cf98cd1e49315a88299c318
 EBUILD netbeans-dlight-9999_p20160617.ebuild 2968 SHA256 62289c46af8720570469a22d8bcfa34f84504175a00cf3f95c2f603e28f1774c SHA512 b58ead7b51fc5c991d221438b13ba3980b0097b3663c3b8067198f591906dcedcab594dce486cd3908fb3b62b54e4e471361ceab70b4034249025b9593b2505c WHIRLPOOL 4e26a77ad6964911923c11556b86552bbbcbb87676dc6bfa6a6858ab77bd06e3b1ddc47143085b559dd52e1662d2643f760eec8cd5a79268e79d47c023150bf2
 EBUILD netbeans-dlight-9999_p20160618.ebuild 2968 SHA256 9507130be7074091b9005a2dbaee302eee5782575cebbded01a7f68762df0b67 SHA512 1c89e27252fc78c83369c7cc90fa4deae216c13f9491c3bb9fcfa29f961647b474de92a12458947b0017b84f93821f8f0fe7687403883cb2297e78243b1c0705 WHIRLPOOL 8b3bc81f75a1f3548b2b2523a38e6c5cb496f9bf8a0f0599456e1dc76d49bcc845f114d9370e2d0215aef129047188061b7754148b289fd31363e1d34d7ed041
+EBUILD netbeans-dlight-9999_p20160619.ebuild 2968 SHA256 aa29f6e3e86b05ec8ae1b794f8d29c9c58bda4ca6c3e45142b4a3912ec1f3233 SHA512 66a4f1a5b3787b20e0fbad6bde2011fb106aa2b38dca8e3542b260ded852968dde1ec277fcd31fea3efe5fbe355dfb1e3f7274ca1d1186cd5763edd390ee9a0d WHIRLPOOL 047b83b1497ed9c97bd1fad6577b8eb049f38c2fa55e40622e0150154e8cb296c9d4f001ac8995c668aa6bb7846ea841ce4e5af264ba6b0228182fac1dcd84ff
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160619.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160619.ebuild
new file mode 100644
index 0000000..d0d593e
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160619.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-06-19_00-02-33/zip/netbeans-trunk-nightly-201606190002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/0F89C62CA701D20BA9A9A526D4D017888C3B5A65-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}"/0F89C62CA701D20BA9A9A526D4D017888C3B5A65-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 445121b..5a79018 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -57,6 +57,7 @@ DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
+DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
 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_p20160523.ebuild 15825 SHA256 986d8870dcb7b14615f3ae22b93c7910f73850579e92383362111fd25194aad6 SHA512 2d0d2f8bb1bb835a27a1b98dd27744ca65a53718df5bb63904da00497af3396fe600fedaa2a5aeb567c39e772dd8da67d8cc8052e937804e29a9f66af7e0548a WHIRLPOOL 65bf7a26ae9992fd9295784b611acd0844b50a6eff201c81ebe563759171a1c09968698b5a23b7dc4307acc55a1d09079c22b52ca5e7a316319cc7d13651e0f6
@@ -81,4 +82,5 @@ EBUILD netbeans-enterprise-9999_p20160615.ebuild 15825 SHA256 77130d68e119327f47
 EBUILD netbeans-enterprise-9999_p20160616.ebuild 15825 SHA256 67dc65afc49bae33892ba44c72db823f25ec47f1334f36dadaf31b979d9b601d SHA512 33f20491ea4b39b6f82a6ff0c2df31d58b4b462aa0c3c9b151ea1bad1854ca3653a4f9369bf926d7368b33c88cbb42b696ecfe099d6ac7b165a4c61e56eab5e9 WHIRLPOOL e6c6ccf8b36c2ad1f4349cd37a08c0b656e9204617d8b8b94ae29e2ea37ab6bfb8fab9c8c6421783a51db36d6a25e33d9e3dd3ed78060224e6a5c14b9fe32a4f
 EBUILD netbeans-enterprise-9999_p20160617.ebuild 15825 SHA256 56780f670a4888f18674202b112a3edc91e7787b20c32d56eb4674ec628202e4 SHA512 80c5ee109a86bd4602e78595465fbe6c7bb90eb68a6a37fd56a7555524edd9119c9f9a5e429ba26c6889355f736822b6b8c66b7ce6e05424743c1931f791d372 WHIRLPOOL 933df05eee623d68126fcca4d3cfb503edc2f9934e9e1edfb36bd0b9a189b1b46e39dc6f771dc00ee1d03b12122fa1dfadcaea46d3ce8c86dc6a9757b81a52f9
 EBUILD netbeans-enterprise-9999_p20160618.ebuild 15825 SHA256 86aaa2168888a50c259e778aa3fc0f7fb89f33fbf5d97b134f40bca5f7285b48 SHA512 27b2b2dacf37b6871a1ae1620c2135f9fdf3678da175074671a548aac3b34222a7384cb07200f170c328f1a8010227bf4e33cd0ae99d04a59b0cbde895644ff4 WHIRLPOOL 96cab73b30091d39104fee7102b661b4d4958856a663e2727cf948f0aab39f1734e7c9bb90c9be6aefb8ab6dd7c24e40f4051f55277146465398111c9a55d577
+EBUILD netbeans-enterprise-9999_p20160619.ebuild 15825 SHA256 8aa66ace0e3d555df5d838047d3399909fb2c8463fb7ee5c91041ab297dfd677 SHA512 b956046db574db9e871e50a89986dd9f4a8e59c98e2989c30d660979b2ee061b4f51c700feb9b016d26785b8240ffd3dd388ce9b310cffd5e93d709da66c7fcd WHIRLPOOL 6c5fdd9f5edcfe5b17eac1352b3866230a01e44bd619bdb625f8700b5548d30e3a531561dfc05dfc9d5e3f0dd8733d5e029f75819a3913f3707d1d816b8c584a
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160619.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160619.ebuild
new file mode 100644
index 0000000..e46d26a
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160619.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-06-19_00-02-33/zip/netbeans-trunk-nightly-201606190002-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 81f9506..3c0aac8 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
+DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
 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_p20160523.ebuild 2913 SHA256 96364969034db64a7702340b43441479c115d6bef57f57a16444e55a2e5f7edb SHA512 1721c2b13533f4f14eb97f39574c9e6e97eb1993fb59b807e0aa042f2b5520607a3b4e7e7e7b66127a45cc66d02f9d217f7ba78c0e88f3851aa6ec302211b5e9 WHIRLPOOL 4818b2d9650dbce3a37720a4798aced5952fcf539820b04c09dc82286413a21aa7c0aea19b3cf28d2d52ebf9c8f569670a52793d61b03de4b04b7b671ff91861
@@ -49,4 +50,5 @@ EBUILD netbeans-ergonomics-9999_p20160615.ebuild 2913 SHA256 3c42247c47f213d0c42
 EBUILD netbeans-ergonomics-9999_p20160616.ebuild 2913 SHA256 fce9bb6e0222b4c2fc245c634bd247addb6268179796cf6811c5db1a12f5d31f SHA512 4111d7b14ef8c95dace4acb4cea3ae38b1bdde6d99ec2f86d44c96ba17fcf4edbf6414bc0937785571eebd9c3ed1fdf077845d8e6a7efafd9417afd3b2365563 WHIRLPOOL 85b439aac7d6ca7415407c8d5d43a39c7cdbcdd3796d712eb7a4d21d256ef584b045c47c49c80ce11ea068a1598df7874c81595054836d6e9b897c123d01fc24
 EBUILD netbeans-ergonomics-9999_p20160617.ebuild 2913 SHA256 c46bb6c3ff85b87c2a108179e3769a714563e11aedf9bff5ae40aee92ef79cce SHA512 4ebc0b801d5893ace81523940ccd7346e83c6c72ee042ab3d9456ca79a7270e808df1e79208dc2f17a9812572788406ed1cd855e00b3392c2a30c60d90fbe9a0 WHIRLPOOL ee4d9e994d314909b195c20c87f4e27d850d98f45bd70e77d78c425bd6a68fe20ba7857c59ea235e8bab371bd3e9a77efb0974c461431ba94f20e8ddcb58c360
 EBUILD netbeans-ergonomics-9999_p20160618.ebuild 2913 SHA256 51abcc43a1da22812105d97b46765c303c30b77921914a9f6fc39016df64c628 SHA512 9e807590dd855c39bbd3e5060eb3103e67393d5c5d45ae7c4abedd120d8088a04492b350100b58009bf2433550bdbacb715e4a3f2c5e996e135819ec301d7af8 WHIRLPOOL f08a3145cb2d6c146a53307d57c695afdbdb1798c70c25d3cf2a47a2b8d1391d4afe86ade356b3b505f8b39b9c5b61ca53ed942492bb7c8ec928e4a6c4fcdaa1
+EBUILD netbeans-ergonomics-9999_p20160619.ebuild 2913 SHA256 895a2f0d66ca9fc0fd9e034320052d8b58e6148d87a43bd347f2ca26d38c522a SHA512 372439cb2f326dd38e8dda1692ade104628b4735e3a3b5d07736afb6ad701e37c8d6f322a4ca9dea70573ef4cba01a5f020a8f9e27447f682fed15481e6c9173 WHIRLPOOL a79e80bfac86cd7c1b102a50d67a27c99818e0abe65783243e8bf7e74d6ed38116fb1ed9301cbb5f4948e204f01ce3031e7bee4046e0637a87e16a684ce2a640
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160619.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160619.ebuild
new file mode 100644
index 0000000..988b01e
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160619.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-06-19_00-02-33/zip/netbeans-trunk-nightly-201606190002-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 3a2b2c3..bba3de9 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
+DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
 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_p20160523.ebuild 3377 SHA256 712e59370d3b3926be6b8db5b6b5dd49c56c4f265ae63abc8b68a1ecdcb77f9d SHA512 d9706a5a1dc2b42be4964a3890b057acb13be0e4cb1b3a4e66b8b2ad4efb54f784be20def8dc56baf4ab69b5b5fcff67679bb58d05539ea4f26e735d01cbcb0d WHIRLPOOL 6ca5380f5ae2a053bf5d289c740c8228d2030b1114179bfefdaf63c694874d235240af46e6925022749f585eecb255b050e965379683326ed439baa38c3a8e2e
@@ -53,4 +54,5 @@ EBUILD netbeans-extide-9999_p20160615.ebuild 3377 SHA256 8d94127171b624564fd1569
 EBUILD netbeans-extide-9999_p20160616.ebuild 3377 SHA256 447b2b78d1f38e712a2c7d503718b2dd0e3cbe8b4d541519b4be7e4c483403db SHA512 f83bd4312fbeeec6d9c092372338f5d26006b4c4b751912a1ceeccb0f9c9775cc6aa4492d7cdd7fe4437a980a02a404ddc0c7c820e4a20b09bc73a65e3073d96 WHIRLPOOL 906bb9f17627a4c7a65fb3d3dd6b4a40db770f3af0dac7d4a999c9ef08b925e39a03d147eece3ba98b23f79e1a488e4a3f2a7aafc8794de22bbc9bf359e1825f
 EBUILD netbeans-extide-9999_p20160617.ebuild 3377 SHA256 650a3c69d5596d9f9267c7bef4ba1c4828f29d5844034cd53c5a56ba62764808 SHA512 f289b63b0acb3ca9bb0b6a0a62e7f59c0d785abde50e4956d852cd3e96b4fa48c70aa527f3a51f66f1d7873126e47e5020869974d477c3fabb8040a28a226c48 WHIRLPOOL 69eb2225d12d239a936ac012fade59ab8c0ca1db87598b15bb4697ad2bb1c18a9caeb0b2e0cc629a2321f432a417808599941ba184ea19a1f494b8d9b6e8450e
 EBUILD netbeans-extide-9999_p20160618.ebuild 3377 SHA256 0b89a7a67e28521b8429075d00b0a9b85ab6c1a765bf405901bd9b7a131f5794 SHA512 118708e266fc7341513444f9514ed311b9177a71d2de79dfcedc4a526e81028486f6fc40d5b85d914fddac123eb33a946853c68d485d0a0772eaa47db85ce7d4 WHIRLPOOL 975bdcd0a9ddab72b094ef1a1341e120e349e8cdb1d791075c7dbfac1efa7ec9946711dbb26110716f4cf014411ae9c7132d84eb36ae7a24cea4a0479864db5f
+EBUILD netbeans-extide-9999_p20160619.ebuild 3377 SHA256 8218ece1f0dfc76088617f60dc1389b5833dd952901a3d4796cbfe9439834395 SHA512 a5773c99fc8a3546ed2a080f2342503a4bc2ba985b9a1ec549cd126da4df72cd0b8ec7c7b436caf1dd5e7306a5a4897943b2545305aea183426e551dac61e302 WHIRLPOOL 1ac9f80566d306ed1df60833007ac3c6bc1c46283aa3532b43e16553d0ec0a6287bbeb582a9ac014001985683656d292717b11fafc1b79b0942b0c18978ba4f4
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160619.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160619.ebuild
new file mode 100644
index 0000000..83e9218
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20160619.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-06-19_00-02-33/zip/netbeans-trunk-nightly-201606190002-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 53fd881..c5bc782 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
+DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
 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_p20160523.ebuild 3416 SHA256 53858a9940b83578c2efc16b35fd63ce2520fc1cc58f8bf7b93e28383ace5820 SHA512 3501a897b4c3618b7d98b90870b80f4a03fb6e8bdb5c3b2b78b1c2aaea3321ab8cf42fde5ed5d89cc4180a34f13f5e8b7218e04cd8fd34c57500e61aa1c59631 WHIRLPOOL c5a388e0b7e1901be94bce3079b106b9947d6bc57a1020ae8bd4337dd448f97a7d7198d419936cbeb4250285ce02ef4f4e9cc2f3758aa60ecfa82a59cc253c97
@@ -51,4 +52,5 @@ EBUILD netbeans-groovy-9999_p20160615.ebuild 3416 SHA256 9ad41132854e17cae83f0c6
 EBUILD netbeans-groovy-9999_p20160616.ebuild 3416 SHA256 42300c18c16b927900009b2318221ea59ce65006f0b4e99198fa587cfb3a24e6 SHA512 2701a9599d82a38687a322ab46269314d6048c763e85f0f51baa4401c6cdc46543e61555ab50899e9fab0685b34f0a5ea5028bb55bf228771bf586043882b5f6 WHIRLPOOL e0a9fc0909903b0bb78f98981f99c1cf49816ef9f0848f6bc0837378651805e43b3b5bd649def230421215663aa0491c704e5975828e190e52e0b79997232af7
 EBUILD netbeans-groovy-9999_p20160617.ebuild 3416 SHA256 2cce6a5f1d074a83eacba1e5bf12d0ed5fd9d0edf2f194942e0774da0df25067 SHA512 9783839e20b93290f354823135874a736dcee8fe48eac63819dfaa13d1dc05f10f2be1e663dc4b6120408adae3ff994e7d443897ed8fe280062e0b21908824d6 WHIRLPOOL c8d6418b606dca59de0bb60606fb182d69ba9829731276a42201d612c4537338ef19b75c837fbd3c916204701f7a7c179786fc35048a4c76063947725d04ba67
 EBUILD netbeans-groovy-9999_p20160618.ebuild 3416 SHA256 1520a2c04fb828d423e531479d79a367b550acbd4f180f3ad1f2c60d44143271 SHA512 d5be892dae22077a07622f9338822ff4118ca8009da4947be99ce289cd7cbdfc49589453bc8e12d6e5f03601176ac683dc444530366d9fdf4b07b556b194e573 WHIRLPOOL a5353a0543c341f6bfc2c4cb1763ad7e5a6393596d9c28fcbda81bc37edf4f32e017f06879d8fb0739445a6ab692737693005783cad9d3e8a6f16151e67229aa
+EBUILD netbeans-groovy-9999_p20160619.ebuild 3416 SHA256 b99f21addf291e4d4e197d424f37322f16ea656df1b39cb1d435a0f224d0d698 SHA512 a2a68139e97d1cb61f0996b63daae1d7ac74039c06d2a287085f66bcd73a16b0b0e745abce478b7f49f8b3146ec7dd9aca1cd44c17ad84e35770a0fb2dab6bc4 WHIRLPOOL 71519ff4e6e6fc14c760c753948294eaf201e5bf67918629cd51293367ede03f62f30dcf86386eefdf0ca8d29ae773656ee27d60f2b0b707dda111e745dcfdd4
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160619.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160619.ebuild
new file mode 100644
index 0000000..1de9c91
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160619.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-06-19_00-02-33/zip/netbeans-trunk-nightly-201606190002-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 28b82b8..9938c97 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
+DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
 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_p20160523.ebuild 4126 SHA256 d5ef830ffc8ea2ebda13a6eb51a1942489e7e0106cf7d363eb3b071330444cfc SHA512 a7023bdcf6b1ae87bc33b28b02974d0f1e068354a94f3995ccfdebc396a08efbd752a87a52d76b64c21b8092c665ba0c9b2b9e3a781de2286b9ef2eae3a96842 WHIRLPOOL ccbec50327b9a2a6f910850f5efc53bddab511f59727e1d18cb14696d0852bdbf40c4dd542a3191d95d7072a7bf420939a622d4bafb94a3cf67b2ab301882636
@@ -54,4 +55,5 @@ EBUILD netbeans-harness-9999_p20160615.ebuild 4126 SHA256 45d0d3cd6ef47cbe49111a
 EBUILD netbeans-harness-9999_p20160616.ebuild 4126 SHA256 ba685f70140f5011e7cfb66445933d498b4686d1cc897a52fb32d69cead6c63c SHA512 24f7d1debcbe39415a24d1adf8caca164eb1f8e83db091b67b169b8651ac72d16f5e3e32f7bad1b90e21bb80e533c0c7ce9da42255afec1813244a251746d428 WHIRLPOOL 45a2272c65a31ecf8762970c943c173272857b9529d2e18180fac419a58125bdb248a14bbd7cca38efa64cdcc4d50d927efa45f0f1a5f3223964bf0b51a77082
 EBUILD netbeans-harness-9999_p20160617.ebuild 4126 SHA256 54c77b47df014cdd74a352e0884110d11db27744e0725b26ad90c408d748ff5f SHA512 c4389f5c8c005b220f27e7fc7f4f607a92780f476946cfcf6e8108f44b263c73c48fcd30dcafb87e801e1c7ce5365d3888591ed170b85550cabc0086511a2036 WHIRLPOOL 8925bae5a670d7ebb456e15614d74e548ae37728039541cf8242ccc151ab2c4dc729ba01179ed68d21d447d229acba1b2f77312fec119a7940a91264c4706408
 EBUILD netbeans-harness-9999_p20160618.ebuild 4126 SHA256 78c646271692572f5f2ee7955d01147f3494279156ebd01aaf185f014937075f SHA512 c3851f73072dbf358970f524bd150acd10a7dd9da4a95d9d237ae6e4b89518bc2becea4d0049202bdb7d7baeddc9461d6b7d2d9bb84448df8b67a81566dc5f30 WHIRLPOOL 93e91bb9a47850a72943bc0bf9aea25e2e51eb293be7c52f58b016bf98710120fb039ebefc452a2681402b71e06cde8ada423541bae611b5b8b4ec46e88e19ac
+EBUILD netbeans-harness-9999_p20160619.ebuild 4126 SHA256 fa85ceff556cf477ff9e03abaa0efa3914a4999fed15849b2566d2049091b68d SHA512 acd36f4e9d684e03f1fe4fd36a054dadd58d75e209a619d3fcbc422f4029a8558d48a67a73af1748010e55d8e9ebca7a74b57b3f42e3008ed3279acd20c1e5af WHIRLPOOL 7f680cd3a1113af287495b71fcb09099476d787527b0ec73a8e40b823c520c6dfb5151442b93a6fcf143b8b07df7e03c0baa86cfdbcf012658f7821c43331793
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160619.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160619.ebuild
new file mode 100644
index 0000000..b4ec3c4
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20160619.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-06-19_00-02-33/zip/netbeans-trunk-nightly-201606190002-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 0f57854..c811588 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -165,6 +165,7 @@ DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
+DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
 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_p20160523.ebuild 30761 SHA256 93157f7392922803c69db9d37f246c546acb4c757ea944c8a3c5425bfea0db37 SHA512 017df530f8c63e592530c534a028b11ec82a606bf2311c2abdeb33b0b3851a8d3fff499635fff3ae4ef8775a175996475de40932786f35cdc84cd4ebc109fb8e WHIRLPOOL 271c02baa53e7c6303949260fd460b181430371b1f99de3ba91cabc858eadd8fc875fde7b59c7b2eccac3befea9df16eabc68c92b44b4d112e226c8322ce0358
@@ -189,4 +190,5 @@ EBUILD netbeans-ide-9999_p20160615.ebuild 29867 SHA256 deefa732a92c591d90b9f66e4
 EBUILD netbeans-ide-9999_p20160616.ebuild 29867 SHA256 8b9b24d96cfb1fdbcb17529ba0a216216a7ce3dde5bc7e76415fb10990696e1f SHA512 d96b51929d51e09d911d60a847313e1b06769985ce8490a7fc43cd83ceab0fee33b3e86836c9752585e5b2334d8b5db5501f3a50bee4b4a357ca6ab33f55b8ed WHIRLPOOL febf90375b1aa59cbaa5747b03973cda730f8826c36eb6528dc6491a0ef029bad1b40b5ad3e486edf1cbfd76ffbbfe7294a9ea7a41cdf378045e7b1687d5d70d
 EBUILD netbeans-ide-9999_p20160617.ebuild 29867 SHA256 53d1bb1a38af2096acc8bcac092971c9ebd87550525700a860154b2bcfc09544 SHA512 c49056bf2adeac686404a08dfc22b73016c74ea5318358c4e43f890f8ebd8ec3d7c97f1727706b39a7a9c17ee8a2869b42f4beba95dcb2f57a314d85f7da31c3 WHIRLPOOL 99eb56bea610a3694210d633255efaaca9e6511d7ac1045a2e161875e347220bd0222baeb46772d1fa2252303b99af92f5240977fbfeb84b7280bd707c221f45
 EBUILD netbeans-ide-9999_p20160618.ebuild 29867 SHA256 0ee16b306ed43c6046e732889a414601d54d0c9d3f0bfbcb7e991390cac2acee SHA512 d1866d8d43925d4d4e15918edd8507dd2e464d5e4ca3060b5bde092d4e382a60a99f6caa75a5998d29e5f20e5c1a8353a461083ac4c6c50395c101d40ab9f3cf WHIRLPOOL 13d7d144d301659be57474188e2ef5c2ea824818a248c64a981296f88f93e1437f54ec5a8c2325b8594d407ec3d357b5cfb307aadfebac8989c1ed7540d5e300
+EBUILD netbeans-ide-9999_p20160619.ebuild 29867 SHA256 72ddc326ea660a16eab2730a23e574c7299e7c950400b03d88b67f9112a80fae SHA512 28b30a234da4b930cd64b3fe7c94cdad5ba5f0c60aef4b4824fd13b2acf67b96473502e619b191ad1f7860b4249efe85518f19db0a19e06c6d526f227ea031db WHIRLPOOL e08860541343c964a569b0b4a53f657b476cbb693ddf6ad34f74878f500fbfae58cabc626c4b1eb389c2fee7d08eb6c0cd19bcaed7ca2fa48ce2cba1550bcae2
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160619.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160619.ebuild
new file mode 100644
index 0000000..1f2768a
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20160619.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-06-19_00-02-33/zip/netbeans-trunk-nightly-201606190002-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.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-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.2-1002.jdbc4.jar && java-pkg_jar-from --into "${instdir}" jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar
+	rm saxon9B.jar && java-pkg_jar-from --into "${instdir}" saxon-9 saxon.jar saxon9B.jar
+	rm servlet-2.2.jar && java-pkg_jar-from --into "${instdir}" tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
+	rm smack.jar && java-pkg_jar-from --into "${instdir}" smack-2.2 smack.jar
+	rm smackx.jar && java-pkg_jar-from --into "${instdir}" smack-2.2 smackx.jar
+	# rm svnjavahl.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl.jar || die
+	rm xerces-2.8.0.jar && java-pkg_jar-from --into "${instdir}" xerces-2 xercesImpl.jar xerces-2.8.0.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxb
+	pushd "${instdir}" >/dev/null || die
+	rm activation.jar && java-pkg_jar-from --into "${instdir}" sun-jaf activation.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxb/api
+	pushd "${instdir}" >/dev/null || die
+	rm jsr173_1.0_api.jar && java-pkg_jar-from --into "${instdir}" jsr173 jsr173.jar jsr173_1.0_api.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ide
+}

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 783dbc7..9a33a03 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -68,6 +68,7 @@ DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
+DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
 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_p20160523.ebuild 15656 SHA256 2b3a09ae5c051ba6dfddd8f26957bedf50f55c8a74d8728baf51a476bd2af091 SHA512 c6c6d42f52a27624ff66b3bec4741d9bcebefdbd68b6a4051cdef7a8059f15f298bb22146c36a8156b21b944d830754cd9af1f8619b8cfcb21ddac20c9c84893 WHIRLPOOL 67a7d364ac48ad8e964bdb0e5b1aecd88caba1c17661fca12eb6187f63be86874041ddbe6fe7c132008d6d4436b66dcb4d7a9701adf882fbf967f90282d69de9
@@ -92,4 +93,5 @@ EBUILD netbeans-java-9999_p20160615.ebuild 15656 SHA256 a0ea8d9fc4cf129152317153
 EBUILD netbeans-java-9999_p20160616.ebuild 15656 SHA256 08c0f6f91c18424f71499886f549d99a9f4f21e83864a1211adcc7001376140e SHA512 911161fedfb54ac9de79add222f1aa548907163cdb845302c8f720ec68009485c1b1c042c36e92dac1246b645d3c5c6bb4a7ba694c3dfb66b1374e257ace34e3 WHIRLPOOL 951e258428cbe2c789709c064c5bbd1bd8fed80551b0b37ce31749cdc13c10a618a16d89196123e18147f53a0cbb2714961fae0f48affe122089a000728df34e
 EBUILD netbeans-java-9999_p20160617.ebuild 15656 SHA256 f1ba76130306bd36c5597fc7c8740a77a8c0e1fa792ec156d09bf6f9f10c2d5d SHA512 b939e5395a6dd40732b6c3cb77ea268d85b2b8d770b51c548c338199bcb465da3f62d61dc5be92b6334407caffad7eb38b78a6ac4a949903f4b5a44d821aaebc WHIRLPOOL 511e61adb044b844b4b94d77b688805542a56183e8246033a98209e3da291101c7b0d0327f3aaef9c3d5e490647f2d43bd99a1bc3db7edbaa4458d01136b3e21
 EBUILD netbeans-java-9999_p20160618.ebuild 15656 SHA256 13adf4d265715f0bb5b5c5e79f54dbec9614b10fc45e8319383ab144845b38b8 SHA512 84dccd5265065aa22b9341c1a1250298aeea60f729620e8b6e0024a594a846f98014691555c830f0e18c927081975d401210e545d64359a0d1849e04e01089ba WHIRLPOOL b51a03a19924419ddeb089a55f6ceef3ae15cc3153edcabd2eaa527a10d282aed3d5020115d2c9a0361d54ab5293b91ce2e459d6732ae6d11a3d80808379f404
+EBUILD netbeans-java-9999_p20160619.ebuild 15656 SHA256 3bd997ea34c3a2730eec6737f828a40937d2bb1324f03c04b7f42f5d50c02da7 SHA512 25e233c71bbc75697c71ce5fa0e86e77af2e76a1a5a4ce8602d20d6833d54b72882d38958325de4e8d31b9a5a0622eb2a1b25fac543d20f4c8f4c1673af55815 WHIRLPOOL 34b056b95c30d25525e2e83d22df79a006bfb47e4ba706c80d06ec0375c8b521dd7b265a01c0def667453ce523254046ca54c2a6ba7548f97de75167813ff8f2
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160619.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160619.ebuild
new file mode 100644
index 0000000..cc419e1
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20160619.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-06-19_00-02-33/zip/netbeans-trunk-nightly-201606190002-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/47E8B11BBA8D4796ADC351499A07197ADF03383B-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}"/47E8B11BBA8D4796ADC351499A07197ADF03383B-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 65325b0..8d86e31 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
+DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
 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_p20160523.ebuild 4971 SHA256 7e6466b0a6131ed1c651e55ed200b91818c210938b94c3beb0ba466c86324c61 SHA512 39a9364bc7f94872dde339d22c497386eaf4f109a53a93b68db928ef73545572a3cccbb04c81ac1cadd286c18e25b0209d33fade71de9e7f9569f6acf70837ef WHIRLPOOL 1e49e2c1149bb8f77cc5ab5a1b2402d523de4d9d16f4df9ec236ed09878f0c3580c94e5b66e5b3e4dabacffbfab220a693411c5aa2b0d4fa04bf40a21487026d
@@ -52,4 +53,5 @@ EBUILD netbeans-javacard-9999_p20160615.ebuild 4971 SHA256 ec2ef842558671cca4b85
 EBUILD netbeans-javacard-9999_p20160616.ebuild 4971 SHA256 07f957fa622b72df3ad275babb74f734076fb2a83c6a5b5329ba29ca80743f1c SHA512 ebb4663e2e49a6966d4bc4cc83a9d34f689e857504e096f834c5b6d63379427d2860e2c14f668e528fc1f5a4d1818524a0e62f07c4231acb38bf0c1bdf3e9ec8 WHIRLPOOL 94ad39967a7f66f3bef4f6a14233f3729a1cfd356ee2a533e3f519bf3d1bbf87f574d19fdec4ae284ea2798a1a78b21092058637b93a56389a6475d232a8486c
 EBUILD netbeans-javacard-9999_p20160617.ebuild 4971 SHA256 7a35bfa0469c5816d703c6257b7709a94cec814e9de015fc4a28784853450f2b SHA512 0d5b689b13a8411fe202633106f1cd01c9256aaff08830f02fea57a71d74c2b7fbf0fa5149cac6981b15d6e8e9249f67866112caf82d711d3842509f22e19126 WHIRLPOOL ff6ada3f72944ae39de506eb7408fcbe8e856301660e9dcb463d66223b031462693690d8de8bc63d1330eebc5fdab921c708244b9d77292012f3606bed342b6b
 EBUILD netbeans-javacard-9999_p20160618.ebuild 4971 SHA256 6164ef9dca6e4ed2cb6ea614cc1cc6fccb82195381066debae97721167521e2c SHA512 beb6a099d330493b054f5bcfd719946769f7f70d86c2fbd105192c0ab0b195409fee4612e29c02e826faa7ee779ff42cbc42b927551d4a81498ad0e8a3de91f4 WHIRLPOOL a6f6406df960c4fd20c0ddf2a94f6e1e3aa881bfb08b7ac8c16bd4e85b3b46c809d6de299e7ca9f2d1802a4b73cc5a597b451b61422e7df3908490b5456b1bc3
+EBUILD netbeans-javacard-9999_p20160619.ebuild 4971 SHA256 da2b8a275b12e9f6f7918b161ba774af404273911eb844373f57856d81a410a5 SHA512 02291d90b6dc7666da421ff44aefb37d536a11113b3a631ad0cd16c3b0f210804240a4d540e823d5f78ce5d2b952557db92f1aa119f06cd20b48a44d8ace88ea WHIRLPOOL 3deb5220853462938a593d9cd8819e3c7de12b5e3ccbb2d4340ae691218f1c2512d8854c3bb70d506f65fb5ba1da24b47acd31b0b587363f820d75198b1197d8
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160619.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160619.ebuild
new file mode 100644
index 0000000..df08446
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160619.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-06-19_00-02-33/zip/netbeans-trunk-nightly-201606190002-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 60a511a..c589f92 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
+DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
 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_p20160523.ebuild 6293 SHA256 7e336bded2bba4190c934e3dd27cc4cc2d3216b0b82893bb2ac03343f09cf73c SHA512 9765972bce05fa120ea3c0ca871c67b5244b83d683b5efa00f988336583a402fb15d2f49a420bdae6c68c804f6409e3c61ced1d6954d6b11307c013fe8d03053 WHIRLPOOL 7709fe1fe1cacfe952610db76da279be25ac5ddb40ab141c1426fa0076ccd77c97399b9343f1d48456cc9128924cfc4137c7f1c52e2d9ac7cec5bdc1ab7c97c5
@@ -51,4 +52,5 @@ EBUILD netbeans-javadoc-9999_p20160615.ebuild 6293 SHA256 e663d34186e5722da7122a
 EBUILD netbeans-javadoc-9999_p20160616.ebuild 6293 SHA256 2c773464b6cd2f9afd9556359c8867d46da873a0d451c14b9b7ded53bba33c0f SHA512 9a960a89b1cc5e6057cdc1e4e4c61b563221aa08321c5465a10883315d4d5b57b07cc3b6baeda3725489ae8f2bc776492003f73218327d2559000c31a3d71593 WHIRLPOOL 25a47193598296e46ba636bd2025ff31fcb9a9f24b6c54c1237710d641485024b7c807b5c6b6d2a8c7010c138b5494f0dc0766ccd3fb0470ff8cef05321f6110
 EBUILD netbeans-javadoc-9999_p20160617.ebuild 6293 SHA256 504582e3479edad515e71f6b756148a2395a200c29afd83421ae0d6dbf16de7e SHA512 c3d760188110a73276340eec8fd34325f1534643eab08b204aa0e2ed3499f6b7c24380748e6f954f7e3c256e32308b4b2c89205af9e293518ef8017942c99f39 WHIRLPOOL 3627b38ebb65fb3026d78047d7237907c25812d61af56a251b4c18ac83904c3fd69e2a83f26cba47f0b8db42fa28a4ae2e7a3f79863ad85710e10d9116fa7313
 EBUILD netbeans-javadoc-9999_p20160618.ebuild 6293 SHA256 77a9eeecc11fdb8a1c1f6df2a4caa5830c9b0bb5b1794927dcade36c7ab5780a SHA512 65a1f8bbb00c4958007ccc600deb304cd2414958829f858653516ca96acc8c5538e6bd81526f3bc3f284425c5d56f0068f5f6e14533e39fae003a79640622a6c WHIRLPOOL b4a11cba5e873dabd84b5904435c0b87404c570fc9192dda6aa08ec1373135a0784d8cdfc57891e97d86afa00235e4978c144b680b71491f6fd1ff68f14e835c
+EBUILD netbeans-javadoc-9999_p20160619.ebuild 6293 SHA256 e4fd24198b55e0e7e6513655178c5cf0543c13bf1eef1bea66da2a58f1fd4e48 SHA512 8baf00c3d0779adaa3e3bb495e239498637d71b55dde2b06fae72591ef05e40389da597114c8706e218c890a58ce7805d7da3a2bbaab018b51f60a72c5935afa WHIRLPOOL 2523655dd9f19bbf20c62768b66c15892ab7f7d24d00a48051a5226de2648985ad6c65b931ab8de4864ad8b95951a09347e88452ffa1d0b94c80c8f0e4ffdd78
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160619.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160619.ebuild
new file mode 100644
index 0000000..d57de6e
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160619.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-06-19_00-02-33/zip/netbeans-trunk-nightly-201606190002-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 29c416b..052cf4c 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
+DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
 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_p20160523.ebuild 4717 SHA256 0f0ce84ebcb9f28cec7ed57b2c5ef667b5d9d385b509db7144b6397bfa123e27 SHA512 afe887a0835853b4c9583461e05c02c8fe433c78385f3d9aa99eaef5192636380c5255230a04f49a8a54367dddd1eec8be26a5b7eacdc42088c505aac3b6248b WHIRLPOOL 16a696c48032092f3a9b7479020676096631f08d199e3a975609a9441c2f4dee937bdf0c26fc16a843ceb89cd9a0a43293e32509d03330941cee243a95de4845
@@ -57,4 +58,5 @@ EBUILD netbeans-javafx-9999_p20160615.ebuild 4717 SHA256 7c25503a4f1a7cfeed68365
 EBUILD netbeans-javafx-9999_p20160616.ebuild 4717 SHA256 e628c45fab98d8ca675391b8e46fce8c880eef550762477ee056bfef8a79f02f SHA512 6fb2fec0939dcbca63afca2983ea2112abfe87664cd79c82c66e6a9c8d3a0f25494674818b11c8462c6a0a1e3b8a4ba9320f34f885aa80d374cb40059110ea7f WHIRLPOOL 716244f2d572cd2426fa104e85b70ba6540ad49e4b26dbede8520fb3f0c233d2fe7239df61bbfaddc75f36ce1f5bf142542629ae96192a480924ae70b8379ef1
 EBUILD netbeans-javafx-9999_p20160617.ebuild 4717 SHA256 bec98089dd32623bb722f0e5fae1d1093eed93c6328724890acc3840721ff82b SHA512 943cb92b0edc45a56437fb965548f23459a01d566dcb770a6447abacea000006239383e18762e02350d3a0d82dea58c8cd28c495f04ff5410f44dafa6c9ce31b WHIRLPOOL 2014ca5abde56477180de6eea17d521304da913e46fa85b149bdb58d856b435235a8a142110cff3c3632b20846f064b340622b657d52f6c420e6d02394cd2cbe
 EBUILD netbeans-javafx-9999_p20160618.ebuild 4717 SHA256 daa849216b3d786b7549c4e1cf9a7327e234a9e760a9172cfa09a5e006214ef4 SHA512 e43cf9518b97e144c41f32fdec62f09e5c44f31a8223e7f25ad13221c2c09c865a1f7bc5c715f03123ece908a666f42d04b05f9d670ceeeff0d967496e43678a WHIRLPOOL 468bda70a15ad5b812dd83afd453b540dc759006af5fe8893ca68fdfc18c4c87ddef05b945c588b5e90bd30879d284b4e8f31c4d1d89aa3d9add0bf251f19865
+EBUILD netbeans-javafx-9999_p20160619.ebuild 4717 SHA256 d4b6d29310536b5dac6b03087b40f8722308608487aecad11cd037b1303b7a33 SHA512 58a789051b4c644ba58e9fe1b29a980ca904b9b16b00b0ee4de0886360e41748dd5f06825c43b18226c1b2f4bb7a8e7984213a045b2426ef61fc7e2c855beea7 WHIRLPOOL 0203b08c2c7a115b1bd2c80b1486e826e141be1671677da97fa5a556e704e6284c77b386bdba2e25b29dd63cea30a223f4de71ddd0c41f0356e61fff56466165
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160619.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160619.ebuild
new file mode 100644
index 0000000..ebb20d6
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160619.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-06-19_00-02-33/zip/netbeans-trunk-nightly-201606190002-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 fe6e0da..5b90667 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
+DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
 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_p20160523.ebuild 4412 SHA256 66cef64387a3a46d02ce0498ec523a7f7ff6853758ca8e4f84a9365183e49fdd SHA512 fd724754c9f3e622198535fed41cb512334b2820e0e388a2046fd234bead4b95ba62529fb496d16cd4da44b353f2a1662fc7f1ee1aeb81a2341c8413dea17033 WHIRLPOOL b1818e12e5e1ab9375bdf263205f58a34fb1ac286c75f76294573661669893cfe5ccd46736c9d4b1bfbd3093bd0d59ac44112435540e3d6b0bf41c4f7b6070a0
@@ -49,4 +50,5 @@ EBUILD netbeans-mobility-9999_p20160615.ebuild 4412 SHA256 2b9b9dfcb8549b1d1d803
 EBUILD netbeans-mobility-9999_p20160616.ebuild 4412 SHA256 7d70a21c94bfbe2ac070fef47455ef64eecf7c40149c5ea98bc8ab092c761dd6 SHA512 8fdfbc149f0623305cf695524c9df1be32f719e88cdfd2b8e962ae0509f38e1d42830f2c3b21c9975857beee640f0002fa783913c4718225cbb889fe17e63592 WHIRLPOOL 8803909f1ae5ce69df65943aefb944a58fd5cdccc4bc38b2da98eabfd5d66b0239a288b874903ca461cafb133f48caef7b362b846dd91bff5af1fd0eb66dde8a
 EBUILD netbeans-mobility-9999_p20160617.ebuild 4412 SHA256 0d0804132eda64caaf465327c65f1e8de1e775a0f976c66a22578cb9c9189751 SHA512 27af844d92d75ae3ebc7687986962cc540e7ae54fcb9c2652e59ed97e9c1733c5f403bdcae6574264e3b697244389240c38b12f6497119ce262cec0270bb4a1d WHIRLPOOL 06d75b57a0038cd40d309888cec18f6c599b5efe9f386d8965527c169013470ac77940372195dc1f38bfa31940be23925d5e661f5cf4d267a48cf012b561ace7
 EBUILD netbeans-mobility-9999_p20160618.ebuild 4412 SHA256 8c5d5d6ed13d9d190c8c88adcbd1db60970f8146c22795eb25ccd63bf84f7576 SHA512 b639cc11e906fd525c5bd1bb6b21979961473cc6cb0f807ab92843700459e83553e68c54f12864240ab065a28b65855ed35db2ec6df7e8c328c168c12f379cd4 WHIRLPOOL b285f04364c855a623deecba8fa0062a4964a68b80327dbdaaffba42f9d170f18fb4b4e5d9eb45187b3655d85295ce81777c6521e00de6638cad7186c416090e
+EBUILD netbeans-mobility-9999_p20160619.ebuild 4412 SHA256 efc0216499f91514fe2cd70b64071a93548275acb68fd489a16278b178b36957 SHA512 464084eed61bf2595c51e3ccfe7069cb4c73f0c82feb5793e102a55820401e265e4932bd7a022f12c6d2f7ec10c37d926ceb1fdd6ba203a5b35d8baf2094a774 WHIRLPOOL 5d7f3f7849980405d94dabe56092d37008aff55202a7565123f3e6d97abe55d3a1addd6e91e7704590184ef77557789490969f06e94de75ed243b7fd09ae763a
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160619.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160619.ebuild
new file mode 100644
index 0000000..39488f5
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160619.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-06-19_00-02-33/zip/netbeans-trunk-nightly-201606190002-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 1733e90..11b4c66 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
+DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
 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_p20160523.ebuild 4111 SHA256 14fad1b53c7b898d270fe8da33bb5c8976ce0fccd41c1daefb8a3427b5d1a417 SHA512 e09498992c0c5c8380db80e0b8ec6325f7eabc37803c5df33a373488a67ead0fa1fe2295fe1e0f0d5d3d179e87e6d0edae81c9dbc79cc6095a00fbfc70ff0f37 WHIRLPOOL 6a0107571264e484b13d94e345babbd1f5dd8bfd3198b0caf9f2169bb6f27bcbb874f71200b49f2487831addf42c0e61b611e8d46086d82d82af91f8b1f0dcdb
@@ -52,4 +53,5 @@ EBUILD netbeans-nb-9999_p20160615.ebuild 4111 SHA256 cbd3ccf2f982bd007679f72177c
 EBUILD netbeans-nb-9999_p20160616.ebuild 4111 SHA256 9c0a7c74d266bb8aa461bfed36528139ac313badb56474aef83def63b132e2fa SHA512 da8ccb62f620a11f03eb5328963fbc4ba0d27da3b804571153e972ed764c6c074db06d0716a36864de29dfad096417324ef2bc90f191d302a3dfad4b0f0c36e7 WHIRLPOOL dc8c22b7a0eaf9d1d39cfee2d3c309b9670728a0c70bb791ac7de88c9a62d67c47a5ae581e1f6cfcded486d906953b968523a6a5ba95963165159c6aca8f86f7
 EBUILD netbeans-nb-9999_p20160617.ebuild 4111 SHA256 58aecc413430db5e6e3b57a4df8c5a41df696e8ee65a02d47b3b47bd5d7dbc36 SHA512 b1f801278966dd6dca307bfdcd1869fe3ea0bf57b6d659796a5b621dc45383f494169fe4720385bea686fdac25b79d66b7d340cff24b2e913ac4b0f324c99374 WHIRLPOOL aac34438f88088635720a759f8e52d313f226a6ab6d4b7b048504122e3db0dd8e8dfd85c124bb8005edc81b89b8b5c337ed2b093222b82240010cf6b8c47b08f
 EBUILD netbeans-nb-9999_p20160618.ebuild 4111 SHA256 7b78f15bff2355ae9d2cdd4afb1978acf599c8e17b4f356d22821c53ae9df9bd SHA512 fc5a11eb4d2d1eca9ac072c3d2385be03683eb9454139c10f73e5fc741bc902ab4b31075e5527838820cd7761cd687ac0f7e1b01e169966df68c1224f33ef478 WHIRLPOOL 2ba1cbc43820231c4963123a3fb23ec8c2d4e5035bbc92b4096c079d43ded251a8e496d6da3fedcf336a4e1e49f8f63336ae8c5cc615086317b08e6d0edc9ace
+EBUILD netbeans-nb-9999_p20160619.ebuild 4111 SHA256 ff3b55348cd8c24c7edc1be9b698a3c4e7b2c53f0e8218b3f39ada013d6e994b SHA512 d201de03963aa3d7196193a87bde1d112ea5034212ef0e5a5fece5cc71432f579fb0b3367da5c1da937fbd611124d715c97bdb02e708e896b3244f85810d27e9 WHIRLPOOL 445f10d9f4e19125ee9757d3e24c027ec6a6cc58b7eebf81afe67c804931798d063bea65b1604bce83cc24d53e840f3f114d6138d0bbf31650d82a883fa1a7eb
 MISC metadata.xml 392 SHA256 01cdbcc83099b97486bd7b8e813e5b19c1138eb0d8d3e8a5683aafd579820435 SHA512 4d2f9160baa022d6a48b61d5f42e71cfd411d244e7a36436629bc5ee4036e4ce19079134d9a6c704ebe942306c2e0199d0591c1e54f92f8f3c8835147e639246 WHIRLPOOL c1131764e1cec66c56b977ebe36014b29e5a68e35ccc326c0cbadd050a6c625cf191c85c212e0a733661c008dab0d99f9a4cdc4c4ae0cc9d775ba1de554795a9

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160619.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160619.ebuild
new file mode 100644
index 0000000..c9a7400
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20160619.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-06-19_00-02-33/zip/netbeans-trunk-nightly-201606190002-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 25ad2f2..39215db 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
+DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
 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_p20160523.ebuild 4418 SHA256 065110929f1b98668efb050cd946ea03fb722c77cf68cdd0153a949e1fdad040 SHA512 ad45b8b46fe9da9ed7a3dd6ecb95fee91893fc4f019902090899ed3f91995d788e5fbcbeedd78bd9064d0417ac2dadba7eb83026f82fb470d284d5e5255915f7 WHIRLPOOL 3101dcf33233602cd30230931865a1b4bb3bc056e141bc4d32239b525b7ec6e745457ed2fe535dc05a878ecd6bd107cc053ddda330fead0493434df257e82dc0
@@ -54,4 +55,5 @@ EBUILD netbeans-php-9999_p20160615.ebuild 4418 SHA256 51ea0af18c35dfdc1290c76c24
 EBUILD netbeans-php-9999_p20160616.ebuild 4418 SHA256 be0e2c81d9c13822532e29b2affdb4aeffc939c1ec71b4fcdf370cd4b02a5906 SHA512 70f69ca728886934fab8b04c42313811bbd816cd61ae44e37fee858ee12340ba58aa04a6fd279013fb98cd6ecf76d4a9b01fb57420cbbfc9bcbd4e3718576748 WHIRLPOOL eacc775c4342a397bcbbd735fd96c7077ac9a7681ac0bbcd26c982cc878cd042bc952a24fdf15d5077563571a9bf83563fe606839bca4460423b77166ceb4bf4
 EBUILD netbeans-php-9999_p20160617.ebuild 4418 SHA256 4f6fac16dfa6338a6c58f16b8bd57d0c3db7d4367e3f40c4d1b45fd7fa7c3c96 SHA512 e986bdc678f578913778b2de557e7699813260e63995b85924ac86a5e51d89cada43ae73e0c84be88d564359d37b65d609d9a4bcb5eb25d06ccb3ac68ec82d7b WHIRLPOOL b4f901927295c97ece9b6488b3db7023fc173fdebb371eff84943ac7b008daabcf2885350e0efa26c9a9faea28570d6324eda75bc5abf42169ac6548e970f195
 EBUILD netbeans-php-9999_p20160618.ebuild 4418 SHA256 de42362981145792e82ba982195d079844dffb942f0695b7aa6dfdba1f56abe7 SHA512 816b47ab6b259a3c5633852833415ba25bbb906b75b7ab92fb21d17f912755a7bb3f5dfbb04c34ae3d8ae67551ffaf29d52aa2db671b50d4a5d26dbf8a62f0c8 WHIRLPOOL f059d2115d3e0f1ff8ebac72face5534ecf9b34f6c6165cda0358628075cd6249425a0d6acbd9cf5a2a0374bfa4e8995240d0441a76bc20c85431317ff45b19b
+EBUILD netbeans-php-9999_p20160619.ebuild 4418 SHA256 53e05c163c65dca14ea563179c50dbe9b39c0538e22b24658ba3ee1d5b07544e SHA512 d7754a50c1ea296f22ec0c9472d94aeb14d2913a185020a30f179cf2613ade4595e6cd1fcbc4f155ee26e247b01ef288b91a3b2df488af561a77dc94d15acdbe WHIRLPOOL 46c37aaae176ddf638c3f25a6dae2eaaf10193f5bafea257dd6260f332171734646b5421189b7bfe133024f714fa52f8d4760b049c10961977f032fc0ab3f578
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160619.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160619.ebuild
new file mode 100644
index 0000000..c066bf4
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20160619.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-06-19_00-02-33/zip/netbeans-trunk-nightly-201606190002-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 d657643..18bd8bf 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -51,6 +51,7 @@ DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
+DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
 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_p20160523.ebuild 9520 SHA256 548daae60d4bb9ca1ce8ab78ff211dea563354611d72ac084fd4331bc9226376 SHA512 644a0e2a32802d79d1af225b68e2c987c7e1a0a5c2817eb43d571fcaecfc0f944d6d8355994b03be94bd3ac031f4528f8fbb0a6ce1b19c0204b8548acc65f17e WHIRLPOOL 770e419ea5972f69a735e5ef0f58572204c4c91a4f016309d9a03ce90bac042872ed71f1133eb36944e4b3c0f49fb14b5fc29d0a584e5e1caed19f84ca077bbe
@@ -75,4 +76,5 @@ EBUILD netbeans-platform-9999_p20160615.ebuild 9520 SHA256 1d1ed4c8dce312810a9e6
 EBUILD netbeans-platform-9999_p20160616.ebuild 9520 SHA256 f83b9f7c44432d294cf8560514c6280f9df7a22a64fca6a3f69157a1273716ae SHA512 930a7cb047b4b92df4aff7510c2893f9e99071f716533aef2c3b8d56335788b16f6d1d3840fff4f76972aeddbc92a28ccf0cf55432216cb0e38e88017194c353 WHIRLPOOL 9cf1d9a31d4509ded199cf19ba04f237421d2b5c8cd14d209db9bc1e02d9dc3e6548c167be1569c058d40aa64982742ee65bdc5bf8cdb3bcad14aef45bed9e3c
 EBUILD netbeans-platform-9999_p20160617.ebuild 9520 SHA256 ff87e2a2d5058688522f5c1106ba3628ec611e76fb4da967f593b4a867ac0026 SHA512 fc57543271cfbf583fc9308570bd7e9a851567228f13a5b8cb088f65a3678758e6da91394a9a9b16f511fe12656350b3e3dfd13f664e5455ae637947cb5bcb8d WHIRLPOOL 14443637c8b536d3adc1ca73b9efcf10f4cdb52caa884f0aeb2645779ec0c14a60e9e18ed6b070f3d6151bdedde8b08a34cf18bfb32c6c1dd1d49ffbb3841b1c
 EBUILD netbeans-platform-9999_p20160618.ebuild 9520 SHA256 9652f01d9264a93f13fa8f4883463888d62e915bb686e6a94ec72916b1d711f2 SHA512 98024f0152fb694b9137e8c98ef47bf73195f4824102ac9a50b2ac9924410998385c0362f208e13183f09391eb7bcccedb4f2312c21ccd324f5fc1c9a9072258 WHIRLPOOL 0c1c39bfe455f2a92d0ba3d31e8c9fb1dae528a653dcbc3feca755fd810f218495ce5088f8d0600f10f28f4bcacc2c6d64b36bd2101bf7a9fb56a2d357e1c598
+EBUILD netbeans-platform-9999_p20160619.ebuild 9520 SHA256 2bea95f0cf80a2f2f9d4063051704f828876b778ca9a0f4035d13f62a98ed19f SHA512 52efd3b75e7944200a54dbdaf70f449d84323f836393c34917570e1cadf938dee225e1396c5ae86f1f3f92de9dd0b9619338d51f61d5127b9c09d67076fd0a7f WHIRLPOOL 5b00e32a4a57a4f7d375239beabf897cd65ac9e4c00e10a45b26e6c9c1ff6beeeb4697bedf0e11b1bac5db0f4dbc1d9284cc922ec843d89688b64c9c8821f2d8
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160619.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160619.ebuild
new file mode 100644
index 0000000..8a745b2
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20160619.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-06-19_00-02-33/zip/netbeans-trunk-nightly-201606190002-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 ec2356d..0933092 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
+DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
 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_p20160523.ebuild 3472 SHA256 ba49671f4804d13ba9a60ddb0acb135211adf79eed11c74b3050bb1fa23b0e65 SHA512 008c86783d471332012053dbc3ffc0d884b6d3f85e139200e099e4a6d9d9e5f969d9e24c0443d73de78e3819b3042895637b3a12980ecc5ecc498ebad34ce6c6 WHIRLPOOL b56023e720ea5f8cc1d6ea9d3fc4afdcd40b417066a60d3c01ce24e1130073fd4601712c9867d4d513a993a8e4ea12d99552c3a351f1942f60e024e3da3928a1
@@ -49,4 +50,5 @@ EBUILD netbeans-profiler-9999_p20160615.ebuild 3472 SHA256 b62578b82c4f0349d88f6
 EBUILD netbeans-profiler-9999_p20160616.ebuild 3472 SHA256 0a79f7add54314b7297739d89959b9ef694a02b25cc05fbd58d1ecabc897c478 SHA512 7da2bdc3361d044e5598b39620afb5e3f0ae819704a9f216a1e976898acdfdf780ab4b3665d0de2ccc63cd07cc8def0c893d55341d4f2c0e80bdf597d2ebc0a2 WHIRLPOOL 3fffc019f02cdb1f7bf7e95e5535e880d0734387225f51c8254ec10aa5c1a30faa8fee470d77b99519552347c585ff033aa9adeec583c9025396c82a50aa6b30
 EBUILD netbeans-profiler-9999_p20160617.ebuild 3472 SHA256 164f0b9ed984dc7e5151268f12e5870b162da4a943b97c06b7a1de70b78926bd SHA512 7dc16e0c9aa0bde8a5b412fe12b075ca0dc540f8e032041cc4ccf0bb8e372138cd6079efaf492da9c7944ad013283dedc2ac68c9c4f567de62a7b3e719f8af8f WHIRLPOOL 0d8bddb982b919887499350d7c1233b1d7aa4987ac3b5b5cd51291e8200e3a24916058036898fb73a270c27be0aab70b60237d482cc8ceb4b3521bfbf800ac9c
 EBUILD netbeans-profiler-9999_p20160618.ebuild 3472 SHA256 068ea21c8310f9cb3ba14844998c483e7eb3913779e86591a5ffd6aded6ed223 SHA512 c9070398f317594bddc982896f1112c46ea63434a80a66dfa906c0e5c6475a41b087b4a073895fab308a9b805cec0adf72757f2875888f8e3263a4707e6617e6 WHIRLPOOL 3c2eba6a28fc2d81d98583d3a0b60a0fa2392a4fe3a38978eeb2cca72e524fd12071d99c34583d4d10cbbbd56f2c72464c244504782eb48f6374b97a4c5e1ea6
+EBUILD netbeans-profiler-9999_p20160619.ebuild 3472 SHA256 19af1b1244f0e3ffb19c71bdf9eaf6a3c73793f70ea79e2822d3574fc9a3ed0f SHA512 2e503b285d681f996ee71bf7b9edee711566a8c30a6c7df68984c08ae33058215fd2df41df4667f4c9714a68d039fcf743c57722f6974658bc469b226688efc8 WHIRLPOOL 27138ef985f80a5b6ea94e127e7b00c693c8002912202c623e337c121a2cad02cb9380a503872e08623db6ae72c9f3aa32b4e63be2ebe2a2de593dc62298fe26
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160619.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160619.ebuild
new file mode 100644
index 0000000..7b82ce2
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160619.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-06-19_00-02-33/zip/netbeans-trunk-nightly-201606190002-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 9e75eeb..1246946 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -44,6 +44,7 @@ DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
+DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
 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_p20160523.ebuild 5343 SHA256 3a6128a2eadec995b2309f20585928d25c20da6a8ac3e2d0bca609f0440def57 SHA512 3f7afc253b15372d2f3bb0e03a0a046e73a33dcff1790cc7cdeb5ee14712e80992bba65f29977bb183baa9c70117e2d57d3fdccb25abbc0ce50f2dd9b133b8c5 WHIRLPOOL d64563313b65313cab7b282042c11efa238b5ec4881ac081c13f74483a5c29fb67112f0be004b272131ccdb84570873b1b44a177f252d698bb1187a00c4b60b2
@@ -68,4 +69,5 @@ EBUILD netbeans-webcommon-9999_p20160615.ebuild 6242 SHA256 4029ad34c29e02d53181
 EBUILD netbeans-webcommon-9999_p20160616.ebuild 6242 SHA256 97916f4e9a9fdec59e7b691d3bfd060cdd27ad063603917748f4633600d3bf22 SHA512 eb0c50d2b5d5c9ef0b7c5eebf65f1b49f47fd3b5c7993c58edc6ddebb311a6786cbd106a22ee3a3d0f2f09d511e50fd8f57373fbee6f6131695d6a414d6f21b9 WHIRLPOOL 8dc26451a04a6e954adafd15eb1e0da5684964ce603ca59806df7e88141d439c52dc224ca83019ed4146781e9ad0089a9c1729ec9144abe308a2c88a349b54ce
 EBUILD netbeans-webcommon-9999_p20160617.ebuild 6242 SHA256 5f72901783a18ff4ed6b3fac43340f96891e0ceaa356b5789326f5750f451b91 SHA512 3c839a28bfea0387458fc11fb519f295b16af57a3cdb9f7697dc421740d51deb0e2741682a20d48857f145d84b061a4a9caad636eaa5c1935ed0694e3ac9e02c WHIRLPOOL 0668921f14ca28ef06d4e242f5b2703b6c6f948dc0a4e923cd4976c06b5f6b62723e57b8170aa9dcd5739fa774da250129aa06e3d277a84b297cc12cf20c6632
 EBUILD netbeans-webcommon-9999_p20160618.ebuild 6242 SHA256 4c6a8e293a215d95438690e10906451ba65722879839b8cac25841bbeda15052 SHA512 56732c679fe0aed2736d18b80d5b02732ca6bd1bc2bbdccda9fb69efd8fac177b99fef7af0394d21454caae00aa0db3a42b5162eb7c17d6afe7f83c5ff079781 WHIRLPOOL 3ddb3fd896dd1f9b7cbd9b1b0704de566654de9b602da19bfbfced50e2a491d6b9a55c8c00b4e321468b1729df591c3a241ef8aba034604aca7ecd824c5f82e8
+EBUILD netbeans-webcommon-9999_p20160619.ebuild 6242 SHA256 81033852b76d0de2e2031c3dc1cc4bc1149a297b12d53a871a715bbb77e58c72 SHA512 9fc9deb4ba086076c38c75bf4edeed787fd851e5cd6f9dee53d57dda5f63ba7a6f5b295c7f81e9408fa674817901c51c4a22089eef5f483ae8f9499cbfe422d3 WHIRLPOOL c8c3c187f5668db4bc1fb3445e11e706ffc6a32f912f6b98f4d2a3f4b90aa6f7c50d8a03a1386683215716b2bf01dc03b1be2872eda891921a73a1d058c909b8
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160619.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160619.ebuild
new file mode 100644
index 0000000..bae6cfa
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160619.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-06-19_00-02-33/zip/netbeans-trunk-nightly-201606190002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/092933967C86940E386EA1799F1CDE4A4E56F0F7-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/070F24B74BF12B52351FF7A9B3F7A074E5117BC8-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}"/092933967C86940E386EA1799F1CDE4A4E56F0F7-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}"/070F24B74BF12B52351FF7A9B3F7A074E5117BC8-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 1066ec2..c96ef9f 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
+DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
 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_p20160523.ebuild 2721 SHA256 3894da4198193139caddba90fc1cd337a26f0bd4753bf5fe937322c5605a7760 SHA512 6b616dc392093a25e2f09be5796bd11873a84bbef8f52360ed1a3a3fded05a4fef0e505c2ee852ec8f6c1118b6f540e862647b3a2d1964e997f6dedc529ca860 WHIRLPOOL d7538ce8e0305952466829d1020b8cc6ddfcc4ebc9c6de573c0f3261714e16f1c342860835b5c23a6c6ab6fe3abbd1b55d282d59afdeeddf60c9d11027cd7738
@@ -49,4 +50,5 @@ EBUILD netbeans-websvccommon-9999_p20160615.ebuild 2721 SHA256 21d8538d3d06d7b2a
 EBUILD netbeans-websvccommon-9999_p20160616.ebuild 2721 SHA256 81077dd1a92ffef3a8c864094861350ddc3229ffd21168d8b74220047368ee6f SHA512 4a854355fac57d38b25fcd580a31fbda039cbb56265b39f2302773c13063be0df4d26140a9c3f8182488a8e8263ccba4cd495ccdb6fa9a9e2281cef5e0a0c1e2 WHIRLPOOL a04413646aeef0b1ec4f5f4434db18da805a1e1a970081797e94882cd58b8de1457911b134422e09f108098d4c2f66e7995024434fb1b5fbea5a3e430f378cbd
 EBUILD netbeans-websvccommon-9999_p20160617.ebuild 2721 SHA256 186fef19c7a144fa1510325c057f4cab763b4ea4621c262a158427137cddab11 SHA512 95a2e8994cf1b1edd76b4edba9f7fd097847c01e05be8c6ac4fabb4542784f4fc9717c6d1792387d88d62f9c4b1db5df08c28199c174e328942a247735b37657 WHIRLPOOL 6b1ae669c3ba7bd5bd912edc957f85b878f1d7674978313e9d58462ef554d605062d1523f359380d73069ada48b9705325a69e231773c2bf5db693d597381838
 EBUILD netbeans-websvccommon-9999_p20160618.ebuild 2721 SHA256 816eeeaeefd9971b1c732002cf4aef4b57268a19531062079efaa4ba061821dd SHA512 e306d2913fa902117784b9fc751a5bc2797df99da151fc7040f0c1f7b4e82543fe6ba78efa9c7e760c8f8f23c0c155f178139462da6bf0fdc74848b809d4b657 WHIRLPOOL 47fb5927886c92149008b8628a85bb5411d8f65b0841a7b4f544f40ff203d795b159d5586d511cc7a2cee075bb9264587c617e8fda61696782080603ef4a4da1
+EBUILD netbeans-websvccommon-9999_p20160619.ebuild 2721 SHA256 b3ea72eea2daee4050d15be4651ff7737eaefb858c8377a6e0157f771c99cf0f SHA512 84eedceb57c9426e208bf963849c1c795518f3226374b74e112c34f37027b9927a91d7ece6ee519f92bc2feed8620acd74447d8255df180d61780d2d068bbea7 WHIRLPOOL c902df360ecbab629270ca75265d2358af4276d2500f3af92333503d123512fff1467ff4d34dc135d38180e73367968c2a289fda058348c8728f7625d86b3da2
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160619.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160619.ebuild
new file mode 100644
index 0000000..3e1f7f6
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160619.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-06-19_00-02-33/zip/netbeans-trunk-nightly-201606190002-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 ee382ac..394b0ae 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
 DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 DIST netbeans-trunk-nightly-201606180002-src.zip 216355073 SHA256 f1cfad0effd312c806967d7aa470936cef25f8c8f5a7096c6fc099d4257cfe10 SHA512 8f97dc0ee5ab3636642ad1ead361d29e870d5079709be513a8529526064441c5131d5ad1a5ee67fb9c2fc2ba6e5a1cd4db93262e6e0c379939cfaa1edba1ffe0 WHIRLPOOL e7697a6f577408c99d7aeb73e8a827206df066180f9848f7116c784e21496dcccc2d98890e6328188c6120ec0b21a2ee5894ef72c4f46677eb94a14f638ec0f6
+DIST netbeans-trunk-nightly-201606190002-src.zip 216355065 SHA256 aade53be54e83b24d2bae4515102d3f769e12765cdedf3c66389681500cea329 SHA512 a32e5eaa127656b8ee423cb1b6a0596f06c1565da5de247d8e911d45c371d73d23dd627671897aab1e33f3825c4fdf162b997130ce5aaa70b825c11472a1145e WHIRLPOOL 6df0013b1db9b2c9017aa78a4c2b735cc5e8ad98dcde65497c712a126db650106e6861f598095700c768271647cad192a9ee9874583c6462aad3f20c8297288c
 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_p20160523.ebuild 6939 SHA256 0d0b635cf7e170090dcd191409e58e06ed8b4d61dd0038b790b38bae2c960aa3 SHA512 833856b2801b06d168bab5303974f440f895590ff86ffa483cd68eb83bc566c098d7c124ba2fac72dde62e1372bd06f15beb79d4dae6013d5d7723f3caf9d793 WHIRLPOOL 59256e6640d1e4c063fb1d7808ac515abfb2e112cedb15522be19ee3bea6010693f38943aa0eb8e0ae3ec5e82bcfebdf4464a6bb50cd414c8f1e166777099196
@@ -52,4 +53,5 @@ EBUILD netbeans-9999_p20160615.ebuild 6939 SHA256 4e9b67afb9bedbbdeaeb62ddd37ec8
 EBUILD netbeans-9999_p20160616.ebuild 6939 SHA256 d9ed9644003dfe397e89f927b0377b4b22a64925bb0d020b468bd8ccc9022a8c SHA512 ad6e3c3edb1895a91803a3f4d4c778db104e639d599cc454efbca25b9290dd47e0b1a7ddf8a5b727518482a7013030fdeaa0664d3da4f7ddfe144d75a3c3fb17 WHIRLPOOL 2bc6c33a2bfa39f3194590bfcc4e187bf0e1cc0c36b4a17e9a8cc82512f44c051690b411ef270d8ddc7bc63cf6688c0ecb83ecaf8da68ae7a760675c326fa6b5
 EBUILD netbeans-9999_p20160617.ebuild 6939 SHA256 9ec68f98e1a55cbdbef4c612cb04ceb415be5a934090bff531861141cab85511 SHA512 526c74f5d20aafdd5aa2c52bb5915608c4d9c89be5c3b1db37b29602ca8dc2ae8a6012c14ff13099e63a5b2356dd04b5d185f2eda68c6ac182c1c7e014db7482 WHIRLPOOL 8479fda2e78eb352c65d9618a5f9b0abf70e40c186010530d275d72df9a031b5591483fffdbfa108759c7de3134e162bae814e34be1b62a63b948f553124bd4d
 EBUILD netbeans-9999_p20160618.ebuild 6939 SHA256 115c177d4137f3b54438b94d1ea5c2a374a1bcb8b851589c699bebfcf2ead4a7 SHA512 0a4190e0dd4210ea6ac423669cc550028b43ec4e2112238788904f7458506cf4d050a6b0152c4855d7632fde76980e7ad4ceb2b34c2f2c49b9a3a63099ea6436 WHIRLPOOL a81bee366bab0a973e741a09bc315656cd34c9e175c4d6af541f08c7a71d04f4c18634fae2a8efb0e8384924b7c922d00f490dafc20628d8ccd4428717d8eb69
+EBUILD netbeans-9999_p20160619.ebuild 6939 SHA256 da8991b33d26229f4c62b77cdbe12cf66306c2d891c109f7c471857248cecf62 SHA512 d5ef59d47f653b5fc5484c834d5571fded1d98645d0364790b6bce2e0f11f86133aa2649c7ffd8089769e6d2e2fff32025f8fd60cfd5385bc03d731321d00a43 WHIRLPOOL 3c55665ad0770d827d63709124f4bd70d61b7c3e099acba84fcdebff685427cb118322750d175baaaeb0a376e5251bdef7df2b935bd6640eebae4db52dac496c
 MISC metadata.xml 329 SHA256 8aeaf2a0228f15c2e4140f401b30f083509bd99d0a578873069f3595cd8555f3 SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640 WHIRLPOOL 799a9b79b1b447bda9631f67e2dfaf722376740e1d2037796528a05f9745eeed00d9990a74a65ce09f74bc5e1d60a887abde540c3c62487d7dd49b8377c15834

diff --git a/dev-util/netbeans/netbeans-9999_p20160619.ebuild b/dev-util/netbeans/netbeans-9999_p20160619.ebuild
new file mode 100644
index 0000000..7e60696
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20160619.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-06-19_00-02-33/zip/netbeans-trunk-nightly-201606190002-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] 2+ messages in thread

end of thread, other threads:[~2016-06-19  9:06 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-17  8:11 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-websvccommon/, dev-java/netbeans-extide/, Miroslav Šulc
  -- strict thread matches above, loose matches on Subject: below --
2016-06-19  9:06 Miroslav Šulc

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