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

[Miroslav Šulc]

commit:     a615ef92502fa4039b9be824466e1716f708a5a9
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  1 22:55:44 2011 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Apr  1 22:55:44 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/fordfrog.git;a=commit;h=a615ef92

netbeans: bumped to latest nightly sources

---
 dev-java/netbeans-apisupport/ChangeLog             |    6 +
 dev-java/netbeans-apisupport/Manifest              |    4 +-
 .../netbeans-apisupport-7.0_rc1_p20110401.ebuild   |  106 ++++++
 dev-java/netbeans-cnd/ChangeLog                    |    6 +
 dev-java/netbeans-cnd/Manifest                     |    4 +-
 .../netbeans-cnd-7.0_rc1_p20110401.ebuild          |  123 +++++++
 dev-java/netbeans-dlight/ChangeLog                 |    6 +
 dev-java/netbeans-dlight/Manifest                  |    4 +-
 .../netbeans-dlight-7.0_rc1_p20110401.ebuild       |  119 +++++++
 dev-java/netbeans-enterprise/ChangeLog             |    6 +
 dev-java/netbeans-enterprise/Manifest              |    4 +-
 .../netbeans-enterprise-7.0_rc1_p20110401.ebuild   |  304 +++++++++++++++++
 dev-java/netbeans-ergonomics/ChangeLog             |    6 +
 dev-java/netbeans-ergonomics/Manifest              |    4 +-
 .../netbeans-ergonomics-7.0_rc1_p20110401.ebuild   |  101 ++++++
 dev-java/netbeans-groovy/ChangeLog                 |    6 +
 dev-java/netbeans-groovy/Manifest                  |    4 +-
 .../netbeans-groovy-7.0_rc1_p20110401.ebuild       |  111 ++++++
 dev-java/netbeans-harness/ChangeLog                |    6 +
 dev-java/netbeans-harness/Manifest                 |    4 +-
 .../netbeans-harness-7.0_rc1_p20110401.ebuild      |  114 +++++++
 dev-java/netbeans-ide/ChangeLog                    |    6 +
 dev-java/netbeans-ide/Manifest                     |    4 +-
 .../netbeans-ide-7.0_rc1_p20110401.ebuild          |  356 ++++++++++++++++++++
 dev-java/netbeans-java/ChangeLog                   |    6 +
 dev-java/netbeans-java/Manifest                    |    5 +-
 .../netbeans-java-7.0_rc1_p20110401.ebuild         |  304 +++++++++++++++++
 dev-java/netbeans-javacard/ChangeLog               |    6 +
 dev-java/netbeans-javacard/Manifest                |    4 +-
 .../netbeans-javacard-7.0_rc1_p20110401.ebuild     |  141 ++++++++
 dev-java/netbeans-javadoc/ChangeLog                |    6 +
 dev-java/netbeans-javadoc/Manifest                 |    4 +-
 .../netbeans-javadoc-7.0_rc1_p20110401.ebuild      |  158 +++++++++
 dev-java/netbeans-mobility/ChangeLog               |    6 +
 dev-java/netbeans-mobility/Manifest                |    4 +-
 .../netbeans-mobility-7.0_rc1_p20110401.ebuild     |  184 ++++++++++
 dev-java/netbeans-nb/ChangeLog                     |    6 +
 dev-java/netbeans-nb/Manifest                      |    4 +-
 .../netbeans-nb-7.0_rc1_p20110401.ebuild           |  149 ++++++++
 dev-java/netbeans-php/ChangeLog                    |    6 +
 dev-java/netbeans-php/Manifest                     |    4 +-
 .../netbeans-php-7.0_rc1_p20110401.ebuild          |  119 +++++++
 dev-java/netbeans-platform/ChangeLog               |    6 +
 dev-java/netbeans-platform/Manifest                |    4 +-
 .../netbeans-platform-7.0_rc1_p20110401.ebuild     |  122 +++++++
 dev-java/netbeans-profiler/ChangeLog               |    6 +
 dev-java/netbeans-profiler/Manifest                |    4 +-
 .../netbeans-profiler-7.0_rc1_p20110401.ebuild     |  113 ++++++
 dev-java/netbeans-websvccommon/ChangeLog           |    6 +
 dev-java/netbeans-websvccommon/Manifest            |    4 +-
 .../netbeans-websvccommon-7.0_rc1_p20110401.ebuild |   94 +++++
 dev-util/netbeans/ChangeLog                        |    6 +
 dev-util/netbeans/Manifest                         |    4 +-
 .../netbeans/netbeans-7.0_rc1_p20110401.ebuild     |  250 ++++++++++++++
 54 files changed, 3131 insertions(+), 18 deletions(-)

diff --git a/dev-java/netbeans-apisupport/ChangeLog b/dev-java/netbeans-apisupport/ChangeLog
index e9ccab3..9159d90 100644
--- a/dev-java/netbeans-apisupport/ChangeLog
+++ b/dev-java/netbeans-apisupport/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-apisupport-7.0_rc1_p20110401 (01 Apr 2011)
+
+  01 Apr 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-apisupport-7.0_rc1_p20110401.ebuild:
+  Bumped to latest nightly sources
+
   30 Mar 2011; Miroslav Šulc <fordfrog@g.o>
   -netbeans-apisupport-7.0_beta2.ebuild:
   Removed old beta release

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 9736872..1256afa 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -1,7 +1,9 @@
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0rc1-201103280000-src.zip 175475363 RMD160 e5fe3ff726404ea8357a7cc7a383e6b8a06dd316 SHA1 df109f98c07bf01b862e59c68bbee76aae6c01df SHA256 fac906f9bdfd740b55758cf171a367702f78f7423cbae70add5a4d1b4669312e
 DIST netbeans-trunk-nightly-201103240400-src.zip 175550392 RMD160 687037f3ddd91fdcb9bb1808b4d61873b077cb29 SHA1 014ee2e2e38cf62b6864c71a2325d4c82fa602cd SHA256 0918ca520f56068114e427ffefdcafedef7a9007b6e1a51964883d64eaa9225a
+DIST netbeans-trunk-nightly-201104010400-src.zip 175593086 RMD160 2c117c544cc554c4fec48515c43a506f52393d2e SHA1 5da39cb9ef621673a06f8a1a734dc7f44cace0fa SHA256 defdf23bbb73b50689c5d30d505d86bc55795d4f98f6b1500966f35718d0c335
 EBUILD netbeans-apisupport-7.0_beta2_p20110324.ebuild 3099 RMD160 7e157ec84fb7228210fc4dfe97092e5bcd9cf6d2 SHA1 cb8b29b3bb9f8ddc9ee8a1b29782c3b12f968e48 SHA256 569dbef4b67105ad290a370877cd161a9777209939bf19303f0d9a908ce6e700
 EBUILD netbeans-apisupport-7.0_rc1.ebuild 3074 RMD160 5b093f27dc51fb118f99513a98598a7c03cb4850 SHA1 6546e27439be877c5a6761696ac0bda8f9e2222f SHA256 4dfbe4ecfef8795581918e5be9734b18346a49d0022dc82f318da0bb226d4b1d
-MISC ChangeLog 4761 RMD160 08efc58300b6e97dd386e584c65cb78168022e8b SHA1 e8d60af3a42db71f3a4239af7888b1cea836c4de SHA256 9cb5ef8c42d4b11e6e0db9a2573729027a5772fc3800d57827462a7024c5cb9b
+EBUILD netbeans-apisupport-7.0_rc1_p20110401.ebuild 3099 RMD160 5ff776165a9afa1545611745d4826b2894ba9000 SHA1 89e0d569d129550f30128968c7e335878f8b2f18 SHA256 dd6675d8a8a38631a4858b218aa51e74043b3132ed9c7b7139a890b934020c8c
+MISC ChangeLog 4952 RMD160 c05292a6462cd3f8c471e20a583d01aa151e64b4 SHA1 0648401d59c10a474beb82ae3a3ec5bfb131a03c SHA256 db691d7bf6b56938ee6d4cc485cdfda5a00780b0007d0a029d64ac062e386397
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-7.0_rc1_p20110401.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-7.0_rc1_p20110401.ebuild
new file mode 100644
index 0000000..c23d920
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-7.0_rc1_p20110401.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2011 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="7.0"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2011-04-01_04-00-17/zip/netbeans-trunk-nightly-201104010400-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}-build.xml-r1.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"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-7.0-build.xml-r1.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-7.0-build.xml-r1.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS70_PATCHES_DIR}" -a -d "${NETBEANS70_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS70_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 9b6e4a2..4be4ff4 100644
--- a/dev-java/netbeans-cnd/ChangeLog
+++ b/dev-java/netbeans-cnd/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-cnd-7.0_rc1_p20110401 (01 Apr 2011)
+
+  01 Apr 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-cnd-7.0_rc1_p20110401.ebuild:
+  Bumped to latest nightly sources
+
   30 Mar 2011; Miroslav Šulc <fordfrog@g.o>
   -netbeans-cnd-7.0_beta2.ebuild:
   Removed old beta release

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index b03acf7..e67561d 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -4,7 +4,9 @@ DIST 800BD16807CD1A4348AFD0554D920845134E5D55-cnd-rfs-1.0.zip 298998 RMD160 c383
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0rc1-201103280000-src.zip 175475363 RMD160 e5fe3ff726404ea8357a7cc7a383e6b8a06dd316 SHA1 df109f98c07bf01b862e59c68bbee76aae6c01df SHA256 fac906f9bdfd740b55758cf171a367702f78f7423cbae70add5a4d1b4669312e
 DIST netbeans-trunk-nightly-201103240400-src.zip 175550392 RMD160 687037f3ddd91fdcb9bb1808b4d61873b077cb29 SHA1 014ee2e2e38cf62b6864c71a2325d4c82fa602cd SHA256 0918ca520f56068114e427ffefdcafedef7a9007b6e1a51964883d64eaa9225a
+DIST netbeans-trunk-nightly-201104010400-src.zip 175593086 RMD160 2c117c544cc554c4fec48515c43a506f52393d2e SHA1 5da39cb9ef621673a06f8a1a734dc7f44cace0fa SHA256 defdf23bbb73b50689c5d30d505d86bc55795d4f98f6b1500966f35718d0c335
 EBUILD netbeans-cnd-7.0_beta2_p20110324.ebuild 4460 RMD160 fa4c8a8b3ccb2c7f38421c0770da049b2d7b1953 SHA1 462cde53c785b65f5f7ade96a66c35e7c6efe1e2 SHA256 24b0371ddcea683c53abf88b6d4416e2226ca3b62161274b3edcf9cbc940b8af
 EBUILD netbeans-cnd-7.0_rc1.ebuild 4435 RMD160 1b0db82106d883d9f5606ff21577f9d556f2f8f3 SHA1 821286e503c73b75a4767ca4ab3fde77bddab610 SHA256 4f6e9468ed6acf4def207341c80c0cbbcd63deffa752642f35b416608e9ee161
-MISC ChangeLog 4404 RMD160 dcbb14e8ca4f04188fb2f0cd025482fd683862da SHA1 59be283a1ad3863f329f9451f4b529f6cafe9e42 SHA256 87ea3a9143ba0907cff1c7472f53bdc9255767c369f2dd63a81525ae44d02d5e
+EBUILD netbeans-cnd-7.0_rc1_p20110401.ebuild 4460 RMD160 18a98c79a213b29957d3798c3abdaa0289e21a59 SHA1 45eb249027aff2f99d8f30ad2fa95ca2014b2ef7 SHA256 a9ff5714470dda07f7ea3a1e162dc4008c0ea0457d9e6643a6ae43e650a0db36
+MISC ChangeLog 4581 RMD160 994850d03a576ede8a68c361b3f7e81a87d356d8 SHA1 ed60294e2e68b8868ea8838ef369f9eec3edac07 SHA256 b7f791bf20a72ad3da8801e74f9d824d7c419b21f8c607bb023c1efbea5eec77
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-7.0_rc1_p20110401.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-7.0_rc1_p20110401.ebuild
new file mode 100644
index 0000000..3fd48a5
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-7.0_rc1_p20110401.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2011 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="7.0"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2011-04-01_04-00-17/zip/netbeans-trunk-nightly-201104010400-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}-build.xml-r1.patch.bz2
+	http://hg.netbeans.org/binaries/1C4FB4BD3508F7A787270A3B65E74FBFC624C2CB-cnd-build-trace-1.0.zip
+	http://hg.netbeans.org/binaries/800BD16807CD1A4348AFD0554D920845134E5D55-cnd-rfs-1.0.zip
+	http://hg.netbeans.org/binaries/296C195B720404C2683BA2F65E2A423DD0611B8B-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/antlr:0[java]
+	dev-java/antlr:3
+	dev-java/javahelp:0
+	dev-java/stringtemplate: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"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-7.0-build.xml-r1.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/1C4FB4BD3508F7A787270A3B65E74FBFC624C2CB-cnd-build-trace-1.0.zip cnd.discovery/external/cnd-build-trace-1.0.zip || die
+	ln -s "${DISTDIR}"/800BD16807CD1A4348AFD0554D920845134E5D55-cnd-rfs-1.0.zip cnd.remote/external/cnd-rfs-1.0.zip || die
+	ln -s "${DISTDIR}"/296C195B720404C2683BA2F65E2A423DD0611B8B-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-7.0-build.xml-r1.patch
+	sed -i "s%<classpath path=\"\${antlr3.jar}\"/>%<classpath path=\"\${antlr3.jar}:../libs.antlr3.devel/external/antlr-2.7.jar:../libs.antlr3.devel/external/stringtemplate-3.2.jar\"/>%" cnd.modelimpl/build.xml || die
+
+	# Support for custom patches
+	if [ -n "${NETBEANS70_PATCHES_DIR}" -a -d "${NETBEANS70_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS70_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.antlr3.devel/external antlr-3 antlr3.jar antlr-3.1.3.jar
+	java-pkg_jar-from --build-only --into libs.antlr3.devel/external antlr antlr.jar antlr-2.7.jar
+	java-pkg_jar-from --build-only --into libs.antlr3.devel/external stringtemplate stringtemplate.jar stringtemplate-3.2.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-dlight-${SLOT} dlight || die
+	cat /usr/share/netbeans-dlight-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.dlight.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/cnd >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/cnd$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	fperms 755 bin/dorun.sh
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/cnd
+}

diff --git a/dev-java/netbeans-dlight/ChangeLog b/dev-java/netbeans-dlight/ChangeLog
index eeaafbb..8968a42 100644
--- a/dev-java/netbeans-dlight/ChangeLog
+++ b/dev-java/netbeans-dlight/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-dlight-7.0_rc1_p20110401 (01 Apr 2011)
+
+  01 Apr 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-dlight-7.0_rc1_p20110401.ebuild:
+  Bumped to latest nightly sources
+
   30 Mar 2011; Miroslav Šulc <fordfrog@g.o>
   -netbeans-dlight-7.0_beta2.ebuild:
   Removed old beta release

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index c924aa4..b3e9acd 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -4,7 +4,9 @@ DIST F787C9B484CD7526F866C21D8925C4DACE467F8A-derby-10.2.2.0.jar 2276020 RMD160
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0rc1-201103280000-src.zip 175475363 RMD160 e5fe3ff726404ea8357a7cc7a383e6b8a06dd316 SHA1 df109f98c07bf01b862e59c68bbee76aae6c01df SHA256 fac906f9bdfd740b55758cf171a367702f78f7423cbae70add5a4d1b4669312e
 DIST netbeans-trunk-nightly-201103240400-src.zip 175550392 RMD160 687037f3ddd91fdcb9bb1808b4d61873b077cb29 SHA1 014ee2e2e38cf62b6864c71a2325d4c82fa602cd SHA256 0918ca520f56068114e427ffefdcafedef7a9007b6e1a51964883d64eaa9225a
+DIST netbeans-trunk-nightly-201104010400-src.zip 175593086 RMD160 2c117c544cc554c4fec48515c43a506f52393d2e SHA1 5da39cb9ef621673a06f8a1a734dc7f44cace0fa SHA256 defdf23bbb73b50689c5d30d505d86bc55795d4f98f6b1500966f35718d0c335
 EBUILD netbeans-dlight-7.0_beta2_p20110324.ebuild 3602 RMD160 e31ff0e52d516ec052806dcef70066fffd1bb56a SHA1 583120b07db4ca28429d7a3f2661fdc02a76ea0a SHA256 49d1e999f64997b79b4de5158f5c607ba58e0449bcf8d5f1213f52558ebbf71a
 EBUILD netbeans-dlight-7.0_rc1.ebuild 3577 RMD160 9f90f63c8c673619df843ed686f80b7ca7956ccf SHA1 f1d157f137639ced2423f166889d0824db525d7f SHA256 2c612de6797596678b5aef6dfee375ecedebcd9eee63feff80dbe36fd6f6abbe
-MISC ChangeLog 4557 RMD160 29bece9d0c914e3be4a015b89d1dfeddb33014c4 SHA1 a14b0f0e33049223c2c97fe3d513424c5d728264 SHA256 be0bdc5fb36f881fd14f4a4d1d56315af8b37d07a281b3d67e65a897648b3e4d
+EBUILD netbeans-dlight-7.0_rc1_p20110401.ebuild 3602 RMD160 dbefe29343ba86c73c4fef913fef0301305d2044 SHA1 056e55d07c28155d58a2418747f64b3bd9f5760a SHA256 b4cd7aeefe6dc34eb63fa1cf529ce10c21aeb23c6ebfe882a21a3cef6d51a4fd
+MISC ChangeLog 4740 RMD160 56f691503589d398f806cfc5a8c09da58447a2b8 SHA1 baa31acd0fdc8a71e05e436d9bc209d5f7546f66 SHA256 1fa8c4463b84dd8c3cabe48f2a775fcec55698cd89bb671c8dd5d7ea0307fcb1
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-7.0_rc1_p20110401.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-7.0_rc1_p20110401.ebuild
new file mode 100644
index 0000000..f38cd88
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-7.0_rc1_p20110401.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2011 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="7.0"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2011-04-01_04-00-17/zip/netbeans-trunk-nightly-201104010400-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}-build.xml-r1.patch.bz2
+	http://hg.netbeans.org/binaries/F787C9B484CD7526F866C21D8925C4DACE467F8A-derby-10.2.2.0.jar
+	http://hg.netbeans.org/binaries/F1AF5929CD612475CCF186F69E268F0CAAA2A90E-dtracectrl-0.1.zip
+	http://hg.netbeans.org/binaries/623DE5A3A60FEA313099D7C42256B146E2BEE9B2-h2-1.0.79.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"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-7.0-build.xml-r1.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/F787C9B484CD7526F866C21D8925C4DACE467F8A-derby-10.2.2.0.jar dlight.db.derby/external/derby-10.2.2.0.jar || die
+	ln -s "${DISTDIR}"/F1AF5929CD612475CCF186F69E268F0CAAA2A90E-dtracectrl-0.1.zip dlight.dtrace/external/dtracectrl-0.1.zip || die
+	ln -s "${DISTDIR}"/623DE5A3A60FEA313099D7C42256B146E2BEE9B2-h2-1.0.79.jar dlight.libs.h2/external/h2-1.0.79.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-7.0-build.xml-r1.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS70_PATCHES_DIR}" -a -d "${NETBEANS70_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS70_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 *
+
+	for file in bin/SunOS*/* ; do
+		fperms 755 ${file}
+	done
+
+	for file in tools/*/bin/* ; do
+		fperms 755 ${file}
+	done
+
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	# derby-10.2.2.0.jar
+	# h2-1.0.79.jar
+	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 e7da8b3..c4b49d1 100644
--- a/dev-java/netbeans-enterprise/ChangeLog
+++ b/dev-java/netbeans-enterprise/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-enterprise-7.0_rc1_p20110401 (01 Apr 2011)
+
+  01 Apr 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-enterprise-7.0_rc1_p20110401.ebuild:
+  Bumped to latest nightly sources
+
   30 Mar 2011; Miroslav Šulc <fordfrog@g.o>
   -netbeans-enterprise-7.0_beta2.ebuild:
   Removed old beta release

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 7f5f0b8..010fc43 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -30,7 +30,9 @@ DIST FFE3425E304F0836912D2B8ABFB5302100B39423-jsr311-api-1.1.1-javadoc.jar 30411
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0rc1-201103280000-src.zip 175475363 RMD160 e5fe3ff726404ea8357a7cc7a383e6b8a06dd316 SHA1 df109f98c07bf01b862e59c68bbee76aae6c01df SHA256 fac906f9bdfd740b55758cf171a367702f78f7423cbae70add5a4d1b4669312e
 DIST netbeans-trunk-nightly-201103240400-src.zip 175550392 RMD160 687037f3ddd91fdcb9bb1808b4d61873b077cb29 SHA1 014ee2e2e38cf62b6864c71a2325d4c82fa602cd SHA256 0918ca520f56068114e427ffefdcafedef7a9007b6e1a51964883d64eaa9225a
+DIST netbeans-trunk-nightly-201104010400-src.zip 175593086 RMD160 2c117c544cc554c4fec48515c43a506f52393d2e SHA1 5da39cb9ef621673a06f8a1a734dc7f44cace0fa SHA256 defdf23bbb73b50689c5d30d505d86bc55795d4f98f6b1500966f35718d0c335
 EBUILD netbeans-enterprise-7.0_beta2_p20110324.ebuild 16303 RMD160 db5bd7e9c4c1822a38be74af8440605ef338efcd SHA1 831c988948ead9322db2b728ac307c50c4631f78 SHA256 4d07c504586933f0d1f969a0c9d54421bfbac9ecd39e77e334b887770ac2e0ce
 EBUILD netbeans-enterprise-7.0_rc1.ebuild 16278 RMD160 47683559a7f70adbd5671593ebcd1f6b4c1f4d1a SHA1 b0c65fbe4b327b21b8e1ce105dc03ac1288ae0af SHA256 427329b3934282c1be078add97736c7f800411fdb2ce6047d85a34087d5c4eef
-MISC ChangeLog 5139 RMD160 fb559c2b36e16dca2a388a8b61bbdf03654bdf8a SHA1 64d0795f06e474900f9e4d43f2381b4cf59ab2b0 SHA256 03e97a0c666abf4f3f120998f629407c8fb2d483404fc4522ca443826cb44054
+EBUILD netbeans-enterprise-7.0_rc1_p20110401.ebuild 16303 RMD160 0d6f434052278cf7d1f901647656e278a0a714fc SHA1 805e6ba5f7a50af625f67d39dce1ec21ddf755ca SHA256 7cc675bf6e0ccd749c86b9e575dd42b1df7668c6e94aea3edaa3d6047721e3c3
+MISC ChangeLog 5330 RMD160 1b277b4d79aec7f4e161dfad308abbb602c7ca1e SHA1 a9cfa1b8c2f106b56941997609c866dd4897f8eb SHA256 b56f5e31e24d9dbc6f37fb4b5fc6e9cd9644194375aac5f7bedec364c4f6e01e
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-7.0_rc1_p20110401.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-7.0_rc1_p20110401.ebuild
new file mode 100644
index 0000000..d43cdc4
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-7.0_rc1_p20110401.ebuild
@@ -0,0 +1,304 @@
+# Copyright 1999-2011 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="7.0"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2011-04-01_04-00-17/zip/netbeans-trunk-nightly-201104010400-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}-build.xml-r1.patch.bz2
+	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/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/BD6C7BD1452456F2F6B2A8CF6C4166493A24ABED-jersey-1.3.zip
+	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/6E3105315F3100F65D66355B04BA6B6C2B8480D3-jersey-json-1.3-javadoc.jar
+	http://hg.netbeans.org/binaries/F10ED4F2ECC7724F7C25D586DC9F25377581CCFC-jersey-multipart-1.3-javadoc.jar
+	http://hg.netbeans.org/binaries/123A7BAAE06D938E5E4533ED745EEE7377E73ED8-jersey-spring-1.3-javadoc.jar
+	http://hg.netbeans.org/binaries/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip
+	http://hg.netbeans.org/binaries/6B90A110E1B1503C4623B13D3BB536212F1BF3DB-jsf-2.0.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/BAEA0B9171897175B0B3E20BDF532EF4CFD44CEE-oauth-client-1.3-javadoc.jar
+	http://hg.netbeans.org/binaries/4855C8481C6951F39DC117C44CA8EE70BF2B003F-oauth-signature-1.3-javadoc.jar
+	http://hg.netbeans.org/binaries/C31A6E33D7D6E77C8123A0830D929187A9707147-primefaces-2.2.1.jar
+	http://hg.netbeans.org/binaries/B9FA9CDC7FA5203E1DB5C4DBAAED0133596D524F-servlet3.0-jsp2.2-api.jar
+	http://hg.netbeans.org/binaries/1A48EDCF8DCFC76882C821931EB0529DB9AF5D9B-spring-webmvc-2.5.6.SEC01.jar
+	http://hg.netbeans.org/binaries/E11C2384FDEAE4F96E433C2A0339DCFC5202CC17-struts-1.3.8-javadoc.zip
+	http://hg.netbeans.org/binaries/A3F62096FB53E14CF09B006458333792890CE429-struts-1.3.8-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-websvccommon-${PV}
+	dev-java/commons-fileupload: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-logging:0
+	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"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-7.0-build.xml-r1.patch.bz2
+
+	pushd "${S}" >/dev/null || 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}"/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}"/BD6C7BD1452456F2F6B2A8CF6C4166493A24ABED-jersey-1.3.zip websvc.restlib/external/jersey-1.3.zip || 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}"/6E3105315F3100F65D66355B04BA6B6C2B8480D3-jersey-json-1.3-javadoc.jar websvc.restlib/external/jersey-json-1.3-javadoc.jar || die
+	ln -s "${DISTDIR}"/F10ED4F2ECC7724F7C25D586DC9F25377581CCFC-jersey-multipart-1.3-javadoc.jar websvc.restlib/external/jersey-multipart-1.3-javadoc.jar || die
+	ln -s "${DISTDIR}"/123A7BAAE06D938E5E4533ED745EEE7377E73ED8-jersey-spring-1.3-javadoc.jar websvc.restlib/external/jersey-spring-1.3-javadoc.jar || die
+	ln -s "${DISTDIR}"/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip web.jsf12/external/jsf-1.2.zip || die
+	ln -s "${DISTDIR}"/6B90A110E1B1503C4623B13D3BB536212F1BF3DB-jsf-2.0.zip web.jsf20/external/jsf-2.0.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}"/BAEA0B9171897175B0B3E20BDF532EF4CFD44CEE-oauth-client-1.3-javadoc.jar websvc.restlib/external/oauth-client-1.3-javadoc.jar || die
+	ln -s "${DISTDIR}"/4855C8481C6951F39DC117C44CA8EE70BF2B003F-oauth-signature-1.3-javadoc.jar websvc.restlib/external/oauth-signature-1.3-javadoc.jar || die
+	ln -s "${DISTDIR}"/C31A6E33D7D6E77C8123A0830D929187A9707147-primefaces-2.2.1.jar web.primefaces/external/primefaces-2.2.1.jar || die
+	ln -s "${DISTDIR}"/B9FA9CDC7FA5203E1DB5C4DBAAED0133596D524F-servlet3.0-jsp2.2-api.jar servletjspapi/external/servlet3.0-jsp2.2-api.jar || die
+	ln -s "${DISTDIR}"/1A48EDCF8DCFC76882C821931EB0529DB9AF5D9B-spring-webmvc-2.5.6.SEC01.jar spring.webmvc/external/spring-webmvc-2.5.6.SEC01.jar || die
+	ln -s "${DISTDIR}"/E11C2384FDEAE4F96E433C2A0339DCFC5202CC17-struts-1.3.8-javadoc.zip web.struts/external/struts-1.3.8-javadoc.zip || die
+	ln -s "${DISTDIR}"/A3F62096FB53E14CF09B006458333792890CE429-struts-1.3.8-lib.zip web.struts/external/struts-1.3.8-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-7.0-build.xml-r1.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS70_PATCHES_DIR}" -a -d "${NETBEANS70_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS70_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.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.8.2.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-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
+	# 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/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_0
+	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.7.0.jar && dosym /usr/share/commons-beanutils-1.7/lib/commons-beanutils.jar ${instdir}/commons-beanutils-1.7.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.2.jar && dosym /usr/share/jakarta-jstl/lib/standard.jar ${instdir}/standard-1.0.2.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 3532edb..ba1d232 100644
--- a/dev-java/netbeans-ergonomics/ChangeLog
+++ b/dev-java/netbeans-ergonomics/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-ergonomics-7.0_rc1_p20110401 (01 Apr 2011)
+
+  01 Apr 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-ergonomics-7.0_rc1_p20110401.ebuild:
+  Bumped to latest nightly sources
+
   30 Mar 2011; Miroslav Šulc <fordfrog@g.o>
   -netbeans-ergonomics-7.0_beta2.ebuild:
   Removed old beta release

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index ff9b510..3726623 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -1,7 +1,9 @@
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0rc1-201103280000-src.zip 175475363 RMD160 e5fe3ff726404ea8357a7cc7a383e6b8a06dd316 SHA1 df109f98c07bf01b862e59c68bbee76aae6c01df SHA256 fac906f9bdfd740b55758cf171a367702f78f7423cbae70add5a4d1b4669312e
 DIST netbeans-trunk-nightly-201103240400-src.zip 175550392 RMD160 687037f3ddd91fdcb9bb1808b4d61873b077cb29 SHA1 014ee2e2e38cf62b6864c71a2325d4c82fa602cd SHA256 0918ca520f56068114e427ffefdcafedef7a9007b6e1a51964883d64eaa9225a
+DIST netbeans-trunk-nightly-201104010400-src.zip 175593086 RMD160 2c117c544cc554c4fec48515c43a506f52393d2e SHA1 5da39cb9ef621673a06f8a1a734dc7f44cace0fa SHA256 defdf23bbb73b50689c5d30d505d86bc55795d4f98f6b1500966f35718d0c335
 EBUILD netbeans-ergonomics-7.0_beta2_p20110324.ebuild 2849 RMD160 35ca8f11a070f55c12e98a0e591bd1a34c85d8f5 SHA1 ebd87e1004f8c8f9c15a4b5ebf8c73ca58b19b06 SHA256 dc43731e473ec06e5d98233bdbffd307f698e4c0265a6374b219722cef9c5f20
 EBUILD netbeans-ergonomics-7.0_rc1.ebuild 2824 RMD160 088bacba0982f430cf7159be33337baa6d4d1c07 SHA1 97d2ec538b72e9c55147601326b368600c481977 SHA256 c12d3f7113d0e8536d609615ba0ba498f2b575ee8c91fc5a6f927379b8411c4d
-MISC ChangeLog 4761 RMD160 a90cfa18cfd6a40149a6cb9e9bbc30bcc1a370f9 SHA1 b6a50203258f1dbdc79f9c905bc40aa644f15c67 SHA256 f0a97dcc86839b9e54c4410619ebf5a9534425aac2bbe41a58f5d30f22a090f0
+EBUILD netbeans-ergonomics-7.0_rc1_p20110401.ebuild 2849 RMD160 ef64edc00ab9884daa651c0c0898ea2a84fda2d9 SHA1 ee98fec37b6950ecb624e558923adc8392cf0a93 SHA256 7d970beeb03a10ee8c210cc749529520c1bab9148692c8106ee8b33d375cb8c3
+MISC ChangeLog 4952 RMD160 89140c71862a771bbd501459d9e63a8018933dc8 SHA1 0a0284370ccea8f3c4ede9b1a34607caaf203af7 SHA256 9446d490a09eb8097f5f1ee75e0ee39c3d8a5beb32690e39c2bd5a7d53670261
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-7.0_rc1_p20110401.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-7.0_rc1_p20110401.ebuild
new file mode 100644
index 0000000..abce7cc
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-7.0_rc1_p20110401.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2011 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="7.0"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2011-04-01_04-00-17/zip/netbeans-trunk-nightly-201104010400-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}-build.xml-r1.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"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-7.0-build.xml-r1.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-7.0-build.xml-r1.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS70_PATCHES_DIR}" -a -d "${NETBEANS70_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS70_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 2a8189b..d5399e4 100644
--- a/dev-java/netbeans-groovy/ChangeLog
+++ b/dev-java/netbeans-groovy/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-groovy-7.0_rc1_p20110401 (01 Apr 2011)
+
+  01 Apr 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-groovy-7.0_rc1_p20110401.ebuild:
+  Bumped to latest nightly sources
+
   30 Mar 2011; Miroslav Šulc <fordfrog@g.o>
   -netbeans-groovy-7.0_beta2.ebuild:
   Removed old beta release

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index dee9e4e..39b708a 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -2,7 +2,9 @@ DIST 559C961A6CE793FAC94C8040253EA1FBD32B668B-groovy-all-1.6.4.jar 4503584 RMD16
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0rc1-201103280000-src.zip 175475363 RMD160 e5fe3ff726404ea8357a7cc7a383e6b8a06dd316 SHA1 df109f98c07bf01b862e59c68bbee76aae6c01df SHA256 fac906f9bdfd740b55758cf171a367702f78f7423cbae70add5a4d1b4669312e
 DIST netbeans-trunk-nightly-201103240400-src.zip 175550392 RMD160 687037f3ddd91fdcb9bb1808b4d61873b077cb29 SHA1 014ee2e2e38cf62b6864c71a2325d4c82fa602cd SHA256 0918ca520f56068114e427ffefdcafedef7a9007b6e1a51964883d64eaa9225a
+DIST netbeans-trunk-nightly-201104010400-src.zip 175593086 RMD160 2c117c544cc554c4fec48515c43a506f52393d2e SHA1 5da39cb9ef621673a06f8a1a734dc7f44cace0fa SHA256 defdf23bbb73b50689c5d30d505d86bc55795d4f98f6b1500966f35718d0c335
 EBUILD netbeans-groovy-7.0_beta2_p20110324.ebuild 3261 RMD160 d768c6d2fc0d85274dabd177c818ad725f4c407a SHA1 9b6bb2721c0c4beb0dbbdf368a5e3387d190fb24 SHA256 8f9959c199f85b183e1ef9fd7954aa228a0d2b58edea8077aa608077862164fc
 EBUILD netbeans-groovy-7.0_rc1.ebuild 3236 RMD160 eaf9fc3c983a8a813ce1656950bc980c552bcb8f SHA1 9cedb9ca67826971645c2df553bed774a4d2b0bc SHA256 85de54d811f6681ef20c285baab6b491c16a333a42ccda3ae30937443178bf4e
-MISC ChangeLog 4557 RMD160 200ecd094b0ae86a1d86c4dd113405241626863a SHA1 10aba4a9aa66184b506762cc480a3fc1fd663c37 SHA256 fc12bb4821ab7a9a901dd1ba2f5d71248ce07232b5e20036dceb479d469e908d
+EBUILD netbeans-groovy-7.0_rc1_p20110401.ebuild 3261 RMD160 98f119d51e52b042dcea002959701708832bc333 SHA1 0047432c6df3f1339c848e873d252f7858a76b3a SHA256 72a552849418c1ff281fa39135e05c2fdf8c2179661f14be36171f1070fba7e8
+MISC ChangeLog 4740 RMD160 3f3286a163015b0aafec38f3ec46d67ea47216a1 SHA1 81fa843765b1414be347ff95ff23b64e9b221457 SHA256 445e8c0fdf1ee268ab2d45fcbab4279d9bd88f292ddcccaa2c504f86163ed0eb
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-7.0_rc1_p20110401.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-7.0_rc1_p20110401.ebuild
new file mode 100644
index 0000000..0ec1ee4
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-7.0_rc1_p20110401.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2011 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="7.0"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2011-04-01_04-00-17/zip/netbeans-trunk-nightly-201104010400-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}-build.xml-r1.patch.bz2
+	http://hg.netbeans.org/binaries/559C961A6CE793FAC94C8040253EA1FBD32B668B-groovy-all-1.6.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"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-7.0-build.xml-r1.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/559C961A6CE793FAC94C8040253EA1FBD32B668B-groovy-all-1.6.4.jar groovy.editor/external/groovy-all-1.6.4.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-7.0-build.xml-r1.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS70_PATCHES_DIR}" -a -d "${NETBEANS70_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS70_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 869893f..822139e 100644
--- a/dev-java/netbeans-harness/ChangeLog
+++ b/dev-java/netbeans-harness/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-harness-7.0_rc1_p20110401 (01 Apr 2011)
+
+  01 Apr 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-harness-7.0_rc1_p20110401.ebuild:
+  Bumped to latest nightly sources
+
   30 Mar 2011; Miroslav Šulc <fordfrog@g.o>
   -netbeans-harness-7.0_beta2.ebuild:
   Removed old beta release

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 0b87f78..0396d8f 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -3,7 +3,9 @@ DIST A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar 109823 RMD160 4033e
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0rc1-201103280000-src.zip 175475363 RMD160 e5fe3ff726404ea8357a7cc7a383e6b8a06dd316 SHA1 df109f98c07bf01b862e59c68bbee76aae6c01df SHA256 fac906f9bdfd740b55758cf171a367702f78f7423cbae70add5a4d1b4669312e
 DIST netbeans-trunk-nightly-201103240400-src.zip 175550392 RMD160 687037f3ddd91fdcb9bb1808b4d61873b077cb29 SHA1 014ee2e2e38cf62b6864c71a2325d4c82fa602cd SHA256 0918ca520f56068114e427ffefdcafedef7a9007b6e1a51964883d64eaa9225a
+DIST netbeans-trunk-nightly-201104010400-src.zip 175593086 RMD160 2c117c544cc554c4fec48515c43a506f52393d2e SHA1 5da39cb9ef621673a06f8a1a734dc7f44cace0fa SHA256 defdf23bbb73b50689c5d30d505d86bc55795d4f98f6b1500966f35718d0c335
 EBUILD netbeans-harness-7.0_beta2_p20110324.ebuild 3544 RMD160 5a07cecb6e9eb42776f239ff74a715a7e44adaa7 SHA1 7bfb619c3219b4df5059f595bdb113ad0ba0708d SHA256 4696e84de6de52a2f79b6af8fd9867e3afda5f28f49dd904f7413b378c65d34f
 EBUILD netbeans-harness-7.0_rc1.ebuild 3519 RMD160 8b1c363323c27674087852022696621013421d82 SHA1 eef673da39ffa083e11bea72588c40769b69d195 SHA256 1ce168338d6eaeca8fe6e611068bc62844e82aedf576d44a0c6e8fa74c244f8a
-MISC ChangeLog 4608 RMD160 ded9c21f0587bac4bc6a513b639904a9c98f51ce SHA1 de877a8380218137cbae7b981af731819c69ba52 SHA256 22ff54330606c27efd1e8a6c287bf410a840ef83486718224d1865a882904aa1
+EBUILD netbeans-harness-7.0_rc1_p20110401.ebuild 3544 RMD160 6e1c8566c2271577ca9ecfb2bfd279b3587e4764 SHA1 ea2ce31a30e4de6244200079da08924cedc45723 SHA256 5a4eb6d098ec39373f510865fe305fabc8875cd97acc9fffe71487b92d02e5f3
+MISC ChangeLog 4793 RMD160 507c47c8d337c915a1f1d831907fbe8331feb640 SHA1 a7316b4b2d3fd770edabed236e0dff0ca6558b3a SHA256 52f8add9f308e3df95f6a8d5e92e20e521526e5dd1192b5f2da4139331f98c24
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-harness/netbeans-harness-7.0_rc1_p20110401.ebuild b/dev-java/netbeans-harness/netbeans-harness-7.0_rc1_p20110401.ebuild
new file mode 100644
index 0000000..6382e34
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-7.0_rc1_p20110401.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2011 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="7.0"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2011-04-01_04-00-17/zip/netbeans-trunk-nightly-201104010400-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}-build.xml-r1.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"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-7.0-build.xml-r1.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-7.0-build.xml-r1.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS70_PATCHES_DIR}" -a -d "${NETBEANS70_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS70_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.8.2.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	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 07e5b13..a2cda52 100644
--- a/dev-java/netbeans-ide/ChangeLog
+++ b/dev-java/netbeans-ide/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-ide-7.0_rc1_p20110401 (01 Apr 2011)
+
+  01 Apr 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-ide-7.0_rc1_p20110401.ebuild:
+  Bumped to latest nightly sources
+
   30 Mar 2011; Miroslav Šulc <fordfrog@g.o>
   netbeans-ide-7.0_rc1.ebuild, netbeans-ide-7.0_beta2_p20110324.ebuild:
   Fixed bug #361357

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index d737dfe..6d7c676 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -44,7 +44,9 @@ DIST FACC6D84B0B0A650B1D44FED941E9ADD9F326862-isorelax20041111.jar 182065 RMD160
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0rc1-201103280000-src.zip 175475363 RMD160 e5fe3ff726404ea8357a7cc7a383e6b8a06dd316 SHA1 df109f98c07bf01b862e59c68bbee76aae6c01df SHA256 fac906f9bdfd740b55758cf171a367702f78f7423cbae70add5a4d1b4669312e
 DIST netbeans-trunk-nightly-201103240400-src.zip 175550392 RMD160 687037f3ddd91fdcb9bb1808b4d61873b077cb29 SHA1 014ee2e2e38cf62b6864c71a2325d4c82fa602cd SHA256 0918ca520f56068114e427ffefdcafedef7a9007b6e1a51964883d64eaa9225a
+DIST netbeans-trunk-nightly-201104010400-src.zip 175593086 RMD160 2c117c544cc554c4fec48515c43a506f52393d2e SHA1 5da39cb9ef621673a06f8a1a734dc7f44cace0fa SHA256 defdf23bbb73b50689c5d30d505d86bc55795d4f98f6b1500966f35718d0c335
 EBUILD netbeans-ide-7.0_beta2_p20110324.ebuild 22254 RMD160 eba7e6add4d807f0330f61d7d4b2303cb49b8377 SHA1 5e75213e9dda446a5e733fdd0d06267a6bd09ecc SHA256 6fa8e66a9116a1bf37bfbc169135c4cf9432bfcc606dc86ab703c89a4f716975
 EBUILD netbeans-ide-7.0_rc1.ebuild 22229 RMD160 aa4f78a6961e5b9c0150bb7078b70bc2ae41eb6d SHA1 3236700b80ef45b0349198c73acc9a0e0fb6bf4c SHA256 4e30805312dd5c89a9788b3eea753e6f1a8b4066d1707fc1c91fb2e6a449154f
-MISC ChangeLog 4700 RMD160 d80afb425346f81327979a5a1b38985cd25f3c26 SHA1 53311ad2b279b22b37a415960faed06df4808315 SHA256 d1a445542b00a40c0109aabacd5fedb8d3b28ada13c406943c3144b7a2d6ceb4
+EBUILD netbeans-ide-7.0_rc1_p20110401.ebuild 22254 RMD160 9da2342c53fd7fe71360e407426e8fe19441ed3e SHA1 9a082bc3872e034172f65dbdf8f26cfcd254a12c SHA256 2cce10884ae9f8c9c5d201d526aed91caff6e889f6fe0fb024a0e33a7448fb8c
+MISC ChangeLog 4877 RMD160 906a5e08e454565506dfe8f794f0144584df6383 SHA1 b0c32ebb6606e8617ccf11547455154db1fc18db SHA256 5ddd65ac7c85e3d00cf37080d6ccb42519a83de6578906c84a7aad3c2b29f52d
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-ide/netbeans-ide-7.0_rc1_p20110401.ebuild b/dev-java/netbeans-ide/netbeans-ide-7.0_rc1_p20110401.ebuild
new file mode 100644
index 0000000..3fc6da6
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-7.0_rc1_p20110401.ebuild
@@ -0,0 +1,356 @@
+# Copyright 1999-2011 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="7.0"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2011-04-01_04-00-17/zip/netbeans-trunk-nightly-201104010400-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}-build.xml-r1.patch.bz2
+	http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
+	http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.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/A1C0ED8C43A306E3FB7676E7463204B9DA9BE290-non-schema.jar
+	http://hg.netbeans.org/binaries/94408B54D039DA036A668C6B331EF944AF2E90EC-org.eclipse.mylyn.bugzilla.core_3.3.1.jar
+	http://hg.netbeans.org/binaries/7D3CCD3ED4DB57F2B746F5ABAF86D10F222AEB87-org.eclipse.mylyn.commons.core_3.3.1.jar
+	http://hg.netbeans.org/binaries/02C39E6C02E2386D4936245F90AC4BFA5A7BCD49-org.eclipse.mylyn.commons.net_3.3.0.jar
+	http://hg.netbeans.org/binaries/DF522A06BF4EFD99A12C545C294D940CF6A2E01D-org.eclipse.mylyn.tasks.core_3.3.1.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/0B9606F570B28FFC4FCE6C7222B88B3DCEFB1A36-svnClientAdapter-javahl-1.6.13.jar
+	http://hg.netbeans.org/binaries/A11623D2AF72A99C1509EC2A0ADA2DACBEE9A8E4-svnClientAdapter-main-1.6.13.jar
+	http://hg.netbeans.org/binaries/0AE20EC02958F193ADAB4C272ACCF6FE3196DCA0-svnClientAdapter-svnkit-1.6.13.jar
+	http://hg.netbeans.org/binaries/636C6FF256A978B786D7502F43E788448E9DAB4B-svnkit-1.3.4.jar
+	http://hg.netbeans.org/binaries/AB271CFC19469D9088BE306685A7AC8787373F99-svnkit-javahl.jar
+	http://hg.netbeans.org/binaries/7C6ED64C55164C5AE0394E11303CA95CB24166AF-swingx-0.9.5.jar
+	http://hg.netbeans.org/binaries/538D727A9A0874019FB11280F07CE3F43EE723BC-sqljet-1.0.3.jar
+	http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar
+	http://hg.netbeans.org/binaries/68B82D7246FD90E0FC70BB9C8F10611489BF371A-trilead.jar
+	http://hg.netbeans.org/binaries/55CD0B272084EB80B8C91F3A0617BB602B4EF2DF-ValidationAPI.jar
+	http://hg.netbeans.org/binaries/7A5A7DF07297A86A944D4D0562C685585B0734EF-validator.jar
+	http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-platform-${PV}
+	dev-java/antlr:3
+	dev-java/commons-codec:0
+	dev-java/commons-httpclient:3
+	dev-java/commons-io:1
+	dev-java/commons-lang:2.1
+	dev-java/commons-logging:0
+	dev-java/commons-net:0
+	dev-java/flute:0
+	dev-java/freemarker:2.3
+	dev-java/icu4j:4.4
+	dev-java/jakarta-oro:2.0
+	dev-java/jdbc-mysql:0
+	dev-java/jdbc-postgresql:0
+	dev-java/jsch:0
+	dev-java/jsr173:0
+	dev-java/jvyamlb:0
+	dev-java/jzlib:0
+	dev-java/log4j:0
+	dev-java/lucene:3.0
+	dev-java/sac:0
+	dev-java/saxon:9
+	dev-java/smack:2.2
+	dev-java/sun-jaf:0
+	dev-java/tomcat-servlet-api:2.2
+	dev-java/xerces:2
+	dev-vcs/subversion:0[java]"
+#	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
+	${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"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-7.0-build.xml-r1.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die
+	ln -s "${DISTDIR}"/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip css.editor/external/css21-spec.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}"/A1C0ED8C43A306E3FB7676E7463204B9DA9BE290-non-schema.jar html.validation/external/non-schema.jar || die
+	ln -s "${DISTDIR}"/94408B54D039DA036A668C6B331EF944AF2E90EC-org.eclipse.mylyn.bugzilla.core_3.3.1.jar libs.bugzilla/external/org.eclipse.mylyn.bugzilla.core_3.3.1.jar || die
+	ln -s "${DISTDIR}"/7D3CCD3ED4DB57F2B746F5ABAF86D10F222AEB87-org.eclipse.mylyn.commons.core_3.3.1.jar libs.bugtracking/external/org.eclipse.mylyn.commons.core_3.3.1.jar || die
+	ln -s "${DISTDIR}"/02C39E6C02E2386D4936245F90AC4BFA5A7BCD49-org.eclipse.mylyn.commons.net_3.3.0.jar libs.bugtracking/external/org.eclipse.mylyn.commons.net_3.3.0.jar || die
+	ln -s "${DISTDIR}"/DF522A06BF4EFD99A12C545C294D940CF6A2E01D-org.eclipse.mylyn.tasks.core_3.3.1.jar libs.bugtracking/external/org.eclipse.mylyn.tasks.core_3.3.1.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}"/538D727A9A0874019FB11280F07CE3F43EE723BC-sqljet-1.0.3.jar libs.svnClientAdapter.svnkit/external/sqljet-1.0.3.jar || die
+	ln -s "${DISTDIR}"/0B9606F570B28FFC4FCE6C7222B88B3DCEFB1A36-svnClientAdapter-javahl-1.6.13.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-javahl-1.6.13.jar || die
+	ln -s "${DISTDIR}"/A11623D2AF72A99C1509EC2A0ADA2DACBEE9A8E4-svnClientAdapter-main-1.6.13.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.6.13.jar || die
+	ln -s "${DISTDIR}"/0AE20EC02958F193ADAB4C272ACCF6FE3196DCA0-svnClientAdapter-svnkit-1.6.13.jar libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.6.13.jar || die
+	ln -s "${DISTDIR}"/636C6FF256A978B786D7502F43E788448E9DAB4B-svnkit-1.3.4.jar libs.svnClientAdapter.svnkit/external/svnkit-1.3.4.jar || die
+	ln -s "${DISTDIR}"/AB271CFC19469D9088BE306685A7AC8787373F99-svnkit-javahl.jar libs.svnClientAdapter.svnkit/external/svnkit-javahl.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}"/68B82D7246FD90E0FC70BB9C8F10611489BF371A-trilead.jar libs.svnClientAdapter.svnkit/external/trilead.jar || die
+	ln -s "${DISTDIR}"/55CD0B272084EB80B8C91F3A0617BB602B4EF2DF-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
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-7.0-build.xml-r1.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS70_PATCHES_DIR}" -a -d "${NETBEANS70_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS70_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 --into css.visual/external flute flute.jar flute-1.3.jar
+	java-pkg_jar-from --into css.visual/external sac sac.jar sac-1.3.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.13-bin.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-postgresql jdbc-postgresql.jar postgresql-8.3-603.jdbc3.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.bugtracking/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.1.jar
+	java-pkg_jar-from --into libs.bugtracking/external commons-lang-2.1 commons-lang.jar commons-lang-2.3.jar
+	java-pkg_jar-from --into libs.commons_codec/external commons-codec commons-codec.jar apache-commons-codec-1.3.jar
+	java-pkg_jar-from --into libs.commons_logging/external commons-logging commons-logging.jar commons-logging-1.1.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.jakarta_oro/external jakarta-oro-2.0 jakarta-oro.jar jakarta-oro-2.0.8.jar
+	# java-pkg_jar-from --into libs.jaxb/external jaxb-2 jaxb-impl.jar jaxb-impl.jar
+	java-pkg_jar-from --into libs.jsch/external jsch jsch.jar jsch-0.1.43.jar
+	java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.3.jar
+	java-pkg_jar-from --into libs.jzlib/external jzlib jzlib.jar jzlib-1.0.7.jar
+	java-pkg_jar-from --into libs.lucene/external lucene-3.0 lucene-core.jar lucene-core-3.0.3.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.6.0.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 --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_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
+	rm apache-commons-codec-1.3.jar && dosym /usr/share/commons-codec/lib/commons-codec.jar ${instdir}/apache-commons-codec-1.3.jar || die
+	# bytelist-0.1.jar
+	rm commons-httpclient-3.1.jar && dosym /usr/share/commons-httpclient-3/lib/commons-httpclient.jar ${instdir}/commons-httpclient-3.1.jar || die
+	rm commons-io-1.4.jar && dosym /usr/share/commons-io-1/lib/commons-io.jar ${instdir}/commons-io-1.4.jar || die
+	rm commons-lang-2.3.jar && dosym /usr/share/commons-lang-2.1/lib/commons-lang.jar ${instdir}/commons-lang-2.3.jar || die
+	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.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-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 flute-1.3.jar && dosym /usr/share/flute/lib/flute.jar ${instdir}/flute-1.3.jar || die
+	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
+	rm jakarta-oro-2.0.8.jar && dosym /usr/share/jakarta-oro-2.0/lib/jakarta-oro.jar ${instdir}/jakarta-oro-2.0.8.jar
+	# [[ -f jing.jar ]] && java-pkg_jar-from jing jing.jar ${instdir}/jing.jar || die
+	rm jsch-0.1.43.jar && dosym /usr/share/jsch//lib/jsch.jar ${instdir}/jsch-0.1.43.jar || die
+	# js.jar
+	rm jvyamlb-0.2.3.jar && dosym /usr/share/jvyamlb/lib/jvyamlb.jar ${instdir}/jvyamlb-0.2.3.jar || die
+	rm jzlib-1.0.7.jar && dosym /usr/share/jzlib/lib/jzlib.jar ${instdir}/jzlib-1.0.7.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.0.3.jar && dosym /usr/share/lucene-3.0/lib/lucene-core.jar ${instdir}/lucene-core-3.0.3.jar || die
+	rm mysql-connector-java-5.1.13-bin.jar && dosym /usr/share/jdbc-mysql/lib/jdbc-mysql.jar ${instdir}/mysql-connector-java-5.1.13-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-8.3-603.jdbc3.jar && dosym /usr/share/jdbc-postgresql/lib/jdbc-postgresql.jar ${instdir}/postgresql-8.3-603.jdbc3.jar || die
+	# processtreekiller-1.0.1.jar
+	# resolver-1.2.jar
+	rm sac-1.3.jar && dosym /usr/share/sac/lib/sac.jar ${instdir}/sac-1.3.jar || die
+	rm saxon9B.jar && dosym /usr/share/saxon-9/lib/saxon.jar ${instdir}/saxon9B.jar || die
+	rm servlet-2.2.jar && dosym /usr/share/tomcat-servlet-api-2.2/lib/servlet.jar ${instdir}/servlet-2.2.jar || die
+	rm smack.jar && dosym /usr/share/smack-2.2/lib/smack.jar ${instdir}/smack.jar || die
+	rm smackx.jar && dosym /usr/share/smack-2.2/lib/smackx.jar ${instdir}/smackx.jar || die
+	# 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.6.0.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl-1.6.0.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 2a61d44..ff0141b 100644
--- a/dev-java/netbeans-java/ChangeLog
+++ b/dev-java/netbeans-java/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-java-7.0_rc1_p20110401 (01 Apr 2011)
+
+  01 Apr 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-java-7.0_rc1_p20110401.ebuild:
+  Bumped to latest nightly sources
+
   30 Mar 2011; Miroslav Šulc <fordfrog@g.o>
   -netbeans-java-7.0_beta2.ebuild:
   Removed old beta release

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 09203d5..d79e08b 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -16,13 +16,16 @@ DIST A511890049A6A9B8D675F4417721337580CBD2F9-apache-maven-3.0.3-bin.zip 3076808
 DIST B456600D274B835E1E7DDB16FD843DDAB2ED3EF1-appframework-1.0.3-doc.zip 301845 RMD160 170bbc400e7001567a6f0aec9394c04ab6f1ec37 SHA1 b456600d274b835e1e7ddb16fd843ddab2ed3ef1 SHA256 0667f86903d97f78ec1022ef1f31a173990bf69b3f882f95e11ea2bf968ec7d0
 DIST C537EAEE0EB142BB8F7AB6AFF340D79913997DD9-indexer-core-4.0.0.MINDEXER-12+MINDEXER-13.jar 211897 RMD160 b470616abd8cf91c694aff1c71cfe50ed6a8a570 SHA1 c537eaee0eb142bb8f7ab6aff340d79913997dd9 SHA256 8845a4582ded27cb07c0a52e00d6888a6f250e33d56dcd0dc0c2728757f57ced
 DIST C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip 5029407 RMD160 546dd5f8c9039925e89e76655265e6105658951d SHA1 c8a5e0d558ea7e7349f9d32b838553d5e7dd214f SHA256 7492417ca97835935912d931f9c2a1c9d98fc35fab455d086fd11f7ff663acb8
+DIST D15B11B3CBD093FF6D6939A5C56D8DAC81F5790C-javac-impl-nb-7.0-b07.jar 1671812 RMD160 31abbdcfd8288f41b2856d52634261f4d96f3e8d SHA1 d15b11b3cbd093ff6d6939a5c56d8dac81f5790c SHA256 34e61a2d9569d77dc14f65dd0677260cd51ea3eb3739b1cf37d0188376d425f7
 DIST D88A41174C5F85D1B791D6A8E0F8B8A1C459D6C0-spring-framework-3.0.2.RELEASE.zip 4054621 RMD160 8d410595e912d2a8d30a0bdfbdf83413692a4269 SHA1 d88a41174c5f85d1b791d6a8e0f8b8a1c459d6c0 SHA256 5901b2a23c80f2669016697aadf27fefd8350fdd5cc876f8e979d5aac92a857e
 DIST F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip 930828 RMD160 7034dd5c48bcf6e44a1de417206f799c942b9f11 SHA1 f7bd95641780c2aae8cb9bed1686441a1ce5e749 SHA256 5f41fe1ef8a7607bafbc04baa7814aecaf72b90a6fa796adec0846f50f8ac7f0
 DIST FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip 2141252 RMD160 97e4e22e7d9a1c9731bac89252399a560d9c3dbf SHA1 ff23dbb427d09aaec3998b50d740c42b6a3fcd61 SHA256 4dea45582ff69620a906347fc1b085bb1cffb75e215cb55ec74181ae240a5be4
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0rc1-201103280000-src.zip 175475363 RMD160 e5fe3ff726404ea8357a7cc7a383e6b8a06dd316 SHA1 df109f98c07bf01b862e59c68bbee76aae6c01df SHA256 fac906f9bdfd740b55758cf171a367702f78f7423cbae70add5a4d1b4669312e
 DIST netbeans-trunk-nightly-201103240400-src.zip 175550392 RMD160 687037f3ddd91fdcb9bb1808b4d61873b077cb29 SHA1 014ee2e2e38cf62b6864c71a2325d4c82fa602cd SHA256 0918ca520f56068114e427ffefdcafedef7a9007b6e1a51964883d64eaa9225a
+DIST netbeans-trunk-nightly-201104010400-src.zip 175593086 RMD160 2c117c544cc554c4fec48515c43a506f52393d2e SHA1 5da39cb9ef621673a06f8a1a734dc7f44cace0fa SHA256 defdf23bbb73b50689c5d30d505d86bc55795d4f98f6b1500966f35718d0c335
 EBUILD netbeans-java-7.0_beta2_p20110324.ebuild 14845 RMD160 37db4dcc14bf6b223e475423ddd75b5ba61639e4 SHA1 f762f93cdfce54a79e39f0f1ee3ed8a8f857891a SHA256 566448277b2d3220ca65b6d513db6a4c71b77f46e3ead463ca9f8b822d27ef49
 EBUILD netbeans-java-7.0_rc1.ebuild 14892 RMD160 48ff8722ce1465adf9d2b95e924ec121036e8a3c SHA1 46b4299f50844acd593dce78f5d128c426c2493e SHA256 a9b9ef10266ba0129b0c78959ef41c7278369ac8b603900f4a1787403364edb5
-MISC ChangeLog 4737 RMD160 80acd820c46a3385ffd367a8d9f56c1ded6c00ae SHA1 64c3fc7c5b6cb70013dfbdfbd3f27414b991987a SHA256 a16ddd8df206a3d51e94e197a3a16d57e827b50f8e52a28997febc5f5000353e
+EBUILD netbeans-java-7.0_rc1_p20110401.ebuild 14917 RMD160 637c59d3eeab18cb8934dd12630e62c8def11bfe SHA1 2a4ddd2199a6b8db3bfa263ce690f391ab8234f1 SHA256 95198821f4530ab564fb82fa33e06ef4ab99b29ba1ff3bcaadd9e4d3b77766d5
+MISC ChangeLog 4916 RMD160 337447c2a8215958d6ef11fec9a97fefcfa48016 SHA1 edfc1f16e97b4b50283042bf264c583b506c5c6f SHA256 ce9151534d46885bc4ce27e05b4ad21e62680cae39650ec0295955d9c13c184c
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-java/netbeans-java-7.0_rc1_p20110401.ebuild b/dev-java/netbeans-java/netbeans-java-7.0_rc1_p20110401.ebuild
new file mode 100644
index 0000000..1df6da9
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-7.0_rc1_p20110401.ebuild
@@ -0,0 +1,304 @@
+# Copyright 1999-2011 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 Java Cluster"
+HOMEPAGE="http://netbeans.org/projects/java"
+SLOT="7.0"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2011-04-01_04-00-17/zip/netbeans-trunk-nightly-201104010400-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}-build.xml-r1.patch.bz2
+	http://hg.netbeans.org/binaries/FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip
+	http://hg.netbeans.org/binaries/A511890049A6A9B8D675F4417721337580CBD2F9-apache-maven-3.0.3-bin.zip
+	http://hg.netbeans.org/binaries/B456600D274B835E1E7DDB16FD843DDAB2ED3EF1-appframework-1.0.3-doc.zip
+	http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip
+	http://hg.netbeans.org/binaries/8C9BFFBCB34DB6E9C9C03413623F05375D44CE49-eclipselink-2.2.0.jar
+	http://hg.netbeans.org/binaries/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-eclipselink-javax.persistence-2.0.jar
+	http://hg.netbeans.org/binaries/263D76EEB2FA35AE240DE31CFDE83C04096AE19E-eclipselink-jpa-modelgen-2.2.0.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/3AF24D401F76D153B77641865737DE53E41E60D6-indexer-artifact-4.0.0.jar
+	http://hg.netbeans.org/binaries/C537EAEE0EB142BB8F7AB6AFF340D79913997DD9-indexer-core-4.0.0.MINDEXER-12+MINDEXER-13.jar
+	http://hg.netbeans.org/binaries/03D05A90FFB98D4E5748AE96C99AE549224C1ABC-javac-api-nb-7.0-b07.jar
+	http://hg.netbeans.org/binaries/D15B11B3CBD093FF6D6939A5C56D8DAC81F5790C-javac-impl-nb-7.0-b07.jar
+	http://hg.netbeans.org/binaries/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.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/2D0D28E05BD6B6452DAAFE2B5CCB69A84EA63E5D-spring-2.5.6.SEC01.jar
+	http://hg.netbeans.org/binaries/D88A41174C5F85D1B791D6A8E0F8B8A1C459D6C0-spring-framework-3.0.2.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/appframework:0
+	dev-java/beansbinding:0
+	dev-java/cglib:2.2
+	dev-java/jdom:1.0
+	dev-java/swing-worker:0"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+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/jta:0
+	dev-java/jtidy:0
+	dev-java/maven-bin:3.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"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-7.0-build.xml-r1.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
+	ln -s "${DISTDIR}"/A511890049A6A9B8D675F4417721337580CBD2F9-apache-maven-3.0.3-bin.zip maven.embedder/external/apache-maven-3.0.3-bin.zip || die
+	ln -s "${DISTDIR}"/B456600D274B835E1E7DDB16FD843DDAB2ED3EF1-appframework-1.0.3-doc.zip swingapp/external/appframework-1.0.3-doc.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}"/8C9BFFBCB34DB6E9C9C03413623F05375D44CE49-eclipselink-2.2.0.jar j2ee.eclipselink/external/eclipselink-2.2.0.jar || die
+	ln -s "${DISTDIR}"/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-eclipselink-javax.persistence-2.0.jar j2ee.eclipselink/external/eclipselink-javax.persistence-2.0.jar || die
+	ln -s "${DISTDIR}"/263D76EEB2FA35AE240DE31CFDE83C04096AE19E-eclipselink-jpa-modelgen-2.2.0.jar j2ee.eclipselinkmodelgen/external/eclipselink-jpa-modelgen-2.2.0.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}"/3AF24D401F76D153B77641865737DE53E41E60D6-indexer-artifact-4.0.0.jar maven.indexer/external/indexer-artifact-4.0.0.jar || die
+	ln -s "${DISTDIR}"/C537EAEE0EB142BB8F7AB6AFF340D79913997DD9-indexer-core-4.0.0.MINDEXER-12+MINDEXER-13.jar maven.indexer/external/indexer-core-4.0.0.MINDEXER-12+MINDEXER-13.jar || die
+	ln -s "${DISTDIR}"/03D05A90FFB98D4E5748AE96C99AE549224C1ABC-javac-api-nb-7.0-b07.jar libs.javacapi/external/javac-api-nb-7.0-b07.jar || die
+	ln -s "${DISTDIR}"/D15B11B3CBD093FF6D6939A5C56D8DAC81F5790C-javac-impl-nb-7.0-b07.jar libs.javacimpl/external/javac-impl-nb-7.0-b07.jar || die
+	ln -s "${DISTDIR}"/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar maven.embedder/external/maven-dependency-tree-1.2.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}"/2D0D28E05BD6B6452DAAFE2B5CCB69A84EA63E5D-spring-2.5.6.SEC01.jar libs.springframework/external/spring-2.5.6.SEC01.jar || die
+	ln -s "${DISTDIR}"/D88A41174C5F85D1B791D6A8E0F8B8A1C459D6C0-spring-framework-3.0.2.RELEASE.zip libs.springframework/external/spring-framework-3.0.2.RELEASE.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-7.0-build.xml-r1.patch
+	sed -i "s%../o.jdesktop.layout/external%\${netbeans.dest.dir}/\${nb.cluster.platform.dir}/modules/ext%" java.examples/build.xml
+
+	# Support for custom patches
+	if [ -n "${NETBEANS70_PATCHES_DIR}" -a -d "${NETBEANS70_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS70_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 --into maven.embedder/external jdom-1.0 jdom.jar jdom-1.0.jar
+	java-pkg_jar-from --into o.jdesktop.beansbinding/external beansbinding beansbinding.jar beansbinding-1.2.1.jar
+	java-pkg_jar-from --into swingapp/external appframework appframework.jar appframework-1.0.3.jar
+	java-pkg_jar-from --into swingapp/external swing-worker swing-worker.jar swing-worker-1.1.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	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
+
+	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 appframework-1.0.3.jar && dosym /usr/share/appframework/lib/appframework.jar ${instdir}/appframework-1.0.3.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
+	rm swing-worker-1.1.jar && dosym /usr/share/swing-worker/lib/swing-worker.jar ${instdir}/swing-worker-1.1.jar || die
+	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-3.1.0.jar
+	# indexer-core-3.1.0.jar
+	rm jdom-1.0.jar && dosym /usr/share/jdom-1.0/lib/jdom.jar ${instdir}/jdom-1.0.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
+}
+
+pkg_postinst() {
+	elog "Note that if you change your version of ant, you have to re-emerge"
+	elog "this package to get updated the link to ant tasks of that specific"
+	elog "version."
+}

diff --git a/dev-java/netbeans-javacard/ChangeLog b/dev-java/netbeans-javacard/ChangeLog
index e69107e..cec309d 100644
--- a/dev-java/netbeans-javacard/ChangeLog
+++ b/dev-java/netbeans-javacard/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javacard-7.0_rc1_p20110401 (01 Apr 2011)
+
+  01 Apr 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-javacard-7.0_rc1_p20110401.ebuild:
+  Bumped to latest nightly sources
+
   30 Mar 2011; Miroslav Šulc <fordfrog@g.o>
   -netbeans-javacard-7.0_beta2.ebuild:
   Removed old beta release

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index faa85ad..dd6a7bd 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -4,7 +4,9 @@ DIST 9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar 125083 RMD160 e7ad1dd08
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0rc1-201103280000-src.zip 175475363 RMD160 e5fe3ff726404ea8357a7cc7a383e6b8a06dd316 SHA1 df109f98c07bf01b862e59c68bbee76aae6c01df SHA256 fac906f9bdfd740b55758cf171a367702f78f7423cbae70add5a4d1b4669312e
 DIST netbeans-trunk-nightly-201103240400-src.zip 175550392 RMD160 687037f3ddd91fdcb9bb1808b4d61873b077cb29 SHA1 014ee2e2e38cf62b6864c71a2325d4c82fa602cd SHA256 0918ca520f56068114e427ffefdcafedef7a9007b6e1a51964883d64eaa9225a
+DIST netbeans-trunk-nightly-201104010400-src.zip 175593086 RMD160 2c117c544cc554c4fec48515c43a506f52393d2e SHA1 5da39cb9ef621673a06f8a1a734dc7f44cace0fa SHA256 defdf23bbb73b50689c5d30d505d86bc55795d4f98f6b1500966f35718d0c335
 EBUILD netbeans-javacard-7.0_beta2_p20110324.ebuild 4926 RMD160 da7f2e01f93c4f200774a0cd06e0825770e6dae7 SHA1 79af843131d846c131b053febed3581238233c51 SHA256 f2829a4831ad100409ad4b8c7ea6b4a78d22191af1a58afa8e702dfb6383c802
 EBUILD netbeans-javacard-7.0_rc1.ebuild 4901 RMD160 b1bdf06a0e068dcda740f5bb548689b60b015b87 SHA1 d2e78bd998c79534a8f06002ca012745cd9fac0a SHA256 ec4f96df48ed370a7610179517b8b14b9d254b9e773435d7b2961bfa07c33d75
-MISC ChangeLog 4659 RMD160 63e41db67ba87507d3dfbf11e51d8a149d6e703f SHA1 fc9d6973f9b23e16257ce555f4044e7519da3578 SHA256 fcbf4d12f4a2a69e28c61b1cc2415a4e0f3f9b5bc379e25820b5f27b4961ad86
+EBUILD netbeans-javacard-7.0_rc1_p20110401.ebuild 4926 RMD160 8563d047571becb1928fc67a69e184ee6e77c91a SHA1 887670f71fb479ae4aaf9517d4c7513baa74c345 SHA256 99d2cdf19e3c21a8e994908be5aa9cdfef7828150a7f727352abbd8fa0b47ca7
+MISC ChangeLog 4846 RMD160 533646980bba0a93ae746e7e8a1109a9cff081a5 SHA1 88308adafd41f49832c39c422e8d11df486a2a05 SHA256 684130d5d68d380d610d9d586abfb801c472030225423dde7abb339db3195b19
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-7.0_rc1_p20110401.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-7.0_rc1_p20110401.ebuild
new file mode 100644
index 0000000..b41e2dc
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-7.0_rc1_p20110401.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2011 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="7.0"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2011-04-01_04-00-17/zip/netbeans-trunk-nightly-201104010400-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}-build.xml-r1.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"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-7.0-build.xml-r1.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-7.0-build.xml-r1.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS70_PATCHES_DIR}" -a -d "${NETBEANS70_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS70_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 ddbb43f..6e5b20c 100644
--- a/dev-java/netbeans-javadoc/ChangeLog
+++ b/dev-java/netbeans-javadoc/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javadoc-7.0_rc1_p20110401 (01 Apr 2011)
+
+  01 Apr 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-javadoc-7.0_rc1_p20110401.ebuild:
+  Bumped to latest nightly sources
+
   30 Mar 2011; Miroslav Šulc <fordfrog@g.o>
   -netbeans-javadoc-7.0_beta2.ebuild:
   Removed old beta release

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index aa5cdb9..3fd4375 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -2,7 +2,9 @@ DIST FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip 2141252 RMD160
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0rc1-201103280000-src.zip 175475363 RMD160 e5fe3ff726404ea8357a7cc7a383e6b8a06dd316 SHA1 df109f98c07bf01b862e59c68bbee76aae6c01df SHA256 fac906f9bdfd740b55758cf171a367702f78f7423cbae70add5a4d1b4669312e
 DIST netbeans-trunk-nightly-201103240400-src.zip 175550392 RMD160 687037f3ddd91fdcb9bb1808b4d61873b077cb29 SHA1 014ee2e2e38cf62b6864c71a2325d4c82fa602cd SHA256 0918ca520f56068114e427ffefdcafedef7a9007b6e1a51964883d64eaa9225a
+DIST netbeans-trunk-nightly-201104010400-src.zip 175593086 RMD160 2c117c544cc554c4fec48515c43a506f52393d2e SHA1 5da39cb9ef621673a06f8a1a734dc7f44cace0fa SHA256 defdf23bbb73b50689c5d30d505d86bc55795d4f98f6b1500966f35718d0c335
 EBUILD netbeans-javadoc-7.0_beta2_p20110324.ebuild 5730 RMD160 5462bdea69c85b7480b4576e5dbc5622549565f5 SHA1 5e1a8478d81877f3edc732103538e9fa905273d2 SHA256 42d3d5dab49bb7718fc41f8d3c3a3814f1a138212a8a3ece6a06ebd273807256
 EBUILD netbeans-javadoc-7.0_rc1.ebuild 5705 RMD160 0a75c2853fc01566a0f29b9efabca4c176cd7bb8 SHA1 2cdcb22ce19bdc4be6bc6484f4bc7e0586276e39 SHA256 025b2515a16e033937400e1a4f3f31c401e916413975bf500a0afb57794be3d9
-MISC ChangeLog 4387 RMD160 efc8921cc11a09db73914af5e6d35003652ae93e SHA1 5a52693f8a5f295d2cb508e509aff4a3b1a7b522 SHA256 f726c0ee18eaa401a6a1dc499d546daf61353aeabb12258c487ab510c3d27d82
+EBUILD netbeans-javadoc-7.0_rc1_p20110401.ebuild 5730 RMD160 f523d0a53d01199be8015c591063c4474ee3c149 SHA1 e39dcd881f6c301a907b0d87877d73fa5b9986fd SHA256 fcbaa7c1ab5030d46b9e94da0c3a62b229683d6f567463e3079bf67414dcb2cc
+MISC ChangeLog 4572 RMD160 9a26d34221f292528b28787e5b08f2a9b130805b SHA1 bdffaf271330bbac518e1a467a895e5462dfe01d SHA256 b7f437dce71bee34d1b29ca805b141c7fff19d6a0a2264f43c265d68b87c5594
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-7.0_rc1_p20110401.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-7.0_rc1_p20110401.ebuild
new file mode 100644
index 0000000..6d1440f
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-7.0_rc1_p20110401.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2011 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="7.0"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2011-04-01_04-00-17/zip/netbeans-trunk-nightly-201104010400-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}-build.xml-r1.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/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-7.0-build.xml-r1.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-7.0-build.xml-r1.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS70_PATCHES_DIR}" -a -d "${NETBEANS70_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS70_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-apisupport-${SLOT} apisupport || die
+	cat /usr/share/netbeans-apisupport-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.apisupport.built
+
+	ln -s /usr/share/netbeans-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-mobility/ChangeLog b/dev-java/netbeans-mobility/ChangeLog
index e9b6ef2..9703aac 100644
--- a/dev-java/netbeans-mobility/ChangeLog
+++ b/dev-java/netbeans-mobility/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-mobility-7.0_rc1_p20110401 (01 Apr 2011)
+
+  01 Apr 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-mobility-7.0_rc1_p20110401.ebuild:
+  Bumped to latest nightly sources
+
   30 Mar 2011; Miroslav Šulc <fordfrog@g.o>
   -netbeans-mobility-7.0_beta2.ebuild:
   Removed old beta release

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 1c1c7ad..3919350 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -9,7 +9,9 @@ DIST D76B8334DCBDBE93297AA5C02B17D9A856E72246-jmunit4cldc11-1.2.1.jar 18043 RMD1
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0rc1-201103280000-src.zip 175475363 RMD160 e5fe3ff726404ea8357a7cc7a383e6b8a06dd316 SHA1 df109f98c07bf01b862e59c68bbee76aae6c01df SHA256 fac906f9bdfd740b55758cf171a367702f78f7423cbae70add5a4d1b4669312e
 DIST netbeans-trunk-nightly-201103240400-src.zip 175550392 RMD160 687037f3ddd91fdcb9bb1808b4d61873b077cb29 SHA1 014ee2e2e38cf62b6864c71a2325d4c82fa602cd SHA256 0918ca520f56068114e427ffefdcafedef7a9007b6e1a51964883d64eaa9225a
+DIST netbeans-trunk-nightly-201104010400-src.zip 175593086 RMD160 2c117c544cc554c4fec48515c43a506f52393d2e SHA1 5da39cb9ef621673a06f8a1a734dc7f44cace0fa SHA256 defdf23bbb73b50689c5d30d505d86bc55795d4f98f6b1500966f35718d0c335
 EBUILD netbeans-mobility-7.0_beta2_p20110324.ebuild 8620 RMD160 6fae777e8a18db7cbc992ffc120539fbc52fc7b8 SHA1 3b5a925f8e4529abf41268fd54b6f84f13ddfdee SHA256 74b9d94c391ac2fd21d95207956af9de8525f61c6931c1231e6a8cefac5a9b47
 EBUILD netbeans-mobility-7.0_rc1.ebuild 8595 RMD160 6310d982b7a958b4113f09e80e6e5dcf02bf70ea SHA1 ed3c9896ebc8a66800b493eb8c34e28d8d860de1 SHA256 5b6b2c94294510164fb4a8daa4a184da517698e67852d63835455768b1b24310
-MISC ChangeLog 4800 RMD160 a21681a15c460f8f4282049b1a97264093bdd609 SHA1 f6ae8aedf2929d6777427a8f4aea1b17e168804e SHA256 59090ffaa5a0d1125880e2da409b3bac63d9680675b8cf917274b5c2c4929980
+EBUILD netbeans-mobility-7.0_rc1_p20110401.ebuild 8620 RMD160 1d1f62f97775fd2b1dc532a113c153d4605b7db1 SHA1 5f2c16383736348619636a036b1f3744e5a405af SHA256 62b656374e552049f478269f7d415327fea82bb4b423003c807c6238d6f14645
+MISC ChangeLog 4987 RMD160 6c2ca4277946d69db33ae731ac83749700868c2f SHA1 44b41cb570a8eda0e89937d966deb9e630e7e023 SHA256 8a4fdc89cfde9e36e8f447f31de043db1c11843bbe23720926bd1059cbb8b692
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-7.0_rc1_p20110401.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-7.0_rc1_p20110401.ebuild
new file mode 100644
index 0000000..0ed9e7b
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-7.0_rc1_p20110401.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2011 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="7.0"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2011-04-01_04-00-17/zip/netbeans-trunk-nightly-201104010400-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}-build.xml-r1.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/3A5C68B301F42D3E8D89976F90D4E2AE6F2984B6-nbactivesync-5.0.jar
+	http://hg.netbeans.org/binaries/2EF44D925014E2EF76416535CC0F3A7C7E9F4AE1-perseus-nb-1.0.jar
+	http://hg.netbeans.org/binaries/793B8D020D81284E0B67FB635C17026121F06433-RicohAntTasks-2.0.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-codec: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"
+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-7.0-build.xml-r1.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}"/3A5C68B301F42D3E8D89976F90D4E2AE6F2984B6-nbactivesync-5.0.jar o.n.mobility.lib.activesync/external/nbactivesync-5.0.jar || die
+	ln -s "${DISTDIR}"/2EF44D925014E2EF76416535CC0F3A7C7E9F4AE1-perseus-nb-1.0.jar svg.perseus/external/perseus-nb-1.0.jar || die
+	ln -s "${DISTDIR}"/793B8D020D81284E0B67FB635C17026121F06433-RicohAntTasks-2.0.jar j2me.cdc.project.ricoh/external/RicohAntTasks-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-7.0-build.xml-r1.patch
+	sed -i "/release\.external.*nbactivesync\.dll/d" o.n.mobility.lib.activesync/nbproject/project.properties || die
+
+	# Support for custom patches
+	if [ -n "${NETBEANS70_PATCHES_DIR}" -a -d "${NETBEANS70_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS70_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 j2me.cdc.project.ricoh/external commons-codec commons-codec.jar commons-codec-1.3.jar
+	java-pkg_jar-from --into j2me.cdc.project.ricoh/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.0.jar
+	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-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-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.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 2d3dc2d..de2ff49 100644
--- a/dev-java/netbeans-nb/ChangeLog
+++ b/dev-java/netbeans-nb/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-nb-7.0_rc1_p20110401 (01 Apr 2011)
+
+  01 Apr 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-nb-7.0_rc1_p20110401.ebuild:
+  Bumped to latest nightly sources
+
   30 Mar 2011; Miroslav Šulc <fordfrog@g.o>
   -netbeans-nb-7.0_beta2.ebuild:
   Removed old beta release

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index b48343f..7276aa2 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -3,7 +3,9 @@ DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674
 DIST netbeans-7.0.png 20011 RMD160 a941b71b571a9cd30c49446aef1bd4244e689465 SHA1 ebd2e748bb4bc29e667ead9a2fb717a9017f9405 SHA256 1d519f018ebeff6e29436c8492dbb266446bd0144fb5519b2ef6637664de6f4a
 DIST netbeans-7.0rc1-201103280000-src.zip 175475363 RMD160 e5fe3ff726404ea8357a7cc7a383e6b8a06dd316 SHA1 df109f98c07bf01b862e59c68bbee76aae6c01df SHA256 fac906f9bdfd740b55758cf171a367702f78f7423cbae70add5a4d1b4669312e
 DIST netbeans-trunk-nightly-201103240400-src.zip 175550392 RMD160 687037f3ddd91fdcb9bb1808b4d61873b077cb29 SHA1 014ee2e2e38cf62b6864c71a2325d4c82fa602cd SHA256 0918ca520f56068114e427ffefdcafedef7a9007b6e1a51964883d64eaa9225a
+DIST netbeans-trunk-nightly-201104010400-src.zip 175593086 RMD160 2c117c544cc554c4fec48515c43a506f52393d2e SHA1 5da39cb9ef621673a06f8a1a734dc7f44cace0fa SHA256 defdf23bbb73b50689c5d30d505d86bc55795d4f98f6b1500966f35718d0c335
 EBUILD netbeans-nb-7.0_beta2_p20110324.ebuild 5067 RMD160 e63ac9b11974aa60073322ddd00eda49fff1bbce SHA1 550289fccf77133b29cfd31c091cd57ab9375d6e SHA256 de8c7769dbb0bf56f56de74a10ba6cd10a614afc771f7a76a9f6d63aed5a8578
 EBUILD netbeans-nb-7.0_rc1.ebuild 5042 RMD160 6011ca3da5e64352a605c4863dd837772752b5a2 SHA1 5e27c7d1a37ba77a12abdb27c471b852ddb06595 SHA256 471acd4fa770d38b38dd9c44386450099b2201b44ad47c6afb79337ab8df9656
-MISC ChangeLog 4517 RMD160 eb581dcba296abf0ca5b2669c538fd06831367fb SHA1 6ad376fc9fa697283ba9aca15351bd7c1fc59699 SHA256 f9ed73c951a19afefd86339e820bbb063f88f8bf3ac646067516a170ce59af9d
+EBUILD netbeans-nb-7.0_rc1_p20110401.ebuild 5067 RMD160 c748432742466fa064c041855013781e7dcbb3d5 SHA1 8c83b94eaddb5cba8fc66ffdfe08ce8a2fb2e002 SHA256 95b5ca7ecc2b234e546ffc93db74704a631ad6647efbe1e62130e473681ecb29
+MISC ChangeLog 4692 RMD160 6b364a88232c261315bad1fceea0aca765658beb SHA1 6fa16b9c3e9d79778c17153c8fd27eaebe996680 SHA256 3099153d0465696cb0ffecd7044266b806cec5bf92bccb0c1808d069c9ed34eb
 MISC metadata.xml 396 RMD160 80c4086b305af8d5e4adae8a263111590f183c05 SHA1 11224a41781dde9ebd92c32e5c0a9d1921b628cb SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49

diff --git a/dev-java/netbeans-nb/netbeans-nb-7.0_rc1_p20110401.ebuild b/dev-java/netbeans-nb/netbeans-nb-7.0_rc1_p20110401.ebuild
new file mode 100644
index 0000000..1f4b6f2
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-7.0_rc1_p20110401.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2011 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="7.0"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2011-04-01_04-00-17/zip/netbeans-trunk-nightly-201104010400-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}-build.xml-r1.patch.bz2
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}.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"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-7.0-build.xml-r1.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-7.0-build.xml-r1.patch
+	use keychain && epatch "${FILESDIR}"/${SLOT}/keychain-support.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS70_PATCHES_DIR}" -a -d "${NETBEANS70_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS70_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
+	sed -i "s%#netbeans_jdkhome=\"/path/to/jdk\"%netbeans_jdkhome=\"\$(java-config -O)\"%" "${D}"/etc/netbeans-${SLOT}/netbeans.conf || die
+
+	# fix paths per bug# 163483
+	if [[ -e "${D}"/${INSTALL_DIR}/bin/netbeans ]]; then
+		sed -i -e 's:"$progdir"/../etc/:/etc/netbeans-7.0/:' "${D}"/${INSTALL_DIR}/bin/netbeans
+		sed -i -e 's:"${userdir}"/etc/:/etc/netbeans-7.0/:' "${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-${SLOT}.png "${D}"/usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png
+	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 8f31ee1..9ff3622 100644
--- a/dev-java/netbeans-php/ChangeLog
+++ b/dev-java/netbeans-php/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-php-7.0_rc1_p20110401 (01 Apr 2011)
+
+  01 Apr 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-php-7.0_rc1_p20110401.ebuild:
+  Bumped to latest nightly sources
+
   30 Mar 2011; Miroslav Šulc <fordfrog@g.o>
   -netbeans-php-7.0_beta2.ebuild:
   Removed old beta release

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index 7dce1ca..792d3c2 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -5,7 +5,9 @@ DIST C3E8FC2F69123F598F29F930DC39F5B55A08824C-phpsigfiles.zip 421035 RMD160 8a73
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0rc1-201103280000-src.zip 175475363 RMD160 e5fe3ff726404ea8357a7cc7a383e6b8a06dd316 SHA1 df109f98c07bf01b862e59c68bbee76aae6c01df SHA256 fac906f9bdfd740b55758cf171a367702f78f7423cbae70add5a4d1b4669312e
 DIST netbeans-trunk-nightly-201103240400-src.zip 175550392 RMD160 687037f3ddd91fdcb9bb1808b4d61873b077cb29 SHA1 014ee2e2e38cf62b6864c71a2325d4c82fa602cd SHA256 0918ca520f56068114e427ffefdcafedef7a9007b6e1a51964883d64eaa9225a
+DIST netbeans-trunk-nightly-201104010400-src.zip 175593086 RMD160 2c117c544cc554c4fec48515c43a506f52393d2e SHA1 5da39cb9ef621673a06f8a1a734dc7f44cace0fa SHA256 defdf23bbb73b50689c5d30d505d86bc55795d4f98f6b1500966f35718d0c335
 EBUILD netbeans-php-7.0_beta2_p20110324.ebuild 4116 RMD160 4ddbf166d07842df91c6c5c125fefbcfced24c2c SHA1 156dad5b2d360d4e3365be18f9bd1c9f55178fff SHA256 dd4c3c1593247e81def4fed04455bdba06d8fcea4bb2626ab8fd6b3893e4d1c4
 EBUILD netbeans-php-7.0_rc1.ebuild 4091 RMD160 ea86e930ab84534983aa945ec9da09023ef691e3 SHA1 4a13563b367381e98b2355c1c4af349bf7246491 SHA256 c0e0ca0a57fb10e0ea81b6dd83e20671b49f1eaf9d57b7a278cb878b33374667
-MISC ChangeLog 4404 RMD160 aff7f56c63c45ddc6d63cf4dbdcf2aeee24d02b1 SHA1 8b4341cd3d94752e9d07b820a3a67f78e70c7de5 SHA256 d8790833b2f834da0249c580cf4c80663d871d496b8f81119f0b100bfd25c7c5
+EBUILD netbeans-php-7.0_rc1_p20110401.ebuild 4116 RMD160 1d3555ec65cb1c5147ddb7d12712b6b3a7711430 SHA1 6465ea2b3908085a4177344c08d676a929d3be7b SHA256 5c1689e0d752f1a1cd8580b2d788ced4555b542c1ed0b853033fe1f87526cc4a
+MISC ChangeLog 4581 RMD160 60d79ea1851fb41926a7e603f7ac742e73199134 SHA1 9110c841b747f1cb7078ccdbd29d739103b4d180 SHA256 8609a5604ce6633d7ca5fab9b8fa057f5000266306fb2afdea4ca27737cb90f4
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-php/netbeans-php-7.0_rc1_p20110401.ebuild b/dev-java/netbeans-php/netbeans-php-7.0_rc1_p20110401.ebuild
new file mode 100644
index 0000000..191b326
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-7.0_rc1_p20110401.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2011 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="7.0"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2011-04-01_04-00-17/zip/netbeans-trunk-nightly-201104010400-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}-build.xml-r1.patch.bz2
+	http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip
+	http://hg.netbeans.org/binaries/C3E8FC2F69123F598F29F930DC39F5B55A08824C-phpsigfiles.zip
+	http://hg.netbeans.org/binaries/06D0F78D33106A7E5D33B414BE4CA0CE474D969A-preindexed-php.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-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"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-7.0-build.xml-r1.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip php.phpdoc.documentation/external/phpdocdesc.zip || die
+	ln -s "${DISTDIR}"/C3E8FC2F69123F598F29F930DC39F5B55A08824C-phpsigfiles.zip php.project/external/phpsigfiles.zip || die
+	ln -s "${DISTDIR}"/06D0F78D33106A7E5D33B414BE4CA0CE474D969A-preindexed-php.zip php.project/external/preindexed-php.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-7.0-build.xml-r1.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS70_PATCHES_DIR}" -a -d "${NETBEANS70_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS70_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-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 a81254b..cbcb58e 100644
--- a/dev-java/netbeans-platform/ChangeLog
+++ b/dev-java/netbeans-platform/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-platform-7.0_rc1_p20110401 (01 Apr 2011)
+
+  01 Apr 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-platform-7.0_rc1_p20110401.ebuild:
+  Bumped to latest nightly sources
+
   31 Mar 2011; Miroslav Šulc <fordfrog@g.o>
   netbeans-platform-7.0_rc1.ebuild,
   netbeans-platform-7.0_beta2_p20110324.ebuild:

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index 94be023..03152c3 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -6,7 +6,9 @@ DIST BD5615C6A15497B60A0AAA9A04D4F05E2BC42D07-felix-main-2.0.2.jar 23434 RMD160
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0rc1-201103280000-src.zip 175475363 RMD160 e5fe3ff726404ea8357a7cc7a383e6b8a06dd316 SHA1 df109f98c07bf01b862e59c68bbee76aae6c01df SHA256 fac906f9bdfd740b55758cf171a367702f78f7423cbae70add5a4d1b4669312e
 DIST netbeans-trunk-nightly-201103240400-src.zip 175550392 RMD160 687037f3ddd91fdcb9bb1808b4d61873b077cb29 SHA1 014ee2e2e38cf62b6864c71a2325d4c82fa602cd SHA256 0918ca520f56068114e427ffefdcafedef7a9007b6e1a51964883d64eaa9225a
+DIST netbeans-trunk-nightly-201104010400-src.zip 175593086 RMD160 2c117c544cc554c4fec48515c43a506f52393d2e SHA1 5da39cb9ef621673a06f8a1a734dc7f44cace0fa SHA256 defdf23bbb73b50689c5d30d505d86bc55795d4f98f6b1500966f35718d0c335
 EBUILD netbeans-platform-7.0_beta2_p20110324.ebuild 4885 RMD160 37856b84aae3c298e67b54fc7bd5a91641816c64 SHA1 06201c7d73ddb7e42c4b5410391d33e135a775f9 SHA256 fc75121fe3114563a8f50a1a87af984bb2db29d41df27f2256e6853d3308fcb3
 EBUILD netbeans-platform-7.0_rc1.ebuild 4860 RMD160 d9264390a4720f48ca19d8d2f194a907fb8e7af4 SHA1 f50ff8867750ea098418052168621052f6ae59ff SHA256 33c5d0c6a78134d0be9eb08975ec7b5a650187db0a4f81961881e1035615d7af
-MISC ChangeLog 5095 RMD160 5eb167816a4c9ef6ad13e7269cdbe481860555c0 SHA1 a84fbe185d3fead6cbcef8b8b49488d4e77ddfaf SHA256 f817735f156bb95496edc728c30ed0abccf968b53c0dab9a3e84c577330ddd17
+EBUILD netbeans-platform-7.0_rc1_p20110401.ebuild 4885 RMD160 1da1651d56cfe2163cdd417e87f51ceba5d3a256 SHA1 3c952ffa8b9002595aaa2a7eb99a9aed449f6047 SHA256 bd4134d733679ef8acb3ba5d609f0b9c94f3f0b35392068f2b864f14b39c8fd5
+MISC ChangeLog 5282 RMD160 17f0b030bba7e24703d829ad777011de2234aae4 SHA1 e7984b6ef4a26c0f0918e612eec66ac45e380425 SHA256 565eafdb7eea47246f39f7252c95f3f472b9c9414fd71f872394aa10ffd83f54
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-platform/netbeans-platform-7.0_rc1_p20110401.ebuild b/dev-java/netbeans-platform/netbeans-platform-7.0_rc1_p20110401.ebuild
new file mode 100644
index 0000000..12bac79
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-7.0_rc1_p20110401.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2011 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="7.0"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2011-04-01_04-00-17/zip/netbeans-trunk-nightly-201104010400-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}-build.xml-r1.patch.bz2
+	http://hg.netbeans.org/binaries/08676C719D33D26DF4F3988E210A04D7F11183B7-felix-2.0.3.jar
+	http://hg.netbeans.org/binaries/BD5615C6A15497B60A0AAA9A04D4F05E2BC42D07-felix-main-2.0.2.jar
+	http://hg.netbeans.org/binaries/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar
+	http://hg.netbeans.org/binaries/986195A7E31034EE73F7A896A36B24169692F142-osgi.core-4.2.jar
+	http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.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"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-7.0-build.xml-r1.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/08676C719D33D26DF4F3988E210A04D7F11183B7-felix-2.0.3.jar libs.felix/external/felix-2.0.3.jar || die
+	ln -s "${DISTDIR}"/BD5615C6A15497B60A0AAA9A04D4F05E2BC42D07-felix-main-2.0.2.jar libs.felix/external/felix-main-2.0.2.jar || die
+	ln -s "${DISTDIR}"/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar libs.osgi/external/osgi.cmpn-4.2.jar || die
+	ln -s "${DISTDIR}"/986195A7E31034EE73F7A896A36B24169692F142-osgi.core-4.2.jar libs.osgi/external/osgi.core-4.2.jar || die
+	ln -s "${DISTDIR}"/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip o.jdesktop.layout/external/swing-layout-1.0.4-doc.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-7.0-build.xml-r1.patch
+	# upstream jna jar contains bundled binary libraries so we disable that feature
+	sed -i "/jnidispatch/d" libs.jna/nbproject/project.properties || die
+
+	# Support for custom patches
+	if [ -n "${NETBEANS70_PATCHES_DIR}" -a -d "${NETBEANS70_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS70_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_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-2.0.3.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.2.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 837a0ff..ae5ab40 100644
--- a/dev-java/netbeans-profiler/ChangeLog
+++ b/dev-java/netbeans-profiler/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-profiler-7.0_rc1_p20110401 (01 Apr 2011)
+
+  01 Apr 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-profiler-7.0_rc1_p20110401.ebuild:
+  Bumped to latest nightly sources
+
   30 Mar 2011; Miroslav Šulc <fordfrog@g.o>
   -netbeans-profiler-7.0_beta2.ebuild:
   Removed old beta release

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index ba90177..ea05162 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -1,7 +1,9 @@
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0rc1-201103280000-src.zip 175475363 RMD160 e5fe3ff726404ea8357a7cc7a383e6b8a06dd316 SHA1 df109f98c07bf01b862e59c68bbee76aae6c01df SHA256 fac906f9bdfd740b55758cf171a367702f78f7423cbae70add5a4d1b4669312e
 DIST netbeans-trunk-nightly-201103240400-src.zip 175550392 RMD160 687037f3ddd91fdcb9bb1808b4d61873b077cb29 SHA1 014ee2e2e38cf62b6864c71a2325d4c82fa602cd SHA256 0918ca520f56068114e427ffefdcafedef7a9007b6e1a51964883d64eaa9225a
+DIST netbeans-trunk-nightly-201104010400-src.zip 175593086 RMD160 2c117c544cc554c4fec48515c43a506f52393d2e SHA1 5da39cb9ef621673a06f8a1a734dc7f44cace0fa SHA256 defdf23bbb73b50689c5d30d505d86bc55795d4f98f6b1500966f35718d0c335
 EBUILD netbeans-profiler-7.0_beta2_p20110324.ebuild 3078 RMD160 baf63749072625a7e03191f4f9f33688a34532ae SHA1 d6d58240bb39b80ecfde0249699b48a94beae2a1 SHA256 097eb78e3dee2bd59a6d1ee6522af4c5fb793fdd396290230e4e0a0961074d7d
 EBUILD netbeans-profiler-7.0_rc1.ebuild 3053 RMD160 865a8250abe4d4370711a5b1c5f1d54c80f948c6 SHA1 cb5d15e41f4d7ab0d240ee40feaebdda1a801862 SHA256 6f7011e6e097ab6155110be41eff91edcecdfbe3419f140ab8f751644959ea68
-MISC ChangeLog 4659 RMD160 6cf0b775916a45b5a3417cc3d3bf91ba1cff3f9d SHA1 6cc72acd68b14ca1fe6322820af68a9a73a3f9af SHA256 668f06ce52acbcc0f1b94d7ccd800d77b5e7f2f1d907c7306c38be70a19d0e22
+EBUILD netbeans-profiler-7.0_rc1_p20110401.ebuild 3078 RMD160 1469972b2fd604367aa339eef92b5c3af1e49aa6 SHA1 4b2a05aae1ee3b9ba3d14e4b2ff3bcbd643b4aa4 SHA256 1fc29f6f59ce7cadd53940101604d852b9530f42cf7006be3d4fc8325698b6ca
+MISC ChangeLog 4846 RMD160 1ca90ad3e09b2c049926320c75a6e8b374c4d555 SHA1 f22421a65f8137446422f5f9035491b7b010c4e4 SHA256 832e3e41bb5fa246318c4c3c475b3bf857ffe4da249b21910788ad4a17ab3516
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-7.0_rc1_p20110401.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-7.0_rc1_p20110401.ebuild
new file mode 100644
index 0000000..baaa755
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-7.0_rc1_p20110401.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2011 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="7.0"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2011-04-01_04-00-17/zip/netbeans-trunk-nightly-201104010400-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}-build.xml-r1.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"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-7.0-build.xml-r1.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-7.0-build.xml-r1.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS70_PATCHES_DIR}" -a -d "${NETBEANS70_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS70_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-websvccommon/ChangeLog b/dev-java/netbeans-websvccommon/ChangeLog
index 22f006c..1e05464 100644
--- a/dev-java/netbeans-websvccommon/ChangeLog
+++ b/dev-java/netbeans-websvccommon/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-websvccommon-7.0_rc1_p20110401 (01 Apr 2011)
+
+  01 Apr 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-websvccommon-7.0_rc1_p20110401.ebuild:
+  Bumped to latest nightly sources
+
   30 Mar 2011; Miroslav Šulc <fordfrog@g.o>
   -netbeans-websvccommon-7.0_beta2.ebuild:
   Removed old beta release

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 2387569..76a515f 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -1,7 +1,9 @@
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0rc1-201103280000-src.zip 175475363 RMD160 e5fe3ff726404ea8357a7cc7a383e6b8a06dd316 SHA1 df109f98c07bf01b862e59c68bbee76aae6c01df SHA256 fac906f9bdfd740b55758cf171a367702f78f7423cbae70add5a4d1b4669312e
 DIST netbeans-trunk-nightly-201103240400-src.zip 175550392 RMD160 687037f3ddd91fdcb9bb1808b4d61873b077cb29 SHA1 014ee2e2e38cf62b6864c71a2325d4c82fa602cd SHA256 0918ca520f56068114e427ffefdcafedef7a9007b6e1a51964883d64eaa9225a
+DIST netbeans-trunk-nightly-201104010400-src.zip 175593086 RMD160 2c117c544cc554c4fec48515c43a506f52393d2e SHA1 5da39cb9ef621673a06f8a1a734dc7f44cace0fa SHA256 defdf23bbb73b50689c5d30d505d86bc55795d4f98f6b1500966f35718d0c335
 EBUILD netbeans-websvccommon-7.0_beta2_p20110324.ebuild 2657 RMD160 a0dd96c9a5faf8e4e404dd7306dbd048e7019216 SHA1 37f14660da8ccaf3b90d7c8c27025520a39f9fac SHA256 6712db6cf3dc438eea48e9b30c143c72a16858a7ccd671df8c81f7257b175c41
 EBUILD netbeans-websvccommon-7.0_rc1.ebuild 2632 RMD160 fc8458befa0451e4916bc3c970a79acfee20a9b3 SHA1 f116ef1845aa63a37085538bfc518d1bb912c6e0 SHA256 7774ef3afbe38b3ff2e03f2c19832db0e283500eab5a158fe0e1268f931116fb
-MISC ChangeLog 4863 RMD160 3fa29eb7843894270247e42eb6e44f5a9c85fa90 SHA1 76dfd2fb6373b225fda2272cdff2ace75d920e64 SHA256 e7da21563a5d2c32ea3ded53bdf855048639d5449da7972be19f8c87fc570129
+EBUILD netbeans-websvccommon-7.0_rc1_p20110401.ebuild 2657 RMD160 bd6f4cd5818f28a0e0b14fd03f263c801d7054a8 SHA1 6843c42aabe00ce048fc5dc269cc27e32a4f13f3 SHA256 ccb688906ef7b867193054050d33902104453ad9a70ba28339e471d10fa5e99a
+MISC ChangeLog 5058 RMD160 866896d80b1a9c9713f5dc11480932e282abe796 SHA1 6dc2257e598df0e64b306b0be51616749df56e60 SHA256 fa72315621b5db7c03356ab746351b94aa0b3146ee784c1a6e5852695edd3f44
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-7.0_rc1_p20110401.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-7.0_rc1_p20110401.ebuild
new file mode 100644
index 0000000..0083b19
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-7.0_rc1_p20110401.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2011 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="7.0"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2011-04-01_04-00-17/zip/netbeans-trunk-nightly-201104010400-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}-build.xml-r1.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"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-7.0-build.xml-r1.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-7.0-build.xml-r1.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS70_PATCHES_DIR}" -a -d "${NETBEANS70_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS70_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/websvccommon >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+	grep -E "/websvccommon$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/websvccommon
+}

diff --git a/dev-util/netbeans/ChangeLog b/dev-util/netbeans/ChangeLog
index 211aece..5c742bb 100644
--- a/dev-util/netbeans/ChangeLog
+++ b/dev-util/netbeans/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-7.0_rc1_p20110401 (01 Apr 2011)
+
+  01 Apr 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-7.0_rc1_p20110401.ebuild:
+  Bumped to latest nightly sources
+
   30 Mar 2011; Miroslav Šulc <fordfrog@g.o> -netbeans-7.0_beta2.ebuild:
   Removed old beta release
 

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 0e10165..9197630 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -2,7 +2,9 @@ DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674
 DIST netbeans-7.0rc1-201103280000-src.zip 175475363 RMD160 e5fe3ff726404ea8357a7cc7a383e6b8a06dd316 SHA1 df109f98c07bf01b862e59c68bbee76aae6c01df SHA256 fac906f9bdfd740b55758cf171a367702f78f7423cbae70add5a4d1b4669312e
 DIST netbeans-l10n-7.0-20101108.tar.bz2 13994679 RMD160 0996a9c8941dfd1662a65605ea518c694dea31e7 SHA1 ccc544bb26274ee84a63cd457e82dc0b0d68504f SHA256 7b6fa265b22d02f8be9e9fb2990055c46f5bfa031d3b7c87feafe5a88acf9834
 DIST netbeans-trunk-nightly-201103240400-src.zip 175550392 RMD160 687037f3ddd91fdcb9bb1808b4d61873b077cb29 SHA1 014ee2e2e38cf62b6864c71a2325d4c82fa602cd SHA256 0918ca520f56068114e427ffefdcafedef7a9007b6e1a51964883d64eaa9225a
+DIST netbeans-trunk-nightly-201104010400-src.zip 175593086 RMD160 2c117c544cc554c4fec48515c43a506f52393d2e SHA1 5da39cb9ef621673a06f8a1a734dc7f44cace0fa SHA256 defdf23bbb73b50689c5d30d505d86bc55795d4f98f6b1500966f35718d0c335
 EBUILD netbeans-7.0_beta2_p20110324.ebuild 6739 RMD160 b7d4f199d7e8d524b3a1e0eddaea7091d62a2ae4 SHA1 6a6ee2fe259122f042df94d297411d88774418f6 SHA256 8dafcf0552912709e48ad46d53a113ade3eb00587ea401706c1a71211d515858
 EBUILD netbeans-7.0_rc1.ebuild 6714 RMD160 edfc12f40b8f0e1d0efe3f308e9c0969f3afc482 SHA1 efba0b27478c5a92540fbe009eaa79127058a3fc SHA256 4312b24154181c18eb004aabb0ea3968adb976b8534f0eed21704b096cfcc5ae
-MISC ChangeLog 4358 RMD160 8b45ee30ba2f8ead34742c312337b6ee2a541a7f SHA1 88f84442aabbdcbaf56087ccc503aaefe0a9a100 SHA256 e75a4746d2df159a32fef22f5d176b0ffbf3614ce778f352e886f5a60951e660
+EBUILD netbeans-7.0_rc1_p20110401.ebuild 6739 RMD160 4bd484ffa23e2b7daff56d6a7e5a96b5beab0aba SHA1 57b88f8a7a9167d8a7d6e9bf49a35eee38bdff1b SHA256 2d39834d90d54b4192a702f7433815b82d568b8711de9832a0d976c3779411ca
+MISC ChangeLog 4527 RMD160 ae31b64a51b7ab5f3a221172fe67cfe08f32b251 SHA1 960a908d60cb6882a67fc67d853ea75faf0dd492 SHA256 8c093f0fc75efef39de2646733eb169b799cb2f9a603186e755b7e61ae8b24a7
 MISC metadata.xml 333 RMD160 848a246f77fbcc88bb03d4a8d0769ef60353148a SHA1 e9afe19410a907fb47230f824b2d592ba3f465d4 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a

diff --git a/dev-util/netbeans/netbeans-7.0_rc1_p20110401.ebuild b/dev-util/netbeans/netbeans-7.0_rc1_p20110401.ebuild
new file mode 100644
index 0000000..8e7b6ee
--- /dev/null
+++ b/dev-util/netbeans/netbeans-7.0_rc1_p20110401.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE"
+HOMEPAGE="http://netbeans.org/"
+SLOT="7.0"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2011-04-01_04-00-17/zip/netbeans-trunk-nightly-201104010400-src.zip"
+PATCHES_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}-build.xml-r1.patch.bz2"
+L10N_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.0-20101108.tar.bz2"
+ALL_URLS="${SOURCE_URL} ${PATCHES_URL} ${L10N_URL}"
+SRC_URI="linguas_af? ( ${ALL_URLS} )
+	linguas_ar? ( ${ALL_URLS} )
+	linguas_ca? ( ${ALL_URLS} )
+	linguas_cs? ( ${ALL_URLS} )
+	linguas_de? ( ${ALL_URLS} )
+	linguas_el? ( ${ALL_URLS} )
+	linguas_es? ( ${ALL_URLS} )
+	linguas_fr? ( ${ALL_URLS} )
+	linguas_gl? ( ${ALL_URLS} )
+	linguas_hi_IN? ( ${ALL_URLS} )
+	linguas_id? ( ${ALL_URLS} )
+	linguas_it? ( ${ALL_URLS} )
+	linguas_ja? ( ${ALL_URLS} )
+	linguas_ko? ( ${ALL_URLS} )
+	linguas_lt? ( ${ALL_URLS} )
+	linguas_nl? ( ${ALL_URLS} )
+	linguas_pl? ( ${ALL_URLS} )
+	linguas_pt_BR? ( ${ALL_URLS} )
+	linguas_pt_PT? ( ${ALL_URLS} )
+	linguas_ro? ( ${ALL_URLS} )
+	linguas_ru? ( ${ALL_URLS} )
+	linguas_sq? ( ${ALL_URLS} )
+	linguas_sr? ( ${ALL_URLS} )
+	linguas_sv? ( ${ALL_URLS} )
+	linguas_tl? ( ${ALL_URLS} )
+	linguas_tr? ( ${ALL_URLS} )
+	linguas_vi? ( ${ALL_URLS} )
+	linguas_zh_CN? ( ${ALL_URLS} )
+	linguas_zh_TW? ( ${ALL_URLS} )
+"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE_NETBEANS_MODULES="
+	+netbeans_modules_apisupport
+	netbeans_modules_cnd
+	netbeans_modules_dlight
+	netbeans_modules_enterprise
+	netbeans_modules_ergonomics
+	netbeans_modules_groovy
+	+netbeans_modules_java
+	netbeans_modules_javacard
+	netbeans_modules_mobility
+	netbeans_modules_php
+	netbeans_modules_profiler
+	+netbeans_modules_websvccommon"
+IUSE_LINGUAS="
+	linguas_af
+	linguas_ar
+	linguas_ca
+	linguas_cs
+	linguas_de
+	linguas_el
+	linguas_es
+	linguas_fr
+	linguas_gl
+	linguas_hi_IN
+	linguas_id
+	linguas_it
+	linguas_ja
+	linguas_ko
+	linguas_lt
+	linguas_nl
+	linguas_pl
+	linguas_pt_BR
+	linguas_pt_PT
+	linguas_ro
+	linguas_ru
+	linguas_sq
+	linguas_sr
+	linguas_sv
+	linguas_tl
+	linguas_tr
+	linguas_vi
+	linguas_zh_CN
+	linguas_zh_TW"
+IUSE="doc ${IUSE_NETBEANS_MODULES} ${IUSE_LINGUAS}"
+S="${WORKDIR}"
+
+DEPEND=">=virtual/jdk-1.6
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-nb-${PV}
+	~dev-java/netbeans-platform-${PV}
+	netbeans_modules_apisupport? ( ~dev-java/netbeans-apisupport-${PV} )
+	netbeans_modules_cnd? ( ~dev-java/netbeans-cnd-${PV} )
+	netbeans_modules_dlight? ( ~dev-java/netbeans-dlight-${PV} )
+	netbeans_modules_enterprise? ( ~dev-java/netbeans-enterprise-${PV} )
+	netbeans_modules_ergonomics? ( ~dev-java/netbeans-ergonomics-${PV} )
+	netbeans_modules_groovy? ( ~dev-java/netbeans-groovy-${PV} )
+	netbeans_modules_java? ( ~dev-java/netbeans-java-${PV} )
+	netbeans_modules_javacard? ( ~dev-java/netbeans-javacard-${PV} )
+	netbeans_modules_mobility? ( ~dev-java/netbeans-mobility-${PV} )
+	netbeans_modules_php? ( ~dev-java/netbeans-php-${PV} )
+	netbeans_modules_profiler? ( ~dev-java/netbeans-profiler-${PV} )
+	netbeans_modules_websvccommon? ( ~dev-java/netbeans-websvccommon-${PV} )
+	doc? ( ~dev-java/netbeans-javadoc-${PV} )"
+JAVA_PKG_BSFIX="off"
+NBLOCALES=""
+
+pkg_setup() {
+	for lingua in ${IUSE_LINGUAS} ; do
+		local lang=${lingua/linguas_/}
+
+		if [[ "${lang}" = "ar" ]] ; then
+			lang="ar_EG,ar_SA"
+		elif [[ "${lang}" = "es" ]] ; then
+			lang="es,es_CO"
+		elif [[ "${lang}" = "gl" ]] ; then
+			lang="gl_ES"
+		elif [[ "${lang}" = "id" ]] ; then
+			lang="in_ID"
+		elif [[ "${lang}" = "nl" ]] ; then
+			lang="nl_BE,nl_NL"
+		elif [[ "${lang}" = "tl" ]] ; then
+			lang="fil_PH"
+		fi
+
+		if use ${lingua} ; then
+			if [ -z "${NBLOCALES}" ] ; then
+				NBLOCALES="${lang}"
+			else
+				NBLOCALES="${NBLOCALES},${lang}"
+			fi
+		fi
+	done
+}
+
+src_unpack() {
+	if [ -n "${NBLOCALES}" ] ; then
+		unpack $(basename ${SOURCE_URL})
+		unpack $(basename ${L10N_URL})
+
+		einfo "Deleting bundled jars..."
+		find -name "*.jar" -type f -delete
+
+		unpack netbeans-7.0-build.xml-r1.patch.bz2
+	fi
+}
+
+src_prepare() {
+	if [ -n "${NBLOCALES}" ] ; then
+		einfo "Deleting bundled class files..."
+		find -name "*.class" -type f | xargs rm -vf
+
+		epatch netbeans-7.0-build.xml-r1.patch
+
+		# Support for custom patches
+		if [ -n "${NETBEANS70_PATCHES_DIR}" -a -d "${NETBEANS70_PATCHES_DIR}" ] ; then
+			local files=`find "${NETBEANS70_PATCHES_DIR}" -type f`
+
+			if [ -n "${files}" ] ; then
+				einfo "Applying custom patches:"
+
+				for file in ${files} ; do
+					epatch "${file}"
+				done
+			fi
+		fi
+
+		einfo "Symlinking external libraries..."
+		java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	fi
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	if [ -n "${NBLOCALES}" ] ; then
+		einfo "Compiling support for locales: ${NBLOCALES}"
+		eant -f nbbuild/build.xml bootstrap || die
+		eant -Dlocales=${NBLOCALES} -Ddist.dir=../nbbuild/netbeans -Dnbms.dir="" -Dnbms.dist.dir="" \
+			-f l10n/build.xml build || die
+	fi
+}
+
+src_install() {
+	if [ -n "${NBLOCALES}" ] ; then
+		pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+		for cluster in apisupport cnd dlight enterprise ergonomics groovy harness ide java javacard mobility php platform profiler websvccommon ; do
+			if [ -d "${cluster}" ] ; then
+				insinto /usr/share/netbeans-${cluster}-${SLOT}
+				doins -r ${cluster}/*
+			fi
+		done
+
+		if [ -d nb ] ; then
+			insinto /usr/share/netbeans-nb-${SLOT}/nb
+			doins -r nb/*
+		fi
+
+		popd >/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	if [ -n "${NBLOCALES}" ] ; then
+		einfo "Netbeans automatically starts with the locale you have set in your user profile, if"
+		einfo "the locale is built for Netbeans."
+		einfo "If you want to force specific locale, use --locale argument, for example:"
+		einfo "${PN}-${SLOT} --locale de"
+		einfo "${PN}-${SLOT} --locale pt:BR"
+	fi
+
+	if use linguas_ar ; then
+		einfo
+		einfo "You selected Arabic locale so you can choose either ar:EG or ar:SA variant."
+	fi
+
+	if use linguas_es ; then
+		einfo
+		einfo "You selected Spanish locale so you can choose either es or es:CO variant."
+	fi
+
+	if use linguas_gl ; then
+		einfo
+		einfo "You selected Galician locale which has locale code gl:ES in Netbeans."
+	fi
+
+	if use linguas_id ; then
+		einfo
+		einfo "You selected Indonesian locale which has locale code in:ID in Netbeans."
+	fi
+
+	if use linguas_nl ; then
+		einfo
+		einfo "You selected Dutch locale so you can choose either nl:BE or nl:NL variant."
+	fi
+
+	if use linguas_tl ; then
+		einfo
+		einfo "You selected Tagalog locale which has for Filipino locale code fil:PH in Netbeans."
+	fi
+}