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

[Miroslav Šulc]

commit:     d18a0d6ae0e832343cf66a2507c6b18b487a6f4e
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed May 30 12:02:26 2012 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed May 30 12:02:26 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/fordfrog.git;a=commit;h=d18a0d6a

netbeans: bumped to the latest nightly sources

---
 dev-java/netbeans-apisupport/ChangeLog             |    6 +
 dev-java/netbeans-apisupport/Manifest              |    4 +-
 .../netbeans-apisupport-9999_p20120530.ebuild      |  107 ++++++
 dev-java/netbeans-cnd/ChangeLog                    |    6 +
 dev-java/netbeans-cnd/Manifest                     |    4 +-
 .../netbeans-cnd-9999_p20120530.ebuild             |  119 ++++++
 dev-java/netbeans-dlight/ChangeLog                 |    6 +
 dev-java/netbeans-dlight/Manifest                  |    4 +-
 .../netbeans-dlight-9999_p20120530.ebuild          |  102 +++++
 dev-java/netbeans-enterprise/ChangeLog             |    6 +
 dev-java/netbeans-enterprise/Manifest              |    4 +-
 .../netbeans-enterprise-9999_p20120530.ebuild      |  342 +++++++++++++++++
 dev-java/netbeans-ergonomics/ChangeLog             |    6 +
 dev-java/netbeans-ergonomics/Manifest              |    4 +-
 .../netbeans-ergonomics-9999_p20120530.ebuild      |  102 +++++
 dev-java/netbeans-groovy/ChangeLog                 |    6 +
 dev-java/netbeans-groovy/Manifest                  |    4 +-
 .../netbeans-groovy-9999_p20120530.ebuild          |  112 ++++++
 dev-java/netbeans-harness/ChangeLog                |    6 +
 dev-java/netbeans-harness/Manifest                 |    4 +-
 .../netbeans-harness-9999_p20120530.ebuild         |  115 ++++++
 dev-java/netbeans-ide/ChangeLog                    |    6 +
 dev-java/netbeans-ide/Manifest                     |    4 +-
 .../netbeans-ide-9999_p20120530.ebuild             |  386 ++++++++++++++++++++
 dev-java/netbeans-java/ChangeLog                   |    5 +
 dev-java/netbeans-java/Manifest                    |   11 +-
 ...0.1-r1.ebuild => netbeans-java-7.0.1-r2.ebuild} |    2 +-
 ...-7.1.2.ebuild => netbeans-java-7.1.2-r1.ebuild} |    2 +-
 ...eta.ebuild => netbeans-java-7.2_beta-r1.ebuild} |    2 +-
 ....ebuild => netbeans-java-9999_p20120530.ebuild} |  170 +++++----
 dev-java/netbeans-javacard/ChangeLog               |    6 +
 dev-java/netbeans-javacard/Manifest                |    4 +-
 .../netbeans-javacard-9999_p20120530.ebuild        |  142 +++++++
 dev-java/netbeans-javadoc/ChangeLog                |    6 +
 dev-java/netbeans-javadoc/Manifest                 |    4 +-
 .../netbeans-javadoc-9999_p20120530.ebuild         |  160 ++++++++
 dev-java/netbeans-javafx/ChangeLog                 |    6 +
 dev-java/netbeans-javafx/Manifest                  |    4 +-
 .../netbeans-javafx-9999_p20120530.ebuild          |  112 ++++++
 dev-java/netbeans-mobility/ChangeLog               |    6 +
 dev-java/netbeans-mobility/Manifest                |    4 +-
 .../netbeans-mobility-9999_p20120530.ebuild        |  175 +++++++++
 dev-java/netbeans-nb/ChangeLog                     |    6 +
 dev-java/netbeans-nb/Manifest                      |    4 +-
 .../netbeans-nb/netbeans-nb-9999_p20120530.ebuild  |  149 ++++++++
 dev-java/netbeans-php/ChangeLog                    |    6 +
 dev-java/netbeans-php/Manifest                     |    4 +-
 .../netbeans-php-9999_p20120530.ebuild             |  123 +++++++
 dev-java/netbeans-platform/ChangeLog               |    6 +
 dev-java/netbeans-platform/Manifest                |    4 +-
 .../netbeans-platform-9999_p20120530.ebuild        |  131 +++++++
 dev-java/netbeans-profiler/ChangeLog               |    6 +
 dev-java/netbeans-profiler/Manifest                |    4 +-
 .../netbeans-profiler-9999_p20120530.ebuild        |  114 ++++++
 dev-java/netbeans-webcommon/ChangeLog              |    6 +
 dev-java/netbeans-webcommon/Manifest               |    4 +-
 .../netbeans-webcommon-9999_p20120530.ebuild       |   95 +++++
 dev-java/netbeans-websvccommon/ChangeLog           |    6 +
 dev-java/netbeans-websvccommon/Manifest            |    4 +-
 .../netbeans-websvccommon-9999_p20120530.ebuild    |   95 +++++
 dev-util/netbeans/ChangeLog                        |    6 +
 dev-util/netbeans/Manifest                         |    4 +-
 dev-util/netbeans/netbeans-9999_p20120530.ebuild   |  260 +++++++++++++
 63 files changed, 3214 insertions(+), 109 deletions(-)

diff --git a/dev-java/netbeans-apisupport/ChangeLog b/dev-java/netbeans-apisupport/ChangeLog
index 2dfb710..2681222 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_p20120530 (30 May 2012)
+
+  30 May 2012; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-apisupport-9999_p20120530.ebuild:
+  bumped to the latest nightly sources
+
   27 May 2012; Miroslav Šulc <fordfrog@g.o>
   -netbeans-apisupport-9999_p20120516.ebuild,
   -netbeans-apisupport-9999_p20120517.ebuild:

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 9025a41..d78d5c4 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -8,11 +8,13 @@ DIST netbeans-9999-r6-build.xml.patch.bz2 2475 RMD160 e4b970f3f4d2389071c5ddfed1
 DIST netbeans-trunk-nightly-201205200400-src.zip 178860844 RMD160 e9f20d02383a477a7848d5e17dfbf023df0326b4 SHA1 a05b277c5cde92909293ef3935cb2e2573fb651e SHA256 73b0ae0b95d7cb5145f56c6b57bca5a06ee7a608f2a5c7714a36c31c3210cf20
 DIST netbeans-trunk-nightly-201205240002-src.zip 178911778 RMD160 ca71d71e3b0c17ab74915043cb07e2da6fb9011f SHA1 0a0dcf4d31e484f58e338117f4ef504267982f53 SHA256 f5c5f274b65b1630a48f496410c46cb6cbcaad217806877b8114b47d62f87a61
 DIST netbeans-trunk-nightly-201205270002-src.zip 174681649 RMD160 3fbf1c797007a9e8ebed8ce67daadbda2f8b9363 SHA1 e72175533d61e40e35c92a49ca7f63c3a173f966 SHA256 47b4c12a34957abb72fa4563536abd220380a51b3378dc6da1a5e1223e0bbfaa
+DIST netbeans-trunk-nightly-201205300001-src.zip 174763237 RMD160 7c5524b4600cc086675ed863830f849216eb2f01 SHA1 9bbc52e25c508170d8207423b5ec43769eb1b0d1 SHA256 9c5d71ce455906f1e1f662c6a4e34c73e491ad3705f221b7c5c671366a79ef24
 EBUILD netbeans-apisupport-7.0.1.ebuild 3134 RMD160 83833605d9930ea81e6d80fbd70114df76e55219 SHA1 cd4689976639175d581d34114db4dc18c8e86123 SHA256 41c32033c9945a39c0aebb6b0271767031d53a47e5c8365d9e3a7c86712e24cd
 EBUILD netbeans-apisupport-7.1.2.ebuild 3143 RMD160 2e712a035c0481bf0f0f27dd14c12baf66eac107 SHA1 30284ab20e91e379f96f89433ce52e341f65bb9f SHA256 cf24048c0ecca98a7d6371624bb0ddfb78663bead073d515a7c84229dbec00a8
 EBUILD netbeans-apisupport-7.2_beta.ebuild 3124 RMD160 15cf0afc040ca4b1fd3170b2c49ac1037a6a1938 SHA1 62d68e5858d4b94c3ddf049ba24f8d485f92d583 SHA256 423d968510126788a1021c62605b9e34a6e525cb13576ffc9e5127756c1fe285
 EBUILD netbeans-apisupport-9999_p20120520.ebuild 3166 RMD160 ca1a2c69923d6b37cbf8422e54fcef726a26dc42 SHA1 25b86f5cf3fb3d4977bbc291aa6f1f0cbd35c662 SHA256 4dc2e648f55e0fd79997cf9990b4b0bcad9ac7fd70daf40752857a9250c34c88
 EBUILD netbeans-apisupport-9999_p20120524.ebuild 3166 RMD160 f5a87f4dd89acd3730e6e6f2b2dd7e7eeb681b9a SHA1 1f849439357946898164f6008ac950218044d957 SHA256 b26f8bb5094405d7d620d4be9a500873082eeb55eabc163bf5eb3e77fc8099fb
 EBUILD netbeans-apisupport-9999_p20120527.ebuild 3166 RMD160 f1745ff93f40113c9119abc0d73f6c885c2ed9b8 SHA1 ae6ac8abf0d1ed0266a1005b20410f09ce573fcc SHA256 7a2d7f311901672632d1a367b8d31dc3b2b797ef717c9e1a4484aa1784fa87fa
-MISC ChangeLog 36562 RMD160 8bce74eb51c12361d8694dcfe9948bebf9971cab SHA1 1e640e671b8aafe2ca63e2af7cd8afd335b6c302 SHA256 5728c38eb27b13518f8bb6ce1fe84cd3a60170c9affd89717436c714fc2e9f13
+EBUILD netbeans-apisupport-9999_p20120530.ebuild 3166 RMD160 7e8685bafcceef75fcf07c99c9ecf307b3318181 SHA1 c8b2998b0ddf5bee03b3cbf74aa44ddc55ad8661 SHA256 f53c1c5e53d8cc56228fda451c0de90c9ac870fe6b0d80e3b69b2bcc0331105c
+MISC ChangeLog 36751 RMD160 4923696bbc8db4474e3f77914a3d6f139b4d4080 SHA1 d29bb282632e9f91bbc18d89fad3bd67f574d020 SHA256 3aa386537644011d80681bfacd2732a7769be8e2de6bd274c6b4039fb842db33
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20120530.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20120530.ebuild
new file mode 100644
index 0000000..9fdd114
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20120530.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-05-30_00-01-54/zip/netbeans-trunk-nightly-201205300001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r6-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-r6-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r6-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 a3b9c3a..982a561 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_p20120530 (30 May 2012)
+
+  30 May 2012; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-cnd-9999_p20120530.ebuild:
+  bumped to the latest nightly sources
+
   27 May 2012; Miroslav Šulc <fordfrog@g.o>
   -netbeans-cnd-9999_p20120516.ebuild, -netbeans-cnd-9999_p20120517.ebuild:
   removed obsolete versions

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index 4be4251..92b2228 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -17,11 +17,13 @@ DIST netbeans-9999-r6-build.xml.patch.bz2 2475 RMD160 e4b970f3f4d2389071c5ddfed1
 DIST netbeans-trunk-nightly-201205200400-src.zip 178860844 RMD160 e9f20d02383a477a7848d5e17dfbf023df0326b4 SHA1 a05b277c5cde92909293ef3935cb2e2573fb651e SHA256 73b0ae0b95d7cb5145f56c6b57bca5a06ee7a608f2a5c7714a36c31c3210cf20
 DIST netbeans-trunk-nightly-201205240002-src.zip 178911778 RMD160 ca71d71e3b0c17ab74915043cb07e2da6fb9011f SHA1 0a0dcf4d31e484f58e338117f4ef504267982f53 SHA256 f5c5f274b65b1630a48f496410c46cb6cbcaad217806877b8114b47d62f87a61
 DIST netbeans-trunk-nightly-201205270002-src.zip 174681649 RMD160 3fbf1c797007a9e8ebed8ce67daadbda2f8b9363 SHA1 e72175533d61e40e35c92a49ca7f63c3a173f966 SHA256 47b4c12a34957abb72fa4563536abd220380a51b3378dc6da1a5e1223e0bbfaa
+DIST netbeans-trunk-nightly-201205300001-src.zip 174763237 RMD160 7c5524b4600cc086675ed863830f849216eb2f01 SHA1 9bbc52e25c508170d8207423b5ec43769eb1b0d1 SHA256 9c5d71ce455906f1e1f662c6a4e34c73e491ad3705f221b7c5c671366a79ef24
 EBUILD netbeans-cnd-7.0.1.ebuild 4495 RMD160 7ae92927ff3a4bf2b69385c0d6898e2cb98c68d7 SHA1 63a4276dd98cadddcc1e87183df9135fb0d70057 SHA256 35b1368456dd7495507a3a093e7e4a6d9caf21818138b9d600a8a97791b11670
 EBUILD netbeans-cnd-7.1.2.ebuild 4111 RMD160 5f5a52797b8a24a3fd680fef58d397053714e47f SHA1 ae433aaa417ee69e8c530b8d72bfb2a6d092344b SHA256 2bab21cf71c2cc0d76ee43fbc9edeafe2f56cbb4586e5a63656178ea51329485
 EBUILD netbeans-cnd-7.2_beta.ebuild 4092 RMD160 2ec2065a9bd046f8f6118a6143f73341390caa02 SHA1 cfd699264b3feadfa8cb349ed69bee9f78933a75 SHA256 dfa1fc14f1d35a8b5f0d3c9f7cd03827360618b690861e79e117c5524ea5b5b9
 EBUILD netbeans-cnd-9999_p20120520.ebuild 4134 RMD160 752d9de61b6027e74b18cd73ad331a1dd3f34451 SHA1 6ab2da8ee3d506aa339b2d5993c15f19709978fe SHA256 80ae9a893d73c1a542881b5103862cb99782cd55ece3e4a172feee3e20cab92b
 EBUILD netbeans-cnd-9999_p20120524.ebuild 4134 RMD160 839a7de9e71d429a4cf4e7432ad4dae8fc9a9263 SHA1 a606956a38b230d540e3d46f0cb6932cace6ac10 SHA256 95f602e6e39525fe2cae003d666547e9ccfa9b9f99289bd9079c3822fb32b782
 EBUILD netbeans-cnd-9999_p20120527.ebuild 4134 RMD160 535d43ce87c07e3815e7dda98bbedf16b0740180 SHA1 eee3c50fdfd993866afb9fba248b7bc3bbac6c57 SHA256 bc2e5dcd4eecad3e078ce4c8d8b45b210ea6b199ddf706ab2e3d7c456cd52844
-MISC ChangeLog 33685 RMD160 1f0258d7a0e5d8c6afdbf5331339f62f3cccd574 SHA1 2ed21a15b84e1eea7704729cd8461288c80a20b0 SHA256 3b5a3ca3cf4b6d9103c598cd7aec1e7773bb6b4ca30deda6909f7478ec1747ba
+EBUILD netbeans-cnd-9999_p20120530.ebuild 4134 RMD160 6ce7815ee7ce1423a3c3f4557d061e726c6dcde9 SHA1 0fd780f0b721ee62b3435e5d4ffb7263413c1575 SHA256 a28cdd1c7b7b6697db283492e7e9f106d8f66824c51c770c2693735ee0cbcc7e
+MISC ChangeLog 33860 RMD160 c2d57be65d59c1a4020bdeb57e140c6da75341bd SHA1 5115a9c2692c6c9c29a9277e1fc137ea516b1119 SHA256 aad5f9808719e420e9e8f7e4c9e3cc899710f6bdfb13126d0ca708ef230ce027
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20120530.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20120530.ebuild
new file mode 100644
index 0000000..e255ef3
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20120530.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-05-30_00-01-54/zip/netbeans-trunk-nightly-201205300001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r6-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/A17998A985D048F3195B6ADE1A360440FCE30102-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-r6-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}"/A17998A985D048F3195B6ADE1A360440FCE30102-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-r6-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 7fe9fd7..ea7ab07 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_p20120530 (30 May 2012)
+
+  30 May 2012; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-dlight-9999_p20120530.ebuild:
+  bumped to the latest nightly sources
+
   27 May 2012; Miroslav Šulc <fordfrog@g.o>
   -netbeans-dlight-9999_p20120516.ebuild,
   -netbeans-dlight-9999_p20120517.ebuild:

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 1e84ff8..6f286fb 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -11,11 +11,13 @@ DIST netbeans-9999-r6-build.xml.patch.bz2 2475 RMD160 e4b970f3f4d2389071c5ddfed1
 DIST netbeans-trunk-nightly-201205200400-src.zip 178860844 RMD160 e9f20d02383a477a7848d5e17dfbf023df0326b4 SHA1 a05b277c5cde92909293ef3935cb2e2573fb651e SHA256 73b0ae0b95d7cb5145f56c6b57bca5a06ee7a608f2a5c7714a36c31c3210cf20
 DIST netbeans-trunk-nightly-201205240002-src.zip 178911778 RMD160 ca71d71e3b0c17ab74915043cb07e2da6fb9011f SHA1 0a0dcf4d31e484f58e338117f4ef504267982f53 SHA256 f5c5f274b65b1630a48f496410c46cb6cbcaad217806877b8114b47d62f87a61
 DIST netbeans-trunk-nightly-201205270002-src.zip 174681649 RMD160 3fbf1c797007a9e8ebed8ce67daadbda2f8b9363 SHA1 e72175533d61e40e35c92a49ca7f63c3a173f966 SHA256 47b4c12a34957abb72fa4563536abd220380a51b3378dc6da1a5e1223e0bbfaa
+DIST netbeans-trunk-nightly-201205300001-src.zip 174763237 RMD160 7c5524b4600cc086675ed863830f849216eb2f01 SHA1 9bbc52e25c508170d8207423b5ec43769eb1b0d1 SHA256 9c5d71ce455906f1e1f662c6a4e34c73e491ad3705f221b7c5c671366a79ef24
 EBUILD netbeans-dlight-7.0.1.ebuild 3624 RMD160 508b76c4699c15431166be0200cb5b8c69400a2b SHA1 f72af18653ce0a3e4576d1fadcec350ed5a16b3d SHA256 499a9303a1972ee89dfa2685e1dc1e4511c7531ff3b29caadd1136ba25dee82e
 EBUILD netbeans-dlight-7.1.2.ebuild 2935 RMD160 521ccfd5aa54e5715d13edb39b09754f6880453b SHA1 66e8dc926f8fe07623d5665a38154ee0a85ac73e SHA256 dc7d110b80174b1baeaca9c005e2cc9167540f186c7794067cfb45d335251b9a
 EBUILD netbeans-dlight-7.2_beta.ebuild 2916 RMD160 fe486a4bae936601d43f4ffd4b49a5b6923536a7 SHA1 b2a25de3a4f9d35b5992687990e125bdc42fbfc0 SHA256 0b6f9b2ade24f66665d58a1a859ab8d0eab30e0a0602692704eac8570bd3a825
 EBUILD netbeans-dlight-9999_p20120520.ebuild 2958 RMD160 507e16a642b9ec9581026a2d94e8e3b6c80f5937 SHA1 4ca1b65cdec5c56495d49fc2ceac7666123a4643 SHA256 f57a108d0ae5a71d9c290e1dc7ad5188daec12ce36e3aacd0ab9e82bf637ed66
 EBUILD netbeans-dlight-9999_p20120524.ebuild 2958 RMD160 677c467fd3b5acc9218af5b10bf1ed79272dbf2d SHA1 d66df95c68c0f492d28507e7f622af1cebc2e4bd SHA256 1c76bd4843ad3236ec11a60841d3479961c71b3407fd729e73bb4dc3a68d218d
 EBUILD netbeans-dlight-9999_p20120527.ebuild 2958 RMD160 397c2ad9884f0326e33565aaae137e4f595f7c62 SHA1 f2d81fd51ffb642cda214eb0a4b6e5d1a2661b41 SHA256 d0117887567288ca42b5751473ff5c7d225d599e615e6ba9db4b3c168808e1f0
-MISC ChangeLog 34964 RMD160 1ea99a6810afdd9e773d2825e4aae44f69da4f1e SHA1 b7b2f73e731879f315b0a2603a8f0eaff09e99bd SHA256 c4f7b1870e01c320cc707e7f596dbc931a4796175c1c0aebaefdadb507f35237
+EBUILD netbeans-dlight-9999_p20120530.ebuild 2958 RMD160 c6b50b94f2feeda027883a657947efd8d9420bf9 SHA1 e2914076dafe38b390384048ef1cf443357c6944 SHA256 367f744a8c569ab1bcba19b33a616080ccacc5eb63949e79aa50fb6771f65f1e
+MISC ChangeLog 35145 RMD160 c151236fedc0790ec7ec277920e50b281d5f5f97 SHA1 7f24864e480ef6277ed9c0571c53be972e03f798 SHA256 f50c2ed0654f69f8b11c8bf64f2b11c6e9dd3fd74b585ab11d2c63c7afea5ee4
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20120530.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20120530.ebuild
new file mode 100644
index 0000000..72c26c6
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20120530.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-05-30_00-01-54/zip/netbeans-trunk-nightly-201205300001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r6-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-r6-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-r6-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 4073ebf..3347464 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_p20120530 (30 May 2012)
+
+  30 May 2012; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-enterprise-9999_p20120530.ebuild:
+  bumped to the latest nightly sources
+
   27 May 2012; Miroslav Šulc <fordfrog@g.o>
   -netbeans-enterprise-9999_p20120516.ebuild,
   -netbeans-enterprise-9999_p20120517.ebuild:

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 80d3b4e..0ff600c 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -60,11 +60,13 @@ DIST netbeans-9999-r6-build.xml.patch.bz2 2475 RMD160 e4b970f3f4d2389071c5ddfed1
 DIST netbeans-trunk-nightly-201205200400-src.zip 178860844 RMD160 e9f20d02383a477a7848d5e17dfbf023df0326b4 SHA1 a05b277c5cde92909293ef3935cb2e2573fb651e SHA256 73b0ae0b95d7cb5145f56c6b57bca5a06ee7a608f2a5c7714a36c31c3210cf20
 DIST netbeans-trunk-nightly-201205240002-src.zip 178911778 RMD160 ca71d71e3b0c17ab74915043cb07e2da6fb9011f SHA1 0a0dcf4d31e484f58e338117f4ef504267982f53 SHA256 f5c5f274b65b1630a48f496410c46cb6cbcaad217806877b8114b47d62f87a61
 DIST netbeans-trunk-nightly-201205270002-src.zip 174681649 RMD160 3fbf1c797007a9e8ebed8ce67daadbda2f8b9363 SHA1 e72175533d61e40e35c92a49ca7f63c3a173f966 SHA256 47b4c12a34957abb72fa4563536abd220380a51b3378dc6da1a5e1223e0bbfaa
+DIST netbeans-trunk-nightly-201205300001-src.zip 174763237 RMD160 7c5524b4600cc086675ed863830f849216eb2f01 SHA1 9bbc52e25c508170d8207423b5ec43769eb1b0d1 SHA256 9c5d71ce455906f1e1f662c6a4e34c73e491ad3705f221b7c5c671366a79ef24
 EBUILD netbeans-enterprise-7.0.1.ebuild 16338 RMD160 0ecafb9ced600f753a5ab6359d6c762313ac2631 SHA1 d710a4694c708d8f78cfe04211ad1a199fa6ce0a SHA256 03ea08daaf5d4c5592937929bac33b4af3bac00a23f2167a7ef7b3c172a72abe
 EBUILD netbeans-enterprise-7.1.2.ebuild 18060 RMD160 0c1271e6e8de8b488da68eca78497d4f018e8e15 SHA1 e2c482b57c7eb35e25da6b8a7a21d53231fd7d85 SHA256 f63721b8ce5e1afbc58f783348f66f1e3501be519a1c9c1287ef860acc64ceda
 EBUILD netbeans-enterprise-7.2_beta.ebuild 20005 RMD160 ca8c5e038e3a91066d6e152bc055b4655c204609 SHA1 30f0057a2972374f2e647e5ac2405bea828cbf50 SHA256 d875258bcd80ad9b06b8c31e5adeacc6c40499b12358be240babfc794e9b4c43
 EBUILD netbeans-enterprise-9999_p20120520.ebuild 20047 RMD160 92b269016ccfb001c1bff0c85f22d6240bd4ff78 SHA1 c16788268a3a850de25002c64f22ce8936240a33 SHA256 0a0b4117dd838d6e67eca1c395edd1b1f194a37f5f3c6f87e7b7e975321e0961
 EBUILD netbeans-enterprise-9999_p20120524.ebuild 20047 RMD160 98da4a113f22b8d8de6ea6babd41b053edc0c91e SHA1 e0e24b73abae1447f20a88eb631feda2c1e060dc SHA256 b061d72b6cdb991fd5cbb07f91f55a8264cb86ab1ce0a92ef68b53d005dd5c5e
 EBUILD netbeans-enterprise-9999_p20120527.ebuild 20047 RMD160 9079f0c258de1c04532ba9533296d8ad6a7356e2 SHA1 80965caeb6c0aa8c3213825bad73dfa43c48e9db SHA256 b9e71729972d58e1cb13f23854f41eea6ad374daed6c5e67e1d3ce6144519fe3
-MISC ChangeLog 36940 RMD160 aad6bf057efc25ebaa3ec51aa17323342acd1ded SHA1 a9f07a9d6d3eabf4813ca09b403eec0520d5fb51 SHA256 322d0252849e9ffb835e33f578981bd8fc6bf7b7f89f604826cecf62361a3e6a
+EBUILD netbeans-enterprise-9999_p20120530.ebuild 20047 RMD160 352b20fc938102aa78224d3904d725f78c798557 SHA1 1dfef2d8d58c9c36319cd6be058b4c5f7812a81e SHA256 9550ea00216efb2900d5b600abc33e5581f57b0d33e5295f5191084904f5d48c
+MISC ChangeLog 37129 RMD160 5dd60d57810f1aafb3247ce7a8f53503d56936f9 SHA1 2f32f5b40a699705e9576181ac3ec92578859079 SHA256 ea9a1c824c26c4bb73e597e902902869f7d1381554b4b9d0a05eb4b9aa1f5de6
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20120530.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20120530.ebuild
new file mode 100644
index 0000000..cdbb8ed
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20120530.ebuild
@@ -0,0 +1,342 @@
+# 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-05-30_00-01-54/zip/netbeans-trunk-nightly-201205300001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r6-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar
+	http://hg.netbeans.org/binaries/A48449579E1EC9257407CCB2B15CEA2698C8B8F0-el-impl.jar
+	http://hg.netbeans.org/binaries/F28E9567138D6B9AD87D79592F77874334FF5BA8-glassfish-jspparser-3.0.jar
+	http://hg.netbeans.org/binaries/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar
+	http://hg.netbeans.org/binaries/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar
+	http://hg.netbeans.org/binaries/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar
+	http://hg.netbeans.org/binaries/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar
+	http://hg.netbeans.org/binaries/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar
+	http://hg.netbeans.org/binaries/26F461B41CF3E9070A76E44ACDD1FD8560FB1E25-javaee5.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/722C8EC88732F63EC7DF1D641F72C2851EDE95FD-libs.oracle.cloud-ext.jar
+	http://hg.netbeans.org/binaries/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip
+	http://hg.netbeans.org/binaries/16CD40905B389B27AFD81DAFF8F163CEC810FBC6-metro-2.0.zip
+	http://hg.netbeans.org/binaries/942DF8FA6174168BD227E925B11672E9A321D5BB-oauth-client-1.8-javadoc.jar
+	http://hg.netbeans.org/binaries/1C6E6C4B3DC659E5720AB08E2972C7C0459E5387-oauth-server-1.8-javadoc.jar
+	http://hg.netbeans.org/binaries/6EC53F24E6F4D9DBC884076FD0190B9C79414070-oauth-signature-1.8-javadoc.jar
+	http://hg.netbeans.org/binaries/75BB262D60528EACC0BCA22B1BF77D20A7AB652C-primefaces-3.2.jar
+	http://hg.netbeans.org/binaries/A8C121019B222DAE0139299B58FDB9C71FE839F3-servlet3.0-jsp2.2-api.jar
+	http://hg.netbeans.org/binaries/275C5AC6ADE12819F49E984C8E06B114A4E23458-spring-webmvc-2.5.6.SEC03.jar
+	http://hg.netbeans.org/binaries/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip
+	http://hg.netbeans.org/binaries/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip
+	http://hg.netbeans.org/binaries/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip
+	http://hg.netbeans.org/binaries/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-profiler-${PV}
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-webcommon-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/commons-codec:0
+	dev-java/commons-fileupload:0
+	dev-java/commons-logging:0
+	dev-java/glassfish-deployment-api:1.2
+	dev-java/jakarta-jstl:0"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	>=dev-java/junit-4.4:4
+	dev-java/tomcat-servlet-api:2.3"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}
+	dev-java/antlr:0[java]
+	dev-java/asm:3
+	dev-java/bsf:2.3
+	dev-java/commons-beanutils:1.7
+	dev-java/commons-collections:0
+	dev-java/commons-digester:0
+	dev-java/commons-io:1
+	dev-java/commons-validator:0
+	dev-java/jakarta-oro:2.0
+	dev-java/jettison:0
+	dev-java/jsr311-api:0"
+#	dev-java/commons-chain:1.1 in overlay
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.enterprise -Dext.binaries.downloaded=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r6-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar libs.amazon/external/aws-java-sdk-1.2.1.jar || die
+	ln -s "${DISTDIR}"/A48449579E1EC9257407CCB2B15CEA2698C8B8F0-el-impl.jar libs.elimpl/external/el-impl.jar || die
+	ln -s "${DISTDIR}"/F28E9567138D6B9AD87D79592F77874334FF5BA8-glassfish-jspparser-3.0.jar web.jspparser/external/glassfish-jspparser-3.0.jar || die
+	ln -s "${DISTDIR}"/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar libs.glassfish_logging/external/glassfish-logging-2.0.jar || die
+	ln -s "${DISTDIR}"/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar libs.amazon/external/httpclient-4.1.1.jar || die
+	ln -s "${DISTDIR}"/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar libs.amazon/external/httpcore-4.1.jar || die
+	ln -s "${DISTDIR}"/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar javaee.api/external/javaee-api-6.0.jar || die
+	ln -s "${DISTDIR}"/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar javaee.api/external/javaee-web-api-6.0.jar || die
+	ln -s "${DISTDIR}"/26F461B41CF3E9070A76E44ACDD1FD8560FB1E25-javaee5.jar libs.oracle.cloud/external/javaee5.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}"/722C8EC88732F63EC7DF1D641F72C2851EDE95FD-libs.oracle.cloud-ext.jar libs.oracle.cloud/external/libs.oracle.cloud-ext.jar || die
+	ln -s "${DISTDIR}"/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip websvc.metro.lib/external/metro-1.4-doc.zip || die
+	ln -s "${DISTDIR}"/16CD40905B389B27AFD81DAFF8F163CEC810FBC6-metro-2.0.zip websvc.metro.lib/external/metro-2.0.zip || die
+	ln -s "${DISTDIR}"/942DF8FA6174168BD227E925B11672E9A321D5BB-oauth-client-1.8-javadoc.jar websvc.restlib/external/oauth-client-1.8-javadoc.jar || die
+	ln -s "${DISTDIR}"/1C6E6C4B3DC659E5720AB08E2972C7C0459E5387-oauth-server-1.8-javadoc.jar websvc.restlib/external/oauth-server-1.8-javadoc.jar || die
+	ln -s "${DISTDIR}"/6EC53F24E6F4D9DBC884076FD0190B9C79414070-oauth-signature-1.8-javadoc.jar websvc.restlib/external/oauth-signature-1.8-javadoc.jar || die
+	ln -s "${DISTDIR}"/75BB262D60528EACC0BCA22B1BF77D20A7AB652C-primefaces-3.2.jar web.primefaces/external/primefaces-3.2.jar || die
+	ln -s "${DISTDIR}"/A8C121019B222DAE0139299B58FDB9C71FE839F3-servlet3.0-jsp2.2-api.jar servletjspapi/external/servlet3.0-jsp2.2-api.jar || die
+	ln -s "${DISTDIR}"/275C5AC6ADE12819F49E984C8E06B114A4E23458-spring-webmvc-2.5.6.SEC03.jar spring.webmvc/external/spring-webmvc-2.5.6.SEC03.jar || die
+	ln -s "${DISTDIR}"/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip web.struts/external/struts-1.3.10-javadoc.zip || die
+	ln -s "${DISTDIR}"/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip web.struts/external/struts-1.3.10-lib.zip || die
+	ln -s "${DISTDIR}"/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip web.core.syntax/external/syntaxref20.zip || die
+	ln -s "${DISTDIR}"/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar javaee.api/external/webservices-api-osgi.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r6-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into j2eeapis/external glassfish-deployment-api-1.2 glassfish-deployment-api.jar jsr88javax.jar
+	java-pkg_jar-from --into libs.amazon/external commons-codec commons-codec.jar commons-codec-1.3.jar
+	java-pkg_jar-from --into libs.amazon/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
+	java-pkg_jar-from --into libs.commons_fileupload/external commons-fileupload commons-fileupload.jar commons-fileupload-1.0.jar
+	java-pkg_jar-from --into web.jstl11/external jakarta-jstl jstl.jar jstl-1.1.2.jar
+	java-pkg_jar-from --into web.jstl11/external jakarta-jstl standard.jar standard-1.1.2.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.10.jar
+	java-pkg_jar-from --build-only --into web.monitor/external tomcat-servlet-api-2.3 servlet.jar servlet-2.3.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-java-${SLOT} java || die
+	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.java.built
+
+	ln -s /usr/share/netbeans-profiler-${SLOT} profiler || die
+	cat /usr/share/netbeans-profiler-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.profiler.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-webcommon-${SLOT} webcommon || die
+	cat /usr/share/netbeans-webcommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.webcommon.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/enterprise >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/enterprise$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-fileupload-1.0.jar && dosym /usr/share/commons-fileupload/lib/commons-fileupload.jar ${instdir}/commons-fileupload-1.0.jar || die
+	# el-impl.jar
+	# glassfish-jspparser-3.0.jar
+	# glassfish-logging-2.0.jar
+	# javaee-api-6.0.jar
+	# javaee-api-6.0-license.txt
+	# javaee-web-api-6.0.jar
+	# javaee-web-api-6.0-license.txt
+	# jsp-parser-ext.jar
+	rm jsr88javax.jar && dosym /usr/share/glassfish-deployment-api-1.2/lib/glassfish-deployment-api.jar ${instdir}/jsr88javax.jar || die
+	rm jstl.jar && dosym /usr/share/jakarta-jstl/lib/jstl.jar ${instdir}/jstl.jar || die
+	# org-netbeans-modules-web-httpmonitor.jar
+	# servlet3.0-jsp2.2-api.jar
+	rm standard.jar && dosym /usr/share/jakarta-jstl/lib/standard.jar ${instdir}/standard.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/aws-sdk
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-codec-1.3.jar && dosym /usr/share/commons-codec/lib/commons-codec.jar ${instdir}/commons-codec-1.3.jar || die
+	rm commons-logging-1.1.1.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.1.1.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/javaee6-endorsed
+	pushd "${D}"/${instdir} >/dev/null || die
+	# javax.annotation.jar
+	# javax.annotation-license.txt
+	# jaxb-api-osgi.jar
+	# jaxb-api-osgi-license.txt
+	# webservices-api-osgi.jar
+	# webservices-api-osgi-license.txt
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jsf-1_2
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-beanutils.jar && dosym /usr/share/commons-beanutils-1.7/lib/commons-beanutils.jar ${instdir}/commons-beanutils.jar || die
+	rm commons-collections.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections.jar || die
+	rm commons-digester.jar && dosym /usr/share/commons-digester/lib/commons-digester.jar ${instdir}/commons-digester.jar || die
+	rm commons-logging.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging.jar || die
+	# jsf-api.jar
+	# jsf-impl.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jsf-2_1
+	pushd "${D}"/${instdir} >/dev/null || die
+	# jsf-api.jar
+	# jsf-impl.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/metro
+	pushd "${D}"/${instdir} >/dev/null || die
+	# webservices-api.jar
+	# webservices-extra-api.jar
+	# webservices-extra.jar
+	# webservices-rt.jar
+	# webservices-tools.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/primefaces
+	pushd "${D}"/${instdir} >/dev/null || die
+	# primefaces-2.1.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/rest
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm asm-3.1.jar && dosym /usr/share/asm-3/lib/asm.jar ${instdir}/asm-3.1.jar || die
+	# jackson-core-asl-1.1.1.jar
+	# jersey-client-1.3.jar
+	# jersey-core-1.3.jar
+	# jersey-json-1.3.jar
+	# jersey-multipart-1.3.jar
+	# jersey-server-1.3.jar
+	# jersey-spring-1.3.jar
+	rm jettison-1.1.jar && dosym /usr/share/jettison/lib/jettison.jar ${instdir}/jettison-1.1.jar || die
+	rm jsr311-api-1.1.1.jar && dosym /usr/share/jsr311-api/lib/jsr311-api.jar ${instdir}/jsr311-api-1.1.1.jar || die
+	# mimepull-1.4.jar
+	# oauth-client-1.3.jar
+	# oauth-signature-1.3.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/spring
+	pushd "${D}"/${instdir} >/dev/null || die
+	# spring-webmvc-2.5.6.SEC01.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/struts
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm antlr-2.7.2.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.2.jar || die
+	rm bsf-2.3.0.jar && dosym /usr/share/bsf-2.3/lib/bsf.jar ${instdir}/bsf-2.3.0.jar || die
+	rm commons-beanutils-1.8.0.jar && dosym /usr/share/commons-beanutils-1.7/lib/commons-beanutils.jar ${instdir}/commons-beanutils-1.8.0.jar || die
+	rm commons-digester-1.8.jar && dosym /usr/share/commons-digester/lib/commons-digester.jar ${instdir}/commons-digester-1.8.jar || die
+	rm commons-fileupload-1.1.1.jar && dosym /usr/share/commons-fileupload/lib/commons-fileupload.jar ${instdir}/commons-fileupload-1.1.1.jar || die
+	# rm commons-chain-1.1.jar && dosym /usr/share/commons-chain-1.1/lib/commons-chain.jar ${instdir}/commons-chain-1.1.jar || die
+	rm commons-io-1.1.jar && dosym /usr/share/commons-io-1/lib/commons-io.jar ${instdir}/commons-io-1.1.jar || die
+	rm commons-logging-1.0.4.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.0.4.jar || die
+	rm commons-validator-1.3.1.jar && dosym /usr/share/commons-validator/lib/commons-validator.jar ${instdir}/commons-validator-1.3.1.jar || die
+	rm jstl-1.0.2.jar && dosym /usr/share/jakarta-jstl/lib/jstl.jar ${instdir}/jstl-1.0.2.jar || die
+	rm oro-2.0.8.jar && dosym /usr/share/jakarta-oro-2.0/lib/jakarta-oro.jar ${instdir}/oro-2.0.8.jar || die
+	rm standard-1.0.6.jar && dosym /usr/share/jakarta-jstl/lib/standard.jar ${instdir}/standard-1.0.6.jar || die
+	# struts-core-1.3.8.jar
+	# struts-el-1.3.8.jar
+	# struts-extras-1.3.8.jar
+	# struts-faces-1.3.8.jar
+	# struts-mailreader-dao-1.3.8.jar
+	# struts-scripting-1.3.8.jar
+	# struts-taglib-1.3.8.jar
+	# struts-tiles-1.3.8.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/enterprise
+}

diff --git a/dev-java/netbeans-ergonomics/ChangeLog b/dev-java/netbeans-ergonomics/ChangeLog
index 6451364..24dbcd1 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_p20120530 (30 May 2012)
+
+  30 May 2012; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-ergonomics-9999_p20120530.ebuild:
+  bumped to the latest nightly sources
+
   27 May 2012; Miroslav Šulc <fordfrog@g.o>
   -netbeans-ergonomics-9999_p20120516.ebuild,
   -netbeans-ergonomics-9999_p20120517.ebuild:

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 541d415..c632619 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -8,11 +8,13 @@ DIST netbeans-9999-r6-build.xml.patch.bz2 2475 RMD160 e4b970f3f4d2389071c5ddfed1
 DIST netbeans-trunk-nightly-201205200400-src.zip 178860844 RMD160 e9f20d02383a477a7848d5e17dfbf023df0326b4 SHA1 a05b277c5cde92909293ef3935cb2e2573fb651e SHA256 73b0ae0b95d7cb5145f56c6b57bca5a06ee7a608f2a5c7714a36c31c3210cf20
 DIST netbeans-trunk-nightly-201205240002-src.zip 178911778 RMD160 ca71d71e3b0c17ab74915043cb07e2da6fb9011f SHA1 0a0dcf4d31e484f58e338117f4ef504267982f53 SHA256 f5c5f274b65b1630a48f496410c46cb6cbcaad217806877b8114b47d62f87a61
 DIST netbeans-trunk-nightly-201205270002-src.zip 174681649 RMD160 3fbf1c797007a9e8ebed8ce67daadbda2f8b9363 SHA1 e72175533d61e40e35c92a49ca7f63c3a173f966 SHA256 47b4c12a34957abb72fa4563536abd220380a51b3378dc6da1a5e1223e0bbfaa
+DIST netbeans-trunk-nightly-201205300001-src.zip 174763237 RMD160 7c5524b4600cc086675ed863830f849216eb2f01 SHA1 9bbc52e25c508170d8207423b5ec43769eb1b0d1 SHA256 9c5d71ce455906f1e1f662c6a4e34c73e491ad3705f221b7c5c671366a79ef24
 EBUILD netbeans-ergonomics-7.0.1.ebuild 2884 RMD160 3ce16ca958ba2e556cd0e2361cb94cc0cf4bbe62 SHA1 ed3139bb1005c01513c3b0e2602a71622f81ecc9 SHA256 e8e4a785fc11b6d0d3c722826761581b8c9c779c5460dc7d1487b3154f4402ab
 EBUILD netbeans-ergonomics-7.1.2.ebuild 2893 RMD160 10a7c9743b22d7041435ec37865513bf1d31b429 SHA1 6aa7fa84c68ebba4af26497825ec78f99bd33492 SHA256 cd56250980429160b8fa9deb17f15050d016394d5fdef19bf772cf29988c86d8
 EBUILD netbeans-ergonomics-7.2_beta.ebuild 2874 RMD160 f0e3b1e27f6cd6469eeb4e2bf63a3ffa0866d095 SHA1 7d9f76da51162820ad072945623bdc9eec502e28 SHA256 d39cd1ae0e337ddfd07657ecf6f43fc413163e82db0df8dc6e31ad4198033135
 EBUILD netbeans-ergonomics-9999_p20120520.ebuild 2916 RMD160 1adbd29622dc5ee9e2b62af8aedc769aeab78253 SHA1 d48cfa588f831022ae347680148bc4f11633d25f SHA256 a8021cc136adc5f24edc4eaf1dee5a87403310c11af7ab02dc327d4788262510
 EBUILD netbeans-ergonomics-9999_p20120524.ebuild 2916 RMD160 e295881fe628df877f1fc9c5e19816fa0b311fb8 SHA1 c2c4698c77d06f2f1b5fb6cf2a1bfce944e08b2b SHA256 a32454d53c1a22a046a52eb0bafa16526bd0775809cb414832d8a32dbe3e8f1e
 EBUILD netbeans-ergonomics-9999_p20120527.ebuild 2916 RMD160 02e6217a4835a55fc79ef06a0aacaf516f6d6870 SHA1 4da49b31957d2cfea9eae974f75045f67cccddd2 SHA256 2ce1867828b2e6a7311bf22d5a39c5ca5a5ab5f738eba581d104f1e1ecf6faff
-MISC ChangeLog 36562 RMD160 aafab7a7f8b2141b9c2bbf082fa2c6e2ef01bc3e SHA1 42a672daa95c3247dae23c2a53836592eb08ec9f SHA256 1e2b6221bd2078c463a437483ef30259c1ef861e9baa719014d491353ac6de56
+EBUILD netbeans-ergonomics-9999_p20120530.ebuild 2916 RMD160 a4836d246fa5bcf49d2e2f35cdd24f7ff84dd93d SHA1 4001c30c7fff74467fa9a2a2f10476d609713164 SHA256 e14e6b503d9cce6a6fed8b6657e7c1ba084f2cbd8a64517de1e175b8d274b987
+MISC ChangeLog 36751 RMD160 0ecde7eec844313920c6925a5c19839b706db453 SHA1 dcc411728039b4832205c5265e43984d546dd0ce SHA256 4632a9d283cc058dfd63d54c244128954a4b3b7c08b31ac453ce46a71905cff3
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20120530.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20120530.ebuild
new file mode 100644
index 0000000..4fcd5ad
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20120530.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-05-30_00-01-54/zip/netbeans-trunk-nightly-201205300001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r6-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-r6-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r6-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 7441cb4..a5f0a0e 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_p20120530 (30 May 2012)
+
+  30 May 2012; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-groovy-9999_p20120530.ebuild:
+  bumped to the latest nightly sources
+
   27 May 2012; Miroslav Šulc <fordfrog@g.o>
   -netbeans-groovy-9999_p20120516.ebuild,
   -netbeans-groovy-9999_p20120517.ebuild:

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index 0770dba..469923f 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -10,11 +10,13 @@ DIST netbeans-9999-r6-build.xml.patch.bz2 2475 RMD160 e4b970f3f4d2389071c5ddfed1
 DIST netbeans-trunk-nightly-201205200400-src.zip 178860844 RMD160 e9f20d02383a477a7848d5e17dfbf023df0326b4 SHA1 a05b277c5cde92909293ef3935cb2e2573fb651e SHA256 73b0ae0b95d7cb5145f56c6b57bca5a06ee7a608f2a5c7714a36c31c3210cf20
 DIST netbeans-trunk-nightly-201205240002-src.zip 178911778 RMD160 ca71d71e3b0c17ab74915043cb07e2da6fb9011f SHA1 0a0dcf4d31e484f58e338117f4ef504267982f53 SHA256 f5c5f274b65b1630a48f496410c46cb6cbcaad217806877b8114b47d62f87a61
 DIST netbeans-trunk-nightly-201205270002-src.zip 174681649 RMD160 3fbf1c797007a9e8ebed8ce67daadbda2f8b9363 SHA1 e72175533d61e40e35c92a49ca7f63c3a173f966 SHA256 47b4c12a34957abb72fa4563536abd220380a51b3378dc6da1a5e1223e0bbfaa
+DIST netbeans-trunk-nightly-201205300001-src.zip 174763237 RMD160 7c5524b4600cc086675ed863830f849216eb2f01 SHA1 9bbc52e25c508170d8207423b5ec43769eb1b0d1 SHA256 9c5d71ce455906f1e1f662c6a4e34c73e491ad3705f221b7c5c671366a79ef24
 EBUILD netbeans-groovy-7.0.1.ebuild 3296 RMD160 8dfd04f7498e840e727faa16d85c1e6998933be3 SHA1 8c5f081cb89500e97feedfd39824fd913fed8044 SHA256 29c3d304eca5999e78550fd715dbcbef9d15639d4e4f17fa0e45a46803080729
 EBUILD netbeans-groovy-7.1.2.ebuild 3305 RMD160 b88deb6b19b75c81fa895198a06bb38e77e43f8a SHA1 8f6633142f85d09ced3994cde51cb066285e3e86 SHA256 1e00f335b8cc1e90deec3c3251629ba699286b25be5b6945d135d271004dc34b
 EBUILD netbeans-groovy-7.2_beta.ebuild 3286 RMD160 634d4fe51ec9c617afcc6bb8c8709621ab6a5610 SHA1 5a72565170ce939fa582d00afda15f437fa5cb85 SHA256 45af04bf8601836a8dc7ffea7cfd0cfbaf931010c410642f7a14c7d0f3a5e0df
 EBUILD netbeans-groovy-9999_p20120520.ebuild 3328 RMD160 53ab3fdfe3f1a96799a5ecd94237d2c1aac1fdd8 SHA1 89f0b670273d0538f2f46a70bfdf300135f25f33 SHA256 03ace24ee5300d4cbda2ae5a8cff1e80e43c9f6e803aff1204ede2f8a83c99a9
 EBUILD netbeans-groovy-9999_p20120524.ebuild 3328 RMD160 81f5fd9b3cbe038be9a4e2932fa1afd6591d33bc SHA1 cbb3a326b59674e60482dc8de3aadbaabcf8be68 SHA256 6df2add461fe39cfcb5dacac201a15c8aa8851e37e030ec64cae319ab2917b98
 EBUILD netbeans-groovy-9999_p20120527.ebuild 3328 RMD160 132a9e7df370fd50a34bd1ef7c3f3ec4302a0342 SHA1 b5cdbf04bb1f24221f01d68cf1b6ff3c55aa7fa8 SHA256 c814db792921d81e3679eb958a71f495e6dca3635d2df771c1ee395a9b449544
-MISC ChangeLog 34964 RMD160 5a15afe96174face4526c6314b31551b20945af2 SHA1 f4b80dd0c67d33ab20796b93bd954a824c979f72 SHA256 dc19d2db4319b9103e835346d38ece183aceae059c881fa598d5ef187290067c
+EBUILD netbeans-groovy-9999_p20120530.ebuild 3328 RMD160 18420989f343541d3becbce3b29373c59029ab21 SHA1 687db6af0462311425ef5830ddb4d4762303af85 SHA256 109abd1b774303163f31b36661dc10f5d6b887e8e85c77051aac1691c0504380
+MISC ChangeLog 35145 RMD160 d31928f4965a097fa81eb354e8ce0bee78d8f2af SHA1 675d68b1b74af1ed82bfeeb8e0e8d1d90ecd4ad6 SHA256 1e5dabcf2aa995ff08d68a431e553ab5b3e669565a40439dd633761804ff22e0
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20120530.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20120530.ebuild
new file mode 100644
index 0000000..e3de6c6
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20120530.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-05-30_00-01-54/zip/netbeans-trunk-nightly-201205300001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r6-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/96A26BFA6E5AEA2E3C46DF44A19DE93A2ACD2366-groovy-all-1.8.6.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-r6-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/96A26BFA6E5AEA2E3C46DF44A19DE93A2ACD2366-groovy-all-1.8.6.jar groovy.editor/external/groovy-all-1.8.6.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r6-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 d6fc2ed..72415d4 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_p20120530 (30 May 2012)
+
+  30 May 2012; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-harness-9999_p20120530.ebuild:
+  bumped to the latest nightly sources
+
   27 May 2012; Miroslav Šulc <fordfrog@g.o>
   -netbeans-harness-9999_p20120516.ebuild,
   -netbeans-harness-9999_p20120517.ebuild:

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index fbb817a..9354a6d 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -10,11 +10,13 @@ DIST netbeans-9999-r6-build.xml.patch.bz2 2475 RMD160 e4b970f3f4d2389071c5ddfed1
 DIST netbeans-trunk-nightly-201205200400-src.zip 178860844 RMD160 e9f20d02383a477a7848d5e17dfbf023df0326b4 SHA1 a05b277c5cde92909293ef3935cb2e2573fb651e SHA256 73b0ae0b95d7cb5145f56c6b57bca5a06ee7a608f2a5c7714a36c31c3210cf20
 DIST netbeans-trunk-nightly-201205240002-src.zip 178911778 RMD160 ca71d71e3b0c17ab74915043cb07e2da6fb9011f SHA1 0a0dcf4d31e484f58e338117f4ef504267982f53 SHA256 f5c5f274b65b1630a48f496410c46cb6cbcaad217806877b8114b47d62f87a61
 DIST netbeans-trunk-nightly-201205270002-src.zip 174681649 RMD160 3fbf1c797007a9e8ebed8ce67daadbda2f8b9363 SHA1 e72175533d61e40e35c92a49ca7f63c3a173f966 SHA256 47b4c12a34957abb72fa4563536abd220380a51b3378dc6da1a5e1223e0bbfaa
+DIST netbeans-trunk-nightly-201205300001-src.zip 174763237 RMD160 7c5524b4600cc086675ed863830f849216eb2f01 SHA1 9bbc52e25c508170d8207423b5ec43769eb1b0d1 SHA256 9c5d71ce455906f1e1f662c6a4e34c73e491ad3705f221b7c5c671366a79ef24
 EBUILD netbeans-harness-7.0.1.ebuild 3579 RMD160 dd36fe87364dc9a15cfad15b64f8d05e46632705 SHA1 d39ddfab960f1b9430a5eee2919d06e2854ae848 SHA256 f4d09cb7bd5e8485caf75a3020ddb8102d3ea326878ac384ef4aecb011a1f6a5
 EBUILD netbeans-harness-7.1.2.ebuild 3587 RMD160 f84167bf6f72bde6403c4658f95140d040bbecbf SHA1 da6bd286aa0e36c3080a2e939a886ae0f883a24a SHA256 e0adc470109009641bf48569623bf0fc51a400ac1ba686475c7dae1a5b561c96
 EBUILD netbeans-harness-7.2_beta.ebuild 3568 RMD160 e43b2c11d23da78ef2d71afd5dd8d64c798043c3 SHA1 73a18420ccf98a3660f44f7c423e3a994239966a SHA256 8846e81b11d169f08b13b53fc10475d1084ed74b9d28f74705588baae5caa1e6
 EBUILD netbeans-harness-9999_p20120520.ebuild 3610 RMD160 425a08acfc4b1fa7b299e94d9be8591fd6fa27fa SHA1 335664a6b57328acec54eea0d34383ad491de33c SHA256 09564cb4f6705dd98b91e2c9d92fe3411ff28a72b6ffa1a1a74beb6c4f0f2d6b
 EBUILD netbeans-harness-9999_p20120524.ebuild 3610 RMD160 da3450130fd5876e8c24f0803cf96c348567d049 SHA1 a04553391c3b9e47b0d18ba9ad4ef4cce3eb1465 SHA256 15d652e6c563901a9c4cc3c6cd43e57f67389ca95b35356629eb87b7f0a98fe2
 EBUILD netbeans-harness-9999_p20120527.ebuild 3610 RMD160 a429ef8d032c59c2cee6698c6469d13ca5e20639 SHA1 b078628e529769062301a35fb8d8efb187318f3b SHA256 3208a0df13143fe08904b6b744cf469b85cbf95fab9a32ec0c26dd8613b91cc1
-MISC ChangeLog 35363 RMD160 d3fc6134a8699af7419f8252a82bc0c7c8bbc131 SHA1 d9779d53cfb02ad063b8911622a57cfea8928cf3 SHA256 0b04ac7f094bb0e732ea164979eb7595ae09f8dcab51299f6024524a77ed5ae0
+EBUILD netbeans-harness-9999_p20120530.ebuild 3610 RMD160 4cf5272d67eac0993677ffe9e0c03d9fe13c1a9e SHA1 fad47c00c117a11481cf1071415bc9b8cc8306a2 SHA256 0700e3c1aca245a88038d4e45ad0867b19f06f47a9d6d067d8fd08acd438dd04
+MISC ChangeLog 35546 RMD160 740a419c620ed44d2caeaf19e8f1e964e6b96d68 SHA1 d90639133d73127a6967f77573a546eb41b98832 SHA256 d22dacdbe047b41fe68e5b323da55313343cd2b8f054af9b5f28ea06003b5c6b
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20120530.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20120530.ebuild
new file mode 100644
index 0000000..e6619da
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20120530.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-05-30_00-01-54/zip/netbeans-trunk-nightly-201205300001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r6-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-r6-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-r6-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 b50589e..d09324c 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_p20120530 (30 May 2012)
+
+  30 May 2012; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-ide-9999_p20120530.ebuild:
+  bumped to the latest nightly sources
+
   27 May 2012; Miroslav Šulc <fordfrog@g.o>
   -netbeans-ide-9999_p20120516.ebuild, -netbeans-ide-9999_p20120517.ebuild:
   removed obsolete versions

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 0d4b7d7..574b57b 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -89,11 +89,13 @@ DIST netbeans-9999-r6-build.xml.patch.bz2 2475 RMD160 e4b970f3f4d2389071c5ddfed1
 DIST netbeans-trunk-nightly-201205200400-src.zip 178860844 RMD160 e9f20d02383a477a7848d5e17dfbf023df0326b4 SHA1 a05b277c5cde92909293ef3935cb2e2573fb651e SHA256 73b0ae0b95d7cb5145f56c6b57bca5a06ee7a608f2a5c7714a36c31c3210cf20
 DIST netbeans-trunk-nightly-201205240002-src.zip 178911778 RMD160 ca71d71e3b0c17ab74915043cb07e2da6fb9011f SHA1 0a0dcf4d31e484f58e338117f4ef504267982f53 SHA256 f5c5f274b65b1630a48f496410c46cb6cbcaad217806877b8114b47d62f87a61
 DIST netbeans-trunk-nightly-201205270002-src.zip 174681649 RMD160 3fbf1c797007a9e8ebed8ce67daadbda2f8b9363 SHA1 e72175533d61e40e35c92a49ca7f63c3a173f966 SHA256 47b4c12a34957abb72fa4563536abd220380a51b3378dc6da1a5e1223e0bbfaa
+DIST netbeans-trunk-nightly-201205300001-src.zip 174763237 RMD160 7c5524b4600cc086675ed863830f849216eb2f01 SHA1 9bbc52e25c508170d8207423b5ec43769eb1b0d1 SHA256 9c5d71ce455906f1e1f662c6a4e34c73e491ad3705f221b7c5c671366a79ef24
 EBUILD netbeans-ide-7.0.1.ebuild 22653 RMD160 fe693a0abc3253af1850b99bfb4fa0d9a488bd94 SHA1 5b6547694a3193ce89cc2a5dfb8fc134cb81fabe SHA256 4c1b3e46e2a6cb89d902c7f4fe6ad9306cbd0c9463a514e87d4c6ec019dc0356
 EBUILD netbeans-ide-7.1.2.ebuild 26834 RMD160 b07d2029d3d736034251b8e3a7b6778d99d14491 SHA1 3236b1541c713cb6fb444725d3b29f6645eb9b19 SHA256 1e57e60a1a00b4530f917319b5d8eef915b9669b9dd3ab82b5afabe171d8959a
 EBUILD netbeans-ide-7.2_beta.ebuild 26873 RMD160 86569fa75b1d41ea96c78721aa998381a52894fa SHA1 c3cb625a7004f96221908e1889c54657ab4dca54 SHA256 1d639a8457bc2bec65af9c148f1430170b061afde16b446d41248dbb181165b2
 EBUILD netbeans-ide-9999_p20120520.ebuild 26915 RMD160 f700c1fb55a86e1271fbde900414c075589d95a2 SHA1 1410e333ace3d5a9f9e451cc34d73b9e5a535469 SHA256 4e239dfaa012c262b86f4da02fdb6283182354015eccbd3d91b39055f1bfcb47
 EBUILD netbeans-ide-9999_p20120524.ebuild 26927 RMD160 5e0042cbf6939d90930b1482e08ef55ab89cbbfa SHA1 61173a5481f9f66482d009edc3ca5c4264a5e076 SHA256 e2e89b08b78148ff8f3a7fa2eeaee5554370a4c6bf037cbff7878dc8995b8ecb
 EBUILD netbeans-ide-9999_p20120527.ebuild 26927 RMD160 0f38f55b7acc6371618b87bb8f1c661d853cde0e SHA1 b90d5cc205a041757f460625f65e2955c58e9c34 SHA256 69eeae78ce7671bdcfecdf4da6ccdb65f3e437d8d7d1d58ebbb8229b03e3631c
-MISC ChangeLog 34236 RMD160 b12a4f75280554ae4082228f251cd45715cf9ca1 SHA1 99f1695b95751378a228d50de6ad5f263daf912a SHA256 4c10e5348cbf856b879b75f211adde493bd8dd33f9d90045c2b8f15c7029e374
+EBUILD netbeans-ide-9999_p20120530.ebuild 26927 RMD160 3ab37120f25fb9a892dade2b0f15f2bffcabbee2 SHA1 231ac4e3f047290666411f0a5b3fada815357216 SHA256 fab44260973bc896b993778e1fc92360799cc45286a19e2165c094284e7ab243
+MISC ChangeLog 34411 RMD160 5ab3d41a6e326268cc237d322e4b592a5f300f7f SHA1 f8b489605fe5f931b53da4fb88274f976d383c92 SHA256 2942975f6f7f5ebf8cb3dc4d9ac096de4504e9bc0df2cb499853343a590b62fe
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20120530.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20120530.ebuild
new file mode 100644
index 0000000..edea0e7
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20120530.ebuild
@@ -0,0 +1,386 @@
+# 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-05-30_00-01-54/zip/netbeans-trunk-nightly-201205300001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r6-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/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar
+	http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip
+	http://hg.netbeans.org/binaries/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar
+	http://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar
+	http://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar
+	http://hg.netbeans.org/binaries/C0C5653D2200F2BD2E834B26DFDBC830D07FA0F4-jing.jar
+	http://hg.netbeans.org/binaries/71F7D2D5A3CF17CECBD15049A856BC0245C95C56-js.jar
+	http://hg.netbeans.org/binaries/098B14300B35E1053AA9945FF2C1CDA164F43B33-js-domstubs.zip
+	http://hg.netbeans.org/binaries/5756AA27E54A3EC6C8CDAE32F49BCA7BC139EB15-jsstubs.zip
+	http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
+	http://hg.netbeans.org/binaries/90FF0731FAFB05C01FEE4F2247140D56E9C30A3B-lucene-core-3.5.0.jar
+	http://hg.netbeans.org/binaries/A1C0ED8C43A306E3FB7676E7463204B9DA9BE290-non-schema.jar
+	http://hg.netbeans.org/binaries/DF8DD2981C9C3EBEDB059CA98450B587E784AF58-org.eclipse.core.contenttype-3.4.100.jar
+	http://hg.netbeans.org/binaries/A71B23F287BB0CB27E3A5B7808AC07D45BE44841-org.eclipse.core.jobs-3.5.1.jar
+	http://hg.netbeans.org/binaries/93CDEDB00404BF3C56AD3BF0501A9E7A09BD2108-org.eclipse.core.net-1.2.100.jar
+	http://hg.netbeans.org/binaries/46735A729401036FC2C14CC05257ACB4CD4F6906-org.eclipse.core.runtime-3.6.0.jar
+	http://hg.netbeans.org/binaries/9C98C277CFFBB4CA06CAFD5820562EF7B5100F5C-org.eclipse.core.runtime.compatibility.auth-3.2.200.jar
+	http://hg.netbeans.org/binaries/8A288BD66E90B1081F843A17F95973514ED55A97-org.eclipse.equinox.app-1.3.1.jar
+	http://hg.netbeans.org/binaries/491025C38F84A6FF9823315A74A0CAC4C30E51A8-org.eclipse.equinox.common-3.6.0.jar
+	http://hg.netbeans.org/binaries/F411AB988320260361C3611714CA5AF1480CD1A3-org.eclipse.equinox.preferences-3.3.0.jar
+	http://hg.netbeans.org/binaries/AD19FF36B5D976E5B4F289B5ACB32967216C1B2D-org.eclipse.equinox.registry-3.5.0.jar
+	http://hg.netbeans.org/binaries/B24FB024EA57B794FA1433CE974102507A231539-org.eclipse.equinox.security-1.0.200.jar
+	http://hg.netbeans.org/binaries/A00DC524B1D1DB1ABBF95407AA3E6009C3D2C157-org.eclipse.jgit-1.3.0.201202151440-r.jar
+	http://hg.netbeans.org/binaries/6AC191F42860D1698C9268AE044AFAA5FE806CE7-org.eclipse.mylyn.bugzilla.core-3.6.0.jar
+	http://hg.netbeans.org/binaries/4617423828BC2E79A1871949C2914285405D8EFF-org.eclipse.mylyn.commons.core-3.6.0.jar
+	http://hg.netbeans.org/binaries/053602E0177D42BF707019F1BC646193A899D571-org.eclipse.mylyn.commons.net-3.6.0.jar
+	http://hg.netbeans.org/binaries/032EFC784E1DE21E4093C08F336C7582F5694760-org.eclipse.mylyn.commons.xmlrpc-3.6.0.jar
+	http://hg.netbeans.org/binaries/5D73EEAEABC42C6FCB85593D1F5B04ACBDFAA0F9-org.eclipse.mylyn.tasks.core-3.6.0.jar
+	http://hg.netbeans.org/binaries/2EB57252FE095468DF7CA74E5D0D5882D17DAB11-org.tmatesoft.svnkit_1.7.4.t20120412_2022.jar
+	http://hg.netbeans.org/binaries/CD33537FD47E801E01B427997F3DE4016159B414-preindexed.zip
+	http://hg.netbeans.org/binaries/E66876EB5F33AA0E57F035F1AADD8C44FEAE7FCB-processtreekiller-1.0.1.jar
+	http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar
+	http://hg.netbeans.org/binaries/1162833E0FE87B69B99B1F7DEB3A6C386EAB6F84-rhino1_7R2rc1.zip
+	http://hg.netbeans.org/binaries/C56F4F5C42102A67F56EB8F12D0219E92E5307C2-sdocs.zip
+	http://hg.netbeans.org/binaries/0E30D36ADF1728F6CFE1E87DF71C5541D3E61931-svnClientAdapter-javahl-1.8.5.jar
+	http://hg.netbeans.org/binaries/84D26BD9524B46955910CE6704812E2308F1D518-svnClientAdapter-main-1.8.5.jar
+	http://hg.netbeans.org/binaries/076FCE66657A48670381BA94B0492C991CF10375-svnClientAdapter-svnkit-1.8.5.jar
+	http://hg.netbeans.org/binaries/7C6ED64C55164C5AE0394E11303CA95CB24166AF-swingx-0.9.5.jar
+	http://hg.netbeans.org/binaries/8ECD1EA66F54C0D5FB20186FD4918D9520096054-sqljet-1.1.0.jar
+	http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar
+	http://hg.netbeans.org/binaries/97484EC8B82D84D6957976C2DCF1740AAD708054-com.trilead.ssh2_1.0.0.build214.jar
+	http://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar
+	http://hg.netbeans.org/binaries/7A5A7DF07297A86A944D4D0562C685585B0734EF-validator.jar
+	http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar
+	http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar
+	http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar
+	http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-platform-${PV}
+	dev-java/commons-httpclient:3
+	dev-java/commons-io:1
+	dev-java/commons-lang:2.1
+	dev-java/commons-logging:0
+	dev-java/freemarker:2.3
+	dev-java/icu4j:4.4
+	dev-java/jdbc-mysql:0
+	dev-java/jdbc-postgresql:0
+	dev-java/jsr173:0
+	dev-java/jvyamlb:0
+	dev-java/log4j:0
+	dev-java/saxon:9
+	dev-java/smack:2.2
+	dev-java/sun-jaf:0
+	dev-java/tomcat-servlet-api:2.2
+	dev-java/ws-commons-util:0
+	dev-java/xerces:2
+	dev-vcs/subversion:0[java]"
+#	dev-java/lucene:3.5 we do not have slot 3.5 yet
+#	dev-java/jaxb:2 upstream version contains more stuff so websvccommon does not compile with ours
+#	app-text/jing:0 our version is probably too old
+#	dev-java/ini4j:0 our version is too old
+#	java-virtuals/jaf:0 could use this instead of sun-jaf but it returns empty classpath
+#	dev-java/trilead-ssh2:0 in overlay
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	dev-java/commons-codec:0
+	dev-java/jsch:0
+	dev-java/jzlib:0
+	${CDEPEND}
+	dev-java/javacc:0
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ide -Dext.binaries.downloaded=true -Djava.awt.headless=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r6-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}"/71F434378F822B09A57174AF6C75D37408687C57-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}"/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar libs.jaxb/external/jaxb-impl.jar || die
+	ln -s "${DISTDIR}"/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar libs.jaxb/external/jaxb-xjc.jar || die
+	ln -s "${DISTDIR}"/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar libs.jaxb/external/jaxb1-impl.jar || die
+	ln -s "${DISTDIR}"/C0C5653D2200F2BD2E834B26DFDBC830D07FA0F4-jing.jar html.validation/external/jing.jar || die
+	ln -s "${DISTDIR}"/71F7D2D5A3CF17CECBD15049A856BC0245C95C56-js.jar html.validation/external/js.jar || die
+	ln -s "${DISTDIR}"/098B14300B35E1053AA9945FF2C1CDA164F43B33-js-domstubs.zip javascript.editing/external/js-domstubs.zip || die
+	ln -s "${DISTDIR}"/5756AA27E54A3EC6C8CDAE32F49BCA7BC139EB15-jsstubs.zip javascript.editing/external/jsstubs.zip || die
+	ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.destroy/external/libpam4j-1.1.jar || die
+	ln -s "${DISTDIR}"/90FF0731FAFB05C01FEE4F2247140D56E9C30A3B-lucene-core-3.5.0.jar libs.lucene/external/lucene-core-3.5.0.jar || die
+	ln -s "${DISTDIR}"/A1C0ED8C43A306E3FB7676E7463204B9DA9BE290-non-schema.jar html.validation/external/non-schema.jar || die
+	ln -s "${DISTDIR}"/DF8DD2981C9C3EBEDB059CA98450B587E784AF58-org.eclipse.core.contenttype-3.4.100.jar o.eclipse.core.contenttype/external/org.eclipse.core.contenttype-3.4.100.jar || die
+	ln -s "${DISTDIR}"/A71B23F287BB0CB27E3A5B7808AC07D45BE44841-org.eclipse.core.jobs-3.5.1.jar o.eclipse.core.jobs/external/org.eclipse.core.jobs-3.5.1.jar || die
+	ln -s "${DISTDIR}"/93CDEDB00404BF3C56AD3BF0501A9E7A09BD2108-org.eclipse.core.net-1.2.100.jar o.eclipse.core.net/external/org.eclipse.core.net-1.2.100.jar || die
+	ln -s "${DISTDIR}"/46735A729401036FC2C14CC05257ACB4CD4F6906-org.eclipse.core.runtime-3.6.0.jar o.eclipse.core.runtime/external/org.eclipse.core.runtime-3.6.0.jar || die
+	ln -s "${DISTDIR}"/9C98C277CFFBB4CA06CAFD5820562EF7B5100F5C-org.eclipse.core.runtime.compatibility.auth-3.2.200.jar o.eclipse.core.runtime.compatibility.auth/external/org.eclipse.core.runtime.compatibility.auth-3.2.200.jar || die
+	ln -s "${DISTDIR}"/8A288BD66E90B1081F843A17F95973514ED55A97-org.eclipse.equinox.app-1.3.1.jar o.eclipse.equinox.app/external/org.eclipse.equinox.app-1.3.1.jar || die
+	ln -s "${DISTDIR}"/491025C38F84A6FF9823315A74A0CAC4C30E51A8-org.eclipse.equinox.common-3.6.0.jar o.eclipse.equinox.common/external/org.eclipse.equinox.common-3.6.0.jar || die
+	ln -s "${DISTDIR}"/F411AB988320260361C3611714CA5AF1480CD1A3-org.eclipse.equinox.preferences-3.3.0.jar o.eclipse.equinox.preferences/external/org.eclipse.equinox.preferences-3.3.0.jar || die
+	ln -s "${DISTDIR}"/AD19FF36B5D976E5B4F289B5ACB32967216C1B2D-org.eclipse.equinox.registry-3.5.0.jar o.eclipse.equinox.registry/external/org.eclipse.equinox.registry-3.5.0.jar || die
+	ln -s "${DISTDIR}"/B24FB024EA57B794FA1433CE974102507A231539-org.eclipse.equinox.security-1.0.200.jar o.eclipse.equinox.security/external/org.eclipse.equinox.security-1.0.200.jar || die
+	ln -s "${DISTDIR}"/A00DC524B1D1DB1ABBF95407AA3E6009C3D2C157-org.eclipse.jgit-1.3.0.201202151440-r.jar o.eclipse.jgit/external/org.eclipse.jgit-1.3.0.201202151440-r.jar || die
+	ln -s "${DISTDIR}"/6AC191F42860D1698C9268AE044AFAA5FE806CE7-org.eclipse.mylyn.bugzilla.core-3.6.0.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core-3.6.0.jar || die
+	ln -s "${DISTDIR}"/4617423828BC2E79A1871949C2914285405D8EFF-org.eclipse.mylyn.commons.core-3.6.0.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core-3.6.0.jar || die
+	ln -s "${DISTDIR}"/053602E0177D42BF707019F1BC646193A899D571-org.eclipse.mylyn.commons.net-3.6.0.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net-3.6.0.jar || die
+	ln -s "${DISTDIR}"/032EFC784E1DE21E4093C08F336C7582F5694760-org.eclipse.mylyn.commons.xmlrpc-3.6.0.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc-3.6.0.jar || die
+	ln -s "${DISTDIR}"/5D73EEAEABC42C6FCB85593D1F5B04ACBDFAA0F9-org.eclipse.mylyn.tasks.core-3.6.0.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core-3.6.0.jar || die
+	ln -s "${DISTDIR}"/2EB57252FE095468DF7CA74E5D0D5882D17DAB11-org.tmatesoft.svnkit_1.7.4.t20120412_2022.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.7.4.t20120412_2022.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}"/8ECD1EA66F54C0D5FB20186FD4918D9520096054-sqljet-1.1.0.jar libs.svnClientAdapter.svnkit/external/sqljet-1.1.0.jar || die
+	ln -s "${DISTDIR}"/0E30D36ADF1728F6CFE1E87DF71C5541D3E61931-svnClientAdapter-javahl-1.8.5.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-javahl-1.8.5.jar || die
+	ln -s "${DISTDIR}"/84D26BD9524B46955910CE6704812E2308F1D518-svnClientAdapter-main-1.8.5.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.8.5.jar || die
+	ln -s "${DISTDIR}"/076FCE66657A48670381BA94B0492C991CF10375-svnClientAdapter-svnkit-1.8.5.jar libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.8.5.jar || die
+	ln -s "${DISTDIR}"/3B91269E9055504778F57744D24F505856698602-svnkit-1.7.0-beta4-20120316.233307-1.jar libs.svnClientAdapter.svnkit/external/svnkit-1.7.0-beta4-20120316.233307-1.jar || die
+	ln -s "${DISTDIR}"/015525209A02BD74254930FF844C7C13498B7FB9-svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar libs.svnClientAdapter.svnkit/external/svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar || die
+	ln -s "${DISTDIR}"/7C6ED64C55164C5AE0394E11303CA95CB24166AF-swingx-0.9.5.jar libs.swingx/external/swingx-0.9.5.jar || die
+	ln -s "${DISTDIR}"/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar httpserver/external/tomcat-webserver-3.2.jar || die
+	ln -s "${DISTDIR}"/97484EC8B82D84D6957976C2DCF1740AAD708054-com.trilead.ssh2_1.0.0.build214.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build214.jar || die
+	ln -s "${DISTDIR}"/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar swing.validation/external/ValidationAPI.jar || die
+	ln -s "${DISTDIR}"/7A5A7DF07297A86A944D4D0562C685585B0734EF-validator.jar html.validation/external/validator.jar || die
+	ln -s "${DISTDIR}"/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar extexecution.destroy/external/winp-1.14-patched.jar || die
+	ln -s "${DISTDIR}"/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar o.apache.xmlrpc/external/xmlrpc-client-3.0.jar || die
+	ln -s "${DISTDIR}"/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar o.apache.xmlrpc/external/xmlrpc-common-3.0.jar || die
+	ln -s "${DISTDIR}"/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar o.apache.xmlrpc/external/xmlrpc-server-3.0.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r6-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 jing jing.jar jing.jar
+	java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar
+	java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar
+	# java-pkg_jar-from --into libs.antlr3.runtime/external antlr-3 antlr3.jar antlr-runtime-3.1.3.jar
+	# java-pkg_jar-from --into libs.commons_net/external commons-net commons-net.jar commons-net-1.4.1.jar
+	java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.8.jar
+	# java-pkg_jar-from --into libs.ini4j/external ini4j ini4j.jar ini4j-0.5.1.jar
+	# java-pkg_jar-from --into libs.jaxb/external jaxb-2 jaxb-impl.jar jaxb-impl.jar
+	java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.3.jar
+	# java-pkg_jar-from --into libs.lucene/external lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
+	java-pkg_jar-from --into libs.smack/external smack-2.2 smack.jar smack.jar
+	java-pkg_jar-from --into libs.smack/external smack-2.2 smackx.jar smackx.jar
+	java-pkg_jar-from --into libs.svnClientAdapter.javahl/external subversion svn-javahl.jar svnjavahl-1.7.2.jar
+	# java-pkg_jar-from --into libs.svnClientAdapter.svnkit/external trilead-ssh2 trilead-ssh2.jar trilead.jar
+	java-pkg_jar-from --into libs.xerces/external xerces-2 xercesImpl.jar xerces-2.8.0.jar
+	java-pkg_jar-from --build-only --into o.apache.commons.codec/external commons-codec commons-codec.jar apache-commons-codec-1.3.jar
+	java-pkg_jar-from --into o.apache.commons.httpclient/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.1.jar
+	java-pkg_jar-from --into o.apache.commons.lang/external commons-lang-2.1 commons-lang.jar commons-lang-2.4.jar
+	java-pkg_jar-from --into o.apache.commons.logging/external commons-logging commons-logging.jar commons-logging-1.1.jar
+	java-pkg_jar-from --into o.apache.ws.commons.util/external ws-commons-util ws-commons-util.jar ws-commons-util-1.0.1.jar
+	java-pkg_jar-from --into servletapi/external tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
+	java-pkg_jar-from --into xml.jaxb.api/external sun-jaf activation.jar activation.jar
+	# java-pkg_jar-from --into xml.jaxb.api/external jaxb-2 jaxb-api.jar jaxb-api.jar
+	java-pkg_jar-from --into xml.jaxb.api/external jsr173 jsr173.jar jsr173_1.0_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-net-1.4.1.jar && dosym /usr/share/commons-net/lib/commons-net.jar ${instdir}/commons-net-1.4.1.jar || die
+	# ddl.jar
+	rm freemarker-2.3.8.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.8.jar || die
+	# html5-datatypes.jar
+	# html5-parser.jar
+	rm icu4j-4_0.jar && dosym /usr/share/icu4j-4.4/lib/icu4j.jar ${instdir}/icu4j-4_0.jar || die
+	# [[ -f ini4j-0.5.1.jar ]] && java-pkg_jar-from ini4j ini4j.jar ${instdir}/ini4j-0.5.1.jar || die
+	# io-xml-util.jar
+	# iri.jar
+	# isorelax20041111.jar
+	# [[ -f jing.jar ]] && java-pkg_jar-from jing jing.jar ${instdir}/jing.jar || die
+	# js.jar
+	rm jvyamlb-0.2.3.jar && dosym /usr/share/jvyamlb/lib/jvyamlb.jar ${instdir}/jvyamlb-0.2.3.jar || die
+	# libpam4j-1.1.jar
+	rm log4j-1.2.15.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.15.jar || die
+	# rm lucene-core-3.5.0.jar && dosym /usr/share/lucene-3.5/lib/lucene-core.jar ${instdir}/lucene-core-3.5.0.jar || die
+	rm mysql-connector-java-5.1.18-bin.jar && dosym /usr/share/jdbc-mysql/lib/jdbc-mysql.jar ${instdir}/mysql-connector-java-5.1.18-bin.jar || die
+	# non-schema.jar
+	# org.eclipse.mylyn.bugzilla.core_3.3.1.jar
+	# org.eclipse.mylyn.commons.core_3.3.1.jar
+	# org.eclipse.mylyn.commons.net_3.3.0.jar
+	# org.eclipse.mylyn.tasks.core_3.3.1.jar
+	# org-netbeans-tax.jar
+	rm postgresql-9.1-901.jdbc4.jar && dosym /usr/share/jdbc-postgresql/lib/jdbc-postgresql.jar ${instdir}/postgresql-9.1-901.jdbc4.jar || die
+	# processtreekiller-1.0.1.jar
+	# resolver-1.2.jar
+	rm saxon9B.jar && dosym /usr/share/saxon-9/lib/saxon.jar ${instdir}/saxon9B.jar || die
+	rm servlet-2.2.jar && dosym /usr/share/tomcat-servlet-api-2.2/lib/servlet.jar ${instdir}/servlet-2.2.jar || die
+	rm smack.jar && dosym /usr/share/smack-2.2/lib/smack.jar ${instdir}/smack.jar || die
+	rm smackx.jar && dosym /usr/share/smack-2.2/lib/smackx.jar ${instdir}/smackx.jar || die
+	# sqljet-1.0.3.jar
+	# svnClientAdapter-javahl-1.6.13.jar
+	# svnClientAdapter-main-1.6.13.jar
+	# svnClientAdapter-svnkit-1.6.13.jar
+	rm svnjavahl-1.7.2.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl-1.7.2.jar || die
+	# svnkit-javahl.jar
+	# svnkit-1.3.4.jar
+	# swingx-0.9.5.jar
+	# [[ -f trilead.jar ]] && java-pkg_jar-from trilead-ssh2 trilead-ssh2.jar ${instdir}/trilead.jar || die
+	# ValidationAPI.jar
+	# validator.jar
+	# webserver.jar
+	# winp-1.14-patched.jar
+	rm xerces-2.8.0.jar && dosym /usr/share/xerces-2/lib/xercesImpl.jar ${instdir}/xerces-2.8.0.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxb
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm activation.jar && dosym /usr/share/sun-jaf/lib/activation.jar ${instdir}/activation.jar || die
+	# [[ -f jaxb-impl.jar ]] && java-pkg_jar-from jaxb-2 jaxb-impl.jar ${instdir}/jaxb-impl.jar || die
+	# jaxb-xjc.jar
+	# jaxb1-impl.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxb/api
+	pushd "${D}"/${instdir} >/dev/null || die
+	# [[ -f jaxb-api.jar ]] && java-pkg_jar-from jaxb-2 jaxb-api.jar ${instdir}/jaxb-api.jar || die
+	rm jsr173_1.0_api.jar && dosym /usr/share/jsr173/lib/jsr173.jar ${instdir}/jsr173_1.0_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 820a134..95505aa 100644
--- a/dev-java/netbeans-java/ChangeLog
+++ b/dev-java/netbeans-java/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 May 2012; Miroslav Šulc <fordfrog@g.o>
+  -netbeans-java-7.0.1.ebuild, -netbeans-java-7.0.1-r1.ebuild,
+  -netbeans-java-7.1.2.ebuild, -netbeans-java-7.2_beta.ebuild:
+  bumped to the latest nightly sources
+
   27 May 2012; Miroslav Šulc <fordfrog@g.o>
   -netbeans-java-9999_p20120516.ebuild, -netbeans-java-9999_p20120517.ebuild:
   removed obsolete versions

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 5a3d701..348212f 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -51,12 +51,13 @@ DIST netbeans-9999-r6-build.xml.patch.bz2 2475 RMD160 e4b970f3f4d2389071c5ddfed1
 DIST netbeans-trunk-nightly-201205200400-src.zip 178860844 RMD160 e9f20d02383a477a7848d5e17dfbf023df0326b4 SHA1 a05b277c5cde92909293ef3935cb2e2573fb651e SHA256 73b0ae0b95d7cb5145f56c6b57bca5a06ee7a608f2a5c7714a36c31c3210cf20
 DIST netbeans-trunk-nightly-201205240002-src.zip 178911778 RMD160 ca71d71e3b0c17ab74915043cb07e2da6fb9011f SHA1 0a0dcf4d31e484f58e338117f4ef504267982f53 SHA256 f5c5f274b65b1630a48f496410c46cb6cbcaad217806877b8114b47d62f87a61
 DIST netbeans-trunk-nightly-201205270002-src.zip 174681649 RMD160 3fbf1c797007a9e8ebed8ce67daadbda2f8b9363 SHA1 e72175533d61e40e35c92a49ca7f63c3a173f966 SHA256 47b4c12a34957abb72fa4563536abd220380a51b3378dc6da1a5e1223e0bbfaa
-EBUILD netbeans-java-7.0.1-r1.ebuild 14910 RMD160 d14f4336ff68a56a3711a3196c2063285ee09368 SHA1 0265d2116d2124d5e212fa4afdb76f6a5a929094 SHA256 8af2b399378ee959c0255091c1f6afadf8ba7925d81cd82755058dbc6cd2334a
-EBUILD netbeans-java-7.0.1.ebuild 14888 RMD160 19208f48ccc5d5d19ba03bf7c60d27a429243b98 SHA1 2c116b4798f92dcac23bdcacd04bb01b0116c7d2 SHA256 98b4789883e375d817f509dbe9067b6f5c3685d92c714d443d51b00bb54704ad
-EBUILD netbeans-java-7.1.2.ebuild 14871 RMD160 2776707aa0eb52fef3e05a257572cf5447776952 SHA1 44a016f9c6201fce8061d557eb9394fd6ed648a6 SHA256 a724854a261c39b2711941ab49d29a2a5341282d903c16455fa72d670a71d1a5
-EBUILD netbeans-java-7.2_beta.ebuild 14467 RMD160 0fcf8adf8db122485488dd8cb62113d342ae42e4 SHA1 7f2505066988a665ff752dbaef3858f989a4f7a2 SHA256 bcabb7248c880e301631ed792c12af1a34a8268db1d1f0547da2f33f4ddbc3e2
+DIST netbeans-trunk-nightly-201205300001-src.zip 174763237 RMD160 7c5524b4600cc086675ed863830f849216eb2f01 SHA1 9bbc52e25c508170d8207423b5ec43769eb1b0d1 SHA256 9c5d71ce455906f1e1f662c6a4e34c73e491ad3705f221b7c5c671366a79ef24
+EBUILD netbeans-java-7.0.1-r2.ebuild 14932 RMD160 8b5ef1094e65db4cfd4e98de9fdc214eda0e743c SHA1 3267c7d4f4ff18d23eca483d85c8bcd3c58207ff SHA256 3d8eeb5c3aea368c5064e83e9519b2982a3d0f999db11344ba33605f46f865b0
+EBUILD netbeans-java-7.1.2-r1.ebuild 14893 RMD160 28cb8be1dffd063222c8c9b2771ef642d10f4ba5 SHA1 583919f7be167cf23d4b659daf09de190e768c16 SHA256 b4441067f67ff63b24929fa054ff0a28ccc0e47be47d1ca609a84872b119c990
+EBUILD netbeans-java-7.2_beta-r1.ebuild 14489 RMD160 835cc16a13a36c92c8162b10c51996742de896d6 SHA1 af314e31b1337e0ccf71bab95ae271aa2b40c439 SHA256 fffa479c842fdaf93e68a6092e6106dcddffde9adab8cfdce17bde8cf9e5ab0b
 EBUILD netbeans-java-9999_p20120520.ebuild 14509 RMD160 803eb77c375e136a1c4e077ce779dc9a1078ccca SHA1 9e528dd6e717d9fff8a65574087f740d22ddbdf6 SHA256 83f0b93c9eb51dfcca0b6f1b4b713378f071086b135b6ec730d9784e54b956b6
 EBUILD netbeans-java-9999_p20120524.ebuild 14408 RMD160 961dc40179337df61bc7d9756fe0e391c71476a1 SHA1 ec4cff82d21980642da2354cdb50c67b18e62faf SHA256 b523afd8248cae40d3cfb6eafff52eb32c4b999d6976b53ad3d33d7da811cdd7
 EBUILD netbeans-java-9999_p20120527.ebuild 14430 RMD160 b4b0c4eb33ffab22d27be8fe715d0f1a45dcc8c5 SHA1 9b6801a1286d2e8bac59e6bebd8c1e16f1e9250b SHA256 edaa62dab98a958d6949a58684ea4355590d83add3e05a7e4bdba71f22219087
-MISC ChangeLog 35537 RMD160 56594c934986ac390c4164e51e8f802d854ea371 SHA1 5ac736a4c5a99600462a36e23fe63c27776750f0 SHA256 0e1b02226a5438bec1a17c6a7f9639182023ad3005d4925cb3632094413cd62c
+EBUILD netbeans-java-9999_p20120530.ebuild 14430 RMD160 3deb3af5ec2be405ea2733e26347edac82f4ea39 SHA1 953ae5607fcfc5e2cd818bf23f0d9e169347ee39 SHA256 acd799067ce2ffbc1c0da90f4e081388680be8a274012540f09b9825894ff960
+MISC ChangeLog 35755 RMD160 9a036803f5b11f15b6853fc932fc0f0529d6fc9d SHA1 f31b1e7e3ae3eac8e7690607c04f398d557a6adb SHA256 8a7502d315e1dd52265cbcd6f7618d03652844c7ac84497216203ac40a28070e
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-java/netbeans-java-7.0.1-r1.ebuild b/dev-java/netbeans-java/netbeans-java-7.0.1-r2.ebuild
similarity index 99%
rename from dev-java/netbeans-java/netbeans-java-7.0.1-r1.ebuild
rename to dev-java/netbeans-java/netbeans-java-7.0.1-r2.ebuild
index b31b737..d6ee26a 100644
--- a/dev-java/netbeans-java/netbeans-java-7.0.1-r1.ebuild
+++ b/dev-java/netbeans-java/netbeans-java-7.0.1-r2.ebuild
@@ -224,7 +224,7 @@ src_install() {
 	# 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 jta.jar && dosym /usr/share/glassfish-transaction-api/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
 

diff --git a/dev-java/netbeans-java/netbeans-java-7.1.2.ebuild b/dev-java/netbeans-java/netbeans-java-7.1.2-r1.ebuild
similarity index 99%
rename from dev-java/netbeans-java/netbeans-java-7.1.2.ebuild
rename to dev-java/netbeans-java/netbeans-java-7.1.2-r1.ebuild
index 31cd927..fd0e164 100644
--- a/dev-java/netbeans-java/netbeans-java-7.1.2.ebuild
+++ b/dev-java/netbeans-java/netbeans-java-7.1.2-r1.ebuild
@@ -243,7 +243,7 @@ src_install() {
 	# 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 jta.jar && dosym /usr/share/glassfish-transaction-api/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
 

diff --git a/dev-java/netbeans-java/netbeans-java-7.2_beta.ebuild b/dev-java/netbeans-java/netbeans-java-7.2_beta-r1.ebuild
similarity index 99%
rename from dev-java/netbeans-java/netbeans-java-7.2_beta.ebuild
rename to dev-java/netbeans-java/netbeans-java-7.2_beta-r1.ebuild
index 25790f1..0722208 100644
--- a/dev-java/netbeans-java/netbeans-java-7.2_beta.ebuild
+++ b/dev-java/netbeans-java/netbeans-java-7.2_beta-r1.ebuild
@@ -243,7 +243,7 @@ src_install() {
 	# 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 jta.jar && dosym /usr/share/glassfish-transaction-api/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
 

diff --git a/dev-java/netbeans-java/netbeans-java-7.0.1.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20120530.ebuild
similarity index 58%
rename from dev-java/netbeans-java/netbeans-java-7.0.1.ebuild
rename to dev-java/netbeans-java/netbeans-java-9999_p20120530.ebuild
index 36f1671..e6629fd 100644
--- a/dev-java/netbeans-java/netbeans-java-7.0.1.ebuild
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20120530.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -6,32 +6,32 @@ 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="7.0"
-SOURCE_URL="http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2012-05-30_00-01-54/zip/netbeans-trunk-nightly-201205300001-src.zip"
 SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}-build.xml-r1.patch.bz2
-	http://hg.netbeans.org/binaries/FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip
-	http://hg.netbeans.org/binaries/A511890049A6A9B8D675F4417721337580CBD2F9-apache-maven-3.0.3-bin.zip
-	http://hg.netbeans.org/binaries/B456600D274B835E1E7DDB16FD843DDAB2ED3EF1-appframework-1.0.3-doc.zip
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r6-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/8C9BFFBCB34DB6E9C9C03413623F05375D44CE49-eclipselink-2.2.0.jar
-	http://hg.netbeans.org/binaries/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-eclipselink-javax.persistence-2.0.jar
-	http://hg.netbeans.org/binaries/263D76EEB2FA35AE240DE31CFDE83C04096AE19E-eclipselink-jpa-modelgen-2.2.0.jar
-	http://hg.netbeans.org/binaries/59FAD2A4D4A1CFECED8149854EEEC3A7B9668927-glassfish-persistence-v2-build-58g.jar
-	http://hg.netbeans.org/binaries/907363E301E2279930C82BEB466BF2053C6E993B-glassfish-persistence-v2ur1-build-09d.jar
+	http://hg.netbeans.org/binaries/90F1E67F38F1D8EC25C082F8EB08CFEC9A3B75E2-eclipselink-2.3.2.jar
 	http://hg.netbeans.org/binaries/C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip
-	http://hg.netbeans.org/binaries/AF599F03E590A5992EE56F363DBD8F0F32B8787E-indexer-artifact-4.1.0.jar
-	http://hg.netbeans.org/binaries/CAF99EFBB25E9183609D6FBA4F63D85E7606903F-indexer-core-4.1.0.jar
-	http://hg.netbeans.org/binaries/ADD5DE96BF7F30DAA4EC41D70610CF72A16F58FD-javac-api-nb-7.0-b07.jar
-	http://hg.netbeans.org/binaries/AA6FD013C506BAC98BCE1174EACAD00383650342-javac-impl-nb-7.0-b07.jar
-	http://hg.netbeans.org/binaries/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar
-	http://hg.netbeans.org/binaries/2F43A634A42CC4FD2EF9E24B488AFFD6984D3411-jaxws-2.2.zip
-	http://hg.netbeans.org/binaries/23E69F0F17757673C573EBD9899727B82EF7DB7F-jaxws-2.2-api.zip
+	http://hg.netbeans.org/binaries/204680C59C7D8A4A1A26B9A2ED46D0DAA6DC10B3-indexer-artifact-4.1.2.jar
+	http://hg.netbeans.org/binaries/EA1F2B2504FC5ABCB06146D858F74A97B85A2998-indexer-core-4.1.2.jar
+	http://hg.netbeans.org/binaries/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-javax.persistence-2.0.3.jar
+	http://hg.netbeans.org/binaries/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip
+	http://hg.netbeans.org/binaries/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip
 	http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip
-	http://hg.netbeans.org/binaries/2D0D28E05BD6B6452DAAFE2B5CCB69A84EA63E5D-spring-2.5.6.SEC01.jar
-	http://hg.netbeans.org/binaries/D88A41174C5F85D1B791D6A8E0F8B8A1C459D6C0-spring-framework-3.0.2.RELEASE.zip"
+	http://hg.netbeans.org/binaries/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar
+	http://hg.netbeans.org/binaries/0F7FC8D69950B86D5F67529B5C551DB84C5BCF87-nb-javac-api.jar
+	http://hg.netbeans.org/binaries/6457933E97B3C8B30C8C8DA5C549B7C3E68C8A0F-nb-javac-impl.jar
+	http://hg.netbeans.org/binaries/663FA7BA7FD8538E44DE9FDC5315C4F733C13E96-org.eclipse.persistence.jpa.jpql_1.0.1.jar
+	http://hg.netbeans.org/binaries/481935A7F53B55502187BD3C28C2BC0D957BB643-org.eclipse.persistence.jpa.modelgen.processor-2.3.2.jar
+	http://hg.netbeans.org/binaries/CB686A65B6C4516A32173CB60385D02027440620-spring-2.5.6.SEC03.jar
+	http://hg.netbeans.org/binaries/C54C41DD33054070647ED50F209CC77A05BA5563-spring-framework-3.1.1.RELEASE.zip"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
@@ -41,15 +41,15 @@ CDEPEND="~dev-java/netbeans-platform-${PV}
 	~dev-java/netbeans-harness-${PV}
 	~dev-java/netbeans-ide-${PV}
 	~dev-java/netbeans-websvccommon-${PV}
-	dev-java/appframework:0
 	dev-java/beansbinding:0
 	dev-java/cglib:2.2
 	dev-java/jdom:1.0
-	dev-java/swing-worker:0"
+	dev-java/lucene:3.0"
 DEPEND="virtual/jdk:1.6
 	app-arch/unzip
 	${CDEPEND}
-	dev-java/javahelp:0"
+	dev-java/javahelp:0
+	dev-java/junit:4"
 RDEPEND=">=virtual/jdk-1.6
 	${CDEPEND}
 	dev-java/absolutelayout:0
@@ -63,10 +63,8 @@ RDEPEND=">=virtual/jdk-1.6
 	dev-java/javassist:3
 	dev-java/jsr67:0
 	dev-java/jsr181:0
-	dev-java/jsr250:0
-	dev-java/jta:0
+	dev-java/glassfish-transaction-api: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"
@@ -79,35 +77,56 @@ EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.java -Dext.binaries.downloade
 EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
 JAVA_PKG_BSFIX="off"
 
+pkg_pretend() {
+	local die_now=""
+
+	if [ -n "$(find /usr/share/netbeans-java-${SLOT}/ant -type l)" ]; then
+		eerror "Please remove following symlinks and run emerge again:"
+		find /usr/share/netbeans-java-${SLOT}/ant -type l
+		die_now="1"
+	fi
+
+	if [ -L /usr/share/netbeans-java-${SLOT}/maven ]; then
+		if [ -z "${die_now}" ]; then
+			eerror "Please remove following symlinks and run emerge again:"
+		fi
+
+		echo "/usr/share/netbeans-java-${SLOT}/maven"
+		die_now="1"
+	fi
+
+	if [ -n "${die_now}" ]; then
+		die "Symlinks exist"
+	fi
+}
+
 src_unpack() {
 	unpack $(basename ${SOURCE_URL})
 
 	einfo "Deleting bundled jars..."
 	find -name "*.jar" -type f -delete
 
-	unpack netbeans-7.0-build.xml-r1.patch.bz2
+	unpack netbeans-9999-r6-build.xml.patch.bz2
 
 	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip o.apache.tools.ant.module/external/ant-libs-1.8.2.zip || die
-	ln -s "${DISTDIR}"/A511890049A6A9B8D675F4417721337580CBD2F9-apache-maven-3.0.3-bin.zip maven.embedder/external/apache-maven-3.0.3-bin.zip || die
-	ln -s "${DISTDIR}"/B456600D274B835E1E7DDB16FD843DDAB2ED3EF1-appframework-1.0.3-doc.zip swingapp/external/appframework-1.0.3-doc.zip || 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}"/8C9BFFBCB34DB6E9C9C03413623F05375D44CE49-eclipselink-2.2.0.jar j2ee.eclipselink/external/eclipselink-2.2.0.jar || die
-	ln -s "${DISTDIR}"/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-eclipselink-javax.persistence-2.0.jar j2ee.eclipselink/external/eclipselink-javax.persistence-2.0.jar || die
-	ln -s "${DISTDIR}"/263D76EEB2FA35AE240DE31CFDE83C04096AE19E-eclipselink-jpa-modelgen-2.2.0.jar j2ee.eclipselinkmodelgen/external/eclipselink-jpa-modelgen-2.2.0.jar || die
-	ln -s "${DISTDIR}"/59FAD2A4D4A1CFECED8149854EEEC3A7B9668927-glassfish-persistence-v2-build-58g.jar j2ee.toplinklib/external/glassfish-persistence-v2-build-58g.jar || die
-	ln -s "${DISTDIR}"/907363E301E2279930C82BEB466BF2053C6E993B-glassfish-persistence-v2ur1-build-09d.jar j2ee.toplinklib/external/glassfish-persistence-v2ur1-build-09d.jar || die
+	ln -s "${DISTDIR}"/90F1E67F38F1D8EC25C082F8EB08CFEC9A3B75E2-eclipselink-2.3.2.jar j2ee.eclipselink/external/eclipselink-2.3.2.jar || die
 	ln -s "${DISTDIR}"/C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip hibernatelib/external/hibernate-3.2.5-lib.zip || die
-	ln -s "${DISTDIR}"/AF599F03E590A5992EE56F363DBD8F0F32B8787E-indexer-artifact-4.1.0.jar maven.indexer/external/indexer-artifact-4.1.0.jar || die
-	ln -s "${DISTDIR}"/CAF99EFBB25E9183609D6FBA4F63D85E7606903F-indexer-core-4.1.0.jar maven.indexer/external/indexer-core-4.1.0.jar || die
-	ln -s "${DISTDIR}"/ADD5DE96BF7F30DAA4EC41D70610CF72A16F58FD-javac-api-nb-7.0-b07.jar libs.javacapi/external/javac-api-nb-7.0-b07.jar || die
-	ln -s "${DISTDIR}"/AA6FD013C506BAC98BCE1174EACAD00383650342-javac-impl-nb-7.0-b07.jar libs.javacimpl/external/javac-impl-nb-7.0-b07.jar || die
-	ln -s "${DISTDIR}"/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar maven.embedder/external/maven-dependency-tree-1.2.jar || die
-	ln -s "${DISTDIR}"/2F43A634A42CC4FD2EF9E24B488AFFD6984D3411-jaxws-2.2.zip websvc.jaxws21/external/jaxws-2.2.zip || die
-	ln -s "${DISTDIR}"/23E69F0F17757673C573EBD9899727B82EF7DB7F-jaxws-2.2-api.zip websvc.jaxws21api/external/jaxws-2.2-api.zip || die
+	ln -s "${DISTDIR}"/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}"/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-javax.persistence-2.0.3.jar j2ee.eclipselink/external/javax.persistence-2.0.3.jar || die
+	ln -s "${DISTDIR}"/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip websvc.jaxws21/external/jaxws-2.2.6.zip || die
+	ln -s "${DISTDIR}"/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip websvc.jaxws21api/external/jaxws-2.2.6-api.zip || die
 	ln -s "${DISTDIR}"/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip websvc.jaxws21/external/jaxws-api-doc.zip || die
-	ln -s "${DISTDIR}"/2D0D28E05BD6B6452DAAFE2B5CCB69A84EA63E5D-spring-2.5.6.SEC01.jar libs.springframework/external/spring-2.5.6.SEC01.jar || die
-	ln -s "${DISTDIR}"/D88A41174C5F85D1B791D6A8E0F8B8A1C459D6C0-spring-framework-3.0.2.RELEASE.zip libs.springframework/external/spring-framework-3.0.2.RELEASE.zip || die
+	ln -s "${DISTDIR}"/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar maven.embedder/external/maven-dependency-tree-1.2.jar || die
+	ln -s "${DISTDIR}"/0F7FC8D69950B86D5F67529B5C551DB84C5BCF87-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
+	ln -s "${DISTDIR}"/6457933E97B3C8B30C8C8DA5C549B7C3E68C8A0F-nb-javac-impl.jar libs.javacimpl/external/nb-javac-impl.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}"/481935A7F53B55502187BD3C28C2BC0D957BB643-org.eclipse.persistence.jpa.modelgen.processor-2.3.2.jar j2ee.eclipselinkmodelgen/external/org.eclipse.persistence.jpa.modelgen.processor-2.3.2.jar || die
+	ln -s "${DISTDIR}"/CB686A65B6C4516A32173CB60385D02027440620-spring-2.5.6.SEC03.jar libs.springframework/external/spring-2.5.6.SEC03.jar || die
+	ln -s "${DISTDIR}"/C54C41DD33054070647ED50F209CC77A05BA5563-spring-framework-3.1.1.RELEASE.zip libs.springframework/external/spring-framework-3.1.1.RELEASE.zip || die
 	popd >/dev/null || die
 }
 
@@ -115,12 +134,11 @@ src_prepare() {
 	einfo "Deleting bundled class files..."
 	find -name "*.class" -type f | xargs rm -vf
 
-	epatch netbeans-7.0-build.xml-r1.patch
-	sed -i "s%../o.jdesktop.layout/external%\${netbeans.dest.dir}/\${nb.cluster.platform.dir}/modules/ext%" java.examples/build.xml
+	epatch netbeans-9999-r6-build.xml.patch
 
 	# Support for custom patches
-	if [ -n "${NETBEANS70_PATCHES_DIR}" -a -d "${NETBEANS70_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS70_PATCHES_DIR}" -type f`
+	if [ -n "${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:"
@@ -134,10 +152,10 @@ src_prepare() {
 	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
-	java-pkg_jar-from --into swingapp/external appframework appframework.jar appframework-1.0.3.jar
-	java-pkg_jar-from --into swingapp/external swing-worker swing-worker.jar swing-worker-1.1.jar
 
 	einfo "Linking in other clusters..."
 	mkdir "${S}"/nbbuild/netbeans || die
@@ -171,32 +189,32 @@ src_install() {
 	grep -E "/java$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
 
 	doins -r *
-	rm -fr "${D}"/${INSTALL_DIR}/ant/* || die
-	rm -fr "${D}"/${INSTALL_DIR}/maven || die
-	dosym /usr/share/maven-bin-3.0 ${INSTALL_DIR}/maven
-
-	insinto ${INSTALL_DIR}/ant
-	dosym /usr/share/ant/bin ${INSTALL_DIR}/ant/bin
-	dosym /usr/share/ant/etc ${INSTALL_DIR}/ant/etc
-	doins -r ant/extra
-	dosym /usr/share/ant/lib ${INSTALL_DIR}/ant/lib
-	doins -r ant/nblib
-	dosym /usr/share/ant/tasks ${INSTALL_DIR}/ant/tasks
-	local vertasks=$(ls -d /usr/share/ant/tasks-*)
-	dosym ${vertasks} ${INSTALL_DIR}/ant/$(basename ${vertasks}) # it would be better if ant would have tasks-current dir
+	#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 appframework-1.0.3.jar && dosym /usr/share/appframework/lib/appframework.jar ${instdir}/appframework-1.0.3.jar || die
 	rm beansbinding-1.2.1.jar && dosym /usr/share/beansbinding/lib/beansbinding.jar ${instdir}/beansbinding-1.2.1.jar || die
 	rm cglib-2.2.jar && dosym /usr/share/cglib-2.2/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
 	# javac-api-nb-7.0-b07.jar
 	# javac-impl-nb-7.0-b07.jar
 	# org-netbeans-modules-java-j2seplatform-probe.jar
-	rm swing-worker-1.1.jar && dosym /usr/share/swing-worker/lib/swing-worker.jar ${instdir}/swing-worker-1.1.jar || die
 	popd >/dev/null || die
 
 	local instdir=${INSTALL_DIR}/modules/ext/eclipselink
@@ -224,7 +242,7 @@ src_install() {
 	# 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 jta.jar && dosym /usr/share/glassfish-transaction-api/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
 
@@ -248,15 +266,15 @@ src_install() {
 	pushd "${D}"/${instdir} >/dev/null || die
 	# jaxws-api.jar
 	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
-	rm jsr250-api.jar && dosym /usr/share/jsr250/lib/jsr250.jar ${instdir}/jsr250-api.jar || die
 	rm saaj-api.jar && dosym /usr/share/jsr67/lib/jsr67.jar ${instdir}/saaj-api.jar || die
 	popd >/dev/null || die
 
 	local instdir=${INSTALL_DIR}/modules/ext/maven
 	pushd "${D}"/${instdir} >/dev/null || die
-	# indexer-artifact-3.1.0.jar
-	# indexer-core-3.1.0.jar
+	# 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
 
@@ -289,17 +307,5 @@ src_install() {
 	# 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 8e36149..1ecc532 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_p20120530 (30 May 2012)
+
+  30 May 2012; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-javacard-9999_p20120530.ebuild:
+  bumped to the latest nightly sources
+
   27 May 2012; Miroslav Šulc <fordfrog@g.o>
   -netbeans-javacard-9999_p20120516.ebuild,
   -netbeans-javacard-9999_p20120517.ebuild:

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index 81dfab0..47f14ef 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -11,11 +11,13 @@ DIST netbeans-9999-r6-build.xml.patch.bz2 2475 RMD160 e4b970f3f4d2389071c5ddfed1
 DIST netbeans-trunk-nightly-201205200400-src.zip 178860844 RMD160 e9f20d02383a477a7848d5e17dfbf023df0326b4 SHA1 a05b277c5cde92909293ef3935cb2e2573fb651e SHA256 73b0ae0b95d7cb5145f56c6b57bca5a06ee7a608f2a5c7714a36c31c3210cf20
 DIST netbeans-trunk-nightly-201205240002-src.zip 178911778 RMD160 ca71d71e3b0c17ab74915043cb07e2da6fb9011f SHA1 0a0dcf4d31e484f58e338117f4ef504267982f53 SHA256 f5c5f274b65b1630a48f496410c46cb6cbcaad217806877b8114b47d62f87a61
 DIST netbeans-trunk-nightly-201205270002-src.zip 174681649 RMD160 3fbf1c797007a9e8ebed8ce67daadbda2f8b9363 SHA1 e72175533d61e40e35c92a49ca7f63c3a173f966 SHA256 47b4c12a34957abb72fa4563536abd220380a51b3378dc6da1a5e1223e0bbfaa
+DIST netbeans-trunk-nightly-201205300001-src.zip 174763237 RMD160 7c5524b4600cc086675ed863830f849216eb2f01 SHA1 9bbc52e25c508170d8207423b5ec43769eb1b0d1 SHA256 9c5d71ce455906f1e1f662c6a4e34c73e491ad3705f221b7c5c671366a79ef24
 EBUILD netbeans-javacard-7.0.1.ebuild 4961 RMD160 2838467c87ae15ce2a24214cb6d69ff5c77cbcd5 SHA1 74adc0ad143660dd782396a68fe702b2a3a43a9a SHA256 566bc7e3275c97d0fe3d68c843b53aee641548ec39a8143aebd56d248da3c32c
 EBUILD netbeans-javacard-7.1.2.ebuild 4970 RMD160 46dc3e5bdb08531eeafd300d3c3c62d5650228c7 SHA1 16fc39a9647d76f52e73fefb4ae04293db0f4532 SHA256 15ff13152b140edaa549ea6515949d99cdb2a4656918566179836ab2277f01b8
 EBUILD netbeans-javacard-7.2_beta.ebuild 4951 RMD160 13daf1a487edd8b0dc94f7193a9e0996ebfe9fa4 SHA1 5c202288f72b0dbc68f94da8f059627b6245e642 SHA256 be2fc72985431626f7838d27136649fa214d4f354354a3d29f013be8d77f3fee
 EBUILD netbeans-javacard-9999_p20120520.ebuild 4993 RMD160 cfccdb02931b3e7dd274386defc98d309a063cff SHA1 2823c1eaddda12e7c04defc6ff8000db91043e19 SHA256 6c5fba3703cc78bbd3cd2fd3d6b892809a5b100034364308c63c16dc45873cea
 EBUILD netbeans-javacard-9999_p20120524.ebuild 4993 RMD160 295d9dfa5058913daf3fa44d5ea99e9d1d10ccc2 SHA1 587d6f504a5d85645dbab092861e0864ea63a1d6 SHA256 006e1d7774d5da3d33f9f04ee27b532efcf0c6a0656bebaaa5f4a044de7091ab
 EBUILD netbeans-javacard-9999_p20120527.ebuild 4993 RMD160 1ad6e3aa2efc82aeb226675a5254d29e5539da91 SHA1 aa7b324bdc8aba5238b913c6a168258e0b7b53f9 SHA256 b3df69fcbeea0ad8483b9df78ebc731bc55949649e1c9cbf0beadb32984da2f9
-MISC ChangeLog 35762 RMD160 63fd87f73cbc0d7f0cb15fe8de623486b3edd98c SHA1 f2f927a2a21f8f215f2b345ca4538905aee77388 SHA256 888259b9f4465ac98f14a14ffc9bfdcc4ecabafd4b7d81819fe97815873cb38f
+EBUILD netbeans-javacard-9999_p20120530.ebuild 4993 RMD160 a571d3ad39cc7bdd907c64204167c1f3631ac147 SHA1 c2f56b9f443822e7be80d91fb725fe5bd88111ae SHA256 208bb0a31a4ada8a26a29a14de39f85c194f0d9d3d56ec2d43f548f0130f6b62
+MISC ChangeLog 35947 RMD160 f1ef01139716e1b1243144e6e0fbb1712195adc2 SHA1 dbb524c1104f01732ac58fdb8c30b78da9882497 SHA256 9d6433eb813219530532f14a900eda2174edcbc0209bb69bea078935975cea2c
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20120530.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20120530.ebuild
new file mode 100644
index 0000000..6222dcd
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20120530.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-05-30_00-01-54/zip/netbeans-trunk-nightly-201205300001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r6-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-r6-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-r6-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 cfa1ca8..151a99a 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_p20120530 (30 May 2012)
+
+  30 May 2012; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-javadoc-9999_p20120530.ebuild:
+  bumped to the latest nightly sources
+
   27 May 2012; Miroslav Šulc <fordfrog@g.o>
   -netbeans-javadoc-9999_p20120516.ebuild,
   -netbeans-javadoc-9999_p20120517.ebuild:

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index c110a77..311bf05 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -10,11 +10,13 @@ DIST netbeans-9999-r6-build.xml.patch.bz2 2475 RMD160 e4b970f3f4d2389071c5ddfed1
 DIST netbeans-trunk-nightly-201205200400-src.zip 178860844 RMD160 e9f20d02383a477a7848d5e17dfbf023df0326b4 SHA1 a05b277c5cde92909293ef3935cb2e2573fb651e SHA256 73b0ae0b95d7cb5145f56c6b57bca5a06ee7a608f2a5c7714a36c31c3210cf20
 DIST netbeans-trunk-nightly-201205240002-src.zip 178911778 RMD160 ca71d71e3b0c17ab74915043cb07e2da6fb9011f SHA1 0a0dcf4d31e484f58e338117f4ef504267982f53 SHA256 f5c5f274b65b1630a48f496410c46cb6cbcaad217806877b8114b47d62f87a61
 DIST netbeans-trunk-nightly-201205270002-src.zip 174681649 RMD160 3fbf1c797007a9e8ebed8ce67daadbda2f8b9363 SHA1 e72175533d61e40e35c92a49ca7f63c3a173f966 SHA256 47b4c12a34957abb72fa4563536abd220380a51b3378dc6da1a5e1223e0bbfaa
+DIST netbeans-trunk-nightly-201205300001-src.zip 174763237 RMD160 7c5524b4600cc086675ed863830f849216eb2f01 SHA1 9bbc52e25c508170d8207423b5ec43769eb1b0d1 SHA256 9c5d71ce455906f1e1f662c6a4e34c73e491ad3705f221b7c5c671366a79ef24
 EBUILD netbeans-javadoc-7.0.1.ebuild 5814 RMD160 d5b77264285edf96d0a3a30666a4ae72ee2387a7 SHA1 ec29b545b0632d7ea9e8bdd2208f5d1fe9532561 SHA256 68531c51838c95012830f5ae09e2386ea3179c2b31bfd5191f67993e3b3dbe2f
 EBUILD netbeans-javadoc-7.1.2.ebuild 5855 RMD160 985df7063e959f63d39de9e39b3cd0a5d21d455f SHA1 cd578ab36c0fe1a15b6db28c1ed79a96e304c5ce SHA256 af28efb956ac3b7147e254ca3083dfaab11b84ea42e20677ebdd18aa29ff87e0
 EBUILD netbeans-javadoc-7.2_beta.ebuild 5803 RMD160 f1f39e242a371aef83111b3b5c84569e39f872e3 SHA1 eda14d48271e227e549aa591b48b322ddab206ef SHA256 7689ccfb157277934517a4ebc04bf92ba7fff2973409a2ae4bfdaeddc14e519b
 EBUILD netbeans-javadoc-9999_p20120520.ebuild 5845 RMD160 e69ca0077a94eff480975c74cf9ba12a0b49cdad SHA1 67c402751e93fb26f2aaa0eb62f3b406542717f6 SHA256 e692d5416edfa008c228fd9b49ca4f767a4173d13213f8d5463e8624a7ed8f68
 EBUILD netbeans-javadoc-9999_p20120524.ebuild 5845 RMD160 5d479f9ad307cead2b6ef07b4113f156283e9ca1 SHA1 1ad9919020f041d63091441c42f65017e4a90bde SHA256 5ffaa7f66d77d48ccb97231ec1b1f6ad727251b7278e375a5372ef1f38964ddd
 EBUILD netbeans-javadoc-9999_p20120527.ebuild 5845 RMD160 df262966362d5765f50d5dd6dfabc255764c66a2 SHA1 344794a3529ce91442a176832bf80734a3bdc809 SHA256 d97fce2eeee200410d20ed59b87a94e4b9d79435b383fa96e92fde20fe37e3ff
-MISC ChangeLog 35328 RMD160 dfeaf83852b0b2e8cdadef47de36c3ec6ae3cb99 SHA1 59e84de2ff4e9b947c2f53c43c2d39ccbf9061e1 SHA256 addac0d47d01daa8d5d3ae355f9f544abc053e7be2dc61240e61bd13d7b022f3
+EBUILD netbeans-javadoc-9999_p20120530.ebuild 5845 RMD160 44d04b81efe119505aa0484cf3588d0238e2b8f0 SHA1 f1b19ec192770d3e0cf8cdef0565a5ac974a2df0 SHA256 e103f4117824e0278803ef0b1624e87ee3746770b5acd7c8cd0e872db5b8bada
+MISC ChangeLog 35511 RMD160 e02ecfb1510a26fefaf98116d51441edf51f7e54 SHA1 4739291cd1b4164b4a402a63003b12e9061e7c51 SHA256 db909ce08e93d44ec378159267b5dce8fc4f562a5a72e378ab09672fbb9b9326
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20120530.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20120530.ebuild
new file mode 100644
index 0000000..a7fa33d
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20120530.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-05-30_00-01-54/zip/netbeans-trunk-nightly-201205300001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r6-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/1A78676E734C72549EE6D9F166BAFE22F7CBA8CD-ant-libs-1.8.3.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-r6-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
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r6-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 a9dac62..ef6dc30 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_p20120530 (30 May 2012)
+
+  30 May 2012; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-javafx-9999_p20120530.ebuild:
+  bumped to the latest nightly sources
+
   27 May 2012; Miroslav Šulc <fordfrog@g.o>
   -netbeans-javafx-9999_p20120516.ebuild,
   -netbeans-javafx-9999_p20120517.ebuild:

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index 3b83b3e..c7a8b09 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -8,10 +8,12 @@ DIST netbeans-9999-r6-build.xml.patch.bz2 2475 RMD160 e4b970f3f4d2389071c5ddfed1
 DIST netbeans-trunk-nightly-201205200400-src.zip 178860844 RMD160 e9f20d02383a477a7848d5e17dfbf023df0326b4 SHA1 a05b277c5cde92909293ef3935cb2e2573fb651e SHA256 73b0ae0b95d7cb5145f56c6b57bca5a06ee7a608f2a5c7714a36c31c3210cf20
 DIST netbeans-trunk-nightly-201205240002-src.zip 178911778 RMD160 ca71d71e3b0c17ab74915043cb07e2da6fb9011f SHA1 0a0dcf4d31e484f58e338117f4ef504267982f53 SHA256 f5c5f274b65b1630a48f496410c46cb6cbcaad217806877b8114b47d62f87a61
 DIST netbeans-trunk-nightly-201205270002-src.zip 174681649 RMD160 3fbf1c797007a9e8ebed8ce67daadbda2f8b9363 SHA1 e72175533d61e40e35c92a49ca7f63c3a173f966 SHA256 47b4c12a34957abb72fa4563536abd220380a51b3378dc6da1a5e1223e0bbfaa
+DIST netbeans-trunk-nightly-201205300001-src.zip 174763237 RMD160 7c5524b4600cc086675ed863830f849216eb2f01 SHA1 9bbc52e25c508170d8207423b5ec43769eb1b0d1 SHA256 9c5d71ce455906f1e1f662c6a4e34c73e491ad3705f221b7c5c671366a79ef24
 EBUILD netbeans-javafx-7.1.2.ebuild 3593 RMD160 8db8562c558ad6d4000da3bca8bf6f8a97791a6a SHA1 62967f5ae4998e52d1c82733ee05c9d019401491 SHA256 76a29b37765000745794e6ae20c6b8528d8637507a257ffef3bef2ce648f05cc
 EBUILD netbeans-javafx-7.2_beta.ebuild 3574 RMD160 b4c29f04e2cbb91185ce1f01dc7ca51529f548fb SHA1 0b54301208d415f36908e4b73ac01e76214e2430 SHA256 1b17c60c11d004fa28ecb1bc4ea72e9259c07e528dabccd2a51d96770f2db7c9
 EBUILD netbeans-javafx-9999_p20120520.ebuild 3616 RMD160 1cf65cdf86b8fd3da3a823f283014cac3c78ac24 SHA1 8b35e9c0a76cee2289a4d5765ef2133d87ca0935 SHA256 f8b90bf1321d74643bb1a998f62fc9d938a7277b260b887bae7d34efd1855312
 EBUILD netbeans-javafx-9999_p20120524.ebuild 3616 RMD160 6aac4a285313b141eeb61eb77f4b51678c27181d SHA1 9db9008463c39c5def86b7b413ec2ebfb684cb92 SHA256 b754737fec6e313d0dcd69f76bf55db27da0869fc26d42f10b44ee5dbdc43d9d
 EBUILD netbeans-javafx-9999_p20120527.ebuild 3616 RMD160 0d0ac7623e5c307c7f64dd2f0b86526711affee9 SHA1 7ed463be003f55178561943f44f39e41379d86b0 SHA256 c2ba8c6e80dec01406d8d9a0b3e0ae61a4693ad07cf9805a02c54d076d7e3733
-MISC ChangeLog 21620 RMD160 f152f28976ae03834c3f066c9c5c25c538948aa7 SHA1 525e8b24eb25ed9241e99d89ff0d0d126402bde0 SHA256 16be7f62fee0e13ad8349e713d7bd9710608fcee2c639eebbdaf70c5381575e7
+EBUILD netbeans-javafx-9999_p20120530.ebuild 3616 RMD160 b861b83316d3e5e546e84a11159b0de540beb580 SHA1 ffff7e40c89d2337f4603847df46bac4f3867118 SHA256 c6a1fe59cf8ca1b994dfd2f524d5e6eb4a96132e83281ed69774cc3d968fc5aa
+MISC ChangeLog 21801 RMD160 61fa7162d67feaa49f85f94dc24a884555303f28 SHA1 76d931c9e7b3bd26e44ef59bc0be6b3d52575be9 SHA256 10fabea64d87755c3097b6502a5fb72b773637810d2abd51b0b1d1f74b7ce913
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20120530.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20120530.ebuild
new file mode 100644
index 0000000..f847550
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20120530.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-05-30_00-01-54/zip/netbeans-trunk-nightly-201205300001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r6-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-r6-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-r6-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 d6208ec..6637dd4 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_p20120530 (30 May 2012)
+
+  30 May 2012; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-mobility-9999_p20120530.ebuild:
+  bumped to the latest nightly sources
+
   27 May 2012; Miroslav Šulc <fordfrog@g.o>
   -netbeans-mobility-9999_p20120516.ebuild,
   -netbeans-mobility-9999_p20120517.ebuild:

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 34cb8db..f3fdf90 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -17,11 +17,13 @@ DIST netbeans-9999-r6-build.xml.patch.bz2 2475 RMD160 e4b970f3f4d2389071c5ddfed1
 DIST netbeans-trunk-nightly-201205200400-src.zip 178860844 RMD160 e9f20d02383a477a7848d5e17dfbf023df0326b4 SHA1 a05b277c5cde92909293ef3935cb2e2573fb651e SHA256 73b0ae0b95d7cb5145f56c6b57bca5a06ee7a608f2a5c7714a36c31c3210cf20
 DIST netbeans-trunk-nightly-201205240002-src.zip 178911778 RMD160 ca71d71e3b0c17ab74915043cb07e2da6fb9011f SHA1 0a0dcf4d31e484f58e338117f4ef504267982f53 SHA256 f5c5f274b65b1630a48f496410c46cb6cbcaad217806877b8114b47d62f87a61
 DIST netbeans-trunk-nightly-201205270002-src.zip 174681649 RMD160 3fbf1c797007a9e8ebed8ce67daadbda2f8b9363 SHA1 e72175533d61e40e35c92a49ca7f63c3a173f966 SHA256 47b4c12a34957abb72fa4563536abd220380a51b3378dc6da1a5e1223e0bbfaa
+DIST netbeans-trunk-nightly-201205300001-src.zip 174763237 RMD160 7c5524b4600cc086675ed863830f849216eb2f01 SHA1 9bbc52e25c508170d8207423b5ec43769eb1b0d1 SHA256 9c5d71ce455906f1e1f662c6a4e34c73e491ad3705f221b7c5c671366a79ef24
 EBUILD netbeans-mobility-7.0.1.ebuild 8655 RMD160 97622d84257291737ea08fa69205ba0377747896 SHA1 2240a20d8c81315c88ed2468e6ca9e3a54ecc5d5 SHA256 992e214ff2926e2f0db623d96b717bf8f8e4ceb47e96e69b3c6b8f67d6a8d130
 EBUILD netbeans-mobility-7.1.2.ebuild 7543 RMD160 ace4bf9d71a1283932f11d8195e73c0348edb73a SHA1 d802657efcfa0cdf956003b74409832ac2d27d00 SHA256 bb3f1245ad68133798fa507f06dd1ffbc1d55f6ba38f4cccc29ff0240e5b5f22
 EBUILD netbeans-mobility-7.2_beta.ebuild 7524 RMD160 2937098c498185e240ad34465b7c694391240f9a SHA1 4984e36f9014484d008cebba812043411d7c60c7 SHA256 f06248e5e47e8f45416e0c6eef46fc54e65e819aa09edf6182ed9ada552d985a
 EBUILD netbeans-mobility-9999_p20120520.ebuild 7566 RMD160 42eb97d6e8f0bd1e247645291a6fcf1852a95bcd SHA1 bb41fd2cea79a944484939a426aa577f3dd69bae SHA256 eee01ae50da02177dda288bb449a9078675ea93484442e4321c14853293bbdca
 EBUILD netbeans-mobility-9999_p20120524.ebuild 7566 RMD160 480e8d4287af7aa570d2266492d5b63884673bc1 SHA1 017fd6b73f5b37acb68d99bf969c78f3275db29a SHA256 59d6d3a39990635eb2ecdc38ac3fbe7a170c13e618f96e1c84e477602dbd1faa
 EBUILD netbeans-mobility-9999_p20120527.ebuild 7566 RMD160 e35b6b6644c4d4695923ba2f6fe43a2967694e3a SHA1 a8b553066c91b2370b2e5d0cef746491db4119a3 SHA256 5a0832a6e2c1920693999db6d3ec2f844b87eafe71c48216b7f96a079b4d9edf
-MISC ChangeLog 35903 RMD160 e7a43e0ca01425623b8eb57da85cb4d25f0522d9 SHA1 28b41eac5d81256208274b7165d357d508f03bb0 SHA256 17eef9491e347555c38019625c51757caf4d78de16beeb70fa21856365271d33
+EBUILD netbeans-mobility-9999_p20120530.ebuild 7566 RMD160 11bceb03a3cfa5c45847d7958c45daac2c6874dd SHA1 4883cd613ec390e6349b4e21b306bbd2e8ea088d SHA256 8f1d63c935f3d464313fb37f44118915fa56bfafd211dbab3faaced3d46e71be
+MISC ChangeLog 36088 RMD160 5a586f54d1b5688f5a0252a95b56f784d1946f0f SHA1 b5eb7de5ffac31446dba7d56ce2517f5adfce0e4 SHA256 1574bf86292209e08442cd78b9eb403a4228056161e2faa07256343fb0a68bfc
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20120530.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20120530.ebuild
new file mode 100644
index 0000000..bfaad78
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20120530.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-05-30_00-01-54/zip/netbeans-trunk-nightly-201205300001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r6-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-r6-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-r6-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 e9411ac..a6de8f9 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_p20120530 (30 May 2012)
+
+  30 May 2012; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-nb-9999_p20120530.ebuild:
+  bumped to the latest nightly sources
+
   27 May 2012; Miroslav Šulc <fordfrog@g.o>
   -netbeans-nb-9999_p20120516.ebuild, -netbeans-nb-9999_p20120517.ebuild:
   removed obsolete versions

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index dce81f9..bf23292 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -12,11 +12,13 @@ DIST netbeans-9999-r6-build.xml.patch.bz2 2475 RMD160 e4b970f3f4d2389071c5ddfed1
 DIST netbeans-trunk-nightly-201205200400-src.zip 178860844 RMD160 e9f20d02383a477a7848d5e17dfbf023df0326b4 SHA1 a05b277c5cde92909293ef3935cb2e2573fb651e SHA256 73b0ae0b95d7cb5145f56c6b57bca5a06ee7a608f2a5c7714a36c31c3210cf20
 DIST netbeans-trunk-nightly-201205240002-src.zip 178911778 RMD160 ca71d71e3b0c17ab74915043cb07e2da6fb9011f SHA1 0a0dcf4d31e484f58e338117f4ef504267982f53 SHA256 f5c5f274b65b1630a48f496410c46cb6cbcaad217806877b8114b47d62f87a61
 DIST netbeans-trunk-nightly-201205270002-src.zip 174681649 RMD160 3fbf1c797007a9e8ebed8ce67daadbda2f8b9363 SHA1 e72175533d61e40e35c92a49ca7f63c3a173f966 SHA256 47b4c12a34957abb72fa4563536abd220380a51b3378dc6da1a5e1223e0bbfaa
+DIST netbeans-trunk-nightly-201205300001-src.zip 174763237 RMD160 7c5524b4600cc086675ed863830f849216eb2f01 SHA1 9bbc52e25c508170d8207423b5ec43769eb1b0d1 SHA256 9c5d71ce455906f1e1f662c6a4e34c73e491ad3705f221b7c5c671366a79ef24
 EBUILD netbeans-nb-7.0.1.ebuild 5116 RMD160 df3e2ea3364e01de002fbb97b56c2bf927ba0e2c SHA1 f962fd0ba56bab72ef843342d94d0992e615698f SHA256 17ac4a9aa7931d052a899ad8649bed42d5c37a06d913e0dc8ded118d7ef01c47
 EBUILD netbeans-nb-7.1.2.ebuild 4987 RMD160 5183a8db3a7f47e0fea33d2ef5f23530752f8184 SHA1 930b37141bd234605941eba4274335e0bdce509b SHA256 075ef11ab57b236061e4df3e905524ecfba2966c5d735d113b878a03219a9cc1
 EBUILD netbeans-nb-7.2_beta.ebuild 4968 RMD160 7d13a944a9102d0c21cff18bdc1e39682a0533cc SHA1 49f8f163179b8f8c8073c23d29914ced57709ea0 SHA256 e7d4770a8ec5e772b88e7ba72836e9f05ae5e8b13847faed7f358b611adf5189
 EBUILD netbeans-nb-9999_p20120520.ebuild 5010 RMD160 80c3710dfc3c0b4d1519c0335f8c19faee0ffdce SHA1 a77f412195748aa63e52b147e4b5c6a0b0e54067 SHA256 2f9246a76684318baba8b90c15ec8a586ba17744f2c43b356400d501fbb3d1fb
 EBUILD netbeans-nb-9999_p20120524.ebuild 5010 RMD160 203b6cc8badad7515d9a732c64386fd64a2a3cab SHA1 b1a4b54a4c0ead13b5abe7c307e2029d72cc6708 SHA256 02d8ff9a57f19574e792d1c3d35d0e98e603e798b4a38717e7a7d383e00c17c1
 EBUILD netbeans-nb-9999_p20120527.ebuild 5010 RMD160 334994a74f936729172cf9de014eac3770251fc1 SHA1 6b7f358c66ef9114e7a6884d749762662b4e503c SHA256 6e0a766fc058d2ff37f3b1a26428a152200b2d6fc93b1247a1ed8eae5b8d2b77
-MISC ChangeLog 33946 RMD160 f609fe5f611bb6fbd4309d5975fa01dfee3ace4a SHA1 096a339018e4985efca0e5cdd1ae4e8d86dc794c SHA256 cb4cbd2672619d27c0aab0a153b49fda9bc26f8ae50d03e277f18248bcff83e4
+EBUILD netbeans-nb-9999_p20120530.ebuild 5010 RMD160 d299b9c91895f0bbf26ec94527f1f86010bf65dd SHA1 48927f9f67091eb24292de49841c8528d059ff19 SHA256 13bbec0635c214c1d3d6b94781346a69208a0589818a3e04c2b152e0c1a5e160
+MISC ChangeLog 34119 RMD160 bbf2534ca330f6619b2874d4c27e71651f54a55f SHA1 68d0bbdb96217aaea5e2b6724ec3bc1e52967624 SHA256 c3ad4584b389a8c5f4e6bad79b248b4e366dc3e731fe592b52ab848241e38dee
 MISC metadata.xml 396 RMD160 80c4086b305af8d5e4adae8a263111590f183c05 SHA1 11224a41781dde9ebd92c32e5c0a9d1921b628cb SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20120530.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20120530.ebuild
new file mode 100644
index 0000000..1a00f5e
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20120530.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-05-30_00-01-54/zip/netbeans-trunk-nightly-201205300001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r6-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-r6-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r6-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 e73fbfe..6582728 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_p20120530 (30 May 2012)
+
+  30 May 2012; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-php-9999_p20120530.ebuild:
+  bumped to the latest nightly sources
+
   27 May 2012; Miroslav Šulc <fordfrog@g.o>
   -netbeans-php-9999_p20120516.ebuild, -netbeans-php-9999_p20120517.ebuild:
   removed obsolete versions

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index 36ff5de..d487fd8 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -16,11 +16,13 @@ DIST netbeans-9999-r6-build.xml.patch.bz2 2475 RMD160 e4b970f3f4d2389071c5ddfed1
 DIST netbeans-trunk-nightly-201205200400-src.zip 178860844 RMD160 e9f20d02383a477a7848d5e17dfbf023df0326b4 SHA1 a05b277c5cde92909293ef3935cb2e2573fb651e SHA256 73b0ae0b95d7cb5145f56c6b57bca5a06ee7a608f2a5c7714a36c31c3210cf20
 DIST netbeans-trunk-nightly-201205240002-src.zip 178911778 RMD160 ca71d71e3b0c17ab74915043cb07e2da6fb9011f SHA1 0a0dcf4d31e484f58e338117f4ef504267982f53 SHA256 f5c5f274b65b1630a48f496410c46cb6cbcaad217806877b8114b47d62f87a61
 DIST netbeans-trunk-nightly-201205270002-src.zip 174681649 RMD160 3fbf1c797007a9e8ebed8ce67daadbda2f8b9363 SHA1 e72175533d61e40e35c92a49ca7f63c3a173f966 SHA256 47b4c12a34957abb72fa4563536abd220380a51b3378dc6da1a5e1223e0bbfaa
+DIST netbeans-trunk-nightly-201205300001-src.zip 174763237 RMD160 7c5524b4600cc086675ed863830f849216eb2f01 SHA1 9bbc52e25c508170d8207423b5ec43769eb1b0d1 SHA256 9c5d71ce455906f1e1f662c6a4e34c73e491ad3705f221b7c5c671366a79ef24
 EBUILD netbeans-php-7.0.1.ebuild 4151 RMD160 948630039891c480cbc0a9440fd9d74438bbcca4 SHA1 9afb5f8b29bc9c86fce11b8a44976da980741ec8 SHA256 3aee393fe89aa4788ccd17af46f1df43a5681c28af6d580724d8db0f5e804ff0
 EBUILD netbeans-php-7.1.2.ebuild 3940 RMD160 23847d511fb946c0a0f5c27f1bc1e922bfc20f86 SHA1 d5a96f605e767c12d3c236fd9e81419669521570 SHA256 779f3bceb2b5a49e923fff28c36c653e31e2d11e186fabab1e656c3314b48d28
 EBUILD netbeans-php-7.2_beta.ebuild 4157 RMD160 f2381455b03d390e24a76244d22a23e7f22c0027 SHA1 18a76bc3b211a2c0ef0d7eb2f380ab736ff4b32d SHA256 00292c6f300fd62ce4f7159b68611b6d26a3af57ed7cffeb58aaf33727965249
 EBUILD netbeans-php-9999_p20120520.ebuild 4199 RMD160 128503cfede92eb247a509064ebf426eb73078b8 SHA1 579740cdad07a3b2fb7a4834e0d53a92c8dccf78 SHA256 ff55c1ee640918cf1e9589f43cfd4fa3085cce891fc75c65c710db21bc905878
 EBUILD netbeans-php-9999_p20120524.ebuild 4199 RMD160 2d74d65ef407abefb77009b8c289ca2f39d041f8 SHA1 88619c050a4dd61d696e4f4443301aa885107073 SHA256 8137e9d5eebfd0db21727c66db3b737ba94a0b3465f5a76a0a68640166d33be6
 EBUILD netbeans-php-9999_p20120527.ebuild 4199 RMD160 47320aa571136331fa48708866aea5c38aed2be9 SHA1 9438bd45b5b88b36624983704225bc371b152b6f SHA256 91a6171199e3c50bfb4021d3f486a5e69a520c7ee4fe60d863ab90f1f9622baa
-MISC ChangeLog 33685 RMD160 b797c7caf50edf576cea6a5427b2c548fb24dfc7 SHA1 a9390a03d9ac426afefaded4d52eb1c3eabc49e9 SHA256 62dc6038e490130cf5f1885cb28fe2d90e7c58e4b4615fa82162713c67cfcf2c
+EBUILD netbeans-php-9999_p20120530.ebuild 4199 RMD160 ef6ea53218ddeefad4c198e3c739876f99d427c1 SHA1 95351137b4042097080d6c39c40718f0b08ef1e9 SHA256 85565d63ad5227c695f38269af7a45c00de9c94136916905326e643a51c4744d
+MISC ChangeLog 33860 RMD160 af6e91289ad09bc903a6ebc4ee0dc6b2d01b2613 SHA1 1354c7f56f7d899cc5e3d73cd9154fa0ed8c0f7e SHA256 53fd06631ee594455257cdac103db77313a2810f4f13b63f3ad939562b5700a7
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20120530.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20120530.ebuild
new file mode 100644
index 0000000..c60cfcc
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20120530.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-05-30_00-01-54/zip/netbeans-trunk-nightly-201205300001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r6-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip
+	http://hg.netbeans.org/binaries/CFC66D677007430C0841704183EED3A5DD72E5D9-phpsigfiles.zip
+	http://hg.netbeans.org/binaries/3D6AF75EA20D715887DAF47A3F063864EF0814C1-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-r6-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}"/CFC66D677007430C0841704183EED3A5DD72E5D9-phpsigfiles.zip php.project/external/phpsigfiles.zip || die
+	ln -s "${DISTDIR}"/3D6AF75EA20D715887DAF47A3F063864EF0814C1-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-r6-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 1e62d15..c970ff6 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_p20120530 (30 May 2012)
+
+  30 May 2012; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-platform-9999_p20120530.ebuild:
+  bumped to the latest nightly sources
+
   27 May 2012; Miroslav Šulc <fordfrog@g.o>
   -netbeans-platform-9999_p20120516.ebuild,
   -netbeans-platform-9999_p20120517.ebuild:

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index d4056fd..d0d630a 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -20,11 +20,13 @@ DIST netbeans-9999-r6-build.xml.patch.bz2 2475 RMD160 e4b970f3f4d2389071c5ddfed1
 DIST netbeans-trunk-nightly-201205200400-src.zip 178860844 RMD160 e9f20d02383a477a7848d5e17dfbf023df0326b4 SHA1 a05b277c5cde92909293ef3935cb2e2573fb651e SHA256 73b0ae0b95d7cb5145f56c6b57bca5a06ee7a608f2a5c7714a36c31c3210cf20
 DIST netbeans-trunk-nightly-201205240002-src.zip 178911778 RMD160 ca71d71e3b0c17ab74915043cb07e2da6fb9011f SHA1 0a0dcf4d31e484f58e338117f4ef504267982f53 SHA256 f5c5f274b65b1630a48f496410c46cb6cbcaad217806877b8114b47d62f87a61
 DIST netbeans-trunk-nightly-201205270002-src.zip 174681649 RMD160 3fbf1c797007a9e8ebed8ce67daadbda2f8b9363 SHA1 e72175533d61e40e35c92a49ca7f63c3a173f966 SHA256 47b4c12a34957abb72fa4563536abd220380a51b3378dc6da1a5e1223e0bbfaa
+DIST netbeans-trunk-nightly-201205300001-src.zip 174763237 RMD160 7c5524b4600cc086675ed863830f849216eb2f01 SHA1 9bbc52e25c508170d8207423b5ec43769eb1b0d1 SHA256 9c5d71ce455906f1e1f662c6a4e34c73e491ad3705f221b7c5c671366a79ef24
 EBUILD netbeans-platform-7.0.1.ebuild 5049 RMD160 d6a01c7785d02b9e5aebb1a2f192c5a2b6f1ccae SHA1 2acc23f9e9f6f5c60cabce30e651b3d31d91ac41 SHA256 b67cf0867358fea808614c02b8b6ea2ab88223f8642175ac3f91dc8c610aca4e
 EBUILD netbeans-platform-7.1.2.ebuild 5034 RMD160 e437fa7566697d4ddfacaa5343e92212aa3b0026 SHA1 7011abec507e2c96ca56069cf6d3a2d69909b124 SHA256 a069e7e45f768e590e5b30fdda26185d8fde492355e4c530ce44169def991cc6
 EBUILD netbeans-platform-7.2_beta.ebuild 5510 RMD160 dd9a73dff8a444c8a5ddeac53bc12d732eb1634e SHA1 e12a32a98a6ed70281ab500b50f86056bb5eabbe SHA256 b5ebd34e1db6b85e3238903885756c404d0e675aba0470b84405c6c977191966
 EBUILD netbeans-platform-9999_p20120520.ebuild 5552 RMD160 eaa5fd5ff3b070548bfdae8c6808df08f5bc516d SHA1 91e91f4d1970b2d5f262a337a5cc60309c7c7bdd SHA256 8c3a7349cd22734f81b568cd44de56ded5c6429e1bf8ddc3ed10106b6e490d4b
 EBUILD netbeans-platform-9999_p20120524.ebuild 5552 RMD160 b122e66e9655da1cbf1292730f27389c011f8555 SHA1 f2a1df369f96fb76f56aea34d0a7964b7ce2794d SHA256 77d3de6348063bdd554cec8a4edf23ad8541e9253b0e7178770f26b2d4ac1fed
 EBUILD netbeans-platform-9999_p20120527.ebuild 5552 RMD160 f7bb7d56940b23273ce7675ec7271fde89778a46 SHA1 14746055ff8a55681ad6ba81fd8d93886b58222a SHA256 9941eb058661c967f7d29593bde92980aec038b5a61c15615c2386141e1eea56
-MISC ChangeLog 36467 RMD160 d6ef8e155d527a225ed022ef2a0020e34c14efe5 SHA1 145ee9b97a937aa3fcb1bd43019c550d84479616 SHA256 f79973cc6816767a5b10976d940f1d85b863ffc6ee084065cde85998c2666527
+EBUILD netbeans-platform-9999_p20120530.ebuild 5552 RMD160 d09fa00816090af84573a9c940f73d87f2fadcd9 SHA1 f55c81b86538bfeeeccf3b18b4fcd5a98d586816 SHA256 0fdc5458513e8645c6ecf542799f87f1cf9c32f941fd725ae1dfe953fcd5501e
+MISC ChangeLog 36652 RMD160 7d9ffc6cb786bdc8ca9206ee39a5add5ec283a8a SHA1 b3f3a6b8b43144f45a510f25f1f81d5a46788b09 SHA256 959217542e6c4803606173828f3d71b0b0e06f41977ebecbcc0c56791a20a842
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20120530.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20120530.ebuild
new file mode 100644
index 0000000..ece1f93
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20120530.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Platform"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2012-05-30_00-01-54/zip/netbeans-trunk-nightly-201205300001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r6-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/14F630EDF137F54188636B5139432986D5FB19B7-felix-4.0.2.jar
+	http://hg.netbeans.org/binaries/2D80F93B8803250F232902C46EBA850BF1F3E67F-org.eclipse.osgi_3.7.1.R37x_v20110808-1106.jar
+	http://hg.netbeans.org/binaries/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar
+	http://hg.netbeans.org/binaries/30B192ADACF0EBA1096F18B3AC445123E212CFC9-osgi.core-4.3.jar
+	http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip
+	http://hg.netbeans.org/binaries/CFF0A34484AAF26F18BC15D0B2C226FD66769EAA-testng-6.5.1-dist.jar
+	http://hg.netbeans.org/binaries/D9B2EEC6413BDD174D047F9B7804C2EA440B79A5-testng-6.5.1-javadoc.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="dev-java/javahelp:0
+	>=dev-java/jna-3.4: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-r6-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/14F630EDF137F54188636B5139432986D5FB19B7-felix-4.0.2.jar libs.felix/external/felix-4.0.2.jar || die
+	ln -s "${DISTDIR}"/2D80F93B8803250F232902C46EBA850BF1F3E67F-org.eclipse.osgi_3.7.1.R37x_v20110808-1106.jar netbinox/external/org.eclipse.osgi_3.7.1.R37x_v20110808-1106.jar || die
+	ln -s "${DISTDIR}"/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar libs.osgi/external/osgi.cmpn-4.2.jar || die
+	ln -s "${DISTDIR}"/30B192ADACF0EBA1096F18B3AC445123E212CFC9-osgi.core-4.3.jar libs.osgi/external/osgi.core-4.3.jar || die
+	ln -s "${DISTDIR}"/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip o.jdesktop.layout/external/swing-layout-1.0.4-doc.zip || die
+	ln -s "${DISTDIR}"/CFF0A34484AAF26F18BC15D0B2C226FD66769EAA-testng-6.5.1-dist.jar libs.testng/external/testng-6.5.1-dist.jar || die
+	ln -s "${DISTDIR}"/D9B2EEC6413BDD174D047F9B7804C2EA440B79A5-testng-6.5.1-javadoc.zip libs.testng/external/testng-6.5.1-javadoc.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r6-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.4.0.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.4.0.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.4.0.jar && dosym /usr/share/jna/lib/jna.jar ${instdir}/jna-3.4.0.jar || die
+	# osgi.cmpn-4.2.jar
+	# osgi.core-4.3.jar
+	rm platform-3.4.0.jar && dosym /usr/share/jna/lib/platform.jar ${instdir}/platform-3.4.0.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 0a6f8a1..a57ce73 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_p20120530 (30 May 2012)
+
+  30 May 2012; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-profiler-9999_p20120530.ebuild:
+  bumped to the latest nightly sources
+
   27 May 2012; Miroslav Šulc <fordfrog@g.o>
   -netbeans-profiler-9999_p20120516.ebuild,
   -netbeans-profiler-9999_p20120517.ebuild:

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 48ea088..328805e 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -8,11 +8,13 @@ DIST netbeans-9999-r6-build.xml.patch.bz2 2475 RMD160 e4b970f3f4d2389071c5ddfed1
 DIST netbeans-trunk-nightly-201205200400-src.zip 178860844 RMD160 e9f20d02383a477a7848d5e17dfbf023df0326b4 SHA1 a05b277c5cde92909293ef3935cb2e2573fb651e SHA256 73b0ae0b95d7cb5145f56c6b57bca5a06ee7a608f2a5c7714a36c31c3210cf20
 DIST netbeans-trunk-nightly-201205240002-src.zip 178911778 RMD160 ca71d71e3b0c17ab74915043cb07e2da6fb9011f SHA1 0a0dcf4d31e484f58e338117f4ef504267982f53 SHA256 f5c5f274b65b1630a48f496410c46cb6cbcaad217806877b8114b47d62f87a61
 DIST netbeans-trunk-nightly-201205270002-src.zip 174681649 RMD160 3fbf1c797007a9e8ebed8ce67daadbda2f8b9363 SHA1 e72175533d61e40e35c92a49ca7f63c3a173f966 SHA256 47b4c12a34957abb72fa4563536abd220380a51b3378dc6da1a5e1223e0bbfaa
+DIST netbeans-trunk-nightly-201205300001-src.zip 174763237 RMD160 7c5524b4600cc086675ed863830f849216eb2f01 SHA1 9bbc52e25c508170d8207423b5ec43769eb1b0d1 SHA256 9c5d71ce455906f1e1f662c6a4e34c73e491ad3705f221b7c5c671366a79ef24
 EBUILD netbeans-profiler-7.0.1.ebuild 3113 RMD160 dcfd93da14dbcf6a090cefd843bd8e6bbdcaa051 SHA1 a9fee09c442cbcd4187f2dc1443e19cdd9a96003 SHA256 588797a6b81c7f5ba5e1cf06ad66e593bd89aa28261b68006ebb973d0eae8044
 EBUILD netbeans-profiler-7.1.2.ebuild 3122 RMD160 d5cbccb8fe91eae1aa932df381f8456c0c959220 SHA1 b184ae32b1a2adbe414377b57a6e8d659905c4a5 SHA256 12f18028d15825753c83161882e187b0fcd0c328d85b617a6acdfe776d60cf77
 EBUILD netbeans-profiler-7.2_beta.ebuild 3103 RMD160 905dee8cc7139e173bf14604cbb59de663f7f306 SHA1 87dc478a59abcb556a02d0712ca5e97471aafdbd SHA256 85d6164700338900f882df2e4e0427f23656363ff4e8d33bbf6219fcc35c8db8
 EBUILD netbeans-profiler-9999_p20120520.ebuild 3145 RMD160 d437d3662c0433515a5e65abbf666c6232443ca0 SHA1 5b0a99d50420ef211a435f9ebe4cb27f15221eb5 SHA256 17b11a006ef07ecff70611592fd52f094d37daa29bc5f8c73f36d326e70ca055
 EBUILD netbeans-profiler-9999_p20120524.ebuild 3145 RMD160 217c471221d509699fb1bb0ee5dca41959acff3f SHA1 58b2f1938f939259b7e5676d3a80dabecfebc63c SHA256 f25884fab71a94b2de5a37488012bfa9f3584cc5d047d9c877f8a162c859ee4c
 EBUILD netbeans-profiler-9999_p20120527.ebuild 3145 RMD160 2f9ead3b3607351110819a1e8b566885dd30984a SHA1 ef0920b2b9576b26f08a3382f49ceb9d64ce7382 SHA256 cd4aadfea5615a7cff14ca4dada7d95877c50aa8f14dd339f8413730e5942695
-MISC ChangeLog 35762 RMD160 337e421bfe8df3d1ada5f7a58deb8c4b6df81f3a SHA1 151ebf2c354ff1ea0af839ceec13047ef615f0f9 SHA256 271ba52c9d1d2802ac024408e060e5aeb80648b67b95193fdfdff26891cca2f9
+EBUILD netbeans-profiler-9999_p20120530.ebuild 3145 RMD160 a59fea538aecf5b67db698e717d7bca79b61c3d2 SHA1 ca0dfda1fd46ac0e98df3e1b68f370192d5e619d SHA256 e3a159c83d5dd2a6959b78d7e7b782cb8947b16945e2329833802f1a545556da
+MISC ChangeLog 35947 RMD160 a6b176db77c1226db1de64695310670fc56ef8ba SHA1 4b8f40f23bc12347263b590315d3b5d99a5ca859 SHA256 e91e2c4d6b2286279727fce7f4b5975913e76557853a6971cb3dc8fbfe000be8
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20120530.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20120530.ebuild
new file mode 100644
index 0000000..20200cf
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20120530.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-05-30_00-01-54/zip/netbeans-trunk-nightly-201205300001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r6-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-r6-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r6-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 76d18b6..27a67b2 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_p20120530 (30 May 2012)
+
+  30 May 2012; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-webcommon-9999_p20120530.ebuild:
+  bumped to the latest nightly sources
+
   27 May 2012; Miroslav Šulc <fordfrog@g.o>
   -netbeans-webcommon-9999_p20120516.ebuild,
   -netbeans-webcommon-9999_p20120517.ebuild:

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index 995fe11..0f53ff9 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -4,9 +4,11 @@ DIST netbeans-9999-r6-build.xml.patch.bz2 2475 RMD160 e4b970f3f4d2389071c5ddfed1
 DIST netbeans-trunk-nightly-201205200400-src.zip 178860844 RMD160 e9f20d02383a477a7848d5e17dfbf023df0326b4 SHA1 a05b277c5cde92909293ef3935cb2e2573fb651e SHA256 73b0ae0b95d7cb5145f56c6b57bca5a06ee7a608f2a5c7714a36c31c3210cf20
 DIST netbeans-trunk-nightly-201205240002-src.zip 178911778 RMD160 ca71d71e3b0c17ab74915043cb07e2da6fb9011f SHA1 0a0dcf4d31e484f58e338117f4ef504267982f53 SHA256 f5c5f274b65b1630a48f496410c46cb6cbcaad217806877b8114b47d62f87a61
 DIST netbeans-trunk-nightly-201205270002-src.zip 174681649 RMD160 3fbf1c797007a9e8ebed8ce67daadbda2f8b9363 SHA1 e72175533d61e40e35c92a49ca7f63c3a173f966 SHA256 47b4c12a34957abb72fa4563536abd220380a51b3378dc6da1a5e1223e0bbfaa
+DIST netbeans-trunk-nightly-201205300001-src.zip 174763237 RMD160 7c5524b4600cc086675ed863830f849216eb2f01 SHA1 9bbc52e25c508170d8207423b5ec43769eb1b0d1 SHA256 9c5d71ce455906f1e1f662c6a4e34c73e491ad3705f221b7c5c671366a79ef24
 EBUILD netbeans-webcommon-7.2_beta.ebuild 2663 RMD160 e1925b63476b8f5754e6015919f19e5540f9324a SHA1 11ff489a21e5cbe0d75e5cc9c26ca37278998259 SHA256 f3ae14e51de624bdc1fc43cfd740d456cbb19933fa044f28ef725706dfdf3a58
 EBUILD netbeans-webcommon-9999_p20120520.ebuild 2705 RMD160 ecacf0c3a4aafd4b05b3f57a01dba4c7f0c53e3d SHA1 77b662d7952e4afd5f93b47d520c6e1172eb00fd SHA256 c98871d2426d2ad2036778193848cb38885325c4eeb70f9e497d386853e089f0
 EBUILD netbeans-webcommon-9999_p20120524.ebuild 2705 RMD160 824dff2bfce98d12665825a0820c8a5f9957a4b2 SHA1 95f1c2da761ebafe76a958da26855bcbd49e9a55 SHA256 816642712904da3afa4435c4e71ab0136a721339359d5bfbf0e6282ada1b3338
 EBUILD netbeans-webcommon-9999_p20120527.ebuild 2705 RMD160 c86391f786e40442731301873da247fc28a3f2eb SHA1 b15ad079e824a75f506a60d694dfe9774f7ebeff SHA256 44fe09c74823df0e9a576538d8f42b262be7cf1a24e75bb0dc36fbb0a8f301ed
-MISC ChangeLog 7487 RMD160 45f606b557fce64b48e339a98e4d268cd97b43be SHA1 ff5d4bd98fc2bea1948684ddae119afcf3e893b3 SHA256 4728b98e7dcb50b37ff166eb606e0f3ffb1f666425b93448af77c780081062d3
+EBUILD netbeans-webcommon-9999_p20120530.ebuild 2705 RMD160 2fe9bafd42001ade1c2431dc0244a1a7384112aa SHA1 f978dbfa438806faaaf7a714dd18e872f74a80a0 SHA256 5c8c2d171ca04a9babdfe6f7faa4bd281e1fa577805b659409bce500198350f0
+MISC ChangeLog 7674 RMD160 82ff96bed45b6c34ae218954eea652586468fdab SHA1 8d2ef2277a388d91ef368f876db749a60166c49a SHA256 248933d174b6391f90a00e7063f0e3e80411405652b0cca0dbc2eee0d5054ca1
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20120530.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20120530.ebuild
new file mode 100644
index 0000000..cfdadae
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20120530.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-05-30_00-01-54/zip/netbeans-trunk-nightly-201205300001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r6-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-r6-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r6-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 b340d04..62ef0e7 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_p20120530 (30 May 2012)
+
+  30 May 2012; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-websvccommon-9999_p20120530.ebuild:
+  bumped to the latest nightly sources
+
   27 May 2012; Miroslav Šulc <fordfrog@g.o>
   -netbeans-websvccommon-9999_p20120516.ebuild,
   -netbeans-websvccommon-9999_p20120517.ebuild:

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 510a89c..2cd1128 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -8,11 +8,13 @@ DIST netbeans-9999-r6-build.xml.patch.bz2 2475 RMD160 e4b970f3f4d2389071c5ddfed1
 DIST netbeans-trunk-nightly-201205200400-src.zip 178860844 RMD160 e9f20d02383a477a7848d5e17dfbf023df0326b4 SHA1 a05b277c5cde92909293ef3935cb2e2573fb651e SHA256 73b0ae0b95d7cb5145f56c6b57bca5a06ee7a608f2a5c7714a36c31c3210cf20
 DIST netbeans-trunk-nightly-201205240002-src.zip 178911778 RMD160 ca71d71e3b0c17ab74915043cb07e2da6fb9011f SHA1 0a0dcf4d31e484f58e338117f4ef504267982f53 SHA256 f5c5f274b65b1630a48f496410c46cb6cbcaad217806877b8114b47d62f87a61
 DIST netbeans-trunk-nightly-201205270002-src.zip 174681649 RMD160 3fbf1c797007a9e8ebed8ce67daadbda2f8b9363 SHA1 e72175533d61e40e35c92a49ca7f63c3a173f966 SHA256 47b4c12a34957abb72fa4563536abd220380a51b3378dc6da1a5e1223e0bbfaa
+DIST netbeans-trunk-nightly-201205300001-src.zip 174763237 RMD160 7c5524b4600cc086675ed863830f849216eb2f01 SHA1 9bbc52e25c508170d8207423b5ec43769eb1b0d1 SHA256 9c5d71ce455906f1e1f662c6a4e34c73e491ad3705f221b7c5c671366a79ef24
 EBUILD netbeans-websvccommon-7.0.1.ebuild 2692 RMD160 78a0dae148b2c583b596a625a6e6622a1c7cafcc SHA1 f3e52c193e9dfdf9d236f655a705c55da76cfad4 SHA256 a18cf7fe0a1e38749826cb12651be06c210b038be50117647496ee6cbd184cda
 EBUILD netbeans-websvccommon-7.1.2.ebuild 2701 RMD160 af95088f6ae934872fea22196c39c0847f952779 SHA1 d752cc17d00dc0a2a132cee783b7853a6e2c43b2 SHA256 3b2a1cf0d32db3c55b66d1c6b8c4ae2ad5487d3fdb27752468ce5c860f9b9515
 EBUILD netbeans-websvccommon-7.2_beta.ebuild 2682 RMD160 6f2d90468558c77d55c14c9c42da07b2ad488d24 SHA1 4d481a0d108d7d96dd890e869f4a01915556ac6b SHA256 e4a14a2192c0585b01e3639b7db41adb0685e6f2a92d0148e85a6b5efe3e75d0
 EBUILD netbeans-websvccommon-9999_p20120520.ebuild 2724 RMD160 3d41b188cc62193f52f16d025f023290ba4e5b94 SHA1 d0fa963665889d9c0f7be9ac4a133a8458e6ef23 SHA256 5747ab182078f56303f421d87ea855837a17271de39302af51435220e409a59c
 EBUILD netbeans-websvccommon-9999_p20120524.ebuild 2724 RMD160 2314c3c6c5fa3f5b2be5c65fef9f9569c1fc2d97 SHA1 7fd1c5601c43a86cae51b0837bb349e9e567aefa SHA256 2ab7c5abe33817bdab4c4e2c4a8a031c40a16500a0979d09dbad206d84751ce2
 EBUILD netbeans-websvccommon-9999_p20120527.ebuild 2724 RMD160 5c1d2a09a7e1f06b795e7e14ed8d8d1e458c1b9a SHA1 45fa0165b122e7ec2b58254905c3421c4a32b3cc SHA256 8d77450540480b3fc27b88ae454577aeb0b80375def6416a359f5733a07346fa
-MISC ChangeLog 37364 RMD160 e8595728b089b962b980b792c118f1737b0ed761 SHA1 97babffbeaaf97a7cf817e4eb6efd3e872370f2b SHA256 bd88c52291ea3fe4f5dab59ac41aec6bdebcf7424bc8a622daead291c96a70bd
+EBUILD netbeans-websvccommon-9999_p20120530.ebuild 2724 RMD160 76184598824fdfaeb9ffb92e7bb9c0f32519e2fd SHA1 1c1f0705c210beb1e990bebb7ff004dda540bc8e SHA256 9c314f0c33d3eaa2fed24012fbc41b032d9b79d92cd256ee0b6e58a5cfb5a2e2
+MISC ChangeLog 37557 RMD160 a97b521cde835c0a7d82b847d524802f696208be SHA1 c5eec19f313426dcf4ac84bfaa6eebe950b7b20c SHA256 f214d12d4b82ca749cb04932583634a74c8eebf0b1c7086b811a1585f4a8f348
 MISC metadata.xml 251 RMD160 c109b2aca38527553ce33f0d84b45662745a7bce SHA1 3089a1ae4346cc3b7c5c37df7fbc253033f542d8 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20120530.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20120530.ebuild
new file mode 100644
index 0000000..7461268
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20120530.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-05-30_00-01-54/zip/netbeans-trunk-nightly-201205300001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r6-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-r6-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r6-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 07685e4..557995e 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_p20120530 (30 May 2012)
+
+  30 May 2012; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-9999_p20120530.ebuild:
+  bumped to the latest nightly sources
+
   27 May 2012; Miroslav Šulc <fordfrog@g.o>
   -netbeans-9999_p20120516.ebuild, -netbeans-9999_p20120517.ebuild:
   removed obsolete versions

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 15c31a6..175b1a1 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -11,11 +11,13 @@ DIST netbeans-l10n-9999-20110613.tar.bz2 13405097 RMD160 9f8fb8fcdbdf87c958b2a8e
 DIST netbeans-trunk-nightly-201205200400-src.zip 178860844 RMD160 e9f20d02383a477a7848d5e17dfbf023df0326b4 SHA1 a05b277c5cde92909293ef3935cb2e2573fb651e SHA256 73b0ae0b95d7cb5145f56c6b57bca5a06ee7a608f2a5c7714a36c31c3210cf20
 DIST netbeans-trunk-nightly-201205240002-src.zip 178911778 RMD160 ca71d71e3b0c17ab74915043cb07e2da6fb9011f SHA1 0a0dcf4d31e484f58e338117f4ef504267982f53 SHA256 f5c5f274b65b1630a48f496410c46cb6cbcaad217806877b8114b47d62f87a61
 DIST netbeans-trunk-nightly-201205270002-src.zip 174681649 RMD160 3fbf1c797007a9e8ebed8ce67daadbda2f8b9363 SHA1 e72175533d61e40e35c92a49ca7f63c3a173f966 SHA256 47b4c12a34957abb72fa4563536abd220380a51b3378dc6da1a5e1223e0bbfaa
+DIST netbeans-trunk-nightly-201205300001-src.zip 174763237 RMD160 7c5524b4600cc086675ed863830f849216eb2f01 SHA1 9bbc52e25c508170d8207423b5ec43769eb1b0d1 SHA256 9c5d71ce455906f1e1f662c6a4e34c73e491ad3705f221b7c5c671366a79ef24
 EBUILD netbeans-7.0.1-r2.ebuild 6736 RMD160 8780b584bedf0cfd4cd40f1e26c015079b19da4c SHA1 9e31064b4e19fad1d0ca79476f32c5153b4b18cf SHA256 e808fba2ddb516270d93b5cf67cff60d98b37ca58a158878f2e3b3ad696cfc82
 EBUILD netbeans-7.1.2.ebuild 6976 RMD160 6689261ce45b36debe645f8ff5ae1a49d04c18df SHA1 e8ff60a715b3868340ff34e909c8c5656ebfe30f SHA256 4222e248dfb664ccfea85d4938ad691d3685f32d8e9b33289d1dda088057261b
 EBUILD netbeans-7.2_beta.ebuild 7015 RMD160 8babe8fcd1461be74edba9485bf67c07fe79febd SHA1 aacfa6ce3026620ac4ca2d372c18cd5adfbf256a SHA256 e69fe5447164ab505ce8865b0f7c4832b6cd61cd1ac37a8e02e67a2afbc7727d
 EBUILD netbeans-9999_p20120520.ebuild 7057 RMD160 1ef4f3ddc2a8701fca8633547d7082caf9d6aa35 SHA1 115fcb9101c0ecd82459a3eeface900e8e7bf0b0 SHA256 9618d208fafa1891e52f8bbac9051d4c8e653de93e765b449801a2433d29712b
 EBUILD netbeans-9999_p20120524.ebuild 7057 RMD160 8da2c0c6ba30504b66e097539f1e906f2ceda2cc SHA1 eabc00d2c6270a1fcc014e7836226b5663cdf3ea SHA256 640958434824f557d4490d8a0fe7faa77c9489640c52ee9b7fa2bfc9bd77e118
 EBUILD netbeans-9999_p20120527.ebuild 7057 RMD160 12c1bf4a76ee9a529bf7c303d2d90e971ffaf7b2 SHA1 2a3ecf4b5bb4b356b294b18c28996ab6040f9799 SHA256 1825c443f2ea2927b53bf2ae1a11ce65d163fdc72b2de780a2c7d08066c0902d
-MISC ChangeLog 33297 RMD160 91cfcde3121b5bef1d5955df78dfe0bd503de897 SHA1 ac33b4be01acbfaf91568b128a07cea80c319b44 SHA256 fab3bcfb6b2375e6c61b1d176d22cc5cb8d2ad1859c8a04a838171f860b808de
+EBUILD netbeans-9999_p20120530.ebuild 7057 RMD160 811f3b1dcdbdd6558d4f83a1d76c7f80f0291c9c SHA1 d398a1600cad165ca4033943fdce33f95483f6ca SHA256 dae0bd28e0afa2dc7b1015b42cc78e1b4ec9a3c2ad1e0834fb36eaa0547ac3ac
+MISC ChangeLog 33464 RMD160 4547711ae61f6803ec85018d47679d7248c5d1d0 SHA1 10871200104224b37723147c84edd29247eb21b7 SHA256 6c26640c08d4763b8ebaf01e90d5f9c3989e5538c7a03177c50c673def6ca560
 MISC metadata.xml 333 RMD160 848a246f77fbcc88bb03d4a8d0769ef60353148a SHA1 e9afe19410a907fb47230f824b2d592ba3f465d4 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a

diff --git a/dev-util/netbeans/netbeans-9999_p20120530.ebuild b/dev-util/netbeans/netbeans-9999_p20120530.ebuild
new file mode 100644
index 0000000..8143e62
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20120530.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-05-30_00-01-54/zip/netbeans-trunk-nightly-201205300001-src.zip"
+PATCHES_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r6-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-r6-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-r6-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
+}