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

[Miroslav Šulc]

commit:     367b3354a04772d19c3579088a4e5b83aaf02845
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 27 11:10:57 2011 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Apr 27 11:10:57 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/fordfrog.git;a=commit;h=367b3354

netbeans: bumped to latest nightly sources

---
 dev-java/netbeans-apisupport/ChangeLog             |    6 +
 dev-java/netbeans-apisupport/Manifest              |    4 +-
 .../netbeans-apisupport-9999_p20110426.ebuild      |  106 ++++++
 dev-java/netbeans-cnd/ChangeLog                    |    6 +
 dev-java/netbeans-cnd/Manifest                     |    5 +-
 .../netbeans-cnd-9999_p20110426.ebuild             |  123 +++++++
 dev-java/netbeans-dlight/ChangeLog                 |    6 +
 dev-java/netbeans-dlight/Manifest                  |    4 +-
 .../netbeans-dlight-9999_p20110426.ebuild          |  119 +++++++
 dev-java/netbeans-enterprise/ChangeLog             |    6 +
 dev-java/netbeans-enterprise/Manifest              |    4 +-
 .../netbeans-enterprise-9999_p20110426.ebuild      |  304 +++++++++++++++++
 dev-java/netbeans-ergonomics/ChangeLog             |    6 +
 dev-java/netbeans-ergonomics/Manifest              |    4 +-
 .../netbeans-ergonomics-9999_p20110426.ebuild      |  101 ++++++
 dev-java/netbeans-groovy/ChangeLog                 |    6 +
 dev-java/netbeans-groovy/Manifest                  |    4 +-
 .../netbeans-groovy-9999_p20110426.ebuild          |  111 ++++++
 dev-java/netbeans-harness/ChangeLog                |    6 +
 dev-java/netbeans-harness/Manifest                 |    4 +-
 .../netbeans-harness-9999_p20110426.ebuild         |  114 +++++++
 dev-java/netbeans-ide/ChangeLog                    |    6 +
 dev-java/netbeans-ide/Manifest                     |    4 +-
 .../netbeans-ide-9999_p20110426.ebuild             |  356 ++++++++++++++++++++
 dev-java/netbeans-java/ChangeLog                   |    6 +
 dev-java/netbeans-java/Manifest                    |    8 +-
 .../netbeans-java-9999_p20110426.ebuild            |  304 +++++++++++++++++
 dev-java/netbeans-javacard/ChangeLog               |    6 +
 dev-java/netbeans-javacard/Manifest                |    4 +-
 .../netbeans-javacard-9999_p20110426.ebuild        |  141 ++++++++
 dev-java/netbeans-javadoc/ChangeLog                |    6 +
 dev-java/netbeans-javadoc/Manifest                 |    4 +-
 .../netbeans-javadoc-9999_p20110426.ebuild         |  160 +++++++++
 dev-java/netbeans-mobility/ChangeLog               |    6 +
 dev-java/netbeans-mobility/Manifest                |    4 +-
 .../netbeans-mobility-9999_p20110426.ebuild        |  184 ++++++++++
 dev-java/netbeans-nb/ChangeLog                     |    6 +
 dev-java/netbeans-nb/Manifest                      |    5 +-
 .../netbeans-nb/files/9999/keychain-support.patch  |   26 ++
 .../netbeans-nb/netbeans-nb-9999_p20110426.ebuild  |  149 ++++++++
 dev-java/netbeans-php/ChangeLog                    |    6 +
 dev-java/netbeans-php/Manifest                     |    4 +-
 .../netbeans-php-9999_p20110426.ebuild             |  119 +++++++
 dev-java/netbeans-platform/ChangeLog               |    6 +
 dev-java/netbeans-platform/Manifest                |    4 +-
 .../netbeans-platform-9999_p20110426.ebuild        |  122 +++++++
 dev-java/netbeans-profiler/ChangeLog               |    6 +
 dev-java/netbeans-profiler/Manifest                |    4 +-
 .../netbeans-profiler-9999_p20110426.ebuild        |  113 ++++++
 dev-java/netbeans-websvccommon/ChangeLog           |    6 +
 dev-java/netbeans-websvccommon/Manifest            |    4 +-
 .../netbeans-websvccommon-9999_p20110426.ebuild    |   94 +++++
 dev-util/netbeans/ChangeLog                        |    6 +
 dev-util/netbeans/Manifest                         |    4 +-
 dev-util/netbeans/netbeans-9999_p20110426.ebuild   |  250 ++++++++++++++
 55 files changed, 3164 insertions(+), 18 deletions(-)

diff --git a/dev-java/netbeans-apisupport/ChangeLog b/dev-java/netbeans-apisupport/ChangeLog
index 0042d9f..c9e0254 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-9999_p20110426 (27 Apr 2011)
+
+  27 Apr 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-apisupport-9999_p20110426.ebuild:
+  Bumped to latest nightly sources
+
 *netbeans-apisupport-7.0 (21 Apr 2011)
 
   21 Apr 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index baabf01..1e93cba 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -1,5 +1,7 @@
 DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e25a481c2bc3c9a58 SHA1 9d22f61b5fa38be0fe9ab8d355d03effd1ba6ff1 SHA256 e2b3a52ac56806446ed3d15b025648d186bd2410e44c36bd2851e39d7f1a9dc5
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
+DIST netbeans-trunk-nightly-201104260000-src.zip 175571505 RMD160 c373fab9655316b90075ce69f9e321a866b9d91d SHA1 ff70d0eccb1143be9f0ea148d9d4853410bea295 SHA256 00bd2431d3acc76601d910acbc1681cc73b62c3f778a30e8fbe596eac746ad76
 EBUILD netbeans-apisupport-7.0.ebuild 3069 RMD160 a6ab7f92886067f94a385effbfaed156ebc97bef SHA1 6e385e84970bec91d70fd9f60d6f5bb8b9bef345 SHA256 aa504004b728931a6727eb23a37c2b9e824c49369cbbefa2e3dabc6340815443
-MISC ChangeLog 6700 RMD160 371c12be6a9446947f0fa8b109085390be1ece22 SHA1 75d36087f05b3a745f19187ff0875592cdff6ce1 SHA256 5aba5c8830599fdf69c5b17f46bedf8037ba55a45d393f98859e8dfae5572f66
+EBUILD netbeans-apisupport-9999_p20110426.ebuild 3102 RMD160 1f72a689d5b25a29bc2f3b78b95c13c9651b1657 SHA1 52b4098ecd9fd20a20b19ec344317f132d5f5379 SHA256 5a8f5c2e16d69da1af0de6193174ca9462817286aebf4c08b048d3362028ff2b
+MISC ChangeLog 6885 RMD160 fee4de7a83ec260b4ee621afec93a5cd0c01901f SHA1 2f2ca7d830404341784928892ce57bf0e285391d SHA256 a9873f868dddb044c49a0f58aebe50343ad429329103e3b84f02af93da447cc6
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20110426.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20110426.ebuild
new file mode 100644
index 0000000..b8f18ca
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20110426.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="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2011-04-26_00-00-27/zip/netbeans-trunk-nightly-201104260000-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-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 "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/apisupport >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/apisupport$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/apisupport
+}

diff --git a/dev-java/netbeans-cnd/ChangeLog b/dev-java/netbeans-cnd/ChangeLog
index dfaa70b..6a9e401 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-9999_p20110426 (27 Apr 2011)
+
+  27 Apr 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-cnd-9999_p20110426.ebuild:
+  Bumped to latest nightly sources
+
 *netbeans-cnd-7.0 (21 Apr 2011)
 
   21 Apr 2011; Miroslav Šulc <fordfrog@g.o> +netbeans-cnd-7.0.ebuild:

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index cb1fb10..82a1080 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -1,8 +1,11 @@
+DIST 156317179F97DA798D757255FBA157B335BEA5C8-cnd-build-trace-1.0.zip 40806 RMD160 b59ead1753e174498802b54aaeb15cd05ddc1bc3 SHA1 156317179f97da798d757255fba157b335bea5c8 SHA256 fdfabc0a14f1d76b76d1d974393be9a5bef4c0758b0024c507c75abcad8691af
 DIST 1C4FB4BD3508F7A787270A3B65E74FBFC624C2CB-cnd-build-trace-1.0.zip 42779 RMD160 6a84967f604dd70a1736b752874e7ea4c6ad68dd SHA1 1c4fb4bd3508f7a787270a3b65e74fbfc624c2cb SHA256 cbb8548f8e1d177778852dc8d38140c824c38609d7066e155687f730fe9948fe
 DIST 296C195B720404C2683BA2F65E2A423DD0611B8B-open-fortran-parser-0.7.1.2.zip 86627 RMD160 3b9b848a4ebaaac9faa76874626104f4eee81d3a SHA1 296c195b720404c2683ba2f65e2a423dd0611b8b SHA256 de7cf8ce10a3d50eefa5e493953404be7db138007aa9fb53b894e307ea033195
 DIST 800BD16807CD1A4348AFD0554D920845134E5D55-cnd-rfs-1.0.zip 298998 RMD160 c38362bc45e9c4df26c0aa7da86db9127d45dccb SHA1 800bd16807cd1a4348afd0554d920845134e5d55 SHA256 8d349b4c072cc1a3bc9c6b42de76ac43600335faff6a2ba1c4fc9e593969897d
 DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e25a481c2bc3c9a58 SHA1 9d22f61b5fa38be0fe9ab8d355d03effd1ba6ff1 SHA256 e2b3a52ac56806446ed3d15b025648d186bd2410e44c36bd2851e39d7f1a9dc5
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
+DIST netbeans-trunk-nightly-201104260000-src.zip 175571505 RMD160 c373fab9655316b90075ce69f9e321a866b9d91d SHA1 ff70d0eccb1143be9f0ea148d9d4853410bea295 SHA256 00bd2431d3acc76601d910acbc1681cc73b62c3f778a30e8fbe596eac746ad76
 EBUILD netbeans-cnd-7.0.ebuild 4430 RMD160 ef34ff1144cdb1628730251a25e2d9a5b503887f SHA1 a1b0f1ab9fe07a6c5c839c3b14782821442d40c3 SHA256 228fc04cd90f647f2b8e94958d671286db01f617e360868be5548f208eebbf00
-MISC ChangeLog 6201 RMD160 a6dc036798566a3da18db2e2a698fed910e5cb95 SHA1 e09d04d77bbc5899065d4a5e2baa686aa2f1c4c4 SHA256 b47ba76c0f6dd4500835ff33ddb7f569970594fecf16c85289482c96ce93c23b
+EBUILD netbeans-cnd-9999_p20110426.ebuild 4463 RMD160 3a0058eae2c346018c05c7635faa15a6440fee6e SHA1 646f6c52bdffe61d1bed48869df785508bc6daf6 SHA256 f284a30797ab27394dfcbfbeef9a6c3a05d6515ad702687b696b0fe3da6e267d
+MISC ChangeLog 6372 RMD160 e2b9eedf27945d5ad06e166dd7bd8faddb7d119d SHA1 7d62111640ae0e61b8cc4d22ac1cebad503f3f67 SHA256 c86eab566d47878902b6c22df4fb7caa20283e259224c4f6e8037e60bbef37a6
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20110426.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20110426.ebuild
new file mode 100644
index 0000000..27c687c
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20110426.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="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2011-04-26_00-00-27/zip/netbeans-trunk-nightly-201104260000-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2
+	http://hg.netbeans.org/binaries/156317179F97DA798D757255FBA157B335BEA5C8-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}"/156317179F97DA798D757255FBA157B335BEA5C8-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 "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.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 471ba30..8996294 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-9999_p20110426 (27 Apr 2011)
+
+  27 Apr 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-dlight-9999_p20110426.ebuild:
+  Bumped to latest nightly sources
+
 *netbeans-dlight-7.0 (21 Apr 2011)
 
   21 Apr 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index dde344a..d2e34d8 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -3,6 +3,8 @@ DIST F1AF5929CD612475CCF186F69E268F0CAAA2A90E-dtracectrl-0.1.zip 8834 RMD160 79b
 DIST F787C9B484CD7526F866C21D8925C4DACE467F8A-derby-10.2.2.0.jar 2276020 RMD160 ea3e733fd709c6c6b6776d05d3e3d08a0f00f166 SHA1 f787c9b484cd7526f866c21d8925c4dace467f8a SHA256 fc563bf30d51408ee092a59cc6abe381172040954ab1654061efb8eaf67fd2ba
 DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e25a481c2bc3c9a58 SHA1 9d22f61b5fa38be0fe9ab8d355d03effd1ba6ff1 SHA256 e2b3a52ac56806446ed3d15b025648d186bd2410e44c36bd2851e39d7f1a9dc5
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
+DIST netbeans-trunk-nightly-201104260000-src.zip 175571505 RMD160 c373fab9655316b90075ce69f9e321a866b9d91d SHA1 ff70d0eccb1143be9f0ea148d9d4853410bea295 SHA256 00bd2431d3acc76601d910acbc1681cc73b62c3f778a30e8fbe596eac746ad76
 EBUILD netbeans-dlight-7.0.ebuild 3572 RMD160 71996c25aca15f9225e0713f8b5521a0f9b3f44b SHA1 c5a4e7215bfd75b92b42de0843ee2b792dc2d753 SHA256 82a3cbfe70024adefdd3f28a1879b26ab2924522828a4f39df6d98cbe1a26fc2
-MISC ChangeLog 6416 RMD160 998a5824c8079b32f4b20e0ff962ad38694bc1a7 SHA1 fa41805ea81613e0b1f4a25fd5f2862cc86a83a0 SHA256 11906ed0a66890f5cd27ea78d39881ecfabb335a872f3f8b1f6d3723b71b6668
+EBUILD netbeans-dlight-9999_p20110426.ebuild 3605 RMD160 4b7d8dfb18bf0950a94d814f9af37dc3966aa802 SHA1 4083212e18cb5703d421ac433630f8d711b79fbb SHA256 3e951b6c2e546571f6b71b3b9f07a50033820c5bf6f3d7830d7ea0309f038fe8
+MISC ChangeLog 6593 RMD160 07dc6985ea810870ca1cd0b4020a4267dffe0ebd SHA1 73b427577e5d7546f204d5e86aee3969f1c6ec7a SHA256 d988a2ef188fdc61623535c9a2b4a3717e80e96b14ec476ab9daeaaa8bbb57a3
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20110426.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20110426.ebuild
new file mode 100644
index 0000000..7d22001
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20110426.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="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2011-04-26_00-00-27/zip/netbeans-trunk-nightly-201104260000-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-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 "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/dlight >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/dlight$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	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 a35f822..a8b60f1 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-9999_p20110426 (27 Apr 2011)
+
+  27 Apr 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-enterprise-9999_p20110426.ebuild:
+  Bumped to latest nightly sources
+
 *netbeans-enterprise-7.0 (21 Apr 2011)
 
   21 Apr 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index b62b241..63019ec 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -29,6 +29,8 @@ DIST FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip 5025064 RMD160 e
 DIST FFE3425E304F0836912D2B8ABFB5302100B39423-jsr311-api-1.1.1-javadoc.jar 304118 RMD160 99deb07ee4c3d7257a2431830eb4f5889b4f5d6c SHA1 ffe3425e304f0836912d2b8abfb5302100b39423 SHA256 af3fbe42b4993a904673eb4500952093384cc85295ca5a35d1cb2059d41b2153
 DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e25a481c2bc3c9a58 SHA1 9d22f61b5fa38be0fe9ab8d355d03effd1ba6ff1 SHA256 e2b3a52ac56806446ed3d15b025648d186bd2410e44c36bd2851e39d7f1a9dc5
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
+DIST netbeans-trunk-nightly-201104260000-src.zip 175571505 RMD160 c373fab9655316b90075ce69f9e321a866b9d91d SHA1 ff70d0eccb1143be9f0ea148d9d4853410bea295 SHA256 00bd2431d3acc76601d910acbc1681cc73b62c3f778a30e8fbe596eac746ad76
 EBUILD netbeans-enterprise-7.0.ebuild 16273 RMD160 ebde1e873534cf5fff103587cbd10ed1008c589b SHA1 b01f2649b7f91eb343f8792f52698c979c8c2291 SHA256 a61703db2126074c0dd6fd15fbfe1a206669eeaa67a968d9ff890365982d0dad
-MISC ChangeLog 7078 RMD160 eb4145a1f817603ef9b467555f08378d528145ba SHA1 b7dd882db970321d6739c70d68035a1c1f3dd334 SHA256 864dee4af65791d86aa2533b613123709113e0dd69f6e8cdd98f4c63e6fd1c24
+EBUILD netbeans-enterprise-9999_p20110426.ebuild 16306 RMD160 280aa7364c82e9ff823df1de7ca3c8af60367966 SHA1 2ef8079292d7b22a6c247510ab1e892e93ef4ff4 SHA256 f2ae4e7e7199040dd204b7ba868d2f0d33231b72d9da95c4f96c5f62dc5cd2d5
+MISC ChangeLog 7263 RMD160 18d2082fec6446f44ac0e86ff31d72e454797548 SHA1 573b38a542fd3d07d47649f01f9f26ec73ad43ac SHA256 97ce215e98df9d988d3357a528b7c9bc6e5079aa1b0c4f991ef02a23bf9e406b
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20110426.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20110426.ebuild
new file mode 100644
index 0000000..c32e378
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20110426.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="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2011-04-26_00-00-27/zip/netbeans-trunk-nightly-201104260000-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-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 "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into j2eeapis/external glassfish-deployment-api-1.2 glassfish-deployment-api.jar jsr88javax.jar
+	java-pkg_jar-from --into libs.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 fb090fb..3033f88 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-9999_p20110426 (27 Apr 2011)
+
+  27 Apr 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-ergonomics-9999_p20110426.ebuild:
+  Bumped to latest nightly sources
+
 *netbeans-ergonomics-7.0 (21 Apr 2011)
 
   21 Apr 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index f82fc10..e6821cb 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -1,5 +1,7 @@
 DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e25a481c2bc3c9a58 SHA1 9d22f61b5fa38be0fe9ab8d355d03effd1ba6ff1 SHA256 e2b3a52ac56806446ed3d15b025648d186bd2410e44c36bd2851e39d7f1a9dc5
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
+DIST netbeans-trunk-nightly-201104260000-src.zip 175571505 RMD160 c373fab9655316b90075ce69f9e321a866b9d91d SHA1 ff70d0eccb1143be9f0ea148d9d4853410bea295 SHA256 00bd2431d3acc76601d910acbc1681cc73b62c3f778a30e8fbe596eac746ad76
 EBUILD netbeans-ergonomics-7.0.ebuild 2819 RMD160 d172b98e26198c64216664ad15e6cecf961b715f SHA1 20e241c008108f9153543df8befd604c52fcfe51 SHA256 4dfe2b8676375de86cc24c97216ba88385abf7a817f451676ffa63230ca23da6
-MISC ChangeLog 6700 RMD160 b1f3328ff6e3737c963024923777282821c38339 SHA1 4dfc154d3c64372f61435a84fc8f452cf79e4bdb SHA256 731bd4938ffed2f4af05f2c87e49214ad4a8cb4e74c864232caa6f2ac5b7a713
+EBUILD netbeans-ergonomics-9999_p20110426.ebuild 2852 RMD160 7a76602b6dd80f750b7b648afccd1900c5df7c87 SHA1 f3329ef8f713ccd431b1578f773b18ab08779162 SHA256 edec1f661c510d607ea0d84776fa78184539d45150faf00ab9206b0bb78ed724
+MISC ChangeLog 6885 RMD160 8bdac06b403d30b1d9833f9920c1f073956f3b8a SHA1 3d48fcfe95b995ecbe7fdce888ae3e78e10f6b70 SHA256 9e387e98590e4326dbddcc87f245de3c44ab37d914cf436aa2a7459d55504f69
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20110426.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20110426.ebuild
new file mode 100644
index 0000000..0922466
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20110426.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="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2011-04-26_00-00-27/zip/netbeans-trunk-nightly-201104260000-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-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 "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-nb-${SLOT}/nb nb || die
+	cat /usr/share/netbeans-nb-${SLOT}/nb/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.nb.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/ergonomics >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/ergonomics$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ergonomics
+}

diff --git a/dev-java/netbeans-groovy/ChangeLog b/dev-java/netbeans-groovy/ChangeLog
index 089b474..2d04aa2 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-9999_p20110426 (27 Apr 2011)
+
+  27 Apr 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-groovy-9999_p20110426.ebuild:
+  Bumped to latest nightly sources
+
 *netbeans-groovy-7.0 (21 Apr 2011)
 
   21 Apr 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index a55cb66..848acfe 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -1,6 +1,8 @@
 DIST 559C961A6CE793FAC94C8040253EA1FBD32B668B-groovy-all-1.6.4.jar 4503584 RMD160 0886cf2b601464a436613854925c5be74b86ec83 SHA1 559c961a6ce793fac94c8040253ea1fbd32b668b SHA256 4e1c36766e9af21519c6f6ee1a6ea21cfc020b253c27aa6d12d58f09c78602f9
 DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e25a481c2bc3c9a58 SHA1 9d22f61b5fa38be0fe9ab8d355d03effd1ba6ff1 SHA256 e2b3a52ac56806446ed3d15b025648d186bd2410e44c36bd2851e39d7f1a9dc5
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
+DIST netbeans-trunk-nightly-201104260000-src.zip 175571505 RMD160 c373fab9655316b90075ce69f9e321a866b9d91d SHA1 ff70d0eccb1143be9f0ea148d9d4853410bea295 SHA256 00bd2431d3acc76601d910acbc1681cc73b62c3f778a30e8fbe596eac746ad76
 EBUILD netbeans-groovy-7.0.ebuild 3231 RMD160 44e744c51e4c45ce60cff46b1500a9dbf1bdcc03 SHA1 7e454ff58ed94993fd412faa564373b27163d431 SHA256 929ebdedccba38fd75f47200b4d94b52f662bcceb82c4321661a64259d3c39d1
-MISC ChangeLog 6416 RMD160 1a1e3230f666378f8d495388c520dc7f2db413e6 SHA1 fa939008948c0913bab3dd13739c9fcfd3a0cbb0 SHA256 ca963fd766a42cce2665cae53ac93545a021b09e4d82b340273922921ea6d391
+EBUILD netbeans-groovy-9999_p20110426.ebuild 3264 RMD160 0795dbf893f55a6311eaad9b38057a21624e2f03 SHA1 81ca894d24d25c2e64f0babac0a38474dc048724 SHA256 72a2f0a59d118e29f7d1e6d643988093d7d975d106ce63b771d5a3ee124ba6e4
+MISC ChangeLog 6593 RMD160 d40af6f08277f4e8aefd21c579d9779b0283a6f8 SHA1 413ad6c528c1f4a9873648392af7c36cb9719a2f SHA256 00af12ae016f9c00ef6e4f1ee7e5b260130ad8bd942a2572f9fa40e5d09a5148
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20110426.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20110426.ebuild
new file mode 100644
index 0000000..a2beeb2
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20110426.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="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2011-04-26_00-00-27/zip/netbeans-trunk-nightly-201104260000-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-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 "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/groovy >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/groovy$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	# groovy-all.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/groovy
+}

diff --git a/dev-java/netbeans-harness/ChangeLog b/dev-java/netbeans-harness/ChangeLog
index 9edefa5..5b7836d 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-9999_p20110426 (27 Apr 2011)
+
+  27 Apr 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-harness-9999_p20110426.ebuild:
+  Bumped to latest nightly sources
+
 *netbeans-harness-7.0 (21 Apr 2011)
 
   21 Apr 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index dfd7687..1389895 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -2,6 +2,8 @@ DIST 418FC62C8A6EF5311987B01FE389B1F88EFDDCA2-jemmy-2.3.0.0.jar 1695373 RMD160 f
 DIST A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar 109823 RMD160 4033e5b1d3508c6bbf43c03476967e665b9cbe79 SHA1 a806d99716c5e9441bfd8b401176fddefc673022 SHA256 18050686d2da634f3612a8100c405eb092dc06d86b8917c6b945d096daf49f94
 DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e25a481c2bc3c9a58 SHA1 9d22f61b5fa38be0fe9ab8d355d03effd1ba6ff1 SHA256 e2b3a52ac56806446ed3d15b025648d186bd2410e44c36bd2851e39d7f1a9dc5
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
+DIST netbeans-trunk-nightly-201104260000-src.zip 175571505 RMD160 c373fab9655316b90075ce69f9e321a866b9d91d SHA1 ff70d0eccb1143be9f0ea148d9d4853410bea295 SHA256 00bd2431d3acc76601d910acbc1681cc73b62c3f778a30e8fbe596eac746ad76
 EBUILD netbeans-harness-7.0.ebuild 3514 RMD160 6e4f7ca5e957c6d1dc7da80e132f1c51d6a10ba8 SHA1 b3b481e1bdf452d7afc475388d012330192b03be SHA256 ffe81227e5ac910ab4f13b092fa60b6486602809b983c8b55941c85dec1fc7cc
-MISC ChangeLog 6487 RMD160 11ec1018cda67cdcdfa7563d19a630893d269bd7 SHA1 808c6e67ca8ee94d936ac0bc6c277ce56b8d4915 SHA256 67bd73b37d6405be2e21c0acaf35a45332618a44af981f68c884b2c12880137a
+EBUILD netbeans-harness-9999_p20110426.ebuild 3547 RMD160 d7e199ebab2d3f54125f53875a9cf8bce05a1c86 SHA1 a411d6e54ff3d96c1b93627c313f9d21c91f3367 SHA256 38cbd17cdd8e6b0b303a0f81c51c295c39f3cdb7612ae027447cfd00f434c6fe
+MISC ChangeLog 6666 RMD160 507768023e11ce1bf6739bc449e628269c06649a SHA1 c29fb01232ef337940b107ee1b39854e3b2af052 SHA256 f61ffc369bcf31115d96bf3a452ecee33b38a395b5d21f37e2bcce791764b218
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20110426.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20110426.ebuild
new file mode 100644
index 0000000..0cc5d24
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20110426.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="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2011-04-26_00-00-27/zip/netbeans-trunk-nightly-201104260000-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-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 "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into apisupport.harness/external javahelp jsearch.jar jsearch-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.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 e70979a..630ee0e 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-9999_p20110426 (27 Apr 2011)
+
+  27 Apr 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-ide-9999_p20110426.ebuild:
+  Bumped to latest nightly sources
+
 *netbeans-ide-7.0 (21 Apr 2011)
 
   21 Apr 2011; Miroslav Šulc <fordfrog@g.o> +netbeans-ide-7.0.ebuild:

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 59da140..67da862 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -43,6 +43,8 @@ DIST F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip 459564 RMD1
 DIST FACC6D84B0B0A650B1D44FED941E9ADD9F326862-isorelax20041111.jar 182065 RMD160 424c76e973ea39aba3851f556e046643ca8d335d SHA1 facc6d84b0b0a650b1d44fed941e9add9f326862 SHA256 171034ff98f1c480bc84029f7a0f5fc57a25adeaf691112a5a251345b81fc5ce
 DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e25a481c2bc3c9a58 SHA1 9d22f61b5fa38be0fe9ab8d355d03effd1ba6ff1 SHA256 e2b3a52ac56806446ed3d15b025648d186bd2410e44c36bd2851e39d7f1a9dc5
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
+DIST netbeans-trunk-nightly-201104260000-src.zip 175571505 RMD160 c373fab9655316b90075ce69f9e321a866b9d91d SHA1 ff70d0eccb1143be9f0ea148d9d4853410bea295 SHA256 00bd2431d3acc76601d910acbc1681cc73b62c3f778a30e8fbe596eac746ad76
 EBUILD netbeans-ide-7.0.ebuild 22224 RMD160 8b4392edbe15388f879765aaca4ca9c239b7ae5b SHA1 2f7d23f6be8a7abd4ce4eb5c2e70a0720dceb25b SHA256 1eb2490e3e8a700fbe81eef8dbb323e77687d67bd92683c1128cee43e4c0a99c
-MISC ChangeLog 6497 RMD160 151bb424dcadfcd302df98090703c9caa2040d81 SHA1 2410ae0e73b497c020b0816521c789c22b6844f9 SHA256 1d7920b4878e3b39eb2f58514db384ca6197f47de309ad9df45e645838cf68d6
+EBUILD netbeans-ide-9999_p20110426.ebuild 22257 RMD160 d88c4e7c11ad066126b61367c57709caf9c067a0 SHA1 185959005830cc1515f8d31ee720e581bf7b7e32 SHA256 08a218ca1395d3c74ec92b368c9503c8c9017e0ebd0b7ad8456eaea402d4c296
+MISC ChangeLog 6668 RMD160 f3915e70336caed74caeb1a274baeda7894578d0 SHA1 64b325ceb52515a1b7f900028750be0a30eaa39c SHA256 4be4d1b36dc116d4ca32553b718261a7181b7ac97670639db39d37ce60ff1714
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20110426.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20110426.ebuild
new file mode 100644
index 0000000..93a99e7
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20110426.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="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2011-04-26_00-00-27/zip/netbeans-trunk-nightly-201104260000-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-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 "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	popd >/dev/null || die
+
+	java-pkg_jar-from --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 9c65bc0..3d2dba7 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-9999_p20110426 (27 Apr 2011)
+
+  27 Apr 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-java-9999_p20110426.ebuild:
+  Bumped to latest nightly sources
+
 *netbeans-java-7.0 (21 Apr 2011)
 
   21 Apr 2011; Miroslav Šulc <fordfrog@g.o> +netbeans-java-7.0.ebuild:

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 6133eb6..f43c843 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -8,18 +8,24 @@ DIST 3BCA561B1B7B284B3D3C097F92A9CD47FF485058-eclipselink-javax.persistence-2.0.
 DIST 4721463A87B9DBD165254C73E64D824AD748DA18-javac-impl-nb-7.0-b07.jar 1671799 RMD160 4e50163b0d8685922fe05123343f1147be8141f9 SHA1 4721463a87b9dbd165254c73e64d824ad748da18 SHA256 bb5cc2eb396b391499e5016ccd3dbeac6da286a86c05a9b30f672fd22d4a3d93
 DIST 59FAD2A4D4A1CFECED8149854EEEC3A7B9668927-glassfish-persistence-v2-build-58g.jar 2286677 RMD160 7f14647470dadbde4ecb7b1f4278fd4d2e2a5ad4 SHA1 59fad2a4d4a1cfeced8149854eeec3a7b9668927 SHA256 763aeee3fceaed696f61bf14f922ea9c6abaa0af2afce2ec586efec32e677074
 DIST 653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar 34559 RMD160 2f9b657dfb6eb672ee33811df3183bba84d8ef59 SHA1 653a6ad1ef786bc577fc20f56e5f2b1d30423805 SHA256 dbb8c53ccc0b16a9dd8370d6e7de63102468caedac1e5fa2eb418319a6875293
+DIST 83A74A811A1C98F6612B68D38ACCE8D2D9F9A719-javac-impl-nb-7.0-b07.jar 1672356 RMD160 9f6110e91bd2843b39d2c59432c1f75827341a21 SHA1 83a74a811a1c98f6612b68d38acce8d2d9f9a719 SHA256 b84a2aa0165cb79a600789b4c48e858d4ef250e205b52711367974365fe26bbf
 DIST 8C9BFFBCB34DB6E9C9C03413623F05375D44CE49-eclipselink-2.2.0.jar 6383304 RMD160 f0cfb0a017dfafaf6f17b1475aa3c7e01417e2c6 SHA1 8c9bffbcb34db6e9c9c03413623f05375d44ce49 SHA256 b2e19c48066648bb30f7e1763d3049c1537b4816bb385e3dd47157bc11077963
 DIST 8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip 266314 RMD160 feca5ad347e36ccf532bcc7fc21a67a5ec115699 SHA1 8ecd169e9e308c258287e4f28b03b6d6f1e55f47 SHA256 36c3189a2d495bc713bfeac0eaf05612fe90d8df6c3c20d943bea38d290cd375
 DIST 907363E301E2279930C82BEB466BF2053C6E993B-glassfish-persistence-v2ur1-build-09d.jar 2284306 RMD160 ee5935c7e43a60a453bef9bebe7068c20f481a25 SHA1 907363e301e2279930c82beb466bf2053c6e993b SHA256 4284a90a28993a18379c5b682eb63a77e6eb2911b5c1f2a60aace19b4938c91b
 DIST A511890049A6A9B8D675F4417721337580CBD2F9-apache-maven-3.0.3-bin.zip 3076808 RMD160 5c05105359edcd9f603ce6cca7af6e755be83ca3 SHA1 a511890049a6a9b8d675f4417721337580cbd2f9 SHA256 39d928daced5072063fa3b9da3b6826ea2f52c4aa9082109eff9847fc1a442f1
+DIST ADD5DE96BF7F30DAA4EC41D70610CF72A16F58FD-javac-api-nb-7.0-b07.jar 130227 RMD160 08d045a87a1381e85f85bda965daeafd7929d6a0 SHA1 add5de96bf7f30daa4ec41d70610cf72a16f58fd SHA256 c221b2ffa32c021c4219883ff43e20bbcb90644996cdbd18f8625a1913009f81
+DIST AF599F03E590A5992EE56F363DBD8F0F32B8787E-indexer-artifact-4.1.0.jar 24703 RMD160 9e66853a89ec7286652b9338462d5cd1afee16c3 SHA1 af599f03e590a5992ee56f363dbd8f0f32b8787e SHA256 d542a451c09313576942e8c201bdbd4a8545da57f9bfe9c9af9712945add6766
 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 CAF99EFBB25E9183609D6FBA4F63D85E7606903F-indexer-core-4.1.0.jar 220841 RMD160 6d0afc9ec328e3b3c2901d0941b29feca57350ee SHA1 caf99efbb25e9183609d6fba4f63d85e7606903f SHA256 f6140d9e9f52a50c381ac500c119b268bae84e84c9ba37d361baf22d4e4ec68f
 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-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e25a481c2bc3c9a58 SHA1 9d22f61b5fa38be0fe9ab8d355d03effd1ba6ff1 SHA256 e2b3a52ac56806446ed3d15b025648d186bd2410e44c36bd2851e39d7f1a9dc5
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
+DIST netbeans-trunk-nightly-201104260000-src.zip 175571505 RMD160 c373fab9655316b90075ce69f9e321a866b9d91d SHA1 ff70d0eccb1143be9f0ea148d9d4853410bea295 SHA256 00bd2431d3acc76601d910acbc1681cc73b62c3f778a30e8fbe596eac746ad76
 EBUILD netbeans-java-7.0.ebuild 14887 RMD160 f0e5479b2eea11afbde068b746bd86fd166aa787 SHA1 9488c70efe27dd04bffa4014b5b892975610ec0d SHA256 2378c47cff8abfbb22602cc763ea965eb0552db9880a41db2838c02fec3f1adc
-MISC ChangeLog 6554 RMD160 09a3f9323bc77f797b4be27a7cf8973b9efe60a8 SHA1 d4211b001dcc9c0bbd5c600291f30c6886726a8a SHA256 60e2aac55fe206b246cb20bb3f1a38f346cad73d5ece2c7fe3aaacba776a30e5
+EBUILD netbeans-java-9999_p20110426.ebuild 14848 RMD160 b9bf9d737467baaa5f72d31c68e4a6027f216f53 SHA1 862fe4e4456f980158bc85f1a35ec33e61665b21 SHA256 f3e65d001fbc8dc914cf1c9f4616adf2533ecc00223728f08d173f42e4592e63
+MISC ChangeLog 6727 RMD160 53248253c06987ec50e36090f95454d840c27d97 SHA1 31653c6e0f81917e041a1e9fdf67dc2ac730a2fb SHA256 69c4850eda858c4a844841bf890d0879d59da267d45b03407859dfe0a21e852b
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20110426.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20110426.ebuild
new file mode 100644
index 0000000..f7b3016
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20110426.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="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2011-04-26_00-00-27/zip/netbeans-trunk-nightly-201104260000-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-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/AF599F03E590A5992EE56F363DBD8F0F32B8787E-indexer-artifact-4.1.0.jar
+	http://hg.netbeans.org/binaries/CAF99EFBB25E9183609D6FBA4F63D85E7606903F-indexer-core-4.1.0.jar
+	http://hg.netbeans.org/binaries/ADD5DE96BF7F30DAA4EC41D70610CF72A16F58FD-javac-api-nb-7.0-b07.jar
+	http://hg.netbeans.org/binaries/83A74A811A1C98F6612B68D38ACCE8D2D9F9A719-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}"/AF599F03E590A5992EE56F363DBD8F0F32B8787E-indexer-artifact-4.1.0.jar maven.indexer/external/indexer-artifact-4.1.0.jar || die
+	ln -s "${DISTDIR}"/CAF99EFBB25E9183609D6FBA4F63D85E7606903F-indexer-core-4.1.0.jar maven.indexer/external/indexer-core-4.1.0.jar || die
+	ln -s "${DISTDIR}"/ADD5DE96BF7F30DAA4EC41D70610CF72A16F58FD-javac-api-nb-7.0-b07.jar libs.javacapi/external/javac-api-nb-7.0-b07.jar || die
+	ln -s "${DISTDIR}"/83A74A811A1C98F6612B68D38ACCE8D2D9F9A719-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 "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.cglib/external cglib-2.2 cglib.jar cglib-2.2.jar
+	java-pkg_jar-from --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 2a66945..909cef4 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-9999_p20110426 (27 Apr 2011)
+
+  27 Apr 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-javacard-9999_p20110426.ebuild:
+  Bumped to latest nightly sources
+
 *netbeans-javacard-7.0 (21 Apr 2011)
 
   21 Apr 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index a41dac5..f4b6aab 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -3,6 +3,8 @@ DIST 6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip 7788619 RMD160 b85
 DIST 9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar 125083 RMD160 e7ad1dd08f29db894e5af4a6fb5455226be36530 SHA1 9c1a8bc9d3270d184f1d1bcc5f60aa81d46e1adf SHA256 d2379466134f239b9dd723f021976e3d2ade9624296d3d4a6d3241beeecfc6ba
 DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e25a481c2bc3c9a58 SHA1 9d22f61b5fa38be0fe9ab8d355d03effd1ba6ff1 SHA256 e2b3a52ac56806446ed3d15b025648d186bd2410e44c36bd2851e39d7f1a9dc5
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
+DIST netbeans-trunk-nightly-201104260000-src.zip 175571505 RMD160 c373fab9655316b90075ce69f9e321a866b9d91d SHA1 ff70d0eccb1143be9f0ea148d9d4853410bea295 SHA256 00bd2431d3acc76601d910acbc1681cc73b62c3f778a30e8fbe596eac746ad76
 EBUILD netbeans-javacard-7.0.ebuild 4896 RMD160 dbe54ac4f637c3a0b74d2db673d4d8109f9a79fb SHA1 d8409b8fbacd12fdc9272eb94b63bec7bf0b240c SHA256 06c630d02e4cf765d2c48db5a6d55036ac6de2fab7375c1976060739eb1957b6
-MISC ChangeLog 6558 RMD160 e9a8c8409492b7aa3862b25a157a022ee9fb7a4e SHA1 bf3a32e6533fd8bd8c330c0d06b90ae76ffbd21a SHA256 997f2dc334868eb114f9fbe8c68c7ef327ca3001f7c02def462739a00bd29df5
+EBUILD netbeans-javacard-9999_p20110426.ebuild 4929 RMD160 c60ced8864f5bc6294d597f0e89be2b70577a2ed SHA1 011ff76fcae85d8824bac687ac238f8946744ef4 SHA256 c22e7236cb6f213754dbf82eb8285d2f72a3f4bba9268f0e2d806679f0c7d1ba
+MISC ChangeLog 6739 RMD160 ca7a5e03feb2969969e97f51741e8b9121f57d69 SHA1 55b3eba239a3579a3c21db6b7b15d9db5181e57f SHA256 ec2aff6d806385cf9d19d93dc2349bb0756acc1da19cc743bea22c969f560edb
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20110426.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20110426.ebuild
new file mode 100644
index 0000000..fa34d95
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20110426.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="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2011-04-26_00-00-27/zip/netbeans-trunk-nightly-201104260000-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-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 "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/javacard >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/javacard$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	rm -fr "${D}"/${INSTALL_DIR}/bin || die
+
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/JCDK3.0.2_ConnectedEdition/lib
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm ant-contrib-1.0b3.jar && dosym /usr/share/ant-contrib/lib/ant-contrib.jar ${instdir}/ant-contrib-1.0b3.jar || die
+	# api_classic.jar
+	# api_connected.jar
+	rm asm-all-3.1.jar && dosym /usr/share/asm-3/lib/asm.jar ${instdir}/asm-all-3.1.jar || die
+	rm bcel-5.2.jar && dosym /usr/share/bcel/lib/bcel.jar ${instdir}/bcel-5.2.jar || die
+	rm commons-cli-1.0.jar && dosym /usr/share/commons-cli-1/lib/commons-cli.jar ${instdir}/commons-cli-1.0.jar || die
+	rm commons-codec-1.3.jar && dosym /usr/share/commons-codec/lib/commons-codec.jar ${instdir}/commons-codec-1.3.jar || die
+	rm commons-httpclient-3.0.jar && dosym /usr/share/commons-httpclient-3/lib/commons-httpclient.jar ${instdir}/commons-httpclient-3.0.jar || die
+	rm commons-logging-1.1.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.1.jar || die
+	# jcapt.jar
+	# jctasks.jar
+	# nbtasks.jar
+	# nbutils.jar
+	# tools.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	# apduio.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/javacard
+}

diff --git a/dev-java/netbeans-javadoc/ChangeLog b/dev-java/netbeans-javadoc/ChangeLog
index 044d86e..3e9543d 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-9999_p20110426 (27 Apr 2011)
+
+  27 Apr 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-javadoc-9999_p20110426.ebuild:
+  Bumped to latest nightly sources
+
 *netbeans-javadoc-7.0 (21 Apr 2011)
 
   21 Apr 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index 304f7e5..e351e18 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -1,6 +1,8 @@
 DIST FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip 2141252 RMD160 97e4e22e7d9a1c9731bac89252399a560d9c3dbf SHA1 ff23dbb427d09aaec3998b50d740c42b6a3fcd61 SHA256 4dea45582ff69620a906347fc1b085bb1cffb75e215cb55ec74181ae240a5be4
 DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e25a481c2bc3c9a58 SHA1 9d22f61b5fa38be0fe9ab8d355d03effd1ba6ff1 SHA256 e2b3a52ac56806446ed3d15b025648d186bd2410e44c36bd2851e39d7f1a9dc5
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
+DIST netbeans-trunk-nightly-201104260000-src.zip 175571505 RMD160 c373fab9655316b90075ce69f9e321a866b9d91d SHA1 ff70d0eccb1143be9f0ea148d9d4853410bea295 SHA256 00bd2431d3acc76601d910acbc1681cc73b62c3f778a30e8fbe596eac746ad76
 EBUILD netbeans-javadoc-7.0.ebuild 5812 RMD160 3cb4bf6f10337d1f92b099124318fbccaca82165 SHA1 2665506a07b7405994381ee44836cdabc8ee7f1c SHA256 93a2d7ceee7fd373ce59f1b154f4815b68bff3cf8fb260dcdf73ff896c53060c
-MISC ChangeLog 6462 RMD160 6b4c90bc46b4721df08588b96eda7d95aeef6fa5 SHA1 029238b1182b4a6394b2fa65eaa08216fa342607 SHA256 235b81e82379b1f2c6681f8959d1775dd7fa00db0904beeb94241dc60a6d96ac
+EBUILD netbeans-javadoc-9999_p20110426.ebuild 5845 RMD160 6b0cd4735e79707bcf689f84634a52c7c098c501 SHA1 b8aab879d2bc3e4e31d9d60ad51045fa9fa724ca SHA256 0584bd12a1b6b80e858f0fba048602261b6323d619f08d7532646fdbba86c2d3
+MISC ChangeLog 6641 RMD160 e183461341112f6b45bd73f5bd1ea65099d7bcbf SHA1 96aa6a52cf9dc1f10c9d2aeddfb6d1680b7a83e7 SHA256 aac1d138bf8f7bd129f17e8a11b15b6b0789c3f68c211af9d77c7c56247050c7
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20110426.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20110426.ebuild
new file mode 100644
index 0000000..9290ace
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20110426.ebuild
@@ -0,0 +1,160 @@
+# 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="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2011-04-26_00-00-27/zip/netbeans-trunk-nightly-201104260000-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-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/junit:4
+	~dev-java/netbeans-apisupport-${PV}
+	~dev-java/netbeans-cnd-${PV}
+	~dev-java/netbeans-dlight-${PV}
+	~dev-java/netbeans-enterprise-${PV}
+	~dev-java/netbeans-ergonomics-${PV}
+	~dev-java/netbeans-groovy-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-javacard-${PV}
+	~dev-java/netbeans-mobility-${PV}
+	~dev-java/netbeans-nb-${PV}
+	~dev-java/netbeans-php-${PV}
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-profiler-${PV}
+	~dev-java/netbeans-websvccommon-${PV}"
+RDEPEND=""
+
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-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 "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.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-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 caac9c1..2e91421 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-9999_p20110426 (27 Apr 2011)
+
+  27 Apr 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-mobility-9999_p20110426.ebuild:
+  Bumped to latest nightly sources
+
 *netbeans-mobility-7.0 (21 Apr 2011)
 
   21 Apr 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 05e39a1..9d4e708 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -8,6 +8,8 @@ DIST D1B5BA3BFE8DCFAF08A0468F8879EF1D0E998038-jakarta-slide-webdavlib-2.1.jar 17
 DIST D76B8334DCBDBE93297AA5C02B17D9A856E72246-jmunit4cldc11-1.2.1.jar 18043 RMD160 856f168f2cb3996ba7769eb543cc4995985aef2b SHA1 d76b8334dcbdbe93297aa5c02b17d9a856e72246 SHA256 f12eb81605e0d6f5c52515545cc6899baac1fc5f6ed069408a5eb5ede8a88c88
 DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e25a481c2bc3c9a58 SHA1 9d22f61b5fa38be0fe9ab8d355d03effd1ba6ff1 SHA256 e2b3a52ac56806446ed3d15b025648d186bd2410e44c36bd2851e39d7f1a9dc5
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
+DIST netbeans-trunk-nightly-201104260000-src.zip 175571505 RMD160 c373fab9655316b90075ce69f9e321a866b9d91d SHA1 ff70d0eccb1143be9f0ea148d9d4853410bea295 SHA256 00bd2431d3acc76601d910acbc1681cc73b62c3f778a30e8fbe596eac746ad76
 EBUILD netbeans-mobility-7.0.ebuild 8590 RMD160 9def01a8eb4d25f3e423cb808ec7fc4b432fe2ff SHA1 c50a2eb86085769ba5a85d3b399b13cd91811a6a SHA256 b65564f38baf7560c37dfdaf0eac14db7e47fc3fc4585e33d5399e12d8c455d5
-MISC ChangeLog 6699 RMD160 32e52b9696396f9051662d15792b576a80815dec SHA1 719ef04167d3b385e23fb40ca5bdb143893e02a8 SHA256 371ce83bc376779dcbaac2175646bb3cb621906ee19084d83d0805502537950b
+EBUILD netbeans-mobility-9999_p20110426.ebuild 8623 RMD160 3eb218c4cb353e316fcbf5e94021ec108cf37291 SHA1 637a365be8e13e77aff8df5f6c2d8d6d0013f590 SHA256 14dd2e2d52cb3ca74051f0349b6e2d6d048a8a95a1cc2fbe2f310ea6af87f9a6
+MISC ChangeLog 6880 RMD160 9b51c8435185e010814d4fb22e36963b6810ec5f SHA1 d03d4d443f98d3eb1c0454058e108dad70cb75f0 SHA256 f14a0c453b912ba766ecb303cd317cfae8b2ad5b0dafb5bf89355ddbb8686a3a
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20110426.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20110426.ebuild
new file mode 100644
index 0000000..7c47ad1
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20110426.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="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2011-04-26_00-00-27/zip/netbeans-trunk-nightly-201104260000-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-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 "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --into 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 2361173..ec625a7 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-9999_p20110426 (27 Apr 2011)
+
+  27 Apr 2011; Miroslav Šulc <fordfrog@g.o>
+  +files/9999/keychain-support.patch, +netbeans-nb-9999_p20110426.ebuild:
+  Bumped to latest nightly sources
+
 *netbeans-nb-7.0 (21 Apr 2011)
 
   21 Apr 2011; Miroslav Šulc <fordfrog@g.o> +netbeans-nb-7.0.ebuild:

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index ba960c7..53461b5 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -1,7 +1,10 @@
 AUX 7.0/keychain-support.patch 872 RMD160 8063d4dc226f04c6fda72fd9b8837757eb3f3276 SHA1 fd22c305e56cde92cb943cf3bca975ebde7781c4 SHA256 75ca94102e72f7d2b7dd16729dd84ee781b04e80430f841a9546aebaa51662c6
+AUX 9999/keychain-support.patch 872 RMD160 8063d4dc226f04c6fda72fd9b8837757eb3f3276 SHA1 fd22c305e56cde92cb943cf3bca975ebde7781c4 SHA256 75ca94102e72f7d2b7dd16729dd84ee781b04e80430f841a9546aebaa51662c6
 DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e25a481c2bc3c9a58 SHA1 9d22f61b5fa38be0fe9ab8d355d03effd1ba6ff1 SHA256 e2b3a52ac56806446ed3d15b025648d186bd2410e44c36bd2851e39d7f1a9dc5
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-7.0.png 20011 RMD160 a941b71b571a9cd30c49446aef1bd4244e689465 SHA1 ebd2e748bb4bc29e667ead9a2fb717a9017f9405 SHA256 1d519f018ebeff6e29436c8492dbb266446bd0144fb5519b2ef6637664de6f4a
+DIST netbeans-trunk-nightly-201104260000-src.zip 175571505 RMD160 c373fab9655316b90075ce69f9e321a866b9d91d SHA1 ff70d0eccb1143be9f0ea148d9d4853410bea295 SHA256 00bd2431d3acc76601d910acbc1681cc73b62c3f778a30e8fbe596eac746ad76
 EBUILD netbeans-nb-7.0.ebuild 5037 RMD160 3802011d7c4d6b89129d3d442f0198c50ad71432 SHA1 c6cdc29caaf7e51dab159cbdabb56f80369aad29 SHA256 416a2c810e7f17e113ed9b5026062ee6471c7e652f40f08a9d410ec18cca70d7
-MISC ChangeLog 6292 RMD160 acb6e43ca084b4e8b76369451d17f25b87dc098b SHA1 20710525d8619be73a404278cabea826a16b9e03 SHA256 76555f3631061fb5fd3168debfa4e8ed1f790d89728746d892e63671559f6405
+EBUILD netbeans-nb-9999_p20110426.ebuild 5066 RMD160 004c8e6264bbdc6d7be25f4694a98b27cc15d15e SHA1 8729f15f72d82cb26718721fae67b30efbf66ac1 SHA256 6b95a737c46e1112b363db3de56d9e8130675e531234899f34571459e7cf99c1
+MISC ChangeLog 6497 RMD160 643fc22a688430f7fdbeb172d59560e4a673addf SHA1 6b96bc4d2c8469006c9be01329058a56ba989a38 SHA256 b9b21acc20c4c0aff66ca21463da9c6044b894fee27f485eb6e6e6da6c8bdde1
 MISC metadata.xml 396 RMD160 80c4086b305af8d5e4adae8a263111590f183c05 SHA1 11224a41781dde9ebd92c32e5c0a9d1921b628cb SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49

diff --git a/dev-java/netbeans-nb/files/9999/keychain-support.patch b/dev-java/netbeans-nb/files/9999/keychain-support.patch
new file mode 100644
index 0000000..4e9c487
--- /dev/null
+++ b/dev-java/netbeans-nb/files/9999/keychain-support.patch
@@ -0,0 +1,26 @@
+# HG changeset patch
+# Parent cbf7b2d2851314077b9c1ecd6ec95ce51453daf8
+diff -r cbf7b2d28513 -r 0350861eeabf ide/launcher/unix/netbeans
+--- a/ide/launcher/unix/netbeans	Tue Nov 09 13:44:15 2010 +0100
++++ b/ide/launcher/unix/netbeans	Tue Nov 09 14:21:18 2010 +0100
+@@ -169,6 +169,20 @@
+     then
+         sh=/bin/bash
+     fi
++    keychain=`which keychain`
++    if [ -n "$keychain" ]; then
++        $keychain -q
++        . $HOME/.keychain/$HOSTNAME-sh
++        if [ -e $userdir/keychain-keys.txt ]; then
++            for key in `cat $userdir/keychain-keys.txt`; do
++                SSH_ASKPASS=`which x11-ssh-askpass`
++                export SSH_ASKPASS
++                if [ -n "$key" ]; then
++                    keychain $key
++                fi
++            done
++        fi
++    fi
+     if [ "${founduserdir}" = "yes" ]; then
+         exec $sh "$nbexec" "$@"
+     else

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20110426.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20110426.ebuild
new file mode 100644
index 0000000..f802197
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20110426.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="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2011-04-26_00-00-27/zip/netbeans-trunk-nightly-201104260000-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0.png"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE="keychain"
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}
+	keychain? (
+		net-misc/keychain:0
+		net-misc/x11-ssh-askpass:0
+	)"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster create-netbeans-import finish-build"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.nb -Dext.binaries.downloaded=true"
+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 "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans >/dev/null || die
+
+	insinto ${INSTALL_DIR}/nb
+
+	grep -E "/nb$" moduleCluster.properties > "${D}"/${INSTALL_DIR}/nb/moduleCluster.properties || die
+
+	insinto ${INSTALL_DIR}
+	doins -r nb
+	dodoc *.txt
+	dohtml *.html *.css
+
+	insinto ${INSTALL_DIR}/bin
+	doins bin/netbeans
+	dosym ${INSTALL_DIR}/bin/netbeans /usr/bin/netbeans-${SLOT}
+	fperms 755 ${INSTALL_DIR}/bin/netbeans
+
+	insinto /etc/netbeans-${SLOT}
+	doins etc/*
+	dosym /etc/netbeans-${SLOT} ${INSTALL_DIR}/etc
+	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 af06cd1..be49661 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-9999_p20110426 (27 Apr 2011)
+
+  27 Apr 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-php-9999_p20110426.ebuild:
+  Bumped to latest nightly sources
+
 *netbeans-php-7.0 (21 Apr 2011)
 
   21 Apr 2011; Miroslav Šulc <fordfrog@g.o> +netbeans-php-7.0.ebuild:

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index ab1b33f..87dd674 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -4,6 +4,8 @@ DIST 40BC40A6E6DBD598900E8FAB87E460FCC601275C-predefined_vars.zip 4792 RMD160 95
 DIST C3E8FC2F69123F598F29F930DC39F5B55A08824C-phpsigfiles.zip 421035 RMD160 8a739c44280b1f239a1ef645ca2a8d43d1cc4ad8 SHA1 c3e8fc2f69123f598f29f930dc39f5b55a08824c SHA256 0622147048e07b8ca59c2674d28327880264d05b775964d032e91f5101f7abd4
 DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e25a481c2bc3c9a58 SHA1 9d22f61b5fa38be0fe9ab8d355d03effd1ba6ff1 SHA256 e2b3a52ac56806446ed3d15b025648d186bd2410e44c36bd2851e39d7f1a9dc5
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
+DIST netbeans-trunk-nightly-201104260000-src.zip 175571505 RMD160 c373fab9655316b90075ce69f9e321a866b9d91d SHA1 ff70d0eccb1143be9f0ea148d9d4853410bea295 SHA256 00bd2431d3acc76601d910acbc1681cc73b62c3f778a30e8fbe596eac746ad76
 EBUILD netbeans-php-7.0.ebuild 4086 RMD160 3b0516c1fb5f77b7845bf956eccd2106aa5b477d SHA1 2deee7e95837905a26f7c3476d4067fd404b7055 SHA256 03a362429af46895dd6f50b8f44a68b9760e47320a52a137f088b3aec4bd2d93
-MISC ChangeLog 6201 RMD160 d0444851f762675a86d8c0a17935a694f8b19a91 SHA1 f2ce524648ee2da5d0c02a8ac276d96be20c2543 SHA256 79725619c7a60845f4a4eb29861802211fd92351bec962004f4635763ecc2706
+EBUILD netbeans-php-9999_p20110426.ebuild 4119 RMD160 756199572731db7aca65ca09913aa36fc850f3e0 SHA1 e011b921875afeb4dc0f75bba0f1db362b63359c SHA256 90479e3a6009f290519479b657995e5e96ce78f7a612fbc1cad5d59fbc7a2df4
+MISC ChangeLog 6372 RMD160 d7446b5d4da857b033a68ca4b184fbdaa7c84811 SHA1 d736633281f9ce29ac102a76a4211053a611fded SHA256 3c8b77704c7ea7c4d06a8d14629ba6440000345892ddb20274f2d9fd43d4f036
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20110426.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20110426.ebuild
new file mode 100644
index 0000000..a9d2133
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20110426.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="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2011-04-26_00-00-27/zip/netbeans-trunk-nightly-201104260000-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-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 "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.javacup/external javacup javacup.jar java-cup-11a.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-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 a444426..dbe7e93 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-9999_p20110426 (27 Apr 2011)
+
+  27 Apr 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-platform-9999_p20110426.ebuild:
+  Bumped to latest nightly sources
+
 *netbeans-platform-7.0 (21 Apr 2011)
 
   21 Apr 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index 33606bb..355622f 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -5,6 +5,8 @@ DIST 986195A7E31034EE73F7A896A36B24169692F142-osgi.core-4.2.jar 101276 RMD160 88
 DIST BD5615C6A15497B60A0AAA9A04D4F05E2BC42D07-felix-main-2.0.2.jar 23434 RMD160 83c333240433200ff319157d89ea88e1774c1061 SHA1 bd5615c6a15497b60a0aaa9a04d4f05e2bc42d07 SHA256 73bb137228039e9aef458d1ee6272f3c0adcac2d0565d3ad307c60c941d33abf
 DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e25a481c2bc3c9a58 SHA1 9d22f61b5fa38be0fe9ab8d355d03effd1ba6ff1 SHA256 e2b3a52ac56806446ed3d15b025648d186bd2410e44c36bd2851e39d7f1a9dc5
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
+DIST netbeans-trunk-nightly-201104260000-src.zip 175571505 RMD160 c373fab9655316b90075ce69f9e321a866b9d91d SHA1 ff70d0eccb1143be9f0ea148d9d4853410bea295 SHA256 00bd2431d3acc76601d910acbc1681cc73b62c3f778a30e8fbe596eac746ad76
 EBUILD netbeans-platform-7.0.ebuild 4855 RMD160 1bf2c46bf11d3c8767d5f03996acf9f8e81b5b87 SHA1 b26949f5b85e72c7e2b7b55b6f8f40f9493dfcd3 SHA256 3375b2dd5b9b638e91d78dc56c81128adf63b03e909c518dcae6dacb6d3ef761
-MISC ChangeLog 6994 RMD160 0a6266f2e12066934c52d98c9c917fa9adf78c0a SHA1 3c5c6a2ec28f84f727f575a864decddc6cad235d SHA256 9301b66df213c42cc5dcaded2d6554b8dc2cd7a3cf5f9f13592ed49cc8a139e6
+EBUILD netbeans-platform-9999_p20110426.ebuild 4888 RMD160 91dc9bde12c6ffc42f470a98667051b9948876d2 SHA1 9783d499a0f5ba7c8dfb720243839c980a866873 SHA256 0b6fff46297fa893abcb7b5ff813119fc262ef727d53191536ad9e516fabd626
+MISC ChangeLog 7175 RMD160 c17e7323afa586f873767b31d1fd49caf47041b6 SHA1 cdec634cd37586928467e28ea841565c4fae7b27 SHA256 901a166bf750a2de2d905703f9b4f0f6d054a5c888c79dd14fdc9fee5d796e66
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20110426.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20110426.ebuild
new file mode 100644
index 0000000..9b296e1
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20110426.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="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2011-04-26_00-00-27/zip/netbeans-trunk-nightly-201104260000-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-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 "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --into core.nativeaccess/external jna platform.jar platform-3.2.7.jar
+	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.jna/external jna jna.jar jna-3.2.7.jar
+	java-pkg_jar-from --into o.jdesktop.layout/external swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
+	ln -s /usr/share/swing-layout-1/sources/swing-layout-src.zip o.jdesktop.layout/external/swing-layout-1.0.4-src.zip || die
+
+	java-pkg-2_src_prepare
+}
+
+src_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 a613d5f..8291d27 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-9999_p20110426 (27 Apr 2011)
+
+  27 Apr 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-profiler-9999_p20110426.ebuild:
+  Bumped to latest nightly sources
+
 *netbeans-profiler-7.0 (21 Apr 2011)
 
   21 Apr 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index b0ec699..c38a473 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -1,5 +1,7 @@
 DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e25a481c2bc3c9a58 SHA1 9d22f61b5fa38be0fe9ab8d355d03effd1ba6ff1 SHA256 e2b3a52ac56806446ed3d15b025648d186bd2410e44c36bd2851e39d7f1a9dc5
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
+DIST netbeans-trunk-nightly-201104260000-src.zip 175571505 RMD160 c373fab9655316b90075ce69f9e321a866b9d91d SHA1 ff70d0eccb1143be9f0ea148d9d4853410bea295 SHA256 00bd2431d3acc76601d910acbc1681cc73b62c3f778a30e8fbe596eac746ad76
 EBUILD netbeans-profiler-7.0.ebuild 3048 RMD160 ff8573b89f3dabc65e232a60c31fabc2c480b181 SHA1 80b0946f0fdcaa9b6f10f3bc78535b94b582dcc7 SHA256 7148f39f6ebb55e5ed0581bcfa361eb6e4fb5e225e50035cd972f3152340a58a
-MISC ChangeLog 6558 RMD160 8ae687066e4130d42451abaa3f52ab1bbb147b34 SHA1 628f18c4dbd36eaa4511a87fb48cc2d15d6995ff SHA256 a298f3cb9bff7b8cf2affec3f01fc521fa7072174ec93631f81df0347135f68c
+EBUILD netbeans-profiler-9999_p20110426.ebuild 3081 RMD160 07680d6be779b32822075f735d82bbb6e742b983 SHA1 f87c58e78c149d3f3fd08c2fdba01a6a9d104bea SHA256 9ff0fa05ebdbc25b5210fcf2f479fba0ea382f43d97c9dad554a0bb730dc650e
+MISC ChangeLog 6739 RMD160 1ad60311560e0f41fc00957f7b569c528457752d SHA1 e1007728a27c0b4d6772468dc23bfdd4efe6f1d3 SHA256 a93586f260f9b2930d84bae7649274c9fd7efb5268ff135323aefa64161e5cce
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20110426.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20110426.ebuild
new file mode 100644
index 0000000..4f7f9ba
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20110426.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="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2011-04-26_00-00-27/zip/netbeans-trunk-nightly-201104260000-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-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 "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/profiler >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/profiler$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	for file in lib/deployed/cvm/linux/*.so ; do
+		fperms 755 ${file}
+	done
+
+	for file in lib/deployed/jdk*/linux*/*.so ; do
+		fperms 755 ${file}
+	done
+
+	for file in remote-pack-defs/*.sh ; do
+		fperms 755 ${file}
+	done
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/profiler
+}

diff --git a/dev-java/netbeans-websvccommon/ChangeLog b/dev-java/netbeans-websvccommon/ChangeLog
index 972eae1..c89bb2e 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-9999_p20110426 (27 Apr 2011)
+
+  27 Apr 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-websvccommon-9999_p20110426.ebuild:
+  Bumped to latest nightly sources
+
 *netbeans-websvccommon-7.0 (21 Apr 2011)
 
   21 Apr 2011; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index c1764b1..5fc63d4 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -1,5 +1,7 @@
 DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e25a481c2bc3c9a58 SHA1 9d22f61b5fa38be0fe9ab8d355d03effd1ba6ff1 SHA256 e2b3a52ac56806446ed3d15b025648d186bd2410e44c36bd2851e39d7f1a9dc5
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
+DIST netbeans-trunk-nightly-201104260000-src.zip 175571505 RMD160 c373fab9655316b90075ce69f9e321a866b9d91d SHA1 ff70d0eccb1143be9f0ea148d9d4853410bea295 SHA256 00bd2431d3acc76601d910acbc1681cc73b62c3f778a30e8fbe596eac746ad76
 EBUILD netbeans-websvccommon-7.0.ebuild 2627 RMD160 22ae06750bdadf3aff577b598b79228c9e061a75 SHA1 17e5c709c6863bd09112924cce9ae267fd427f36 SHA256 7a89f0152d080d3fbf76008832ac4d858b969a034abac69d252b2ed821a34a21
-MISC ChangeLog 6842 RMD160 d0b0345bed28839be64cc20c4cda6789f3914b1b SHA1 a9861c6c4dceaeb50dc51a1a77e6be09134fb102 SHA256 e79cf259a8b2c379646d9fa475f0f6c134cfb5b399d78912ea5ce29372cfbdcc
+EBUILD netbeans-websvccommon-9999_p20110426.ebuild 2660 RMD160 bbd170efb83ecbc6cf14c887e0d26144bf22063b SHA1 90fa8a25af93382e58ead61a416e497b8892de7b SHA256 3457c77b05e663ce376ec5d78e75c46e5d702dbcf6b4a428b825cb5dd0068abe
+MISC ChangeLog 7031 RMD160 565a6f82e02338b8957fd73a310f3acc1ade695b SHA1 a86a180eb3a49aab4a7f98e418e38320b4282f19 SHA256 086f3ae3ff56fed1087a586c033c884f42ec3acf7be9990f02de98b28ca6f5e3
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20110426.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20110426.ebuild
new file mode 100644
index 0000000..c7cc238
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20110426.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="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2011-04-26_00-00-27/zip/netbeans-trunk-nightly-201104260000-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-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 "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/websvccommon >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+	grep -E "/websvccommon$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/websvccommon
+}

diff --git a/dev-util/netbeans/ChangeLog b/dev-util/netbeans/ChangeLog
index 47d6cad..0b01032 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-9999_p20110426 (27 Apr 2011)
+
+  27 Apr 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-9999_p20110426.ebuild:
+  Bumped to latest nightly sources
+
 *netbeans-7.0 (21 Apr 2011)
 
   21 Apr 2011; Miroslav Šulc <fordfrog@g.o> +netbeans-7.0.ebuild:

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 77dded8..3a7d5b2 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -1,6 +1,8 @@
 DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e25a481c2bc3c9a58 SHA1 9d22f61b5fa38be0fe9ab8d355d03effd1ba6ff1 SHA256 e2b3a52ac56806446ed3d15b025648d186bd2410e44c36bd2851e39d7f1a9dc5
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-l10n-7.0-20110413.tar.bz2 13405280 RMD160 146a1e4e72e44659fa547bec00712f55063e31ab SHA1 04d91b859a64405c4b71821a4d0ca543f9ab523e SHA256 30c2008d5b7d3b03a1d80b32b681e473fdf89a907c564a1ca4b4dac2fcea7eab
+DIST netbeans-trunk-nightly-201104260000-src.zip 175571505 RMD160 c373fab9655316b90075ce69f9e321a866b9d91d SHA1 ff70d0eccb1143be9f0ea148d9d4853410bea295 SHA256 00bd2431d3acc76601d910acbc1681cc73b62c3f778a30e8fbe596eac746ad76
 EBUILD netbeans-7.0.ebuild 6709 RMD160 3e3200c10f2a343501e9658fb7730063d0e7f326 SHA1 1cee5a87e542c8da6b167a7f8edfe8cdd511987f SHA256 347005e2f9d19eee6d54446b0318501f9a3a70b5965aaf883af47b41b851682b
-MISC ChangeLog 6069 RMD160 0694389c3d0dd47ea6b90799d1693a0f7d0e867b SHA1 7f4e7842c68e6ebba16795337ad4327d52cf1999 SHA256 acd47dfae971de20df08618cf2a0ed34c463aa9b8d71cf4347dd0f878837533e
+EBUILD netbeans-9999_p20110426.ebuild 6742 RMD160 520710f13af94a5de135bf9f2730770c535fd605 SHA1 980b97dd88a490915d511e0bbdadb0c5a5cdd5bf SHA256 5fb39cb6783fc650230fc497360d219507f597bdc56f95f54fe84dc94cde7fd6
+MISC ChangeLog 6232 RMD160 9d790d3526cb2782e3a2f03d5d3a114db642a782 SHA1 4ce479f30b8f2a73d38e6dc97ab2fc18f263f716 SHA256 10b62bc6a873d3d172830c315f3910c249f57c41cc480b30d34b004dbafb2cf3
 MISC metadata.xml 333 RMD160 848a246f77fbcc88bb03d4a8d0769ef60353148a SHA1 e9afe19410a907fb47230f824b2d592ba3f465d4 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a

diff --git a/dev-util/netbeans/netbeans-9999_p20110426.ebuild b/dev-util/netbeans/netbeans-9999_p20110426.ebuild
new file mode 100644
index 0000000..6dfc969
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20110426.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="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2011-04-26_00-00-27/zip/netbeans-trunk-nightly-201104260000-src.zip"
+PATCHES_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2"
+L10N_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-7.0-20110413.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 "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+			local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+			if [ -n "${files}" ] ; then
+				einfo "Applying custom patches:"
+
+				for file in ${files} ; do
+					epatch "${file}"
+				done
+			fi
+		fi
+
+		einfo "Symlinking external libraries..."
+		java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	fi
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	if [ -n "${NBLOCALES}" ] ; then
+		einfo "Compiling support for locales: ${NBLOCALES}"
+		eant -f nbbuild/build.xml bootstrap || die
+		eant -Dlocales=${NBLOCALES} -Ddist.dir=../nbbuild/netbeans -Dnbms.dir="" -Dnbms.dist.dir="" \
+			-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
+}