public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Miroslav Šulc" <fordfrog@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-mobility/, dev-java/netbeans-extide/, ...
Date: Fri,  3 Apr 2015 09:04:42 +0000 (UTC)	[thread overview]
Message-ID: <1428051859.4b36e59357a50cf870fb227f1d3cfd470e3cca42.fordfrog@gentoo> (raw)

commit:     4b36e59357a50cf870fb227f1d3cfd470e3cca42
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  3 09:04:19 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Apr  3 09:04:19 2015 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=4b36e593

netbeans: bumped to the latest sources

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

diff --git a/dev-java/netbeans-apisupport/ChangeLog b/dev-java/netbeans-apisupport/ChangeLog
index bb1c85f..80a6dac 100644
--- a/dev-java/netbeans-apisupport/ChangeLog
+++ b/dev-java/netbeans-apisupport/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-apisupport-9999_p20150403 (03 Apr 2015)
+
+  03 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-apisupport-9999_p20150403.ebuild:
+  bumped to the latest sources
+
 *netbeans-apisupport-9999_p20150402 (02 Apr 2015)
 
   02 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index a8e8b5c..27eea9c 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201503270001-src.zip 206933166 SHA256 ec88a4e19aef5c
 DIST netbeans-trunk-nightly-201503310001-src.zip 206989433 SHA256 1c3752add0684a6cc2fab0677c2259a21b5e7d3bff9270739f583a5613f8ec43 SHA512 f5c5466f5a9c59a903479c51c12586b2cb5fc1501b7a6cb92dbb39d3b7617fbb7a61bb61d13f21a26774f7a50885f3b963355be0738847d469d5156d37ee626b WHIRLPOOL f34a82105807ea88ab1414903112f75df442fe3daa9eebd98669985d2935f984e6a51fdf45ec00b058298da1e91e169ced7da1be4997ae30c8b98577efff09c1
 DIST netbeans-trunk-nightly-201504010001-src.zip 206997278 SHA256 8fc0488ca935d5e577fe05fe76bb1dcf8c0f0df0ad155966797c819f970b24a0 SHA512 8d7a6b83a3e32967358c5a07641eda588c28132e4f451b7f83d7c0f5cb03afd15fd3bf6fb916576e7d1859d0f8ed3c13ac50eed45d076a85d046555e86647bb1 WHIRLPOOL 6f64a1108890cbe4a2a89ec627142df9199ff2485f71bf83ab5f0aed48cd502872187b88c5aa5d1aee14701aa7cfc9226e8f2a654dd3b7ff5c37afd839ae6af0
 DIST netbeans-trunk-nightly-201504020001-src.zip 207019553 SHA256 d10dcf7a1c0b1070dceb99a4efbeb9d047ec9938c9950f9565ed3953312e2d50 SHA512 b1c680effd9560c373a73d9d5f691f51e4d60cbd2b35cf5557680821409451e73e9bdae030db8bf52da2b36ff4fabd826447482d9eb1743415418834b938bc9f WHIRLPOOL 0e2299826eb95a5679f84b2f3ee26fb5541804dcde8265ecfdf54f6bb64d59d940af58fae7b315c51a608c79e781d53b3150dfa61124f5faf692aacfe1b5a3ab
+DIST netbeans-trunk-nightly-201504030001-src.zip 207037940 SHA256 ef43b1a5fa315405511e141a8304fc78c27a594c95d49691109d3d3982540ed4 SHA512 ee745e10ec2cd30502cd1cd7bac908fb7a063ea269a4bebc25cf54a0e01c1e4f23f379e935cbd3a90ac8739669e2206fedb33e1554abc559171e805bd31232e7 WHIRLPOOL 621106415266577acf0061e692da5ed3ff9f0ea92e8b2040a0e89139272117ed7f70f4fa835dfb7b7c0dcff91afc93d53fb2e52cb77859e980b4a97ba3e371a0
 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
@@ -56,5 +57,6 @@ EBUILD netbeans-apisupport-9999_p20150327.ebuild 3390 SHA256 6ae63142aaa225fd2d4
 EBUILD netbeans-apisupport-9999_p20150331.ebuild 3390 SHA256 0a6bf8bc5cfab4bb805d3f6cbe2df0d125ebda2ccbd12883fccaf43f99ef9b2f SHA512 0d42c92198f86dcf3be8b4169c36fd77213043bb4f70a4bb6702ba3eec27fc609a15d789e9b677cedeabf3e55ca7128621c77c2bde3cd765e02086ab1c811b17 WHIRLPOOL 827e8db141515cd1e76d85be0e6b759c4a1988e30e1bcd2575c114ea96c143db03f00f787308fca4d74d29adef3762d9a238bf736c1e8edcb68e1f11299baa76
 EBUILD netbeans-apisupport-9999_p20150401.ebuild 3390 SHA256 a9fe038d0d5371f2ee25ae0fadab934ce58b45de3333feabee1e2a9572aa0d22 SHA512 8d6237ba70f2221c51d71dbd77c38a5bc5d4fb86840b6dce2fcabe8f414af43067cae188dd572aca028b51e32d33c3dfc9a8daba1182963dfce9c61801150431 WHIRLPOOL d41d1a528538da4f64958950bf78ce227cff0f45e3ea66c8c411dafe04af63f749c025dedc4e51b0a74a5a271912e14d2363ac1e2d32c979ac603177e6d99f6f
 EBUILD netbeans-apisupport-9999_p20150402.ebuild 3390 SHA256 e360fbb2abda52c684d93617dbddcf0acf7900eb5dcb59729e05769edb905e85 SHA512 dae6763d3c2fd99313d5c634db4d39416d110a3e5226e612d7c9085c6e926e6bdaf5883632d799ddecd1c87e8172a4085d4df07dcd6c1fb7388a1fc0f1b5c74a WHIRLPOOL dc754ccebea040f6eb71f5e9543393efad9d857557ed117affcc5682bbc6b79d05de4f0a80c84cccd6c3aa88287d9435792c9f89a32f6d3f6732e063682bae23
-MISC ChangeLog 166430 SHA256 24d3ac108e915d247a9e4de8e0ccdc6314ce8c5c475cc855d9544484c01930d1 SHA512 7250dde1590093593250bbe0227673c6cefe917bfd20e8a466f10720920639ba0bc9b4c823849f0467b1ff9c2556a7f86097ca28ec9e4b5bd2ec6f26b6c347c4 WHIRLPOOL 31cd233df7028757139369c1a71f9258fc00a38a93f7afcee21bcab173b3f546e2b10b3b688f576ecd42230f27200543b94c79653f4384d43f9b9d119c54a7a4
+EBUILD netbeans-apisupport-9999_p20150403.ebuild 3390 SHA256 9f0e7f58bb0253185294478e6255bdc5979fd51097c5e4de5186e166e250a909 SHA512 1c667e0d04d246fac187d9dc9b9dcd848941eabaab39a98a79d94854c01cabe00c0feb9839caf538dfc50d651b735b3646b3fa17b486b017897a41e1ca8ad20f WHIRLPOOL 41c807fdcb2ef32388c152b985753b32011e8e74d9ed243bfdb69738535495d2c6a3c554166caeae5c3d1a1fff34c2ba38fe5e269ee3c48f411b9eee45262719
+MISC ChangeLog 166611 SHA256 9e3f15c6ea6a1a5ad39193dee7390004d8a22aab5e808722e39131e91ef7e9ba SHA512 e9a9cd12bd32aefb8e10277de8244382b29576dc4870efe0bf1c5ac68ded6e20b57b968becbef30e6a8fb7c2c5c6bbd00b85764c3aaa33a586b2457770b099e5 WHIRLPOOL 65de767d6a02d3f7806b6b9289da6b78b6b6deff41b4910976e9a4abac68bda3056b578135847ff94cc9354017ecc11c3580caf0ee083d9fbca54ed53fdceea9
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150403.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150403.ebuild
new file mode 100644
index 0000000..daff7a5
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150403.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans API Support Cluster"
+HOMEPAGE="http://netbeans.org/projects/apisupport"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-04-03_00-01-28/zip/netbeans-trunk-nightly-201504030001-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 c373034..bd176de 100644
--- a/dev-java/netbeans-cnd/ChangeLog
+++ b/dev-java/netbeans-cnd/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-cnd-9999_p20150403 (03 Apr 2015)
+
+  03 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-cnd-9999_p20150403.ebuild:
+  bumped to the latest sources
+
 *netbeans-cnd-9999_p20150402 (02 Apr 2015)
 
   02 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index 7b71dec..104751f 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -46,6 +46,7 @@ DIST netbeans-trunk-nightly-201503270001-src.zip 206933166 SHA256 ec88a4e19aef5c
 DIST netbeans-trunk-nightly-201503310001-src.zip 206989433 SHA256 1c3752add0684a6cc2fab0677c2259a21b5e7d3bff9270739f583a5613f8ec43 SHA512 f5c5466f5a9c59a903479c51c12586b2cb5fc1501b7a6cb92dbb39d3b7617fbb7a61bb61d13f21a26774f7a50885f3b963355be0738847d469d5156d37ee626b WHIRLPOOL f34a82105807ea88ab1414903112f75df442fe3daa9eebd98669985d2935f984e6a51fdf45ec00b058298da1e91e169ced7da1be4997ae30c8b98577efff09c1
 DIST netbeans-trunk-nightly-201504010001-src.zip 206997278 SHA256 8fc0488ca935d5e577fe05fe76bb1dcf8c0f0df0ad155966797c819f970b24a0 SHA512 8d7a6b83a3e32967358c5a07641eda588c28132e4f451b7f83d7c0f5cb03afd15fd3bf6fb916576e7d1859d0f8ed3c13ac50eed45d076a85d046555e86647bb1 WHIRLPOOL 6f64a1108890cbe4a2a89ec627142df9199ff2485f71bf83ab5f0aed48cd502872187b88c5aa5d1aee14701aa7cfc9226e8f2a654dd3b7ff5c37afd839ae6af0
 DIST netbeans-trunk-nightly-201504020001-src.zip 207019553 SHA256 d10dcf7a1c0b1070dceb99a4efbeb9d047ec9938c9950f9565ed3953312e2d50 SHA512 b1c680effd9560c373a73d9d5f691f51e4d60cbd2b35cf5557680821409451e73e9bdae030db8bf52da2b36ff4fabd826447482d9eb1743415418834b938bc9f WHIRLPOOL 0e2299826eb95a5679f84b2f3ee26fb5541804dcde8265ecfdf54f6bb64d59d940af58fae7b315c51a608c79e781d53b3150dfa61124f5faf692aacfe1b5a3ab
+DIST netbeans-trunk-nightly-201504030001-src.zip 207037940 SHA256 ef43b1a5fa315405511e141a8304fc78c27a594c95d49691109d3d3982540ed4 SHA512 ee745e10ec2cd30502cd1cd7bac908fb7a063ea269a4bebc25cf54a0e01c1e4f23f379e935cbd3a90ac8739669e2206fedb33e1554abc559171e805bd31232e7 WHIRLPOOL 621106415266577acf0061e692da5ed3ff9f0ea92e8b2040a0e89139272117ed7f70f4fa835dfb7b7c0dcff91afc93d53fb2e52cb77859e980b4a97ba3e371a0
 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
@@ -71,5 +72,6 @@ EBUILD netbeans-cnd-9999_p20150327.ebuild 4586 SHA256 b5babc0cf30a12b03b33f35815
 EBUILD netbeans-cnd-9999_p20150331.ebuild 4586 SHA256 558016c1b8a63aa40f86a712a15cb807c8b4be359c0a3b664d47333800802d7b SHA512 b2f180e68f9fc1b91d2d67d72a7369083171e12be86556bd175a94f24f47e0270c380a3f15457dfabd322a84d74ca68a28b7ff095068c65afb347ad57cc9f04f WHIRLPOOL ab9649d32cf0b54d970941cd64cd74644bea02f8f621e20597c4a4661a06acbabb627b2ff530733598f326b6422b61a887682a203dbb4fc4cccc634232c8c52f
 EBUILD netbeans-cnd-9999_p20150401.ebuild 4586 SHA256 2e7be89c3f5b187cdbba7fb11c011a8e4bfebf8eca872968dc51e425d326d4f7 SHA512 f41da08c873813f1f5114a96c23cb416a608b1a990296d8a4fda20aa7fc438f9472aa5264a7c40b48eadb22b051daa1ae0b169296eb27b89e957f21ec14d7638 WHIRLPOOL 760160def2cf992b5e71f109dbcf988613bbefd57dea3a0b53779abc03f4261bf043b6a226d88aa3e6c7d06913c77f44164321fad2f56ca9e9e8071c2a540c1d
 EBUILD netbeans-cnd-9999_p20150402.ebuild 4586 SHA256 f39dac54eca4896eb662a046cef3301e1befb85141a148534821301a55a61e1d SHA512 c23897be28499e36fefe7a587bcf7e2cc3f1719590170ae342f9cbd6173c39fd683093613652b29fe0e797175a0d36988043ea647808c0cee710b98e9f679601 WHIRLPOOL fa66b300b4a08a11bf9460e260fbe9c6175a35f9586215ca3a2d33b15969998fea7ec261a354fd6dce6b140590dd66dcfc5187b4ba1cd1ccf7c4b1daedd878fa
-MISC ChangeLog 151925 SHA256 c606226574508d4102ad82e0abad7f4649185c83e8a26565865c2fab89aa5977 SHA512 0da0f14bc6f4a70d9392b89f22930735f86dc7612763b3c840b42d6f64eab1ee4591f8110a6083f5dff3ee3046cd4a6a75ee6fb14400d5b946b65a71c4c58042 WHIRLPOOL 3db0139220a30a6b527090aa78f113039fe1f7ad61bccaa8810a16e05f10011065a873ad14e212ccfb4c56210e8f8e5d445587b0c537c0fc521e41eace7ae74b
+EBUILD netbeans-cnd-9999_p20150403.ebuild 4586 SHA256 09a6e35f4c188931014bc27caeb624eb2192b4c244f6bbc230da4345a11bc82f SHA512 6ade9693d202dfb873058cdf822c6fdec27e12bfc0eafad09c8d71fe60cf60ba6cdf11adf9c2049735b7b81b27016bcb57337bcc674d7fada07ed66e0acdd773 WHIRLPOOL 2fd436ccaf5f103b5a30e31b741aceee41669feedbe99499c0a2421fa2f8957fbb393a5d811c4e3e273c13418d540c74a1418ffe2c7bf5b79cb276b5bb458d35
+MISC ChangeLog 152092 SHA256 420397b063f693f309e11eaf5808c46ba1adaf2cf4566b4bdf8c01a75b7a542b SHA512 391a30e2b0b9c6c68acdc398b8a023fecd5cce1542afa93ae623d21fda74285c1bcf5f1bb41be1999d65a9b88a5e41845f2c2c67ad9b0ed44c2afb9c638e182e WHIRLPOOL de66afe28b90181f9b61c6f8f5e0ee3258217ed08303e2bd53f56ad5b7023f9c9a659f522ac7c3ebc8e483792ab184f97e4d77a1aeab8a10e8377266ed38751f
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150403.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150403.ebuild
new file mode 100644
index 0000000..09a2bde
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150403.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans CND Cluster"
+HOMEPAGE="http://netbeans.org/projects/cnd"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-04-03_00-01-28/zip/netbeans-trunk-nightly-201504030001-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/BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip
+	http://hg.netbeans.org/binaries/547CFC4D4F7C877925CFB0732F303DC1797A58C1-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}"/BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip cnd.discovery/external/cnd-build-trace-1.0.zip || die
+	ln -s "${DISTDIR}"/547CFC4D4F7C877925CFB0732F303DC1797A58C1-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 3d53078..5482cf7 100644
--- a/dev-java/netbeans-dlight/ChangeLog
+++ b/dev-java/netbeans-dlight/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-dlight-9999_p20150403 (03 Apr 2015)
+
+  03 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-dlight-9999_p20150403.ebuild:
+  bumped to the latest sources
+
 *netbeans-dlight-9999_p20150402 (02 Apr 2015)
 
   02 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 9fbe96e..a8e88c7 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -40,6 +40,7 @@ DIST netbeans-trunk-nightly-201503270001-src.zip 206933166 SHA256 ec88a4e19aef5c
 DIST netbeans-trunk-nightly-201503310001-src.zip 206989433 SHA256 1c3752add0684a6cc2fab0677c2259a21b5e7d3bff9270739f583a5613f8ec43 SHA512 f5c5466f5a9c59a903479c51c12586b2cb5fc1501b7a6cb92dbb39d3b7617fbb7a61bb61d13f21a26774f7a50885f3b963355be0738847d469d5156d37ee626b WHIRLPOOL f34a82105807ea88ab1414903112f75df442fe3daa9eebd98669985d2935f984e6a51fdf45ec00b058298da1e91e169ced7da1be4997ae30c8b98577efff09c1
 DIST netbeans-trunk-nightly-201504010001-src.zip 206997278 SHA256 8fc0488ca935d5e577fe05fe76bb1dcf8c0f0df0ad155966797c819f970b24a0 SHA512 8d7a6b83a3e32967358c5a07641eda588c28132e4f451b7f83d7c0f5cb03afd15fd3bf6fb916576e7d1859d0f8ed3c13ac50eed45d076a85d046555e86647bb1 WHIRLPOOL 6f64a1108890cbe4a2a89ec627142df9199ff2485f71bf83ab5f0aed48cd502872187b88c5aa5d1aee14701aa7cfc9226e8f2a654dd3b7ff5c37afd839ae6af0
 DIST netbeans-trunk-nightly-201504020001-src.zip 207019553 SHA256 d10dcf7a1c0b1070dceb99a4efbeb9d047ec9938c9950f9565ed3953312e2d50 SHA512 b1c680effd9560c373a73d9d5f691f51e4d60cbd2b35cf5557680821409451e73e9bdae030db8bf52da2b36ff4fabd826447482d9eb1743415418834b938bc9f WHIRLPOOL 0e2299826eb95a5679f84b2f3ee26fb5541804dcde8265ecfdf54f6bb64d59d940af58fae7b315c51a608c79e781d53b3150dfa61124f5faf692aacfe1b5a3ab
+DIST netbeans-trunk-nightly-201504030001-src.zip 207037940 SHA256 ef43b1a5fa315405511e141a8304fc78c27a594c95d49691109d3d3982540ed4 SHA512 ee745e10ec2cd30502cd1cd7bac908fb7a063ea269a4bebc25cf54a0e01c1e4f23f379e935cbd3a90ac8739669e2206fedb33e1554abc559171e805bd31232e7 WHIRLPOOL 621106415266577acf0061e692da5ed3ff9f0ea92e8b2040a0e89139272117ed7f70f4fa835dfb7b7c0dcff91afc93d53fb2e52cb77859e980b4a97ba3e371a0
 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
@@ -65,5 +66,6 @@ EBUILD netbeans-dlight-9999_p20150327.ebuild 2995 SHA256 454856c60c97ee8242edc93
 EBUILD netbeans-dlight-9999_p20150331.ebuild 2995 SHA256 9ec6b91b30405ecd814907ef35f87e6227667364a077181816522deecb99d8b0 SHA512 3c011deff57d0af2c1810dc2e72a177715017c013e88bff6914befca101b84a44e65d3a6ab47650a7b1ef7eaa2e54da9e6447b72a4249d65b5e92d67b785ce04 WHIRLPOOL eabbb39f7919c978a78bf4f166f368657f2d7523527404c7f4e3ebf3a5600e3daa873d971a1aa25c81a783a57f071529c6f7ebef836300d503930d0cf19270e1
 EBUILD netbeans-dlight-9999_p20150401.ebuild 2995 SHA256 a648fac11ea8fd19e05e11deb12b0241c35b274c20af90ed47d0572f1086b66b SHA512 94c7f69dc71b5aebc6776ecf86e0e9e65e97fb147214f46b2e78188c330eeab123e51d19aca82f2be3fc8d295f7b98b6e4dd002631f5686165e18c7e280ad7a8 WHIRLPOOL 06ac09d24a72babd408a062d7fbf06dce535a89b180ad96a3b22d6320e4a42ff94eedb5eb26c48fa5e6569aa7c5c84f100aa9eefa6431624cf3b50ba4acbd149
 EBUILD netbeans-dlight-9999_p20150402.ebuild 2995 SHA256 65a155c751f6e3a2791cf0db581e5d5f368d1dc2cc57cca8250e2ca9e3216763 SHA512 8c565fad9a400696ded05147552e3583130a68d2198800de1801fdd3dadf6caa95cc01769521d5d1002a05427f1ff4d27998f9618852040063cf36b9094fbb4d WHIRLPOOL 519517aecef036f3522557d07a2dbd995d7c3a1a109013e79614fb58c3b91b2b51598ea253641b97154b439bdd43385ce539a1ccf82f8f4e255495ccdc3f52eb
-MISC ChangeLog 158559 SHA256 ae60a507c2c673184d1b992cb681c174c78351d6cade5f3bef67cbc57ba1fb30 SHA512 9de8e09df2a9d111db8c00fb7fd0a999aae3f56d41c01f7faa839d537e75a96e0e6f9cc79da4d7a06ea66e4686f5918344b6f2c92eb78971cdb8e3898758b7e6 WHIRLPOOL 596fcef4e07e1cf01d5bbda3f03838370f04e4b09ebcd3444029069a107e90a3cf8ce6c29288559ce95948b8874641a4600caafc885cdd2f0bd74875f7a9f816
+EBUILD netbeans-dlight-9999_p20150403.ebuild 2995 SHA256 57741993cbbe5f9ec0de1239901b07e6d0cee40425046f20e481b18cf692de2d SHA512 7f899291569fdcb96d21bc346627cc041106c6950904b2ad7285784f4b41abf767319104b2270882cd5633ab1558efe499f5be077cd1a6260572bfcb891a9619 WHIRLPOOL c55b14b278b517fd68c301c4f724a28dd241ab338bcfef15e46e46b1a20bf23f94df33a84c715abe8397c296b09743558ba92ab92861670e6c432129ada8557e
+MISC ChangeLog 158732 SHA256 42a7aef7011c4bf1e2bacabe0abfa8d2c413f83d547b0b9de5849c4e682a4346 SHA512 f48e816d964f5b4996fe3635c8d4b32439e07006c13ff2ce0ab4433444c388d7773bf090d662312ee788f10bddc3969f886607cc582c1d4c7e774dd5d5b04fc1 WHIRLPOOL f7d2d1a5457d04613314b175b86c68dafe611ae1e4cb9b8fdddc174b70f80b2640fd0ad0cc61e3a4108a5ca012e5cea000b9ccaa9b41bcb1b5abb8eae1c88624
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150403.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150403.ebuild
new file mode 100644
index 0000000..71423f9
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150403.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans D-Light Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-04-03_00-01-28/zip/netbeans-trunk-nightly-201504030001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/9395F923725681A9FC9154EF919B69564185B310-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}"/9395F923725681A9FC9154EF919B69564185B310-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 32b4cf7..6eb64a8 100644
--- a/dev-java/netbeans-enterprise/ChangeLog
+++ b/dev-java/netbeans-enterprise/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-enterprise-9999_p20150403 (03 Apr 2015)
+
+  03 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-enterprise-9999_p20150403.ebuild:
+  bumped to the latest sources
+
 *netbeans-enterprise-9999_p20150402 (02 Apr 2015)
 
   02 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 98b6987..633267d 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -120,6 +120,7 @@ DIST netbeans-trunk-nightly-201503270001-src.zip 206933166 SHA256 ec88a4e19aef5c
 DIST netbeans-trunk-nightly-201503310001-src.zip 206989433 SHA256 1c3752add0684a6cc2fab0677c2259a21b5e7d3bff9270739f583a5613f8ec43 SHA512 f5c5466f5a9c59a903479c51c12586b2cb5fc1501b7a6cb92dbb39d3b7617fbb7a61bb61d13f21a26774f7a50885f3b963355be0738847d469d5156d37ee626b WHIRLPOOL f34a82105807ea88ab1414903112f75df442fe3daa9eebd98669985d2935f984e6a51fdf45ec00b058298da1e91e169ced7da1be4997ae30c8b98577efff09c1
 DIST netbeans-trunk-nightly-201504010001-src.zip 206997278 SHA256 8fc0488ca935d5e577fe05fe76bb1dcf8c0f0df0ad155966797c819f970b24a0 SHA512 8d7a6b83a3e32967358c5a07641eda588c28132e4f451b7f83d7c0f5cb03afd15fd3bf6fb916576e7d1859d0f8ed3c13ac50eed45d076a85d046555e86647bb1 WHIRLPOOL 6f64a1108890cbe4a2a89ec627142df9199ff2485f71bf83ab5f0aed48cd502872187b88c5aa5d1aee14701aa7cfc9226e8f2a654dd3b7ff5c37afd839ae6af0
 DIST netbeans-trunk-nightly-201504020001-src.zip 207019553 SHA256 d10dcf7a1c0b1070dceb99a4efbeb9d047ec9938c9950f9565ed3953312e2d50 SHA512 b1c680effd9560c373a73d9d5f691f51e4d60cbd2b35cf5557680821409451e73e9bdae030db8bf52da2b36ff4fabd826447482d9eb1743415418834b938bc9f WHIRLPOOL 0e2299826eb95a5679f84b2f3ee26fb5541804dcde8265ecfdf54f6bb64d59d940af58fae7b315c51a608c79e781d53b3150dfa61124f5faf692aacfe1b5a3ab
+DIST netbeans-trunk-nightly-201504030001-src.zip 207037940 SHA256 ef43b1a5fa315405511e141a8304fc78c27a594c95d49691109d3d3982540ed4 SHA512 ee745e10ec2cd30502cd1cd7bac908fb7a063ea269a4bebc25cf54a0e01c1e4f23f379e935cbd3a90ac8739669e2206fedb33e1554abc559171e805bd31232e7 WHIRLPOOL 621106415266577acf0061e692da5ed3ff9f0ea92e8b2040a0e89139272117ed7f70f4fa835dfb7b7c0dcff91afc93d53fb2e52cb77859e980b4a97ba3e371a0
 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
@@ -145,5 +146,6 @@ EBUILD netbeans-enterprise-9999_p20150327.ebuild 14851 SHA256 cdca8248b5a4847adb
 EBUILD netbeans-enterprise-9999_p20150331.ebuild 14851 SHA256 99687ee78509f4b2fb64fadfce20b10231710e4cfea50f808189721cc45e72c7 SHA512 dae801e900deea677d492856eef0ff3ad0a0adbc2d826cf25706a0fb4a39d5cdfd10f468b5cc88d9369a538e86865abfcc133cf47252f90ffbd42a2da2188ff1 WHIRLPOOL 34f17e0d8c0dda7d83faf931be511abbdfb81849b29e48f8ea4ae480751f4bd2a6400ec8dbcb4bc8dd23fe3bae9a3d882ce4bee0ac117e320a892d28c6104665
 EBUILD netbeans-enterprise-9999_p20150401.ebuild 14851 SHA256 c6d5f29d596baa0e6c7ed4816b6418ae4ab870b4a2b731218a61c9b7ca071ed6 SHA512 72b920924f2f5c5ff9db1907b3a47e110868911168ba3ca41011d2b3f85e4801c0abb0b9d356cc12021fb17a5040559f8376544fff39093ad2852cb89cfeda8e WHIRLPOOL b90ed4f3de298ca7699a3e3f71aeb24e59e912e5b052ab5ddcbe15e29a8c0d006854a8f0b349150f4245b8247e6800fb8254bdf8cf89bc124e584bb06d59d129
 EBUILD netbeans-enterprise-9999_p20150402.ebuild 14851 SHA256 a7320f5068ae31e163f9f3d4c7281262e55b0556297e3c87b6433a8b3af5d0e2 SHA512 076eb3e7d8221d4dc1bcf973dc975c397b62d5ea41eafe5a95abc6be0da0d1f9a9d88896f173fee9bff421ee38355acabbc3976e99a20fede3d1b5c8851ce79f WHIRLPOOL 4b8e7a93db64352e04577ca569d7d1e52d84242ad302819b3a187d202da1c5599ec9e0923c2a0a53933385ca46b398e9d4b4e3e7ee1ead660b6a2078e5f6223c
-MISC ChangeLog 166955 SHA256 f4ad8aac5e739f3c00a79cb4b502f42e6ca9491fe7349f71b20d87ad7131a813 SHA512 09e3af48bf16a023fd73943e526144962d244f97d8b13c343237433527c0dbb12f4ae28a61be13fb6faac1388362f785e269ac4972006f3a4980ac2a6105dde9 WHIRLPOOL 184ab642f8154dee59d879e7b381f4b2738619b6ef05acc330b9344d04b15d85219acf80fcfb30cb8bcaf5e6e37559b53ac7cc13c38e6ffe88568aaf647fb6cb
+EBUILD netbeans-enterprise-9999_p20150403.ebuild 14851 SHA256 6db6f31cdf2deda61b6d29fadebf3818cb740addcce80b4779c9be81899d88c4 SHA512 f5c79a1fa98e6f6167b68e6a87b318bf96dbbf70b0f7129669ed3d859f2cbba3430fd55201738a2748d1379beb8af6c2d79e337887c081a89806f3698793a369 WHIRLPOOL 5574d22211b2587d08b71336b98c954f9e9b98f6dfd816fd2a0b125e01e776df4ce73a47a04844d5d3dee7a50d24513592a6ba2d53212bdb8ce451be04c64925
+MISC ChangeLog 167136 SHA256 91e371f48b1d90c2c04358dd85b67801119f856323211874498935e10f40954f SHA512 1ca73262642efcf6d9a67531bd0f07340b890f77c9a1691f876ec8d81a5cbb72f1a28aa9b6dbdcbc2691337c746909abbb7825ba59c5a246a243a816e0b36f75 WHIRLPOOL 5391e91c28559f05d19636c90be024df67fc6b2253f9421d92d9177347abc649496d80a64f64416ac2e59c399f1ec6b145ba71151cb1e52e02127a4e53e8c4f2
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150403.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150403.ebuild
new file mode 100644
index 0000000..a1b3a3a
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150403.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Enterprise cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-04-03_00-01-28/zip/netbeans-trunk-nightly-201504030001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar
+	http://hg.netbeans.org/binaries/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar
+	http://hg.netbeans.org/binaries/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar
+	http://hg.netbeans.org/binaries/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar
+	http://hg.netbeans.org/binaries/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar
+	http://hg.netbeans.org/binaries/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar
+	http://hg.netbeans.org/binaries/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar
+	http://hg.netbeans.org/binaries/51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar
+	http://hg.netbeans.org/binaries/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar
+	http://hg.netbeans.org/binaries/B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar
+	http://hg.netbeans.org/binaries/27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar
+	http://hg.netbeans.org/binaries/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar
+	http://hg.netbeans.org/binaries/1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar
+	http://hg.netbeans.org/binaries/E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar
+	http://hg.netbeans.org/binaries/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar
+	http://hg.netbeans.org/binaries/45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar
+	http://hg.netbeans.org/binaries/C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip
+	http://hg.netbeans.org/binaries/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar
+	http://hg.netbeans.org/binaries/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip
+	http://hg.netbeans.org/binaries/99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip
+	http://hg.netbeans.org/binaries/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip
+	http://hg.netbeans.org/binaries/F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar
+	http://hg.netbeans.org/binaries/5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar
+	http://hg.netbeans.org/binaries/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip
+	http://hg.netbeans.org/binaries/F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip
+	http://hg.netbeans.org/binaries/065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar
+	http://hg.netbeans.org/binaries/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar
+	http://hg.netbeans.org/binaries/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip
+	http://hg.netbeans.org/binaries/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip
+	http://hg.netbeans.org/binaries/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip
+	http://hg.netbeans.org/binaries/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-profiler-${PV}
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-webcommon-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/commons-codec:0
+	dev-java/commons-fileupload:0
+	dev-java/commons-logging:0
+	dev-java/glassfish-deployment-api:1.2"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	dev-java/jsr181:0
+	>=dev-java/junit-4.4:4
+	dev-java/tomcat-servlet-api:2.3"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}
+	dev-java/antlr:0[java]
+	dev-java/bsf:2.3
+	dev-java/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}"/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 199bdd5..ee5e008 100644
--- a/dev-java/netbeans-ergonomics/ChangeLog
+++ b/dev-java/netbeans-ergonomics/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-ergonomics-9999_p20150403 (03 Apr 2015)
+
+  03 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ergonomics-9999_p20150403.ebuild:
+  bumped to the latest sources
+
 *netbeans-ergonomics-9999_p20150402 (02 Apr 2015)
 
   02 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 3e46456..1d59ac3 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201503270001-src.zip 206933166 SHA256 ec88a4e19aef5c
 DIST netbeans-trunk-nightly-201503310001-src.zip 206989433 SHA256 1c3752add0684a6cc2fab0677c2259a21b5e7d3bff9270739f583a5613f8ec43 SHA512 f5c5466f5a9c59a903479c51c12586b2cb5fc1501b7a6cb92dbb39d3b7617fbb7a61bb61d13f21a26774f7a50885f3b963355be0738847d469d5156d37ee626b WHIRLPOOL f34a82105807ea88ab1414903112f75df442fe3daa9eebd98669985d2935f984e6a51fdf45ec00b058298da1e91e169ced7da1be4997ae30c8b98577efff09c1
 DIST netbeans-trunk-nightly-201504010001-src.zip 206997278 SHA256 8fc0488ca935d5e577fe05fe76bb1dcf8c0f0df0ad155966797c819f970b24a0 SHA512 8d7a6b83a3e32967358c5a07641eda588c28132e4f451b7f83d7c0f5cb03afd15fd3bf6fb916576e7d1859d0f8ed3c13ac50eed45d076a85d046555e86647bb1 WHIRLPOOL 6f64a1108890cbe4a2a89ec627142df9199ff2485f71bf83ab5f0aed48cd502872187b88c5aa5d1aee14701aa7cfc9226e8f2a654dd3b7ff5c37afd839ae6af0
 DIST netbeans-trunk-nightly-201504020001-src.zip 207019553 SHA256 d10dcf7a1c0b1070dceb99a4efbeb9d047ec9938c9950f9565ed3953312e2d50 SHA512 b1c680effd9560c373a73d9d5f691f51e4d60cbd2b35cf5557680821409451e73e9bdae030db8bf52da2b36ff4fabd826447482d9eb1743415418834b938bc9f WHIRLPOOL 0e2299826eb95a5679f84b2f3ee26fb5541804dcde8265ecfdf54f6bb64d59d940af58fae7b315c51a608c79e781d53b3150dfa61124f5faf692aacfe1b5a3ab
+DIST netbeans-trunk-nightly-201504030001-src.zip 207037940 SHA256 ef43b1a5fa315405511e141a8304fc78c27a594c95d49691109d3d3982540ed4 SHA512 ee745e10ec2cd30502cd1cd7bac908fb7a063ea269a4bebc25cf54a0e01c1e4f23f379e935cbd3a90ac8739669e2206fedb33e1554abc559171e805bd31232e7 WHIRLPOOL 621106415266577acf0061e692da5ed3ff9f0ea92e8b2040a0e89139272117ed7f70f4fa835dfb7b7c0dcff91afc93d53fb2e52cb77859e980b4a97ba3e371a0
 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
@@ -56,5 +57,6 @@ EBUILD netbeans-ergonomics-9999_p20150327.ebuild 2919 SHA256 2830ff1e69fbcf0e654
 EBUILD netbeans-ergonomics-9999_p20150331.ebuild 2919 SHA256 7b124c7c0eb6d40ef5799cfc0b8df6221d7f4dc43af702913c7179a35f113631 SHA512 97310ea193350820808e2944ed48be87e20f50cc3805554a4b9c1607ea362f25ab141eb868b224086944649cc6ea1d9e46585241692159b51f3030a0e88e4f73 WHIRLPOOL cd59cf36c48ec2463fd03ff611a1d693ffb591c7a50b4d9149d8c0a49a2ec337ccdc53939997fb9cac722200f3cc28fe79fd9263725193083997a5e42a8b372d
 EBUILD netbeans-ergonomics-9999_p20150401.ebuild 2919 SHA256 c2be310807828e2358cce96b06b5f440c4279728ff245d942f611d22dbf057b3 SHA512 be722db59184aff57c40534d098ccbb2bdde87a026268f0965deebe6db3b2058717099dfd500fdaa6f6baddf797a45f1cbefa5bcdcb95d7269a4a2673b8eb347 WHIRLPOOL a056e309886856b728ebc5e5307cdf2df6c422c6edc4d986ca7805ede864c8e86f47f9724f8e5e24b74247da8855bc5dbd345910c4be14c264702ec1be05da2c
 EBUILD netbeans-ergonomics-9999_p20150402.ebuild 2919 SHA256 aad7d43e4c02f9ac47532d3aa00a6337031157ede5624ae7f83759a1601fb633 SHA512 8c21ac1b17a91ca5bb8627b24a0a96cdb15eb67318790cedb885b711b410be5934c25bc1b54b209f4b31600c65aa16dafde491d570539d2b567568c935956073 WHIRLPOOL 793aa5144229f56c0434b647bc2cbf982a51dc4951b4268e15a51c6f76086312e4aa4ad473ed7953983096894523825fca9518738282ca06cebebe2827bc4adb
-MISC ChangeLog 166430 SHA256 94e64e2f34faaf70632daae0b68b38c03201e508912bfa0a428cc855d2532443 SHA512 9e84c0979da38efd640d376bf34f532288445894f9c73b6dee9bed2b399b9c5eb5488e2411411e03c18bec416e5ba02eaf76b1c12f58d3655eb03beb333df20a WHIRLPOOL 28bc9fce4d291c1ae9f3e87ce3baa12ea1a3c2373d1d6af30c29e4f983ea60c72ed3e3ec2563ad9f677ab96f633b16c1d906959e3c928b04b33e56e7033df4d7
+EBUILD netbeans-ergonomics-9999_p20150403.ebuild 2919 SHA256 93261c6a71f8ce78b0ad6de45973267ef65aec7fbeff8891649dc6df95dfa905 SHA512 e1e3c1385c300f05d8020b2ee09c37e1d8f2c432d61a9a0fdd5c5e9b2919998aab5ad67723edafa289438f7ec4da93eafb3f196e1f018feeb369f9159096002c WHIRLPOOL 7a8b797f1d313194ef5bf71a285e0dcbaf74c52fc8ae2d69f6a2c4fdc5bc9e4a75bc6a7115f068425fcbc7dbf288b704a75ed7243928119d36a601174a611be2
+MISC ChangeLog 166611 SHA256 487a6ce0aca9e3360c20ff8ecf2a9ea2984807167ed86c8d13aadbb2c7f6147e SHA512 0a9eeae362abb15e67925ca0eba53ce0d362e6af7ecfac20dcee6b2fad5c02a8431f3fdda77f5b6450a984ef9b77762f7c5a96eb537e85c9a46e340d45bad8cc WHIRLPOOL c4b0f1df4e0b4de65f8e44e1a7e803ab348c1ef9aa08caa52328e594682d3d18fb0e413850e159e1c6b11c82af6681453939a2ee81c6b244823e00033ea55291
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150403.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150403.ebuild
new file mode 100644
index 0000000..1705081
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150403.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Ergonomics Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-04-03_00-01-28/zip/netbeans-trunk-nightly-201504030001-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 2fce525..042986d 100644
--- a/dev-java/netbeans-extide/ChangeLog
+++ b/dev-java/netbeans-extide/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-extide-9999_p20150403 (03 Apr 2015)
+
+  03 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-extide-9999_p20150403.ebuild:
+  bumped to the latest sources
+
 *netbeans-extide-9999_p20150402 (02 Apr 2015)
 
   02 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index b1b4d2a..7e05804 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201503270001-src.zip 206933166 SHA256 ec88a4e19aef5c
 DIST netbeans-trunk-nightly-201503310001-src.zip 206989433 SHA256 1c3752add0684a6cc2fab0677c2259a21b5e7d3bff9270739f583a5613f8ec43 SHA512 f5c5466f5a9c59a903479c51c12586b2cb5fc1501b7a6cb92dbb39d3b7617fbb7a61bb61d13f21a26774f7a50885f3b963355be0738847d469d5156d37ee626b WHIRLPOOL f34a82105807ea88ab1414903112f75df442fe3daa9eebd98669985d2935f984e6a51fdf45ec00b058298da1e91e169ced7da1be4997ae30c8b98577efff09c1
 DIST netbeans-trunk-nightly-201504010001-src.zip 206997278 SHA256 8fc0488ca935d5e577fe05fe76bb1dcf8c0f0df0ad155966797c819f970b24a0 SHA512 8d7a6b83a3e32967358c5a07641eda588c28132e4f451b7f83d7c0f5cb03afd15fd3bf6fb916576e7d1859d0f8ed3c13ac50eed45d076a85d046555e86647bb1 WHIRLPOOL 6f64a1108890cbe4a2a89ec627142df9199ff2485f71bf83ab5f0aed48cd502872187b88c5aa5d1aee14701aa7cfc9226e8f2a654dd3b7ff5c37afd839ae6af0
 DIST netbeans-trunk-nightly-201504020001-src.zip 207019553 SHA256 d10dcf7a1c0b1070dceb99a4efbeb9d047ec9938c9950f9565ed3953312e2d50 SHA512 b1c680effd9560c373a73d9d5f691f51e4d60cbd2b35cf5557680821409451e73e9bdae030db8bf52da2b36ff4fabd826447482d9eb1743415418834b938bc9f WHIRLPOOL 0e2299826eb95a5679f84b2f3ee26fb5541804dcde8265ecfdf54f6bb64d59d940af58fae7b315c51a608c79e781d53b3150dfa61124f5faf692aacfe1b5a3ab
+DIST netbeans-trunk-nightly-201504030001-src.zip 207037940 SHA256 ef43b1a5fa315405511e141a8304fc78c27a594c95d49691109d3d3982540ed4 SHA512 ee745e10ec2cd30502cd1cd7bac908fb7a063ea269a4bebc25cf54a0e01c1e4f23f379e935cbd3a90ac8739669e2206fedb33e1554abc559171e805bd31232e7 WHIRLPOOL 621106415266577acf0061e692da5ed3ff9f0ea92e8b2040a0e89139272117ed7f70f4fa835dfb7b7c0dcff91afc93d53fb2e52cb77859e980b4a97ba3e371a0
 EBUILD netbeans-extide-7.4.ebuild 3311 SHA256 8585e0b9eac3b9bb35d5b5e0152936f84708a824d76831930a3dfd3d196556b0 SHA512 19eceec7a634923b4712eb277a1ff9900a2eb4d9ac0a2c699175333c263f0c02baaf24eb30bd7919444f5c9df751186689b2d4359ca1c88dca02884d7c18c3cd WHIRLPOOL e64509f198c4d09851f98d5bd2ddd5b469b0a7c0f3122f391c17833e5d6d77b7a6c2fd9e942e34f2df42047504ad40593f97af9b2898450e769c7b012355c316
 EBUILD netbeans-extide-8.0.2.ebuild 3313 SHA256 d147df43b8e55de81e0429604a2497a82861864ae50fbb85368a3070e1c266c9 SHA512 8f2722ce12c1582ca6e9ed348fcb37b9969585037b5432e592e5dd6ef4b3e49c58783da5fe20f088bee07514e3b42de7aa36607900b285c32c4b91fa218df90c WHIRLPOOL 0fb074484787a5e0e688dc734efe027ff6dfd082dd63bc9bccc612f915fbbe33a4f93db6c43d345abc9c191e22ec196aada1e889d1240968916d54c69497a2d6
 EBUILD netbeans-extide-8.0.ebuild 3305 SHA256 b2d57e2e2d92760ead3d383fe4dd5b4fb9fc2807a9b58c6f40b44fc24072b8bb SHA512 6e7f12758188a564ef6b5cf8b0ffdf79e30d1021172d10f215d04e727bc4001e4385fd0961a26a6bb42638089e0919b1d4628a13ba11a3deac94d4693c7210d5 WHIRLPOOL adac8461de43669b7bb98ea8920c0a2944837211a37503b957221149d4b91c4bd92b6db160191990b838c474495c65f62c8a4bb9fdbcaa371b4648a335b1afa9
@@ -50,5 +51,6 @@ EBUILD netbeans-extide-9999_p20150327.ebuild 3383 SHA256 ce68976521c11f47ef8d258
 EBUILD netbeans-extide-9999_p20150331.ebuild 3383 SHA256 c16af31f8d083cdcee4342fb9fe5d6fde2f92c4ee3f3845450e8ea8a82472d08 SHA512 05c45d72bab285d14df20e09c94f077f37ca34d2f187bde7873b2833b9e0d16f7a1ce4655f6de06b9b6eb6caa8c0deebc047ecd7667a1e9cbfc671bd41eb9d5c WHIRLPOOL 7df923cc63427a3952792fc53eec438f946168a66d9b9150690e2a6c107d0283e0379464755846a780eee2107e9971f6b2a51e5a73bcc940972d2cad182867ec
 EBUILD netbeans-extide-9999_p20150401.ebuild 3383 SHA256 3788b73fba3cd4939f89dcdd2adecbb8e86b81f1e6d196c33323ab4940cf7bb3 SHA512 3222158867d9182f5852fc67d0e28c022215055cf8fa1409f13693729b29adc972ca2241969e734f3eebd796c67b713ccaf7191e3f6c82aa87338a4e217ca8e5 WHIRLPOOL 587b4fbe82806551dd0f253656db291d79dc675dfd7808827e3f9ae13c77113d20c780d2367c395d5669e7814f73a36d2762d840aa47284175d5edddc576639b
 EBUILD netbeans-extide-9999_p20150402.ebuild 3383 SHA256 53d8cd66913a8fd1e7840442d0fa33e1fa8747d1dfd58490e4e2dcccdfe853be SHA512 56c336a7d1450adc6558c2a869ca3b5dc000a9ae1a60ceb6050042e20e57fec4fed9c63f7664c9d3e49b7bfe319a581bf48f7b4d552eff4aefccdcb1c9276b9e WHIRLPOOL 55c25dbae9a42b148f9dd1db5b14c931609d542787033d9109a91567ed2a9148ad42de2646ba485535e14081be4fa97864b8c8e0a504d089f81e64c942dfdadc
-MISC ChangeLog 90469 SHA256 796d4dd05f8b0ae0f2776c81b42753ad8c88fa3938bd4715c4e260717a330105 SHA512 69e12708f3ac20fe61c86a4a85389e65579a14fbada6ca792ba372664d060c2562c665a40352731846590644567cfc4d76b489b346639fd1a60ec6a6aaefdeb9 WHIRLPOOL 78877baccff73f76cfa36d3bc2173ba4ae26edc10a9c5775e70dfee4f34a3d59cace60ddd3d6bc2ff5e67ab507ee37f800b799879bbf69793c487a320b801de7
+EBUILD netbeans-extide-9999_p20150403.ebuild 3383 SHA256 f61bed046030f3f719c8dbbf012ae1a79cbb85c974dc3c5f2298270196f79dea SHA512 add7bef3b19346183ad31168e456db3136a5e119d81096c1327e58cbd5e7f65178cdb644bd45dd384aae35e30d070b14f8a701c880a7cedb54ff183b9fd4dbcc WHIRLPOOL d372b15950ca371e088f769ba1971845d85ac2ae504684c20c2b9ace82f31562500872dd87807736f19ec1eccd6e0c0c2bc2e172d2ec46ef1255f40faad59c5c
+MISC ChangeLog 90642 SHA256 09db7ecd6f8814ddc4f16d30e80f6784092facb652cde279855e8da7e8c17a27 SHA512 c7ed8ea6447ebf6692c64312858f0a2ee8ce904312637f47f3ec097843cc74d8dfc1314eb4d84068bdc880fdebe9bc251fd6e469302b754ae4b38dbdf5895a19 WHIRLPOOL 50b931a1c5d29a2103a7818a1ea6f8b34696938a0a7931177e66747d3575bbed813ca2a21f6c1234539ef3ce2f6e596aec9f2ba90c080af5e7152b7b7d0c5428
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20150403.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20150403.ebuild
new file mode 100644
index 0000000..b7a6ac9
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20150403.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans ExtIDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-04-03_00-01-28/zip/netbeans-trunk-nightly-201504030001-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 3803829..cbdc9ac 100644
--- a/dev-java/netbeans-groovy/ChangeLog
+++ b/dev-java/netbeans-groovy/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-groovy-9999_p20150403 (03 Apr 2015)
+
+  03 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-groovy-9999_p20150403.ebuild:
+  bumped to the latest sources
+
 *netbeans-groovy-9999_p20150402 (02 Apr 2015)
 
   02 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index 35e6d4a..c6aa5cf 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201503270001-src.zip 206933166 SHA256 ec88a4e19aef5c
 DIST netbeans-trunk-nightly-201503310001-src.zip 206989433 SHA256 1c3752add0684a6cc2fab0677c2259a21b5e7d3bff9270739f583a5613f8ec43 SHA512 f5c5466f5a9c59a903479c51c12586b2cb5fc1501b7a6cb92dbb39d3b7617fbb7a61bb61d13f21a26774f7a50885f3b963355be0738847d469d5156d37ee626b WHIRLPOOL f34a82105807ea88ab1414903112f75df442fe3daa9eebd98669985d2935f984e6a51fdf45ec00b058298da1e91e169ced7da1be4997ae30c8b98577efff09c1
 DIST netbeans-trunk-nightly-201504010001-src.zip 206997278 SHA256 8fc0488ca935d5e577fe05fe76bb1dcf8c0f0df0ad155966797c819f970b24a0 SHA512 8d7a6b83a3e32967358c5a07641eda588c28132e4f451b7f83d7c0f5cb03afd15fd3bf6fb916576e7d1859d0f8ed3c13ac50eed45d076a85d046555e86647bb1 WHIRLPOOL 6f64a1108890cbe4a2a89ec627142df9199ff2485f71bf83ab5f0aed48cd502872187b88c5aa5d1aee14701aa7cfc9226e8f2a654dd3b7ff5c37afd839ae6af0
 DIST netbeans-trunk-nightly-201504020001-src.zip 207019553 SHA256 d10dcf7a1c0b1070dceb99a4efbeb9d047ec9938c9950f9565ed3953312e2d50 SHA512 b1c680effd9560c373a73d9d5f691f51e4d60cbd2b35cf5557680821409451e73e9bdae030db8bf52da2b36ff4fabd826447482d9eb1743415418834b938bc9f WHIRLPOOL 0e2299826eb95a5679f84b2f3ee26fb5541804dcde8265ecfdf54f6bb64d59d940af58fae7b315c51a608c79e781d53b3150dfa61124f5faf692aacfe1b5a3ab
+DIST netbeans-trunk-nightly-201504030001-src.zip 207037940 SHA256 ef43b1a5fa315405511e141a8304fc78c27a594c95d49691109d3d3982540ed4 SHA512 ee745e10ec2cd30502cd1cd7bac908fb7a063ea269a4bebc25cf54a0e01c1e4f23f379e935cbd3a90ac8739669e2206fedb33e1554abc559171e805bd31232e7 WHIRLPOOL 621106415266577acf0061e692da5ed3ff9f0ea92e8b2040a0e89139272117ed7f70f4fa835dfb7b7c0dcff91afc93d53fb2e52cb77859e980b4a97ba3e371a0
 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
@@ -60,5 +61,6 @@ EBUILD netbeans-groovy-9999_p20150327.ebuild 3422 SHA256 394871f4e7464002536a1bc
 EBUILD netbeans-groovy-9999_p20150331.ebuild 3422 SHA256 940036d09c8cf98560043d1266f9debe47779fbcb595113320d940db9ca74ed4 SHA512 e952926c4e9ebb9261c2106321a5980846c13c29691fefc742efa84909c30df3794a96e6fd5ae3e1c8913ea89d9f3d1efcedf556778370f14dcc4b35ad966330 WHIRLPOOL fffc99330a482aa5ac0813b9b8cb10cf184e82b246a341718a56a944ff984815ccd6b2168905a2fd1a11eb21c4154226c1a0a2c2bceabba3a2aed519c3f03fe3
 EBUILD netbeans-groovy-9999_p20150401.ebuild 3422 SHA256 0bc3d8b7af21c4d395e35337b64aa97ccf3376c6f14cf1874d797698cc3f4899 SHA512 9fab38cdf88cc59ba9dc7186fce7a367de1d50273f253d10490cfa62e29961a6085f3dddfa3f48c766a035ab2ca731085b608e51535abbdf8ba77cf3b0e05ed8 WHIRLPOOL 1e35b7cd61917853121509e2adc9f7c28c8cf410c7295d4400d071929b936eacd8128bc925a57837911a3457ae9abf744dbd85cbcab40957a85972f4e022a331
 EBUILD netbeans-groovy-9999_p20150402.ebuild 3422 SHA256 43e86308b3befa6ce87b000b6c6c18d06c7aa96c74379cf5a65e3aad074bfc71 SHA512 94385fd4439d893f816ffe8fd4b062220f73a0b15e807a8dfc821021b127910f524e1ee9c66471775740836af419f2ceb4ba862c3598396c31a2bf8bde1e23d9 WHIRLPOOL fc6dad93edd39416443250dba9f2b72f010dba29543ec7b7574a851e97d14ee8bb718a6b7043c27074cfdd6c5e40299bad563e6ea177040614a288a54944f305
-MISC ChangeLog 158449 SHA256 38c53ed090ecf63e823d35c6638df30ea81d879f21ae2f3079f2d92efb120654 SHA512 41525177bb7202fedfb909cd70f603c6c57f497ca3d65f05b353c9cd66737524be3cc201e94b545b08ee7572e7f6c1eb47257fb2eea2c6248f75cba524067953 WHIRLPOOL 55bac1fc9b5142783773ae08a1f31e892cb443c67ff7c6d3d5f2ac50680e3e647f8c12e4a93120e37ed5e8cbf19f092678ce2030cfc2f9a65c779fc7b52b5dba
+EBUILD netbeans-groovy-9999_p20150403.ebuild 3422 SHA256 d1af0370a3040f187c0b3171ea0726d1c15c848416c9c4928a0f1a2976ed1210 SHA512 bc6a22890360312a2825e736f4667b9dca848ee9cd78f8f5bb01374cdf12d4b24c223dfa71396f39aa42cd46dcbb850ec72666beb8cdc2d20b07db95e55f9cde WHIRLPOOL 88687d9c74cd6514dbd6aa7e0e070345efc1dc3a004d54da52972e3d6b99e3149408b8d9d89e7b6bba74e6ddfb671ab02e6520979f36353d79424968456d9bf4
+MISC ChangeLog 158622 SHA256 be1195264e7e1a2a07076546e8135a225a93a110b9eebaeb70aae4abba05372a SHA512 5393c165a14daa457b72e45f30b5e9c8f8c04a14a85bf843451afb961f72d4bbe27992c774745ef56deaf66952cdec1f87e1d8ec294abd3271e500d4e934834a WHIRLPOOL 2f987b2a5cc544c9cce06cac0f1c819384f4216cddade1ccbe49b05fa92b37753ee97329ade328cf529cba991329f0b05c1acce7fb1ea9ed0fecb3e1324f1401
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150403.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150403.ebuild
new file mode 100644
index 0000000..9ee2169
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150403.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Groovy Cluster"
+HOMEPAGE="http://netbeans.org/projects/groovy"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-04-03_00-01-28/zip/netbeans-trunk-nightly-201504030001-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 8bfd924..144a83f 100644
--- a/dev-java/netbeans-harness/ChangeLog
+++ b/dev-java/netbeans-harness/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-harness-9999_p20150403 (03 Apr 2015)
+
+  03 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-harness-9999_p20150403.ebuild:
+  bumped to the latest sources
+
 *netbeans-harness-9999_p20150402 (02 Apr 2015)
 
   02 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index ab20fe0..2ea2909 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -37,6 +37,7 @@ DIST netbeans-trunk-nightly-201503270001-src.zip 206933166 SHA256 ec88a4e19aef5c
 DIST netbeans-trunk-nightly-201503310001-src.zip 206989433 SHA256 1c3752add0684a6cc2fab0677c2259a21b5e7d3bff9270739f583a5613f8ec43 SHA512 f5c5466f5a9c59a903479c51c12586b2cb5fc1501b7a6cb92dbb39d3b7617fbb7a61bb61d13f21a26774f7a50885f3b963355be0738847d469d5156d37ee626b WHIRLPOOL f34a82105807ea88ab1414903112f75df442fe3daa9eebd98669985d2935f984e6a51fdf45ec00b058298da1e91e169ced7da1be4997ae30c8b98577efff09c1
 DIST netbeans-trunk-nightly-201504010001-src.zip 206997278 SHA256 8fc0488ca935d5e577fe05fe76bb1dcf8c0f0df0ad155966797c819f970b24a0 SHA512 8d7a6b83a3e32967358c5a07641eda588c28132e4f451b7f83d7c0f5cb03afd15fd3bf6fb916576e7d1859d0f8ed3c13ac50eed45d076a85d046555e86647bb1 WHIRLPOOL 6f64a1108890cbe4a2a89ec627142df9199ff2485f71bf83ab5f0aed48cd502872187b88c5aa5d1aee14701aa7cfc9226e8f2a654dd3b7ff5c37afd839ae6af0
 DIST netbeans-trunk-nightly-201504020001-src.zip 207019553 SHA256 d10dcf7a1c0b1070dceb99a4efbeb9d047ec9938c9950f9565ed3953312e2d50 SHA512 b1c680effd9560c373a73d9d5f691f51e4d60cbd2b35cf5557680821409451e73e9bdae030db8bf52da2b36ff4fabd826447482d9eb1743415418834b938bc9f WHIRLPOOL 0e2299826eb95a5679f84b2f3ee26fb5541804dcde8265ecfdf54f6bb64d59d940af58fae7b315c51a608c79e781d53b3150dfa61124f5faf692aacfe1b5a3ab
+DIST netbeans-trunk-nightly-201504030001-src.zip 207037940 SHA256 ef43b1a5fa315405511e141a8304fc78c27a594c95d49691109d3d3982540ed4 SHA512 ee745e10ec2cd30502cd1cd7bac908fb7a063ea269a4bebc25cf54a0e01c1e4f23f379e935cbd3a90ac8739669e2206fedb33e1554abc559171e805bd31232e7 WHIRLPOOL 621106415266577acf0061e692da5ed3ff9f0ea92e8b2040a0e89139272117ed7f70f4fa835dfb7b7c0dcff91afc93d53fb2e52cb77859e980b4a97ba3e371a0
 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
@@ -62,5 +63,6 @@ EBUILD netbeans-harness-9999_p20150327.ebuild 4131 SHA256 697c810e7425bba335a362
 EBUILD netbeans-harness-9999_p20150331.ebuild 4131 SHA256 b68b1b4be3974fc925e9d789eeef4f5b29a6e9280a54357c05fffe2a1ae3cce1 SHA512 92cb56d37e467245c87d5abac118a78643183d9326b1d9aa33994e1153c57d5334baaaa5a363da5af718d9ab3ca47a57e3dc40e5a55263e69c4fcaad7951f366 WHIRLPOOL 07693e59504db0339a5474196b9ca203395fa5c3b672d437fe1eb2edb300abddac38af1ea9c3b6795cde08815dd69da51af31301a6eb5713f7199fd4509dce91
 EBUILD netbeans-harness-9999_p20150401.ebuild 4131 SHA256 7ea93e39cd8f7bca0770fe37def0f3270d2415287c73ae27550e33ec874ed36a SHA512 a640183665680a0047a07600106ac04bbd6cad9869067aeffbb5b11fe0dc84e06196c25a8766a33cb91c0003824b50b6a32856d9ab51a0542e1a8a96e816420c WHIRLPOOL 3338512ee832f0da569ab4ef467b04122f6cc3a15a3fdbc77cfe007bd7616a026db1534f54b84578d550ca738118243ddcf5adf218d2da79e0ca121acfe828b0
 EBUILD netbeans-harness-9999_p20150402.ebuild 4131 SHA256 2ff634abf1ce93442e02e168182b38acadcad79e8fedea520cf73a33acc9c1b9 SHA512 f381be3d96a8c2ac5e20ef3d63595e76baf4af5c480cde773392b5343b690245b75c1742e1c476a011ee149edf378b8e3cca804048bbc00a68af0998805bc4de WHIRLPOOL d9207dc0d97071758b52809e5ce63038400c1eba8388128812630769d1226d654f5f369cd566fc002a89052224b385d07012f276d79402c56c54709a2feab8ac
-MISC ChangeLog 160473 SHA256 596ddc96d7ffce0f8ac4fe9fc2fa2bcafd14576c10c928bca9aff426f7ec334f SHA512 28b8a195e6acf5bd8d020068ad2d296cae045ab4bfeb8d9bb4b6cabd6ddfecfb1d08f2c6931c19d0031f016021e71c238a216d536d27435f9be96774dd2729d2 WHIRLPOOL f33f17bf2cae51b2f35e9a13085fd041418fa297acf0bdf24b8901308bdf2182762df5ffea5cc6b5ade7bb8fa55a5b67001e06a17a3d80fbcb31f0f310b35cb4
+EBUILD netbeans-harness-9999_p20150403.ebuild 4131 SHA256 70cccbf64212804da81df03753552af1169b53ced1fda4954ad750f1d661186d SHA512 80b2def94e86ee2cc42fdcbbaf82b93189a823e0abe0506a3f80ed21881724b68e620751fcff3a0c374eaebf2f2a239f5adc88266b276e49e8415a82bd7e84ec WHIRLPOOL 3230390c415ddc0c81c0681a3c1e2927fbefe03785a93966a8c0b32e68cd5ef2bdc9cd3c23be14f8e69bb9b9ace1bd45b162e09abe419d828e6f7f81158bfc49
+MISC ChangeLog 160648 SHA256 beb606e3d0215b9e5b08306bf799e46e573e4d1a4975ea3534df8ce9121d8810 SHA512 8e433a17a07438f1d505a708f8481c772398d3b8173fc23652641054a768af46c0a96f359590ad9b48afb8626117a4da1008db386bb2e4af3c5160d43679e432 WHIRLPOOL a06800d02e38845a49affd5726f4a0b2156b3f0ac8b528847c13ffe5dc8a97f117c60ab30b71d9304ff5ac755e2818e87d3f2c14e71f7aa5196e60b540f824c6
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20150403.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20150403.ebuild
new file mode 100644
index 0000000..b1627c5
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20150403.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Harness"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-04-03_00-01-28/zip/netbeans-trunk-nightly-201504030001-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 8d3a8af..36d1d4f 100644
--- a/dev-java/netbeans-ide/ChangeLog
+++ b/dev-java/netbeans-ide/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-ide-9999_p20150403 (03 Apr 2015)
+
+  03 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ide-9999_p20150403.ebuild:
+  bumped to the latest sources
+
 *netbeans-ide-9999_p20150402 (02 Apr 2015)
 
   02 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 26f7f2b..e51e030 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -239,6 +239,7 @@ DIST netbeans-trunk-nightly-201503270001-src.zip 206933166 SHA256 ec88a4e19aef5c
 DIST netbeans-trunk-nightly-201503310001-src.zip 206989433 SHA256 1c3752add0684a6cc2fab0677c2259a21b5e7d3bff9270739f583a5613f8ec43 SHA512 f5c5466f5a9c59a903479c51c12586b2cb5fc1501b7a6cb92dbb39d3b7617fbb7a61bb61d13f21a26774f7a50885f3b963355be0738847d469d5156d37ee626b WHIRLPOOL f34a82105807ea88ab1414903112f75df442fe3daa9eebd98669985d2935f984e6a51fdf45ec00b058298da1e91e169ced7da1be4997ae30c8b98577efff09c1
 DIST netbeans-trunk-nightly-201504010001-src.zip 206997278 SHA256 8fc0488ca935d5e577fe05fe76bb1dcf8c0f0df0ad155966797c819f970b24a0 SHA512 8d7a6b83a3e32967358c5a07641eda588c28132e4f451b7f83d7c0f5cb03afd15fd3bf6fb916576e7d1859d0f8ed3c13ac50eed45d076a85d046555e86647bb1 WHIRLPOOL 6f64a1108890cbe4a2a89ec627142df9199ff2485f71bf83ab5f0aed48cd502872187b88c5aa5d1aee14701aa7cfc9226e8f2a654dd3b7ff5c37afd839ae6af0
 DIST netbeans-trunk-nightly-201504020001-src.zip 207019553 SHA256 d10dcf7a1c0b1070dceb99a4efbeb9d047ec9938c9950f9565ed3953312e2d50 SHA512 b1c680effd9560c373a73d9d5f691f51e4d60cbd2b35cf5557680821409451e73e9bdae030db8bf52da2b36ff4fabd826447482d9eb1743415418834b938bc9f WHIRLPOOL 0e2299826eb95a5679f84b2f3ee26fb5541804dcde8265ecfdf54f6bb64d59d940af58fae7b315c51a608c79e781d53b3150dfa61124f5faf692aacfe1b5a3ab
+DIST netbeans-trunk-nightly-201504030001-src.zip 207037940 SHA256 ef43b1a5fa315405511e141a8304fc78c27a594c95d49691109d3d3982540ed4 SHA512 ee745e10ec2cd30502cd1cd7bac908fb7a063ea269a4bebc25cf54a0e01c1e4f23f379e935cbd3a90ac8739669e2206fedb33e1554abc559171e805bd31232e7 WHIRLPOOL 621106415266577acf0061e692da5ed3ff9f0ea92e8b2040a0e89139272117ed7f70f4fa835dfb7b7c0dcff91afc93d53fb2e52cb77859e980b4a97ba3e371a0
 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
@@ -266,5 +267,6 @@ EBUILD netbeans-ide-9999_p20150327.ebuild 30068 SHA256 4dd445f11a9b422df98472b0c
 EBUILD netbeans-ide-9999_p20150331.ebuild 30068 SHA256 af01ec3f250cde24f0751127fa91df040b63c7a242e0e7623db17dce7421fc0e SHA512 9ca47d8f7e0101ed33d24e8a72750cbab0962c2cf3d12f5570a61fe52dca65833379b02c09194366b027a2213a8a7bc4ad64b6fc2182cacab1030588e5165a8d WHIRLPOOL 7ae1fbe27ff682f4e7e87ce35de1d712cb76f340b465fbf18195b1260d818a735c8c9af5ec4d524946060da19f2cadad6cb4f58773f92109cd27d930dbb1de86
 EBUILD netbeans-ide-9999_p20150401.ebuild 30068 SHA256 0d6a53758587833d2d97399c1a4f0ac9cde8d6a48f991bac7a6cc709b3ac39d3 SHA512 571c6316c836a1efa4dbd577749c2e9af48f0e77ed19b8360b9464db39a7a18f03f94f8b28bec6eca2317fe1b34edff68feca349b507ecd71c7115ad8189a8b0 WHIRLPOOL b5e68066fe799874c1259b112cef84c1503d7369d6420d495e664f8f011fefdc4f428081ee4962debedcef210e3d37e8ab944801b576341be45ff4ecf42e0f47
 EBUILD netbeans-ide-9999_p20150402.ebuild 30068 SHA256 76edea157fda8f21478fc2d403d0efe8a9a1dd6eb112653dfa8db523245a7a66 SHA512 7d789435c7fc8f4930d591717be9d00301167671f0fc4cb1719f722aaae0d1073b52e0ed26af219f238d9e4bff81ab268b5a9d8cdab91dce9323b33e6114bf69 WHIRLPOOL c5a123af19885ec667afca2c77fbfeb96a658ad660ce2a06277052307fac0019aa0611e05f9d52ec6de4aa649e0ceca598da9f7c2bdb37a535350c57e450eb11
-MISC ChangeLog 152839 SHA256 54b85fd6143903e55c6413bbca40aaee5be2c3a53d2265c49236bbba04b11334 SHA512 4ba934f0d0e5f62d643a80a65fa9e470f883014eb737e64b283f965d26343094a1c2c380220503285d8ba19cadf00a9714bcaa3617e5020a9bb21a0f3b3dde66 WHIRLPOOL cc1927417dea92bf5ac1862ec6f0107c39f0bae262ff2e0d71ce1b2b38d6117360bc1e6b7e944906cb00823fda36af753d0b97605de4c843603f00e8da9641e9
+EBUILD netbeans-ide-9999_p20150403.ebuild 30068 SHA256 d0575a3fdad7cdbff7e8aff4f327da9e42343c110372bc3c252529baaa75097b SHA512 94bc7bc180b76c73f314a0a79c1f20ac3b95c4ef895bbfa510c8b8c12a3927484902041b55887da5f99dbb4b8329fbd23b64453c4d11f84e59b196ccfbc3cbd5 WHIRLPOOL d16950366cf64f07f69ca8c71152dbb2fb0076a5d779e1a3b0e7ff536804aab15b01efa74c9ab3baefc5c307113f3b8c2d39a91e27354d1fc0ca00ab7f1d811b
+MISC ChangeLog 153006 SHA256 f3184573480bcb12080f292599692839398e1b0753f4094f0d4a598b951f4a54 SHA512 8e623e8dadd05855bfb96c3fe76b97be20d9f6f7e388e69d7fec9a7ce92714bd25f39d88b6f6a6105a588e8b06bc5fb15506cfd02388ce82bb751e8638239454 WHIRLPOOL 609f3fb88c72a7c7e14bb9185ebb5ce076342a0f84c169b904734a28970806a70580015b419faabbc5a5a84b17527b9cf73fa0e221a55ac636d4d6689c4ea65c
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20150403.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20150403.ebuild
new file mode 100644
index 0000000..231d5e6
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20150403.ebuild
@@ -0,0 +1,371 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-04-03_00-01-28/zip/netbeans-trunk-nightly-201504030001-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/D19F70E8CC5D326509B1BF8C1A8FC87BD258E990-exechlp-1.0.zip
+	http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar
+	http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
+	http://hg.netbeans.org/binaries/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar
+	http://hg.netbeans.org/binaries/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/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-js-corestubs.zip
+	http://hg.netbeans.org/binaries/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip
+	http://hg.netbeans.org/binaries/7B737C0556FD692D8F072EF375FDD4FCA717DF9B-js-reststubs.zip
+	http://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar
+	http://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar
+	http://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar
+	http://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar
+	http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
+	http://hg.netbeans.org/binaries/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar
+	http://hg.netbeans.org/binaries/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar
+	http://hg.netbeans.org/binaries/F27BF427BE72709F3094BF76ECA8C5A2B9AC6DA9-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar
+	http://hg.netbeans.org/binaries/9BC512C5BB9A9F5276B9E8672F6B30AD0BD97D88-org.eclipse.core.jobs-3.5.101_nosignature.jar
+	http://hg.netbeans.org/binaries/105DC9A1A93E6EA9A6CD368AD12897B1F247D6AE-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar
+	http://hg.netbeans.org/binaries/E99C3C29A90F8AB29078A38CF8EBC3860249640C-org.eclipse.core.runtime-3.7.0_nosignature.jar
+	http://hg.netbeans.org/binaries/84FC6D443CD0816FA87093B6B7AD6876ADFC4207-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar
+	http://hg.netbeans.org/binaries/74069BFD03B2C66A9EBB4370C0B8064E3F5B6594-org.eclipse.equinox.app-1.3.100_nosignature.jar
+	http://hg.netbeans.org/binaries/A7953EEE9D4D7CD896C7D0AD6D21902E6259979B-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar
+	http://hg.netbeans.org/binaries/3FB169C95F095B70F05B96BE9496DA63FAE7F707-org.eclipse.equinox.preferences-3.4.2_nosignature.jar
+	http://hg.netbeans.org/binaries/CD5919A707EB6B5C1FC29964C8EF5E2CF3F5A3D4-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar
+	http://hg.netbeans.org/binaries/A4634373DC60650C49CC98AEA2090889F7ADC68F-org.eclipse.equinox.security-1.1.1_nosignature.jar
+	http://hg.netbeans.org/binaries/278049664FFA5447191BD5FE96B0B62B0CFD15D1-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar
+	http://hg.netbeans.org/binaries/9039A0C1FA0E56CB56A1A192908814478FA747C5-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar
+	http://hg.netbeans.org/binaries/DAA45A7EE529A7532F5DC08625A5A3E81DB2D4CB-org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar
+	http://hg.netbeans.org/binaries/F5AC8FBA216A8C52F319EC2CB455B44FFD734B38-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar
+	http://hg.netbeans.org/binaries/B43E7CE55F0DECA3BE1A6E695A3E3ABC6D62567F-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar
+	http://hg.netbeans.org/binaries/1B9CBEC0FCB47C279519E52D360199C24EC99B01-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar
+	http://hg.netbeans.org/binaries/6B0A6E9F9179E314944E4ADB831A9D6FCADED3DC-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar
+	http://hg.netbeans.org/binaries/B28B8EE777232102471EA5334FD70E20851845DD-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar
+	http://hg.netbeans.org/binaries/24A15BD37950663933CC4975EE6E518BEB2C28A3-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar
+	http://hg.netbeans.org/binaries/01CD242F06F6F7E4E61C9E05ABBE07318E501D51-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar
+	http://hg.netbeans.org/binaries/75928E4368CA748131A6767BA1A97D9DA643C306-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar
+	http://hg.netbeans.org/binaries/934DCAB9534B8FE12FD9C90759B26B6B0D442837-org.tmatesoft.svnkit_1.8.7.r10376_v20141223_2131.jar
+	http://hg.netbeans.org/binaries/688C11A84F86005448120D4F8E6347DF38117A56-processtreekiller-1.0.3.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}"/D19F70E8CC5D326509B1BF8C1A8FC87BD258E990-exechlp-1.0.zip dlight.nativeexecution/external/exechlp-1.0.zip || die
+	ln -s "${DISTDIR}"/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar libs.freemarker/external/freemarker-2.3.19.jar || die
+	ln -s "${DISTDIR}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || die
+	ln -s "${DISTDIR}"/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar html.validation/external/html5-datatypes.jar || die
+	ln -s "${DISTDIR}"/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}"/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-js-corestubs.zip javascript2.editor/external/js-corestubs.zip || die
+	ln -s "${DISTDIR}"/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip javascript2.editor/external/js-domstubs.zip || die
+	ln -s "${DISTDIR}"/7B737C0556FD692D8F072EF375FDD4FCA717DF9B-js-reststubs.zip javascript2.editor/external/js-reststubs.zip || die
+	ln -s "${DISTDIR}"/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.core-0.0.7.jar || die
+	ln -s "${DISTDIR}"/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.sshagent-0.0.7.jar || die
+	ln -s "${DISTDIR}"/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.pageant-0.0.7.jar || die
+	ln -s "${DISTDIR}"/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.usocket-jna-0.0.7.jar || die
+	ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.process/external/libpam4j-1.1.jar || die
+	ln -s "${DISTDIR}"/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar libs.nashorn/external/nashorn-02f810c26ff9-patched.jar || die
+	ln -s "${DISTDIR}"/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar html.validation/external/non-schema.jar || die
+	ln -s "${DISTDIR}"/F27BF427BE72709F3094BF76ECA8C5A2B9AC6DA9-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar o.eclipse.core.contenttype/external/org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar || die
+	ln -s "${DISTDIR}"/9BC512C5BB9A9F5276B9E8672F6B30AD0BD97D88-org.eclipse.core.jobs-3.5.101_nosignature.jar o.eclipse.core.jobs/external/org.eclipse.core.jobs-3.5.101_nosignature.jar || die
+	ln -s "${DISTDIR}"/105DC9A1A93E6EA9A6CD368AD12897B1F247D6AE-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar o.eclipse.core.net/external/org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar || die
+	ln -s "${DISTDIR}"/E99C3C29A90F8AB29078A38CF8EBC3860249640C-org.eclipse.core.runtime-3.7.0_nosignature.jar o.eclipse.core.runtime/external/org.eclipse.core.runtime-3.7.0_nosignature.jar || die
+	ln -s "${DISTDIR}"/84FC6D443CD0816FA87093B6B7AD6876ADFC4207-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar o.eclipse.core.runtime.compatibility.auth/external/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar || die
+	ln -s "${DISTDIR}"/74069BFD03B2C66A9EBB4370C0B8064E3F5B6594-org.eclipse.equinox.app-1.3.100_nosignature.jar o.eclipse.equinox.app/external/org.eclipse.equinox.app-1.3.100_nosignature.jar || die
+	ln -s "${DISTDIR}"/A7953EEE9D4D7CD896C7D0AD6D21902E6259979B-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar o.eclipse.equinox.common/external/org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar || die
+	ln -s "${DISTDIR}"/3FB169C95F095B70F05B96BE9496DA63FAE7F707-org.eclipse.equinox.preferences-3.4.2_nosignature.jar o.eclipse.equinox.preferences/external/org.eclipse.equinox.preferences-3.4.2_nosignature.jar || die
+	ln -s "${DISTDIR}"/CD5919A707EB6B5C1FC29964C8EF5E2CF3F5A3D4-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar o.eclipse.equinox.registry/external/org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar || die
+	ln -s "${DISTDIR}"/A4634373DC60650C49CC98AEA2090889F7ADC68F-org.eclipse.equinox.security-1.1.1_nosignature.jar o.eclipse.equinox.security/external/org.eclipse.equinox.security-1.1.1_nosignature.jar || die
+	ln -s "${DISTDIR}"/278049664FFA5447191BD5FE96B0B62B0CFD15D1-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit/external/org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar || die
+	ln -s "${DISTDIR}"/9039A0C1FA0E56CB56A1A192908814478FA747C5-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit.java7/external/org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar || die
+	ln -s "${DISTDIR}"/DAA45A7EE529A7532F5DC08625A5A3E81DB2D4CB-org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar || die
+	ln -s "${DISTDIR}"/F5AC8FBA216A8C52F319EC2CB455B44FFD734B38-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar || die
+	ln -s "${DISTDIR}"/B43E7CE55F0DECA3BE1A6E695A3E3ABC6D62567F-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar || die
+	ln -s "${DISTDIR}"/1B9CBEC0FCB47C279519E52D360199C24EC99B01-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar o.eclipse.mylyn.commons.repositories.core/external/org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar || die
+	ln -s "${DISTDIR}"/6B0A6E9F9179E314944E4ADB831A9D6FCADED3DC-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar || die
+	ln -s "${DISTDIR}"/B28B8EE777232102471EA5334FD70E20851845DD-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar || die
+	ln -s "${DISTDIR}"/24A15BD37950663933CC4975EE6E518BEB2C28A3-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.confluence.core/external/org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar || die
+	ln -s "${DISTDIR}"/01CD242F06F6F7E4E61C9E05ABBE07318E501D51-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar || die
+	ln -s "${DISTDIR}"/75928E4368CA748131A6767BA1A97D9DA643C306-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.textile.core/external/org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar  || die
+	ln -s "${DISTDIR}"/934DCAB9534B8FE12FD9C90759B26B6B0D442837-org.tmatesoft.svnkit_1.8.7.r10376_v20141223_2131.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.7.r10376_v20141223_2131.jar || die
+	ln -s "${DISTDIR}"/688C11A84F86005448120D4F8E6347DF38117A56-processtreekiller-1.0.3.jar extexecution.process/external/processtreekiller-1.0.3.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.51.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.7.jar
+	java-pkg_jar-from --into libs.lucene/external lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
+	java-pkg_jar-from --into libs.smack/external smack-2.2 smack.jar smack.jar
+	java-pkg_jar-from --into libs.smack/external smack-2.2 smackx.jar smackx.jar
+	# java-pkg_jar-from --into libs.svnClientAdapter.javahl/external subversion svn-javahl.jar svnjavahl-1.8.4.jar
+	java-pkg_jar-from --into libs.xerces/external xerces-2 xercesImpl.jar xerces-2.8.0.jar
+	java-pkg_jar-from --build-only --into o.apache.commons.codec/external commons-codec commons-codec.jar apache-commons-codec-1.3.jar
+	java-pkg_jar-from --into o.apache.commons.httpclient/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.1.jar
+	java-pkg_jar-from --into o.apache.commons.lang/external commons-lang-2.1 commons-lang.jar commons-lang-2.4.jar
+	java-pkg_jar-from --into o.apache.commons.logging/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
+	java-pkg_jar-from --into o.apache.ws.commons.util/external ws-commons-util ws-commons-util.jar ws-commons-util-1.0.1.jar
+	java-pkg_jar-from --into servletapi/external tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
+	java-pkg_jar-from --into xml.jaxb.api/external sun-jaf activation.jar activation.jar
+	java-pkg_jar-from --into xml.jaxb.api/external jsr173 jsr173.jar jsr173_1.0_api.jar
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	unset DISPLAY
+	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+	pushd nbbuild/netbeans/ide >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/ide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	rm -fr "${D}"/${INSTALL_DIR}/bin/nativeexecution || die
+	rm -fr "${D}"/${INSTALL_DIR}/modules/lib || die
+
+	insinto ${INSTALL_DIR}/bin/nativeexecution
+	doins bin/nativeexecution/*
+
+	pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution >/dev/null || die
+	for file in *.sh ; do
+		fperms 755 ${file}
+	done
+	popd >/dev/null || die
+
+	if use x86 ; then
+		doins -r bin/nativeexecution/Linux-x86
+		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86 >/dev/null || die
+		for file in * ; do
+			fperms 755 ${file}
+		done
+		popd >/dev/null || die
+	elif use amd64 ; then
+		doins -r bin/nativeexecution/Linux-x86_64
+		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86_64 >/dev/null || die
+		for file in * ; do
+			fperms 755 ${file}
+		done
+		popd >/dev/null || die
+	fi
+
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	# rm freemarker-2.3.19.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.19.jar || die
+	rm icu4j-4_4_2.jar && dosym /usr/share/icu4j-4.4/lib/icu4j.jar ${instdir}/icu4j-4_4_2.jar || die
+	rm isorelax.jar && dosym /usr/share/iso-relax/lib/isorelax.jar ${instdir}/isorelax.jar || die
+	rm json-simple-1.1.1.jar && dosym /usr/share/json-simple/lib/json-simple.jar ${instdir}/json-simple-1.1.1.jar || die
+	rm jvyamlb-0.2.7.jar && dosym /usr/share/jvyamlb/lib/jvyamlb.jar ${instdir}/jvyamlb-0.2.7.jar || die
+	rm log4j-1.2.15.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.15.jar || die
+	rm lucene-core-3.5.0.jar && dosym /usr/share/lucene-3.5/lib/lucene-core.jar ${instdir}/lucene-core-3.5.0.jar || die
+	rm mysql-connector-java-5.1.23-bin.jar && dosym /usr/share/jdbc-mysql/lib/jdbc-mysql.jar ${instdir}/mysql-connector-java-5.1.23-bin.jar || die
+	rm postgresql-9.2-1002.jdbc4.jar && dosym /usr/share/jdbc-postgresql/lib/jdbc-postgresql.jar ${instdir}/postgresql-9.2-1002.jdbc4.jar || die
+	rm saxon9B.jar && dosym /usr/share/saxon-9/lib/saxon.jar ${instdir}/saxon9B.jar || die
+	rm servlet-2.2.jar && dosym /usr/share/tomcat-servlet-api-2.2/lib/servlet.jar ${instdir}/servlet-2.2.jar || die
+	rm smack.jar && dosym /usr/share/smack-2.2/lib/smack.jar ${instdir}/smack.jar || die
+	rm smackx.jar && dosym /usr/share/smack-2.2/lib/smackx.jar ${instdir}/smackx.jar || die
+	# rm svnjavahl.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl.jar || die
+	rm xerces-2.8.0.jar && dosym /usr/share/xerces-2/lib/xercesImpl.jar ${instdir}/xerces-2.8.0.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxb
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm activation.jar && dosym /usr/share/sun-jaf/lib/activation.jar ${instdir}/activation.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxb/api
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsr173_1.0_api.jar && dosym /usr/share/jsr173/lib/jsr173.jar ${instdir}/jsr173_1.0_api.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ide
+}

diff --git a/dev-java/netbeans-java/ChangeLog b/dev-java/netbeans-java/ChangeLog
index 8ddd98c..4dfae67 100644
--- a/dev-java/netbeans-java/ChangeLog
+++ b/dev-java/netbeans-java/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-java-9999_p20150403 (03 Apr 2015)
+
+  03 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-java-9999_p20150403.ebuild:
+  bumped to the latest sources
+
 *netbeans-java-9999_p20150402 (02 Apr 2015)
 
   02 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index aab1cbf..f95d880 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -112,6 +112,7 @@ DIST netbeans-trunk-nightly-201503270001-src.zip 206933166 SHA256 ec88a4e19aef5c
 DIST netbeans-trunk-nightly-201503310001-src.zip 206989433 SHA256 1c3752add0684a6cc2fab0677c2259a21b5e7d3bff9270739f583a5613f8ec43 SHA512 f5c5466f5a9c59a903479c51c12586b2cb5fc1501b7a6cb92dbb39d3b7617fbb7a61bb61d13f21a26774f7a50885f3b963355be0738847d469d5156d37ee626b WHIRLPOOL f34a82105807ea88ab1414903112f75df442fe3daa9eebd98669985d2935f984e6a51fdf45ec00b058298da1e91e169ced7da1be4997ae30c8b98577efff09c1
 DIST netbeans-trunk-nightly-201504010001-src.zip 206997278 SHA256 8fc0488ca935d5e577fe05fe76bb1dcf8c0f0df0ad155966797c819f970b24a0 SHA512 8d7a6b83a3e32967358c5a07641eda588c28132e4f451b7f83d7c0f5cb03afd15fd3bf6fb916576e7d1859d0f8ed3c13ac50eed45d076a85d046555e86647bb1 WHIRLPOOL 6f64a1108890cbe4a2a89ec627142df9199ff2485f71bf83ab5f0aed48cd502872187b88c5aa5d1aee14701aa7cfc9226e8f2a654dd3b7ff5c37afd839ae6af0
 DIST netbeans-trunk-nightly-201504020001-src.zip 207019553 SHA256 d10dcf7a1c0b1070dceb99a4efbeb9d047ec9938c9950f9565ed3953312e2d50 SHA512 b1c680effd9560c373a73d9d5f691f51e4d60cbd2b35cf5557680821409451e73e9bdae030db8bf52da2b36ff4fabd826447482d9eb1743415418834b938bc9f WHIRLPOOL 0e2299826eb95a5679f84b2f3ee26fb5541804dcde8265ecfdf54f6bb64d59d940af58fae7b315c51a608c79e781d53b3150dfa61124f5faf692aacfe1b5a3ab
+DIST netbeans-trunk-nightly-201504030001-src.zip 207037940 SHA256 ef43b1a5fa315405511e141a8304fc78c27a594c95d49691109d3d3982540ed4 SHA512 ee745e10ec2cd30502cd1cd7bac908fb7a063ea269a4bebc25cf54a0e01c1e4f23f379e935cbd3a90ac8739669e2206fedb33e1554abc559171e805bd31232e7 WHIRLPOOL 621106415266577acf0061e692da5ed3ff9f0ea92e8b2040a0e89139272117ed7f70f4fa835dfb7b7c0dcff91afc93d53fb2e52cb77859e980b4a97ba3e371a0
 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
@@ -138,5 +139,6 @@ EBUILD netbeans-java-9999_p20150327.ebuild 13432 SHA256 45ee204ec2c69820b8b9f471
 EBUILD netbeans-java-9999_p20150331.ebuild 13432 SHA256 c65a7e29d6db7651c84d9e5db0c32d9188e5231cefef68d539deb95380e0e3fd SHA512 b415ebd71181462f5b10deb8af39f9d9bc9740ebfbdfcddd6ee79ebbb8f678e9f7483a1404c815f9fdc3026aa03bc1684c9ef3754393ec497256cbe03b34e792 WHIRLPOOL 85cd8f16291925dd949f2a584fdb036c4691537a884aab424f7d99c85fe081c7e920d0b61a462c838c24879241da8a116981b63f6fa87b5713522081077951cf
 EBUILD netbeans-java-9999_p20150401.ebuild 13432 SHA256 e1cd6045ffbc3ae9f6dfae0a38e4092eea0cff670d9320f81f6ec100a3e19f5a SHA512 5b991b6512c8b2237f26eb3e85a2bc1b82839767f35171c59845206f724003abcd6e079e7e094971eaa600395338307a12893d89b0a516c819ff2ed5a8c63994 WHIRLPOOL 4546644b278712304f45b5135e305bc8539df9c1b671c8fe275feaef9fb4bbf56e0eb7c32a1c0b70e02a26cde3ac7a353eabf6bef504d1200275124d70036d8f
 EBUILD netbeans-java-9999_p20150402.ebuild 13432 SHA256 a5b5ac152b0d7e5cb2b8f1f0ef7eb45ef0e8f47cec920883e77b3b61984fddc0 SHA512 73c17ea86db27165c46f3f6bdc70623072d4a1938cfaff0d69b9abeda8f12582b71718e122cc4d440597322bb768b5ae9876a9de185bc12db60017e7a0f9c02e WHIRLPOOL e43ae7cdf413513bd4e374386b4968c41b561e1f5312c00d1b41419d06686ddc42d1a1f7b595f89bca305ed3fcc2b37c6e304c813852c34f5d74b6c21c34edb6
-MISC ChangeLog 155707 SHA256 6701a9f9734af78748cbfa3ad64abb05ed3290dee90b0ab7f72bee4879a1188b SHA512 d2e3a0ad695a398fe42b2452a72c1d4e477b2107d22d831561ac41fa7dda94d534e2ab68fb5b345add272f163e82db3992281168d63be90bf7c0f782691ca2a1 WHIRLPOOL 0b3570170d2b88ff22b61da3ee510a2a2f9a5674a913dcf7b5dfb4b03f762ac0275be8ce76017e26367ad919ec4561d8fd5e1558d747cb76def5232ce7f8d96e
+EBUILD netbeans-java-9999_p20150403.ebuild 13432 SHA256 1acc4539ed559675f34cc58157f84e573f06d7ddf32903bfcf6561f3270eb19d SHA512 c8d5475dea0af882d2707774a2edd306b9ac93287baf9ed5c1731077f10eed1cf3ce884ca140f51a0271782a204d32b78cf83d96b81b43262de13471bca67a9b WHIRLPOOL 6a7c3df1c2c92728ecdb1071fb5f10d1ac827cb35b1ffa147eb482cc68f237d7e02b4e2a2646e19f5d5358aad87948874f8fb744d8f142fd2498b3749e43a65a
+MISC ChangeLog 155876 SHA256 5455203d39a8bc511daffe3127ae2adef0e162265a3c1e8c8d212cf5b15731d4 SHA512 bfe4ede868c3cae7b72e48dc23f351de0127eb182af80422a69e8779e8c5def80d829cade525a60428bde32237d21d52dd743b76af7befb87c17417f997ee504 WHIRLPOOL 68dab7400c430f118c82e9507d9d06bfc82b29b60a1e6b74705eb0ac6e2e7861a9fbad98c36141c2e9ac9f7b1a110ed7a61ae482b7571a1eece80d3c05b28805
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20150403.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20150403.ebuild
new file mode 100644
index 0000000..b4c3b3c
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20150403.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+# Maven cannot be unbundled because it depends on exact maven version and exact content of maven directory
+
+DESCRIPTION="Netbeans Java Cluster"
+HOMEPAGE="http://netbeans.org/projects/java"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-04-03_00-01-28/zip/netbeans-trunk-nightly-201504030001-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/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar
+	http://hg.netbeans.org/binaries/87405A9D166EAE11638A7F9C3C9FA3C3B6EDEDF3-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}"/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
+	ln -s "${DISTDIR}"/87405A9D166EAE11638A7F9C3C9FA3C3B6EDEDF3-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/xmlstreambuffer.jar ${instdir}/streambuffer.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxws22/api
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
+	rm saaj-api.jar && dosym /usr/share/jsr67/lib/jsr67.jar ${instdir}/saaj-api.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/maven
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jdom-1.0.jar && dosym /usr/share/jdom-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 ade6801..22780fc 100644
--- a/dev-java/netbeans-javacard/ChangeLog
+++ b/dev-java/netbeans-javacard/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javacard-9999_p20150403 (03 Apr 2015)
+
+  03 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javacard-9999_p20150403.ebuild:
+  bumped to the latest sources
+
 *netbeans-javacard-9999_p20150402 (02 Apr 2015)
 
   02 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index c90889d..479dccc 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201503270001-src.zip 206933166 SHA256 ec88a4e19aef5c
 DIST netbeans-trunk-nightly-201503310001-src.zip 206989433 SHA256 1c3752add0684a6cc2fab0677c2259a21b5e7d3bff9270739f583a5613f8ec43 SHA512 f5c5466f5a9c59a903479c51c12586b2cb5fc1501b7a6cb92dbb39d3b7617fbb7a61bb61d13f21a26774f7a50885f3b963355be0738847d469d5156d37ee626b WHIRLPOOL f34a82105807ea88ab1414903112f75df442fe3daa9eebd98669985d2935f984e6a51fdf45ec00b058298da1e91e169ced7da1be4997ae30c8b98577efff09c1
 DIST netbeans-trunk-nightly-201504010001-src.zip 206997278 SHA256 8fc0488ca935d5e577fe05fe76bb1dcf8c0f0df0ad155966797c819f970b24a0 SHA512 8d7a6b83a3e32967358c5a07641eda588c28132e4f451b7f83d7c0f5cb03afd15fd3bf6fb916576e7d1859d0f8ed3c13ac50eed45d076a85d046555e86647bb1 WHIRLPOOL 6f64a1108890cbe4a2a89ec627142df9199ff2485f71bf83ab5f0aed48cd502872187b88c5aa5d1aee14701aa7cfc9226e8f2a654dd3b7ff5c37afd839ae6af0
 DIST netbeans-trunk-nightly-201504020001-src.zip 207019553 SHA256 d10dcf7a1c0b1070dceb99a4efbeb9d047ec9938c9950f9565ed3953312e2d50 SHA512 b1c680effd9560c373a73d9d5f691f51e4d60cbd2b35cf5557680821409451e73e9bdae030db8bf52da2b36ff4fabd826447482d9eb1743415418834b938bc9f WHIRLPOOL 0e2299826eb95a5679f84b2f3ee26fb5541804dcde8265ecfdf54f6bb64d59d940af58fae7b315c51a608c79e781d53b3150dfa61124f5faf692aacfe1b5a3ab
+DIST netbeans-trunk-nightly-201504030001-src.zip 207037940 SHA256 ef43b1a5fa315405511e141a8304fc78c27a594c95d49691109d3d3982540ed4 SHA512 ee745e10ec2cd30502cd1cd7bac908fb7a063ea269a4bebc25cf54a0e01c1e4f23f379e935cbd3a90ac8739669e2206fedb33e1554abc559171e805bd31232e7 WHIRLPOOL 621106415266577acf0061e692da5ed3ff9f0ea92e8b2040a0e89139272117ed7f70f4fa835dfb7b7c0dcff91afc93d53fb2e52cb77859e980b4a97ba3e371a0
 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
@@ -59,5 +60,6 @@ EBUILD netbeans-javacard-9999_p20150327.ebuild 4982 SHA256 98b8be90f0699baac12f9
 EBUILD netbeans-javacard-9999_p20150331.ebuild 4982 SHA256 f679c934962365cba8bde35b5c84763c6a76716c16177b617768efb825e26f75 SHA512 b1014f14ce03a2d01410ed55f55dacdea3bb5f407f3f2644b61c331965930d10caf06aecb5dfc1c53f07ab742dc6f186f1b765633cabf00dd780d03838d82d3a WHIRLPOOL 4d22590d84310ba56b111ef0c9e8942939aeea5d828110491800cec315ecd6c2ad999f246267c9403b68cb4c5e62f4c17f2b28edad495a3b5bf50326d6bb23be
 EBUILD netbeans-javacard-9999_p20150401.ebuild 4982 SHA256 a7a201f769d65f37830cec11e58b765c9afac79201ac21c410492c0b9d30a5ee SHA512 a4d6a55ef02bcffda3ff0ada5c7e5e2b03045326e13a50febd15737e7a7bc1560d7861ebb6c484991aba6f3280e83052f9cd6e21f153e79ef418e1bfe63dcb8e WHIRLPOOL b66beebfbcc930a45cdeb434efba7ef4bd7ab90383505fa3fb7e871c81ba45adbd05b75f76b240b84142d714e018ea9272f21c5250fde41ae9321cdf73d939ed
 EBUILD netbeans-javacard-9999_p20150402.ebuild 4982 SHA256 c55f64ef26b3b223de11724a8f44f9c9afc028a375868705323c42527991ac35 SHA512 0284b07ed33ddf79444af39218e7947efa4402773b1c8bd8d89a590205e8ffe11cdcfdae8bdab6d3c104f4c3e68ec8a11c6695b02f571b5a9a88e2e651f5bf18 WHIRLPOOL 04622482c2019430f6bd88f9db35d932a8f7e9e1a075029b41ebfb9f7aa6ff0ca25fde36a63d7c9e6c51e8290b784c4ea100a3c19b64c84330225c6a7d57f591
-MISC ChangeLog 162497 SHA256 ddcd33ccfed33d8e197b2acff4b6f900e75098750a6884b0c82f2cefceb88f60 SHA512 649b9b8e80125f5b6bbba78f0c2b7db3e16bd9251cb449ad9ed77878f3a525f32635f2711c7485685dbba968944f857db80df376510d5638ae6f1a47473963d0 WHIRLPOOL 1ba2a9e152c74c94376c6ff0b4f3b249e594adbd953f9bda0e43a9001808c2119e18358020c40dbbcfb9de4449c1ccde29bb7cc56dfc10c64bb9894fedd128f2
+EBUILD netbeans-javacard-9999_p20150403.ebuild 4982 SHA256 c817991beb3361e974c86a1432cbb892c930ba3df548f4630d5e01e308ec64b6 SHA512 b235a03338a8b5747fe26fc6876f208d19dd41b3eb498a292a7682c7f209edfadd65177c9e97aed070529e3f3f848645f55c9980d1ab0f1cde08af54b304335b WHIRLPOOL eab719efeb3645adb8fc2c21bc29f7b1341c804c179f9549b0f12209b7df345a7123d3e9791b58dd14bdee66a8595919889597abe552777fb47989ad1987e11b
+MISC ChangeLog 162674 SHA256 d3c6a69dfe3e817aca1d0bd642f5b1d25a8d19d0df9e9caa375de296dded08d3 SHA512 57d3ffba8f8df347cfe54c29f33dfeb9098b9a4faa703a9b43c2e0ac3f1952ad2c4e160151422da20cad1e5cc3603a9e0035220c559d3ce75ee0b63dcbbfecf2 WHIRLPOOL 533bfd0a286a02f15056446d90265394db6973e89b87e9d944c63724bc06c9ff41637d753a32fa7315743c8681df49e19b3d908f15e862bfc2dc038b39114886
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150403.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150403.ebuild
new file mode 100644
index 0000000..6325391
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150403.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaCard Cluster"
+HOMEPAGE="http://netbeans.org/projects/javacard"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-04-03_00-01-28/zip/netbeans-trunk-nightly-201504030001-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 ee2bf87..297ead2 100644
--- a/dev-java/netbeans-javadoc/ChangeLog
+++ b/dev-java/netbeans-javadoc/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javadoc-9999_p20150403 (03 Apr 2015)
+
+  03 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javadoc-9999_p20150403.ebuild:
+  bumped to the latest sources
+
 *netbeans-javadoc-9999_p20150402 (02 Apr 2015)
 
   02 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index eb396d7..d787026 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -37,6 +37,7 @@ DIST netbeans-trunk-nightly-201503270001-src.zip 206933166 SHA256 ec88a4e19aef5c
 DIST netbeans-trunk-nightly-201503310001-src.zip 206989433 SHA256 1c3752add0684a6cc2fab0677c2259a21b5e7d3bff9270739f583a5613f8ec43 SHA512 f5c5466f5a9c59a903479c51c12586b2cb5fc1501b7a6cb92dbb39d3b7617fbb7a61bb61d13f21a26774f7a50885f3b963355be0738847d469d5156d37ee626b WHIRLPOOL f34a82105807ea88ab1414903112f75df442fe3daa9eebd98669985d2935f984e6a51fdf45ec00b058298da1e91e169ced7da1be4997ae30c8b98577efff09c1
 DIST netbeans-trunk-nightly-201504010001-src.zip 206997278 SHA256 8fc0488ca935d5e577fe05fe76bb1dcf8c0f0df0ad155966797c819f970b24a0 SHA512 8d7a6b83a3e32967358c5a07641eda588c28132e4f451b7f83d7c0f5cb03afd15fd3bf6fb916576e7d1859d0f8ed3c13ac50eed45d076a85d046555e86647bb1 WHIRLPOOL 6f64a1108890cbe4a2a89ec627142df9199ff2485f71bf83ab5f0aed48cd502872187b88c5aa5d1aee14701aa7cfc9226e8f2a654dd3b7ff5c37afd839ae6af0
 DIST netbeans-trunk-nightly-201504020001-src.zip 207019553 SHA256 d10dcf7a1c0b1070dceb99a4efbeb9d047ec9938c9950f9565ed3953312e2d50 SHA512 b1c680effd9560c373a73d9d5f691f51e4d60cbd2b35cf5557680821409451e73e9bdae030db8bf52da2b36ff4fabd826447482d9eb1743415418834b938bc9f WHIRLPOOL 0e2299826eb95a5679f84b2f3ee26fb5541804dcde8265ecfdf54f6bb64d59d940af58fae7b315c51a608c79e781d53b3150dfa61124f5faf692aacfe1b5a3ab
+DIST netbeans-trunk-nightly-201504030001-src.zip 207037940 SHA256 ef43b1a5fa315405511e141a8304fc78c27a594c95d49691109d3d3982540ed4 SHA512 ee745e10ec2cd30502cd1cd7bac908fb7a063ea269a4bebc25cf54a0e01c1e4f23f379e935cbd3a90ac8739669e2206fedb33e1554abc559171e805bd31232e7 WHIRLPOOL 621106415266577acf0061e692da5ed3ff9f0ea92e8b2040a0e89139272117ed7f70f4fa835dfb7b7c0dcff91afc93d53fb2e52cb77859e980b4a97ba3e371a0
 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
@@ -62,5 +63,6 @@ EBUILD netbeans-javadoc-9999_p20150327.ebuild 6234 SHA256 54881edc8b92ab93505c3b
 EBUILD netbeans-javadoc-9999_p20150331.ebuild 6234 SHA256 6a161ec795be8d853bb18f0b73bf791e76ce315fe5659edaf95a19e399da9197 SHA512 016a8c1168bd782c2ad4044f1eb17032e1f156c34e74147c5ee76af1df71e339ec8c5fcc515b85f17d3edecfd0cdab06ce0e99ade56ec1ddeb92cdfb8240860a WHIRLPOOL 3daeedc9b5a9e58de3cf36d31fb58d2d24e058a4dfd2abee4f944599fdac7b9ae13ef4b019047461d35eca83b111f64eb09cf54b55e07323ca0016f8ac323934
 EBUILD netbeans-javadoc-9999_p20150401.ebuild 6234 SHA256 b26b4ac73e970a03301152b63b70bf035b9fac419247f27514fb757f708b36ba SHA512 236d7e89d0fb2253bb82d1df1dc090ccb995bcec1746fca7705bf542e89bf889f825dfc8ce839cb7490371f3e67a41a5d4b79d31d0de614a91afc52f54c073a5 WHIRLPOOL ed0fc2aceb4387e4e3995135a37196a1a71796ba0d63d86a8b259940ae99b169605fd7ce23a871ca352c8915c3846c98394fd4aa106da6c36895364e6fd048db
 EBUILD netbeans-javadoc-9999_p20150402.ebuild 6234 SHA256 cff6d2cf15b6a7069ab5ae4e224994a0c52b91f044b0951f79fdb6490feb91d0 SHA512 17eadfbb5c627cb2d6cb3a95205eecb81caaee7be5c164828921b9680089585c95ee18d074265e03aa45e48664bda2dbb0233e22cf030c0c5f4645d22a7b9351 WHIRLPOOL 4605149101a0ee212d7a6d7879e2f56699851cfb3e69a5f929d00f382d3fdb1bc04e1c9d25972c5475a2846c785f152c19d47a9e39ca9aad432f9ec0878856a9
-MISC ChangeLog 160299 SHA256 410ebec962c5f24e8722bcbb5cc69e82b157a84cc5c4665a7f1360687ec11b8a SHA512 c4a8591305be279924a29ffc3eabd59bce96725478b4fac75afc9e20f62ed6a8968611f0bddeabf9aaa3708247f18e6577f27707fdfe28a5038de0935b315a86 WHIRLPOOL 63bca7c1f11ae66cfbc6f88c3915390222196374836dfea91e1dac1683f147a8e3f6740636e0427af749177fec212bdda42f9e1d77c1c324b4255818ab2debd2
+EBUILD netbeans-javadoc-9999_p20150403.ebuild 6234 SHA256 c12f73005fdb7a431992d1659c21ff50d97a949764b248a8c882a40bb0bcac5d SHA512 95a70258e7a2f75f1a2fc63d9f989bb6a086afad1d49b16487949063758e465a2f0fb5ebe63c00534f94b7163546434305a62272393d01e920baa954d2f8d2e4 WHIRLPOOL 264f676279525b1e6b659c9809239441fd22c412552df243caa04a46c84b770e9de79eae360c67c6f54b377e3eca53fc464945b1a9dce068d71db0eb991d9911
+MISC ChangeLog 160474 SHA256 652f28f1c6c8a1127690d8ab896e81197c244ae9f7dfd64f56606226aae6e45a SHA512 552e4f1bec8c300e998433bd81874f27a4db64b226b221bdfe6b7a1c78178bf76317c43b14db84b8dd82dcd77ab4b5bbe6e23f7ba0c474543cf57258d76127d5 WHIRLPOOL eb2edf8dc3536cb1fdfc07fadc1998eb399a51202083c5af99c54a133d02071718bfde9f30a2da909567b83cf8b7326d1ce4beab61aac2806d3c393551deee2b
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150403.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150403.ebuild
new file mode 100644
index 0000000..d67aee7
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150403.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaDocs"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-04-03_00-01-28/zip/netbeans-trunk-nightly-201504030001-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 f04e204..269ec75 100644
--- a/dev-java/netbeans-javafx/ChangeLog
+++ b/dev-java/netbeans-javafx/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javafx-9999_p20150403 (03 Apr 2015)
+
+  03 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javafx-9999_p20150403.ebuild:
+  bumped to the latest sources
+
 *netbeans-javafx-9999_p20150402 (02 Apr 2015)
 
   02 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index d315b91..d07d113 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -37,6 +37,7 @@ DIST netbeans-trunk-nightly-201503270001-src.zip 206933166 SHA256 ec88a4e19aef5c
 DIST netbeans-trunk-nightly-201503310001-src.zip 206989433 SHA256 1c3752add0684a6cc2fab0677c2259a21b5e7d3bff9270739f583a5613f8ec43 SHA512 f5c5466f5a9c59a903479c51c12586b2cb5fc1501b7a6cb92dbb39d3b7617fbb7a61bb61d13f21a26774f7a50885f3b963355be0738847d469d5156d37ee626b WHIRLPOOL f34a82105807ea88ab1414903112f75df442fe3daa9eebd98669985d2935f984e6a51fdf45ec00b058298da1e91e169ced7da1be4997ae30c8b98577efff09c1
 DIST netbeans-trunk-nightly-201504010001-src.zip 206997278 SHA256 8fc0488ca935d5e577fe05fe76bb1dcf8c0f0df0ad155966797c819f970b24a0 SHA512 8d7a6b83a3e32967358c5a07641eda588c28132e4f451b7f83d7c0f5cb03afd15fd3bf6fb916576e7d1859d0f8ed3c13ac50eed45d076a85d046555e86647bb1 WHIRLPOOL 6f64a1108890cbe4a2a89ec627142df9199ff2485f71bf83ab5f0aed48cd502872187b88c5aa5d1aee14701aa7cfc9226e8f2a654dd3b7ff5c37afd839ae6af0
 DIST netbeans-trunk-nightly-201504020001-src.zip 207019553 SHA256 d10dcf7a1c0b1070dceb99a4efbeb9d047ec9938c9950f9565ed3953312e2d50 SHA512 b1c680effd9560c373a73d9d5f691f51e4d60cbd2b35cf5557680821409451e73e9bdae030db8bf52da2b36ff4fabd826447482d9eb1743415418834b938bc9f WHIRLPOOL 0e2299826eb95a5679f84b2f3ee26fb5541804dcde8265ecfdf54f6bb64d59d940af58fae7b315c51a608c79e781d53b3150dfa61124f5faf692aacfe1b5a3ab
+DIST netbeans-trunk-nightly-201504030001-src.zip 207037940 SHA256 ef43b1a5fa315405511e141a8304fc78c27a594c95d49691109d3d3982540ed4 SHA512 ee745e10ec2cd30502cd1cd7bac908fb7a063ea269a4bebc25cf54a0e01c1e4f23f379e935cbd3a90ac8739669e2206fedb33e1554abc559171e805bd31232e7 WHIRLPOOL 621106415266577acf0061e692da5ed3ff9f0ea92e8b2040a0e89139272117ed7f70f4fa835dfb7b7c0dcff91afc93d53fb2e52cb77859e980b4a97ba3e371a0
 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
@@ -61,5 +62,6 @@ EBUILD netbeans-javafx-9999_p20150327.ebuild 4723 SHA256 aaa8e1bc54925e28acc68fd
 EBUILD netbeans-javafx-9999_p20150331.ebuild 4723 SHA256 0a969a3ac4d2214a44da6d0848df39b407c2dc99bb049e088651971625da029e SHA512 7721053e63aa335c52a666df88d1d66d7a2a4a2fc99c2b2a1459b62b58851236e4c59a67e42c7bbbcd5c61b7760cc405e83f3c63606634fee06ae68e31b68594 WHIRLPOOL 45a3750e24ea7bacc1757e8445b8addcf65c215b310f2e8261c115b60670f30f9470ade190eb5a08a69b044b360662eca2b15441f854b4b8efe5da72911390fc
 EBUILD netbeans-javafx-9999_p20150401.ebuild 4723 SHA256 4455651bce1a56dd9516df26d58c88f1661ab04b3fab1c30fda0dd10565a82a6 SHA512 ae73282498e194897cee3b0c32cf0b7a9edcb60b74041c37341b6e133db869224033b3d4d05e763a1bc44568165f181e64951762971db886b4ad4d793f4e509b WHIRLPOOL c67230942c683b724fb7686e08a19760b3d2b9baba318bf8aac266a0aefbcb7be2d397a90c9a04f76d6e83feac14fdd62bbf6fa3ea13f0c8a527985112c8f09d
 EBUILD netbeans-javafx-9999_p20150402.ebuild 4723 SHA256 b69df7e3f3229e9db772bc349e7061f1f97c1e2651862c8e45e9b3424356ade5 SHA512 2a37ad511f0fbebc8468af7c9775cda163b1c46fdebf911d15718f9dc124b337671955ff296993c54de350e337181b6aa5fa50c1ab4fc25e226acaaaf30f2742 WHIRLPOOL 14058393a44832cb5eb65772eb8af4e18ea73758ab4b9737d157a951d6b7eb319daeb83a2effda4a171d662577a03cd09b04213c7926c424bce898a1b5e3a2f8
-MISC ChangeLog 144968 SHA256 31afac5f3a59dbe24dc006a838681633076db57eb9f7a986aa780bc37b8940e6 SHA512 8eb568d54b1067e7b39f721675b478a80174f3bbcbcbecee1de0116f5103c32ccbe71a08871279de5dd08340cfab1172c5dc64c768d256b0b689670fda500d80 WHIRLPOOL c19f72b8f4b0b3ccfb4d691414edd3e2c32ac0fe3f1d3da92752b5e2f1fa976cfdddc7dae4874f0d6f1eb85a83954e6992168fe66ab168b3937928bf3ebafc28
+EBUILD netbeans-javafx-9999_p20150403.ebuild 4723 SHA256 95abe5fe2fa4a410f156fd235f4dee7a2cbdbde3381f92a8398a1e1ffb8da540 SHA512 fd6d72231eae496ae7b3a78e0599df57f482786475ad4bc4919b959f42ab09fc983cc4c5c5b446b75f263f4ab135934aef9058d082faf89847fddecc9caa7866 WHIRLPOOL e3feae8e9e912a4d398c11b9b57f04f01940302467140ff6ca05c701c51df8c1ea8a9b6d867271d26472bc5733e5cfdd2c59f0b9d799978778b3f83a0240b4e0
+MISC ChangeLog 145141 SHA256 ba9511072bd56167d9eeb5c00d4281bef25b7a9bfc05146769e6bfa1e94e1561 SHA512 51ecc08d8115a82de1fcf876a3989efc5ba3b598cd57299a5f3605196a40e6c387de81460a120bbde84ea662307362b3344a6a58315ee98e32f67e02e3af4559 WHIRLPOOL 21a439163c539de25a86017ceae9f0ab58741c4f4d7faa35b8d56b6d3775d029fa5b2b785d1548c3c5fb5ab370511fe878dd5eb3af27142b9b665f14ee23edbb
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150403.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150403.ebuild
new file mode 100644
index 0000000..71cf3b7
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150403.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaFX Cluster"
+HOMEPAGE="http://netbeans.org/projects/javafx"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-04-03_00-01-28/zip/netbeans-trunk-nightly-201504030001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
+	http://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar
+	http://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip
+	http://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip
+	http://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar
+	http://hg.netbeans.org/binaries/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	dev-java/junit:4"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.javafx -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar apisupport.harness/external/bindex-2.2.jar || die
+	ln -s "${DISTDIR}"/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar apisupport.harness/external/jnlp-servlet.jar || die
+	ln -s "${DISTDIR}"/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar jemmy/external/jemmy-2.3.1.1.jar || die
+	ln -s "${DISTDIR}"/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip jemmy/external/jemmy-2.3.1.1-doc.zip || die
+	ln -s "${DISTDIR}"/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip jemmy/external/jemmy-2.3.1.1-src.zip || die
+	ln -s "${DISTDIR}"/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into apisupport.harness/external javahelp jsearch.jar jsearch-2.0_05.jar
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.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 04e6552..e03aa7b 100644
--- a/dev-java/netbeans-mobility/ChangeLog
+++ b/dev-java/netbeans-mobility/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-mobility-9999_p20150403 (03 Apr 2015)
+
+  03 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-mobility-9999_p20150403.ebuild:
+  bumped to the latest sources
+
 *netbeans-mobility-9999_p20150402 (02 Apr 2015)
 
   02 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 5605d27..6505438 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -40,6 +40,7 @@ DIST netbeans-trunk-nightly-201503270001-src.zip 206933166 SHA256 ec88a4e19aef5c
 DIST netbeans-trunk-nightly-201503310001-src.zip 206989433 SHA256 1c3752add0684a6cc2fab0677c2259a21b5e7d3bff9270739f583a5613f8ec43 SHA512 f5c5466f5a9c59a903479c51c12586b2cb5fc1501b7a6cb92dbb39d3b7617fbb7a61bb61d13f21a26774f7a50885f3b963355be0738847d469d5156d37ee626b WHIRLPOOL f34a82105807ea88ab1414903112f75df442fe3daa9eebd98669985d2935f984e6a51fdf45ec00b058298da1e91e169ced7da1be4997ae30c8b98577efff09c1
 DIST netbeans-trunk-nightly-201504010001-src.zip 206997278 SHA256 8fc0488ca935d5e577fe05fe76bb1dcf8c0f0df0ad155966797c819f970b24a0 SHA512 8d7a6b83a3e32967358c5a07641eda588c28132e4f451b7f83d7c0f5cb03afd15fd3bf6fb916576e7d1859d0f8ed3c13ac50eed45d076a85d046555e86647bb1 WHIRLPOOL 6f64a1108890cbe4a2a89ec627142df9199ff2485f71bf83ab5f0aed48cd502872187b88c5aa5d1aee14701aa7cfc9226e8f2a654dd3b7ff5c37afd839ae6af0
 DIST netbeans-trunk-nightly-201504020001-src.zip 207019553 SHA256 d10dcf7a1c0b1070dceb99a4efbeb9d047ec9938c9950f9565ed3953312e2d50 SHA512 b1c680effd9560c373a73d9d5f691f51e4d60cbd2b35cf5557680821409451e73e9bdae030db8bf52da2b36ff4fabd826447482d9eb1743415418834b938bc9f WHIRLPOOL 0e2299826eb95a5679f84b2f3ee26fb5541804dcde8265ecfdf54f6bb64d59d940af58fae7b315c51a608c79e781d53b3150dfa61124f5faf692aacfe1b5a3ab
+DIST netbeans-trunk-nightly-201504030001-src.zip 207037940 SHA256 ef43b1a5fa315405511e141a8304fc78c27a594c95d49691109d3d3982540ed4 SHA512 ee745e10ec2cd30502cd1cd7bac908fb7a063ea269a4bebc25cf54a0e01c1e4f23f379e935cbd3a90ac8739669e2206fedb33e1554abc559171e805bd31232e7 WHIRLPOOL 621106415266577acf0061e692da5ed3ff9f0ea92e8b2040a0e89139272117ed7f70f4fa835dfb7b7c0dcff91afc93d53fb2e52cb77859e980b4a97ba3e371a0
 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
@@ -65,5 +66,6 @@ EBUILD netbeans-mobility-9999_p20150327.ebuild 4418 SHA256 df238c8d8cef76700b123
 EBUILD netbeans-mobility-9999_p20150331.ebuild 4418 SHA256 1bee06dc213211df7fdef3d588252dbbd6e7c7100c382e0165a3e5209a9402d1 SHA512 d4d063fa7d2b05d902c5d165970420d2a0718a85581119ddc96b610bd36cbc5c26c49b9768a7a5f0b70849e7aba9682c6e9a39809f3de34139cbf99ea8d9b9c8 WHIRLPOOL 3972d2e7e1e62bd6f4cbe4b6a5fa990afe0391f57199ff7ba0e188485d0eb540c29bbb25f9fef5059ea8fcf11eebafd76526d515ef2dfeb6f2fe3151a940f5eb
 EBUILD netbeans-mobility-9999_p20150401.ebuild 4418 SHA256 f474bff9f991f0a9dd19ca465ddbb9c7a6fa2b5e3cf3ed39e747e2b3bc857690 SHA512 1950b0ea554d612629e8e56570480696ea2bed0e544eb3661f9bae098144994302906adec54108e69c30e898c3212c2504e646179b406b4ae8180c9bf9e437ed WHIRLPOOL 183eb2a36c6ef483aeab8b45973f8d43e09f293d4d7553dd6a1f7477c88ea138a3021925a0008ec1a8f44343fddb01c07cafd810a4352dc071c99f1d26ed1ffb
 EBUILD netbeans-mobility-9999_p20150402.ebuild 4418 SHA256 dc6bbb11a22c34e1720881c122f509faf1886209337c888af4ba4e1bbe752281 SHA512 833645cb883370305c0e4ac69caade9ab25b0df21f2c0fd3aad23a702cc44c56ae2ab3c26233b69dd90d151411a235282452dd2aa90709c5a39d43672fdd5f55 WHIRLPOOL d03093a706639e65466cf10b0735572ac43293f9b1357ef2e5c454244c8b8101bb8a912d4d52b07ff67ef814c3733eafede5a117530f81f43a9cded4d8af8b5b
-MISC ChangeLog 162638 SHA256 f090ab72d438bc0e2f926e6010b95d96f6c8df1b701c6beb43ce803a3394a5ea SHA512 9e302b517ee2bd799ccecb5c2633bc71d6ffd055f7309ff9ce97d167aa6667ea2a14fe26b5bc7fb93c7223226845b87b9eb87e0127656558b0c9b8ce6b46d402 WHIRLPOOL 99a8a40ea8e56f0696de571b450d21cbac15aaac0f5221f12e032d8fb42100974aacbb8ca54c8405e5fa05029d89a749d7843319b89f2aedaa9c5c4c575f89a0
+EBUILD netbeans-mobility-9999_p20150403.ebuild 4418 SHA256 fd9db1d80ac016f7407b39a16cd721f119e989da6172ab0fd901980240d31d89 SHA512 4c5c0b7bd06d0ed9915c7694ae43641f2c2050dca2c3e95b2df7f7e8c84e39f61e8da6ee5347f50f25447e2558f301302f380b38c88806fd863f541419de4404 WHIRLPOOL b2dc59b03d88e4700aeba697cde197adb118acdd2fe2560a0f68e6c1299218889aac9036eac353ef2dd582ff8c38cf7ffafc8e4eb0150823005b2dde14bbb323
+MISC ChangeLog 162815 SHA256 4ddb8ad48e7cbb8feccfeb46a14956edff05f29e9055e8fab2fa7758a05de001 SHA512 91615b3146182d701c02312474e4f3395139833f90b39e0bcc22b2403d9d854bf66aea6f33e49f4e7905769fbd14e5ccef73a6d5e5a58f002248068217562950 WHIRLPOOL 9fea8d1feab85527d412f39fae3d55fa5b857cb09c7c65f01369c246dbcfc0d570111c79da2c9a12602d18bacc0020e469b7d7be8f2add2e3440fe5962a09b37
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150403.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150403.ebuild
new file mode 100644
index 0000000..b61e682
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150403.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Mobility Cluster"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-04-03_00-01-28/zip/netbeans-trunk-nightly-201504030001-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 2e0c887..569b6e8 100644
--- a/dev-java/netbeans-nb/ChangeLog
+++ b/dev-java/netbeans-nb/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-nb-9999_p20150403 (03 Apr 2015)
+
+  03 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-nb-9999_p20150403.ebuild:
+  bumped to the latest sources
+
 *netbeans-nb-9999_p20150402 (02 Apr 2015)
 
   02 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index 19c23e2..fb38e0b 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201503270001-src.zip 206933166 SHA256 ec88a4e19aef5c
 DIST netbeans-trunk-nightly-201503310001-src.zip 206989433 SHA256 1c3752add0684a6cc2fab0677c2259a21b5e7d3bff9270739f583a5613f8ec43 SHA512 f5c5466f5a9c59a903479c51c12586b2cb5fc1501b7a6cb92dbb39d3b7617fbb7a61bb61d13f21a26774f7a50885f3b963355be0738847d469d5156d37ee626b WHIRLPOOL f34a82105807ea88ab1414903112f75df442fe3daa9eebd98669985d2935f984e6a51fdf45ec00b058298da1e91e169ced7da1be4997ae30c8b98577efff09c1
 DIST netbeans-trunk-nightly-201504010001-src.zip 206997278 SHA256 8fc0488ca935d5e577fe05fe76bb1dcf8c0f0df0ad155966797c819f970b24a0 SHA512 8d7a6b83a3e32967358c5a07641eda588c28132e4f451b7f83d7c0f5cb03afd15fd3bf6fb916576e7d1859d0f8ed3c13ac50eed45d076a85d046555e86647bb1 WHIRLPOOL 6f64a1108890cbe4a2a89ec627142df9199ff2485f71bf83ab5f0aed48cd502872187b88c5aa5d1aee14701aa7cfc9226e8f2a654dd3b7ff5c37afd839ae6af0
 DIST netbeans-trunk-nightly-201504020001-src.zip 207019553 SHA256 d10dcf7a1c0b1070dceb99a4efbeb9d047ec9938c9950f9565ed3953312e2d50 SHA512 b1c680effd9560c373a73d9d5f691f51e4d60cbd2b35cf5557680821409451e73e9bdae030db8bf52da2b36ff4fabd826447482d9eb1743415418834b938bc9f WHIRLPOOL 0e2299826eb95a5679f84b2f3ee26fb5541804dcde8265ecfdf54f6bb64d59d940af58fae7b315c51a608c79e781d53b3150dfa61124f5faf692aacfe1b5a3ab
+DIST netbeans-trunk-nightly-201504030001-src.zip 207037940 SHA256 ef43b1a5fa315405511e141a8304fc78c27a594c95d49691109d3d3982540ed4 SHA512 ee745e10ec2cd30502cd1cd7bac908fb7a063ea269a4bebc25cf54a0e01c1e4f23f379e935cbd3a90ac8739669e2206fedb33e1554abc559171e805bd31232e7 WHIRLPOOL 621106415266577acf0061e692da5ed3ff9f0ea92e8b2040a0e89139272117ed7f70f4fa835dfb7b7c0dcff91afc93d53fb2e52cb77859e980b4a97ba3e371a0
 EBUILD netbeans-nb-7.0.1.ebuild 5106 SHA256 3c68751bf5face5f80e2d7dcedb7466e69343f2d06c0a4dd30a722a987fbb207 SHA512 d79343e0ca8655b074a8f96b9898e4bc0123d60e346602ba8d7a239597993cadb33a036b43862ef1a39630e4f0ba7e79892d8b2eed8b30535f12a5d0b9f4b581 WHIRLPOOL 9f2cd645e34fbcfa8f0059fbda4f355f411aaff7966121360dfe5b3c769966c5a4586bbc04142b279e3a3fa323bc4b51a6349cf3eafe89063db44fcae58ef119
 EBUILD netbeans-nb-7.1.2.ebuild 4977 SHA256 265f9e4a9490937a65632ddaef48e3a731154b07b9ee5f9536a991181fc2fcbd SHA512 65d1065993dba3b1fece428beb1b75f17d89eddb08aacd2cbf5ecd3ee5ca844e75e9100c324ecdeeed5b138b1da4ab8cd5a4598e584a17545ffc2c52ea763779 WHIRLPOOL 9b63f2b5671bd38d24ff6b280de37fc19c74170bf80c22818da5e8af415a85211c6cfcf690e68d7697c41a1b749a3c7b48ec9b362782df140856f892d381e360
 EBUILD netbeans-nb-7.2.ebuild 4960 SHA256 bef2020a6e0d722ca77c0931b9a06014cedc822f14a21d8d916200e358dcdfb8 SHA512 988d902bbef52e123b5800e56049210d69c4dd6dbeca80396aeac58c70d90b76da65b338e664368ea3f9a3973b7b94ffd0a47a77b01be53452c2cc04c4067442 WHIRLPOOL a27fa8a1a066499a3fc2cb82e955b6b18b1725889b088ea1e94528cde3ec58f3b46c1e757fa597af6ad4ba96218dacfacff9561799f46add316e233d46127d28
@@ -64,5 +65,6 @@ EBUILD netbeans-nb-9999_p20150327.ebuild 5003 SHA256 e3f7c9bf326c8b6d802defc8774
 EBUILD netbeans-nb-9999_p20150331.ebuild 5003 SHA256 2b9bf4f231fad17f73516be8bd2f3cf827c108888e984cb17e0371f5945ea73f SHA512 7f5a27eec4f725721d05789e8927c20f40ebc8b42dbd4210139653f447b3bde8c5d44712d71b82b3870c20be5dc7aa53f6b531db2bcc73d7adf69dd9c4dd8658 WHIRLPOOL 92d526e8d3a07f803ac7b30e5aac740a9aa3b9c72e599ba1023354cc58ecf593a3732defb91a96baee363bf15654a0bea6854ea530a065d4028aeb7c6d562871
 EBUILD netbeans-nb-9999_p20150401.ebuild 5003 SHA256 d4e4521774b2ab78ec26983f896150678c73d41ef17a78d1bd23b001c37da0b9 SHA512 9c6ab36853209950ea478bd30bbc9c7348d138b52d5a8d1e02d5c11a0a40950bdaa59fd5f8e13e79fa1818d76cb3c0790b7f9bf755f6da754b16868e0a6d8f4d WHIRLPOOL 3ea0212abcc036a39bdfa347e80e4ecbc3b4ba4d39f38b98be6cc78eb6c9c70804a6aca08bc82a8023ee589e8de8942b83091201d4c4f3b0eeb9e80b813fdb80
 EBUILD netbeans-nb-9999_p20150402.ebuild 5003 SHA256 176e6972076183e99ff0d4df016569d8561c999aadd9b2ca44a10bf6776b5aa9 SHA512 c259195428ec299093d0be583197b29768431abf60c8e1e8756f83848a770ad7019a90e6b4afb64a86f3774afe3badb764b0d1973f9e211fb169a19e6afab9c7 WHIRLPOOL 943ffd510e06fb1d5585e892cb703034e6fc29c64c88a3a7c33d9309926bf1e460f4d1a8e8958817029bb1e52bfa2108525e6033f5b19d5f81beddc816c57a6a
-MISC ChangeLog 152012 SHA256 b53f259de0649e0a81019c0f30962c27902988ce3bbf32620d5be8ed2c3d60aa SHA512 973ae7af7c6831a9f78d3477aad9f30fd99aed5ac7d8f3e5b5ad374f35084b41232a6de5878590716736b8cfe5e64e75d2ee6a690721388b546a83ae00d89e33 WHIRLPOOL e5d75c309580836560e569cc74e40d67f6daf3c8813ea273c875e6e1e0844b604e70f8e63a56eaec5d3d9d25954b18dc6fdf7b4f1e0acf99b8c238a9997a6b7f
+EBUILD netbeans-nb-9999_p20150403.ebuild 5003 SHA256 6540f0eca3913713e67607f37b43befb11ab74bf86b14fc6f913e8937ba24371 SHA512 706eece0333fc3391628f4cbb33d340b553766b105e680567bdb3e22d9bcac133aa827535d6025ec8982476a8751cbad2db248f1aec6c81483f37f25699c98b5 WHIRLPOOL 79537b9f7a7afdea8d0d27126af40ec7e04730aac36d0768de717e958d170e5fab3992e21885bd8302d8a791647801ffed849612b691761b97afd1a646994209
+MISC ChangeLog 152177 SHA256 36af5820912f5ce4e33cfb8216bd19bbc6ed5f5833ab85889213f37266eb6fd6 SHA512 201b68682a75bbd52540eacea9b960c22602f3db0c70f544a903335cf4d66124840bae36611604c16d67ab0f2d24ad1db761188db98b2fac51764f37c5738dda WHIRLPOOL b6961385c43d3dfbfbeaebe00b0bf7326c558ead1786bce771b024da6d6a8ac14a237a34abaec7fcf3bdaea41513d56b141d5c14a187775eb0c3080ed36eb456
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20150403.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20150403.ebuild
new file mode 100644
index 0000000..2f35f0b
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20150403.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Branding"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-04-03_00-01-28/zip/netbeans-trunk-nightly-201504030001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0.png"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE="keychain"
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}
+	keychain? (
+		net-misc/keychain:0
+		net-misc/x11-ssh-askpass:0
+	)"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster create-netbeans-import finish-build"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.nb -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+	use keychain && epatch "${FILESDIR}"/${SLOT}/keychain-support.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans >/dev/null || die
+
+	insinto ${INSTALL_DIR}/nb
+
+	grep -E "/nb$" moduleCluster.properties > "${D}"/${INSTALL_DIR}/nb/moduleCluster.properties || die
+
+	insinto ${INSTALL_DIR}
+	doins -r nb
+	dodoc *.txt
+	dohtml *.html *.css
+
+	insinto ${INSTALL_DIR}/bin
+	doins bin/netbeans
+	dosym ${INSTALL_DIR}/bin/netbeans /usr/bin/netbeans-${SLOT}
+	fperms 755 ${INSTALL_DIR}/bin/netbeans
+
+	insinto /etc/netbeans-${SLOT}
+	doins etc/*
+	dosym /etc/netbeans-${SLOT} ${INSTALL_DIR}/etc
+
+	# fix paths per bug# 163483
+	if [[ -e "${D}"/${INSTALL_DIR}/bin/netbeans ]]; then
+		sed -i -e "s:\"\$progdir\"/../etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans
+		sed -i -e "s:\"\${userdir}\"/etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans
+	fi
+
+	dodir /usr/share/icons/hicolor/32x32/apps
+	dosym ${INSTALL_DIR}/nb/netbeans.png /usr/share/icons/hicolor/32x32/apps/netbeans-${SLOT}.png
+	dodir /usr/share/icons/hicolor/128x128/apps
+	cp "${DISTDIR}"/netbeans-7.0.png "${D}"/usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png || die
+	dosym /usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png /usr/share/pixmaps/netbeans-${SLOT}.png
+
+	popd >/dev/null || die
+
+	make_desktop_entry netbeans-${SLOT} "Netbeans ${PV}" netbeans-${SLOT} Development
+
+	mkdir -p  "${D}"/${INSTALL_DIR}/nb/config || die
+	echo "NBGNT" > "${D}"/${INSTALL_DIR}/nb/config/productid || die
+}
+
+pkg_postinst() {
+	if use keychain ; then
+		einfo "You enabled keychain support, that means NetBeans will use keychain for managing"
+		einfo "your keys while connecting to ssh protected repositories. If you want to load some"
+		einfo "keys on NetBeans startup, create file keychain-keys.txt in your userdir"
+		einfo "(~/.netbeans/${SLOT}/keychain-keys.txt) and put names of your keys in the file,"
+		einfo "each key on single line, for example:"
+		einfo "id_dsa"
+		einfo "id_dsa_gentoo"
+		einfo "If on NetBeans startup key will not be handled by keychain yet, you will be asked"
+		einfo "for key password (only this time and never again). You can find more information"
+		einfo "about keychain at https://wiki.gentoo.org/wiki/Keychain"
+	fi
+}

diff --git a/dev-java/netbeans-php/ChangeLog b/dev-java/netbeans-php/ChangeLog
index 670995b..e5077dd 100644
--- a/dev-java/netbeans-php/ChangeLog
+++ b/dev-java/netbeans-php/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-php-9999_p20150403 (03 Apr 2015)
+
+  03 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-php-9999_p20150403.ebuild:
+  bumped to the latest sources
+
 *netbeans-php-9999_p20150402 (02 Apr 2015)
 
   02 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index 71970cc..1d6d86f 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -42,6 +42,7 @@ DIST netbeans-trunk-nightly-201503270001-src.zip 206933166 SHA256 ec88a4e19aef5c
 DIST netbeans-trunk-nightly-201503310001-src.zip 206989433 SHA256 1c3752add0684a6cc2fab0677c2259a21b5e7d3bff9270739f583a5613f8ec43 SHA512 f5c5466f5a9c59a903479c51c12586b2cb5fc1501b7a6cb92dbb39d3b7617fbb7a61bb61d13f21a26774f7a50885f3b963355be0738847d469d5156d37ee626b WHIRLPOOL f34a82105807ea88ab1414903112f75df442fe3daa9eebd98669985d2935f984e6a51fdf45ec00b058298da1e91e169ced7da1be4997ae30c8b98577efff09c1
 DIST netbeans-trunk-nightly-201504010001-src.zip 206997278 SHA256 8fc0488ca935d5e577fe05fe76bb1dcf8c0f0df0ad155966797c819f970b24a0 SHA512 8d7a6b83a3e32967358c5a07641eda588c28132e4f451b7f83d7c0f5cb03afd15fd3bf6fb916576e7d1859d0f8ed3c13ac50eed45d076a85d046555e86647bb1 WHIRLPOOL 6f64a1108890cbe4a2a89ec627142df9199ff2485f71bf83ab5f0aed48cd502872187b88c5aa5d1aee14701aa7cfc9226e8f2a654dd3b7ff5c37afd839ae6af0
 DIST netbeans-trunk-nightly-201504020001-src.zip 207019553 SHA256 d10dcf7a1c0b1070dceb99a4efbeb9d047ec9938c9950f9565ed3953312e2d50 SHA512 b1c680effd9560c373a73d9d5f691f51e4d60cbd2b35cf5557680821409451e73e9bdae030db8bf52da2b36ff4fabd826447482d9eb1743415418834b938bc9f WHIRLPOOL 0e2299826eb95a5679f84b2f3ee26fb5541804dcde8265ecfdf54f6bb64d59d940af58fae7b315c51a608c79e781d53b3150dfa61124f5faf692aacfe1b5a3ab
+DIST netbeans-trunk-nightly-201504030001-src.zip 207037940 SHA256 ef43b1a5fa315405511e141a8304fc78c27a594c95d49691109d3d3982540ed4 SHA512 ee745e10ec2cd30502cd1cd7bac908fb7a063ea269a4bebc25cf54a0e01c1e4f23f379e935cbd3a90ac8739669e2206fedb33e1554abc559171e805bd31232e7 WHIRLPOOL 621106415266577acf0061e692da5ed3ff9f0ea92e8b2040a0e89139272117ed7f70f4fa835dfb7b7c0dcff91afc93d53fb2e52cb77859e980b4a97ba3e371a0
 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
@@ -67,5 +68,6 @@ EBUILD netbeans-php-9999_p20150327.ebuild 4423 SHA256 5dd44081fb327b6ac90f66ae0e
 EBUILD netbeans-php-9999_p20150331.ebuild 4423 SHA256 2b7e9585a90e2692c15764f20b0c743c609b21a685a7adc8344cb2cdf520d1f3 SHA512 48d9c52a74551c164aa36d4ec31fabfcc912acdcabe42333480e1966ae224bd68bcf38e5d7283484692151a5a9b4166c4e60f2f6b9d8f811d240465065719759 WHIRLPOOL 5cba25145dbf742e8ece83c95e25e53a1dba51446ab719efbc5b5240055c0386dcce69c17c2d82c077b8b0b97c302f11d4589247cf012549b52ccc33d3206bbb
 EBUILD netbeans-php-9999_p20150401.ebuild 4423 SHA256 52a1ff7a6089f34d997d008878fa652ad8b0af7e6ad3d0504909d8572d735b76 SHA512 a8cee9fbb4a3e9ee80c1f0ace97d9fe26bd42bcda929c52d8de31a956ae0c82e918a1dbab482087dd7fccda928f3493113c308a957840e6f29b4e6386508585a WHIRLPOOL e0ac1f64129985b0d8b34e03902d4bd69a011f706336c64d66470d5f3f95df20d0ea883fb502f5e8a804a376fd4f3f5809f6de4fcc95600ba805f51c3dccf570
 EBUILD netbeans-php-9999_p20150402.ebuild 4423 SHA256 11ab476bdfba2c736eb81fb6d3831a5e6d968f457cc081ec8df7730f498514ff SHA512 535fa88fd77bf3fbda63ea1dea777c8a710863de627922d01373c3220fbf0a2ed5d92268c9cabd1bda57599f20e0518f8ed291c4bd95b575f74912958424cd5f WHIRLPOOL 96b16669b983baad3fcc5bb449db2a1aabaf439a6dee72617ddb3ee4ff9fe1242c6b7cc188a6d448b1c879c2158d092c9456d4240a41bd52879d901901a38034
-MISC ChangeLog 151668 SHA256 86010c1bed6ae1cd0bd3982edcfc4b5a85c26aced10afcc36521af24888e2104 SHA512 67a0bb5b6cc514b7653439d9239628c09e7166a1c696c3826c00e6e2e881966cf7fb036b77c16ba30b1906d1dc7d8f60f4cedc9d0646e245ccf9dce486f120be WHIRLPOOL dde5b4f3e714d811f12ec3224f89139bfa3efc61e1ed0e6fb30581fa8e4591d371ed0e13046d5654bcd2c8bef7888d53f10808cdfc9bfe407770cc9e1fdc7c30
+EBUILD netbeans-php-9999_p20150403.ebuild 4423 SHA256 ae2a0e359fcfd2bd142c033d4348f53ff39229bd8b342cc1a0e3672ecab0e3ad SHA512 444660949c7864d9b4397724b5aff40a303f7bb10aad4aa9c8b43089975c39117ed45f4fca4d74fdf484d03cbca7599d0c61010491feba76800e4bcd05ddafe5 WHIRLPOOL 1940a4dacbc90289a7231bc38758b85334dd16fd2ff1b793f1d8386e0a330099e7b270324410b37876ceea7cef673cb9c0420a31c8b01ab99b57b8b33562d81b
+MISC ChangeLog 151835 SHA256 deac6737a7bcd87c389da14e0fb1acf1fd98fb6fef007e61626998c4c2b02e8d SHA512 9ec6a871308f6645c48aec0374b4c085ea515766c9ff21b053163c6de2ee0f112fc1576cdd3ec3582b5d4f5cd32c20c6f00fcb6c375b7bca044c8ae3438f87c6 WHIRLPOOL 8076a962e0dfdfda9afe50bccabd800b518563cf287c69f5f4563d772bafdde1106c7ac5e7c6b1043ccdb46b3e6d6001fda35157544a0d0b3fe57a80bbe9613e
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20150403.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20150403.ebuild
new file mode 100644
index 0000000..c6bd7ad
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20150403.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans PHP Cluster"
+HOMEPAGE="http://netbeans.org/projects/php"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-04-03_00-01-28/zip/netbeans-trunk-nightly-201504030001-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 7e43533..4121189 100644
--- a/dev-java/netbeans-platform/ChangeLog
+++ b/dev-java/netbeans-platform/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-platform-9999_p20150403 (03 Apr 2015)
+
+  03 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-platform-9999_p20150403.ebuild:
+  bumped to the latest sources
+
 *netbeans-platform-9999_p20150402 (02 Apr 2015)
 
   02 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index b786ece..8e6142e 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -56,6 +56,7 @@ DIST netbeans-trunk-nightly-201503270001-src.zip 206933166 SHA256 ec88a4e19aef5c
 DIST netbeans-trunk-nightly-201503310001-src.zip 206989433 SHA256 1c3752add0684a6cc2fab0677c2259a21b5e7d3bff9270739f583a5613f8ec43 SHA512 f5c5466f5a9c59a903479c51c12586b2cb5fc1501b7a6cb92dbb39d3b7617fbb7a61bb61d13f21a26774f7a50885f3b963355be0738847d469d5156d37ee626b WHIRLPOOL f34a82105807ea88ab1414903112f75df442fe3daa9eebd98669985d2935f984e6a51fdf45ec00b058298da1e91e169ced7da1be4997ae30c8b98577efff09c1
 DIST netbeans-trunk-nightly-201504010001-src.zip 206997278 SHA256 8fc0488ca935d5e577fe05fe76bb1dcf8c0f0df0ad155966797c819f970b24a0 SHA512 8d7a6b83a3e32967358c5a07641eda588c28132e4f451b7f83d7c0f5cb03afd15fd3bf6fb916576e7d1859d0f8ed3c13ac50eed45d076a85d046555e86647bb1 WHIRLPOOL 6f64a1108890cbe4a2a89ec627142df9199ff2485f71bf83ab5f0aed48cd502872187b88c5aa5d1aee14701aa7cfc9226e8f2a654dd3b7ff5c37afd839ae6af0
 DIST netbeans-trunk-nightly-201504020001-src.zip 207019553 SHA256 d10dcf7a1c0b1070dceb99a4efbeb9d047ec9938c9950f9565ed3953312e2d50 SHA512 b1c680effd9560c373a73d9d5f691f51e4d60cbd2b35cf5557680821409451e73e9bdae030db8bf52da2b36ff4fabd826447482d9eb1743415418834b938bc9f WHIRLPOOL 0e2299826eb95a5679f84b2f3ee26fb5541804dcde8265ecfdf54f6bb64d59d940af58fae7b315c51a608c79e781d53b3150dfa61124f5faf692aacfe1b5a3ab
+DIST netbeans-trunk-nightly-201504030001-src.zip 207037940 SHA256 ef43b1a5fa315405511e141a8304fc78c27a594c95d49691109d3d3982540ed4 SHA512 ee745e10ec2cd30502cd1cd7bac908fb7a063ea269a4bebc25cf54a0e01c1e4f23f379e935cbd3a90ac8739669e2206fedb33e1554abc559171e805bd31232e7 WHIRLPOOL 621106415266577acf0061e692da5ed3ff9f0ea92e8b2040a0e89139272117ed7f70f4fa835dfb7b7c0dcff91afc93d53fb2e52cb77859e980b4a97ba3e371a0
 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
@@ -81,5 +82,6 @@ EBUILD netbeans-platform-9999_p20150327.ebuild 8293 SHA256 519ea52adf42051c045c0
 EBUILD netbeans-platform-9999_p20150331.ebuild 8293 SHA256 bcd538c5d01916cb4840da22c5f8b94ec04cb08c4b3b42d465ac86fd13e6e3fd SHA512 52f3244226c1e3063d80d5c65163e372da17d7d5887e3e3919942aa2fb8442986fbac9fb2ea8fb7e2cdcec495f116c8f5a3a8e936f9f293109c52f442c771c08 WHIRLPOOL bdc120e137ae8823e38c122cf3c54f6471d18c1d4406343fffaaba8a0c1c55c2fdb8cdd5a5fdef1fae6f7b3fed5379ef6b6bc2384facfe419742b8c4277a5ce1
 EBUILD netbeans-platform-9999_p20150401.ebuild 8293 SHA256 7a052ea9a8a5b373e8a391a0e6f08bdbfd4f4e17ad875953d45050bfb906725e SHA512 5eadd0c11b1b9382d08bcbe615bd820dbf48f1ba8df1fb0734951f4dadcf1328df6015af67a8261e1b3a83f1412d506e3bd4645439e2cfa473a5011a06bb97ef WHIRLPOOL c439ce2a7b1edc84bb09711f814e67bfaec8a961b579c41ec3c0d4f3f6b953fd0b30856394da3ed8afd8c415fdd047f577af040965e0aec36919ff9ae074c4f8
 EBUILD netbeans-platform-9999_p20150402.ebuild 8293 SHA256 7948d38349942f58dd31a5a659eb9d5e84c26fe06c2a673d5e032e13ada54bc5 SHA512 a52639ad024d487e18dbe93b4dcdcb48e66580975a23acc8230fb6464f9878a8c82b9940467425afc29ec19e42239780d9657d974d39cd892f8a978ca5af4f95 WHIRLPOOL 7289ca920369c79a4b4341f7b4da02b4367e38d83bd4858c25fe2c9952581b2f0d0220edd358fc65e00fef8e4ee0595d93143b333636deb57bbe719736a94aea
-MISC ChangeLog 163234 SHA256 0be96194a2d3177c69e2dabcd2575d3eb18d4b22e12ef3064f8f7ff9c1694af7 SHA512 19b5ee2fd74db554ad9f07118be560b89a22c59fecff6f7d5745ec907fc9da7aa8e5fdcfb2e26322110e88368304f7014e79c003f3cb262514c9e3d8c2d71319 WHIRLPOOL cf7f0abef5bd3cf4efeeebc6fc456ec9b9942e0200ff4713adabee1e788c49230256ac9aebb80dff786aa4b419b338bc91514d0d804621fefb5d4cb04a9f956c
+EBUILD netbeans-platform-9999_p20150403.ebuild 8293 SHA256 ff93e92ace4f41eb39b6a0ffbe4dcad65339526d444dba8c78f0e873ddd1c923 SHA512 f56c1cdf363af7a2dcf18e6615953b1469d92571ec95e39e89d8b616ac31697369602757a6f1015559de3612090ebc29da9f3ae497cabf05a9dd37df02b35aab WHIRLPOOL 68be655891bb623714e9a559819811fb64755755f424d9eb4c570baa4bdadaa393f48f6b9675c4bdef8675645d89768af79a27d661263844dd2f8ae62578a102
+MISC ChangeLog 163411 SHA256 1340aa9766b5e055044bcee7f5feb742463deea58d1d124d87095119d0671d07 SHA512 95cce0cc2700799b2be5bc86ced68871248f4d6cb7d9bdc63b80c6edf06247b1d466bfe148a94da0228387ad83d02266a5d9303d7a17c353072724419f7c2f2f WHIRLPOOL 28df7663aa5a913133cb94ac5bc425dee33754ff0b5ca1dbfef0ae48b791b02adae6674e37604495df4dca1b1a2c4be64b09d9d72fbfa3d72862a2a4dfa6c80d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-profiler/ChangeLog b/dev-java/netbeans-profiler/ChangeLog
index b817699..b10c016 100644
--- a/dev-java/netbeans-profiler/ChangeLog
+++ b/dev-java/netbeans-profiler/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-profiler-9999_p20150403 (03 Apr 2015)
+
+  03 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-profiler-9999_p20150403.ebuild:
+  bumped to the latest sources
+
 *netbeans-profiler-9999_p20150402 (02 Apr 2015)
 
   02 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index a828939..14e0c30 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201503270001-src.zip 206933166 SHA256 ec88a4e19aef5c
 DIST netbeans-trunk-nightly-201503310001-src.zip 206989433 SHA256 1c3752add0684a6cc2fab0677c2259a21b5e7d3bff9270739f583a5613f8ec43 SHA512 f5c5466f5a9c59a903479c51c12586b2cb5fc1501b7a6cb92dbb39d3b7617fbb7a61bb61d13f21a26774f7a50885f3b963355be0738847d469d5156d37ee626b WHIRLPOOL f34a82105807ea88ab1414903112f75df442fe3daa9eebd98669985d2935f984e6a51fdf45ec00b058298da1e91e169ced7da1be4997ae30c8b98577efff09c1
 DIST netbeans-trunk-nightly-201504010001-src.zip 206997278 SHA256 8fc0488ca935d5e577fe05fe76bb1dcf8c0f0df0ad155966797c819f970b24a0 SHA512 8d7a6b83a3e32967358c5a07641eda588c28132e4f451b7f83d7c0f5cb03afd15fd3bf6fb916576e7d1859d0f8ed3c13ac50eed45d076a85d046555e86647bb1 WHIRLPOOL 6f64a1108890cbe4a2a89ec627142df9199ff2485f71bf83ab5f0aed48cd502872187b88c5aa5d1aee14701aa7cfc9226e8f2a654dd3b7ff5c37afd839ae6af0
 DIST netbeans-trunk-nightly-201504020001-src.zip 207019553 SHA256 d10dcf7a1c0b1070dceb99a4efbeb9d047ec9938c9950f9565ed3953312e2d50 SHA512 b1c680effd9560c373a73d9d5f691f51e4d60cbd2b35cf5557680821409451e73e9bdae030db8bf52da2b36ff4fabd826447482d9eb1743415418834b938bc9f WHIRLPOOL 0e2299826eb95a5679f84b2f3ee26fb5541804dcde8265ecfdf54f6bb64d59d940af58fae7b315c51a608c79e781d53b3150dfa61124f5faf692aacfe1b5a3ab
+DIST netbeans-trunk-nightly-201504030001-src.zip 207037940 SHA256 ef43b1a5fa315405511e141a8304fc78c27a594c95d49691109d3d3982540ed4 SHA512 ee745e10ec2cd30502cd1cd7bac908fb7a063ea269a4bebc25cf54a0e01c1e4f23f379e935cbd3a90ac8739669e2206fedb33e1554abc559171e805bd31232e7 WHIRLPOOL 621106415266577acf0061e692da5ed3ff9f0ea92e8b2040a0e89139272117ed7f70f4fa835dfb7b7c0dcff91afc93d53fb2e52cb77859e980b4a97ba3e371a0
 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
@@ -56,5 +57,6 @@ EBUILD netbeans-profiler-9999_p20150327.ebuild 3478 SHA256 34e67a65b7eed4a748a76
 EBUILD netbeans-profiler-9999_p20150331.ebuild 3478 SHA256 066097ffc95f5868270273eaae80aaf6629c2795cca7141b443a965075f61e4e SHA512 c122e034240dcf13b03fa84185342540a56632aa682391093c8089b373277f81d3a3de54367b02b74c2af192ddbed69dcd77798e2222b4defd002dd4cbb3a2cd WHIRLPOOL 112d8ba75bf9caa4fa9aec80f92b9958a2cfc40c6a5ceebf2bb3c9dc0eb6ccb0c7f45eaac1af458636044dcfe880324b5118a3c3a06a627f58ffc70e126d4de1
 EBUILD netbeans-profiler-9999_p20150401.ebuild 3478 SHA256 684a086aa87f4c23b39bcff199e345466393ab0794446f3a88f1eb1a86a0967b SHA512 c817774b565a003769a55330fc6e98fd656ee9b324414cf9bebfe7ebe44bfda7872cde6a2e84e77bb2031b2f7a481327c14c446f5b82246d5002ead3cf5acdc3 WHIRLPOOL 13e1bfed1f0a44327e7f1235d6d7881d86cecaa1dceda28c8fd0ecbf36e9edb4f9d43796f12947639290b880e8ba692c64790776c18153914dfe6c342e6838bd
 EBUILD netbeans-profiler-9999_p20150402.ebuild 3478 SHA256 8dd02bf2eed608b7814d0e64b72c59a675e59d332b9faab6d7f8fc7d8ebcfaa2 SHA512 b4221fc04668f46b1e8c278d049f7d96d3ac1c621ce82c854a796c1babc6c18aed0b17d06e60f541666b4240fe43c3454ea60e49c2be08ce0c04c0d3b296581d WHIRLPOOL 782ba0d834641ae840c4322a58b3780b4c5c2f2a33fd8946311d0a25e9300f6a6fe83cfc5163cb5c612f810378bbcd52fcf3935c629e7951df35381e97edf4ce
-MISC ChangeLog 162695 SHA256 3eefce9ee6f4fe320b1985df0776eadc433e00ae280af852bf9e81a20d973fa2 SHA512 f935185c0f652bd432bb920e06dfb2bd9f12c2bd4c62593695b33504b9e7a92cf8c6bfaf7f5a164df5469dd26e249493a6b7274ba3077b5e58849dc7a4efd4e3 WHIRLPOOL cb9b1774024d7dfbcb465cceb04cbb071bf2a44490c47b8eb3bd7fe8363073af38409cfafca71956eaacf206763bdbaa89e05185a9c569c6b0dd2b26f9356181
+EBUILD netbeans-profiler-9999_p20150403.ebuild 3478 SHA256 836f7f0ef4426541d237356b14d25186fa2373cc7cbfadb483e8b01e47a84a79 SHA512 4baa53692d1e9d0c17534193c508d51fb066a8e07571b8d6fd7c082ff01c103b4d7f04d5e323a19076e54da4462f64ba59d97e8827b542afa0b7e08dfd4f17b9 WHIRLPOOL cc704ad6a1965a5adbd51544ec39a7ca56570d2683b785235c2090a14b5ad2221eaa77ca2209b71935d3ca81a448293a870808c45b586747e40d209b371693f5
+MISC ChangeLog 162872 SHA256 5a5ed399db25a5aefee5b27c6a2845dbaf46925889dd6526565353bcc2ac15ea SHA512 6a96f19539d6799be1b42290b1c38c0f545ff849f716d9e1eb1ac1b23b6b13c4fcf1dfdade96334373f9c9bafdcf9cc86a40060302ea1ff3dfc11d1233d60dc2 WHIRLPOOL 97531b2dfd96102d6af528e71f6141784f60bae16b9dface1ae8839f3857a78e23be3f527540e4cde58c1223c165a19b6f4558bc00dab768eb7da81e38b03287
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150403.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150403.ebuild
new file mode 100644
index 0000000..93a54d4
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150403.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Profiler Cluster"
+HOMEPAGE="http://netbeans.org/projects/profiler"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-04-03_00-01-28/zip/netbeans-trunk-nightly-201504030001-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 7368d2b..6e081eb 100644
--- a/dev-java/netbeans-webcommon/ChangeLog
+++ b/dev-java/netbeans-webcommon/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-webcommon-9999_p20150403 (03 Apr 2015)
+
+  03 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-webcommon-9999_p20150403.ebuild:
+  bumped to the latest sources
+
 *netbeans-webcommon-9999_p20150402 (02 Apr 2015)
 
   02 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index b6e7a5a..3ac1092 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -37,6 +37,7 @@ DIST netbeans-trunk-nightly-201503270001-src.zip 206933166 SHA256 ec88a4e19aef5c
 DIST netbeans-trunk-nightly-201503310001-src.zip 206989433 SHA256 1c3752add0684a6cc2fab0677c2259a21b5e7d3bff9270739f583a5613f8ec43 SHA512 f5c5466f5a9c59a903479c51c12586b2cb5fc1501b7a6cb92dbb39d3b7617fbb7a61bb61d13f21a26774f7a50885f3b963355be0738847d469d5156d37ee626b WHIRLPOOL f34a82105807ea88ab1414903112f75df442fe3daa9eebd98669985d2935f984e6a51fdf45ec00b058298da1e91e169ced7da1be4997ae30c8b98577efff09c1
 DIST netbeans-trunk-nightly-201504010001-src.zip 206997278 SHA256 8fc0488ca935d5e577fe05fe76bb1dcf8c0f0df0ad155966797c819f970b24a0 SHA512 8d7a6b83a3e32967358c5a07641eda588c28132e4f451b7f83d7c0f5cb03afd15fd3bf6fb916576e7d1859d0f8ed3c13ac50eed45d076a85d046555e86647bb1 WHIRLPOOL 6f64a1108890cbe4a2a89ec627142df9199ff2485f71bf83ab5f0aed48cd502872187b88c5aa5d1aee14701aa7cfc9226e8f2a654dd3b7ff5c37afd839ae6af0
 DIST netbeans-trunk-nightly-201504020001-src.zip 207019553 SHA256 d10dcf7a1c0b1070dceb99a4efbeb9d047ec9938c9950f9565ed3953312e2d50 SHA512 b1c680effd9560c373a73d9d5f691f51e4d60cbd2b35cf5557680821409451e73e9bdae030db8bf52da2b36ff4fabd826447482d9eb1743415418834b938bc9f WHIRLPOOL 0e2299826eb95a5679f84b2f3ee26fb5541804dcde8265ecfdf54f6bb64d59d940af58fae7b315c51a608c79e781d53b3150dfa61124f5faf692aacfe1b5a3ab
+DIST netbeans-trunk-nightly-201504030001-src.zip 207037940 SHA256 ef43b1a5fa315405511e141a8304fc78c27a594c95d49691109d3d3982540ed4 SHA512 ee745e10ec2cd30502cd1cd7bac908fb7a063ea269a4bebc25cf54a0e01c1e4f23f379e935cbd3a90ac8739669e2206fedb33e1554abc559171e805bd31232e7 WHIRLPOOL 621106415266577acf0061e692da5ed3ff9f0ea92e8b2040a0e89139272117ed7f70f4fa835dfb7b7c0dcff91afc93d53fb2e52cb77859e980b4a97ba3e371a0
 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
@@ -60,5 +61,6 @@ EBUILD netbeans-webcommon-9999_p20150327.ebuild 4997 SHA256 ecf4de06a4cbc31dd841
 EBUILD netbeans-webcommon-9999_p20150331.ebuild 4997 SHA256 9cab4292ff3a9d9d3e9e1d159ecb023da4d8f059f60746360f5e2db565bb95bf SHA512 067d35cdd47ee2b6b40b497a8e92b12912fcc5e620e7a3544f2486842e78eba70adc6f355ea2e57589509edc77017051bf81ea06f3fa997ec22febd4a426a486 WHIRLPOOL 70dcabb33faceaf3feba8fc3fa724eda4f41fe8805f7bbdbfa778c178189561294ec17367795ad953317dc950a6ab78f8bce66fe9b44031f44f544798f603237
 EBUILD netbeans-webcommon-9999_p20150401.ebuild 4997 SHA256 db8294fbc7fb2624768bfa2721dd7dba520556c9a3ca04bb5f5226feb2b71eb6 SHA512 9185c421d102e9916accff85ce8637aec41cc1ce20471c8fe6e38146f2ab2dc80c1178c8deea51531e02c4449ed345ef2a9a58fe5076244d496fd902a046f9cf WHIRLPOOL 6d928086033fd6825700603d9178ee50d87731cea0d62874790579dc9a131322a4696c4fb1cbbcf00a20c7c97c5f757867290bd6c19aa649782e18cb131bf8b0
 EBUILD netbeans-webcommon-9999_p20150402.ebuild 4997 SHA256 8b288960313953749c239efda42d2468805c403f0948578aa9cdc714dbc35bbb SHA512 ba21f9a0475a80c13c7a9ba01f02bd8048dd06acb8e14f639090450f94a86f2e88687a4b67b58cfdd314ffe74013552637c20f8a957f2d0c7d75508caf99a6be WHIRLPOOL 536bf68ec99d5981c12bdc0e761cb78e7a68d41d6be1680871ce8c01fedce0127f31ca09cb464363a605de268efb8ac5f6c1b688fcc29fb83377023181de8e70
-MISC ChangeLog 135706 SHA256 5bac1dc382e00664c7a7c63bfd06df556823fe6ec9202414377b00181fd326fc SHA512 530d5c8ff688731840187ba21bc19f4148f628adbd3133ae8b6281541dea3a21c5f4ac5f51dc36ed093ceac13610beeff5140ffd47401b7be374327783ca9b5e WHIRLPOOL 22703d41378e54b359d1d83d0bae83d63dd1660c6e038c2f1e2cae00bb487efe00ccca9fc46f41ffd3e78948739262a35bf3aaeb52e66caa1c5185e17de7d7c2
+EBUILD netbeans-webcommon-9999_p20150403.ebuild 4997 SHA256 4f43db6b4012fe6430992c3ab96fdbccd9a22816ab9693b58c0c5d9f6145a5bf SHA512 12414f05653b1c8d271f5953240f6337727399b78223449f1553a72e7157ae44ea3a1159d234ecdc2930189b5bf7813908346231fa26c9de43dc7cf0b5ff9901 WHIRLPOOL 35c242dcf158ff42406d99ab43b44107535b06fe7e9486317cbb7177a7cb2dd069c819cfe50ac83035ad0ec01861f709d5869fe5dfd15ea836a791fe155617c2
+MISC ChangeLog 135885 SHA256 c9eb972b21dc94d1199da3bb009113270db99a849fe09525c5e41450832baeba SHA512 23b87471abc73fc012a14711c4d4ff95b10b8ca01d390f572ee9bcce69c13c0cf65c980d7f795127e304039c3d132f3aa7531db57270c46f8aff6cfdcb9ad678 WHIRLPOOL 95add2061e3a3a7c5e520e475c6a5518a411b26d1dc9c39bb59d6f306addc4a266c0b4ba947edfce6e67b39c4c29532c932ea3cb22d51f6a07521ed2ecbf160c
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150403.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150403.ebuild
new file mode 100644
index 0000000..cf7a5a0
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150403.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-04-03_00-01-28/zip/netbeans-trunk-nightly-201504030001-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 22656cb..6f55583 100644
--- a/dev-java/netbeans-websvccommon/ChangeLog
+++ b/dev-java/netbeans-websvccommon/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-websvccommon-9999_p20150403 (03 Apr 2015)
+
+  03 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-websvccommon-9999_p20150403.ebuild:
+  bumped to the latest sources
+
 *netbeans-websvccommon-9999_p20150402 (02 Apr 2015)
 
   02 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 70ca02d..03db418 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201503270001-src.zip 206933166 SHA256 ec88a4e19aef5c
 DIST netbeans-trunk-nightly-201503310001-src.zip 206989433 SHA256 1c3752add0684a6cc2fab0677c2259a21b5e7d3bff9270739f583a5613f8ec43 SHA512 f5c5466f5a9c59a903479c51c12586b2cb5fc1501b7a6cb92dbb39d3b7617fbb7a61bb61d13f21a26774f7a50885f3b963355be0738847d469d5156d37ee626b WHIRLPOOL f34a82105807ea88ab1414903112f75df442fe3daa9eebd98669985d2935f984e6a51fdf45ec00b058298da1e91e169ced7da1be4997ae30c8b98577efff09c1
 DIST netbeans-trunk-nightly-201504010001-src.zip 206997278 SHA256 8fc0488ca935d5e577fe05fe76bb1dcf8c0f0df0ad155966797c819f970b24a0 SHA512 8d7a6b83a3e32967358c5a07641eda588c28132e4f451b7f83d7c0f5cb03afd15fd3bf6fb916576e7d1859d0f8ed3c13ac50eed45d076a85d046555e86647bb1 WHIRLPOOL 6f64a1108890cbe4a2a89ec627142df9199ff2485f71bf83ab5f0aed48cd502872187b88c5aa5d1aee14701aa7cfc9226e8f2a654dd3b7ff5c37afd839ae6af0
 DIST netbeans-trunk-nightly-201504020001-src.zip 207019553 SHA256 d10dcf7a1c0b1070dceb99a4efbeb9d047ec9938c9950f9565ed3953312e2d50 SHA512 b1c680effd9560c373a73d9d5f691f51e4d60cbd2b35cf5557680821409451e73e9bdae030db8bf52da2b36ff4fabd826447482d9eb1743415418834b938bc9f WHIRLPOOL 0e2299826eb95a5679f84b2f3ee26fb5541804dcde8265ecfdf54f6bb64d59d940af58fae7b315c51a608c79e781d53b3150dfa61124f5faf692aacfe1b5a3ab
+DIST netbeans-trunk-nightly-201504030001-src.zip 207037940 SHA256 ef43b1a5fa315405511e141a8304fc78c27a594c95d49691109d3d3982540ed4 SHA512 ee745e10ec2cd30502cd1cd7bac908fb7a063ea269a4bebc25cf54a0e01c1e4f23f379e935cbd3a90ac8739669e2206fedb33e1554abc559171e805bd31232e7 WHIRLPOOL 621106415266577acf0061e692da5ed3ff9f0ea92e8b2040a0e89139272117ed7f70f4fa835dfb7b7c0dcff91afc93d53fb2e52cb77859e980b4a97ba3e371a0
 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
@@ -56,5 +57,6 @@ EBUILD netbeans-websvccommon-9999_p20150327.ebuild 2727 SHA256 e8ee414d4c6a7dd7e
 EBUILD netbeans-websvccommon-9999_p20150331.ebuild 2727 SHA256 14a1415664c590f27cc8504559caada97de66bb8d110eb043797b095fa13f58d SHA512 2cfffac756218eef3db350caeab727ba515c9e1f553db557920e35d07ddb7695e7c4be9b42a0db252f1e351a5b57400014de635d2e249846691a41129c99305e WHIRLPOOL 5f72688da389dd10cc8c1653da875e088d191b9dc52507c5e2917b37746884c62c6b53e6a683d53fe43f658d76c364327359fe251b6b0f18454f7ffd38ca4183
 EBUILD netbeans-websvccommon-9999_p20150401.ebuild 2727 SHA256 b248b766ce10f6e22aaf344b9e3694d1b8cad69aebc46d96e83c39a7ab3bbb2c SHA512 565b3921ebc1ad63866b29e5b5ecda06e75ec85b129f1fdb8741b07922287aa6719afa20a025b993e96333f28b0c7615d51b89175be0d44bf2aa2cd89feaa049 WHIRLPOOL a38b074e7795979d3acaae5986060e0de66399bb355359bd3d61ff69bbe7ac61e8178b6e2bf4820ce2def57ca381f36b6a3828061cd55757576201800351e4f8
 EBUILD netbeans-websvccommon-9999_p20150402.ebuild 2727 SHA256 e2c5adf0d66232aa2e4fa44f1e37a5bb74a70345dda30f37228f88c07a001810 SHA512 c0cc81a7ed28181c1977e32095ac41387d2c59ea4be97e489d45f4f369903e0dbe8525d62aa6c4cff918eab37d7ff4556568773f6d2bd3492ad9563298d017ab WHIRLPOOL 83c68df738ddc53e6ee9c325e2901eec197d17023b8f62732b11f3c30e087f6a9dc43c7c914eaedea83e66aa7ae2c4dc92a46e3eb59873ca3328451d59be51f4
-MISC ChangeLog 170480 SHA256 bf80185fd1e23765d766630d40186cb56482329b2680c23f529f07cba50b08dd SHA512 ab38c8e9f175b1c8dd91c2988811e20fef9edc3382e664bd67aa3f1ab4883cc36943007a3fa47f9e0c1672658f5ea04e6b76977ba883db85f0f52e59ff55585c WHIRLPOOL 2b76c8e0823f9bba062389fdc53e49133b8d2411d7d7b24fee3422b09cda0e3cce4b15fbf80d05616796b293048f5e777f113919aa4630214f898a180d50050a
+EBUILD netbeans-websvccommon-9999_p20150403.ebuild 2727 SHA256 eb4d404863513bcc9617e113b493c0183eb3ea4ef812758f843a732b27bad582 SHA512 f28fc3e94224a2d67a370e427b462fed45c5e1819c056637a2ee2f384c2e08a48a28bda33d15c7a8ed03f0c01b3c46c1b5b9fc4820efe58539062941063d906c WHIRLPOOL 7d870198bbab49e4c4fb6f2b2fee004e88b50a70f3bc736419767b61a29d36cdfca1876b1ef429438d2040caa3c55be218eddb40787032920c9fcdbbcf029d37
+MISC ChangeLog 170665 SHA256 21f26f72802728586cfd36f0d4e5b1724ca0e9b6f805644abc8fb44fb1a628e1 SHA512 5a0c0259292c23a8e32b5b2c0826ea98193fd086bc0539652320df2bbcd0e87bb72848b120d6c915ce84520fec86efd9acf6634ffdb185343a44800810123678 WHIRLPOOL 9b287388534bb87eac8deab45b001febfdd85cb814809899e51c7025643dbed7d351060b1b3654e6bafadacf8a53e2c5ef826c3b320ecf086e4e68424a417762
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150403.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150403.ebuild
new file mode 100644
index 0000000..3fc91ce
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150403.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Common Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-04-03_00-01-28/zip/netbeans-trunk-nightly-201504030001-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 306d8b2..73edd36 100644
--- a/dev-util/netbeans/ChangeLog
+++ b/dev-util/netbeans/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-9999_p20150403 (03 Apr 2015)
+
+  03 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-9999_p20150403.ebuild:
+  bumped to the latest sources
+
 *netbeans-9999_p20150402 (02 Apr 2015)
 
   02 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 1858b57..be4e3de 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201503270001-src.zip 206933166 SHA256 ec88a4e19aef5c
 DIST netbeans-trunk-nightly-201503310001-src.zip 206989433 SHA256 1c3752add0684a6cc2fab0677c2259a21b5e7d3bff9270739f583a5613f8ec43 SHA512 f5c5466f5a9c59a903479c51c12586b2cb5fc1501b7a6cb92dbb39d3b7617fbb7a61bb61d13f21a26774f7a50885f3b963355be0738847d469d5156d37ee626b WHIRLPOOL f34a82105807ea88ab1414903112f75df442fe3daa9eebd98669985d2935f984e6a51fdf45ec00b058298da1e91e169ced7da1be4997ae30c8b98577efff09c1
 DIST netbeans-trunk-nightly-201504010001-src.zip 206997278 SHA256 8fc0488ca935d5e577fe05fe76bb1dcf8c0f0df0ad155966797c819f970b24a0 SHA512 8d7a6b83a3e32967358c5a07641eda588c28132e4f451b7f83d7c0f5cb03afd15fd3bf6fb916576e7d1859d0f8ed3c13ac50eed45d076a85d046555e86647bb1 WHIRLPOOL 6f64a1108890cbe4a2a89ec627142df9199ff2485f71bf83ab5f0aed48cd502872187b88c5aa5d1aee14701aa7cfc9226e8f2a654dd3b7ff5c37afd839ae6af0
 DIST netbeans-trunk-nightly-201504020001-src.zip 207019553 SHA256 d10dcf7a1c0b1070dceb99a4efbeb9d047ec9938c9950f9565ed3953312e2d50 SHA512 b1c680effd9560c373a73d9d5f691f51e4d60cbd2b35cf5557680821409451e73e9bdae030db8bf52da2b36ff4fabd826447482d9eb1743415418834b938bc9f WHIRLPOOL 0e2299826eb95a5679f84b2f3ee26fb5541804dcde8265ecfdf54f6bb64d59d940af58fae7b315c51a608c79e781d53b3150dfa61124f5faf692aacfe1b5a3ab
+DIST netbeans-trunk-nightly-201504030001-src.zip 207037940 SHA256 ef43b1a5fa315405511e141a8304fc78c27a594c95d49691109d3d3982540ed4 SHA512 ee745e10ec2cd30502cd1cd7bac908fb7a063ea269a4bebc25cf54a0e01c1e4f23f379e935cbd3a90ac8739669e2206fedb33e1554abc559171e805bd31232e7 WHIRLPOOL 621106415266577acf0061e692da5ed3ff9f0ea92e8b2040a0e89139272117ed7f70f4fa835dfb7b7c0dcff91afc93d53fb2e52cb77859e980b4a97ba3e371a0
 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
@@ -64,5 +65,6 @@ EBUILD netbeans-9999_p20150327.ebuild 7216 SHA256 c8f0a4c1400a549bfa46f9a69bfa5e
 EBUILD netbeans-9999_p20150331.ebuild 7216 SHA256 a30dfb32c54d732cd7b62ce3c4fbec1c19028c759f3d54349ac42b9028c55832 SHA512 2e70317ad254581e5aa5f7dc77d81e7bfaca1310fb268a53e5b122c354e86b947e79e868063e5f4f1e1172274644bf9f8826215ad29093d3aa4b7716c6865867 WHIRLPOOL a3cb5dcf787cde938318c3ec00a0609a8da84cbacf6f68c4b58577b40989e3185e7a9f5fc17ea213028f476f02172730b5a530f0bb2f97ba528738b11ae6ce20
 EBUILD netbeans-9999_p20150401.ebuild 7216 SHA256 3ec8fea31c89da1e160dc7ef31f6a8367c2bdfdf3bb7a3098d66e121cb3a8c9d SHA512 3d9482e7fd8fb1a7a168654c46fc0e1f108d6fdcf9d739b4eb1c6c147deac7d798020ac9584bf09d0288f0ffb5e83b386d96190292f12d5856475773ee5dfb8f WHIRLPOOL 96af301bc4e6c9aee14b201cc37722ac77ae47e04e2e16dfd13ec0d9cccfe8ceaabf3b9fda7ca71970b0748d70132c2f209f4f157f21a6755234e25886e6081b
 EBUILD netbeans-9999_p20150402.ebuild 7216 SHA256 b687653cb5aa40fe1493dc4f7181946917b0bb58910933671493a0d5c0944317 SHA512 16b7712a0bfb9532e5ba51b9a29ced23d56e90d9fa9ddc7077a823b1cc6bd7b24d05f0c587dea620fd8050d35fe0540d8924381629d20e578a24ca11393fe82f WHIRLPOOL 2a83e7549ff203e9f15cdb86806a8f4c677040d23d8236f0f519bafe72a661d13feefc152b50cc867f212c9d0300906cdcf0da421dc70e9d973a27392360c081
-MISC ChangeLog 144957 SHA256 0c159cebb32b940e63f398b53cf10f3f049a54c3428533282b953ec983b4b0b1 SHA512 6a9d6a7fa75c669342cea4f42451f96508ca7a0df0f2b4e0cd52708046f2bbab644486c9de8879126e161430b7ec51fa42be61c339094246cdd1c66dc1f77159 WHIRLPOOL 6d937a44f39ef4b929eb9811e2edd32bc81c142d12462f3de5c3eaf17eb1ffcf457c7adf9a3ae1d0b8f03ff4cb71c7fc54043190834312f79245ba57a711c833
+EBUILD netbeans-9999_p20150403.ebuild 7216 SHA256 bf0adf2a0482c2fa4c775c2221a280c827273b586ce86737a51f98a180052f65 SHA512 20bb0747a1a9e2c968faa8dd21e881ddfdd513d5207c298be889e4374bae55df76f087c1334b180b52e3be807acdd8b74c64aaf656b732b47d82402f14737988 WHIRLPOOL 248f85ab51f32f8df7d6aa6b8c4bb9c41c9269ce145df6b9fb7c76dfed2b0cfd6e814e29147c184cf218245049f41ebcce9995bdd34c7f97b8d3c99a2e62cde2
+MISC ChangeLog 145116 SHA256 d34f87ccf807c3cd136cd29ef6db6055fc0b567a7ad251ab5985ee39772c4430 SHA512 380df869aaddaa26c1c9e3b04099c0065386c4b92d78f1f89cb7cdd378c00f454b5be6664c49748004961aa4a2a9c388296992b45d851bb46cbe9386d20ab17c WHIRLPOOL 4701a8bf81b5462567e59d4949baee47fa35dcd8fc4879ed329eb8b51c57460d8af1c56630472651e28ffe56a3f8f1ccd79ceaa60c983a702b7ac5439f8b8a82
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

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


             reply	other threads:[~2015-04-03  9:04 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-03  9:04 Miroslav Šulc [this message]
  -- strict thread matches above, loose matches on Subject: below --
2016-02-12 11:33 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-mobility/, dev-java/netbeans-extide/, Miroslav Šulc

Reply instructions:

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

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

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

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

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

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

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox