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

[Miroslav Šulc]

commit:     29d2fbc79d7deffd3a7152d304420e1264869d94
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 29 15:28:15 2011 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Jul 29 15:28:15 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/fordfrog.git;a=commit;h=29d2fbc7

netbeans: bumped to latest nightly sources

---
 dev-java/netbeans-apisupport/ChangeLog             |    6 +
 dev-java/netbeans-apisupport/Manifest              |    4 +-
 .../netbeans-apisupport-9999_p20110728.ebuild      |  106 ++++++
 dev-java/netbeans-cnd/ChangeLog                    |    6 +
 dev-java/netbeans-cnd/Manifest                     |    4 +-
 .../netbeans-cnd-9999_p20110728.ebuild             |  123 +++++++
 dev-java/netbeans-dlight/ChangeLog                 |    6 +
 dev-java/netbeans-dlight/Manifest                  |    4 +-
 .../netbeans-dlight-9999_p20110728.ebuild          |  119 +++++++
 dev-java/netbeans-enterprise/ChangeLog             |    6 +
 dev-java/netbeans-enterprise/Manifest              |   15 +-
 .../netbeans-enterprise-9999_p20110728.ebuild      |  316 +++++++++++++++++
 dev-java/netbeans-ergonomics/ChangeLog             |    6 +
 dev-java/netbeans-ergonomics/Manifest              |    4 +-
 .../netbeans-ergonomics-9999_p20110728.ebuild      |  101 ++++++
 dev-java/netbeans-groovy/ChangeLog                 |    6 +
 dev-java/netbeans-groovy/Manifest                  |    4 +-
 .../netbeans-groovy-9999_p20110728.ebuild          |  111 ++++++
 dev-java/netbeans-harness/ChangeLog                |    6 +
 dev-java/netbeans-harness/Manifest                 |    4 +-
 .../netbeans-harness-9999_p20110728.ebuild         |  114 ++++++
 dev-java/netbeans-ide/ChangeLog                    |    6 +
 dev-java/netbeans-ide/Manifest                     |    5 +-
 .../netbeans-ide-9999_p20110728.ebuild             |  361 ++++++++++++++++++++
 dev-java/netbeans-java/ChangeLog                   |    6 +
 dev-java/netbeans-java/Manifest                    |    4 +-
 .../netbeans-java-9999_p20110728.ebuild            |  298 ++++++++++++++++
 dev-java/netbeans-javacard/ChangeLog               |    6 +
 dev-java/netbeans-javacard/Manifest                |    4 +-
 .../netbeans-javacard-9999_p20110728.ebuild        |  141 ++++++++
 dev-java/netbeans-javadoc/ChangeLog                |    6 +
 dev-java/netbeans-javadoc/Manifest                 |    4 +-
 .../netbeans-javadoc-9999_p20110728.ebuild         |  160 +++++++++
 dev-java/netbeans-mobility/ChangeLog               |    6 +
 dev-java/netbeans-mobility/Manifest                |    4 +-
 .../netbeans-mobility-9999_p20110728.ebuild        |  184 ++++++++++
 dev-java/netbeans-nb/ChangeLog                     |    6 +
 dev-java/netbeans-nb/Manifest                      |    4 +-
 .../netbeans-nb/netbeans-nb-9999_p20110728.ebuild  |  149 ++++++++
 dev-java/netbeans-php/ChangeLog                    |    6 +
 dev-java/netbeans-php/Manifest                     |    4 +-
 .../netbeans-php-9999_p20110728.ebuild             |  119 +++++++
 dev-java/netbeans-platform/ChangeLog               |    6 +
 dev-java/netbeans-platform/Manifest                |    4 +-
 .../netbeans-platform-9999_p20110728.ebuild        |  122 +++++++
 dev-java/netbeans-profiler/ChangeLog               |    6 +
 dev-java/netbeans-profiler/Manifest                |    4 +-
 .../netbeans-profiler-9999_p20110728.ebuild        |  113 ++++++
 dev-java/netbeans-websvccommon/ChangeLog           |    6 +
 dev-java/netbeans-websvccommon/Manifest            |    4 +-
 .../netbeans-websvccommon-9999_p20110728.ebuild    |   94 +++++
 dev-util/netbeans/ChangeLog                        |    6 +
 dev-util/netbeans/Manifest                         |    4 +-
 dev-util/netbeans/netbeans-9999_p20110728.ebuild   |  254 ++++++++++++++
 54 files changed, 3159 insertions(+), 18 deletions(-)

diff --git a/dev-java/netbeans-apisupport/ChangeLog b/dev-java/netbeans-apisupport/ChangeLog
index 37649a1..5de0d0a 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_p20110728 (29 Jul 2011)
+
+  29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-apisupport-9999_p20110728.ebuild:
+  Bumped to latest nightly sources
+
   29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
   -netbeans-apisupport-9999_p20110717.ebuild:
   Removed obsolete version

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 1cb529b..15882f3 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -2,7 +2,9 @@ DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
 DIST netbeans-trunk-nightly-201107220600-src.zip 173109164 RMD160 4529b4f9d6d42e53bd84e9ec3d0b7faed68490d0 SHA1 442a996bc1da147252cd75338b74e31dc5f632e0 SHA256 6d488db0c59aaa952f6b72b77a095d6354b8030d651788773639d965b6b65c8a
+DIST netbeans-trunk-nightly-201107280600-src.zip 173413435 RMD160 86b59d8b2fa15be0541e255fe0c1f3ab42603462 SHA1 156f011fddbf7f7659fb27f1a59700ef891c5d7e SHA256 7b77df1988a1423960dc6242b8b4e384918950ba6d4d0e6c0c7dcec4731292c4
 EBUILD netbeans-apisupport-7.0.ebuild 3069 RMD160 a6ab7f92886067f94a385effbfaed156ebc97bef SHA1 6e385e84970bec91d70fd9f60d6f5bb8b9bef345 SHA256 aa504004b728931a6727eb23a37c2b9e824c49369cbbefa2e3dabc6340815443
 EBUILD netbeans-apisupport-9999_p20110722.ebuild 3096 RMD160 5a066865bfa9ce607c188d2891765f71ec3335ea SHA1 9d1fb1f6c9d0e2a95b38de778fb6950439e5b01d SHA256 c40d61699f6a8bf26545a51bfc1166fe08238067086967323ca65d59f5a367c1
-MISC ChangeLog 11844 RMD160 3b72a5089c46e9c8ea7baa2f037e24bca1afaf28 SHA1 429f7a5e00ceddb29fe0e80a78e50b8613d3127f SHA256 94b51e750bb5f333a9c7eea8f01c68968594eefcb207055cc5e3ba6cd8a3f40b
+EBUILD netbeans-apisupport-9999_p20110728.ebuild 3096 RMD160 4b8dcfa9364c4a3a52793f4509faa2ab19ab193d SHA1 1ed203c84f8bb69767c46d6729b658b91233fad8 SHA256 cb163c834b37f0f5cb45390683a5e22a26fd95eaa577daa806e0f068d2838b81
+MISC ChangeLog 12029 RMD160 9625d7e15eb89f812a59415f5f9567d39cd8d39c SHA1 62fd8dfd2d847e6bb8a94104801727d54871f9e4 SHA256 794a0e3dca827ef008544e5aef3df3d277e2e287be9927ed8a0c875b8140a331
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20110728.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20110728.ebuild
new file mode 100644
index 0000000..564a2eb
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20110728.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-07-28_06-00-32/zip/netbeans-trunk-nightly-201107280600-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.apisupport -Dext.binaries.downloaded=true"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/apisupport >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/apisupport$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/apisupport
+}

diff --git a/dev-java/netbeans-cnd/ChangeLog b/dev-java/netbeans-cnd/ChangeLog
index afec877..f50230b 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_p20110728 (29 Jul 2011)
+
+  29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-cnd-9999_p20110728.ebuild:
+  Bumped to latest nightly sources
+
   29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
   -netbeans-cnd-9999_p20110717.ebuild:
   Removed obsolete version

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index fa81171..9bb7257 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -7,7 +7,9 @@ DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
 DIST netbeans-trunk-nightly-201107220600-src.zip 173109164 RMD160 4529b4f9d6d42e53bd84e9ec3d0b7faed68490d0 SHA1 442a996bc1da147252cd75338b74e31dc5f632e0 SHA256 6d488db0c59aaa952f6b72b77a095d6354b8030d651788773639d965b6b65c8a
+DIST netbeans-trunk-nightly-201107280600-src.zip 173413435 RMD160 86b59d8b2fa15be0541e255fe0c1f3ab42603462 SHA1 156f011fddbf7f7659fb27f1a59700ef891c5d7e SHA256 7b77df1988a1423960dc6242b8b4e384918950ba6d4d0e6c0c7dcec4731292c4
 EBUILD netbeans-cnd-7.0.ebuild 4430 RMD160 ef34ff1144cdb1628730251a25e2d9a5b503887f SHA1 a1b0f1ab9fe07a6c5c839c3b14782821442d40c3 SHA256 228fc04cd90f647f2b8e94958d671286db01f617e360868be5548f208eebbf00
 EBUILD netbeans-cnd-9999_p20110722.ebuild 4457 RMD160 7e30d0e1d370fd1013a2ab50614f1310f0e7e6b0 SHA1 ddf58e96f2395d712943123379c6a55fe3d37500 SHA256 87494426bc64e9e5cbe79f205daa941bdaaf832681bb51554d83b308a77d0504
-MISC ChangeLog 10966 RMD160 40eca0715bb8e3a864712479333ea7b5407903d3 SHA1 57aa6d9fd923d349e542f91f618d3e2557a75bb9 SHA256 781215b52387ff61a088a9e478f98378afe9fb9ba1cc25c6d06ec86a9641c0d8
+EBUILD netbeans-cnd-9999_p20110728.ebuild 4457 RMD160 42a4256a7de7232070a92ea5e8b782b7aaaac345 SHA1 da4f26378daee82341f76d41e29ddc255b1488ac SHA256 fdd62faca0cdf0d141e662cb53b9a0b7b3cdcd428dff87167800a8a20757df12
+MISC ChangeLog 11137 RMD160 ced29f2b32bd9c6549f9de6df99cac11b662f886 SHA1 1183f00b3d1aeb589320b055849703184cd62b14 SHA256 f31a5eed2caa52af77ae41c65ee8ede019e144d2aaaa1cf0a2e731caadb37981
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20110728.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20110728.ebuild
new file mode 100644
index 0000000..5d0d319
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20110728.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-07-28_06-00-32/zip/netbeans-trunk-nightly-201107280600-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/5C917BCC015510DC6C7E3B511DB85B2978C0774C-cnd-build-trace-1.0.zip
+	http://hg.netbeans.org/binaries/84F10BEAA967E2896F0B43B0BBD08D834841F554-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-9999-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/5C917BCC015510DC6C7E3B511DB85B2978C0774C-cnd-build-trace-1.0.zip cnd.discovery/external/cnd-build-trace-1.0.zip || die
+	ln -s "${DISTDIR}"/84F10BEAA967E2896F0B43B0BBD08D834841F554-cnd-rfs-1.0.zip cnd.remote/external/cnd-rfs-1.0.zip || die
+	ln -s "${DISTDIR}"/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-9999-build.xml.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 d02183f..e1f1207 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_p20110728 (29 Jul 2011)
+
+  29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-dlight-9999_p20110728.ebuild:
+  Bumped to latest nightly sources
+
   29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
   -netbeans-dlight-9999_p20110717.ebuild:
   Removed obsolete version

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 078a47c..a1910ad 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -5,7 +5,9 @@ DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
 DIST netbeans-trunk-nightly-201107220600-src.zip 173109164 RMD160 4529b4f9d6d42e53bd84e9ec3d0b7faed68490d0 SHA1 442a996bc1da147252cd75338b74e31dc5f632e0 SHA256 6d488db0c59aaa952f6b72b77a095d6354b8030d651788773639d965b6b65c8a
+DIST netbeans-trunk-nightly-201107280600-src.zip 173413435 RMD160 86b59d8b2fa15be0541e255fe0c1f3ab42603462 SHA1 156f011fddbf7f7659fb27f1a59700ef891c5d7e SHA256 7b77df1988a1423960dc6242b8b4e384918950ba6d4d0e6c0c7dcec4731292c4
 EBUILD netbeans-dlight-7.0.ebuild 3572 RMD160 71996c25aca15f9225e0713f8b5521a0f9b3f44b SHA1 c5a4e7215bfd75b92b42de0843ee2b792dc2d753 SHA256 82a3cbfe70024adefdd3f28a1879b26ab2924522828a4f39df6d98cbe1a26fc2
 EBUILD netbeans-dlight-9999_p20110722.ebuild 3586 RMD160 8d830c5190df185b9eda40e3e1312546ca6643e1 SHA1 f939f007b122d5f43f44d30baca1786d6737ed4f SHA256 1e5dc38ca7e2aace73d2c592de29986921f1d7448f3a833f6411d0a42fede19e
-MISC ChangeLog 11348 RMD160 4aa99315871e5dbedb7bd5d7948dff7ba82162be SHA1 9eb2d9091f6d8ebb10118ef9c2e1252dc08fbd54 SHA256 30cd20e99272882200798d959cd59913af3e2604859187302ff8ffd6c0c81f8c
+EBUILD netbeans-dlight-9999_p20110728.ebuild 3586 RMD160 ff593fb6a717e52c078e48d1172039538fb76abf SHA1 84a3aee61efd8d94eabbfce654a755da86d541f2 SHA256 d569b3c70b3754e781bb21bbbbb9b36e09023791e2d4ba9b704b4d6bf9aff899
+MISC ChangeLog 11525 RMD160 d5148fff70b46b64d7da897de74d33a17b82eed3 SHA1 890b2165dd931509ec8c4e849402dd9cfbdde52c SHA256 fffaf4a4a15058904c93fd667753bbf8c3d802813b6bac42a52baede304d499d
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20110728.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20110728.ebuild
new file mode 100644
index 0000000..e55cb95
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20110728.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-07-28_06-00-32/zip/netbeans-trunk-nightly-201107280600-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-build.xml.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-9999-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/F787C9B484CD7526F866C21D8925C4DACE467F8A-derby-10.2.2.0.jar db/external/derby-10.2.2.0.jar || die
+	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-9999-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/dlight >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/dlight$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	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 85ddc14..b5421f8 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_p20110728 (29 Jul 2011)
+
+  29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-enterprise-9999_p20110728.ebuild:
+  Bumped to latest nightly sources
+
   29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
   -netbeans-enterprise-9999_p20110717.ebuild:
   Removed obsolete version

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 6cec33b..71aaae7 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -1,13 +1,22 @@
+DIST 0EE4D36A33681C945339BB1B594F4C0ED9A4C3DE-jersey-multipart-1.8-javadoc.jar 106370 RMD160 af3d6da5831c6473e1bd3b46aa9d03418add10b8 SHA1 0ee4d36a33681c945339bb1b594f4c0ed9a4c3de SHA256 30d78ea34c56be9f07b694b3d1edbfd8d244deca53feb2dd883cda8b34db0f7e
 DIST 123A7BAAE06D938E5E4533ED745EEE7377E73ED8-jersey-spring-1.3-javadoc.jar 55457 RMD160 8376afbec0a8004d5e591f966a2a12157102f15e SHA1 123a7baae06d938e5e4533ed745eee7377e73ed8 SHA256 a66c6f446e5f01e53c9eb7e29bc2092b9627de3e9c964f11b9a6b730d0aa3407
 DIST 16CD40905B389B27AFD81DAFF8F163CEC810FBC6-metro-2.0.zip 15969889 RMD160 c7178a992d303eb3d6eba70a2bdc27d6d19e20e5 SHA1 16cd40905b389b27afd81daff8f163cec810fbc6 SHA256 d2d6d6fb711334657deb1debe4b546a6bee02a2714c2bab5823ad16477833ba4
 DIST 1A48EDCF8DCFC76882C821931EB0529DB9AF5D9B-spring-webmvc-2.5.6.SEC01.jar 402348 RMD160 86c33d4674abbd9c6af22649da7e800eb3335420 SHA1 1a48edcf8dcfc76882c821931eb0529db9af5d9b SHA256 a432fa403f568e02e39effd52f2fe1672155a1c2c6273535d80aeee61ddd9a11
+DIST 1C6E6C4B3DC659E5720AB08E2972C7C0459E5387-oauth-server-1.8-javadoc.jar 88394 RMD160 d165754c4d5599bd6af5ddfbe2185a59b2fd0135 SHA1 1c6e6c4b3dc659e5720ab08e2972c7c0459e5387 SHA256 f8dc91a801462381ae026ceb161e6e6d43467edf239170d2e3023fba26eb1ca5
 DIST 1D74DA79DC71C52D1B7916853BDD51F346A85359-jsf-2.1.zip 2375126 RMD160 3df682860ebf98b2292ba09f51555174bedc8b29 SHA1 1d74da79dc71c52d1b7916853bdd51f346a85359 SHA256 3b545ca0865d5e18be96bc863aa1f1dab9e2fb6047aa96486d8a525090c900c8
+DIST 2503B5FDE71D6BE1CE44BADA3257A6F310E3BB67-jersey-atom-abdera-1.8-javadoc.jar 22852 RMD160 fbebd2d652ff1089ce53ef7ef450aa2e4cb6c136 SHA1 2503b5fde71d6be1ce44bada3257a6f310e3bb67 SHA256 2fc49f57aad57967be0143e2adbcc18473117f55696268985012a1204c750a66
 DIST 2EA8E5BDC70E1B1D738140E52E4793385B2567A3-el-impl.jar 111719 RMD160 c3db8ce1835efe49fb0a7f432ff88286a945d584 SHA1 2ea8e5bdc70e1b1d738140e52e4793385b2567a3 SHA256 61b1c254f1529632d98a9261e0fd50c77e5c2a1c4c53e43cee65cedb279c7703
+DIST 3E5011972CEDE87E5ADCF9A90351A106DAEE2FC2-jersey-guice-1.8-javadoc.jar 60500 RMD160 52a50d5e1dc2d11f9cb12b44d91b8d9933dca7fd SHA1 3e5011972cede87e5adcf9a90351a106daee2fc2 SHA256 9d2cd70d9e75271462ebff7e97332e300e1bc978352eaa236b6bce3c0a365dbf
+DIST 454F67445E0740C3414476812F2DFD17DA2AF0A3-jersey-spring-1.8-javadoc.jar 57058 RMD160 5d94e75f4b086a12047cba70a29ecca6f29d28f2 SHA1 454f67445e0740c3414476812f2dfd17da2af0a3 SHA256 b1b4ec78c584974973103320da4be5579b8a24a106eb52dd098ece6f9138bac7
 DIST 4855C8481C6951F39DC117C44CA8EE70BF2B003F-oauth-signature-1.3-javadoc.jar 77306 RMD160 0372d69b83cdde74c54795ed134a87f07da7b8a1 SHA1 4855c8481c6951f39dc117c44ca8ee70bf2b003f SHA256 bf7cb3a0e9d2e23e1d1aafeeda524953e318b7e2f2e688bef1c5626db68ac9ef
+DIST 4D9B1037036E99811D9E393F191058C9CA30CAE2-jersey-apache-client-1.8-javadoc.jar 72887 RMD160 1af6941404ae733cfc1bb6edd76b96dbca04f5df SHA1 4d9b1037036e99811d9e393f191058c9ca30cae2 SHA256 a18a63d0222bafdc452b067b05b8b43e58732ef0525b94a47a1f1453a2331578
+DIST 6055EAF5B4F778A243B52D2DC4E66CB5F35B3D7C-jersey-1.8-javadoc.jar 2662365 RMD160 46d5649c58142398b694b2e1e4bb4e22aa073092 SHA1 6055eaf5b4f778a243b52d2dc4e66cb5f35b3d7c SHA256 a87b1385a750cd3533be38dc6e1f337ed23f28698a83c7a2184a0ac98b42d3f3
 DIST 6B90A110E1B1503C4623B13D3BB536212F1BF3DB-jsf-2.0.zip 2306840 RMD160 bf0d1361a4aea635dea89786ee399864798c4d5a SHA1 6b90a110e1b1503c4623b13d3bb536212f1bf3db SHA256 102ace4cf39e29dc075f0d144303c849e95fc010e984b287edcaf8318caf0737
 DIST 6E3105315F3100F65D66355B04BA6B6C2B8480D3-jersey-json-1.3-javadoc.jar 89300 RMD160 68e6b9b7fb63e086ce8e1d2801597c89be63dbb3 SHA1 6e3105315f3100f65d66355b04ba6b6c2b8480d3 SHA256 46f4221448d3b3123e27535094f142c7eabe528e6febbd2573cda3bf11c0660b
+DIST 6EC53F24E6F4D9DBC884076FD0190B9C79414070-oauth-signature-1.8-javadoc.jar 79240 RMD160 0673c50ec2810ef72096d403f6a321fcb73bb512 SHA1 6ec53f24e6f4d9dbc884076fd0190b9c79414070 SHA256 bcd0c63a25ea887b5faeb628918173286ab8ecbf5c19ec2947a57bc2643954f1
 DIST 7763236B189D9B910E2BDBA6822E6EB4DDDAC41B-glassfish-jspparser-3.0.jar 628998 RMD160 83eebfcdc65bae7248338a3f32ac0bc958596b9b SHA1 7763236b189d9b910e2bdba6822e6eb4dddac41b SHA256 d430e44351bdb132e2f37a4361b6950a16b9486c82c4434fb43383c3f8cd46a3
 DIST 93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip 1699050 RMD160 d6418501837089078e70ddf864d3b770b134e512 SHA1 93a58e37ba1d014375b1578f3d904736cb2d408f SHA256 ce29ef11b17fe5e36304bca4383af8a4b828902f2da1486509ca909bfb93eab4
+DIST 942DF8FA6174168BD227E925B11672E9A321D5BB-oauth-client-1.8-javadoc.jar 35898 RMD160 537293d66e202342245374a6e22affb6517fbd69 SHA1 942df8fa6174168bd227e925b11672e9a321d5bb SHA256 7144ce6a63e2b7ae37c8f5241b0fef3612e78269a030812d6913749d5b5f6fab
 DIST 955396DB8CE0477C6BD70BA830FF84CB9B7AB47B-jersey-client-1.3-javadoc.jar 373331 RMD160 7982e8784a7168e931f64b70a2178cf0d52bbe16 SHA1 955396db8ce0477c6bd70ba830ff84cb9b7ab47b SHA256 88ac6b76c897fe277d05623f1efd37f717731bb4ff47604a73e3166378d3d6c7
 DIST A27843863A5EAE9DDFF1C70F7A95D3BFC2A59D99-jersey-core-1.1.5.1-javadoc.jar 742909 RMD160 e4425ed0e7c9e7d879516f3f5581fc32cba89177 SHA1 a27843863a5eae9ddff1c70f7a95d3bfc2a59d99 SHA256 aeefffbfac45880d81da06bf72de77e06ecf2faf5ae24e8b93c3cedd9d2b9543
 DIST A3F62096FB53E14CF09B006458333792890CE429-struts-1.3.8-lib.zip 2689401 RMD160 138729cd8d03c08f5979bd26fb3a88f5bbc7459a SHA1 a3f62096fb53e14cf09b006458333792890ce429 SHA256 25dedc70b2119a3af8d270cfb86499fd2b67ba38433ebae9b04c134ae538a3f3
@@ -19,11 +28,13 @@ DIST BAEA0B9171897175B0B3E20BDF532EF4CFD44CEE-oauth-client-1.3-javadoc.jar 22293
 DIST BD6C7BD1452456F2F6B2A8CF6C4166493A24ABED-jersey-1.3.zip 1461064 RMD160 fd195dad0e01d46c135bf797a7d64531a5962d67 SHA1 bd6c7bd1452456f2f6b2a8cf6c4166493a24abed SHA256 846e447d3372d1fdda496ad34aa09b67bae2f98b2a4a338e211f6a9f4baf4a32
 DIST C31A6E33D7D6E77C8123A0830D929187A9707147-primefaces-2.2.1.jar 1718901 RMD160 b87853d778699440e072f6749d3ae8b2b10ac5f2 SHA1 c31a6e33d7d6e77c8123a0830d929187a9707147 SHA256 d286721d64b725a02117a95baadde7c4a9fea46f606891454c4f02beec72e707
 DIST D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar 979616 RMD160 2bbf829b42cf13b118c11c8da43ca99cf96cea4e SHA1 d6f416983ea13c334d5c599a9045414ecaf5d66d SHA256 a045eac0ff80c5c0fd29b680599f27598abff16b1e6c9df46ce962a4e0b1390e
+DIST D77C6E4AA0F3D3C9B7230F6C0991DBBF0CEF39BA-jersey-simple-server-1.8-javadoc.jar 24558 RMD160 85741de16c09842c419456272fb07f4fb1afd6e8 SHA1 d77c6e4aa0f3d3c9b7230f6c0991dbbf0cef39ba SHA256 35b72bd704eed03ff770b0d465c647a53ded7a47df62e5546410ef87973638ba
 DIST D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar 21631 RMD160 92ff3bab42bc2f233fef348dfc2d10fd82ad9bdf SHA1 d813e05a06b587cd0fe36b00442eab03c1431aa9 SHA256 7fc569141b2cb6acb1497db768d3bc0548d3f19823dc753cea512f8125a475b6
 DIST DC9A229C4AB1788D0C20D937A82FB64CE2911171-javaee6-doc-api.zip 7890754 RMD160 a9de20dbe4fb04b5f8d383b4b78f3ac5d71092bc SHA1 dc9a229c4ab1788d0c20d937a82fb64ce2911171 SHA256 8ce5b8e25a498ed461d3a52ebde9b52ca6265c148b871cabae3f0d42a96cc536
 DIST E11C2384FDEAE4F96E433C2A0339DCFC5202CC17-struts-1.3.8-javadoc.zip 4767779 RMD160 04fb50545fdbed47f240bb654f51c21e0078deee SHA1 e11c2384fdeae4f96e433c2a0339dcfc5202cc17 SHA256 17e273817c8352b8834321aefd739e18b45f83a279d383aedd06a7f39dea7516
 DIST EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar 105613 RMD160 5b1b87c7a4525c801ee2dcd643956d4bc0205c3d SHA1 eb77d3664eea27d67b799ed28cb766b4d0971505 SHA256 47a602c750eebebf967031748b85d14c0c19a9a1a80c0cd7d1505eae9d70a6df
 DIST EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar 930427 RMD160 cfb8edab5ce54208a4dfe60c9986170d6f652588 SHA1 ebec44255251e6d3b8ddbaf701f732daf0238cbf SHA256 7f1621299e3e47638571a4fffda5c33bf2b80d6b4cb1cae52e0f6b85d7ac343a
+DIST EEBA5E4DCFB946A8E9CAAF1AC405620E28710BEE-jersey-1.8.zip 2337913 RMD160 f5d41963681a325882ef768bf3351f35f5666ef5 SHA1 eeba5e4dcfb946a8e9caaf1ac405620e28710bee SHA256 23dfe66c5aab7a095737550a212c06c50ba7a99e1d3f6a793b63c721ed5fc057
 DIST F10ED4F2ECC7724F7C25D586DC9F25377581CCFC-jersey-multipart-1.3-javadoc.jar 104495 RMD160 50199191918fc2cbe6361cbfaa3e7cd7b7d3dbe4 SHA1 f10ed4f2ecc7724f7c25d586dc9f25377581ccfc SHA256 c672f5aaeeee09c0013e36e402b136dce10ee7caaa0a600763d168ec89535098
 DIST F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip 57110 RMD160 a2c0dea9c0f7b4eb487889b3ec3a5114ae188a5c SHA1 f6e990df59bd1fd2058320002a853a5411a45cd4 SHA256 fd191029e59405a3eedfeed81cfc0aab4e4f44c3d7ff39417a1975cedf12866a
 DIST FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip 5025064 RMD160 e8d39c939b6eec86e13cc5fef983cfec6cdcae1e SHA1 fdecfb78184c7d19e7e20130a7d7e88c1df0bdd1 SHA256 7233497b97430016cd84dfcea79907c5c00f44fff09d448070d2b9799aea4592
@@ -32,7 +43,9 @@ DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
 DIST netbeans-trunk-nightly-201107220600-src.zip 173109164 RMD160 4529b4f9d6d42e53bd84e9ec3d0b7faed68490d0 SHA1 442a996bc1da147252cd75338b74e31dc5f632e0 SHA256 6d488db0c59aaa952f6b72b77a095d6354b8030d651788773639d965b6b65c8a
+DIST netbeans-trunk-nightly-201107280600-src.zip 173413435 RMD160 86b59d8b2fa15be0541e255fe0c1f3ab42603462 SHA1 156f011fddbf7f7659fb27f1a59700ef891c5d7e SHA256 7b77df1988a1423960dc6242b8b4e384918950ba6d4d0e6c0c7dcec4731292c4
 EBUILD netbeans-enterprise-7.0.ebuild 16273 RMD160 ebde1e873534cf5fff103587cbd10ed1008c589b SHA1 b01f2649b7f91eb343f8792f52698c979c8c2291 SHA256 a61703db2126074c0dd6fd15fbfe1a206669eeaa67a968d9ff890365982d0dad
 EBUILD netbeans-enterprise-9999_p20110722.ebuild 16300 RMD160 4afcbdd78a02b17a7f02d26b00d25a9fc2b2edbd SHA1 5dfb26eb9eab75e299cb086a3c9a9065d0c2d1c2 SHA256 cd98acbe201b7f5bb4cbe7f7a9b2b0b94ceb558af744a85fc3488330dae60b58
-MISC ChangeLog 12222 RMD160 ffa962dbe817ebd4056a4ef07db4cdfa7315fee4 SHA1 350650814ae90349e043a3341c7c16187dc2370a SHA256 3c58fcfd7f05f7817bce5a8bbc99484a04ecd2fd31bee72122f73da7191f68e5
+EBUILD netbeans-enterprise-9999_p20110728.ebuild 17866 RMD160 6e669b09615aa46e0437be963d29d19e22f1d9e7 SHA1 05b13a176ad46015937a55d816f1b2c5e4e08076 SHA256 062fe3d8ca0d989599a19ab51a3b80f687f334bbcf13d22d8dbc1eeb83c7caa3
+MISC ChangeLog 12407 RMD160 72d7e235bec1271054db1c739363f5a01e446b7f SHA1 f0da585cba8b2c13050d685c932e440d6f320c68 SHA256 fa7158c698e034e13165ea613ca7998d9306d6e61de79ae1a5cfdfb400189f58
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20110728.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20110728.ebuild
new file mode 100644
index 0000000..509af8c
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20110728.ebuild
@@ -0,0 +1,316 @@
+# 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-07-28_06-00-32/zip/netbeans-trunk-nightly-201107280600-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-build.xml.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/EEBA5E4DCFB946A8E9CAAF1AC405620E28710BEE-jersey-1.8.zip
+	http://hg.netbeans.org/binaries/6055EAF5B4F778A243B52D2DC4E66CB5F35B3D7C-jersey-1.8-javadoc.jar
+	http://hg.netbeans.org/binaries/4D9B1037036E99811D9E393F191058C9CA30CAE2-jersey-apache-client-1.8-javadoc.jar
+	http://hg.netbeans.org/binaries/2503B5FDE71D6BE1CE44BADA3257A6F310E3BB67-jersey-atom-abdera-1.8-javadoc.jar
+	http://hg.netbeans.org/binaries/955396DB8CE0477C6BD70BA830FF84CB9B7AB47B-jersey-client-1.3-javadoc.jar
+	http://hg.netbeans.org/binaries/A27843863A5EAE9DDFF1C70F7A95D3BFC2A59D99-jersey-core-1.1.5.1-javadoc.jar
+	http://hg.netbeans.org/binaries/3E5011972CEDE87E5ADCF9A90351A106DAEE2FC2-jersey-guice-1.8-javadoc.jar
+	http://hg.netbeans.org/binaries/6E3105315F3100F65D66355B04BA6B6C2B8480D3-jersey-json-1.3-javadoc.jar
+	http://hg.netbeans.org/binaries/0EE4D36A33681C945339BB1B594F4C0ED9A4C3DE-jersey-multipart-1.8-javadoc.jar
+	http://hg.netbeans.org/binaries/D77C6E4AA0F3D3C9B7230F6C0991DBBF0CEF39BA-jersey-simple-server-1.8-javadoc.jar
+	http://hg.netbeans.org/binaries/454F67445E0740C3414476812F2DFD17DA2AF0A3-jersey-spring-1.8-javadoc.jar
+	http://hg.netbeans.org/binaries/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip
+	http://hg.netbeans.org/binaries/1D74DA79DC71C52D1B7916853BDD51F346A85359-jsf-2.1.zip
+	http://hg.netbeans.org/binaries/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip
+	http://hg.netbeans.org/binaries/FFE3425E304F0836912D2B8ABFB5302100B39423-jsr311-api-1.1.1-javadoc.jar
+	http://hg.netbeans.org/binaries/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip
+	http://hg.netbeans.org/binaries/16CD40905B389B27AFD81DAFF8F163CEC810FBC6-metro-2.0.zip
+	http://hg.netbeans.org/binaries/942DF8FA6174168BD227E925B11672E9A321D5BB-oauth-client-1.8-javadoc.jar
+	http://hg.netbeans.org/binaries/1C6E6C4B3DC659E5720AB08E2972C7C0459E5387-oauth-server-1.8-javadoc.jar
+	http://hg.netbeans.org/binaries/6EC53F24E6F4D9DBC884076FD0190B9C79414070-oauth-signature-1.8-javadoc.jar
+	http://hg.netbeans.org/binaries/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-9999-build.xml.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}"/EEBA5E4DCFB946A8E9CAAF1AC405620E28710BEE-jersey-1.8.zip websvc.restlib/external/jersey-1.8.zip || die
+	ln -s "${DISTDIR}"/6055EAF5B4F778A243B52D2DC4E66CB5F35B3D7C-jersey-1.8-javadoc.jar websvc.restlib/external/jersey-1.8-javadoc.jar || die
+	ln -s "${DISTDIR}"/4D9B1037036E99811D9E393F191058C9CA30CAE2-jersey-apache-client-1.8-javadoc.jar websvc.restlib/external/jersey-apache-client-1.8-javadoc.jar || die
+	ln -s "${DISTDIR}"/2503B5FDE71D6BE1CE44BADA3257A6F310E3BB67-jersey-atom-abdera-1.8-javadoc.jar websvc.restlib/external/jersey-atom-abdera-1.8-javadoc.jar || die
+	ln -s "${DISTDIR}"/955396DB8CE0477C6BD70BA830FF84CB9B7AB47B-jersey-client-1.3-javadoc.jar websvc.restlib/external/jersey-client-1.3-javadoc.jar || die
+	ln -s "${DISTDIR}"/A27843863A5EAE9DDFF1C70F7A95D3BFC2A59D99-jersey-core-1.1.5.1-javadoc.jar websvc.restlib/external/jersey-core-1.1.5.1-javadoc.jar || die
+	ln -s "${DISTDIR}"/3E5011972CEDE87E5ADCF9A90351A106DAEE2FC2-jersey-guice-1.8-javadoc.jar websvc.restlib/external/jersey-guice-1.8-javadoc.jar || die
+	ln -s "${DISTDIR}"/6E3105315F3100F65D66355B04BA6B6C2B8480D3-jersey-json-1.3-javadoc.jar websvc.restlib/external/jersey-json-1.3-javadoc.jar || die
+	ln -s "${DISTDIR}"/0EE4D36A33681C945339BB1B594F4C0ED9A4C3DE-jersey-multipart-1.8-javadoc.jar websvc.restlib/external/jersey-multipart-1.8-javadoc.jar || die
+	ln -s "${DISTDIR}"/D77C6E4AA0F3D3C9B7230F6C0991DBBF0CEF39BA-jersey-simple-server-1.8-javadoc.jar websvc.restlib/external/jersey-simple-server-1.8-javadoc.jar || die
+	ln -s "${DISTDIR}"/454F67445E0740C3414476812F2DFD17DA2AF0A3-jersey-spring-1.8-javadoc.jar websvc.restlib/external/jersey-spring-1.8-javadoc.jar || die
+	ln -s "${DISTDIR}"/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip web.jsf12/external/jsf-1.2.zip || die
+	ln -s "${DISTDIR}"/1D74DA79DC71C52D1B7916853BDD51F346A85359-jsf-2.1.zip web.jsf20/external/jsf-2.1.zip || die
+	ln -s "${DISTDIR}"/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip web.jsf.editor/external/jsf-api-docs.zip || die
+	ln -s "${DISTDIR}"/FFE3425E304F0836912D2B8ABFB5302100B39423-jsr311-api-1.1.1-javadoc.jar websvc.restlib/external/jsr311-api-1.1.1-javadoc.jar || die
+	ln -s "${DISTDIR}"/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip websvc.metro.lib/external/metro-1.4-doc.zip || die
+	ln -s "${DISTDIR}"/16CD40905B389B27AFD81DAFF8F163CEC810FBC6-metro-2.0.zip websvc.metro.lib/external/metro-2.0.zip || die
+	ln -s "${DISTDIR}"/942DF8FA6174168BD227E925B11672E9A321D5BB-oauth-client-1.8-javadoc.jar websvc.restlib/external/oauth-client-1.8-javadoc.jar || die
+	ln -s "${DISTDIR}"/1C6E6C4B3DC659E5720AB08E2972C7C0459E5387-oauth-server-1.8-javadoc.jar websvc.restlib/external/oauth-server-1.8-javadoc.jar || die
+	ln -s "${DISTDIR}"/6EC53F24E6F4D9DBC884076FD0190B9C79414070-oauth-signature-1.8-javadoc.jar websvc.restlib/external/oauth-signature-1.8-javadoc.jar || die
+	ln -s "${DISTDIR}"/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-9999-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into j2eeapis/external glassfish-deployment-api-1.2 glassfish-deployment-api.jar jsr88javax.jar
+	java-pkg_jar-from --into libs.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_1
+	pushd "${D}"/${instdir} >/dev/null || die
+	# jsf-api.jar
+	# jsf-impl.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/metro
+	pushd "${D}"/${instdir} >/dev/null || die
+	# webservices-api.jar
+	# webservices-extra-api.jar
+	# webservices-extra.jar
+	# webservices-rt.jar
+	# webservices-tools.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/primefaces
+	pushd "${D}"/${instdir} >/dev/null || die
+	# primefaces-2.1.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/rest
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm asm-3.1.jar && dosym /usr/share/asm-3/lib/asm.jar ${instdir}/asm-3.1.jar || die
+	# jackson-core-asl-1.1.1.jar
+	# jersey-client-1.3.jar
+	# jersey-core-1.3.jar
+	# jersey-json-1.3.jar
+	# jersey-multipart-1.3.jar
+	# jersey-server-1.3.jar
+	# jersey-spring-1.3.jar
+	rm jettison-1.1.jar && dosym /usr/share/jettison/lib/jettison.jar ${instdir}/jettison-1.1.jar || die
+	rm jsr311-api-1.1.1.jar && dosym /usr/share/jsr311-api/lib/jsr311-api.jar ${instdir}/jsr311-api-1.1.1.jar || die
+	# mimepull-1.4.jar
+	# oauth-client-1.3.jar
+	# oauth-signature-1.3.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/spring
+	pushd "${D}"/${instdir} >/dev/null || die
+	# spring-webmvc-2.5.6.SEC01.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/struts
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm antlr-2.7.2.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.2.jar || die
+	rm bsf-2.3.0.jar && dosym /usr/share/bsf-2.3/lib/bsf.jar ${instdir}/bsf-2.3.0.jar || die
+	rm commons-beanutils-1.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 46ce3cc..c3da582 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_p20110728 (29 Jul 2011)
+
+  29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-ergonomics-9999_p20110728.ebuild:
+  Bumped to latest nightly sources
+
   29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
   -netbeans-ergonomics-9999_p20110717.ebuild:
   Removed obsolete version

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index d39019b..3aca16c 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -2,7 +2,9 @@ DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
 DIST netbeans-trunk-nightly-201107220600-src.zip 173109164 RMD160 4529b4f9d6d42e53bd84e9ec3d0b7faed68490d0 SHA1 442a996bc1da147252cd75338b74e31dc5f632e0 SHA256 6d488db0c59aaa952f6b72b77a095d6354b8030d651788773639d965b6b65c8a
+DIST netbeans-trunk-nightly-201107280600-src.zip 173413435 RMD160 86b59d8b2fa15be0541e255fe0c1f3ab42603462 SHA1 156f011fddbf7f7659fb27f1a59700ef891c5d7e SHA256 7b77df1988a1423960dc6242b8b4e384918950ba6d4d0e6c0c7dcec4731292c4
 EBUILD netbeans-ergonomics-7.0.ebuild 2819 RMD160 d172b98e26198c64216664ad15e6cecf961b715f SHA1 20e241c008108f9153543df8befd604c52fcfe51 SHA256 4dfe2b8676375de86cc24c97216ba88385abf7a817f451676ffa63230ca23da6
 EBUILD netbeans-ergonomics-9999_p20110722.ebuild 2846 RMD160 c1fc5037081893de0cf863499f7f2ba72b730f35 SHA1 b1677d4fe34bc465faa4791f44f0feed08b134ba SHA256 b6d133fcb78cad55da187554fc19e325fad382526c9326946db1ebfb97fb8414
-MISC ChangeLog 11844 RMD160 de342450121375af34a658e0d7fde0df6d806bb8 SHA1 7e4a8f5ebbf2fce190df54d03108372a1b34d25e SHA256 3ecfd9dc32a6243299d18868eae3b17dd3bb520273296e0e36d6086b6befe915
+EBUILD netbeans-ergonomics-9999_p20110728.ebuild 2846 RMD160 68200fa24489593384efe2e9e4848c1c64846b94 SHA1 22c4f3f7b7ff09a11d8a0019134ee7ac35d1c107 SHA256 a8ae847627ecdd1d8bb4db02d70e8dcd373b01822f0cb162ac76f17a1903f336
+MISC ChangeLog 12029 RMD160 495cc0430441e23f751dbc573cb84d2ed9ff9def SHA1 57644937f5c709563a85b7076d9cd67047524707 SHA256 1c880a3a81d1fece27b63a1294e5fd0c53c1901a8140b34d54e8d5ab989dc52e
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20110728.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20110728.ebuild
new file mode 100644
index 0000000..786be35
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20110728.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-07-28_06-00-32/zip/netbeans-trunk-nightly-201107280600-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-nb-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ergonomics -Dext.binaries.downloaded=true"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-nb-${SLOT}/nb nb || die
+	cat /usr/share/netbeans-nb-${SLOT}/nb/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.nb.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/ergonomics >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/ergonomics$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ergonomics
+}

diff --git a/dev-java/netbeans-groovy/ChangeLog b/dev-java/netbeans-groovy/ChangeLog
index a6b85c7..981b3f2 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_p20110728 (29 Jul 2011)
+
+  29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-groovy-9999_p20110728.ebuild:
+  Bumped to latest nightly sources
+
   29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
   -netbeans-groovy-9999_p20110717.ebuild:
   Removed obsolete version

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index e725771..50af4f9 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -3,7 +3,9 @@ DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
 DIST netbeans-trunk-nightly-201107220600-src.zip 173109164 RMD160 4529b4f9d6d42e53bd84e9ec3d0b7faed68490d0 SHA1 442a996bc1da147252cd75338b74e31dc5f632e0 SHA256 6d488db0c59aaa952f6b72b77a095d6354b8030d651788773639d965b6b65c8a
+DIST netbeans-trunk-nightly-201107280600-src.zip 173413435 RMD160 86b59d8b2fa15be0541e255fe0c1f3ab42603462 SHA1 156f011fddbf7f7659fb27f1a59700ef891c5d7e SHA256 7b77df1988a1423960dc6242b8b4e384918950ba6d4d0e6c0c7dcec4731292c4
 EBUILD netbeans-groovy-7.0.ebuild 3231 RMD160 44e744c51e4c45ce60cff46b1500a9dbf1bdcc03 SHA1 7e454ff58ed94993fd412faa564373b27163d431 SHA256 929ebdedccba38fd75f47200b4d94b52f662bcceb82c4321661a64259d3c39d1
 EBUILD netbeans-groovy-9999_p20110722.ebuild 3258 RMD160 c156bca1e1a61f7e78f0962ea3966edb69323eb4 SHA1 dc3e001b947e496889121de4d82426db171ea578 SHA256 38e1a486438510546ca20e01b4b2f0e4780c07751a8ad699aec3770836d3bfba
-MISC ChangeLog 11348 RMD160 beda59afb1e2226074183821ac5b084c57c301aa SHA1 d2bfca7419b7ec3256f54a6a8452193866db8ed3 SHA256 85ee18de387a8d77b0482d5310cdbb036436493142879c4366139d9b6dc22aff
+EBUILD netbeans-groovy-9999_p20110728.ebuild 3258 RMD160 57f29c88b25e69c053bc1c98c11d6bdb69a419e9 SHA1 7c55117ce37ee77a27153fe2ec755545428a5331 SHA256 6d3a3754fe80b14bb4908fc8573f781200c3793a1841fb2eb6ab4fc63c9dc4c8
+MISC ChangeLog 11525 RMD160 3c6a601af6f2155a8c31e7a9bd8ed041061054cb SHA1 90b688a7b4c22eb969a1e55be275f4e332102348 SHA256 054dc4f4d4a4c96314b376e9db6e500ae2ccb291d880f3524958f550118040c4
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

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

diff --git a/dev-java/netbeans-harness/ChangeLog b/dev-java/netbeans-harness/ChangeLog
index bf86e76..64bf097 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_p20110728 (29 Jul 2011)
+
+  29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-harness-9999_p20110728.ebuild:
+  Bumped to latest nightly sources
+
   29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
   -netbeans-harness-9999_p20110717.ebuild:
   Removed obsolete version

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 52b21a3..cff857e 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -4,7 +4,9 @@ DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
 DIST netbeans-trunk-nightly-201107220600-src.zip 173109164 RMD160 4529b4f9d6d42e53bd84e9ec3d0b7faed68490d0 SHA1 442a996bc1da147252cd75338b74e31dc5f632e0 SHA256 6d488db0c59aaa952f6b72b77a095d6354b8030d651788773639d965b6b65c8a
+DIST netbeans-trunk-nightly-201107280600-src.zip 173413435 RMD160 86b59d8b2fa15be0541e255fe0c1f3ab42603462 SHA1 156f011fddbf7f7659fb27f1a59700ef891c5d7e SHA256 7b77df1988a1423960dc6242b8b4e384918950ba6d4d0e6c0c7dcec4731292c4
 EBUILD netbeans-harness-7.0.ebuild 3514 RMD160 6e4f7ca5e957c6d1dc7da80e132f1c51d6a10ba8 SHA1 b3b481e1bdf452d7afc475388d012330192b03be SHA256 ffe81227e5ac910ab4f13b092fa60b6486602809b983c8b55941c85dec1fc7cc
 EBUILD netbeans-harness-9999_p20110722.ebuild 3541 RMD160 b677cc1c0e34da8862f57485a7a197583022c210 SHA1 50197d7da8a0203242201f478a0853ff9ad9bce5 SHA256 06d65e1d16227fb9f732ad35d00b66e49beb7cd1d126dcf993adcdfac7951c82
-MISC ChangeLog 11472 RMD160 d38196d5d29a3eb893361df8c6ff5fad33c1bb94 SHA1 e31b7e0d371a7b1662476b28cfaf839fd2f51210 SHA256 7e392cd9ea248623e221cb6e7d9d490bd3f66936fe8a0ef6ad2b44cc9c784cbb
+EBUILD netbeans-harness-9999_p20110728.ebuild 3541 RMD160 ed7a7260993662d3c7d4102ddb8c6a61a9fbb2d3 SHA1 cca90b242d1bca1ace084031d69600f6b703862e SHA256 3858196fb772f72fd2dbda3973cc2063742fff2bb03a32432ae1cf1d4ab87810
+MISC ChangeLog 11651 RMD160 12d7491955cb9577f347edbefed18636349a1d34 SHA1 14d7a348605a0d48b1b7a77b341819dca1d4d6af SHA256 83448a903b017c9da50ad60d9e25c54a8e6b9e41618861243523b3a871870078
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20110728.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20110728.ebuild
new file mode 100644
index 0000000..739eb45
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20110728.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-07-28_06-00-32/zip/netbeans-trunk-nightly-201107280600-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
+	http://hg.netbeans.org/binaries/418FC62C8A6EF5311987B01FE389B1F88EFDDCA2-jemmy-2.3.0.0.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	dev-java/javahelp:0"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}
+	>=dev-java/junit-4.4:4"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.harness -Dext.binaries.downloaded=true"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar apisupport.harness/external/bindex-2.2.jar || die
+	ln -s "${DISTDIR}"/418FC62C8A6EF5311987B01FE389B1F88EFDDCA2-jemmy-2.3.0.0.jar jemmy/external/jemmy-2.3.0.0.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into apisupport.harness/external javahelp jsearch.jar jsearch-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.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 0f0cdd9..7d29b2f 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_p20110728 (29 Jul 2011)
+
+  29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-ide-9999_p20110728.ebuild:
+  Bumped to latest nightly sources
+
   29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
   -netbeans-ide-9999_p20110717.ebuild:
   Removed obsolete version

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index ba56e6a..3ca124a 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -30,6 +30,7 @@ DIST A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar 190101 RMD160 dde1
 DIST AB271CFC19469D9088BE306685A7AC8787373F99-svnkit-javahl.jar 108278 RMD160 f2e20aca47db9fea33c1849ba3c518b0faa1f393 SHA1 ab271cfc19469d9088be306685a7ac8787373f99 SHA256 0d7da46bfa2dd5d4daf2eebb086082915d73e6a1dab9c17885b2b30600a20b53
 DIST B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar 90859 RMD160 cde382392df3dbf58a2c9dcac4b85e8c06b67f31 SHA1 b0d0fcbac68826d2afa3c7c89fc4d57b95a000c3 SHA256 b3b421fd586c67e0c7f04b879ad527a8a295de222392ded6e68c62b9af669d11
 DIST BCF23B1D858C6F69D67C851D497984D25345D0B1-jaxb-api.jar 104172 RMD160 70595eb5dd26ecf5e506fd08bec91584a5c774d5 SHA1 bcf23b1d858c6f69d67c851d497984d25345d0b1 SHA256 34c022696b577e984d42641428e6e49a8afa0257c4ec96feff36e4b67c093390
+DIST BDFC25B87D1A034FACBC13133406BAB416814525-antlr3.3-runtime.jar 177185 RMD160 412a1970462e9a80c59c6426e83095c6b0203622 SHA1 bdfc25b87d1a034facbc13133406bab416814525 SHA256 30965a74b3409b235d9cb105115030badd2f872301fb8b50d6fc9e265ff69041
 DIST C0C5653D2200F2BD2E834B26DFDBC830D07FA0F4-jing.jar 625400 RMD160 0d0a0a7fb80b85503ce85dee4ac302e804e7a6ed SHA1 c0c5653d2200f2bd2e834b26dfdbc830d07fa0f4 SHA256 7f71ade91cb8e0c503ac334a1b76143d94a266f87cf1621991ec9b133f90f2bd
 DIST C56F4F5C42102A67F56EB8F12D0219E92E5307C2-sdocs.zip 348661 RMD160 0c0618080d909af181cca9f5b7e3632b9bacd6c1 SHA1 c56f4f5c42102a67f56eb8f12d0219e92e5307c2 SHA256 3db0a5869f40fe897b05ff7f9bd6889a25a4390584c6ab9ad58d00417c862155
 DIST C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar 18627 RMD160 b32245bfbf94e120190260a952f7eb706f98f261 SHA1 c9757efb2cfba523a7375a78fa9ecfaf0d0ac505 SHA256 a8fdf6cc2afb7e11c7ddc28cc8e7242e7678c65186a78429b81a0bffec9a200f
@@ -46,7 +47,9 @@ DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
 DIST netbeans-trunk-nightly-201107220600-src.zip 173109164 RMD160 4529b4f9d6d42e53bd84e9ec3d0b7faed68490d0 SHA1 442a996bc1da147252cd75338b74e31dc5f632e0 SHA256 6d488db0c59aaa952f6b72b77a095d6354b8030d651788773639d965b6b65c8a
+DIST netbeans-trunk-nightly-201107280600-src.zip 173413435 RMD160 86b59d8b2fa15be0541e255fe0c1f3ab42603462 SHA1 156f011fddbf7f7659fb27f1a59700ef891c5d7e SHA256 7b77df1988a1423960dc6242b8b4e384918950ba6d4d0e6c0c7dcec4731292c4
 EBUILD netbeans-ide-7.0.ebuild 22224 RMD160 8b4392edbe15388f879765aaca4ca9c239b7ae5b SHA1 2f7d23f6be8a7abd4ce4eb5c2e70a0720dceb25b SHA256 1eb2490e3e8a700fbe81eef8dbb323e77687d67bd92683c1128cee43e4c0a99c
 EBUILD netbeans-ide-9999_p20110722.ebuild 22462 RMD160 ec719dba31a7e4bd0c6b6f6cd946b3dee2168a78 SHA1 03704fd3f27caac45d53a5a686b0debb9476d8c0 SHA256 37daae1e611adf435978112a9e97b593e3d63a887661f64ef7b77951bbb4ab81
-MISC ChangeLog 11262 RMD160 ca656b553184dacaedf02bce88b7992e34bc0172 SHA1 5019c69235b921693101651001fce7c714331b1c SHA256 904934ce26aa79b41ab0eb391677d3c406934af46e91b4258c60bc8181534961
+EBUILD netbeans-ide-9999_p20110728.ebuild 22768 RMD160 d03bfe83a989b615531f9dc8c0d8016323a53605 SHA1 bc39899b666704ff5c03c76cc39d0ba0bdbea80d SHA256 27f344b4d92cf9bcd404d9bbc9e03d09e793261e9afb3fa815b692b57308dfdf
+MISC ChangeLog 11433 RMD160 bbaf25814f48e72eb1de416ffc640dfefa86cb25 SHA1 b24f0e9edf3a3e7f4a5410d8cdcedb2fb1cd2ca3 SHA256 173404ab35630fd8546b26fc22482a4ffe95b7f667757fc0a670985bae5c2228
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20110728.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20110728.ebuild
new file mode 100644
index 0000000..07a8f8d
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20110728.ebuild
@@ -0,0 +1,361 @@
+# 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-07-28_06-00-32/zip/netbeans-trunk-nightly-201107280600-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/BDFC25B87D1A034FACBC13133406BAB416814525-antlr3.3-runtime.jar
+	http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
+	http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip
+	http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip
+	http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
+	http://hg.netbeans.org/binaries/77DB1AFF3C0730C144D30C9935A1CD8DCD2488A9-html5-datatypes.jar
+	http://hg.netbeans.org/binaries/4388C34B9F085A42FBEA06C5B00FDF0A251171EC-html5doc.zip
+	http://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar
+	http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar
+	http://hg.netbeans.org/binaries/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar
+	http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar
+	http://hg.netbeans.org/binaries/FACC6D84B0B0A650B1D44FED941E9ADD9F326862-isorelax20041111.jar
+	http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip
+	http://hg.netbeans.org/binaries/BCF23B1D858C6F69D67C851D497984D25345D0B1-jaxb-api.jar
+	http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip
+	http://hg.netbeans.org/binaries/2EC69BD69B66B0DABEA392DE713A11F975001760-jaxb-impl.jar
+	http://hg.netbeans.org/binaries/64D468922B85A9626178AEDF564FFDBDE980B3EC-jaxb-xjc.jar
+	http://hg.netbeans.org/binaries/F02664A059617D060BEC3EBA0BC002B2102AEB84-jaxb1-impl.jar
+	http://hg.netbeans.org/binaries/C0C5653D2200F2BD2E834B26DFDBC830D07FA0F4-jing.jar
+	http://hg.netbeans.org/binaries/71F7D2D5A3CF17CECBD15049A856BC0245C95C56-js.jar
+	http://hg.netbeans.org/binaries/098B14300B35E1053AA9945FF2C1CDA164F43B33-js-domstubs.zip
+	http://hg.netbeans.org/binaries/5756AA27E54A3EC6C8CDAE32F49BCA7BC139EB15-jsstubs.zip
+	http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
+	http://hg.netbeans.org/binaries/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-9999-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/BDFC25B87D1A034FACBC13133406BAB416814525-antlr3.3-runtime.jar css.lib/external/antlr3.3-runtime.jar || 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}"/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip derby/external/derbysampledb.zip || die
+	ln -s "${DISTDIR}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || die
+	ln -s "${DISTDIR}"/77DB1AFF3C0730C144D30C9935A1CD8DCD2488A9-html5-datatypes.jar html.validation/external/html5-datatypes.jar || die
+	ln -s "${DISTDIR}"/4388C34B9F085A42FBEA06C5B00FDF0A251171EC-html5doc.zip html.parser/external/html5doc.zip || die
+	ln -s "${DISTDIR}"/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar html.parser/external/htmlparser-1.2.1.jar || die
+	ln -s "${DISTDIR}"/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar libs.ini4j/external/ini4j-0.5.1.jar || die
+	ln -s "${DISTDIR}"/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar html.validation/external/io-xml-util.jar || die
+	ln -s "${DISTDIR}"/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar html.validation/external/iri.jar || die
+	ln -s "${DISTDIR}"/FACC6D84B0B0A650B1D44FED941E9ADD9F326862-isorelax20041111.jar html.validation/external/isorelax20041111.jar || die
+	ln -s "${DISTDIR}"/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip spellchecker.dictionary_en/external/ispell-enwl-3.1.20.zip || die
+	ln -s "${DISTDIR}"/BCF23B1D858C6F69D67C851D497984D25345D0B1-jaxb-api.jar xml.jaxb.api/external/jaxb-api.jar || die
+	ln -s "${DISTDIR}"/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip libs.jaxb/external/jaxb-api-doc.zip || die
+	ln -s "${DISTDIR}"/2EC69BD69B66B0DABEA392DE713A11F975001760-jaxb-impl.jar libs.jaxb/external/jaxb-impl.jar || die
+	ln -s "${DISTDIR}"/64D468922B85A9626178AEDF564FFDBDE980B3EC-jaxb-xjc.jar libs.jaxb/external/jaxb-xjc.jar || die
+	ln -s "${DISTDIR}"/F02664A059617D060BEC3EBA0BC002B2102AEB84-jaxb1-impl.jar libs.jaxb/external/jaxb1-impl.jar || die
+	ln -s "${DISTDIR}"/C0C5653D2200F2BD2E834B26DFDBC830D07FA0F4-jing.jar html.validation/external/jing.jar || die
+	ln -s "${DISTDIR}"/71F7D2D5A3CF17CECBD15049A856BC0245C95C56-js.jar html.validation/external/js.jar || die
+	ln -s "${DISTDIR}"/098B14300B35E1053AA9945FF2C1CDA164F43B33-js-domstubs.zip javascript.editing/external/js-domstubs.zip || die
+	ln -s "${DISTDIR}"/5756AA27E54A3EC6C8CDAE32F49BCA7BC139EB15-jsstubs.zip javascript.editing/external/jsstubs.zip || die
+	ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.destroy/external/libpam4j-1.1.jar || die
+	ln -s "${DISTDIR}"/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-9999-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	popd >/dev/null || die
+
+	#java-pkg_jar-from --into css.lib/external antlr-3 antlr3.jar antlr3.3-runtime.jar
+	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.44.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.44.jar && dosym /usr/share/jsch//lib/jsch.jar ${instdir}/jsch-0.1.44.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 a51da9a..b6d295d 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_p20110728 (29 Jul 2011)
+
+  29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-java-9999_p20110728.ebuild:
+  Bumped to latest nightly sources
+
   29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
   -netbeans-java-9999_p20110717.ebuild:
   Removed obsolete version

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index bc95b27..4641809 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -30,7 +30,9 @@ DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
 DIST netbeans-trunk-nightly-201107220600-src.zip 173109164 RMD160 4529b4f9d6d42e53bd84e9ec3d0b7faed68490d0 SHA1 442a996bc1da147252cd75338b74e31dc5f632e0 SHA256 6d488db0c59aaa952f6b72b77a095d6354b8030d651788773639d965b6b65c8a
+DIST netbeans-trunk-nightly-201107280600-src.zip 173413435 RMD160 86b59d8b2fa15be0541e255fe0c1f3ab42603462 SHA1 156f011fddbf7f7659fb27f1a59700ef891c5d7e SHA256 7b77df1988a1423960dc6242b8b4e384918950ba6d4d0e6c0c7dcec4731292c4
 EBUILD netbeans-java-7.0.ebuild 14895 RMD160 9b2dd800c4901f781eddbba280770d09466e0aea SHA1 84b870b767ad5618b1088762d12c40fdb8df7ba5 SHA256 110ae71dfd837ccc1db3aa0003097576ec88df62203353daeb7db5d551a92b4b
 EBUILD netbeans-java-9999_p20110722.ebuild 14388 RMD160 a5b554acc39bfa1a03879cf13e5bc08fc611ce48 SHA1 ab9114621655574762d9c1812d789effca568c6e SHA256 df949d36d59da92cfb86453fb051feb2a8f819f1fc07768d012dbe7bbd4adb50
-MISC ChangeLog 11510 RMD160 ab2de385ce59db465b8c48340db2fac750e073d1 SHA1 9f8f819eba2db89a6437bbf0d0645e5fac2595bd SHA256 b1be8ca8058ccedf5a8d9ded6d4dc0895914c0d82e69bc06148f96e1d7439fbb
+EBUILD netbeans-java-9999_p20110728.ebuild 14388 RMD160 31d4ef803c14da15c17a7518c0191dae7935d9b8 SHA1 dedcf745e9b5836b3eab661f7a1b7e8c112b3188 SHA256 519b15fa63273925b8feab00351e50cac7d202cf7f601c546c83dbfed9340665
+MISC ChangeLog 11683 RMD160 3865b441be2e4c0a2435da86e5591202fba1561c SHA1 c893e88ce7948266b0eeba00b6d581c12b3f7dff SHA256 ec07bf95218805ab9aac924f79c628ab93bf2721df928f986d0830686153e946
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20110728.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20110728.ebuild
new file mode 100644
index 0000000..253c3ed
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20110728.ebuild
@@ -0,0 +1,298 @@
+# 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-07-28_06-00-32/zip/netbeans-trunk-nightly-201107280600-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-build.xml.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/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip
+	http://hg.netbeans.org/binaries/1E4BAF3553AE5691E81647D30ABE8FFFC250B59E-eclipselink-2.3.0.jar
+	http://hg.netbeans.org/binaries/E9DCFD351C4A7EB6C172612C987752F715BF2E6B-eclipselink-jpa-modelgen-2.3.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/89BFCE12CA01C7518739B5AC2C22A220B6B5510E-indexer-artifact-4.1.1.jar
+	http://hg.netbeans.org/binaries/D1B67FE60F2FDD654FDAE0A84B300DDB72CBC209-indexer-core-4.1.1.jar
+	http://hg.netbeans.org/binaries/ADD5DE96BF7F30DAA4EC41D70610CF72A16F58FD-javac-api-nb-7.0-b07.jar
+	http://hg.netbeans.org/binaries/8FB21F7AAC2DEB6215D71F00DCE1FAE9107643A9-javac-impl-nb-7.0-b07.jar
+	http://hg.netbeans.org/binaries/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-javax.persistence-2.0.jar
+	http://hg.netbeans.org/binaries/2F43A634A42CC4FD2EF9E24B488AFFD6984D3411-jaxws-2.2.zip
+	http://hg.netbeans.org/binaries/23E69F0F17757673C573EBD9899727B82EF7DB7F-jaxws-2.2-api.zip
+	http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip
+	http://hg.netbeans.org/binaries/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar
+	http://hg.netbeans.org/binaries/9B2ACF67C1DADE48B9FDFC398F6848FDCD7454D9-org.eclipse.persistence.jpa.jpql_1.0.0.jar
+	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/beansbinding:0
+	dev-java/cglib:2.2
+	dev-java/jdom:1.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.3: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-9999-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip o.apache.tools.ant.module/external/ant-libs-1.8.2.zip || die
+	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}"/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip o.jdesktop.beansbinding/external/beansbinding-1.2.1-doc.zip || die
+	ln -s "${DISTDIR}"/1E4BAF3553AE5691E81647D30ABE8FFFC250B59E-eclipselink-2.3.0.jar j2ee.eclipselink/external/eclipselink-2.3.0.jar || die
+	ln -s "${DISTDIR}"/E9DCFD351C4A7EB6C172612C987752F715BF2E6B-eclipselink-jpa-modelgen-2.3.0.jar j2ee.eclipselinkmodelgen/external/eclipselink-jpa-modelgen-2.3.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}"/89BFCE12CA01C7518739B5AC2C22A220B6B5510E-indexer-artifact-4.1.1.jar maven.indexer/external/indexer-artifact-4.1.1.jar || die
+	ln -s "${DISTDIR}"/D1B67FE60F2FDD654FDAE0A84B300DDB72CBC209-indexer-core-4.1.1.jar maven.indexer/external/indexer-core-4.1.1.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}"/8FB21F7AAC2DEB6215D71F00DCE1FAE9107643A9-javac-impl-nb-7.0-b07.jar libs.javacimpl/external/javac-impl-nb-7.0-b07.jar || die
+	ln -s "${DISTDIR}"/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-javax.persistence-2.0.jar j2ee.eclipselink/external/javax.persistence-2.0.jar || die
+	ln -s "${DISTDIR}"/2F43A634A42CC4FD2EF9E24B488AFFD6984D3411-jaxws-2.2.zip websvc.jaxws21/external/jaxws-2.2.zip || die
+	ln -s "${DISTDIR}"/23E69F0F17757673C573EBD9899727B82EF7DB7F-jaxws-2.2-api.zip websvc.jaxws21api/external/jaxws-2.2-api.zip || die
+	ln -s "${DISTDIR}"/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip websvc.jaxws21/external/jaxws-api-doc.zip || die
+	ln -s "${DISTDIR}"/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar maven.embedder/external/maven-dependency-tree-1.2.jar || die
+	ln -s "${DISTDIR}"/9B2ACF67C1DADE48B9FDFC398F6848FDCD7454D9-org.eclipse.persistence.jpa.jpql_1.0.0.jar j2ee.eclipselink/external/org.eclipse.persistence.jpa.jpql_1.0.0.jar || 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-9999-build.xml.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
+
+	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 beansbinding-1.2.1.jar && dosym /usr/share/beansbinding/lib/beansbinding.jar ${instdir}/beansbinding-1.2.1.jar || die
+	rm cglib-2.2.jar && dosym /usr/share/cglib-2.2/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
+	# javac-api-nb-7.0-b07.jar
+	# javac-impl-nb-7.0-b07.jar
+	# org-netbeans-modules-java-j2seplatform-probe.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/eclipselink
+	pushd "${D}"/${instdir} >/dev/null || die
+	# dir: eclipselink
+	# eclipselink-javax.persistence-2.0.jar
+	# eclipselink-jpa-modelgen-2.2.0.jar
+	# eclipselink-2.2.0.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/hibernate
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm antlr-2.7.6.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.6.jar || die
+	rm asm-attrs.jar && dosym /usr/share/asm-2.2/lib/asm-attrs.jar ${instdir}/asm-attrs.jar || die
+	rm asm.jar && dosym /usr/share/asm-2.2/lib/asm.jar ${instdir}/asm.jar || die
+	rm cglib-2.1.3.jar && dosym /usr/share/cglib-2.1/lib/cglib.jar ${instdir}/cglib-2.1.3.jar || die
+	rm commons-collections-2.1.1.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections-2.1.1.jar || die
+	rm dom4j-1.6.1.jar && dosym /usr/share/dom4j-1/lib/dom4j.jar ${instdir}/dom4j-1.6.1.jar || die
+	rm ehcache-1.2.3.jar && dosym /usr/share/ehcache-1.2/lib/ehcache.jar ${instdir}/ehcache-1.2.3.jar || die
+	# ejb3-persistence.jar
+	# hibernate-annotations.jar
+	# hibernate-commons-annotations.jar
+	# hibernate-entitymanager.jar
+	# hibernate-tools.jar
+	# hibernate3.jar
+	rm javassist.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist.jar || die
+	# jdbc2_0-stdext.jar
+	rm jta.jar && dosym /usr/share/jta/lib/jta.jar ${instdir}/jta.jar || die
+	rm jtidy-r8-20060801.jar && dosym /usr/share/jtidy/lib/Tidy.jar ${instdir}/jtidy-r8-20060801.jar || die
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/modules/ext/jaxws22
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm FastInfoset.jar && dosym /usr/share/fastinfoset/lib/fastinfoset.jar ${instdir}/FastInfoset.jar || die
+	# gmbal-api-only.jar
+	# http.jar
+	# jaxws-rt.jar
+	# jaxws-tools.jar
+	# management-api.jar
+	# mimepull.jar
+	# policy.jar
+	rm saaj-impl.jar && dosym /usr/share/saaj/lib/saaj.jar ${instdir}/saaj-impl.jar || die
+	rm stax-ex.jar && dosym /usr/share/stax-ex/lib/stax-ex.jar ${instdir}/stax-ex.jar || die
+	rm streambuffer.jar && dosym /usr/share/xmlstreambuffer/lib/streambuffer.jar ${instdir}/streambuffer.jar || die
+	# woodstox.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxws22/api
+	pushd "${D}"/${instdir} >/dev/null || die
+	# jaxws-api.jar
+	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
+	rm jsr250-api.jar && dosym /usr/share/jsr250/lib/jsr250.jar ${instdir}/jsr250-api.jar || die
+	rm saaj-api.jar && dosym /usr/share/jsr67/lib/jsr67.jar ${instdir}/saaj-api.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/maven
+	pushd "${D}"/${instdir} >/dev/null || die
+	# indexer-artifact-4.1.1.jar
+	# indexer-core-4.1.1.jar
+	rm jdom-1.0.jar && dosym /usr/share/jdom-1.0/lib/jdom.jar ${instdir}/jdom-1.0.jar || die
+	# 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 a3ffbc1..8c31a6d 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_p20110728 (29 Jul 2011)
+
+  29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-javacard-9999_p20110728.ebuild:
+  Bumped to latest nightly sources
+
   29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
   -netbeans-javacard-9999_p20110717.ebuild:
   Removed obsolete version

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index 91aa021..15fe28f 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -5,7 +5,9 @@ DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
 DIST netbeans-trunk-nightly-201107220600-src.zip 173109164 RMD160 4529b4f9d6d42e53bd84e9ec3d0b7faed68490d0 SHA1 442a996bc1da147252cd75338b74e31dc5f632e0 SHA256 6d488db0c59aaa952f6b72b77a095d6354b8030d651788773639d965b6b65c8a
+DIST netbeans-trunk-nightly-201107280600-src.zip 173413435 RMD160 86b59d8b2fa15be0541e255fe0c1f3ab42603462 SHA1 156f011fddbf7f7659fb27f1a59700ef891c5d7e SHA256 7b77df1988a1423960dc6242b8b4e384918950ba6d4d0e6c0c7dcec4731292c4
 EBUILD netbeans-javacard-7.0.ebuild 4896 RMD160 dbe54ac4f637c3a0b74d2db673d4d8109f9a79fb SHA1 d8409b8fbacd12fdc9272eb94b63bec7bf0b240c SHA256 06c630d02e4cf765d2c48db5a6d55036ac6de2fab7375c1976060739eb1957b6
 EBUILD netbeans-javacard-9999_p20110722.ebuild 4923 RMD160 ed3c82c7e32b4222307bcdbca8c6fca3bc4461ea SHA1 8546d96b859bdc5e44383c6a24e338c3fa45748d SHA256 bae8cfd928c294f578c7cf976ed599a04d264503140f2bdf8b5b07ee6ba664c6
-MISC ChangeLog 11596 RMD160 8cb45814ae71ba99d52a5a732cc43236a8c8cfd6 SHA1 48e3acea4322a8ecf1180efc2c6e15b66d6c20b9 SHA256 c310d27cfd84f85515f1590f31ad693696e34ed6f49194f5536c35a5d7dd7e1c
+EBUILD netbeans-javacard-9999_p20110728.ebuild 4923 RMD160 8eee65d60fb6bd722577176cfe15acba2bdecae4 SHA1 1724a19da2db78a916e473ba110b0bb9545678b8 SHA256 3cf12050a5f7dc4ece71d41483f025fc31d6dbbca3903eff47a5aa6174617008
+MISC ChangeLog 11777 RMD160 811ac84d4741643cb9c0ee487aa31a54d0041b1b SHA1 39f49960defd0cc20fa980c3025ce2f0f68d6a9c SHA256 aa4fedd2bb943e8784b667b463170a0692c1479ab0b4a89fa25f793f8abc20c8
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20110728.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20110728.ebuild
new file mode 100644
index 0000000..5e9437d
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20110728.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-07-28_06-00-32/zip/netbeans-trunk-nightly-201107280600-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar
+	http://hg.netbeans.org/binaries/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar
+	http://hg.netbeans.org/binaries/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}
+	dev-java/ant-contrib:0
+	dev-java/asm:3
+	dev-java/bcel:0
+	dev-java/commons-cli:1
+	dev-java/commons-codec:0
+	dev-java/commons-httpclient:3
+	dev-java/commons-logging:0"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.javacard -Dext.binaries.downloaded=true"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar javacard.ri.platform/external/anttasks.jar || die
+	ln -s "${DISTDIR}"/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar javacard.apdu.io/external/apduio.jar || die
+	ln -s "${DISTDIR}"/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip javacard.ri.bundle/external/javacard_ri.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/javacard >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/javacard$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	rm -fr "${D}"/${INSTALL_DIR}/bin || die
+
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/JCDK3.0.2_ConnectedEdition/lib
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm ant-contrib-1.0b3.jar && dosym /usr/share/ant-contrib/lib/ant-contrib.jar ${instdir}/ant-contrib-1.0b3.jar || die
+	# api_classic.jar
+	# api_connected.jar
+	rm asm-all-3.1.jar && dosym /usr/share/asm-3/lib/asm.jar ${instdir}/asm-all-3.1.jar || die
+	rm bcel-5.2.jar && dosym /usr/share/bcel/lib/bcel.jar ${instdir}/bcel-5.2.jar || die
+	rm commons-cli-1.0.jar && dosym /usr/share/commons-cli-1/lib/commons-cli.jar ${instdir}/commons-cli-1.0.jar || die
+	rm commons-codec-1.3.jar && dosym /usr/share/commons-codec/lib/commons-codec.jar ${instdir}/commons-codec-1.3.jar || die
+	rm commons-httpclient-3.0.jar && dosym /usr/share/commons-httpclient-3/lib/commons-httpclient.jar ${instdir}/commons-httpclient-3.0.jar || die
+	rm commons-logging-1.1.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.1.jar || die
+	# jcapt.jar
+	# jctasks.jar
+	# nbtasks.jar
+	# nbutils.jar
+	# tools.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	# apduio.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/javacard
+}

diff --git a/dev-java/netbeans-javadoc/ChangeLog b/dev-java/netbeans-javadoc/ChangeLog
index 32c4c7f..3361a42 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_p20110728 (29 Jul 2011)
+
+  29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-javadoc-9999_p20110728.ebuild:
+  Bumped to latest nightly sources
+
   29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
   -netbeans-javadoc-9999_p20110717.ebuild:
   Removed obsolete version

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index 174b8f4..1b9f44b 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -3,7 +3,9 @@ DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
 DIST netbeans-trunk-nightly-201107220600-src.zip 173109164 RMD160 4529b4f9d6d42e53bd84e9ec3d0b7faed68490d0 SHA1 442a996bc1da147252cd75338b74e31dc5f632e0 SHA256 6d488db0c59aaa952f6b72b77a095d6354b8030d651788773639d965b6b65c8a
+DIST netbeans-trunk-nightly-201107280600-src.zip 173413435 RMD160 86b59d8b2fa15be0541e255fe0c1f3ab42603462 SHA1 156f011fddbf7f7659fb27f1a59700ef891c5d7e SHA256 7b77df1988a1423960dc6242b8b4e384918950ba6d4d0e6c0c7dcec4731292c4
 EBUILD netbeans-javadoc-7.0.ebuild 5812 RMD160 3cb4bf6f10337d1f92b099124318fbccaca82165 SHA1 2665506a07b7405994381ee44836cdabc8ee7f1c SHA256 93a2d7ceee7fd373ce59f1b154f4815b68bff3cf8fb260dcdf73ff896c53060c
 EBUILD netbeans-javadoc-9999_p20110722.ebuild 5839 RMD160 e9f0537323cd373ce782a8405037ca2e7e7509c5 SHA1 646d92a8b0ee3b88813b314efc2164a455749d7a SHA256 233378cf9ae1f645f2781bfc462e816f30b0a1a8ca502cceecc84588b21ea5fd
-MISC ChangeLog 11447 RMD160 8a6a401a4492f978ef8c6b0ec3bc06003045fca4 SHA1 6e6da157a8ca07b3e151bc5d5a845685e4195baf SHA256 d565a37e0c3f1c9a231756c04a5eceb89e40678cae19b8c77aaf21dfdfeba715
+EBUILD netbeans-javadoc-9999_p20110728.ebuild 5839 RMD160 3db5bd61e76029c092781bc4761968cb4ccb6bd9 SHA1 1510390d03f2c9073b31260f3a95cb6da0da4ae3 SHA256 82b4414cc93496ff199bebc62aa026d035c68d227444d9de298de15de71e7e76
+MISC ChangeLog 11626 RMD160 12193986fbdf03fd706e9dab5a17b71ea9a13aeb SHA1 c5fa67105b3fdfefb59b3889411ec8b27fd55702 SHA256 9dd0415496ea45d047242569fc82061ad1929a4c4d70572663d85b7d1a327907
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20110728.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20110728.ebuild
new file mode 100644
index 0000000..684d3ef
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20110728.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-07-28_06-00-32/zip/netbeans-trunk-nightly-201107280600-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	dev-java/javahelp:0
+	dev-java/junit:4
+	~dev-java/netbeans-apisupport-${PV}
+	~dev-java/netbeans-cnd-${PV}
+	~dev-java/netbeans-dlight-${PV}
+	~dev-java/netbeans-enterprise-${PV}
+	~dev-java/netbeans-ergonomics-${PV}
+	~dev-java/netbeans-groovy-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-javacard-${PV}
+	~dev-java/netbeans-mobility-${PV}
+	~dev-java/netbeans-nb-${PV}
+	~dev-java/netbeans-php-${PV}
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-profiler-${PV}
+	~dev-java/netbeans-websvccommon-${PV}"
+RDEPEND=""
+
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip o.apache.tools.ant.module/external/ant-libs-1.8.2.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.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 e1bc6c5..4bcdbf0 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_p20110728 (29 Jul 2011)
+
+  29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-mobility-9999_p20110728.ebuild:
+  Bumped to latest nightly sources
+
   29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
   -netbeans-mobility-9999_p20110717.ebuild:
   Removed obsolete version

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 40b349f..5a239be 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -10,7 +10,9 @@ DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
 DIST netbeans-trunk-nightly-201107220600-src.zip 173109164 RMD160 4529b4f9d6d42e53bd84e9ec3d0b7faed68490d0 SHA1 442a996bc1da147252cd75338b74e31dc5f632e0 SHA256 6d488db0c59aaa952f6b72b77a095d6354b8030d651788773639d965b6b65c8a
+DIST netbeans-trunk-nightly-201107280600-src.zip 173413435 RMD160 86b59d8b2fa15be0541e255fe0c1f3ab42603462 SHA1 156f011fddbf7f7659fb27f1a59700ef891c5d7e SHA256 7b77df1988a1423960dc6242b8b4e384918950ba6d4d0e6c0c7dcec4731292c4
 EBUILD netbeans-mobility-7.0.ebuild 8590 RMD160 9def01a8eb4d25f3e423cb808ec7fc4b432fe2ff SHA1 c50a2eb86085769ba5a85d3b399b13cd91811a6a SHA256 b65564f38baf7560c37dfdaf0eac14db7e47fc3fc4585e33d5399e12d8c455d5
 EBUILD netbeans-mobility-9999_p20110722.ebuild 8617 RMD160 726600c47b2ecdbb93745bb705d80dab37bdcddf SHA1 d36cd1270fe5289bb972e53a8bd081309a2101e2 SHA256 b753cfd0a133f58eccb2bc73ebdb09248a38e3e0999926d35509dc135f869d84
-MISC ChangeLog 11737 RMD160 c8d3313d956062f0cc0c8c0726e387b9e78143a4 SHA1 52c9b67f674e5097c59b6501ba110500f9e09a65 SHA256 c471b17f5302f6d64eb670531c8d77deffe0b6feb9dec58f4420a6bd86cf6c9f
+EBUILD netbeans-mobility-9999_p20110728.ebuild 8617 RMD160 1562a0442e4111c901ebf313b49d3c87bd0f1931 SHA1 f35d0a707273489a63bf00383a18abe2a4953e02 SHA256 09ab48da0d2a2ab2b356b58842b62925a6fc713fb72f180a3fc10e794b0f8eb0
+MISC ChangeLog 11918 RMD160 075a35082619c71fa4adaa226cec79a1d3cdd55b SHA1 a79255c1a185f4ee58af6dbcb09ab4465674da9e SHA256 f63b11c480e222f87f05b02a2fe05c372a1f6a60d83800a54e56cdb8a4d79c81
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20110728.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20110728.ebuild
new file mode 100644
index 0000000..8ca1bad
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20110728.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-07-28_06-00-32/zip/netbeans-trunk-nightly-201107280600-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/CEF99941E945D543DF0711F2C6AEF765B50F8501-jakarta-slide-ant-webdav-2.1.jar
+	http://hg.netbeans.org/binaries/D1B5BA3BFE8DCFAF08A0468F8879EF1D0E998038-jakarta-slide-webdavlib-2.1.jar
+	http://hg.netbeans.org/binaries/2FB485DD8C5EFC7972037781BFFF0CE31316FCE6-jmunit-1.2.1-api.zip
+	http://hg.netbeans.org/binaries/BD84F1A4C0789070CC62A8D2DBA75121A57C069C-jmunit4cldc10-1.2.1.jar
+	http://hg.netbeans.org/binaries/D76B8334DCBDBE93297AA5C02B17D9A856E72246-jmunit4cldc11-1.2.1.jar
+	http://hg.netbeans.org/binaries/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-9999-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/CEF99941E945D543DF0711F2C6AEF765B50F8501-jakarta-slide-ant-webdav-2.1.jar mobility.deployment.webdav/external/jakarta-slide-ant-webdav-2.1.jar || die
+	ln -s "${DISTDIR}"/D1B5BA3BFE8DCFAF08A0468F8879EF1D0E998038-jakarta-slide-webdavlib-2.1.jar mobility.deployment.webdav/external/jakarta-slide-webdavlib-2.1.jar || die
+	ln -s "${DISTDIR}"/2FB485DD8C5EFC7972037781BFFF0CE31316FCE6-jmunit-1.2.1-api.zip mobility.j2meunit/external/jmunit-1.2.1-api.zip || die
+	ln -s "${DISTDIR}"/BD84F1A4C0789070CC62A8D2DBA75121A57C069C-jmunit4cldc10-1.2.1.jar mobility.j2meunit/external/jmunit4cldc10-1.2.1.jar || die
+	ln -s "${DISTDIR}"/D76B8334DCBDBE93297AA5C02B17D9A856E72246-jmunit4cldc11-1.2.1.jar mobility.j2meunit/external/jmunit4cldc11-1.2.1.jar || die
+	ln -s "${DISTDIR}"/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-9999-build.xml.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 0c68df9..a4f4d93 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_p20110728 (29 Jul 2011)
+
+  29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-nb-9999_p20110728.ebuild:
+  Bumped to latest nightly sources
+
   29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
   -netbeans-nb-9999_p20110717.ebuild:
   Removed obsolete version

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index 9ce9b79..68f6367 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -5,7 +5,9 @@ DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674
 DIST netbeans-7.0.png 20011 RMD160 a941b71b571a9cd30c49446aef1bd4244e689465 SHA1 ebd2e748bb4bc29e667ead9a2fb717a9017f9405 SHA256 1d519f018ebeff6e29436c8492dbb266446bd0144fb5519b2ef6637664de6f4a
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
 DIST netbeans-trunk-nightly-201107220600-src.zip 173109164 RMD160 4529b4f9d6d42e53bd84e9ec3d0b7faed68490d0 SHA1 442a996bc1da147252cd75338b74e31dc5f632e0 SHA256 6d488db0c59aaa952f6b72b77a095d6354b8030d651788773639d965b6b65c8a
+DIST netbeans-trunk-nightly-201107280600-src.zip 173413435 RMD160 86b59d8b2fa15be0541e255fe0c1f3ab42603462 SHA1 156f011fddbf7f7659fb27f1a59700ef891c5d7e SHA256 7b77df1988a1423960dc6242b8b4e384918950ba6d4d0e6c0c7dcec4731292c4
 EBUILD netbeans-nb-7.0.ebuild 5037 RMD160 3802011d7c4d6b89129d3d442f0198c50ad71432 SHA1 c6cdc29caaf7e51dab159cbdabb56f80369aad29 SHA256 416a2c810e7f17e113ed9b5026062ee6471c7e652f40f08a9d410ec18cca70d7
 EBUILD netbeans-nb-9999_p20110722.ebuild 5060 RMD160 1a0cf1ca70e5c1fabcf71963e705708c4a06f9ba SHA1 e5a90f2732a9169778ee6e966c8f2acec9fd195a SHA256 d69076281ab96e5196f3bb730d2e756867eeaa844fdfefe693d11d11c15ac349
-MISC ChangeLog 11040 RMD160 b29da8a83d35dd8adde394c0293492f82b79acba SHA1 281d55beef61ab065222b44da54683cc663e1a40 SHA256 bf6c4cb5b3bae1014ba4ad13a2d1cf650be39cc091085df85f42d235dede4eae
+EBUILD netbeans-nb-9999_p20110728.ebuild 5060 RMD160 e2a530a9870590f5a1358ee18b958aa54d564ca2 SHA1 0a8574fe293a01ce2f992329fb6748cbabb3ef5a SHA256 00c0291e3c100fc83e48bf22884fee66693e5fcd48a32a8d34ba1ba626b1d590
+MISC ChangeLog 11209 RMD160 e1444df4b5daa1869aef59eee6d74777144358d7 SHA1 c35bc9565cfb56ff054b187d19b991882e423ef6 SHA256 91318e8facbcf5b1aeefea14f473824a65e5a4cf113eeed48d63c54fe2171045
 MISC metadata.xml 396 RMD160 80c4086b305af8d5e4adae8a263111590f183c05 SHA1 11224a41781dde9ebd92c32e5c0a9d1921b628cb SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20110728.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20110728.ebuild
new file mode 100644
index 0000000..2512ae7
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20110728.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-07-28_06-00-32/zip/netbeans-trunk-nightly-201107280600-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-build.xml.patch.bz2
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0.png"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE="keychain"
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}
+	keychain? (
+		net-misc/keychain:0
+		net-misc/x11-ssh-askpass:0
+	)"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster create-netbeans-import finish-build"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.nb -Dext.binaries.downloaded=true"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-build.xml.patch
+	use keychain && epatch "${FILESDIR}"/${SLOT}/keychain-support.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans >/dev/null || die
+
+	insinto ${INSTALL_DIR}/nb
+
+	grep -E "/nb$" moduleCluster.properties > "${D}"/${INSTALL_DIR}/nb/moduleCluster.properties || die
+
+	insinto ${INSTALL_DIR}
+	doins -r nb
+	dodoc *.txt
+	dohtml *.html *.css
+
+	insinto ${INSTALL_DIR}/bin
+	doins bin/netbeans
+	dosym ${INSTALL_DIR}/bin/netbeans /usr/bin/netbeans-${SLOT}
+	fperms 755 ${INSTALL_DIR}/bin/netbeans
+
+	insinto /etc/netbeans-${SLOT}
+	doins etc/*
+	dosym /etc/netbeans-${SLOT} ${INSTALL_DIR}/etc
+	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 3c7bbfb..b629592 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_p20110728 (29 Jul 2011)
+
+  29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-php-9999_p20110728.ebuild:
+  Bumped to latest nightly sources
+
   29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
   -netbeans-php-9999_p20110717.ebuild:
   Removed obsolete version

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index f5dc7c5..3b264c6 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -6,7 +6,9 @@ DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
 DIST netbeans-trunk-nightly-201107220600-src.zip 173109164 RMD160 4529b4f9d6d42e53bd84e9ec3d0b7faed68490d0 SHA1 442a996bc1da147252cd75338b74e31dc5f632e0 SHA256 6d488db0c59aaa952f6b72b77a095d6354b8030d651788773639d965b6b65c8a
+DIST netbeans-trunk-nightly-201107280600-src.zip 173413435 RMD160 86b59d8b2fa15be0541e255fe0c1f3ab42603462 SHA1 156f011fddbf7f7659fb27f1a59700ef891c5d7e SHA256 7b77df1988a1423960dc6242b8b4e384918950ba6d4d0e6c0c7dcec4731292c4
 EBUILD netbeans-php-7.0.ebuild 4086 RMD160 3b0516c1fb5f77b7845bf956eccd2106aa5b477d SHA1 2deee7e95837905a26f7c3476d4067fd404b7055 SHA256 03a362429af46895dd6f50b8f44a68b9760e47320a52a137f088b3aec4bd2d93
 EBUILD netbeans-php-9999_p20110722.ebuild 4113 RMD160 e9cedd518706d2ee584812ae836bd240b667499a SHA1 7614fe31d451b9933ad9e4a352f5f7bacabc2c58 SHA256 33eaca97e7d77cf4c26e87def6995c389d33fd6b9d553f15b171c8c74412fe67
-MISC ChangeLog 10966 RMD160 efacdc8e66316c777a5254d6d462d2e4cabb194c SHA1 731048143aa7d2e850b4502fc8a9651af248be5d SHA256 373ce08e22216e983f19fc9e3b0c447b1e1e9e66b5f0a65b810b2173a56a05d9
+EBUILD netbeans-php-9999_p20110728.ebuild 4113 RMD160 07e897c852dc20777fe8a860c0001830262f065d SHA1 567428fa913c4e6bd0f355f8020da3443b028004 SHA256 3a4e4ed5153d8001d39aa63a756641d84e6bdd304846f1aac7d6ea22987b070e
+MISC ChangeLog 11137 RMD160 31565e6bf6eb9d584a3240575e552212d2785b61 SHA1 da3e59e19fc9ec1a57f5a0cb6d05cc8920a7ae79 SHA256 be817574343a2478df59b1b162f3d5e4beb43de249cce69546e0787104dcd03e
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20110728.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20110728.ebuild
new file mode 100644
index 0000000..690f422
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20110728.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-07-28_06-00-32/zip/netbeans-trunk-nightly-201107280600-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-build.xml.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-9999-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip php.phpdoc.documentation/external/phpdocdesc.zip || die
+	ln -s "${DISTDIR}"/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-9999-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.javacup/external javacup javacup.jar java-cup-11a.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-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 3cbbb1d..a35970c 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_p20110728 (29 Jul 2011)
+
+  29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-platform-9999_p20110728.ebuild:
+  Bumped to latest nightly sources
+
   29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
   -netbeans-platform-9999_p20110717.ebuild:
   Removed obsolete version

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index c6bd280..718c245 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -7,7 +7,9 @@ DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
 DIST netbeans-trunk-nightly-201107220600-src.zip 173109164 RMD160 4529b4f9d6d42e53bd84e9ec3d0b7faed68490d0 SHA1 442a996bc1da147252cd75338b74e31dc5f632e0 SHA256 6d488db0c59aaa952f6b72b77a095d6354b8030d651788773639d965b6b65c8a
+DIST netbeans-trunk-nightly-201107280600-src.zip 173413435 RMD160 86b59d8b2fa15be0541e255fe0c1f3ab42603462 SHA1 156f011fddbf7f7659fb27f1a59700ef891c5d7e SHA256 7b77df1988a1423960dc6242b8b4e384918950ba6d4d0e6c0c7dcec4731292c4
 EBUILD netbeans-platform-7.0.ebuild 4855 RMD160 1bf2c46bf11d3c8767d5f03996acf9f8e81b5b87 SHA1 b26949f5b85e72c7e2b7b55b6f8f40f9493dfcd3 SHA256 3375b2dd5b9b638e91d78dc56c81128adf63b03e909c518dcae6dacb6d3ef761
 EBUILD netbeans-platform-9999_p20110722.ebuild 4882 RMD160 ff3e75ef5c4cd90b73df51c4ab726a0e0dc9f49e SHA1 fbc32b53d9b0e2603319d4fa4480a42be17ae78f SHA256 d07efa50f3b8ff8df2daf5a9b35995657eac9080557c377880bf54916ee9b24b
-MISC ChangeLog 12032 RMD160 86676f90ec317852feb0d51b5c8828a81811d549 SHA1 56074fbc036f0a0405d37a0f4df74c2db7383e71 SHA256 a691c833455c0cf86494a70562503fc1f2935611120b6645b3253d201c8a1fcf
+EBUILD netbeans-platform-9999_p20110728.ebuild 4882 RMD160 3bdd9fe0a7855310f8888b3c3c63d05215218f60 SHA1 c739bbf9612748233322a39c493259676d9883df SHA256 c6963d73968fcf600cf3b62dfc50d96e955ee765e8c0790f4e25c708a4e78bde
+MISC ChangeLog 12213 RMD160 677aabbdc8f785aa458d304dd82b802d575798fd SHA1 6e22489a75b55679bf5879791c0310019da41d41 SHA256 0541696e5e0433a84363302a32c08a8f5f1ca10f1c3de06f8acb898f94fba902
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20110728.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20110728.ebuild
new file mode 100644
index 0000000..a095cf4
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20110728.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-07-28_06-00-32/zip/netbeans-trunk-nightly-201107280600-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-build.xml.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-9999-build.xml.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-9999-build.xml.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 2c4ac5f..73ae397 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_p20110728 (29 Jul 2011)
+
+  29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-profiler-9999_p20110728.ebuild:
+  Bumped to latest nightly sources
+
   29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
   -netbeans-profiler-9999_p20110717.ebuild:
   Removed obsolete version

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 9c74c77..2365bc2 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -2,7 +2,9 @@ DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
 DIST netbeans-trunk-nightly-201107220600-src.zip 173109164 RMD160 4529b4f9d6d42e53bd84e9ec3d0b7faed68490d0 SHA1 442a996bc1da147252cd75338b74e31dc5f632e0 SHA256 6d488db0c59aaa952f6b72b77a095d6354b8030d651788773639d965b6b65c8a
+DIST netbeans-trunk-nightly-201107280600-src.zip 173413435 RMD160 86b59d8b2fa15be0541e255fe0c1f3ab42603462 SHA1 156f011fddbf7f7659fb27f1a59700ef891c5d7e SHA256 7b77df1988a1423960dc6242b8b4e384918950ba6d4d0e6c0c7dcec4731292c4
 EBUILD netbeans-profiler-7.0.ebuild 3048 RMD160 ff8573b89f3dabc65e232a60c31fabc2c480b181 SHA1 80b0946f0fdcaa9b6f10f3bc78535b94b582dcc7 SHA256 7148f39f6ebb55e5ed0581bcfa361eb6e4fb5e225e50035cd972f3152340a58a
 EBUILD netbeans-profiler-9999_p20110722.ebuild 3075 RMD160 001bb5d8197c33b5a311b449226e783b0bba5346 SHA1 8309d741d6001f58b7963afa3ac1c5230f4ff7cf SHA256 0793e1031c2f8f4e6d404e3ecfb248fc681279c888d6a43ab7de4830f3aacd0b
-MISC ChangeLog 11596 RMD160 1c1c6bc00bdf51e80fac20aa3366a29f61544b32 SHA1 91287b695580ac60f28305cdbfdc8730b0868160 SHA256 620db696606cab092943fe10456153ab67ce9d93e7aeca1c8d32074aa467c93d
+EBUILD netbeans-profiler-9999_p20110728.ebuild 3075 RMD160 3800d7de97a3f5083f0d392f71089e26f524b927 SHA1 5443bc8a67d86d982134e5b70ad63d437df72563 SHA256 1fbcd9277a68ee340931a4a78aae4187ec35dc4b2431dec7023a5fd431e9b957
+MISC ChangeLog 11777 RMD160 5c435c091ffebfcf5d69ffa3b5c0f37a9d06c4f0 SHA1 f98d78ccdf2ebb0c4d7be511a2c3a96cc2f1f9f6 SHA256 1ee1bf844fd139ad0a908a625f990049f0c4f576a855d65778efc7fa904d3c29
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20110728.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20110728.ebuild
new file mode 100644
index 0000000..f42aaba
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20110728.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-07-28_06-00-32/zip/netbeans-trunk-nightly-201107280600-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.profiler -Dext.binaries.downloaded=true"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/profiler >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/profiler$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	for file in lib/deployed/cvm/linux/*.so ; do
+		fperms 755 ${file}
+	done
+
+	for file in lib/deployed/jdk*/linux*/*.so ; do
+		fperms 755 ${file}
+	done
+
+	for file in remote-pack-defs/*.sh ; do
+		fperms 755 ${file}
+	done
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/profiler
+}

diff --git a/dev-java/netbeans-websvccommon/ChangeLog b/dev-java/netbeans-websvccommon/ChangeLog
index 0ad5f43..f18070c 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_p20110728 (29 Jul 2011)
+
+  29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-websvccommon-9999_p20110728.ebuild:
+  Bumped to latest nightly sources
+
   29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
   -netbeans-websvccommon-9999_p20110717.ebuild:
   Removed obsolete version

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 796cc3b..54a9d20 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -2,7 +2,9 @@ DIST netbeans-7.0-201104080000-src.zip 175465212 RMD160 78a98cb97447e29d5867f79e
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 RMD160 f8f092c93c1197ce759afbd8674ff1216d504d2d SHA1 6324909cc2dfae583f38e3544a38d1058c73a7ec SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f
 DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243fe1356b215b SHA1 a391d2a9b656cac3ab3f4f673ee469935dd11dc2 SHA256 5110af4f75c4780ec0ae2f06d3243c7921f3907d53ab15431a706f7a65336e38
 DIST netbeans-trunk-nightly-201107220600-src.zip 173109164 RMD160 4529b4f9d6d42e53bd84e9ec3d0b7faed68490d0 SHA1 442a996bc1da147252cd75338b74e31dc5f632e0 SHA256 6d488db0c59aaa952f6b72b77a095d6354b8030d651788773639d965b6b65c8a
+DIST netbeans-trunk-nightly-201107280600-src.zip 173413435 RMD160 86b59d8b2fa15be0541e255fe0c1f3ab42603462 SHA1 156f011fddbf7f7659fb27f1a59700ef891c5d7e SHA256 7b77df1988a1423960dc6242b8b4e384918950ba6d4d0e6c0c7dcec4731292c4
 EBUILD netbeans-websvccommon-7.0.ebuild 2627 RMD160 22ae06750bdadf3aff577b598b79228c9e061a75 SHA1 17e5c709c6863bd09112924cce9ae267fd427f36 SHA256 7a89f0152d080d3fbf76008832ac4d858b969a034abac69d252b2ed821a34a21
 EBUILD netbeans-websvccommon-9999_p20110722.ebuild 2654 RMD160 8714edff35da89774cd25276ae0b07653bdeda6f SHA1 338202b94bc085266b3b4314fb6cc93a918ffdd5 SHA256 a0b5c367c9e86c662b99cfac099d2167b0cbc8031743a21716f840cf3b3c6913
-MISC ChangeLog 12092 RMD160 816cdaebfbc1dfafe45d87ffe9be8b0845a46156 SHA1 793c80147349dacc7dbef7a6f0d29c42f06de904 SHA256 4b20a3da3d3d8ff63526520c40e75d49538eaff2fe07d926deb858d24df98fff
+EBUILD netbeans-websvccommon-9999_p20110728.ebuild 2654 RMD160 5cc82ee9fb5d5195ad5d649905c70769863590fa SHA1 3f772abe57fc2dcef8e2438ce0bde3804866d558 SHA256 98155a43d0768d0befac316fa99f6b117a1c8364d5d138f29b6aa5d62df2b00b
+MISC ChangeLog 12281 RMD160 f7e538efc57fd21a315707989c8f0c72123cbf10 SHA1 15ab60d0fdd9be74cfaa8a8f532e68dd7717c4af SHA256 27128688b853d1af7a5a060afcfc5a49b5e06a12ada2d95fb42ea5afa375367c
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20110728.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20110728.ebuild
new file mode 100644
index 0000000..20b7095
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20110728.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-07-28_06-00-32/zip/netbeans-trunk-nightly-201107280600-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-ide-${PV}"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.websvccommon -Dext.binaries.downloaded=true"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/websvccommon >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+	grep -E "/websvccommon$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/websvccommon
+}

diff --git a/dev-util/netbeans/ChangeLog b/dev-util/netbeans/ChangeLog
index 174d85c..35ee205 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_p20110728 (29 Jul 2011)
+
+  29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-9999_p20110728.ebuild:
+  Bumped to latest nightly sources
+
   29 Jul 2011; Miroslav Šulc <fordfrog@g.o>
   -netbeans-9999_p20110717.ebuild:
   Removed obsolete version

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 7f7a492..72cd04e 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -4,7 +4,9 @@ DIST netbeans-9999-build.xml.patch.bz2 1620 RMD160 d565d98a2bf88cc6937c3597d1243
 DIST netbeans-l10n-7.0-20110413.tar.bz2 13405280 RMD160 146a1e4e72e44659fa547bec00712f55063e31ab SHA1 04d91b859a64405c4b71821a4d0ca543f9ab523e SHA256 30c2008d5b7d3b03a1d80b32b681e473fdf89a907c564a1ca4b4dac2fcea7eab
 DIST netbeans-l10n-9999-20110613.tar.bz2 13405097 RMD160 9f8fb8fcdbdf87c958b2a8e162e150cd30c6c327 SHA1 fb06e579426ebad1909f17e36d31fe1b1b6d9f7d SHA256 c8ad3bfdd8c7da892780caa29cef57006f39016b6598327ebdab5704c9ad08a4
 DIST netbeans-trunk-nightly-201107220600-src.zip 173109164 RMD160 4529b4f9d6d42e53bd84e9ec3d0b7faed68490d0 SHA1 442a996bc1da147252cd75338b74e31dc5f632e0 SHA256 6d488db0c59aaa952f6b72b77a095d6354b8030d651788773639d965b6b65c8a
+DIST netbeans-trunk-nightly-201107280600-src.zip 173413435 RMD160 86b59d8b2fa15be0541e255fe0c1f3ab42603462 SHA1 156f011fddbf7f7659fb27f1a59700ef891c5d7e SHA256 7b77df1988a1423960dc6242b8b4e384918950ba6d4d0e6c0c7dcec4731292c4
 EBUILD netbeans-7.0.ebuild 6709 RMD160 3e3200c10f2a343501e9658fb7730063d0e7f326 SHA1 1cee5a87e542c8da6b167a7f8edfe8cdd511987f SHA256 347005e2f9d19eee6d54446b0318501f9a3a70b5965aaf883af47b41b851682b
 EBUILD netbeans-9999_p20110722.ebuild 6825 RMD160 5445786811c5e21142d806499edef1972279b166 SHA1 a3ebc5390cb09785d4cf14bfcc64e715fb8791e1 SHA256 2a2582503ee9dfefc0c5c2bdddd7ab7b1d6feea1a792db9df2fc44c59d5e050d
-MISC ChangeLog 10622 RMD160 4892431b0f4b06655aaf6bb624c1f7bff48df34e SHA1 999a3772ae07ecbd66f299079ef14e150663353e SHA256 71f4ebd2b9be3577498d2c54b95d03e278cda4eb669e0b48e398f9add4d0c563
+EBUILD netbeans-9999_p20110728.ebuild 6825 RMD160 e05004cf047378455fdc391e32e91659d04bd65c SHA1 da104785329b601c32079aed6b14dae3626750a0 SHA256 f5e765607a445760815e6b0b1bbdfcfeb55c6390123def36de5ea01f14887bb6
+MISC ChangeLog 10785 RMD160 df1d247e5066de3d9a5b680d5818d2e07828ae7e SHA1 111e753ff2a68eaa902c8013329b711ab6c2844c SHA256 146eb99808e25955980ba154c6fc249320578a7e30c2d53f0a3e1aeff0b4e816
 MISC metadata.xml 333 RMD160 848a246f77fbcc88bb03d4a8d0769ef60353148a SHA1 e9afe19410a907fb47230f824b2d592ba3f465d4 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a

diff --git a/dev-util/netbeans/netbeans-9999_p20110728.ebuild b/dev-util/netbeans/netbeans-9999_p20110728.ebuild
new file mode 100644
index 0000000..4a2f388
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20110728.ebuild
@@ -0,0 +1,254 @@
+# 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-07-28_06-00-32/zip/netbeans-trunk-nightly-201107280600-src.zip"
+PATCHES_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-build.xml.patch.bz2"
+L10N_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-9999-20110613.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_si? ( ${ALL_URLS} )
+	linguas_sq? ( ${ALL_URLS} )
+	linguas_sr? ( ${ALL_URLS} )
+	linguas_sv? ( ${ALL_URLS} )
+	linguas_ta_IN? ( ${ALL_URLS} )
+	linguas_tl? ( ${ALL_URLS} )
+	linguas_tr? ( ${ALL_URLS} )
+	linguas_vi? ( ${ALL_URLS} )
+	linguas_zh_CN? ( ${ALL_URLS} )
+	linguas_zh_TW? ( ${ALL_URLS} )
+"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE_NETBEANS_MODULES="
+	+netbeans_modules_apisupport
+	netbeans_modules_cnd
+	netbeans_modules_dlight
+	netbeans_modules_enterprise
+	netbeans_modules_ergonomics
+	netbeans_modules_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_si
+	linguas_sq
+	linguas_sr
+	linguas_sv
+	linguas_ta_IN
+	linguas_tl
+	linguas_tr
+	linguas_vi
+	linguas_zh_CN
+	linguas_zh_TW"
+IUSE="doc ${IUSE_NETBEANS_MODULES} ${IUSE_LINGUAS}"
+S="${WORKDIR}"
+
+DEPEND=">=virtual/jdk-1.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-9999-build.xml.patch.bz2
+	fi
+}
+
+src_prepare() {
+	if [ -n "${NBLOCALES}" ] ; then
+		einfo "Deleting bundled class files..."
+		find -name "*.class" -type f | xargs rm -vf
+
+		epatch netbeans-9999-build.xml.patch
+
+		# Support for custom patches
+		if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+			local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+			if [ -n "${files}" ] ; then
+				einfo "Applying custom patches:"
+
+				for file in ${files} ; do
+					epatch "${file}"
+				done
+			fi
+		fi
+
+		einfo "Symlinking external libraries..."
+		java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	fi
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	if [ -n "${NBLOCALES}" ] ; then
+		einfo "Compiling support for locales: ${NBLOCALES}"
+		eant -f nbbuild/build.xml bootstrap || die
+		eant -Dlocales=${NBLOCALES} -Ddist.dir=../nbbuild/netbeans -Dnbms.dir="" -Dnbms.dist.dir="" \
+			-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
+}