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

[Miroslav Šulc]

commit:     1bf47d0c91160fa5a5f8c86a1222d8f9da558434
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  4 22:59:50 2012 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Mar  4 22:59:50 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/fordfrog.git;a=commit;h=1bf47d0c

netbeans: bumped to latest nightly module

---
 dev-java/netbeans-apisupport/ChangeLog             |    6 +
 dev-java/netbeans-apisupport/Manifest              |    4 +-
 .../netbeans-apisupport-9999_p20120304.ebuild      |  107 ++++++
 dev-java/netbeans-cnd/ChangeLog                    |    6 +
 dev-java/netbeans-cnd/Manifest                     |    4 +-
 .../netbeans-cnd-9999_p20120304.ebuild             |  119 ++++++
 dev-java/netbeans-dlight/ChangeLog                 |    6 +
 dev-java/netbeans-dlight/Manifest                  |    4 +-
 .../netbeans-dlight-9999_p20120304.ebuild          |  102 +++++
 dev-java/netbeans-enterprise/ChangeLog             |    6 +
 dev-java/netbeans-enterprise/Manifest              |    4 +-
 .../netbeans-enterprise-9999_p20120304.ebuild      |  323 ++++++++++++++++
 dev-java/netbeans-ergonomics/ChangeLog             |    6 +
 dev-java/netbeans-ergonomics/Manifest              |    4 +-
 .../netbeans-ergonomics-9999_p20120304.ebuild      |  102 +++++
 dev-java/netbeans-groovy/ChangeLog                 |    6 +
 dev-java/netbeans-groovy/Manifest                  |    4 +-
 .../netbeans-groovy-9999_p20120304.ebuild          |  112 ++++++
 dev-java/netbeans-harness/ChangeLog                |    6 +
 dev-java/netbeans-harness/Manifest                 |    4 +-
 .../netbeans-harness-9999_p20120304.ebuild         |  115 ++++++
 dev-java/netbeans-ide/ChangeLog                    |    6 +
 dev-java/netbeans-ide/Manifest                     |    4 +-
 .../netbeans-ide-9999_p20120304.ebuild             |  390 ++++++++++++++++++++
 dev-java/netbeans-java/ChangeLog                   |    6 +
 dev-java/netbeans-java/Manifest                    |    4 +-
 .../netbeans-java-9999_p20120304.ebuild            |  307 +++++++++++++++
 dev-java/netbeans-javacard/ChangeLog               |    6 +
 dev-java/netbeans-javacard/Manifest                |    4 +-
 .../netbeans-javacard-9999_p20120304.ebuild        |  142 +++++++
 dev-java/netbeans-javadoc/ChangeLog                |    6 +
 dev-java/netbeans-javadoc/Manifest                 |    4 +-
 .../netbeans-javadoc-9999_p20120304.ebuild         |  160 ++++++++
 dev-java/netbeans-javafx/ChangeLog                 |    6 +
 dev-java/netbeans-javafx/Manifest                  |    4 +-
 .../netbeans-javafx-9999_p20120304.ebuild          |  112 ++++++
 dev-java/netbeans-mobility/ChangeLog               |    6 +
 dev-java/netbeans-mobility/Manifest                |    4 +-
 .../netbeans-mobility-9999_p20120304.ebuild        |  175 +++++++++
 dev-java/netbeans-nb/ChangeLog                     |    6 +
 dev-java/netbeans-nb/Manifest                      |    4 +-
 .../netbeans-nb/netbeans-nb-9999_p20120304.ebuild  |  149 ++++++++
 dev-java/netbeans-php/ChangeLog                    |    6 +
 dev-java/netbeans-php/Manifest                     |    4 +-
 .../netbeans-php-9999_p20120304.ebuild             |  123 ++++++
 dev-java/netbeans-platform/ChangeLog               |    6 +
 dev-java/netbeans-platform/Manifest                |    4 +-
 .../netbeans-platform-9999_p20120304.ebuild        |  127 +++++++
 dev-java/netbeans-profiler/ChangeLog               |    6 +
 dev-java/netbeans-profiler/Manifest                |    4 +-
 .../netbeans-profiler-9999_p20120304.ebuild        |  114 ++++++
 dev-java/netbeans-webcommon/ChangeLog              |    6 +
 dev-java/netbeans-webcommon/Manifest               |    4 +-
 .../netbeans-webcommon-9999_p20120304.ebuild       |   95 +++++
 dev-java/netbeans-websvccommon/ChangeLog           |    6 +
 dev-java/netbeans-websvccommon/Manifest            |    4 +-
 .../netbeans-websvccommon-9999_p20120304.ebuild    |   95 +++++
 dev-util/netbeans/ChangeLog                        |    6 +
 dev-util/netbeans/Manifest                         |    4 +-
 dev-util/netbeans/netbeans-9999_p20120304.ebuild   |  260 +++++++++++++
 60 files changed, 3409 insertions(+), 20 deletions(-)

diff --git a/dev-java/netbeans-apisupport/ChangeLog b/dev-java/netbeans-apisupport/ChangeLog
index 4c2194e..e63d5a8 100644
--- a/dev-java/netbeans-apisupport/ChangeLog
+++ b/dev-java/netbeans-apisupport/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-apisupport-9999_p20120304 (04 Mar 2012)
+
+  04 Mar 2012; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-apisupport-9999_p20120304.ebuild:
+  Bumped to latest nightly module
+
 *netbeans-apisupport-9999_p20120303 (03 Mar 2012)
 
   03 Mar 2012; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 3348936..dc97cd7 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -7,6 +7,7 @@ DIST netbeans-trunk-nightly-201202220400-src.zip 174195023 RMD160 800aa796b42f79
 DIST netbeans-trunk-nightly-201202270400-src.zip 174236017 RMD160 91d77d72c626d19a3bb88ab54e5612bb25e9c284 SHA1 58ba5f403553b9f754bebcc526047914d0721e4e SHA256 ad81b677ea067a86ebd2e26f2c7a1b538115406ee7bd36a95bb3856d8a4d5913
 DIST netbeans-trunk-nightly-201203010400-src.zip 174453125 RMD160 18c55d8b3789cef77bfde78b3310e55eab20011a SHA1 18e5786d27bbbdc91110e4d88eff9780b4dfc5cd SHA256 b1429ceebbaaefc169dc290870a66452b28c017a355bfbe925c3eba6e015013b
 DIST netbeans-trunk-nightly-201203030400-src.zip 174515173 RMD160 c9d99881d451d04be8035e861b8c91a8c5768084 SHA1 d86dbf4f822663c19b46fb19b05e275ba0f710e6 SHA256 e4bccd6167404f55ae5983807388a8cfb7980b3b00d37253a6ac4df4e6dea115
+DIST netbeans-trunk-nightly-201203040400-src.zip 174521722 RMD160 fb5cf478d504b5fb86e00c8204998bdfbf3d03e4 SHA1 6a97490572215bc65cfdcc150c9f76b6795fec78 SHA256 e5e376831eb0104ecac58cce6da6e20a637f1c7c14ac0992c094dc61ed186f35
 EBUILD netbeans-apisupport-7.0.1.ebuild 3134 RMD160 83833605d9930ea81e6d80fbd70114df76e55219 SHA1 cd4689976639175d581d34114db4dc18c8e86123 SHA256 41c32033c9945a39c0aebb6b0271767031d53a47e5c8365d9e3a7c86712e24cd
 EBUILD netbeans-apisupport-7.1.ebuild 3139 RMD160 c824bd790ac08ea0b5fb82f6ce3cd06860303fb9 SHA1 fcbf90f1a2dc92360e6d6bbeaebc9893d60a2611 SHA256 ab0f9bcb8787975ab63c2f3ed0554dc64ec468f20a913aceb05cedae0d23542f
 EBUILD netbeans-apisupport-9999_p20120219.ebuild 3166 RMD160 cd1eebe445ad9b896f3bca812c44bb5fc7d94bbd SHA1 93a6a428dc5918bbe9c3c6e6222bdf910f2a28c6 SHA256 75e28fb40d2a2e697bb56ebc40e4d7a558b01c7f63413be18c5858b7ef7e5a3a
@@ -14,5 +15,6 @@ EBUILD netbeans-apisupport-9999_p20120222.ebuild 3166 RMD160 3deef66d906f80d9b56
 EBUILD netbeans-apisupport-9999_p20120227.ebuild 3166 RMD160 080e88f1508ff701ea157e68704beed03feb0b73 SHA1 5b10c1a912aecd47b4c5dda72b6f56d99378dd9b SHA256 743e1684947e25a6ec77e3ce6c1905f7cabc1aa74843d07fd08063ddb0d3999d
 EBUILD netbeans-apisupport-9999_p20120301.ebuild 3166 RMD160 1d0a9005e25703a54e57f7834d79c62f967a8d44 SHA1 89893b5333820723d581436af92dad490c30a404 SHA256 90f6a414541f40158217521a17ed0aa4805b41be7f3942efa448443494e5331d
 EBUILD netbeans-apisupport-9999_p20120303.ebuild 3166 RMD160 6423da45c9fdd3f71bb7fef956c0a1bd8951a1af SHA1 89c2a7696c35975b900c6db6e8429ceb9661d49d SHA256 bae25d933ca24c4905e555153445e05c251ffbf28bcba6048987c5dde4b12cb1
-MISC ChangeLog 28948 RMD160 f443c712cc1ba3135c2c1aa6b8ae901458905729 SHA1 003f402fc8ed5259a9065686eb20a494bfb8eb8f SHA256 de7aafd9317a13e97c4d0b6847b6586d7b7cc705061635cd1dab473b115e21fe
+EBUILD netbeans-apisupport-9999_p20120304.ebuild 3166 RMD160 499bf253f9d8687bb5ef1a6dda35d206be4a3e30 SHA1 47f849917ad230bb52a3700b2acd22022d035c8c SHA256 b5e9dafbb27b3ac026840305da6ded19b7e4edaf0076559482e78b6ac1794d8e
+MISC ChangeLog 29132 RMD160 f5dbbe3da9d3ba4764e3dfb88291f9ad1e7ffeb4 SHA1 a1331efa02cb3ebad98d6fb8bb260ada415381a1 SHA256 944e2b09afe727017557e18b6a3edcc5fe7525dd0de53617ba1fd9f63eefd407
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20120304.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20120304.ebuild
new file mode 100644
index 0000000..281c458
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20120304.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans API Support Cluster"
+HOMEPAGE="http://netbeans.org/projects/apisupport"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2012-03-04_04-00-40/zip/netbeans-trunk-nightly-201203040400-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.apisupport -Dext.binaries.downloaded=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r1-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r1-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 965e9ed..eb55f24 100644
--- a/dev-java/netbeans-cnd/ChangeLog
+++ b/dev-java/netbeans-cnd/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-cnd-9999_p20120304 (04 Mar 2012)
+
+  04 Mar 2012; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-cnd-9999_p20120304.ebuild:
+  Bumped to latest nightly module
+
 *netbeans-cnd-9999_p20120303 (03 Mar 2012)
 
   03 Mar 2012; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index 5249a84..f9229e9 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -14,6 +14,7 @@ DIST netbeans-trunk-nightly-201202220400-src.zip 174195023 RMD160 800aa796b42f79
 DIST netbeans-trunk-nightly-201202270400-src.zip 174236017 RMD160 91d77d72c626d19a3bb88ab54e5612bb25e9c284 SHA1 58ba5f403553b9f754bebcc526047914d0721e4e SHA256 ad81b677ea067a86ebd2e26f2c7a1b538115406ee7bd36a95bb3856d8a4d5913
 DIST netbeans-trunk-nightly-201203010400-src.zip 174453125 RMD160 18c55d8b3789cef77bfde78b3310e55eab20011a SHA1 18e5786d27bbbdc91110e4d88eff9780b4dfc5cd SHA256 b1429ceebbaaefc169dc290870a66452b28c017a355bfbe925c3eba6e015013b
 DIST netbeans-trunk-nightly-201203030400-src.zip 174515173 RMD160 c9d99881d451d04be8035e861b8c91a8c5768084 SHA1 d86dbf4f822663c19b46fb19b05e275ba0f710e6 SHA256 e4bccd6167404f55ae5983807388a8cfb7980b3b00d37253a6ac4df4e6dea115
+DIST netbeans-trunk-nightly-201203040400-src.zip 174521722 RMD160 fb5cf478d504b5fb86e00c8204998bdfbf3d03e4 SHA1 6a97490572215bc65cfdcc150c9f76b6795fec78 SHA256 e5e376831eb0104ecac58cce6da6e20a637f1c7c14ac0992c094dc61ed186f35
 EBUILD netbeans-cnd-7.0.1.ebuild 4495 RMD160 7ae92927ff3a4bf2b69385c0d6898e2cb98c68d7 SHA1 63a4276dd98cadddcc1e87183df9135fb0d70057 SHA256 35b1368456dd7495507a3a093e7e4a6d9caf21818138b9d600a8a97791b11670
 EBUILD netbeans-cnd-7.1.ebuild 4107 RMD160 e84143f3e187ba80154f90e9b9af364bd2d11c75 SHA1 08f8dae281bce64c4613e4fc9c76149294563e3d SHA256 af94b922a3cb395f421a8e76faa472668ef1015e2e58aad19dfa213c66710811
 EBUILD netbeans-cnd-9999_p20120219.ebuild 4134 RMD160 b270f3bd104e5de43da37b4f56d26d445adfe6bc SHA1 474c8a41a611ff21f9937449989bc61e68cf47b9 SHA256 b3735faf4995452b3a4e23ed42b8eaa2fecf3edf391c5cc6f89dc4017dd8a921
@@ -21,5 +22,6 @@ EBUILD netbeans-cnd-9999_p20120222.ebuild 4134 RMD160 e250eaffa6a1b30c2dcf2f883b
 EBUILD netbeans-cnd-9999_p20120227.ebuild 4134 RMD160 4ffe779ae54f7b9f1369cf4065c474f81357e26d SHA1 40ed0e1628e810527a5c852d843ddd2392ed0334 SHA256 39cfdf01747cfdfe23b63f3f1344451d32a4bdc2432c105fec2f7fda01aba39e
 EBUILD netbeans-cnd-9999_p20120301.ebuild 4134 RMD160 8787c85b2122b3196c753aba51e4c5fd784b15e9 SHA1 6ab343af0bd253f067b06fa0fa35fc06b464135b SHA256 87eb4bcb6fd48c902e77d35912192b108f7381073727e90705d168c13424411b
 EBUILD netbeans-cnd-9999_p20120303.ebuild 4134 RMD160 3181dda55e197b2a74ba95e14a94a1580a455aec SHA1 f4c6438aca0e98a2d841e994a31e0a32ae472598 SHA256 5fd71e673f7bf1e1ea59e766e2dbe7a26882c1052df1a40a931f504fb7c4a80f
-MISC ChangeLog 26719 RMD160 143ce7ecc49d11df73edc0ed86189466bea8f898 SHA1 fd4acdc64643a299b3551f99bef90bd28617e663 SHA256 2ae16a4935f74e998e9a3f7927e89fe4489e9a047472e350e5505d57e0182d64
+EBUILD netbeans-cnd-9999_p20120304.ebuild 4134 RMD160 a62aa90399abe614f4dc5709f08a3b461ebcd56b SHA1 b33c7e3067c862857c28f2612d091991d01ceec9 SHA256 8976f041b897e1d2c83b537366845abae33e1a2a2b0011a0a780c6c71472ea04
+MISC ChangeLog 26889 RMD160 3efc7e502416d17e422992dfae8fbda23cffacce SHA1 ce9b9a59aaf114c6699bc70d401bcb395d4ee022 SHA256 a12b91227461d612694371d3b4a5a27da90dc82cbd9028d098e7b48d6ebaa3bb
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20120304.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20120304.ebuild
new file mode 100644
index 0000000..d9e66f7
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20120304.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans CND Cluster"
+HOMEPAGE="http://netbeans.org/projects/cnd"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2012-03-04_04-00-40/zip/netbeans-trunk-nightly-201203040400-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/11B1CFD9AB9B7BB572F272CD1972693D1E9721E9-antlr-3.3.jar
+	http://hg.netbeans.org/binaries/C4CF9314A530E51B891D46DB65806A5A0ED240AF-cnd-build-trace-1.0.zip
+	http://hg.netbeans.org/binaries/84F10BEAA967E2896F0B43B0BBD08D834841F554-cnd-rfs-1.0.zip
+	http://hg.netbeans.org/binaries/41A2A50A59225CAB20940E88A67B8BADFC0F45AF-open-fortran-parser-0.7.1.2.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-dlight-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.cnd -Dext.binaries.downloaded=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r1-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/11B1CFD9AB9B7BB572F272CD1972693D1E9721E9-antlr-3.3.jar libs.antlr3.devel/external/antlr-3.3.jar || die
+	ln -s "${DISTDIR}"/C4CF9314A530E51B891D46DB65806A5A0ED240AF-cnd-build-trace-1.0.zip cnd.discovery/external/cnd-build-trace-1.0.zip || die
+	ln -s "${DISTDIR}"/84F10BEAA967E2896F0B43B0BBD08D834841F554-cnd-rfs-1.0.zip cnd.remote/external/cnd-rfs-1.0.zip || die
+	ln -s "${DISTDIR}"/41A2A50A59225CAB20940E88A67B8BADFC0F45AF-open-fortran-parser-0.7.1.2.zip cnd.modelimpl/external/open-fortran-parser-0.7.1.2.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-dlight-${SLOT} dlight || die
+	cat /usr/share/netbeans-dlight-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.dlight.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/cnd >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/cnd$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	fperms 755 bin/dorun.sh
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/cnd
+}

diff --git a/dev-java/netbeans-dlight/ChangeLog b/dev-java/netbeans-dlight/ChangeLog
index 812f2c6..31ffd2c 100644
--- a/dev-java/netbeans-dlight/ChangeLog
+++ b/dev-java/netbeans-dlight/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-dlight-9999_p20120304 (04 Mar 2012)
+
+  04 Mar 2012; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-dlight-9999_p20120304.ebuild:
+  Bumped to latest nightly module
+
 *netbeans-dlight-9999_p20120303 (03 Mar 2012)
 
   03 Mar 2012; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 0911ff8..7512833 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -10,6 +10,7 @@ DIST netbeans-trunk-nightly-201202220400-src.zip 174195023 RMD160 800aa796b42f79
 DIST netbeans-trunk-nightly-201202270400-src.zip 174236017 RMD160 91d77d72c626d19a3bb88ab54e5612bb25e9c284 SHA1 58ba5f403553b9f754bebcc526047914d0721e4e SHA256 ad81b677ea067a86ebd2e26f2c7a1b538115406ee7bd36a95bb3856d8a4d5913
 DIST netbeans-trunk-nightly-201203010400-src.zip 174453125 RMD160 18c55d8b3789cef77bfde78b3310e55eab20011a SHA1 18e5786d27bbbdc91110e4d88eff9780b4dfc5cd SHA256 b1429ceebbaaefc169dc290870a66452b28c017a355bfbe925c3eba6e015013b
 DIST netbeans-trunk-nightly-201203030400-src.zip 174515173 RMD160 c9d99881d451d04be8035e861b8c91a8c5768084 SHA1 d86dbf4f822663c19b46fb19b05e275ba0f710e6 SHA256 e4bccd6167404f55ae5983807388a8cfb7980b3b00d37253a6ac4df4e6dea115
+DIST netbeans-trunk-nightly-201203040400-src.zip 174521722 RMD160 fb5cf478d504b5fb86e00c8204998bdfbf3d03e4 SHA1 6a97490572215bc65cfdcc150c9f76b6795fec78 SHA256 e5e376831eb0104ecac58cce6da6e20a637f1c7c14ac0992c094dc61ed186f35
 EBUILD netbeans-dlight-7.0.1.ebuild 3624 RMD160 508b76c4699c15431166be0200cb5b8c69400a2b SHA1 f72af18653ce0a3e4576d1fadcec350ed5a16b3d SHA256 499a9303a1972ee89dfa2685e1dc1e4511c7531ff3b29caadd1136ba25dee82e
 EBUILD netbeans-dlight-7.1.ebuild 2931 RMD160 a395361b08eb1ee7fa74f71bc22153085f545f4c SHA1 565286e4bad373585e8871e43ca548e55cd7fea7 SHA256 968f297c5151743472a5979b57cf9917a8067b6e870900cdde077640ad60cb0f
 EBUILD netbeans-dlight-9999_p20120219.ebuild 2958 RMD160 f9664f31d21b50507cd7cdf9c508ba18ceaa5499 SHA1 2b89f0bee377e987e0a68aa20588df312bc3ed25 SHA256 3c0c3bd11f01bd4f45a004e198a37afa221abe3f7b80af83ba03513e33e2b103
@@ -17,5 +18,6 @@ EBUILD netbeans-dlight-9999_p20120222.ebuild 2958 RMD160 36b0c50cfa297db12034558
 EBUILD netbeans-dlight-9999_p20120227.ebuild 2958 RMD160 6a13478927a803de561c9700eb01a5d63eec0d54 SHA1 737f9fa95c0da9e58c63141cac0a2a7aaece0a05 SHA256 4d34008e20efc158719705ec4809ea4da3b9aeaef647765439a69adde9233ea8
 EBUILD netbeans-dlight-9999_p20120301.ebuild 2958 RMD160 9ef34eb1188dcd82cb44d2ee937b5f3811b8a0ec SHA1 77fcfed4d478129ba1da78a33225c2ca4528db5d SHA256 3f40fbcb5d4fc6cd97179f282e42f7cf9273463392f58341934fe2a006c448e6
 EBUILD netbeans-dlight-9999_p20120303.ebuild 2958 RMD160 84ad72875026649119db33004c81a70873996bf4 SHA1 b7fd7ee109b1148a4351ba5887dbb1711f326396 SHA256 4abd091d3aa56fa1aca2de01e35f845af2678c4cdca4b2cc348b7cdb37cd02ae
-MISC ChangeLog 27702 RMD160 403ea22ce0b64cccd6f5867b41a88518701a99d8 SHA1 202012a272adb2998c371bd2693566719dd309be SHA256 3289bb8130e91f1f2e3a79bc0e0175da03db68f02dc0343e7855ebf13465892c
+EBUILD netbeans-dlight-9999_p20120304.ebuild 2958 RMD160 194f2ec42b48bdfa055dec988f1466359663f2e3 SHA1 73ec3a04d10f8cfce5d7619c12a9178a6b8a7883 SHA256 b5de6111393fa71c850c9252109c59dd19f181f01e584d45374cdf31384f5ef8
+MISC ChangeLog 27878 RMD160 d5aee6439dc5f90962e5a06ee52b3fd2305430ff SHA1 58abb5e537305d86a7ac06ce7fa5eab4d7e6eb7d SHA256 d6b5e9486523b7d7b3e91b2d970468d7dc9538fa00f8b0d9899b57769c66ca48
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20120304.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20120304.ebuild
new file mode 100644
index 0000000..fee0dde
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20120304.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans D-Light Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2012-03-04_04-00-40/zip/netbeans-trunk-nightly-201203040400-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/F787C9B484CD7526F866C21D8925C4DACE467F8A-derby-10.2.2.0.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.dlight -Dext.binaries.downloaded=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r1-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/F787C9B484CD7526F866C21D8925C4DACE467F8A-derby-10.2.2.0.jar db/external/derby-10.2.2.0.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/dlight >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/dlight$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/dlight
+}

diff --git a/dev-java/netbeans-enterprise/ChangeLog b/dev-java/netbeans-enterprise/ChangeLog
index ec32875..8a0143a 100644
--- a/dev-java/netbeans-enterprise/ChangeLog
+++ b/dev-java/netbeans-enterprise/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-enterprise-9999_p20120304 (04 Mar 2012)
+
+  04 Mar 2012; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-enterprise-9999_p20120304.ebuild:
+  Bumped to latest nightly module
+
 *netbeans-enterprise-9999_p20120303 (03 Mar 2012)
 
   03 Mar 2012; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 66e8596..378db28 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -49,6 +49,7 @@ DIST netbeans-trunk-nightly-201202220400-src.zip 174195023 RMD160 800aa796b42f79
 DIST netbeans-trunk-nightly-201202270400-src.zip 174236017 RMD160 91d77d72c626d19a3bb88ab54e5612bb25e9c284 SHA1 58ba5f403553b9f754bebcc526047914d0721e4e SHA256 ad81b677ea067a86ebd2e26f2c7a1b538115406ee7bd36a95bb3856d8a4d5913
 DIST netbeans-trunk-nightly-201203010400-src.zip 174453125 RMD160 18c55d8b3789cef77bfde78b3310e55eab20011a SHA1 18e5786d27bbbdc91110e4d88eff9780b4dfc5cd SHA256 b1429ceebbaaefc169dc290870a66452b28c017a355bfbe925c3eba6e015013b
 DIST netbeans-trunk-nightly-201203030400-src.zip 174515173 RMD160 c9d99881d451d04be8035e861b8c91a8c5768084 SHA1 d86dbf4f822663c19b46fb19b05e275ba0f710e6 SHA256 e4bccd6167404f55ae5983807388a8cfb7980b3b00d37253a6ac4df4e6dea115
+DIST netbeans-trunk-nightly-201203040400-src.zip 174521722 RMD160 fb5cf478d504b5fb86e00c8204998bdfbf3d03e4 SHA1 6a97490572215bc65cfdcc150c9f76b6795fec78 SHA256 e5e376831eb0104ecac58cce6da6e20a637f1c7c14ac0992c094dc61ed186f35
 EBUILD netbeans-enterprise-7.0.1.ebuild 16338 RMD160 0ecafb9ced600f753a5ab6359d6c762313ac2631 SHA1 d710a4694c708d8f78cfe04211ad1a199fa6ce0a SHA256 03ea08daaf5d4c5592937929bac33b4af3bac00a23f2167a7ef7b3c172a72abe
 EBUILD netbeans-enterprise-7.1.ebuild 18056 RMD160 52cf2c5c4ba0d48b9d6c07bb53f472fe36bee46b SHA1 2ea10dcf651401961b58e905318c3797e31320ae SHA256 9122513da95e1cee1e32d9053a88c6d03d5c6376d0d0ac4c53785429d726df0b
 EBUILD netbeans-enterprise-9999_p20120219.ebuild 18083 RMD160 7f50126f233274cc0e20c1a9995120a1e7bb00f0 SHA1 6b7ffd142959d8b7cb25f30e68eede6dbbd21b6f SHA256 6cb0869756820da07c94a24682088eba9bae3d46dd79255c53867e3ad9cf8847
@@ -56,5 +57,6 @@ EBUILD netbeans-enterprise-9999_p20120222.ebuild 18083 RMD160 f89d2f9e875811bd19
 EBUILD netbeans-enterprise-9999_p20120227.ebuild 18083 RMD160 ac28c9f93818bfed5261d58ff23ac303abf2d2d9 SHA1 37243bfe3e383fe282b450e5cb139ed25090b5e7 SHA256 78925cd4192745aad24205684383a159d35ad8dcc93d63b1c0369f276ab14a46
 EBUILD netbeans-enterprise-9999_p20120301.ebuild 18319 RMD160 8ede5d42a5aada0811d361ac9d8d3de219327253 SHA1 fb1e4f56a2b4b3ab1435de57894772be9e96bbc0 SHA256 51b6d3608899f09d72532c86a07d840baa1ebc379788ab4fa4a1cf1ee326a16e
 EBUILD netbeans-enterprise-9999_p20120303.ebuild 18319 RMD160 197a19cfecc3783df60d6531048b8e840e949d0c SHA1 5a16ebf95b15e46f129e604e5c78854963c8bc80 SHA256 88ba951b46f4463aee22d61eab814ba7ed892b1e6d18e7a7023a17c60f6b1ae8
-MISC ChangeLog 29326 RMD160 3140ff16b1adbac82c6362ac2c88a0de8723bf05 SHA1 4c77ff294ced814259d15e2e792245e72c0bbf51 SHA256 1846229ae45ea108f480ac2b36ebea47d0245b2d30dba457f752d06d88717fb8
+EBUILD netbeans-enterprise-9999_p20120304.ebuild 18319 RMD160 bcad7ba4edf9991a56a8e03583cc0fc24498bea6 SHA1 7238278be55713addec13994876c9d3137b0c4c0 SHA256 e8348b19c1cc386b19bb2f79c6faaac6ee0a40960f6f4c63230dd719421d2edb
+MISC ChangeLog 29510 RMD160 1340aa67239dea4d75bb7f4e76087909d045ea0a SHA1 17c9cc8a9d82228898f26dfad65718fb04f0b581 SHA256 ecb06dedba6db4c9b65b68bf13d07ab438109eb1fc0a7529a963c01b8dfc1204
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20120304.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20120304.ebuild
new file mode 100644
index 0000000..a5625ea
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20120304.ebuild
@@ -0,0 +1,323 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Enterprise cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2012-03-04_04-00-40/zip/netbeans-trunk-nightly-201203040400-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-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/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip
+	http://hg.netbeans.org/binaries/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip
+	http://hg.netbeans.org/binaries/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip
+	http://hg.netbeans.org/binaries/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-profiler-${PV}
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-webcommon-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/commons-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"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r1-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}"/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip web.struts/external/struts-1.3.10-javadoc.zip || die
+	ln -s "${DISTDIR}"/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip web.struts/external/struts-1.3.10-lib.zip || die
+	ln -s "${DISTDIR}"/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip web.core.syntax/external/syntaxref20.zip || die
+	ln -s "${DISTDIR}"/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar javaee.api/external/webservices-api-osgi.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r1-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.10.jar
+	java-pkg_jar-from --build-only --into web.monitor/external tomcat-servlet-api-2.3 servlet.jar servlet-2.3.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-profiler-${SLOT} profiler || die
+	cat /usr/share/netbeans-profiler-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.profiler.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-webcommon-${SLOT} webcommon || die
+	cat /usr/share/netbeans-webcommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.webcommon.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/enterprise >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/enterprise$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-fileupload-1.0.jar && dosym /usr/share/commons-fileupload/lib/commons-fileupload.jar ${instdir}/commons-fileupload-1.0.jar || die
+	# el-impl.jar
+	# glassfish-jspparser-3.0.jar
+	# glassfish-logging-2.0.jar
+	# javaee-api-6.0.jar
+	# javaee-api-6.0-license.txt
+	# javaee-web-api-6.0.jar
+	# javaee-web-api-6.0-license.txt
+	# jsp-parser-ext.jar
+	rm jsr88javax.jar && dosym /usr/share/glassfish-deployment-api-1.2/lib/glassfish-deployment-api.jar ${instdir}/jsr88javax.jar || die
+	rm jstl.jar && dosym /usr/share/jakarta-jstl/lib/jstl.jar ${instdir}/jstl.jar || die
+	# org-netbeans-modules-web-httpmonitor.jar
+	# servlet3.0-jsp2.2-api.jar
+	rm standard.jar && dosym /usr/share/jakarta-jstl/lib/standard.jar ${instdir}/standard.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/javaee6-endorsed
+	pushd "${D}"/${instdir} >/dev/null || die
+	# javax.annotation.jar
+	# javax.annotation-license.txt
+	# jaxb-api-osgi.jar
+	# jaxb-api-osgi-license.txt
+	# webservices-api-osgi.jar
+	# webservices-api-osgi-license.txt
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jsf-1_2
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-beanutils.jar && dosym /usr/share/commons-beanutils-1.7/lib/commons-beanutils.jar ${instdir}/commons-beanutils.jar || die
+	rm commons-collections.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections.jar || die
+	rm commons-digester.jar && dosym /usr/share/commons-digester/lib/commons-digester.jar ${instdir}/commons-digester.jar || die
+	rm commons-logging.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging.jar || die
+	# jsf-api.jar
+	# jsf-impl.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jsf-2_1
+	pushd "${D}"/${instdir} >/dev/null || die
+	# jsf-api.jar
+	# jsf-impl.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/metro
+	pushd "${D}"/${instdir} >/dev/null || die
+	# webservices-api.jar
+	# webservices-extra-api.jar
+	# webservices-extra.jar
+	# webservices-rt.jar
+	# webservices-tools.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/primefaces
+	pushd "${D}"/${instdir} >/dev/null || die
+	# primefaces-2.1.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/rest
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm asm-3.1.jar && dosym /usr/share/asm-3/lib/asm.jar ${instdir}/asm-3.1.jar || die
+	# jackson-core-asl-1.1.1.jar
+	# jersey-client-1.3.jar
+	# jersey-core-1.3.jar
+	# jersey-json-1.3.jar
+	# jersey-multipart-1.3.jar
+	# jersey-server-1.3.jar
+	# jersey-spring-1.3.jar
+	rm jettison-1.1.jar && dosym /usr/share/jettison/lib/jettison.jar ${instdir}/jettison-1.1.jar || die
+	rm jsr311-api-1.1.1.jar && dosym /usr/share/jsr311-api/lib/jsr311-api.jar ${instdir}/jsr311-api-1.1.1.jar || die
+	# mimepull-1.4.jar
+	# oauth-client-1.3.jar
+	# oauth-signature-1.3.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/spring
+	pushd "${D}"/${instdir} >/dev/null || die
+	# spring-webmvc-2.5.6.SEC01.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/struts
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm antlr-2.7.2.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.2.jar || die
+	rm bsf-2.3.0.jar && dosym /usr/share/bsf-2.3/lib/bsf.jar ${instdir}/bsf-2.3.0.jar || die
+	rm commons-beanutils-1.8.0.jar && dosym /usr/share/commons-beanutils-1.7/lib/commons-beanutils.jar ${instdir}/commons-beanutils-1.8.0.jar || die
+	rm commons-digester-1.8.jar && dosym /usr/share/commons-digester/lib/commons-digester.jar ${instdir}/commons-digester-1.8.jar || die
+	rm commons-fileupload-1.1.1.jar && dosym /usr/share/commons-fileupload/lib/commons-fileupload.jar ${instdir}/commons-fileupload-1.1.1.jar || die
+	# rm commons-chain-1.1.jar && dosym /usr/share/commons-chain-1.1/lib/commons-chain.jar ${instdir}/commons-chain-1.1.jar || die
+	rm commons-io-1.1.jar && dosym /usr/share/commons-io-1/lib/commons-io.jar ${instdir}/commons-io-1.1.jar || die
+	rm commons-logging-1.0.4.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.0.4.jar || die
+	rm commons-validator-1.3.1.jar && dosym /usr/share/commons-validator/lib/commons-validator.jar ${instdir}/commons-validator-1.3.1.jar || die
+	rm jstl-1.0.2.jar && dosym /usr/share/jakarta-jstl/lib/jstl.jar ${instdir}/jstl-1.0.2.jar || die
+	rm oro-2.0.8.jar && dosym /usr/share/jakarta-oro-2.0/lib/jakarta-oro.jar ${instdir}/oro-2.0.8.jar || die
+	rm standard-1.0.6.jar && dosym /usr/share/jakarta-jstl/lib/standard.jar ${instdir}/standard-1.0.6.jar || die
+	# struts-core-1.3.8.jar
+	# struts-el-1.3.8.jar
+	# struts-extras-1.3.8.jar
+	# struts-faces-1.3.8.jar
+	# struts-mailreader-dao-1.3.8.jar
+	# struts-scripting-1.3.8.jar
+	# struts-taglib-1.3.8.jar
+	# struts-tiles-1.3.8.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/enterprise
+}

diff --git a/dev-java/netbeans-ergonomics/ChangeLog b/dev-java/netbeans-ergonomics/ChangeLog
index b1dbeed..d752bf5 100644
--- a/dev-java/netbeans-ergonomics/ChangeLog
+++ b/dev-java/netbeans-ergonomics/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-ergonomics-9999_p20120304 (04 Mar 2012)
+
+  04 Mar 2012; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-ergonomics-9999_p20120304.ebuild:
+  Bumped to latest nightly module
+
 *netbeans-ergonomics-9999_p20120303 (03 Mar 2012)
 
   03 Mar 2012; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 1374181..1833c7f 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -7,6 +7,7 @@ DIST netbeans-trunk-nightly-201202220400-src.zip 174195023 RMD160 800aa796b42f79
 DIST netbeans-trunk-nightly-201202270400-src.zip 174236017 RMD160 91d77d72c626d19a3bb88ab54e5612bb25e9c284 SHA1 58ba5f403553b9f754bebcc526047914d0721e4e SHA256 ad81b677ea067a86ebd2e26f2c7a1b538115406ee7bd36a95bb3856d8a4d5913
 DIST netbeans-trunk-nightly-201203010400-src.zip 174453125 RMD160 18c55d8b3789cef77bfde78b3310e55eab20011a SHA1 18e5786d27bbbdc91110e4d88eff9780b4dfc5cd SHA256 b1429ceebbaaefc169dc290870a66452b28c017a355bfbe925c3eba6e015013b
 DIST netbeans-trunk-nightly-201203030400-src.zip 174515173 RMD160 c9d99881d451d04be8035e861b8c91a8c5768084 SHA1 d86dbf4f822663c19b46fb19b05e275ba0f710e6 SHA256 e4bccd6167404f55ae5983807388a8cfb7980b3b00d37253a6ac4df4e6dea115
+DIST netbeans-trunk-nightly-201203040400-src.zip 174521722 RMD160 fb5cf478d504b5fb86e00c8204998bdfbf3d03e4 SHA1 6a97490572215bc65cfdcc150c9f76b6795fec78 SHA256 e5e376831eb0104ecac58cce6da6e20a637f1c7c14ac0992c094dc61ed186f35
 EBUILD netbeans-ergonomics-7.0.1.ebuild 2884 RMD160 3ce16ca958ba2e556cd0e2361cb94cc0cf4bbe62 SHA1 ed3139bb1005c01513c3b0e2602a71622f81ecc9 SHA256 e8e4a785fc11b6d0d3c722826761581b8c9c779c5460dc7d1487b3154f4402ab
 EBUILD netbeans-ergonomics-7.1.ebuild 2889 RMD160 376d5048c3560a72d52c09b6aede1b109cbd29f5 SHA1 72989f52f0f3e11606c48d28413d0166d06d5b33 SHA256 dfb1665bfbfca3b3f1a5608b1f2f809590f2bb451c5b2a284d35f9957ec80ceb
 EBUILD netbeans-ergonomics-9999_p20120219.ebuild 2916 RMD160 148ce70524964c14907b33d2f7f796c96b290372 SHA1 6e6135afb9f1996ccf7501453b6c26e42f183d40 SHA256 d1c48914a2702e1ba9ee938708936f552fff8a8c33b3653793f8e67e1e1aface
@@ -14,5 +15,6 @@ EBUILD netbeans-ergonomics-9999_p20120222.ebuild 2916 RMD160 b4c447ee8992a62542d
 EBUILD netbeans-ergonomics-9999_p20120227.ebuild 2916 RMD160 95891fe03bd376657ed467a81a5f4e7519e3059a SHA1 ef798ae2715d6d7c1ce58e9d733daa39c5afa5d2 SHA256 3a10723b4dfd3675c85fc5edde2b43df6bffb2255db55ed41bef7d7e3342ec45
 EBUILD netbeans-ergonomics-9999_p20120301.ebuild 2916 RMD160 63617cb2e376e5f3401222263d0380d82c142428 SHA1 ffe0fbc74ea9944eb465504f528d9ad1dd3b84a9 SHA256 7720fc0c93f8025832016089659456902dd9291c4fbd87a4105c79fc21de6496
 EBUILD netbeans-ergonomics-9999_p20120303.ebuild 2916 RMD160 ee4178f3a0d156bd9174772c8ebf877b45aa678f SHA1 9743f23459b454ee534e41743b1aa7a38d48ea29 SHA256 cabef3a525d42396515436628bf631166c3c6ea2574731739e0c9be26e54880a
-MISC ChangeLog 28948 RMD160 32ada4b81c1414cd30fdf89e693215784018dcbc SHA1 54591fecb42f6c95d59b09fe6e8fadeb8c6c4f81 SHA256 229e76ae51ac99a04bc0ab6eba2c981d1b364f8ac006bbcaed95c627921057d9
+EBUILD netbeans-ergonomics-9999_p20120304.ebuild 2916 RMD160 a4018323aae1e3e57c031e92a6b533826b46e4ac SHA1 283b9ea5d18c13ff5b8b2e9e5b853f3483afcf73 SHA256 3dbceb06509df3bdd8da2b1c13d3180fc227b31b7bc0301d7cb86c708242e091
+MISC ChangeLog 29132 RMD160 8c9d815ebe44913048a323a31b697808bf52374a SHA1 19630af1d07d5ebbfb341a8ca31b1c9a22fd976a SHA256 c6d9a4c12a95c9a0a0744311d7e44fe04b0a01fe2ad9a2d67fb48643ef4981e9
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20120304.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20120304.ebuild
new file mode 100644
index 0000000..04ac194
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20120304.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Ergonomics Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2012-03-04_04-00-40/zip/netbeans-trunk-nightly-201203040400-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-nb-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ergonomics -Dext.binaries.downloaded=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r1-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r1-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 82aa70a..e6acefa 100644
--- a/dev-java/netbeans-groovy/ChangeLog
+++ b/dev-java/netbeans-groovy/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-groovy-9999_p20120304 (04 Mar 2012)
+
+  04 Mar 2012; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-groovy-9999_p20120304.ebuild:
+  Bumped to latest nightly module
+
 *netbeans-groovy-9999_p20120303 (03 Mar 2012)
 
   03 Mar 2012; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index 8bfb486..82ff844 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -9,6 +9,7 @@ DIST netbeans-trunk-nightly-201202220400-src.zip 174195023 RMD160 800aa796b42f79
 DIST netbeans-trunk-nightly-201202270400-src.zip 174236017 RMD160 91d77d72c626d19a3bb88ab54e5612bb25e9c284 SHA1 58ba5f403553b9f754bebcc526047914d0721e4e SHA256 ad81b677ea067a86ebd2e26f2c7a1b538115406ee7bd36a95bb3856d8a4d5913
 DIST netbeans-trunk-nightly-201203010400-src.zip 174453125 RMD160 18c55d8b3789cef77bfde78b3310e55eab20011a SHA1 18e5786d27bbbdc91110e4d88eff9780b4dfc5cd SHA256 b1429ceebbaaefc169dc290870a66452b28c017a355bfbe925c3eba6e015013b
 DIST netbeans-trunk-nightly-201203030400-src.zip 174515173 RMD160 c9d99881d451d04be8035e861b8c91a8c5768084 SHA1 d86dbf4f822663c19b46fb19b05e275ba0f710e6 SHA256 e4bccd6167404f55ae5983807388a8cfb7980b3b00d37253a6ac4df4e6dea115
+DIST netbeans-trunk-nightly-201203040400-src.zip 174521722 RMD160 fb5cf478d504b5fb86e00c8204998bdfbf3d03e4 SHA1 6a97490572215bc65cfdcc150c9f76b6795fec78 SHA256 e5e376831eb0104ecac58cce6da6e20a637f1c7c14ac0992c094dc61ed186f35
 EBUILD netbeans-groovy-7.0.1.ebuild 3296 RMD160 8dfd04f7498e840e727faa16d85c1e6998933be3 SHA1 8c5f081cb89500e97feedfd39824fd913fed8044 SHA256 29c3d304eca5999e78550fd715dbcbef9d15639d4e4f17fa0e45a46803080729
 EBUILD netbeans-groovy-7.1.ebuild 3301 RMD160 4d265db3e6761989f609c31528e325aea3d137e1 SHA1 e2406543dfe0af45b78f3e16ec46354f7e094596 SHA256 2404e8fff70514c00c3d040aaad1b53c16738236d4ff513a80314e2b6fe04797
 EBUILD netbeans-groovy-9999_p20120219.ebuild 3349 RMD160 f8910ae5a9f76e27a8484bb1740d11c84376105b SHA1 1148af1cff6a60d6bc597ef07440525fedf8727b SHA256 c1f863c05a9cfc42f06c2da08be69f2dc30f3e2b5ad0004065720253d1bbbf4d
@@ -16,5 +17,6 @@ EBUILD netbeans-groovy-9999_p20120222.ebuild 3349 RMD160 11becef3f6906dd0b3ef246
 EBUILD netbeans-groovy-9999_p20120227.ebuild 3349 RMD160 2221dfb1440edd116ce224ac0df06ff117b5a50f SHA1 0e08874f745a131622c7883fb54d5f21c7a73d44 SHA256 87ff7f09558da4d330047e4d47afa75fe670924d361a6bec008c1e6542544d96
 EBUILD netbeans-groovy-9999_p20120301.ebuild 3349 RMD160 fb53349e95fa60eb756f1702d0afabf6c82fca05 SHA1 4fd2648c51e5762bfaf791162eb388ead86b0270 SHA256 e4fc18265f5f93add06a1e75963d46cb6f0ff5dc405c28305318e98447c4f706
 EBUILD netbeans-groovy-9999_p20120303.ebuild 3349 RMD160 0b8cd14d5fe3246f730b130311a4cf7d4f5010f8 SHA1 cea2f2d6eeb9a6a95deb9440cf67b30cae48808b SHA256 d2a2a00e3d016abcad9fef25571f43d11d8f12b44def8e999fdcf7feb1427502
-MISC ChangeLog 27702 RMD160 1427b7caff67b58e2afb5bb7ca6ecb128a549ae9 SHA1 6242e9ad72aa163057fcfbce04c846fc2d0e7962 SHA256 6d49f59d7ed4a45a55ee1ae6a97cd914c619b79637aa7f0aa419a6e90a1c46b9
+EBUILD netbeans-groovy-9999_p20120304.ebuild 3349 RMD160 4357728657041b1be2d7f9627591622f549fd483 SHA1 ad8925ea3d007002857dd9478ac49e6bfb0f3a30 SHA256 dd708831f9340c1b14f185f310315bc43595f44d1089f046b62921a727a40118
+MISC ChangeLog 27878 RMD160 d130d1ca22cae138e24b1c30db2cdcdcfb85cddc SHA1 b10a98d2c785a51c7a6c80e7fbb1ae4b5ad778c7 SHA256 17bb050e16301f188c88be7e4f6fc8b8b11f0d215ea59c8b3753fa80f1267a58
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20120304.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20120304.ebuild
new file mode 100644
index 0000000..d3a3bdb
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20120304.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Groovy Cluster"
+HOMEPAGE="http://netbeans.org/projects/groovy"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2012-03-04_04-00-40/zip/netbeans-trunk-nightly-201203040400-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/73F30341DFC0BD8E51D31B96498DBD90F4890CF8-groovy-all-1.9.0-beta-4.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.groovy -Dext.binaries.downloaded=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r1-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/73F30341DFC0BD8E51D31B96498DBD90F4890CF8-groovy-all-1.9.0-beta-4.jar groovy.editor/external/groovy-all-1.9.0-beta-4.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r1-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 f31616c..f6c2fbe 100644
--- a/dev-java/netbeans-harness/ChangeLog
+++ b/dev-java/netbeans-harness/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-harness-9999_p20120304 (04 Mar 2012)
+
+  04 Mar 2012; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-harness-9999_p20120304.ebuild:
+  Bumped to latest nightly module
+
 *netbeans-harness-9999_p20120303 (03 Mar 2012)
 
   03 Mar 2012; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index e14893c..cdee5c7 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -9,6 +9,7 @@ DIST netbeans-trunk-nightly-201202220400-src.zip 174195023 RMD160 800aa796b42f79
 DIST netbeans-trunk-nightly-201202270400-src.zip 174236017 RMD160 91d77d72c626d19a3bb88ab54e5612bb25e9c284 SHA1 58ba5f403553b9f754bebcc526047914d0721e4e SHA256 ad81b677ea067a86ebd2e26f2c7a1b538115406ee7bd36a95bb3856d8a4d5913
 DIST netbeans-trunk-nightly-201203010400-src.zip 174453125 RMD160 18c55d8b3789cef77bfde78b3310e55eab20011a SHA1 18e5786d27bbbdc91110e4d88eff9780b4dfc5cd SHA256 b1429ceebbaaefc169dc290870a66452b28c017a355bfbe925c3eba6e015013b
 DIST netbeans-trunk-nightly-201203030400-src.zip 174515173 RMD160 c9d99881d451d04be8035e861b8c91a8c5768084 SHA1 d86dbf4f822663c19b46fb19b05e275ba0f710e6 SHA256 e4bccd6167404f55ae5983807388a8cfb7980b3b00d37253a6ac4df4e6dea115
+DIST netbeans-trunk-nightly-201203040400-src.zip 174521722 RMD160 fb5cf478d504b5fb86e00c8204998bdfbf3d03e4 SHA1 6a97490572215bc65cfdcc150c9f76b6795fec78 SHA256 e5e376831eb0104ecac58cce6da6e20a637f1c7c14ac0992c094dc61ed186f35
 EBUILD netbeans-harness-7.0.1.ebuild 3579 RMD160 dd36fe87364dc9a15cfad15b64f8d05e46632705 SHA1 d39ddfab960f1b9430a5eee2919d06e2854ae848 SHA256 f4d09cb7bd5e8485caf75a3020ddb8102d3ea326878ac384ef4aecb011a1f6a5
 EBUILD netbeans-harness-7.1.ebuild 3583 RMD160 2e7e58557d47c9903478ce7d4dca2e8e970d6cbf SHA1 ba7a38594180ef2af45240ab4b46b829bc7f096b SHA256 e84d837fba28e8d7038fc582544f6ed0668c62a60b4b1c0ebef3c85038068895
 EBUILD netbeans-harness-9999_p20120219.ebuild 3610 RMD160 b001917c302602d129e60685ce62affbc5ed79b2 SHA1 9fddc3dc3be852693db50da41010b111074e4ef8 SHA256 b2f76ad32685369dce2330b9244c3e2fcde3c331c47ca45ce50f659584f668ef
@@ -16,5 +17,6 @@ EBUILD netbeans-harness-9999_p20120222.ebuild 3610 RMD160 c9fe0b516c7b43422592ab
 EBUILD netbeans-harness-9999_p20120227.ebuild 3610 RMD160 db552eb40edca94fb8d62d5877ca97c733f1537e SHA1 7444f19e4ebe87fc0a279df4095c749a9f319494 SHA256 8d6e504d5a8ee89aecc838e57325aec401ee56ba3cb1b45e7ad2717b040f47ba
 EBUILD netbeans-harness-9999_p20120301.ebuild 3610 RMD160 ee53c714daee86347c24ba34706dde90f3bdad07 SHA1 f4afb075f2a509d614c30e81384acfdad46f672f SHA256 00694ed243b50352264c9e6f072fbaf3d1c110d28f036f04d7714093c00039d3
 EBUILD netbeans-harness-9999_p20120303.ebuild 3610 RMD160 3f70ac74549eb4ec352013bf6bec68af3cc71fef SHA1 f637635fbc832fc7599ccd4e8e252eea0322611d SHA256 6620836c4b16c57a94223440431525b0f6ecd262b80bebbf80c4aaffe19fe613
-MISC ChangeLog 28013 RMD160 52966e13a494cd0eebe88a0c3fb35bc3d59be3b8 SHA1 90c4c45c5281824caa1c8dbc98b38350a44f03a6 SHA256 802df02ecc507168a4ff1e88d3a91039b1414716a3b09da3cfb442488852ed55
+EBUILD netbeans-harness-9999_p20120304.ebuild 3610 RMD160 309a9252b96602125cc6083212828fa04418fdef SHA1 8ea37c1fbbc789a71ee353c9ee06c2389311dfec SHA256 17dfcf084aca90b4d3a60ee23f525f96f51d2af9846c33672f646dae5f0eef47
+MISC ChangeLog 28191 RMD160 327d7b7c071f057b55cec95a8caca7961abdf4b0 SHA1 2231b6e515bbc8976fea2d01b5066b0d1bedccf7 SHA256 552d97d1634dc660abf30198899ee61bc97b74942bc29a35ad944bbb02407a4b
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20120304.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20120304.ebuild
new file mode 100644
index 0000000..2647048
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20120304.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Harness"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2012-03-04_04-00-40/zip/netbeans-trunk-nightly-201203040400-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
+	http://hg.netbeans.org/binaries/418FC62C8A6EF5311987B01FE389B1F88EFDDCA2-jemmy-2.3.0.0.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	dev-java/javahelp:0"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}
+	>=dev-java/junit-4.4:4"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.harness -Dext.binaries.downloaded=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r1-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-r1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into apisupport.harness/external javahelp jsearch.jar jsearch-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.10.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/harness >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/harness$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	fperms 755 launchers/app.sh
+	find "${D}" -name "*.exe" -type f -delete
+
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/antlib
+	pushd "${D}"/${instdir} >/dev/null || die
+	# bindex-2.2.jar
+	rm jsearch-2.0_05.jar && dosym /usr/share/javahelp/lib/jsearch.jar ${instdir}/jsearch-2.0_05.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	# jemmy-2.3.0.0.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/harness
+}

diff --git a/dev-java/netbeans-ide/ChangeLog b/dev-java/netbeans-ide/ChangeLog
index 9d2075a..d29b5e3 100644
--- a/dev-java/netbeans-ide/ChangeLog
+++ b/dev-java/netbeans-ide/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-ide-9999_p20120304 (04 Mar 2012)
+
+  04 Mar 2012; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-ide-9999_p20120304.ebuild:
+  Bumped to latest nightly module
+
 *netbeans-ide-9999_p20120303 (03 Mar 2012)
 
   03 Mar 2012; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 5221d21..12ca523 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -77,6 +77,7 @@ DIST netbeans-trunk-nightly-201202220400-src.zip 174195023 RMD160 800aa796b42f79
 DIST netbeans-trunk-nightly-201202270400-src.zip 174236017 RMD160 91d77d72c626d19a3bb88ab54e5612bb25e9c284 SHA1 58ba5f403553b9f754bebcc526047914d0721e4e SHA256 ad81b677ea067a86ebd2e26f2c7a1b538115406ee7bd36a95bb3856d8a4d5913
 DIST netbeans-trunk-nightly-201203010400-src.zip 174453125 RMD160 18c55d8b3789cef77bfde78b3310e55eab20011a SHA1 18e5786d27bbbdc91110e4d88eff9780b4dfc5cd SHA256 b1429ceebbaaefc169dc290870a66452b28c017a355bfbe925c3eba6e015013b
 DIST netbeans-trunk-nightly-201203030400-src.zip 174515173 RMD160 c9d99881d451d04be8035e861b8c91a8c5768084 SHA1 d86dbf4f822663c19b46fb19b05e275ba0f710e6 SHA256 e4bccd6167404f55ae5983807388a8cfb7980b3b00d37253a6ac4df4e6dea115
+DIST netbeans-trunk-nightly-201203040400-src.zip 174521722 RMD160 fb5cf478d504b5fb86e00c8204998bdfbf3d03e4 SHA1 6a97490572215bc65cfdcc150c9f76b6795fec78 SHA256 e5e376831eb0104ecac58cce6da6e20a637f1c7c14ac0992c094dc61ed186f35
 EBUILD netbeans-ide-7.0.1.ebuild 22653 RMD160 fe693a0abc3253af1850b99bfb4fa0d9a488bd94 SHA1 5b6547694a3193ce89cc2a5dfb8fc134cb81fabe SHA256 4c1b3e46e2a6cb89d902c7f4fe6ad9306cbd0c9463a514e87d4c6ec019dc0356
 EBUILD netbeans-ide-7.1.ebuild 26830 RMD160 adfa597060947ce74484aa8abaaade9b1d4db3a3 SHA1 c2d66d647148ba602ff5f7ae7a7f66d0660050c9 SHA256 dc31adc2d38e9c67f7d7b48131506bfbec05bb37d3c394da48a6956e5a430cf3
 EBUILD netbeans-ide-9999_p20120219.ebuild 27119 RMD160 973fe646b71bc830a43ff279366861d5cb90a18e SHA1 b3f00c93d8e938e163e6be49f075dd3681fe6f9d SHA256 78921c556cce837895d8dbd389c5251690a1fefaf9dbc7b0bb4c6bf707fe2cf9
@@ -84,5 +85,6 @@ EBUILD netbeans-ide-9999_p20120222.ebuild 27119 RMD160 25cedab1f7c0781d75f7ba38f
 EBUILD netbeans-ide-9999_p20120227.ebuild 27119 RMD160 63d0814e9fe485a57e26067b29810a58d57a8000 SHA1 d11af555fd10df777d24c2531367f4eff291d7a9 SHA256 3ef0682960f44959f490828d7e84c6fb81fbfb64314e2af25635fc6edfa97c04
 EBUILD netbeans-ide-9999_p20120301.ebuild 27119 RMD160 6f3cc3767ab9c54f683562c638b8dfa1f02d18d2 SHA1 14e14d2e0a057b70089f5a09a487fe39779b87d0 SHA256 a28aa2937f4690c1b9b3aa9bb4d177ebdcae949d7ca524e4856047a63dc7d52b
 EBUILD netbeans-ide-9999_p20120303.ebuild 27119 RMD160 c6ca2a6205abcadaa4a92d41cc24a7382696057c SHA1 f36ee02f81f832d3748bc9429c3d7682649d4bb1 SHA256 1c7a5b2315b717ca4eb954b41478a8fee60406c679c4e73801a8ec694924528a
-MISC ChangeLog 27270 RMD160 3732e0ffef101065fca1c0340432f779055cc7b0 SHA1 9d7f8b7e0ff82f5f15e3df5bbdf1934d3dd2c432 SHA256 609e41f8b21767b92689099055ecd5f5a710fb7d79a42214b3923790975b6513
+EBUILD netbeans-ide-9999_p20120304.ebuild 27119 RMD160 04f6a6a6f51fd2e7ff60f28433563731fa9bfddb SHA1 4c6ac15590d6e3be023e416bf4685174d6889263 SHA256 f581b0c81e252249fd47800e835ce2e718b6191dd7195c166377096aeb76254f
+MISC ChangeLog 27440 RMD160 8b3d6f5237264f0bdfa1270d71349fbe12c61235 SHA1 8ca234527c19609a6a629f34b74ee8a577d2e078 SHA256 a8a093dcff060ef705308c2dd84605079b80a00c5597b50543c2d61e35b3e427
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20120304.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20120304.ebuild
new file mode 100644
index 0000000..e44ed5a
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20120304.ebuild
@@ -0,0 +1,390 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2012-03-04_04-00-40/zip/netbeans-trunk-nightly-201203040400-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/B7ADB35C7BC16AFA8AE49C4D61F87E607BDADB41-antlr-runtime-3.3.jar
+	http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
+	http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar
+	http://hg.netbeans.org/binaries/643CC426B9F75AA111FAC0FAC0E52FF5D991A337-commons-net-3.0.1.jar
+	http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip
+	http://hg.netbeans.org/binaries/53AFD6CAA1B476204557B0626E7D673FBD5D245C-css3-spec.zip
+	http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip
+	http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
+	http://hg.netbeans.org/binaries/77DB1AFF3C0730C144D30C9935A1CD8DCD2488A9-html5-datatypes.jar
+	http://hg.netbeans.org/binaries/4388C34B9F085A42FBEA06C5B00FDF0A251171EC-html5doc.zip
+	http://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar
+	http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar
+	http://hg.netbeans.org/binaries/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar
+	http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar
+	http://hg.netbeans.org/binaries/FACC6D84B0B0A650B1D44FED941E9ADD9F326862-isorelax20041111.jar
+	http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip
+	http://hg.netbeans.org/binaries/BCF23B1D858C6F69D67C851D497984D25345D0B1-jaxb-api.jar
+	http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip
+	http://hg.netbeans.org/binaries/2EC69BD69B66B0DABEA392DE713A11F975001760-jaxb-impl.jar
+	http://hg.netbeans.org/binaries/64D468922B85A9626178AEDF564FFDBDE980B3EC-jaxb-xjc.jar
+	http://hg.netbeans.org/binaries/F02664A059617D060BEC3EBA0BC002B2102AEB84-jaxb1-impl.jar
+	http://hg.netbeans.org/binaries/C0C5653D2200F2BD2E834B26DFDBC830D07FA0F4-jing.jar
+	http://hg.netbeans.org/binaries/71F7D2D5A3CF17CECBD15049A856BC0245C95C56-js.jar
+	http://hg.netbeans.org/binaries/098B14300B35E1053AA9945FF2C1CDA164F43B33-js-domstubs.zip
+	http://hg.netbeans.org/binaries/5756AA27E54A3EC6C8CDAE32F49BCA7BC139EB15-jsstubs.zip
+	http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
+	http://hg.netbeans.org/binaries/90FF0731FAFB05C01FEE4F2247140D56E9C30A3B-lucene-core-3.5.0.jar
+	http://hg.netbeans.org/binaries/A1C0ED8C43A306E3FB7676E7463204B9DA9BE290-non-schema.jar
+	http://hg.netbeans.org/binaries/DF8DD2981C9C3EBEDB059CA98450B587E784AF58-org.eclipse.core.contenttype-3.4.100.jar
+	http://hg.netbeans.org/binaries/A71B23F287BB0CB27E3A5B7808AC07D45BE44841-org.eclipse.core.jobs-3.5.1.jar
+	http://hg.netbeans.org/binaries/93CDEDB00404BF3C56AD3BF0501A9E7A09BD2108-org.eclipse.core.net-1.2.100.jar
+	http://hg.netbeans.org/binaries/46735A729401036FC2C14CC05257ACB4CD4F6906-org.eclipse.core.runtime-3.6.0.jar
+	http://hg.netbeans.org/binaries/9C98C277CFFBB4CA06CAFD5820562EF7B5100F5C-org.eclipse.core.runtime.compatibility.auth-3.2.200.jar
+	http://hg.netbeans.org/binaries/8A288BD66E90B1081F843A17F95973514ED55A97-org.eclipse.equinox.app-1.3.1.jar
+	http://hg.netbeans.org/binaries/491025C38F84A6FF9823315A74A0CAC4C30E51A8-org.eclipse.equinox.common-3.6.0.jar
+	http://hg.netbeans.org/binaries/F411AB988320260361C3611714CA5AF1480CD1A3-org.eclipse.equinox.preferences-3.3.0.jar
+	http://hg.netbeans.org/binaries/AD19FF36B5D976E5B4F289B5ACB32967216C1B2D-org.eclipse.equinox.registry-3.5.0.jar
+	http://hg.netbeans.org/binaries/1FE453D0B251571463F9BE4F51F413BBA5A376A7-org.eclipse.equinox.security-1.0.200.jar
+	http://hg.netbeans.org/binaries/A00DC524B1D1DB1ABBF95407AA3E6009C3D2C157-org.eclipse.jgit-1.3.0.201202151440-r.jar
+	http://hg.netbeans.org/binaries/6AC191F42860D1698C9268AE044AFAA5FE806CE7-org.eclipse.mylyn.bugzilla.core-3.6.0.jar
+	http://hg.netbeans.org/binaries/4617423828BC2E79A1871949C2914285405D8EFF-org.eclipse.mylyn.commons.core-3.6.0.jar
+	http://hg.netbeans.org/binaries/053602E0177D42BF707019F1BC646193A899D571-org.eclipse.mylyn.commons.net-3.6.0.jar
+	http://hg.netbeans.org/binaries/032EFC784E1DE21E4093C08F336C7582F5694760-org.eclipse.mylyn.commons.xmlrpc-3.6.0.jar
+	http://hg.netbeans.org/binaries/5D73EEAEABC42C6FCB85593D1F5B04ACBDFAA0F9-org.eclipse.mylyn.tasks.core-3.6.0.jar
+	http://hg.netbeans.org/binaries/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/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar
+	http://hg.netbeans.org/binaries/7A5A7DF07297A86A944D4D0562C685585B0734EF-validator.jar
+	http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar
+	http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar
+	http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar
+	http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-platform-${PV}
+	dev-java/commons-httpclient:3
+	dev-java/commons-io:1
+	dev-java/commons-lang:2.1
+	dev-java/commons-logging:0
+	dev-java/freemarker:2.3
+	dev-java/icu4j:4.4
+	dev-java/jdbc-mysql:0
+	dev-java/jdbc-postgresql:0
+	dev-java/jsr173:0
+	dev-java/jvyamlb:0
+	dev-java/log4j:0
+	dev-java/saxon:9
+	dev-java/smack:2.2
+	dev-java/sun-jaf:0
+	dev-java/tomcat-servlet-api:2.2
+	dev-java/ws-commons-util:0
+	dev-java/xerces:2
+	dev-vcs/subversion:0[java]"
+#	dev-java/lucene:3.5 we do not have slot 3.5 yet
+#	dev-java/jaxb:2 upstream version contains more stuff so websvccommon does not compile with ours
+#	app-text/jing:0 our version is probably too old
+#	dev-java/ini4j:0 our version is too old
+#	java-virtuals/jaf:0 could use this instead of sun-jaf but it returns empty classpath
+#	dev-java/trilead-ssh2:0 in overlay
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	dev-java/commons-codec:0
+	dev-java/jsch:0
+	dev-java/jzlib:0
+	${CDEPEND}
+	dev-java/javacc:0
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ide -Dext.binaries.downloaded=true -Djava.awt.headless=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r1-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/B7ADB35C7BC16AFA8AE49C4D61F87E607BDADB41-antlr-runtime-3.3.jar libs.antlr3.runtime/external/antlr-runtime-3.3.jar || die
+	ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die
+	ln -s "${DISTDIR}"/643CC426B9F75AA111FAC0FAC0E52FF5D991A337-commons-net-3.0.1.jar libs.commons_net/external/commons-net-3.0.1.jar || die
+	# system commons-io fails with following error:
+	# Missing manifest tag OpenIDE-Module; /var/tmp/portage/dev-java/netbeans-ide-9999_p20110911/work/nbbuild/netbeans/ide/modules/org-apache-commons-io.jar is not a module
+	ln -s "${DISTDIR}"/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar o.apache.commons.io/external/commons-io-1.4.jar ||die
+	ln -s "${DISTDIR}"/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip css.editor/external/css21-spec.zip || die
+	ln -s "${DISTDIR}"/53AFD6CAA1B476204557B0626E7D673FBD5D245C-css3-spec.zip css.editor/external/css3-spec.zip || die
+	ln -s "${DISTDIR}"/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip derby/external/derbysampledb.zip || die
+	ln -s "${DISTDIR}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || die
+	ln -s "${DISTDIR}"/77DB1AFF3C0730C144D30C9935A1CD8DCD2488A9-html5-datatypes.jar html.validation/external/html5-datatypes.jar || die
+	ln -s "${DISTDIR}"/4388C34B9F085A42FBEA06C5B00FDF0A251171EC-html5doc.zip html.parser/external/html5doc.zip || die
+	ln -s "${DISTDIR}"/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar html.parser/external/htmlparser-1.2.1.jar || die
+	ln -s "${DISTDIR}"/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar libs.ini4j/external/ini4j-0.5.1.jar || die
+	ln -s "${DISTDIR}"/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar html.validation/external/io-xml-util.jar || die
+	ln -s "${DISTDIR}"/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar html.validation/external/iri.jar || die
+	ln -s "${DISTDIR}"/FACC6D84B0B0A650B1D44FED941E9ADD9F326862-isorelax20041111.jar html.validation/external/isorelax20041111.jar || die
+	ln -s "${DISTDIR}"/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip spellchecker.dictionary_en/external/ispell-enwl-3.1.20.zip || die
+	ln -s "${DISTDIR}"/BCF23B1D858C6F69D67C851D497984D25345D0B1-jaxb-api.jar xml.jaxb.api/external/jaxb-api.jar || die
+	ln -s "${DISTDIR}"/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip libs.jaxb/external/jaxb-api-doc.zip || die
+	ln -s "${DISTDIR}"/2EC69BD69B66B0DABEA392DE713A11F975001760-jaxb-impl.jar libs.jaxb/external/jaxb-impl.jar || die
+	ln -s "${DISTDIR}"/64D468922B85A9626178AEDF564FFDBDE980B3EC-jaxb-xjc.jar libs.jaxb/external/jaxb-xjc.jar || die
+	ln -s "${DISTDIR}"/F02664A059617D060BEC3EBA0BC002B2102AEB84-jaxb1-impl.jar libs.jaxb/external/jaxb1-impl.jar || die
+	ln -s "${DISTDIR}"/C0C5653D2200F2BD2E834B26DFDBC830D07FA0F4-jing.jar html.validation/external/jing.jar || die
+	ln -s "${DISTDIR}"/71F7D2D5A3CF17CECBD15049A856BC0245C95C56-js.jar html.validation/external/js.jar || die
+	ln -s "${DISTDIR}"/098B14300B35E1053AA9945FF2C1CDA164F43B33-js-domstubs.zip javascript.editing/external/js-domstubs.zip || die
+	ln -s "${DISTDIR}"/5756AA27E54A3EC6C8CDAE32F49BCA7BC139EB15-jsstubs.zip javascript.editing/external/jsstubs.zip || die
+	ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.destroy/external/libpam4j-1.1.jar || die
+	ln -s "${DISTDIR}"/90FF0731FAFB05C01FEE4F2247140D56E9C30A3B-lucene-core-3.5.0.jar libs.lucene/external/lucene-core-3.5.0.jar || die
+	ln -s "${DISTDIR}"/A1C0ED8C43A306E3FB7676E7463204B9DA9BE290-non-schema.jar html.validation/external/non-schema.jar || die
+	ln -s "${DISTDIR}"/DF8DD2981C9C3EBEDB059CA98450B587E784AF58-org.eclipse.core.contenttype-3.4.100.jar o.eclipse.core.contenttype/external/org.eclipse.core.contenttype-3.4.100.jar || die
+	ln -s "${DISTDIR}"/A71B23F287BB0CB27E3A5B7808AC07D45BE44841-org.eclipse.core.jobs-3.5.1.jar o.eclipse.core.jobs/external/org.eclipse.core.jobs-3.5.1.jar || die
+	ln -s "${DISTDIR}"/93CDEDB00404BF3C56AD3BF0501A9E7A09BD2108-org.eclipse.core.net-1.2.100.jar o.eclipse.core.net/external/org.eclipse.core.net-1.2.100.jar || die
+	ln -s "${DISTDIR}"/46735A729401036FC2C14CC05257ACB4CD4F6906-org.eclipse.core.runtime-3.6.0.jar o.eclipse.core.runtime/external/org.eclipse.core.runtime-3.6.0.jar || die
+	ln -s "${DISTDIR}"/9C98C277CFFBB4CA06CAFD5820562EF7B5100F5C-org.eclipse.core.runtime.compatibility.auth-3.2.200.jar o.eclipse.core.runtime.compatibility.auth/external/org.eclipse.core.runtime.compatibility.auth-3.2.200.jar || die
+	ln -s "${DISTDIR}"/8A288BD66E90B1081F843A17F95973514ED55A97-org.eclipse.equinox.app-1.3.1.jar o.eclipse.equinox.app/external/org.eclipse.equinox.app-1.3.1.jar || die
+	ln -s "${DISTDIR}"/491025C38F84A6FF9823315A74A0CAC4C30E51A8-org.eclipse.equinox.common-3.6.0.jar o.eclipse.equinox.common/external/org.eclipse.equinox.common-3.6.0.jar || die
+	ln -s "${DISTDIR}"/F411AB988320260361C3611714CA5AF1480CD1A3-org.eclipse.equinox.preferences-3.3.0.jar o.eclipse.equinox.preferences/external/org.eclipse.equinox.preferences-3.3.0.jar || die
+	ln -s "${DISTDIR}"/AD19FF36B5D976E5B4F289B5ACB32967216C1B2D-org.eclipse.equinox.registry-3.5.0.jar o.eclipse.equinox.registry/external/org.eclipse.equinox.registry-3.5.0.jar || die
+	ln -s "${DISTDIR}"/1FE453D0B251571463F9BE4F51F413BBA5A376A7-org.eclipse.equinox.security-1.0.200.jar o.eclipse.equinox.security/external/org.eclipse.equinox.security-1.0.200.jar || die
+	ln -s "${DISTDIR}"/A00DC524B1D1DB1ABBF95407AA3E6009C3D2C157-org.eclipse.jgit-1.3.0.201202151440-r.jar o.eclipse.jgit/external/org.eclipse.jgit-1.3.0.201202151440-r.jar || die
+	ln -s "${DISTDIR}"/6AC191F42860D1698C9268AE044AFAA5FE806CE7-org.eclipse.mylyn.bugzilla.core-3.6.0.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core-3.6.0.jar || die
+	ln -s "${DISTDIR}"/4617423828BC2E79A1871949C2914285405D8EFF-org.eclipse.mylyn.commons.core-3.6.0.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core-3.6.0.jar || die
+	ln -s "${DISTDIR}"/053602E0177D42BF707019F1BC646193A899D571-org.eclipse.mylyn.commons.net-3.6.0.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net-3.6.0.jar || die
+	ln -s "${DISTDIR}"/032EFC784E1DE21E4093C08F336C7582F5694760-org.eclipse.mylyn.commons.xmlrpc-3.6.0.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc-3.6.0.jar || die
+	ln -s "${DISTDIR}"/5D73EEAEABC42C6FCB85593D1F5B04ACBDFAA0F9-org.eclipse.mylyn.tasks.core-3.6.0.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core-3.6.0.jar || die
+	ln -s "${DISTDIR}"/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}"/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar swing.validation/external/ValidationAPI.jar || die
+	ln -s "${DISTDIR}"/7A5A7DF07297A86A944D4D0562C685585B0734EF-validator.jar html.validation/external/validator.jar || die
+	ln -s "${DISTDIR}"/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar extexecution.destroy/external/winp-1.14-patched.jar || die
+	ln -s "${DISTDIR}"/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar o.apache.xmlrpc/external/xmlrpc-client-3.0.jar || die
+	ln -s "${DISTDIR}"/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar o.apache.xmlrpc/external/xmlrpc-common-3.0.jar || die
+	ln -s "${DISTDIR}"/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar o.apache.xmlrpc/external/xmlrpc-server-3.0.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	popd >/dev/null || die
+
+	java-pkg_jar-from --build-only --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.45.jar
+	java-pkg_jar-from --build-only --into c.jcraft.jzlib/external jzlib jzlib.jar jzlib-1.0.7.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.18-bin.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-postgresql jdbc-postgresql.jar postgresql-9.1-901.jdbc4.jar
+	java-pkg_jar-from --build-only --into db.sql.visualeditor/external javacc javacc.jar javacc-3.2.jar
+	java-pkg_jar-from --into extexecution.destroy/external commons-io-1 commons-io.jar commons-io-1.4.jar
+	java-pkg_jar-from --into html.parser/external icu4j-4.4 icu4j.jar icu4j-4_0.jar
+	java-pkg_jar-from --into html.validation/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
+	java-pkg_jar-from --into html.validation/external commons-logging commons-logging-api.jar commons-logging-api-1.1.1.jar
+	# java-pkg_jar-from --into html.validation/external jing jing.jar jing.jar
+	java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar
+	java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar
+	# java-pkg_jar-from --into libs.antlr3.runtime/external antlr-3 antlr3.jar antlr-runtime-3.1.3.jar
+	# java-pkg_jar-from --into libs.commons_net/external commons-net commons-net.jar commons-net-1.4.1.jar
+	java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.8.jar
+	# java-pkg_jar-from --into libs.ini4j/external ini4j ini4j.jar ini4j-0.5.1.jar
+	# java-pkg_jar-from --into libs.jaxb/external jaxb-2 jaxb-impl.jar jaxb-impl.jar
+	java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.3.jar
+	# java-pkg_jar-from --into libs.lucene/external lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
+	java-pkg_jar-from --into libs.smack/external smack-2.2 smack.jar smack.jar
+	java-pkg_jar-from --into libs.smack/external smack-2.2 smackx.jar smackx.jar
+	java-pkg_jar-from --into libs.svnClientAdapter.javahl/external subversion svn-javahl.jar svnjavahl-1.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 --build-only --into o.apache.commons.codec/external commons-codec commons-codec.jar apache-commons-codec-1.3.jar
+	java-pkg_jar-from --into o.apache.commons.httpclient/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.1.jar
+	java-pkg_jar-from --into o.apache.commons.lang/external commons-lang-2.1 commons-lang.jar commons-lang-2.4.jar
+	java-pkg_jar-from --into o.apache.commons.logging/external commons-logging commons-logging.jar commons-logging-1.1.jar
+	java-pkg_jar-from --into o.apache.ws.commons.util/external ws-commons-util ws-commons-util.jar ws-commons-util-1.0.1.jar
+	java-pkg_jar-from --into servletapi/external tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
+	java-pkg_jar-from --into xml.jaxb.api/external sun-jaf activation.jar activation.jar
+	# java-pkg_jar-from --into xml.jaxb.api/external jaxb-2 jaxb-api.jar jaxb-api.jar
+	java-pkg_jar-from --into xml.jaxb.api/external jsr173 jsr173.jar jsr173_api.jar
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	unset DISPLAY
+	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+	pushd nbbuild/netbeans/ide >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/ide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	rm -fr "${D}"/${INSTALL_DIR}/bin/nativeexecution || die
+	rm -fr "${D}"/${INSTALL_DIR}/modules/lib || die
+
+	insinto ${INSTALL_DIR}/bin/nativeexecution
+	doins bin/nativeexecution/*
+
+	pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution >/dev/null || die
+	for file in *.sh ; do
+		fperms 755 ${file}
+	done
+	popd >/dev/null || die
+
+	if use x86 ; then
+		doins -r bin/nativeexecution/Linux-x86
+		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86 >/dev/null || die
+		for file in * ; do
+			fperms 755 ${file}
+		done
+		popd >/dev/null || die
+	elif use amd64 ; then
+		doins -r bin/nativeexecution/Linux-x86_64
+		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86_64 >/dev/null || die
+		for file in * ; do
+			fperms 755 ${file}
+		done
+		popd >/dev/null || die
+	fi
+
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	# rm antlr-runtime-3.1.3.jar && dosym /usr/share/antlr-3/lib/antlr3.jar ${instdir}/antlr-runtime-3.1.3.jar || die
+	# bytelist-0.1.jar
+	rm commons-logging-api-1.1.1.jar && dosym /usr/share/commons-logging/lib/commons-logging-api.jar ${instdir}/commons-logging-api-1.1.1.jar || die
+	rm commons-logging-1.1.1.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.1.1.jar || die
+	# rm commons-net-1.4.1.jar && dosym /usr/share/commons-net/lib/commons-net.jar ${instdir}/commons-net-1.4.1.jar || die
+	# ddl.jar
+	rm freemarker-2.3.8.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.8.jar || die
+	# html5-datatypes.jar
+	# html5-parser.jar
+	rm icu4j-4_0.jar && dosym /usr/share/icu4j-4.4/lib/icu4j.jar ${instdir}/icu4j-4_0.jar || die
+	# [[ -f ini4j-0.5.1.jar ]] && java-pkg_jar-from ini4j ini4j.jar ${instdir}/ini4j-0.5.1.jar || die
+	# io-xml-util.jar
+	# iri.jar
+	# isorelax20041111.jar
+	# [[ -f jing.jar ]] && java-pkg_jar-from jing jing.jar ${instdir}/jing.jar || die
+	# js.jar
+	rm jvyamlb-0.2.3.jar && dosym /usr/share/jvyamlb/lib/jvyamlb.jar ${instdir}/jvyamlb-0.2.3.jar || die
+	# libpam4j-1.1.jar
+	rm log4j-1.2.15.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.15.jar || die
+	# rm lucene-core-3.5.0.jar && dosym /usr/share/lucene-3.5/lib/lucene-core.jar ${instdir}/lucene-core-3.5.0.jar || die
+	rm mysql-connector-java-5.1.18-bin.jar && dosym /usr/share/jdbc-mysql/lib/jdbc-mysql.jar ${instdir}/mysql-connector-java-5.1.18-bin.jar || die
+	# non-schema.jar
+	# org.eclipse.mylyn.bugzilla.core_3.3.1.jar
+	# org.eclipse.mylyn.commons.core_3.3.1.jar
+	# org.eclipse.mylyn.commons.net_3.3.0.jar
+	# org.eclipse.mylyn.tasks.core_3.3.1.jar
+	# org-netbeans-tax.jar
+	rm postgresql-9.1-901.jdbc4.jar && dosym /usr/share/jdbc-postgresql/lib/jdbc-postgresql.jar ${instdir}/postgresql-9.1-901.jdbc4.jar || die
+	# processtreekiller-1.0.1.jar
+	# resolver-1.2.jar
+	rm saxon9B.jar && dosym /usr/share/saxon-9/lib/saxon.jar ${instdir}/saxon9B.jar || die
+	rm servlet-2.2.jar && dosym /usr/share/tomcat-servlet-api-2.2/lib/servlet.jar ${instdir}/servlet-2.2.jar || die
+	rm smack.jar && dosym /usr/share/smack-2.2/lib/smack.jar ${instdir}/smack.jar || die
+	rm smackx.jar && dosym /usr/share/smack-2.2/lib/smackx.jar ${instdir}/smackx.jar || die
+	# sqljet-1.0.3.jar
+	# svnClientAdapter-javahl-1.6.13.jar
+	# svnClientAdapter-main-1.6.13.jar
+	# svnClientAdapter-svnkit-1.6.13.jar
+	rm svnjavahl-1.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 feaea5d..fd472bd 100644
--- a/dev-java/netbeans-java/ChangeLog
+++ b/dev-java/netbeans-java/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-java-9999_p20120304 (04 Mar 2012)
+
+  04 Mar 2012; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-java-9999_p20120304.ebuild:
+  Bumped to latest nightly module
+
 *netbeans-java-9999_p20120303 (03 Mar 2012)
 
   03 Mar 2012; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 75c3577..736a755 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -42,6 +42,7 @@ DIST netbeans-trunk-nightly-201202220400-src.zip 174195023 RMD160 800aa796b42f79
 DIST netbeans-trunk-nightly-201202270400-src.zip 174236017 RMD160 91d77d72c626d19a3bb88ab54e5612bb25e9c284 SHA1 58ba5f403553b9f754bebcc526047914d0721e4e SHA256 ad81b677ea067a86ebd2e26f2c7a1b538115406ee7bd36a95bb3856d8a4d5913
 DIST netbeans-trunk-nightly-201203010400-src.zip 174453125 RMD160 18c55d8b3789cef77bfde78b3310e55eab20011a SHA1 18e5786d27bbbdc91110e4d88eff9780b4dfc5cd SHA256 b1429ceebbaaefc169dc290870a66452b28c017a355bfbe925c3eba6e015013b
 DIST netbeans-trunk-nightly-201203030400-src.zip 174515173 RMD160 c9d99881d451d04be8035e861b8c91a8c5768084 SHA1 d86dbf4f822663c19b46fb19b05e275ba0f710e6 SHA256 e4bccd6167404f55ae5983807388a8cfb7980b3b00d37253a6ac4df4e6dea115
+DIST netbeans-trunk-nightly-201203040400-src.zip 174521722 RMD160 fb5cf478d504b5fb86e00c8204998bdfbf3d03e4 SHA1 6a97490572215bc65cfdcc150c9f76b6795fec78 SHA256 e5e376831eb0104ecac58cce6da6e20a637f1c7c14ac0992c094dc61ed186f35
 EBUILD netbeans-java-7.0.1.ebuild 14888 RMD160 19208f48ccc5d5d19ba03bf7c60d27a429243b98 SHA1 2c116b4798f92dcac23bdcacd04bb01b0116c7d2 SHA256 98b4789883e375d817f509dbe9067b6f5c3685d92c714d443d51b00bb54704ad
 EBUILD netbeans-java-7.1-r1.ebuild 14523 RMD160 c7f8323d800a66810f92842d547a597f5124d527 SHA1 eabb31fa80ec777bcae74b34d3924c56f84a3041 SHA256 e271ced952475f3fe836216a605d49793b07caaeafc2ade8d56a1ec21083a172
 EBUILD netbeans-java-9999_p20120219.ebuild 14894 RMD160 3fc7f365ec776410c6d9f3e7fd5f1e99c4059580 SHA1 82daa9127e3ee298a4736c172fc76d6b1ac70830 SHA256 506593e1c713435260aec116bf889151f5364095f127e15567dae43bf27e17eb
@@ -49,5 +50,6 @@ EBUILD netbeans-java-9999_p20120222.ebuild 14894 RMD160 a2894170b8f5369b25d1b82f
 EBUILD netbeans-java-9999_p20120227.ebuild 14894 RMD160 f83f43e9ccf86727cd3d1cf0991d00510971d843 SHA1 e232ab255c6e5aaa57be3892ee2dbef7b3a4adfc SHA256 8e0b956aebdd0eac471791eae44d13a4d2fc00c4909f3625038de219e5736d47
 EBUILD netbeans-java-9999_p20120301.ebuild 14894 RMD160 5db5a5fb96b5d5ef32cbc637084c7f42d8d3235a SHA1 b5f43083ab2082435e9971870488c22d0a1f1687 SHA256 5c640d4d2f257144e3ad15c9bc4d67cc05aa41f9ef703b01bbd6b0921e476c70
 EBUILD netbeans-java-9999_p20120303.ebuild 14894 RMD160 084a8fd730a252ea1b58122f427f2d2ee8259508 SHA1 9444980fd54e4ae06b07b36f4ecf7303f9f3815d SHA256 8d5b9cfdf1434252fb39c721740107c8d7145fc32b4ced8297f6bb651ae57a3d
-MISC ChangeLog 27864 RMD160 8893fa772b3380f55775d34beb07d767940065f0 SHA1 67560de8596105e5b94cf987ddf0686ac1c25033 SHA256 c7b623fb1652e0f212daabdd8947c502f85f24493ddb7ddd8ed70bcd731ca887
+EBUILD netbeans-java-9999_p20120304.ebuild 14894 RMD160 025b9e2b5c419db42f15dc616b1bc0b2b4c0f804 SHA1 029d1e8c18461ab7dec290817cd98183eddeb4fc SHA256 e942b13390175a8843dc71045c7c1c6edfa7aa82fc1bb9a114c9e0532b5f3334
+MISC ChangeLog 28036 RMD160 2026cc427225d730b13dc8d2628d7fbed062d632 SHA1 b31e5612cbee0c74df2c754b00f3ce3f14addec5 SHA256 e93d67ca4430226580939c30cf7bd7bf1a6c740d90c1f582cbc43df351096ca5
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20120304.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20120304.ebuild
new file mode 100644
index 0000000..905d0ac
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20120304.ebuild
@@ -0,0 +1,307 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+# Maven cannot be unbundled because it depends on exact maven version and exact content of maven directory
+
+DESCRIPTION="Netbeans Java Cluster"
+HOMEPAGE="http://netbeans.org/projects/java"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2012-03-04_04-00-40/zip/netbeans-trunk-nightly-201203040400-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/1A78676E734C72549EE6D9F166BAFE22F7CBA8CD-ant-libs-1.8.3.zip
+	http://hg.netbeans.org/binaries/29CFD351206016B67DD0D556098513D2B259C69B-apache-maven-3.0.4-bin.zip
+	http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip
+	http://hg.netbeans.org/binaries/90F1E67F38F1D8EC25C082F8EB08CFEC9A3B75E2-eclipselink-2.3.2.jar
+	http://hg.netbeans.org/binaries/481935A7F53B55502187BD3C28C2BC0D957BB643-eclipselink-jpa-modelgen-2.3.2.jar
+	http://hg.netbeans.org/binaries/59FAD2A4D4A1CFECED8149854EEEC3A7B9668927-glassfish-persistence-v2-build-58g.jar
+	http://hg.netbeans.org/binaries/907363E301E2279930C82BEB466BF2053C6E993B-glassfish-persistence-v2ur1-build-09d.jar
+	http://hg.netbeans.org/binaries/C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip
+	http://hg.netbeans.org/binaries/204680C59C7D8A4A1A26B9A2ED46D0DAA6DC10B3-indexer-artifact-4.1.2.jar
+	http://hg.netbeans.org/binaries/EA1F2B2504FC5ABCB06146D858F74A97B85A2998-indexer-core-4.1.2.jar
+	http://hg.netbeans.org/binaries/E90F4B2F8972AA5EF58139F16B78D5F6ACFC6EF9-javac-api-nb-7.0-b07.jar
+	http://hg.netbeans.org/binaries/033FC62C8D65CD97FA7FC29F0546EB7CDDEF85BB-javac-impl-nb-7.0-b07.jar
+	http://hg.netbeans.org/binaries/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-javax.persistence-2.0.jar
+	http://hg.netbeans.org/binaries/2F43A634A42CC4FD2EF9E24B488AFFD6984D3411-jaxws-2.2.zip
+	http://hg.netbeans.org/binaries/23E69F0F17757673C573EBD9899727B82EF7DB7F-jaxws-2.2-api.zip
+	http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip
+	http://hg.netbeans.org/binaries/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar
+	http://hg.netbeans.org/binaries/663FA7BA7FD8538E44DE9FDC5315C4F733C13E96-org.eclipse.persistence.jpa.jpql_1.0.1.jar
+	http://hg.netbeans.org/binaries/2D0D28E05BD6B6452DAAFE2B5CCB69A84EA63E5D-spring-2.5.6.SEC01.jar
+	http://hg.netbeans.org/binaries/7622CB23DAEDD9DE0ACBD16C820D3A02F94572AF-spring-framework-3.0.6.RELEASE.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/beansbinding:0
+	dev-java/cglib:2.2
+	dev-java/jdom:1.0
+	dev-java/lucene:3.0"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	dev-java/junit:4"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}
+	dev-java/absolutelayout:0
+	dev-java/antlr:0[java]
+	dev-java/asm:2.2
+	dev-java/cglib:2.1
+	dev-java/commons-collections:0
+	dev-java/dom4j:1
+	dev-java/ehcache:1.2
+	dev-java/fastinfoset:0
+	dev-java/javassist:3
+	dev-java/jsr67:0
+	dev-java/jsr181:0
+	dev-java/jsr250:0
+	dev-java/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"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r1-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/1A78676E734C72549EE6D9F166BAFE22F7CBA8CD-ant-libs-1.8.3.zip o.apache.tools.ant.module/external/ant-libs-1.8.3.zip || die
+	ln -s "${DISTDIR}"/29CFD351206016B67DD0D556098513D2B259C69B-apache-maven-3.0.4-bin.zip maven.embedder/external/apache-maven-3.0.4-bin.zip || die
+	ln -s "${DISTDIR}"/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip o.jdesktop.beansbinding/external/beansbinding-1.2.1-doc.zip || die
+	ln -s "${DISTDIR}"/90F1E67F38F1D8EC25C082F8EB08CFEC9A3B75E2-eclipselink-2.3.2.jar j2ee.eclipselink/external/eclipselink-2.3.2.jar || die
+	ln -s "${DISTDIR}"/481935A7F53B55502187BD3C28C2BC0D957BB643-eclipselink-jpa-modelgen-2.3.2.jar j2ee.eclipselinkmodelgen/external/eclipselink-jpa-modelgen-2.3.2.jar || die
+	ln -s "${DISTDIR}"/59FAD2A4D4A1CFECED8149854EEEC3A7B9668927-glassfish-persistence-v2-build-58g.jar j2ee.toplinklib/external/glassfish-persistence-v2-build-58g.jar || die
+	ln -s "${DISTDIR}"/907363E301E2279930C82BEB466BF2053C6E993B-glassfish-persistence-v2ur1-build-09d.jar j2ee.toplinklib/external/glassfish-persistence-v2ur1-build-09d.jar || die
+	ln -s "${DISTDIR}"/C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip hibernatelib/external/hibernate-3.2.5-lib.zip || die
+	ln -s "${DISTDIR}"/204680C59C7D8A4A1A26B9A2ED46D0DAA6DC10B3-indexer-artifact-4.1.2.jar maven.indexer/external/indexer-artifact-4.1.2.jar || die
+	ln -s "${DISTDIR}"/EA1F2B2504FC5ABCB06146D858F74A97B85A2998-indexer-core-4.1.2.jar maven.indexer/external/indexer-core-4.1.2.jar || die
+	ln -s "${DISTDIR}"/E90F4B2F8972AA5EF58139F16B78D5F6ACFC6EF9-javac-api-nb-7.0-b07.jar libs.javacapi/external/javac-api-nb-7.0-b07.jar || die
+	ln -s "${DISTDIR}"/033FC62C8D65CD97FA7FC29F0546EB7CDDEF85BB-javac-impl-nb-7.0-b07.jar libs.javacimpl/external/javac-impl-nb-7.0-b07.jar || die
+	ln -s "${DISTDIR}"/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-javax.persistence-2.0.jar j2ee.eclipselink/external/javax.persistence-2.0.jar || die
+	ln -s "${DISTDIR}"/2F43A634A42CC4FD2EF9E24B488AFFD6984D3411-jaxws-2.2.zip websvc.jaxws21/external/jaxws-2.2.zip || die
+	ln -s "${DISTDIR}"/23E69F0F17757673C573EBD9899727B82EF7DB7F-jaxws-2.2-api.zip websvc.jaxws21api/external/jaxws-2.2-api.zip || die
+	ln -s "${DISTDIR}"/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip websvc.jaxws21/external/jaxws-api-doc.zip || die
+	ln -s "${DISTDIR}"/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar maven.embedder/external/maven-dependency-tree-1.2.jar || die
+	ln -s "${DISTDIR}"/663FA7BA7FD8538E44DE9FDC5315C4F733C13E96-org.eclipse.persistence.jpa.jpql_1.0.1.jar j2ee.eclipselink/external/org.eclipse.persistence.jpa.jpql_1.0.1.jar || die
+	ln -s "${DISTDIR}"/2D0D28E05BD6B6452DAAFE2B5CCB69A84EA63E5D-spring-2.5.6.SEC01.jar libs.springframework/external/spring-2.5.6.SEC01.jar || die
+	ln -s "${DISTDIR}"/7622CB23DAEDD9DE0ACBD16C820D3A02F94572AF-spring-framework-3.0.6.RELEASE.zip libs.springframework/external/spring-framework-3.0.6.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-r1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.cglib/external cglib-2.2 cglib.jar cglib-2.2.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.10.jar
+	java-pkg_jar-from --into maven.embedder/external jdom-1.0 jdom.jar jdom-1.0.jar
+	java-pkg_jar-from --into maven.indexer/external lucene-3.0 lucene-core.jar lucene-core-3.0.3.jar
+	java-pkg_jar-from --into o.jdesktop.beansbinding/external beansbinding beansbinding.jar beansbinding-1.2.1.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/java >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+	grep -E "/java$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	rm -fr "${D}"/${INSTALL_DIR}/ant/* || die
+	#rm -fr "${D}"/${INSTALL_DIR}/maven || die
+	#dosym /usr/share/maven-bin-3.0 ${INSTALL_DIR}/maven
+	chmod 755 "${D}"/${INSTALL_DIR}/maven/bin/mvn* || die
+	rm -fr "${D}"/${INSTALL_DIR}/maven/bin/*.bat || die
+
+	insinto ${INSTALL_DIR}/ant
+	dosym /usr/share/ant/bin ${INSTALL_DIR}/ant/bin
+	dosym /usr/share/ant/etc ${INSTALL_DIR}/ant/etc
+	doins -r ant/extra
+	dosym /usr/share/ant/lib ${INSTALL_DIR}/ant/lib
+	doins -r ant/nblib
+	dosym /usr/share/ant/tasks ${INSTALL_DIR}/ant/tasks
+	local vertasks=$(ls -d /usr/share/ant/tasks-*)
+	dosym ${vertasks} ${INSTALL_DIR}/ant/$(basename ${vertasks}) # it would be better if ant would have tasks-current dir
+
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm AbsoluteLayout.jar  && dosym /usr/share/absolutelayout/lib/absolutelayout.jar ${instdir}/AbsoluteLayout.jar || die
+	rm beansbinding-1.2.1.jar && dosym /usr/share/beansbinding/lib/beansbinding.jar ${instdir}/beansbinding-1.2.1.jar || die
+	rm cglib-2.2.jar && dosym /usr/share/cglib-2.2/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
+	# javac-api-nb-7.0-b07.jar
+	# javac-impl-nb-7.0-b07.jar
+	# org-netbeans-modules-java-j2seplatform-probe.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/eclipselink
+	pushd "${D}"/${instdir} >/dev/null || die
+	# dir: eclipselink
+	# eclipselink-javax.persistence-2.0.jar
+	# eclipselink-jpa-modelgen-2.2.0.jar
+	# eclipselink-2.2.0.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/hibernate
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm antlr-2.7.6.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.6.jar || die
+	rm asm-attrs.jar && dosym /usr/share/asm-2.2/lib/asm-attrs.jar ${instdir}/asm-attrs.jar || die
+	rm asm.jar && dosym /usr/share/asm-2.2/lib/asm.jar ${instdir}/asm.jar || die
+	rm cglib-2.1.3.jar && dosym /usr/share/cglib-2.1/lib/cglib.jar ${instdir}/cglib-2.1.3.jar || die
+	rm commons-collections-2.1.1.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections-2.1.1.jar || die
+	rm dom4j-1.6.1.jar && dosym /usr/share/dom4j-1/lib/dom4j.jar ${instdir}/dom4j-1.6.1.jar || die
+	rm ehcache-1.2.3.jar && dosym /usr/share/ehcache-1.2/lib/ehcache.jar ${instdir}/ehcache-1.2.3.jar || die
+	# ejb3-persistence.jar
+	# hibernate-annotations.jar
+	# hibernate-commons-annotations.jar
+	# hibernate-entitymanager.jar
+	# hibernate-tools.jar
+	# hibernate3.jar
+	rm javassist.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist.jar || die
+	# jdbc2_0-stdext.jar
+	rm jta.jar && dosym /usr/share/jta/lib/jta.jar ${instdir}/jta.jar || die
+	rm jtidy-r8-20060801.jar && dosym /usr/share/jtidy/lib/Tidy.jar ${instdir}/jtidy-r8-20060801.jar || die
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/modules/ext/jaxws22
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm FastInfoset.jar && dosym /usr/share/fastinfoset/lib/fastinfoset.jar ${instdir}/FastInfoset.jar || die
+	# gmbal-api-only.jar
+	# http.jar
+	# jaxws-rt.jar
+	# jaxws-tools.jar
+	# management-api.jar
+	# mimepull.jar
+	# policy.jar
+	rm saaj-impl.jar && dosym /usr/share/saaj/lib/saaj.jar ${instdir}/saaj-impl.jar || die
+	rm stax-ex.jar && dosym /usr/share/stax-ex/lib/stax-ex.jar ${instdir}/stax-ex.jar || die
+	rm streambuffer.jar && dosym /usr/share/xmlstreambuffer/lib/streambuffer.jar ${instdir}/streambuffer.jar || die
+	# woodstox.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxws22/api
+	pushd "${D}"/${instdir} >/dev/null || die
+	# jaxws-api.jar
+	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
+	rm jsr250-api.jar && dosym /usr/share/jsr250/lib/jsr250.jar ${instdir}/jsr250-api.jar || die
+	rm saaj-api.jar && dosym /usr/share/jsr67/lib/jsr67.jar ${instdir}/saaj-api.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/maven
+	pushd "${D}"/${instdir} >/dev/null || die
+	# indexer-artifact-4.1.1.jar
+	# indexer-core-4.1.1.jar
+	rm jdom-1.0.jar && dosym /usr/share/jdom-1.0/lib/jdom.jar ${instdir}/jdom-1.0.jar || die
+	rm lucene-core-3.0.3.jar && dosym /usr/share/lucene-3.0/lib/lucene-core.jar ${instdir}/lucene-core-3.0.3.jar || die
+	# maven-dependency-tree-1.2.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/spring
+	pushd "${D}"/${instdir} >/dev/null || die
+	# spring-2.5.6.SEC01.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/spring-3.0
+	pushd "${D}"/${instdir} >/dev/null || die
+	# spring-aop-3.0.2.RELEASE.jar
+	# spring-asm-3.0.2.RELEASE.jar
+	# spring-aspects-3.0.2.RELEASE.jar
+	# spring-beans-3.0.2.RELEASE.jar
+	# spring-context-support-3.0.2.RELEASE.jar
+	# spring-context-3.0.2.RELEASE.jar
+	# spring-core-3.0.2.RELEASE.jar
+	# spring-expression-3.0.2.RELEASE.jar
+	# spring-instrument-tomcat-3.0.2.RELEASE.jar
+	# spring-instrument-3.0.2.RELEASE.jar
+	# spring-jdbc-3.0.2.RELEASE.jar
+	# spring-jms-3.0.2.RELEASE.jar
+	# spring-orm-3.0.2.RELEASE.jar
+	# spring-oxm-3.0.2.RELEASE.jar
+	# spring-struts-3.0.2.RELEASE.jar
+	# spring-test-3.0.2.RELEASE.jar
+	# spring-tx-3.0.2.RELEASE.jar
+	# spring-webmvc-portlet-3.0.2.RELEASE.jar
+	# spring-webmvc-3.0.2.RELEASE.jar
+	# spring-web-3.0.2.RELEASE.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/toplink
+	pushd "${D}"/${instdir} >/dev/null || die
+	# toplink-essentials-agent.jar
+	# toplink-essentials.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java
+}
+
+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 b83f898..33918c0 100644
--- a/dev-java/netbeans-javacard/ChangeLog
+++ b/dev-java/netbeans-javacard/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javacard-9999_p20120304 (04 Mar 2012)
+
+  04 Mar 2012; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-javacard-9999_p20120304.ebuild:
+  Bumped to latest nightly module
+
 *netbeans-javacard-9999_p20120303 (03 Mar 2012)
 
   03 Mar 2012; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index c4fff01..a2a32c4 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -10,6 +10,7 @@ DIST netbeans-trunk-nightly-201202220400-src.zip 174195023 RMD160 800aa796b42f79
 DIST netbeans-trunk-nightly-201202270400-src.zip 174236017 RMD160 91d77d72c626d19a3bb88ab54e5612bb25e9c284 SHA1 58ba5f403553b9f754bebcc526047914d0721e4e SHA256 ad81b677ea067a86ebd2e26f2c7a1b538115406ee7bd36a95bb3856d8a4d5913
 DIST netbeans-trunk-nightly-201203010400-src.zip 174453125 RMD160 18c55d8b3789cef77bfde78b3310e55eab20011a SHA1 18e5786d27bbbdc91110e4d88eff9780b4dfc5cd SHA256 b1429ceebbaaefc169dc290870a66452b28c017a355bfbe925c3eba6e015013b
 DIST netbeans-trunk-nightly-201203030400-src.zip 174515173 RMD160 c9d99881d451d04be8035e861b8c91a8c5768084 SHA1 d86dbf4f822663c19b46fb19b05e275ba0f710e6 SHA256 e4bccd6167404f55ae5983807388a8cfb7980b3b00d37253a6ac4df4e6dea115
+DIST netbeans-trunk-nightly-201203040400-src.zip 174521722 RMD160 fb5cf478d504b5fb86e00c8204998bdfbf3d03e4 SHA1 6a97490572215bc65cfdcc150c9f76b6795fec78 SHA256 e5e376831eb0104ecac58cce6da6e20a637f1c7c14ac0992c094dc61ed186f35
 EBUILD netbeans-javacard-7.0.1.ebuild 4961 RMD160 2838467c87ae15ce2a24214cb6d69ff5c77cbcd5 SHA1 74adc0ad143660dd782396a68fe702b2a3a43a9a SHA256 566bc7e3275c97d0fe3d68c843b53aee641548ec39a8143aebd56d248da3c32c
 EBUILD netbeans-javacard-7.1.ebuild 4966 RMD160 48d1e8f40a104dd04b979a14846771c46ec23aa1 SHA1 fc824964f516a0e2c44e1a9d5c2e4ed433144b6b SHA256 e3845c5991e3cfe78bcae7747a84ec23a4608bd953656600010580d6d5a31f96
 EBUILD netbeans-javacard-9999_p20120219.ebuild 4993 RMD160 7d111da4f5b247383d9a4575da5790ac3696889f SHA1 c933a44bfb7920120d38013b7c02488ba16be189 SHA256 1d9d8fbf814e1e4efc437316d096f811314162be15431cbf970b91eadd70704e
@@ -17,5 +18,6 @@ EBUILD netbeans-javacard-9999_p20120222.ebuild 4993 RMD160 1b9fea86ed2bfad44b4cb
 EBUILD netbeans-javacard-9999_p20120227.ebuild 4993 RMD160 bea32e81b1d3309693dd7f18f1d9b93ebcf6f87e SHA1 c7f15f6335c2904310812409fb96d166511c93e2 SHA256 4c4303922e15c1568ff489ba871310305af50bfa006c61051f4d373de9cd073e
 EBUILD netbeans-javacard-9999_p20120301.ebuild 4993 RMD160 7c70db2b50d01ee3aa95373e6a6f7e325dc31541 SHA1 29c21354d6a173467ac078ef3e5981f68bd30940 SHA256 16522e5a1edaa462d1701a28df9525865e5919d9320f7db371b4744f5e675626
 EBUILD netbeans-javacard-9999_p20120303.ebuild 4993 RMD160 884224cc009c5fc46e74d70b64a6c86fa7f8b72b SHA1 9f1f20bfaec00d47cb5f1e642b99d28d50095ca2 SHA256 1256531c0f4a6179c19fab69a54ab3ead925bc5c81e75bfbe7ceda715abadc4d
-MISC ChangeLog 28324 RMD160 6d80e18b90217e8ffb1ddf890e0721c6d5b1b910 SHA1 653fc722b1da13fcae6640c54081ffa2a3be86e6 SHA256 7b30d38cf95713f1e5486c53eb2c44c08bf69242eea4272adbdc4df0096eb9b2
+EBUILD netbeans-javacard-9999_p20120304.ebuild 4993 RMD160 f9ed7d275ef0f92cd992853c3a3761043e54af41 SHA1 fc92c80e04b053343662cb357160f5d1baa9bf05 SHA256 e5029b075acbf8cffd3551484e9c89c5647b9d139a958999ce3221c27329bac8
+MISC ChangeLog 28504 RMD160 1503abb65b3a44f808eb34efe6142f778a9862a3 SHA1 7707d49e30ca46cf7b1e7f965e7d553bf7956aff SHA256 ec2d3de8e757af3e57bf0b857f99faf55563bf16745f9efd657b2db1e9ae0119
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20120304.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20120304.ebuild
new file mode 100644
index 0000000..7b43d00
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20120304.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaCard Cluster"
+HOMEPAGE="http://netbeans.org/projects/javacard"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2012-03-04_04-00-40/zip/netbeans-trunk-nightly-201203040400-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar
+	http://hg.netbeans.org/binaries/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar
+	http://hg.netbeans.org/binaries/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}
+	dev-java/ant-contrib:0
+	dev-java/asm:3
+	dev-java/bcel:0
+	dev-java/commons-cli:1
+	dev-java/commons-codec:0
+	dev-java/commons-httpclient:3
+	dev-java/commons-logging:0"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.javacard -Dext.binaries.downloaded=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r1-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-r1-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 0bcb4a3..d8262c0 100644
--- a/dev-java/netbeans-javadoc/ChangeLog
+++ b/dev-java/netbeans-javadoc/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javadoc-9999_p20120304 (04 Mar 2012)
+
+  04 Mar 2012; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-javadoc-9999_p20120304.ebuild:
+  Bumped to latest nightly module
+
 *netbeans-javadoc-9999_p20120303 (03 Mar 2012)
 
   03 Mar 2012; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index 42f11d3..89cf204 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -8,6 +8,7 @@ DIST netbeans-trunk-nightly-201202220400-src.zip 174195023 RMD160 800aa796b42f79
 DIST netbeans-trunk-nightly-201202270400-src.zip 174236017 RMD160 91d77d72c626d19a3bb88ab54e5612bb25e9c284 SHA1 58ba5f403553b9f754bebcc526047914d0721e4e SHA256 ad81b677ea067a86ebd2e26f2c7a1b538115406ee7bd36a95bb3856d8a4d5913
 DIST netbeans-trunk-nightly-201203010400-src.zip 174453125 RMD160 18c55d8b3789cef77bfde78b3310e55eab20011a SHA1 18e5786d27bbbdc91110e4d88eff9780b4dfc5cd SHA256 b1429ceebbaaefc169dc290870a66452b28c017a355bfbe925c3eba6e015013b
 DIST netbeans-trunk-nightly-201203030400-src.zip 174515173 RMD160 c9d99881d451d04be8035e861b8c91a8c5768084 SHA1 d86dbf4f822663c19b46fb19b05e275ba0f710e6 SHA256 e4bccd6167404f55ae5983807388a8cfb7980b3b00d37253a6ac4df4e6dea115
+DIST netbeans-trunk-nightly-201203040400-src.zip 174521722 RMD160 fb5cf478d504b5fb86e00c8204998bdfbf3d03e4 SHA1 6a97490572215bc65cfdcc150c9f76b6795fec78 SHA256 e5e376831eb0104ecac58cce6da6e20a637f1c7c14ac0992c094dc61ed186f35
 EBUILD netbeans-javadoc-7.0.1.ebuild 5814 RMD160 d5b77264285edf96d0a3a30666a4ae72ee2387a7 SHA1 ec29b545b0632d7ea9e8bdd2208f5d1fe9532561 SHA256 68531c51838c95012830f5ae09e2386ea3179c2b31bfd5191f67993e3b3dbe2f
 EBUILD netbeans-javadoc-7.1.ebuild 5851 RMD160 db66fdfbe9d39c0f397909a0f06a08fc8d986710 SHA1 3faf82e4992bfcf12c1390baceb7d694fa920005 SHA256 216cbe2fd9fc97f843c0148806ad2d8267aab337542822301543070aa47a8a2d
 EBUILD netbeans-javadoc-9999_p20120219.ebuild 5845 RMD160 85981247984ca3ead624512b76a03212bbe11a9b SHA1 4e0b0386385dc6a7fdce834cf10787543dbbf360 SHA256 d780ad42fd570923c2d777ff369f9e43b5d1cd0580810c0e03d47a25adc0e03d
@@ -15,5 +16,6 @@ EBUILD netbeans-javadoc-9999_p20120222.ebuild 5845 RMD160 05fe1e3d2b81d1164927d7
 EBUILD netbeans-javadoc-9999_p20120227.ebuild 5845 RMD160 000b6a40bd3b0ec0206417199c77910a6a7551c3 SHA1 2bd21b1ecb44e1145be0307ddb8f1f3e0e3968b9 SHA256 f13d9fd01330181e6ad98cfb831ad641b30174974d39a0d95a6d91ecf55a642f
 EBUILD netbeans-javadoc-9999_p20120301.ebuild 5845 RMD160 ba523f8f7e54ecc2f35970c56cf4527d7c3f81c9 SHA1 52434df186f66b7dde3405f29324d01c9a5d4c7a SHA256 9f8dcb8a7d7b8ed2039a0433816e215136a13fb1073becd7d3fbeaee760103e5
 EBUILD netbeans-javadoc-9999_p20120303.ebuild 5845 RMD160 4626bbf5fa81cd96514d378f445d236414b64ab4 SHA1 b4adf76ffdf6b651a72af8fae0c463bbe69cb22c SHA256 02ecdf7d0f2e6a2e090d51b41d0e9f790bde39840b87f0cc61c4b1b5c4fecec2
-MISC ChangeLog 27872 RMD160 a1309fb1024049c32d7b4ec205ca28bcef665176 SHA1 ec21498d1a59c85c8be5c2c942a62393149b0a6a SHA256 bbafff2c42f4dc3f00e0c0a98b155a27a76ffb15c4461236dd3ec6742dcbf680
+EBUILD netbeans-javadoc-9999_p20120304.ebuild 5845 RMD160 4303573ede4b6e5f5b343bb9ebcf64f98167c897 SHA1 13e16ba9fc60e6ccfbc41d367bb4a51a56027b1a SHA256 7f5eca54503feca52052a0247f021b8bad57e2c6cf75b47944f920a48dae8153
+MISC ChangeLog 28050 RMD160 bf83f89c3f467156c2e8ee84b9f39182344da7d5 SHA1 e85e1fc559437f9b0464fce788c4ea791b6b4358 SHA256 fecdfc58ac6147a99e7e564f4d36f286b757d56992175e9db9aacccbe046dfc4
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20120304.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20120304.ebuild
new file mode 100644
index 0000000..f030d91
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20120304.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaDocs"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2012-03-04_04-00-40/zip/netbeans-trunk-nightly-201203040400-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-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-r1-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-r1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.10.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-apisupport-${SLOT} apisupport || die
+	cat /usr/share/netbeans-apisupport-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.apisupport.built
+
+	ln -s /usr/share/netbeans-cnd-${SLOT} cnd || die
+	cat /usr/share/netbeans-cnd-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.cnd.built
+
+	ln -s /usr/share/netbeans-dlight-${SLOT} dlight || die
+	cat /usr/share/netbeans-dlight-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.dlight.built
+
+	ln -s /usr/share/netbeans-enterprise-${SLOT} enterprise || die
+	cat /usr/share/netbeans-enterprise-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.enterprise.built
+
+	ln -s /usr/share/netbeans-ergonomics-${SLOT} ergonomics || die
+	cat /usr/share/netbeans-ergonomics-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ergonomics.built
+
+	ln -s /usr/share/netbeans-groovy-${SLOT} groovy || die
+	cat /usr/share/netbeans-groovy-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.groovy.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-javacard-${SLOT} javacard || die
+	cat /usr/share/netbeans-javacard-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.javacard.built
+
+	ln -s /usr/share/netbeans-mobility-${SLOT} mobility || die
+	cat /usr/share/netbeans-mobility-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.mobility.built
+
+	ln -s /usr/share/netbeans-nb-${SLOT}/nb nb || die
+	cat /usr/share/netbeans-nb-${SLOT}/nb/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.nb.built
+
+	ln -s /usr/share/netbeans-php-${SLOT} php || die
+	cat /usr/share/netbeans-php-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.php.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-profiler-${SLOT} profiler || die
+	cat /usr/share/netbeans-profiler-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.profiler.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	eant -f nbbuild/build.xml bootstrap || die
+	ANT_OPTS="-Xmx1536m" eant -f nbbuild/javadoctools/build.xml build-javadoc
+}
+
+src_install() {
+	rm nbbuild/build/javadoc/*.zip
+	java-pkg_dojavadoc nbbuild/build/javadoc
+}

diff --git a/dev-java/netbeans-javafx/ChangeLog b/dev-java/netbeans-javafx/ChangeLog
index 07e3b72..2e2034c 100644
--- a/dev-java/netbeans-javafx/ChangeLog
+++ b/dev-java/netbeans-javafx/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javafx-9999_p20120304 (04 Mar 2012)
+
+  04 Mar 2012; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-javafx-9999_p20120304.ebuild:
+  Bumped to latest nightly module
+
 *netbeans-javafx-9999_p20120303 (03 Mar 2012)
 
   03 Mar 2012; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index 05b528f..6c61a01 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -7,11 +7,13 @@ DIST netbeans-trunk-nightly-201202220400-src.zip 174195023 RMD160 800aa796b42f79
 DIST netbeans-trunk-nightly-201202270400-src.zip 174236017 RMD160 91d77d72c626d19a3bb88ab54e5612bb25e9c284 SHA1 58ba5f403553b9f754bebcc526047914d0721e4e SHA256 ad81b677ea067a86ebd2e26f2c7a1b538115406ee7bd36a95bb3856d8a4d5913
 DIST netbeans-trunk-nightly-201203010400-src.zip 174453125 RMD160 18c55d8b3789cef77bfde78b3310e55eab20011a SHA1 18e5786d27bbbdc91110e4d88eff9780b4dfc5cd SHA256 b1429ceebbaaefc169dc290870a66452b28c017a355bfbe925c3eba6e015013b
 DIST netbeans-trunk-nightly-201203030400-src.zip 174515173 RMD160 c9d99881d451d04be8035e861b8c91a8c5768084 SHA1 d86dbf4f822663c19b46fb19b05e275ba0f710e6 SHA256 e4bccd6167404f55ae5983807388a8cfb7980b3b00d37253a6ac4df4e6dea115
+DIST netbeans-trunk-nightly-201203040400-src.zip 174521722 RMD160 fb5cf478d504b5fb86e00c8204998bdfbf3d03e4 SHA1 6a97490572215bc65cfdcc150c9f76b6795fec78 SHA256 e5e376831eb0104ecac58cce6da6e20a637f1c7c14ac0992c094dc61ed186f35
 EBUILD netbeans-javafx-7.1.ebuild 3589 RMD160 8d1d9404f21e87bbdb03ae48cc3f3b69d8dae46d SHA1 ff7897e7488e2740ab40e2bcbe990e570a56e8ce SHA256 b8f24560705d071178a1bc5e0dcff0d021e69055fff09f37231c8125eeb7f5d9
 EBUILD netbeans-javafx-9999_p20120219.ebuild 3616 RMD160 1a46f122f95d0395a14f029088e4ccfbe341accb SHA1 eeb28c8bfc30189e43a46530da85b7f3506f5762 SHA256 87fbddfe621fa782ad313632e361a36c191ca91d8c61682968ceb82a9654f278
 EBUILD netbeans-javafx-9999_p20120222.ebuild 3616 RMD160 8b1f57a7b7576dac04faf4b4f819cf1d4331e563 SHA1 be8c9700cdc9f3dc3d05f38024212ea24ee56be9 SHA256 b5394395afe27cf43a3e163e2d5f65bfdd5d04f697db32b9e5aa81c5ff083da3
 EBUILD netbeans-javafx-9999_p20120227.ebuild 3616 RMD160 6318a942c8b4b83fb6354e16a6b29cd64928c9c5 SHA1 1cac278c44a97b8f34b15356da769132ceffa5b8 SHA256 d733faf7e73983f59ee4bec2888c026087c2f37875c466e044dd37422ccb54b5
 EBUILD netbeans-javafx-9999_p20120301.ebuild 3616 RMD160 1f747b42d6e27b54f837615ae212c571c2ea2416 SHA1 bde396c2381aa22c91a72a3d9d9a4c6502cdbc25 SHA256 acb32f83653405b60742cb23c6611f74cb1b115f3289325f39b90fd2c6c183ef
 EBUILD netbeans-javafx-9999_p20120303.ebuild 3616 RMD160 a7b8da4d30805f2038c4a0bc716fe556f638a641 SHA1 d453da3b885f9f88268f576197334ff6b98cfb38 SHA256 5c5c52d74876ed88ee68a8b4d4b78a9363478c3f6f0f6a78535f3bc676242474
-MISC ChangeLog 14358 RMD160 8ff32d84194c7b23f5b291add2779894e12a5da1 SHA1 9f2e76d4fc6605dd5758e28d3c1b94c0d60b054b SHA256 232b9a77282c913c42de97f6e237a2bc075ed955cb658518ed892930911ffdd5
+EBUILD netbeans-javafx-9999_p20120304.ebuild 3616 RMD160 edc8a0312ad8b195f83d7115fd19436115922d93 SHA1 9cf14e3927edba527de067ec560161bf47d3a97b SHA256 bd2f7831a0cbe763ad40658823684126ed7057e34737c7f8468a35b03a5a008a
+MISC ChangeLog 14534 RMD160 a44f4e9fba54680ab767da8f5d0fd62d838cf3ea SHA1 8cf849a29cc4194feb8eb985f39bf513a2fe8fc2 SHA256 f93adf92150c758fa41f09e0fec922b30f3e18f7c926e83d426af957bd017bb9
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20120304.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20120304.ebuild
new file mode 100644
index 0000000..6cbabc7
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20120304.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaFX Cluster"
+HOMEPAGE="http://netbeans.org/projects/javafx"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2012-03-04_04-00-40/zip/netbeans-trunk-nightly-201203040400-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
+	http://hg.netbeans.org/binaries/418FC62C8A6EF5311987B01FE389B1F88EFDDCA2-jemmy-2.3.0.0.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	dev-java/junit:4"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.javafx -Dext.binaries.downloaded=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r1-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-r1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into apisupport.harness/external javahelp jsearch.jar jsearch-2.0_05.jar
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.10.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/javafx >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/javafx$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/javafx
+}

diff --git a/dev-java/netbeans-mobility/ChangeLog b/dev-java/netbeans-mobility/ChangeLog
index 2565a4d..e3e6f8d 100644
--- a/dev-java/netbeans-mobility/ChangeLog
+++ b/dev-java/netbeans-mobility/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-mobility-9999_p20120304 (04 Mar 2012)
+
+  04 Mar 2012; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-mobility-9999_p20120304.ebuild:
+  Bumped to latest nightly module
+
 *netbeans-mobility-9999_p20120303 (03 Mar 2012)
 
   03 Mar 2012; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index e96d96e..7babae5 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -16,6 +16,7 @@ DIST netbeans-trunk-nightly-201202220400-src.zip 174195023 RMD160 800aa796b42f79
 DIST netbeans-trunk-nightly-201202270400-src.zip 174236017 RMD160 91d77d72c626d19a3bb88ab54e5612bb25e9c284 SHA1 58ba5f403553b9f754bebcc526047914d0721e4e SHA256 ad81b677ea067a86ebd2e26f2c7a1b538115406ee7bd36a95bb3856d8a4d5913
 DIST netbeans-trunk-nightly-201203010400-src.zip 174453125 RMD160 18c55d8b3789cef77bfde78b3310e55eab20011a SHA1 18e5786d27bbbdc91110e4d88eff9780b4dfc5cd SHA256 b1429ceebbaaefc169dc290870a66452b28c017a355bfbe925c3eba6e015013b
 DIST netbeans-trunk-nightly-201203030400-src.zip 174515173 RMD160 c9d99881d451d04be8035e861b8c91a8c5768084 SHA1 d86dbf4f822663c19b46fb19b05e275ba0f710e6 SHA256 e4bccd6167404f55ae5983807388a8cfb7980b3b00d37253a6ac4df4e6dea115
+DIST netbeans-trunk-nightly-201203040400-src.zip 174521722 RMD160 fb5cf478d504b5fb86e00c8204998bdfbf3d03e4 SHA1 6a97490572215bc65cfdcc150c9f76b6795fec78 SHA256 e5e376831eb0104ecac58cce6da6e20a637f1c7c14ac0992c094dc61ed186f35
 EBUILD netbeans-mobility-7.0.1.ebuild 8655 RMD160 97622d84257291737ea08fa69205ba0377747896 SHA1 2240a20d8c81315c88ed2468e6ca9e3a54ecc5d5 SHA256 992e214ff2926e2f0db623d96b717bf8f8e4ceb47e96e69b3c6b8f67d6a8d130
 EBUILD netbeans-mobility-7.1.ebuild 7539 RMD160 f975f736b74d57c8e445e50e7e909adbef38ebd7 SHA1 826425ff93ca5c153de51aa79ed2385c00ba1586 SHA256 fc17a886b5cf6035b8dfb4572297a27a89bcd9dedd8a41cbde9249ed6322c7aa
 EBUILD netbeans-mobility-9999_p20120219.ebuild 7566 RMD160 770f31cd0daf253796284b0f9419ce9bffad3006 SHA1 b5ea9e351c698268cadd42cdf2d5db99a78f2117 SHA256 996a39418d8b9a9eea5e6c94b4b367ec50981bf63d9b7b21c2495890f62565e4
@@ -23,5 +24,6 @@ EBUILD netbeans-mobility-9999_p20120222.ebuild 7566 RMD160 504cd0e28d7a8b41266d4
 EBUILD netbeans-mobility-9999_p20120227.ebuild 7566 RMD160 0f1629c72e5bbc22ca0ba7dc83afd03f9f10ed3b SHA1 cfba81fc8cee1d3dff24ae1d44b8c467bb4ab032 SHA256 fcad12ef3a6c55493c3d867218cd7b8ff1ced67376d8d13a9dc12006aeb4ad35
 EBUILD netbeans-mobility-9999_p20120301.ebuild 7566 RMD160 38e776b073320c0632553798777b083a38105038 SHA1 6f9c18e491cbac4336edfb4483577504c591400c SHA256 b41ef7d61e502d2c20a6adbcfece17e36d24718ceeb0a88bc40c109cb7e5cce2
 EBUILD netbeans-mobility-9999_p20120303.ebuild 7566 RMD160 de1dc632914969e872c9b2d6615aca9366490d22 SHA1 1b7461497f160b6aa3eaaab4a507b933db03f300 SHA256 b0064b9847f700f64ee9d8af81e7c5d5e8ebab5d878c8e000121903a0939e554
-MISC ChangeLog 28465 RMD160 600e9cec2517162e1638bee1083676408a25ae2a SHA1 bfb36fada01cc7ffa64c831f528a634a660f730b SHA256 4cbd3cce7f0a96c0736d3c1b2c8ef35e6b765b254d80e1907bee09a66f2d037b
+EBUILD netbeans-mobility-9999_p20120304.ebuild 7566 RMD160 aca2a7f5fb7858ef8c40182ea8cb4a90d4f52176 SHA1 50d65fb5c8790a31743e04ce631063ec0bf98974 SHA256 ec1c3ea3fdf2a94a321937df85b0542a460ef20dfce187e2894763994678b40e
+MISC ChangeLog 28645 RMD160 a866727087c3118e91f294774f203c26090b8bdd SHA1 f13bc237b8eacba80aa6ab2afc1f172858c4d65d SHA256 cad25ac7cbcad5fb6b942124ea47ca13834fcc7cc936100f91fd2bb08730f5e0
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20120304.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20120304.ebuild
new file mode 100644
index 0000000..599dca9
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20120304.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Mobility Cluster"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2012-03-04_04-00-40/zip/netbeans-trunk-nightly-201203040400-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/CEF99941E945D543DF0711F2C6AEF765B50F8501-jakarta-slide-ant-webdav-2.1.jar
+	http://hg.netbeans.org/binaries/D1B5BA3BFE8DCFAF08A0468F8879EF1D0E998038-jakarta-slide-webdavlib-2.1.jar
+	http://hg.netbeans.org/binaries/2FB485DD8C5EFC7972037781BFFF0CE31316FCE6-jmunit-1.2.1-api.zip
+	http://hg.netbeans.org/binaries/BD84F1A4C0789070CC62A8D2DBA75121A57C069C-jmunit4cldc10-1.2.1.jar
+	http://hg.netbeans.org/binaries/D76B8334DCBDBE93297AA5C02B17D9A856E72246-jmunit4cldc11-1.2.1.jar
+	http://hg.netbeans.org/binaries/D63B2CB355170F1BC8E126E43021047F94243B70-perseus-nb-1.0.1.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-apisupport-${PV}
+	~dev-java/netbeans-enterprise-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/ant-contrib:0
+	dev-java/commons-httpclient:3
+	dev-java/jdom:1.0"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.mobility -Dext.binaries.downloaded=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f | grep -vE "mobility.databindingme/lib/netbeans_databindingme.*\.jar" \
+		| grep -v "vmd.components.midp/netbeans_midp_components_basic/dist/netbeans_midp_components_basic.jar" \
+		| grep -v "vmd.components.midp.pda/netbeans_midp_components_pda/dist/netbeans_midp_components_pda.jar" \
+		| grep -v "vmd.components.midp.wma/netbeans_midp_components_wma/dist/netbeans_midp_components_wma.jar" \
+		| grep -v "vmd.components.svg/nb_svg_midp_components/dist/nb_svg_midp_components.jar" | xargs rm
+
+	unpack netbeans-9999-r1-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/CEF99941E945D543DF0711F2C6AEF765B50F8501-jakarta-slide-ant-webdav-2.1.jar mobility.deployment.webdav/external/jakarta-slide-ant-webdav-2.1.jar || die
+	ln -s "${DISTDIR}"/D1B5BA3BFE8DCFAF08A0468F8879EF1D0E998038-jakarta-slide-webdavlib-2.1.jar mobility.deployment.webdav/external/jakarta-slide-webdavlib-2.1.jar || die
+	ln -s "${DISTDIR}"/2FB485DD8C5EFC7972037781BFFF0CE31316FCE6-jmunit-1.2.1-api.zip mobility.j2meunit/external/jmunit-1.2.1-api.zip || die
+	ln -s "${DISTDIR}"/BD84F1A4C0789070CC62A8D2DBA75121A57C069C-jmunit4cldc10-1.2.1.jar mobility.j2meunit/external/jmunit4cldc10-1.2.1.jar || die
+	ln -s "${DISTDIR}"/D76B8334DCBDBE93297AA5C02B17D9A856E72246-jmunit4cldc11-1.2.1.jar mobility.j2meunit/external/jmunit4cldc11-1.2.1.jar || die
+	ln -s "${DISTDIR}"/D63B2CB355170F1BC8E126E43021047F94243B70-perseus-nb-1.0.1.jar svg.perseus/external/perseus-nb-1.0.1.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into mobility.antext/external ant-contrib ant-contrib.jar ant-contrib-1.0b3.jar
+	java-pkg_jar-from --into mobility.deployment.webdav/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.0.1.jar
+	java-pkg_jar-from --into mobility.deployment.webdav/external jdom-1.0 jdom.jar jdom-1.0.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-apisupport-${SLOT} apisupport || die
+	cat /usr/share/netbeans-apisupport-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.apisupport.built
+
+	ln -s /usr/share/netbeans-enterprise-${SLOT} enterprise || die
+	cat /usr/share/netbeans-enterprise-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.enterprise.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/mobility >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/mobility$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	rm -rf "${D}"/${INSTALL_DIR}/modules/lib || die
+
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm ant-contrib-1.0b3.jar && dosym /usr/share/ant-contrib/lib/ant-contrib.jar ${instdir}/ant-contrib-1.0b3.jar || die
+	# cdc-agui-swing-layout.jar
+	# cdc-pp-awt-layout.jar
+	rm commons-httpclient-3.0.1.jar && dosym /usr/share/commons-httpclient-3/lib/commons-httpclient.jar ${instdir}/commons-httpclient-3.0.1.jar || die
+	# jakarta-slide-ant-webdav-2.1.jar
+	# jakarta-slide-webdavlib-2.1.jar
+	rm jdom-1.0.jar && dosym /usr/share/jdom-1.0/lib/jdom.jar ${instdir}/jdom-1.0.jar || die
+	# jmunit4cldc10-1.2.1.jar
+	# jmunit4cldc11-1.2.1.jar
+	# nbactivesync-5.0.jar
+	# nb_svg_midp_components.jar
+	# netbeans_databindingme.jar
+	# netbeans_databindingme_pim.jar
+	# netbeans_databindingme_svg.jar
+	# netbeans_midp_components_basic.jar
+	# netbeans_midp_components_pda.jar
+	# netbeans_midp_components_wma.jar
+	# org-netbeans-modules-deployment-deviceanywhere.jar
+	# org-netbeans-modules-j2me-cdc-platform-nsicom-probe.jar
+	# org-netbeans-modules-j2me-cdc-project.jar
+	# org-netbeans-modules-j2me-cdc-project-nokiaS80.jar
+	# org-netbeans-modules-j2me-cdc-project-ojec.jar
+	# org-netbeans-modules-j2me-cdc-project-ricoh.jar
+	# org-netbeans-modules-j2me-cdc-project-savaje.jar
+	# org-netbeans-modules-j2me-cdc-project-semc.jar
+	# org-netbeans-modules-j2me-cdc-project-sjmc.jar
+	# perseus-nb-1.0.1.jar
+	# RicohAntTasks-2.0.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/mobility
+}

diff --git a/dev-java/netbeans-nb/ChangeLog b/dev-java/netbeans-nb/ChangeLog
index edce59b..d283ec4 100644
--- a/dev-java/netbeans-nb/ChangeLog
+++ b/dev-java/netbeans-nb/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-nb-9999_p20120304 (04 Mar 2012)
+
+  04 Mar 2012; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-nb-9999_p20120304.ebuild:
+  Bumped to latest nightly module
+
 *netbeans-nb-9999_p20120303 (03 Mar 2012)
 
   03 Mar 2012; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index a1ffe48..b82fabd 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -11,6 +11,7 @@ DIST netbeans-trunk-nightly-201202220400-src.zip 174195023 RMD160 800aa796b42f79
 DIST netbeans-trunk-nightly-201202270400-src.zip 174236017 RMD160 91d77d72c626d19a3bb88ab54e5612bb25e9c284 SHA1 58ba5f403553b9f754bebcc526047914d0721e4e SHA256 ad81b677ea067a86ebd2e26f2c7a1b538115406ee7bd36a95bb3856d8a4d5913
 DIST netbeans-trunk-nightly-201203010400-src.zip 174453125 RMD160 18c55d8b3789cef77bfde78b3310e55eab20011a SHA1 18e5786d27bbbdc91110e4d88eff9780b4dfc5cd SHA256 b1429ceebbaaefc169dc290870a66452b28c017a355bfbe925c3eba6e015013b
 DIST netbeans-trunk-nightly-201203030400-src.zip 174515173 RMD160 c9d99881d451d04be8035e861b8c91a8c5768084 SHA1 d86dbf4f822663c19b46fb19b05e275ba0f710e6 SHA256 e4bccd6167404f55ae5983807388a8cfb7980b3b00d37253a6ac4df4e6dea115
+DIST netbeans-trunk-nightly-201203040400-src.zip 174521722 RMD160 fb5cf478d504b5fb86e00c8204998bdfbf3d03e4 SHA1 6a97490572215bc65cfdcc150c9f76b6795fec78 SHA256 e5e376831eb0104ecac58cce6da6e20a637f1c7c14ac0992c094dc61ed186f35
 EBUILD netbeans-nb-7.0.1.ebuild 5116 RMD160 df3e2ea3364e01de002fbb97b56c2bf927ba0e2c SHA1 f962fd0ba56bab72ef843342d94d0992e615698f SHA256 17ac4a9aa7931d052a899ad8649bed42d5c37a06d913e0dc8ded118d7ef01c47
 EBUILD netbeans-nb-7.1.ebuild 4983 RMD160 d7f1aa7a179b6513634f94170baab7f6ff6b0297 SHA1 26aa2b6fc0bd70f77a5024d6882cce19e0ab287a SHA256 51fa0624a944ce97e5ab1d23803c86937f06d4f0d60c4cb2d56bcb93607a5223
 EBUILD netbeans-nb-9999_p20120219.ebuild 5010 RMD160 7e5ea676c0e6814c70315e665efe04bd284f350b SHA1 6cf45b2d5618f354aa60ebbe1124d6938a2c95bd SHA256 be176765cca61990830b3de9c5304c0bfe412de6d7454a39fa9e6f407bf1c741
@@ -18,5 +19,6 @@ EBUILD netbeans-nb-9999_p20120222.ebuild 5010 RMD160 b38199a5a2b996ee61674047cb9
 EBUILD netbeans-nb-9999_p20120227.ebuild 5010 RMD160 7802309f1832759c38c903ea543ea3e50a7ee97b SHA1 ad0f8641a269b12fa48c4c699f74c83f8fdef798 SHA256 260744b0e079d89cda557eeba0f95f2c452eceda395ba6718fda302e61706af3
 EBUILD netbeans-nb-9999_p20120301.ebuild 5010 RMD160 b127fabaf0cf4bfe56b5931fb1d96c087393cfad SHA1 fa4864fed33211e451e364acf14222ceb55ef304 SHA256 e56ee15639606f8a882ec443df6703688ddddc66409554ca800ba349b6d58508
 EBUILD netbeans-nb-9999_p20120303.ebuild 5010 RMD160 40d350f202e268870aa74e2d0271dd9c1158469a SHA1 3392a273097186854c3f4858433093bab4bb4717 SHA256 e37a73168bfc7949c83468d1da6a8788dc9d357e4ce17f9313b9ded212f3ed91
-MISC ChangeLog 27068 RMD160 0911e88ca0eaa3154e2ff8b59ece77a8046bc694 SHA1 4309ae17b242b65979813038093ac3d035074178 SHA256 c75c5b983343e2af3fbc7717a64cb1a3252c5988d381e1668a57f4d5c54b1567
+EBUILD netbeans-nb-9999_p20120304.ebuild 5010 RMD160 7fb929e5181554ac548378f8133125fb5c79752e SHA1 c79e018f64b6acd5c411cd30f406348aeb15bc81 SHA256 8c333dd1bb7046076a957ef533adc19bec1ed00934239a0dda0e28be5cf2db28
+MISC ChangeLog 27236 RMD160 40e0a9e9b31630e74d5f407e9cb23ed1b44032d0 SHA1 785092718029b24f87cc894165ca3fc5292e5ce0 SHA256 1049d5e787dd66dd8ca49dd1952e56f403f45c4d5ac258fe87e8e080ea018c92
 MISC metadata.xml 396 RMD160 80c4086b305af8d5e4adae8a263111590f183c05 SHA1 11224a41781dde9ebd92c32e5c0a9d1921b628cb SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49

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

diff --git a/dev-java/netbeans-php/ChangeLog b/dev-java/netbeans-php/ChangeLog
index d7c31cb..0407d49 100644
--- a/dev-java/netbeans-php/ChangeLog
+++ b/dev-java/netbeans-php/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-php-9999_p20120304 (04 Mar 2012)
+
+  04 Mar 2012; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-php-9999_p20120304.ebuild:
+  Bumped to latest nightly module
+
 *netbeans-php-9999_p20120303 (03 Mar 2012)
 
   03 Mar 2012; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index c42a417..5c044bd 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -13,6 +13,7 @@ DIST netbeans-trunk-nightly-201202220400-src.zip 174195023 RMD160 800aa796b42f79
 DIST netbeans-trunk-nightly-201202270400-src.zip 174236017 RMD160 91d77d72c626d19a3bb88ab54e5612bb25e9c284 SHA1 58ba5f403553b9f754bebcc526047914d0721e4e SHA256 ad81b677ea067a86ebd2e26f2c7a1b538115406ee7bd36a95bb3856d8a4d5913
 DIST netbeans-trunk-nightly-201203010400-src.zip 174453125 RMD160 18c55d8b3789cef77bfde78b3310e55eab20011a SHA1 18e5786d27bbbdc91110e4d88eff9780b4dfc5cd SHA256 b1429ceebbaaefc169dc290870a66452b28c017a355bfbe925c3eba6e015013b
 DIST netbeans-trunk-nightly-201203030400-src.zip 174515173 RMD160 c9d99881d451d04be8035e861b8c91a8c5768084 SHA1 d86dbf4f822663c19b46fb19b05e275ba0f710e6 SHA256 e4bccd6167404f55ae5983807388a8cfb7980b3b00d37253a6ac4df4e6dea115
+DIST netbeans-trunk-nightly-201203040400-src.zip 174521722 RMD160 fb5cf478d504b5fb86e00c8204998bdfbf3d03e4 SHA1 6a97490572215bc65cfdcc150c9f76b6795fec78 SHA256 e5e376831eb0104ecac58cce6da6e20a637f1c7c14ac0992c094dc61ed186f35
 EBUILD netbeans-php-7.0.1.ebuild 4151 RMD160 948630039891c480cbc0a9440fd9d74438bbcca4 SHA1 9afb5f8b29bc9c86fce11b8a44976da980741ec8 SHA256 3aee393fe89aa4788ccd17af46f1df43a5681c28af6d580724d8db0f5e804ff0
 EBUILD netbeans-php-7.1.ebuild 3936 RMD160 6bb9027c14db7fe0c590939d25e73c990ad57a91 SHA1 ba77f0f6453cf11820fd6ba1d85f610d17984056 SHA256 46946b8309f18149285462375093a8b6d4385c547ce355d443b92de7c484b541
 EBUILD netbeans-php-9999_p20120219.ebuild 3963 RMD160 8b2539255e11ae82e5a946c192ac46ccecd401ea SHA1 34884b057f2096ba0dc6985b86261261b28c265a SHA256 7d8388f86b11423f434ae836501fdd442ab549be23b22e1a73e734144fccbfd2
@@ -20,5 +21,6 @@ EBUILD netbeans-php-9999_p20120222.ebuild 3963 RMD160 ecd49ec159f72608b4ab1fecb9
 EBUILD netbeans-php-9999_p20120227.ebuild 3963 RMD160 168b6c5e436789573cceb338933d43f3d5b24306 SHA1 37b7f8a96ed9e3747f75666b2a0f775a945a96a1 SHA256 bde2a4b18b5f770d0e41453f27309b1ddd0e0beba4e627eed880a59ebb967a01
 EBUILD netbeans-php-9999_p20120301.ebuild 4199 RMD160 41a4b85b9b0d4e9c93e462cf19e183d90beaeb74 SHA1 df1aab9e52c79f2cc779c4d0f02d7b6719b5ef52 SHA256 fbf48d4807a273fa776c73731dcda36584c0f63a41074a97544e00f493c57e1e
 EBUILD netbeans-php-9999_p20120303.ebuild 4199 RMD160 f8bbf3ffe4a53ae56191b6fcdb94b00152a233ca SHA1 b6244b49b82b282ab7231cbf892f0910a97f2a2d SHA256 04054d388dc0ffab72a4620e7546be7955e56f1f48c2392e2e8d7fa9f958aa59
-MISC ChangeLog 26719 RMD160 fd524511e1b6bdb4574adec5d58c2509f21b4139 SHA1 1b21e26ff2c1987de06b8924780f45f048deb56a SHA256 e3e629fddd567f078723789e7fef2bea46b82ee745b905b4db7fd50e3578483e
+EBUILD netbeans-php-9999_p20120304.ebuild 4199 RMD160 6121084adbcd78d818680e4d3ab654ef2790b513 SHA1 22d920c7862d81fcfe90f5b6e9953a3fe947199f SHA256 0410292f06424b321cb1c10886c03a3a2b897c814286efb3f133d8f519a8fe7f
+MISC ChangeLog 26889 RMD160 1e70e34d176e2c13d3285c925501ebba8d48a196 SHA1 9e39a2be977c6d05ea68ee1e487891f0cc15bf0a SHA256 ca51626c6fecad01c036f30883423cca4cc1e9274b6249915fdd0a315367b0a8
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20120304.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20120304.ebuild
new file mode 100644
index 0000000..b1bfa54
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20120304.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans PHP Cluster"
+HOMEPAGE="http://netbeans.org/projects/php"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2012-03-04_04-00-40/zip/netbeans-trunk-nightly-201203040400-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip
+	http://hg.netbeans.org/binaries/02C57E8113871A5CEC0AB853D48165761FAF1051-phpsigfiles.zip
+	http://hg.netbeans.org/binaries/40BC40A6E6DBD598900E8FAB87E460FCC601275C-predefined_vars.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-webcommon-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/javacup:0"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.php -Dext.binaries.downloaded=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r1-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip php.phpdoc.documentation/external/phpdocdesc.zip || die
+	ln -s "${DISTDIR}"/02C57E8113871A5CEC0AB853D48165761FAF1051-phpsigfiles.zip php.project/external/phpsigfiles.zip || die
+	ln -s "${DISTDIR}"/40BC40A6E6DBD598900E8FAB87E460FCC601275C-predefined_vars.zip php.editor/external/predefined_vars.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.javacup/external javacup javacup.jar java-cup-11a.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-webcommon-${SLOT} webcommon || die
+	cat /usr/share/netbeans-webcommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.webcommon.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/php >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/php$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm java-cup-11a.jar && dosym /usr/share/javacup/lib/javacup.jar ${instdir}/java-cup-11a.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/php
+}

diff --git a/dev-java/netbeans-platform/ChangeLog b/dev-java/netbeans-platform/ChangeLog
index 2c8c155..afe5c6e 100644
--- a/dev-java/netbeans-platform/ChangeLog
+++ b/dev-java/netbeans-platform/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-platform-9999_p20120304 (04 Mar 2012)
+
+  04 Mar 2012; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-platform-9999_p20120304.ebuild:
+  Bumped to latest nightly module
+
 *netbeans-platform-9999_p20120303 (03 Mar 2012)
 
   03 Mar 2012; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index 74f1a0d..e180fa4 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -17,6 +17,7 @@ DIST netbeans-trunk-nightly-201202220400-src.zip 174195023 RMD160 800aa796b42f79
 DIST netbeans-trunk-nightly-201202270400-src.zip 174236017 RMD160 91d77d72c626d19a3bb88ab54e5612bb25e9c284 SHA1 58ba5f403553b9f754bebcc526047914d0721e4e SHA256 ad81b677ea067a86ebd2e26f2c7a1b538115406ee7bd36a95bb3856d8a4d5913
 DIST netbeans-trunk-nightly-201203010400-src.zip 174453125 RMD160 18c55d8b3789cef77bfde78b3310e55eab20011a SHA1 18e5786d27bbbdc91110e4d88eff9780b4dfc5cd SHA256 b1429ceebbaaefc169dc290870a66452b28c017a355bfbe925c3eba6e015013b
 DIST netbeans-trunk-nightly-201203030400-src.zip 174515173 RMD160 c9d99881d451d04be8035e861b8c91a8c5768084 SHA1 d86dbf4f822663c19b46fb19b05e275ba0f710e6 SHA256 e4bccd6167404f55ae5983807388a8cfb7980b3b00d37253a6ac4df4e6dea115
+DIST netbeans-trunk-nightly-201203040400-src.zip 174521722 RMD160 fb5cf478d504b5fb86e00c8204998bdfbf3d03e4 SHA1 6a97490572215bc65cfdcc150c9f76b6795fec78 SHA256 e5e376831eb0104ecac58cce6da6e20a637f1c7c14ac0992c094dc61ed186f35
 EBUILD netbeans-platform-7.0.1.ebuild 5049 RMD160 d6a01c7785d02b9e5aebb1a2f192c5a2b6f1ccae SHA1 2acc23f9e9f6f5c60cabce30e651b3d31d91ac41 SHA256 b67cf0867358fea808614c02b8b6ea2ab88223f8642175ac3f91dc8c610aca4e
 EBUILD netbeans-platform-7.1.ebuild 5030 RMD160 973c294a75693c4b7b5758102a007a26bfef1fc9 SHA1 7da3aa5d7471b5ff32601631d5cf517c6a3844f3 SHA256 0e66b8ff85624350b3e1fe765ae80c81723c43848411bafb7cb80924f16f5906
 EBUILD netbeans-platform-9999_p20120219.ebuild 5087 RMD160 b765c7a0e846224ae48d243334f505e48cbe14c0 SHA1 6f3e58a2c636de40b5b944c262791055cd7c2d06 SHA256 ed819f8a72a6562f2b6c80efb4471ca59dfb0d3a62e50b832888fa4e78059ee3
@@ -24,5 +25,6 @@ EBUILD netbeans-platform-9999_p20120222.ebuild 5087 RMD160 5010489877ea57b69217b
 EBUILD netbeans-platform-9999_p20120227.ebuild 5087 RMD160 1e7c67c834fc3349f7ecb86fe3fc44942c8c17b5 SHA1 0b7687b0107bd78b5747b13e53e07b8dab7cf55c SHA256 6c7a03f0fee278499aaae552e741afaecb0505a28ea9d839ad63f9e165a86741
 EBUILD netbeans-platform-9999_p20120301.ebuild 5087 RMD160 5e7b4530311cca8c9e9f7240113cb63c0d9c3970 SHA1 d1c0949e821012d9cf664263316de351dea1c092 SHA256 cc976dff7b1a854dc8b7485c1c9f5a619a909686c6b7d17a59815944149e9c8b
 EBUILD netbeans-platform-9999_p20120303.ebuild 5087 RMD160 5a26cfc84ec2c98c91953bdce36a955dddf9ece4 SHA1 b924094ea87d70e0d2ef1a54cd9f3c924d684138 SHA256 8f37b3634375fd5784980270a5c51355dfc07f8132b932ffc078e01a3233ec68
-MISC ChangeLog 29029 RMD160 a107652e30855b10660ecbcb555308645987e0b5 SHA1 87f35c043b78d27eff61cc6157d0fa664dd46972 SHA256 ac561b023a451221739ed84ec74c9f042408cd8b0d5d39283fd2c6ff1d666455
+EBUILD netbeans-platform-9999_p20120304.ebuild 5087 RMD160 3a63cb899fdc981448efd20831104f7732cd28fb SHA1 3393cd211235398115bb4492b960a2a392139f7d SHA256 b41ced010f590c7fc3e17a9ff1e7bf756528441448662cc3f0e9a48178662ac2
+MISC ChangeLog 29209 RMD160 4262f879a7d8c455ace40da6a7e00262bc58cb47 SHA1 d2711ac8642bc14b6dd9ccfb54dd5b283cbfa537 SHA256 67dc6bc39600e90f7796ab297f996ce29735ec9ed8dcd9cc63d42dc97b880051
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20120304.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20120304.ebuild
new file mode 100644
index 0000000..e1ebc8c
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20120304.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Platform"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2012-03-04_04-00-40/zip/netbeans-trunk-nightly-201203040400-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/14F630EDF137F54188636B5139432986D5FB19B7-felix-4.0.2.jar
+	http://hg.netbeans.org/binaries/2D80F93B8803250F232902C46EBA850BF1F3E67F-org.eclipse.osgi_3.7.1.R37x_v20110808-1106.jar
+	http://hg.netbeans.org/binaries/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar
+	http://hg.netbeans.org/binaries/30B192ADACF0EBA1096F18B3AC445123E212CFC9-osgi.core-4.3.jar
+	http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="dev-java/javahelp:0
+	>=dev-java/jna-3.2.7:0
+	dev-java/swing-layout:1[source]"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.platform -Dext.binaries.downloaded=true -Djava.awt.headless=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r1-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/14F630EDF137F54188636B5139432986D5FB19B7-felix-4.0.2.jar libs.felix/external/felix-4.0.2.jar || die
+	ln -s "${DISTDIR}"/2D80F93B8803250F232902C46EBA850BF1F3E67F-org.eclipse.osgi_3.7.1.R37x_v20110808-1106.jar netbinox/external/org.eclipse.osgi_3.7.1.R37x_v20110808-1106.jar || die
+	ln -s "${DISTDIR}"/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar libs.osgi/external/osgi.cmpn-4.2.jar || die
+	ln -s "${DISTDIR}"/30B192ADACF0EBA1096F18B3AC445123E212CFC9-osgi.core-4.3.jar libs.osgi/external/osgi.core-4.3.jar || die
+	ln -s "${DISTDIR}"/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip o.jdesktop.layout/external/swing-layout-1.0.4-doc.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r1-build.xml.patch
+	# upstream jna jar contains bundled binary libraries so we disable that feature
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --into core.nativeaccess/external jna platform.jar platform-3.2.7.jar
+	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.jna/external jna jna.jar jna-3.2.7.jar
+	java-pkg_jar-from --into o.jdesktop.layout/external swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
+	ln -s /usr/share/swing-layout-1/sources/swing-layout-src.zip o.jdesktop.layout/external/swing-layout-1.0.4-src.zip || die
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	unset DISPLAY
+	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+	pushd nbbuild/netbeans/platform >/dev/null || die
+
+	java-pkg_dojar lib/*.jar
+	grep -E "/platform$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	insinto ${INSTALL_DIR}
+	doins -r *
+	rm "${D}"/${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip || die
+	dosym /usr/share/swing-layout-1/sources/swing-layout-src.zip ${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip
+	find "${D}"/${INSTALL_DIR} -name "*.exe" -delete
+	find "${D}"/${INSTALL_DIR} -name "*.dll" -delete
+	rm -fr "${D}"/modules/lib || die
+
+	popd >/dev/null || die
+
+	fperms 775 ${INSTALL_DIR}/lib/nbexec
+	dosym ${INSTALL_DIR}/lib/nbexec /usr/bin/nbexec-${SLOT}
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	# felix-main-2.0.2.jar
+	# felix-4.0.2.jar
+	rm jhall-2.0_05.jar && dosym /usr/share/javahelp/lib/jhall.jar ${instdir}/jhall-2.0_05.jar || die
+	rm jna-3.2.7.jar && dosym /usr/share/jna/lib/jna.jar ${instdir}/jna-3.2.7.jar || die
+	# osgi.cmpn-4.2.jar
+	# osgi.core-4.3.jar
+	rm platform-3.2.7.jar && dosym /usr/share/jna/lib/platform.jar ${instdir}/platform-3.2.7.jar || die
+	rm swing-layout-1.0.4.jar && dosym /usr/share/swing-layout-1/lib/swing-layout.jar ${instdir}/swing-layout-1.0.4.jar || die
+	# updater.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/platform
+}

diff --git a/dev-java/netbeans-profiler/ChangeLog b/dev-java/netbeans-profiler/ChangeLog
index 26228c3..b9d7bd0 100644
--- a/dev-java/netbeans-profiler/ChangeLog
+++ b/dev-java/netbeans-profiler/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-profiler-9999_p20120304 (04 Mar 2012)
+
+  04 Mar 2012; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-profiler-9999_p20120304.ebuild:
+  Bumped to latest nightly module
+
 *netbeans-profiler-9999_p20120303 (03 Mar 2012)
 
   03 Mar 2012; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index e3d1520..806354d 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -7,6 +7,7 @@ DIST netbeans-trunk-nightly-201202220400-src.zip 174195023 RMD160 800aa796b42f79
 DIST netbeans-trunk-nightly-201202270400-src.zip 174236017 RMD160 91d77d72c626d19a3bb88ab54e5612bb25e9c284 SHA1 58ba5f403553b9f754bebcc526047914d0721e4e SHA256 ad81b677ea067a86ebd2e26f2c7a1b538115406ee7bd36a95bb3856d8a4d5913
 DIST netbeans-trunk-nightly-201203010400-src.zip 174453125 RMD160 18c55d8b3789cef77bfde78b3310e55eab20011a SHA1 18e5786d27bbbdc91110e4d88eff9780b4dfc5cd SHA256 b1429ceebbaaefc169dc290870a66452b28c017a355bfbe925c3eba6e015013b
 DIST netbeans-trunk-nightly-201203030400-src.zip 174515173 RMD160 c9d99881d451d04be8035e861b8c91a8c5768084 SHA1 d86dbf4f822663c19b46fb19b05e275ba0f710e6 SHA256 e4bccd6167404f55ae5983807388a8cfb7980b3b00d37253a6ac4df4e6dea115
+DIST netbeans-trunk-nightly-201203040400-src.zip 174521722 RMD160 fb5cf478d504b5fb86e00c8204998bdfbf3d03e4 SHA1 6a97490572215bc65cfdcc150c9f76b6795fec78 SHA256 e5e376831eb0104ecac58cce6da6e20a637f1c7c14ac0992c094dc61ed186f35
 EBUILD netbeans-profiler-7.0.1.ebuild 3113 RMD160 dcfd93da14dbcf6a090cefd843bd8e6bbdcaa051 SHA1 a9fee09c442cbcd4187f2dc1443e19cdd9a96003 SHA256 588797a6b81c7f5ba5e1cf06ad66e593bd89aa28261b68006ebb973d0eae8044
 EBUILD netbeans-profiler-7.1.ebuild 3118 RMD160 dcbbdf8b3d3524bbb039b0d67b8b5a77054bb132 SHA1 a1099e5bc24f5bf8ebd8895d9d32f22c917458dc SHA256 4584dee6eab332c7d16048098b9d2d7ac201f961139a58fb054c3f52646b67cb
 EBUILD netbeans-profiler-9999_p20120219.ebuild 3145 RMD160 d6eb125e0148ba9573c81045036581a6527409e8 SHA1 b449f67e866a8afab4e2126c582cce5da245360b SHA256 4c0532b8b7afad21e1fa3db857282e26ea7e8c6a84ead6c91f06224c0f8fc6c5
@@ -14,5 +15,6 @@ EBUILD netbeans-profiler-9999_p20120222.ebuild 3145 RMD160 c60f480465391a0f0e1ba
 EBUILD netbeans-profiler-9999_p20120227.ebuild 3145 RMD160 8f37a7f177ab8e016ac775f4aac1359c2d512e08 SHA1 4cb7cdbcc529a60ab1c50d5fd671a28e0aaf3d36 SHA256 f7ed8e4614338b8e65530b3a2f31ab8c8448bd0d703a6ae777367be4012a4b93
 EBUILD netbeans-profiler-9999_p20120301.ebuild 3145 RMD160 68187346f4686fcc3a3034a302aca7a66e651453 SHA1 be370a5099ca73ba8c92b54a69a9cda4fcb67b55 SHA256 fbb896449e02baf49ea26f174fc5c2ef956266e78a6daadb8671771779096773
 EBUILD netbeans-profiler-9999_p20120303.ebuild 3145 RMD160 fd258c4719ad7315945ab8b6dc8780cf094756ce SHA1 0dc20f8177e9061e62d2dd72b879420250f5cce1 SHA256 a49547266c5df175aa9e02dbc2b6c119a9b914c9016b72b34a5281a43f5d83b2
-MISC ChangeLog 28324 RMD160 5e1521eb3de5b4ad81bf2a91267c5dec32c1117b SHA1 645b31ea1296178058c96d7df67b67919619dc97 SHA256 c0e6f14d3a3dd834c8d4812aec74895e503fba1e6a42d03ea267b1fde605f6b9
+EBUILD netbeans-profiler-9999_p20120304.ebuild 3145 RMD160 827c922748b49b82c61582030f256ac80b7ebfeb SHA1 390714864fff7a9776f7f27ffbf83b242a1afe9b SHA256 12d1cc304b989c90e8e41a7564a0684671bdb9fddcefbdc1fc859687f3ddd924
+MISC ChangeLog 28504 RMD160 4328f14a5ee8abc5747490a9d8b96187ce0e2c3d SHA1 386e9a2af378b2a99753f32b42d4250be1a34986 SHA256 dc7c3b61b4b6c6626c84b5eb714d14c2be20e13551183ec14fbf1982d8966c2f
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20120304.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20120304.ebuild
new file mode 100644
index 0000000..bcfdde4
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20120304.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Profiler Cluster"
+HOMEPAGE="http://netbeans.org/projects/profiler"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2012-03-04_04-00-40/zip/netbeans-trunk-nightly-201203040400-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.profiler -Dext.binaries.downloaded=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r1-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/profiler >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/profiler$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	for file in lib/deployed/cvm/linux/*.so ; do
+		fperms 755 ${file}
+	done
+
+	for file in lib/deployed/jdk*/linux*/*.so ; do
+		fperms 755 ${file}
+	done
+
+	for file in remote-pack-defs/*.sh ; do
+		fperms 755 ${file}
+	done
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/profiler
+}

diff --git a/dev-java/netbeans-webcommon/ChangeLog b/dev-java/netbeans-webcommon/ChangeLog
index e55d12a..4bd9195 100644
--- a/dev-java/netbeans-webcommon/ChangeLog
+++ b/dev-java/netbeans-webcommon/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-webcommon-9999_p20120304 (04 Mar 2012)
+
+  04 Mar 2012; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-webcommon-9999_p20120304.ebuild:
+  Bumped to latest nightly module
+
 *netbeans-webcommon-9999_p20120303 (03 Mar 2012)
 
   03 Mar 2012; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index c6f8170..0f30ad7 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -1,7 +1,9 @@
 DIST netbeans-9999-r1-build.xml.patch.bz2 2379 RMD160 9713acb05ca5c9000528dd195d5297e84103df2d SHA1 209945171a811e17ad52f63896cc4f5894a5ac0c SHA256 09cfedef0fd9d713ddc71a54848d7551ce750c15e3df00af7feef37d25260a7e
 DIST netbeans-trunk-nightly-201203010400-src.zip 174453125 RMD160 18c55d8b3789cef77bfde78b3310e55eab20011a SHA1 18e5786d27bbbdc91110e4d88eff9780b4dfc5cd SHA256 b1429ceebbaaefc169dc290870a66452b28c017a355bfbe925c3eba6e015013b
 DIST netbeans-trunk-nightly-201203030400-src.zip 174515173 RMD160 c9d99881d451d04be8035e861b8c91a8c5768084 SHA1 d86dbf4f822663c19b46fb19b05e275ba0f710e6 SHA256 e4bccd6167404f55ae5983807388a8cfb7980b3b00d37253a6ac4df4e6dea115
+DIST netbeans-trunk-nightly-201203040400-src.zip 174521722 RMD160 fb5cf478d504b5fb86e00c8204998bdfbf3d03e4 SHA1 6a97490572215bc65cfdcc150c9f76b6795fec78 SHA256 e5e376831eb0104ecac58cce6da6e20a637f1c7c14ac0992c094dc61ed186f35
 EBUILD netbeans-webcommon-9999_p20120301.ebuild 2705 RMD160 6fcc67dfdc470cada88317bab7bc3172ee06176d SHA1 eed72fa42982e1e3c885e6269cd591a1ff88b34f SHA256 5a4956b9ecd85ce601eb819400cd5282bce66821efe0cc27f3a7c37736c851db
 EBUILD netbeans-webcommon-9999_p20120303.ebuild 2705 RMD160 afbfb860dd259f5a5ebf075a33b6e1b465fdec46 SHA1 872fa81483598f1a239e61326f144260aa44eddd SHA256 44be8bfcb6110ef32f0f242ae2dcc7d3c0342166dad5135ab6113332af874d2d
-MISC ChangeLog 635 RMD160 ae8e0ded803b9cc17487e7e37ab06d95f30ff1ec SHA1 3715f9aabc13f24818e47a2908ad97d596ac4e3c SHA256 c8f4a08ca7e9b108490bb106c8b4938104fb02d215036e72eacd3328630554a6
+EBUILD netbeans-webcommon-9999_p20120304.ebuild 2705 RMD160 bf73b87c687bfc5517a0d9459b8e9753fb64ce2a SHA1 16b232bec884f90c959735270ddad68ed9872fe3 SHA256 be83e2ce2a6fd185023d2fe22da0bc6cffb25f6402921d8b62842e35bff38e88
+MISC ChangeLog 817 RMD160 3dae4d606dfe8b02d5df34c73c5c8012fbff8519 SHA1 c4897ffe2e75a1efc15ab1ce6986c892e4b5d60d SHA256 68dda3342b4dbc28cc172641d1b573480bc6f2c9c97f17aaea5f366808ab3314
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20120304.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20120304.ebuild
new file mode 100644
index 0000000..fa9be9a
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20120304.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2012-03-04_04-00-40/zip/netbeans-trunk-nightly-201203040400-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-ide-${PV}"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.webcommon -Dext.binaries.downloaded=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r1-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/webcommon >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+	grep -E "/webcommon$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/webcommon
+}

diff --git a/dev-java/netbeans-websvccommon/ChangeLog b/dev-java/netbeans-websvccommon/ChangeLog
index 4204d31..8c99342 100644
--- a/dev-java/netbeans-websvccommon/ChangeLog
+++ b/dev-java/netbeans-websvccommon/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-websvccommon-9999_p20120304 (04 Mar 2012)
+
+  04 Mar 2012; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-websvccommon-9999_p20120304.ebuild:
+  Bumped to latest nightly module
+
 *netbeans-websvccommon-9999_p20120303 (03 Mar 2012)
 
   03 Mar 2012; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 413f888..9b3f44f 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -7,6 +7,7 @@ DIST netbeans-trunk-nightly-201202220400-src.zip 174195023 RMD160 800aa796b42f79
 DIST netbeans-trunk-nightly-201202270400-src.zip 174236017 RMD160 91d77d72c626d19a3bb88ab54e5612bb25e9c284 SHA1 58ba5f403553b9f754bebcc526047914d0721e4e SHA256 ad81b677ea067a86ebd2e26f2c7a1b538115406ee7bd36a95bb3856d8a4d5913
 DIST netbeans-trunk-nightly-201203010400-src.zip 174453125 RMD160 18c55d8b3789cef77bfde78b3310e55eab20011a SHA1 18e5786d27bbbdc91110e4d88eff9780b4dfc5cd SHA256 b1429ceebbaaefc169dc290870a66452b28c017a355bfbe925c3eba6e015013b
 DIST netbeans-trunk-nightly-201203030400-src.zip 174515173 RMD160 c9d99881d451d04be8035e861b8c91a8c5768084 SHA1 d86dbf4f822663c19b46fb19b05e275ba0f710e6 SHA256 e4bccd6167404f55ae5983807388a8cfb7980b3b00d37253a6ac4df4e6dea115
+DIST netbeans-trunk-nightly-201203040400-src.zip 174521722 RMD160 fb5cf478d504b5fb86e00c8204998bdfbf3d03e4 SHA1 6a97490572215bc65cfdcc150c9f76b6795fec78 SHA256 e5e376831eb0104ecac58cce6da6e20a637f1c7c14ac0992c094dc61ed186f35
 EBUILD netbeans-websvccommon-7.0.1.ebuild 2692 RMD160 78a0dae148b2c583b596a625a6e6622a1c7cafcc SHA1 f3e52c193e9dfdf9d236f655a705c55da76cfad4 SHA256 a18cf7fe0a1e38749826cb12651be06c210b038be50117647496ee6cbd184cda
 EBUILD netbeans-websvccommon-7.1.ebuild 2697 RMD160 f1f36d89866f3699594340228edce7a86ea24a7d SHA1 e6029f4fd6bc416ff3b859c0683174b34b8268f3 SHA256 d45fb1bf95badd12e956995f83f270fed1ca8456f1525e11b429ae927e432fdf
 EBUILD netbeans-websvccommon-9999_p20120219.ebuild 2724 RMD160 6e26872aa494eeacf187dd77e548ccf22b960cb3 SHA1 a34a76fb42e741ea02b739c50a0b5bd700ad387e SHA256 67e2fd406696e633e206e2f73741a87a879da7a0db75c3b37bf332f522de966b
@@ -14,5 +15,6 @@ EBUILD netbeans-websvccommon-9999_p20120222.ebuild 2724 RMD160 e19f23f7505a14a54
 EBUILD netbeans-websvccommon-9999_p20120227.ebuild 2724 RMD160 6eeb47736adf8798abd325c88638977278d83609 SHA1 a5af1118512148607c3c4614c1b98d16f69d109f SHA256 bf475a8289aac0d0a1b4479d1259d35f263a37f87044073b1f53171ee2bcac44
 EBUILD netbeans-websvccommon-9999_p20120301.ebuild 2724 RMD160 1450504393948c9a1133104c1f23c6147a17eaf6 SHA1 4a3c887e002fe2753d4cdac9be71303a7d0bc9d7 SHA256 21097c4bf1c4f0e836528a13b77db3367e6d48f61044c4821b8544e07b7d6e07
 EBUILD netbeans-websvccommon-9999_p20120303.ebuild 2724 RMD160 823858954c38510612e2d2947b61c67ae920b129 SHA1 3f8b1cfc5e7716febc8a35f926e853ce6fe695a5 SHA256 148acc6b7e96aac57d57c0967113a85bf8434b097343f9d5bb88d662f849d32e
-MISC ChangeLog 29574 RMD160 670b664117dc70f3e77e5c4fb0a11f7ab4da2d4a SHA1 d11517a55059bc3b06e8dada04a0194a7f234a70 SHA256 2d89400a7c5f8e6bb8424bf885a74b5986b7b4846003fe093ef23c9e69538d89
+EBUILD netbeans-websvccommon-9999_p20120304.ebuild 2724 RMD160 9a05657b5f793b654b8ba01141518428f75b4329 SHA1 9b6a6d8720b370fac3abc7d7700a469f7ae5945c SHA256 c21387afd519315a541dd0f7a396a15046c900e007f1d1edd3cc4dd215ef67e1
+MISC ChangeLog 29762 RMD160 cff093e24192c437ad170ded7526eba04189c135 SHA1 50a8cc7a4f1471b417469c65d4cd1ea85ba1d741 SHA256 9b57021ea89ad49fcdc597d668f3a93e67c1827344d76e5a63510c159be9c9b4
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20120304.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20120304.ebuild
new file mode 100644
index 0000000..5b6bc3c
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20120304.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Common Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2012-03-04_04-00-40/zip/netbeans-trunk-nightly-201203040400-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-ide-${PV}"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.websvccommon -Dext.binaries.downloaded=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r1-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r1-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 540de2c..eea4ea1 100644
--- a/dev-util/netbeans/ChangeLog
+++ b/dev-util/netbeans/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-9999_p20120304 (04 Mar 2012)
+
+  04 Mar 2012; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-9999_p20120304.ebuild:
+  Bumped to latest nightly module
+
 *netbeans-9999_p20120303 (03 Mar 2012)
 
   03 Mar 2012; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 6274b0f..57d1a69 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -10,6 +10,7 @@ DIST netbeans-trunk-nightly-201202220400-src.zip 174195023 RMD160 800aa796b42f79
 DIST netbeans-trunk-nightly-201202270400-src.zip 174236017 RMD160 91d77d72c626d19a3bb88ab54e5612bb25e9c284 SHA1 58ba5f403553b9f754bebcc526047914d0721e4e SHA256 ad81b677ea067a86ebd2e26f2c7a1b538115406ee7bd36a95bb3856d8a4d5913
 DIST netbeans-trunk-nightly-201203010400-src.zip 174453125 RMD160 18c55d8b3789cef77bfde78b3310e55eab20011a SHA1 18e5786d27bbbdc91110e4d88eff9780b4dfc5cd SHA256 b1429ceebbaaefc169dc290870a66452b28c017a355bfbe925c3eba6e015013b
 DIST netbeans-trunk-nightly-201203030400-src.zip 174515173 RMD160 c9d99881d451d04be8035e861b8c91a8c5768084 SHA1 d86dbf4f822663c19b46fb19b05e275ba0f710e6 SHA256 e4bccd6167404f55ae5983807388a8cfb7980b3b00d37253a6ac4df4e6dea115
+DIST netbeans-trunk-nightly-201203040400-src.zip 174521722 RMD160 fb5cf478d504b5fb86e00c8204998bdfbf3d03e4 SHA1 6a97490572215bc65cfdcc150c9f76b6795fec78 SHA256 e5e376831eb0104ecac58cce6da6e20a637f1c7c14ac0992c094dc61ed186f35
 EBUILD netbeans-7.0.1-r2.ebuild 6736 RMD160 8780b584bedf0cfd4cd40f1e26c015079b19da4c SHA1 9e31064b4e19fad1d0ca79476f32c5153b4b18cf SHA256 e808fba2ddb516270d93b5cf67cff60d98b37ca58a158878f2e3b3ad696cfc82
 EBUILD netbeans-7.1-r1.ebuild 6970 RMD160 6c355552b5d3cdfae6753d9c9bf887d723aa550d SHA1 2c3d2f9b4b9b0aa3506abd7bd9cc70a1cac12685 SHA256 5b20fa37872380401b808756ac69e15e10baa3cb574030cf0ef913329fcf9113
 EBUILD netbeans-9999_p20120219.ebuild 6951 RMD160 1e2063153e1e0efb87c4989e4b78057273a18831 SHA1 10122a677702c0d04e8de3d96c1c7667bf4955ca SHA256 33ca1f70c4d16d73966010d6eb11e90094dd9869fbfcdb932b23a53a31f7bb16
@@ -17,5 +18,6 @@ EBUILD netbeans-9999_p20120222.ebuild 6951 RMD160 8dc21c3739abcf598e5187f3aec7d0
 EBUILD netbeans-9999_p20120227.ebuild 6951 RMD160 3cd7a5f41cb220c0f635b54ba17ef45377cfbb78 SHA1 4ef519007ed24c6359698268c55d53ec8621ae50 SHA256 4993742b7d1005ece76e03a6af5fef5c007c9550b0653ff85ad35d04ddc6cbcf
 EBUILD netbeans-9999_p20120301.ebuild 7057 RMD160 064ebf8062b23b9606e54b94f9da5456ddbd9531 SHA1 56bf1d2def3b5efbea6fdc9a10aa5ae31eaa6cbd SHA256 af6410aa282289fdec40569b71b3109067bfe19d8a222ffff653c95c69ed0a6d
 EBUILD netbeans-9999_p20120303.ebuild 7057 RMD160 6b7986d6317d0f3317886f0387d6e67a077ab7fd SHA1 833bf90e91c036a51d7413b2559b9ea88eab65b7 SHA256 78052f08f3510bc2f75c3a634f2060d754e47e362e77e53248286dd99e3d3f1c
-MISC ChangeLog 26682 RMD160 48fe996ff3f7a7c32006fd76cdbb8cee15bfbd48 SHA1 832491659e1f751d1c4b6d5728c9531e6d9b65ec SHA256 22940ac85866e2d8c7b81a55587a8fb1787f03e43d40634a038940f04dfb6bdd
+EBUILD netbeans-9999_p20120304.ebuild 7057 RMD160 d26ffb2aeaca9ea8c64421106bfc2bfbb1c716e9 SHA1 ee8f917006e5dfe7464c4df7fbe019b454847509 SHA256 0248746b017968b8052ed60235fcec248cbd7993d5e101ca7375d895ab3407df
+MISC ChangeLog 26844 RMD160 06086fdd3cb1aeefd54f81f547e2acea5d103c5b SHA1 5cfb81b2b7605e3aafc8d724bd9c31c38e434b87 SHA256 cf2bc43d90dc129fe266ad49ee8290fe72df0d5f0b6996a25a97158af4a39861
 MISC metadata.xml 333 RMD160 848a246f77fbcc88bb03d4a8d0769ef60353148a SHA1 e9afe19410a907fb47230f824b2d592ba3f465d4 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a

diff --git a/dev-util/netbeans/netbeans-9999_p20120304.ebuild b/dev-util/netbeans/netbeans-9999_p20120304.ebuild
new file mode 100644
index 0000000..18ccab4
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20120304.ebuild
@@ -0,0 +1,260 @@
+# Copyright 1999-2012 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/2012-03-04_04-00-40/zip/netbeans-trunk-nightly-201203040400-src.zip"
+PATCHES_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-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_javafx
+	netbeans_modules_mobility
+	netbeans_modules_php
+	+netbeans_modules_profiler
+	netbeans_modules_webcommon
+	+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_javafx? ( ~dev-java/netbeans-javafx-${PV} )
+	netbeans_modules_mobility? ( ~dev-java/netbeans-mobility-${PV} )
+	netbeans_modules_php? ( ~dev-java/netbeans-php-${PV} )
+	netbeans_modules_profiler? ( ~dev-java/netbeans-profiler-${PV} )
+	netbeans_modules_webcommon? ( ~dev-java/netbeans-webcommon-${PV} )
+	netbeans_modules_websvccommon? ( ~dev-java/netbeans-websvccommon-${PV} )
+	doc? ( ~dev-java/netbeans-javadoc-${PV} )"
+JAVA_PKG_BSFIX="off"
+NBLOCALES=""
+
+pkg_setup() {
+	for lingua in ${IUSE_LINGUAS} ; do
+		local lang=${lingua/linguas_/}
+
+		if [[ "${lang}" = "ar" ]] ; then
+			lang="ar_EG,ar_SA"
+		elif [[ "${lang}" = "es" ]] ; then
+			lang="es,es_CO"
+		elif [[ "${lang}" = "gl" ]] ; then
+			lang="gl_ES"
+		elif [[ "${lang}" = "id" ]] ; then
+			lang="in_ID"
+		elif [[ "${lang}" = "nl" ]] ; then
+			lang="nl_BE,nl_NL"
+		elif [[ "${lang}" = "tl" ]] ; then
+			lang="fil_PH"
+		fi
+
+		if use ${lingua} ; then
+			if [ -z "${NBLOCALES}" ] ; then
+				NBLOCALES="${lang}"
+			else
+				NBLOCALES="${NBLOCALES},${lang}"
+			fi
+		fi
+	done
+
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	if [ -n "${NBLOCALES}" ] ; then
+		unpack $(basename ${SOURCE_URL})
+		unpack $(basename ${L10N_URL})
+
+		einfo "Deleting bundled jars..."
+		find -name "*.jar" -type f -delete
+
+		unpack netbeans-9999-r1-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-r1-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 javafx mobility php platform profiler webcommon websvccommon ; do
+			if [ -d "${cluster}" ] ; then
+				insinto /usr/share/netbeans-${cluster}-${SLOT}
+				doins -r ${cluster}/*
+			fi
+		done
+
+		if [ -d nb ] ; then
+			insinto /usr/share/netbeans-nb-${SLOT}/nb
+			doins -r nb/*
+		fi
+
+		popd >/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	if [ -n "${NBLOCALES}" ] ; then
+		einfo "Netbeans automatically starts with the locale you have set in your user profile, if"
+		einfo "the locale is built for Netbeans."
+		einfo "If you want to force specific locale, use --locale argument, for example:"
+		einfo "${PN}-${SLOT} --locale de"
+		einfo "${PN}-${SLOT} --locale pt:BR"
+	fi
+
+	if use linguas_ar ; then
+		einfo
+		einfo "You selected Arabic locale so you can choose either ar:EG or ar:SA variant."
+	fi
+
+	if use linguas_es ; then
+		einfo
+		einfo "You selected Spanish locale so you can choose either es or es:CO variant."
+	fi
+
+	if use linguas_gl ; then
+		einfo
+		einfo "You selected Galician locale which has locale code gl:ES in Netbeans."
+	fi
+
+	if use linguas_id ; then
+		einfo
+		einfo "You selected Indonesian locale which has locale code in:ID in Netbeans."
+	fi
+
+	if use linguas_nl ; then
+		einfo
+		einfo "You selected Dutch locale so you can choose either nl:BE or nl:NL variant."
+	fi
+
+	if use linguas_tl ; then
+		einfo
+		einfo "You selected Tagalog locale which has for Filipino locale code fil:PH in Netbeans."
+	fi
+}