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

[Miroslav Šulc]

commit:     f0f31c74afda51e91376b28d35a1a264c14d1dda
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 29 09:16:37 2014 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Dec 29 09:16:37 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=dev/fordfrog.git;a=commit;h=f0f31c74

netbeans: bumped to the latest sources

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

diff --git a/dev-java/netbeans-apisupport/ChangeLog b/dev-java/netbeans-apisupport/ChangeLog
index ddc1108..8a41d11 100644
--- a/dev-java/netbeans-apisupport/ChangeLog
+++ b/dev-java/netbeans-apisupport/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-apisupport-9999_p20141229 (29 Dec 2014)
+*netbeans-apisupport-9999_p20141228 (29 Dec 2014)
+
+  29 Dec 2014; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-apisupport-9999_p20141228.ebuild,
+  +netbeans-apisupport-9999_p20141229.ebuild:
+  bumped to the latest sources
+
 *netbeans-apisupport-9999_p20141227 (27 Dec 2014)
 
   27 Dec 2014; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index bc3f6d5..44f8d9c 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -52,6 +52,8 @@ DIST netbeans-trunk-nightly-201412230001-src.zip 201224939 SHA256 4b0894151a203a
 DIST netbeans-trunk-nightly-201412250001-src.zip 201240621 SHA256 d133ff2185d2c6f5561d9226d16c2db373796f017b009ac16107d7c0b9fda1e4 SHA512 a8a5db63b7644a15051d4fc72ded6b5a11789a6ca73404068b5d7d2a82fdfcee29216d3a056180ebdd7a735468c485b939c1ee9ad012e5bd9632bd4a48cb948f WHIRLPOOL db78e1911db3615eceef7177cb734956c3ad5760ffd802019e2b809546999c579dfe9ec77b2dba0241862f4525eacdd71a3beb3848386fde5cbaf267d9b0e36e
 DIST netbeans-trunk-nightly-201412260001-src.zip 201263552 SHA256 1c168e53c6217da5215d1349a33ff9c8f29006832f1a2453819a83525452468b SHA512 a6b2b605dd50d7b2ad81edb254de2182f2182cbd24d11e61d2f64955a5d9a3ebf32abc20968b27bd72be8b2b41a2cc1dcaf8c54fe51ad82f58deb23716713baf WHIRLPOOL 6fe4efa1dbffc68b4d7f423fadeb897b349c883ee6d3808ddb26b3fd94d57a853731d26e13fa03b4b223412bd12bedcedc6e4807b2779233e69896c706f8ccda
 DIST netbeans-trunk-nightly-201412270001-src.zip 201263552 SHA256 734c2d6a13ac8466921c952831f2890fb0062ccaf79fe0b4ff12b02be55aaa90 SHA512 4015c26df82c49a534e31e14ce72c263589af621c78e1961b85f96fae0d9d61140b1ba66f0a758400c2bf73bed73ddf887f8703ab721f03369fc5363ad3e7f95 WHIRLPOOL 6dc1dc6e5aeb0b28fb750ab0dad64b8b50d919b42d549e78ea354535c6430fe8f52bf06838d4ad7530d7ef77175d0e8d81d6df8952ba0f8c5e1736bc317a8151
+DIST netbeans-trunk-nightly-201412280001-src.zip 201263552 SHA256 9ee16bf46caf062b6173d9e07e91666f09dcf896b91cbf5aa12fe3d8b56c26b9 SHA512 87b2862da5db0abcae2c0a3ed3c95b53be94ecf9d11282c65af96e16fadac25c004c1d404cf5c74bd83ea61c53e102e2cf914b57d91aa2dbb305dd506c56fb8b WHIRLPOOL 6a1d5065e9597a0075a6d3d2adbfe80a3222dab95f198ce7de1f7cf9a7bbb088625f622543524e89a6d2045a9b47b21b999f09d048e52436f81f2d906cbfe695
+DIST netbeans-trunk-nightly-201412290001-src.zip 201263552 SHA256 170477d79b8bf19d65684dec3518bc8b6d344b05dd304b2a950f976a77069b63 SHA512 88f9cbee44a891ac35381a934058f23660d01ae6a072a6253589aecf4864daf4c288124564707f590f199a5428f82eaa6c85508d192970917ef88373788e5b7f WHIRLPOOL ba5464c152dab8532f561fb80812ecade46659f32a5314b32dc318f50c157b123dc1bf7fba6a1e9c447253c0607a83e341ef79ba91fd8f684a10f277b8d9899c
 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
@@ -98,5 +100,7 @@ EBUILD netbeans-apisupport-9999_p20141223.ebuild 3390 SHA256 0b99a984d3f31e468eb
 EBUILD netbeans-apisupport-9999_p20141225.ebuild 3390 SHA256 c2bedda406e0247ff1db2184cb4faa88bde904d4696e8aa1716b4ff49d842387 SHA512 27149c9db6c2dc8d95955c8c2adb97e9afbe33f33d374e0c2dc1c89e7032bb58d901d0e124cd01762f845c3d22fbb2e3d0268e423377ca9d6e25ddf394d540bd WHIRLPOOL 486df5b94e66677d85d787a4aa6f8eb18971574f3680fb605b13d6e763fd32385f3808c09e1c4b95c8481bced5aa5b05e4fdcc27af5d4a84a6cd2f596e8ebe35
 EBUILD netbeans-apisupport-9999_p20141226.ebuild 3390 SHA256 caa6d58ddfe80733080c170dad56452cb62a69c95490568d8bf5ca4ab363f773 SHA512 84bf419b71b6dabb02a329e677174c662aea260dcc9f75e6f62665fe1e71df9c191fe749671f3c9e414486e4850f5ff23749f116b36f1a0f42ca8c976a655d8b WHIRLPOOL 8c32f3478ce8fce0634677efd5d42cb6fa34bbd73c05c5e108e8fce0d0e6ce6984e7cc03ffacd5415441f0a76ca268b7ad70f00455aee498ae2f7c37bd717d98
 EBUILD netbeans-apisupport-9999_p20141227.ebuild 3390 SHA256 22a19b8611a61af34338e2b451c9036c72a3a2c6f48fec96cf9b8e03e1efb390 SHA512 e0960ee191d13c16ce143ca5734efda35bcabd7c14022ac815c1c45d19f41e1e3871431f0985ccb3b08b5f01763dc0ad78a1c3c9f3b5bb174c41cd067d7c4e20 WHIRLPOOL 89d06177ec2a4334af8654dbf5f62645932504d55fab7531b42eb8d536db5d62efa5f3d00d7f81045ede348c1b1fb8262d1d4b14e41e042311280a09016f4753
-MISC ChangeLog 148897 SHA256 bd661086198cbdf3ce883bc56d0c63c8180953da09ca2b4a978603910952de45 SHA512 642945c04cae53bd196bae69a9533089b061b2390cf1844423764eb5d1429257f4d5a48c388f5c99f9e991370df48e0892909a5784183771098366c8a0e553fb WHIRLPOOL f8d6815b98ab24e2224d8d095531307bce0f3d76f38618135d9fba4996c442dabae3f370902a8177c458537dc9f6965c6dd88432041baef53ac5bfcba143a55c
+EBUILD netbeans-apisupport-9999_p20141228.ebuild 3390 SHA256 90645991dd06cf04334b5f1cb3d0055618f4668e1ca39878654fd6592837e4a0 SHA512 bac9765e15938821965e55ccd834e3d695a83eaaaed7d5747aa285772be79176938d9d09813e434070e39d5a92f559b094292c1f3547276cdf89ba6d5a3130e7 WHIRLPOOL 7a9f1820f502edaed0982a5ab274856e39596c2306ab7748647bb24396cf580ef2872d01332b42e602f9af3d8cd92b511bccf9da2b6c190ec68aeeb573ed43ea
+EBUILD netbeans-apisupport-9999_p20141229.ebuild 3390 SHA256 fc6423745e560cf3df810f853c9ba93e245f55507b8c287f153e9871946f049b SHA512 5c0091b3fcdf65a53077f7732bbef40a502e1c6d5b2e380bf5a936c107d562190bfcb25e60054ce4eb3531c0cd1a8f589125bd10b5a36add9d3cf40449c22030 WHIRLPOOL 569be7735a53a2038056762e4b27704ad49557f225c1b8eee3a4421064cc2b2a3723af12f4a762a6ef336bf7fd66274a4711a796918202e14367dfb87b8c1e78
+MISC ChangeLog 149174 SHA256 ec3587376f4e5ea9de1fc2db8bbe55d46ae78c1bd3e9b204b009154be2eee718 SHA512 777f6af45ffd1e909b15765e659de99019a28d4e378baf6b91faa8fb204fb27cb85af867bc89df41ed5dadce35cad9afa710b81ca901cc55626949ddb82249d2 WHIRLPOOL 28e7150df15aac0ed761059fa0ce0cd2440652aaaf2d4de3626e2437721b05b7fab9f7d91f0f9721e9b12687645e5673f4ef4489a522ab01ae2dcb761b8e7427
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20141228.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20141228.ebuild
new file mode 100644
index 0000000..4ab5730
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20141228.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans API Support Cluster"
+HOMEPAGE="http://netbeans.org/projects/apisupport"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2014-12-28_00-01-53/zip/netbeans-trunk-nightly-201412280001-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-apisupport/netbeans-apisupport-9999_p20141229.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20141229.ebuild
new file mode 100644
index 0000000..cb671b5
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20141229.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans API Support Cluster"
+HOMEPAGE="http://netbeans.org/projects/apisupport"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2014-12-29_00-01-53/zip/netbeans-trunk-nightly-201412290001-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 a68d9f9..a90ccab 100644
--- a/dev-java/netbeans-cnd/ChangeLog
+++ b/dev-java/netbeans-cnd/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-cnd-9999_p20141229 (29 Dec 2014)
+*netbeans-cnd-9999_p20141228 (29 Dec 2014)
+
+  29 Dec 2014; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-cnd-9999_p20141228.ebuild, +netbeans-cnd-9999_p20141229.ebuild:
+  bumped to the latest sources
+
 *netbeans-cnd-9999_p20141227 (27 Dec 2014)
 
   27 Dec 2014; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index 05a12e7..4505174 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -65,6 +65,8 @@ DIST netbeans-trunk-nightly-201412230001-src.zip 201224939 SHA256 4b0894151a203a
 DIST netbeans-trunk-nightly-201412250001-src.zip 201240621 SHA256 d133ff2185d2c6f5561d9226d16c2db373796f017b009ac16107d7c0b9fda1e4 SHA512 a8a5db63b7644a15051d4fc72ded6b5a11789a6ca73404068b5d7d2a82fdfcee29216d3a056180ebdd7a735468c485b939c1ee9ad012e5bd9632bd4a48cb948f WHIRLPOOL db78e1911db3615eceef7177cb734956c3ad5760ffd802019e2b809546999c579dfe9ec77b2dba0241862f4525eacdd71a3beb3848386fde5cbaf267d9b0e36e
 DIST netbeans-trunk-nightly-201412260001-src.zip 201263552 SHA256 1c168e53c6217da5215d1349a33ff9c8f29006832f1a2453819a83525452468b SHA512 a6b2b605dd50d7b2ad81edb254de2182f2182cbd24d11e61d2f64955a5d9a3ebf32abc20968b27bd72be8b2b41a2cc1dcaf8c54fe51ad82f58deb23716713baf WHIRLPOOL 6fe4efa1dbffc68b4d7f423fadeb897b349c883ee6d3808ddb26b3fd94d57a853731d26e13fa03b4b223412bd12bedcedc6e4807b2779233e69896c706f8ccda
 DIST netbeans-trunk-nightly-201412270001-src.zip 201263552 SHA256 734c2d6a13ac8466921c952831f2890fb0062ccaf79fe0b4ff12b02be55aaa90 SHA512 4015c26df82c49a534e31e14ce72c263589af621c78e1961b85f96fae0d9d61140b1ba66f0a758400c2bf73bed73ddf887f8703ab721f03369fc5363ad3e7f95 WHIRLPOOL 6dc1dc6e5aeb0b28fb750ab0dad64b8b50d919b42d549e78ea354535c6430fe8f52bf06838d4ad7530d7ef77175d0e8d81d6df8952ba0f8c5e1736bc317a8151
+DIST netbeans-trunk-nightly-201412280001-src.zip 201263552 SHA256 9ee16bf46caf062b6173d9e07e91666f09dcf896b91cbf5aa12fe3d8b56c26b9 SHA512 87b2862da5db0abcae2c0a3ed3c95b53be94ecf9d11282c65af96e16fadac25c004c1d404cf5c74bd83ea61c53e102e2cf914b57d91aa2dbb305dd506c56fb8b WHIRLPOOL 6a1d5065e9597a0075a6d3d2adbfe80a3222dab95f198ce7de1f7cf9a7bbb088625f622543524e89a6d2045a9b47b21b999f09d048e52436f81f2d906cbfe695
+DIST netbeans-trunk-nightly-201412290001-src.zip 201263552 SHA256 170477d79b8bf19d65684dec3518bc8b6d344b05dd304b2a950f976a77069b63 SHA512 88f9cbee44a891ac35381a934058f23660d01ae6a072a6253589aecf4864daf4c288124564707f590f199a5428f82eaa6c85508d192970917ef88373788e5b7f WHIRLPOOL ba5464c152dab8532f561fb80812ecade46659f32a5314b32dc318f50c157b123dc1bf7fba6a1e9c447253c0607a83e341ef79ba91fd8f684a10f277b8d9899c
 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
@@ -111,5 +113,7 @@ EBUILD netbeans-cnd-9999_p20141223.ebuild 4586 SHA256 f5ac040a314bf26531da3476f3
 EBUILD netbeans-cnd-9999_p20141225.ebuild 4586 SHA256 f2c0f0903641ce59e1beca15447c2edec0c6af913b3f10162fd082be573b1ec8 SHA512 48f1caf7148c559d73ec40b014db6549c02a93cfe009a4d3b2f1fc4032fd5cda8ad6eae521b6cdcdbe3a61c91d162c5209ee1350f8220db325c6d71054664b61 WHIRLPOOL 62f60fe5a57d558851eadce0aa6566ca5bbed6656855a65343b14bdde7125a185abaa74caeb1a7dc44ccf76fa6f41a670e00f863dd032bc6328442b8494fc181
 EBUILD netbeans-cnd-9999_p20141226.ebuild 4586 SHA256 c739c518cea5687ac9d243769b31349410cb3dda83ff846b6fb02c99f9c6a554 SHA512 626583fa3df075330e19a7728caf9d439397a033d19de0de93b993ce737b06001f9e28daaa3d8b807b4a0050d507b1d7d16f7bc4ace0fb788fbd64e39a1b06da WHIRLPOOL 45a120a8693095f223388fb951960a19ccd3a856d12a8b579de7782d69103970a1bf8786b3df621df275354493c7b3151613aad2032eba1f8ba00f5e43a36842
 EBUILD netbeans-cnd-9999_p20141227.ebuild 4586 SHA256 041bb5175144fbb2c32cc92d074a495180e57f08ea364fa78e06ce26a188246d SHA512 8a9b6db74271b5666865f6bb2e63952faff885ae82da49759a4972b951a3d39c191addbcd8b62a0f6ed7b64e85c09df6c9e6c092e5749332c2649d73be0ef3cb WHIRLPOOL 8b83e0faf07e11708058ca314c7350c6e80dea10e0db3347fed17cc1b166c36c7aa4cf82b9250b5265e8b637c3e5123b4b4ab2b17eaf5d2d1ef6e21f91b4eafe
-MISC ChangeLog 136108 SHA256 aed7a648b5361e7eb7e2f15f4d70d82c676c3f5f8c21a501c296c65580d25183 SHA512 d7f86d4bc515a734d1865d6dfd87a338b0c5793cd91c159a607442cb14f868d5bbbd6cb1c662b7f892bc40e53705d4771e2886c485611339e9f26973e562e003 WHIRLPOOL 5c269244eade51be340e341bb48c2e7dcd98a106f7c19396868a401f4b25b3c38cb62fbe556d28aee02c066cff5cb427ba1a2dcb4cd11378cbfbbef750c7e574
+EBUILD netbeans-cnd-9999_p20141228.ebuild 4586 SHA256 1d873f3d3e1e6319933df8c432e0157446996cf6c54a42db5a60807d6d2c66fe SHA512 1935a028da39d1412e1e07132631688232c8c35b737c4f4b38a22dbae736f72f27cabfce3bf0c686a4b06b59f9910b7a128bc43597f5eea5c037ec47d86e25cf WHIRLPOOL 5f17fc19d4bdbaea1c6f1b9442d4b0dbf1f2cb3a518744c748ac7c02b8d174181bd0d60941db854b9d389a3b902a1222bd43ab5a500aa4973ce4948d67cdc4a6
+EBUILD netbeans-cnd-9999_p20141229.ebuild 4586 SHA256 5215af8434796b584c87ad0aad9803d6675fb2177153a57461b2ccaf36998deb SHA512 9289c26df1053c33cadebe0f728337572b7fa077ec5e353b736b2f94081bb6883825f0a5c718d4b8bc687334725e8fe0497e8614c377b52be3406d2530ff17f6 WHIRLPOOL dd489f3de29475dae03057b16879a15075fdfa79553e03284e1cc2d169ed1f7477bd278ce910d222a6d6f4013c9d582e06fc665eb850827b2b6dbd8f1199ea21
+MISC ChangeLog 136355 SHA256 a4cf9f5f9a7b7a499d7429fb7ec33ea5ce73ba64b62cf1f56b48f68688bfc560 SHA512 c770f3a90b0dd81237cc4fa187aefce3a3f08d85bc04bfcaff445e2141a9894670ca388f1b02830ae3f078ba1577585e1fbd375060738f5fda2a850df223f0b5 WHIRLPOOL dd150b5c2b796588ee29de27dbc2618d85067c7ce4fe24488c5585a0d0293e66ad3e5e0dbe25aca5d2a1807bb0e6ad9a568df8abc38527b89bec480d94f8862d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20141228.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20141228.ebuild
new file mode 100644
index 0000000..64ac8a4
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20141228.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans CND Cluster"
+HOMEPAGE="http://netbeans.org/projects/cnd"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2014-12-28_00-01-53/zip/netbeans-trunk-nightly-201412280001-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-cnd/netbeans-cnd-9999_p20141229.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20141229.ebuild
new file mode 100644
index 0000000..83aac21
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20141229.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans CND Cluster"
+HOMEPAGE="http://netbeans.org/projects/cnd"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2014-12-29_00-01-53/zip/netbeans-trunk-nightly-201412290001-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 123cfb8..6a9a7c3 100644
--- a/dev-java/netbeans-dlight/ChangeLog
+++ b/dev-java/netbeans-dlight/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-dlight-9999_p20141229 (29 Dec 2014)
+*netbeans-dlight-9999_p20141228 (29 Dec 2014)
+
+  29 Dec 2014; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-dlight-9999_p20141228.ebuild,
+  +netbeans-dlight-9999_p20141229.ebuild:
+  bumped to the latest sources
+
 *netbeans-dlight-9999_p20141227 (27 Dec 2014)
 
   27 Dec 2014; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 4a75687..dff6ac7 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -60,6 +60,8 @@ DIST netbeans-trunk-nightly-201412230001-src.zip 201224939 SHA256 4b0894151a203a
 DIST netbeans-trunk-nightly-201412250001-src.zip 201240621 SHA256 d133ff2185d2c6f5561d9226d16c2db373796f017b009ac16107d7c0b9fda1e4 SHA512 a8a5db63b7644a15051d4fc72ded6b5a11789a6ca73404068b5d7d2a82fdfcee29216d3a056180ebdd7a735468c485b939c1ee9ad012e5bd9632bd4a48cb948f WHIRLPOOL db78e1911db3615eceef7177cb734956c3ad5760ffd802019e2b809546999c579dfe9ec77b2dba0241862f4525eacdd71a3beb3848386fde5cbaf267d9b0e36e
 DIST netbeans-trunk-nightly-201412260001-src.zip 201263552 SHA256 1c168e53c6217da5215d1349a33ff9c8f29006832f1a2453819a83525452468b SHA512 a6b2b605dd50d7b2ad81edb254de2182f2182cbd24d11e61d2f64955a5d9a3ebf32abc20968b27bd72be8b2b41a2cc1dcaf8c54fe51ad82f58deb23716713baf WHIRLPOOL 6fe4efa1dbffc68b4d7f423fadeb897b349c883ee6d3808ddb26b3fd94d57a853731d26e13fa03b4b223412bd12bedcedc6e4807b2779233e69896c706f8ccda
 DIST netbeans-trunk-nightly-201412270001-src.zip 201263552 SHA256 734c2d6a13ac8466921c952831f2890fb0062ccaf79fe0b4ff12b02be55aaa90 SHA512 4015c26df82c49a534e31e14ce72c263589af621c78e1961b85f96fae0d9d61140b1ba66f0a758400c2bf73bed73ddf887f8703ab721f03369fc5363ad3e7f95 WHIRLPOOL 6dc1dc6e5aeb0b28fb750ab0dad64b8b50d919b42d549e78ea354535c6430fe8f52bf06838d4ad7530d7ef77175d0e8d81d6df8952ba0f8c5e1736bc317a8151
+DIST netbeans-trunk-nightly-201412280001-src.zip 201263552 SHA256 9ee16bf46caf062b6173d9e07e91666f09dcf896b91cbf5aa12fe3d8b56c26b9 SHA512 87b2862da5db0abcae2c0a3ed3c95b53be94ecf9d11282c65af96e16fadac25c004c1d404cf5c74bd83ea61c53e102e2cf914b57d91aa2dbb305dd506c56fb8b WHIRLPOOL 6a1d5065e9597a0075a6d3d2adbfe80a3222dab95f198ce7de1f7cf9a7bbb088625f622543524e89a6d2045a9b47b21b999f09d048e52436f81f2d906cbfe695
+DIST netbeans-trunk-nightly-201412290001-src.zip 201263552 SHA256 170477d79b8bf19d65684dec3518bc8b6d344b05dd304b2a950f976a77069b63 SHA512 88f9cbee44a891ac35381a934058f23660d01ae6a072a6253589aecf4864daf4c288124564707f590f199a5428f82eaa6c85508d192970917ef88373788e5b7f WHIRLPOOL ba5464c152dab8532f561fb80812ecade46659f32a5314b32dc318f50c157b123dc1bf7fba6a1e9c447253c0607a83e341ef79ba91fd8f684a10f277b8d9899c
 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
@@ -106,5 +108,7 @@ EBUILD netbeans-dlight-9999_p20141223.ebuild 2995 SHA256 732505848b2e4f193bf3eb4
 EBUILD netbeans-dlight-9999_p20141225.ebuild 2995 SHA256 fd741898d297701f21e95b09b69776a37c9f4c2005ae980460d0f3504905cf04 SHA512 3b7c9197aaa0f5d2b3fb74655d00550c4318315b69222bd350ff06d236c41274ab2ff26763e84d1eabadd0ee9ad53093cd00001f1f81079c29c3174418de3fac WHIRLPOOL 942a990050a25f5ba65b6268454fe062368b9432d5a7f0785ef41b44f039bb741db950bcc9421c62adecd8d5edbba476a0e7ed38ecf59d749bfc4f298c946a87
 EBUILD netbeans-dlight-9999_p20141226.ebuild 2995 SHA256 c5a3cc072d264ae2537fb8bf61155f883174bd83df95018a4d5cecdfd27537ee SHA512 b5dd1a50b5754edf7c1fc22578900da6ebca9936e2650da13b201c8215688e985fd6b0389c82e3c35240fa8819a9ca75ec60a62c25ae3876dd47645a36f309c4 WHIRLPOOL ecfeeaad17c54c3b6bacd1ea75e10628dcbbd67e47529e32f8574fb5120a923dc80291b16b4c273b15b6dff9c40f4d7539e82ebfd2af9a141d734844f378e257
 EBUILD netbeans-dlight-9999_p20141227.ebuild 2995 SHA256 c5b7eec3ffda014b148479fda3bedbcc1535e91866f40f0e39a3f213670ecd88 SHA512 25c1ed642c5cb9e8bacb610c85a1beb6610b381c995aa0fe901e2ba3abdc941879b6fe43c24ce83a5bd304a15341dba49d51baa4644f57936d8f62598e651adf WHIRLPOOL 82b327e18739daedbbae13fc61ea88739c40eff5dd428a8e8ce2d107877490e25cc1d6e916a0f735cf993d3fa8c7821547a30e89f04718802d4145c0d3c1cf09
-MISC ChangeLog 141852 SHA256 2cddfd7eb347c2da40aa9bd76b0901808b3a9ffc725eef29ee197d1c6cf98d04 SHA512 dc00d0fb91d10799d0cb1075f97705abbc9fd4ea284f906eb9e6658b604676f6dadc3cc6268f41a4c9b70fcea47669f4134abae10b17b6dc984e0b25e9e0bcb9 WHIRLPOOL bc01dcfe8834c51e4afcb8a198264c69d280941e603cf7c3bb9a7ca84ca76a67c7a7c55637c40aeee69411fd26edd21673ce4d9fd20961690b6182c5173863e4
+EBUILD netbeans-dlight-9999_p20141228.ebuild 2995 SHA256 10688df4558d2df419c84be6dec5328fb5ffa6764c6a85ed5da8f1316512312f SHA512 5e466d3caf5e205f3152ad10de20429c49427477be2342aa65bc70b2a05e6f1e8031413dc422f9e9fec28ec28cc965bd7d2fef7286414f252d30e659c2257266 WHIRLPOOL 9452a3954f515c6f3578914a2ed61ab4bd83b5830065070a9dc78fa39ca6cca56bb58b830208351632bfcaf77c64b027b163df7b66e37b71ceafe98cbf87558d
+EBUILD netbeans-dlight-9999_p20141229.ebuild 2995 SHA256 db88bf5207dd9775285a1a5d153ac92c3c0f8a107a83054d25d4ed1a3703d50a SHA512 6c4b570eabd339400dd82425329abf2cbc677ef9d41638670841fe88280500128c1bcc57c5b920ce5004773693c95050855a23363a6815f1a6d8b7d940abd196 WHIRLPOOL b50e20f6793c372f3b7ce8b9588be0f6f3a2851e564f123340ab1be80e53eb2f7abef52c4cf42e93b65a506ef5248f595a31b29701e8fe20b0092cd4dc20b4e4
+MISC ChangeLog 142113 SHA256 651d4af383efae0809927563ec6f67a82de1feb56d62a7b6c645b221b466e458 SHA512 484096b0822227dff6a5e2682eaa18721383e33bef733bae92c3ee317a7ef88801d1264a9b380863d51bf2ce5ab7e6a2622a30c380f653236a34dd9c1adefa5f WHIRLPOOL db8c9d311acb225bd999fb526ff593d7814519d02746f9c45b022ba3a9ef1b84a0d0cd7976d4a1046a9486234e512d7b66d286c17f45671aac498874b103705f
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20141228.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20141228.ebuild
new file mode 100644
index 0000000..78ddc32
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20141228.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans D-Light Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2014-12-28_00-01-53/zip/netbeans-trunk-nightly-201412280001-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-dlight/netbeans-dlight-9999_p20141229.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20141229.ebuild
new file mode 100644
index 0000000..7554586
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20141229.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans D-Light Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2014-12-29_00-01-53/zip/netbeans-trunk-nightly-201412290001-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 9d89f7e..d1ceecc 100644
--- a/dev-java/netbeans-enterprise/ChangeLog
+++ b/dev-java/netbeans-enterprise/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-enterprise-9999_p20141229 (29 Dec 2014)
+*netbeans-enterprise-9999_p20141228 (29 Dec 2014)
+
+  29 Dec 2014; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-enterprise-9999_p20141228.ebuild,
+  +netbeans-enterprise-9999_p20141229.ebuild:
+  bumped to the latest sources
+
 *netbeans-enterprise-9999_p20141227 (27 Dec 2014)
 
   27 Dec 2014; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 473e7e9..d314a07 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -141,6 +141,8 @@ DIST netbeans-trunk-nightly-201412230001-src.zip 201224939 SHA256 4b0894151a203a
 DIST netbeans-trunk-nightly-201412250001-src.zip 201240621 SHA256 d133ff2185d2c6f5561d9226d16c2db373796f017b009ac16107d7c0b9fda1e4 SHA512 a8a5db63b7644a15051d4fc72ded6b5a11789a6ca73404068b5d7d2a82fdfcee29216d3a056180ebdd7a735468c485b939c1ee9ad012e5bd9632bd4a48cb948f WHIRLPOOL db78e1911db3615eceef7177cb734956c3ad5760ffd802019e2b809546999c579dfe9ec77b2dba0241862f4525eacdd71a3beb3848386fde5cbaf267d9b0e36e
 DIST netbeans-trunk-nightly-201412260001-src.zip 201263552 SHA256 1c168e53c6217da5215d1349a33ff9c8f29006832f1a2453819a83525452468b SHA512 a6b2b605dd50d7b2ad81edb254de2182f2182cbd24d11e61d2f64955a5d9a3ebf32abc20968b27bd72be8b2b41a2cc1dcaf8c54fe51ad82f58deb23716713baf WHIRLPOOL 6fe4efa1dbffc68b4d7f423fadeb897b349c883ee6d3808ddb26b3fd94d57a853731d26e13fa03b4b223412bd12bedcedc6e4807b2779233e69896c706f8ccda
 DIST netbeans-trunk-nightly-201412270001-src.zip 201263552 SHA256 734c2d6a13ac8466921c952831f2890fb0062ccaf79fe0b4ff12b02be55aaa90 SHA512 4015c26df82c49a534e31e14ce72c263589af621c78e1961b85f96fae0d9d61140b1ba66f0a758400c2bf73bed73ddf887f8703ab721f03369fc5363ad3e7f95 WHIRLPOOL 6dc1dc6e5aeb0b28fb750ab0dad64b8b50d919b42d549e78ea354535c6430fe8f52bf06838d4ad7530d7ef77175d0e8d81d6df8952ba0f8c5e1736bc317a8151
+DIST netbeans-trunk-nightly-201412280001-src.zip 201263552 SHA256 9ee16bf46caf062b6173d9e07e91666f09dcf896b91cbf5aa12fe3d8b56c26b9 SHA512 87b2862da5db0abcae2c0a3ed3c95b53be94ecf9d11282c65af96e16fadac25c004c1d404cf5c74bd83ea61c53e102e2cf914b57d91aa2dbb305dd506c56fb8b WHIRLPOOL 6a1d5065e9597a0075a6d3d2adbfe80a3222dab95f198ce7de1f7cf9a7bbb088625f622543524e89a6d2045a9b47b21b999f09d048e52436f81f2d906cbfe695
+DIST netbeans-trunk-nightly-201412290001-src.zip 201263552 SHA256 170477d79b8bf19d65684dec3518bc8b6d344b05dd304b2a950f976a77069b63 SHA512 88f9cbee44a891ac35381a934058f23660d01ae6a072a6253589aecf4864daf4c288124564707f590f199a5428f82eaa6c85508d192970917ef88373788e5b7f WHIRLPOOL ba5464c152dab8532f561fb80812ecade46659f32a5314b32dc318f50c157b123dc1bf7fba6a1e9c447253c0607a83e341ef79ba91fd8f684a10f277b8d9899c
 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
@@ -187,5 +189,7 @@ EBUILD netbeans-enterprise-9999_p20141223.ebuild 15147 SHA256 2ed1fbaae58f8362c4
 EBUILD netbeans-enterprise-9999_p20141225.ebuild 15147 SHA256 46bf10e39c9eacd2cba2a37e506392ffd99167ec64de69650431bacaee79bf57 SHA512 804ed927eef4a8e6ff4201e80e969ea7660dfcaa72ff375b881cfac732894da401a2297fccaa8ad108c3a23da2c933b6eb0c414b1e99d596dce81b64ea5cc3b5 WHIRLPOOL 20a861dce69ef9251fbe9a38e0f1eefaefb32108867dce104e04fdc9ac5857e348945d3b35da85f3779f5334c23283294d1a144479205fc4a6b3915078765f4b
 EBUILD netbeans-enterprise-9999_p20141226.ebuild 15147 SHA256 1836833db92a6ffc6f80b523dedc49b0040a7d3314be54a561c01b50e51f8f3b SHA512 ee6162751fc6364464397ad341e849b7b25b13926984b4213d97b2f73af3f11e6c7b2558014ac26a8bfe1a96b5b485bd919dd7fb15d50a28363017d765ae9b29 WHIRLPOOL 87ec7fda316d956a9156d0fcf777b48961f1137dace7c4c05dc7ac86b03f00819179542d6b28a31a4fb42735275872e66684870c34ad66dd45c67074aef33968
 EBUILD netbeans-enterprise-9999_p20141227.ebuild 15147 SHA256 e90ca29be30850ba4b79cfd4b491600108f67a67ce6cd45cff707cb4340aef95 SHA512 e9e76b0919174dd4cb3c5c3c79b620772fba446a6d3842d69eb72eee1e4589104d050ba50e2debf3d32afadc5d118021dbc03424ceac1cae48e6dfb6867aa2df WHIRLPOOL b09a377d7c44694a07ccf8cdd06497d96be2f320533e0f62c6842cdb774d18903f10c0d29886a236352e1e1251b612a2342e3561ed063af2b8a6a2db6db68680
-MISC ChangeLog 149422 SHA256 bddd7e72203cb6ae117f605beff31e83d4b068726d7fc7b12e41360d4ab52adc SHA512 360606b2b7fc8c8256cd4d8a9b45e24148251d0081dc82abcecca295f73d61430d66d1308dba78ac63611c389ce7fcdd76d8b588c1a5c32b5746df79bc73f5ef WHIRLPOOL 6faa1829215b68549379592816014dadb94c038397f128c6dc5fadc3cd639ef7b06b41fa875235d29a88a1c553451812ab9b819423b61f2f66ac26a4283b9c9c
+EBUILD netbeans-enterprise-9999_p20141228.ebuild 15147 SHA256 13e5b5107036ca64550bc6e8e610f13f6caa20c84fc431a341fb710e06a27c86 SHA512 74fdbe4f7d682d05a1bba1c8f8a960b759584841f4e090073efa8200613ff5594faffd9376b37357a255c6661b2c71699485040e986a04d5cbd4f801bef05fe3 WHIRLPOOL 1e9ed8d7d8158b525d1fd16908cd680db6d2369e7c14c5e5e73f12fa5ccc730db13dd35236b2afe89fe3f73e6299daa3a1157dbe43b365673ba7166ea71cd3e3
+EBUILD netbeans-enterprise-9999_p20141229.ebuild 15147 SHA256 8a69043270ca422fbafd8c6e6e30f6f11d55e70448c5341370476dfbd695a678 SHA512 77e46c03563a46c683b4e767fd36c353ffe4acd0ab286d27f0f7290877606fb5873811fd263cc88a3016b79d1caf00ffd9df3892b3653917be82cc95f4b79eb1 WHIRLPOOL 525e042a0d3633487ec579437519b308669b2dd6b9acfca9981cb7f12827911a167873ee9f22e83b54dd5cf879857b55ccf152b2b3b043e07e27f9aa9dd3332a
+MISC ChangeLog 149699 SHA256 80ad82e645e9016c09bc37aed535b718622675faf51c5299d755205b3abc3369 SHA512 bf65b45a093f590d4730eae3ee928b9a0254d4e2475f2b8c07e33621a878bae0390ab6d29e78ebcc34d8b7662d3398b2886cfab2714cf4dd98520fa59e7ac954 WHIRLPOOL 04a9cba20cb7bfd45984041f11e7f58e8fc1cf441b7e4c1fe98adc9e34c35b667efe217fa5f7200b45885fdd8f8ba9f99d73c46fdbe44bd18b5c82a1def09e8f
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20141228.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20141228.ebuild
new file mode 100644
index 0000000..80e934b
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20141228.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Enterprise cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2014-12-28_00-01-53/zip/netbeans-trunk-nightly-201412280001-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-enterprise/netbeans-enterprise-9999_p20141229.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20141229.ebuild
new file mode 100644
index 0000000..67bbca3
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20141229.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Enterprise cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2014-12-29_00-01-53/zip/netbeans-trunk-nightly-201412290001-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 ee83a12..e2e1f1a 100644
--- a/dev-java/netbeans-ergonomics/ChangeLog
+++ b/dev-java/netbeans-ergonomics/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-ergonomics-9999_p20141229 (29 Dec 2014)
+*netbeans-ergonomics-9999_p20141228 (29 Dec 2014)
+
+  29 Dec 2014; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-ergonomics-9999_p20141228.ebuild,
+  +netbeans-ergonomics-9999_p20141229.ebuild:
+  bumped to the latest sources
+
 *netbeans-ergonomics-9999_p20141227 (27 Dec 2014)
 
   27 Dec 2014; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 4d21c64..8eaffe4 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -52,6 +52,8 @@ DIST netbeans-trunk-nightly-201412230001-src.zip 201224939 SHA256 4b0894151a203a
 DIST netbeans-trunk-nightly-201412250001-src.zip 201240621 SHA256 d133ff2185d2c6f5561d9226d16c2db373796f017b009ac16107d7c0b9fda1e4 SHA512 a8a5db63b7644a15051d4fc72ded6b5a11789a6ca73404068b5d7d2a82fdfcee29216d3a056180ebdd7a735468c485b939c1ee9ad012e5bd9632bd4a48cb948f WHIRLPOOL db78e1911db3615eceef7177cb734956c3ad5760ffd802019e2b809546999c579dfe9ec77b2dba0241862f4525eacdd71a3beb3848386fde5cbaf267d9b0e36e
 DIST netbeans-trunk-nightly-201412260001-src.zip 201263552 SHA256 1c168e53c6217da5215d1349a33ff9c8f29006832f1a2453819a83525452468b SHA512 a6b2b605dd50d7b2ad81edb254de2182f2182cbd24d11e61d2f64955a5d9a3ebf32abc20968b27bd72be8b2b41a2cc1dcaf8c54fe51ad82f58deb23716713baf WHIRLPOOL 6fe4efa1dbffc68b4d7f423fadeb897b349c883ee6d3808ddb26b3fd94d57a853731d26e13fa03b4b223412bd12bedcedc6e4807b2779233e69896c706f8ccda
 DIST netbeans-trunk-nightly-201412270001-src.zip 201263552 SHA256 734c2d6a13ac8466921c952831f2890fb0062ccaf79fe0b4ff12b02be55aaa90 SHA512 4015c26df82c49a534e31e14ce72c263589af621c78e1961b85f96fae0d9d61140b1ba66f0a758400c2bf73bed73ddf887f8703ab721f03369fc5363ad3e7f95 WHIRLPOOL 6dc1dc6e5aeb0b28fb750ab0dad64b8b50d919b42d549e78ea354535c6430fe8f52bf06838d4ad7530d7ef77175d0e8d81d6df8952ba0f8c5e1736bc317a8151
+DIST netbeans-trunk-nightly-201412280001-src.zip 201263552 SHA256 9ee16bf46caf062b6173d9e07e91666f09dcf896b91cbf5aa12fe3d8b56c26b9 SHA512 87b2862da5db0abcae2c0a3ed3c95b53be94ecf9d11282c65af96e16fadac25c004c1d404cf5c74bd83ea61c53e102e2cf914b57d91aa2dbb305dd506c56fb8b WHIRLPOOL 6a1d5065e9597a0075a6d3d2adbfe80a3222dab95f198ce7de1f7cf9a7bbb088625f622543524e89a6d2045a9b47b21b999f09d048e52436f81f2d906cbfe695
+DIST netbeans-trunk-nightly-201412290001-src.zip 201263552 SHA256 170477d79b8bf19d65684dec3518bc8b6d344b05dd304b2a950f976a77069b63 SHA512 88f9cbee44a891ac35381a934058f23660d01ae6a072a6253589aecf4864daf4c288124564707f590f199a5428f82eaa6c85508d192970917ef88373788e5b7f WHIRLPOOL ba5464c152dab8532f561fb80812ecade46659f32a5314b32dc318f50c157b123dc1bf7fba6a1e9c447253c0607a83e341ef79ba91fd8f684a10f277b8d9899c
 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
@@ -98,5 +100,7 @@ EBUILD netbeans-ergonomics-9999_p20141223.ebuild 2919 SHA256 8268a963c094bd66d04
 EBUILD netbeans-ergonomics-9999_p20141225.ebuild 2919 SHA256 0162cb8c27e24eaa43a6bbdaa8601b062b63b54ac9d03f652c83cfa10ed1a9cf SHA512 13f6591385babd205008d6f6e7b8d0c262bdaa14e97b1f883133eca50a4fceda61251e1e7fcfc83be1d275f04ef4e4c2ffece41a69282df29b69fe168a1256c6 WHIRLPOOL 59a69920244e8495faac8adf7f766a50e69d052826faa5e88db79679e31fcd85063debd51a042ea2619e8bcf50d7e2822aa989d9c44a8285ee76ab320ab429ff
 EBUILD netbeans-ergonomics-9999_p20141226.ebuild 2919 SHA256 9fde4d04556b9f2d72fb15a8851824989fd03910a3ce8ea75c0a01189bf638a5 SHA512 918d0ea48bd45db3db3da9c00316fc4fe831f4e7645a6d6a59b05e35905c6adfdf10377bce0ba644e76dcf57d7a644a189f1683c1bb577dcab297628380ffab2 WHIRLPOOL 5a1a7e920cb0ef9c4fd7fec4ae22646cad804eeb3fa134c90ab1636b7f1af0f9c06c737e2f3af2fc8056374f81ded1f5813b7e4acac4ce4f516f1f2309692444
 EBUILD netbeans-ergonomics-9999_p20141227.ebuild 2919 SHA256 eb8c39f49f079fc96da5948725c53b47df82c42437e5d981653d3c115cc58607 SHA512 2a932ec6e2b96bc6a9e2fb38bad8e7d84dae0cf3c496ceef6685deef5371845c7d0b55527f879631a874af8e6f9025154e3e40d1eeeeebd5647a810d4ac19a00 WHIRLPOOL 2a5e83735d222ca28ef343c1d0c4f4b6997eaecd19b109aaf540f95b9323a9dcdfca0dcb0cfcc601bde7510d598234938bc84787cb235e8338246a88f74707fe
-MISC ChangeLog 148897 SHA256 2c55b6bb34105da5f493e9448d658e52eadc38a960547e5ce46e1c15bf9bbb7f SHA512 8fa2851f525787313afeeafeaa44043a36dbc464f6b836d9dbe64caf9174b1d565e4ef153a3c388264aadd543d9cb8c531c0acf26d7d8aa8a11dad5e915d845f WHIRLPOOL eebc5ced08095fbc9f02adf7f1b77e2a56a25ee67682088bfb9c2459d977bc35646491ba548188aa412e78e4662b2709d18962c8bacf49eaac2edd07b90a7f38
+EBUILD netbeans-ergonomics-9999_p20141228.ebuild 2919 SHA256 fbbe73a8c66ab61546c4d0cf9ebc03bd9661e9921f6526cc1a8e738da1d9ab15 SHA512 2d1e74d4f2798dcb93dd01c4f1bb75fbc155e5e54b123da108c46c82916926f22be77f38019b8e1c9c6eecf85a78b82720f7e96f4cdca39afab1c718716c740f WHIRLPOOL c00abc3f22370c2f4f9a989435bd1305b0df6b63c4b812ec8463cb0e2d14a2f67ced0bc440c584b1ca121f4c80d088b2e4f610986fda724f0c98f802cd3c8139
+EBUILD netbeans-ergonomics-9999_p20141229.ebuild 2919 SHA256 d9ad1d2b6b8acfb15a835ab6a68595724c9659309b616942172384f43e89431d SHA512 23950cfe5794b96beedd8af3af8e838b5afabed0edec9311f625a0670406bb8136a800aa5b1401586fe5c8217434d919f9f2fad30a40189a3b4d543e4ef10d9c WHIRLPOOL ebb4397631667efd9a4ec5c9d23dcbf94e7911a00a55fbcce13a452362834cf0cdec77426c67feca7d97ff9cefac7a1eab21b26b4d0488047057c1cf2d1e2f01
+MISC ChangeLog 149174 SHA256 afcb806e230efab046e21f18b777c4e0b89dda33233314b132070adea4b4d407 SHA512 99acee85c578e59857e22d95d503939116f8899c0e921cf9cabebfbc9750cc54a6bfad54894ecf69ff7c035c8bb4073077a559fcb89486032e73474363aa5066 WHIRLPOOL f1ab81e08773d9f1694649c742f6102b2fc3320b92ef2257eeeef3e224c4650c906425eb5d224836b571b2ab70c34249134914818cf489fb575aa5a5ef77f483
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20141228.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20141228.ebuild
new file mode 100644
index 0000000..85d2195
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20141228.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Ergonomics Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2014-12-28_00-01-53/zip/netbeans-trunk-nightly-201412280001-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-ergonomics/netbeans-ergonomics-9999_p20141229.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20141229.ebuild
new file mode 100644
index 0000000..1f8dd9d
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20141229.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Ergonomics Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2014-12-29_00-01-53/zip/netbeans-trunk-nightly-201412290001-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 0937ff9..f212ee2 100644
--- a/dev-java/netbeans-extide/ChangeLog
+++ b/dev-java/netbeans-extide/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-extide-9999_p20141229 (29 Dec 2014)
+*netbeans-extide-9999_p20141228 (29 Dec 2014)
+
+  29 Dec 2014; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-extide-9999_p20141228.ebuild,
+  +netbeans-extide-9999_p20141229.ebuild:
+  bumped to the latest sources
+
 *netbeans-extide-9999_p20141227 (27 Dec 2014)
 
   27 Dec 2014; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index 0985f62..8080e8d 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -50,6 +50,8 @@ DIST netbeans-trunk-nightly-201412230001-src.zip 201224939 SHA256 4b0894151a203a
 DIST netbeans-trunk-nightly-201412250001-src.zip 201240621 SHA256 d133ff2185d2c6f5561d9226d16c2db373796f017b009ac16107d7c0b9fda1e4 SHA512 a8a5db63b7644a15051d4fc72ded6b5a11789a6ca73404068b5d7d2a82fdfcee29216d3a056180ebdd7a735468c485b939c1ee9ad012e5bd9632bd4a48cb948f WHIRLPOOL db78e1911db3615eceef7177cb734956c3ad5760ffd802019e2b809546999c579dfe9ec77b2dba0241862f4525eacdd71a3beb3848386fde5cbaf267d9b0e36e
 DIST netbeans-trunk-nightly-201412260001-src.zip 201263552 SHA256 1c168e53c6217da5215d1349a33ff9c8f29006832f1a2453819a83525452468b SHA512 a6b2b605dd50d7b2ad81edb254de2182f2182cbd24d11e61d2f64955a5d9a3ebf32abc20968b27bd72be8b2b41a2cc1dcaf8c54fe51ad82f58deb23716713baf WHIRLPOOL 6fe4efa1dbffc68b4d7f423fadeb897b349c883ee6d3808ddb26b3fd94d57a853731d26e13fa03b4b223412bd12bedcedc6e4807b2779233e69896c706f8ccda
 DIST netbeans-trunk-nightly-201412270001-src.zip 201263552 SHA256 734c2d6a13ac8466921c952831f2890fb0062ccaf79fe0b4ff12b02be55aaa90 SHA512 4015c26df82c49a534e31e14ce72c263589af621c78e1961b85f96fae0d9d61140b1ba66f0a758400c2bf73bed73ddf887f8703ab721f03369fc5363ad3e7f95 WHIRLPOOL 6dc1dc6e5aeb0b28fb750ab0dad64b8b50d919b42d549e78ea354535c6430fe8f52bf06838d4ad7530d7ef77175d0e8d81d6df8952ba0f8c5e1736bc317a8151
+DIST netbeans-trunk-nightly-201412280001-src.zip 201263552 SHA256 9ee16bf46caf062b6173d9e07e91666f09dcf896b91cbf5aa12fe3d8b56c26b9 SHA512 87b2862da5db0abcae2c0a3ed3c95b53be94ecf9d11282c65af96e16fadac25c004c1d404cf5c74bd83ea61c53e102e2cf914b57d91aa2dbb305dd506c56fb8b WHIRLPOOL 6a1d5065e9597a0075a6d3d2adbfe80a3222dab95f198ce7de1f7cf9a7bbb088625f622543524e89a6d2045a9b47b21b999f09d048e52436f81f2d906cbfe695
+DIST netbeans-trunk-nightly-201412290001-src.zip 201263552 SHA256 170477d79b8bf19d65684dec3518bc8b6d344b05dd304b2a950f976a77069b63 SHA512 88f9cbee44a891ac35381a934058f23660d01ae6a072a6253589aecf4864daf4c288124564707f590f199a5428f82eaa6c85508d192970917ef88373788e5b7f WHIRLPOOL ba5464c152dab8532f561fb80812ecade46659f32a5314b32dc318f50c157b123dc1bf7fba6a1e9c447253c0607a83e341ef79ba91fd8f684a10f277b8d9899c
 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
@@ -92,5 +94,7 @@ EBUILD netbeans-extide-9999_p20141223.ebuild 3383 SHA256 8a2df77f92dc1381c89a82c
 EBUILD netbeans-extide-9999_p20141225.ebuild 3383 SHA256 688d688f3a832807e5a6c6c9afc0569097542b966b065fa60a2ebfa4208c14b8 SHA512 aa018b5f318da66f292a23b20a24f04dffde9d3db28270b4ced877045d86e5d631ef927098b780857bdf64a3f353c93de3a028313d3a276b84642cf5f03fadc3 WHIRLPOOL 1f3e1ca8bae217a36f230b1fab2aa4e6f09e7f95314b27dd824e102155972eef72f4a37e62f47f9f68a7d26ab508e68049cacd9a7fb913b065d2673ddedb009b
 EBUILD netbeans-extide-9999_p20141226.ebuild 3383 SHA256 8f11bf855a40ec43a5369a5da0bc7357709b5ab510de4b9378c564fe21fc6f56 SHA512 225a2b28fd648df68b7c939f8cbc64ac4bc9d962dd297343b479a10946b9016d64f6bbcc0ffba9a62877d59ba0ae9397423fde5343ac7534c9f60c01709e29be WHIRLPOOL cf9af7295fe8b4410b71e9fa20ef7cd69e5aac5ff03f09eca3ba04c7b895abedf817fdee1157f4875e9278876f65755309909bf1f8319537f0f9745f4ba83313
 EBUILD netbeans-extide-9999_p20141227.ebuild 3383 SHA256 1347a8d4d69d7712f7aa136a5d6b1ae7f05357ec755e49bdb610039d3a1f94d2 SHA512 708c4b543a38ef091422918dd87e1f4b8c5db74b9eb02eaeb166b7c662ed0c1f96720b4435a699ac4f75d38e1015b4c04fd35f36fa476ee4f3e2a05463c972e9 WHIRLPOOL 611387bff065a95285d76aa869d43e88c0a582c2c7b5bd4a254beff2019407df7e48df59d7e20af3aa9678c4b90bd57c32caae54904ca0ec57a0f4b6168675da
-MISC ChangeLog 73864 SHA256 7d6741edf11edaecbbff8b8c463301731231a3020848d00c8b52d484ba2e29d5 SHA512 33bac48cb1044f7a38a858135d6657519d26af7c93e602479be59af26745792ba9017e882184eb462a36b07474ef1925883ad3155e3672bb5d504eca2d3a660d WHIRLPOOL d13adf734e26e12efa8931f3e6ba1c03c8a3c084128537ffe55a6aa232624be29f3f1ad797e705aafae229c09e15c466d101d11de23b9e3077719bf116dd6f8d
+EBUILD netbeans-extide-9999_p20141228.ebuild 3383 SHA256 9d4a18faede72f0f93bf1b8964c27ec05a29c4a64c5392914310c8d0ad6bcbb4 SHA512 2913788f4965aec8fd919ff910465c4bcd387242129af95995c06d57e50d9c12f68b1ce0432a70b9cc7c5b04b9819c0ec4d5e3c9186a71cfe29503b0bfb13ed0 WHIRLPOOL 743e752ef78b76ced361cd95546bbe5d8fdf674e5ba8bdf75d2508dd9de1af7724e0f7bf59c578c3f8cb8f756691197284141235cf60d75032bb7d2d4d039585
+EBUILD netbeans-extide-9999_p20141229.ebuild 3383 SHA256 c43a52ac5625a26bcd3b7853123611f896648f2ce3ad0617b1d4dab72e1da776 SHA512 d48c3511d727ef706d44cd2be5f62f38c8066959a105652a35aee2b04c28e79215329dd48c69afb41935ca1292a4f7ce9204cb1f60a4d2ecb94ae9ec60b988e4 WHIRLPOOL ee81f1d75f46e4429c7788cf80d8d346b24daa69cbca180e11d7b6c5348ea9812036ac4e488f206f7824b9d7db61f78f94118bdc24cf0eae5be0b1480e610215
+MISC ChangeLog 74125 SHA256 22fbf6621a2bddead420919edf2178e2415ebae5d068ff524cdd491874d66b44 SHA512 dea85f64ed4b5f324855357174e2540a219b653366bc877c5bc275bd15cb4bcb95dba7bf82db4c2b073b8873dbb975d58db5fce85776a6eb49598d3828db0c61 WHIRLPOOL 1db620c2197bbd86629d28b173355fadfd038510a096a7111ab67158a637b23d2dd865cbbb045c06eb5f5e8142f34cdd266f7f9df5be5c91453c2d1556159786
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20141228.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20141228.ebuild
new file mode 100644
index 0000000..a81b0dd
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20141228.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans ExtIDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2014-12-28_00-01-53/zip/netbeans-trunk-nightly-201412280001-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-extide/netbeans-extide-9999_p20141229.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20141229.ebuild
new file mode 100644
index 0000000..f1cfeda
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20141229.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans ExtIDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2014-12-29_00-01-53/zip/netbeans-trunk-nightly-201412290001-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 cf30efc..7b26734 100644
--- a/dev-java/netbeans-groovy/ChangeLog
+++ b/dev-java/netbeans-groovy/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-groovy-9999_p20141229 (29 Dec 2014)
+*netbeans-groovy-9999_p20141228 (29 Dec 2014)
+
+  29 Dec 2014; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-groovy-9999_p20141228.ebuild,
+  +netbeans-groovy-9999_p20141229.ebuild:
+  bumped to the latest sources
+
 *netbeans-groovy-9999_p20141227 (27 Dec 2014)
 
   27 Dec 2014; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index 91bfa75..eacf750 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -56,6 +56,8 @@ DIST netbeans-trunk-nightly-201412230001-src.zip 201224939 SHA256 4b0894151a203a
 DIST netbeans-trunk-nightly-201412250001-src.zip 201240621 SHA256 d133ff2185d2c6f5561d9226d16c2db373796f017b009ac16107d7c0b9fda1e4 SHA512 a8a5db63b7644a15051d4fc72ded6b5a11789a6ca73404068b5d7d2a82fdfcee29216d3a056180ebdd7a735468c485b939c1ee9ad012e5bd9632bd4a48cb948f WHIRLPOOL db78e1911db3615eceef7177cb734956c3ad5760ffd802019e2b809546999c579dfe9ec77b2dba0241862f4525eacdd71a3beb3848386fde5cbaf267d9b0e36e
 DIST netbeans-trunk-nightly-201412260001-src.zip 201263552 SHA256 1c168e53c6217da5215d1349a33ff9c8f29006832f1a2453819a83525452468b SHA512 a6b2b605dd50d7b2ad81edb254de2182f2182cbd24d11e61d2f64955a5d9a3ebf32abc20968b27bd72be8b2b41a2cc1dcaf8c54fe51ad82f58deb23716713baf WHIRLPOOL 6fe4efa1dbffc68b4d7f423fadeb897b349c883ee6d3808ddb26b3fd94d57a853731d26e13fa03b4b223412bd12bedcedc6e4807b2779233e69896c706f8ccda
 DIST netbeans-trunk-nightly-201412270001-src.zip 201263552 SHA256 734c2d6a13ac8466921c952831f2890fb0062ccaf79fe0b4ff12b02be55aaa90 SHA512 4015c26df82c49a534e31e14ce72c263589af621c78e1961b85f96fae0d9d61140b1ba66f0a758400c2bf73bed73ddf887f8703ab721f03369fc5363ad3e7f95 WHIRLPOOL 6dc1dc6e5aeb0b28fb750ab0dad64b8b50d919b42d549e78ea354535c6430fe8f52bf06838d4ad7530d7ef77175d0e8d81d6df8952ba0f8c5e1736bc317a8151
+DIST netbeans-trunk-nightly-201412280001-src.zip 201263552 SHA256 9ee16bf46caf062b6173d9e07e91666f09dcf896b91cbf5aa12fe3d8b56c26b9 SHA512 87b2862da5db0abcae2c0a3ed3c95b53be94ecf9d11282c65af96e16fadac25c004c1d404cf5c74bd83ea61c53e102e2cf914b57d91aa2dbb305dd506c56fb8b WHIRLPOOL 6a1d5065e9597a0075a6d3d2adbfe80a3222dab95f198ce7de1f7cf9a7bbb088625f622543524e89a6d2045a9b47b21b999f09d048e52436f81f2d906cbfe695
+DIST netbeans-trunk-nightly-201412290001-src.zip 201263552 SHA256 170477d79b8bf19d65684dec3518bc8b6d344b05dd304b2a950f976a77069b63 SHA512 88f9cbee44a891ac35381a934058f23660d01ae6a072a6253589aecf4864daf4c288124564707f590f199a5428f82eaa6c85508d192970917ef88373788e5b7f WHIRLPOOL ba5464c152dab8532f561fb80812ecade46659f32a5314b32dc318f50c157b123dc1bf7fba6a1e9c447253c0607a83e341ef79ba91fd8f684a10f277b8d9899c
 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
@@ -102,5 +104,7 @@ EBUILD netbeans-groovy-9999_p20141223.ebuild 3422 SHA256 db757f30da26473585f77ac
 EBUILD netbeans-groovy-9999_p20141225.ebuild 3422 SHA256 8adb3f378b62dd3be4dae648cf9daa6322a7df95b861c88f6cf45c4572865abe SHA512 1db9959b4fa38b788d90c37ef32f555785937c29dca8ac49155228ec6d87c67d622e6c2617bbb1cb9d66c52c23338740c61813428a4d8c1307efb22b432bf3bc WHIRLPOOL 345c09f337b4207362a9db64cc9a0130edad913e6362830b15bb3aae2df7d4a71bd7403c98f6d7912b94bc87766feb32fcb1e0506d3c50d3e02cb2b1311d5674
 EBUILD netbeans-groovy-9999_p20141226.ebuild 3422 SHA256 115a66722af0489dd3b218dea870af32bfb9df6974e3d6310a1810b26bfacb75 SHA512 0e74e020364058feccfad9e4807c39b1a4942cb85240e2eda57efd62c32618c377e02968a5b82bce9b4b40f33073a3441916980a4a7df6248ffcb506cd0f0679 WHIRLPOOL 5fbce21ed4823e050b7676d106da7aa78da2db813a7a7d46ba2a6a7453c51890231d843b8d62bd5c30b94ec3f458cc566b13efea56441853135c3f3f49f32443
 EBUILD netbeans-groovy-9999_p20141227.ebuild 3422 SHA256 388028b0b2920ee8a1ea29c6344b040651d89b194ee3a0da34526a1188bb59c4 SHA512 601992fb465458fb35652b7d59823086aaad4962c87fb1647c1f6a59c7fe6edce0ffb9064864617a1d8e0a676512461919603763d5a1c7b9843600905ed520fa WHIRLPOOL 2d6b47b911ca7ad2902781135a6a07ad05afdd014a045d211bc7e173f035d7f64512fc3bb6cb06b85350dd85aea7349424a350d1770687116cf3724bc3fe0ef0
-MISC ChangeLog 141844 SHA256 09a6ddc08184dca5439675e08994b2967d89129733cb736671bc4e4698fcd196 SHA512 6bf8032e179792232871e4653d28a6c9a1eae444a7003a75f6e70d7545e3d5c05635bbcbe933c1e570872b05b10117790be728c7887b631f939804dfb23d8c0b WHIRLPOOL 9ed78f865d279a343a2804ea114773e331c8d15669dc0ca3f58180a07a7046175c1a10ab603a26f7c98f8bcd673f71ee6567a98b4b6beed9a49fc845d28e123a
+EBUILD netbeans-groovy-9999_p20141228.ebuild 3422 SHA256 ec4a2131cca521aa7fc7dc504ef934c8150f66033dd5c0583ec11cde03a152cc SHA512 76e601e796918d681001a2643720dc6ca753eb9f37f4c812069e1494dc0ad5f00b3f2cea0a617023c07f1fa28c4c520205ea95404c6df4460a7a49525d894fa4 WHIRLPOOL d5825ee395faccd9656417cbb866487caa420559f7631849572c7929d17c9404ed0a78cb134871e0e1e9700963878e64bf091c2645980f1a2887e8b7b597b6a3
+EBUILD netbeans-groovy-9999_p20141229.ebuild 3422 SHA256 5487c82152dcb008fc81e81c91d13fbb37c890e99d63010889668241c44d4051 SHA512 475864627aefa7d23b6aadc324528a3fd0c50ef2357e1b7443b498cadf6233c8895685ab0f44d8783db973a750dfa1cba8e2fe49fcace4b604a02d7740bad458 WHIRLPOOL 29b7ed80fec635fa9a0360c8201275b629e4c5f182946b1875c6f0056a736c06216ad7773dd15402e8d141acef2ca9629abdf10abf05207cecacb855a6efca5f
+MISC ChangeLog 142105 SHA256 ed546f7589b4ca859251e542a7c8405a210879e0d357e88f78dd6ee7b497eaab SHA512 62b3569a5b423c3c4c52a722ed4c9de0b285638c425591482c47b75b2812b0e46b7e93f9b6ce7670e691907975abbea6ecfb58f00936babcba230284fd2da76b WHIRLPOOL 7350f9491a41f18ee299d9084ba1b40a9601cf702b30330ffd5409d80829d4eabc05cdbce1f125dba36febe968bcc7124d5b53a5670487e9d66684a9f872484e
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20141228.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20141228.ebuild
new file mode 100644
index 0000000..fcc2dee
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20141228.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Groovy Cluster"
+HOMEPAGE="http://netbeans.org/projects/groovy"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2014-12-28_00-01-53/zip/netbeans-trunk-nightly-201412280001-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-groovy/netbeans-groovy-9999_p20141229.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20141229.ebuild
new file mode 100644
index 0000000..91d7ea4
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20141229.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Groovy Cluster"
+HOMEPAGE="http://netbeans.org/projects/groovy"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2014-12-29_00-01-53/zip/netbeans-trunk-nightly-201412290001-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 fd1eed0..30160ef 100644
--- a/dev-java/netbeans-harness/ChangeLog
+++ b/dev-java/netbeans-harness/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-harness-9999_p20141229 (29 Dec 2014)
+*netbeans-harness-9999_p20141228 (29 Dec 2014)
+
+  29 Dec 2014; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-harness-9999_p20141228.ebuild,
+  +netbeans-harness-9999_p20141229.ebuild:
+  bumped to the latest sources
+
 *netbeans-harness-9999_p20141227 (27 Dec 2014)
 
   27 Dec 2014; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index e432d88..83c70db 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -58,6 +58,8 @@ DIST netbeans-trunk-nightly-201412230001-src.zip 201224939 SHA256 4b0894151a203a
 DIST netbeans-trunk-nightly-201412250001-src.zip 201240621 SHA256 d133ff2185d2c6f5561d9226d16c2db373796f017b009ac16107d7c0b9fda1e4 SHA512 a8a5db63b7644a15051d4fc72ded6b5a11789a6ca73404068b5d7d2a82fdfcee29216d3a056180ebdd7a735468c485b939c1ee9ad012e5bd9632bd4a48cb948f WHIRLPOOL db78e1911db3615eceef7177cb734956c3ad5760ffd802019e2b809546999c579dfe9ec77b2dba0241862f4525eacdd71a3beb3848386fde5cbaf267d9b0e36e
 DIST netbeans-trunk-nightly-201412260001-src.zip 201263552 SHA256 1c168e53c6217da5215d1349a33ff9c8f29006832f1a2453819a83525452468b SHA512 a6b2b605dd50d7b2ad81edb254de2182f2182cbd24d11e61d2f64955a5d9a3ebf32abc20968b27bd72be8b2b41a2cc1dcaf8c54fe51ad82f58deb23716713baf WHIRLPOOL 6fe4efa1dbffc68b4d7f423fadeb897b349c883ee6d3808ddb26b3fd94d57a853731d26e13fa03b4b223412bd12bedcedc6e4807b2779233e69896c706f8ccda
 DIST netbeans-trunk-nightly-201412270001-src.zip 201263552 SHA256 734c2d6a13ac8466921c952831f2890fb0062ccaf79fe0b4ff12b02be55aaa90 SHA512 4015c26df82c49a534e31e14ce72c263589af621c78e1961b85f96fae0d9d61140b1ba66f0a758400c2bf73bed73ddf887f8703ab721f03369fc5363ad3e7f95 WHIRLPOOL 6dc1dc6e5aeb0b28fb750ab0dad64b8b50d919b42d549e78ea354535c6430fe8f52bf06838d4ad7530d7ef77175d0e8d81d6df8952ba0f8c5e1736bc317a8151
+DIST netbeans-trunk-nightly-201412280001-src.zip 201263552 SHA256 9ee16bf46caf062b6173d9e07e91666f09dcf896b91cbf5aa12fe3d8b56c26b9 SHA512 87b2862da5db0abcae2c0a3ed3c95b53be94ecf9d11282c65af96e16fadac25c004c1d404cf5c74bd83ea61c53e102e2cf914b57d91aa2dbb305dd506c56fb8b WHIRLPOOL 6a1d5065e9597a0075a6d3d2adbfe80a3222dab95f198ce7de1f7cf9a7bbb088625f622543524e89a6d2045a9b47b21b999f09d048e52436f81f2d906cbfe695
+DIST netbeans-trunk-nightly-201412290001-src.zip 201263552 SHA256 170477d79b8bf19d65684dec3518bc8b6d344b05dd304b2a950f976a77069b63 SHA512 88f9cbee44a891ac35381a934058f23660d01ae6a072a6253589aecf4864daf4c288124564707f590f199a5428f82eaa6c85508d192970917ef88373788e5b7f WHIRLPOOL ba5464c152dab8532f561fb80812ecade46659f32a5314b32dc318f50c157b123dc1bf7fba6a1e9c447253c0607a83e341ef79ba91fd8f684a10f277b8d9899c
 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
@@ -104,5 +106,7 @@ EBUILD netbeans-harness-9999_p20141223.ebuild 4131 SHA256 ab87f9e53362f0820ece5d
 EBUILD netbeans-harness-9999_p20141225.ebuild 4131 SHA256 17bbb014a6012c39fa24c3040eb2ea1351ab7c32f42d6aaf51a864e5c75f7d68 SHA512 61e8efcab429b16332e77b75262e01393745e9efd01eccbd946ecf55814d3b3f302ed3142df3fc0b064b469158bd61ae6ddc59a82d3fc80f6962309f9966f514 WHIRLPOOL 2afa3dcb44587bcc84de8017cd5fa5038fa46a8c2f3a8d7878cfbeb5313c552ce9da78810d6283f4001660e439d7ae1797813f4759176c152d0b39c12db2a2f2
 EBUILD netbeans-harness-9999_p20141226.ebuild 4131 SHA256 7f0096665d3e9951c70986c4e8e69748ae54b08cf026fee2fb6e1d12a474fc02 SHA512 36950b520c0dac7467fea4f8fb372c5383901ce28292e1d0fa962864efb235e80462d591a6a3538af2741b6e1edd1ce925bb69cd4e005aec04be939a93bc8461 WHIRLPOOL 11015d9cd70f4296f05a019cb96f292dffc0d34de8650d35e661e398393b2d7cc47e65d7459879bb8aadb3c194e7cd078836ada2b94eff4feeec48a3f1bbba76
 EBUILD netbeans-harness-9999_p20141227.ebuild 4131 SHA256 d4cbeff905659d5d9aa04c1cb70049d0a5fe1d60c8384ac7c72c18aff6549186 SHA512 dc0f5be3be35a6d719a610c3cd2bd4de2acb2ba4af70fece85f64035fb2ffdfc59f460dbd3b6f1662ce8f597f4127d9291a375b831c5a5dba95d2c2f3d428af9 WHIRLPOOL 3639e5c5eac293d4ce6cadf8a1eaf725366544435188a8c4db4ab165f498dc23cfa2f3b7375a76a85769fbf02f115132be67ac15436a15e06a79cdf174f8a490
-MISC ChangeLog 143636 SHA256 1b6b9a97bbd2cc8aa7f46fc8a383e1ddc32959b7cd12bc8b74b5559f66fc7621 SHA512 03338d95a1ce2b6083ff9b123ccbb711a13ef20c86dbfc52a923873f322943b51e06a84200612d765c80aadb0236fec45654f22fc447b93661dfb69b7c3f6824 WHIRLPOOL 2e0836a4d6295e03e53d917bbbf6e81e6156c1bdccf621de517044a173d7bfaec79dd8ac61ec9aebc597a6aaa068e14076eb01f7ca2c75e7f4e3928a3d958dd2
+EBUILD netbeans-harness-9999_p20141228.ebuild 4131 SHA256 b18b072a8031355d043d7c446dc0cffc1de75c84f791b3d325ab500a3646b492 SHA512 04c2baa4c406bf87c9d77f9d078d5b51e972e5ce765758c5f8a56a39ed9e504d4b24429a63cee8d36398278218cad1f209786dc2698514ec8dce872662b02bb9 WHIRLPOOL 234c9d6c7de13d8e33e19beeb74d3eb0d937ae188eaae6599804fa7ae632b7fd954b66dc33bfa55e79eddd3413c2e2ce5b13adcdb1ee23f91e6b20ebb4871139
+EBUILD netbeans-harness-9999_p20141229.ebuild 4131 SHA256 9b81f565a18785a7ae399250bd1ab43a83f2d07721ab2c45c845acb864098e8e SHA512 6319557dec692abbeff3acf4ebfa32d4ed9239be3eadf6d33cf51b34a62b4678b2733c45df27c9738b2502f0b272018bee4518584a1e394e7be0448af75cb398 WHIRLPOOL 056b32867584d022ccec762a43cde0cfacc96ff74a792afc09682fd6df7ffb3fc7069caef8da0cae0ccf5cef626a67a88eb9a856d885d535221afaf38572fb29
+MISC ChangeLog 143901 SHA256 cf6408efc5cbe00be06c775a8ee899ca7adf48d7993a238429b1ad34344f4802 SHA512 f3c2c845c27e9d66962154c0d19102817ef562bc116c10d9db9019b64ddadcc7540d93e6aef2ee41283cf593f0662bf6cb7e29a5efa6b3b4ef0ff585d40e52ca WHIRLPOOL b4d360f09078c62a5fa052f9184df9393954e35da797168f5faecb37a0abc764ad4495c323f74adcf4fcda1c107d39e53fd24dfd69e7d8095b5c5d058aa39331
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20141228.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20141228.ebuild
new file mode 100644
index 0000000..1d30e3b
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20141228.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Harness"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2014-12-28_00-01-53/zip/netbeans-trunk-nightly-201412280001-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-harness/netbeans-harness-9999_p20141229.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20141229.ebuild
new file mode 100644
index 0000000..40b954e
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20141229.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Harness"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2014-12-29_00-01-53/zip/netbeans-trunk-nightly-201412290001-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 b7ebeeb..6e3be5c 100644
--- a/dev-java/netbeans-ide/ChangeLog
+++ b/dev-java/netbeans-ide/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-ide-9999_p20141229 (29 Dec 2014)
+*netbeans-ide-9999_p20141228 (29 Dec 2014)
+
+  29 Dec 2014; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-ide-9999_p20141228.ebuild, +netbeans-ide-9999_p20141229.ebuild:
+  bumped to the latest sources
+
 *netbeans-ide-9999_p20141227 (27 Dec 2014)
 
   27 Dec 2014; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 2b8ce01..38cc3d8 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -236,6 +236,8 @@ DIST netbeans-trunk-nightly-201412230001-src.zip 201224939 SHA256 4b0894151a203a
 DIST netbeans-trunk-nightly-201412250001-src.zip 201240621 SHA256 d133ff2185d2c6f5561d9226d16c2db373796f017b009ac16107d7c0b9fda1e4 SHA512 a8a5db63b7644a15051d4fc72ded6b5a11789a6ca73404068b5d7d2a82fdfcee29216d3a056180ebdd7a735468c485b939c1ee9ad012e5bd9632bd4a48cb948f WHIRLPOOL db78e1911db3615eceef7177cb734956c3ad5760ffd802019e2b809546999c579dfe9ec77b2dba0241862f4525eacdd71a3beb3848386fde5cbaf267d9b0e36e
 DIST netbeans-trunk-nightly-201412260001-src.zip 201263552 SHA256 1c168e53c6217da5215d1349a33ff9c8f29006832f1a2453819a83525452468b SHA512 a6b2b605dd50d7b2ad81edb254de2182f2182cbd24d11e61d2f64955a5d9a3ebf32abc20968b27bd72be8b2b41a2cc1dcaf8c54fe51ad82f58deb23716713baf WHIRLPOOL 6fe4efa1dbffc68b4d7f423fadeb897b349c883ee6d3808ddb26b3fd94d57a853731d26e13fa03b4b223412bd12bedcedc6e4807b2779233e69896c706f8ccda
 DIST netbeans-trunk-nightly-201412270001-src.zip 201263552 SHA256 734c2d6a13ac8466921c952831f2890fb0062ccaf79fe0b4ff12b02be55aaa90 SHA512 4015c26df82c49a534e31e14ce72c263589af621c78e1961b85f96fae0d9d61140b1ba66f0a758400c2bf73bed73ddf887f8703ab721f03369fc5363ad3e7f95 WHIRLPOOL 6dc1dc6e5aeb0b28fb750ab0dad64b8b50d919b42d549e78ea354535c6430fe8f52bf06838d4ad7530d7ef77175d0e8d81d6df8952ba0f8c5e1736bc317a8151
+DIST netbeans-trunk-nightly-201412280001-src.zip 201263552 SHA256 9ee16bf46caf062b6173d9e07e91666f09dcf896b91cbf5aa12fe3d8b56c26b9 SHA512 87b2862da5db0abcae2c0a3ed3c95b53be94ecf9d11282c65af96e16fadac25c004c1d404cf5c74bd83ea61c53e102e2cf914b57d91aa2dbb305dd506c56fb8b WHIRLPOOL 6a1d5065e9597a0075a6d3d2adbfe80a3222dab95f198ce7de1f7cf9a7bbb088625f622543524e89a6d2045a9b47b21b999f09d048e52436f81f2d906cbfe695
+DIST netbeans-trunk-nightly-201412290001-src.zip 201263552 SHA256 170477d79b8bf19d65684dec3518bc8b6d344b05dd304b2a950f976a77069b63 SHA512 88f9cbee44a891ac35381a934058f23660d01ae6a072a6253589aecf4864daf4c288124564707f590f199a5428f82eaa6c85508d192970917ef88373788e5b7f WHIRLPOOL ba5464c152dab8532f561fb80812ecade46659f32a5314b32dc318f50c157b123dc1bf7fba6a1e9c447253c0607a83e341ef79ba91fd8f684a10f277b8d9899c
 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
@@ -284,5 +286,7 @@ EBUILD netbeans-ide-9999_p20141223.ebuild 29641 SHA256 ba873347c63a1bd2e5d108f02
 EBUILD netbeans-ide-9999_p20141225.ebuild 29641 SHA256 7cee6ff76f07ac52799390c132e810727c633a3582d3e7e5e86e22f2b3062250 SHA512 7ccf2f73f862b23f737edbe6d6b0d49aa2ab56743d35759e74fd1472bcad69547bb5a5fc7f1935d1149e0f3e87ddf9a08ca69759489c123554639961d1e800c0 WHIRLPOOL c0e1c04cf4b73b78bfc87b692cd7a7f04e906ec0efc336e75d2ba01a222cebaf13367bff0ea6c430bb955a039e92f465546a9d46b2864edd8f5ab983fa0e3528
 EBUILD netbeans-ide-9999_p20141226.ebuild 29641 SHA256 fff7e1b2d55717e7b91aea2e90f1bc1c033136fa4ba6c8666ae16efb848033b0 SHA512 da162a7b06f1ab786ab90451c14d38337d0ecca3ff48ad66fd646d8a529b7ae11874cd850c7f6b1896fd5fa0cc9386d46ad41677f93389afbbe20bf1b64f4571 WHIRLPOOL 020684c818a4c94d5484ef809200f0ba61bd8577445072cf609edfb7727f39f98ee3d57b47976e9cdd82517dfb5d82e7cec0badb73d99667dbba789356d871ff
 EBUILD netbeans-ide-9999_p20141227.ebuild 29641 SHA256 f92c70ce8d2a65356f2728d4846010fe230fc42dc01bb2b569175da6eba8c8fe SHA512 18fe76d7bbcac243e7d26cfcd1bc67d4574a7b83d75f171f906fc84def71d63085d3f8b8cb54776fe676a8200c5df44f4218d6378057e5e93d34775f47e4cbfc WHIRLPOOL 1175ab92543b4c6ef686c1a5421076445cc9bbbc13493c6e9207bfca71a676906ba195c827323948003e2d4eb016c020391d7494f9f2fb6029f89a5dfb51f920
-MISC ChangeLog 137022 SHA256 95dbb90d027d477b658caeacbb0021c89aeda0b96974f0ce98f12739170c8f0a SHA512 d65bb731c01ec75548d27734ebfc2588285322e9b42d83cd5e5ac04d58e3b3398bd6f540721ac1fe65d4a8c1a69fd17074b638f22dc95a2f32709783171b4a41 WHIRLPOOL c48cec469c033c6d7cc52c30a0ff0f90a33afd7403bade0b62039ca69aaee83c2116acb3008ba5a25ce50b377345380bd418e4f5b4ff48c305578ee73f030e85
+EBUILD netbeans-ide-9999_p20141228.ebuild 29641 SHA256 2080ec377a452334c1844a182b9c031a1f3a01feecf9b93b0a652c1aa3f59ec1 SHA512 53feeda3a85aa82a0de2d265fa91c521eb836831ff0fdcac983bbd7dd0552afd49ab1cf20cfabdd664555135a5ea3564f76076e45c6c34a9a6415f9d768f9c52 WHIRLPOOL 2e22082d8b92384c698654781a170d05fbf57487b6205d8bf505cb558c4ce821f831f37f92f5fec8c11af72331316a6df603989db836a08c5f520dbede506d23
+EBUILD netbeans-ide-9999_p20141229.ebuild 29641 SHA256 e1c0e50d86a2024d6d465dd92fd7f5bd13c4895249bb24dc98fb988ca0a58d6f SHA512 e2d15a73028590c3b2288df2854d69fb8fd16a73857c58932e9aa1f2ca3780884d1b152aa988148a46d0a7f5ede227b896a3fd9660dd47241b3eb0ce0ad8f8aa WHIRLPOOL 4c79548431281ae52491833180c4908a877d48f7b6d00d29a7d958f58f93be71bb082698edcd7fbb36f5953e1af202fe83b3e24a05a513c0bbcb616a3755d8ef
+MISC ChangeLog 137269 SHA256 46d8cede32e7074bfd99cb7c30930ed40c1ec64ab7979d5473dbb0a8012edd63 SHA512 f90b6af4a7d1f3c98721fdebc701c551e8d1fec00c4c383c95ab635ed584d87af6188f6fbc3112951756004bb4fcc5ceda7094be83b78c83cc2c4ba8f330e75b WHIRLPOOL ac5d77d95aa17654a39c142eb79447c3a084cf39dc2495d29b5d0c95c187e5e638bdb6f27b0c702ee312a8b784b16021df896d7f94eae7b24d1dfaa4f3db6253
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20141228.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20141228.ebuild
new file mode 100644
index 0000000..2c1a79f
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20141228.ebuild
@@ -0,0 +1,373 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2014-12-28_00-01-53/zip/netbeans-trunk-nightly-201412280001-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/9F3781C7163EE6FA380A4518564A5ABB097D9E27-org.eclipse.jgit-3.5.3.201412180710-r.jar
+	http://hg.netbeans.org/binaries/B597C6D7F889603033C98E8AFED47FEB6EF52FAD-org.eclipse.jgit.java7-3.5.3.201412180710-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}"/9F3781C7163EE6FA380A4518564A5ABB097D9E27-org.eclipse.jgit-3.5.3.201412180710-r.jar o.eclipse.jgit/external/org.eclipse.jgit-3.5.3.201412180710-r.jar || die
+	ln -s "${DISTDIR}"/B597C6D7F889603033C98E8AFED47FEB6EF52FAD-org.eclipse.jgit.java7-3.5.3.201412180710-r.jar o.eclipse.jgit.java7/external/org.eclipse.jgit.java7-3.5.3.201412180710-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-ide/netbeans-ide-9999_p20141229.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20141229.ebuild
new file mode 100644
index 0000000..8397aea
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20141229.ebuild
@@ -0,0 +1,373 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2014-12-29_00-01-53/zip/netbeans-trunk-nightly-201412290001-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/9F3781C7163EE6FA380A4518564A5ABB097D9E27-org.eclipse.jgit-3.5.3.201412180710-r.jar
+	http://hg.netbeans.org/binaries/B597C6D7F889603033C98E8AFED47FEB6EF52FAD-org.eclipse.jgit.java7-3.5.3.201412180710-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}"/9F3781C7163EE6FA380A4518564A5ABB097D9E27-org.eclipse.jgit-3.5.3.201412180710-r.jar o.eclipse.jgit/external/org.eclipse.jgit-3.5.3.201412180710-r.jar || die
+	ln -s "${DISTDIR}"/B597C6D7F889603033C98E8AFED47FEB6EF52FAD-org.eclipse.jgit.java7-3.5.3.201412180710-r.jar o.eclipse.jgit.java7/external/org.eclipse.jgit.java7-3.5.3.201412180710-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 0b2c662..0203e23 100644
--- a/dev-java/netbeans-java/ChangeLog
+++ b/dev-java/netbeans-java/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-java-9999_p20141229 (29 Dec 2014)
+*netbeans-java-9999_p20141228 (29 Dec 2014)
+
+  29 Dec 2014; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-java-9999_p20141228.ebuild, +netbeans-java-9999_p20141229.ebuild:
+  bumped to the latest sources
+
 *netbeans-java-9999_p20141227 (27 Dec 2014)
 
   27 Dec 2014; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 01fa365..112d08e 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -131,6 +131,8 @@ DIST netbeans-trunk-nightly-201412230001-src.zip 201224939 SHA256 4b0894151a203a
 DIST netbeans-trunk-nightly-201412250001-src.zip 201240621 SHA256 d133ff2185d2c6f5561d9226d16c2db373796f017b009ac16107d7c0b9fda1e4 SHA512 a8a5db63b7644a15051d4fc72ded6b5a11789a6ca73404068b5d7d2a82fdfcee29216d3a056180ebdd7a735468c485b939c1ee9ad012e5bd9632bd4a48cb948f WHIRLPOOL db78e1911db3615eceef7177cb734956c3ad5760ffd802019e2b809546999c579dfe9ec77b2dba0241862f4525eacdd71a3beb3848386fde5cbaf267d9b0e36e
 DIST netbeans-trunk-nightly-201412260001-src.zip 201263552 SHA256 1c168e53c6217da5215d1349a33ff9c8f29006832f1a2453819a83525452468b SHA512 a6b2b605dd50d7b2ad81edb254de2182f2182cbd24d11e61d2f64955a5d9a3ebf32abc20968b27bd72be8b2b41a2cc1dcaf8c54fe51ad82f58deb23716713baf WHIRLPOOL 6fe4efa1dbffc68b4d7f423fadeb897b349c883ee6d3808ddb26b3fd94d57a853731d26e13fa03b4b223412bd12bedcedc6e4807b2779233e69896c706f8ccda
 DIST netbeans-trunk-nightly-201412270001-src.zip 201263552 SHA256 734c2d6a13ac8466921c952831f2890fb0062ccaf79fe0b4ff12b02be55aaa90 SHA512 4015c26df82c49a534e31e14ce72c263589af621c78e1961b85f96fae0d9d61140b1ba66f0a758400c2bf73bed73ddf887f8703ab721f03369fc5363ad3e7f95 WHIRLPOOL 6dc1dc6e5aeb0b28fb750ab0dad64b8b50d919b42d549e78ea354535c6430fe8f52bf06838d4ad7530d7ef77175d0e8d81d6df8952ba0f8c5e1736bc317a8151
+DIST netbeans-trunk-nightly-201412280001-src.zip 201263552 SHA256 9ee16bf46caf062b6173d9e07e91666f09dcf896b91cbf5aa12fe3d8b56c26b9 SHA512 87b2862da5db0abcae2c0a3ed3c95b53be94ecf9d11282c65af96e16fadac25c004c1d404cf5c74bd83ea61c53e102e2cf914b57d91aa2dbb305dd506c56fb8b WHIRLPOOL 6a1d5065e9597a0075a6d3d2adbfe80a3222dab95f198ce7de1f7cf9a7bbb088625f622543524e89a6d2045a9b47b21b999f09d048e52436f81f2d906cbfe695
+DIST netbeans-trunk-nightly-201412290001-src.zip 201263552 SHA256 170477d79b8bf19d65684dec3518bc8b6d344b05dd304b2a950f976a77069b63 SHA512 88f9cbee44a891ac35381a934058f23660d01ae6a072a6253589aecf4864daf4c288124564707f590f199a5428f82eaa6c85508d192970917ef88373788e5b7f WHIRLPOOL ba5464c152dab8532f561fb80812ecade46659f32a5314b32dc318f50c157b123dc1bf7fba6a1e9c447253c0607a83e341ef79ba91fd8f684a10f277b8d9899c
 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
@@ -177,5 +179,7 @@ EBUILD netbeans-java-9999_p20141223.ebuild 13429 SHA256 e9dbbd6d631921ee0ebbfc3f
 EBUILD netbeans-java-9999_p20141225.ebuild 13429 SHA256 5757d2451a5f7cb533b9c5e7a6e13fc0df5556fcf0a6226ab5cdb68c58052a13 SHA512 3f357c2d235d510393385d27201cc814399d7f0da5b13a8251a8f4c20f28dceaa7898d96b5665f6ccee8b25cd00b26b2418c82c2e9aab6ed94c35bb8598fdcf0 WHIRLPOOL 89f2be81e0d4fd24d3a2fe3531d4d19648e7bc5685bb3307b7d99cb812907d3e06b016f60386deab6ba5f4d43483271a8d5a864237b0bea206567d4e8c13db31
 EBUILD netbeans-java-9999_p20141226.ebuild 13429 SHA256 4fdf49e2fe567de4fb5586d8ba2c049442a841736cbd9bc78182cf81fb94cbc7 SHA512 41468876bc752f7e3e39285bb2e0942f5e943c866fef83bebf676c45c735fbc5fd64dc54b1b66b30ef5ccc45e58ac0ac199a89324845bfe3da29c16365f9c1cc WHIRLPOOL 7b620d5f79d9f2ed318a0271a98c09bbe23558f81f249ead80e5cc985f3c0e50a7b1be897e78675ad02fcd3d4236009e11fca1315ca490fcfe798ac71ce7f984
 EBUILD netbeans-java-9999_p20141227.ebuild 13429 SHA256 9fc8fe4d220998c34be09303a94825f22a2b845018e7a4aafc469b5a9b5caf00 SHA512 67e61b28dd310cbc11e12ecf4c3369687f46e068665d570ee538e0fb209b663491c07ab5f7d534a38396ab5cbcfcc41e4011229b14cc8d7b75099405aac5e0e0 WHIRLPOOL b59919d3aab28f7380f6543c1afc2a1cb360105493f7f5e45d46edaafc07dc91df7427a8ab1ffd5f89c9476bf180ed3a5f697e102dba71b504c9896f6522b6d9
-MISC ChangeLog 139588 SHA256 4164a623326aac83e0acedfc4c79bdff4e76c688f5e573b290ed31873ef5f3a6 SHA512 0d7fda39017cbbed453167018c8b32078baa75c1f8af28415f77e938164b8e16563630c444eaeb22615db1d78788d624261c5d9af655ae896c2b0ebda4cc8564 WHIRLPOOL eb231bfd1590e3d07d1bb1b92815097fd819cd01ca6c2577a421e9e32546f8f9d92613d1e60d45daec3b12638dc008fcd7f9a26ab7e2ea7ebf48c3239fe10703
+EBUILD netbeans-java-9999_p20141228.ebuild 13429 SHA256 0a6338e1a342c043f96136f1c72958fb9928cf60670e56e9005e3dad11b56bca SHA512 059d45f1bc743c77d18b8e8540b151b162d98343910305528c1b6373054ae4fdbd2c0bb17cdf162617fae631c4fe5e4e26061304f80f6895c91a16246b9ff2e9 WHIRLPOOL 4ec0118fbbf46475ee7954ef7b4706c6a871fc282e2e4e8794800e6d12c825518d42eb1c0510992875bf90b3a99bf1f0261a86c5421ada0c59cdee2df64d3c53
+EBUILD netbeans-java-9999_p20141229.ebuild 13429 SHA256 14653284834000de7f1dbfafb2c40aded0b902d878212d08a86442191ddc319c SHA512 4d79692373c921059d4bd67e086e8631094e20920f540f0715fc9b410617c9ccb5f374a62462426adb46f2e24dad928f76e9353c9e8dbb581f8417243fd0bf97 WHIRLPOOL e7160ebe6e7f9488b32bd9b13067336e531b5bdf7fa8b0c9b3450e18b0fe530f318318f4b98889b0c46e192991fb5380443be164299aff6376b872f69a06707f
+MISC ChangeLog 139839 SHA256 721bb3f52e821a8c3e6fcf1ae4a13260dd558ba9fbb83cdf356198b76dbbfb62 SHA512 620c1594e0389c6f8fd282c414f64b6ee95c35a078488e0fe06b806c03673393b24fd9bdf61da8f38b2ce3e1ad132ff85fe4139b735b68e5454816f74007d2cf WHIRLPOOL 5c514cfade055b49bd6e5d5a38f4722859a50ccf7a4882299a959543fa579d45164d5ef4690bc204537dabaeb5f25e6bbe1f4a36858f3667b3d8f8fd0344ea74
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20141228.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20141228.ebuild
new file mode 100644
index 0000000..1ec5e5c
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20141228.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+# Maven cannot be unbundled because it depends on exact maven version and exact content of maven directory
+
+DESCRIPTION="Netbeans Java Cluster"
+HOMEPAGE="http://netbeans.org/projects/java"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2014-12-28_00-01-53/zip/netbeans-trunk-nightly-201412280001-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-java/netbeans-java-9999_p20141229.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20141229.ebuild
new file mode 100644
index 0000000..4b730af
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20141229.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+# Maven cannot be unbundled because it depends on exact maven version and exact content of maven directory
+
+DESCRIPTION="Netbeans Java Cluster"
+HOMEPAGE="http://netbeans.org/projects/java"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2014-12-29_00-01-53/zip/netbeans-trunk-nightly-201412290001-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 29eb525..6f5ecb6 100644
--- a/dev-java/netbeans-javacard/ChangeLog
+++ b/dev-java/netbeans-javacard/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javacard-9999_p20141229 (29 Dec 2014)
+*netbeans-javacard-9999_p20141228 (29 Dec 2014)
+
+  29 Dec 2014; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-javacard-9999_p20141228.ebuild,
+  +netbeans-javacard-9999_p20141229.ebuild:
+  bumped to the latest sources
+
 *netbeans-javacard-9999_p20141227 (27 Dec 2014)
 
   27 Dec 2014; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index 5a8b31b..45aca94 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -55,6 +55,8 @@ DIST netbeans-trunk-nightly-201412230001-src.zip 201224939 SHA256 4b0894151a203a
 DIST netbeans-trunk-nightly-201412250001-src.zip 201240621 SHA256 d133ff2185d2c6f5561d9226d16c2db373796f017b009ac16107d7c0b9fda1e4 SHA512 a8a5db63b7644a15051d4fc72ded6b5a11789a6ca73404068b5d7d2a82fdfcee29216d3a056180ebdd7a735468c485b939c1ee9ad012e5bd9632bd4a48cb948f WHIRLPOOL db78e1911db3615eceef7177cb734956c3ad5760ffd802019e2b809546999c579dfe9ec77b2dba0241862f4525eacdd71a3beb3848386fde5cbaf267d9b0e36e
 DIST netbeans-trunk-nightly-201412260001-src.zip 201263552 SHA256 1c168e53c6217da5215d1349a33ff9c8f29006832f1a2453819a83525452468b SHA512 a6b2b605dd50d7b2ad81edb254de2182f2182cbd24d11e61d2f64955a5d9a3ebf32abc20968b27bd72be8b2b41a2cc1dcaf8c54fe51ad82f58deb23716713baf WHIRLPOOL 6fe4efa1dbffc68b4d7f423fadeb897b349c883ee6d3808ddb26b3fd94d57a853731d26e13fa03b4b223412bd12bedcedc6e4807b2779233e69896c706f8ccda
 DIST netbeans-trunk-nightly-201412270001-src.zip 201263552 SHA256 734c2d6a13ac8466921c952831f2890fb0062ccaf79fe0b4ff12b02be55aaa90 SHA512 4015c26df82c49a534e31e14ce72c263589af621c78e1961b85f96fae0d9d61140b1ba66f0a758400c2bf73bed73ddf887f8703ab721f03369fc5363ad3e7f95 WHIRLPOOL 6dc1dc6e5aeb0b28fb750ab0dad64b8b50d919b42d549e78ea354535c6430fe8f52bf06838d4ad7530d7ef77175d0e8d81d6df8952ba0f8c5e1736bc317a8151
+DIST netbeans-trunk-nightly-201412280001-src.zip 201263552 SHA256 9ee16bf46caf062b6173d9e07e91666f09dcf896b91cbf5aa12fe3d8b56c26b9 SHA512 87b2862da5db0abcae2c0a3ed3c95b53be94ecf9d11282c65af96e16fadac25c004c1d404cf5c74bd83ea61c53e102e2cf914b57d91aa2dbb305dd506c56fb8b WHIRLPOOL 6a1d5065e9597a0075a6d3d2adbfe80a3222dab95f198ce7de1f7cf9a7bbb088625f622543524e89a6d2045a9b47b21b999f09d048e52436f81f2d906cbfe695
+DIST netbeans-trunk-nightly-201412290001-src.zip 201263552 SHA256 170477d79b8bf19d65684dec3518bc8b6d344b05dd304b2a950f976a77069b63 SHA512 88f9cbee44a891ac35381a934058f23660d01ae6a072a6253589aecf4864daf4c288124564707f590f199a5428f82eaa6c85508d192970917ef88373788e5b7f WHIRLPOOL ba5464c152dab8532f561fb80812ecade46659f32a5314b32dc318f50c157b123dc1bf7fba6a1e9c447253c0607a83e341ef79ba91fd8f684a10f277b8d9899c
 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
@@ -101,5 +103,7 @@ EBUILD netbeans-javacard-9999_p20141223.ebuild 4982 SHA256 efc8725bac0fb72ac5906
 EBUILD netbeans-javacard-9999_p20141225.ebuild 4982 SHA256 8bdfa33d0c222b0cd6f62fddc55be59ca70d70c45b946b39831f01e9efd5bbef SHA512 6b314856b9d9fea1a74a9fc4ed0d1b8ccfd719c109a4512d11f504b7c2c3c746f5f59d79d4140076462936971fe0eb505417901ee98247be222ced347e5bdcb3 WHIRLPOOL c17af396e0a6b4a48e673c06fc4640ddddf0ecfd07a87eb39656d34bd5148914ff19b11c3349c6f495c7aba6eaae68935669f57812c722742bad184e662f8d3e
 EBUILD netbeans-javacard-9999_p20141226.ebuild 4982 SHA256 1a420416b1ec3f6cd6078d6641e6ea759e216a41da7dcd60ab5b2defd4bc6ebc SHA512 ed221cb186c214ed973a760e9ccfad22fc03fa00fa2636e229ba41b614406e30e4627325ba96a83523ceb77d4380ddf86cd176b3bde32460b7f6c19dd188be73 WHIRLPOOL eb082d310ea3d37c709db67b4c6089a7265d139276feeb4a1b5f3a1f72f87ea35de450878375707568300c88e0cd8e47dfa40fcd0de99b2661c3d3a7c1970cf0
 EBUILD netbeans-javacard-9999_p20141227.ebuild 4982 SHA256 2b1dfc52a7983a6aea8ce3e6a6903fd1a54aba2350a59bcc8eebff43631bf12f SHA512 56e6a87b176bf3ef247dd287e64bc7881245b6cf869e5135c1b9232ea312cd1e6f5a170b9f8ddd84d6d18aeb4b837ad810727e04da90c5daff3c3dd528beb73b WHIRLPOOL 61b2fdb40a42b3213839c37dc89db711fedfe54fb66589b5106ccc0710bfdb12918e995bed8e9a2b98c3805170e1cc97a150059e915c9febdadbf2cf350bb93c
-MISC ChangeLog 145428 SHA256 832592192529050cf47cccbebbc7b28a408fde5d11812622dadc37fdb6f97784 SHA512 34839503a8c20bdab95b9bed96ed311a86c7866843865bec68b915dc3a962041779d4bfe4c48cfb040c2595adcee4d22f34492aa1ef91cd6a78c4df72ea1f9bf WHIRLPOOL c4c6669457c4cb5d05d289077bd8a87b7debba97eb2dd3021cf3d8aa482b7f1ef37341da5b1f53de65bd28cb1067a36b858cc1597a057b93bc11a1334aa3bdaf
+EBUILD netbeans-javacard-9999_p20141228.ebuild 4982 SHA256 b0cd20f7f301316b7aab6f7d95b2ce3ee9e01a3550683c2aab3263f5b644f5e0 SHA512 942c26b89f242b11ec42912eabb478e6c62d00457d29a616135c6990b67a4b70d2bd0a1671b0d1cd2c07f63e81d422023b27e1e28a66bfe112bde9c7463d2c39 WHIRLPOOL 659709521a79b8fa85966c5290213b9d05df79c14f5655d62331056620f8aa2c51a0427b0bc26dd44713b5b117bdabb81ce97162e3321f8848e10aa556845c93
+EBUILD netbeans-javacard-9999_p20141229.ebuild 4982 SHA256 4d892b7b697c04072970cfb3464c3680b5f897798eb2ea29f1fc83dbbca45934 SHA512 75c242be0b01521149916d5a10af31eac72e168aacf40979110187302f6761b6b5a88922b7cbf2ac42d98a8242ad3c00b9462a84c95ca8f89b22308a1f25e6a2 WHIRLPOOL 44f140879b86e472ef78461cea841f9dad9884dff8443f2a2216436524dc69d65289551902dccc587c85f9d9ebcb8b48f5c5ad9be49b3d7b665864f86f8dfaad
+MISC ChangeLog 145697 SHA256 ea18470ac372e87d16d02cf568c1c758b56b51a1c26dea9ced30d990ed8a2289 SHA512 69714a6b1b526ab158e2610fa4fa1df2f6bb5ac2b08fab5619b829a82b2558f7fa6f55e8c21600a18fa909a36d30004048f92d49d20945bdc0ca1aaa26abe54c WHIRLPOOL d09248fa76d87f67dfb7d9a5191b52f39cedfca041582854db7cad03efe37024af96979667ee149ab3ff875f1a3aa6935d7857e489bf2486c517032afe707f9f
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20141228.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20141228.ebuild
new file mode 100644
index 0000000..0f04f16
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20141228.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaCard Cluster"
+HOMEPAGE="http://netbeans.org/projects/javacard"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2014-12-28_00-01-53/zip/netbeans-trunk-nightly-201412280001-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-javacard/netbeans-javacard-9999_p20141229.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20141229.ebuild
new file mode 100644
index 0000000..414f3c1
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20141229.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaCard Cluster"
+HOMEPAGE="http://netbeans.org/projects/javacard"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2014-12-29_00-01-53/zip/netbeans-trunk-nightly-201412290001-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 56dd285..2cbeeec 100644
--- a/dev-java/netbeans-javadoc/ChangeLog
+++ b/dev-java/netbeans-javadoc/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javadoc-9999_p20141229 (29 Dec 2014)
+*netbeans-javadoc-9999_p20141228 (29 Dec 2014)
+
+  29 Dec 2014; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-javadoc-9999_p20141228.ebuild,
+  +netbeans-javadoc-9999_p20141229.ebuild:
+  bumped to the latest sources
+
 *netbeans-javadoc-9999_p20141227 (27 Dec 2014)
 
   27 Dec 2014; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index 2aa4737..8151ecf 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -58,6 +58,8 @@ DIST netbeans-trunk-nightly-201412230001-src.zip 201224939 SHA256 4b0894151a203a
 DIST netbeans-trunk-nightly-201412250001-src.zip 201240621 SHA256 d133ff2185d2c6f5561d9226d16c2db373796f017b009ac16107d7c0b9fda1e4 SHA512 a8a5db63b7644a15051d4fc72ded6b5a11789a6ca73404068b5d7d2a82fdfcee29216d3a056180ebdd7a735468c485b939c1ee9ad012e5bd9632bd4a48cb948f WHIRLPOOL db78e1911db3615eceef7177cb734956c3ad5760ffd802019e2b809546999c579dfe9ec77b2dba0241862f4525eacdd71a3beb3848386fde5cbaf267d9b0e36e
 DIST netbeans-trunk-nightly-201412260001-src.zip 201263552 SHA256 1c168e53c6217da5215d1349a33ff9c8f29006832f1a2453819a83525452468b SHA512 a6b2b605dd50d7b2ad81edb254de2182f2182cbd24d11e61d2f64955a5d9a3ebf32abc20968b27bd72be8b2b41a2cc1dcaf8c54fe51ad82f58deb23716713baf WHIRLPOOL 6fe4efa1dbffc68b4d7f423fadeb897b349c883ee6d3808ddb26b3fd94d57a853731d26e13fa03b4b223412bd12bedcedc6e4807b2779233e69896c706f8ccda
 DIST netbeans-trunk-nightly-201412270001-src.zip 201263552 SHA256 734c2d6a13ac8466921c952831f2890fb0062ccaf79fe0b4ff12b02be55aaa90 SHA512 4015c26df82c49a534e31e14ce72c263589af621c78e1961b85f96fae0d9d61140b1ba66f0a758400c2bf73bed73ddf887f8703ab721f03369fc5363ad3e7f95 WHIRLPOOL 6dc1dc6e5aeb0b28fb750ab0dad64b8b50d919b42d549e78ea354535c6430fe8f52bf06838d4ad7530d7ef77175d0e8d81d6df8952ba0f8c5e1736bc317a8151
+DIST netbeans-trunk-nightly-201412280001-src.zip 201263552 SHA256 9ee16bf46caf062b6173d9e07e91666f09dcf896b91cbf5aa12fe3d8b56c26b9 SHA512 87b2862da5db0abcae2c0a3ed3c95b53be94ecf9d11282c65af96e16fadac25c004c1d404cf5c74bd83ea61c53e102e2cf914b57d91aa2dbb305dd506c56fb8b WHIRLPOOL 6a1d5065e9597a0075a6d3d2adbfe80a3222dab95f198ce7de1f7cf9a7bbb088625f622543524e89a6d2045a9b47b21b999f09d048e52436f81f2d906cbfe695
+DIST netbeans-trunk-nightly-201412290001-src.zip 201263552 SHA256 170477d79b8bf19d65684dec3518bc8b6d344b05dd304b2a950f976a77069b63 SHA512 88f9cbee44a891ac35381a934058f23660d01ae6a072a6253589aecf4864daf4c288124564707f590f199a5428f82eaa6c85508d192970917ef88373788e5b7f WHIRLPOOL ba5464c152dab8532f561fb80812ecade46659f32a5314b32dc318f50c157b123dc1bf7fba6a1e9c447253c0607a83e341ef79ba91fd8f684a10f277b8d9899c
 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
@@ -104,5 +106,7 @@ EBUILD netbeans-javadoc-9999_p20141223.ebuild 6234 SHA256 635127879709fa5d13c47b
 EBUILD netbeans-javadoc-9999_p20141225.ebuild 6234 SHA256 41f4b74689c263b19be35dd3e2abddf13f4cccfaba159206462079dadca77fb7 SHA512 61aa8f9b6958f3abddd3fdbe37dcda7a160cdd1a339f1f86fa71b6aaa7f35363627502233c4687905ef534d7b782c4f8033d8903bb90bad834330e1141b4b746 WHIRLPOOL a6ceee3e4a33cd5c89c3743e49faae308aa6a6c9413f867b82f8e67ac46d35d8972767d23266d7a6250d3f8717e23de7e7470a6a31872edda7d999a5efae83be
 EBUILD netbeans-javadoc-9999_p20141226.ebuild 6234 SHA256 638ce694d0c84c4f16b0ef488f1a85a3e4ba52fbfb8e75bba1513de3ad787f86 SHA512 51979f00913e0b99f36dd0951de2657cd172507724554d5fcdc2f849f88764c766cc908454b6026fc5db4891ec6501a6742965cc6b320eb2505d57acb91f5fa2 WHIRLPOOL 7d84f67ba52543013424f993ce4c1fb0eb75ebf956f4872461012a747e6cf6cfcff106b1fed28365cc4caa189849755211c772978749673ac29722de8c0aa30b
 EBUILD netbeans-javadoc-9999_p20141227.ebuild 6234 SHA256 9cf3987c87394f7277558b63b23b7c9293c94fe6da407e887f86e9bcd12647cd SHA512 1799e5f84d793cf0c0eded19912167c0c0ddd69a5ebb7687316505c4201b5b9554b53981d677b16830b941153332943fab591077a98ce563a7ffb8176b7c3c18 WHIRLPOOL e2276bf650616237535776943c3186491af1a173ca7a1cc7f67da38c8a34822cf557a76afaa380989d54fce43bc3ea84da751819173856fc13b489c52f3341f4
-MISC ChangeLog 143462 SHA256 66f0f38b1f9695e6f1d70f3b890f7e846c8a7867b8a94320dc434fe902f5aec2 SHA512 d430cbc53bfcdc808a586f937ac3659e546448265092be068f3f74f0e5949478ff3c4d5baae586bcb0d9405ad114fb2e1043c8b0f044435763a676673cd7987b WHIRLPOOL 4b43ea8992706c9855e931a4174219419de29b245fd3f16509aa43e55c86709762a8072dc8513c4e5ef3422b7c13ea3955321e086e47ea3fad81c89d37c1c37c
+EBUILD netbeans-javadoc-9999_p20141228.ebuild 6234 SHA256 26c68812696756234e173e927375751116e4ae88d4da17c734bd6673b1fbdeee SHA512 035d1b4cf46291657812e6bf7fb01797240995d831332f812c37d0eb5d3c486c8605cf9bcf65705a31104509faa9dc7b200717c0c2fddf772da2bdaa6809a21b WHIRLPOOL dc8fad7b6ee2deb1bc2dc0a6b356ec9dc839182db674af4f2833dad61b4d3ef85aaf94aefc78d24db6a0512bd701359f8ee683b1a1f51619ce399ce7f1816117
+EBUILD netbeans-javadoc-9999_p20141229.ebuild 6234 SHA256 d8d3a592706c0833c2c7320a86784ee8705b58205e7f591779908eb337517397 SHA512 648e9d5746440d6566b826db3d5aa0b27b0a60b7917d9eac0bbb45187b6a52a54cd29601c26b3ff3160870c8306a3713edb1e93aea47fbd0cd70ca57e9cbb9fa WHIRLPOOL eb28177af9d71b16168a406728a657b3c1900b67fdb62d1148f0eb8fb854907f32aa9ad3cf16d12b119aadf38203c2c45f4ae73e076b87b4ce7900f4a4d52a7d
+MISC ChangeLog 143727 SHA256 baadbac11c9ad19278dffb8e08dd6a8da01eaa9a6f646fdf576893086cea171b SHA512 12b66c17e5feef99c35237394728eec928406d3afd12f41e6393b7c5d1c390d4107a2c73d92450adc6720cca901f9b6b0d90f332e620bf7c705a39973b4841ad WHIRLPOOL 6a4895b34241fa6cc8d83277461746d4b517cd10b399ebedf414385ffe8b1d4ae558939c07c0942bb913ff6b72cf629e8a90196b53623ac311a403b0d47825ef
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20141228.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20141228.ebuild
new file mode 100644
index 0000000..5115421
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20141228.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaDocs"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2014-12-28_00-01-53/zip/netbeans-trunk-nightly-201412280001-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-javadoc/netbeans-javadoc-9999_p20141229.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20141229.ebuild
new file mode 100644
index 0000000..c526ce0
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20141229.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaDocs"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2014-12-29_00-01-53/zip/netbeans-trunk-nightly-201412290001-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 54220d7..0eaec03 100644
--- a/dev-java/netbeans-javafx/ChangeLog
+++ b/dev-java/netbeans-javafx/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javafx-9999_p20141229 (29 Dec 2014)
+*netbeans-javafx-9999_p20141228 (29 Dec 2014)
+
+  29 Dec 2014; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-javafx-9999_p20141228.ebuild,
+  +netbeans-javafx-9999_p20141229.ebuild:
+  bumped to the latest sources
+
 *netbeans-javafx-9999_p20141227 (27 Dec 2014)
 
   27 Dec 2014; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index 07e155b..3ff4406 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -57,6 +57,8 @@ DIST netbeans-trunk-nightly-201412230001-src.zip 201224939 SHA256 4b0894151a203a
 DIST netbeans-trunk-nightly-201412250001-src.zip 201240621 SHA256 d133ff2185d2c6f5561d9226d16c2db373796f017b009ac16107d7c0b9fda1e4 SHA512 a8a5db63b7644a15051d4fc72ded6b5a11789a6ca73404068b5d7d2a82fdfcee29216d3a056180ebdd7a735468c485b939c1ee9ad012e5bd9632bd4a48cb948f WHIRLPOOL db78e1911db3615eceef7177cb734956c3ad5760ffd802019e2b809546999c579dfe9ec77b2dba0241862f4525eacdd71a3beb3848386fde5cbaf267d9b0e36e
 DIST netbeans-trunk-nightly-201412260001-src.zip 201263552 SHA256 1c168e53c6217da5215d1349a33ff9c8f29006832f1a2453819a83525452468b SHA512 a6b2b605dd50d7b2ad81edb254de2182f2182cbd24d11e61d2f64955a5d9a3ebf32abc20968b27bd72be8b2b41a2cc1dcaf8c54fe51ad82f58deb23716713baf WHIRLPOOL 6fe4efa1dbffc68b4d7f423fadeb897b349c883ee6d3808ddb26b3fd94d57a853731d26e13fa03b4b223412bd12bedcedc6e4807b2779233e69896c706f8ccda
 DIST netbeans-trunk-nightly-201412270001-src.zip 201263552 SHA256 734c2d6a13ac8466921c952831f2890fb0062ccaf79fe0b4ff12b02be55aaa90 SHA512 4015c26df82c49a534e31e14ce72c263589af621c78e1961b85f96fae0d9d61140b1ba66f0a758400c2bf73bed73ddf887f8703ab721f03369fc5363ad3e7f95 WHIRLPOOL 6dc1dc6e5aeb0b28fb750ab0dad64b8b50d919b42d549e78ea354535c6430fe8f52bf06838d4ad7530d7ef77175d0e8d81d6df8952ba0f8c5e1736bc317a8151
+DIST netbeans-trunk-nightly-201412280001-src.zip 201263552 SHA256 9ee16bf46caf062b6173d9e07e91666f09dcf896b91cbf5aa12fe3d8b56c26b9 SHA512 87b2862da5db0abcae2c0a3ed3c95b53be94ecf9d11282c65af96e16fadac25c004c1d404cf5c74bd83ea61c53e102e2cf914b57d91aa2dbb305dd506c56fb8b WHIRLPOOL 6a1d5065e9597a0075a6d3d2adbfe80a3222dab95f198ce7de1f7cf9a7bbb088625f622543524e89a6d2045a9b47b21b999f09d048e52436f81f2d906cbfe695
+DIST netbeans-trunk-nightly-201412290001-src.zip 201263552 SHA256 170477d79b8bf19d65684dec3518bc8b6d344b05dd304b2a950f976a77069b63 SHA512 88f9cbee44a891ac35381a934058f23660d01ae6a072a6253589aecf4864daf4c288124564707f590f199a5428f82eaa6c85508d192970917ef88373788e5b7f WHIRLPOOL ba5464c152dab8532f561fb80812ecade46659f32a5314b32dc318f50c157b123dc1bf7fba6a1e9c447253c0607a83e341ef79ba91fd8f684a10f277b8d9899c
 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
@@ -102,5 +104,7 @@ EBUILD netbeans-javafx-9999_p20141223.ebuild 4723 SHA256 04b7ca7da6559de6f7b7010
 EBUILD netbeans-javafx-9999_p20141225.ebuild 4723 SHA256 10a5b013356fda9083089b79280de00dba46bcdd1ed7819b64201ad07da55b88 SHA512 611cf051a3bf1e404179afef474ff25e67a7a5cee6675bfed743e0b656980bb955d224779eec00adbc9a20d0ba8026c601323b98f1e4ce9e458409c93ae54037 WHIRLPOOL ddcf4f72328a9d23cf5814acbeb35299c7fa4792f4746e773c60e51e8f00f1cd8a2b927193ee650bce0f55d1260419bebaa630e6b088a3fe5375c2cbfb671a21
 EBUILD netbeans-javafx-9999_p20141226.ebuild 4723 SHA256 ea11c885e7102b4236097bf4feca5d26fe931fd6a4f78c5c6cfe6f20dc864338 SHA512 2cb476c0c13f9f22be46b3c1cc0243e635981f4208dea84e8b9805f9b80e3ef9fcd7da48f14ade920e10ec24382746561b71ae5df6ef52377356b9bae2171670 WHIRLPOOL 3f3315531aeb176f02138558817553711d65068c5eb1ebb7c77dd3dfd1373ef883e1455b9d401b83078396ad135991a202f2403c9fb31df49f535ba0335eb603
 EBUILD netbeans-javafx-9999_p20141227.ebuild 4723 SHA256 5ab204ac5084c16ea31f7bfe0945ca86c6f7f7ee283016c77b4e55fbeb0798c0 SHA512 b90022456191d6e726ffcebcb5bf2cf0409841624f0869f4a8507024630c93046ef92c801f63d4f817ed83e160b6c9d7c82dff09fc20fdc1b9e7fb1d7956a440 WHIRLPOOL 6d50d548be30eb65ed9f2ac7614737cf9a537498ed991b09866708ef01a292af2f0051c0025909fe52045032dfd8b00df9da64a1118c90f80cec64fc1d83174d
-MISC ChangeLog 128363 SHA256 01128cd2310cd803de4044f5f716ca95f9d296a7d3a9c4d256e4458ec5640584 SHA512 198a81067efa01efdc802843ed39a0a770b4d1d84251e1fa4a4a9c5c2430884aaf7837fd1413192f1f65a69bde4bb62368619fd67604c5b9563470261d815ec4 WHIRLPOOL 297415cc2b33d17a0a947e7f101adb5bcfeae6cb7fceeffecb40fa92a712d10e39f8fe9047524f3770b48a691e9cde34d9ad530bd95b97d5d34734c3a5000f8b
+EBUILD netbeans-javafx-9999_p20141228.ebuild 4723 SHA256 f75e55a66696de761f53774fb3b7a6d21ab908807f8103fb20ca499b2999c6e1 SHA512 d1acaae07bb1abcb3735ff0ac3d53d98b1a9b1c85e7dc16fc35cfabf4e17b20d6238547d14c5d878e38be1494cf62e074e63e15b502289225e303ce36c62e7f0 WHIRLPOOL 137753fcbe7850c21b82dba7ac5211c50af02b2905616fbd0c3e6a7e762455e3b09250a9bc35f43e64eed102073a2a19fb069dbab3bc3800bab8476eefd3c6f7
+EBUILD netbeans-javafx-9999_p20141229.ebuild 4723 SHA256 fbd5a2ffb7b8207c7133ddaa5a10238cbd417967a7446afdbaf69ff66cbaf826 SHA512 a86f60f1ec12e89c108dfa41e883237d9ad9d71683aff20047c76b23777afbfee5e030b37e30b46745c2aff020f9e37a2766c89110f542333bf19f9c3a90b94a WHIRLPOOL 2a1cf4816a87bfca70f335de5e33ba6f5b1c52c9c988308a1b37d52a86452d2df76ce9848617707ac1b7536ace044197969723b5cddb9cf19bc24b93becfe719
+MISC ChangeLog 128624 SHA256 75b584097a478530419d44191c679b0e7cbc4c542e9c16458b7ee7844587a43e SHA512 fdeaee9147c7c3b779b13c5418e246e396f7f87de243de7d12372c7a4843e0541ca2c85d7647b4d427068434bd0a59d87bf544ac49b2521ba9d33dcd6aae0b16 WHIRLPOOL a756401156730fb090eaf804904c6bba6ed1981832c4635da5ff779caa18583c23b9fe2043f8e8ff551dd686b8f288d8d08830132b0ef8b5af981aab8236ab25
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20141228.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20141228.ebuild
new file mode 100644
index 0000000..85830d3
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20141228.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaFX Cluster"
+HOMEPAGE="http://netbeans.org/projects/javafx"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2014-12-28_00-01-53/zip/netbeans-trunk-nightly-201412280001-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-javafx/netbeans-javafx-9999_p20141229.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20141229.ebuild
new file mode 100644
index 0000000..1d8537d
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20141229.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaFX Cluster"
+HOMEPAGE="http://netbeans.org/projects/javafx"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2014-12-29_00-01-53/zip/netbeans-trunk-nightly-201412290001-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 02c4c5c..e9a6443 100644
--- a/dev-java/netbeans-mobility/ChangeLog
+++ b/dev-java/netbeans-mobility/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-mobility-9999_p20141229 (29 Dec 2014)
+*netbeans-mobility-9999_p20141228 (29 Dec 2014)
+
+  29 Dec 2014; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-mobility-9999_p20141228.ebuild,
+  +netbeans-mobility-9999_p20141229.ebuild:
+  bumped to the latest sources
+
 *netbeans-mobility-9999_p20141227 (27 Dec 2014)
 
   27 Dec 2014; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 8159976..1f2f4e3 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -61,6 +61,8 @@ DIST netbeans-trunk-nightly-201412230001-src.zip 201224939 SHA256 4b0894151a203a
 DIST netbeans-trunk-nightly-201412250001-src.zip 201240621 SHA256 d133ff2185d2c6f5561d9226d16c2db373796f017b009ac16107d7c0b9fda1e4 SHA512 a8a5db63b7644a15051d4fc72ded6b5a11789a6ca73404068b5d7d2a82fdfcee29216d3a056180ebdd7a735468c485b939c1ee9ad012e5bd9632bd4a48cb948f WHIRLPOOL db78e1911db3615eceef7177cb734956c3ad5760ffd802019e2b809546999c579dfe9ec77b2dba0241862f4525eacdd71a3beb3848386fde5cbaf267d9b0e36e
 DIST netbeans-trunk-nightly-201412260001-src.zip 201263552 SHA256 1c168e53c6217da5215d1349a33ff9c8f29006832f1a2453819a83525452468b SHA512 a6b2b605dd50d7b2ad81edb254de2182f2182cbd24d11e61d2f64955a5d9a3ebf32abc20968b27bd72be8b2b41a2cc1dcaf8c54fe51ad82f58deb23716713baf WHIRLPOOL 6fe4efa1dbffc68b4d7f423fadeb897b349c883ee6d3808ddb26b3fd94d57a853731d26e13fa03b4b223412bd12bedcedc6e4807b2779233e69896c706f8ccda
 DIST netbeans-trunk-nightly-201412270001-src.zip 201263552 SHA256 734c2d6a13ac8466921c952831f2890fb0062ccaf79fe0b4ff12b02be55aaa90 SHA512 4015c26df82c49a534e31e14ce72c263589af621c78e1961b85f96fae0d9d61140b1ba66f0a758400c2bf73bed73ddf887f8703ab721f03369fc5363ad3e7f95 WHIRLPOOL 6dc1dc6e5aeb0b28fb750ab0dad64b8b50d919b42d549e78ea354535c6430fe8f52bf06838d4ad7530d7ef77175d0e8d81d6df8952ba0f8c5e1736bc317a8151
+DIST netbeans-trunk-nightly-201412280001-src.zip 201263552 SHA256 9ee16bf46caf062b6173d9e07e91666f09dcf896b91cbf5aa12fe3d8b56c26b9 SHA512 87b2862da5db0abcae2c0a3ed3c95b53be94ecf9d11282c65af96e16fadac25c004c1d404cf5c74bd83ea61c53e102e2cf914b57d91aa2dbb305dd506c56fb8b WHIRLPOOL 6a1d5065e9597a0075a6d3d2adbfe80a3222dab95f198ce7de1f7cf9a7bbb088625f622543524e89a6d2045a9b47b21b999f09d048e52436f81f2d906cbfe695
+DIST netbeans-trunk-nightly-201412290001-src.zip 201263552 SHA256 170477d79b8bf19d65684dec3518bc8b6d344b05dd304b2a950f976a77069b63 SHA512 88f9cbee44a891ac35381a934058f23660d01ae6a072a6253589aecf4864daf4c288124564707f590f199a5428f82eaa6c85508d192970917ef88373788e5b7f WHIRLPOOL ba5464c152dab8532f561fb80812ecade46659f32a5314b32dc318f50c157b123dc1bf7fba6a1e9c447253c0607a83e341ef79ba91fd8f684a10f277b8d9899c
 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
@@ -107,5 +109,7 @@ EBUILD netbeans-mobility-9999_p20141223.ebuild 4418 SHA256 24e1095fb021c0e79b07a
 EBUILD netbeans-mobility-9999_p20141225.ebuild 4418 SHA256 a7d33d0f5debf038201a5c29676f92e74a50c6f2bacb47f10a04cccefef5a8a5 SHA512 a5dae2f0422627a465ca2921d29716914f6d4598e52e54b2e92b49ef80d5b8dd731399aa4b15f069e9d3d9fe647a719ac917d969950ddb1b78e99473f7b24f4d WHIRLPOOL 395ae4696fc1e4f7b4243ebe6c8ff22db81b541ef6c3c941ca961c56c56a61e7c34b262f68dacf6fb973ef9f569c44d839278ccde2fef2c785f3ee4b9220fd3f
 EBUILD netbeans-mobility-9999_p20141226.ebuild 4418 SHA256 034a8a3d9898a80b2185b7d723de54440385274065fb3e40888d543cab0be111 SHA512 47c54fed866ec8638cca87edb3a4f94f00faa9967ae73178ad44cbd58f14e629e4e9b9a133a0cad5d3f6f5ee4834d5d825f716208c75ad9c7ed4a33adfaa05d3 WHIRLPOOL 371be903fd99b30e41a13e53d72553a76f91098453adef528548a8620a404ea2b7c2b687e1f43734bd94098f3d42f9eb7c4aae9dcca83e2c0c5b7390fd5e86b5
 EBUILD netbeans-mobility-9999_p20141227.ebuild 4418 SHA256 442125495e30684b2c3b1330e6858b3411be1bbc8d258b255c9928d1a8b7ff5a SHA512 b5eecfefda5c763d8b331601c8a7d6702d453b31d3ae43cf34a5b3879f74914ede21846d8776a0643b7a33e76efd4f1554f65de3013b0c797b95201198ad4a36 WHIRLPOOL 1043b5cb9093920b70cd4d0685e6581a74dd81750846e1bf195202472ffcb65e662af0b7a702196820e1a7d7f9501b9592c389d52f9e9f80ba192f2cb362a146
-MISC ChangeLog 145569 SHA256 e0bd8c3bc83081549065d284f6cd7134c9e83e597eee8159403ab829ae35f333 SHA512 4e486f6fc9c84b367a76827314fc3f35b2b8b4a74d8df86348224e004196c9f14f2f9c3172cc9584f272daa031ed3673b846fc2532f14c2cc18c990c05e5fc30 WHIRLPOOL a7651a86afdd25720efce34c6ca6a472b83199694d41a1f5dd937794732a30e8a819e2429b3f69092ba834e373914080e7401c140281e9160c23394826a8f7f1
+EBUILD netbeans-mobility-9999_p20141228.ebuild 4418 SHA256 04f3454762d5aed6849ddc3f12551b38082e35c5c62f0507e0b8989f2eebec89 SHA512 2d57c94334599696226985bb8c381e41230f99100d31d7387002726d37538ffc8085d5e121ed94874bc093a8da705336a2610e627a199dd1d731b6954aed8cde WHIRLPOOL b4da049c65ca752efddd4269cd8597340c506dc5f058abf561964a5d92e87bd197dea0237bbb117ae6ad99d4e8c0d949d474bbb2f86ec43558c4424cb6af46b2
+EBUILD netbeans-mobility-9999_p20141229.ebuild 4418 SHA256 c81f9a227b718d77cc384c5d3f49257b550bb2a3e466ab29755e638d388875e6 SHA512 8873ff6c873e3827a73cf7dfabc05508c0a3c3ca9f29f48e19839096414bf2dc80d4ae694c61b4aba4fa95ea589c8d897c9dc113e6f1f1c2e3925e60df3865da WHIRLPOOL 64def016e7be9ca95ced45eb137540a4d2f04dc00d38a1487cdde2265a7cd564c2bdd613cdc1266fab12fcec9f611eb6538c4e7c6ad36e7bdae198e44b7d4068
+MISC ChangeLog 145838 SHA256 83ee52deb9324a729a4634da417e1e54d7b0322faa5294aa0c4f11f7b624f283 SHA512 e08665f8fdbdbfaa4d4f6eb46279cf5cf11baa1002bc8ce038f35fc7ec664c5782db9a0fc4c51a799a1b06aed7f7f1b5d17c9fe9f935a03eecc4ff631b5bb604 WHIRLPOOL 39b684126b96348d30950de82b31126c1f2dbf75036d6d96f85fbf1f27bd8348ee0503fec3d34532c3e3df283823e2ff1107ec732fb3d24a12d026cec083bdc1
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20141228.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20141228.ebuild
new file mode 100644
index 0000000..520aaf5
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20141228.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Mobility Cluster"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2014-12-28_00-01-53/zip/netbeans-trunk-nightly-201412280001-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-mobility/netbeans-mobility-9999_p20141229.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20141229.ebuild
new file mode 100644
index 0000000..feb384f
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20141229.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Mobility Cluster"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2014-12-29_00-01-53/zip/netbeans-trunk-nightly-201412290001-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 da682b6..1948916 100644
--- a/dev-java/netbeans-nb/ChangeLog
+++ b/dev-java/netbeans-nb/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-nb-9999_p20141229 (29 Dec 2014)
+*netbeans-nb-9999_p20141228 (29 Dec 2014)
+
+  29 Dec 2014; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-nb-9999_p20141228.ebuild, +netbeans-nb-9999_p20141229.ebuild:
+  bumped to the latest sources
+
 *netbeans-nb-9999_p20141227 (27 Dec 2014)
 
   27 Dec 2014; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index 63d3785..6eff675 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -60,6 +60,8 @@ DIST netbeans-trunk-nightly-201412230001-src.zip 201224939 SHA256 4b0894151a203a
 DIST netbeans-trunk-nightly-201412250001-src.zip 201240621 SHA256 d133ff2185d2c6f5561d9226d16c2db373796f017b009ac16107d7c0b9fda1e4 SHA512 a8a5db63b7644a15051d4fc72ded6b5a11789a6ca73404068b5d7d2a82fdfcee29216d3a056180ebdd7a735468c485b939c1ee9ad012e5bd9632bd4a48cb948f WHIRLPOOL db78e1911db3615eceef7177cb734956c3ad5760ffd802019e2b809546999c579dfe9ec77b2dba0241862f4525eacdd71a3beb3848386fde5cbaf267d9b0e36e
 DIST netbeans-trunk-nightly-201412260001-src.zip 201263552 SHA256 1c168e53c6217da5215d1349a33ff9c8f29006832f1a2453819a83525452468b SHA512 a6b2b605dd50d7b2ad81edb254de2182f2182cbd24d11e61d2f64955a5d9a3ebf32abc20968b27bd72be8b2b41a2cc1dcaf8c54fe51ad82f58deb23716713baf WHIRLPOOL 6fe4efa1dbffc68b4d7f423fadeb897b349c883ee6d3808ddb26b3fd94d57a853731d26e13fa03b4b223412bd12bedcedc6e4807b2779233e69896c706f8ccda
 DIST netbeans-trunk-nightly-201412270001-src.zip 201263552 SHA256 734c2d6a13ac8466921c952831f2890fb0062ccaf79fe0b4ff12b02be55aaa90 SHA512 4015c26df82c49a534e31e14ce72c263589af621c78e1961b85f96fae0d9d61140b1ba66f0a758400c2bf73bed73ddf887f8703ab721f03369fc5363ad3e7f95 WHIRLPOOL 6dc1dc6e5aeb0b28fb750ab0dad64b8b50d919b42d549e78ea354535c6430fe8f52bf06838d4ad7530d7ef77175d0e8d81d6df8952ba0f8c5e1736bc317a8151
+DIST netbeans-trunk-nightly-201412280001-src.zip 201263552 SHA256 9ee16bf46caf062b6173d9e07e91666f09dcf896b91cbf5aa12fe3d8b56c26b9 SHA512 87b2862da5db0abcae2c0a3ed3c95b53be94ecf9d11282c65af96e16fadac25c004c1d404cf5c74bd83ea61c53e102e2cf914b57d91aa2dbb305dd506c56fb8b WHIRLPOOL 6a1d5065e9597a0075a6d3d2adbfe80a3222dab95f198ce7de1f7cf9a7bbb088625f622543524e89a6d2045a9b47b21b999f09d048e52436f81f2d906cbfe695
+DIST netbeans-trunk-nightly-201412290001-src.zip 201263552 SHA256 170477d79b8bf19d65684dec3518bc8b6d344b05dd304b2a950f976a77069b63 SHA512 88f9cbee44a891ac35381a934058f23660d01ae6a072a6253589aecf4864daf4c288124564707f590f199a5428f82eaa6c85508d192970917ef88373788e5b7f WHIRLPOOL ba5464c152dab8532f561fb80812ecade46659f32a5314b32dc318f50c157b123dc1bf7fba6a1e9c447253c0607a83e341ef79ba91fd8f684a10f277b8d9899c
 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
@@ -106,5 +108,7 @@ EBUILD netbeans-nb-9999_p20141223.ebuild 5013 SHA256 c3b46623787dd7f8fab3d55de11
 EBUILD netbeans-nb-9999_p20141225.ebuild 5013 SHA256 df441f8b08cc7c10dd180da7721f844f2c7f4101452794605edd364b120909a0 SHA512 126f438bf8648f571911cdd5479efebb98e2280b4d820513da6ebffc1ce78420ec7a99ca847b8fc66f098d863a4344408e2b4c9528012740e8dc579120048482 WHIRLPOOL 69e562fe55f54a456ae42d902681b54e690e58ef2acdffab14406630d038bb4eb7389cdcc397589e09c7634a3d7f4632904613ddc414fcd20a20d6594f1e490b
 EBUILD netbeans-nb-9999_p20141226.ebuild 5013 SHA256 c40f62b531405b50bbb9c5275bcc98acc4149d980ff4e535a9a7975355a64875 SHA512 12ef7763a070ccf9ca375eff8f0c35cda8ebe3872aa7ba854d35274fbdb2ef0f2b9f3e6085166376938aa43bdf54c3adccdfe78cf13cd2bff8dbc02b2256d7e5 WHIRLPOOL 9a51f17660400532e409bb6ccd7bef910a39220c342b1a89485c966590bd5ddc3dcd8a51143ee5900f74c836944ba7ed043df99c00f0d25642e5e7c9916a581e
 EBUILD netbeans-nb-9999_p20141227.ebuild 5013 SHA256 c32366b6ca592e32d8d4f541b3a6729a71e130f113126940451d4f1fd422a6d2 SHA512 fe9147d12cc4df7aa7d896bfbd6f1641d7e58df70a95e0a95641b72de09917b4e4f1039da8f1d1a302e12f0d1d3af6e013278ad75b349a271d3b6ac4a3c9bf4c WHIRLPOOL f8181811b91272cd724ea96c4ca4ed5f4cc620faf73e9bca7eeaf58b49a965a2525117ed5ab8b86e975a3ac3b0654c9c28344a772c6c4de7a0300556dda84a17
-MISC ChangeLog 135094 SHA256 8fb20bedc5570f7e8f6ab9c67ad21b76bc309678ed14b9385d220337c8fe101c SHA512 42ef506047155b77cb4f4657f8688c48c0fa551d926fab999ac59b557265e90e8737425ff86bce0bf05b6363fa3b16e58520c7878f76192a449d56d1dcebb34a WHIRLPOOL 883c6530ccdb9ab163aea0d53ef93b1afbf83fc8ce643534008fb28e91984538dc63dc9c9e64f41046861967dd297da4f8d4106af503e5fe81661f31237d0ffa
+EBUILD netbeans-nb-9999_p20141228.ebuild 5013 SHA256 a964615f427e32025e33fb3cfaa44f0c324e30fbf4df6f24ae0bbbf81c20e315 SHA512 b6ecfbbb5244f34aacea224eaac5522273daad9c176111ed268c233c7f3dad825a4d7187e4e95e5ba591c67ce56665015ced6309fb5ea85025058597cf96a079 WHIRLPOOL 72ef2d66d27c2778dd487cd7ab6ac4b07ba0ebef496d060dbf3fcad4cbada154247641225026a217edcbf08320b9498d1c70f67b8189d29fa078f7ea64d83fb6
+EBUILD netbeans-nb-9999_p20141229.ebuild 5013 SHA256 5210e87090e1f7c4397ccebe8f1607e30d7677c6f3f3cfc4d453029152a6ae10 SHA512 11204c7de29f7c2da0d55ca9b0f4d4ef2f4437745d4368d72823defb2af419ef1e075f12366195f05de08b2e17e2d867bf25bc6f6efc94ef37788728f203938e WHIRLPOOL 34e638587645800a1205b475cb1f7535f92dd500b0de65141a5c137d7eb86edbb48e6f778d3d46acfcd42d516f4923651fa794b3512403cad544266ffed40081
+MISC ChangeLog 135337 SHA256 9bbf668ff80e8ac952a01fa2e25993ca646c78bb80070aa74aff8c0d3a707a8d SHA512 7df96a6add5a0d218f59440891e1dec0d38d660ce833cb296849b36486164cfb40271fba7964b3d4a7f4024f3baff52933f28ab3bd42b80721142565ae29407b WHIRLPOOL 9e87a2a4898d4b5dc2ee64e0294e36c2259d2c6ac9dad310b4644631d37d24fef07166ac416e1de2d7a428e9de9346d89de697a964f33e01a3e3510015a242b0
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20141228.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20141228.ebuild
new file mode 100644
index 0000000..2f04b55
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20141228.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Branding"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2014-12-28_00-01-53/zip/netbeans-trunk-nightly-201412280001-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-nb/netbeans-nb-9999_p20141229.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20141229.ebuild
new file mode 100644
index 0000000..5be6af3
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20141229.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Branding"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2014-12-29_00-01-53/zip/netbeans-trunk-nightly-201412290001-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 ba44e70..de5d8d7 100644
--- a/dev-java/netbeans-php/ChangeLog
+++ b/dev-java/netbeans-php/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-php-9999_p20141229 (29 Dec 2014)
+*netbeans-php-9999_p20141228 (29 Dec 2014)
+
+  29 Dec 2014; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-php-9999_p20141228.ebuild, +netbeans-php-9999_p20141229.ebuild:
+  bumped to the latest sources
+
 *netbeans-php-9999_p20141227 (27 Dec 2014)
 
   27 Dec 2014; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index f4bcf5c..990495c 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -63,6 +63,8 @@ DIST netbeans-trunk-nightly-201412230001-src.zip 201224939 SHA256 4b0894151a203a
 DIST netbeans-trunk-nightly-201412250001-src.zip 201240621 SHA256 d133ff2185d2c6f5561d9226d16c2db373796f017b009ac16107d7c0b9fda1e4 SHA512 a8a5db63b7644a15051d4fc72ded6b5a11789a6ca73404068b5d7d2a82fdfcee29216d3a056180ebdd7a735468c485b939c1ee9ad012e5bd9632bd4a48cb948f WHIRLPOOL db78e1911db3615eceef7177cb734956c3ad5760ffd802019e2b809546999c579dfe9ec77b2dba0241862f4525eacdd71a3beb3848386fde5cbaf267d9b0e36e
 DIST netbeans-trunk-nightly-201412260001-src.zip 201263552 SHA256 1c168e53c6217da5215d1349a33ff9c8f29006832f1a2453819a83525452468b SHA512 a6b2b605dd50d7b2ad81edb254de2182f2182cbd24d11e61d2f64955a5d9a3ebf32abc20968b27bd72be8b2b41a2cc1dcaf8c54fe51ad82f58deb23716713baf WHIRLPOOL 6fe4efa1dbffc68b4d7f423fadeb897b349c883ee6d3808ddb26b3fd94d57a853731d26e13fa03b4b223412bd12bedcedc6e4807b2779233e69896c706f8ccda
 DIST netbeans-trunk-nightly-201412270001-src.zip 201263552 SHA256 734c2d6a13ac8466921c952831f2890fb0062ccaf79fe0b4ff12b02be55aaa90 SHA512 4015c26df82c49a534e31e14ce72c263589af621c78e1961b85f96fae0d9d61140b1ba66f0a758400c2bf73bed73ddf887f8703ab721f03369fc5363ad3e7f95 WHIRLPOOL 6dc1dc6e5aeb0b28fb750ab0dad64b8b50d919b42d549e78ea354535c6430fe8f52bf06838d4ad7530d7ef77175d0e8d81d6df8952ba0f8c5e1736bc317a8151
+DIST netbeans-trunk-nightly-201412280001-src.zip 201263552 SHA256 9ee16bf46caf062b6173d9e07e91666f09dcf896b91cbf5aa12fe3d8b56c26b9 SHA512 87b2862da5db0abcae2c0a3ed3c95b53be94ecf9d11282c65af96e16fadac25c004c1d404cf5c74bd83ea61c53e102e2cf914b57d91aa2dbb305dd506c56fb8b WHIRLPOOL 6a1d5065e9597a0075a6d3d2adbfe80a3222dab95f198ce7de1f7cf9a7bbb088625f622543524e89a6d2045a9b47b21b999f09d048e52436f81f2d906cbfe695
+DIST netbeans-trunk-nightly-201412290001-src.zip 201263552 SHA256 170477d79b8bf19d65684dec3518bc8b6d344b05dd304b2a950f976a77069b63 SHA512 88f9cbee44a891ac35381a934058f23660d01ae6a072a6253589aecf4864daf4c288124564707f590f199a5428f82eaa6c85508d192970917ef88373788e5b7f WHIRLPOOL ba5464c152dab8532f561fb80812ecade46659f32a5314b32dc318f50c157b123dc1bf7fba6a1e9c447253c0607a83e341ef79ba91fd8f684a10f277b8d9899c
 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
@@ -109,5 +111,7 @@ EBUILD netbeans-php-9999_p20141223.ebuild 4423 SHA256 3d0d7f543f945c2fec028f8d60
 EBUILD netbeans-php-9999_p20141225.ebuild 4423 SHA256 4d6b013984a2d5c0797fa5394c543bb743838cc973465ca88096fcf3b7c5bc8c SHA512 bb1ef8e362546b2cc00192619639d0ed0ea25d67ed8084dd1d7a9fb9d7e9db5bbd66fa0cef8b0376f112f091fa124a1b3adf4cf3ae595f3ad80c82afff5564d8 WHIRLPOOL ae05f0a2148800879434a11dea1fd3ed61c20bec1712451d328f6bc6db35133249412eff3daaf7d435509913dd359830459e712d1030689cb2d8d1f0a522c0b7
 EBUILD netbeans-php-9999_p20141226.ebuild 4423 SHA256 fa37e219869a9b388e976336f08f885d7f8b6945bca43a43f480e9fe10d1e7b7 SHA512 19fe6d7b73aefca9f53bac2a052c5809d17ac00f2d90f07ee0b792b43a296e26302cf3669a6cfa30df651a0fb83edecfbc70868eeb7c3fa3d5294738f2d131a3 WHIRLPOOL f71b0093e8b2b0687920733c97445e288ac11a86265fefba8d82b63f86e5bd1fed5810943d5cdd254e00a325797bee3f7365bc4990ae618fb0e7be21136c5df9
 EBUILD netbeans-php-9999_p20141227.ebuild 4423 SHA256 24c4b21581471071f531f69af09c844ae352b47904c229a44b7840647f71fa95 SHA512 8fc9bab81fff9f8d0167e035f053b078e9509dcc6444e378a7c79be2d5bd3db9911eb0801e5eb7ce22fe4e94eb5f01bf5ad42e901aea296d552f0ad0cfdd6002 WHIRLPOOL 8bbfcefa6455e64fa84c3f31916180735ac04a0ac36ac72abf99df5da00787d1a6808c314aef28508cd2266cd820e2c9d902bb2983a241f7e89eef36c78aa9a0
-MISC ChangeLog 135851 SHA256 880c8e391e05d560e8dda704f2220abb87f2a427428e4336c891d6fa4c5a1949 SHA512 49cd6ac9c9d64abddbd248a70c24458c8e4529f6ba52e8e490fccfe99b79ee402eeebd2c10bb6ef7622b5b6a2c10ba85677a1cf51c45e07d7b42421f078b123b WHIRLPOOL 9e3697b121c320adb6740ed451b082daf4e84d1b446f1565a2d783fa8facb7c69b8074d2aa81cade25dadcff66dc9dd09da13315e01f7ce701853fc0a736790c
+EBUILD netbeans-php-9999_p20141228.ebuild 4423 SHA256 4f82c9cfe2f9751098a64f6ce98d8db7fd3b2edb9607a18ec3f0e0ea999b321a SHA512 17b739549c14dd76a1863286fb9b561f2e0bfc20ec5c8f4df67241f11a7cc00e176e76034dbcc5adfcb7b16301f38ba7a4ee9d15024d5061ddbce39c52c8f229 WHIRLPOOL 164b1f46a6f3d8de3c4c213e6ffc1ef536a9345c3cb54bb18bf29a579a31cdada0f45e2f428ffa758904e4bb5fa9b5cdf515513660d61735c847b439010ad679
+EBUILD netbeans-php-9999_p20141229.ebuild 4423 SHA256 052612d2e74a735027d7a4f43908ddd47b344cf59616ee4d4eb9f8f6957bd7df SHA512 99d4261fbfbfe6659b6b6d491e581455602565848a3a51838b00170d1e7e993ff88aefa1214387b81aa4149c38e60034f1a5c709cfcf6acfe2f1bab21606908f WHIRLPOOL 7c0a71effe6615704eb4ded23aafd5bcf77b6c281dbba14e83a422aa08cb3149fd79595446398787bfd4880c24449c646715e05bd2597ccbf079b66c481a9807
+MISC ChangeLog 136098 SHA256 6b1b3e0e045b6a888c90e8543ec3384919317adefe765c247d91d55c862db732 SHA512 759e554d00578a0103c28cb4dd569478e2a317ca743be83394adc6236e8d8954a685d69a6676ea85d086baf8e4d0e8f654fd4158d6af3dc1cd1f2c5411a6a574 WHIRLPOOL 68a06b70696394250248d5fec38131871a4d4bfee85016829fe79e15ea8ad8bf5cde0c5f10853947a8255ff514c476ceeb9c3a802e3eaad400abc9e46122a2ea
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20141228.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20141228.ebuild
new file mode 100644
index 0000000..48f1d79
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20141228.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans PHP Cluster"
+HOMEPAGE="http://netbeans.org/projects/php"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2014-12-28_00-01-53/zip/netbeans-trunk-nightly-201412280001-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-php/netbeans-php-9999_p20141229.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20141229.ebuild
new file mode 100644
index 0000000..e183a63
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20141229.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans PHP Cluster"
+HOMEPAGE="http://netbeans.org/projects/php"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2014-12-29_00-01-53/zip/netbeans-trunk-nightly-201412290001-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 1d92e9a..659ce9d 100644
--- a/dev-java/netbeans-platform/ChangeLog
+++ b/dev-java/netbeans-platform/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-platform-9999_p20141229 (29 Dec 2014)
+*netbeans-platform-9999_p20141228 (29 Dec 2014)
+
+  29 Dec 2014; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-platform-9999_p20141228.ebuild,
+  +netbeans-platform-9999_p20141229.ebuild:
+  bumped to the latest sources
+
 *netbeans-platform-9999_p20141227 (27 Dec 2014)
 
   27 Dec 2014; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index 7dcf6be..d875e29 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -78,6 +78,8 @@ DIST netbeans-trunk-nightly-201412230001-src.zip 201224939 SHA256 4b0894151a203a
 DIST netbeans-trunk-nightly-201412250001-src.zip 201240621 SHA256 d133ff2185d2c6f5561d9226d16c2db373796f017b009ac16107d7c0b9fda1e4 SHA512 a8a5db63b7644a15051d4fc72ded6b5a11789a6ca73404068b5d7d2a82fdfcee29216d3a056180ebdd7a735468c485b939c1ee9ad012e5bd9632bd4a48cb948f WHIRLPOOL db78e1911db3615eceef7177cb734956c3ad5760ffd802019e2b809546999c579dfe9ec77b2dba0241862f4525eacdd71a3beb3848386fde5cbaf267d9b0e36e
 DIST netbeans-trunk-nightly-201412260001-src.zip 201263552 SHA256 1c168e53c6217da5215d1349a33ff9c8f29006832f1a2453819a83525452468b SHA512 a6b2b605dd50d7b2ad81edb254de2182f2182cbd24d11e61d2f64955a5d9a3ebf32abc20968b27bd72be8b2b41a2cc1dcaf8c54fe51ad82f58deb23716713baf WHIRLPOOL 6fe4efa1dbffc68b4d7f423fadeb897b349c883ee6d3808ddb26b3fd94d57a853731d26e13fa03b4b223412bd12bedcedc6e4807b2779233e69896c706f8ccda
 DIST netbeans-trunk-nightly-201412270001-src.zip 201263552 SHA256 734c2d6a13ac8466921c952831f2890fb0062ccaf79fe0b4ff12b02be55aaa90 SHA512 4015c26df82c49a534e31e14ce72c263589af621c78e1961b85f96fae0d9d61140b1ba66f0a758400c2bf73bed73ddf887f8703ab721f03369fc5363ad3e7f95 WHIRLPOOL 6dc1dc6e5aeb0b28fb750ab0dad64b8b50d919b42d549e78ea354535c6430fe8f52bf06838d4ad7530d7ef77175d0e8d81d6df8952ba0f8c5e1736bc317a8151
+DIST netbeans-trunk-nightly-201412280001-src.zip 201263552 SHA256 9ee16bf46caf062b6173d9e07e91666f09dcf896b91cbf5aa12fe3d8b56c26b9 SHA512 87b2862da5db0abcae2c0a3ed3c95b53be94ecf9d11282c65af96e16fadac25c004c1d404cf5c74bd83ea61c53e102e2cf914b57d91aa2dbb305dd506c56fb8b WHIRLPOOL 6a1d5065e9597a0075a6d3d2adbfe80a3222dab95f198ce7de1f7cf9a7bbb088625f622543524e89a6d2045a9b47b21b999f09d048e52436f81f2d906cbfe695
+DIST netbeans-trunk-nightly-201412290001-src.zip 201263552 SHA256 170477d79b8bf19d65684dec3518bc8b6d344b05dd304b2a950f976a77069b63 SHA512 88f9cbee44a891ac35381a934058f23660d01ae6a072a6253589aecf4864daf4c288124564707f590f199a5428f82eaa6c85508d192970917ef88373788e5b7f WHIRLPOOL ba5464c152dab8532f561fb80812ecade46659f32a5314b32dc318f50c157b123dc1bf7fba6a1e9c447253c0607a83e341ef79ba91fd8f684a10f277b8d9899c
 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
@@ -124,5 +126,7 @@ EBUILD netbeans-platform-9999_p20141223.ebuild 8508 SHA256 f34577104fc582c61c1e6
 EBUILD netbeans-platform-9999_p20141225.ebuild 8508 SHA256 c3dfc7d33c771850ba30e846e1c92c42a27cbc9b1ceabad73a84672cf562bfd9 SHA512 d0cc5c68de138891b164984d6517b53ef14daaecdef450b4cc268d526d85e51955d662a1f2397b962097fa0fb3305b2eb507bf79083b62394c0f79ba781ffead WHIRLPOOL 791cf3b55db88df3ccf3e70c8b187b9f10b3e400c2dba80c0646fc2caf02258fecf906ba0168a94404e1f5852b42a50eb7c84af9e9db9065423e21e1fd3acdb5
 EBUILD netbeans-platform-9999_p20141226.ebuild 8508 SHA256 57c8a4294dd4b1d484bcb16e722d9859a77ecb082a268b66e46628eb0c2dd481 SHA512 df615cfd0c27e6c1ac2bb2b018c1148b91212005a3c38b2e00dc260b522a4aab72e80d6addc86a7f3b57688a98eddc0f99ef428d3ce2c02fddfbbfcbe7546f22 WHIRLPOOL 0127b37f4595f3338e6fbcb39fd4e2ebac7eaaf54b6165216916302c5730cc12379262182698d1c84c61025e047f2d13e8309e3d4323118a6438789bc6656ae8
 EBUILD netbeans-platform-9999_p20141227.ebuild 8508 SHA256 3d5699182f1685fcc9b5d60b0f50c751eac10fc2f31d4c433e6267940b9c4afe SHA512 3a512f0fc400a752b14bab153ab47a2a0b7d7ea9afe7f78cedd7e9610de69bfd7732d174470081cf888a066a1c70242f1bd808cd645ce1c929203ede852425df WHIRLPOOL 78df8476c1c82f601ccc42594ab1f676b006a085519788398dfdcb1a6abc4cae6d42414252949f6bd1fb6bcd4a0b4533b84539592938ff976857a23a9054ae68
-MISC ChangeLog 146165 SHA256 068543ce8dfe19c424d7300916fadcfaa8c5572d9bf4cb0ec326768a4ded1a42 SHA512 ab5e37ca92d0532f09c48616974d74b97bac57e24271e336dc0b1d6dc2e5ce32a82324af5ef54d13f60ef3f43ec0185c0bde17d745520bc2e6df305a947ef334 WHIRLPOOL b90cd0c8e585e56bcd08e58b343b3964003bc91d82046780660f0ffdc034c2fc14712cde0ba880c77dfaf0aa293f3b1e898c314a9fdd4737e84caa6bfbace7d3
+EBUILD netbeans-platform-9999_p20141228.ebuild 8508 SHA256 3df4f489cc516072b366282bd5839dbba4f5b54c28ae2cc073f317ebbeed330a SHA512 341b2cc054952787ff2ea4f49b3e6b127db8f74d33e2ea22b5a1a0ab0530eaec9186e1c24f1dc6e449f3f190d55664f3ba2a2c0c4b97bfec3c72fce7879af583 WHIRLPOOL 0b8e828ea16ab4262a2a764407767f4e85075e76fffa60a74c89724aced594aaa4107c4b65f3fb341832287fc167566aa49b0659ebcc75f00c59d83ec8ef26d9
+EBUILD netbeans-platform-9999_p20141229.ebuild 8508 SHA256 520993051f098dace92f0e42c0f325a7eeb592b8f669f43fd28e5e646ddc066a SHA512 ea77bd51c0e966d1dd57331896865450b8876bae88b7588de328226480619716960b856172491e519da699e8ed4c9c7a71a0130caf2a4ef433994fb1dddde486 WHIRLPOOL 0032e086e24bc15c77959fe49df42109e9ee0e8a180a957c9a820f43affd92f17cd0627a8e73d77ecf7d2168e315963cfafd8c1b3b810a6ca91f9a756e53d3a5
+MISC ChangeLog 146434 SHA256 4e6090e771eb3a680788068744f6c87b0c9863b14dee9340605646e45395de4b SHA512 c58ff2ab85716192fa54e5cff071ee47db91710458510f16a31e20c81af317e7d3fb54c7242906cf236ea69482c3e5e5e7e73e862a0ca61a0f1fcfa5a2f33548 WHIRLPOOL b891359b19b096e84d153b6cfdbfae9b69696b1de4467b1111e86f6caddc9d115e92dc077fe83d4caca2cc6e62edf833aa7bebabd2f44b939f5ecd4f0d06f6cc
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20141228.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20141228.ebuild
new file mode 100644
index 0000000..18b8f20
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20141228.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Platform"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2014-12-28_00-01-53/zip/netbeans-trunk-nightly-201412280001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar
+	http://hg.netbeans.org/binaries/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar
+	http://hg.netbeans.org/binaries/8B5627E4907808B25628C64F2876B2E64ECDF750-ko4j.jar
+	http://hg.netbeans.org/binaries/4C8F273EB7D02845F42CFBE3DE4EB2BA22AF6357-net-java-html.jar
+	http://hg.netbeans.org/binaries/72B71E13ADC08732D8274083908D47ED9CC37B55-net-java-html-boot.jar
+	http://hg.netbeans.org/binaries/29388BB216B2463DB0B7AD403392C0F7EA7A4260-net-java-html-boot-fx.jar
+	http://hg.netbeans.org/binaries/37B1B513D8E7A2689A92188DABE950E0D63176D3-net-java-html-boot-script.jar
+	http://hg.netbeans.org/binaries/51ADBD6B0FE548E15BD10AFC345CAD48589E960E-net-java-html-geo.jar
+	http://hg.netbeans.org/binaries/D9E741F404CE0751B97A343A665666A441008E4F-net-java-html-json.jar
+	http://hg.netbeans.org/binaries/A89F8D030A3BFCA10880C3274E86D683FCB92062-net-java-html-sound.jar
+	http://hg.netbeans.org/binaries/B27F1304F18FEDE876F940AEFA6C9EB5632619D7-org.eclipse.osgi_3.9.1.v20140110-1610.jar
+	http://hg.netbeans.org/binaries/AD568238EE36A820BD6C6806807E8A14EA34684D-org-ow2-asm.jar
+	http://hg.netbeans.org/binaries/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar
+	http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip
+	http://hg.netbeans.org/binaries/AC97B566699146713B3CF0ABC226B5C08EF7CF33-testng-6.8.1-dist.jar
+	http://hg.netbeans.org/binaries/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="dev-java/javahelp:0
+	>=dev-java/jna-3.4:0
+	>=dev-java/osgi-core-api-5:0
+	dev-java/swing-layout:1[source]"
+# oracle-jdk-bin is needed because other jdks do not contain file jre/lib/ext/jfxrt.jar
+# the error:
+#  [parseprojectxml] Distilling /var/tmp/portage/dev-java/netbeans-platform-9999_p20140922/work/nbbuild/build/public-package-jars/org-netbeans-libs-javafx.jar from [/var/tmp/portage/dev-java/netbeans-platform-9999_p20140922/work/nbbuild/netbeans/platform/modules/org-netbeans-libs-javafx.jar, /opt/icedtea-bin-7.2.4.7/jre/lib/ext/jfxrt.jar]
+#  [parseprojectxml] Classpath entry /opt/icedtea-bin-7.2.4.7/jre/lib/ext/jfxrt.jar does not exist; skipping
+#  [nbmerge] Failed to build target: all-api.html4j
+
+DEPEND="dev-java/oracle-jdk-bin:1.7
+	app-arch/unzip
+	${CDEPEND}"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.platform -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+JAVA_PKG_WANT_BUILD_VM="oracle-jdk-bin-1.7"
+JAVA_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar libs.asm/external/asm-all-5.0.1.jar || die
+	ln -s "${DISTDIR}"/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar libs.felix/external/felix-4.2.1.jar || die
+	ln -s "${DISTDIR}"/8B5627E4907808B25628C64F2876B2E64ECDF750-ko4j.jar o.n.html.ko4j/external/ko4j.jar || die
+	ln -s "${DISTDIR}"/4C8F273EB7D02845F42CFBE3DE4EB2BA22AF6357-net-java-html.jar net.java.html/external/net-java-html.jar || die
+	ln -s "${DISTDIR}"/72B71E13ADC08732D8274083908D47ED9CC37B55-net-java-html-boot.jar net.java.html.boot/external/net-java-html-boot.jar || die
+	ln -s "${DISTDIR}"/29388BB216B2463DB0B7AD403392C0F7EA7A4260-net-java-html-boot-fx.jar net.java.html.boot.fx/external/net-java-html-boot-fx.jar || die
+	ln -s "${DISTDIR}"/37B1B513D8E7A2689A92188DABE950E0D63176D3-net-java-html-boot-script.jar net.java.html.boot.script/external/net-java-html-boot-script.jar || die
+	ln -s "${DISTDIR}"/51ADBD6B0FE548E15BD10AFC345CAD48589E960E-net-java-html-geo.jar net.java.html.geo/external/net-java-html-geo.jar || die
+	ln -s "${DISTDIR}"/D9E741F404CE0751B97A343A665666A441008E4F-net-java-html-json.jar net.java.html.json/external/net-java-html-json.jar || die
+	ln -s "${DISTDIR}"/A89F8D030A3BFCA10880C3274E86D683FCB92062-net-java-html-sound.jar net.java.html.sound/external/net-java-html-sound.jar || die
+	ln -s "${DISTDIR}"/B27F1304F18FEDE876F940AEFA6C9EB5632619D7-org.eclipse.osgi_3.9.1.v20140110-1610.jar netbinox/external/org.eclipse.osgi_3.9.1.v20140110-1610.jar || die
+	ln -s "${DISTDIR}"/AD568238EE36A820BD6C6806807E8A14EA34684D-org-ow2-asm.jar o.objectweb.asm/external/org-ow2-asm.jar || die
+	ln -s "${DISTDIR}"/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar libs.osgi/external/osgi.cmpn-4.2.jar || die
+	ln -s "${DISTDIR}"/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip o.jdesktop.layout/external/swing-layout-1.0.4-doc.zip || die
+	ln -s "${DISTDIR}"/AC97B566699146713B3CF0ABC226B5C08EF7CF33-testng-6.8.1-dist.jar libs.testng/external/testng-6.8.1-dist.jar || die
+	ln -s "${DISTDIR}"/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip libs.testng/external/testng-6.8.1-javadoc.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	# upstream jna jar contains bundled binary libraries so we disable that feature
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --into libs.jna.platform/external jna platform.jar jna-platform-4.1.0.jar
+	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.jna/external jna jna.jar jna-4.1.0.jar
+	java-pkg_jar-from --into libs.osgi/external osgi-core-api osgi-core-api.jar osgi.core-5.0.0.jar
+	java-pkg_jar-from --into o.jdesktop.layout/external swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
+	ln -s /usr/share/swing-layout-1/sources/swing-layout-src.zip o.jdesktop.layout/external/swing-layout-1.0.4-src.zip || die
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	unset DISPLAY
+	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+	pushd nbbuild/netbeans/platform >/dev/null || die
+
+	java-pkg_dojar lib/*.jar
+	grep -E "/platform$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	insinto ${INSTALL_DIR}
+	doins -r *
+	rm "${D}"/${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip || die
+	dosym /usr/share/swing-layout-1/sources/swing-layout-src.zip ${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip
+	find "${D}"/${INSTALL_DIR} -name "*.exe" -delete
+	find "${D}"/${INSTALL_DIR} -name "*.dll" -delete
+	rm -fr "${D}"/modules/lib || die
+
+	popd >/dev/null || die
+
+	fperms 775 ${INSTALL_DIR}/lib/nbexec
+	dosym ${INSTALL_DIR}/lib/nbexec /usr/bin/nbexec-${SLOT}
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jhall-2.0_05.jar && dosym /usr/share/javahelp/lib/jhall.jar ${instdir}/jhall-2.0_05.jar || die
+	rm jna-4.1.0.jar && dosym /usr/share/jna/lib/jna.jar ${instdir}/jna-4.1.0.jar || die
+	rm jna-platform-4.1.0.jar && dosym /usr/share/jna/lib/platform.jar ${instdir}/jna-platform-4.1.0.jar || die
+	rm osgi.core-5.0.0.jar && dosym /usr/share/osgi-core-api/lib/osgi-core-api.jar ${instdir}/osgi.core-5.0.0.jar || die
+	rm swing-layout-1.0.4.jar && dosym /usr/share/swing-layout-1/lib/swing-layout.jar ${instdir}/swing-layout-1.0.4.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/platform
+}

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20141229.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20141229.ebuild
new file mode 100644
index 0000000..29275f6
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20141229.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Platform"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2014-12-29_00-01-53/zip/netbeans-trunk-nightly-201412290001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar
+	http://hg.netbeans.org/binaries/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar
+	http://hg.netbeans.org/binaries/8B5627E4907808B25628C64F2876B2E64ECDF750-ko4j.jar
+	http://hg.netbeans.org/binaries/4C8F273EB7D02845F42CFBE3DE4EB2BA22AF6357-net-java-html.jar
+	http://hg.netbeans.org/binaries/72B71E13ADC08732D8274083908D47ED9CC37B55-net-java-html-boot.jar
+	http://hg.netbeans.org/binaries/29388BB216B2463DB0B7AD403392C0F7EA7A4260-net-java-html-boot-fx.jar
+	http://hg.netbeans.org/binaries/37B1B513D8E7A2689A92188DABE950E0D63176D3-net-java-html-boot-script.jar
+	http://hg.netbeans.org/binaries/51ADBD6B0FE548E15BD10AFC345CAD48589E960E-net-java-html-geo.jar
+	http://hg.netbeans.org/binaries/D9E741F404CE0751B97A343A665666A441008E4F-net-java-html-json.jar
+	http://hg.netbeans.org/binaries/A89F8D030A3BFCA10880C3274E86D683FCB92062-net-java-html-sound.jar
+	http://hg.netbeans.org/binaries/B27F1304F18FEDE876F940AEFA6C9EB5632619D7-org.eclipse.osgi_3.9.1.v20140110-1610.jar
+	http://hg.netbeans.org/binaries/AD568238EE36A820BD6C6806807E8A14EA34684D-org-ow2-asm.jar
+	http://hg.netbeans.org/binaries/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar
+	http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip
+	http://hg.netbeans.org/binaries/AC97B566699146713B3CF0ABC226B5C08EF7CF33-testng-6.8.1-dist.jar
+	http://hg.netbeans.org/binaries/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="dev-java/javahelp:0
+	>=dev-java/jna-3.4:0
+	>=dev-java/osgi-core-api-5:0
+	dev-java/swing-layout:1[source]"
+# oracle-jdk-bin is needed because other jdks do not contain file jre/lib/ext/jfxrt.jar
+# the error:
+#  [parseprojectxml] Distilling /var/tmp/portage/dev-java/netbeans-platform-9999_p20140922/work/nbbuild/build/public-package-jars/org-netbeans-libs-javafx.jar from [/var/tmp/portage/dev-java/netbeans-platform-9999_p20140922/work/nbbuild/netbeans/platform/modules/org-netbeans-libs-javafx.jar, /opt/icedtea-bin-7.2.4.7/jre/lib/ext/jfxrt.jar]
+#  [parseprojectxml] Classpath entry /opt/icedtea-bin-7.2.4.7/jre/lib/ext/jfxrt.jar does not exist; skipping
+#  [nbmerge] Failed to build target: all-api.html4j
+
+DEPEND="dev-java/oracle-jdk-bin:1.7
+	app-arch/unzip
+	${CDEPEND}"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.platform -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+JAVA_PKG_WANT_BUILD_VM="oracle-jdk-bin-1.7"
+JAVA_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar libs.asm/external/asm-all-5.0.1.jar || die
+	ln -s "${DISTDIR}"/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar libs.felix/external/felix-4.2.1.jar || die
+	ln -s "${DISTDIR}"/8B5627E4907808B25628C64F2876B2E64ECDF750-ko4j.jar o.n.html.ko4j/external/ko4j.jar || die
+	ln -s "${DISTDIR}"/4C8F273EB7D02845F42CFBE3DE4EB2BA22AF6357-net-java-html.jar net.java.html/external/net-java-html.jar || die
+	ln -s "${DISTDIR}"/72B71E13ADC08732D8274083908D47ED9CC37B55-net-java-html-boot.jar net.java.html.boot/external/net-java-html-boot.jar || die
+	ln -s "${DISTDIR}"/29388BB216B2463DB0B7AD403392C0F7EA7A4260-net-java-html-boot-fx.jar net.java.html.boot.fx/external/net-java-html-boot-fx.jar || die
+	ln -s "${DISTDIR}"/37B1B513D8E7A2689A92188DABE950E0D63176D3-net-java-html-boot-script.jar net.java.html.boot.script/external/net-java-html-boot-script.jar || die
+	ln -s "${DISTDIR}"/51ADBD6B0FE548E15BD10AFC345CAD48589E960E-net-java-html-geo.jar net.java.html.geo/external/net-java-html-geo.jar || die
+	ln -s "${DISTDIR}"/D9E741F404CE0751B97A343A665666A441008E4F-net-java-html-json.jar net.java.html.json/external/net-java-html-json.jar || die
+	ln -s "${DISTDIR}"/A89F8D030A3BFCA10880C3274E86D683FCB92062-net-java-html-sound.jar net.java.html.sound/external/net-java-html-sound.jar || die
+	ln -s "${DISTDIR}"/B27F1304F18FEDE876F940AEFA6C9EB5632619D7-org.eclipse.osgi_3.9.1.v20140110-1610.jar netbinox/external/org.eclipse.osgi_3.9.1.v20140110-1610.jar || die
+	ln -s "${DISTDIR}"/AD568238EE36A820BD6C6806807E8A14EA34684D-org-ow2-asm.jar o.objectweb.asm/external/org-ow2-asm.jar || die
+	ln -s "${DISTDIR}"/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar libs.osgi/external/osgi.cmpn-4.2.jar || die
+	ln -s "${DISTDIR}"/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip o.jdesktop.layout/external/swing-layout-1.0.4-doc.zip || die
+	ln -s "${DISTDIR}"/AC97B566699146713B3CF0ABC226B5C08EF7CF33-testng-6.8.1-dist.jar libs.testng/external/testng-6.8.1-dist.jar || die
+	ln -s "${DISTDIR}"/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip libs.testng/external/testng-6.8.1-javadoc.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	# upstream jna jar contains bundled binary libraries so we disable that feature
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --into libs.jna.platform/external jna platform.jar jna-platform-4.1.0.jar
+	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.jna/external jna jna.jar jna-4.1.0.jar
+	java-pkg_jar-from --into libs.osgi/external osgi-core-api osgi-core-api.jar osgi.core-5.0.0.jar
+	java-pkg_jar-from --into o.jdesktop.layout/external swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
+	ln -s /usr/share/swing-layout-1/sources/swing-layout-src.zip o.jdesktop.layout/external/swing-layout-1.0.4-src.zip || die
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	unset DISPLAY
+	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+	pushd nbbuild/netbeans/platform >/dev/null || die
+
+	java-pkg_dojar lib/*.jar
+	grep -E "/platform$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	insinto ${INSTALL_DIR}
+	doins -r *
+	rm "${D}"/${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip || die
+	dosym /usr/share/swing-layout-1/sources/swing-layout-src.zip ${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip
+	find "${D}"/${INSTALL_DIR} -name "*.exe" -delete
+	find "${D}"/${INSTALL_DIR} -name "*.dll" -delete
+	rm -fr "${D}"/modules/lib || die
+
+	popd >/dev/null || die
+
+	fperms 775 ${INSTALL_DIR}/lib/nbexec
+	dosym ${INSTALL_DIR}/lib/nbexec /usr/bin/nbexec-${SLOT}
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jhall-2.0_05.jar && dosym /usr/share/javahelp/lib/jhall.jar ${instdir}/jhall-2.0_05.jar || die
+	rm jna-4.1.0.jar && dosym /usr/share/jna/lib/jna.jar ${instdir}/jna-4.1.0.jar || die
+	rm jna-platform-4.1.0.jar && dosym /usr/share/jna/lib/platform.jar ${instdir}/jna-platform-4.1.0.jar || die
+	rm osgi.core-5.0.0.jar && dosym /usr/share/osgi-core-api/lib/osgi-core-api.jar ${instdir}/osgi.core-5.0.0.jar || die
+	rm swing-layout-1.0.4.jar && dosym /usr/share/swing-layout-1/lib/swing-layout.jar ${instdir}/swing-layout-1.0.4.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/platform
+}

diff --git a/dev-java/netbeans-profiler/ChangeLog b/dev-java/netbeans-profiler/ChangeLog
index a6f058b..f4f4345 100644
--- a/dev-java/netbeans-profiler/ChangeLog
+++ b/dev-java/netbeans-profiler/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-profiler-9999_p20141229 (29 Dec 2014)
+*netbeans-profiler-9999_p20141228 (29 Dec 2014)
+
+  29 Dec 2014; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-profiler-9999_p20141228.ebuild,
+  +netbeans-profiler-9999_p20141229.ebuild:
+  bumped to the latest sources
+
 *netbeans-profiler-9999_p20141227 (27 Dec 2014)
 
   27 Dec 2014; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 3c999a9..ad19fd9 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -52,6 +52,8 @@ DIST netbeans-trunk-nightly-201412230001-src.zip 201224939 SHA256 4b0894151a203a
 DIST netbeans-trunk-nightly-201412250001-src.zip 201240621 SHA256 d133ff2185d2c6f5561d9226d16c2db373796f017b009ac16107d7c0b9fda1e4 SHA512 a8a5db63b7644a15051d4fc72ded6b5a11789a6ca73404068b5d7d2a82fdfcee29216d3a056180ebdd7a735468c485b939c1ee9ad012e5bd9632bd4a48cb948f WHIRLPOOL db78e1911db3615eceef7177cb734956c3ad5760ffd802019e2b809546999c579dfe9ec77b2dba0241862f4525eacdd71a3beb3848386fde5cbaf267d9b0e36e
 DIST netbeans-trunk-nightly-201412260001-src.zip 201263552 SHA256 1c168e53c6217da5215d1349a33ff9c8f29006832f1a2453819a83525452468b SHA512 a6b2b605dd50d7b2ad81edb254de2182f2182cbd24d11e61d2f64955a5d9a3ebf32abc20968b27bd72be8b2b41a2cc1dcaf8c54fe51ad82f58deb23716713baf WHIRLPOOL 6fe4efa1dbffc68b4d7f423fadeb897b349c883ee6d3808ddb26b3fd94d57a853731d26e13fa03b4b223412bd12bedcedc6e4807b2779233e69896c706f8ccda
 DIST netbeans-trunk-nightly-201412270001-src.zip 201263552 SHA256 734c2d6a13ac8466921c952831f2890fb0062ccaf79fe0b4ff12b02be55aaa90 SHA512 4015c26df82c49a534e31e14ce72c263589af621c78e1961b85f96fae0d9d61140b1ba66f0a758400c2bf73bed73ddf887f8703ab721f03369fc5363ad3e7f95 WHIRLPOOL 6dc1dc6e5aeb0b28fb750ab0dad64b8b50d919b42d549e78ea354535c6430fe8f52bf06838d4ad7530d7ef77175d0e8d81d6df8952ba0f8c5e1736bc317a8151
+DIST netbeans-trunk-nightly-201412280001-src.zip 201263552 SHA256 9ee16bf46caf062b6173d9e07e91666f09dcf896b91cbf5aa12fe3d8b56c26b9 SHA512 87b2862da5db0abcae2c0a3ed3c95b53be94ecf9d11282c65af96e16fadac25c004c1d404cf5c74bd83ea61c53e102e2cf914b57d91aa2dbb305dd506c56fb8b WHIRLPOOL 6a1d5065e9597a0075a6d3d2adbfe80a3222dab95f198ce7de1f7cf9a7bbb088625f622543524e89a6d2045a9b47b21b999f09d048e52436f81f2d906cbfe695
+DIST netbeans-trunk-nightly-201412290001-src.zip 201263552 SHA256 170477d79b8bf19d65684dec3518bc8b6d344b05dd304b2a950f976a77069b63 SHA512 88f9cbee44a891ac35381a934058f23660d01ae6a072a6253589aecf4864daf4c288124564707f590f199a5428f82eaa6c85508d192970917ef88373788e5b7f WHIRLPOOL ba5464c152dab8532f561fb80812ecade46659f32a5314b32dc318f50c157b123dc1bf7fba6a1e9c447253c0607a83e341ef79ba91fd8f684a10f277b8d9899c
 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
@@ -98,5 +100,7 @@ EBUILD netbeans-profiler-9999_p20141223.ebuild 3478 SHA256 6f4acdff886236460ce8c
 EBUILD netbeans-profiler-9999_p20141225.ebuild 3478 SHA256 422522cab16c4df3095964760ac8debc04724484bba5947ccb30be814f620302 SHA512 d4c143ddf8ad56364dfbf6ba137ac356e003720be5ada2a896202d8ce785acfaef2cab6ccea497a6e657a17344f313fe7225b54ce3b71f2e110ad8ee9538ec3f WHIRLPOOL d47c6c6e7405cae9c57ff57e6019b38da2ba777181746fac2c3ed850bd50cf2846f84d12711fa81ec8cfa41fca92d63179545226459df6cd59a2872151ef49c4
 EBUILD netbeans-profiler-9999_p20141226.ebuild 3478 SHA256 e374ae7422fa4aebc9cfeb58820ce2291ba931ba73ee3ad3176e9631782478fe SHA512 7e46a34ece838be374592d0737b249c151f7e07fdb70ee9fc78efdb2162768b6e07e71835363d2e402ffb727b444cbff1fdbc0aa337ed37d8a19e206d439f668 WHIRLPOOL a3319c5df0ab423ef71a068c87e8f86d8c4ff3bb878876f93898c816a9b6850fca26507bf9fcc2a98b65a1f0f95772a467d67a24c3a74adebccb6ed7783e500b
 EBUILD netbeans-profiler-9999_p20141227.ebuild 3478 SHA256 9af256695f982c29a84e51c4a09b281292924f70eec071b11e81fc9245cf0b02 SHA512 4c80a0e9501623b854b8b0db732dfbd220b7adef2c644b3dc7428926b641e12efd6475bfa86a37d38f57be98f20fd9a943130722e683c8242b009e1708a6aa3d WHIRLPOOL b47727924e1f8cc5b2f2f3db45a82c474c20f97681df13643d6b5b85f3f96c534c184c039fc188b63cf315a0647a2bcc929f3f144b92f6247c3589b323e7304d
-MISC ChangeLog 145626 SHA256 5f64042260fcb1074324f14634f416a96d217ff9b64fef0ce1efb110e483ec7c SHA512 1b09dd8e7137f462a50c477febf5efc0da0d55646b87051e1c8a339440b40bb1c0e1e3fc4801441ea6e183367cca445e60649110f72ddbeaacfdbb7a3686fd97 WHIRLPOOL 920043b213846a0aa00ad14df80b01ad437ad8114e870f9594c8b8c8ba344dc28ffbadc1595c1c967b4ddb4efa5ebdf6ab2cfb00fd674a271ee275a7fb55a1c7
+EBUILD netbeans-profiler-9999_p20141228.ebuild 3478 SHA256 92b86eea32bccdd2376f77f94def35023539380ca14fa027d8882b7f5a96e33e SHA512 ab1274057e010a80c114a3b09ca7d5498563aea2ea1c6f6e0cd4811b96131122b194c5a8090909d25868d4ce8f52fa01604fa95e9d80032536d941a94a3c3dc6 WHIRLPOOL 021f70b415e4c48f636dc5a3efb31eb8b333d8c639dc24d791f2d12b504ea6df6aa2f94d53bbafb9188140122fa065be25ae5cd3112cad4025a97b135db33958
+EBUILD netbeans-profiler-9999_p20141229.ebuild 3478 SHA256 353c6a99d9544656c372461bb519a30e63e2fca33b51256222712656b73ccaa8 SHA512 993204282fb07bd6f173f2da000eddec6ef87484d1551c9b2213b1e83a644bf39bd23da5e95aad047c36709e19a7dcdac374f54bf18253fb8253a746ed61cc33 WHIRLPOOL 96ae7994cba23f8809ffdc5434395eb348f7bfcac4208c062eeb6105ce5a46ac04d81c224d6488634252449f348fd5cb6f747f77489fe4dd4a81cf295a283418
+MISC ChangeLog 145895 SHA256 0a5e190f93a083cc4eeb8f603e53dfccededd18679b6e70456a31720c4d45a6a SHA512 6d9d8892283eacdb01dac70c5f5e3017c85b089b1afea1abf3c450236b03aa3526b2cb0e29613375ea75a0f54f046b695fb6d6bab27a45c04664efb15ba43f18 WHIRLPOOL 502d5e161b27c19bb19618e9d6ea3e27b32b155160af914b20dfdf3c4e5cd1506c06eadf16b8d00dee12742c6aa70c7e8d0125e9d256a6f02d91a14fd92aec6f
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20141228.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20141228.ebuild
new file mode 100644
index 0000000..10de350
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20141228.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Profiler Cluster"
+HOMEPAGE="http://netbeans.org/projects/profiler"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2014-12-28_00-01-53/zip/netbeans-trunk-nightly-201412280001-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-profiler/netbeans-profiler-9999_p20141229.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20141229.ebuild
new file mode 100644
index 0000000..05b2412
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20141229.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Profiler Cluster"
+HOMEPAGE="http://netbeans.org/projects/profiler"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2014-12-29_00-01-53/zip/netbeans-trunk-nightly-201412290001-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 510638a..59cf874 100644
--- a/dev-java/netbeans-webcommon/ChangeLog
+++ b/dev-java/netbeans-webcommon/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-webcommon-9999_p20141229 (29 Dec 2014)
+*netbeans-webcommon-9999_p20141228 (29 Dec 2014)
+
+  29 Dec 2014; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-webcommon-9999_p20141228.ebuild,
+  +netbeans-webcommon-9999_p20141229.ebuild:
+  bumped to the latest sources
+
 *netbeans-webcommon-9999_p20141227 (27 Dec 2014)
 
   27 Dec 2014; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index 4e80f8a..db47afb 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -58,6 +58,8 @@ DIST netbeans-trunk-nightly-201412230001-src.zip 201224939 SHA256 4b0894151a203a
 DIST netbeans-trunk-nightly-201412250001-src.zip 201240621 SHA256 d133ff2185d2c6f5561d9226d16c2db373796f017b009ac16107d7c0b9fda1e4 SHA512 a8a5db63b7644a15051d4fc72ded6b5a11789a6ca73404068b5d7d2a82fdfcee29216d3a056180ebdd7a735468c485b939c1ee9ad012e5bd9632bd4a48cb948f WHIRLPOOL db78e1911db3615eceef7177cb734956c3ad5760ffd802019e2b809546999c579dfe9ec77b2dba0241862f4525eacdd71a3beb3848386fde5cbaf267d9b0e36e
 DIST netbeans-trunk-nightly-201412260001-src.zip 201263552 SHA256 1c168e53c6217da5215d1349a33ff9c8f29006832f1a2453819a83525452468b SHA512 a6b2b605dd50d7b2ad81edb254de2182f2182cbd24d11e61d2f64955a5d9a3ebf32abc20968b27bd72be8b2b41a2cc1dcaf8c54fe51ad82f58deb23716713baf WHIRLPOOL 6fe4efa1dbffc68b4d7f423fadeb897b349c883ee6d3808ddb26b3fd94d57a853731d26e13fa03b4b223412bd12bedcedc6e4807b2779233e69896c706f8ccda
 DIST netbeans-trunk-nightly-201412270001-src.zip 201263552 SHA256 734c2d6a13ac8466921c952831f2890fb0062ccaf79fe0b4ff12b02be55aaa90 SHA512 4015c26df82c49a534e31e14ce72c263589af621c78e1961b85f96fae0d9d61140b1ba66f0a758400c2bf73bed73ddf887f8703ab721f03369fc5363ad3e7f95 WHIRLPOOL 6dc1dc6e5aeb0b28fb750ab0dad64b8b50d919b42d549e78ea354535c6430fe8f52bf06838d4ad7530d7ef77175d0e8d81d6df8952ba0f8c5e1736bc317a8151
+DIST netbeans-trunk-nightly-201412280001-src.zip 201263552 SHA256 9ee16bf46caf062b6173d9e07e91666f09dcf896b91cbf5aa12fe3d8b56c26b9 SHA512 87b2862da5db0abcae2c0a3ed3c95b53be94ecf9d11282c65af96e16fadac25c004c1d404cf5c74bd83ea61c53e102e2cf914b57d91aa2dbb305dd506c56fb8b WHIRLPOOL 6a1d5065e9597a0075a6d3d2adbfe80a3222dab95f198ce7de1f7cf9a7bbb088625f622543524e89a6d2045a9b47b21b999f09d048e52436f81f2d906cbfe695
+DIST netbeans-trunk-nightly-201412290001-src.zip 201263552 SHA256 170477d79b8bf19d65684dec3518bc8b6d344b05dd304b2a950f976a77069b63 SHA512 88f9cbee44a891ac35381a934058f23660d01ae6a072a6253589aecf4864daf4c288124564707f590f199a5428f82eaa6c85508d192970917ef88373788e5b7f WHIRLPOOL ba5464c152dab8532f561fb80812ecade46659f32a5314b32dc318f50c157b123dc1bf7fba6a1e9c447253c0607a83e341ef79ba91fd8f684a10f277b8d9899c
 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
@@ -102,5 +104,7 @@ EBUILD netbeans-webcommon-9999_p20141223.ebuild 4997 SHA256 af64347978d6e7d2ca78
 EBUILD netbeans-webcommon-9999_p20141225.ebuild 4997 SHA256 c759101879f74f75e97c2f76b77f636e2321c2723364cda799fbd5b4189ccc6e SHA512 78017e5d9b7daba562465fcd587cd46c5a2867d64743152ca0bec5d16382c59ed3bb96b1c87047115a50716d53dfc399cb3a8b17befdce6f584066842cac83d6 WHIRLPOOL b65451484c08c66a7a9015828c25851e3de940a81aba3a5d9f107b4d914029fefaf4a0c393fe2d8af2e21e807fd13c7db8f3a5bcf4289943c14583bc5b142d30
 EBUILD netbeans-webcommon-9999_p20141226.ebuild 4997 SHA256 a8e5dbd2d4c8122946407b7a9396c5a3d2ca8c91b16924010494309417b9b488 SHA512 e940bd777491f32caca4df24c6ea6ca592e595374bf268eeb5559548aa2e4e23e5a5a361bf2b8681d8d3b79440c74d3813cff627945a448cd2d89590af30aadb WHIRLPOOL 82f577384a299ffcc5c3a2b500352279ca1af9ed1d5f884ceba91e64fb0f03268101ffc80c04284870278476169fdda1b21383e2347adb433eaaade832095a40
 EBUILD netbeans-webcommon-9999_p20141227.ebuild 4997 SHA256 9b6983cace01f584f8702128a574bcbbbce5b8c8312388ca26e15fd5f8e08fc5 SHA512 7a94bc0198d7d7047c379f376f6e22db71a16b8a9716ebf5f5b19385c730668d22cdd9b7967e38a96e2769ffe603e5cdb971eee7fd3547beb0f0b9fdea2b2234 WHIRLPOOL 68e6fecd68e6272bdc735e0cbd63fcb4e6851a7870e376b2d1f8d0c4d47aab8fe709fae26dcc307890144ff0a55cc8fb8d6e6fb241271a676085e6bd7ac0d2cb
-MISC ChangeLog 118405 SHA256 0c98ed5a68905df441cbf1a6efb5a7bf7b5364a960fb25765d320587471a334a SHA512 6a7749d6c2f24814b0cdfd360bcb9f2dc961e1d08977733afa0d998e3b526d2d985f2e4bf895c2d3881744930fbf119f649d72e3be54b120acd7089f4a944358 WHIRLPOOL a3452f313293d056cd2ae1bb9f066daca8f473a145fd7f3b30e18f89ddd97e5b8ce06994e8a57026aa0285953836654c7f720496c4e38ad1fd59a376941c3f92
+EBUILD netbeans-webcommon-9999_p20141228.ebuild 4997 SHA256 334112efc0819d6d9caad60de9f99e5155de2c9260a1af39891ccc3ac6c34905 SHA512 1b3eae19e4fc0777392d784d62f4768aa56193bc1afe55b39c6829b61c1608ad48d6d36a5e1db9c1ed7a8c95e7e747012ff737eee939d6c14faea2ff58981f08 WHIRLPOOL 63005a83873b1cf54f021c2da1c64701badc132859c5bbd15f7e2eeae2d2da7a0181ebe07e53b844e569a91d79566be4e71a16c10fbcb3f12a9ed8ee4e3c5ea3
+EBUILD netbeans-webcommon-9999_p20141229.ebuild 4997 SHA256 a7c7f2b102a9fa8b5490b892d09f4a8323d6d7c95fb1d94c33f041c2d45fc027 SHA512 f9576afc828035d65c24eca7cd8955a7dcb96e4b99011391c0766a0f3490973cb47159198c122d3d14ef29e061c5f7c3adb4de53c6f3329a6f116950867cb751 WHIRLPOOL 985f685faaca8305c9a79fefc9f77a7638ed7f44ef6656a69a0441bc82ec32c55d8ab33929b99835d13c71e455b87050ed30801dce5ce0100fedd158d072fb12
+MISC ChangeLog 118678 SHA256 0fc8e614180ceba3e166500d30a44f9e9cf9708b88e0490cacfb22230598766e SHA512 bbc46411e6f6ba5aa41f33c577baabcdeccc574a3945fc3193c22d1bdc971c45a587c8120445819052af23597641afe0367fa606fe371103f250d9dbe7de8252 WHIRLPOOL c458c611774134e0e1adb0193a0bc03e0d222e985897dd574028691eacc9f006791f8ba386a1155254d0b60ddf00b515ff18201a5ec94190bc6ae306499ddce7
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20141228.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20141228.ebuild
new file mode 100644
index 0000000..c7d6de0
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20141228.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2014-12-28_00-01-53/zip/netbeans-trunk-nightly-201412280001-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-webcommon/netbeans-webcommon-9999_p20141229.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20141229.ebuild
new file mode 100644
index 0000000..4d13b94
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20141229.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2014-12-29_00-01-53/zip/netbeans-trunk-nightly-201412290001-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 f6419bf..995e342 100644
--- a/dev-java/netbeans-websvccommon/ChangeLog
+++ b/dev-java/netbeans-websvccommon/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-websvccommon-9999_p20141229 (29 Dec 2014)
+*netbeans-websvccommon-9999_p20141228 (29 Dec 2014)
+
+  29 Dec 2014; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-websvccommon-9999_p20141228.ebuild,
+  +netbeans-websvccommon-9999_p20141229.ebuild:
+  bumped to the latest sources
+
 *netbeans-websvccommon-9999_p20141227 (27 Dec 2014)
 
   27 Dec 2014; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 3abdd68..9677342 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -52,6 +52,8 @@ DIST netbeans-trunk-nightly-201412230001-src.zip 201224939 SHA256 4b0894151a203a
 DIST netbeans-trunk-nightly-201412250001-src.zip 201240621 SHA256 d133ff2185d2c6f5561d9226d16c2db373796f017b009ac16107d7c0b9fda1e4 SHA512 a8a5db63b7644a15051d4fc72ded6b5a11789a6ca73404068b5d7d2a82fdfcee29216d3a056180ebdd7a735468c485b939c1ee9ad012e5bd9632bd4a48cb948f WHIRLPOOL db78e1911db3615eceef7177cb734956c3ad5760ffd802019e2b809546999c579dfe9ec77b2dba0241862f4525eacdd71a3beb3848386fde5cbaf267d9b0e36e
 DIST netbeans-trunk-nightly-201412260001-src.zip 201263552 SHA256 1c168e53c6217da5215d1349a33ff9c8f29006832f1a2453819a83525452468b SHA512 a6b2b605dd50d7b2ad81edb254de2182f2182cbd24d11e61d2f64955a5d9a3ebf32abc20968b27bd72be8b2b41a2cc1dcaf8c54fe51ad82f58deb23716713baf WHIRLPOOL 6fe4efa1dbffc68b4d7f423fadeb897b349c883ee6d3808ddb26b3fd94d57a853731d26e13fa03b4b223412bd12bedcedc6e4807b2779233e69896c706f8ccda
 DIST netbeans-trunk-nightly-201412270001-src.zip 201263552 SHA256 734c2d6a13ac8466921c952831f2890fb0062ccaf79fe0b4ff12b02be55aaa90 SHA512 4015c26df82c49a534e31e14ce72c263589af621c78e1961b85f96fae0d9d61140b1ba66f0a758400c2bf73bed73ddf887f8703ab721f03369fc5363ad3e7f95 WHIRLPOOL 6dc1dc6e5aeb0b28fb750ab0dad64b8b50d919b42d549e78ea354535c6430fe8f52bf06838d4ad7530d7ef77175d0e8d81d6df8952ba0f8c5e1736bc317a8151
+DIST netbeans-trunk-nightly-201412280001-src.zip 201263552 SHA256 9ee16bf46caf062b6173d9e07e91666f09dcf896b91cbf5aa12fe3d8b56c26b9 SHA512 87b2862da5db0abcae2c0a3ed3c95b53be94ecf9d11282c65af96e16fadac25c004c1d404cf5c74bd83ea61c53e102e2cf914b57d91aa2dbb305dd506c56fb8b WHIRLPOOL 6a1d5065e9597a0075a6d3d2adbfe80a3222dab95f198ce7de1f7cf9a7bbb088625f622543524e89a6d2045a9b47b21b999f09d048e52436f81f2d906cbfe695
+DIST netbeans-trunk-nightly-201412290001-src.zip 201263552 SHA256 170477d79b8bf19d65684dec3518bc8b6d344b05dd304b2a950f976a77069b63 SHA512 88f9cbee44a891ac35381a934058f23660d01ae6a072a6253589aecf4864daf4c288124564707f590f199a5428f82eaa6c85508d192970917ef88373788e5b7f WHIRLPOOL ba5464c152dab8532f561fb80812ecade46659f32a5314b32dc318f50c157b123dc1bf7fba6a1e9c447253c0607a83e341ef79ba91fd8f684a10f277b8d9899c
 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
@@ -98,5 +100,7 @@ EBUILD netbeans-websvccommon-9999_p20141223.ebuild 2727 SHA256 613e3dcb5ff01a247
 EBUILD netbeans-websvccommon-9999_p20141225.ebuild 2727 SHA256 3c0f506c076128bf7e82d5922c8eaced2398d35268d398c0b586de528fa26cf6 SHA512 fe324972eb994ef307153164bac8d7d00387dd8847dda6ca996e063253765c7a5a4c8a3d1d47c8f03538def628aa4bdcc4b91e0ee270dfc181f9c78d5b1328a0 WHIRLPOOL eebf6163fbd7f7e9fac3ff1e6765f74b9f2559fc0d3c93aa9108bba28f0813a3d0e77b9758fd8613206ba5b5c4f1a4cc5b15c47ce8d4a6534279c3ea62cc4ea5
 EBUILD netbeans-websvccommon-9999_p20141226.ebuild 2727 SHA256 1898e6be4d6fc6f849a5c38024b4a24d407538820de099a3daeee7afc9f9899e SHA512 0b773011b57b1bfcc56e554bdc67af411f41c70ae4ceb62b847b74a09c42aa9b6f76a5528b94a9fcd288a4bc1b6b69bfe58c857df91b96939e91c8abbf5ce1e4 WHIRLPOOL 21ec98784d03c28d141cabf299d00286bd23e8015338c7ce083caf4a38f3c83056ce0d7be4d4b3ba1f7394b0c6168760687d8297dabb164d37e5c463d5e08458
 EBUILD netbeans-websvccommon-9999_p20141227.ebuild 2727 SHA256 103c9fedd0fe8c62aa357da3a75799aa5e37f1398fcc6a1073c67bdfdc87d4fd SHA512 2bd34601b3f9d356c0f8ca046246c49d9e833d1f94de3e29f1fceafb8b1d82c224bc113fb01444438cd01df399486657476bbc97ffdcde90b772f3e8c2e3a3c6 WHIRLPOOL babd676dbbf29ab8481f99f30b42c0ea6902319aae7e9a4e9ca927db4b0c475e33860da8be342156adbc8d63aefdd06445549941dd38528bb8b7f0181a51246e
-MISC ChangeLog 152483 SHA256 53758f03e10c662da0e1913962b6a7b00715f90475cf9a8d0ed40838bae9163c SHA512 ab8bcb303f03f4c33b23757e5fe8fc9613429dadc0da867efa138e786b4ff1d8c5f2cf2037ffa4ac51a4a9be6640f7f8a773030a1a42c1ae28a08e58c1b71e57 WHIRLPOOL 6c67a80a6be55f5d89b60bf66601fc23cc52719bb11e6999dbbc6813e47d95a438a8a202514076dbdc6b1eaaf4655c1929e0f0f5943b4f884cc80a57e861e20b
+EBUILD netbeans-websvccommon-9999_p20141228.ebuild 2727 SHA256 163b8f0794711a47596242c71a0c1f877d782fa57d218e43199d2764423be271 SHA512 13183241daee88747af663105d9e12ff8c4a17f39934196ad31d4abfd9fd74508e89e5bc3d82a3ea5a7a18fffdab8c37f7414a24c4c484d783456fa25dd2b7a9 WHIRLPOOL cf0847b2e233530bd75eefcafa88fdddacbba5faec55c66023a68b48ade1c0d05552a9cee376bd6ca86c6eaa06902f484ed21c5728ac9a5d7f08c2fa1741c31b
+EBUILD netbeans-websvccommon-9999_p20141229.ebuild 2727 SHA256 dd41fb14b0636ed07862a8683e6258b11abd592641fb1ed8f4171c648b9ea3cf SHA512 0f225a3537c1665ae2b9278945c59b3c2e33fba00d13468a2c48a4e205615b38359cc6c4a3d90d5a7f7a3fc02e5faf97b78d4d0efa801baa477f566f063ebe63 WHIRLPOOL 69baf6a64bded1195af5912fcf657f0073bdaa1851a1c33cd58b91058033441d0ba61ac7cd4a690444c76b211cfb16ccade10c2c82d45331eb665a91ba227c59
+MISC ChangeLog 152768 SHA256 4698d758eec0b4ba25426c241775dfce1e6a4423cd14fe571e78d34a69fb49d7 SHA512 11a607590fdf074a8f5bf335282133f8dbc18fd12b63b4df36c9b5c974f2de715c905535f7046ebbc123db21701be0f0f2e3e5b65cd29fdfd798326f47bec41b WHIRLPOOL 8a0c927e9e964acd2ce89ffd0e8bf2b350317bfedd5eb23d01d9b5cfb95cce20702319fd884ad8494cb180e1fb558dfe3aa13ca859ddc884bacdd5b76b0a3e87
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20141228.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20141228.ebuild
new file mode 100644
index 0000000..af192cb
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20141228.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Common Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2014-12-28_00-01-53/zip/netbeans-trunk-nightly-201412280001-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-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20141229.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20141229.ebuild
new file mode 100644
index 0000000..786e9a3
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20141229.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Common Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2014-12-29_00-01-53/zip/netbeans-trunk-nightly-201412290001-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 d97031f..6d9cb9d 100644
--- a/dev-util/netbeans/ChangeLog
+++ b/dev-util/netbeans/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-9999_p20141229 (29 Dec 2014)
+*netbeans-9999_p20141228 (29 Dec 2014)
+
+  29 Dec 2014; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-9999_p20141228.ebuild, +netbeans-9999_p20141229.ebuild:
+  bumped to the latest sources
+
 *netbeans-9999_p20141227 (27 Dec 2014)
 
   27 Dec 2014; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 7f31488..1fa3dc9 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -60,6 +60,8 @@ DIST netbeans-trunk-nightly-201412230001-src.zip 201224939 SHA256 4b0894151a203a
 DIST netbeans-trunk-nightly-201412250001-src.zip 201240621 SHA256 d133ff2185d2c6f5561d9226d16c2db373796f017b009ac16107d7c0b9fda1e4 SHA512 a8a5db63b7644a15051d4fc72ded6b5a11789a6ca73404068b5d7d2a82fdfcee29216d3a056180ebdd7a735468c485b939c1ee9ad012e5bd9632bd4a48cb948f WHIRLPOOL db78e1911db3615eceef7177cb734956c3ad5760ffd802019e2b809546999c579dfe9ec77b2dba0241862f4525eacdd71a3beb3848386fde5cbaf267d9b0e36e
 DIST netbeans-trunk-nightly-201412260001-src.zip 201263552 SHA256 1c168e53c6217da5215d1349a33ff9c8f29006832f1a2453819a83525452468b SHA512 a6b2b605dd50d7b2ad81edb254de2182f2182cbd24d11e61d2f64955a5d9a3ebf32abc20968b27bd72be8b2b41a2cc1dcaf8c54fe51ad82f58deb23716713baf WHIRLPOOL 6fe4efa1dbffc68b4d7f423fadeb897b349c883ee6d3808ddb26b3fd94d57a853731d26e13fa03b4b223412bd12bedcedc6e4807b2779233e69896c706f8ccda
 DIST netbeans-trunk-nightly-201412270001-src.zip 201263552 SHA256 734c2d6a13ac8466921c952831f2890fb0062ccaf79fe0b4ff12b02be55aaa90 SHA512 4015c26df82c49a534e31e14ce72c263589af621c78e1961b85f96fae0d9d61140b1ba66f0a758400c2bf73bed73ddf887f8703ab721f03369fc5363ad3e7f95 WHIRLPOOL 6dc1dc6e5aeb0b28fb750ab0dad64b8b50d919b42d549e78ea354535c6430fe8f52bf06838d4ad7530d7ef77175d0e8d81d6df8952ba0f8c5e1736bc317a8151
+DIST netbeans-trunk-nightly-201412280001-src.zip 201263552 SHA256 9ee16bf46caf062b6173d9e07e91666f09dcf896b91cbf5aa12fe3d8b56c26b9 SHA512 87b2862da5db0abcae2c0a3ed3c95b53be94ecf9d11282c65af96e16fadac25c004c1d404cf5c74bd83ea61c53e102e2cf914b57d91aa2dbb305dd506c56fb8b WHIRLPOOL 6a1d5065e9597a0075a6d3d2adbfe80a3222dab95f198ce7de1f7cf9a7bbb088625f622543524e89a6d2045a9b47b21b999f09d048e52436f81f2d906cbfe695
+DIST netbeans-trunk-nightly-201412290001-src.zip 201263552 SHA256 170477d79b8bf19d65684dec3518bc8b6d344b05dd304b2a950f976a77069b63 SHA512 88f9cbee44a891ac35381a934058f23660d01ae6a072a6253589aecf4864daf4c288124564707f590f199a5428f82eaa6c85508d192970917ef88373788e5b7f WHIRLPOOL ba5464c152dab8532f561fb80812ecade46659f32a5314b32dc318f50c157b123dc1bf7fba6a1e9c447253c0607a83e341ef79ba91fd8f684a10f277b8d9899c
 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
@@ -106,5 +108,7 @@ EBUILD netbeans-9999_p20141223.ebuild 7216 SHA256 05f245ef330898fd08059f41b8e30c
 EBUILD netbeans-9999_p20141225.ebuild 7216 SHA256 65942bd877d7b9e23f8fdc8db1459c196c3060a01722c55fee9b199153de6e77 SHA512 460ff01e30cbd82f5d313f9ca5680854e8fb147389d834a089476b829aa39d3f63131ee5c646d21da18dbe7ad1f8b32684eddf0c3a8cf7329ae9f74f526a5bfa WHIRLPOOL b6c8276e549089f494200bdf0181b106e65f63a2b0baaf8d41eccc29b66340e4e323554fe85ae5cf8a6fd993a6d97b56946f69cf0fc0c576e28af52cfa54bdce
 EBUILD netbeans-9999_p20141226.ebuild 7216 SHA256 28bd6ab46730381bd8814f49918b53b5f13eaed8289ef73aa763744ca6b3f563 SHA512 adc92e1fc20d73608ab861c88b69ec8482d879ac8fb3c6c8a39258ba14a7d084bc68e5ee1133dc29c0aefdb0d7e038dc0d6bd1087d7482a60dec80d0532e25fc WHIRLPOOL 18e10870de61c548c21acbf807719ef2d407a8a280bf425a6b4eba7e96abf6ae2a6eb1d2afe1570fdaaa923a62bc1b3475f37e50d052c6bcf0e659be08ec49c2
 EBUILD netbeans-9999_p20141227.ebuild 7216 SHA256 6d1a4f5feb90360e45483721f35873b7becb9a97a40528ac22c30f91f8ba040e SHA512 91d1d47caed9fe7c79afbd5bd33696d1233b5cae76206c39905d4d50969af4a8a1a2b0ad67c6e357d0e06b96af5fe086cbbf909a011deb903353f35ab56ff7bc WHIRLPOOL cecb9ffdf4f608e670ced620c304e1bfab5a24e1d788cf04050164d0ce167a53014dfe99d2faacfcc0aa750dad84cb7583941401d31296f884bd3fe620eeac8d
-MISC ChangeLog 130068 SHA256 96ddf53573f4219d418f78979eac893466f6ae95b4fb2d5b73df2d6b872b72ae SHA512 d995adf95e64f5c06e12e9c0b7632f80554dc47df459a7c4b19a184e4ca850897ce9bde2bfc7b204f8785ee863fd11f83d98b21fa0065482b110e5dadbaeeda1 WHIRLPOOL ef3d7c4ac03e091f92c5ce7025b0881fb0e239dbbe5afc4a8aee1cd67edc4ec77fe7042d08cce8e2768040395376ba4c265aec3e3cb716c823655d9e779aa84b
+EBUILD netbeans-9999_p20141228.ebuild 7216 SHA256 e820d40872641a1a00a534e26c56792c772ae783509f90e12396b8ea6d4df61b SHA512 948910fd1e8f4c8532f3f35620c2c4a432a6a6b614f913549eca55bbfecd91e38b19b4bfeace34f14ca65ca29f55dbc6d11b07d561c70e8b72c423548b458403 WHIRLPOOL d7510726bc61f248c6d66a6bfcb548488e9adc3c4c0291d064d11f386e782e18c5fafe39bd88f77b13ec14221034829890927f71392bbe214de11ab8ac33189a
+EBUILD netbeans-9999_p20141229.ebuild 7216 SHA256 564a1750b2f3f1471808301337ad980a113aaebb67673164f6378e385115e2ab SHA512 f5b6a6644fd1c5b4a83591eaa819eb78404120e4614dc8224538c84b654f6056e9eb9b09cd78780978b43015f5d2540153b6cafa8868687911b5f778832638ed WHIRLPOOL 65d11ab5971362389a3fcfbd4fd9a31be9e09cd8d39245cd4970b9d3e4c167af5a831e9977dbd4597ee7846623d2c8ea52b28e11c0e24d6a5c41b811059443bc
+MISC ChangeLog 130299 SHA256 ce5fc4990fd8801e4d50d4d794e2832b326b4eaf753170c887c8cd89739f34e7 SHA512 0ec1f7dd46ead7f9ce3466111d83d622cc43f79e621ca99638cc77de5eb1e3fc6de3a63a1d81316da6a29290fd20be4296ece87f42f5ab9a7debfae3eb51fe76 WHIRLPOOL 7a34607398969dda2afb72253555808d24707e89f859b1c6ad8b457b6868b10b7b5adb05af9e1e5746359c08edfa51aec3641f28a9727fd706340505684589f1
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

diff --git a/dev-util/netbeans/netbeans-9999_p20141228.ebuild b/dev-util/netbeans/netbeans-9999_p20141228.ebuild
new file mode 100644
index 0000000..bc30199
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20141228.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2014-12-28_00-01-53/zip/netbeans-trunk-nightly-201412280001-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
+}

diff --git a/dev-util/netbeans/netbeans-9999_p20141229.ebuild b/dev-util/netbeans/netbeans-9999_p20141229.ebuild
new file mode 100644
index 0000000..1070b21
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20141229.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2014-12-29_00-01-53/zip/netbeans-trunk-nightly-201412290001-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
+}