netbeans: bumped to latest nightly sources

57 files changed, 3177 insertions, 19 deletions

diff --git a/dev-java/netbeans-apisupport/ChangeLog b/dev-java/netbeans-apisupport/ChangeLog
index 6fde85dc6..31fdf0d96 100644
--- a/dev-java/netbeans-apisupport/ChangeLog
+++ b/dev-java/netbeans-apisupport/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-apisupport-9999_p20120402 (03 Apr 2012)
+
+  03 Apr 2012; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-apisupport-9999_p20120402.ebuild:
+  Bumped to latest nightly sources
+
 *netbeans-apisupport-9999_p20120328 (29 Mar 2012)
 
   29 Mar 2012; Miroslav Šulc <fordfrog@gentoo.org>
diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 726f606dc..b68e23b15 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -5,9 +5,11 @@ DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d
 DIST netbeans-9999-r2-build.xml.patch.bz2 2435 RMD160 c8988360fb0157b27a767d877dcd2a3d523b6178 SHA1 530768eb7ba1aff85b05cd15f21ac00edb15e55a SHA256 5f26c11ed3b34e99640a0b465ba348b07a2b91bfb061bf09f07ab07017ba5391
 DIST netbeans-trunk-nightly-201203250401-src.zip 177539743 RMD160 b078183a73a2691a71e191d890ddf71e31678103 SHA1 64490a2000e51cde6c8e2480285a5a438711b7c0 SHA256 eb9400386d9813b7aa9102f29557db7777a056af9bf3d17dfee17d4267377e4d
 DIST netbeans-trunk-nightly-201203280401-src.zip 177594044 RMD160 db98172a5ac7b055d845f92cc50840e07e6fb489 SHA1 702e46f0271580e8be745ed968579bd08c2c6be5 SHA256 ca0c9501d5eb837fb954ca40b9423bcb41dba8bf4a52cd6aadb13b02e26265eb
+DIST netbeans-trunk-nightly-201204021038-src.zip 177759174 RMD160 1e14efd847bcae1ca4f060b512ad31ea0610335f SHA1 c28dd9b9d2c4e12d3facab3d52b3fd6b3ea7563f SHA256 723a1133eb1c4a824d394ce9ac90248f0dd3bea2603f667172bf7780facde377
 EBUILD netbeans-apisupport-7.0.1.ebuild 3134 RMD160 83833605d9930ea81e6d80fbd70114df76e55219 SHA1 cd4689976639175d581d34114db4dc18c8e86123 SHA256 41c32033c9945a39c0aebb6b0271767031d53a47e5c8365d9e3a7c86712e24cd
 EBUILD netbeans-apisupport-7.1.1.ebuild 3143 RMD160 08c799ef48ac784e90154c70a2953d33ecb34fbf SHA1 a0050175371a7db528a7a70bf821e3ce1e02e2df SHA256 365ef2601070dcb36610b99cdf66291fa8c6c5f81247e99a8419a9934617f8a6
 EBUILD netbeans-apisupport-9999_p20120325.ebuild 3166 RMD160 aa4d6ca7fa07847a3c9c39af6c4393cbf878920e SHA1 f5a85bc62b99903b078959b7dda378dd44c2457f SHA256 6e3b47a246a7fe493e240291468f35a83c336aa525d1fd692de8141033bf8db7
 EBUILD netbeans-apisupport-9999_p20120328.ebuild 3166 RMD160 12099a5c9800a6f180daba2af35965bcb84bd087 SHA1 4e353de73587dc384b37c259766085014d919838 SHA256 f6698089b4167cf8e5db69e1dff35767dfa3798a1f402dca3228db33554bf0b6
-MISC ChangeLog 31208 RMD160 7f187fe98c4985e0acfc0aa2412d229c6292123e SHA1 fddfac7ec3de10da9a6cebd95a43319efbcfa6a3 SHA256 407a5b2b7d3f796f70c442d1520897c2efc49dcef84d69378ae4c9d454acec0f
+EBUILD netbeans-apisupport-9999_p20120402.ebuild 3166 RMD160 6617285f15840ddcb69eb9f8c0ce2bd66b19c40f SHA1 554f12ffc7e5d2ec24e61d5a23d7ca7e42aea5ad SHA256 c9d93da9406ab42cef6288bf6fc0cba17b313630fb3968a10566549d905cb1ce
+MISC ChangeLog 31393 RMD160 831e50ae04880ea686f268f5cc3a287c2ff8a896 SHA1 f7bfc6e0d098b878d530501b989b0f7eca03a617 SHA256 9ffd17ef4d8dd64cd2d823967bc7ff5facfabb191e79270e8deaa3c1b950ac43
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003
diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20120402.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20120402.ebuild
new file mode 100644
index 000000000..4c8076257
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20120402.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+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/2012-04-02_10-38-56/zip/netbeans-trunk-nightly-201204021038-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r2-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${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"
+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-r2-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r2-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-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 7d16ff812..5b8fe913d 100644
--- a/dev-java/netbeans-cnd/ChangeLog
+++ b/dev-java/netbeans-cnd/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-cnd-9999_p20120402 (03 Apr 2012)
+
+  03 Apr 2012; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-cnd-9999_p20120402.ebuild:
+  Bumped to latest nightly sources
+
 *netbeans-cnd-9999_p20120328 (29 Mar 2012)
 
   29 Mar 2012; Miroslav Šulc <fordfrog@gentoo.org>
diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index d011bfc94..5a900e810 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -12,9 +12,11 @@ DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d
 DIST netbeans-9999-r2-build.xml.patch.bz2 2435 RMD160 c8988360fb0157b27a767d877dcd2a3d523b6178 SHA1 530768eb7ba1aff85b05cd15f21ac00edb15e55a SHA256 5f26c11ed3b34e99640a0b465ba348b07a2b91bfb061bf09f07ab07017ba5391
 DIST netbeans-trunk-nightly-201203250401-src.zip 177539743 RMD160 b078183a73a2691a71e191d890ddf71e31678103 SHA1 64490a2000e51cde6c8e2480285a5a438711b7c0 SHA256 eb9400386d9813b7aa9102f29557db7777a056af9bf3d17dfee17d4267377e4d
 DIST netbeans-trunk-nightly-201203280401-src.zip 177594044 RMD160 db98172a5ac7b055d845f92cc50840e07e6fb489 SHA1 702e46f0271580e8be745ed968579bd08c2c6be5 SHA256 ca0c9501d5eb837fb954ca40b9423bcb41dba8bf4a52cd6aadb13b02e26265eb
+DIST netbeans-trunk-nightly-201204021038-src.zip 177759174 RMD160 1e14efd847bcae1ca4f060b512ad31ea0610335f SHA1 c28dd9b9d2c4e12d3facab3d52b3fd6b3ea7563f SHA256 723a1133eb1c4a824d394ce9ac90248f0dd3bea2603f667172bf7780facde377
 EBUILD netbeans-cnd-7.0.1.ebuild 4495 RMD160 7ae92927ff3a4bf2b69385c0d6898e2cb98c68d7 SHA1 63a4276dd98cadddcc1e87183df9135fb0d70057 SHA256 35b1368456dd7495507a3a093e7e4a6d9caf21818138b9d600a8a97791b11670
 EBUILD netbeans-cnd-7.1.1.ebuild 4111 RMD160 12f4aa4c0489d3d8ddfeb057c1aefef58a25cf1e SHA1 d86476938009e58ff00c56d89633b3a095cf19ad SHA256 23c32f017bbf655e55ffd34482a2b27bf7671be92421092cc9db855bd54b4a60
 EBUILD netbeans-cnd-9999_p20120325.ebuild 4134 RMD160 609a75555238dc25a2a73edc41a0f77def020bea SHA1 bb28c9ca12f40753e8c9c0f4a71ce860c5b12e16 SHA256 932fcd9006a8b101518d034860aba6de86a4382597adaa52ff132ecdd997eb53
 EBUILD netbeans-cnd-9999_p20120328.ebuild 4134 RMD160 b223aba51feadaf2a721cdd1487e751cafa9f443 SHA1 51b5de74128dcd819f76afae89ecd49ae76b67a0 SHA256 136022854c913e5613c1f994cf7d5a0f3f98892ad43f09d9fe7c22b6a0f3d8f0
-MISC ChangeLog 28778 RMD160 7d71dca2b720be9f667b18069813724edc855d51 SHA1 b5e8a2ef50a3522adaac1a493090028fafdbd436 SHA256 4839e862ab02fe06c5266a45160edd9081e9f5213732c6f7c8303205ab4c714c
+EBUILD netbeans-cnd-9999_p20120402.ebuild 4134 RMD160 9f0b1ee9776725fddd1b20e05cc35373f21e299f SHA1 d9d9e78d1f19344f7d9bd07d08a23b2265ffa03c SHA256 a5589a0952faecb3801790623e15efea447472e9b3103e35d1eb362859b047ca
+MISC ChangeLog 28949 RMD160 3e7be176261e179b52782d35aa5fab5cba89eba3 SHA1 e76d28076dc2e52a24242a2cfc607119d466b0ad SHA256 8764f1779ea8dbcaed3323f03445949628c45421c9accf67eba3025a66f09f95
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003
diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20120402.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20120402.ebuild
new file mode 100644
index 000000000..62cde8f19
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20120402.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+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/2012-04-02_10-38-56/zip/netbeans-trunk-nightly-201204021038-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r2-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/11B1CFD9AB9B7BB572F272CD1972693D1E9721E9-antlr-3.3.jar
+	http://hg.netbeans.org/binaries/C4CF9314A530E51B891D46DB65806A5A0ED240AF-cnd-build-trace-1.0.zip
+	http://hg.netbeans.org/binaries/84F10BEAA967E2896F0B43B0BBD08D834841F554-cnd-rfs-1.0.zip
+	http://hg.netbeans.org/binaries/41A2A50A59225CAB20940E88A67B8BADFC0F45AF-open-fortran-parser-0.7.1.2.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+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.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${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"
+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-r2-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/11B1CFD9AB9B7BB572F272CD1972693D1E9721E9-antlr-3.3.jar libs.antlr3.devel/external/antlr-3.3.jar || die
+	ln -s "${DISTDIR}"/C4CF9314A530E51B891D46DB65806A5A0ED240AF-cnd-build-trace-1.0.zip cnd.discovery/external/cnd-build-trace-1.0.zip || die
+	ln -s "${DISTDIR}"/84F10BEAA967E2896F0B43B0BBD08D834841F554-cnd-rfs-1.0.zip cnd.remote/external/cnd-rfs-1.0.zip || die
+	ln -s "${DISTDIR}"/41A2A50A59225CAB20940E88A67B8BADFC0F45AF-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-r2-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-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 4bc9b9312..64a1fb349 100644
--- a/dev-java/netbeans-dlight/ChangeLog
+++ b/dev-java/netbeans-dlight/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-dlight-9999_p20120402 (03 Apr 2012)
+
+  03 Apr 2012; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-dlight-9999_p20120402.ebuild:
+  Bumped to latest nightly sources
+
 *netbeans-dlight-9999_p20120328 (29 Mar 2012)
 
   29 Mar 2012; Miroslav Šulc <fordfrog@gentoo.org>
diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index b0c502a2a..404448c14 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -8,9 +8,11 @@ DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d
 DIST netbeans-9999-r2-build.xml.patch.bz2 2435 RMD160 c8988360fb0157b27a767d877dcd2a3d523b6178 SHA1 530768eb7ba1aff85b05cd15f21ac00edb15e55a SHA256 5f26c11ed3b34e99640a0b465ba348b07a2b91bfb061bf09f07ab07017ba5391
 DIST netbeans-trunk-nightly-201203250401-src.zip 177539743 RMD160 b078183a73a2691a71e191d890ddf71e31678103 SHA1 64490a2000e51cde6c8e2480285a5a438711b7c0 SHA256 eb9400386d9813b7aa9102f29557db7777a056af9bf3d17dfee17d4267377e4d
 DIST netbeans-trunk-nightly-201203280401-src.zip 177594044 RMD160 db98172a5ac7b055d845f92cc50840e07e6fb489 SHA1 702e46f0271580e8be745ed968579bd08c2c6be5 SHA256 ca0c9501d5eb837fb954ca40b9423bcb41dba8bf4a52cd6aadb13b02e26265eb
+DIST netbeans-trunk-nightly-201204021038-src.zip 177759174 RMD160 1e14efd847bcae1ca4f060b512ad31ea0610335f SHA1 c28dd9b9d2c4e12d3facab3d52b3fd6b3ea7563f SHA256 723a1133eb1c4a824d394ce9ac90248f0dd3bea2603f667172bf7780facde377
 EBUILD netbeans-dlight-7.0.1.ebuild 3624 RMD160 508b76c4699c15431166be0200cb5b8c69400a2b SHA1 f72af18653ce0a3e4576d1fadcec350ed5a16b3d SHA256 499a9303a1972ee89dfa2685e1dc1e4511c7531ff3b29caadd1136ba25dee82e
 EBUILD netbeans-dlight-7.1.1.ebuild 2935 RMD160 fffca34961ccab008348a4bf746d44d268d30d36 SHA1 3d26909c4c63b03bc396f1b1f33220370dba000a SHA256 56aa167c8f423f9bb6e40d98beabd6498f95cb6de1a5ca7dd5adf85e0c14d6e1
 EBUILD netbeans-dlight-9999_p20120325.ebuild 2958 RMD160 2b17e3491fc67cf33c21a2b96c740e089cb74b15 SHA1 1d23c95e0cdf8fbd0c98507fd793b7021334f1c1 SHA256 9abedc542e22b675c58a19b306b327a0c70b43c3e79dc6ead634b4b727edc642
 EBUILD netbeans-dlight-9999_p20120328.ebuild 2958 RMD160 b828e968a9dd421ad145dfef269e9ddceb7bae58 SHA1 245bcaab8c202f8e48ebf19861037b5e0d12f5cb SHA256 6e64c94cf2a058b0c94f2747b6f3b3a3c12e332bfff91ca2a7be6e130ddff3e6
-MISC ChangeLog 29854 RMD160 15883e65be6aafe1b1545edf1ac71fdb3ece26d5 SHA1 3e92781def7f79e0446ea0f72a46fac4b0dc791c SHA256 66ffe5e51a51802c82165489c7fd55fbcf06061bec1de42ca5abf2d10d5500c6
+EBUILD netbeans-dlight-9999_p20120402.ebuild 2958 RMD160 17e365982770dbcb5f82de577b9ee90ec014220f SHA1 f02dbb389a6d6c62465c6778bb3d292e3b05dc85 SHA256 5719db8a3030b9910e56c24525473029670ba73c592776748b5d3b1c5742c920
+MISC ChangeLog 30031 RMD160 744e29fbe7443bfc6a26fd571ecc5822d149d146 SHA1 633515b7373dcab2fdc5f16a71a519c42ef82e2b SHA256 2a85c3ca0f954591d39ef5e2e3ae3490d76964af2ebc8b4556ed2bf26cfe5888
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003
diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20120402.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20120402.ebuild
new file mode 100644
index 000000000..a5c8415fc
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20120402.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+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/2012-04-02_10-38-56/zip/netbeans-trunk-nightly-201204021038-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r2-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/F787C9B484CD7526F866C21D8925C4DACE467F8A-derby-10.2.2.0.jar"
+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.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${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"
+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-r2-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/F787C9B484CD7526F866C21D8925C4DACE467F8A-derby-10.2.2.0.jar db/external/derby-10.2.2.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-r2-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 0318329b8..79d18c8c9 100644
--- a/dev-java/netbeans-enterprise/ChangeLog
+++ b/dev-java/netbeans-enterprise/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-enterprise-9999_p20120402 (03 Apr 2012)
+
+  03 Apr 2012; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-enterprise-9999_p20120402.ebuild:
+  Bumped to latest nightly sources
+
 *netbeans-enterprise-9999_p20120328 (29 Mar 2012)
 
   29 Mar 2012; Miroslav Šulc <fordfrog@gentoo.org>
diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 642471eb8..e804b5c86 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -5,6 +5,7 @@ DIST 1A48EDCF8DCFC76882C821931EB0529DB9AF5D9B-spring-webmvc-2.5.6.SEC01.jar 4023
 DIST 1C6E6C4B3DC659E5720AB08E2972C7C0459E5387-oauth-server-1.8-javadoc.jar 88394 RMD160 d165754c4d5599bd6af5ddfbe2185a59b2fd0135 SHA1 1c6e6c4b3dc659e5720ab08e2972c7c0459e5387 SHA256 f8dc91a801462381ae026ceb161e6e6d43467edf239170d2e3023fba26eb1ca5
 DIST 1D74DA79DC71C52D1B7916853BDD51F346A85359-jsf-2.1.zip 2375126 RMD160 3df682860ebf98b2292ba09f51555174bedc8b29 SHA1 1d74da79dc71c52d1b7916853bdd51f346a85359 SHA256 3b545ca0865d5e18be96bc863aa1f1dab9e2fb6047aa96486d8a525090c900c8
 DIST 2503B5FDE71D6BE1CE44BADA3257A6F310E3BB67-jersey-atom-abdera-1.8-javadoc.jar 22852 RMD160 fbebd2d652ff1089ce53ef7ef450aa2e4cb6c136 SHA1 2503b5fde71d6be1ce44bada3257a6f310e3bb67 SHA256 2fc49f57aad57967be0143e2adbcc18473117f55696268985012a1204c750a66
+DIST 275C5AC6ADE12819F49E984C8E06B114A4E23458-spring-webmvc-2.5.6.SEC03.jar 402348 RMD160 3d3cc4a0c913f41a1bde025f99d216f1a9928ed1 SHA1 275c5ac6ade12819f49e984c8e06b114a4e23458 SHA256 45e483472cc07052039c8370aef36771b21a3572df0f39d6bd463a415cc8316c
 DIST 2EA8E5BDC70E1B1D738140E52E4793385B2567A3-el-impl.jar 111719 RMD160 c3db8ce1835efe49fb0a7f432ff88286a945d584 SHA1 2ea8e5bdc70e1b1d738140e52e4793385b2567a3 SHA256 61b1c254f1529632d98a9261e0fd50c77e5c2a1c4c53e43cee65cedb279c7703
 DIST 33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar 181041 RMD160 7cd00ae123f31f4ee7f9b01357913c3a0bbd633a SHA1 33fc26c02f8043ab0ede19eadc8c9885386b255c SHA256 3ce38de51f4e24668c6d184057a8d08541f9e815d2d319d0f462f083092b29cf
 DIST 3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar 351132 RMD160 5ada17982ea7d32081ae75404c4c012c65e45f80 SHA1 3d74bfb229c259e2398f2b383d5425cb81c643f0 SHA256 1916c5b4fde4e424097f35cda9a3bca8de4e9a2b52b90965742d43abd085688d
@@ -51,9 +52,11 @@ DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d
 DIST netbeans-9999-r2-build.xml.patch.bz2 2435 RMD160 c8988360fb0157b27a767d877dcd2a3d523b6178 SHA1 530768eb7ba1aff85b05cd15f21ac00edb15e55a SHA256 5f26c11ed3b34e99640a0b465ba348b07a2b91bfb061bf09f07ab07017ba5391
 DIST netbeans-trunk-nightly-201203250401-src.zip 177539743 RMD160 b078183a73a2691a71e191d890ddf71e31678103 SHA1 64490a2000e51cde6c8e2480285a5a438711b7c0 SHA256 eb9400386d9813b7aa9102f29557db7777a056af9bf3d17dfee17d4267377e4d
 DIST netbeans-trunk-nightly-201203280401-src.zip 177594044 RMD160 db98172a5ac7b055d845f92cc50840e07e6fb489 SHA1 702e46f0271580e8be745ed968579bd08c2c6be5 SHA256 ca0c9501d5eb837fb954ca40b9423bcb41dba8bf4a52cd6aadb13b02e26265eb
+DIST netbeans-trunk-nightly-201204021038-src.zip 177759174 RMD160 1e14efd847bcae1ca4f060b512ad31ea0610335f SHA1 c28dd9b9d2c4e12d3facab3d52b3fd6b3ea7563f SHA256 723a1133eb1c4a824d394ce9ac90248f0dd3bea2603f667172bf7780facde377
 EBUILD netbeans-enterprise-7.0.1.ebuild 16338 RMD160 0ecafb9ced600f753a5ab6359d6c762313ac2631 SHA1 d710a4694c708d8f78cfe04211ad1a199fa6ce0a SHA256 03ea08daaf5d4c5592937929bac33b4af3bac00a23f2167a7ef7b3c172a72abe
 EBUILD netbeans-enterprise-7.1.1.ebuild 18060 RMD160 6722779b909da18ed3bd532f03fd24503ca093ad SHA1 c7da0f768c7abf685aee36c7d453a2b4e3cedb56 SHA256 a7a0631689de641d87ca3dff783fcc9f9b4bf763c2701593f6969e5ce294f1f8
 EBUILD netbeans-enterprise-9999_p20120325.ebuild 19595 RMD160 66d132d4e15bb6b433bcfeb01b0855124c8c86bd SHA1 d4b3a27ba517614af107296af2da88fc7b54b1ae SHA256 8d3d14dc50784a095334e74b3fbe037b9811e5876c95ad34f457be3bf5347e3d
 EBUILD netbeans-enterprise-9999_p20120328.ebuild 19595 RMD160 946dacd8bbdcde134de4a226c07675b4db8ea98a SHA1 7b8c85fb2aae62dfff9c47c270ee24dd07fce808 SHA256 7b058dc50afe2afa6cab8d78fb7219246457bd252d5f8301cfc7a97c3f610305
-MISC ChangeLog 31586 RMD160 1a8183a886d1e6efc88b1ae7939218d8d68bd3bd SHA1 ef3943e94153ccc310f8bdc020867db1dd7653b7 SHA256 291e451ccbafee4b45004ce6e424c22883b14eb34bc4236eb90407025e3dd037
+EBUILD netbeans-enterprise-9999_p20120402.ebuild 19595 RMD160 8fe79c920ea5e350dd7a3fc15cc3d361a0c28b41 SHA1 c290381eeb5dea9a6439a320f9e93d5a08b54489 SHA256 a368a3d65ab082429978f9554c9c85bafd3a9f0eedd4ff0b7e3fa03a10ef4f5d
+MISC ChangeLog 31771 RMD160 2f2f9c9298921174b77ca3963bc319c1e7be79c1 SHA1 1c941a3edb61490fba06dedbac982391a99a6304 SHA256 accb8d81d4548fc1d7c1d38148ae885f919394c3caa41994bc7f6c5d78b095e8
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003
diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20120402.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20120402.ebuild
new file mode 100644
index 000000000..06f2221b0
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20120402.ebuild
@@ -0,0 +1,338 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+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/2012-04-02_10-38-56/zip/netbeans-trunk-nightly-201204021038-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r2-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar
+	http://hg.netbeans.org/binaries/2EA8E5BDC70E1B1D738140E52E4793385B2567A3-el-impl.jar
+	http://hg.netbeans.org/binaries/7763236B189D9B910E2BDBA6822E6EB4DDDAC41B-glassfish-jspparser-3.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/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar
+	http://hg.netbeans.org/binaries/DC9A229C4AB1788D0C20D937A82FB64CE2911171-javaee6-doc-api.zip
+	http://hg.netbeans.org/binaries/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar
+	http://hg.netbeans.org/binaries/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar
+	http://hg.netbeans.org/binaries/EEBA5E4DCFB946A8E9CAAF1AC405620E28710BEE-jersey-1.8.zip
+	http://hg.netbeans.org/binaries/6055EAF5B4F778A243B52D2DC4E66CB5F35B3D7C-jersey-1.8-javadoc.jar
+	http://hg.netbeans.org/binaries/4D9B1037036E99811D9E393F191058C9CA30CAE2-jersey-apache-client-1.8-javadoc.jar
+	http://hg.netbeans.org/binaries/2503B5FDE71D6BE1CE44BADA3257A6F310E3BB67-jersey-atom-abdera-1.8-javadoc.jar
+	http://hg.netbeans.org/binaries/955396DB8CE0477C6BD70BA830FF84CB9B7AB47B-jersey-client-1.3-javadoc.jar
+	http://hg.netbeans.org/binaries/A27843863A5EAE9DDFF1C70F7A95D3BFC2A59D99-jersey-core-1.1.5.1-javadoc.jar
+	http://hg.netbeans.org/binaries/3E5011972CEDE87E5ADCF9A90351A106DAEE2FC2-jersey-guice-1.8-javadoc.jar
+	http://hg.netbeans.org/binaries/6E3105315F3100F65D66355B04BA6B6C2B8480D3-jersey-json-1.3-javadoc.jar
+	http://hg.netbeans.org/binaries/0EE4D36A33681C945339BB1B594F4C0ED9A4C3DE-jersey-multipart-1.8-javadoc.jar
+	http://hg.netbeans.org/binaries/D77C6E4AA0F3D3C9B7230F6C0991DBBF0CEF39BA-jersey-simple-server-1.8-javadoc.jar
+	http://hg.netbeans.org/binaries/454F67445E0740C3414476812F2DFD17DA2AF0A3-jersey-spring-1.8-javadoc.jar
+	http://hg.netbeans.org/binaries/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip
+	http://hg.netbeans.org/binaries/1D74DA79DC71C52D1B7916853BDD51F346A85359-jsf-2.1.zip
+	http://hg.netbeans.org/binaries/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip
+	http://hg.netbeans.org/binaries/FFE3425E304F0836912D2B8ABFB5302100B39423-jsr311-api-1.1.1-javadoc.jar
+	http://hg.netbeans.org/binaries/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip
+	http://hg.netbeans.org/binaries/16CD40905B389B27AFD81DAFF8F163CEC810FBC6-metro-2.0.zip
+	http://hg.netbeans.org/binaries/942DF8FA6174168BD227E925B11672E9A321D5BB-oauth-client-1.8-javadoc.jar
+	http://hg.netbeans.org/binaries/1C6E6C4B3DC659E5720AB08E2972C7C0459E5387-oauth-server-1.8-javadoc.jar
+	http://hg.netbeans.org/binaries/6EC53F24E6F4D9DBC884076FD0190B9C79414070-oauth-signature-1.8-javadoc.jar
+	http://hg.netbeans.org/binaries/75BB262D60528EACC0BCA22B1BF77D20A7AB652C-primefaces-3.2.jar
+	http://hg.netbeans.org/binaries/B9FA9CDC7FA5203E1DB5C4DBAAED0133596D524F-servlet3.0-jsp2.2-api.jar
+	http://hg.netbeans.org/binaries/275C5AC6ADE12819F49E984C8E06B114A4E23458-spring-webmvc-2.5.6.SEC03.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-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-profiler-${PV}
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-webcommon-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/commons-codec:0
+	dev-java/commons-fileupload:0
+	dev-java/commons-logging:0
+	dev-java/glassfish-deployment-api:1.2
+	dev-java/jakarta-jstl:0"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	>=dev-java/junit-4.4:4
+	dev-java/tomcat-servlet-api:2.3"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}
+	dev-java/antlr:0[java]
+	dev-java/asm:3
+	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/jettison:0
+	dev-java/jsr311-api: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"
+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-r2-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}"/2EA8E5BDC70E1B1D738140E52E4793385B2567A3-el-impl.jar libs.elimpl/external/el-impl.jar || die
+	ln -s "${DISTDIR}"/7763236B189D9B910E2BDBA6822E6EB4DDDAC41B-glassfish-jspparser-3.0.jar web.jspparser/external/glassfish-jspparser-3.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}"/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar javaee.api/external/javaee-web-api-6.0.jar || die
+	ln -s "${DISTDIR}"/DC9A229C4AB1788D0C20D937A82FB64CE2911171-javaee6-doc-api.zip j2ee.platform/external/javaee6-doc-api.zip || die
+	ln -s "${DISTDIR}"/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar javaee.api/external/javax.annotation.jar || die
+	ln -s "${DISTDIR}"/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar javaee.api/external/jaxb-api-osgi.jar || die
+	ln -s "${DISTDIR}"/EEBA5E4DCFB946A8E9CAAF1AC405620E28710BEE-jersey-1.8.zip websvc.restlib/external/jersey-1.8.zip || die
+	ln -s "${DISTDIR}"/6055EAF5B4F778A243B52D2DC4E66CB5F35B3D7C-jersey-1.8-javadoc.jar websvc.restlib/external/jersey-1.8-javadoc.jar || die
+	ln -s "${DISTDIR}"/4D9B1037036E99811D9E393F191058C9CA30CAE2-jersey-apache-client-1.8-javadoc.jar websvc.restlib/external/jersey-apache-client-1.8-javadoc.jar || die
+	ln -s "${DISTDIR}"/2503B5FDE71D6BE1CE44BADA3257A6F310E3BB67-jersey-atom-abdera-1.8-javadoc.jar websvc.restlib/external/jersey-atom-abdera-1.8-javadoc.jar || die
+	ln -s "${DISTDIR}"/955396DB8CE0477C6BD70BA830FF84CB9B7AB47B-jersey-client-1.3-javadoc.jar websvc.restlib/external/jersey-client-1.3-javadoc.jar || die
+	ln -s "${DISTDIR}"/A27843863A5EAE9DDFF1C70F7A95D3BFC2A59D99-jersey-core-1.1.5.1-javadoc.jar websvc.restlib/external/jersey-core-1.1.5.1-javadoc.jar || die
+	ln -s "${DISTDIR}"/3E5011972CEDE87E5ADCF9A90351A106DAEE2FC2-jersey-guice-1.8-javadoc.jar websvc.restlib/external/jersey-guice-1.8-javadoc.jar || die
+	ln -s "${DISTDIR}"/6E3105315F3100F65D66355B04BA6B6C2B8480D3-jersey-json-1.3-javadoc.jar websvc.restlib/external/jersey-json-1.3-javadoc.jar || die
+	ln -s "${DISTDIR}"/0EE4D36A33681C945339BB1B594F4C0ED9A4C3DE-jersey-multipart-1.8-javadoc.jar websvc.restlib/external/jersey-multipart-1.8-javadoc.jar || die
+	ln -s "${DISTDIR}"/D77C6E4AA0F3D3C9B7230F6C0991DBBF0CEF39BA-jersey-simple-server-1.8-javadoc.jar websvc.restlib/external/jersey-simple-server-1.8-javadoc.jar || die
+	ln -s "${DISTDIR}"/454F67445E0740C3414476812F2DFD17DA2AF0A3-jersey-spring-1.8-javadoc.jar websvc.restlib/external/jersey-spring-1.8-javadoc.jar || die
+	ln -s "${DISTDIR}"/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip web.jsf12/external/jsf-1.2.zip || die
+	ln -s "${DISTDIR}"/1D74DA79DC71C52D1B7916853BDD51F346A85359-jsf-2.1.zip web.jsf20/external/jsf-2.1.zip || die
+	ln -s "${DISTDIR}"/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip web.jsf.editor/external/jsf-api-docs.zip || die
+	ln -s "${DISTDIR}"/FFE3425E304F0836912D2B8ABFB5302100B39423-jsr311-api-1.1.1-javadoc.jar websvc.restlib/external/jsr311-api-1.1.1-javadoc.jar || die
+	ln -s "${DISTDIR}"/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip websvc.metro.lib/external/metro-1.4-doc.zip || die
+	ln -s "${DISTDIR}"/16CD40905B389B27AFD81DAFF8F163CEC810FBC6-metro-2.0.zip websvc.metro.lib/external/metro-2.0.zip || die
+	ln -s "${DISTDIR}"/942DF8FA6174168BD227E925B11672E9A321D5BB-oauth-client-1.8-javadoc.jar websvc.restlib/external/oauth-client-1.8-javadoc.jar || die
+	ln -s "${DISTDIR}"/1C6E6C4B3DC659E5720AB08E2972C7C0459E5387-oauth-server-1.8-javadoc.jar websvc.restlib/external/oauth-server-1.8-javadoc.jar || die
+	ln -s "${DISTDIR}"/6EC53F24E6F4D9DBC884076FD0190B9C79414070-oauth-signature-1.8-javadoc.jar websvc.restlib/external/oauth-signature-1.8-javadoc.jar || die
+	ln -s "${DISTDIR}"/75BB262D60528EACC0BCA22B1BF77D20A7AB652C-primefaces-3.2.jar web.primefaces/external/primefaces-3.2.jar || die
+	ln -s "${DISTDIR}"/B9FA9CDC7FA5203E1DB5C4DBAAED0133596D524F-servlet3.0-jsp2.2-api.jar servletjspapi/external/servlet3.0-jsp2.2-api.jar || die
+	ln -s "${DISTDIR}"/275C5AC6ADE12819F49E984C8E06B114A4E23458-spring-webmvc-2.5.6.SEC03.jar spring.webmvc/external/spring-webmvc-2.5.6.SEC03.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-r2-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.0.jar
+	java-pkg_jar-from --into web.jstl11/external jakarta-jstl jstl.jar jstl-1.1.2.jar
+	java-pkg_jar-from --into web.jstl11/external jakarta-jstl standard.jar standard-1.1.2.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-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.0.jar && dosym /usr/share/commons-fileupload/lib/commons-fileupload.jar ${instdir}/commons-fileupload-1.0.jar || die
+	# el-impl.jar
+	# glassfish-jspparser-3.0.jar
+	# glassfish-logging-2.0.jar
+	# javaee-api-6.0.jar
+	# javaee-api-6.0-license.txt
+	# javaee-web-api-6.0.jar
+	# javaee-web-api-6.0-license.txt
+	# jsp-parser-ext.jar
+	rm jsr88javax.jar && dosym /usr/share/glassfish-deployment-api-1.2/lib/glassfish-deployment-api.jar ${instdir}/jsr88javax.jar || die
+	rm jstl.jar && dosym /usr/share/jakarta-jstl/lib/jstl.jar ${instdir}/jstl.jar || die
+	# org-netbeans-modules-web-httpmonitor.jar
+	# servlet3.0-jsp2.2-api.jar
+	rm standard.jar && dosym /usr/share/jakarta-jstl/lib/standard.jar ${instdir}/standard.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/javaee6-endorsed
+	pushd "${D}"/${instdir} >/dev/null || die
+	# javax.annotation.jar
+	# javax.annotation-license.txt
+	# jaxb-api-osgi.jar
+	# jaxb-api-osgi-license.txt
+	# webservices-api-osgi.jar
+	# webservices-api-osgi-license.txt
+	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
+	# jsf-api.jar
+	# jsf-impl.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jsf-2_1
+	pushd "${D}"/${instdir} >/dev/null || die
+	# jsf-api.jar
+	# jsf-impl.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/metro
+	pushd "${D}"/${instdir} >/dev/null || die
+	# webservices-api.jar
+	# webservices-extra-api.jar
+	# webservices-extra.jar
+	# webservices-rt.jar
+	# webservices-tools.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/primefaces
+	pushd "${D}"/${instdir} >/dev/null || die
+	# primefaces-2.1.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/rest
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm asm-3.1.jar && dosym /usr/share/asm-3/lib/asm.jar ${instdir}/asm-3.1.jar || die
+	# jackson-core-asl-1.1.1.jar
+	# jersey-client-1.3.jar
+	# jersey-core-1.3.jar
+	# jersey-json-1.3.jar
+	# jersey-multipart-1.3.jar
+	# jersey-server-1.3.jar
+	# jersey-spring-1.3.jar
+	rm jettison-1.1.jar && dosym /usr/share/jettison/lib/jettison.jar ${instdir}/jettison-1.1.jar || die
+	rm jsr311-api-1.1.1.jar && dosym /usr/share/jsr311-api/lib/jsr311-api.jar ${instdir}/jsr311-api-1.1.1.jar || die
+	# mimepull-1.4.jar
+	# oauth-client-1.3.jar
+	# oauth-signature-1.3.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/spring
+	pushd "${D}"/${instdir} >/dev/null || die
+	# spring-webmvc-2.5.6.SEC01.jar
+	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-chain-1.1.jar && dosym /usr/share/commons-chain-1.1/lib/commons-chain.jar ${instdir}/commons-chain-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 jstl-1.0.2.jar && dosym /usr/share/jakarta-jstl/lib/jstl.jar ${instdir}/jstl-1.0.2.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
+	rm standard-1.0.6.jar && dosym /usr/share/jakarta-jstl/lib/standard.jar ${instdir}/standard-1.0.6.jar || die
+	# struts-core-1.3.8.jar
+	# struts-el-1.3.8.jar
+	# struts-extras-1.3.8.jar
+	# struts-faces-1.3.8.jar
+	# struts-mailreader-dao-1.3.8.jar
+	# struts-scripting-1.3.8.jar
+	# struts-taglib-1.3.8.jar
+	# struts-tiles-1.3.8.jar
+	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 8132a629e..d6be1e945 100644
--- a/dev-java/netbeans-ergonomics/ChangeLog
+++ b/dev-java/netbeans-ergonomics/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-ergonomics-9999_p20120402 (03 Apr 2012)
+
+  03 Apr 2012; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ergonomics-9999_p20120402.ebuild:
+  Bumped to latest nightly sources
+
 *netbeans-ergonomics-9999_p20120328 (29 Mar 2012)
 
   29 Mar 2012; Miroslav Šulc <fordfrog@gentoo.org>
diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 8a2b1d60b..a759c7aa4 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -5,9 +5,11 @@ DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d
 DIST netbeans-9999-r2-build.xml.patch.bz2 2435 RMD160 c8988360fb0157b27a767d877dcd2a3d523b6178 SHA1 530768eb7ba1aff85b05cd15f21ac00edb15e55a SHA256 5f26c11ed3b34e99640a0b465ba348b07a2b91bfb061bf09f07ab07017ba5391
 DIST netbeans-trunk-nightly-201203250401-src.zip 177539743 RMD160 b078183a73a2691a71e191d890ddf71e31678103 SHA1 64490a2000e51cde6c8e2480285a5a438711b7c0 SHA256 eb9400386d9813b7aa9102f29557db7777a056af9bf3d17dfee17d4267377e4d
 DIST netbeans-trunk-nightly-201203280401-src.zip 177594044 RMD160 db98172a5ac7b055d845f92cc50840e07e6fb489 SHA1 702e46f0271580e8be745ed968579bd08c2c6be5 SHA256 ca0c9501d5eb837fb954ca40b9423bcb41dba8bf4a52cd6aadb13b02e26265eb
+DIST netbeans-trunk-nightly-201204021038-src.zip 177759174 RMD160 1e14efd847bcae1ca4f060b512ad31ea0610335f SHA1 c28dd9b9d2c4e12d3facab3d52b3fd6b3ea7563f SHA256 723a1133eb1c4a824d394ce9ac90248f0dd3bea2603f667172bf7780facde377
 EBUILD netbeans-ergonomics-7.0.1.ebuild 2884 RMD160 3ce16ca958ba2e556cd0e2361cb94cc0cf4bbe62 SHA1 ed3139bb1005c01513c3b0e2602a71622f81ecc9 SHA256 e8e4a785fc11b6d0d3c722826761581b8c9c779c5460dc7d1487b3154f4402ab
 EBUILD netbeans-ergonomics-7.1.1.ebuild 2893 RMD160 f68c4de97475abe80394b482d931952e8bfa7528 SHA1 a2e1287c02f03c5ada5a2fab5ebc0f1fb29bb6c3 SHA256 f5e1173ab9368bb613c22bc584b8d9b969f9a51bc72fd35062602d7b608fd5c7
 EBUILD netbeans-ergonomics-9999_p20120325.ebuild 2916 RMD160 b2e812258fba6bc1859ab9e0796e8b5ef720d8f2 SHA1 0ac28e5fc1d851776b6418416058430da8b503f2 SHA256 8906aff5e19079048372c5aac0f3139b12460c8153176f8b9129aa258c5de6e7
 EBUILD netbeans-ergonomics-9999_p20120328.ebuild 2916 RMD160 3f87a44e84b41b219a0deebfd1c6cf3623ff0817 SHA1 f6e50e31aa715cdbb1a8f0ed07acec985317b5c0 SHA256 31f8df52f456c578f0af63f8f3031b2570a3eba095dbeaaffac3a4aa229bf959
-MISC ChangeLog 31208 RMD160 0e9d1863df6f3abf38c0df20da3aae88c9e022d4 SHA1 c61623995c3e88725d1ef2741e9634dc2adacda3 SHA256 9f30ba6f8246e502354132271dbb7398790835f8a8479fa6629413e4f54aa579
+EBUILD netbeans-ergonomics-9999_p20120402.ebuild 2916 RMD160 8f924fc4fc1634c2c1e910ffb8042c059f75522b SHA1 f22691fd1c6e7e79e93d7b02220f287ad5b42401 SHA256 e95bb417bd2082aa98dcb5dd031bc47ac9bb3da0f2d335c239de4ab562a07b90
+MISC ChangeLog 31393 RMD160 a40584b1a691f8acba67ae3dca4f0a65816f47e8 SHA1 90981fe7968d3f5fc913e81ec4a81137a028a6c1 SHA256 540f703fecfcdf56583721b8307ad656d9ea4ee038580de830ff0a0d8fac4b79
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003
diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20120402.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20120402.ebuild
new file mode 100644
index 000000000..08210bc6b
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20120402.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+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/2012-04-02_10-38-56/zip/netbeans-trunk-nightly-201204021038-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r2-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.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${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"
+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-r2-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r2-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-groovy/ChangeLog b/dev-java/netbeans-groovy/ChangeLog
index 7dcd55840..f2b5c0918 100644
--- a/dev-java/netbeans-groovy/ChangeLog
+++ b/dev-java/netbeans-groovy/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-groovy-9999_p20120402 (03 Apr 2012)
+
+  03 Apr 2012; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-groovy-9999_p20120402.ebuild:
+  Bumped to latest nightly sources
+
 *netbeans-groovy-9999_p20120328 (29 Mar 2012)
 
   29 Mar 2012; Miroslav Šulc <fordfrog@gentoo.org>
diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index bad0a4078..ea88a5bbd 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -7,9 +7,11 @@ DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d
 DIST netbeans-9999-r2-build.xml.patch.bz2 2435 RMD160 c8988360fb0157b27a767d877dcd2a3d523b6178 SHA1 530768eb7ba1aff85b05cd15f21ac00edb15e55a SHA256 5f26c11ed3b34e99640a0b465ba348b07a2b91bfb061bf09f07ab07017ba5391
 DIST netbeans-trunk-nightly-201203250401-src.zip 177539743 RMD160 b078183a73a2691a71e191d890ddf71e31678103 SHA1 64490a2000e51cde6c8e2480285a5a438711b7c0 SHA256 eb9400386d9813b7aa9102f29557db7777a056af9bf3d17dfee17d4267377e4d
 DIST netbeans-trunk-nightly-201203280401-src.zip 177594044 RMD160 db98172a5ac7b055d845f92cc50840e07e6fb489 SHA1 702e46f0271580e8be745ed968579bd08c2c6be5 SHA256 ca0c9501d5eb837fb954ca40b9423bcb41dba8bf4a52cd6aadb13b02e26265eb
+DIST netbeans-trunk-nightly-201204021038-src.zip 177759174 RMD160 1e14efd847bcae1ca4f060b512ad31ea0610335f SHA1 c28dd9b9d2c4e12d3facab3d52b3fd6b3ea7563f SHA256 723a1133eb1c4a824d394ce9ac90248f0dd3bea2603f667172bf7780facde377
 EBUILD netbeans-groovy-7.0.1.ebuild 3296 RMD160 8dfd04f7498e840e727faa16d85c1e6998933be3 SHA1 8c5f081cb89500e97feedfd39824fd913fed8044 SHA256 29c3d304eca5999e78550fd715dbcbef9d15639d4e4f17fa0e45a46803080729
 EBUILD netbeans-groovy-7.1.1.ebuild 3305 RMD160 7da2700618b318e35a941026e0b2f236973eba28 SHA1 9be20e176c246f76873b69574daafd31977d7a2c SHA256 bdb6b64b062cf2525d7b0e132ffda2a0497954d612321cb9121cfd1d06d7a65b
 EBUILD netbeans-groovy-9999_p20120325.ebuild 3349 RMD160 6c282bf72fb1dd8bac63ccd5091915878c02d26d SHA1 331261937db036a191a5918d58671ec3efb59efd SHA256 56a2fb4c9c63a0fe0f8ac708d4153ff3f689793af35067d77d7de31391e5cc4f
 EBUILD netbeans-groovy-9999_p20120328.ebuild 3349 RMD160 029fd2504e5a641bed5989cb30a57c6254f609aa SHA1 702f03fe27c98449d4671d5f47ee1cd603fe2a60 SHA256 b29e9ccbc316a5215cc74bb4c6b4b135647b6e06b73d236edd4384c5df79a85a
-MISC ChangeLog 29854 RMD160 a381355a5c0822926820b3e1fed1dc1afc185b90 SHA1 33ea6b800c97a5cf67820e8bf6ef1dacd7f013a5 SHA256 4c0dc3b473d1564bdacbf0e4980fb74097cd8e5fbca3f790fa87fb7eaabfedfe
+EBUILD netbeans-groovy-9999_p20120402.ebuild 3349 RMD160 58de56497045d33028e877b002ae6eb9191b3b5d SHA1 0c04c04dcda488b6213789bee8e64a326b24f592 SHA256 78dc0632d64ee692f26cd655294b88febbefe2230f5f4bcdabe473b57f199599
+MISC ChangeLog 30031 RMD160 99c3668064195879e0d7cf1507a0851f6dba137e SHA1 03f2b5a595bcd6490c3dde1fd314a860d4be18c7 SHA256 0320e8cd5370bd4cb873d6522dbf9a350df4e9dd59b0c2fa38048fcc0ceeca4d
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003
diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20120402.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20120402.ebuild
new file mode 100644
index 000000000..ce2f33d97
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20120402.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+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/2012-04-02_10-38-56/zip/netbeans-trunk-nightly-201204021038-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r2-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/73F30341DFC0BD8E51D31B96498DBD90F4890CF8-groovy-all-1.9.0-beta-4.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${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"
+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-r2-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/73F30341DFC0BD8E51D31B96498DBD90F4890CF8-groovy-all-1.9.0-beta-4.jar groovy.editor/external/groovy-all-1.9.0-beta-4.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r2-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-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
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	# groovy-all.jar
+	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 1134899b3..892766b90 100644
--- a/dev-java/netbeans-harness/ChangeLog
+++ b/dev-java/netbeans-harness/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-harness-9999_p20120402 (03 Apr 2012)
+
+  03 Apr 2012; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-harness-9999_p20120402.ebuild:
+  Bumped to latest nightly sources
+
 *netbeans-harness-9999_p20120328 (29 Mar 2012)
 
   29 Mar 2012; Miroslav Šulc <fordfrog@gentoo.org>
diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 741dfe1f2..f9500c0ab 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -7,9 +7,11 @@ DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d
 DIST netbeans-9999-r2-build.xml.patch.bz2 2435 RMD160 c8988360fb0157b27a767d877dcd2a3d523b6178 SHA1 530768eb7ba1aff85b05cd15f21ac00edb15e55a SHA256 5f26c11ed3b34e99640a0b465ba348b07a2b91bfb061bf09f07ab07017ba5391
 DIST netbeans-trunk-nightly-201203250401-src.zip 177539743 RMD160 b078183a73a2691a71e191d890ddf71e31678103 SHA1 64490a2000e51cde6c8e2480285a5a438711b7c0 SHA256 eb9400386d9813b7aa9102f29557db7777a056af9bf3d17dfee17d4267377e4d
 DIST netbeans-trunk-nightly-201203280401-src.zip 177594044 RMD160 db98172a5ac7b055d845f92cc50840e07e6fb489 SHA1 702e46f0271580e8be745ed968579bd08c2c6be5 SHA256 ca0c9501d5eb837fb954ca40b9423bcb41dba8bf4a52cd6aadb13b02e26265eb
+DIST netbeans-trunk-nightly-201204021038-src.zip 177759174 RMD160 1e14efd847bcae1ca4f060b512ad31ea0610335f SHA1 c28dd9b9d2c4e12d3facab3d52b3fd6b3ea7563f SHA256 723a1133eb1c4a824d394ce9ac90248f0dd3bea2603f667172bf7780facde377
 EBUILD netbeans-harness-7.0.1.ebuild 3579 RMD160 dd36fe87364dc9a15cfad15b64f8d05e46632705 SHA1 d39ddfab960f1b9430a5eee2919d06e2854ae848 SHA256 f4d09cb7bd5e8485caf75a3020ddb8102d3ea326878ac384ef4aecb011a1f6a5
 EBUILD netbeans-harness-7.1.1.ebuild 3587 RMD160 4b78aa7e3c0af41f3f7f85a09368de526172289f SHA1 93adf0871e22a1e9c27d5bee1e1a65f62728ff2f SHA256 5579365d51acc14e70d074b894482082b0b923b5097ec4bd9cfa39a6052c9626
 EBUILD netbeans-harness-9999_p20120325.ebuild 3610 RMD160 3b80b617a0a4a1c79738b95253177f81317ad149 SHA1 a8dfca38f97353af809c958c5b4fe63827247be1 SHA256 c907987e2032ea6ee52fa4913c0df4cbae4285329f0d88c7acc0aa9f5499617f
 EBUILD netbeans-harness-9999_p20120328.ebuild 3610 RMD160 20c19fc216989b0ed17ba57117fedf2ffaa9f5bb SHA1 260068e6875e37b95a454e21e1c47506e6093022 SHA256 68842898b343d73e81c51d884adfe3410be2d1f4ea692ba468976aca829bf9f0
-MISC ChangeLog 30192 RMD160 50fe5c258422274a1e84415781a85bee3180aae0 SHA1 50a1a4b6076576b4f7ef1aa7459cc7fd3c106d06 SHA256 fd29f4508c7dc75a0a215563c18c3e6bfc21493fd3c4bd61e721566c657a1c8f
+EBUILD netbeans-harness-9999_p20120402.ebuild 3610 RMD160 f2ee83c2bea1ee6512e51551ba0f2aade5e0b5df SHA1 76e06c294f0e67141270b12006d41c43c8bbbab4 SHA256 ff68e2316d296ec5243719ed64e50846b653598fa21d5e951a3b4ce1b203d45a
+MISC ChangeLog 30371 RMD160 8edfa03cfb0f3b0a6b4cd53882c84897a07aa6b4 SHA1 50669ece8a9eeaaa6ad0ba093c6ce6350c225881 SHA256 bf2cc354447847a672ce3d6619024891a5138fda0dd1921dfccc024f231bb617
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003
diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20120402.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20120402.ebuild
new file mode 100644
index 000000000..14b1ca6c8
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20120402.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+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/2012-04-02_10-38-56/zip/netbeans-trunk-nightly-201204021038-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r2-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
+	http://hg.netbeans.org/binaries/418FC62C8A6EF5311987B01FE389B1F88EFDDCA2-jemmy-2.3.0.0.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.6
+	app-arch/unzip
+	${CDEPEND}
+	>=dev-java/junit-4.4:4"
+RDEPEND=">=virtual/jdk-1.6
+	${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"
+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-r2-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}"/418FC62C8A6EF5311987B01FE389B1F88EFDDCA2-jemmy-2.3.0.0.jar jemmy/external/jemmy-2.3.0.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-r2-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
+	# bindex-2.2.jar
+	rm jsearch-2.0_05.jar && dosym /usr/share/javahelp/lib/jsearch.jar ${instdir}/jsearch-2.0_05.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	# jemmy-2.3.0.0.jar
+	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 4cd903d9f..9698234d5 100644
--- a/dev-java/netbeans-ide/ChangeLog
+++ b/dev-java/netbeans-ide/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-ide-9999_p20120402 (03 Apr 2012)
+
+  03 Apr 2012; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ide-9999_p20120402.ebuild:
+  Bumped to latest nightly sources
+
 *netbeans-ide-9999_p20120328 (29 Mar 2012)
 
   29 Mar 2012; Miroslav Šulc <fordfrog@gentoo.org>
diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index b13d38b39..0d810c82a 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -82,9 +82,11 @@ DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d
 DIST netbeans-9999-r2-build.xml.patch.bz2 2435 RMD160 c8988360fb0157b27a767d877dcd2a3d523b6178 SHA1 530768eb7ba1aff85b05cd15f21ac00edb15e55a SHA256 5f26c11ed3b34e99640a0b465ba348b07a2b91bfb061bf09f07ab07017ba5391
 DIST netbeans-trunk-nightly-201203250401-src.zip 177539743 RMD160 b078183a73a2691a71e191d890ddf71e31678103 SHA1 64490a2000e51cde6c8e2480285a5a438711b7c0 SHA256 eb9400386d9813b7aa9102f29557db7777a056af9bf3d17dfee17d4267377e4d
 DIST netbeans-trunk-nightly-201203280401-src.zip 177594044 RMD160 db98172a5ac7b055d845f92cc50840e07e6fb489 SHA1 702e46f0271580e8be745ed968579bd08c2c6be5 SHA256 ca0c9501d5eb837fb954ca40b9423bcb41dba8bf4a52cd6aadb13b02e26265eb
+DIST netbeans-trunk-nightly-201204021038-src.zip 177759174 RMD160 1e14efd847bcae1ca4f060b512ad31ea0610335f SHA1 c28dd9b9d2c4e12d3facab3d52b3fd6b3ea7563f SHA256 723a1133eb1c4a824d394ce9ac90248f0dd3bea2603f667172bf7780facde377
 EBUILD netbeans-ide-7.0.1.ebuild 22653 RMD160 fe693a0abc3253af1850b99bfb4fa0d9a488bd94 SHA1 5b6547694a3193ce89cc2a5dfb8fc134cb81fabe SHA256 4c1b3e46e2a6cb89d902c7f4fe6ad9306cbd0c9463a514e87d4c6ec019dc0356
 EBUILD netbeans-ide-7.1.1.ebuild 26834 RMD160 d04d5bffcd0471316c7022f754b1debcf5203552 SHA1 c2a935f33fd37e8ceace2f2e212753bb8f88219a SHA256 f3000e8e4a0565371a02e9574e1f4b1aafbbabc5095ac496bc5c233d6e5ce3d7
 EBUILD netbeans-ide-9999_p20120325.ebuild 27519 RMD160 af4147134755eb41ddfad7312a9f4df9a1553c0d SHA1 81211b6b51acbc2868afaf7506d1edc74a004e73 SHA256 67157b0485f8df56fc51934cfee2b5cdd24de7ed43d39b0a637f72bc27f08b53
 EBUILD netbeans-ide-9999_p20120328.ebuild 27519 RMD160 29ce6198a5fd246a47e3236c61b8cfe92c173409 SHA1 850358e7125ba2161525e7a4e88e4aa947983132 SHA256 13dd25a9b8adda878c2d1dafa0e49a2fa4aaabc3bda5ededf3efdcb10145b79c
-MISC ChangeLog 29329 RMD160 603de40b69269d628f77caf5b0c3ee1529040448 SHA1 0ff21fbc1be5ee3f6696e6954ba9fd57c1c4ed9f SHA256 b6ae6ba981fdfb730802415829b387bc291eb4c861232441764b1265aa21a978
+EBUILD netbeans-ide-9999_p20120402.ebuild 27519 RMD160 cd904ccef293377ec433b29b581a45fe4d691831 SHA1 4e5ba3c0e1d286cdf91feafac7cec56ae28be372 SHA256 30110ea129826c4888d6f0c11ef37934a4eebcea9a94e83ed19294e178afc57c
+MISC ChangeLog 29500 RMD160 581aa25a64e02232442bc7de721aacb84a7bcc95 SHA1 f087533732ddc4f0c8eb51a6bc8640e248f76ad1 SHA256 8d92e881274f14b768fd617a20603773fae395b920e42999e5b11debe9970ed2
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003
diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20120402.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20120402.ebuild
new file mode 100644
index 000000000..6da70d0e1
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20120402.ebuild
@@ -0,0 +1,390 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+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/2012-04-02_10-38-56/zip/netbeans-trunk-nightly-201204021038-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r2-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/B7ADB35C7BC16AFA8AE49C4D61F87E607BDADB41-antlr-runtime-3.3.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/643CC426B9F75AA111FAC0FAC0E52FF5D991A337-commons-net-3.0.1.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/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
+	http://hg.netbeans.org/binaries/77DB1AFF3C0730C144D30C9935A1CD8DCD2488A9-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/FACC6D84B0B0A650B1D44FED941E9ADD9F326862-isorelax20041111.jar
+	http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip
+	http://hg.netbeans.org/binaries/BCF23B1D858C6F69D67C851D497984D25345D0B1-jaxb-api.jar
+	http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip
+	http://hg.netbeans.org/binaries/2EC69BD69B66B0DABEA392DE713A11F975001760-jaxb-impl.jar
+	http://hg.netbeans.org/binaries/64D468922B85A9626178AEDF564FFDBDE980B3EC-jaxb-xjc.jar
+	http://hg.netbeans.org/binaries/F02664A059617D060BEC3EBA0BC002B2102AEB84-jaxb1-impl.jar
+	http://hg.netbeans.org/binaries/C0C5653D2200F2BD2E834B26DFDBC830D07FA0F4-jing.jar
+	http://hg.netbeans.org/binaries/71F7D2D5A3CF17CECBD15049A856BC0245C95C56-js.jar
+	http://hg.netbeans.org/binaries/098B14300B35E1053AA9945FF2C1CDA164F43B33-js-domstubs.zip
+	http://hg.netbeans.org/binaries/5756AA27E54A3EC6C8CDAE32F49BCA7BC139EB15-jsstubs.zip
+	http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
+	http://hg.netbeans.org/binaries/90FF0731FAFB05C01FEE4F2247140D56E9C30A3B-lucene-core-3.5.0.jar
+	http://hg.netbeans.org/binaries/A1C0ED8C43A306E3FB7676E7463204B9DA9BE290-non-schema.jar
+	http://hg.netbeans.org/binaries/DF8DD2981C9C3EBEDB059CA98450B587E784AF58-org.eclipse.core.contenttype-3.4.100.jar
+	http://hg.netbeans.org/binaries/A71B23F287BB0CB27E3A5B7808AC07D45BE44841-org.eclipse.core.jobs-3.5.1.jar
+	http://hg.netbeans.org/binaries/93CDEDB00404BF3C56AD3BF0501A9E7A09BD2108-org.eclipse.core.net-1.2.100.jar
+	http://hg.netbeans.org/binaries/46735A729401036FC2C14CC05257ACB4CD4F6906-org.eclipse.core.runtime-3.6.0.jar
+	http://hg.netbeans.org/binaries/9C98C277CFFBB4CA06CAFD5820562EF7B5100F5C-org.eclipse.core.runtime.compatibility.auth-3.2.200.jar
+	http://hg.netbeans.org/binaries/8A288BD66E90B1081F843A17F95973514ED55A97-org.eclipse.equinox.app-1.3.1.jar
+	http://hg.netbeans.org/binaries/491025C38F84A6FF9823315A74A0CAC4C30E51A8-org.eclipse.equinox.common-3.6.0.jar
+	http://hg.netbeans.org/binaries/F411AB988320260361C3611714CA5AF1480CD1A3-org.eclipse.equinox.preferences-3.3.0.jar
+	http://hg.netbeans.org/binaries/AD19FF36B5D976E5B4F289B5ACB32967216C1B2D-org.eclipse.equinox.registry-3.5.0.jar
+	http://hg.netbeans.org/binaries/B24FB024EA57B794FA1433CE974102507A231539-org.eclipse.equinox.security-1.0.200.jar
+	http://hg.netbeans.org/binaries/A00DC524B1D1DB1ABBF95407AA3E6009C3D2C157-org.eclipse.jgit-1.3.0.201202151440-r.jar
+	http://hg.netbeans.org/binaries/6AC191F42860D1698C9268AE044AFAA5FE806CE7-org.eclipse.mylyn.bugzilla.core-3.6.0.jar
+	http://hg.netbeans.org/binaries/4617423828BC2E79A1871949C2914285405D8EFF-org.eclipse.mylyn.commons.core-3.6.0.jar
+	http://hg.netbeans.org/binaries/053602E0177D42BF707019F1BC646193A899D571-org.eclipse.mylyn.commons.net-3.6.0.jar
+	http://hg.netbeans.org/binaries/032EFC784E1DE21E4093C08F336C7582F5694760-org.eclipse.mylyn.commons.xmlrpc-3.6.0.jar
+	http://hg.netbeans.org/binaries/5D73EEAEABC42C6FCB85593D1F5B04ACBDFAA0F9-org.eclipse.mylyn.tasks.core-3.6.0.jar
+	http://hg.netbeans.org/binaries/299144A066A7E2965ACB1A30D71F4D1E6C0FC061-org.tmatesoft.svnkit_1.7.4.rc1_t20120321_0030.jar
+	http://hg.netbeans.org/binaries/CD33537FD47E801E01B427997F3DE4016159B414-preindexed.zip
+	http://hg.netbeans.org/binaries/E66876EB5F33AA0E57F035F1AADD8C44FEAE7FCB-processtreekiller-1.0.1.jar
+	http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar
+	http://hg.netbeans.org/binaries/1162833E0FE87B69B99B1F7DEB3A6C386EAB6F84-rhino1_7R2rc1.zip
+	http://hg.netbeans.org/binaries/C56F4F5C42102A67F56EB8F12D0219E92E5307C2-sdocs.zip
+	http://hg.netbeans.org/binaries/0E30D36ADF1728F6CFE1E87DF71C5541D3E61931-svnClientAdapter-javahl-1.8.5.jar
+	http://hg.netbeans.org/binaries/84D26BD9524B46955910CE6704812E2308F1D518-svnClientAdapter-main-1.8.5.jar
+	http://hg.netbeans.org/binaries/076FCE66657A48670381BA94B0492C991CF10375-svnClientAdapter-svnkit-1.8.5.jar
+	http://hg.netbeans.org/binaries/7C6ED64C55164C5AE0394E11303CA95CB24166AF-swingx-0.9.5.jar
+	http://hg.netbeans.org/binaries/69229EDC4C10A6B5752BA517F624544CE1F69721-sqljet-1.1.0-SNAPSHOT_r1197_v20120313_1735.jar
+	http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar
+	http://hg.netbeans.org/binaries/E1E307B031161B5D5FB7E4CB2FADE454CCF2506B-trilead-ssh2-1.0.0-build214.jar
+	http://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar
+	http://hg.netbeans.org/binaries/7A5A7DF07297A86A944D4D0562C685585B0734EF-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-io:1
+	dev-java/commons-lang:2.1
+	dev-java/commons-logging:0
+	dev-java/freemarker:2.3
+	dev-java/icu4j:4.4
+	dev-java/jdbc-mysql:0
+	dev-java/jdbc-postgresql:0
+	dev-java/jsr173:0
+	dev-java/jvyamlb:0
+	dev-java/log4j:0
+	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:0[java]"
+#	dev-java/lucene:3.5 we do not have slot 3.5 yet
+#	dev-java/jaxb:2 upstream version contains more stuff so websvccommon does not compile with ours
+#	app-text/jing:0 our version is probably too old
+#	dev-java/ini4j:0 our version is too old
+#	java-virtuals/jaf:0 could use this instead of sun-jaf but it returns empty classpath
+#	dev-java/trilead-ssh2:0 in overlay
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	dev-java/commons-codec:0
+	dev-java/jsch:0
+	dev-java/jzlib:0
+	${CDEPEND}
+	dev-java/javacc:0
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${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"
+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-r2-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/B7ADB35C7BC16AFA8AE49C4D61F87E607BDADB41-antlr-runtime-3.3.jar libs.antlr3.runtime/external/antlr-runtime-3.3.jar || die
+	ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die
+	ln -s "${DISTDIR}"/643CC426B9F75AA111FAC0FAC0E52FF5D991A337-commons-net-3.0.1.jar libs.commons_net/external/commons-net-3.0.1.jar || die
+	# system commons-io fails with following error:
+	# Missing manifest tag OpenIDE-Module; /var/tmp/portage/dev-java/netbeans-ide-9999_p20110911/work/nbbuild/netbeans/ide/modules/org-apache-commons-io.jar is not a module
+	ln -s "${DISTDIR}"/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar o.apache.commons.io/external/commons-io-1.4.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}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || die
+	ln -s "${DISTDIR}"/77DB1AFF3C0730C144D30C9935A1CD8DCD2488A9-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}"/FACC6D84B0B0A650B1D44FED941E9ADD9F326862-isorelax20041111.jar html.validation/external/isorelax20041111.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}"/BCF23B1D858C6F69D67C851D497984D25345D0B1-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}"/2EC69BD69B66B0DABEA392DE713A11F975001760-jaxb-impl.jar libs.jaxb/external/jaxb-impl.jar || die
+	ln -s "${DISTDIR}"/64D468922B85A9626178AEDF564FFDBDE980B3EC-jaxb-xjc.jar libs.jaxb/external/jaxb-xjc.jar || die
+	ln -s "${DISTDIR}"/F02664A059617D060BEC3EBA0BC002B2102AEB84-jaxb1-impl.jar libs.jaxb/external/jaxb1-impl.jar || die
+	ln -s "${DISTDIR}"/C0C5653D2200F2BD2E834B26DFDBC830D07FA0F4-jing.jar html.validation/external/jing.jar || die
+	ln -s "${DISTDIR}"/71F7D2D5A3CF17CECBD15049A856BC0245C95C56-js.jar html.validation/external/js.jar || die
+	ln -s "${DISTDIR}"/098B14300B35E1053AA9945FF2C1CDA164F43B33-js-domstubs.zip javascript.editing/external/js-domstubs.zip || die
+	ln -s "${DISTDIR}"/5756AA27E54A3EC6C8CDAE32F49BCA7BC139EB15-jsstubs.zip javascript.editing/external/jsstubs.zip || die
+	ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.destroy/external/libpam4j-1.1.jar || die
+	ln -s "${DISTDIR}"/90FF0731FAFB05C01FEE4F2247140D56E9C30A3B-lucene-core-3.5.0.jar libs.lucene/external/lucene-core-3.5.0.jar || die
+	ln -s "${DISTDIR}"/A1C0ED8C43A306E3FB7676E7463204B9DA9BE290-non-schema.jar html.validation/external/non-schema.jar || die
+	ln -s "${DISTDIR}"/DF8DD2981C9C3EBEDB059CA98450B587E784AF58-org.eclipse.core.contenttype-3.4.100.jar o.eclipse.core.contenttype/external/org.eclipse.core.contenttype-3.4.100.jar || die
+	ln -s "${DISTDIR}"/A71B23F287BB0CB27E3A5B7808AC07D45BE44841-org.eclipse.core.jobs-3.5.1.jar o.eclipse.core.jobs/external/org.eclipse.core.jobs-3.5.1.jar || die
+	ln -s "${DISTDIR}"/93CDEDB00404BF3C56AD3BF0501A9E7A09BD2108-org.eclipse.core.net-1.2.100.jar o.eclipse.core.net/external/org.eclipse.core.net-1.2.100.jar || die
+	ln -s "${DISTDIR}"/46735A729401036FC2C14CC05257ACB4CD4F6906-org.eclipse.core.runtime-3.6.0.jar o.eclipse.core.runtime/external/org.eclipse.core.runtime-3.6.0.jar || die
+	ln -s "${DISTDIR}"/9C98C277CFFBB4CA06CAFD5820562EF7B5100F5C-org.eclipse.core.runtime.compatibility.auth-3.2.200.jar o.eclipse.core.runtime.compatibility.auth/external/org.eclipse.core.runtime.compatibility.auth-3.2.200.jar || die
+	ln -s "${DISTDIR}"/8A288BD66E90B1081F843A17F95973514ED55A97-org.eclipse.equinox.app-1.3.1.jar o.eclipse.equinox.app/external/org.eclipse.equinox.app-1.3.1.jar || die
+	ln -s "${DISTDIR}"/491025C38F84A6FF9823315A74A0CAC4C30E51A8-org.eclipse.equinox.common-3.6.0.jar o.eclipse.equinox.common/external/org.eclipse.equinox.common-3.6.0.jar || die
+	ln -s "${DISTDIR}"/F411AB988320260361C3611714CA5AF1480CD1A3-org.eclipse.equinox.preferences-3.3.0.jar o.eclipse.equinox.preferences/external/org.eclipse.equinox.preferences-3.3.0.jar || die
+	ln -s "${DISTDIR}"/AD19FF36B5D976E5B4F289B5ACB32967216C1B2D-org.eclipse.equinox.registry-3.5.0.jar o.eclipse.equinox.registry/external/org.eclipse.equinox.registry-3.5.0.jar || die
+	ln -s "${DISTDIR}"/B24FB024EA57B794FA1433CE974102507A231539-org.eclipse.equinox.security-1.0.200.jar o.eclipse.equinox.security/external/org.eclipse.equinox.security-1.0.200.jar || die
+	ln -s "${DISTDIR}"/A00DC524B1D1DB1ABBF95407AA3E6009C3D2C157-org.eclipse.jgit-1.3.0.201202151440-r.jar o.eclipse.jgit/external/org.eclipse.jgit-1.3.0.201202151440-r.jar || die
+	ln -s "${DISTDIR}"/6AC191F42860D1698C9268AE044AFAA5FE806CE7-org.eclipse.mylyn.bugzilla.core-3.6.0.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core-3.6.0.jar || die
+	ln -s "${DISTDIR}"/4617423828BC2E79A1871949C2914285405D8EFF-org.eclipse.mylyn.commons.core-3.6.0.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core-3.6.0.jar || die
+	ln -s "${DISTDIR}"/053602E0177D42BF707019F1BC646193A899D571-org.eclipse.mylyn.commons.net-3.6.0.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net-3.6.0.jar || die
+	ln -s "${DISTDIR}"/032EFC784E1DE21E4093C08F336C7582F5694760-org.eclipse.mylyn.commons.xmlrpc-3.6.0.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc-3.6.0.jar || die
+	ln -s "${DISTDIR}"/5D73EEAEABC42C6FCB85593D1F5B04ACBDFAA0F9-org.eclipse.mylyn.tasks.core-3.6.0.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core-3.6.0.jar || die
+	ln -s "${DISTDIR}"/299144A066A7E2965ACB1A30D71F4D1E6C0FC061-org.tmatesoft.svnkit_1.7.4.rc1_t20120321_0030.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.7.4.rc1_t20120321_0030.jar || die
+	ln -s "${DISTDIR}"/CD33537FD47E801E01B427997F3DE4016159B414-preindexed.zip javascript.editing/external/preindexed.zip || die
+	ln -s "${DISTDIR}"/E66876EB5F33AA0E57F035F1AADD8C44FEAE7FCB-processtreekiller-1.0.1.jar extexecution.destroy/external/processtreekiller-1.0.1.jar || die
+	ln -s "${DISTDIR}"/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar o.apache.xml.resolver/external/resolver-1.2.jar || die
+	ln -s "${DISTDIR}"/1162833E0FE87B69B99B1F7DEB3A6C386EAB6F84-rhino1_7R2rc1.zip o.mozilla.rhino.patched/external/rhino1_7R2rc1.zip || die
+	ln -s "${DISTDIR}"/C56F4F5C42102A67F56EB8F12D0219E92E5307C2-sdocs.zip javascript.editing/external/sdocs.zip || die
+	ln -s "${DISTDIR}"/69229EDC4C10A6B5752BA517F624544CE1F69721-sqljet-1.1.0-SNAPSHOT_r1197_v20120313_1735.jar libs.svnClientAdapter.svnkit/external/sqljet-1.1.0-SNAPSHOT_r1197_v20120313_1735.jar || die
+	ln -s "${DISTDIR}"/0E30D36ADF1728F6CFE1E87DF71C5541D3E61931-svnClientAdapter-javahl-1.8.5.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-javahl-1.8.5.jar || die
+	ln -s "${DISTDIR}"/84D26BD9524B46955910CE6704812E2308F1D518-svnClientAdapter-main-1.8.5.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.8.5.jar || die
+	ln -s "${DISTDIR}"/076FCE66657A48670381BA94B0492C991CF10375-svnClientAdapter-svnkit-1.8.5.jar libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.8.5.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}"/7C6ED64C55164C5AE0394E11303CA95CB24166AF-swingx-0.9.5.jar libs.swingx/external/swingx-0.9.5.jar || die
+	ln -s "${DISTDIR}"/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar httpserver/external/tomcat-webserver-3.2.jar || die
+	ln -s "${DISTDIR}"/E1E307B031161B5D5FB7E4CB2FADE454CCF2506B-trilead-ssh2-1.0.0-build214.jar libs.svnClientAdapter.svnkit/external/trilead-ssh2-1.0.0-build214.jar || die
+	ln -s "${DISTDIR}"/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar swing.validation/external/ValidationAPI.jar || die
+	ln -s "${DISTDIR}"/7A5A7DF07297A86A944D4D0562C685585B0734EF-validator.jar html.validation/external/validator.jar || die
+	ln -s "${DISTDIR}"/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar extexecution.destroy/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-r2-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	popd >/dev/null || die
+
+	java-pkg_jar-from --build-only --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.45.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.18-bin.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-postgresql jdbc-postgresql.jar postgresql-9.1-901.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 extexecution.destroy/external commons-io-1 commons-io.jar commons-io-1.4.jar
+	java-pkg_jar-from --into html.parser/external icu4j-4.4 icu4j.jar icu4j-4_0.jar
+	java-pkg_jar-from --into html.validation/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
+	java-pkg_jar-from --into html.validation/external commons-logging commons-logging-api.jar commons-logging-api-1.1.1.jar
+	# java-pkg_jar-from --into html.validation/external jing jing.jar jing.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.antlr3.runtime/external antlr-3 antlr3.jar antlr-runtime-3.1.3.jar
+	# java-pkg_jar-from --into libs.commons_net/external commons-net commons-net.jar commons-net-1.4.1.jar
+	java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.8.jar
+	# java-pkg_jar-from --into libs.ini4j/external ini4j ini4j.jar ini4j-0.5.1.jar
+	# java-pkg_jar-from --into libs.jaxb/external jaxb-2 jaxb-impl.jar jaxb-impl.jar
+	java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.3.jar
+	# java-pkg_jar-from --into libs.lucene/external lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
+	java-pkg_jar-from --into libs.smack/external smack-2.2 smack.jar smack.jar
+	java-pkg_jar-from --into libs.smack/external smack-2.2 smackx.jar smackx.jar
+	java-pkg_jar-from --into libs.svnClientAdapter.javahl/external subversion svn-javahl.jar svnjavahl-1.7.2.jar
+	# java-pkg_jar-from --into libs.svnClientAdapter.svnkit/external trilead-ssh2 trilead-ssh2.jar trilead.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.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 jaxb-2 jaxb-api.jar jaxb-api.jar
+	java-pkg_jar-from --into xml.jaxb.api/external jsr173 jsr173.jar jsr173_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 antlr-runtime-3.1.3.jar && dosym /usr/share/antlr-3/lib/antlr3.jar ${instdir}/antlr-runtime-3.1.3.jar || die
+	# bytelist-0.1.jar
+	rm commons-logging-api-1.1.1.jar && dosym /usr/share/commons-logging/lib/commons-logging-api.jar ${instdir}/commons-logging-api-1.1.1.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
+	# rm commons-net-1.4.1.jar && dosym /usr/share/commons-net/lib/commons-net.jar ${instdir}/commons-net-1.4.1.jar || die
+	# ddl.jar
+	rm freemarker-2.3.8.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.8.jar || die
+	# html5-datatypes.jar
+	# html5-parser.jar
+	rm icu4j-4_0.jar && dosym /usr/share/icu4j-4.4/lib/icu4j.jar ${instdir}/icu4j-4_0.jar || die
+	# [[ -f ini4j-0.5.1.jar ]] && java-pkg_jar-from ini4j ini4j.jar ${instdir}/ini4j-0.5.1.jar || die
+	# io-xml-util.jar
+	# iri.jar
+	# isorelax20041111.jar
+	# [[ -f jing.jar ]] && java-pkg_jar-from jing jing.jar ${instdir}/jing.jar || die
+	# js.jar
+	rm jvyamlb-0.2.3.jar && dosym /usr/share/jvyamlb/lib/jvyamlb.jar ${instdir}/jvyamlb-0.2.3.jar || die
+	# libpam4j-1.1.jar
+	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.18-bin.jar && dosym /usr/share/jdbc-mysql/lib/jdbc-mysql.jar ${instdir}/mysql-connector-java-5.1.18-bin.jar || die
+	# non-schema.jar
+	# org.eclipse.mylyn.bugzilla.core_3.3.1.jar
+	# org.eclipse.mylyn.commons.core_3.3.1.jar
+	# org.eclipse.mylyn.commons.net_3.3.0.jar
+	# org.eclipse.mylyn.tasks.core_3.3.1.jar
+	# org-netbeans-tax.jar
+	rm postgresql-9.1-901.jdbc4.jar && dosym /usr/share/jdbc-postgresql/lib/jdbc-postgresql.jar ${instdir}/postgresql-9.1-901.jdbc4.jar || die
+	# processtreekiller-1.0.1.jar
+	# resolver-1.2.jar
+	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
+	# sqljet-1.0.3.jar
+	# svnClientAdapter-javahl-1.6.13.jar
+	# svnClientAdapter-main-1.6.13.jar
+	# svnClientAdapter-svnkit-1.6.13.jar
+	rm svnjavahl-1.7.2.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl-1.7.2.jar || die
+	# svnkit-javahl.jar
+	# svnkit-1.3.4.jar
+	# swingx-0.9.5.jar
+	# [[ -f trilead.jar ]] && java-pkg_jar-from trilead-ssh2 trilead-ssh2.jar ${instdir}/trilead.jar || die
+	# ValidationAPI.jar
+	# validator.jar
+	# webserver.jar
+	# winp-1.14-patched.jar
+	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
+	# [[ -f jaxb-impl.jar ]] && java-pkg_jar-from jaxb-2 jaxb-impl.jar ${instdir}/jaxb-impl.jar || die
+	# jaxb-xjc.jar
+	# jaxb1-impl.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxb/api
+	pushd "${D}"/${instdir} >/dev/null || die
+	# [[ -f jaxb-api.jar ]] && java-pkg_jar-from jaxb-2 jaxb-api.jar ${instdir}/jaxb-api.jar || die
+	rm jsr173_api.jar && dosym /usr/share/jsr173/lib/jsr173.jar ${instdir}/jsr173_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 11f5d8d97..f9cb899e0 100644
--- a/dev-java/netbeans-java/ChangeLog
+++ b/dev-java/netbeans-java/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-java-9999_p20120402 (03 Apr 2012)
+
+  03 Apr 2012; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-java-9999_p20120402.ebuild:
+  Bumped to latest nightly sources
+
 *netbeans-java-9999_p20120328 (29 Mar 2012)
 
   29 Mar 2012; Miroslav Šulc <fordfrog@gentoo.org>
diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 08afe534d..609abe910 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -29,6 +29,7 @@ DIST BC0919190ADD3A7FB764C8412D10A2B026CD9563-eclipselink-2.3.0.jar 6503498 RMD1
 DIST C54C41DD33054070647ED50F209CC77A05BA5563-spring-framework-3.1.1.RELEASE.zip 4830417 RMD160 4a19faedca26b91d582219356616dd47838b4f4c SHA1 c54c41dd33054070647ed50f209cc77a05ba5563 SHA256 a8e0c288398abf48e2222160a4e935353e988cb6093385628e7ce20c26b339e6
 DIST C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip 5029407 RMD160 546dd5f8c9039925e89e76655265e6105658951d SHA1 c8a5e0d558ea7e7349f9d32b838553d5e7dd214f SHA256 7492417ca97835935912d931f9c2a1c9d98fc35fab455d086fd11f7ff663acb8
 DIST CAF99EFBB25E9183609D6FBA4F63D85E7606903F-indexer-core-4.1.0.jar 220841 RMD160 6d0afc9ec328e3b3c2901d0941b29feca57350ee SHA1 caf99efbb25e9183609d6fba4f63d85e7606903f SHA256 f6140d9e9f52a50c381ac500c119b268bae84e84c9ba37d361baf22d4e4ec68f
+DIST CB686A65B6C4516A32173CB60385D02027440620-spring-2.5.6.SEC03.jar 2949268 RMD160 996dc03464a1bbb4b65062dd438956d4581c9261 SHA1 cb686a65b6c4516a32173cb60385d02027440620 SHA256 7865677c19d1373c7126751c30bf9719bbe7431f9b8a160e78cd53d74534f4f1
 DIST D88A41174C5F85D1B791D6A8E0F8B8A1C459D6C0-spring-framework-3.0.2.RELEASE.zip 4054621 RMD160 8d410595e912d2a8d30a0bdfbdf83413692a4269 SHA1 d88a41174c5f85d1b791d6a8e0f8b8a1c459d6c0 SHA256 5901b2a23c80f2669016697aadf27fefd8350fdd5cc876f8e979d5aac92a857e
 DIST E90F4B2F8972AA5EF58139F16B78D5F6ACFC6EF9-javac-api-nb-7.0-b07.jar 130251 RMD160 bc5cbedbc2ae6ca85f2abd5718d946273ca0b356 SHA1 e90f4b2f8972aa5ef58139f16b78d5f6acfc6ef9 SHA256 cc025405fbfb86113b6f0c2f80c6d34babc59be0ef2c8778043ad108296faa21
 DIST EA1F2B2504FC5ABCB06146D858F74A97B85A2998-indexer-core-4.1.2.jar 231058 RMD160 798a4028230bb087efd5ee133f01b08a11e99452 SHA1 ea1f2b2504fc5abcb06146d858f74a97b85a2998 SHA256 7dbbee8f9000b1a157b75425f54495dd90c63621f5a8a88f40e5780712c12a5e
@@ -41,11 +42,13 @@ DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d
 DIST netbeans-9999-r2-build.xml.patch.bz2 2435 RMD160 c8988360fb0157b27a767d877dcd2a3d523b6178 SHA1 530768eb7ba1aff85b05cd15f21ac00edb15e55a SHA256 5f26c11ed3b34e99640a0b465ba348b07a2b91bfb061bf09f07ab07017ba5391
 DIST netbeans-trunk-nightly-201203250401-src.zip 177539743 RMD160 b078183a73a2691a71e191d890ddf71e31678103 SHA1 64490a2000e51cde6c8e2480285a5a438711b7c0 SHA256 eb9400386d9813b7aa9102f29557db7777a056af9bf3d17dfee17d4267377e4d
 DIST netbeans-trunk-nightly-201203280401-src.zip 177594044 RMD160 db98172a5ac7b055d845f92cc50840e07e6fb489 SHA1 702e46f0271580e8be745ed968579bd08c2c6be5 SHA256 ca0c9501d5eb837fb954ca40b9423bcb41dba8bf4a52cd6aadb13b02e26265eb
+DIST netbeans-trunk-nightly-201204021038-src.zip 177759174 RMD160 1e14efd847bcae1ca4f060b512ad31ea0610335f SHA1 c28dd9b9d2c4e12d3facab3d52b3fd6b3ea7563f SHA256 723a1133eb1c4a824d394ce9ac90248f0dd3bea2603f667172bf7780facde377
 EBUILD netbeans-java-7.0.1-r1.ebuild 14910 RMD160 d14f4336ff68a56a3711a3196c2063285ee09368 SHA1 0265d2116d2124d5e212fa4afdb76f6a5a929094 SHA256 8af2b399378ee959c0255091c1f6afadf8ba7925d81cd82755058dbc6cd2334a
 EBUILD netbeans-java-7.0.1.ebuild 14888 RMD160 19208f48ccc5d5d19ba03bf7c60d27a429243b98 SHA1 2c116b4798f92dcac23bdcacd04bb01b0116c7d2 SHA256 98b4789883e375d817f509dbe9067b6f5c3685d92c714d443d51b00bb54704ad
 EBUILD netbeans-java-7.1.1-r1.ebuild 14871 RMD160 dcc71dd840ea199e781b50e50d2e9ae16d6f627c SHA1 8e2b9ad67f9840c2dd117abbb044e1c66f819e51 SHA256 b1dfbc2c519128a9dbb7b6f0a2f5690661b079cf9235a3da548f7c89016fcf08
 EBUILD netbeans-java-7.1.1.ebuild 14849 RMD160 c7b0b84b77b2c08d57edeacf799c6c2288881960 SHA1 b9a3e4a3ba16214e3afa89454e5f595373500611 SHA256 e5fc891099dfd9e26f9dc9542fe953e96c6bd397dcc32435b6b49ad938eb54d4
 EBUILD netbeans-java-9999_p20120325.ebuild 15238 RMD160 c450c9fd2f23404cf7b59c49e4cb9a2068480225 SHA1 81afc58612fb5f008b17e7765496971e7f6c8c50 SHA256 ae482bd9e839f4f37193e160d974f21d453dda321930aa2580c04b0771b197d3
 EBUILD netbeans-java-9999_p20120328.ebuild 15238 RMD160 3cfe0cda15a89fdbc959ab7cbdcf65301fbbae38 SHA1 34bd6df01c167b24bbbb229e5dbaa68d945f09c6 SHA256 f6c1b8f0e790c22db6837c9703ed515b4b13e9ff3e14b8fbae11a79aceb6a2cd
-MISC ChangeLog 30533 RMD160 bab55ca6f496069f3f0713b96accbee832114b5a SHA1 052b5c49d778b35ea7be7179d07d8439ea014d00 SHA256 fd59693d0e4f14283e075d660ad1f7a01355b7c6623af570948e9e7a3268317c
+EBUILD netbeans-java-9999_p20120402.ebuild 15238 RMD160 1bab4e0fcd85c3d2c6b2dff0e13107ae28618b67 SHA1 ef76e9da6f7935653192dd5475d8589e8794e8d6 SHA256 62aaa3b7ae46d731fd597591c441f21aa9a4c120d2f635463d257798157b10f0
+MISC ChangeLog 30706 RMD160 307b4c027dc92cfef9e2fedc4f191162ff603e43 SHA1 58dbdaea0433b32f1066af98fa5c6039ef07191c SHA256 0c713df210e5cfabb4ec3462b2eb7897b1a2964ffd231ba970006e5be68452d6
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003
diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20120402.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20120402.ebuild
new file mode 100644
index 000000000..57037a79b
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20120402.ebuild
@@ -0,0 +1,323 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+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/2012-04-02_10-38-56/zip/netbeans-trunk-nightly-201204021038-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r2-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/1A78676E734C72549EE6D9F166BAFE22F7CBA8CD-ant-libs-1.8.3.zip
+	http://hg.netbeans.org/binaries/29CFD351206016B67DD0D556098513D2B259C69B-apache-maven-3.0.4-bin.zip
+	http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip
+	http://hg.netbeans.org/binaries/90F1E67F38F1D8EC25C082F8EB08CFEC9A3B75E2-eclipselink-2.3.2.jar
+	http://hg.netbeans.org/binaries/481935A7F53B55502187BD3C28C2BC0D957BB643-eclipselink-jpa-modelgen-2.3.2.jar
+	http://hg.netbeans.org/binaries/59FAD2A4D4A1CFECED8149854EEEC3A7B9668927-glassfish-persistence-v2-build-58g.jar
+	http://hg.netbeans.org/binaries/907363E301E2279930C82BEB466BF2053C6E993B-glassfish-persistence-v2ur1-build-09d.jar
+	http://hg.netbeans.org/binaries/C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip
+	http://hg.netbeans.org/binaries/204680C59C7D8A4A1A26B9A2ED46D0DAA6DC10B3-indexer-artifact-4.1.2.jar
+	http://hg.netbeans.org/binaries/EA1F2B2504FC5ABCB06146D858F74A97B85A2998-indexer-core-4.1.2.jar
+	http://hg.netbeans.org/binaries/E90F4B2F8972AA5EF58139F16B78D5F6ACFC6EF9-javac-api-nb-7.0-b07.jar
+	http://hg.netbeans.org/binaries/033FC62C8D65CD97FA7FC29F0546EB7CDDEF85BB-javac-impl-nb-7.0-b07.jar
+	http://hg.netbeans.org/binaries/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-javax.persistence-2.0.jar
+	http://hg.netbeans.org/binaries/2F43A634A42CC4FD2EF9E24B488AFFD6984D3411-jaxws-2.2.zip
+	http://hg.netbeans.org/binaries/23E69F0F17757673C573EBD9899727B82EF7DB7F-jaxws-2.2-api.zip
+	http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip
+	http://hg.netbeans.org/binaries/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar
+	http://hg.netbeans.org/binaries/663FA7BA7FD8538E44DE9FDC5315C4F733C13E96-org.eclipse.persistence.jpa.jpql_1.0.1.jar
+	http://hg.netbeans.org/binaries/CB686A65B6C4516A32173CB60385D02027440620-spring-2.5.6.SEC03.jar
+	http://hg.netbeans.org/binaries/C54C41DD33054070647ED50F209CC77A05BA5563-spring-framework-3.1.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-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
+	dev-java/lucene:3.0"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	dev-java/junit:4"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}
+	dev-java/absolutelayout:0
+	dev-java/antlr:0[java]
+	dev-java/asm:2.2
+	dev-java/cglib:2.1
+	dev-java/commons-collections:0
+	dev-java/dom4j:1
+	dev-java/ehcache:1.2
+	dev-java/fastinfoset:0
+	dev-java/javassist:3
+	dev-java/jsr67:0
+	dev-java/jsr181:0
+	dev-java/jsr250:0
+	dev-java/glassfish-transaction-api:0
+	dev-java/jtidy: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"
+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 [ -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
+
+	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-r2-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/1A78676E734C72549EE6D9F166BAFE22F7CBA8CD-ant-libs-1.8.3.zip o.apache.tools.ant.module/external/ant-libs-1.8.3.zip || die
+	ln -s "${DISTDIR}"/29CFD351206016B67DD0D556098513D2B259C69B-apache-maven-3.0.4-bin.zip maven.embedder/external/apache-maven-3.0.4-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}"/90F1E67F38F1D8EC25C082F8EB08CFEC9A3B75E2-eclipselink-2.3.2.jar j2ee.eclipselink/external/eclipselink-2.3.2.jar || die
+	ln -s "${DISTDIR}"/481935A7F53B55502187BD3C28C2BC0D957BB643-eclipselink-jpa-modelgen-2.3.2.jar j2ee.eclipselinkmodelgen/external/eclipselink-jpa-modelgen-2.3.2.jar || die
+	ln -s "${DISTDIR}"/59FAD2A4D4A1CFECED8149854EEEC3A7B9668927-glassfish-persistence-v2-build-58g.jar j2ee.toplinklib/external/glassfish-persistence-v2-build-58g.jar || die
+	ln -s "${DISTDIR}"/907363E301E2279930C82BEB466BF2053C6E993B-glassfish-persistence-v2ur1-build-09d.jar j2ee.toplinklib/external/glassfish-persistence-v2ur1-build-09d.jar || die
+	ln -s "${DISTDIR}"/C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip hibernatelib/external/hibernate-3.2.5-lib.zip || die
+	ln -s "${DISTDIR}"/204680C59C7D8A4A1A26B9A2ED46D0DAA6DC10B3-indexer-artifact-4.1.2.jar maven.indexer/external/indexer-artifact-4.1.2.jar || die
+	ln -s "${DISTDIR}"/EA1F2B2504FC5ABCB06146D858F74A97B85A2998-indexer-core-4.1.2.jar maven.indexer/external/indexer-core-4.1.2.jar || die
+	ln -s "${DISTDIR}"/E90F4B2F8972AA5EF58139F16B78D5F6ACFC6EF9-javac-api-nb-7.0-b07.jar libs.javacapi/external/javac-api-nb-7.0-b07.jar || die
+	ln -s "${DISTDIR}"/033FC62C8D65CD97FA7FC29F0546EB7CDDEF85BB-javac-impl-nb-7.0-b07.jar libs.javacimpl/external/javac-impl-nb-7.0-b07.jar || die
+	ln -s "${DISTDIR}"/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-javax.persistence-2.0.jar j2ee.eclipselink/external/javax.persistence-2.0.jar || die
+	ln -s "${DISTDIR}"/2F43A634A42CC4FD2EF9E24B488AFFD6984D3411-jaxws-2.2.zip websvc.jaxws21/external/jaxws-2.2.zip || die
+	ln -s "${DISTDIR}"/23E69F0F17757673C573EBD9899727B82EF7DB7F-jaxws-2.2-api.zip websvc.jaxws21api/external/jaxws-2.2-api.zip || die
+	ln -s "${DISTDIR}"/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip websvc.jaxws21/external/jaxws-api-doc.zip || die
+	ln -s "${DISTDIR}"/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar maven.embedder/external/maven-dependency-tree-1.2.jar || die
+	ln -s "${DISTDIR}"/663FA7BA7FD8538E44DE9FDC5315C4F733C13E96-org.eclipse.persistence.jpa.jpql_1.0.1.jar j2ee.eclipselink/external/org.eclipse.persistence.jpa.jpql_1.0.1.jar || die
+	ln -s "${DISTDIR}"/CB686A65B6C4516A32173CB60385D02027440620-spring-2.5.6.SEC03.jar libs.springframework/external/spring-2.5.6.SEC03.jar || die
+	ln -s "${DISTDIR}"/C54C41DD33054070647ED50F209CC77A05BA5563-spring-framework-3.1.1.RELEASE.zip libs.springframework/external/spring-framework-3.1.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-r2-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.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 maven.indexer/external lucene-3.0 lucene-core.jar lucene-core-3.0.3.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-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 *
+	#rm -fr "${D}"/${INSTALL_DIR}/ant/* || die
+	#rm -fr "${D}"/${INSTALL_DIR}/maven || die
+	#dosym /usr/share/maven-bin-3.0 ${INSTALL_DIR}/maven
+	chmod 755 "${D}"/${INSTALL_DIR}/maven/bin/mvn* || die
+	rm -fr "${D}"/${INSTALL_DIR}/maven/bin/*.bat || die
+
+	#insinto ${INSTALL_DIR}/ant
+	#dosym /usr/share/ant/bin ${INSTALL_DIR}/ant/bin
+	#dosym /usr/share/ant/etc ${INSTALL_DIR}/ant/etc
+	#doins -r ant/extra
+	#dosym /usr/share/ant/lib ${INSTALL_DIR}/ant/lib
+	#doins -r ant/nblib
+	#dosym /usr/share/ant/tasks ${INSTALL_DIR}/ant/tasks
+	#local vertasks=$(ls -d /usr/share/ant/tasks-*)
+	#dosym ${vertasks} ${INSTALL_DIR}/ant/$(basename ${vertasks}) # it would be better if ant would have tasks-current dir
+
+	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
+	# javac-api-nb-7.0-b07.jar
+	# javac-impl-nb-7.0-b07.jar
+	# org-netbeans-modules-java-j2seplatform-probe.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/eclipselink
+	pushd "${D}"/${instdir} >/dev/null || die
+	# dir: eclipselink
+	# eclipselink-javax.persistence-2.0.jar
+	# eclipselink-jpa-modelgen-2.2.0.jar
+	# eclipselink-2.2.0.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/hibernate
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm antlr-2.7.6.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.6.jar || die
+	rm asm-attrs.jar && dosym /usr/share/asm-2.2/lib/asm-attrs.jar ${instdir}/asm-attrs.jar || die
+	rm asm.jar && dosym /usr/share/asm-2.2/lib/asm.jar ${instdir}/asm.jar || die
+	rm cglib-2.1.3.jar && dosym /usr/share/cglib-2.1/lib/cglib.jar ${instdir}/cglib-2.1.3.jar || die
+	rm commons-collections-2.1.1.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections-2.1.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 ehcache-1.2.3.jar && dosym /usr/share/ehcache-1.2/lib/ehcache.jar ${instdir}/ehcache-1.2.3.jar || die
+	# ejb3-persistence.jar
+	# hibernate-annotations.jar
+	# hibernate-commons-annotations.jar
+	# hibernate-entitymanager.jar
+	# hibernate-tools.jar
+	# hibernate3.jar
+	rm javassist.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist.jar || die
+	# jdbc2_0-stdext.jar
+	rm jta.jar && dosym /usr/share/jta/lib/jta.jar ${instdir}/jta.jar || die
+	rm jtidy-r8-20060801.jar && dosym /usr/share/jtidy/lib/Tidy.jar ${instdir}/jtidy-r8-20060801.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
+	# gmbal-api-only.jar
+	# http.jar
+	# jaxws-rt.jar
+	# jaxws-tools.jar
+	# management-api.jar
+	# mimepull.jar
+	# policy.jar
+	rm saaj-impl.jar && dosym /usr/share/saaj/lib/saaj.jar ${instdir}/saaj-impl.jar || die
+	rm stax-ex.jar && dosym /usr/share/stax-ex/lib/stax-ex.jar ${instdir}/stax-ex.jar || die
+	rm streambuffer.jar && dosym /usr/share/xmlstreambuffer/lib/streambuffer.jar ${instdir}/streambuffer.jar || die
+	# woodstox.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxws22/api
+	pushd "${D}"/${instdir} >/dev/null || die
+	# jaxws-api.jar
+	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
+	rm jsr250-api.jar && dosym /usr/share/jsr250/lib/jsr250.jar ${instdir}/jsr250-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
+	# indexer-artifact-4.1.1.jar
+	# indexer-core-4.1.1.jar
+	rm jdom-1.0.jar && dosym /usr/share/jdom-1.0/lib/jdom.jar ${instdir}/jdom-1.0.jar || die
+	rm lucene-core-3.0.3.jar && dosym /usr/share/lucene-3.0/lib/lucene-core.jar ${instdir}/lucene-core-3.0.3.jar || die
+	# maven-dependency-tree-1.2.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/spring
+	pushd "${D}"/${instdir} >/dev/null || die
+	# spring-2.5.6.SEC01.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/spring-3.0
+	pushd "${D}"/${instdir} >/dev/null || die
+	# spring-aop-3.0.2.RELEASE.jar
+	# spring-asm-3.0.2.RELEASE.jar
+	# spring-aspects-3.0.2.RELEASE.jar
+	# spring-beans-3.0.2.RELEASE.jar
+	# spring-context-support-3.0.2.RELEASE.jar
+	# spring-context-3.0.2.RELEASE.jar
+	# spring-core-3.0.2.RELEASE.jar
+	# spring-expression-3.0.2.RELEASE.jar
+	# spring-instrument-tomcat-3.0.2.RELEASE.jar
+	# spring-instrument-3.0.2.RELEASE.jar
+	# spring-jdbc-3.0.2.RELEASE.jar
+	# spring-jms-3.0.2.RELEASE.jar
+	# spring-orm-3.0.2.RELEASE.jar
+	# spring-oxm-3.0.2.RELEASE.jar
+	# spring-struts-3.0.2.RELEASE.jar
+	# spring-test-3.0.2.RELEASE.jar
+	# spring-tx-3.0.2.RELEASE.jar
+	# spring-webmvc-portlet-3.0.2.RELEASE.jar
+	# spring-webmvc-3.0.2.RELEASE.jar
+	# spring-web-3.0.2.RELEASE.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/toplink
+	pushd "${D}"/${instdir} >/dev/null || die
+	# toplink-essentials-agent.jar
+	# toplink-essentials.jar
+	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 a57245799..a74c0c781 100644
--- a/dev-java/netbeans-javacard/ChangeLog
+++ b/dev-java/netbeans-javacard/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javacard-9999_p20120402 (03 Apr 2012)
+
+  03 Apr 2012; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javacard-9999_p20120402.ebuild:
+  Bumped to latest nightly sources
+
 *netbeans-javacard-9999_p20120328 (29 Mar 2012)
 
   29 Mar 2012; Miroslav Šulc <fordfrog@gentoo.org>
diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index d3c4f94da..c00c2cb4a 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -8,9 +8,11 @@ DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d
 DIST netbeans-9999-r2-build.xml.patch.bz2 2435 RMD160 c8988360fb0157b27a767d877dcd2a3d523b6178 SHA1 530768eb7ba1aff85b05cd15f21ac00edb15e55a SHA256 5f26c11ed3b34e99640a0b465ba348b07a2b91bfb061bf09f07ab07017ba5391
 DIST netbeans-trunk-nightly-201203250401-src.zip 177539743 RMD160 b078183a73a2691a71e191d890ddf71e31678103 SHA1 64490a2000e51cde6c8e2480285a5a438711b7c0 SHA256 eb9400386d9813b7aa9102f29557db7777a056af9bf3d17dfee17d4267377e4d
 DIST netbeans-trunk-nightly-201203280401-src.zip 177594044 RMD160 db98172a5ac7b055d845f92cc50840e07e6fb489 SHA1 702e46f0271580e8be745ed968579bd08c2c6be5 SHA256 ca0c9501d5eb837fb954ca40b9423bcb41dba8bf4a52cd6aadb13b02e26265eb
+DIST netbeans-trunk-nightly-201204021038-src.zip 177759174 RMD160 1e14efd847bcae1ca4f060b512ad31ea0610335f SHA1 c28dd9b9d2c4e12d3facab3d52b3fd6b3ea7563f SHA256 723a1133eb1c4a824d394ce9ac90248f0dd3bea2603f667172bf7780facde377
 EBUILD netbeans-javacard-7.0.1.ebuild 4961 RMD160 2838467c87ae15ce2a24214cb6d69ff5c77cbcd5 SHA1 74adc0ad143660dd782396a68fe702b2a3a43a9a SHA256 566bc7e3275c97d0fe3d68c843b53aee641548ec39a8143aebd56d248da3c32c
 EBUILD netbeans-javacard-7.1.1.ebuild 4970 RMD160 550a164ecc4b7be40f3f6ccc9533d504c68bb7bf SHA1 2336a49e7b9dc3aa09fa9ce668d2fb9656ec92ec SHA256 b35358ceb23c234aca2b989956cf1cfd1773ffb435343e51963f9ab59916413a
 EBUILD netbeans-javacard-9999_p20120325.ebuild 4993 RMD160 ce083e68fe5bf576b22eecd607f833cceefad5b1 SHA1 bd34dc53c6734a42332387cf943f0add9bf40952 SHA256 9b72a9c0c123a2c3099fe360f1f29b76dbd40ab7ce388df03eb04d5d2446df41
 EBUILD netbeans-javacard-9999_p20120328.ebuild 4993 RMD160 66ed36f83ab50b7b25ea43666a67efecdd10c9d3 SHA1 f4699882e156bfcdae623e59d3f9459e03ba192d SHA256 f1a5b6359e795ac6d17e5e9e47ea002023c5dc6faa28ad98227103b0cecd3d67
-MISC ChangeLog 30530 RMD160 1de5a61a6fe2281fe1ea5e2a1e55e86f9031822a SHA1 c728e9dc47cca5974fdadeb4a9bf7cc69b5426da SHA256 e6be52549f62c7b2d98ae014cdba2e1ea09b1bdff95064eea7f0a88ea6db1477
+EBUILD netbeans-javacard-9999_p20120402.ebuild 4993 RMD160 fffc4ff1aaf615eaeba538db8f71d4176d7f678c SHA1 1a1cf9cfa7b7c5c6ea3bcc058d1e87dee6b6fc61 SHA256 0a70f0a622e1e6f4fb1cdf70aa14a4cfff6fcbc7a0973378ab1b2c659a2c9075
+MISC ChangeLog 30711 RMD160 9ac5967e886eb734ed27899849095c8926ced972 SHA1 3b4d9109096c98b5e137f13d335bf94b249874b3 SHA256 5c877219d77f4a05b01d32a3b6872cb88b0eabc9dbebcad30bda5a989460c4b7
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003
diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20120402.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20120402.ebuild
new file mode 100644
index 000000000..ff14799e8
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20120402.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+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/2012-04-02_10-38-56/zip/netbeans-trunk-nightly-201204021038-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r2-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-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${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"
+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-r2-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-r2-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-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
+	# api_classic.jar
+	# api_connected.jar
+	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
+	# jcapt.jar
+	# jctasks.jar
+	# nbtasks.jar
+	# nbutils.jar
+	# tools.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	# apduio.jar
+	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 7501ef743..e2b8a780d 100644
--- a/dev-java/netbeans-javadoc/ChangeLog
+++ b/dev-java/netbeans-javadoc/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javadoc-9999_p20120402 (03 Apr 2012)
+
+  03 Apr 2012; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javadoc-9999_p20120402.ebuild:
+  Bumped to latest nightly sources
+
 *netbeans-javadoc-9999_p20120328 (29 Mar 2012)
 
   29 Mar 2012; Miroslav Šulc <fordfrog@gentoo.org>
diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index 03b5504e4..eebaf4c1a 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -6,9 +6,11 @@ DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d
 DIST netbeans-9999-r2-build.xml.patch.bz2 2435 RMD160 c8988360fb0157b27a767d877dcd2a3d523b6178 SHA1 530768eb7ba1aff85b05cd15f21ac00edb15e55a SHA256 5f26c11ed3b34e99640a0b465ba348b07a2b91bfb061bf09f07ab07017ba5391
 DIST netbeans-trunk-nightly-201203250401-src.zip 177539743 RMD160 b078183a73a2691a71e191d890ddf71e31678103 SHA1 64490a2000e51cde6c8e2480285a5a438711b7c0 SHA256 eb9400386d9813b7aa9102f29557db7777a056af9bf3d17dfee17d4267377e4d
 DIST netbeans-trunk-nightly-201203280401-src.zip 177594044 RMD160 db98172a5ac7b055d845f92cc50840e07e6fb489 SHA1 702e46f0271580e8be745ed968579bd08c2c6be5 SHA256 ca0c9501d5eb837fb954ca40b9423bcb41dba8bf4a52cd6aadb13b02e26265eb
+DIST netbeans-trunk-nightly-201204021038-src.zip 177759174 RMD160 1e14efd847bcae1ca4f060b512ad31ea0610335f SHA1 c28dd9b9d2c4e12d3facab3d52b3fd6b3ea7563f SHA256 723a1133eb1c4a824d394ce9ac90248f0dd3bea2603f667172bf7780facde377
 EBUILD netbeans-javadoc-7.0.1.ebuild 5814 RMD160 d5b77264285edf96d0a3a30666a4ae72ee2387a7 SHA1 ec29b545b0632d7ea9e8bdd2208f5d1fe9532561 SHA256 68531c51838c95012830f5ae09e2386ea3179c2b31bfd5191f67993e3b3dbe2f
 EBUILD netbeans-javadoc-7.1.1.ebuild 5855 RMD160 dae83cf856eb0306137c166abdd903513811ded4 SHA1 931763d3e254c541f9f8934047458b2b374d9862 SHA256 5b2efe8a3d3b2afeee6ba7f54ae362c7949512b74df87388e7d8dd7177e3d2de
 EBUILD netbeans-javadoc-9999_p20120325.ebuild 5845 RMD160 d2f9bf75f1031ac383c7fde77a55618454e301f8 SHA1 669add85f825aa8798085d536b9b5231d4ee835d SHA256 f06b70bc960756573bd2fe1ac7fe4f438bbb5a336d5a018c58fb291aa6507036
 EBUILD netbeans-javadoc-9999_p20120328.ebuild 5845 RMD160 c717f7739a5cd5a8e33bd45a3fa7b27075dcfcc2 SHA1 d17a53c32093a0fa68997aaf8f6dbd61936ebe21 SHA256 3fd7b9eaa04bb9ef5de6d03efd59f3c312e1859d1025b176002ee73dea755ec9
-MISC ChangeLog 30051 RMD160 4424e7700e6f4846751b7c1ab4839602356cf13d SHA1 2b3e48763c7c1664cb1031d07f567048f213a7da SHA256 56981c41540b0ca03f8fe5bf652e387a09c96eeeea284537dc62183b00e44b59
+EBUILD netbeans-javadoc-9999_p20120402.ebuild 5845 RMD160 33fcdf4624b18b68ef596879f543f06fb1bfee8f SHA1 5a3f7f4b222c9ea34b68759480993f22630b05dd SHA256 d91196c30bed410bd07e8d0d37c2587eea670b197c862eb0ec7cb6cd1f298928
+MISC ChangeLog 30230 RMD160 29b524d2f24924dc2756ca362c14fba0c1fcd44b SHA1 22a0f2c661ee57a5a1f8ffb48ee8f6fee9a48349 SHA256 4427bbac5cc7ec669c27757dcec4b6cdfa624e889cd36182dff0849d831a749d
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003
diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20120402.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20120402.ebuild
new file mode 100644
index 000000000..9d753bc75
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20120402.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+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/2012-04-02_10-38-56/zip/netbeans-trunk-nightly-201204021038-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r2-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+DEPEND="virtual/jdk:1.6
+	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-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"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r2-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip o.apache.tools.ant.module/external/ant-libs-1.8.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-r2-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-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 bc57379f6..26f1d7b57 100644
--- a/dev-java/netbeans-javafx/ChangeLog
+++ b/dev-java/netbeans-javafx/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javafx-9999_p20120402 (03 Apr 2012)
+
+  03 Apr 2012; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javafx-9999_p20120402.ebuild:
+  Bumped to latest nightly sources
+
 *netbeans-javafx-9999_p20120328 (29 Mar 2012)
 
   29 Mar 2012; Miroslav Šulc <fordfrog@gentoo.org>
diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index 39404fad4..560014325 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -5,8 +5,10 @@ DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d
 DIST netbeans-9999-r2-build.xml.patch.bz2 2435 RMD160 c8988360fb0157b27a767d877dcd2a3d523b6178 SHA1 530768eb7ba1aff85b05cd15f21ac00edb15e55a SHA256 5f26c11ed3b34e99640a0b465ba348b07a2b91bfb061bf09f07ab07017ba5391
 DIST netbeans-trunk-nightly-201203250401-src.zip 177539743 RMD160 b078183a73a2691a71e191d890ddf71e31678103 SHA1 64490a2000e51cde6c8e2480285a5a438711b7c0 SHA256 eb9400386d9813b7aa9102f29557db7777a056af9bf3d17dfee17d4267377e4d
 DIST netbeans-trunk-nightly-201203280401-src.zip 177594044 RMD160 db98172a5ac7b055d845f92cc50840e07e6fb489 SHA1 702e46f0271580e8be745ed968579bd08c2c6be5 SHA256 ca0c9501d5eb837fb954ca40b9423bcb41dba8bf4a52cd6aadb13b02e26265eb
+DIST netbeans-trunk-nightly-201204021038-src.zip 177759174 RMD160 1e14efd847bcae1ca4f060b512ad31ea0610335f SHA1 c28dd9b9d2c4e12d3facab3d52b3fd6b3ea7563f SHA256 723a1133eb1c4a824d394ce9ac90248f0dd3bea2603f667172bf7780facde377
 EBUILD netbeans-javafx-7.1.1.ebuild 3593 RMD160 37f400387ec83b13dbc0ee0156c223d8248146c5 SHA1 6226a77dd9826e28b772dfdfef173756a87baf8c SHA256 874409a260f4f2d28d022fcfdf4bc29b1d120e4e5e249897e9afd17fdcf095c7
 EBUILD netbeans-javafx-9999_p20120325.ebuild 3616 RMD160 b79a382486da7035c1e100de84a94e87fd2df67c SHA1 aff0431ee35673c4e536ed3d69ccb61f618a1919 SHA256 87f774637c8d82e34dc361c34fd7b35c89a92ece8decfca5ed706a45a0e7663f
 EBUILD netbeans-javafx-9999_p20120328.ebuild 3616 RMD160 b869526f9647020fe0311a58195bfde8b1720fa6 SHA1 5a1382e1d436c0b2eb03add1e4dc5158c659c589 SHA256 632f4fac395b320813f31c1d61a4a8443ea57afc2b77e70b4846d46ae2447913
-MISC ChangeLog 16510 RMD160 9263b8eb10d4ed376d633e3c7ad5be2a9f1c9427 SHA1 288a0ff65aa5b047ffe6e4a23e69d9ef0dc9ab05 SHA256 a92ecb574d97a251385b066fbe4986c67856c0fcfe44ebb78ea7a60f859eb3e3
+EBUILD netbeans-javafx-9999_p20120402.ebuild 3616 RMD160 3bcae2f260f5dbec5d0b245110b5bb46ff31bac5 SHA1 ccd61e7234bdef9ec746843d9c79517e9d6dab50 SHA256 e53298e7d7ca2b5617b0f46fd92e4692a31f5234ae83b5fb51ba742585c77a37
+MISC ChangeLog 16687 RMD160 369d951106e236257b662a327eaa328ce9b9ee89 SHA1 026af56d8215340b8633e3f1b93527984abd3cd3 SHA256 5bbcfc3797caface3eacb854bfe78fc3503dd84f49cd0625ce15cf75fd231177
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003
diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20120402.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20120402.ebuild
new file mode 100644
index 000000000..0dc42157b
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20120402.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+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/2012-04-02_10-38-56/zip/netbeans-trunk-nightly-201204021038-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r2-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
+	http://hg.netbeans.org/binaries/418FC62C8A6EF5311987B01FE389B1F88EFDDCA2-jemmy-2.3.0.0.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	dev-java/junit:4"
+RDEPEND=">=virtual/jdk-1.6
+	${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"
+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-r2-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}"/418FC62C8A6EF5311987B01FE389B1F88EFDDCA2-jemmy-2.3.0.0.jar jemmy/external/jemmy-2.3.0.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-r2-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-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 6e99730af..f585eeb89 100644
--- a/dev-java/netbeans-mobility/ChangeLog
+++ b/dev-java/netbeans-mobility/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-mobility-9999_p20120402 (03 Apr 2012)
+
+  03 Apr 2012; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-mobility-9999_p20120402.ebuild:
+  Bumped to latest nightly sources
+
 *netbeans-mobility-9999_p20120328 (29 Mar 2012)
 
   29 Mar 2012; Miroslav Šulc <fordfrog@gentoo.org>
diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 311253e51..43e87fd3b 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -14,9 +14,11 @@ DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d
 DIST netbeans-9999-r2-build.xml.patch.bz2 2435 RMD160 c8988360fb0157b27a767d877dcd2a3d523b6178 SHA1 530768eb7ba1aff85b05cd15f21ac00edb15e55a SHA256 5f26c11ed3b34e99640a0b465ba348b07a2b91bfb061bf09f07ab07017ba5391
 DIST netbeans-trunk-nightly-201203250401-src.zip 177539743 RMD160 b078183a73a2691a71e191d890ddf71e31678103 SHA1 64490a2000e51cde6c8e2480285a5a438711b7c0 SHA256 eb9400386d9813b7aa9102f29557db7777a056af9bf3d17dfee17d4267377e4d
 DIST netbeans-trunk-nightly-201203280401-src.zip 177594044 RMD160 db98172a5ac7b055d845f92cc50840e07e6fb489 SHA1 702e46f0271580e8be745ed968579bd08c2c6be5 SHA256 ca0c9501d5eb837fb954ca40b9423bcb41dba8bf4a52cd6aadb13b02e26265eb
+DIST netbeans-trunk-nightly-201204021038-src.zip 177759174 RMD160 1e14efd847bcae1ca4f060b512ad31ea0610335f SHA1 c28dd9b9d2c4e12d3facab3d52b3fd6b3ea7563f SHA256 723a1133eb1c4a824d394ce9ac90248f0dd3bea2603f667172bf7780facde377
 EBUILD netbeans-mobility-7.0.1.ebuild 8655 RMD160 97622d84257291737ea08fa69205ba0377747896 SHA1 2240a20d8c81315c88ed2468e6ca9e3a54ecc5d5 SHA256 992e214ff2926e2f0db623d96b717bf8f8e4ceb47e96e69b3c6b8f67d6a8d130
 EBUILD netbeans-mobility-7.1.1.ebuild 7543 RMD160 7b7e5ae757445acd61746b035269c640d6c012b7 SHA1 768a4029d836765f45d57652e2713172542abb01 SHA256 66cb7fb6f94353f997254d8d81156440c9b66fcd8bac9a3635225d6675c89dd7
 EBUILD netbeans-mobility-9999_p20120325.ebuild 7566 RMD160 ef78420e464457c6a4c953d785c0a70ddc5733ed SHA1 d09852e38e7511a1f366625de6def6a43c33dc54 SHA256 320f056f683692a9e97c478d2ff81f7261defedd5690b2c8eb5b540cec9973e3
 EBUILD netbeans-mobility-9999_p20120328.ebuild 7566 RMD160 5fd91de270b224257a144e09179098dc85e75bd1 SHA1 e94a2343fb88c65dacc1145770a889296763d2ca SHA256 46217f8361fd203939cc99c253c94fd074121b62f1cb5be09acfef554044c6b7
-MISC ChangeLog 30671 RMD160 aaef68381acbda9327077a22dcd1e00130f808f0 SHA1 2a9ff1063b479a620ed0aa9979144150ecfb4775 SHA256 b91e1f21489ab75ca728da792f0a92343fe60570108ac8bddd1f31f08cac986b
+EBUILD netbeans-mobility-9999_p20120402.ebuild 7566 RMD160 9fb21a919fdf3db5bbd76efe4a46e847828fae08 SHA1 8ae3ee87cddc8019f00a414ebba5e8f25951f04b SHA256 79d110355e5ab02e2e73e86cb98327288d778b7b635762b9f4e63316b91f17e0
+MISC ChangeLog 30852 RMD160 90f0e6b1a3b585b1931aa14073b8cb63f833b437 SHA1 18690f7e7842acd5daeaf7e56dba2f949298fe83 SHA256 ec44a1c97dde33edba522604f4fe1be27d70f734cf68879a3a8855ec610e33e6
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003
diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20120402.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20120402.ebuild
new file mode 100644
index 000000000..1c09201f4
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20120402.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+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/2012-04-02_10-38-56/zip/netbeans-trunk-nightly-201204021038-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r2-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/CEF99941E945D543DF0711F2C6AEF765B50F8501-jakarta-slide-ant-webdav-2.1.jar
+	http://hg.netbeans.org/binaries/D1B5BA3BFE8DCFAF08A0468F8879EF1D0E998038-jakarta-slide-webdavlib-2.1.jar
+	http://hg.netbeans.org/binaries/2FB485DD8C5EFC7972037781BFFF0CE31316FCE6-jmunit-1.2.1-api.zip
+	http://hg.netbeans.org/binaries/BD84F1A4C0789070CC62A8D2DBA75121A57C069C-jmunit4cldc10-1.2.1.jar
+	http://hg.netbeans.org/binaries/D76B8334DCBDBE93297AA5C02B17D9A856E72246-jmunit4cldc11-1.2.1.jar
+	http://hg.netbeans.org/binaries/D63B2CB355170F1BC8E126E43021047F94243B70-perseus-nb-1.0.1.jar"
+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-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/ant-contrib:0
+	dev-java/commons-httpclient:3
+	dev-java/jdom:1.0"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${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"
+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-r2-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/CEF99941E945D543DF0711F2C6AEF765B50F8501-jakarta-slide-ant-webdav-2.1.jar mobility.deployment.webdav/external/jakarta-slide-ant-webdav-2.1.jar || die
+	ln -s "${DISTDIR}"/D1B5BA3BFE8DCFAF08A0468F8879EF1D0E998038-jakarta-slide-webdavlib-2.1.jar mobility.deployment.webdav/external/jakarta-slide-webdavlib-2.1.jar || die
+	ln -s "${DISTDIR}"/2FB485DD8C5EFC7972037781BFFF0CE31316FCE6-jmunit-1.2.1-api.zip mobility.j2meunit/external/jmunit-1.2.1-api.zip || die
+	ln -s "${DISTDIR}"/BD84F1A4C0789070CC62A8D2DBA75121A57C069C-jmunit4cldc10-1.2.1.jar mobility.j2meunit/external/jmunit4cldc10-1.2.1.jar || die
+	ln -s "${DISTDIR}"/D76B8334DCBDBE93297AA5C02B17D9A856E72246-jmunit4cldc11-1.2.1.jar mobility.j2meunit/external/jmunit4cldc11-1.2.1.jar || die
+	ln -s "${DISTDIR}"/D63B2CB355170F1BC8E126E43021047F94243B70-perseus-nb-1.0.1.jar svg.perseus/external/perseus-nb-1.0.1.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r2-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 mobility.antext/external ant-contrib ant-contrib.jar ant-contrib-1.0b3.jar
+	java-pkg_jar-from --into mobility.deployment.webdav/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.0.1.jar
+	java-pkg_jar-from --into mobility.deployment.webdav/external jdom-1.0 jdom.jar jdom-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-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-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
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	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
+	# cdc-agui-swing-layout.jar
+	# cdc-pp-awt-layout.jar
+	rm commons-httpclient-3.0.1.jar && dosym /usr/share/commons-httpclient-3/lib/commons-httpclient.jar ${instdir}/commons-httpclient-3.0.1.jar || die
+	# jakarta-slide-ant-webdav-2.1.jar
+	# jakarta-slide-webdavlib-2.1.jar
+	rm jdom-1.0.jar && dosym /usr/share/jdom-1.0/lib/jdom.jar ${instdir}/jdom-1.0.jar || die
+	# jmunit4cldc10-1.2.1.jar
+	# jmunit4cldc11-1.2.1.jar
+	# nbactivesync-5.0.jar
+	# nb_svg_midp_components.jar
+	# netbeans_databindingme.jar
+	# netbeans_databindingme_pim.jar
+	# netbeans_databindingme_svg.jar
+	# netbeans_midp_components_basic.jar
+	# netbeans_midp_components_pda.jar
+	# netbeans_midp_components_wma.jar
+	# org-netbeans-modules-deployment-deviceanywhere.jar
+	# org-netbeans-modules-j2me-cdc-platform-nsicom-probe.jar
+	# org-netbeans-modules-j2me-cdc-project.jar
+	# org-netbeans-modules-j2me-cdc-project-nokiaS80.jar
+	# org-netbeans-modules-j2me-cdc-project-ojec.jar
+	# org-netbeans-modules-j2me-cdc-project-ricoh.jar
+	# org-netbeans-modules-j2me-cdc-project-savaje.jar
+	# org-netbeans-modules-j2me-cdc-project-semc.jar
+	# org-netbeans-modules-j2me-cdc-project-sjmc.jar
+	# perseus-nb-1.0.1.jar
+	# RicohAntTasks-2.0.jar
+	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 2e96f8b81..89e4795a5 100644
--- a/dev-java/netbeans-nb/ChangeLog
+++ b/dev-java/netbeans-nb/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-nb-9999_p20120402 (03 Apr 2012)
+
+  03 Apr 2012; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-nb-9999_p20120402.ebuild:
+  Bumped to latest nightly sources
+
 *netbeans-nb-9999_p20120328 (29 Mar 2012)
 
   29 Mar 2012; Miroslav Šulc <fordfrog@gentoo.org>
diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index 5ac65e23f..078926df3 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -9,9 +9,11 @@ DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d
 DIST netbeans-9999-r2-build.xml.patch.bz2 2435 RMD160 c8988360fb0157b27a767d877dcd2a3d523b6178 SHA1 530768eb7ba1aff85b05cd15f21ac00edb15e55a SHA256 5f26c11ed3b34e99640a0b465ba348b07a2b91bfb061bf09f07ab07017ba5391
 DIST netbeans-trunk-nightly-201203250401-src.zip 177539743 RMD160 b078183a73a2691a71e191d890ddf71e31678103 SHA1 64490a2000e51cde6c8e2480285a5a438711b7c0 SHA256 eb9400386d9813b7aa9102f29557db7777a056af9bf3d17dfee17d4267377e4d
 DIST netbeans-trunk-nightly-201203280401-src.zip 177594044 RMD160 db98172a5ac7b055d845f92cc50840e07e6fb489 SHA1 702e46f0271580e8be745ed968579bd08c2c6be5 SHA256 ca0c9501d5eb837fb954ca40b9423bcb41dba8bf4a52cd6aadb13b02e26265eb
+DIST netbeans-trunk-nightly-201204021038-src.zip 177759174 RMD160 1e14efd847bcae1ca4f060b512ad31ea0610335f SHA1 c28dd9b9d2c4e12d3facab3d52b3fd6b3ea7563f SHA256 723a1133eb1c4a824d394ce9ac90248f0dd3bea2603f667172bf7780facde377
 EBUILD netbeans-nb-7.0.1.ebuild 5116 RMD160 df3e2ea3364e01de002fbb97b56c2bf927ba0e2c SHA1 f962fd0ba56bab72ef843342d94d0992e615698f SHA256 17ac4a9aa7931d052a899ad8649bed42d5c37a06d913e0dc8ded118d7ef01c47
 EBUILD netbeans-nb-7.1.1.ebuild 4987 RMD160 53ab38fc92b4496f13ea99273fe3fbed89dc5554 SHA1 e1ee8f7bb0a1a4b28c2cb9a783b89169e795a878 SHA256 3ad49d73a05b5355594ddd5384c249230451959cab49350bf75eff42c0992db6
 EBUILD netbeans-nb-9999_p20120325.ebuild 5010 RMD160 0bebf765665e59c02faf889abb43794f588159e9 SHA1 5d0b23c051f53b523b11fed3c8a2ce953fe9d1e4 SHA256 4a16ea11c13baeb9f1607b5348771e40dac78fda53cbbf364115416b6f9efb4f
 EBUILD netbeans-nb-9999_p20120328.ebuild 5010 RMD160 e21560db60676d20cafa91ffaaca1a5a8ce91387 SHA1 8957bb67c0a4d29af189faf03bed4e41aaecd61d SHA256 3886096f760b8121e41029a924328ec55346d070a2f2b4c936ea79678a87fb01
-MISC ChangeLog 29100 RMD160 878bd73e3ddfabd13dc80324749da8d35fd68b24 SHA1 8f0617fd1c0500b8d71681dd4f3357f333a2bc31 SHA256 24a91bda0f1189650090aea17c8d7a11995a7e897a1cc2c16b5b4de272818c26
+EBUILD netbeans-nb-9999_p20120402.ebuild 5010 RMD160 f916f3ff635b74c776d97be994794c9a3ef34e97 SHA1 d8fbeb6806b45e47a1a02b292fb55df0203b1b4e SHA256 d2b4fcb85ae57588e549358334dfa65e5f8690e3f89622e3387860b12e06337c
+MISC ChangeLog 29269 RMD160 beec54c802181d7ed333b0dafaca6d6a4225fe72 SHA1 5a064aa7039777105738b6393d59d9d75bfbfd95 SHA256 8bc5e43f9b6613e5aff7cdfb85c1cd14ca87e4a3362380842a1cf41f73241c47
 MISC metadata.xml 396 RMD160 80c4086b305af8d5e4adae8a263111590f183c05 SHA1 11224a41781dde9ebd92c32e5c0a9d1921b628cb SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49
diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20120402.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20120402.ebuild
new file mode 100644
index 000000000..ae89eca0a
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20120402.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+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/2012-04-02_10-38-56/zip/netbeans-trunk-nightly-201204021038-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r2-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.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${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"
+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-r2-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r2-build.xml.patch
+	use keychain && epatch "${FILESDIR}"/${SLOT}/keychain-support.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans >/dev/null || die
+
+	insinto ${INSTALL_DIR}/nb
+
+	grep -E "/nb$" moduleCluster.properties > "${D}"/${INSTALL_DIR}/nb/moduleCluster.properties || die
+
+	insinto ${INSTALL_DIR}
+	doins -r nb
+	dodoc *.txt
+	dohtml *.html *.css
+
+	insinto ${INSTALL_DIR}/bin
+	doins bin/netbeans
+	dosym ${INSTALL_DIR}/bin/netbeans /usr/bin/netbeans-${SLOT}
+	fperms 755 ${INSTALL_DIR}/bin/netbeans
+
+	insinto /etc/netbeans-${SLOT}
+	doins etc/*
+	dosym /etc/netbeans-${SLOT} ${INSTALL_DIR}/etc
+
+	# fix paths per bug# 163483
+	if [[ -e "${D}"/${INSTALL_DIR}/bin/netbeans ]]; then
+		sed -i -e "s:\"\$progdir\"/../etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans
+		sed -i -e "s:\"\${userdir}\"/etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans
+	fi
+
+	dodir /usr/share/icons/hicolor/32x32/apps
+	dosym ${INSTALL_DIR}/nb/netbeans.png /usr/share/icons/hicolor/32x32/apps/netbeans-${SLOT}.png
+	dodir /usr/share/icons/hicolor/128x128/apps
+	cp "${DISTDIR}"/netbeans-7.0.png "${D}"/usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png || die
+	dosym /usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png /usr/share/pixmaps/netbeans-${SLOT}.png
+
+	popd >/dev/null || die
+
+	make_desktop_entry netbeans-${SLOT} "Netbeans ${PV}" netbeans-${SLOT} Development
+
+	mkdir -p  "${D}"/${INSTALL_DIR}/nb/config || die
+	echo "NBGNT" > "${D}"/${INSTALL_DIR}/nb/config/productid || die
+}
+
+pkg_postinst() {
+	if use keychain ; then
+		einfo "You enabled keychain support, that means NetBeans will use keychain for managing"
+		einfo "your keys while connecting to ssh protected repositories. If you want to load some"
+		einfo "keys on NetBeans startup, create file keychain-keys.txt in your userdir"
+		einfo "(~/.netbeans/${SLOT}/keychain-keys.txt) and put names of your keys in the file,"
+		einfo "each key on single line, for example:"
+		einfo "id_dsa"
+		einfo "id_dsa_gentoo"
+		einfo "If on NetBeans startup key will not be handled by keychain yet, you will be asked"
+		einfo "for key password (only this time and never again). You can find more information"
+		einfo "about keychain at http://www.gentoo.org/doc/en/keychain-guide.xml"
+	fi
+}
diff --git a/dev-java/netbeans-php/ChangeLog b/dev-java/netbeans-php/ChangeLog
index 9bc72d551..8c1d58ca7 100644
--- a/dev-java/netbeans-php/ChangeLog
+++ b/dev-java/netbeans-php/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-php-9999_p20120402 (03 Apr 2012)
+
+  03 Apr 2012; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-php-9999_p20120402.ebuild:
+  Bumped to latest nightly sources
+
 *netbeans-php-9999_p20120328 (29 Mar 2012)
 
   29 Mar 2012; Miroslav Šulc <fordfrog@gentoo.org>
diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index c9587d92c..243df4f09 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -11,9 +11,11 @@ DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d
 DIST netbeans-9999-r2-build.xml.patch.bz2 2435 RMD160 c8988360fb0157b27a767d877dcd2a3d523b6178 SHA1 530768eb7ba1aff85b05cd15f21ac00edb15e55a SHA256 5f26c11ed3b34e99640a0b465ba348b07a2b91bfb061bf09f07ab07017ba5391
 DIST netbeans-trunk-nightly-201203250401-src.zip 177539743 RMD160 b078183a73a2691a71e191d890ddf71e31678103 SHA1 64490a2000e51cde6c8e2480285a5a438711b7c0 SHA256 eb9400386d9813b7aa9102f29557db7777a056af9bf3d17dfee17d4267377e4d
 DIST netbeans-trunk-nightly-201203280401-src.zip 177594044 RMD160 db98172a5ac7b055d845f92cc50840e07e6fb489 SHA1 702e46f0271580e8be745ed968579bd08c2c6be5 SHA256 ca0c9501d5eb837fb954ca40b9423bcb41dba8bf4a52cd6aadb13b02e26265eb
+DIST netbeans-trunk-nightly-201204021038-src.zip 177759174 RMD160 1e14efd847bcae1ca4f060b512ad31ea0610335f SHA1 c28dd9b9d2c4e12d3facab3d52b3fd6b3ea7563f SHA256 723a1133eb1c4a824d394ce9ac90248f0dd3bea2603f667172bf7780facde377
 EBUILD netbeans-php-7.0.1.ebuild 4151 RMD160 948630039891c480cbc0a9440fd9d74438bbcca4 SHA1 9afb5f8b29bc9c86fce11b8a44976da980741ec8 SHA256 3aee393fe89aa4788ccd17af46f1df43a5681c28af6d580724d8db0f5e804ff0
 EBUILD netbeans-php-7.1.1.ebuild 3940 RMD160 ae247bfbc18ebf76ac7a9295310f6f4d344988fd SHA1 3b0d9e2595bbb3e96921ca2dce65875319e84b7b SHA256 9974bb3737eb902a178d3e8d4367ad7721a512ade1a1fc394a74513c4bd0ac12
 EBUILD netbeans-php-9999_p20120325.ebuild 4199 RMD160 a00002078d7589b949f01cb4d82b2fdb3e653165 SHA1 10b4175f14b9e90017505a88cfefcd410497e89a SHA256 8afa3235411e17ac06c1f735da2301b09644c65a32d47057528b23870d9f47c4
 EBUILD netbeans-php-9999_p20120328.ebuild 4199 RMD160 0005764d1c9b5f0498d034b6b09e1c3d9826bf59 SHA1 4812240d771b400e39ecca630c8161086f8cda23 SHA256 47823cd0fa7f7d285038cde8d7484f8c5a308d33a02a7b2bf1b10a3c2d3d642d
-MISC ChangeLog 28778 RMD160 8cf5cc16e60e3ba34fc602a414ac6f128ba69792 SHA1 79289708678c05d72fb832d2aab9289f9035d017 SHA256 57447c2064db75618e09e5c31c18ec00a258656b61b2a7b73b59bbd4d677faf2
+EBUILD netbeans-php-9999_p20120402.ebuild 4199 RMD160 7d166b62f3a9b6865c47988f5e47845925ee395f SHA1 9c273abc97efa2599c90eeaae6ddda3c0d19c7c0 SHA256 d1929ae30344fac1be3ba3ae1e145c88d40426153712d50db77ed1131202a568
+MISC ChangeLog 28949 RMD160 02e05b2c1886a43d81ccd6b1df15e724fef8143e SHA1 1f814addc1ecc1d78d3887b3e10854e69a80668b SHA256 6a659ea1ed3ec19266ec8c827b49f3c451784057ccc78dda0670c1c8560a272f
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003
diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20120402.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20120402.ebuild
new file mode 100644
index 000000000..b38fd531a
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20120402.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+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/2012-04-02_10-38-56/zip/netbeans-trunk-nightly-201204021038-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r2-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip
+	http://hg.netbeans.org/binaries/02C57E8113871A5CEC0AB853D48165761FAF1051-phpsigfiles.zip
+	http://hg.netbeans.org/binaries/40BC40A6E6DBD598900E8FAB87E460FCC601275C-predefined_vars.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}
+	~dev-java/netbeans-webcommon-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/javacup:0"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${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"
+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-r2-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}"/02C57E8113871A5CEC0AB853D48165761FAF1051-phpsigfiles.zip php.project/external/phpsigfiles.zip || die
+	ln -s "${DISTDIR}"/40BC40A6E6DBD598900E8FAB87E460FCC601275C-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-r2-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-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 a9d5952c7..a48308dae 100644
--- a/dev-java/netbeans-platform/ChangeLog
+++ b/dev-java/netbeans-platform/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-platform-9999_p20120402 (03 Apr 2012)
+
+  03 Apr 2012; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-platform-9999_p20120402.ebuild:
+  Bumped to latest nightly sources
+
 *netbeans-platform-9999_p20120328 (29 Mar 2012)
 
   29 Mar 2012; Miroslav Šulc <fordfrog@gentoo.org>
diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index dd8ab8774..6a5d740f7 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -17,9 +17,11 @@ DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d
 DIST netbeans-9999-r2-build.xml.patch.bz2 2435 RMD160 c8988360fb0157b27a767d877dcd2a3d523b6178 SHA1 530768eb7ba1aff85b05cd15f21ac00edb15e55a SHA256 5f26c11ed3b34e99640a0b465ba348b07a2b91bfb061bf09f07ab07017ba5391
 DIST netbeans-trunk-nightly-201203250401-src.zip 177539743 RMD160 b078183a73a2691a71e191d890ddf71e31678103 SHA1 64490a2000e51cde6c8e2480285a5a438711b7c0 SHA256 eb9400386d9813b7aa9102f29557db7777a056af9bf3d17dfee17d4267377e4d
 DIST netbeans-trunk-nightly-201203280401-src.zip 177594044 RMD160 db98172a5ac7b055d845f92cc50840e07e6fb489 SHA1 702e46f0271580e8be745ed968579bd08c2c6be5 SHA256 ca0c9501d5eb837fb954ca40b9423bcb41dba8bf4a52cd6aadb13b02e26265eb
+DIST netbeans-trunk-nightly-201204021038-src.zip 177759174 RMD160 1e14efd847bcae1ca4f060b512ad31ea0610335f SHA1 c28dd9b9d2c4e12d3facab3d52b3fd6b3ea7563f SHA256 723a1133eb1c4a824d394ce9ac90248f0dd3bea2603f667172bf7780facde377
 EBUILD netbeans-platform-7.0.1.ebuild 5049 RMD160 d6a01c7785d02b9e5aebb1a2f192c5a2b6f1ccae SHA1 2acc23f9e9f6f5c60cabce30e651b3d31d91ac41 SHA256 b67cf0867358fea808614c02b8b6ea2ab88223f8642175ac3f91dc8c610aca4e
 EBUILD netbeans-platform-7.1.1.ebuild 5034 RMD160 fd4d05d3b693f295eae57db2892bd05837b96614 SHA1 38e239aaa67759a2ca65b6fb0c010bff89c1733b SHA256 a28438f57c381e90256d5b0bf5a5ae0a337cd8747d5f07994059f1a134f61dd1
 EBUILD netbeans-platform-9999_p20120325.ebuild 5566 RMD160 2adfe04ea672817aeb7823d4e529a1423601e418 SHA1 701ec8b02afb6a212fcad4615020d1cdb972db55 SHA256 2105fb06175089e9b2193cd99730bc717847e7be61ce176a57584f855c591d78
 EBUILD netbeans-platform-9999_p20120328.ebuild 5566 RMD160 c7fb748a835089b153d0bcfe1a71ea9fb7cb1ad4 SHA1 9c7c8c8c0af589e627fa8ee5a683c7b614131f4d SHA256 2dabb56881172860a858745b41469170cfc98d289d5816d09ea53cf4b8ef03e1
-MISC ChangeLog 31235 RMD160 cfa447c41e4cb85c63eadcba3d4511b6a77fd5a2 SHA1 b15247217d46a618d4e1deb4d9bbb0c09198df38 SHA256 46e0bca03766c94c01f84ae61e2778eb69348cfad5ffec3936b31cdda09c4185
+EBUILD netbeans-platform-9999_p20120402.ebuild 5566 RMD160 e527a1ce11407b00db6958f796b776ee059ef691 SHA1 48cff58d707307428352dbc1a0c827b563c3f3b5 SHA256 4e99a4716361fc64fc9a6c5e459cafb356bbe49b5dbd0431fe805bddf86b6e44
+MISC ChangeLog 31416 RMD160 20478fc2a73b8c5a999e24a6bfa5533d5120bc86 SHA1 731be37edb80da0767474895ecd3d007004d4eec SHA256 99105b07b44ab3c440859b02c1867adbb5e3182e2cb0f77cad9d349407c0f5d1
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003
diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20120402.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20120402.ebuild
new file mode 100644
index 000000000..d94ed587a
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20120402.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+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/2012-04-02_10-38-56/zip/netbeans-trunk-nightly-201204021038-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r2-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/14F630EDF137F54188636B5139432986D5FB19B7-felix-4.0.2.jar
+	http://hg.netbeans.org/binaries/2D80F93B8803250F232902C46EBA850BF1F3E67F-org.eclipse.osgi_3.7.1.R37x_v20110808-1106.jar
+	http://hg.netbeans.org/binaries/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar
+	http://hg.netbeans.org/binaries/30B192ADACF0EBA1096F18B3AC445123E212CFC9-osgi.core-4.3.jar
+	http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip
+	http://hg.netbeans.org/binaries/7946DC68552946622BD86FBF7A47D75B0C83C52D-testng-6.5beta-dist.jar
+	http://hg.netbeans.org/binaries/DE34E27064497584DFE5E1A650F04C607617D9F1-testng-6.5beta-javadoc.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="dev-java/javahelp:0
+	>=dev-java/jna-3.2.7:0
+	dev-java/swing-layout:1[source]"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}"
+RDEPEND=">=virtual/jdk-1.6
+	${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"
+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-r2-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/14F630EDF137F54188636B5139432986D5FB19B7-felix-4.0.2.jar libs.felix/external/felix-4.0.2.jar || die
+	ln -s "${DISTDIR}"/2D80F93B8803250F232902C46EBA850BF1F3E67F-org.eclipse.osgi_3.7.1.R37x_v20110808-1106.jar netbinox/external/org.eclipse.osgi_3.7.1.R37x_v20110808-1106.jar || die
+	ln -s "${DISTDIR}"/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar libs.osgi/external/osgi.cmpn-4.2.jar || die
+	ln -s "${DISTDIR}"/30B192ADACF0EBA1096F18B3AC445123E212CFC9-osgi.core-4.3.jar libs.osgi/external/osgi.core-4.3.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}"/7946DC68552946622BD86FBF7A47D75B0C83C52D-testng-6.5beta-dist.jar libs.testng/external/testng-6.5beta-dist.jar || die
+	ln -s "${DISTDIR}"/DE34E27064497584DFE5E1A650F04C607617D9F1-testng-6.5beta-javadoc.zip libs.testng/external/testng-6.5beta-javadoc.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r2-build.xml.patch
+	# upstream jna jar contains bundled binary libraries so we disable that feature
+
+	# 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 core.nativeaccess/external jna platform.jar platform-3.2.7.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-3.2.7.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
+	# felix-main-2.0.2.jar
+	# felix-4.0.2.jar
+	rm jhall-2.0_05.jar && dosym /usr/share/javahelp/lib/jhall.jar ${instdir}/jhall-2.0_05.jar || die
+	rm jna-3.2.7.jar && dosym /usr/share/jna/lib/jna.jar ${instdir}/jna-3.2.7.jar || die
+	# osgi.cmpn-4.2.jar
+	# osgi.core-4.3.jar
+	rm platform-3.2.7.jar && dosym /usr/share/jna/lib/platform.jar ${instdir}/platform-3.2.7.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
+	# updater.jar
+	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 e68eafaf1..3e6454da4 100644
--- a/dev-java/netbeans-profiler/ChangeLog
+++ b/dev-java/netbeans-profiler/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-profiler-9999_p20120402 (03 Apr 2012)
+
+  03 Apr 2012; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-profiler-9999_p20120402.ebuild:
+  Bumped to latest nightly sources
+
 *netbeans-profiler-9999_p20120328 (29 Mar 2012)
 
   29 Mar 2012; Miroslav Šulc <fordfrog@gentoo.org>
diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 761e400aa..06cf70492 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -5,9 +5,11 @@ DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d
 DIST netbeans-9999-r2-build.xml.patch.bz2 2435 RMD160 c8988360fb0157b27a767d877dcd2a3d523b6178 SHA1 530768eb7ba1aff85b05cd15f21ac00edb15e55a SHA256 5f26c11ed3b34e99640a0b465ba348b07a2b91bfb061bf09f07ab07017ba5391
 DIST netbeans-trunk-nightly-201203250401-src.zip 177539743 RMD160 b078183a73a2691a71e191d890ddf71e31678103 SHA1 64490a2000e51cde6c8e2480285a5a438711b7c0 SHA256 eb9400386d9813b7aa9102f29557db7777a056af9bf3d17dfee17d4267377e4d
 DIST netbeans-trunk-nightly-201203280401-src.zip 177594044 RMD160 db98172a5ac7b055d845f92cc50840e07e6fb489 SHA1 702e46f0271580e8be745ed968579bd08c2c6be5 SHA256 ca0c9501d5eb837fb954ca40b9423bcb41dba8bf4a52cd6aadb13b02e26265eb
+DIST netbeans-trunk-nightly-201204021038-src.zip 177759174 RMD160 1e14efd847bcae1ca4f060b512ad31ea0610335f SHA1 c28dd9b9d2c4e12d3facab3d52b3fd6b3ea7563f SHA256 723a1133eb1c4a824d394ce9ac90248f0dd3bea2603f667172bf7780facde377
 EBUILD netbeans-profiler-7.0.1.ebuild 3113 RMD160 dcfd93da14dbcf6a090cefd843bd8e6bbdcaa051 SHA1 a9fee09c442cbcd4187f2dc1443e19cdd9a96003 SHA256 588797a6b81c7f5ba5e1cf06ad66e593bd89aa28261b68006ebb973d0eae8044
 EBUILD netbeans-profiler-7.1.1.ebuild 3122 RMD160 7fb87ff51d8080c2b070b281dd877d930985b443 SHA1 376158790b3cc68d86a2c52cff62e14cfeed3fb0 SHA256 ab4283f4c407c778a447f93ea4278bcce0e87965524d3e298b0cfd6821a390b4
 EBUILD netbeans-profiler-9999_p20120325.ebuild 3145 RMD160 d56ec45cc5a28297c4b66807fb78553eaaee83c0 SHA1 4b3b1faf2d1cbfdaf085d69b0ca5dd50d1812b00 SHA256 784a48e59cf0d77f7c6baaf920626483b8beff3f528b3292eaeed45f38d0d46a
 EBUILD netbeans-profiler-9999_p20120328.ebuild 3145 RMD160 968ffdb41e64cc68efa68ee26c911b8dcdb4d692 SHA1 39383e82aaa0823dad76424d629aa538379c44c6 SHA256 b40b893a3c9f05c583e3dd3a5b97c78fe698c1273200729a6b628eac6f0a53a8
-MISC ChangeLog 30530 RMD160 c8fdb871f511e10b73e2cbd738363e98856dae6c SHA1 330f996ba4439c1f44559a2ae3f839db8b59622e SHA256 97c916e8d31678fef400df8a7c7507c825d3475730052107983bfa22435993cf
+EBUILD netbeans-profiler-9999_p20120402.ebuild 3145 RMD160 4015208e47b37669ab60fe9378ecd7a76ac47fcc SHA1 b553e4c555f0544188f7a9db2d5467d3c4136c56 SHA256 6b2da4df42318402a2b856312da67a3672c84af657bdc3f0abbf8bc3a52222dd
+MISC ChangeLog 30711 RMD160 04be390cd03ab660ba279eb778732289fb04f5cc SHA1 b4a1a2d5296cfb426ef525356373753abee94556 SHA256 ebd2037220caae6eeff93f46082b986acea2cc1d9fa09101fefc995e0e45ed43
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003
diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20120402.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20120402.ebuild
new file mode 100644
index 000000000..c9285dd09
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20120402.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+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/2012-04-02_10-38-56/zip/netbeans-trunk-nightly-201204021038-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r2-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-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${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"
+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-r2-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r2-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-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 89ccc1b71..42f76aa31 100644
--- a/dev-java/netbeans-webcommon/ChangeLog
+++ b/dev-java/netbeans-webcommon/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-webcommon-9999_p20120402 (03 Apr 2012)
+
+  03 Apr 2012; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-webcommon-9999_p20120402.ebuild:
+  Bumped to latest nightly sources
+
 *netbeans-webcommon-9999_p20120328 (29 Mar 2012)
 
   29 Mar 2012; Miroslav Šulc <fordfrog@gentoo.org>
diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index 88ff41d61..7535585b9 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -1,7 +1,9 @@
 DIST netbeans-9999-r2-build.xml.patch.bz2 2435 RMD160 c8988360fb0157b27a767d877dcd2a3d523b6178 SHA1 530768eb7ba1aff85b05cd15f21ac00edb15e55a SHA256 5f26c11ed3b34e99640a0b465ba348b07a2b91bfb061bf09f07ab07017ba5391
 DIST netbeans-trunk-nightly-201203250401-src.zip 177539743 RMD160 b078183a73a2691a71e191d890ddf71e31678103 SHA1 64490a2000e51cde6c8e2480285a5a438711b7c0 SHA256 eb9400386d9813b7aa9102f29557db7777a056af9bf3d17dfee17d4267377e4d
 DIST netbeans-trunk-nightly-201203280401-src.zip 177594044 RMD160 db98172a5ac7b055d845f92cc50840e07e6fb489 SHA1 702e46f0271580e8be745ed968579bd08c2c6be5 SHA256 ca0c9501d5eb837fb954ca40b9423bcb41dba8bf4a52cd6aadb13b02e26265eb
+DIST netbeans-trunk-nightly-201204021038-src.zip 177759174 RMD160 1e14efd847bcae1ca4f060b512ad31ea0610335f SHA1 c28dd9b9d2c4e12d3facab3d52b3fd6b3ea7563f SHA256 723a1133eb1c4a824d394ce9ac90248f0dd3bea2603f667172bf7780facde377
 EBUILD netbeans-webcommon-9999_p20120325.ebuild 2705 RMD160 ef5db66bc3c9a657fdaef245d9a0f0ff9f368b07 SHA1 236af5028384942736d0c0ba908847c46c573d70 SHA256 f1c6f0a45af118916e05f84d2dcadba827669222cecbf0894f174d77fb75272b
 EBUILD netbeans-webcommon-9999_p20120328.ebuild 2705 RMD160 13992c97054a329b61c946be70df0c5248b31ab8 SHA1 6c37043130574e369bf8b60fa67772d15d3d34b1 SHA256 249d1c759178e968d7f54ea486f47e5e25156263d57795498fda8160d55d6ff7
-MISC ChangeLog 2467 RMD160 4009e14a8c1059e722fb3eee9fd5e69d73b64a1b SHA1 476be2b0137a87e191ccf2d4f962d8ce30bd4805 SHA256 286cf2178aa30b5e86f19bac919abc31e447ba93a9a68597775c7d4e29d00874
+EBUILD netbeans-webcommon-9999_p20120402.ebuild 2705 RMD160 b5cce87d8bc5fe7e54277e429d494a6dceeaa672 SHA1 964c541ae11ea1bc9c2527f3fc1deb1169232e10 SHA256 0826e5bc2139b55b90f81fe5995ab52fb218fe6cdce5428d9ab72461f537c1b4
+MISC ChangeLog 2650 RMD160 76add4b76c1c75582b0a891afcad486d6b68ba97 SHA1 f1f2a7418d48478457492b923d1e0c9f2e482e00 SHA256 dd10bd3604f46dc1399c50396b1d23dcc9142ae9c0c92a43f03c2c30c25eaa53
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003
diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20120402.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20120402.ebuild
new file mode 100644
index 000000000..3359a0d6f
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20120402.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+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/2012-04-02_10-38-56/zip/netbeans-trunk-nightly-201204021038-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r2-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.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${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"
+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-r2-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r2-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/webcommon >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+	grep -E "/webcommon$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/webcommon
+}
diff --git a/dev-java/netbeans-websvccommon/ChangeLog b/dev-java/netbeans-websvccommon/ChangeLog
index 44fea9997..458580a4e 100644
--- a/dev-java/netbeans-websvccommon/ChangeLog
+++ b/dev-java/netbeans-websvccommon/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-websvccommon-9999_p20120402 (03 Apr 2012)
+
+  03 Apr 2012; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-websvccommon-9999_p20120402.ebuild:
+  Bumped to latest nightly sources
+
 *netbeans-websvccommon-9999_p20120328 (29 Mar 2012)
 
   29 Mar 2012; Miroslav Šulc <fordfrog@gentoo.org>
diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index cba3171d5..c7dd32b92 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -5,9 +5,11 @@ DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d
 DIST netbeans-9999-r2-build.xml.patch.bz2 2435 RMD160 c8988360fb0157b27a767d877dcd2a3d523b6178 SHA1 530768eb7ba1aff85b05cd15f21ac00edb15e55a SHA256 5f26c11ed3b34e99640a0b465ba348b07a2b91bfb061bf09f07ab07017ba5391
 DIST netbeans-trunk-nightly-201203250401-src.zip 177539743 RMD160 b078183a73a2691a71e191d890ddf71e31678103 SHA1 64490a2000e51cde6c8e2480285a5a438711b7c0 SHA256 eb9400386d9813b7aa9102f29557db7777a056af9bf3d17dfee17d4267377e4d
 DIST netbeans-trunk-nightly-201203280401-src.zip 177594044 RMD160 db98172a5ac7b055d845f92cc50840e07e6fb489 SHA1 702e46f0271580e8be745ed968579bd08c2c6be5 SHA256 ca0c9501d5eb837fb954ca40b9423bcb41dba8bf4a52cd6aadb13b02e26265eb
+DIST netbeans-trunk-nightly-201204021038-src.zip 177759174 RMD160 1e14efd847bcae1ca4f060b512ad31ea0610335f SHA1 c28dd9b9d2c4e12d3facab3d52b3fd6b3ea7563f SHA256 723a1133eb1c4a824d394ce9ac90248f0dd3bea2603f667172bf7780facde377
 EBUILD netbeans-websvccommon-7.0.1.ebuild 2692 RMD160 78a0dae148b2c583b596a625a6e6622a1c7cafcc SHA1 f3e52c193e9dfdf9d236f655a705c55da76cfad4 SHA256 a18cf7fe0a1e38749826cb12651be06c210b038be50117647496ee6cbd184cda
 EBUILD netbeans-websvccommon-7.1.1.ebuild 2701 RMD160 08e2138f0acb39feba8b8b0f78f6031c234a3fa2 SHA1 df06b23632ff1bfbc47eb89f0d64f050bd1d4382 SHA256 ab776d6f3ca6f2cf8974e9d1544110f6c59b0ad4770b47c1a353091788675582
 EBUILD netbeans-websvccommon-9999_p20120325.ebuild 2724 RMD160 21690966781461e7ea2ab45c4cf083d63c309cb7 SHA1 4fe2a4b66e6cd4716ced07f664c7422f5791a4e3 SHA256 4141e7babbfd579554ee677c61a53931eaa0ca8280a690a83b682279a3736dbc
 EBUILD netbeans-websvccommon-9999_p20120328.ebuild 2724 RMD160 af75cdd8f3c02fd6ff849368f2d028515952849d SHA1 6d862e1dffd73e975df17cc088a1b8a12b86e4a2 SHA256 780370c456872b5dde81ab36f819d89ab6ca3f979a6d6195d5ee5b986d3d6b5b
-MISC ChangeLog 31888 RMD160 0f4780cda7d5ea6817fb4c6fb0b28309f95d88aa SHA1 aed21c0e936e51e5f5eec5f4a372fc69818069da SHA256 3f0d50b3c3328198e512d359354bef61f863604d85d16ebf3961285ff8d506d5
+EBUILD netbeans-websvccommon-9999_p20120402.ebuild 2724 RMD160 be2725bae39db7cb89d5e46e6350e526d1305e40 SHA1 99ab48ef2b347c58e06ef691bce4bc1ad7d131a8 SHA256 8c5eb5a77875dd88bf57d5970c6a4abc55fbbdc43619259786f0aeb305008c27
+MISC ChangeLog 32077 RMD160 bbc2d29e90393c946212f67c4fbcb95fe098d77c SHA1 53b987f1f34e346113c6dc36dbf44aa00ec99678 SHA256 46e5037cf05185116efa984f185d2b8fa24916ceee8b8035759ff01341cee8e9
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003
diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20120402.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20120402.ebuild
new file mode 100644
index 000000000..e68ffba62
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20120402.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+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/2012-04-02_10-38-56/zip/netbeans-trunk-nightly-201204021038-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r2-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.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${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"
+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-r2-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r2-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
+}