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

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

From: "Miroslav Šulc" <fordfrog@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-websvccommon/, dev-java/netbeans-groovy/, ...
Date: Sun, 18 Jan 2015 10:10:42 +0000 (UTC)	[thread overview]
Message-ID: <1421575837.e0cf638ba8caf36b2495474726af26809bc628c6.fordfrog@gentoo> (raw)

commit:     e0cf638ba8caf36b2495474726af26809bc628c6
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 18 10:10:37 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Jan 18 10:10:37 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=dev/fordfrog.git;a=commit;h=e0cf638b

netbeans: bumped to the latest sources

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

diff --git a/dev-java/netbeans-apisupport/ChangeLog b/dev-java/netbeans-apisupport/ChangeLog
index 3149c88..a6176fc 100644
--- a/dev-java/netbeans-apisupport/ChangeLog
+++ b/dev-java/netbeans-apisupport/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-apisupport-9999_p20150118 (18 Jan 2015)
+
+  18 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-apisupport-9999_p20150118.ebuild:
+  bumped to the latest sources
+
 *netbeans-apisupport-9999_p20150116 (16 Jan 2015)
 
   16 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 47d9b85..7f7e802 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -45,6 +45,7 @@ DIST netbeans-trunk-nightly-201501130001-src.zip 201373370 SHA256 eb5fbabdcc6f24
 DIST netbeans-trunk-nightly-201501140001-src.zip 201400262 SHA256 65aef07f80d9cfe6b47ac2c3aa2be2f1d98a7d9466a44c5196cab7b88e743a2d SHA512 1175de97a824b8be65a5b25b20cfcd17ae4ab4b101794f7dbdde8059b7192f30193d634e63141a54e9e8c2018166f1f204d321270ba91959d450839b9e1fb89e WHIRLPOOL b5944d4eb663cda53d83f88a52775868cf942c632e5cae0be25970fde60557aa43f69095ddc0861eb872f815e562f6998a5873b8aae1c2c660ae8e8ade75b4c2
 DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6b3b7a2050181c2ec341fa33b031423a913141b9c76aa590044 SHA512 6cd0ff2334b892835c91ae0c0bcf996e2322673533f46cec0efa37db25837f809202de061696c737da837099179a1fe20ef7bd569f6c04375e6090a8c5757d4d WHIRLPOOL 82a9189ff14ac9f373d84346361b231bc7ef298be20892b7a76e20ba8fe3762055f11957f40ba914d939d650cf7f9b098604aae84d30622e207498a5ad14fa81
 DIST netbeans-trunk-nightly-201501160001-src.zip 201394511 SHA256 0a5e6e98692bceabdacc7ef41fe2b7fb59d9c879453982b2dc0e79d28f077714 SHA512 2a5be09537b1735e712ec373cc7f41b1e8b7753be5026ec3a1562d7347f4d5addf58bb9ea052051e0df2113e18a366e4095f84432dffb4b75b86b9ca913d3d56 WHIRLPOOL 7a8d35dcba4754cb809b8ac8710cbba8ba5452c4c4e13963a40e032b13241aa9b44328f3bbeea681bf535a31980e766331acaf5ae265bda5dd5790bda872d8dc
+DIST netbeans-trunk-nightly-201501180001-src.zip 201391445 SHA256 b1bf4373e5b799f830894b4ea7ab878ef09c64059758cebb2fa1b1a244718965 SHA512 bf1a40344c915a754f3b7baed759b6513e6a055bface5fe6c30c4e0adeb76fe7d2aaac5d344553ee5df505131cb05c7e2219c67514d4a962f681f9a39c685166 WHIRLPOOL f33d7bfe0174c7de81986a44578df8322fa8f2b46911e9f6fc05ffe8f0839e70b691d62ef9b6dc1b248aceb68760330ef69e86f026a83b6c0f27bcee3a4bc07b
 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
@@ -84,5 +85,6 @@ EBUILD netbeans-apisupport-9999_p20150113.ebuild 3390 SHA256 4dfd14635ea8c13041b
 EBUILD netbeans-apisupport-9999_p20150114.ebuild 3390 SHA256 167281625d91d0f9d07a4fdbe21a76c17f20df9b960b5b685a96e6b9bb5961e4 SHA512 667a74b58dfd1ebf217850cc52584135dc21557170e3211d50cb28ee9d46ee15e7c54b94e9751028570d361f81dc7563f57e92b19f5565aa1170a1ab588e696f WHIRLPOOL 36778499d30133821d09324f1f30637bc98aa951eb487be2eb206013be8f83c7b29507e537400d6cbde5512b0d2399c2fb92d1113da987f7d661f396905affd5
 EBUILD netbeans-apisupport-9999_p20150115.ebuild 3390 SHA256 4011ee695fc0a3e2c8b64fdca954fb5e114af6e364244995ff37aad4f18d3a82 SHA512 74cd50a6a601b2e2a8ecde3875b7f79fd401cc6fa5b0fb73726306d14aeb1a41d039cb3c1f778999dd1f9a226be6bf6bad84e2ca2dc9b6d75065302f496b3233 WHIRLPOOL c954a6f2d0e2834074dc2f5b32165d84104f560613f9262c1d29aa4e1f00564c635c8be17edf91dbc96ff63f1b8a753fec3398dd9b6cc8ead0695b2d5c2b7f99
 EBUILD netbeans-apisupport-9999_p20150116.ebuild 3390 SHA256 1a2de3ae48856cb1273f42076fcd475500c596557cfd291d3d245be3d9bc2784 SHA512 59eb275e8de0a41dffa5a1009e5cbee80f4e8286a654a54427841c10bb7b336e979a896c6ae03aa32bca05086b5dbab2a38dfdc853342e5e4ce62b33cbb8df46 WHIRLPOOL 54932975567f37d6cea466a3615499831d3d35b55547b0e30f1f3483f47b61a040b4f03805e8f9bdb8794bca56e74c07e385314c826adabfefb872464b7a1a67
-MISC ChangeLog 153527 SHA256 9d9546dfac3be11231922a1b69b679e2c0ecc92f9dd39a5e6bcbc6d312fb5aeb SHA512 0897d7be840cc8dffd51409987d23496f62c4116e77cccc5b88df2214eeadaf768f8be474683e449d4aac198db5834907a2dea7bb4564e527a705280e78229c9 WHIRLPOOL 5818561b4c499e229fe901ba2107d1e1475625b66e1b957ca550b27910a9d777512aa6f3c419e0c49caa19fb3629533e2ec3d9d801d2b359796007df325c38e2
+EBUILD netbeans-apisupport-9999_p20150118.ebuild 3390 SHA256 7113ea05991ec5fe4dcb311cb36ca9d5497806196ae43ce8a91d37f5db425087 SHA512 c87051ced9f1d444662a841929a92d6b4b947bde34493b948c7fdec9251127a79b274e17a6a9475e452f7611a210d2239ed04ad2b9648e534e3f8c202463dc90 WHIRLPOOL dda7b95aaaf871ad2f50ff1ab7e352be49c2867c41a732da2e48d9313d8038480c8e779e891dfece6c62098ca6bc86aa31144381312ee1861469337f9b4eb339
+MISC ChangeLog 153708 SHA256 6355ca8bf5d86fa7a3682a023ac6386b75deafe1d8ae5bf8d9a6999b71cb2dd7 SHA512 ed32cb4aba6cfb4e2e724485594022c16ab89d0d3ee3a4deafcd7d69437760682fd672f508ef1b4081d435998d5045d027a36632f3eb67f848fc5148b52824d8 WHIRLPOOL 3dd5b4841c308098d6bd881fe08e6ff0061cb8b215538b967746273682683d6ddb9f7d836f6264382ac1f63ca356a73059971ac388114c4cff391eefbf1ddcd0
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150118.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150118.ebuild
new file mode 100644
index 0000000..f4c3148
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150118.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 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/2015-01-18_00-01-55/zip/netbeans-trunk-nightly-201501180001-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 4417583..242929e 100644
--- a/dev-java/netbeans-cnd/ChangeLog
+++ b/dev-java/netbeans-cnd/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-cnd-9999_p20150118 (18 Jan 2015)
+
+  18 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-cnd-9999_p20150118.ebuild:
+  bumped to the latest sources
+
 *netbeans-cnd-9999_p20150116 (16 Jan 2015)
 
   16 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index 31b447b..505bac0 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -58,6 +58,7 @@ DIST netbeans-trunk-nightly-201501130001-src.zip 201373370 SHA256 eb5fbabdcc6f24
 DIST netbeans-trunk-nightly-201501140001-src.zip 201400262 SHA256 65aef07f80d9cfe6b47ac2c3aa2be2f1d98a7d9466a44c5196cab7b88e743a2d SHA512 1175de97a824b8be65a5b25b20cfcd17ae4ab4b101794f7dbdde8059b7192f30193d634e63141a54e9e8c2018166f1f204d321270ba91959d450839b9e1fb89e WHIRLPOOL b5944d4eb663cda53d83f88a52775868cf942c632e5cae0be25970fde60557aa43f69095ddc0861eb872f815e562f6998a5873b8aae1c2c660ae8e8ade75b4c2
 DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6b3b7a2050181c2ec341fa33b031423a913141b9c76aa590044 SHA512 6cd0ff2334b892835c91ae0c0bcf996e2322673533f46cec0efa37db25837f809202de061696c737da837099179a1fe20ef7bd569f6c04375e6090a8c5757d4d WHIRLPOOL 82a9189ff14ac9f373d84346361b231bc7ef298be20892b7a76e20ba8fe3762055f11957f40ba914d939d650cf7f9b098604aae84d30622e207498a5ad14fa81
 DIST netbeans-trunk-nightly-201501160001-src.zip 201394511 SHA256 0a5e6e98692bceabdacc7ef41fe2b7fb59d9c879453982b2dc0e79d28f077714 SHA512 2a5be09537b1735e712ec373cc7f41b1e8b7753be5026ec3a1562d7347f4d5addf58bb9ea052051e0df2113e18a366e4095f84432dffb4b75b86b9ca913d3d56 WHIRLPOOL 7a8d35dcba4754cb809b8ac8710cbba8ba5452c4c4e13963a40e032b13241aa9b44328f3bbeea681bf535a31980e766331acaf5ae265bda5dd5790bda872d8dc
+DIST netbeans-trunk-nightly-201501180001-src.zip 201391445 SHA256 b1bf4373e5b799f830894b4ea7ab878ef09c64059758cebb2fa1b1a244718965 SHA512 bf1a40344c915a754f3b7baed759b6513e6a055bface5fe6c30c4e0adeb76fe7d2aaac5d344553ee5df505131cb05c7e2219c67514d4a962f681f9a39c685166 WHIRLPOOL f33d7bfe0174c7de81986a44578df8322fa8f2b46911e9f6fc05ffe8f0839e70b691d62ef9b6dc1b248aceb68760330ef69e86f026a83b6c0f27bcee3a4bc07b
 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
@@ -97,5 +98,6 @@ EBUILD netbeans-cnd-9999_p20150113.ebuild 4586 SHA256 c14dc25a24d1fddc74d78b279e
 EBUILD netbeans-cnd-9999_p20150114.ebuild 4586 SHA256 be0dcc3f79a7b3f8abe7d72514830eda4328a411556f9502b08ce77f8ef721d8 SHA512 18d8030a392c12185e5f3ee3fb08c2600a057796e4698b3818c8433bae5b0263f4e0acfb97734a89085910e574e2ed7ba22bbf808e853ec91de93dbe09786211 WHIRLPOOL 9f8648c683c2fbb790b475b72488f7d853f42d52cc8770e35219ec960c8091eb049c6533d051eb4c7baa1880eeb226dcc39e04468898d5ff18d1c280bd84f6be
 EBUILD netbeans-cnd-9999_p20150115.ebuild 4586 SHA256 7775eb74c5741163677258dc21ab307b678794a4f826fc6aad72129d5e420d00 SHA512 4fb73f7d97a44ec4039e89b41430b4cef7e5baf29c2e8bd4d630077f5e79abee300f893a8000ed97c8d50ec496a624da01a377caa3ecb6729ae466270ecebff3 WHIRLPOOL 7b40fb0a6cdae862497f8b153294bb77e94f472705eef38268ee9ad95aeae76070474017a5ad7332d079cfd03cc75e4347b700c05e77399c7dbf015e7fccd284
 EBUILD netbeans-cnd-9999_p20150116.ebuild 4586 SHA256 52c6e544f6ef9b824d7af8324a7f004fb6937db9436db19b52a00b44f8e27428 SHA512 8a365612bf2e4c4c5d4330fdd5b82ae1b3c1fe5939e879c768aebe2b67e76466521857e616a13d0fcc033a0c0d375bc2b4b2e40dc2fcf3c808da4dc3fd34e782 WHIRLPOOL b62c55002855a2ab67ad373e05ad9911777b18a856e2971f49d5df55f647f6d4c5ee81c824a97169ab5ea5d1ea60cd9cf3d53ba2abea2ca48ddd8fc325f01d8e
-MISC ChangeLog 140262 SHA256 bf5e21b4bd8a485e0c6d49091e3a978059b08723efcce684f461cb09db624c9e SHA512 24cfe2b5289a5e6eb11d021810b5466ad937d3b5b09847c8fd7c3407e7ac8902276f4aefdc0b99dbb4bf030f447721cfde150a91a55ffc09e4e30b54380f2b4c WHIRLPOOL 84d9f5cc74ae41a007c601007c734b1f6e08e0a731f4cff6fd668ab0c076c854f2bce22c432f7725712644291ab4b7cd6420e3740438289c291cff534ea5607d
+EBUILD netbeans-cnd-9999_p20150118.ebuild 4586 SHA256 6882fa70cbed44b940a4a2761d81b16583f0b24761c7d477ea080fc84d909a2f SHA512 ba2120913d14b0bf4c7bb4ffa249d1a1e2c1ac870234480be3d046838592367ad34cf12e81d4816ce02f39408233baea0e76e8b1958821a48805c7bb048c19b6 WHIRLPOOL 3020977a6d6bd9378bf99c6254cede2b525191b7afd66c79dd2c4708dd93bc339b17956d494af9d7da163e4fc4b223d45e1c1de8a70ff5a3791b5769a29d7173
+MISC ChangeLog 140429 SHA256 f72115d546878024a5d18d9ec9d76f4b171860b2d359548063f0c7f6381f9334 SHA512 109442be1da0529da256b5a855915efad8f8dee420ad6648781ff579557dee875eb0f561d9783ce33cddab7292e8faf0440a5bb8b9a5886b2e313ee3e62ad954 WHIRLPOOL 6e3fe451a13a9b66bcf3cb580f681864f21dfa4c75dd4be59b383cd8a168c9adb70e5f0e93e67d05c36a70b05ed5b547d868600ada49dd26d6d1c3adfb0338fe
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150118.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150118.ebuild
new file mode 100644
index 0000000..c081935
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150118.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2015 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/2015-01-18_00-01-55/zip/netbeans-trunk-nightly-201501180001-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 d19d901..f93fc2a 100644
--- a/dev-java/netbeans-dlight/ChangeLog
+++ b/dev-java/netbeans-dlight/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-dlight-9999_p20150118 (18 Jan 2015)
+
+  18 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-dlight-9999_p20150118.ebuild:
+  bumped to the latest sources
+
 *netbeans-dlight-9999_p20150116 (16 Jan 2015)
 
   16 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index eb36053..bea3f37 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -53,6 +53,7 @@ DIST netbeans-trunk-nightly-201501130001-src.zip 201373370 SHA256 eb5fbabdcc6f24
 DIST netbeans-trunk-nightly-201501140001-src.zip 201400262 SHA256 65aef07f80d9cfe6b47ac2c3aa2be2f1d98a7d9466a44c5196cab7b88e743a2d SHA512 1175de97a824b8be65a5b25b20cfcd17ae4ab4b101794f7dbdde8059b7192f30193d634e63141a54e9e8c2018166f1f204d321270ba91959d450839b9e1fb89e WHIRLPOOL b5944d4eb663cda53d83f88a52775868cf942c632e5cae0be25970fde60557aa43f69095ddc0861eb872f815e562f6998a5873b8aae1c2c660ae8e8ade75b4c2
 DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6b3b7a2050181c2ec341fa33b031423a913141b9c76aa590044 SHA512 6cd0ff2334b892835c91ae0c0bcf996e2322673533f46cec0efa37db25837f809202de061696c737da837099179a1fe20ef7bd569f6c04375e6090a8c5757d4d WHIRLPOOL 82a9189ff14ac9f373d84346361b231bc7ef298be20892b7a76e20ba8fe3762055f11957f40ba914d939d650cf7f9b098604aae84d30622e207498a5ad14fa81
 DIST netbeans-trunk-nightly-201501160001-src.zip 201394511 SHA256 0a5e6e98692bceabdacc7ef41fe2b7fb59d9c879453982b2dc0e79d28f077714 SHA512 2a5be09537b1735e712ec373cc7f41b1e8b7753be5026ec3a1562d7347f4d5addf58bb9ea052051e0df2113e18a366e4095f84432dffb4b75b86b9ca913d3d56 WHIRLPOOL 7a8d35dcba4754cb809b8ac8710cbba8ba5452c4c4e13963a40e032b13241aa9b44328f3bbeea681bf535a31980e766331acaf5ae265bda5dd5790bda872d8dc
+DIST netbeans-trunk-nightly-201501180001-src.zip 201391445 SHA256 b1bf4373e5b799f830894b4ea7ab878ef09c64059758cebb2fa1b1a244718965 SHA512 bf1a40344c915a754f3b7baed759b6513e6a055bface5fe6c30c4e0adeb76fe7d2aaac5d344553ee5df505131cb05c7e2219c67514d4a962f681f9a39c685166 WHIRLPOOL f33d7bfe0174c7de81986a44578df8322fa8f2b46911e9f6fc05ffe8f0839e70b691d62ef9b6dc1b248aceb68760330ef69e86f026a83b6c0f27bcee3a4bc07b
 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
@@ -92,5 +93,6 @@ EBUILD netbeans-dlight-9999_p20150113.ebuild 2995 SHA256 ab9c2bbd47557ea7429945e
 EBUILD netbeans-dlight-9999_p20150114.ebuild 2995 SHA256 cf9b79bbeb270aa57a4268f0f5a8d4cb421ae864e04955fefe30492b92bbdbb8 SHA512 983da37fa9b6c675e11096c36522a1e3447b562dbb8147faf0ddd897723eab82c4f638e8ec88a5ef61b6e2bb86b02f1a3cf99ca6152bf4fbec1ae12d2e42c8a7 WHIRLPOOL 6ed8a96595086bd9d9f71289eec7187a4b8766b5a679808c8736ca7fbd693122ca039f8e334e11105672b3c8eff89b2c6d5dd5646c413072a53fea51403d0b0e
 EBUILD netbeans-dlight-9999_p20150115.ebuild 2995 SHA256 701348a13acc8f87f342b348c169a789812b421d18831763bc5eab4a6d7b1bf3 SHA512 b00187b6db521f10efeab8e51c727ed5a596b8ef0ea03186560e524aed9aa1b03c865dbb7473e9bf1ffe161d2273c3d7d21d800274aa6248023452c1885c78cc WHIRLPOOL e50da17f1f185f68777d6f0807d221868992028ecc73bd0cd006a3cf57b0e5c7ee86ae90648c8a9a80bfffb397a1389dfb09992a5ff67ba5eba4e8d29aeb5245
 EBUILD netbeans-dlight-9999_p20150116.ebuild 2995 SHA256 ff37894f944835df50c468e36efbc6d90bd1c12a547a3a8b15f80e7f535cc86a SHA512 07d675df60c823436dab7ec5690d66bba2a396551cc41c96d7bf6a3bffff57c1329a9a7ad4dd7ccc5f459c851ff9ff4c31102476e5f4a72692d4951d29517a33 WHIRLPOOL 254a6d78d4be42a52d85ab32b6fadf84bc43fe86ca8ed6e27076a7314c41a18b546c4709144cae17b9c07636310f7cb5edb5cf2ff706d7be7b1340a7853827d8
-MISC ChangeLog 146226 SHA256 917e9ed0300edd57e6d611797866e17cc0f45e5d563a3c851276087b70c02fb7 SHA512 8738b46afa1bbb17b213ed0eb503deae33f0c2444fdcd0587778ea1dc54bb4a080fdc0129932d530b68f2b46444f2551694d8394ac6a0c2ddae0c1a03779b0ed WHIRLPOOL f273a9208cdbd80344585e75d8c59cb32620ee083a74880256ad8f43d1247ce5d615d5cc3247119f6abdad5a19ec0f9631269f1ef9761a824e0f52baca3ed9e7
+EBUILD netbeans-dlight-9999_p20150118.ebuild 2995 SHA256 f91edc523c3264dd93203d54800100ffbe8a323308091982024ca9c06b13aa1d SHA512 d5a8d48b8d01ee2931878d585088adf2acd78e3ae18efeb3c18c62f82670e2669151cbf9da09fbb94f7e54ff390a562aa73bd8dee1ad36ccdc6716c3f052fcca WHIRLPOOL 486cfd6ffac84b7f10e8aafef3e71039ae77ac844647a17b3bcdf78b5f892f5ed197a63176e459cd3f3ab0e645998fce144cbc3591b1f69abdb2775387628afc
+MISC ChangeLog 146399 SHA256 d6b7da898d161648cb8ac15601b88f0e0ab80790492d0b11c0f35630afa50951 SHA512 92898bac356873191412e87c1a1fcb69343310530ae8a188da2715e7bb8901a8d5dfcdb678fc398e4912f5a0cae205c8d6db0147b6c827406f42eb15730bbd3e WHIRLPOOL 8cea6b31e5a069772c320226e475e00fb22ed870d3397bc10f43ceb91d79776e33c6e3192e01e3085025ca46bcdbfd3fdbc4c7a20303305a5b6d545925f6d36d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150118.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150118.ebuild
new file mode 100644
index 0000000..738203f
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150118.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 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/2015-01-18_00-01-55/zip/netbeans-trunk-nightly-201501180001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/9695A2FCDFCDDB42935490029E077C053E3F6FE1-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}"/9695A2FCDFCDDB42935490029E077C053E3F6FE1-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 e17fd5b..a4ab557 100644
--- a/dev-java/netbeans-enterprise/ChangeLog
+++ b/dev-java/netbeans-enterprise/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-enterprise-9999_p20150118 (18 Jan 2015)
+
+  18 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-enterprise-9999_p20150118.ebuild:
+  bumped to the latest sources
+
 *netbeans-enterprise-9999_p20150116 (16 Jan 2015)
 
   16 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 5d597d2..4e7c8ca 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -134,6 +134,7 @@ DIST netbeans-trunk-nightly-201501130001-src.zip 201373370 SHA256 eb5fbabdcc6f24
 DIST netbeans-trunk-nightly-201501140001-src.zip 201400262 SHA256 65aef07f80d9cfe6b47ac2c3aa2be2f1d98a7d9466a44c5196cab7b88e743a2d SHA512 1175de97a824b8be65a5b25b20cfcd17ae4ab4b101794f7dbdde8059b7192f30193d634e63141a54e9e8c2018166f1f204d321270ba91959d450839b9e1fb89e WHIRLPOOL b5944d4eb663cda53d83f88a52775868cf942c632e5cae0be25970fde60557aa43f69095ddc0861eb872f815e562f6998a5873b8aae1c2c660ae8e8ade75b4c2
 DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6b3b7a2050181c2ec341fa33b031423a913141b9c76aa590044 SHA512 6cd0ff2334b892835c91ae0c0bcf996e2322673533f46cec0efa37db25837f809202de061696c737da837099179a1fe20ef7bd569f6c04375e6090a8c5757d4d WHIRLPOOL 82a9189ff14ac9f373d84346361b231bc7ef298be20892b7a76e20ba8fe3762055f11957f40ba914d939d650cf7f9b098604aae84d30622e207498a5ad14fa81
 DIST netbeans-trunk-nightly-201501160001-src.zip 201394511 SHA256 0a5e6e98692bceabdacc7ef41fe2b7fb59d9c879453982b2dc0e79d28f077714 SHA512 2a5be09537b1735e712ec373cc7f41b1e8b7753be5026ec3a1562d7347f4d5addf58bb9ea052051e0df2113e18a366e4095f84432dffb4b75b86b9ca913d3d56 WHIRLPOOL 7a8d35dcba4754cb809b8ac8710cbba8ba5452c4c4e13963a40e032b13241aa9b44328f3bbeea681bf535a31980e766331acaf5ae265bda5dd5790bda872d8dc
+DIST netbeans-trunk-nightly-201501180001-src.zip 201391445 SHA256 b1bf4373e5b799f830894b4ea7ab878ef09c64059758cebb2fa1b1a244718965 SHA512 bf1a40344c915a754f3b7baed759b6513e6a055bface5fe6c30c4e0adeb76fe7d2aaac5d344553ee5df505131cb05c7e2219c67514d4a962f681f9a39c685166 WHIRLPOOL f33d7bfe0174c7de81986a44578df8322fa8f2b46911e9f6fc05ffe8f0839e70b691d62ef9b6dc1b248aceb68760330ef69e86f026a83b6c0f27bcee3a4bc07b
 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
@@ -173,5 +174,6 @@ EBUILD netbeans-enterprise-9999_p20150113.ebuild 15147 SHA256 1da3c2f249ec931e72
 EBUILD netbeans-enterprise-9999_p20150114.ebuild 15147 SHA256 25705e9e8694c026a811b5ff8ccd862bd60e8be5f889f438840fcf98e7cccf36 SHA512 88619fb4c6534a95aa5177dff66a4f2df0403a7670ca7bf2fa33c471658bde754b54171b263815b9d71328fdf80760537131f53b49b2de17c7f942d8e0f64c9c WHIRLPOOL 08fccbf929de7a2ac37a4e31555ffa5867dab89a139f0ef6431502323370eb2f7e50087231c6b3053ac7c429a9974deddd78275423d40940bf8de354e362995b
 EBUILD netbeans-enterprise-9999_p20150115.ebuild 15147 SHA256 32d5865497090b91f3dd1a20cb5a9199e0e711f8a9ab5529b75ed242c934808d SHA512 a2d2efa162c7b87dd432afc0e93aa8646e6bbe88843f86412fe93182b55c2f84a3975b9198a0272bd67b651503e3e4d086ef325828acaceaae360b4bf5a63b7a WHIRLPOOL 33bbccd4407c0feff096f6d32064e177309de22200f254763813745a4beef2b5881f5896968f4329d5415849ebd3d94ea464ffe40f03c9819d14cccf97a4752e
 EBUILD netbeans-enterprise-9999_p20150116.ebuild 15147 SHA256 d471e33e89c8a25fdb7fe3776f690998894501ee604915287a3e8c86281d1908 SHA512 c9486ae6ba60782a805fe1cb0613003047795d13f7964b53a3c9952d51673f2b63bbcea62d3d120bf90d0c42db7acef8ff22dde9db3d4ace6a78f892477a88c1 WHIRLPOOL b2e4ba167c9255e579edc6b30e2578ad6df44a135e791662e2f6478b38f0169e95370759c8441439e96234ea803904bed5e089317c946ba7c49a5012bfd36e5b
-MISC ChangeLog 154052 SHA256 cad6c223ddd73c1ed3357f42310db5b53a419840b8495b91e63c3114afc6ee50 SHA512 26c7db6e09653da4bf0b93c97fa79666a76ab22e3b70c6256c542da88c33c64c2b3cf50361d5f7957b656998a4640d907d2dfef563466fa377052ec612e03564 WHIRLPOOL 8a48cd3bd88d345f7b7f6423d98dbb4cdc97764b8fef7fc63abd206cda70122e554890be6eaa0eb64941fdc82ea7e44bb94ebd2ca37ff93613141dd302ef2283
+EBUILD netbeans-enterprise-9999_p20150118.ebuild 15147 SHA256 de08290aaedfb02717816d77333b45d1e9368754fb08f58dc87b6e971401e71c SHA512 e40d39f17e34d06137847966d66af6f5524f08e14a59e5c90db7bb285e7af8c3be779fa0d6bbe28d13fc7980d8545f45dc6e6fee79d52a98464dc51a5380dcc4 WHIRLPOOL 22a620d34beafa8ad13214e3a8f3a802e01640525a4819debcdf87a6cf0d8417957b849cd2c2925527ea55d54b17dff5bcaa0a6c942ce8e5d07094f50c3c0f26
+MISC ChangeLog 154233 SHA256 71b2f986833555603740d727a7b9d1357815c0f4b992bf231593e092a569ff1d SHA512 76b96e689a9354011b5e6cae07c8bb5b79ba46e1692e07ba4f2f9ede44bbc8e12bd510954e5c6b3fd75af366a7dec18948a71702dd92ece1cf95ecb4f6f39791 WHIRLPOOL 1d40133171b1db0f49cac1a50a245ea0ab20a0701429517dc6db0efd1aafce80171a5891d4b0dc53cf5c45bb397fa1f2b9bf4e0c956e3de88e4ba5d36b143135
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150118.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150118.ebuild
new file mode 100644
index 0000000..b017fa1
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150118.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2015 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/2015-01-18_00-01-55/zip/netbeans-trunk-nightly-201501180001-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 24aba8c..60c5ba4 100644
--- a/dev-java/netbeans-ergonomics/ChangeLog
+++ b/dev-java/netbeans-ergonomics/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-ergonomics-9999_p20150118 (18 Jan 2015)
+
+  18 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ergonomics-9999_p20150118.ebuild:
+  bumped to the latest sources
+
 *netbeans-ergonomics-9999_p20150116 (16 Jan 2015)
 
   16 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index ab58bc2..297d5c4 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -45,6 +45,7 @@ DIST netbeans-trunk-nightly-201501130001-src.zip 201373370 SHA256 eb5fbabdcc6f24
 DIST netbeans-trunk-nightly-201501140001-src.zip 201400262 SHA256 65aef07f80d9cfe6b47ac2c3aa2be2f1d98a7d9466a44c5196cab7b88e743a2d SHA512 1175de97a824b8be65a5b25b20cfcd17ae4ab4b101794f7dbdde8059b7192f30193d634e63141a54e9e8c2018166f1f204d321270ba91959d450839b9e1fb89e WHIRLPOOL b5944d4eb663cda53d83f88a52775868cf942c632e5cae0be25970fde60557aa43f69095ddc0861eb872f815e562f6998a5873b8aae1c2c660ae8e8ade75b4c2
 DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6b3b7a2050181c2ec341fa33b031423a913141b9c76aa590044 SHA512 6cd0ff2334b892835c91ae0c0bcf996e2322673533f46cec0efa37db25837f809202de061696c737da837099179a1fe20ef7bd569f6c04375e6090a8c5757d4d WHIRLPOOL 82a9189ff14ac9f373d84346361b231bc7ef298be20892b7a76e20ba8fe3762055f11957f40ba914d939d650cf7f9b098604aae84d30622e207498a5ad14fa81
 DIST netbeans-trunk-nightly-201501160001-src.zip 201394511 SHA256 0a5e6e98692bceabdacc7ef41fe2b7fb59d9c879453982b2dc0e79d28f077714 SHA512 2a5be09537b1735e712ec373cc7f41b1e8b7753be5026ec3a1562d7347f4d5addf58bb9ea052051e0df2113e18a366e4095f84432dffb4b75b86b9ca913d3d56 WHIRLPOOL 7a8d35dcba4754cb809b8ac8710cbba8ba5452c4c4e13963a40e032b13241aa9b44328f3bbeea681bf535a31980e766331acaf5ae265bda5dd5790bda872d8dc
+DIST netbeans-trunk-nightly-201501180001-src.zip 201391445 SHA256 b1bf4373e5b799f830894b4ea7ab878ef09c64059758cebb2fa1b1a244718965 SHA512 bf1a40344c915a754f3b7baed759b6513e6a055bface5fe6c30c4e0adeb76fe7d2aaac5d344553ee5df505131cb05c7e2219c67514d4a962f681f9a39c685166 WHIRLPOOL f33d7bfe0174c7de81986a44578df8322fa8f2b46911e9f6fc05ffe8f0839e70b691d62ef9b6dc1b248aceb68760330ef69e86f026a83b6c0f27bcee3a4bc07b
 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
@@ -84,5 +85,6 @@ EBUILD netbeans-ergonomics-9999_p20150113.ebuild 2919 SHA256 d64a782c532ec94d9c1
 EBUILD netbeans-ergonomics-9999_p20150114.ebuild 2919 SHA256 a464dcbfd483ec2dada2234b898bf85714700075b4bee286312e691f100150e9 SHA512 83bb52dda29f1bccbc60d3a5d032e4887a2f8ff0adad78437ec87965f1a16d4cd5343888f502648d0012a2479a20fe886d99a350b81b968da68152e4e144814a WHIRLPOOL 5c9edcdd8e05a995c8a825a6f04a53729a34875e927e33b6188f5bf2c88a543601fa6752f5fecd8698c6333bda80f4c662324c4605dd78287f4e01d73847da75
 EBUILD netbeans-ergonomics-9999_p20150115.ebuild 2919 SHA256 7bbb97c6d2c8fc681ace228f0679aa978aac4b947cf2900b5e663bbb2c1dbc70 SHA512 3eb5010891f0dcd6d3b9088d5485fcfcaf38feaf03c08ea27213028519d50289c9056080ff22127ef46898d0c8861ec235f8dff20b8afb95e8df1b447958dd4d WHIRLPOOL 1e1efe618184c5e5e7eeefa956c9e679cb90145659f37265a76ca2bc7e57ef83d01b94a3b8afa56eb761c5225c0a6c5b645eeb3df57548c2879bb36c477ad2a4
 EBUILD netbeans-ergonomics-9999_p20150116.ebuild 2919 SHA256 27c7bc6c53e7cd492766e59868982c94a9fe99ed238a34e94da922e25c23d929 SHA512 d1ce57c93647ce128615a33c9dc963e6d1ea4b690e498a74cf0da15df43cbb1ff75de1d4a0988d152071c6923dae8df5a7fb70ebdc009701f63598e2c658012e WHIRLPOOL 4bd301227ccfbb92f28d2f9a5d2d7ba6eb522d7d400d11783369bfda19f12da8a4246ac94414be3ff1048651967e4bb7a5d220380ba993c09bd75aff1cb52f13
-MISC ChangeLog 153527 SHA256 6e4ba730cb7f69475571ff8f60e546b0edca87b2bae467855ef21c3c31e56839 SHA512 11c49b4642f8dc277c8d9ea156316db3ea39c5b0f4ca2cba61e167a1469dbfae5dc9a12154b7a5738826b31bb6b40c10f7fdec315f5c3b1798b16703377de7bd WHIRLPOOL 4054b52b59fd4ef4640c8d6b50194000b799c3355fbeb6ae12cfebc44d4021fc68117ee09a580947f105207356b9cdb8f0c69ebe94727a11831e2843deeba6b2
+EBUILD netbeans-ergonomics-9999_p20150118.ebuild 2919 SHA256 61dec9c0ae69db18c9dafb835a321833ffb4cbe939915f1859495beeed837813 SHA512 f22794dea930dfdc48def5a7d2f7cf283d6273f336d63093b9b26f5a9b968036c85a3c8735808bf809860042316a48abb2e3ddfb2d47f4cddaa750348fec34f1 WHIRLPOOL 75bd3258709799eca1dd2a82dff094daf532872ab6b3ff1a451f4953c1e02e6672684b8ca5d2119c2ed6bcf4a9d406823ba2ec2797f6f894e0734508899db37e
+MISC ChangeLog 153708 SHA256 811dd4d55c3aad2375b99cad265b1fddc533876707a44c39f47696002e3ecc4b SHA512 b0ef5ba39de5d5e9a21aca3096dd3e836fe10678fa7cad22b836783f26009b3213198cb320bd6488fe6784ffa25a3d619214b5f7364a7097f16796bf8f375582 WHIRLPOOL bfbaf7f8109973daa449f4bd69608807172efc694c22eabe699a593944a825fd73cd5e3a503dfba0f114dc3ebcb553c654a88cc0c8361941a5346dbec56ce47b
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150118.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150118.ebuild
new file mode 100644
index 0000000..785ccef
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150118.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 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/2015-01-18_00-01-55/zip/netbeans-trunk-nightly-201501180001-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 cb46f48..3b300d5 100644
--- a/dev-java/netbeans-extide/ChangeLog
+++ b/dev-java/netbeans-extide/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-extide-9999_p20150118 (18 Jan 2015)
+
+  18 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-extide-9999_p20150118.ebuild:
+  bumped to the latest sources
+
 *netbeans-extide-9999_p20150116 (16 Jan 2015)
 
   16 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index 6758618..27a5937 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -43,6 +43,7 @@ DIST netbeans-trunk-nightly-201501130001-src.zip 201373370 SHA256 eb5fbabdcc6f24
 DIST netbeans-trunk-nightly-201501140001-src.zip 201400262 SHA256 65aef07f80d9cfe6b47ac2c3aa2be2f1d98a7d9466a44c5196cab7b88e743a2d SHA512 1175de97a824b8be65a5b25b20cfcd17ae4ab4b101794f7dbdde8059b7192f30193d634e63141a54e9e8c2018166f1f204d321270ba91959d450839b9e1fb89e WHIRLPOOL b5944d4eb663cda53d83f88a52775868cf942c632e5cae0be25970fde60557aa43f69095ddc0861eb872f815e562f6998a5873b8aae1c2c660ae8e8ade75b4c2
 DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6b3b7a2050181c2ec341fa33b031423a913141b9c76aa590044 SHA512 6cd0ff2334b892835c91ae0c0bcf996e2322673533f46cec0efa37db25837f809202de061696c737da837099179a1fe20ef7bd569f6c04375e6090a8c5757d4d WHIRLPOOL 82a9189ff14ac9f373d84346361b231bc7ef298be20892b7a76e20ba8fe3762055f11957f40ba914d939d650cf7f9b098604aae84d30622e207498a5ad14fa81
 DIST netbeans-trunk-nightly-201501160001-src.zip 201394511 SHA256 0a5e6e98692bceabdacc7ef41fe2b7fb59d9c879453982b2dc0e79d28f077714 SHA512 2a5be09537b1735e712ec373cc7f41b1e8b7753be5026ec3a1562d7347f4d5addf58bb9ea052051e0df2113e18a366e4095f84432dffb4b75b86b9ca913d3d56 WHIRLPOOL 7a8d35dcba4754cb809b8ac8710cbba8ba5452c4c4e13963a40e032b13241aa9b44328f3bbeea681bf535a31980e766331acaf5ae265bda5dd5790bda872d8dc
+DIST netbeans-trunk-nightly-201501180001-src.zip 201391445 SHA256 b1bf4373e5b799f830894b4ea7ab878ef09c64059758cebb2fa1b1a244718965 SHA512 bf1a40344c915a754f3b7baed759b6513e6a055bface5fe6c30c4e0adeb76fe7d2aaac5d344553ee5df505131cb05c7e2219c67514d4a962f681f9a39c685166 WHIRLPOOL f33d7bfe0174c7de81986a44578df8322fa8f2b46911e9f6fc05ffe8f0839e70b691d62ef9b6dc1b248aceb68760330ef69e86f026a83b6c0f27bcee3a4bc07b
 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
@@ -78,5 +79,6 @@ EBUILD netbeans-extide-9999_p20150113.ebuild 3383 SHA256 00c5a68c9cd96675835d706
 EBUILD netbeans-extide-9999_p20150114.ebuild 3383 SHA256 c2e601c6578150f39885f6f8c73b6092844afb3b95448976d9a0b3dfa566ef1a SHA512 acddc531ba0c51d531ff57c2cc545e3562fc77df075c868fe0787b19e8bd31bb7bb432d0df5dc634d4b3d8174d4668870712440867f408925c1b17b922abd59f WHIRLPOOL 98d14002a03ce2124e1462fc494570fc864452bc66d7d352c8c9b3f433576ab76f8781232e226330bd79208504b0c14bcda4ee2b0a3ef742b74342561c7bbdfc
 EBUILD netbeans-extide-9999_p20150115.ebuild 3383 SHA256 9bcac5fa6955229212a7b4ebfa9ef1d297b8e249a4b9327e5290c546b8915d87 SHA512 024a0f2c935bc03a6c014796f5872e49d4ac61940004f902d8d281ede06fbe5c9cd394b2081f12966f213f5384cd39de2d8dca049765fe683b581c08e8033ef5 WHIRLPOOL ea78c777b365621301b20988dba0bc799d663973fbb9ef62989545e9bcefd2ad5d7005b1caced24202f23c4fe9a3327727eddabcdcaa03e21371f257edf9b256
 EBUILD netbeans-extide-9999_p20150116.ebuild 3383 SHA256 7733098c3179aff8223238b7ccfc1449463de00edf0730ca52e8a8b0621fab9f SHA512 7f4cc6fe1d4330ee6a3c068e443adcf215d1c794f8092114b090a3b9fcac0992b7f784cf72ebf76bf81abfd82fdf13ce4c7b2c85a9cfafcb394f3e5950047b62 WHIRLPOOL 4d62998bc87da17978ef5e7ef2d55f3a337ee35e243c9e50d2d32bd151f028aa8829580ebd5c019871a1f92c9d1ec02695d4f63c2d92e9a452306c56efe567bb
-MISC ChangeLog 78238 SHA256 446ae158393af468d0fb376e5ddf6d7857ce580f16550e44fc2d71ee976a6a4e SHA512 87fa7a3914f28c4d6ed5e5e3d786c7521967cbb0601ee4d15caecaaff86df19878d41fb9341f981822de93eec215b644ed6429f58cfe0e543aa67cd054eae22f WHIRLPOOL 75fe383b6f8aa02250ebb24b3d263104b3252e1efbc1122d8a6cbc64f414e77c2793e19b3b831ee5813b10d35d1b679ccb0a902466444b059d0c862e33aa66bd
+EBUILD netbeans-extide-9999_p20150118.ebuild 3383 SHA256 3e6eecb155c8816f0461c7bde9d74f26eaeecdea3d0e630df284673905296a1d SHA512 fae3248d8d4efc922303231b0f77fb4d0b5c40df6d82b22296d8de2b41d313eb30620880928dda04c39726a55ddd8d65e41a01cd732e69bdeac5817c749680d8 WHIRLPOOL 6382b78dd43fb850897110dd0811cc4e21102185b367d8a8b6ba9f1e2b3cac8a589fa157097954a8366d1fdcccea6520d275b6987d1ffe46b21204ce48a550e7
+MISC ChangeLog 78411 SHA256 146376f1ccf3c1e1e396fd7039adfd5cf9b61f90093ba60db9cdf865755f2ccd SHA512 55c7ea8b76645088f6be600d1010163f502bec74827ba7168f326134dca5ed1e255bb897bd65564cb03d06c83b4374aed6eb0d2ada372111396e5904848d1ded WHIRLPOOL 4a90f7087fbf35e0a40ffd8a88de9529ce1ccb31e41dbe87f2fc5be6478cf33ceacc9bf9e8e79091ce97ffc66f426f747742a857cccf7fd2d8bd0773dec25ce5
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20150118.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20150118.ebuild
new file mode 100644
index 0000000..5e27c83
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20150118.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2015 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/2015-01-18_00-01-55/zip/netbeans-trunk-nightly-201501180001-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 15a37d8..af4e2de 100644
--- a/dev-java/netbeans-groovy/ChangeLog
+++ b/dev-java/netbeans-groovy/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-groovy-9999_p20150118 (18 Jan 2015)
+
+  18 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-groovy-9999_p20150118.ebuild:
+  bumped to the latest sources
+
 *netbeans-groovy-9999_p20150116 (16 Jan 2015)
 
   16 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index 60ec3d6..e4a3217 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -49,6 +49,7 @@ DIST netbeans-trunk-nightly-201501130001-src.zip 201373370 SHA256 eb5fbabdcc6f24
 DIST netbeans-trunk-nightly-201501140001-src.zip 201400262 SHA256 65aef07f80d9cfe6b47ac2c3aa2be2f1d98a7d9466a44c5196cab7b88e743a2d SHA512 1175de97a824b8be65a5b25b20cfcd17ae4ab4b101794f7dbdde8059b7192f30193d634e63141a54e9e8c2018166f1f204d321270ba91959d450839b9e1fb89e WHIRLPOOL b5944d4eb663cda53d83f88a52775868cf942c632e5cae0be25970fde60557aa43f69095ddc0861eb872f815e562f6998a5873b8aae1c2c660ae8e8ade75b4c2
 DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6b3b7a2050181c2ec341fa33b031423a913141b9c76aa590044 SHA512 6cd0ff2334b892835c91ae0c0bcf996e2322673533f46cec0efa37db25837f809202de061696c737da837099179a1fe20ef7bd569f6c04375e6090a8c5757d4d WHIRLPOOL 82a9189ff14ac9f373d84346361b231bc7ef298be20892b7a76e20ba8fe3762055f11957f40ba914d939d650cf7f9b098604aae84d30622e207498a5ad14fa81
 DIST netbeans-trunk-nightly-201501160001-src.zip 201394511 SHA256 0a5e6e98692bceabdacc7ef41fe2b7fb59d9c879453982b2dc0e79d28f077714 SHA512 2a5be09537b1735e712ec373cc7f41b1e8b7753be5026ec3a1562d7347f4d5addf58bb9ea052051e0df2113e18a366e4095f84432dffb4b75b86b9ca913d3d56 WHIRLPOOL 7a8d35dcba4754cb809b8ac8710cbba8ba5452c4c4e13963a40e032b13241aa9b44328f3bbeea681bf535a31980e766331acaf5ae265bda5dd5790bda872d8dc
+DIST netbeans-trunk-nightly-201501180001-src.zip 201391445 SHA256 b1bf4373e5b799f830894b4ea7ab878ef09c64059758cebb2fa1b1a244718965 SHA512 bf1a40344c915a754f3b7baed759b6513e6a055bface5fe6c30c4e0adeb76fe7d2aaac5d344553ee5df505131cb05c7e2219c67514d4a962f681f9a39c685166 WHIRLPOOL f33d7bfe0174c7de81986a44578df8322fa8f2b46911e9f6fc05ffe8f0839e70b691d62ef9b6dc1b248aceb68760330ef69e86f026a83b6c0f27bcee3a4bc07b
 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
@@ -88,5 +89,6 @@ EBUILD netbeans-groovy-9999_p20150113.ebuild 3422 SHA256 8e04fdc9c8099b8fddfc2fe
 EBUILD netbeans-groovy-9999_p20150114.ebuild 3422 SHA256 3d48db78c3e60544387a931e666bff167f68154333ad6939aedfa4deb20ab58b SHA512 0ec683069d07c0b32cc373bedce91795837023dba43de198f586a30a5d95444c2a125d2f905aa0d9da31956397269ca61576b6d15f8a4a8149c26d4dc287c1ce WHIRLPOOL 813b326d9a87ae820f915e499569b4ab5bee2c62d1caf57e4f33333fc77a482f15db44558cb72477ea1677537e6c2ab932134e089fdd3d085c5f2244b1d9801d
 EBUILD netbeans-groovy-9999_p20150115.ebuild 3422 SHA256 38d2593f66af4952670575cf0a38dd5ef94f0d44954ece459dc21262ab75dcdc SHA512 76df7e24975dbb6990866a858a80cb5e5ab1657b178db33817e8eb787b8d572c94b678bf064229d85e2cd864e06c0fc7db18f9dec37ab053b384ad9ef288e43c WHIRLPOOL 89f45dc34bf0152bd74634fefd9172b37619d1343264bce40c14a5e60973eb6fa00631de6144a4c51e694b339620092c560069aa54397df31cce695aac754689
 EBUILD netbeans-groovy-9999_p20150116.ebuild 3422 SHA256 0d43e8ccf0cadbf997e61b5a6bdd87f1d63f33a5d4b7baf3e8265113235cea11 SHA512 424ff0fdf14f7c9200fd9d74f69c323386d4453aa11b9fcc417bb43a6499adbd36528296ff8fd6fa83fdcd54eedc3ce3e028df40066e474647a6223bf3500f4e WHIRLPOOL bd05beb365c156808c98cc31a627130cb4b45e7cb3d9d7f1903d6779f2832971f6bfc912bb8e2dc75492667de5263ec6ed3557ffe790a5bc42673b52c1014a36
-MISC ChangeLog 146218 SHA256 fd86ac1c5eb38465b2a7fd22db71faba8e1e58148e42f0220765810c7a2c429a SHA512 bb19dfbedc914254a885839227a210a879edf1f53d282f8a92eb45ab8e9cf4f25c931f6463f7c034ea2b9b62c7eae74f50c3f9fa440fd04e36e5283b7a8f5835 WHIRLPOOL 1f0c7272c598ac4ffca37bba1f34d6529276d2f772a422bd362d4440a0f47bff626acf7ccb4b7408e14cebd57ae66e103df4bf1a7738c1e18e8a9359f4bcc292
+EBUILD netbeans-groovy-9999_p20150118.ebuild 3422 SHA256 95d1aabc2fd79aaa7770dca28ede02ff5acdbdd13765aa74803cf9034630a3aa SHA512 31fb4140b62e2bd8a07bf8775377068761b2686132cc515272f1c6dd6fddd30ecb46c001793910e51e384777464e1108267575f1b8c7000bb18202824b8bf8bb WHIRLPOOL fdb6c149deaec0528bca3b398b088f5d9e263c5ffa890a57efc1cda82da6d60b14a5439886fd022491661563130ad251dea129a33cbcac9190ab0dc492dd8af4
+MISC ChangeLog 146391 SHA256 de4a5a54ae269490396d87f768c4761e56f5a9d84bcef98d61ce2c724454433c SHA512 14712700c925ea86988fd2c40c19e282768126f6051d6f0fc70eb8030e064998a35f9551bb1b73803f83b1ee1a1016a0aaa880d83756441159178b49a186fde6 WHIRLPOOL 839674c646dc14a914bf3bc3fcf90e00f19eb475b6814cda15ea21cccd7ec183d96df7e4ef4396f2703c63674219ddc5e534ddac8c0837734eabb2fd6c1e2b73
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150118.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150118.ebuild
new file mode 100644
index 0000000..4a5eea8
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150118.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 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/2015-01-18_00-01-55/zip/netbeans-trunk-nightly-201501180001-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 30c2c01..4b7baa5 100644
--- a/dev-java/netbeans-harness/ChangeLog
+++ b/dev-java/netbeans-harness/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-harness-9999_p20150118 (18 Jan 2015)
+
+  18 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-harness-9999_p20150118.ebuild:
+  bumped to the latest sources
+
 *netbeans-harness-9999_p20150116 (16 Jan 2015)
 
   16 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 291e508..35c9b1f 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -51,6 +51,7 @@ DIST netbeans-trunk-nightly-201501130001-src.zip 201373370 SHA256 eb5fbabdcc6f24
 DIST netbeans-trunk-nightly-201501140001-src.zip 201400262 SHA256 65aef07f80d9cfe6b47ac2c3aa2be2f1d98a7d9466a44c5196cab7b88e743a2d SHA512 1175de97a824b8be65a5b25b20cfcd17ae4ab4b101794f7dbdde8059b7192f30193d634e63141a54e9e8c2018166f1f204d321270ba91959d450839b9e1fb89e WHIRLPOOL b5944d4eb663cda53d83f88a52775868cf942c632e5cae0be25970fde60557aa43f69095ddc0861eb872f815e562f6998a5873b8aae1c2c660ae8e8ade75b4c2
 DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6b3b7a2050181c2ec341fa33b031423a913141b9c76aa590044 SHA512 6cd0ff2334b892835c91ae0c0bcf996e2322673533f46cec0efa37db25837f809202de061696c737da837099179a1fe20ef7bd569f6c04375e6090a8c5757d4d WHIRLPOOL 82a9189ff14ac9f373d84346361b231bc7ef298be20892b7a76e20ba8fe3762055f11957f40ba914d939d650cf7f9b098604aae84d30622e207498a5ad14fa81
 DIST netbeans-trunk-nightly-201501160001-src.zip 201394511 SHA256 0a5e6e98692bceabdacc7ef41fe2b7fb59d9c879453982b2dc0e79d28f077714 SHA512 2a5be09537b1735e712ec373cc7f41b1e8b7753be5026ec3a1562d7347f4d5addf58bb9ea052051e0df2113e18a366e4095f84432dffb4b75b86b9ca913d3d56 WHIRLPOOL 7a8d35dcba4754cb809b8ac8710cbba8ba5452c4c4e13963a40e032b13241aa9b44328f3bbeea681bf535a31980e766331acaf5ae265bda5dd5790bda872d8dc
+DIST netbeans-trunk-nightly-201501180001-src.zip 201391445 SHA256 b1bf4373e5b799f830894b4ea7ab878ef09c64059758cebb2fa1b1a244718965 SHA512 bf1a40344c915a754f3b7baed759b6513e6a055bface5fe6c30c4e0adeb76fe7d2aaac5d344553ee5df505131cb05c7e2219c67514d4a962f681f9a39c685166 WHIRLPOOL f33d7bfe0174c7de81986a44578df8322fa8f2b46911e9f6fc05ffe8f0839e70b691d62ef9b6dc1b248aceb68760330ef69e86f026a83b6c0f27bcee3a4bc07b
 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
@@ -90,5 +91,6 @@ EBUILD netbeans-harness-9999_p20150113.ebuild 4131 SHA256 d88dd1fad7f7ebcc340df3
 EBUILD netbeans-harness-9999_p20150114.ebuild 4131 SHA256 3b3e4c4f922eaffa7ed0ffa5d682843c59443026df0b4a86afeca8bd74c2f268 SHA512 ffaabe1db1b08f5e49d71721bb186b9edcfca3bd91361a46c6000c9b33e082acf52bda49bac460ce360a080324e3effcfb9333c31112155a1d383374e3c5ff71 WHIRLPOOL 24f6b3b83ee3d871847a71e48d7e7fb4b79e93ec5ba34e4f04d7deef81c77ecc0e9be24e83e63735f35da93a3299131498192f6c441033777180a9ca28fc920f
 EBUILD netbeans-harness-9999_p20150115.ebuild 4131 SHA256 90550405cd67e736368b7e031faef64fd58d986c9335f18a7ac1ac9c0e1360ec SHA512 33f0b40fad3589fe3c81b48b2b1d2b2b50510c785c884084c404adf2be47a936a952bdcbabbf74fb6332a14347a3b111a24df89b69044b7277883b2bfe1ff5a1 WHIRLPOOL 6ffc61543927c966f02b7a67e87f5bc3f66386af911e9c1f395c7beadd14516eb588eea0353ae6b4375b179de22e2716275728afb7121e4de7f8c24247286919
 EBUILD netbeans-harness-9999_p20150116.ebuild 4131 SHA256 fb2337f9f2fae97010ae27b3152d7b192adf0215aed6de4d68f74793fd05570b SHA512 3e28453eb3fb139fd6f710c68594d07fcd28e3d8891e208d8356d670bc26e96d960323ec8854d96aee2e7bc7712c5e1dc5badfcde2d57e7dd68db374bae423e9 WHIRLPOOL a93dd3a803f5df9cb400da9b7752976b7287eb16e557d443c6254afe3607deef2ad8f71189c4bfc85ddf4c789fae4b2e70d593d16c96988e90d6891d44c9164e
-MISC ChangeLog 148074 SHA256 377a5cb0e6474056b8420ca90b940a79d01a8952600cd11a512f1cc1752d51f7 SHA512 1199b1c4a55bc44b1b7efdb9b3aeb90dbb6f2ff55366f2c6df9ff01b921f23ca92ed958640807845c8782168e3e0de9dd402548b0fb4e2ec91c89861984407cf WHIRLPOOL 2e54de25c82100e64300999269d863a4d92a9357c96af67f46acf5638d66feb0b3d22ab92c29fee7537dba78b97101c378de30c03dd4688b5ca40a8444868d1c
+EBUILD netbeans-harness-9999_p20150118.ebuild 4131 SHA256 1433c0e355fef5a065dadc0720f05fc7067558cd58e7ecfa7e621ad8b53170b2 SHA512 356f5c24dea8e01aed371b1335554437792df9fef51f7332ab1abef537d465a155a4742a10d2614d8c54bda985eeb9a782be803ad36b7244ed603dbe4e57ee5e WHIRLPOOL 1ab83797f58fb421b69e7fcc5d845d1b4a712e6a90914e634800cfef2e1ee9577b64bf2307bc1efcc888f12b77744a8c5f94e273314aa01c1c6cf07347ce9182
+MISC ChangeLog 148249 SHA256 e422e54d975fa871b6276782abccaafd8d0de5ec556d5dcedcf922edbfd1b183 SHA512 137aabea17a2f04b135687066566f21955f7888aede9c56914059f75593ed1e2932836d8382b5c3998b72ff268d5da1b1466945e65ed9c26a5acc33f43e25bc8 WHIRLPOOL 558311a0bb46f014e22be3529bc13c01722574f73088149068f973592818d402cfd05d75736f665496663b601f0daa0f466893a9bfeb02f4abf376c27ff85389
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20150118.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20150118.ebuild
new file mode 100644
index 0000000..974805e
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20150118.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2015 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/2015-01-18_00-01-55/zip/netbeans-trunk-nightly-201501180001-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 1a54fc2..cfa7c58 100644
--- a/dev-java/netbeans-ide/ChangeLog
+++ b/dev-java/netbeans-ide/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-ide-9999_p20150118 (18 Jan 2015)
+
+  18 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ide-9999_p20150118.ebuild:
+  bumped to the latest sources
+
 *netbeans-ide-9999_p20150116 (16 Jan 2015)
 
   16 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 1d1fcb8..658354b 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -231,6 +231,7 @@ DIST netbeans-trunk-nightly-201501130001-src.zip 201373370 SHA256 eb5fbabdcc6f24
 DIST netbeans-trunk-nightly-201501140001-src.zip 201400262 SHA256 65aef07f80d9cfe6b47ac2c3aa2be2f1d98a7d9466a44c5196cab7b88e743a2d SHA512 1175de97a824b8be65a5b25b20cfcd17ae4ab4b101794f7dbdde8059b7192f30193d634e63141a54e9e8c2018166f1f204d321270ba91959d450839b9e1fb89e WHIRLPOOL b5944d4eb663cda53d83f88a52775868cf942c632e5cae0be25970fde60557aa43f69095ddc0861eb872f815e562f6998a5873b8aae1c2c660ae8e8ade75b4c2
 DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6b3b7a2050181c2ec341fa33b031423a913141b9c76aa590044 SHA512 6cd0ff2334b892835c91ae0c0bcf996e2322673533f46cec0efa37db25837f809202de061696c737da837099179a1fe20ef7bd569f6c04375e6090a8c5757d4d WHIRLPOOL 82a9189ff14ac9f373d84346361b231bc7ef298be20892b7a76e20ba8fe3762055f11957f40ba914d939d650cf7f9b098604aae84d30622e207498a5ad14fa81
 DIST netbeans-trunk-nightly-201501160001-src.zip 201394511 SHA256 0a5e6e98692bceabdacc7ef41fe2b7fb59d9c879453982b2dc0e79d28f077714 SHA512 2a5be09537b1735e712ec373cc7f41b1e8b7753be5026ec3a1562d7347f4d5addf58bb9ea052051e0df2113e18a366e4095f84432dffb4b75b86b9ca913d3d56 WHIRLPOOL 7a8d35dcba4754cb809b8ac8710cbba8ba5452c4c4e13963a40e032b13241aa9b44328f3bbeea681bf535a31980e766331acaf5ae265bda5dd5790bda872d8dc
+DIST netbeans-trunk-nightly-201501180001-src.zip 201391445 SHA256 b1bf4373e5b799f830894b4ea7ab878ef09c64059758cebb2fa1b1a244718965 SHA512 bf1a40344c915a754f3b7baed759b6513e6a055bface5fe6c30c4e0adeb76fe7d2aaac5d344553ee5df505131cb05c7e2219c67514d4a962f681f9a39c685166 WHIRLPOOL f33d7bfe0174c7de81986a44578df8322fa8f2b46911e9f6fc05ffe8f0839e70b691d62ef9b6dc1b248aceb68760330ef69e86f026a83b6c0f27bcee3a4bc07b
 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
@@ -272,5 +273,6 @@ EBUILD netbeans-ide-9999_p20150113.ebuild 29641 SHA256 e535d312eff6159b45d4c6e70
 EBUILD netbeans-ide-9999_p20150114.ebuild 29641 SHA256 38440a5ed44abfc6457321d4e1b6d664ff532aa075d7253575c452bec58fbd77 SHA512 effc9890a79883cd5cf0e24054b59512076de26678f1deb317a6a34163575bc39524f205febc296300f388fab38567556c46d91e1da3d663b7359efbbc0944b4 WHIRLPOOL 9d9bd71fe1d0aba94c03ef8ee105610b3c806a6d317692a628982e4140ea08f2d4a4ad0da7bc12e322bdf79b237f59655bb35de77414c9fcdc655ef00bc60a41
 EBUILD netbeans-ide-9999_p20150115.ebuild 29641 SHA256 b28e67f7de5354a6ff76015e5bb293d2804413d2d585cdbf7e8b9a1ed2d3664b SHA512 d009d51e39597b11c3dc3a86f774ff953a91463a52dbea846705cf6d91d9f27edc85ca1d262c743a7a720bae2ab4efe5064099385a11737c92be688be2a20c91 WHIRLPOOL c7a379b65db68bb4f74b2bfe37587f0dd11e62ef852cb073051126000692c01690c9d119670e53a8db9a870bb6804f343f7498b1150c1f2f067956a2da071aad
 EBUILD netbeans-ide-9999_p20150116.ebuild 29641 SHA256 5124cc60592a92cffac8efa8ca82eef226080bd0841786332dbc92bec84d263d SHA512 7ba2e3be5dd3fb62705df17c4dc594b8888dcab5e7e34058082c1358abd3b0b0576c13784689df7807a2624ce0e7fa676082e6ab3a5cc1d3f763f92952e99025 WHIRLPOOL 79663110e8be20e6d8aef4ae543f9d80001d5fa032c6fffa43a9f3cbe169f4eba4b8d997c2a578ffba8328aa494aa4bbc2b6e767b55ac93ad3e0de03a5a9d16c
-MISC ChangeLog 141176 SHA256 a895cef2e8435a18bf891ac7f5f2a6c99a3f96b90c416f2a13ca8fb710a3d231 SHA512 a52ad287d17f6dca9178c8eabc303c9d2431348d55fece498cdb18c2aca440fddbe2306652334f31bf79f58308561b846dbef4bd1e28043d3bdcf13aec06ed67 WHIRLPOOL 6b4b2693169624d1409ec9a63f2e577aa932de3ed8e9b6b90e0895f0ea285254df4af93bf671b54b92a05010adfe86ddb21a2064d0ad51deac5d05a1e89c2cdc
+EBUILD netbeans-ide-9999_p20150118.ebuild 29641 SHA256 a77a1264f3287227866a23958e6b3dcd81477cef9841d6a31f97346ae9d711a9 SHA512 c5635d4acae72fd586d214965734826e34a11f8e9366df38e3a531b66a6a9a167ebc8a259afa3d5171d0f143a51f53df605ca67da421c3eafe7ecb9a0e66fe16 WHIRLPOOL b1990aa93fb774fe58dfbbf1fa9ed59fd598dfbb5df3af552e3192f5159f3b128ecc10861502c69b218e61565014a956792c23482de030e6a911049147b15bf5
+MISC ChangeLog 141343 SHA256 40ad4c11e852a227a5b2c26296d48ce86996425cbbf5ddcb0a284d9e45451c4d SHA512 90b012ff2e1058ef9deb194c92876f26ee6eae167b10ff5a73b9c532fcac3430fff219822c62ceef1eef8f09207a990b4950e3dae7bf1eed7a50061a090a8c85 WHIRLPOOL f460e1c82b809f8bf1894ee2e1fab48272d82fa9cd6806a5e985f25169509c9f76342ec53b739e9485b1e84b2f6c9449e55f306094681a8ab2c23649bc56ea46
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20150118.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20150118.ebuild
new file mode 100644
index 0000000..d9dc8d7
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20150118.ebuild
@@ -0,0 +1,373 @@
+# Copyright 1999-2015 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/2015-01-18_00-01-55/zip/netbeans-trunk-nightly-201501180001-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/B005B69D9F5B4DBA636A95403D5CB62BAD5C486D-org.eclipse.jgit-3.6.0.201412230720-r.jar
+	http://hg.netbeans.org/binaries/0F81EBAFB75BE1C3A972B7563078897958724E1A-org.eclipse.jgit.java7-3.6.0.201412230720-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}"/B005B69D9F5B4DBA636A95403D5CB62BAD5C486D-org.eclipse.jgit-3.6.0.201412230720-r.jar o.eclipse.jgit/external/org.eclipse.jgit-3.6.0.201412230720-r.jar || die
+	ln -s "${DISTDIR}"/0F81EBAFB75BE1C3A972B7563078897958724E1A-org.eclipse.jgit.java7-3.6.0.201412230720-r.jar o.eclipse.jgit.java7/external/org.eclipse.jgit.java7-3.6.0.201412230720-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 f2d7aca..292547d 100644
--- a/dev-java/netbeans-java/ChangeLog
+++ b/dev-java/netbeans-java/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-java-9999_p20150118 (18 Jan 2015)
+
+  18 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-java-9999_p20150118.ebuild:
+  bumped to the latest sources
+
 *netbeans-java-9999_p20150116 (16 Jan 2015)
 
   16 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 922363e..f140032 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -123,6 +123,7 @@ DIST netbeans-trunk-nightly-201501130001-src.zip 201373370 SHA256 eb5fbabdcc6f24
 DIST netbeans-trunk-nightly-201501140001-src.zip 201400262 SHA256 65aef07f80d9cfe6b47ac2c3aa2be2f1d98a7d9466a44c5196cab7b88e743a2d SHA512 1175de97a824b8be65a5b25b20cfcd17ae4ab4b101794f7dbdde8059b7192f30193d634e63141a54e9e8c2018166f1f204d321270ba91959d450839b9e1fb89e WHIRLPOOL b5944d4eb663cda53d83f88a52775868cf942c632e5cae0be25970fde60557aa43f69095ddc0861eb872f815e562f6998a5873b8aae1c2c660ae8e8ade75b4c2
 DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6b3b7a2050181c2ec341fa33b031423a913141b9c76aa590044 SHA512 6cd0ff2334b892835c91ae0c0bcf996e2322673533f46cec0efa37db25837f809202de061696c737da837099179a1fe20ef7bd569f6c04375e6090a8c5757d4d WHIRLPOOL 82a9189ff14ac9f373d84346361b231bc7ef298be20892b7a76e20ba8fe3762055f11957f40ba914d939d650cf7f9b098604aae84d30622e207498a5ad14fa81
 DIST netbeans-trunk-nightly-201501160001-src.zip 201394511 SHA256 0a5e6e98692bceabdacc7ef41fe2b7fb59d9c879453982b2dc0e79d28f077714 SHA512 2a5be09537b1735e712ec373cc7f41b1e8b7753be5026ec3a1562d7347f4d5addf58bb9ea052051e0df2113e18a366e4095f84432dffb4b75b86b9ca913d3d56 WHIRLPOOL 7a8d35dcba4754cb809b8ac8710cbba8ba5452c4c4e13963a40e032b13241aa9b44328f3bbeea681bf535a31980e766331acaf5ae265bda5dd5790bda872d8dc
+DIST netbeans-trunk-nightly-201501180001-src.zip 201391445 SHA256 b1bf4373e5b799f830894b4ea7ab878ef09c64059758cebb2fa1b1a244718965 SHA512 bf1a40344c915a754f3b7baed759b6513e6a055bface5fe6c30c4e0adeb76fe7d2aaac5d344553ee5df505131cb05c7e2219c67514d4a962f681f9a39c685166 WHIRLPOOL f33d7bfe0174c7de81986a44578df8322fa8f2b46911e9f6fc05ffe8f0839e70b691d62ef9b6dc1b248aceb68760330ef69e86f026a83b6c0f27bcee3a4bc07b
 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
@@ -162,5 +163,6 @@ EBUILD netbeans-java-9999_p20150113.ebuild 13429 SHA256 5e746642e87c71ff5d008ac6
 EBUILD netbeans-java-9999_p20150114.ebuild 13429 SHA256 6e4f432236b9140ed6b31ae70785789ae435a0c016b7b9b941ef69c514d7e01a SHA512 846b44d2288bd5ca85724a64482dda7027b5c4880ada24cab969f40fda9aa60ac1115211088bb7c252ccb05777b62e45ca6822147898baf69ca4571e1f4f644f WHIRLPOOL a7ce4d453ef01a38cf26f7b133a5689d3b0b145474428eb72a9aa2b203cc707622af008af102bf988b1e626c799257ca234cf126555f74410219ac914bec3644
 EBUILD netbeans-java-9999_p20150115.ebuild 13429 SHA256 8f9e798f3e957f9101c93da462653a7a00202797fbdbc6cc42256db285d0a768 SHA512 46e8254c4a64858737f6eab5c859c0098d9116ad51faf5612cb081a9228c554e679420bb29e0eb524662d13cadf82b2abacaacba838d9e7aec2af14b274e0bee WHIRLPOOL f6e4a2a90dd4df0888cea49a1e6c2a6df4abbc302f2f41df33cbda43f33ea0f2d52fe6df59d99fbeaf78900ef96d2925135999d5dd4d51c3b9b3fcb57d91370e
 EBUILD netbeans-java-9999_p20150116.ebuild 13429 SHA256 84777411b2c89454bd34bca29e88ebe458a494c3c3f194592f2e699067ac56ce SHA512 b85d782bc08200bf13c0c5b6600b96b2da5c75554b371aa76109b67fbcff5bc279a0503264603f65f0c923f1d96dace8e5c9ac5d24ce0ff1a36ae4758b2e43a8 WHIRLPOOL 7326cbab2a79367819df079a953d828360cdf30fb343a55c81377d26bde7d7d67ac920b67bbc59c0988d642b77c897b209c61ed055d3d49fd7f2a7ccf19e722a
-MISC ChangeLog 143806 SHA256 77ef5ad4ddde1db8599adcd94df75cf54553a8e405f4e905882b34174e211395 SHA512 302f4c48b6fa418cc3369eacaa68c2a30d66b7f9b91a9b53087df8194d4a95c00841fcf735362d4a3ea64adfb3e14b1ad41e639b2d1ddcabe0b47024b2403f99 WHIRLPOOL a54219224c82d758e5fe24518d973569ac885df70554594749ee5effef8c89977f65e833d3b21b0577243888ec1305c3bd393ce61d71443be902a9742bde02a0
+EBUILD netbeans-java-9999_p20150118.ebuild 13429 SHA256 611c6d83f5c8f23fea3bfe94602bf4237428962072c469bb2a23c6986ad9ea68 SHA512 08cfdc583d18122860ffdffba9a1b1820a2f6bc2fe959f56c803dd85a4779cb0a45df6b348b42e8fcc6b48590b25b35f06c1eeb9c09a192d27097753afeb8603 WHIRLPOOL 96f914f7b5dfc7f19bfb424016a7105c476936b2195ddb94a1f974a4e4ba2ea1f80cbdc7ae56d37037dbe1be3819042b9acfb097ecd8fd67b3061ff2f7208c6b
+MISC ChangeLog 143975 SHA256 b526bebbf6df6e0ffdeb1d8e09199c7429b5657548f0e4e3b2f439a6110a1d04 SHA512 cc3053cac47caafb39bad40a89d14a0efc8663f19948d872db686875d5b12c08d1067db35b51557dd6785d9b72f09364940ecd08a2e2bff6d4cc73cf027f9465 WHIRLPOOL 8c6323688d8c721b18d38af629bc36ebc2cdd66a327053732c81974442cf3d43fa6137b6c7657d209ead3e4641ab7c335f230487b8c1bfec824cb9cd82f67f75
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20150118.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20150118.ebuild
new file mode 100644
index 0000000..565cfb2
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20150118.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2015 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/2015-01-18_00-01-55/zip/netbeans-trunk-nightly-201501180001-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 3b0a977..1995a64 100644
--- a/dev-java/netbeans-javacard/ChangeLog
+++ b/dev-java/netbeans-javacard/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javacard-9999_p20150118 (18 Jan 2015)
+
+  18 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javacard-9999_p20150118.ebuild:
+  bumped to the latest sources
+
 *netbeans-javacard-9999_p20150116 (16 Jan 2015)
 
   16 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index 42e5831..2b91aea 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -48,6 +48,7 @@ DIST netbeans-trunk-nightly-201501130001-src.zip 201373370 SHA256 eb5fbabdcc6f24
 DIST netbeans-trunk-nightly-201501140001-src.zip 201400262 SHA256 65aef07f80d9cfe6b47ac2c3aa2be2f1d98a7d9466a44c5196cab7b88e743a2d SHA512 1175de97a824b8be65a5b25b20cfcd17ae4ab4b101794f7dbdde8059b7192f30193d634e63141a54e9e8c2018166f1f204d321270ba91959d450839b9e1fb89e WHIRLPOOL b5944d4eb663cda53d83f88a52775868cf942c632e5cae0be25970fde60557aa43f69095ddc0861eb872f815e562f6998a5873b8aae1c2c660ae8e8ade75b4c2
 DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6b3b7a2050181c2ec341fa33b031423a913141b9c76aa590044 SHA512 6cd0ff2334b892835c91ae0c0bcf996e2322673533f46cec0efa37db25837f809202de061696c737da837099179a1fe20ef7bd569f6c04375e6090a8c5757d4d WHIRLPOOL 82a9189ff14ac9f373d84346361b231bc7ef298be20892b7a76e20ba8fe3762055f11957f40ba914d939d650cf7f9b098604aae84d30622e207498a5ad14fa81
 DIST netbeans-trunk-nightly-201501160001-src.zip 201394511 SHA256 0a5e6e98692bceabdacc7ef41fe2b7fb59d9c879453982b2dc0e79d28f077714 SHA512 2a5be09537b1735e712ec373cc7f41b1e8b7753be5026ec3a1562d7347f4d5addf58bb9ea052051e0df2113e18a366e4095f84432dffb4b75b86b9ca913d3d56 WHIRLPOOL 7a8d35dcba4754cb809b8ac8710cbba8ba5452c4c4e13963a40e032b13241aa9b44328f3bbeea681bf535a31980e766331acaf5ae265bda5dd5790bda872d8dc
+DIST netbeans-trunk-nightly-201501180001-src.zip 201391445 SHA256 b1bf4373e5b799f830894b4ea7ab878ef09c64059758cebb2fa1b1a244718965 SHA512 bf1a40344c915a754f3b7baed759b6513e6a055bface5fe6c30c4e0adeb76fe7d2aaac5d344553ee5df505131cb05c7e2219c67514d4a962f681f9a39c685166 WHIRLPOOL f33d7bfe0174c7de81986a44578df8322fa8f2b46911e9f6fc05ffe8f0839e70b691d62ef9b6dc1b248aceb68760330ef69e86f026a83b6c0f27bcee3a4bc07b
 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
@@ -87,5 +88,6 @@ EBUILD netbeans-javacard-9999_p20150113.ebuild 4982 SHA256 7ae2e8bafcdc063e45e5c
 EBUILD netbeans-javacard-9999_p20150114.ebuild 4982 SHA256 6703de46d3d775df57d000bb7d17bc34c19b4c406f4c420a1eb92c622653728e SHA512 9714c2be9c6bfb797a2c4260b4bc72c4f7361896e2365f41d42823a948f4cdeae8291caa0502b596349bac2f9ce47a3d0faf1f42022bce2a35597ef23deb55b8 WHIRLPOOL 1d863c9749042f12a54f00d710fd004e06ae4b854493b66607b2c97502fb5aafa8e2b606950b49ef63798d658213ac0f5fbbd95e127db90aeb043055bb0febf3
 EBUILD netbeans-javacard-9999_p20150115.ebuild 4982 SHA256 f991980471a8e396fb289967836a65c33167e77a3800cd9b83944a017ce691a6 SHA512 b390b136467507b76f448039f5be9f4a75ca027c89734e09cc93844c4e9d9c496e9fccbadcb928c7f0a39612bb1a42b1bf18a07d2381a9eb64d40cddbc727d0e WHIRLPOOL b5e6570eec78886d3717d53416e4a4568b332ce2a29d9cee778769fb56d92eccf495bf97cb9c1a271ff9efea550c424b59ed189c1d49a0aea9b08991738f52d9
 EBUILD netbeans-javacard-9999_p20150116.ebuild 4982 SHA256 0cb0051b965d98164b2a986b2327fb3b8ef6286c5e4e4d3b43947f25dbbcc9f8 SHA512 a3d9267162df1acc11c1ee649c7fbc3cb8d001d6fb33d93c010e48f3f767a3cafa601e03940e411180c9b1221bd4e5bc81051414b32b59c700a417f9d385e4c5 WHIRLPOOL 8a9d4d49c10a19203d1fcbd37627e75bf043ae2e7d7bcfb099b7054fe8f025536552b5368cf04d8711b234f075df0fd108a4c475723cee8e309a153bb9ab2107
-MISC ChangeLog 149930 SHA256 a3a3307388417142018e55238b435c6680a557f826251c73a3f93f238bf1e975 SHA512 a7e7851e3d9ea49fc94d2394df3f81753b2525295fe2ec00673d07b489d602d5a8ca92b8305602b4650144a913ff2cf68668fde3b5e8e6e3000bab47a21e1011 WHIRLPOOL bf91b1747cd754660ad54e23ab25d40801ae56e3133f688ad9b07ab00d4b06403bff0aa2a0398247643ce001194bd45e4757e848233b2ae8e978b1bcb828db4c
+EBUILD netbeans-javacard-9999_p20150118.ebuild 4982 SHA256 c95b66b489d8c45a5a26d5caaed9103c4e1eab3026d93e978ba9fa9fc1e34a5b SHA512 8a81fdf2067c6604115e42ecf11556ad75ab6025fc47286e8a4bbc89a0eb83eb45365bd4176610beb646ae2d2ce2d0297c4902de15e4d55537afa730add50f2a WHIRLPOOL 359fce96adcb4f6ec4205c9e816adce2271d4356cf3247ad596e9105f891ee44c861df45305d6951da1fc1777ad9647a6b3e271450c7298855bd4048c4bce467
+MISC ChangeLog 150107 SHA256 0af536a85263b8f214eab6a1f8b0bdfc815677b05b09a3cc57324ea665d44914 SHA512 d1ba9f3e293cb6e3f38154129a1b5d750d4c0b8d75a1fd55519fb75a0d88bc676f523dc4f8cd111a93c6872c162ec201681f2c15da94adfd3d97733efd14c631 WHIRLPOOL f35426db2f7abcb69c5515557e9bbb6b361bfe4509080173a1841d653477747117cbaccec7d1e63e4414b3c0aceca3fece7e867d41a47ce733ce205e7fa902d7
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150118.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150118.ebuild
new file mode 100644
index 0000000..678864a
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150118.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2015 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/2015-01-18_00-01-55/zip/netbeans-trunk-nightly-201501180001-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 db6a32e..02a930a 100644
--- a/dev-java/netbeans-javadoc/ChangeLog
+++ b/dev-java/netbeans-javadoc/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javadoc-9999_p20150118 (18 Jan 2015)
+
+  18 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javadoc-9999_p20150118.ebuild:
+  bumped to the latest sources
+
 *netbeans-javadoc-9999_p20150116 (16 Jan 2015)
 
   16 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index 332b4bf..54a6316 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -51,6 +51,7 @@ DIST netbeans-trunk-nightly-201501130001-src.zip 201373370 SHA256 eb5fbabdcc6f24
 DIST netbeans-trunk-nightly-201501140001-src.zip 201400262 SHA256 65aef07f80d9cfe6b47ac2c3aa2be2f1d98a7d9466a44c5196cab7b88e743a2d SHA512 1175de97a824b8be65a5b25b20cfcd17ae4ab4b101794f7dbdde8059b7192f30193d634e63141a54e9e8c2018166f1f204d321270ba91959d450839b9e1fb89e WHIRLPOOL b5944d4eb663cda53d83f88a52775868cf942c632e5cae0be25970fde60557aa43f69095ddc0861eb872f815e562f6998a5873b8aae1c2c660ae8e8ade75b4c2
 DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6b3b7a2050181c2ec341fa33b031423a913141b9c76aa590044 SHA512 6cd0ff2334b892835c91ae0c0bcf996e2322673533f46cec0efa37db25837f809202de061696c737da837099179a1fe20ef7bd569f6c04375e6090a8c5757d4d WHIRLPOOL 82a9189ff14ac9f373d84346361b231bc7ef298be20892b7a76e20ba8fe3762055f11957f40ba914d939d650cf7f9b098604aae84d30622e207498a5ad14fa81
 DIST netbeans-trunk-nightly-201501160001-src.zip 201394511 SHA256 0a5e6e98692bceabdacc7ef41fe2b7fb59d9c879453982b2dc0e79d28f077714 SHA512 2a5be09537b1735e712ec373cc7f41b1e8b7753be5026ec3a1562d7347f4d5addf58bb9ea052051e0df2113e18a366e4095f84432dffb4b75b86b9ca913d3d56 WHIRLPOOL 7a8d35dcba4754cb809b8ac8710cbba8ba5452c4c4e13963a40e032b13241aa9b44328f3bbeea681bf535a31980e766331acaf5ae265bda5dd5790bda872d8dc
+DIST netbeans-trunk-nightly-201501180001-src.zip 201391445 SHA256 b1bf4373e5b799f830894b4ea7ab878ef09c64059758cebb2fa1b1a244718965 SHA512 bf1a40344c915a754f3b7baed759b6513e6a055bface5fe6c30c4e0adeb76fe7d2aaac5d344553ee5df505131cb05c7e2219c67514d4a962f681f9a39c685166 WHIRLPOOL f33d7bfe0174c7de81986a44578df8322fa8f2b46911e9f6fc05ffe8f0839e70b691d62ef9b6dc1b248aceb68760330ef69e86f026a83b6c0f27bcee3a4bc07b
 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
@@ -90,5 +91,6 @@ EBUILD netbeans-javadoc-9999_p20150113.ebuild 6234 SHA256 d79635390b42ddb6223575
 EBUILD netbeans-javadoc-9999_p20150114.ebuild 6234 SHA256 a73534d92bbf49398e11628079e621c49cb5a58a918a5edb5c997b3311d9bbdf SHA512 b4bf0b9e8ea52e90e98132464cb7d37d48b1bc9a6d1d3132b18d35a0becf8495f6d8dd11d51202a69792b5b22a6fa4a65425db61919780e9a4ed51f12c4b4400 WHIRLPOOL e4d667b18d47801e7d45ccb1f2998128a1b193740e87030174867768358896ebb27bd1471753a399edfadb41c1b795619df6c5cb9c4f0183c6f6d4dfa5195a71
 EBUILD netbeans-javadoc-9999_p20150115.ebuild 6234 SHA256 9bb821fafc961a68a3cdd0c82c42efaba802c8f8c2e535355661bc659b90b18c SHA512 4ed440a75ba374cc8460715d4abd0e6d57bb6780edf9057f04fc645c172bc37dd4865472cd7546dbc65e894120fc787e4021d8c1023561e855f436a9a5505280 WHIRLPOOL 9ec6b27d47082326f74546478920dcbff019efc86d64bacd6f56a89b5c97275824bbfab40d1351b9749c1d3b648f0eea563f95c315798a4018c860d0d72c859c
 EBUILD netbeans-javadoc-9999_p20150116.ebuild 6234 SHA256 53365a599b58eb3d715b537a15fa6b8a3f164299c8e57ad501a3b572305f970b SHA512 d2cf1c4b4e6a6cb84149e5aa89a860f59d0e41ff9736c9219953ed1e9b273a3c76a33b5f7d029855c2312aff689466e4779cb0fc66d6237d7e7f6409b927df70 WHIRLPOOL 914cd995256470301b884f447dcce901e9cbe53ca5a151a607548b82e5d2aefc2b9f5fa45d6fde854803ae2fd1299b669088948b751a5ec12c01da4d4db13415
-MISC ChangeLog 147900 SHA256 661418da639abd91e106b348c5e7ec2fba9baa735d70dfca8764a5a10a865566 SHA512 d7020b4e4226496cab037ab9c033260cdfc5dc715c8b73e7b56a1c1665bbd87087dd1dfab24d8482f6c1436b2b37568455b3fd69a4e9c69cd7d77eef815e2b19 WHIRLPOOL f05b593de12f3252681b50d635326d359549e3f80d2df80dabb328db7447f7dbeb453f70d8fbc31f8a9aeebdbeea7784fc7f221697b3e78be37f3ce4b7bad090
+EBUILD netbeans-javadoc-9999_p20150118.ebuild 6234 SHA256 521289b829609fe6098b51496c5b70440d4a991b3136d9d2462ccaca453209a6 SHA512 92a95f2a97fd11165c8939bf731ce8ec04310d5e56ea8a5e7ff55877272457dc88cdbcc4ce3400b4e77891603f8e559aae833108a488da0b26a38227db276a34 WHIRLPOOL aa559c5a51cd023d72e30045f116bdfd51e7eb5283997297fe6c2080d1d3e438c63581b54b4c9dbe885e3684284d43575bf76bfb1cc1121a1d73284416446ca4
+MISC ChangeLog 148075 SHA256 2e814c1487b71558ef673d24f12527b63053806333e28cf7bc385c68085894d1 SHA512 7dd034595ff4ff444fb45684cdf31859e5236af646586f877e48fdb14f0adba11f3e5d1c9b4a397dfc0e72144e9bd9ae6567f835c2397998e9dfa74a130cc879 WHIRLPOOL ac2c5dab5867b197f24235628327782c8911081a8d7b091bbf83e240383f2042f7a70e6fbf30b28d88779ee6d3c33c389c9228936dd6c89b2d1a47ca7e0c7caf
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150118.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150118.ebuild
new file mode 100644
index 0000000..8a63bfe
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150118.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2015 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/2015-01-18_00-01-55/zip/netbeans-trunk-nightly-201501180001-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 15f17b9..d9a01c0 100644
--- a/dev-java/netbeans-javafx/ChangeLog
+++ b/dev-java/netbeans-javafx/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javafx-9999_p20150118 (18 Jan 2015)
+
+  18 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javafx-9999_p20150118.ebuild:
+  bumped to the latest sources
+
 *netbeans-javafx-9999_p20150116 (16 Jan 2015)
 
   16 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index 900868a..0aab245 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -50,6 +50,7 @@ DIST netbeans-trunk-nightly-201501130001-src.zip 201373370 SHA256 eb5fbabdcc6f24
 DIST netbeans-trunk-nightly-201501140001-src.zip 201400262 SHA256 65aef07f80d9cfe6b47ac2c3aa2be2f1d98a7d9466a44c5196cab7b88e743a2d SHA512 1175de97a824b8be65a5b25b20cfcd17ae4ab4b101794f7dbdde8059b7192f30193d634e63141a54e9e8c2018166f1f204d321270ba91959d450839b9e1fb89e WHIRLPOOL b5944d4eb663cda53d83f88a52775868cf942c632e5cae0be25970fde60557aa43f69095ddc0861eb872f815e562f6998a5873b8aae1c2c660ae8e8ade75b4c2
 DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6b3b7a2050181c2ec341fa33b031423a913141b9c76aa590044 SHA512 6cd0ff2334b892835c91ae0c0bcf996e2322673533f46cec0efa37db25837f809202de061696c737da837099179a1fe20ef7bd569f6c04375e6090a8c5757d4d WHIRLPOOL 82a9189ff14ac9f373d84346361b231bc7ef298be20892b7a76e20ba8fe3762055f11957f40ba914d939d650cf7f9b098604aae84d30622e207498a5ad14fa81
 DIST netbeans-trunk-nightly-201501160001-src.zip 201394511 SHA256 0a5e6e98692bceabdacc7ef41fe2b7fb59d9c879453982b2dc0e79d28f077714 SHA512 2a5be09537b1735e712ec373cc7f41b1e8b7753be5026ec3a1562d7347f4d5addf58bb9ea052051e0df2113e18a366e4095f84432dffb4b75b86b9ca913d3d56 WHIRLPOOL 7a8d35dcba4754cb809b8ac8710cbba8ba5452c4c4e13963a40e032b13241aa9b44328f3bbeea681bf535a31980e766331acaf5ae265bda5dd5790bda872d8dc
+DIST netbeans-trunk-nightly-201501180001-src.zip 201391445 SHA256 b1bf4373e5b799f830894b4ea7ab878ef09c64059758cebb2fa1b1a244718965 SHA512 bf1a40344c915a754f3b7baed759b6513e6a055bface5fe6c30c4e0adeb76fe7d2aaac5d344553ee5df505131cb05c7e2219c67514d4a962f681f9a39c685166 WHIRLPOOL f33d7bfe0174c7de81986a44578df8322fa8f2b46911e9f6fc05ffe8f0839e70b691d62ef9b6dc1b248aceb68760330ef69e86f026a83b6c0f27bcee3a4bc07b
 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
@@ -88,5 +89,6 @@ EBUILD netbeans-javafx-9999_p20150113.ebuild 4723 SHA256 d7da0d3306879e7b28aacec
 EBUILD netbeans-javafx-9999_p20150114.ebuild 4723 SHA256 d359afa5415e77a71f7df856dad130d06bf16b816ba68854ef910f06479c9d98 SHA512 b15111249e72b485322fe03814884242b21e8fd250425946d7383619609ceed6c8b50418cb4b5a74ee5ea1ca0f9b2de1ccfb5d17ad2c956ba01ae1c8c232250c WHIRLPOOL 016829bb885b039484fbc9c5dda0e6b9bcdfa3af8065bb663aea0368660178716a3f5a831355c07b16cd828999099834682a695d1baba5c2a76655422cafaafd
 EBUILD netbeans-javafx-9999_p20150115.ebuild 4723 SHA256 5354f5e69334a2f6989aa7e6c6227eae7a3d007b168686f5205a22c678f76516 SHA512 dc261bd23b9a7e014c425e0afd13d58584132543b05721a08188f393c560db28e4aa4959c0d59a1970eed1961410804510f40b5d625a1ec4d7c0214993f11ac4 WHIRLPOOL 20f256da511cbc50df32ac9d1d226f9ca0c8357b91f4a64a44fac81915c47f0d162e1a8b0fe612584551069f3e30ede4afaaab3bd11a081b683f8c4ad81e41a5
 EBUILD netbeans-javafx-9999_p20150116.ebuild 4723 SHA256 63f49967b2218fd37554ba16317ce7781c67a6f63c29b2932caaf96995e0e892 SHA512 41c75c5187ab0fb127e40f9b8fa3f05bc4021a4a65b43b5750d8ce8ceab602062d0354b5edaf0bc4c8c216f063ccb55853fbd09de9f5ef8a3d09fcd9bdd8f3da WHIRLPOOL 45eb0c5cc0c0c427b1b1f2f479c21d2cafc88edb8f8838912fb71f0bb1a73f132c7ee80629b73ffa745a5b1f1b994da714420a02719fd9432074e8690ace7495
-MISC ChangeLog 132737 SHA256 6d1275b84496a399e2b41f02eba6f093ba34e498990f824b0e4d4ba56738a88f SHA512 3d148a2d7ed4e3a8d316518620bb2c2f734bdd95090d37d18d30c00451e91855408c5f60e40876473deb1dce36276b8c60a54b00246340b4fb67d2d156889ed8 WHIRLPOOL a8a3bbe306734ca74a7a8621138874ef2d836daeee5e44eab31ed89a3f6cd2ebd9a8589c19e412b4e03da0524712e48bf6d8634c04b2c51aee62f5a2fcc4cf2a
+EBUILD netbeans-javafx-9999_p20150118.ebuild 4723 SHA256 2efdf04bd6892ec153f459e98684f130e81d2482e5f6333ea19f7f2c898e09f7 SHA512 693ca81e085ded76351a67553bb33a77b3cb2c894191695c47374b2308728a80588ee07aa50b9e17cc3303f11343a7735844d112f951dbee35c91ea1326ca155 WHIRLPOOL eb6f0f8bcef73bfc76c4fd92fe47fe5017b2cc7d826b5b33895deb257237f960c43552e41677433756d2a17f92f9cb508523d7a30dfcd19313bd078d23170e5e
+MISC ChangeLog 132910 SHA256 fabba7f82db3353bea1581160e2a145fd542acaa166040e81943c3e32da41bc5 SHA512 7a3da84e48e7b4cfeff2e4478f5051ef269a568c79ced52b0e084809899d97e7b353023db0d9e2273d46f54a34e355d10e92abb7b9242253d0875edfef888408 WHIRLPOOL a632125b9009035295ee6dbd55fcbad01008268a2f5fc04713517c42fa4986deb9a94ad7a54ae64d7155576b1e53b5ddaf702dcbfe09c3f1261da94637417a0f
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150118.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150118.ebuild
new file mode 100644
index 0000000..f776021
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150118.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2015 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/2015-01-18_00-01-55/zip/netbeans-trunk-nightly-201501180001-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 c5eb716..56c273d 100644
--- a/dev-java/netbeans-mobility/ChangeLog
+++ b/dev-java/netbeans-mobility/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-mobility-9999_p20150118 (18 Jan 2015)
+
+  18 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-mobility-9999_p20150118.ebuild:
+  bumped to the latest sources
+
 *netbeans-mobility-9999_p20150116 (16 Jan 2015)
 
   16 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 19e9434..2e2b26f 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -54,6 +54,7 @@ DIST netbeans-trunk-nightly-201501130001-src.zip 201373370 SHA256 eb5fbabdcc6f24
 DIST netbeans-trunk-nightly-201501140001-src.zip 201400262 SHA256 65aef07f80d9cfe6b47ac2c3aa2be2f1d98a7d9466a44c5196cab7b88e743a2d SHA512 1175de97a824b8be65a5b25b20cfcd17ae4ab4b101794f7dbdde8059b7192f30193d634e63141a54e9e8c2018166f1f204d321270ba91959d450839b9e1fb89e WHIRLPOOL b5944d4eb663cda53d83f88a52775868cf942c632e5cae0be25970fde60557aa43f69095ddc0861eb872f815e562f6998a5873b8aae1c2c660ae8e8ade75b4c2
 DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6b3b7a2050181c2ec341fa33b031423a913141b9c76aa590044 SHA512 6cd0ff2334b892835c91ae0c0bcf996e2322673533f46cec0efa37db25837f809202de061696c737da837099179a1fe20ef7bd569f6c04375e6090a8c5757d4d WHIRLPOOL 82a9189ff14ac9f373d84346361b231bc7ef298be20892b7a76e20ba8fe3762055f11957f40ba914d939d650cf7f9b098604aae84d30622e207498a5ad14fa81
 DIST netbeans-trunk-nightly-201501160001-src.zip 201394511 SHA256 0a5e6e98692bceabdacc7ef41fe2b7fb59d9c879453982b2dc0e79d28f077714 SHA512 2a5be09537b1735e712ec373cc7f41b1e8b7753be5026ec3a1562d7347f4d5addf58bb9ea052051e0df2113e18a366e4095f84432dffb4b75b86b9ca913d3d56 WHIRLPOOL 7a8d35dcba4754cb809b8ac8710cbba8ba5452c4c4e13963a40e032b13241aa9b44328f3bbeea681bf535a31980e766331acaf5ae265bda5dd5790bda872d8dc
+DIST netbeans-trunk-nightly-201501180001-src.zip 201391445 SHA256 b1bf4373e5b799f830894b4ea7ab878ef09c64059758cebb2fa1b1a244718965 SHA512 bf1a40344c915a754f3b7baed759b6513e6a055bface5fe6c30c4e0adeb76fe7d2aaac5d344553ee5df505131cb05c7e2219c67514d4a962f681f9a39c685166 WHIRLPOOL f33d7bfe0174c7de81986a44578df8322fa8f2b46911e9f6fc05ffe8f0839e70b691d62ef9b6dc1b248aceb68760330ef69e86f026a83b6c0f27bcee3a4bc07b
 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
@@ -93,5 +94,6 @@ EBUILD netbeans-mobility-9999_p20150113.ebuild 4418 SHA256 3b0c1c8080846219d3864
 EBUILD netbeans-mobility-9999_p20150114.ebuild 4418 SHA256 a0356a0a2011216022bfc9b546a390dcf79798ec6aa09393508ac3398365d248 SHA512 0aa2aafa2b5f8a48ac4e4f16505c12b8b9c2ececb78f008069277d35625386ecb97b2995550190fdd0f96185b1104844ccab9b40673cf7129efe623a7f8a6812 WHIRLPOOL 905c35236fa1f66deca8097521c0456d383d3de52077bd69070e1cedcf0bcada66a457c3903f56b902e25033e47ab2702061a0a39bb63cd16e6663d37f13abf2
 EBUILD netbeans-mobility-9999_p20150115.ebuild 4418 SHA256 d6ef4aef261e28e40e0757eb8d451dc877f9e55cefb7d86dbfa5842945a9782e SHA512 ef0a1489ffb12e687cc5448fbacb277c3f25e7ce9a401056ad568bafbbb1a356c7f261347ef0a48a84a7a8775693bea65a3df16760c018df15709ba70b8e648a WHIRLPOOL 1c994a95cee1e9eed5c3424d6131912534114de3d0f038e690355ce7ae207c08c5777d6602c23a9d17a9a8f39f969c546307f6f8f1232703c3a55f486a32d036
 EBUILD netbeans-mobility-9999_p20150116.ebuild 4418 SHA256 e12cb3cd50d7068f19a4dae8a8d7f7c4fe47a16a3d1936c82828bb12a5988616 SHA512 b4769f05709c9e9eb448cd876ae0f83e442036b65f8440d29015ae384b3a088b9626d9a0825dd3937cb86fbc09f5dd01ecfa8649d8046f2fdb08a300f1a95133 WHIRLPOOL 4c522ae1fa0eb1557104a5f69618f6bd8f95f3c0d1954fe9c26fdc4f693b389039a28e26ed5cbffa7b9634458f9021827cc703f2ec20407733101e07ca38094b
-MISC ChangeLog 150071 SHA256 614740f15e7d27417c8622e72251f4672bebec19c6ef20ee1153f36732a5c3bd SHA512 9eeda5032b551abcbc83e8e76fe41f141d2781e16e4314ef6f867686099cef1728aaa64fd671bd6f5b8878decad87c1315097fbe814863123303037baeac1709 WHIRLPOOL 1150b2c8939e8c3e53304cf61e3d72cb72f68027a1a957b011ef074dace6a00033d0deee6c5d3c76dc3b706333c5ef1eb049aca567e24fa751e2230d2622ac3e
+EBUILD netbeans-mobility-9999_p20150118.ebuild 4418 SHA256 c3dd3881bfebe3a69015260d7cfff93fdda8b7186fdfed738a1a44dd60281504 SHA512 efa64491f54d4e4c51639bb949d57d25a0413be71752e062cfcaec7382abe2dd4ced5754513eba25efbccc9fc7833aef1c41948ef16f545945df81a84fc00d72 WHIRLPOOL 51ec29a6fa004a5990af9878b492ad53a0dc83faf6e308cf5d9f4f53e30d1b09ec3b870c1a68c8a894e5f2452d82ed12e46823f3a78f3f5febafa6debaf9d527
+MISC ChangeLog 150248 SHA256 560edd8003efa2b82f69f46cd8f1d887e0e98946f38f7ad63a33573ea46d0266 SHA512 3568505cdb6d45dcb0a7cb8f533bfee5305dd2a17aaf5a789bc34a72d52d531acd8c79fdd7e796bf09a13af8b0a5638c3bb7d5595c95daa4a7717dd6eda2f78d WHIRLPOOL 105a3b57c1b78bfe6604dc392fac0b39e0164a1ef4123b79ae620017e4d66a645673449a1571e9e252876929a1e9833a95bba4807e700f42a4af27ec62db093f
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150118.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150118.ebuild
new file mode 100644
index 0000000..2f59c50
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150118.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2015 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/2015-01-18_00-01-55/zip/netbeans-trunk-nightly-201501180001-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 0d01ace..08b1b21 100644
--- a/dev-java/netbeans-nb/ChangeLog
+++ b/dev-java/netbeans-nb/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-nb-9999_p20150118 (18 Jan 2015)
+
+  18 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-nb-9999_p20150118.ebuild:
+  bumped to the latest sources
+
 *netbeans-nb-9999_p20150116 (16 Jan 2015)
 
   16 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index 9bc7de3..ab9ac1a 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -53,6 +53,7 @@ DIST netbeans-trunk-nightly-201501130001-src.zip 201373370 SHA256 eb5fbabdcc6f24
 DIST netbeans-trunk-nightly-201501140001-src.zip 201400262 SHA256 65aef07f80d9cfe6b47ac2c3aa2be2f1d98a7d9466a44c5196cab7b88e743a2d SHA512 1175de97a824b8be65a5b25b20cfcd17ae4ab4b101794f7dbdde8059b7192f30193d634e63141a54e9e8c2018166f1f204d321270ba91959d450839b9e1fb89e WHIRLPOOL b5944d4eb663cda53d83f88a52775868cf942c632e5cae0be25970fde60557aa43f69095ddc0861eb872f815e562f6998a5873b8aae1c2c660ae8e8ade75b4c2
 DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6b3b7a2050181c2ec341fa33b031423a913141b9c76aa590044 SHA512 6cd0ff2334b892835c91ae0c0bcf996e2322673533f46cec0efa37db25837f809202de061696c737da837099179a1fe20ef7bd569f6c04375e6090a8c5757d4d WHIRLPOOL 82a9189ff14ac9f373d84346361b231bc7ef298be20892b7a76e20ba8fe3762055f11957f40ba914d939d650cf7f9b098604aae84d30622e207498a5ad14fa81
 DIST netbeans-trunk-nightly-201501160001-src.zip 201394511 SHA256 0a5e6e98692bceabdacc7ef41fe2b7fb59d9c879453982b2dc0e79d28f077714 SHA512 2a5be09537b1735e712ec373cc7f41b1e8b7753be5026ec3a1562d7347f4d5addf58bb9ea052051e0df2113e18a366e4095f84432dffb4b75b86b9ca913d3d56 WHIRLPOOL 7a8d35dcba4754cb809b8ac8710cbba8ba5452c4c4e13963a40e032b13241aa9b44328f3bbeea681bf535a31980e766331acaf5ae265bda5dd5790bda872d8dc
+DIST netbeans-trunk-nightly-201501180001-src.zip 201391445 SHA256 b1bf4373e5b799f830894b4ea7ab878ef09c64059758cebb2fa1b1a244718965 SHA512 bf1a40344c915a754f3b7baed759b6513e6a055bface5fe6c30c4e0adeb76fe7d2aaac5d344553ee5df505131cb05c7e2219c67514d4a962f681f9a39c685166 WHIRLPOOL f33d7bfe0174c7de81986a44578df8322fa8f2b46911e9f6fc05ffe8f0839e70b691d62ef9b6dc1b248aceb68760330ef69e86f026a83b6c0f27bcee3a4bc07b
 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
@@ -92,5 +93,6 @@ EBUILD netbeans-nb-9999_p20150113.ebuild 5013 SHA256 2191d51222749b3bb5332d11699
 EBUILD netbeans-nb-9999_p20150114.ebuild 5013 SHA256 ed135fc7e3f9490f201fd2f473d9be8858961ab369556988167cabab44bf39a7 SHA512 bc551e1e0433a4e02cf71426409f4c41ea34b693dbbd968d578e3e7efd666cbe31cb9d90bb75f841916174c78c55e55a430067c73e0a95027abbd7ebafadf268 WHIRLPOOL 86cc7c7a9cf8722572e7d7d89df496f5a464273ab4a188fa09c85c7434bffc21c66fb11a2ef564a63c438c49f33e3124cc30488b1ae54247eb48de29be24fd9b
 EBUILD netbeans-nb-9999_p20150115.ebuild 5013 SHA256 103a0cfbd35f674f55c41196e6410dc3884aef3263bb8c4aa1e5d5f023374af5 SHA512 7db94f851a055a679a30e8d68e0667f1f2ec7821536f5d2de2618ba32f89d9ad4145f53c22c3ad36f850c2a66fa36c08f987251bc2aa40aeafe87cdb6940d52b WHIRLPOOL 82b40ce9a9ed35e14207b03c1fcfdaa02994c5628bc8284df563506cf5092cf58375078a22f11d71146cef1cd1ab5954c9bf50bf016ca138b2ec030a07a12873
 EBUILD netbeans-nb-9999_p20150116.ebuild 5013 SHA256 c26f290012171c53491cfb559ec705cc7a8e3e93d61d19c0ca941b6a3ba8ee28 SHA512 0cee6db475842b2a539fe6f46429867f27aaeb22efb863835f982af9cbf883a4bcbc26f72d77595790eb4a67337be28addace80d291eb75f78c9a4dd6fa969ca WHIRLPOOL 2f8808e16ff24d402a302e79e9c85a3960f561516f98edc91530d896657867108c72f469977fc91c267f03701b053a215ea400a16129f53116c3c8b77e5dbd3f
-MISC ChangeLog 139184 SHA256 b93774b7a0887d576418f840f23e622094d491bcf6367217deb306b70886bd5f SHA512 c2eb94bffca447d0037c8c1a40280561035c1ceb3f52362320df74c318a07ba1367fba3aa0d61b1c6a52880f7b5e4b6ceb9ddc602c01d529ff15944ab6961d99 WHIRLPOOL 4803ffef0250aee05d5ec6ad3d8464735e9aa28385b3bf99c3d58ce1b2c18e621a734890b603d34d474446da7383a435f540ea10055ee0d3f84ce5509bbba8db
+EBUILD netbeans-nb-9999_p20150118.ebuild 5013 SHA256 8f83adc6636fb2ce02f54e7c6e65022308364a98bf9628a034927adeeb8e1caf SHA512 246bd1380b8a9c28e382478bed3630a7ece971dc8ea6c2a7e20340e30e357c9b832bc1c72edd9d884b8f2988e8840637a7969e295e27710001ed8a72f8ce05ad WHIRLPOOL 1c9a6b65bbe6d568c13f4afefba4419c7c2b67e5fb2b830d6e9c34bf4270daf627e1888f0dbedeb995746b6b8d24b258effd33c26355eaf4488fc2330c769246
+MISC ChangeLog 139349 SHA256 cb3ccdfd36e4903093444bf69dc9f88ba31f38ecdca5c919def5cb66bcb06f51 SHA512 882ad66ce79001eefed3e7928315eeb35b1e923d71c24549864571b4e2e5b32124204f8e2c06247446bdbfaaf502ef191128e1bca55993eca1899cec47e871ca WHIRLPOOL 48bc6cb59de06605b88f2b89f4c517ea4675cc7f6ba3e12714510c4cd36fbf4efa21bfdb0ef702b9bfa97927e535f42771055953e42a739dbc3f52ecf58408ee
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20150118.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20150118.ebuild
new file mode 100644
index 0000000..e62e21b
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20150118.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2015 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/2015-01-18_00-01-55/zip/netbeans-trunk-nightly-201501180001-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 d913c43..687c597 100644
--- a/dev-java/netbeans-php/ChangeLog
+++ b/dev-java/netbeans-php/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-php-9999_p20150118 (18 Jan 2015)
+
+  18 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-php-9999_p20150118.ebuild:
+  bumped to the latest sources
+
 *netbeans-php-9999_p20150116 (16 Jan 2015)
 
   16 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index 4b422b9..0a4a7e3 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -56,6 +56,7 @@ DIST netbeans-trunk-nightly-201501130001-src.zip 201373370 SHA256 eb5fbabdcc6f24
 DIST netbeans-trunk-nightly-201501140001-src.zip 201400262 SHA256 65aef07f80d9cfe6b47ac2c3aa2be2f1d98a7d9466a44c5196cab7b88e743a2d SHA512 1175de97a824b8be65a5b25b20cfcd17ae4ab4b101794f7dbdde8059b7192f30193d634e63141a54e9e8c2018166f1f204d321270ba91959d450839b9e1fb89e WHIRLPOOL b5944d4eb663cda53d83f88a52775868cf942c632e5cae0be25970fde60557aa43f69095ddc0861eb872f815e562f6998a5873b8aae1c2c660ae8e8ade75b4c2
 DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6b3b7a2050181c2ec341fa33b031423a913141b9c76aa590044 SHA512 6cd0ff2334b892835c91ae0c0bcf996e2322673533f46cec0efa37db25837f809202de061696c737da837099179a1fe20ef7bd569f6c04375e6090a8c5757d4d WHIRLPOOL 82a9189ff14ac9f373d84346361b231bc7ef298be20892b7a76e20ba8fe3762055f11957f40ba914d939d650cf7f9b098604aae84d30622e207498a5ad14fa81
 DIST netbeans-trunk-nightly-201501160001-src.zip 201394511 SHA256 0a5e6e98692bceabdacc7ef41fe2b7fb59d9c879453982b2dc0e79d28f077714 SHA512 2a5be09537b1735e712ec373cc7f41b1e8b7753be5026ec3a1562d7347f4d5addf58bb9ea052051e0df2113e18a366e4095f84432dffb4b75b86b9ca913d3d56 WHIRLPOOL 7a8d35dcba4754cb809b8ac8710cbba8ba5452c4c4e13963a40e032b13241aa9b44328f3bbeea681bf535a31980e766331acaf5ae265bda5dd5790bda872d8dc
+DIST netbeans-trunk-nightly-201501180001-src.zip 201391445 SHA256 b1bf4373e5b799f830894b4ea7ab878ef09c64059758cebb2fa1b1a244718965 SHA512 bf1a40344c915a754f3b7baed759b6513e6a055bface5fe6c30c4e0adeb76fe7d2aaac5d344553ee5df505131cb05c7e2219c67514d4a962f681f9a39c685166 WHIRLPOOL f33d7bfe0174c7de81986a44578df8322fa8f2b46911e9f6fc05ffe8f0839e70b691d62ef9b6dc1b248aceb68760330ef69e86f026a83b6c0f27bcee3a4bc07b
 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
@@ -95,5 +96,6 @@ EBUILD netbeans-php-9999_p20150113.ebuild 4423 SHA256 026a382552a0801c52d106224f
 EBUILD netbeans-php-9999_p20150114.ebuild 4423 SHA256 86e0f51b97364e8ab308d3ef5e555745ef64e888e16705cd8d53634eab5722e9 SHA512 0cad5fff67645e92066008139c705217a0ad14efdbfd35fba928166466b513de99d03de171770d758ef5fa8c77f7dbd22f49b935dec6c23f2ba69742c321fb4a WHIRLPOOL ee6eb00272d5f4a3c670c22adc23899b0d66638cfcfb45e79a85b3de29c8927dff0bdd2fba421f6d8329a46422ad966bd3dfa6a920e19ad44adc5f91079d6a6d
 EBUILD netbeans-php-9999_p20150115.ebuild 4423 SHA256 d2086c51e219a41ce60cf68e7119b0fd0117360da9fa2eb3f1e337425fe2a8ff SHA512 a177a1189a5e757df359db84bbc928111363816d9ec70ef41dd77f8063e10701cfaf9652852db001d6eb945336c958cfed66be676046863f70655e1d0cf052c6 WHIRLPOOL d0a67b052d50e9b0f0549a2d1c7b04e03a0a228a18773b30b25f0746d7b92495b8df615f3abd31609be4857a5bbfbd12b48c0e1c878e42de55fd304942095dbc
 EBUILD netbeans-php-9999_p20150116.ebuild 4423 SHA256 1fb33578bd88f2cd8fe8a5d9f6a2b31f656ca564a9636adad3a203dc0ed7dce9 SHA512 165dfcca55da8d7bdbbabd52aece82c430337b7fda701069f1b620c3f80fdf5d51296b5de40984740345046b4c5baab0de2c243d7083b4a08acb5a11e05d8224 WHIRLPOOL 896f667876e2ca186d0fc20ab53dda6335cb61a4c30561cc2b8e79973ab400e8140d29c82d37ff21758547ac7b4fc093ce564634a20f6884e31eb3844a9e29b6
-MISC ChangeLog 140005 SHA256 da15289a0b4481a2baade0b1f6805684d6d00120cb336b1481444d82ce589b6a SHA512 2c6ed4d60789a8abb6728c444de7c3b28682e66007e7ccdde685dbc833e6a16785124401dc98cb1e6cd5a494e899e0b9103cf72247eede13527497b6be15ef20 WHIRLPOOL 82ca93522252f24ed59f3823a9d6cc8d5496506ee38f2a75947add9b061ab56bddd8dd26afa459cbe65a6cab11dc0fcaef3864ee23702fdbeef69c82f35932af
+EBUILD netbeans-php-9999_p20150118.ebuild 4423 SHA256 8f63409287fe2fc821fb23a73deb8df7c3ddf6c4882edf4e54f59167ad38e8b5 SHA512 72ded40ccb7dab63954e3dcf4653634733c54c2f03f90c3398b273d4ee32ad9a348b2cb14e756b5774544d8bab897f5244955d7601743d510ad2239e9fd796c0 WHIRLPOOL 6f080a0b973585b081ce7be6bd0f760b7a69dcce590a6033ab9c63ef74dc23630c3491df76c27833a493d97383ec72ec7543023b09428ed048dc8fbc66e3808e
+MISC ChangeLog 140172 SHA256 49d5a47bc404877d52bd1850427a75eb8395db5f7406d773e6e6c60edef3354c SHA512 37c65a027fc26022d033b695f97c490b72770d26ef9d95903058138177ce0d08b5e8a1fddd5ada90055e3e0a976f843a407e0d9ad840fa2db489e6a7bf951536 WHIRLPOOL c0eeed353947109bdbeb0d6fbfcf4b7e1f58fa490b1429a1cf0c66ac8942339e975157968a2cea6c05646efc1e6db389ef13286105762195b42b03be3ade610e
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20150118.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20150118.ebuild
new file mode 100644
index 0000000..c7ca665
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20150118.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2015 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/2015-01-18_00-01-55/zip/netbeans-trunk-nightly-201501180001-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 15aaf38..dbe2424 100644
--- a/dev-java/netbeans-platform/ChangeLog
+++ b/dev-java/netbeans-platform/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-platform-9999_p20150118 (18 Jan 2015)
+
+  18 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-platform-9999_p20150118.ebuild:
+  bumped to the latest sources
+
 *netbeans-platform-9999_p20150116 (16 Jan 2015)
 
   16 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index b9ac190..c93c238 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -79,6 +79,7 @@ DIST netbeans-trunk-nightly-201501130001-src.zip 201373370 SHA256 eb5fbabdcc6f24
 DIST netbeans-trunk-nightly-201501140001-src.zip 201400262 SHA256 65aef07f80d9cfe6b47ac2c3aa2be2f1d98a7d9466a44c5196cab7b88e743a2d SHA512 1175de97a824b8be65a5b25b20cfcd17ae4ab4b101794f7dbdde8059b7192f30193d634e63141a54e9e8c2018166f1f204d321270ba91959d450839b9e1fb89e WHIRLPOOL b5944d4eb663cda53d83f88a52775868cf942c632e5cae0be25970fde60557aa43f69095ddc0861eb872f815e562f6998a5873b8aae1c2c660ae8e8ade75b4c2
 DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6b3b7a2050181c2ec341fa33b031423a913141b9c76aa590044 SHA512 6cd0ff2334b892835c91ae0c0bcf996e2322673533f46cec0efa37db25837f809202de061696c737da837099179a1fe20ef7bd569f6c04375e6090a8c5757d4d WHIRLPOOL 82a9189ff14ac9f373d84346361b231bc7ef298be20892b7a76e20ba8fe3762055f11957f40ba914d939d650cf7f9b098604aae84d30622e207498a5ad14fa81
 DIST netbeans-trunk-nightly-201501160001-src.zip 201394511 SHA256 0a5e6e98692bceabdacc7ef41fe2b7fb59d9c879453982b2dc0e79d28f077714 SHA512 2a5be09537b1735e712ec373cc7f41b1e8b7753be5026ec3a1562d7347f4d5addf58bb9ea052051e0df2113e18a366e4095f84432dffb4b75b86b9ca913d3d56 WHIRLPOOL 7a8d35dcba4754cb809b8ac8710cbba8ba5452c4c4e13963a40e032b13241aa9b44328f3bbeea681bf535a31980e766331acaf5ae265bda5dd5790bda872d8dc
+DIST netbeans-trunk-nightly-201501180001-src.zip 201391445 SHA256 b1bf4373e5b799f830894b4ea7ab878ef09c64059758cebb2fa1b1a244718965 SHA512 bf1a40344c915a754f3b7baed759b6513e6a055bface5fe6c30c4e0adeb76fe7d2aaac5d344553ee5df505131cb05c7e2219c67514d4a962f681f9a39c685166 WHIRLPOOL f33d7bfe0174c7de81986a44578df8322fa8f2b46911e9f6fc05ffe8f0839e70b691d62ef9b6dc1b248aceb68760330ef69e86f026a83b6c0f27bcee3a4bc07b
 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
@@ -118,5 +119,6 @@ EBUILD netbeans-platform-9999_p20150113.ebuild 8293 SHA256 d24f1c873d7c04db94e84
 EBUILD netbeans-platform-9999_p20150114.ebuild 8293 SHA256 30ce978fde2c58b11017dd7b409c7be606a11c20d41e081e7129b60dc2ad219f SHA512 cbf3a241b4d37cf68dd7ee1cbd1fd944eadc988ced18ba0e823228016c4986be2f3309e50e78e508b361fe185bbbaa1eb9fe28f16e0cddf3f0874c74610d3468 WHIRLPOOL 10935199184bb1b20c0c1f4c0f2b653b1a66401e7093cef3a0a81548561285d698b4ef4c0463e88965ed94db4952c4cff1330be9d1c02cd7a05812c3aacf60df
 EBUILD netbeans-platform-9999_p20150115.ebuild 8293 SHA256 5e3599e69b68285bff404f318e02870e3ca21a2df87ca076b5ca6cc92f6ad925 SHA512 43cf67defbd3829aedf6ae7e28348b6258d55a898484d4df0cf0a75e0259d4af160e504f6c3373d179efe7d707f6d21ddd1cc19ab0e7f67b06adfa585a452865 WHIRLPOOL 6f098ae26151355249c5a7e21822c8d763e75b2e70214bc4a90d7495aed069fc3e0a7363d4a78b3eb095117a3715cf528af04f91c0d301b046adb308e928ccb3
 EBUILD netbeans-platform-9999_p20150116.ebuild 8293 SHA256 f618c62440e6ec8d15e6e32b95b66d6ae72786eb01f3541fbe1eb3c126c6c203 SHA512 16583bbe0ff02ad1bde98cd1cb1290933441143b5edf820dce1ac172857e8e5b63efda1ab7d23104cca59c61d666b310dde76fa29b39e90f335bb074e5bee513 WHIRLPOOL 007c2e0c11c14b2f7a6958e1da382dc405faa45a98601ab113c79dde2e7f549dab3d9a9569cf330c4466af1e56cae9d36fb87c1a5719a0bdc3cba9f76302c422
-MISC ChangeLog 150667 SHA256 449d99f70fc8b29786df2371b15083b0e32655a255963b3d587c3559ee7ae0ec SHA512 e4cf8aadac6ca52fbf9065f8b9cfc7619e824231945cc3807598a2c40c5eda8921b985de1bc6df5b4c8e0c3edb6d2b5cdfddcdc1e24aed5638390756c58fbd9c WHIRLPOOL ff5aa78d367274e56eefaad41510e7c2e93c3c204157be4126062f10ad3f5afc5710879c522c5f71eb17d742a0811cdd7d5d720323c214da9bf5114f8aed93d7
+EBUILD netbeans-platform-9999_p20150118.ebuild 8293 SHA256 75733e9bfb7d75c24dc7f2a36a7681d089b1ca7569d83e1633259298ed9a21b3 SHA512 f06d5b89fc0dc0cd62f9d54d8fa711ba32e7469dbd1053af03a3e44d248418f1fff29e0931e7df76e902ca1dfad214229922d3e585c0fd0cf80bcd0984244d81 WHIRLPOOL 6431e12ca729b8ca7a41e5c9aa1d0062b909806191f2f13df042716ee3476cd4f9708b7bfc35c0f6940c7f8781621d853a801263853eb15fbd28066d95d31355
+MISC ChangeLog 150844 SHA256 35defb4df0b40c6503abb352e75503a8ae49ada2a0b72d951198bf6612c8da73 SHA512 7366d64bb15298dbc334f3367c430d2b419f5abae80babde7afd2cbf643e2a8b51a1bfb024d02c5a7c3e581968fdad5ca816d059993b8519e00582b724fdeb21 WHIRLPOOL 143f681e73c1d57491ac0cc53839e8b56c7ea85bd8a7f078d70d693b50ac2989f952e41ded9fef88370f18d9b1e85eef5534bb441d8f364d3b014a6e05c5a073
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20150118.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20150118.ebuild
new file mode 100644
index 0000000..5188417
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20150118.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2015 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/2015-01-18_00-01-55/zip/netbeans-trunk-nightly-201501180001-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/B250509C67194E89C3A27F96933DB7EB0E027E56-ko4j.jar
+	http://hg.netbeans.org/binaries/E556F74DF0942B304F94D9F82CAA8102FED6356E-net-java-html.jar
+	http://hg.netbeans.org/binaries/C74AC1ED160379872826FDC4A3C0CA924A3A0A83-net-java-html-boot.jar
+	http://hg.netbeans.org/binaries/03FE10857B0689B1F98B8D96DE87E80DF5D87A69-net-java-html-boot-fx.jar
+	http://hg.netbeans.org/binaries/31C9329E78A222E38CB86716ACFCEF81EF0BA1FD-net-java-html-boot-script.jar
+	http://hg.netbeans.org/binaries/24ED356FF3C72665CB5FB972B428824FABBC1987-net-java-html-geo.jar
+	http://hg.netbeans.org/binaries/432EDFB05C0F44E6ADAC4B1F3E08C67D1F52FB4B-net-java-html-json.jar
+	http://hg.netbeans.org/binaries/A7B6C3470DB8821A3587CE04844FF504A7C62354-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/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}"/B250509C67194E89C3A27F96933DB7EB0E027E56-ko4j.jar o.n.html.ko4j/external/ko4j.jar || die
+	ln -s "${DISTDIR}"/E556F74DF0942B304F94D9F82CAA8102FED6356E-net-java-html.jar net.java.html/external/net-java-html.jar || die
+	ln -s "${DISTDIR}"/C74AC1ED160379872826FDC4A3C0CA924A3A0A83-net-java-html-boot.jar net.java.html.boot/external/net-java-html-boot.jar || die
+	ln -s "${DISTDIR}"/03FE10857B0689B1F98B8D96DE87E80DF5D87A69-net-java-html-boot-fx.jar net.java.html.boot.fx/external/net-java-html-boot-fx.jar || die
+	ln -s "${DISTDIR}"/31C9329E78A222E38CB86716ACFCEF81EF0BA1FD-net-java-html-boot-script.jar net.java.html.boot.script/external/net-java-html-boot-script.jar || die
+	ln -s "${DISTDIR}"/24ED356FF3C72665CB5FB972B428824FABBC1987-net-java-html-geo.jar net.java.html.geo/external/net-java-html-geo.jar || die
+	ln -s "${DISTDIR}"/432EDFB05C0F44E6ADAC4B1F3E08C67D1F52FB4B-net-java-html-json.jar net.java.html.json/external/net-java-html-json.jar || die
+	ln -s "${DISTDIR}"/A7B6C3470DB8821A3587CE04844FF504A7C62354-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}"/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 536fb7f..fb168f5 100644
--- a/dev-java/netbeans-profiler/ChangeLog
+++ b/dev-java/netbeans-profiler/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-profiler-9999_p20150118 (18 Jan 2015)
+
+  18 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-profiler-9999_p20150118.ebuild:
+  bumped to the latest sources
+
 *netbeans-profiler-9999_p20150116 (16 Jan 2015)
 
   16 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index c5baa28..b1abf5c 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -45,6 +45,7 @@ DIST netbeans-trunk-nightly-201501130001-src.zip 201373370 SHA256 eb5fbabdcc6f24
 DIST netbeans-trunk-nightly-201501140001-src.zip 201400262 SHA256 65aef07f80d9cfe6b47ac2c3aa2be2f1d98a7d9466a44c5196cab7b88e743a2d SHA512 1175de97a824b8be65a5b25b20cfcd17ae4ab4b101794f7dbdde8059b7192f30193d634e63141a54e9e8c2018166f1f204d321270ba91959d450839b9e1fb89e WHIRLPOOL b5944d4eb663cda53d83f88a52775868cf942c632e5cae0be25970fde60557aa43f69095ddc0861eb872f815e562f6998a5873b8aae1c2c660ae8e8ade75b4c2
 DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6b3b7a2050181c2ec341fa33b031423a913141b9c76aa590044 SHA512 6cd0ff2334b892835c91ae0c0bcf996e2322673533f46cec0efa37db25837f809202de061696c737da837099179a1fe20ef7bd569f6c04375e6090a8c5757d4d WHIRLPOOL 82a9189ff14ac9f373d84346361b231bc7ef298be20892b7a76e20ba8fe3762055f11957f40ba914d939d650cf7f9b098604aae84d30622e207498a5ad14fa81
 DIST netbeans-trunk-nightly-201501160001-src.zip 201394511 SHA256 0a5e6e98692bceabdacc7ef41fe2b7fb59d9c879453982b2dc0e79d28f077714 SHA512 2a5be09537b1735e712ec373cc7f41b1e8b7753be5026ec3a1562d7347f4d5addf58bb9ea052051e0df2113e18a366e4095f84432dffb4b75b86b9ca913d3d56 WHIRLPOOL 7a8d35dcba4754cb809b8ac8710cbba8ba5452c4c4e13963a40e032b13241aa9b44328f3bbeea681bf535a31980e766331acaf5ae265bda5dd5790bda872d8dc
+DIST netbeans-trunk-nightly-201501180001-src.zip 201391445 SHA256 b1bf4373e5b799f830894b4ea7ab878ef09c64059758cebb2fa1b1a244718965 SHA512 bf1a40344c915a754f3b7baed759b6513e6a055bface5fe6c30c4e0adeb76fe7d2aaac5d344553ee5df505131cb05c7e2219c67514d4a962f681f9a39c685166 WHIRLPOOL f33d7bfe0174c7de81986a44578df8322fa8f2b46911e9f6fc05ffe8f0839e70b691d62ef9b6dc1b248aceb68760330ef69e86f026a83b6c0f27bcee3a4bc07b
 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
@@ -84,5 +85,6 @@ EBUILD netbeans-profiler-9999_p20150113.ebuild 3478 SHA256 33e27ac1cd118a16d7f09
 EBUILD netbeans-profiler-9999_p20150114.ebuild 3478 SHA256 c51d13f368a66ec3f418259948846e1be451b02a093a8ec937a67b515319a25c SHA512 e1a0c4cffa66d80fa49bc56e4225ab550c1dd0bd42d24f08cfa21f51a5cda734a73d572d1a36f5c4bf1443e56db5b45293c1b86f3c2d4fe4a6d424ff437d4f33 WHIRLPOOL 4ebed844534bcd07c56524277a083d12fbfe8d4c91b81801dde8eaaefc409107c2e3b9aab00cce052fac94fc7619ae6757b2c57dd7cb2268f0ebacb40b7d555d
 EBUILD netbeans-profiler-9999_p20150115.ebuild 3478 SHA256 62b0d5e5e15e11d58b4d3f181fb2858774d81283c42e21a2daaa854bfc6acbb2 SHA512 d96f0da5848aefce3828d87c95085a277f4bd866a7e3b82cf3e6c2bfa988c23248cb3a216976f8cc677ae5f270e0d7e5da419cb0fadfed1bb14176741d13a2bb WHIRLPOOL 2ebc369fad408d30d88a2c19171e0edcf63e9331dc55b8119ab8c3436aa9fe58b4f289aec22d27f379a020dcab76a4460a952bcdf95dc77e059d18470b1ff9c0
 EBUILD netbeans-profiler-9999_p20150116.ebuild 3478 SHA256 de5b4b51c1e3651fc8d5592145c9534589272e9ba7a793c1aaf629c35642e88b SHA512 2a6089f96f09dbf2074303c03cf3c3d38455ef8b7262f2d4399908a38121e40ad93bcde7a5a891da4e2b50655c7e068fb9f4f07c2d1df994ef205d430f12b246 WHIRLPOOL 72421d0cb157b9230934bfd0a8bb01ad7d28882af663f9047744c0a68191edbb509bd7457812b4ba409b1abeab719422eb994c3002e1b2018005fec92f23c082
-MISC ChangeLog 150128 SHA256 7cd1811cd3891a7040b7e7bece74682eb366f1ad029a9a17603f9bb8a2584115 SHA512 74162820c6396107e9bb90bdf74301c44ffee3a6bd8cb5c3c0fcf5687316366fb4bc39681400b5d9a6aface9cf08bd2523a2712746c6cc3a7ce3962c44105cf1 WHIRLPOOL f7ba836a1566e0bce9bc12fe8bc852df26fb0788256e8a9b237a8f05c6a0fe7792abf55e57825c84d4674af75a728d5299da8e15f5d81caf7e326b14ef54362e
+EBUILD netbeans-profiler-9999_p20150118.ebuild 3478 SHA256 1a8a41944225f8fc0ece1d06c5d603631ce16551516beee9597f5e2c5ab524a5 SHA512 b6062aaf1fd74e97d057a395417fd50c439c89bc00c766bf654dfc1e868dee469508f480d99f78967bdf3124f37b8f9d7f1b27acbe4482b14d7f7a2542409704 WHIRLPOOL 44cee17d7862491074d3b587cfacd38b2236429a012c699f42ada261d9bb6764c38aa5c9c5b1c98bb356ba08389a69d0111d02478876f7e4e91c25bcbd280ef0
+MISC ChangeLog 150305 SHA256 5482c9828ac64e641c5d7a7dc3eb2dae8e69e009c5f8b03d49a4a0ace0ee66c4 SHA512 3dfe2157003ebce429faded64dace8649e987039480f1d99d2568aea9111054d892579c779ca623bacbb8d8330c895070165a11e68d615e19df168e19782f20c WHIRLPOOL c437e15d8b5eb39dd82b62bf8ee5c50af7aa2817ac877bd4d3072e8f418508fbd506fa93e6039963ee09f10f8790f7ffce1eb2051b06a8c727d5686151561679
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150118.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150118.ebuild
new file mode 100644
index 0000000..6a6e23b
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150118.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2015 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/2015-01-18_00-01-55/zip/netbeans-trunk-nightly-201501180001-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 c264ca2..f3777df 100644
--- a/dev-java/netbeans-webcommon/ChangeLog
+++ b/dev-java/netbeans-webcommon/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-webcommon-9999_p20150118 (18 Jan 2015)
+
+  18 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-webcommon-9999_p20150118.ebuild:
+  bumped to the latest sources
+
 *netbeans-webcommon-9999_p20150116 (16 Jan 2015)
 
   16 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index ee397ff..a100efd 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -51,6 +51,7 @@ DIST netbeans-trunk-nightly-201501130001-src.zip 201373370 SHA256 eb5fbabdcc6f24
 DIST netbeans-trunk-nightly-201501140001-src.zip 201400262 SHA256 65aef07f80d9cfe6b47ac2c3aa2be2f1d98a7d9466a44c5196cab7b88e743a2d SHA512 1175de97a824b8be65a5b25b20cfcd17ae4ab4b101794f7dbdde8059b7192f30193d634e63141a54e9e8c2018166f1f204d321270ba91959d450839b9e1fb89e WHIRLPOOL b5944d4eb663cda53d83f88a52775868cf942c632e5cae0be25970fde60557aa43f69095ddc0861eb872f815e562f6998a5873b8aae1c2c660ae8e8ade75b4c2
 DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6b3b7a2050181c2ec341fa33b031423a913141b9c76aa590044 SHA512 6cd0ff2334b892835c91ae0c0bcf996e2322673533f46cec0efa37db25837f809202de061696c737da837099179a1fe20ef7bd569f6c04375e6090a8c5757d4d WHIRLPOOL 82a9189ff14ac9f373d84346361b231bc7ef298be20892b7a76e20ba8fe3762055f11957f40ba914d939d650cf7f9b098604aae84d30622e207498a5ad14fa81
 DIST netbeans-trunk-nightly-201501160001-src.zip 201394511 SHA256 0a5e6e98692bceabdacc7ef41fe2b7fb59d9c879453982b2dc0e79d28f077714 SHA512 2a5be09537b1735e712ec373cc7f41b1e8b7753be5026ec3a1562d7347f4d5addf58bb9ea052051e0df2113e18a366e4095f84432dffb4b75b86b9ca913d3d56 WHIRLPOOL 7a8d35dcba4754cb809b8ac8710cbba8ba5452c4c4e13963a40e032b13241aa9b44328f3bbeea681bf535a31980e766331acaf5ae265bda5dd5790bda872d8dc
+DIST netbeans-trunk-nightly-201501180001-src.zip 201391445 SHA256 b1bf4373e5b799f830894b4ea7ab878ef09c64059758cebb2fa1b1a244718965 SHA512 bf1a40344c915a754f3b7baed759b6513e6a055bface5fe6c30c4e0adeb76fe7d2aaac5d344553ee5df505131cb05c7e2219c67514d4a962f681f9a39c685166 WHIRLPOOL f33d7bfe0174c7de81986a44578df8322fa8f2b46911e9f6fc05ffe8f0839e70b691d62ef9b6dc1b248aceb68760330ef69e86f026a83b6c0f27bcee3a4bc07b
 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
@@ -88,5 +89,6 @@ EBUILD netbeans-webcommon-9999_p20150113.ebuild 4997 SHA256 5f9b6c71c952022b9b89
 EBUILD netbeans-webcommon-9999_p20150114.ebuild 4997 SHA256 ddfdfa120d1b65a9f646e3b694145513f0c99cf7ac9a429a23ce13cb33566f75 SHA512 d6a32f19760b0bdfbf73d867c915b4a2f23ec6d725d785da0f0a16f9abcc22427c29b3bb3cac1adb1d62b5e1834c3e8f5ed6a7b37516ee0fa486304ec02759c4 WHIRLPOOL 9acab1cbb1185e3880ef26c20bc5664c28e2fa17ab177fc49812ca1f45052b1ff76c5f1d499b3e7978deb6b0ef5e95c7c3994479e8b5f4807678dd45720f440a
 EBUILD netbeans-webcommon-9999_p20150115.ebuild 4997 SHA256 d4a393471335a0eb6286438fc779cfbfd8620a08085d8fe4c8444d93135d2e8c SHA512 1293b48ee5ea063c34a441a1c5c1b75c58265bb10a19948d5a7006ad61edf015f4e2af0c90fd9b93889348da68478c45a7b3127eceb00c4164508afc4c14fd22 WHIRLPOOL 04bd0333e32d0a5a06177269e191af1b14509cbaf1649f314aab8c94b9e2b939ca215895f35523a36b475cf6c0dbfe95475b7f73ec6a8fad5b091c1ea27ff939
 EBUILD netbeans-webcommon-9999_p20150116.ebuild 4997 SHA256 0251db677101f76e3ec56f52beef42321d8debf73ba5e2e26505ee830124c1b6 SHA512 e6037bc7136a2c876a65ad14d6b2cbd5523297acc05983defd8a188d7f7aef23d2a2a7e0688bbb525a007b657318ed0c8ef71d76761ae6f0b6164a5a74a112a3 WHIRLPOOL b7ad8462fe27ab5cb59a921e39fda75df03bc11412029ad68c5a7afecad14775fb50f0a03f8d731cc855e551beb879b1f6c920b5be902dbc038d14278159ede0
-MISC ChangeLog 122971 SHA256 201cf2b95b17158b0c03e782da8dd62e058c81a4c1320298648eb75ce381a52e SHA512 d633aa21ea8ed57b148159d4dafa6fa10d76ca21a59025d0e5ee7ac2b8b709dc1c46cd4a26ce0fe83db4448893281c46562e980c523fd3f98079f0aae6c286f7 WHIRLPOOL 53585dc25798137cb670037a54b514492c08a8db7fd74718d0ff56615b5c7d9ebf7abffbeb441da097477bd3617489be6fc0f106cac2add05a5b34e51a8a0da9
+EBUILD netbeans-webcommon-9999_p20150118.ebuild 4997 SHA256 85000b0400338b446298a941b63c84d45a95a01d38233d3625589fb43621dfcc SHA512 bb891437516e3f6fe0bb2df4a4febbb2ef73c47243ac42ed45356a8edb87ab5c3599470f090a251f31c824512f6234f78ce90e4a7611ff8aac242b445d8245ae WHIRLPOOL 610f9e0ef6c6db49b3a97eecae0b9b688228b480bc86b7806a95d782c461567caaccd15ad0d398016433531ffc791f3047e6afb0b63669e18aa89c89355aa801
+MISC ChangeLog 123150 SHA256 e143cdfe3073c079d084dd5377882bf1030706db8d593c1afbf5123028dd1ee8 SHA512 b74d54363d82527217bbe8f3f8048fd6f650bf5386d70048423139b38ce6ea8402fe40ec715da937b8b8ed11739e8fbc1734fa950bdd791f158aa445b80cafb4 WHIRLPOOL 75582ad712e8391d0d07fc7be77765fd069f730095a87280761b6633c76ea849f31ade653187f2f3eb79eede912016e90919f8d5337c2dea7128de030a91466a
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150118.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150118.ebuild
new file mode 100644
index 0000000..7746c01
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150118.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2015 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/2015-01-18_00-01-55/zip/netbeans-trunk-nightly-201501180001-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 36e58aa..346764d 100644
--- a/dev-java/netbeans-websvccommon/ChangeLog
+++ b/dev-java/netbeans-websvccommon/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-websvccommon-9999_p20150118 (18 Jan 2015)
+
+  18 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-websvccommon-9999_p20150118.ebuild:
+  bumped to the latest sources
+
 *netbeans-websvccommon-9999_p20150116 (16 Jan 2015)
 
   16 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 2b20e84..97222b9 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -45,6 +45,7 @@ DIST netbeans-trunk-nightly-201501130001-src.zip 201373370 SHA256 eb5fbabdcc6f24
 DIST netbeans-trunk-nightly-201501140001-src.zip 201400262 SHA256 65aef07f80d9cfe6b47ac2c3aa2be2f1d98a7d9466a44c5196cab7b88e743a2d SHA512 1175de97a824b8be65a5b25b20cfcd17ae4ab4b101794f7dbdde8059b7192f30193d634e63141a54e9e8c2018166f1f204d321270ba91959d450839b9e1fb89e WHIRLPOOL b5944d4eb663cda53d83f88a52775868cf942c632e5cae0be25970fde60557aa43f69095ddc0861eb872f815e562f6998a5873b8aae1c2c660ae8e8ade75b4c2
 DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6b3b7a2050181c2ec341fa33b031423a913141b9c76aa590044 SHA512 6cd0ff2334b892835c91ae0c0bcf996e2322673533f46cec0efa37db25837f809202de061696c737da837099179a1fe20ef7bd569f6c04375e6090a8c5757d4d WHIRLPOOL 82a9189ff14ac9f373d84346361b231bc7ef298be20892b7a76e20ba8fe3762055f11957f40ba914d939d650cf7f9b098604aae84d30622e207498a5ad14fa81
 DIST netbeans-trunk-nightly-201501160001-src.zip 201394511 SHA256 0a5e6e98692bceabdacc7ef41fe2b7fb59d9c879453982b2dc0e79d28f077714 SHA512 2a5be09537b1735e712ec373cc7f41b1e8b7753be5026ec3a1562d7347f4d5addf58bb9ea052051e0df2113e18a366e4095f84432dffb4b75b86b9ca913d3d56 WHIRLPOOL 7a8d35dcba4754cb809b8ac8710cbba8ba5452c4c4e13963a40e032b13241aa9b44328f3bbeea681bf535a31980e766331acaf5ae265bda5dd5790bda872d8dc
+DIST netbeans-trunk-nightly-201501180001-src.zip 201391445 SHA256 b1bf4373e5b799f830894b4ea7ab878ef09c64059758cebb2fa1b1a244718965 SHA512 bf1a40344c915a754f3b7baed759b6513e6a055bface5fe6c30c4e0adeb76fe7d2aaac5d344553ee5df505131cb05c7e2219c67514d4a962f681f9a39c685166 WHIRLPOOL f33d7bfe0174c7de81986a44578df8322fa8f2b46911e9f6fc05ffe8f0839e70b691d62ef9b6dc1b248aceb68760330ef69e86f026a83b6c0f27bcee3a4bc07b
 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
@@ -84,5 +85,6 @@ EBUILD netbeans-websvccommon-9999_p20150113.ebuild 2727 SHA256 aeb389cfef748bf0d
 EBUILD netbeans-websvccommon-9999_p20150114.ebuild 2727 SHA256 d6349f1a50a0ab593e454e08ea4047a697dbe25a90400a09f3e7b6d587f64dd5 SHA512 ac1c8838c55749e16f0649b5ced8673dc941c7692596a5982d1e2d6fc732e48e368b1c696703d6b873b3fcdb973d1219167f96151ba5e58f0ed29067b471d52c WHIRLPOOL 464034a53422dc00300834183a7c2c10ae163f2559c0a8e717b24cbdb56efc209299f9e56be7080f9f8d5e89f62eaf5b9f8e5c2a34404ada7e362c8253e0a1e9
 EBUILD netbeans-websvccommon-9999_p20150115.ebuild 2727 SHA256 aa9ddcf1829a4a2d6021080cfa1dbc2a8c7cebfb8315940db86946b8a89d581b SHA512 ce503b1c8bf330109b0356f2a75a7a9c73ede633bf0fed73d50d5255265ff5592b901b7a43759dc0c05ac5e74aa1e4c74a069ce9fda8e4fe13a06eda00fb20a6 WHIRLPOOL 67bb41532686549a8aa088afff0abed80ae0af6260f8d0b50dedd9954e444a3b8642f12825f39fa44071e398ec02b724cf229f1ff2571d344f1eb34e2216b67f
 EBUILD netbeans-websvccommon-9999_p20150116.ebuild 2727 SHA256 6c30bc2507cc9e5a096cd50e6615b4609d6ecc4034e312ddf0377ac91f1b2c66 SHA512 6da1d854fd9f6b20b6d224600197c67bad3caff62dee02101da504e2ae3af6d301a2c7f52f42da19bed6c668e0c5707a7021af18ff77a5613115fcc40af66951 WHIRLPOOL 42cb4ce0c8899ce032a8091f914156b90ac9d71f912e7cff0845c59c721ecc1da2dc6621dab8ec93e50849ec71c9582581f8330bfc8949cf75f26ae9295b17fa
-MISC ChangeLog 157241 SHA256 804db6929c63a60084c02642c4b183b87b93641d7cc306a4a422f3484c575d08 SHA512 7c6f2bfb9c0a792818d26954fb3b699e3a38d176cf2cbc9c950f5b842e6be3bbf18b5b87a9c659e89bc2d880f0f6b57edc6cf227417a7339df8f3a516e1cf3b0 WHIRLPOOL abae880066691128048a980ecb10d0bfbdc5ac18c602c11a60b90738410d4d3be9f3f2abed37777fc2ab4ab42ee8073c1f756ccaef3fb9c3503dfbf1c82d147b
+EBUILD netbeans-websvccommon-9999_p20150118.ebuild 2727 SHA256 1f59d2120e206997bab4c493976a3cab1f91b0440d4db909ed691b9e73a9d96e SHA512 b1d78610baef6378fa30373a28b2504a0884ff379b28b44a863cf30d05d60011c9d858d0f2586221b54c31820d2c4635b60ade78546a0e8716268fc85f1c3117 WHIRLPOOL 1933ebc83fbe473827be12c8d99e5b30187fe6e2a80cd33c658317098393f797db9680c5f6e7223e002bb31d43f4b320de32a0136fc29d023f026ef0ee422702
+MISC ChangeLog 157426 SHA256 607cbbed3adae3787d0d8abd67b41ac773232eb056fbf697b159f5870c32e26d SHA512 454e2c9945b9c2b5695c98bac1b764221f376167a62ff99a2f01779d157ec5365730fdea33dd9f81eada98fd59792cef5a4e29963de16caef351b4d540f061f2 WHIRLPOOL 86af8d74b7be89bc02a2e4d77494b3d672f208c16a3818098f476be8373f9523cc3828b0deb23416e9fe992e19b44936c437972b435df0c8319b0f0fa2252e43
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150118.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150118.ebuild
new file mode 100644
index 0000000..2e78385
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150118.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 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/2015-01-18_00-01-55/zip/netbeans-trunk-nightly-201501180001-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 dddf6dd..a2112b2 100644
--- a/dev-util/netbeans/ChangeLog
+++ b/dev-util/netbeans/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-9999_p20150118 (18 Jan 2015)
+
+  18 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-9999_p20150118.ebuild:
+  bumped to the latest sources
+
 *netbeans-9999_p20150116 (16 Jan 2015)
 
   16 Jan 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 9841d8f..0f2451a 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -53,6 +53,7 @@ DIST netbeans-trunk-nightly-201501130001-src.zip 201373370 SHA256 eb5fbabdcc6f24
 DIST netbeans-trunk-nightly-201501140001-src.zip 201400262 SHA256 65aef07f80d9cfe6b47ac2c3aa2be2f1d98a7d9466a44c5196cab7b88e743a2d SHA512 1175de97a824b8be65a5b25b20cfcd17ae4ab4b101794f7dbdde8059b7192f30193d634e63141a54e9e8c2018166f1f204d321270ba91959d450839b9e1fb89e WHIRLPOOL b5944d4eb663cda53d83f88a52775868cf942c632e5cae0be25970fde60557aa43f69095ddc0861eb872f815e562f6998a5873b8aae1c2c660ae8e8ade75b4c2
 DIST netbeans-trunk-nightly-201501150001-src.zip 201400330 SHA256 20732864d0ece6b3b7a2050181c2ec341fa33b031423a913141b9c76aa590044 SHA512 6cd0ff2334b892835c91ae0c0bcf996e2322673533f46cec0efa37db25837f809202de061696c737da837099179a1fe20ef7bd569f6c04375e6090a8c5757d4d WHIRLPOOL 82a9189ff14ac9f373d84346361b231bc7ef298be20892b7a76e20ba8fe3762055f11957f40ba914d939d650cf7f9b098604aae84d30622e207498a5ad14fa81
 DIST netbeans-trunk-nightly-201501160001-src.zip 201394511 SHA256 0a5e6e98692bceabdacc7ef41fe2b7fb59d9c879453982b2dc0e79d28f077714 SHA512 2a5be09537b1735e712ec373cc7f41b1e8b7753be5026ec3a1562d7347f4d5addf58bb9ea052051e0df2113e18a366e4095f84432dffb4b75b86b9ca913d3d56 WHIRLPOOL 7a8d35dcba4754cb809b8ac8710cbba8ba5452c4c4e13963a40e032b13241aa9b44328f3bbeea681bf535a31980e766331acaf5ae265bda5dd5790bda872d8dc
+DIST netbeans-trunk-nightly-201501180001-src.zip 201391445 SHA256 b1bf4373e5b799f830894b4ea7ab878ef09c64059758cebb2fa1b1a244718965 SHA512 bf1a40344c915a754f3b7baed759b6513e6a055bface5fe6c30c4e0adeb76fe7d2aaac5d344553ee5df505131cb05c7e2219c67514d4a962f681f9a39c685166 WHIRLPOOL f33d7bfe0174c7de81986a44578df8322fa8f2b46911e9f6fc05ffe8f0839e70b691d62ef9b6dc1b248aceb68760330ef69e86f026a83b6c0f27bcee3a4bc07b
 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
@@ -92,5 +93,6 @@ EBUILD netbeans-9999_p20150113.ebuild 7216 SHA256 ae012f69a2244659ac63b3262cd7df
 EBUILD netbeans-9999_p20150114.ebuild 7216 SHA256 02ca10c7d20f2f37c54eb2ff6f21f6521b088fcccfb67515529d52bbaa81ab5a SHA512 f1b64da112b597e857d508d6564b9563b96d323fbbd80fa21438bd36d8b1df63624ba476983d42edd45ff4c7dc4d3ad2166f66021498ae126456f71e68fb76c4 WHIRLPOOL 8bde0a6bc540cf62401c74d539496bed9c09d34caa3218730301da51e6ca11cb46a640ab96e560a5a4eab60cea5abfd5c7ec3bfeb88b554f762e8d0f27d103fa
 EBUILD netbeans-9999_p20150115.ebuild 7216 SHA256 a4bbbf4b6012d8ddd8495eebfb13e6cc11aba015547f6aefba5ebf625bdb6a43 SHA512 4ea70adb5dd0f9ac9e641ce7a5e4c45c723b2c3d8a0e0b420fb7da65d41c29ee844767a3bc70d9fb9f73b5c9853ab0342ccb11b30d6ebe68006982f638354f70 WHIRLPOOL fbf70c3918379c5552ae150b7621515401ccf778e17bc7eb0e9c394df5688debef2a27983b6015e70e3ccd7d92e44a9fda91299d2b21bd3761b2ebbc43c0bc47
 EBUILD netbeans-9999_p20150116.ebuild 7216 SHA256 932a7ddb1f2112bbf19bea6281826ce0c0bbfcb8c82b7ce344ae81f54802ba17 SHA512 362c8d7c3bf9e4b1bd6d02cfc67f02e662292803268d24a2f9c00cdb0a9e96a758e4797f2ea7ff019c8d02b5f840d2a031c1991db55feaa97a1e4f271488bcf2 WHIRLPOOL 4dd9bd1655142727033e31eaa15a870d2386fc8448d2a48c20848e76483563312b3360d72ed50f00c6ad3aebfeea8ae0ab5985f8c30ef1b3099c166fe0df77c1
-MISC ChangeLog 133966 SHA256 e36e978871e8eff71ece937d4b6674cdfa7b00dc2bde5ae0d7b6b411eff070fd SHA512 c4248b1dc4713f4af6561de9d005c4b123dd09321ed3ce7e701802931abb28a7d5f1e3b01faeb8459ac3e9290e7d7becad573a93d8318b89ccb2ca7b5d48b548 WHIRLPOOL 0805a1f7ce3f7e0c05f4c1ced2ab385f7c756bf2cfcb64973f9bd9f1a1e329c69ecb05e950d9b3a7fc835c88329215016d2d257d9888f6ae238247ff3f773378
+EBUILD netbeans-9999_p20150118.ebuild 7216 SHA256 7a062c1b98caa319060dece145d11ce58c23fd26f9431a34e18b9d41647ae5fc SHA512 c5ab2287f52cdc6b4f79b15780560542aa4583da16cea0fbce09bc6ebac0b02b0e8b4c50c3c04fa2a95c4c91f147505b38b9f7075a0c58349528dedf25fde9b6 WHIRLPOOL 302db2c25d542d129832cb6133be572f6d7a3297e5408d9a0393a89e67e8fee12c40d17e9f6d0eaf76b1b68587f491523ace57d91606e934b1d2a41e7ce8309d
+MISC ChangeLog 134125 SHA256 c6507e0caa1aed9727a338049dbe10ff68c567fe07f6f080daa3e603c2e8d6ae SHA512 2931055b8df337fe2bac4258ba3da0a9313b719bfdf998d75ad7710516ec922c674290b1673f02e9e23e53386a122d2b639f5352377038339ddd58e47e31fee0 WHIRLPOOL a29de4556052b67f5307f07a364bdaf15a1d5d319219884e7d6faa7c8232d853cd0d8810d2b7496a7eab30f435910517cd92629809be9abbc832ff4ef0c6b78f
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

diff --git a/dev-util/netbeans/netbeans-9999_p20150118.ebuild b/dev-util/netbeans/netbeans-9999_p20150118.ebuild
new file mode 100644
index 0000000..86c9ddf
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20150118.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2015 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/2015-01-18_00-01-55/zip/netbeans-trunk-nightly-201501180001-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
+}

next             reply	other threads:[~2015-01-18 10:10 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-18 10:10 Miroslav Šulc [this message]
  -- strict thread matches above, loose matches on Subject: below --
2015-08-22  8:46 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-websvccommon/, dev-java/netbeans-groovy/, Miroslav Šulc
2015-12-09 11:01 Miroslav Šulc

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:3149c88 dfblob:a6176fc dfblob:47d9b85 dfblob:7f7e802
dfblob:f4c3148 dfblob:4417583 dfblob:242929e dfblob:31b447b
dfblob:505bac0 dfblob:c081935 dfblob:d19d901 dfblob:f93fc2a
dfblob:eb36053 dfblob:bea3f37 dfblob:738203f dfblob:e17fd5b
dfblob:a4ab557 dfblob:5d597d2 dfblob:4e7c8ca dfblob:b017fa1
dfblob:24aba8c dfblob:60c5ba4 dfblob:ab58bc2 dfblob:297d5c4
dfblob:785ccef dfblob:cb46f48 dfblob:3b300d5 dfblob:6758618
dfblob:27a5937 dfblob:5e27c83 dfblob:15a37d8 dfblob:af4e2de
dfblob:60ec3d6 dfblob:e4a3217 dfblob:4a5eea8 dfblob:30c2c01
dfblob:4b7baa5 dfblob:291e508 dfblob:35c9b1f dfblob:974805e
dfblob:1a54fc2 dfblob:cfa7c58 dfblob:1d1fcb8 dfblob:658354b
dfblob:d9dc8d7 dfblob:f2d7aca dfblob:292547d dfblob:922363e
dfblob:f140032 dfblob:565cfb2 dfblob:3b0a977 dfblob:1995a64
dfblob:42e5831 dfblob:2b91aea dfblob:678864a dfblob:db6a32e
dfblob:02a930a dfblob:332b4bf dfblob:54a6316 dfblob:8a63bfe
dfblob:15f17b9 dfblob:d9a01c0 dfblob:900868a dfblob:0aab245
dfblob:f776021 dfblob:c5eb716 dfblob:56c273d dfblob:19e9434
dfblob:2e2b26f dfblob:2f59c50 dfblob:0d01ace dfblob:08b1b21
dfblob:9bc7de3 dfblob:ab9ac1a dfblob:e62e21b dfblob:d913c43
dfblob:687c597 dfblob:4b422b9 dfblob:0a4a7e3 dfblob:c7ca665
dfblob:15aaf38 dfblob:dbe2424 dfblob:b9ac190 dfblob:c93c238
dfblob:5188417 dfblob:536fb7f dfblob:fb168f5 dfblob:c5baa28
dfblob:b1abf5c dfblob:6a6e23b dfblob:c264ca2 dfblob:f3777df
dfblob:ee397ff dfblob:a100efd dfblob:7746c01 dfblob:36e58aa
dfblob:346764d dfblob:2b20e84 dfblob:97222b9 dfblob:2e78385
dfblob:dddf6dd dfblob:a2112b2 dfblob:9841d8f dfblob:0f2451a
dfblob:86c9ddf )
 OR (
bs:"[gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-websvccommon/, dev-java/netbeans-groovy/, ..." )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1421575837.e0cf638ba8caf36b2495474726af26809bc628c6.fordfrog@gentoo \
    --to=fordfrog@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

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