Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-mobility/, dev-java/netbeans-groovy/, ...
Date: Fri, 31 May 2013 19:44:54
Message-Id: 1370029455.abec0b9406d14699ef9791218ab73aad0a5daa73.fordfrog@gentoo
commit:     abec0b9406d14699ef9791218ab73aad0a5daa73
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri May 31 19:44:15 2013 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri May 31 19:44:15 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/fordfrog.git;a=commit;h=abec0b94

netbeans: bumped to latest nightly sources

---
 dev-java/netbeans-apisupport/ChangeLog             |   6 +
 dev-java/netbeans-apisupport/Manifest              |   4 +-
 .../netbeans-apisupport-9999_p20130530.ebuild      | 111 +++++++
 dev-java/netbeans-cnd/ChangeLog                    |   6 +
 dev-java/netbeans-cnd/Manifest                     |   4 +-
 .../netbeans-cnd-9999_p20130530.ebuild             | 125 +++++++
 dev-java/netbeans-dlight/ChangeLog                 |   6 +
 dev-java/netbeans-dlight/Manifest                  |   4 +-
 .../netbeans-dlight-9999_p20130530.ebuild          |  96 ++++++
 dev-java/netbeans-enterprise/ChangeLog             |   6 +
 dev-java/netbeans-enterprise/Manifest              |   4 +-
 .../netbeans-enterprise-9999_p20130530.ebuild      | 256 +++++++++++++++
 dev-java/netbeans-ergonomics/ChangeLog             |   6 +
 dev-java/netbeans-ergonomics/Manifest              |   4 +-
 .../netbeans-ergonomics-9999_p20130530.ebuild      | 101 ++++++
 dev-java/netbeans-extide/ChangeLog                 |   6 +
 dev-java/netbeans-extide/Manifest                  |   4 +-
 .../netbeans-extide-9999_p20130530.ebuild          | 108 ++++++
 dev-java/netbeans-groovy/ChangeLog                 |   6 +
 dev-java/netbeans-groovy/Manifest                  |   4 +-
 .../netbeans-groovy-9999_p20130530.ebuild          | 111 +++++++
 dev-java/netbeans-harness/ChangeLog                |   6 +
 dev-java/netbeans-harness/Manifest                 |   4 +-
 .../netbeans-harness-9999_p20130530.ebuild         | 114 +++++++
 dev-java/netbeans-ide/ChangeLog                    |   6 +
 dev-java/netbeans-ide/Manifest                     |   8 +-
 .../netbeans-ide-9999_p20130530.ebuild             | 364 +++++++++++++++++++++
 dev-java/netbeans-java/ChangeLog                   |   6 +
 dev-java/netbeans-java/Manifest                    |   4 +-
 .../netbeans-java-9999_p20130530.ebuild            | 246 ++++++++++++++
 dev-java/netbeans-javacard/ChangeLog               |   6 +
 dev-java/netbeans-javacard/Manifest                |   4 +-
 .../netbeans-javacard-9999_p20130530.ebuild        | 134 ++++++++
 dev-java/netbeans-javadoc/ChangeLog                |   6 +
 dev-java/netbeans-javadoc/Manifest                 |   4 +-
 .../netbeans-javadoc-9999_p20130530.ebuild         | 164 ++++++++++
 dev-java/netbeans-javafx/ChangeLog                 |   6 +
 dev-java/netbeans-javafx/Manifest                  |   4 +-
 .../netbeans-javafx-9999_p20130530.ebuild          | 124 +++++++
 dev-java/netbeans-mobility/ChangeLog               |   6 +
 dev-java/netbeans-mobility/Manifest                |   4 +-
 .../netbeans-mobility-9999_p20130530.ebuild        | 154 +++++++++
 dev-java/netbeans-nb/ChangeLog                     |   6 +
 dev-java/netbeans-nb/Manifest                      |   4 +-
 .../netbeans-nb/netbeans-nb-9999_p20130530.ebuild  | 148 +++++++++
 dev-java/netbeans-php/ChangeLog                    |   6 +
 dev-java/netbeans-php/Manifest                     |   4 +-
 .../netbeans-php-9999_p20130530.ebuild             | 127 +++++++
 dev-java/netbeans-platform/ChangeLog               |   6 +
 dev-java/netbeans-platform/Manifest                |   4 +-
 .../netbeans-platform-9999_p20130530.ebuild        | 126 +++++++
 dev-java/netbeans-profiler/ChangeLog               |   6 +
 dev-java/netbeans-profiler/Manifest                |   4 +-
 .../netbeans-profiler-9999_p20130530.ebuild        | 121 +++++++
 dev-java/netbeans-webcommon/ChangeLog              |   6 +
 dev-java/netbeans-webcommon/Manifest               |   4 +-
 .../netbeans-webcommon-9999_p20130530.ebuild       | 108 ++++++
 dev-java/netbeans-websvccommon/ChangeLog           |   6 +
 dev-java/netbeans-websvccommon/Manifest            |   4 +-
 .../netbeans-websvccommon-9999_p20130530.ebuild    |  94 ++++++
 dev-util/netbeans/ChangeLog                        |   6 +
 dev-util/netbeans/Manifest                         |   4 +-
 dev-util/netbeans/netbeans-9999_p20130530.ebuild   | 264 +++++++++++++++
 63 files changed, 3389 insertions(+), 21 deletions(-)

diff --git a/dev-java/netbeans-apisupport/ChangeLog b/dev-java/netbeans-apisupport/ChangeLog
index dbfe8d5..3baeb7b 100644
--- a/dev-java/netbeans-apisupport/ChangeLog
+++ b/dev-java/netbeans-apisupport/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-apisupport-9999_p20130530 (31 May 2013)
+
+  31 May 2013; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-apisupport-9999_p20130530.ebuild:
+  bumped to latest nightly sources
+
 *netbeans-apisupport-9999_p20130529 (30 May 2013)
 
   30 May 2013; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index cc2caed..42af025 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -15,6 +15,7 @@ DIST netbeans-trunk-nightly-201305232300-src.zip 187763774 SHA256 211672ba83f511
 DIST netbeans-trunk-nightly-201305252300-src.zip 187807028 SHA256 b2e70c316de0cd83aa2a1b0ae4f2e1da432199396564f77155b0b74d708e11a6 SHA512 c4cc20ff92b5b35f729539bbebc260452ab89f8c28b6fe986f3ff04f35a02a2039710291411880283901ad515d3ef62a15c615c74bc4df621970abadd0a50c69 WHIRLPOOL e61232b507ae121fd286e136d292f96cfb79a58c7b155a2743301092e209ecf888378fa81aa9752816fb6c2f07d5fef60a2c9fccc3e921bca80449b5cf2c4764
 DIST netbeans-trunk-nightly-201305262300-src.zip 187807028 SHA256 8552e30f84ea1b8483dcc1596dd3612121a068f5c36bc0093de4fda24157e41d SHA512 e69451b64003c4c4feb3b4232f6a6e51308b59a5feb9617217b43295d311ce279219b5a8fdbb2457bff512ae4fa10ea649b5d0b7eba424c3365e5071d56c4436 WHIRLPOOL 400a776d0034dcf78c833c7b80a99524a7634213462f7ad45297cbfa2b02cf70d4699e81d946d874135c4bdd23b07631df65db454214423368ebedbc89a2e0e7
 DIST netbeans-trunk-nightly-201305292301-src.zip 187953498 SHA256 00164aa21766eae8a68e648f3a838da04b98e48a91564bb0c8e7d02e8111ab8c SHA512 e9e3e2d45bf8db8a5c0ad0ef81020916f303554f26c032aea50612cdc9406c1b3c1d594f7fa08faae2676572eb9dc675a9d615efdbf920d61134e6628ec8fbce WHIRLPOOL 6481bfe8871154685314b9bae1c96c1690eb0d770f03a4708f603bed5165f0207d521cc48cc51b81432b98126f9089d3bc06a3c7bbf56347be7edbe2898a47c1
+DIST netbeans-trunk-nightly-201305302301-src.zip 187971727 SHA256 8aa8682d824dc611bfeadf594449af492c5f0403b8fa8daad0f28dd654365830 SHA512 affe9abba9c5970d8492248f46c0edd1d6f011ec1d2a9f238e94d00bbf9c53af563e0a6144b2781683700ec5f69273f956540efdb062746f3c91c545f8cfbff3 WHIRLPOOL 65f8f32ead3f9ce0f23b287f641b96245db0eaf26fa46b52f82843afcd060d9e505c39136980932e906f1aaeea37db4ecd073eb06ec779299843242d8c27dfe3
 EBUILD netbeans-apisupport-7.0.1.ebuild 3134 SHA256 41c32033c9945a39c0aebb6b0271767031d53a47e5c8365d9e3a7c86712e24cd SHA512 dd4bdde9574a87b46b02fd7204b1e90394bd87dc572dfa015b601203b026b35571f20323db834a310f90aefe6e4a822044b0d71d535a7351137219b50ecb2aa8 WHIRLPOOL f3721521a33b337d7dc24d6b49b0b2fe723f5ec446a5a4befb085051140a41bfd2d3081876e9f02f8b9932a3a0997b92211cd964fe372e40b42813df5db5170e
 EBUILD netbeans-apisupport-7.1.2.ebuild 3143 SHA256 cf24048c0ecca98a7d6371624bb0ddfb78663bead073d515a7c84229dbec00a8 SHA512 ec44c263e786210fd64c9ebb253bc9d4fc34d3be9493157dad06007c19734672bfd767765c003393d1e5cc6755fd5d1eda956b00c2092e98592a73ec1af4e729 WHIRLPOOL d619c304a994a2b818d892fb6315d092588f2ebf95e566f7a909f92daf21bb368a28c4e1af876ae585980dc82996e62aba30b12c41461103c23620a215480b76
 EBUILD netbeans-apisupport-7.2.ebuild 3126 SHA256 b0d64795b8403a932e3e20721a116c755c4de66fc36f7191476fcb4a226bad13 SHA512 cea062a72a8e75a9c2fe91c323f83d542a70149336360e1c41479f401fcae5ead6a301c8a7d5704d5beb27f7810b5d1e3cff0196cce7a26890a001c570179f6a WHIRLPOOL c286f4e4d3a02cbeb1a6e13b2005dc5435a6e9ec026a98fcc00bb83222014b800cd83f437c69352b48d16bdf442a6c7ebbed6aff86f10b3c5e6cdfb7edd9e184
@@ -27,5 +28,6 @@ EBUILD netbeans-apisupport-9999_p20130523.ebuild 3361 SHA256 b8b500dade24e71368a
 EBUILD netbeans-apisupport-9999_p20130525.ebuild 3361 SHA256 b061eb03733f4449c014f4d9809c59cff630bba2bd16bbfa720744840dbc9a26 SHA512 632c894b621f4ae2733654aba31eabab860550193d4aba5276c2e7c746abfbf9fdb08c746227f6eada0ab2e62906f7c61d3bd60480d92f06d045a2cdc624243b WHIRLPOOL 6d15d1ba96cdabdc50cfe092ca96de7fe39cc5e464a496c330ff80ffa4b9ad1791d90d736364b01b881b36718e78e424ecdf482f28fcf259e9c92bd83c0bc3bd
 EBUILD netbeans-apisupport-9999_p20130526.ebuild 3361 SHA256 8d77523795b869725b24d527b22ccafa575418ff83efbc3b32ea8503c47b148b SHA512 60685bad9c7aa27a12636a95d25a9e6c447f5538adc8954108e6411093267d9a53f73fa1eb32457a3bcba61e928f4bdd42a4520f5f26a36cf68ebf43b2b076ef WHIRLPOOL 03585a8a6f1089fc0f695a6458ae29947de267a57cf998a4b504a43d6ab989c66950599a5b04c54b11f02e363d3645a80d9dd3ea33e3281cf2487cba11f22cc2
 EBUILD netbeans-apisupport-9999_p20130529.ebuild 3361 SHA256 13f5dd3007229ea0d530683e03deb1d29ad6010548edfcf55c35bbedaad41879 SHA512 879032b5a75f539114877b1e9fc540cc39816420f2d2402a768237e9f65f682e58413f0da807c6baae8fdd823a794fa9a405807a3faac169895fdb3b5912a09f WHIRLPOOL 1a22de5ad7a85104feacd9a77a192370ec647ea782c574f4f6cb8264bd91f67c12c347c84512b2c3e86b7a15a2986681dc7870b3720f56db1cffe0e07b9b45eb
-MISC ChangeLog 82049 SHA256 da43c1df2d81c27cc04164e0cbd6b770c2ddffb4492453f3f50d8f2d456835a3 SHA512 76eed2f3d1498037f87678b65ce795e9e1147282d0ebbc4f157cf49968a103686f31e8ea328c0d5a46879a51d56e83b4b763983118463cf7e0e3c5dc41c21535 WHIRLPOOL c7f0cfb6613e6453b46269c72aff38f75f5b243904619484811ca9483cc2e994ca23c6553509450a32588de49a2660e1012d26241317afc1902d175fc986bd07
+EBUILD netbeans-apisupport-9999_p20130530.ebuild 3361 SHA256 725bd7b86c0b9b9b06741a292a115e838f0b56711f99173b39c921e66be82589 SHA512 2f52a5f8292f65032b7b1737fcf7ded807caeeadc2112b06da5cf92eb618b2b4575839a015e3aaea91c97f0c1f3cb75a696462cf6c6af4b05b9e3b8780ae0ab0 WHIRLPOOL 176e47768001d5199633cde0a8d32ffb5d6562ea9f18b6f755a1c99a0f05fdb7efed5c66edf3b6fda07494c7a3a801bfc43ae14e4e2d7f933df93b535afef235
+MISC ChangeLog 82234 SHA256 21c93ce9b757fca295f35ff5e04a6458674b2a68514d58cab713540d17955374 SHA512 f465477ee85398c635095b9c48135cc36951c3d46270a3072289cabc85b27f928864d690f05731b37c61e5442a6f7ad85425ba8192dc8db3335ae57d89f2fd2e WHIRLPOOL 328ff41ac12e1504737c414c43ff568fced15f609fa606ffd5f5202c9607dd26ef496db54fc684bf674ee3a49b430cfdf794a2dac8963097cc012b8e2f54c4ca
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20130530.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20130530.ebuild
new file mode 100644
index 0000000..3f2ec52
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20130530.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2013 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 API Support Cluster"
+HOMEPAGE="http://netbeans.org/projects/apisupport"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2013-05-30_23-01-06/zip/netbeans-trunk-nightly-201305302301-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r8-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${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-r8-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r8-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-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.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-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 e715fb8..a458004 100644
--- a/dev-java/netbeans-cnd/ChangeLog
+++ b/dev-java/netbeans-cnd/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-cnd-9999_p20130530 (31 May 2013)
+
+  31 May 2013; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-cnd-9999_p20130530.ebuild:
+  bumped to latest nightly sources
+
 *netbeans-cnd-9999_p20130529 (30 May 2013)
 
   30 May 2013; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index d555a2a..6b3c466 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201305232300-src.zip 187763774 SHA256 211672ba83f511
 DIST netbeans-trunk-nightly-201305252300-src.zip 187807028 SHA256 b2e70c316de0cd83aa2a1b0ae4f2e1da432199396564f77155b0b74d708e11a6 SHA512 c4cc20ff92b5b35f729539bbebc260452ab89f8c28b6fe986f3ff04f35a02a2039710291411880283901ad515d3ef62a15c615c74bc4df621970abadd0a50c69 WHIRLPOOL e61232b507ae121fd286e136d292f96cfb79a58c7b155a2743301092e209ecf888378fa81aa9752816fb6c2f07d5fef60a2c9fccc3e921bca80449b5cf2c4764
 DIST netbeans-trunk-nightly-201305262300-src.zip 187807028 SHA256 8552e30f84ea1b8483dcc1596dd3612121a068f5c36bc0093de4fda24157e41d SHA512 e69451b64003c4c4feb3b4232f6a6e51308b59a5feb9617217b43295d311ce279219b5a8fdbb2457bff512ae4fa10ea649b5d0b7eba424c3365e5071d56c4436 WHIRLPOOL 400a776d0034dcf78c833c7b80a99524a7634213462f7ad45297cbfa2b02cf70d4699e81d946d874135c4bdd23b07631df65db454214423368ebedbc89a2e0e7
 DIST netbeans-trunk-nightly-201305292301-src.zip 187953498 SHA256 00164aa21766eae8a68e648f3a838da04b98e48a91564bb0c8e7d02e8111ab8c SHA512 e9e3e2d45bf8db8a5c0ad0ef81020916f303554f26c032aea50612cdc9406c1b3c1d594f7fa08faae2676572eb9dc675a9d615efdbf920d61134e6628ec8fbce WHIRLPOOL 6481bfe8871154685314b9bae1c96c1690eb0d770f03a4708f603bed5165f0207d521cc48cc51b81432b98126f9089d3bc06a3c7bbf56347be7edbe2898a47c1
+DIST netbeans-trunk-nightly-201305302301-src.zip 187971727 SHA256 8aa8682d824dc611bfeadf594449af492c5f0403b8fa8daad0f28dd654365830 SHA512 affe9abba9c5970d8492248f46c0edd1d6f011ec1d2a9f238e94d00bbf9c53af563e0a6144b2781683700ec5f69273f956540efdb062746f3c91c545f8cfbff3 WHIRLPOOL 65f8f32ead3f9ce0f23b287f641b96245db0eaf26fa46b52f82843afcd060d9e505c39136980932e906f1aaeea37db4ecd073eb06ec779299843242d8c27dfe3
 EBUILD netbeans-cnd-7.0.1.ebuild 4602 SHA256 1336b76de715719ef59a3601dd5ad3b24992f58096f874f0e37935ec0d088d8e SHA512 38745c3ad6364198516ebb64002185fd05c34dee75acdb3933221d772177d5d6fcda853bb63991f0d071b21079fdab0c090db93e59cddd8daeb8f8d571a18a41 WHIRLPOOL cc196275289a01c1168b8c2710e0be0c2483cc86dc47b8fb3383ce1141f7bc11565e2b2feb95436cf448c09aaac7ee8c8804316ce6782d8853c0742367c0963a
 EBUILD netbeans-cnd-7.1.2.ebuild 4218 SHA256 6c80020e4204226274f4a24413dad8bf134f5beb7aee4ecc53d6b4d709093bb2 SHA512 299c07f5e5d930045e8c8ef3d04009beee7035daa2022a803e6dcb16b380096bbf5014c2d684094705d06b4608afcf6925266ef609a483a86452b03505dcb67c WHIRLPOOL 6d6c8bddf3490282b9134315f9bc94ff55675160056fa4c98c302a59d943a9cb38f23ffb9ca313c82061d84d0ae86898ce72d16756d41c468737e319e68f06ce
 EBUILD netbeans-cnd-7.2.ebuild 4201 SHA256 0f77a1a343d437e2eb1236722b27b2f2f03901ecc1afde29e1d38e54aef7c81d SHA512 b5fc985d1280ab900cb5125691a0ff99bab075ff5e93ded9af256310a7dcbea87a28a52ba383875caa24fd0ff28bc8dff4fc0fa0242987a673fdc729f7234b58 WHIRLPOOL 19e79dc426fb05ffb48ff9b13de3bab40f483b6dd9d79514e8f819029c278ee47a09c9531b5b4dba2014f805d502e66745f3355e2932e24e0dd9b5e3e273d2c2
@@ -39,5 +40,6 @@ EBUILD netbeans-cnd-9999_p20130523.ebuild 4557 SHA256 cadd0ada9e549090d9d8643a43
 EBUILD netbeans-cnd-9999_p20130525.ebuild 4557 SHA256 3a755f5d561ca91ce124d7889cc0dd14542c7b820678a9c8e4ae12da50777bb4 SHA512 c03cd17d0bb765caba6d23438abbc8a72e14bc0ac9537c3ef57872186104bd79dc3ba9afb4a24d8cc97a4408b4b024ec370daf69ec9e265885832885a43efa3b WHIRLPOOL 05ae4e05118244179c85fd16f72fb8dd89d5669938f368699f7c3d0d66817a1916c92e98a3ef9617a67e9aa8a333deb09466b799b55f0321fc82bcc1f8015c6d
 EBUILD netbeans-cnd-9999_p20130526.ebuild 4557 SHA256 3d7dce7fd6791184cfb23eb04f2a29700916e8f6981113d825b3c4eb662fed5f SHA512 801684ba40c3d4cc1e306b1b781134770f58726067c9891cbbc512d004de2d709f0763cd42acba14f913b70c26276c483e8baa8b36f2c7f483e9afd87ad449c0 WHIRLPOOL 2fc838d1d11b487f6071b63fd3eae8796d80bf3c76bb4a809f0e3f2f6e764f0ce3685c57dc39346863e8a8d6f168f2f1faa77807ca8d0aff1db6a78aacb46a61
 EBUILD netbeans-cnd-9999_p20130529.ebuild 4557 SHA256 18585c48c8615a003592d85079f439ebf4d23a5d9ee8d33e2f699d7152db4032 SHA512 8e2bc2fbff356e0869285e5239cdf095d563f00a7dd1a3a2cd999ca17f7b33ae91919a013c20bb110a68674cd9322ea8c5c87048f5915e7ac86b2a9ffbe4acb5 WHIRLPOOL 37e756936f8cc1f8ae2f321614963f73f2d97d3326362676e62eb56c4019d090de60de67dddfc293bc1948514532e3751b4e9568f648f8be4ea3a6dcbe133e83
-MISC ChangeLog 75339 SHA256 659aa903883d9eaf75b289fda0e4ebfeca025eb0dd16275a0ba119d040ac4f48 SHA512 2ecd3c928e2ba35d4c7d96a3319fb0f1645f48ad35d13ca29438f8f033d14a2d2769504b5b2e3b6e3c9bb1550735fcd856b3c4375d7b794aff46ee27468996c3 WHIRLPOOL f7b8119c3abbcec3ec21493a169cfd138ba04e5bd46f5e76353b3ad4f73e018610d11cd3e4ee5b659152dbcd9e6b6820a8f17e9c53830c9d9d533142cec610df
+EBUILD netbeans-cnd-9999_p20130530.ebuild 4557 SHA256 275bb49b063103e8c287683ae637442ec977c814d9c90e810ec8101b90f59dfc SHA512 9118ea2cca01162b10f64d63e7af8888056678d2a9c3fed2168bc3a125ef441200e052be2d83842a73beda16e5bb64f334b6b499a4e5e59de803dd5078bf10cd WHIRLPOOL 3fea36ab978dbcae739a7f6fe6f42dc29f48a88885224d4423f5351d3b1b289f99eb2ac02f7452c81c559b9ff74d7c7caf1d444dc635344cc90ef5d4040788d8
+MISC ChangeLog 75510 SHA256 49cac3c2732ff17fcb73303f8182fccc8a1dad9daf2f73f6a5ff7f15a9694c5f SHA512 97d367014924511e87be4b11251656813aa9c833047b71da78013a609bb658b8675676b9b4ec2e24e4b6a5b80a666e6b3f408950dcfecc4f6a9dda01609d64dc WHIRLPOOL 67044b4f3682c55be92b20bade9e92845fea28acbda7442c2304efeaa0be627001b4a4c880f7666f1e5a99dcd538c1f401d88899f678cb707f0114cf6e19cfe9
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20130530.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20130530.ebuild
new file mode 100644
index 0000000..73e1839
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20130530.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2013 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 CND Cluster"
+HOMEPAGE="http://netbeans.org/projects/cnd"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2013-05-30_23-01-06/zip/netbeans-trunk-nightly-201305302301-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r8-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar
+	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
+	http://hg.netbeans.org/binaries/C4CF9314A530E51B891D46DB65806A5A0ED240AF-cnd-build-trace-1.0.zip
+	http://hg.netbeans.org/binaries/2BCF2047382FB68A2F275677745C80E79B4046AB-cnd-rfs-1.0.zip
+	http://hg.netbeans.org/binaries/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+# These files are for remote development and debugging
+QA_PREBUILT="usr/share/netbeans-cnd-${SLOT}/bin/*"
+
+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.7
+	app-arch/unzip
+	>=dev-java/jna-3.4.0
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${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-r8-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar libs.antlr3.devel/external/antlr-3.4.jar || die
+	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.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}"/2BCF2047382FB68A2F275677745C80E79B4046AB-cnd-rfs-1.0.zip cnd.remote/external/cnd-rfs-1.0.zip || die
+	ln -s "${DISTDIR}"/C51780D99464CBF45B0495C7646B442AB3C7B463-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-r8-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.jna/external jna jna.jar jna-3.4.0.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 da34a85..2a80c5f 100644
--- a/dev-java/netbeans-dlight/ChangeLog
+++ b/dev-java/netbeans-dlight/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-dlight-9999_p20130530 (31 May 2013)
+
+  31 May 2013; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-dlight-9999_p20130530.ebuild:
+  bumped to latest nightly sources
+
 *netbeans-dlight-9999_p20130529 (30 May 2013)
 
   30 May 2013; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 02353e8..c1701c3 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -18,6 +18,7 @@ DIST netbeans-trunk-nightly-201305232300-src.zip 187763774 SHA256 211672ba83f511
 DIST netbeans-trunk-nightly-201305252300-src.zip 187807028 SHA256 b2e70c316de0cd83aa2a1b0ae4f2e1da432199396564f77155b0b74d708e11a6 SHA512 c4cc20ff92b5b35f729539bbebc260452ab89f8c28b6fe986f3ff04f35a02a2039710291411880283901ad515d3ef62a15c615c74bc4df621970abadd0a50c69 WHIRLPOOL e61232b507ae121fd286e136d292f96cfb79a58c7b155a2743301092e209ecf888378fa81aa9752816fb6c2f07d5fef60a2c9fccc3e921bca80449b5cf2c4764
 DIST netbeans-trunk-nightly-201305262300-src.zip 187807028 SHA256 8552e30f84ea1b8483dcc1596dd3612121a068f5c36bc0093de4fda24157e41d SHA512 e69451b64003c4c4feb3b4232f6a6e51308b59a5feb9617217b43295d311ce279219b5a8fdbb2457bff512ae4fa10ea649b5d0b7eba424c3365e5071d56c4436 WHIRLPOOL 400a776d0034dcf78c833c7b80a99524a7634213462f7ad45297cbfa2b02cf70d4699e81d946d874135c4bdd23b07631df65db454214423368ebedbc89a2e0e7
 DIST netbeans-trunk-nightly-201305292301-src.zip 187953498 SHA256 00164aa21766eae8a68e648f3a838da04b98e48a91564bb0c8e7d02e8111ab8c SHA512 e9e3e2d45bf8db8a5c0ad0ef81020916f303554f26c032aea50612cdc9406c1b3c1d594f7fa08faae2676572eb9dc675a9d615efdbf920d61134e6628ec8fbce WHIRLPOOL 6481bfe8871154685314b9bae1c96c1690eb0d770f03a4708f603bed5165f0207d521cc48cc51b81432b98126f9089d3bc06a3c7bbf56347be7edbe2898a47c1
+DIST netbeans-trunk-nightly-201305302301-src.zip 187971727 SHA256 8aa8682d824dc611bfeadf594449af492c5f0403b8fa8daad0f28dd654365830 SHA512 affe9abba9c5970d8492248f46c0edd1d6f011ec1d2a9f238e94d00bbf9c53af563e0a6144b2781683700ec5f69273f956540efdb062746f3c91c545f8cfbff3 WHIRLPOOL 65f8f32ead3f9ce0f23b287f641b96245db0eaf26fa46b52f82843afcd060d9e505c39136980932e906f1aaeea37db4ecd073eb06ec779299843242d8c27dfe3
 EBUILD netbeans-dlight-7.0.1.ebuild 3624 SHA256 499a9303a1972ee89dfa2685e1dc1e4511c7531ff3b29caadd1136ba25dee82e SHA512 ad60adc5d64f93d03e27170311ce7bd0a6952c8b41cdc51385f8efc9140593201064d162b3130bff7a003570de11963d375d3676476115b1129ac74632d4a227 WHIRLPOOL d68dcdba50b2565d40e1adc484b51c1ed0171c2fcf99fbee08a221e6d9767f96d161d45eda612eb4c4d62e0db6826e2cd124b83e11ee2f7c9bfb6a440ec6821d
 EBUILD netbeans-dlight-7.1.2.ebuild 2935 SHA256 dc7d110b80174b1baeaca9c005e2cc9167540f186c7794067cfb45d335251b9a SHA512 7dc2db63ee40a3e64375eb49e669c54f88cc532d7ac8c7320329f8378a3be15ebc4536208ea2975c7fe4a9b3f2ac60d0ec5b8c9a9da392587fb04838f101e0ec WHIRLPOOL 1801653d9e146eba02642dbdb0a39c235a40e5d3d5ac8d4d5b8d2a570aa62330638355ee8df76693db177c58bbf31271342215c70d7e198e4b6bd905984ed9c7
 EBUILD netbeans-dlight-7.2.ebuild 2650 SHA256 9b0c0049b7cf6894cd44327c3697d4ddfb0dba2aebd6aabc1821b550932cd69d SHA512 0584c2a1cc65193673bded284c454b430fa3f5774c33d704922977d25ed26bf88d090670e330299c85ada2e897e5f124ae9f635a6f8be7d7fd10740482df7eae WHIRLPOOL 1c27b0c84a34865cb8a84062127f49aefcd245fa16fb825d7ee57d24c3f5841935242c16b3250319078762ce4e8aa5bc8dbd8dbe497b39af8e027b9e39ee585f
@@ -30,5 +31,6 @@ EBUILD netbeans-dlight-9999_p20130523.ebuild 2664 SHA256 0c14957f8246fd59f997079
 EBUILD netbeans-dlight-9999_p20130525.ebuild 2664 SHA256 69470faaffcc5485db0e11b00ec8df71c2b4288c3fe955b1159e141f7247ad9e SHA512 66c3d562bb58f1af4a0d81194fe1f86d77ed81aacf9805e6131c9cd5765f50c3df70769c5cca84150a4a1983a2035d8b70fe84b480cf0c6c1f1686a15a0f3301 WHIRLPOOL 6d82f880e625363b42459f0623e5a41ca6c3018e6d6e1cfe19dfe7d346bc2676f8a2267ebd38224b2cc983d2ec57121712dddf3345648370f9255fd08d07cee4
 EBUILD netbeans-dlight-9999_p20130526.ebuild 2664 SHA256 5050443b3aa136fab9bfea585793912c494b483b7c7dd9a42199e1b313fdbd4b SHA512 c5fbd8366b7bb449eb7897eadd15624e853ac150774da2d27d96e8c8b6ce4cdcbd4ceb1df26e2fc6242e4250c63daaea7f92b6ae49943ec2a21eb0f5e041d617 WHIRLPOOL df98b749305d0208724695519eee26e8cb708d6a1442c14aa3910c8e04b2387bf3d97055151be43592d1e06f8b88bb615eb9b7835c3cb6cd72193fb685dbfff3
 EBUILD netbeans-dlight-9999_p20130529.ebuild 2664 SHA256 263d0467d78154481f98397230aac129311f33a9464cf4c475c0b7fe19d06acb SHA512 53ae5d277f483cf54b65f19aca0c5268b00fc9431c75601d2a2c0a910f13931bf957e2182d0a5cff6954de1ccc64b0ec7584b97b14d7ce6b6089470ac652124a WHIRLPOOL 7a0fde6295d46b1e69d6d424a37f6975b20244f1630db837f47005a15ab5d15e6ca13d494fd7e2c99438366b2fdf9315c6923b556992752029e12b95367306e9
-MISC ChangeLog 78336 SHA256 c1daa3d16cea90b956f065d851d135efa327cf72450fbc9b418b04d059b5d9f3 SHA512 6a041a2753e09db3bf89e28b397d7321a610bc7d6309fee3f09e240c9a58b141de59ebd9950ee378dca880cd3b29ab191a74e381f243f67cf14860f2bd9f787c WHIRLPOOL be44b044763daffbfdcb3b851fd173b7499bdf38f3d02215c0ec848e505c22f88ad1b145c67eff909b1396a4a8b462d7fb52f3628cdf128b2049f9331c8ef9eb
+EBUILD netbeans-dlight-9999_p20130530.ebuild 2664 SHA256 56fd738b205d6bcaa2f333228a561a12ab6650ef326d80ee8e4a63dcc7f44366 SHA512 fcc15165994d4a5605c4bdc8ca889be10f8b6016896649dd68585f26e9623d3d9294bae8b550ee28bdaf3ba4886e971456425f555f53103d36b7a189a8d6c632 WHIRLPOOL e42ec71f20d3ef4b892355fce43d27135f73ecafc212dd90dc660df6424692b5734f668495c7531f1a83c97adcf043a5ccb646c98867e9c73391bb65a1562c96
+MISC ChangeLog 78513 SHA256 72fe95634f85f5e294ad2abe6cd1e09a57f36da67cdef567d323ff2580af4e0b SHA512 fc9e4b1b50cbc8498c2f2a5ff640346399615619bf555e9a78417a5972f0dd285659839e793d51ac89267579e422a47609c653624d2dd72c1b4eef1e5481fbe0 WHIRLPOOL af9c67c9939e6f4707af453cd779da9d01032ef6644baf0815f27e2241d9a7c9e557c279e451bdb79ac7ae99dc493300f3ad919af5498663aff0abbe79141eaa
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20130530.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20130530.ebuild
new file mode 100644
index 0000000..13cf1db
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20130530.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2013 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 D-Light Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2013-05-30_23-01-06/zip/netbeans-trunk-nightly-201305302301-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r8-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-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${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-r8-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r8-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 75f812d..20bb8c7 100644
--- a/dev-java/netbeans-enterprise/ChangeLog
+++ b/dev-java/netbeans-enterprise/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-enterprise-9999_p20130530 (31 May 2013)
+
+  31 May 2013; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-enterprise-9999_p20130530.ebuild:
+  bumped to latest nightly sources
+
 *netbeans-enterprise-9999_p20130529 (30 May 2013)
 
   30 May 2013; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 187d8fc..99a87c1 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -101,6 +101,7 @@ DIST netbeans-trunk-nightly-201305232300-src.zip 187763774 SHA256 211672ba83f511
 DIST netbeans-trunk-nightly-201305252300-src.zip 187807028 SHA256 b2e70c316de0cd83aa2a1b0ae4f2e1da432199396564f77155b0b74d708e11a6 SHA512 c4cc20ff92b5b35f729539bbebc260452ab89f8c28b6fe986f3ff04f35a02a2039710291411880283901ad515d3ef62a15c615c74bc4df621970abadd0a50c69 WHIRLPOOL e61232b507ae121fd286e136d292f96cfb79a58c7b155a2743301092e209ecf888378fa81aa9752816fb6c2f07d5fef60a2c9fccc3e921bca80449b5cf2c4764
 DIST netbeans-trunk-nightly-201305262300-src.zip 187807028 SHA256 8552e30f84ea1b8483dcc1596dd3612121a068f5c36bc0093de4fda24157e41d SHA512 e69451b64003c4c4feb3b4232f6a6e51308b59a5feb9617217b43295d311ce279219b5a8fdbb2457bff512ae4fa10ea649b5d0b7eba424c3365e5071d56c4436 WHIRLPOOL 400a776d0034dcf78c833c7b80a99524a7634213462f7ad45297cbfa2b02cf70d4699e81d946d874135c4bdd23b07631df65db454214423368ebedbc89a2e0e7
 DIST netbeans-trunk-nightly-201305292301-src.zip 187953498 SHA256 00164aa21766eae8a68e648f3a838da04b98e48a91564bb0c8e7d02e8111ab8c SHA512 e9e3e2d45bf8db8a5c0ad0ef81020916f303554f26c032aea50612cdc9406c1b3c1d594f7fa08faae2676572eb9dc675a9d615efdbf920d61134e6628ec8fbce WHIRLPOOL 6481bfe8871154685314b9bae1c96c1690eb0d770f03a4708f603bed5165f0207d521cc48cc51b81432b98126f9089d3bc06a3c7bbf56347be7edbe2898a47c1
+DIST netbeans-trunk-nightly-201305302301-src.zip 187971727 SHA256 8aa8682d824dc611bfeadf594449af492c5f0403b8fa8daad0f28dd654365830 SHA512 affe9abba9c5970d8492248f46c0edd1d6f011ec1d2a9f238e94d00bbf9c53af563e0a6144b2781683700ec5f69273f956540efdb062746f3c91c545f8cfbff3 WHIRLPOOL 65f8f32ead3f9ce0f23b287f641b96245db0eaf26fa46b52f82843afcd060d9e505c39136980932e906f1aaeea37db4ecd073eb06ec779299843242d8c27dfe3
 EBUILD netbeans-enterprise-7.0.1.ebuild 16338 SHA256 03ea08daaf5d4c5592937929bac33b4af3bac00a23f2167a7ef7b3c172a72abe SHA512 4d24162c7920b9a1c65e6c6753900ead387a4941c2db98b522631bb09889c281bce048a74e2e584f8b5732cfaad1d7125e0cfd37aa2dc81fe85160b0e123ccd8 WHIRLPOOL 35eb648c37cb6e59aca7969c1074c2c280814529aa7ec3c3191b0d3f2a92fa24e1a8d981f343e4217fff52f6100b4884b970df734c45145759889aa6e6661ff2
 EBUILD netbeans-enterprise-7.1.2.ebuild 18060 SHA256 f63721b8ce5e1afbc58f783348f66f1e3501be519a1c9c1287ef860acc64ceda SHA512 2ca89ec8f89f106a284136d4d0ed52fe3bcf49c650d56ded6e62306c531e5e41f62b8aa923cb544842cf6e34e5f433fecb278bc1515abac987e2d00fb68ffa26 WHIRLPOOL 879067d72285aa6c7273e84ddc3dfef7d09c7cb9f9a6c279fddfbd3eea6439dea053d3c648fcd56d47ef2292db14d101307eb1aa8b3081dfcdbc3dac4d0c3ed9
 EBUILD netbeans-enterprise-7.2.ebuild 17752 SHA256 2f46916df731fe33c5d4626ae580a77686c392932a3388f755324bc3184bd636 SHA512 3543d033b971108fa2b8e6633ed640e812a83b34807e1cb5a69d425823d1fec1c13ecba3cc36fa4504fbfd6297e7eff1ecabe07d01725d9f13c99ffd70d220ba WHIRLPOOL 512753153bbf714ae3fbf9c580f350234d88bd5ce5690e7bc0fadd1c355bd38c2a5c1e9adb7993c3678d759661bbfb1654b0630e3535a2fb9198742fa7fd2c1e
@@ -113,5 +114,6 @@ EBUILD netbeans-enterprise-9999_p20130523.ebuild 18891 SHA256 4316c4e282f0272212
 EBUILD netbeans-enterprise-9999_p20130525.ebuild 18891 SHA256 115b0ab8a51a1e286ffb5183112c922d28d7893518f140bef0ec2f0e4c110a97 SHA512 e403710e180b99c0715b38c6a053f9a574fbded9f7a3a70efc53c0bef21b31b4b9eccd07d56fdf049f76dae199c7685dd02888ba81036434bc109b9a3afa3da6 WHIRLPOOL 9a20f7ca57b6683f7faed36536b9621f599268380dd2449ca5b9e0267237d7f3afb4549a66df7af0a12a18debdbd0e73150ae9a4994362c43dd46f693d98d42b
 EBUILD netbeans-enterprise-9999_p20130526.ebuild 18891 SHA256 d5fe4d962f49ff98e702c14933e5b0bd3e5c1cce393dfe6ec29d60a41832b0c9 SHA512 303f7e7200c5d85bf3db4642e9e757acce4a5d45abf55d005642119c66c6cff24b5cb29144f68743ca0c097d4ee5a262e20c2b538a10c69463bb34d3c55e4a20 WHIRLPOOL cc296b98c886666c4de8eb89bdaa5635317a760d67c115d39c7eb5485fc669a94a94028eb6113734814ac74a3560222ffd96037be291a73606e89d66ebfdde75
 EBUILD netbeans-enterprise-9999_p20130529.ebuild 15769 SHA256 4112c52080b37af9695b6c8339ea6f640cef679b04ee2c0a60a495ccd804cc2c SHA512 635dbd18e70235e07702abaed35df9e828a37352f0d67ce7c602f3e0b1cddc97bb4a8da84720927c5a5f8145c68b2da3b5c6355525ad1f8d72339805f5f8b3b3 WHIRLPOOL 77f3aa89aab21f4d473d9cf7bfc0e8287f0a1a0165d336e6c8deea0bcbfc46c12dd3110eca0834e7bb4a970f5daa03a612b5f9fc6ebf656fb8d4d7a6796798b5
-MISC ChangeLog 82574 SHA256 64902fd85c07f5c2759d3d2a35195c8e9e4a7ea3eead7dc9a91258978fec913f SHA512 4b6e24e76f387c7aa2ac2cbcc70f6c8c038cf3a6306a33067461d24682950cc60148daa4a6fa26a3208b3ead1d79c3c496a3235d4a26c64c32f4a000cc997b13 WHIRLPOOL e16f75d954762971e43b783774dca3455358898bb42ac8eb528f2840ca1789e26f69476d82dabd548c01f27fcf7154a14af753b63d7cdda2f15b6f8bed80f768
+EBUILD netbeans-enterprise-9999_p20130530.ebuild 15769 SHA256 1ff06a5fd36395f3980ec9b9e11ac9343fedbe70f3661ab6e7a849a918b1c9ab SHA512 19e1d9a4425b47429f34c0406e424de78ff9c5978466eb8830e6e0c1ddc7f67eecb8ed5d88c1593f310a2c4b7c08514d00c9e4ad9121948a7b2d919ca74f5775 WHIRLPOOL 691d3d17bc478441ea029744e2af4b4213ba861c2ae9e2b04901bde9ccaba19494bdf8728019a39a059657937304fc94e7aea8bfbb71965a54e39bb2d48ad623
+MISC ChangeLog 82759 SHA256 26b2755ef9aa3ed97e3d66a694095bca3f5c5aab74db0e2542cc575f717e1048 SHA512 66395b94379288ef22dd66d591707b6086b51f417992f63b371cd853b3e1880fe80ddacc32ce35c7c13714209db738e3a8aa1c54fd06c9762eaca8dbd46ad849 WHIRLPOOL 2aab2f4bd05ed4526455c53a00b52fbe52c51b68556375bb470f344f57b3b360a5ce034ff2091ae4ff047254055c41a1acbe4dbf8c42ae2136289bdd7598eae8
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20130530.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20130530.ebuild
new file mode 100644
index 0000000..b4d5794
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20130530.ebuild
@@ -0,0 +1,256 @@
+# Copyright 1999-2013 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 Enterprise cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2013-05-30_23-01-06/zip/netbeans-trunk-nightly-201305302301-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r8-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar
+	http://hg.netbeans.org/binaries/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar
+	http://hg.netbeans.org/binaries/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar
+	http://hg.netbeans.org/binaries/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar
+	http://hg.netbeans.org/binaries/77B15258E01216226E00DFA2ADD9C0F6D4E1B7C1-glassfish-tooling-sdk-0.3-b047.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/51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar
+	http://hg.netbeans.org/binaries/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar
+	http://hg.netbeans.org/binaries/B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar
+	http://hg.netbeans.org/binaries/27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar
+	http://hg.netbeans.org/binaries/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar
+	http://hg.netbeans.org/binaries/1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar
+	http://hg.netbeans.org/binaries/E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar
+	http://hg.netbeans.org/binaries/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar
+	http://hg.netbeans.org/binaries/45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar
+	http://hg.netbeans.org/binaries/51EBE06BB1278AEDE08686B0D3618EBD1A999C25-jaxrs-ri-2.0.zip
+	http://hg.netbeans.org/binaries/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar
+	http://hg.netbeans.org/binaries/F999E0F3DE77B80DB439E47F0396CED8D7E3344C-jersey2-extensions.zip
+	http://hg.netbeans.org/binaries/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip
+	http://hg.netbeans.org/binaries/83C61010C43130C56500F06BC257D59CF29F7B79-jsf-2.2.zip
+	http://hg.netbeans.org/binaries/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip
+	http://hg.netbeans.org/binaries/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip
+	http://hg.netbeans.org/binaries/F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip
+	http://hg.netbeans.org/binaries/1E2F64CC5AF306F6B7833E8C4E69EDEDDF0E6393-primefaces-3.5.jar
+	http://hg.netbeans.org/binaries/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-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-ide-${PV}
+	~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.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	dev-java/jsr181:0
+	>=dev-java/junit-4.4:4
+	dev-java/tomcat-servlet-api:2.3"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}
+	dev-java/antlr:0[java]
+	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/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-r8-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}"/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar libs.elimpl/external/el-impl.jar || die
+	ln -s "${DISTDIR}"/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar web.jspparser/external/glassfish-jspparser-4.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}"/77B15258E01216226E00DFA2ADD9C0F6D4E1B7C1-glassfish-tooling-sdk-0.3-b047.jar libs.glassfish.sdk/external/glassfish-tooling-sdk-0.3-b047.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}"/51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar javaee7.api/external/javaee-api-7.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}"/B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar javaee7.api/external/javaee-web-api-7.0.jar || die
+	ln -s "${DISTDIR}"/27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar j2ee.platform/external/javaee-doc-api.jar || die
+	ln -s "${DISTDIR}"/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar javaee.api/external/javax.annotation.jar || die
+	ln -s "${DISTDIR}"/1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar javaee7.api/external/javax.annotation-api.jar || die
+	ln -s "${DISTDIR}"/E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar javaee7.api/external/javax.xml.soap-api.jar || die
+	ln -s "${DISTDIR}"/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar javaee.api/external/jaxb-api-osgi.jar || die
+	ln -s "${DISTDIR}"/45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar javaee7.api/external/jaxb-api-osgi.jar || die
+	ln -s "${DISTDIR}"/51EBE06BB1278AEDE08686B0D3618EBD1A999C25-jaxrs-ri-2.0.zip websvc.restlib/external/jaxrs-ri-2.0.zip || die
+	ln -s "${DISTDIR}"/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar javaee7.api/external/jaxws-api.jar || die
+	ln -s "${DISTDIR}"/F999E0F3DE77B80DB439E47F0396CED8D7E3344C-jersey2-extensions.zip websvc.restlib/external/jersey2-extensions.zip || die
+	ln -s "${DISTDIR}"/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip web.jsf12/external/jsf-1.2.zip || die
+	ln -s "${DISTDIR}"/83C61010C43130C56500F06BC257D59CF29F7B79-jsf-2.2.zip web.jsf20/external/jsf-2.2.zip || die
+	ln -s "${DISTDIR}"/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip web.jsf.editor/external/jsf-api-docs.zip || die
+	ln -s "${DISTDIR}"/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip websvc.metro.lib/external/metro-1.4-doc.zip || die
+	ln -s "${DISTDIR}"/F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip websvc.metro.lib/external/metro-2.0.zip || die
+	ln -s "${DISTDIR}"/1E2F64CC5AF306F6B7833E8C4E69EDEDDF0E6393-primefaces-3.5.jar web.primefaces/external/primefaces-3.5.jar || die
+	ln -s "${DISTDIR}"/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar servletjspapi/external/servlet3.1-jsp2.3-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-r8-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 javaee7.api/external jsr181 jsr181.jar jsr181-api.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-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.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-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
+	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
+	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/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
+	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-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
+	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 90643f2..f71d598 100644
--- a/dev-java/netbeans-ergonomics/ChangeLog
+++ b/dev-java/netbeans-ergonomics/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-ergonomics-9999_p20130530 (31 May 2013)
+
+  31 May 2013; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-ergonomics-9999_p20130530.ebuild:
+  bumped to latest nightly sources
+
 *netbeans-ergonomics-9999_p20130529 (30 May 2013)
 
   30 May 2013; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index d13a3be..0cfecb5 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -15,6 +15,7 @@ DIST netbeans-trunk-nightly-201305232300-src.zip 187763774 SHA256 211672ba83f511
 DIST netbeans-trunk-nightly-201305252300-src.zip 187807028 SHA256 b2e70c316de0cd83aa2a1b0ae4f2e1da432199396564f77155b0b74d708e11a6 SHA512 c4cc20ff92b5b35f729539bbebc260452ab89f8c28b6fe986f3ff04f35a02a2039710291411880283901ad515d3ef62a15c615c74bc4df621970abadd0a50c69 WHIRLPOOL e61232b507ae121fd286e136d292f96cfb79a58c7b155a2743301092e209ecf888378fa81aa9752816fb6c2f07d5fef60a2c9fccc3e921bca80449b5cf2c4764
 DIST netbeans-trunk-nightly-201305262300-src.zip 187807028 SHA256 8552e30f84ea1b8483dcc1596dd3612121a068f5c36bc0093de4fda24157e41d SHA512 e69451b64003c4c4feb3b4232f6a6e51308b59a5feb9617217b43295d311ce279219b5a8fdbb2457bff512ae4fa10ea649b5d0b7eba424c3365e5071d56c4436 WHIRLPOOL 400a776d0034dcf78c833c7b80a99524a7634213462f7ad45297cbfa2b02cf70d4699e81d946d874135c4bdd23b07631df65db454214423368ebedbc89a2e0e7
 DIST netbeans-trunk-nightly-201305292301-src.zip 187953498 SHA256 00164aa21766eae8a68e648f3a838da04b98e48a91564bb0c8e7d02e8111ab8c SHA512 e9e3e2d45bf8db8a5c0ad0ef81020916f303554f26c032aea50612cdc9406c1b3c1d594f7fa08faae2676572eb9dc675a9d615efdbf920d61134e6628ec8fbce WHIRLPOOL 6481bfe8871154685314b9bae1c96c1690eb0d770f03a4708f603bed5165f0207d521cc48cc51b81432b98126f9089d3bc06a3c7bbf56347be7edbe2898a47c1
+DIST netbeans-trunk-nightly-201305302301-src.zip 187971727 SHA256 8aa8682d824dc611bfeadf594449af492c5f0403b8fa8daad0f28dd654365830 SHA512 affe9abba9c5970d8492248f46c0edd1d6f011ec1d2a9f238e94d00bbf9c53af563e0a6144b2781683700ec5f69273f956540efdb062746f3c91c545f8cfbff3 WHIRLPOOL 65f8f32ead3f9ce0f23b287f641b96245db0eaf26fa46b52f82843afcd060d9e505c39136980932e906f1aaeea37db4ecd073eb06ec779299843242d8c27dfe3
 EBUILD netbeans-ergonomics-7.0.1.ebuild 2884 SHA256 e8e4a785fc11b6d0d3c722826761581b8c9c779c5460dc7d1487b3154f4402ab SHA512 3ba2810e650726f48fbdb1bc0c58b6ee1e7d9d29d4be3b27c00bc981b773f26d979fd90154184276e044eafd1d4d8940b47d6f0f58589f9cff7fbadef5fbb05f WHIRLPOOL 5fab7fe6492f91bd0e97a8a95c0652266d771e9b60957e16ce6ff683c1e38081372151cd8c7bea44ee1f1dd7bf435f8b00b9a1a23e4c6106c990794c6093ba10
 EBUILD netbeans-ergonomics-7.1.2.ebuild 2893 SHA256 cd56250980429160b8fa9deb17f15050d016394d5fdef19bf772cf29988c86d8 SHA512 32d4556218791a32efb8cf8ec8303f7e8f27bfb03b97af0c66cee717563c7e02fcd9e350b0425ec0cec28ab09865d4815aba1471ee958e05e7c42e421a7f71c2 WHIRLPOOL 318c8528c2338c1e2f6e342c263be52753fa74c9ac934b0ee60fe0fff2146e86d1761fef8eaeca8eab844709bea2196fbe181fad1f689a9d5b9994da3271b4db
 EBUILD netbeans-ergonomics-7.2.ebuild 2876 SHA256 ca7184ac24c255941c4ec3e686c4237ef0af4be7242c44417fa799813083515e SHA512 c6537bedf2fed4ea914c74a208124fe692af837ab2c81c98b8aa0347cb9d5af496378a8c042437facced26d3b42b101225dfa8b81dfc3d6ec4e3e5613e359f72 WHIRLPOOL c7e4c08ace118690f454dbf6a9040bff3e7013c646947fd02b05bca2b4d802393b6eca3234c6228f8e4df4da1ed193ecfd93c848038e4dd9ae3f50959692aa15
@@ -27,5 +28,6 @@ EBUILD netbeans-ergonomics-9999_p20130523.ebuild 2890 SHA256 6293b67d4bdcc630256
 EBUILD netbeans-ergonomics-9999_p20130525.ebuild 2890 SHA256 1082f758013986c5b45aa384e76c318620e4dfbdfc38db8d5e3c0799f43e4391 SHA512 0a013e6f6b9355ed1ed06b31bfc91ca387ac5802b2b64062247231313b3064363de96c87ee447c48de39a6cc7b5489d3526029acf5ffe25fd2ee17d0e3b176c4 WHIRLPOOL 2b32e01ca3b06392c80e84b8fbe90a6b6221a646b5f6338f9440ee535a28a4cc5beeaae77adb306a15a093c408a0e51b9c0f8fb1144a4821bc5da215d54c1679
 EBUILD netbeans-ergonomics-9999_p20130526.ebuild 2890 SHA256 f92a2a1f92204f6ec5e4a922eabcae8cd17e6dee7c19bffcfccab14c6ec43c7a SHA512 0f995ca89e13f7632930235105fc481685637fef010d4b8eec276cedf9f797264059a9914a2c23b1022962cd50a2e7e413b0dec24b7f51d0c61f7736c9ee33e5 WHIRLPOOL c7e46ba4edefe97b3564f98442587c0535b1d270c4388c7fbc0f0df287dd1a59d45f26023efef9ac3baf50dc7728c2a0debf3015015177d7565874699bcfa093
 EBUILD netbeans-ergonomics-9999_p20130529.ebuild 2890 SHA256 e2073fc88a28ed8b83bd0b4c189ac109172ff0d7e769d469d4232d0bb8f5038e SHA512 1788cbde6af3aa544fda75dbe3dd9e3dfa6f63002c5b3ae2a7423ff7e7b47cc885df29db94bb4af740519c23841a32ce7d8be7fe674d411413c1c4be839a85b8 WHIRLPOOL f95b2fc37fa5d6c90002f60aa9acc393cdb1583b9ee3f8a5e3f23aff9d3b150a61e2fbe243c84dcc2077d7edc70157f1d3e0494b21deb96bbba0a6a401b2c6e3
-MISC ChangeLog 82049 SHA256 0ff91f8812dd230bb84d1143d5e6c901c0b49979ed0174835c1c37db2f8c5eab SHA512 893f49a445988143ca99214dc69988b0c605efda251366414763fa870795fee64b0436fcf00ebe8e7a02135562d99c2e744d355e48208d7f81528481ade55861 WHIRLPOOL 03d6aee24ed46047101368d8e8ede2b665b6b7a7344c989cd4ecd70689d226ad4c36cc4e73871a079443aabe4aceb27ba1b5a3080e726756f5762dffb54150c1
+EBUILD netbeans-ergonomics-9999_p20130530.ebuild 2890 SHA256 1e2050ebd0b441e6cf8fdc3329d21b301e11df0ad79b620c6040fc4a4647cd8f SHA512 110c0b6c461f17a822aec304677d448e9be07e2ecfd9b9cdb598b8b06496d5681c2d08661295e22617f3ece150cb590dd51ba02b13e1a350d753cc44a302f8e3 WHIRLPOOL 38f5664f718420fe7e2d7e3e84b54d1829ce88d51443d66e15093ded00760829d694e1ab7d330fbf75a0079582ff814f850b790e31000df40c471d155007de3e
+MISC ChangeLog 82234 SHA256 8a471b356c3cc41fd6d4f800e732829af920eb4fa866073e2bce9074fdc1799c SHA512 eeef80e5f74c9506a92bd6fec9142c05b7530a02194cc26a3ad6e16c085edfcacdb616fdf6f317d75727c22d75d7501e9c864b24e1dc12234cf85dadee1fb6c5 WHIRLPOOL 6a25f78755dbea24139fbd5c31fbb806a9efbb6bede6a4896023be8b9678bd2af10dca4d6b1b76cffaeb9c0a991e19f88a5535de2512874b77fc72f299219036
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20130530.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20130530.ebuild
new file mode 100644
index 0000000..03aba34
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20130530.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2013 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 Ergonomics Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2013-05-30_23-01-06/zip/netbeans-trunk-nightly-201305302301-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r8-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.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${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-r8-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r8-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-extide/ChangeLog b/dev-java/netbeans-extide/ChangeLog
index 0af7728..f79b873 100644
--- a/dev-java/netbeans-extide/ChangeLog
+++ b/dev-java/netbeans-extide/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-extide-9999_p20130530 (31 May 2013)
+
+  31 May 2013; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-extide-9999_p20130530.ebuild:
+  bumped to latest nightly sources
+
 *netbeans-extide-9999_p20130529 (30 May 2013)
 
   30 May 2013; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index 9c9f825..b477099 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -9,6 +9,7 @@ DIST netbeans-trunk-nightly-201305232300-src.zip 187763774 SHA256 211672ba83f511
 DIST netbeans-trunk-nightly-201305252300-src.zip 187807028 SHA256 b2e70c316de0cd83aa2a1b0ae4f2e1da432199396564f77155b0b74d708e11a6 SHA512 c4cc20ff92b5b35f729539bbebc260452ab89f8c28b6fe986f3ff04f35a02a2039710291411880283901ad515d3ef62a15c615c74bc4df621970abadd0a50c69 WHIRLPOOL e61232b507ae121fd286e136d292f96cfb79a58c7b155a2743301092e209ecf888378fa81aa9752816fb6c2f07d5fef60a2c9fccc3e921bca80449b5cf2c4764
 DIST netbeans-trunk-nightly-201305262300-src.zip 187807028 SHA256 8552e30f84ea1b8483dcc1596dd3612121a068f5c36bc0093de4fda24157e41d SHA512 e69451b64003c4c4feb3b4232f6a6e51308b59a5feb9617217b43295d311ce279219b5a8fdbb2457bff512ae4fa10ea649b5d0b7eba424c3365e5071d56c4436 WHIRLPOOL 400a776d0034dcf78c833c7b80a99524a7634213462f7ad45297cbfa2b02cf70d4699e81d946d874135c4bdd23b07631df65db454214423368ebedbc89a2e0e7
 DIST netbeans-trunk-nightly-201305292301-src.zip 187953498 SHA256 00164aa21766eae8a68e648f3a838da04b98e48a91564bb0c8e7d02e8111ab8c SHA512 e9e3e2d45bf8db8a5c0ad0ef81020916f303554f26c032aea50612cdc9406c1b3c1d594f7fa08faae2676572eb9dc675a9d615efdbf920d61134e6628ec8fbce WHIRLPOOL 6481bfe8871154685314b9bae1c96c1690eb0d770f03a4708f603bed5165f0207d521cc48cc51b81432b98126f9089d3bc06a3c7bbf56347be7edbe2898a47c1
+DIST netbeans-trunk-nightly-201305302301-src.zip 187971727 SHA256 8aa8682d824dc611bfeadf594449af492c5f0403b8fa8daad0f28dd654365830 SHA512 affe9abba9c5970d8492248f46c0edd1d6f011ec1d2a9f238e94d00bbf9c53af563e0a6144b2781683700ec5f69273f956540efdb062746f3c91c545f8cfbff3 WHIRLPOOL 65f8f32ead3f9ce0f23b287f641b96245db0eaf26fa46b52f82843afcd060d9e505c39136980932e906f1aaeea37db4ecd073eb06ec779299843242d8c27dfe3
 EBUILD netbeans-extide-9999_p20130510.ebuild 3382 SHA256 90f80ecb2036459ff0b7ffcb44692f41fc177e08ee0954d4881966b16fd131a7 SHA512 a12f712f8f6e1c27f26d32db023958c9a41bd15cb981f2dc25ab5d1d3b7484abab8ac7edd2638416a3ffc501a0cd02c434ebf7a3cd54cff772f66c513266bf1e WHIRLPOOL 03f7bfd592d4def7b75ca179c84cb452fddac4bff5385f2e04e7be1b1f51e9733fd71ad884ca9ff0126e7b55af931331dd66fad081635038338ec5c7f8cbef73
 EBUILD netbeans-extide-9999_p20130513.ebuild 3354 SHA256 b37fba5bbfeeaa0b570d69671afde52c8b5fb6da1a417f574a89e6473e890378 SHA512 ed2027ef30b79a8c5c0dd4eab4b09bb9953f7883e8cc1ac3d2e0bf8ee51e220c7e562e3dcf5ac6cb153fdbb67ade88b49afbd21d8e32209a5a016959852ab7a9 WHIRLPOOL fee036ca2de1ddaac048473c2c0dd5ce871b753a747a2ca82c58044e7de72508b32394a82006e81904a32720d3efd9c8977d827a40744580e4e540b2ba843f92
 EBUILD netbeans-extide-9999_p20130515.ebuild 3354 SHA256 b31dbd95e1e4e3c4c9e9470bdb63930bdd64ba4e441d8043f5e2d7a1a0b51300 SHA512 e6b7e65b959c955ce90eab77e8229ccec3ba93ee49ec9743c95f49e4c060af678fbf7b73e87542038332800e8e862e04c652b33c5dc837bd05f8c22cca1da3cb WHIRLPOOL 379bccd6e3547485148190dbb7bf6126d5dc0109c9fc6ced34f7993c3958e2165161a28682db614430b6eb13c570b40966eb5cc1342b43f3b6dbe80c70870cbb
@@ -17,5 +18,6 @@ EBUILD netbeans-extide-9999_p20130523.ebuild 3354 SHA256 98bbd51bcd32262b73824fd
 EBUILD netbeans-extide-9999_p20130525.ebuild 3354 SHA256 7d5a13b7791667069558786a6b4b02756e599f56b50a788168df83542b1d04fe SHA512 af1e07b553c03d2f28d9fcbcba78f3d553e06883426a6e5a8b7bb3bb9a2d96a945a97072dc0b95ee843f4280785c88e37560d0ee38ba78221b7217dbac206788 WHIRLPOOL ed982a0fe98aec2b9567b6cdff3f879ee4bd3f3addf9106a320d3fee08533851a7353f5c5183df4fd60fce99aff46b38253bc737623e2dad9134a6b1accd3619
 EBUILD netbeans-extide-9999_p20130526.ebuild 3354 SHA256 51be794e3faf4ea13f0e8880b0ad991d5483a1027bbd9eca9d68b8299463444f SHA512 93cf5bba29ded306f07af670a2dca93c9b38e1447297fdabd5bc406c5192ce3f2414c096fb527b870e2b577776f50cd976c7670411326991c12561225c616ed9 WHIRLPOOL cc83eec8e78e64673f48f7ddd05461d46481e00ef24511c43f64d1d239b8f65fc43c143175c9817c0bb380e23e4256bb47f1ffebb7373d17acce446e06c0e3eb
 EBUILD netbeans-extide-9999_p20130529.ebuild 3354 SHA256 61f3e69cb8410f88437b9b8b1fad57e516e67a629705f3e5117ad8650fcc14ae SHA512 23ea35e8960a05f15ca4f5fff1ceea3fb5df0399d80500149251ac85ae4be1ada5e83611e9ca757e4a1a67be6405b6395f8bd1f2d48f6902f4a802f3dc2b8dd3 WHIRLPOOL f9c0e281b90f9d3ed107bc05a3d7fa0049d16ec8550803e1f7fae51164c6a417674e63e7a253a35c9a12e64e5138d5e8a20388058779d1a7ae0e8e3a624569b2
-MISC ChangeLog 10348 SHA256 818020fca84f2d69388aacc2f64088eae0bf4b2fdf9f37a72129b9865376c9b5 SHA512 83f068745d5a59a9a392e704c6ae09b1d80e04d0593e1a90e1770ef0842dbba511bb825616ed10ed9b22abe3b491eb9b7d9d80499e05e8b50c84ccd099b9ba76 WHIRLPOOL 067db90af704502fb74e9ea5e75ed8768b4671af34115667a3d88fed1993468ea489d2d2945f0d2f5e4d18e07790dc5ce6b88b95c7f005bfdb59fe2bb79c6e71
+EBUILD netbeans-extide-9999_p20130530.ebuild 3354 SHA256 53c4bcbf443434a220d5ef6b8daf8b2b3554cf7369ecc22c3ebc483beb89747a SHA512 2e1320c342a10c1abd43fa3154d8a55fc809ec4dff9c80e0be3143f103cbaad2da7a57146512d2a4ac6a95bb1963cf09a6596c95cd4d0b49078111398c8823d4 WHIRLPOOL 4bfca2b26e6637d3de8b66d918a89ac57fc4526973bb65e3b27c8d8e5a6377fab6dc4d7a7abcf6fab98d4d3c96943b0c90f36db3162f490cc23f771f8fd934ee
+MISC ChangeLog 10525 SHA256 caff2a7ff972b540d08f4bf212de66d62591cf496be3143cac263a9c326a581b SHA512 b4253a556372639073b9ba52799b6bfae548331c045134bafd48c424a6be83dcbb60582a9eb7b47859cdfc6c6416f4d84930d24011c239fdb443b8fd4edffd98 WHIRLPOOL a21eab7a4a819bfe08dceb0d05817517b4fc745dcb8e5cba130ef2acc0f9e8a30788f117c8c16c576973ec0a4ca21fdf46abd67c4d7dbf543944e5a589a5bcad
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20130530.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20130530.ebuild
new file mode 100644
index 0000000..781dfdc
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20130530.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2013 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 ExtIDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2013-05-30_23-01-06/zip/netbeans-trunk-nightly-201305302301-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r8-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/3B9300EC2301B54DD0D46CE915F016ACFBCC381B-ant-libs-1.9.0.zip
+	http://hg.netbeans.org/binaries/2508B4FDB639456646E2CC3135D2B5EDCBD70456-ant-misc-1.9.0.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}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	dev-java/javahelp:0
+	${CDEPEND}"
+RDEPEND=">=virtual/jdk-1.7
+	${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.extide -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-r8-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/3B9300EC2301B54DD0D46CE915F016ACFBCC381B-ant-libs-1.9.0.zip o.apache.tools.ant.module/external/ant-libs-1.9.0.zip || die
+	ln -s "${DISTDIR}"/2508B4FDB639456646E2CC3135D2B5EDCBD70456-ant-misc-1.9.0.zip o.apache.tools.ant.module/external/ant-misc-1.9.0.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r8-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_compile() {
+	unset DISPLAY
+	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+	pushd nbbuild/netbeans/extide >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/extide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/extide
+}

diff --git a/dev-java/netbeans-groovy/ChangeLog b/dev-java/netbeans-groovy/ChangeLog
index 2ee2b46..5f7da1d 100644
--- a/dev-java/netbeans-groovy/ChangeLog
+++ b/dev-java/netbeans-groovy/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-groovy-9999_p20130530 (31 May 2013)
+
+  31 May 2013; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-groovy-9999_p20130530.ebuild:
+  bumped to latest nightly sources
+
 *netbeans-groovy-9999_p20130529 (30 May 2013)
 
   30 May 2013; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index e7057e8..fbfd2b3 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -18,6 +18,7 @@ DIST netbeans-trunk-nightly-201305232300-src.zip 187763774 SHA256 211672ba83f511
 DIST netbeans-trunk-nightly-201305252300-src.zip 187807028 SHA256 b2e70c316de0cd83aa2a1b0ae4f2e1da432199396564f77155b0b74d708e11a6 SHA512 c4cc20ff92b5b35f729539bbebc260452ab89f8c28b6fe986f3ff04f35a02a2039710291411880283901ad515d3ef62a15c615c74bc4df621970abadd0a50c69 WHIRLPOOL e61232b507ae121fd286e136d292f96cfb79a58c7b155a2743301092e209ecf888378fa81aa9752816fb6c2f07d5fef60a2c9fccc3e921bca80449b5cf2c4764
 DIST netbeans-trunk-nightly-201305262300-src.zip 187807028 SHA256 8552e30f84ea1b8483dcc1596dd3612121a068f5c36bc0093de4fda24157e41d SHA512 e69451b64003c4c4feb3b4232f6a6e51308b59a5feb9617217b43295d311ce279219b5a8fdbb2457bff512ae4fa10ea649b5d0b7eba424c3365e5071d56c4436 WHIRLPOOL 400a776d0034dcf78c833c7b80a99524a7634213462f7ad45297cbfa2b02cf70d4699e81d946d874135c4bdd23b07631df65db454214423368ebedbc89a2e0e7
 DIST netbeans-trunk-nightly-201305292301-src.zip 187953498 SHA256 00164aa21766eae8a68e648f3a838da04b98e48a91564bb0c8e7d02e8111ab8c SHA512 e9e3e2d45bf8db8a5c0ad0ef81020916f303554f26c032aea50612cdc9406c1b3c1d594f7fa08faae2676572eb9dc675a9d615efdbf920d61134e6628ec8fbce WHIRLPOOL 6481bfe8871154685314b9bae1c96c1690eb0d770f03a4708f603bed5165f0207d521cc48cc51b81432b98126f9089d3bc06a3c7bbf56347be7edbe2898a47c1
+DIST netbeans-trunk-nightly-201305302301-src.zip 187971727 SHA256 8aa8682d824dc611bfeadf594449af492c5f0403b8fa8daad0f28dd654365830 SHA512 affe9abba9c5970d8492248f46c0edd1d6f011ec1d2a9f238e94d00bbf9c53af563e0a6144b2781683700ec5f69273f956540efdb062746f3c91c545f8cfbff3 WHIRLPOOL 65f8f32ead3f9ce0f23b287f641b96245db0eaf26fa46b52f82843afcd060d9e505c39136980932e906f1aaeea37db4ecd073eb06ec779299843242d8c27dfe3
 EBUILD netbeans-groovy-7.0.1.ebuild 3296 SHA256 29c3d304eca5999e78550fd715dbcbef9d15639d4e4f17fa0e45a46803080729 SHA512 43a0ddb43354bb3c0b8e29004ab547da508662d037b0006dfd24250c49470ddc0384bfffb6423f1e3eeaca98410c5de8b314a69970189306869a16380ab098a1 WHIRLPOOL bf626cecf6dec0c51e7e0b95ac4ff26a795e44a5dabd25719eeb2244742d96d33cb20ebbd9a68728dc27d28b8e558a7e2a3ee318c2e4fde234e0b5e8d32e6a58
 EBUILD netbeans-groovy-7.1.2.ebuild 3305 SHA256 1e00f335b8cc1e90deec3c3251629ba699286b25be5b6945d135d271004dc34b SHA512 3a1d67d02054478ed15e11789292fcce3fcfd343b8feebde5e07a9463c380c644310603a3f9f984e8071b0b097075809dce423b888e1f2aed316cb90a562d20e WHIRLPOOL a790c1e186c4d1949de6b4dd975b929c132e3e7b7c455c7867bd1445f59fb6ace72b5c9adf09d0c6079718fdc6c34a0c5f0c9c437517b55b7ae109ce3e20b064
 EBUILD netbeans-groovy-7.2.ebuild 3160 SHA256 6d709b7cc07d7ebb59c3ede0a19c9890ca3230144d7f455cf24d984ac2f633b0 SHA512 e30c8d58165b87a39a356f8b813c593910cd2c247de41420369fee21157c2f2881db34612711f77c9ecd9501aa6d7235ab7bc41d4092be1e68fab778c16d8288 WHIRLPOOL 4a6495ca077f3c374105b25698c8251aaa89daf56c2749bdc73867b0ea1ae404cfc7b2a8b435ef7b19f00aee8128be051c04d6a24fb631379fbe98d6854a507b
@@ -30,5 +31,6 @@ EBUILD netbeans-groovy-9999_p20130523.ebuild 3393 SHA256 f8080e682a58abc4a3e1635
 EBUILD netbeans-groovy-9999_p20130525.ebuild 3393 SHA256 f1335990db732ff059198ebcd83da2191ccc125d8cca3123e23250b12af96e51 SHA512 8b4ee01baaf5035d752f2e30a1027ec7373d6e282924ee6f9714f97728d530fd847f76eeb5bb50607f941f78d716faf21b8a4e3f41c5835bebaeaaaa8e4b1a87 WHIRLPOOL 13623c481b0c4d94dfdda9d480d08514f4c754edb249b31da4f202b54ed904f50de29ec2a714b569cc3e90224a414a5e9ed89c834ab4db8f98271c5e2d36594e
 EBUILD netbeans-groovy-9999_p20130526.ebuild 3393 SHA256 a06780a3e6d40fbd01a76fba19db8000e75d8bc89826f706c454798cd7bd5a54 SHA512 c49c7d255b408d94211c70dfc6159de0e99a071fdf5b30c283fcdb05f28c9023846451e996c1fafa48c8aa05a208de3e97744d489a38b721669ddfc24d710693 WHIRLPOOL 441e65526cbf9987b305de7088ef7731d62b9c4d74637eb6b3c47c969301613a71624a847eca4496f8a1945389da870898c703953fab6004c8f42306ddb4bd2b
 EBUILD netbeans-groovy-9999_p20130529.ebuild 3393 SHA256 138f3ed79b1c7f8f4d5276547d7fa775edda50a65d7cd3064f16f97d68187d0a SHA512 84b297014d4e7ba51af4431bf324c5a9e94c33128ca3b0ac9c144b7eb06df55f861adc91bde508e1b21b8c28c175a91cca8dbbfcd3660c063fb40c1725cac017 WHIRLPOOL 6ea205c2ec477b4c88f090bf00e533d368f5894fd340202cf9ff96ef7ed4da41d6ffe8dcf2b8a9974f29b4865c02b65b654c86453d051fbfbcb9c57d0f86c2d6
-MISC ChangeLog 78328 SHA256 2019ec381451be6c874cd5f25a42a07ebeb9ecd3798f3d1048b1da9c5300c055 SHA512 cf9e90d3d2e74eb95c4f799a2b2a9183137573d8858ac08ddb9b4d3311db603cf9cddee9f8cfda0c99ad9a592a36ca6b4ea8bc54ce5be0ab2b22532818a5ff65 WHIRLPOOL 508aee5cbbc02d8f19d6f9a707ac2e3ae4c5d6bce71a4d942b7ab584711fdc7cbbb9eac6b735e9b20a0340bc5e3599e21847c46561130804c8f6362469ef67a4
+EBUILD netbeans-groovy-9999_p20130530.ebuild 3393 SHA256 b432718092e71a4f0e97ebaf8a6e552854adaa7356778d28c6d7175af083235d SHA512 555a16407bf6bd1e9520893625ab154741b5a8051b628f090b34f8294a5bc9f95eef1af003c27f676f1132d837e904cb585aa47daeac9f1512137f5fa7359097 WHIRLPOOL 0d56809de061d5d9a5df29d6837f3b65d92160a66ba7ceae686a6b1b3c75cde0f577ff9057695c406dd4a107efe076023e373c29de8c364f13a49a1303cb828e
+MISC ChangeLog 78505 SHA256 12e2aa68e9e1cbf0d6cf6e249ad08e62ffd417e1a4eaa2fe83c504f37d4a8b72 SHA512 fe4ed379f0e606a3349587f4a65526c99e8a0745e074f773ed00ef01000d3794d87d92054f6422cd93f7eb2511d124ee3ea143fb936c512f1b924e53193c69b9 WHIRLPOOL 44f6946a724192bbd2e47628ff041b24a7c46335e40fba6fb74eacc8a8a102a3fe3bb4f8f78c2d1bfefb2bdec37cb01a585dcf4dc7cae690183531644f789ee8
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20130530.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20130530.ebuild
new file mode 100644
index 0000000..5da495f
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20130530.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2013 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 Groovy Cluster"
+HOMEPAGE="http://netbeans.org/projects/groovy"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2013-05-30_23-01-06/zip/netbeans-trunk-nightly-201305302301-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r8-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/DAB15E586F88BBBA1FBD38CFD3720CFF1F9C0CF7-groovy-all-2.0.1.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${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-r8-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/DAB15E586F88BBBA1FBD38CFD3720CFF1F9C0CF7-groovy-all-2.0.1.jar libs.groovy/external/groovy-all-2.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-r8-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-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.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/groovy >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/groovy$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	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 96983d0..bfe1780 100644
--- a/dev-java/netbeans-harness/ChangeLog
+++ b/dev-java/netbeans-harness/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-harness-9999_p20130530 (31 May 2013)
+
+  31 May 2013; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-harness-9999_p20130530.ebuild:
+  bumped to latest nightly sources
+
 *netbeans-harness-9999_p20130529 (30 May 2013)
 
   30 May 2013; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 734dded..0d4ad08 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -21,6 +21,7 @@ DIST netbeans-trunk-nightly-201305232300-src.zip 187763774 SHA256 211672ba83f511
 DIST netbeans-trunk-nightly-201305252300-src.zip 187807028 SHA256 b2e70c316de0cd83aa2a1b0ae4f2e1da432199396564f77155b0b74d708e11a6 SHA512 c4cc20ff92b5b35f729539bbebc260452ab89f8c28b6fe986f3ff04f35a02a2039710291411880283901ad515d3ef62a15c615c74bc4df621970abadd0a50c69 WHIRLPOOL e61232b507ae121fd286e136d292f96cfb79a58c7b155a2743301092e209ecf888378fa81aa9752816fb6c2f07d5fef60a2c9fccc3e921bca80449b5cf2c4764
 DIST netbeans-trunk-nightly-201305262300-src.zip 187807028 SHA256 8552e30f84ea1b8483dcc1596dd3612121a068f5c36bc0093de4fda24157e41d SHA512 e69451b64003c4c4feb3b4232f6a6e51308b59a5feb9617217b43295d311ce279219b5a8fdbb2457bff512ae4fa10ea649b5d0b7eba424c3365e5071d56c4436 WHIRLPOOL 400a776d0034dcf78c833c7b80a99524a7634213462f7ad45297cbfa2b02cf70d4699e81d946d874135c4bdd23b07631df65db454214423368ebedbc89a2e0e7
 DIST netbeans-trunk-nightly-201305292301-src.zip 187953498 SHA256 00164aa21766eae8a68e648f3a838da04b98e48a91564bb0c8e7d02e8111ab8c SHA512 e9e3e2d45bf8db8a5c0ad0ef81020916f303554f26c032aea50612cdc9406c1b3c1d594f7fa08faae2676572eb9dc675a9d615efdbf920d61134e6628ec8fbce WHIRLPOOL 6481bfe8871154685314b9bae1c96c1690eb0d770f03a4708f603bed5165f0207d521cc48cc51b81432b98126f9089d3bc06a3c7bbf56347be7edbe2898a47c1
+DIST netbeans-trunk-nightly-201305302301-src.zip 187971727 SHA256 8aa8682d824dc611bfeadf594449af492c5f0403b8fa8daad0f28dd654365830 SHA512 affe9abba9c5970d8492248f46c0edd1d6f011ec1d2a9f238e94d00bbf9c53af563e0a6144b2781683700ec5f69273f956540efdb062746f3c91c545f8cfbff3 WHIRLPOOL 65f8f32ead3f9ce0f23b287f641b96245db0eaf26fa46b52f82843afcd060d9e505c39136980932e906f1aaeea37db4ecd073eb06ec779299843242d8c27dfe3
 EBUILD netbeans-harness-7.0.1.ebuild 3579 SHA256 f4d09cb7bd5e8485caf75a3020ddb8102d3ea326878ac384ef4aecb011a1f6a5 SHA512 390c26b4a3dbc81ad1ef210b3ea668926398cb38ea13fa37dceb6782b4478b1ceb7a49e9db300f691fb8b31c21c56b25f4c3237c0890f0c637ca45f596c88294 WHIRLPOOL ae1e34af6dd61c30f645f39a825b6235e3eb1f9a42dd23431225513733209a2eb225a741b75342f827a4be0ffbf41b9786a6a6430051f543c321abe3c20da6bd
 EBUILD netbeans-harness-7.1.2.ebuild 3587 SHA256 e0adc470109009641bf48569623bf0fc51a400ac1ba686475c7dae1a5b561c96 SHA512 e4157a6b294c17fd7430802b33253d473120dc16173557e0d7840078f4043a383d5e3672af64f124509e54cc85d590abfa4375f181a32ab8b49e976cb6613cea WHIRLPOOL 423a5844a2c55ea99db4ac78e1c605a55a04f634601c0ac054e739c0ab4a3e9c765778dbd81ccf4a1e50e9d9e4cc29ecfad2ec64b483197927f434b67cd4d773
 EBUILD netbeans-harness-7.2.ebuild 3421 SHA256 47a5281d140b47e0235592c58657a9065d1827175ccca7d0c73fd81e90710090 SHA512 403fd1f49e11b27ef8002c4066fc911dbeadcccc7adddcdded86c6cd95e8bddaf0603c0ccafd0e91ef31a0909508deab1eb326e98e621bcbae7304413acca291 WHIRLPOOL fe3c5f95a606db39861a80201c185cb5a25e2d80698ac78ff724587b54e859f861b834b89aa79aac22f2c5da700532eaafae67fbcc33259ee07d578ba5c7f9ee
@@ -33,5 +34,6 @@ EBUILD netbeans-harness-9999_p20130523.ebuild 4102 SHA256 bb6aadda9850d8763abc98
 EBUILD netbeans-harness-9999_p20130525.ebuild 4102 SHA256 509353453c63bc8d14ee40c4fa8601c8fe940f7a1c064ada110a166d341bd6f7 SHA512 6da51378dec4d67d93fe14537278bae59b7923ff342ed1be0fa68779de898d3953903e19279d739439b4c326f66789451fb8743f727a6c02880e1c40dd5cf630 WHIRLPOOL e852838fc2f77094331638fc70d317720271f312738e4e21ac0c0045a0847ef06b363845d78ced97dfb0b50a1e6d4a2691d4a8311c78f7979285de80df5e88dd
 EBUILD netbeans-harness-9999_p20130526.ebuild 4102 SHA256 427361e4ed90f7386bf701e6d7f804f0c1230bc19f38d2e4d80d0e0ea564913c SHA512 0f1c4b45b59fcbde4870b0d4cd592b520c2e020ad295d5a9a521234a87da62539e1539869164c9e57d1524c4ddf99ea162b80677bb1524cef8a170e73788e706 WHIRLPOOL 6775bb1ff5878526f51101164f54e1ae7ce6edf356a59b4464522f9adf90feb6ac45ed22cc520a1ea7caef4a7b838bc7dc74de03e42cd119382bcc00961396ea
 EBUILD netbeans-harness-9999_p20130529.ebuild 4102 SHA256 e18ba5bfaa32c0a059626e8244fab83bfebdfe04a346f8ff17d5fbb2555c8a5d SHA512 d540c1e28a7e1146afd20d6c8375680e70e5518953d7b48786b2ba0590f4f5d5084a603bc5a8c516e194802ece7df8c372691af8d8c2d14475f9b93b4068e72a WHIRLPOOL 7ea8288c696db8ea0e2848db92c86e5336eca873be0f8f3dedbf0f0e05eca17eeaf1981b811533d64dca863f049d5c3520ec03c77aed6b317fac413298e90c47
-MISC ChangeLog 79287 SHA256 04ca34aff635bfcca17b41b4ad74501f3a978bc9f9e33985538e880443e386f1 SHA512 70b60012eb327d5072eb1c235b9e942bbca23ac8c640114e356b972ab512c87f24131934331595d5e0d11d3333c437ae3b67c23b2f0a64030236ff3af3e789ba WHIRLPOOL e62e819410dbf4dd72f542c51e03ca9461c5a7a3d80c5f2f486c43fe8ba593309be1215b14803aba61adc781883982954e95c8291546f7bd37a5199b99ea124e
+EBUILD netbeans-harness-9999_p20130530.ebuild 4102 SHA256 35843658cac5c550e47dd3b255961cd14ae972efdd2e80a70bbd595ed449870e SHA512 b8e0393b7ccfc27319c8a8209a3de7da80da47c13693b179f3c81b1d2fea240a2449b1e23a78d6282a6743cace15d4245ede4ebdee76c0904860cba8b71d35e3 WHIRLPOOL 673056d675aba4ffdf9b41e4a0fbb2d371908c86d23f8b0a4abea780499d106b26cb4198202bd8e88dba7ecb0898b08f56bc3c4658b4086d5b7c0cae8ad36bac
+MISC ChangeLog 79466 SHA256 df0c88d713f92cacf6203074fe276f210d2f5e666e98670c3bfe1e1d70e93a5f SHA512 254cb6b5ae2ce2e3ef7c02d7fbc4b2e819bc30caea80da3cf32551d77128bb351312a7b3f38c1cbb49a7e232113bc0cc04dda8a50973c187b2e7c26b4528936b WHIRLPOOL 0a642f4b0ce15231dd8064486730995f1ae943ca809bbe01ec0981207f743ed68f8a7a1e1af53968127298abe58c816807fb6c7ef3bd5c4c10614ab1fbe9e986
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20130530.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20130530.ebuild
new file mode 100644
index 0000000..365974a
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20130530.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2013 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 Harness"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2013-05-30_23-01-06/zip/netbeans-trunk-nightly-201305302301-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r8-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
+	http://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar
+	http://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip
+	http://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip
+	http://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.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.7
+	app-arch/unzip
+	${CDEPEND}
+	>=dev-java/junit-4.4:4"
+RDEPEND=">=virtual/jdk-1.7
+	${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-r8-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}"/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar apisupport.harness/external/jnlp-servlet.jar || die
+	ln -s "${DISTDIR}"/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar jemmy/external/jemmy-2.3.1.1.jar || die
+	ln -s "${DISTDIR}"/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip jemmy/external/jemmy-2.3.1.1-doc.zip || die
+	ln -s "${DISTDIR}"/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip jemmy/external/jemmy-2.3.1.1-src.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r8-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
+	rm jsearch-2.0_05.jar && dosym /usr/share/javahelp/lib/jsearch.jar ${instdir}/jsearch-2.0_05.jar || die
+	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 2b42643..3e00797 100644
--- a/dev-java/netbeans-ide/ChangeLog
+++ b/dev-java/netbeans-ide/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-ide-9999_p20130530 (31 May 2013)
+
+  31 May 2013; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-ide-9999_p20130530.ebuild:
+  bumped to latest nightly sources
+
 *netbeans-ide-9999_p20130529 (30 May 2013)
 
   30 May 2013; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index db2cfd1..bf5a35b 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -1,3 +1,4 @@
+DIST 010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar 161749 SHA256 c2796b7d2b374f82ae6e4b89cab5b27fcd075c01829e10efe184a2fe5e8749a4 SHA512 4a3c60974562aa45b11341b610abdaa22de6af183c19c1c01df63afa107b53e6d0079f19ae36bf1acb2e4428996aa2c349acc2442a0a25124929da53b07739e5 WHIRLPOOL 51dc17ad690383ed1211fbaddebc654c6393e20451f4a4eadbb55d93d31987eb4f5bd0d479a690aec447e89f83c0c40a075104163cfe68141dda18eab910ddd5
 DIST 02C39E6C02E2386D4936245F90AC4BFA5A7BCD49-org.eclipse.mylyn.commons.net_3.3.0.jar 68005 SHA256 9232c82c5f708b27821c4782a7a7dda2267cce41e371416e6af717ca58b06bf0 SHA512 c0aed9da0b06bf4c040cf787d49ca60b4820b26e2f4b8866cfe43ae8b718718732a4e17177969d624b7f4dfe0a8d7047a22580c97f3a852d96ee1079b435f4e5 WHIRLPOOL b4ed985c58c185933e18b22285e65cad896534ca8ac1d06cae0f0954c62601206764d72fddc1fa8a29de2cbaae7cf7dfa285d225b4b609a6bd87ad9316ffe2cc
 DIST 032EFC784E1DE21E4093C08F336C7582F5694760-org.eclipse.mylyn.commons.xmlrpc-3.6.0.jar 36601 SHA256 d714b17381ae7d70634e1c9df5a0e02932b218be315fb67827ad6a84d4659a40 SHA512 c074eef860f302103f95681e1bd79bc43566a14cf43acaf7b950a234de1da93cb1294df9d41f4e537516a5223e93157a0e3ee113acbe73027910be37112124c6 WHIRLPOOL d14589dafcc8bf4cce0d2e6d94e07b278ed3ce6e9bd1da8c2cfe1c634594204bd2ef6000576eb35f06bbe52468e638bf0d5d79410a11472711cd6aee7b8d9a54
 DIST 04E3664261A296066E6650DF19B23691979589F8-js-reststubs.zip 8448 SHA256 a701df323ef95d3e52edf20fb1f9d3678371e07973ff0272eae09bad3cd00b7f SHA512 864804f4612a0528b8efffd3d57cd90704ab63af34ded7306c68e1b6eec8bcc8c0d671bc9752f1bab8a1742c62a86ec35b60b22df1dca653c7bbb40d156eb315 WHIRLPOOL 34e23b11a11bb251a34fb8a1ca7d82145c838c626608b3af63d1cbcf8c619e89dc9331ef05ad20e37f2e13f6b9a0c18fb076b2f682f62940300f1ff90ffd1ffa
@@ -33,6 +34,7 @@ DIST 4617423828BC2E79A1871949C2914285405D8EFF-org.eclipse.mylyn.commons.core-3.6
 DIST 46735A729401036FC2C14CC05257ACB4CD4F6906-org.eclipse.core.runtime-3.6.0.jar 70928 SHA256 d6580fe773124183cc298977bb2cfb6204f49fdd1d6c943d7982c9459495e296 SHA512 f6ed0d763199550ed60cd7cb8020934a8fd6e486578d3d85616cb4dfb54532a52e1030de6a4ef6c913affa72821cce3bc5fbef5138426242213e68cc8eedc446 WHIRLPOOL 19cd48ab7be89e0a712d3eef1c9cbee546884242ef1c953169b34afc7391a4a8b4176b8c3408cda92fc86fb2b70aa316a1ff331e9743456804eb879ad10d6067
 DIST 46C29693545F1FE541EE810F42C4A3A2A6A0DCCF-svnClientAdapter-javahl-1.8.16.jar 88172 SHA256 482487dd78f7b3fdf5d26b61c513bcabc97a98e651919d6325f22f4dffdf88c8 SHA512 4f464597bc8d3e5f66a8d2806e54f2afde6be6d729bd46158a6e9fd27ef980a194fd97f467d4110c73e71d4754ab1de3d22270db8430b3a3ffe8fe13ceea6320 WHIRLPOOL 4042e6d3f6fbf4defba6c3fb6e05089a77548b15159126b2ec99e2dae1eec1d86bf2ca360e1cfd9c25bf8444419b073cd800a2f0443168dfca5805165ec78ca0
 DIST 482B4CAA825398AB48969AADE9DC32E8C2819AF0-glassfish-tooling-sdk-0.3-b046.jar 316136 SHA256 2837d8f37e5c2f8dbba0092ebfe462ef216966601c4973453dc69f4e50a8aa4c SHA512 19db4d1ddecaed1e64a9d6c69f67aa0e97c488acc9f88760400087cc0afc8ac4723e39e1de16a9ab98d2807d2a7f8483e055384ac95d3286ea2a327171f4ea3e WHIRLPOOL 0e8daad4c3ab05aa02d74378b04cadaf1b054ea24e8c2082d21baeacba58b8a5af916bdcae4bfe43ae76da325512746e4d283bbba4daefa4e3891e86846fae26
+DIST 483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar 594732 SHA256 0131ee193a5eaaa2837f8be26e932256cf310b97ebb975b721f6e79ce29eedca SHA512 84a110da6cbbafc38bd1d15c88fcf28793175c906d8a273fe9bab014348bcfa68eab01d8d821c27275278d4b4f4c083356032eaf779e8d9fd537f39d30e03069 WHIRLPOOL 322853d2c5da5a33afad2e9f8254ba399b80e0b417506be77edd963a4a065e7d75bddb073c9d6c5a3613a27b72dcee835eb1bb5631521098c635d62bb70d72ab
 DIST 491025C38F84A6FF9823315A74A0CAC4C30E51A8-org.eclipse.equinox.common-3.6.0.jar 101958 SHA256 6846af5e627e289ac025ffe3fa65ed5740a5756a1610f6f7a2f5aba02df44838 SHA512 867e7b93cd1f543b47ac535d32442105a811d90114a349f6d611d089fe6224d3da6cab126d898b18f730c890552baa9b19bb32621f37b55fb7718a6eb8674b53 WHIRLPOOL 2b151459304a43fc710237521bfd66a07bd8c8731e2cceca2ff4b33f8a5bcd1dea08c99ac71e296043d2377f9ae06c021810abcb2a940ee24302d640f56c9808
 DIST 4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar 164365 SHA256 8633aa79a2566f51a089195e09a4581af3ee71bfc13eb234af5e0cf6383078b4 SHA512 f1300e2d1e47659f6113a0a3dcc953766b5a8ab32f13bedf4d6ac652ffcf828c17474d47edec08d7ad9039d7abb8570770b48fa53b8ff6b47a028836490777bc WHIRLPOOL 765c87803d9cf622ae7936cb922ad9bff8823a09baf01a6c8b4a81df8ba5fd7cd17b513b36da9910b75349de45185f4641680f35be8335e08b9c30283b6d3345
 DIST 4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar 3778995 SHA256 db07fac55e4d689ab4e4107c67679aff116788f488caf35980bfcf7792641651 SHA512 3d9f273fbf1187c69f88a8d5741841f9b6ac0edeb8dd9df0610390bc4f7bbafc63d872621e26c5093dcb792986657ae2d0f691caedd249f7b861d0a552134d58 WHIRLPOOL 7704b47754260e085a1fcfc2a03389e25e7896d4c64babc7b663b510c7eb4dd3289b7e0e8a8f65fc5093eeb8a6e5517ace9d1111083fcc937501555395baced7
@@ -55,6 +57,7 @@ DIST 68B82D7246FD90E0FC70BB9C8F10611489BF371A-trilead.jar 251371 SHA256 d2819211
 DIST 68EA2A422AD4604636F50BAFD91EFD7EFC7276A4-org.eclipse.mylyn.commons.xmlrpc_3.8.2.v20120916-1200.jar 36092 SHA256 cbb1b1993403541d1b385f2eff15ac0b90fc09a4a484da7ae4b16f73e41f6655 SHA512 c1095c03ee4b5c556370b7ac72dc0a4411c3901ced8d8ed2c74b4c3fc82f169c04b6dae0aa9cd2d155f670776de070da0424a29da750377f14e3c803b171152c WHIRLPOOL 1e47e25ceb6debc1c4ba291a7c15ca8cf0a4dc1e2598eda27b6764b88a3981741fcfc13afbb16a71907ab0354bd7820ff309cec76d93c892d95c6e7dedb802f5
 DIST 6990481339073957CCAB02AD181BFD8F186F5002-org.eclipse.mylyn.commons.repositories.core_1.0.2.v20120916-1200.jar 44609 SHA256 95a5545f3c5ecac5db3df855190ff2b9c523a9f6c42b941ca90eb6f6fb84b4b8 SHA512 a0fb54b5e32930bb64a101f1c8725c15022af27e322b75263498e13f8e2ec1d3a78e66bfc44a05c330d60505955145ef2470d27028c4f6b0117818f993be3bc2 WHIRLPOOL 1b9c4545f77816cd1b1316332c489aaa5b9bd5ee4e6e14ee370095c3cdb9c1c682dc860247fbafc915cf62e6c922bb3b16a136df3f31fef311d8119e751b9310
 DIST 6AC191F42860D1698C9268AE044AFAA5FE806CE7-org.eclipse.mylyn.bugzilla.core-3.6.0.jar 247078 SHA256 eaa460f3740ee4f8fd7c278daf98cde55f2b0f58fce72bb2f6d39a655a0104dc SHA512 f9e41c47f99141e187d91ece000d90f7d88639a044c9e4191cd8099c421961d754bb4969bf86afc4d3ca34876487d785d3c6d4ff7008a034958ff2da60e3c3d3 WHIRLPOOL 8641880bd58a488d06addd6647c3e00acd42f9015e794f6184f84e1873af59f6ab297d265b2e1dce0b8e89ace07234b98e2b816ba2ad0135f26b157fe703cf75
+DIST 6FC6098C230D7CBA5730106D379CBBB42F6EC48A-validator.jar 2049845 SHA256 f6f9415729b3e700289d895d9a3d658e23bb25cc72b7087ed83c4cfc4c027076 SHA512 3348b71375e83e630c8741c2e0c0e95386ec76675055b20ffecf6dba75263b1ed203193561307878073331a01684bee3f65248f2b106c52e39cdf4971d0b3e99 WHIRLPOOL 0564d4ab425fac7b1dd18159562a187ea3e1d6ac0709341e0ad9551446ea870ff97c24bfc7c742df83a46c73e3868c1d1c6c93191c3577818520b86c9af70898
 DIST 7052E115041D04410A4519A61307502FB7C138E6-org.eclipse.core.contenttype_3.4.100.v20110423-0524.jar 91961 SHA256 6da47b0a00d62966e0a8456e516c8afe74e761b3d9eb0008efd7635cfdc0080a SHA512 26aa2c4f8a00bb504291054e651d6b12d44aeac8abe3325c61a18047d800df9718e8d9367db1576e02408c0fe9c2c9a6e1a707983d8c9c2e9dcf7ddb6c1101b7 WHIRLPOOL 65f09d5ea0a10f549d2c3f387970a0b6ef0383ff10aa837ef794987ff07de6da883cc1fde2966ab5734ceef96eb3cd719d80e7d1a54d906c5b390de460086be0
 DIST 71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar 99570 SHA256 55f9cf74e16ddadcb212afbb73bfd4b9b3dcb47eba79a48421cede9b303bce3f SHA512 5056a55f5ad60e14d7f585288e70da9db87676520a4d81996f7b3deb34b5214cdf519b448a2202193b3b8672a7b2e86345ac28a451723d50678560439c4a8127 WHIRLPOOL 23a97603fd1dd817bdf1786196611c8af35ada3911c14a057b0cc4bd91f432f230ba96783af930547fbe0444236a84d30789846c5679a107005a8c027328213f
 DIST 71F7D2D5A3CF17CECBD15049A856BC0245C95C56-js.jar 756883 SHA256 30bb058a39a819a85e5957672afbdb717d8cc9fc9372c282f2128838311cc9f8 SHA512 1460df312f5acc509536c1d31adbeb6b2ba9a615240981b6ddbcb0c20a5bc2e4281c0a79060573cfceb4ee9cd1613dd30c27afd20ba8c7aabd2bb51a26806e75 WHIRLPOOL 420752a1b0f231687859ca5b4b76c2bba35b4d72d1df4af7ef64d3af1e091e43b9370f5df7fe2e75c4567d281d8587c92a033f5955c166c859a75f8edeec99c3
@@ -125,6 +128,7 @@ DIST E671EEFAE798BCAB90CCDF9BCE7BC9BF32971E0B-glassfish-tooling-sdk-0.3-b047.jar
 DIST F02664A059617D060BEC3EBA0BC002B2102AEB84-jaxb1-impl.jar 980264 SHA256 c11e41f2ab089113949870b570298d5873aad61d7112ff19a0e116b95150f4ff SHA512 1deb53b30cb2432d1fd03ac1c9113ecaee66fba5783b404ab5d692a14a0a2255c8a4509a35b81211c49a9e20a9ce299e146cc14e1df47a8e073833226112273e WHIRLPOOL 797173ebebaf3ff60ced9664cd5f09541f0690e83c56b8e296d99974815f240d6843c02080381abdfdf12211b896d3bebf1880629426e1a0e96c8b74d3bafd81
 DIST F3885B903DC60BFD657520250788137D318B7B3C-jsch.agentproxy.usocket-jna-0.0.5.jar 6346 SHA256 9f6d557dbc2507908202c3f7e5915617c1faebbd071aed01fc9dca7389697331 SHA512 dc65b2b3b155bc6b48f03fb04cc33a87ca8abf6d2959822a95a63e1f670af6b02fd8e74bd5b59c9562375020c42e6c4bc67775e08ac6154b94954d248d1c563a WHIRLPOOL 9f468cd3a3f4191b865036453ff21d7d2a6786f7f9a0a828cd124b8913d5160bfa9377473a078d7e488d04a6a0d4a1424bf4c1030e3ef7426a7d52ad63d31409
 DIST F411AB988320260361C3611714CA5AF1480CD1A3-org.eclipse.equinox.preferences-3.3.0.jar 111095 SHA256 a0120a7b73e3ac45f3e1b0a8e16288547a754015b241f4cee2b75e61b6e67173 SHA512 bdcb654a13984d80eb10bacc7a497fedc99021dc39a3d85254fb2449cdd54d1473147d09581b9d352f1bde325eaccae112c2195197c75a705d8f455a17b66887 WHIRLPOOL 1a4c71d476a2ad9d6f0b9598fad0e5981ef560c4c107f5371ccfd50192c089f093ea8c1192e231fa3513b89aeed153ec9ed9543b26c80354e792f97a1b0e77b0
+DIST F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar 142009 SHA256 3e986bea88f686401b10c9fc635cb4bb2b6e56654ae9d4cb014fa97775ec395d SHA512 55135126a1c66a149dab0962a584de04f604e5db4749f6607deb0bb9411b15b26c9ad70e37a09d1efd185dc70194515d62198fc7640ba13c3923d07a2ab58cf3 WHIRLPOOL c9f6955a57c372b594bb8792670976f40b6c4c8c67740d20a1faff324f09bf1c79b66776b60e97f470b83846694854bfb354cb43f7772494f15170e4a98d0566
 DIST F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar 1077617 SHA256 20e68ea3ae1d239913b87f6ae800c9338053f438a8e5c2225b1fcd0ea48fffb9 SHA512 c7faa01d25b323f63604f17602c62cdf3cec9fce542cf51c0666d6042db37efb9ac0296da0244a83ff4738ec44c2a67ba6a2550e0acbf621ad83a9b7db56ebe0 WHIRLPOOL a712ab19ced51550d251db7e245b0619c8e67c84f06006532296f65f1fa9b88ce8c4a7b85a7a10c22d5eef151142d7160a91219b778d7523d172ef92f7058452
 DIST F89D9ACAC53BA5C0D7179B473E0BFAC9BFAEE3C4-org.eclipse.mylyn.tasks.core_3.8.2.v20120916-1200.jar 402233 SHA256 7314da91e8d3ba3d2e3deb289e4f25a4c935e509b76fc2e5287fe0c10b35e715 SHA512 bbf39ed6f2e04babe5182517894e07e4f58114aa14c90be6d01217c1805ade3fb4a0e8dcab9f2c47f855501d5528531bc9c450fce091e51dc0844162dd5cdef8 WHIRLPOOL 9dc4c94629c9eb6d6fc2b7e5aa71f1ba647c419ea33ee0fd8fb0a8ebe415d06940e45cbcfc797b1389266ab2995a406defbb0863d912f53c0b88caa525135d32
 DIST F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip 459564 SHA256 bc323866c2341105db83621fdaedf14a0076fcbecfe6ebd8361726e76a6fb3d7 SHA512 8add9ad7e3f2fb551c11841ad991f204dbeadf7d88cf2e10609644deaa1012095579fb32d568aa67715108062836b48d5c17fd69d5b61d33bca38ad85a617ab5 WHIRLPOOL 23e901a031122ff301518c1da2df9a98f4ddd1b13e9d2c22f0dc320c181d60d1eaca44e0f2d2b651f1ca30b6c001a3efe831d049bdc8f0f7eb8ede5b21e5bdfc
@@ -147,6 +151,7 @@ DIST netbeans-trunk-nightly-201305232300-src.zip 187763774 SHA256 211672ba83f511
 DIST netbeans-trunk-nightly-201305252300-src.zip 187807028 SHA256 b2e70c316de0cd83aa2a1b0ae4f2e1da432199396564f77155b0b74d708e11a6 SHA512 c4cc20ff92b5b35f729539bbebc260452ab89f8c28b6fe986f3ff04f35a02a2039710291411880283901ad515d3ef62a15c615c74bc4df621970abadd0a50c69 WHIRLPOOL e61232b507ae121fd286e136d292f96cfb79a58c7b155a2743301092e209ecf888378fa81aa9752816fb6c2f07d5fef60a2c9fccc3e921bca80449b5cf2c4764
 DIST netbeans-trunk-nightly-201305262300-src.zip 187807028 SHA256 8552e30f84ea1b8483dcc1596dd3612121a068f5c36bc0093de4fda24157e41d SHA512 e69451b64003c4c4feb3b4232f6a6e51308b59a5feb9617217b43295d311ce279219b5a8fdbb2457bff512ae4fa10ea649b5d0b7eba424c3365e5071d56c4436 WHIRLPOOL 400a776d0034dcf78c833c7b80a99524a7634213462f7ad45297cbfa2b02cf70d4699e81d946d874135c4bdd23b07631df65db454214423368ebedbc89a2e0e7
 DIST netbeans-trunk-nightly-201305292301-src.zip 187953498 SHA256 00164aa21766eae8a68e648f3a838da04b98e48a91564bb0c8e7d02e8111ab8c SHA512 e9e3e2d45bf8db8a5c0ad0ef81020916f303554f26c032aea50612cdc9406c1b3c1d594f7fa08faae2676572eb9dc675a9d615efdbf920d61134e6628ec8fbce WHIRLPOOL 6481bfe8871154685314b9bae1c96c1690eb0d770f03a4708f603bed5165f0207d521cc48cc51b81432b98126f9089d3bc06a3c7bbf56347be7edbe2898a47c1
+DIST netbeans-trunk-nightly-201305302301-src.zip 187971727 SHA256 8aa8682d824dc611bfeadf594449af492c5f0403b8fa8daad0f28dd654365830 SHA512 affe9abba9c5970d8492248f46c0edd1d6f011ec1d2a9f238e94d00bbf9c53af563e0a6144b2781683700ec5f69273f956540efdb062746f3c91c545f8cfbff3 WHIRLPOOL 65f8f32ead3f9ce0f23b287f641b96245db0eaf26fa46b52f82843afcd060d9e505c39136980932e906f1aaeea37db4ecd073eb06ec779299843242d8c27dfe3
 EBUILD netbeans-ide-7.0.1.ebuild 22653 SHA256 4c1b3e46e2a6cb89d902c7f4fe6ad9306cbd0c9463a514e87d4c6ec019dc0356 SHA512 5dd526a85a70720686c612efb3aa5602c395111d507b91ae4db04c5814b27bafd1480ab7e44e1148b7412f768543110ff58abdf676de303cd3be9d87b87bd373 WHIRLPOOL abaedc56df115c6050ad7824929ee959ba1669fc1f3f9d4cd1eb9f9f948a608828621f46aeedd0b6062c85b1ad4481d12f952a504559e52c110ff37b88ae0d72
 EBUILD netbeans-ide-7.1.2-r1.ebuild 26831 SHA256 2643a4435aa093e292a2728583d8ffbf213dac6a13dad8e47029ed13a2478493 SHA512 5ba14c7b820f2daae788588ae2fdebdc8af6bb870d6ed56adcc2d43810e5dbd2ea21ae639e6b864d6d0b1e69c9aa4f86dfb15e99eb4a170434aadf0109ad876a WHIRLPOOL c9367735f073f9fcf6bb992b6d481aaea1ebe8526907cb6366d432a3f47a0c4d76bc9224206e0e512708dfe896b465878a2a1ad68836c7cd9b51a3a4efa2aecc
 EBUILD netbeans-ide-7.1.2.ebuild 26834 SHA256 1e57e60a1a00b4530f917319b5d8eef915b9669b9dd3ab82b5afabe171d8959a SHA512 4242265c0783a87c028f955425c86596038aa477e3256ff8ba244220a573486bb7f2e47b07b3c94fbef07940a3b32c313a1320b58656a67cb15a490e7307b1ca WHIRLPOOL 1e23b1e4370292500f154527ecd7a0e7ca315ee73588806413f630355677ee8fe9318a0e672b5f6ad60f829c0a5579b37eedbd737bc8ec154aba9f59c53bd337
@@ -161,5 +166,6 @@ EBUILD netbeans-ide-9999_p20130523.ebuild 28767 SHA256 cf9fda94c584958afd343ce91
 EBUILD netbeans-ide-9999_p20130525.ebuild 28767 SHA256 3b670092ce7136c0670d39c8598151059c8c0e1a5f6d37427275cb9bc6d33e14 SHA512 3e74fababe963a1e3c7019ddc0db663a5c8757b0063a0ba1fe5bc94a9ce3709b79416eea9ad7d993c7c94505ff59e074a669bf0f9ba7f510decf1acc8b30725a WHIRLPOOL 3d391a48b1183c56814c4e8ff8d5c9049a58cbca46d95d63f1baa7cd71a2e9f258dd543aa14bce07d24c87bcc7cb29444e011ca9ccd495cec670f21bd3a92178
 EBUILD netbeans-ide-9999_p20130526.ebuild 28767 SHA256 04778343f43739c8e8550de5cb061293a9f089c9b112026f7eec9ed3d23fa798 SHA512 e96cb5a84186f609b7fce56a4d693a0d41a02f075d81780e7a86023f6929a3458899ea288399c7671a78c8130d3005f9cacc9df4cc6b063e4d1feec77eb2dbea WHIRLPOOL 67dac7c59a2dcb97cf7722a41b5954d99c9b496e03816cfd69849fdb56e45fe354f2c0475132cc717ec2305c7b250f19464499c29b9646195acdc368e3627d47
 EBUILD netbeans-ide-9999_p20130529.ebuild 28767 SHA256 2a2405bcdb032c48bbb61e107a29783ea425c625dcf7ef57fc953aa7269df6c0 SHA512 08d882e8d5e108a14a9f99bca94bf741a1938e6075e4960f9e7e83c0b9b6387f1ee2dc9bb34ba0c3cba419104681cc930fd33f94f7f42917984e21b9daef8379 WHIRLPOOL 91ff3c22ff9e5f6e747f359ae37587fc7518f7b723a635aad8c557b0e762691dfbb83efbc8ef05322007c9fd89fee355b2c46e52659bdbb7d10bc18588ef5cef
-MISC ChangeLog 76253 SHA256 417960695381f07f400838b52e060058d0728634d2c58043b22f0ba491620dbf SHA512 6cf738bf15bf400c0594ca65a9532fc7bfdc9a9192f456c249556686240e1655b78745b2be98b8f61c61eeedcc0eb2ce66566944aa53058412411d97e07197d1 WHIRLPOOL 9f3588e359da0bdf9fee70c222ab26c58234602a3e53f40e5b1e5e8da0ede18b4326be231b87e9047089f6787015b939b7b43124d4bac828a5132f8f71ad57b6
+EBUILD netbeans-ide-9999_p20130530.ebuild 28600 SHA256 3a2f646a0950d08631ef61a82a9aa272452ec454ebf7f2f03521232f0f708683 SHA512 734ce68255ebf9ee610425efdb10eee67d5a3f524374a65ef3e0f473b8765f2ffd7c2fa87984f4af6602d07435f24992964df89a2b7656379084255037f2df2b WHIRLPOOL 6eb6226deaa30c0c1302da144d4ec2aecb503bc411f6974c02d428504f42437bdb086a2cc2cd5b8f1cec68f0e85111a1e672a9e034e5575f84190e796d5fc249
+MISC ChangeLog 76424 SHA256 4fa7428825b2f3b6bdc9c04c6c3c643dacfbc44afb67e4187c57ec83471dd608 SHA512 0290440dd601dea3ac179dfb370f9f49c9aeb26926565740ae5376280e7421f9416cda1f6472e4f38f1c8c25c5db0f237da2f57df06dbb90e91e0bf05bda5f88 WHIRLPOOL 7d6148d4198125cd62450f5ce93ae8c28fd0af583ff9f5e6845f6593b07b4d23ba28910fc287a2d44a182700d6288d3ac6f79188f7eaf1aee203a889e91fc331
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20130530.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20130530.ebuild
new file mode 100644
index 0000000..1a3033e
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20130530.ebuild
@@ -0,0 +1,364 @@
+# Copyright 1999-2013 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 Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2013-05-30_23-01-06/zip/netbeans-trunk-nightly-201305302301-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r8-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
+	http://hg.netbeans.org/binaries/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.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/2298164A7C2484406F2AA5AC85B205D39019896F-commons-net-3.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/10535DEC87DED9981853DAE916CE356DBDB0A0FA-exechlp-1.0.zip
+	http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar
+	http://hg.netbeans.org/binaries/77B15258E01216226E00DFA2ADD9C0F6D4E1B7C1-glassfish-tooling-sdk-0.3-b047.jar
+	http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
+	http://hg.netbeans.org/binaries/F4A1696661E6233F8C27EE323CAEF9CB052666F1-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/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/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar
+	http://hg.netbeans.org/binaries/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar
+	http://hg.netbeans.org/binaries/54C5D72D7AD60DEC4450A5CF1C361F341E6AE092-js-corestubs.zip
+	http://hg.netbeans.org/binaries/0F65AE810437C2C6939B46BBE149CEFDED19FD35-js-domstubs.zip
+	http://hg.netbeans.org/binaries/04E3664261A296066E6650DF19B23691979589F8-js-reststubs.zip
+	http://hg.netbeans.org/binaries/10EED0A1D831F8EC5FBD38F7C49352017D76296D-jsch.agentproxy.core-0.0.5.jar
+	http://hg.netbeans.org/binaries/9782615745DE80421D805240541E6B4F1E6A797A-jsch.agentproxy.sshagent-0.0.5.jar
+	http://hg.netbeans.org/binaries/A96C3EAE7CA812AD3EAB07A0ECABA0469AAAE6FD-jsch.agentproxy.pageant-0.0.5.jar
+	http://hg.netbeans.org/binaries/8C05A1E3FE1BD4DC07F12E7BCF197118B29FB58E-jsch.agentproxy.usocket-nc-0.0.5.jar
+	http://hg.netbeans.org/binaries/F3885B903DC60BFD657520250788137D318B7B3C-jsch.agentproxy.usocket-jna-0.0.5.jar
+	http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
+	http://hg.netbeans.org/binaries/90813273BB5FECF7BDAF5478F63666C444421BA0-nashorn-02f810c26ff9-patched.jar
+	http://hg.netbeans.org/binaries/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar
+	http://hg.netbeans.org/binaries/7052E115041D04410A4519A61307502FB7C138E6-org.eclipse.core.contenttype_3.4.100.v20110423-0524.jar
+	http://hg.netbeans.org/binaries/B19A4D998C76FE7A30830C96B9E3A47682F320FC-org.eclipse.core.jobs-3.5.101.jar
+	http://hg.netbeans.org/binaries/E64EF6A3FC5DB01AD95632B843706CCE56614C90-org.eclipse.core.net_1.2.100.I20110511-0800.jar
+	http://hg.netbeans.org/binaries/6658C235056134F7E86295E751129508802D71F2-org.eclipse.core.runtime-3.7.0.jar
+	http://hg.netbeans.org/binaries/0CA9B9DF8A8E4C6805C60A5761C470FCE8AE828F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110.jar
+	http://hg.netbeans.org/binaries/9C74D245214DB08E7EB9BC07A951B41CFE3E3648-org.eclipse.equinox.app-1.3.100.jar
+	http://hg.netbeans.org/binaries/78E5D0B8516B042495660DA36CE5114650F8F156-org.eclipse.equinox.common_3.6.0.v20110523.jar
+	http://hg.netbeans.org/binaries/FD94003A1BCE42008753522BFED68E5A84B92644-org.eclipse.equinox.preferences-3.4.2.jar
+	http://hg.netbeans.org/binaries/54AE046B40C9095C2637F8D21664C5CD76E34485-org.eclipse.equinox.registry_3.5.200.v20120522-1841.jar
+	http://hg.netbeans.org/binaries/0FFB9B1D7CD992CE6C8AAEEC2F6F98DFBB1D2F91-org.eclipse.equinox.security-1.1.1.jar
+	http://hg.netbeans.org/binaries/AFF0C3438BA2628FE2A460FDBCD53F6EFD22A0E9-org.eclipse.jgit-2.3.1.201302201838-r.jar
+	http://hg.netbeans.org/binaries/E31000A35F9FB210B18AB4F50F513F4D400BC48D-org.eclipse.mylyn.bugzilla.core_3.8.2.v20120916-1200.jar
+	http://hg.netbeans.org/binaries/AE7F6FFEE9CC2E55349D325AC7504F6D09B30761-org.eclipse.mylyn.commons.core_3.8.2.v20120916-1200.jar
+	http://hg.netbeans.org/binaries/3483ECE4E30CCA034BEC49979C6E735C6B1FBB13-org.eclipse.mylyn.commons.net_3.8.2.v20120916-1200.jar
+	http://hg.netbeans.org/binaries/6990481339073957CCAB02AD181BFD8F186F5002-org.eclipse.mylyn.commons.repositories.core_1.0.2.v20120916-1200.jar
+	http://hg.netbeans.org/binaries/68EA2A422AD4604636F50BAFD91EFD7EFC7276A4-org.eclipse.mylyn.commons.xmlrpc_3.8.2.v20120916-1200.jar
+	http://hg.netbeans.org/binaries/F89D9ACAC53BA5C0D7179B473E0BFAC9BFAEE3C4-org.eclipse.mylyn.tasks.core_3.8.2.v20120916-1200.jar
+	http://hg.netbeans.org/binaries/0CB932CDAD1898C52A0B11FFF854BB3CD8C46A30-org.eclipse.mylyn.wikitext.confluence.core_1.7.1.v20120725-0100.jar
+	http://hg.netbeans.org/binaries/AEA3D94B08D44DEB6556DCC93F7568D6C2E8A686-org.eclipse.mylyn.wikitext.core_1.7.1.v20120725-0100.jar
+	http://hg.netbeans.org/binaries/3B144D023541891D063C1DACA5980FA56918191B-org.eclipse.mylyn.wikitext.textile.core_1.7.1.v20120725-0100.jar
+	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/78CBB04534731D472CA853E024CD7EF136340142-svnClientAdapter-javahl-1.8.18.jar
+	http://hg.netbeans.org/binaries/CF988230BF3FB968C102F400ECA7E642BB371FB6-svnClientAdapter-main-1.8.18.jar
+	http://hg.netbeans.org/binaries/C40AEAD96AADF7E640FC9D0B8501CA839549941D-svnClientAdapter-svnkit-1.8.18.jar
+	http://hg.netbeans.org/binaries/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar
+	http://hg.netbeans.org/binaries/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar
+	http://hg.netbeans.org/binaries/A618A836EEF5F88232A10675CE316EC0A9FA4E2B-sqljet-1.1.6.jar
+	http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar
+	http://hg.netbeans.org/binaries/24DD3B605C50A04D6C5FC129D4AD340659236EB5-com.trilead.ssh2_1.0.0.build215.jar
+	http://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar
+	http://hg.netbeans.org/binaries/6FC6098C230D7CBA5730106D379CBBB42F6EC48A-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-lang:2.1
+	dev-java/commons-logging:0
+	dev-java/icu4j:4.4
+	dev-java/iso-relax:0
+	dev-java/jdbc-mysql:0
+	dev-java/jdbc-postgresql:0
+	>=dev-java/json-simple-1.1:0
+	dev-java/jsr173:0
+	dev-java/jvyamlb:0
+	dev-java/log4j:0
+	dev-java/lucene:3.5
+	dev-java/rhino:1.6
+	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]"
+#	app-text/jing:0 our version is probably too old
+#	dev-java/commons-io:1 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/freemarker:2.3
+#	dev-java/ini4j:0 our version is too old
+#	dev-java/jaxb:2 upstream version contains more stuff so websvccommon does not compile with ours
+#	dev-java/trilead-ssh2:0 in overlay
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	dev-java/commons-codec:0
+	>=dev-java/jsch-0.1.46:0
+	dev-java/jzlib:0
+	${CDEPEND}
+	dev-java/javacc:0
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${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-r8-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
+	ln -s "${DISTDIR}"/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar libs.nashorn/external/asm-all-4.0.jar || die
+	ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die
+	ln -s "${DISTDIR}"/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar o.apache.commons.io/external/commons-io-1.4.jar || die
+	ln -s "${DISTDIR}"/2298164A7C2484406F2AA5AC85B205D39019896F-commons-net-3.1.jar libs.commons_net/external/commons-net-3.1.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}"/10535DEC87DED9981853DAE916CE356DBDB0A0FA-exechlp-1.0.zip dlight.nativeexecution/external/exechlp-1.0.zip || die
+	ln -s "${DISTDIR}"/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar libs.freemarker/external/freemarker-2.3.19.jar || die
+	ln -s "${DISTDIR}"/77B15258E01216226E00DFA2ADD9C0F6D4E1B7C1-glassfish-tooling-sdk-0.3-b047.jar libs.glassfish.sdk/external/glassfish-tooling-sdk-0.3-b047.jar || die
+	ln -s "${DISTDIR}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || die
+	ln -s "${DISTDIR}"/F4A1696661E6233F8C27EE323CAEF9CB052666F1-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}"/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}"/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar core.browser.webview/external/jfxrt.jar || die
+	ln -s "${DISTDIR}"/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar html.validation/external/jing.jar || die
+	ln -s "${DISTDIR}"/54C5D72D7AD60DEC4450A5CF1C361F341E6AE092-js-corestubs.zip javascript2.editor/external/js-corestubs.zip || die
+	ln -s "${DISTDIR}"/0F65AE810437C2C6939B46BBE149CEFDED19FD35-js-domstubs.zip javascript2.editor/external/js-domstubs.zip || die
+	ln -s "${DISTDIR}"/04E3664261A296066E6650DF19B23691979589F8-js-reststubs.zip javascript2.editor/external/js-reststubs.zip || die
+	ln -s "${DISTDIR}"/10EED0A1D831F8EC5FBD38F7C49352017D76296D-jsch.agentproxy.core-0.0.5.jar libs.jsch.agentproxy/external/jsch.agentproxy.core-0.0.5.jar || die
+	ln -s "${DISTDIR}"/9782615745DE80421D805240541E6B4F1E6A797A-jsch.agentproxy.sshagent-0.0.5.jar libs.jsch.agentproxy/external/jsch.agentproxy.sshagent-0.0.5.jar || die
+	ln -s "${DISTDIR}"/A96C3EAE7CA812AD3EAB07A0ECABA0469AAAE6FD-jsch.agentproxy.pageant-0.0.5.jar libs.jsch.agentproxy/external/jsch.agentproxy.pageant-0.0.5.jar || die
+	ln -s "${DISTDIR}"/8C05A1E3FE1BD4DC07F12E7BCF197118B29FB58E-jsch.agentproxy.usocket-nc-0.0.5.jar libs.jsch.agentproxy/external/jsch.agentproxy.usocket-nc-0.0.5.jar || die
+	ln -s "${DISTDIR}"/F3885B903DC60BFD657520250788137D318B7B3C-jsch.agentproxy.usocket-jna-0.0.5.jar libs.jsch.agentproxy/external/jsch.agentproxy.usocket-jna-0.0.5.jar || die
+	ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.impl/external/libpam4j-1.1.jar || die
+	ln -s "${DISTDIR}"/90813273BB5FECF7BDAF5478F63666C444421BA0-nashorn-02f810c26ff9-patched.jar libs.nashorn/external/nashorn-02f810c26ff9-patched.jar || die
+	ln -s "${DISTDIR}"/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar html.validation/external/non-schema.jar || die
+	ln -s "${DISTDIR}"/7052E115041D04410A4519A61307502FB7C138E6-org.eclipse.core.contenttype_3.4.100.v20110423-0524.jar o.eclipse.core.contenttype/external/org.eclipse.core.contenttype_3.4.100.v20110423-0524.jar || die
+	ln -s "${DISTDIR}"/B19A4D998C76FE7A30830C96B9E3A47682F320FC-org.eclipse.core.jobs-3.5.101.jar o.eclipse.core.jobs/external/org.eclipse.core.jobs-3.5.101.jar || die
+	ln -s "${DISTDIR}"/E64EF6A3FC5DB01AD95632B843706CCE56614C90-org.eclipse.core.net_1.2.100.I20110511-0800.jar o.eclipse.core.net/external/org.eclipse.core.net_1.2.100.I20110511-0800.jar || die
+	ln -s "${DISTDIR}"/6658C235056134F7E86295E751129508802D71F2-org.eclipse.core.runtime-3.7.0.jar o.eclipse.core.runtime/external/org.eclipse.core.runtime-3.7.0.jar || die
+	ln -s "${DISTDIR}"/0CA9B9DF8A8E4C6805C60A5761C470FCE8AE828F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110.jar o.eclipse.core.runtime.compatibility.auth/external/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110.jar || die
+	ln -s "${DISTDIR}"/9C74D245214DB08E7EB9BC07A951B41CFE3E3648-org.eclipse.equinox.app-1.3.100.jar o.eclipse.equinox.app/external/org.eclipse.equinox.app-1.3.100.jar || die
+	ln -s "${DISTDIR}"/78E5D0B8516B042495660DA36CE5114650F8F156-org.eclipse.equinox.common_3.6.0.v20110523.jar o.eclipse.equinox.common/external/org.eclipse.equinox.common_3.6.0.v20110523.jar || die
+	ln -s "${DISTDIR}"/FD94003A1BCE42008753522BFED68E5A84B92644-org.eclipse.equinox.preferences-3.4.2.jar o.eclipse.equinox.preferences/external/org.eclipse.equinox.preferences-3.4.2.jar || die
+	ln -s "${DISTDIR}"/54AE046B40C9095C2637F8D21664C5CD76E34485-org.eclipse.equinox.registry_3.5.200.v20120522-1841.jar o.eclipse.equinox.registry/external/org.eclipse.equinox.registry_3.5.200.v20120522-1841.jar || die
+	ln -s "${DISTDIR}"/0FFB9B1D7CD992CE6C8AAEEC2F6F98DFBB1D2F91-org.eclipse.equinox.security-1.1.1.jar o.eclipse.equinox.security/external/org.eclipse.equinox.security-1.1.1.jar || die
+	ln -s "${DISTDIR}"/AFF0C3438BA2628FE2A460FDBCD53F6EFD22A0E9-org.eclipse.jgit-2.3.1.201302201838-r.jar o.eclipse.jgit/external/org.eclipse.jgit-2.3.1.201302201838-r.jar || die
+	ln -s "${DISTDIR}"/E31000A35F9FB210B18AB4F50F513F4D400BC48D-org.eclipse.mylyn.bugzilla.core_3.8.2.v20120916-1200.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core_3.8.2.v20120916-1200.jar || die
+	ln -s "${DISTDIR}"/AE7F6FFEE9CC2E55349D325AC7504F6D09B30761-org.eclipse.mylyn.commons.core_3.8.2.v20120916-1200.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core_3.8.2.v20120916-1200.jar || die
+	ln -s "${DISTDIR}"/3483ECE4E30CCA034BEC49979C6E735C6B1FBB13-org.eclipse.mylyn.commons.net_3.8.2.v20120916-1200.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net_3.8.2.v20120916-1200.jar  || die
+	ln -s "${DISTDIR}"/6990481339073957CCAB02AD181BFD8F186F5002-org.eclipse.mylyn.commons.repositories.core_1.0.2.v20120916-1200.jar o.eclipse.mylyn.commons.repositories.core/external/org.eclipse.mylyn.commons.repositories.core_1.0.2.v20120916-1200.jar || die
+	ln -s "${DISTDIR}"/68EA2A422AD4604636F50BAFD91EFD7EFC7276A4-org.eclipse.mylyn.commons.xmlrpc_3.8.2.v20120916-1200.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc_3.8.2.v20120916-1200.jar || die
+	ln -s "${DISTDIR}"/F89D9ACAC53BA5C0D7179B473E0BFAC9BFAEE3C4-org.eclipse.mylyn.tasks.core_3.8.2.v20120916-1200.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core_3.8.2.v20120916-1200.jar || die
+	ln -s "${DISTDIR}"/0CB932CDAD1898C52A0B11FFF854BB3CD8C46A30-org.eclipse.mylyn.wikitext.confluence.core_1.7.1.v20120725-0100.jar o.eclipse.mylyn.wikitext.confluence.core/external/org.eclipse.mylyn.wikitext.confluence.core_1.7.1.v20120725-0100.jar || die
+	ln -s "${DISTDIR}"/AEA3D94B08D44DEB6556DCC93F7568D6C2E8A686-org.eclipse.mylyn.wikitext.core_1.7.1.v20120725-0100.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.core_1.7.1.v20120725-0100.jar || die
+	ln -s "${DISTDIR}"/3B144D023541891D063C1DACA5980FA56918191B-org.eclipse.mylyn.wikitext.textile.core_1.7.1.v20120725-0100.jar o.eclipse.mylyn.wikitext.textile.core/external/org.eclipse.mylyn.wikitext.textile.core_1.7.1.v20120725-0100.jar || die
+	ln -s "${DISTDIR}"/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar libs.svnClientAdapter.svnkit/external/svnkit_1.7.8.r9538_v20130107_2001.jar || die
+	ln -s "${DISTDIR}"/E66876EB5F33AA0E57F035F1AADD8C44FEAE7FCB-processtreekiller-1.0.1.jar extexecution.impl/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}"/A618A836EEF5F88232A10675CE316EC0A9FA4E2B-sqljet-1.1.6.jar libs.svnClientAdapter.svnkit/external/sqljet-1.1.6.jar || die
+	ln -s "${DISTDIR}"/78CBB04534731D472CA853E024CD7EF136340142-svnClientAdapter-javahl-1.8.18.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-javahl-1.8.18.jar || die
+	ln -s "${DISTDIR}"/CF988230BF3FB968C102F400ECA7E642BB371FB6-svnClientAdapter-main-1.8.18.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.8.18.jar || die
+	ln -s "${DISTDIR}"/C40AEAD96AADF7E640FC9D0B8501CA839549941D-svnClientAdapter-svnkit-1.8.18.jar libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.8.18.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}"/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar libs.swingx/external/swingx-all-1.6.4.jar || die
+	ln -s "${DISTDIR}"/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar httpserver/external/tomcat-webserver-3.2.jar || die
+	ln -s "${DISTDIR}"/24DD3B605C50A04D6C5FC129D4AD340659236EB5-com.trilead.ssh2_1.0.0.build215.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build215.jar || die
+	ln -s "${DISTDIR}"/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar swing.validation/external/ValidationAPI.jar || die
+	ln -s "${DISTDIR}"/6FC6098C230D7CBA5730106D379CBBB42F6EC48A-validator.jar html.validation/external/validator.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
+	ln -s "${DISTDIR}"/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar extexecution.impl/external/winp-1.14-patched.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r8-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.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	popd >/dev/null || die
+
+	java-pkg_jar-from --build-only --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.49.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.23-bin.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.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 html.parser/external icu4j-4.4 icu4j.jar icu4j-4_4_2.jar
+	java-pkg_jar-from --into html.validation/external iso-relax isorelax.jar isorelax.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.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.19.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.8.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.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 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 freemarker-2.3.19.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.19.jar || die
+	rm icu4j-4_4_2.jar && dosym /usr/share/icu4j-4.4/lib/icu4j.jar ${instdir}/icu4j-4_4_2.jar || die
+	rm isorelax.jar && dosym /usr/share/iso-relax/lib/isorelax.jar ${instdir}/isorelax.jar || die
+	rm json-simple-1.1.1.jar && dosym /usr/share/json-simple/lib/json-simple.jar ${instdir}/json-simple-1.1.1.jar || die
+	rm jvyamlb-0.2.3.jar && dosym /usr/share/jvyamlb/lib/jvyamlb.jar ${instdir}/jvyamlb-0.2.3.jar || die
+	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.23-bin.jar && dosym /usr/share/jdbc-mysql/lib/jdbc-mysql.jar ${instdir}/mysql-connector-java-5.1.23-bin.jar || die
+	rm postgresql-9.2-1002.jdbc4.jar && dosym /usr/share/jdbc-postgresql/lib/jdbc-postgresql.jar ${instdir}/postgresql-9.2-1002.jdbc4.jar || die
+	rm saxon9B.jar && dosym /usr/share/saxon-9/lib/saxon.jar ${instdir}/saxon9B.jar || die
+	rm servlet-2.2.jar && dosym /usr/share/tomcat-servlet-api-2.2/lib/servlet.jar ${instdir}/servlet-2.2.jar || die
+	rm smack.jar && dosym /usr/share/smack-2.2/lib/smack.jar ${instdir}/smack.jar || die
+	rm smackx.jar && dosym /usr/share/smack-2.2/lib/smackx.jar ${instdir}/smackx.jar || die
+	rm svnjavahl.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl.jar || die
+	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
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxb/api
+	pushd "${D}"/${instdir} >/dev/null || 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 16616ca..30cd045 100644
--- a/dev-java/netbeans-java/ChangeLog
+++ b/dev-java/netbeans-java/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-java-9999_p20130530 (31 May 2013)
+
+  31 May 2013; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-java-9999_p20130530.ebuild:
+  bumped to latest nightly sources
+
 *netbeans-java-9999_p20130529 (30 May 2013)
 
   30 May 2013; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index cef9b20..6738aaa 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -85,6 +85,7 @@ DIST netbeans-trunk-nightly-201305232300-src.zip 187763774 SHA256 211672ba83f511
 DIST netbeans-trunk-nightly-201305252300-src.zip 187807028 SHA256 b2e70c316de0cd83aa2a1b0ae4f2e1da432199396564f77155b0b74d708e11a6 SHA512 c4cc20ff92b5b35f729539bbebc260452ab89f8c28b6fe986f3ff04f35a02a2039710291411880283901ad515d3ef62a15c615c74bc4df621970abadd0a50c69 WHIRLPOOL e61232b507ae121fd286e136d292f96cfb79a58c7b155a2743301092e209ecf888378fa81aa9752816fb6c2f07d5fef60a2c9fccc3e921bca80449b5cf2c4764
 DIST netbeans-trunk-nightly-201305262300-src.zip 187807028 SHA256 8552e30f84ea1b8483dcc1596dd3612121a068f5c36bc0093de4fda24157e41d SHA512 e69451b64003c4c4feb3b4232f6a6e51308b59a5feb9617217b43295d311ce279219b5a8fdbb2457bff512ae4fa10ea649b5d0b7eba424c3365e5071d56c4436 WHIRLPOOL 400a776d0034dcf78c833c7b80a99524a7634213462f7ad45297cbfa2b02cf70d4699e81d946d874135c4bdd23b07631df65db454214423368ebedbc89a2e0e7
 DIST netbeans-trunk-nightly-201305292301-src.zip 187953498 SHA256 00164aa21766eae8a68e648f3a838da04b98e48a91564bb0c8e7d02e8111ab8c SHA512 e9e3e2d45bf8db8a5c0ad0ef81020916f303554f26c032aea50612cdc9406c1b3c1d594f7fa08faae2676572eb9dc675a9d615efdbf920d61134e6628ec8fbce WHIRLPOOL 6481bfe8871154685314b9bae1c96c1690eb0d770f03a4708f603bed5165f0207d521cc48cc51b81432b98126f9089d3bc06a3c7bbf56347be7edbe2898a47c1
+DIST netbeans-trunk-nightly-201305302301-src.zip 187971727 SHA256 8aa8682d824dc611bfeadf594449af492c5f0403b8fa8daad0f28dd654365830 SHA512 affe9abba9c5970d8492248f46c0edd1d6f011ec1d2a9f238e94d00bbf9c53af563e0a6144b2781683700ec5f69273f956540efdb062746f3c91c545f8cfbff3 WHIRLPOOL 65f8f32ead3f9ce0f23b287f641b96245db0eaf26fa46b52f82843afcd060d9e505c39136980932e906f1aaeea37db4ecd073eb06ec779299843242d8c27dfe3
 EBUILD netbeans-java-7.0.1-r2.ebuild 14932 SHA256 3d8eeb5c3aea368c5064e83e9519b2982a3d0f999db11344ba33605f46f865b0 SHA512 0c99037f44aa968f357724650189fe0f6fc89496fbf73f6c5a9bcd589afa5af4974f058a8eea2b6a97e1884f4cabba8b5ecf0214b7e840870358f0e55abbc595 WHIRLPOOL 4c1ccada62d0c8883033500ead9586e5bfcd360e6030b3d8368b0b16b9ed01cc03d3c3d5888de437a16d5382b5fe9ec7c02f3e200c3c19bc9a43f011f32d3a68
 EBUILD netbeans-java-7.1.2-r1.ebuild 14936 SHA256 6082d8d5022e011e7aa9d4ff92bf9a144a4f733b879127552c0ca55566b0f18c SHA512 c03a674b6d93a4261bff40ad9aaad6fa9bc0451d6017aeb51f14c42113cc2ff12f84ff5a6cc01c01b43c7ce1b4d885da5c9cb4c0e13601c8ff780eb140060ac6 WHIRLPOOL d32f06a7bd7d4924f14fcb2ed67fd2f5a1766087e4f46ed77d12d472c4c133eef5431d75a709da1abcf8b8cff5afef303dd57e82e4022651a7278076502300d6
 EBUILD netbeans-java-7.2.ebuild 12206 SHA256 da05f74f2c02e4aac745dcf1be75069cc7070f241d063c19c40465e139ac135f SHA512 62be228321e175ad03c2a7d9270065445ba9e1ca08a1a51927027ddbc78aa43a0c57c6b4193add993764235068c7128655f2f12e00fcd17fbac807334f2483c6 WHIRLPOOL 5f518535df8a5f1e1e4f0bc5c845ca063317221c619c3e8928c89a4f2bb30be5a03838f5a610bcda58959d535e4fb152f92f4edd780bcd423918b448d7ddf2e1
@@ -97,5 +98,6 @@ EBUILD netbeans-java-9999_p20130523.ebuild 12822 SHA256 07a1881a1245847a8db45639
 EBUILD netbeans-java-9999_p20130525.ebuild 12822 SHA256 f1a57af250bd4800e2a378d32c48c4f7922640f2b057c14bb7b0b772d39515ea SHA512 ebd2b4c8af762a91a7fd1185c463d686b504d9a90dea60958f69ac6117650fcf9410c342a709110b5d65bb21048bd3ebc4c85d21e6c7c49e26a42b8d8b9e4a6f WHIRLPOOL e8486778f7729458fd45d068de140618a61ad84a050eb7fc90277b7885b30727be9c0c6742ea854cd3dbbb695894ba5a1956468fde5f54c735005d3c9c4f9f08
 EBUILD netbeans-java-9999_p20130526.ebuild 12822 SHA256 773507ba18160603b908befda56ecca9fbbd1bd83c24c835fd3a25b6c5b041ef SHA512 fc32a10b47b58dcb783b416635b1a07be0fa40dfb3cf0334cba0fca7e8615d122477039841453c94fc13da4b26becedb53b3e0259a0ce860bfa2b523dbcfe2d0 WHIRLPOOL cb09180de5c7cfca0ecb4ec35caea7618025362d9beccae030dfba896e70676c790be53923aca5a0cd8584ef5d93bc1d520e3aeff58e80ca829912ac2b2341a2
 EBUILD netbeans-java-9999_p20130529.ebuild 12822 SHA256 25eba550daffc96b0e394fb9323a45f499db90f942a0b894d118dd9c48e2a6f2 SHA512 16d372b9a6d35a42994ebfdb4fb8a58fdc0726768f85de39e1cdfc56c5f22701f6fb60de46d2a165fc74f5862e5535292e8a96056a1b61fd3768f945714a6a7e WHIRLPOOL 626431576391de12cd840f522b70686dd4e72a144ec5ed48ba556959061f27db088e972a412fe800b865bcdf421ff2194552f6e5cd1b358e0378b16f04d41329
-MISC ChangeLog 77984 SHA256 f89ae3c721f0ced2df71e67c7beb80574cf41706ae2981d6391cc56dae10d833 SHA512 58390e74fa0d61faa868d93f978b565feea0fcbc7d2b7f290a828b179957440c3bff7ae7be3efa9b4379b29832c5753a290e79ada018abb6e7f6638c2ba5fb77 WHIRLPOOL b01ff7b305b7d77a878cfac97f143d053411abd4274347aee4254447cb42d91ddb9e33a495eafd2128e59b2d66be12a62a0e52c0ff9f710eb5b3889a800b0c13
+EBUILD netbeans-java-9999_p20130530.ebuild 12822 SHA256 d2e29cd5fc96d24eebbe44ff8491535c532bad14b1ccd7248c80fa0955c9ac15 SHA512 b44f698047f0fe279a0b86e0974a80ef02e3d27d2bd0c185975b0d15550e76ff53e6959cdb28260a3bea87aaecce4b1f8a3ac01688ce4d415ad8010d4e3cfedf WHIRLPOOL 6398cbbdeb07a382cfffe2ab6fd00b1260b8a3c72ebfb7624af7c40ee6a7996d1c19919c6096de3a9d646731a4dcf55e1e2a2314ffe4842c1a3056a1bff10986
+MISC ChangeLog 78157 SHA256 a4378e2cffb060270206b31503a1fb660086c56bc4e8bcc7ccda0ddb609f9942 SHA512 539891e37704e5c684280aa2e89a0e942cb6a1eecf0947d76dfa347030ee84526ae9d3932fdb4a660b4faa74e5c7449fdd6ad6e5ac2c860258d5220928d18870 WHIRLPOOL d32764972bee849e2a435059b05395e96763b2dc5a4c25c2dd732e4df694f6fa4686c914568fda3b7964abaa37a30103d9c22bcf09c8c5efd26b7acd5f962e6e
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20130530.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20130530.ebuild
new file mode 100644
index 0000000..45ed36d
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20130530.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+# Maven cannot be unbundled because it depends on exact maven version and exact content of maven directory
+
+DESCRIPTION="Netbeans Java Cluster"
+HOMEPAGE="http://netbeans.org/projects/java"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2013-05-30_23-01-06/zip/netbeans-trunk-nightly-201305302301-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r8-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip
+	http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip
+	http://hg.netbeans.org/binaries/33693E782E0F99CA7E2DEECA0222F493EBB6BC82-eclipselink.jar
+	http://hg.netbeans.org/binaries/3A33D0056725FC9ACA375DF19327BFB8818E3C47-hibernate-3.6.10-lib.zip
+	http://hg.netbeans.org/binaries/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar
+	http://hg.netbeans.org/binaries/2B9EAB164D8748F9793F6A0D29B6463E97B284DA-indexer-core-5.1.1.jar
+	http://hg.netbeans.org/binaries/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar
+	http://hg.netbeans.org/binaries/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.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/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar
+	http://hg.netbeans.org/binaries/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar
+	http://hg.netbeans.org/binaries/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar
+	http://hg.netbeans.org/binaries/A1F1821B53426CDE2FCAED79978D26122B0B370F-nb-javac-api.jar
+	http://hg.netbeans.org/binaries/7D89D4428F93E2EFAC66C40233A5133C7E049B75-nb-javac-impl.jar
+	http://hg.netbeans.org/binaries/B1D9BFCBC513472E819CB6C7E1018D26439D400A-org.eclipse.persistence.jpa.jpql_2.5.0.v20130507-3faac2b.jar
+	http://hg.netbeans.org/binaries/BE675D922E5BFAF6557EB5E05A06B0B5047C08B1-org.eclipse.persistence.jpa.modelgen_2.5.0.v20130507-3faac2b.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=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/beansbinding:0
+	dev-java/cglib:2.2
+	dev-java/jdom:1.0"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	dev-java/json-simple:0
+	dev-java/junit:4"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}
+	dev-java/absolutelayout:0
+	dev-java/antlr:0[java]
+	dev-java/asm:2.2
+	dev-java/cglib:2.1
+	dev-java/commons-collections:0
+	dev-java/dom4j:1
+	dev-java/fastinfoset:0
+	dev-java/javassist:3
+	dev-java/jsr67:0
+	dev-java/jsr181:0
+	dev-java/glassfish-transaction-api:0
+	dev-java/jtidy:0
+	dev-java/mimepull:0
+	dev-java/saaj:0
+	dev-java/stax-ex:0
+	dev-java/xmlstreambuffer:0"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.java -Dext.binaries.downloaded=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+pkg_pretend() {
+	local die_now=""
+
+	if [ -d /usr/share/netbeans-java-${SLOT}/ant -a -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-9999-r8-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip maven.embedder/external/apache-maven-3.0.5-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}"/33693E782E0F99CA7E2DEECA0222F493EBB6BC82-eclipselink.jar j2ee.eclipselink/external/eclipselink.jar || die
+	ln -s "${DISTDIR}"/3A33D0056725FC9ACA375DF19327BFB8818E3C47-hibernate-3.6.10-lib.zip hibernatelib/external/hibernate-3.6.10-lib.zip || die
+	ln -s "${DISTDIR}"/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar maven.indexer/external/indexer-artifact-5.1.1.jar || die
+	ln -s "${DISTDIR}"/2B9EAB164D8748F9793F6A0D29B6463E97B284DA-indexer-core-5.1.1.jar maven.indexer/external/indexer-core-5.1.1.jar || die
+	ln -s "${DISTDIR}"/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar maven/external/jarjar-1.4.jar || die
+	ln -s "${DISTDIR}"/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar j2ee.eclipselink/external/javax.persistence_2.1.0.v201304241213.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}"/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar maven.indexer/external/lucene-core-3.6.2.jar || die
+	ln -s "${DISTDIR}"/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar maven.indexer/external/lucene-highlighter-3.6.2.jar || die
+	ln -s "${DISTDIR}"/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar maven.embedder/external/maven-dependency-tree-2.0.jar || die
+	ln -s "${DISTDIR}"/A1F1821B53426CDE2FCAED79978D26122B0B370F-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
+	ln -s "${DISTDIR}"/7D89D4428F93E2EFAC66C40233A5133C7E049B75-nb-javac-impl.jar libs.javacimpl/external/nb-javac-impl.jar || die
+	ln -s "${DISTDIR}"/B1D9BFCBC513472E819CB6C7E1018D26439D400A-org.eclipse.persistence.jpa.jpql_2.5.0.v20130507-3faac2b.jar j2ee.eclipselink/external/org.eclipse.persistence.jpa.jpql_2.5.0.v20130507-3faac2b.jar || die
+	ln -s "${DISTDIR}"/BE675D922E5BFAF6557EB5E05A06B0B5047C08B1-org.eclipse.persistence.jpa.modelgen_2.5.0.v20130507-3faac2b.jar j2ee.eclipselinkmodelgen/external/org.eclipse.persistence.jpa.modelgen_2.5.0.v20130507-3faac2b.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
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r8-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.cglib/external cglib-2.2 cglib.jar cglib-2.2.jar
+	java-pkg_jar-from --build-only --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.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 o.jdesktop.beansbinding/external beansbinding beansbinding.jar beansbinding-1.2.1.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/java >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+	grep -E "/java$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	chmod 755 "${D}"/${INSTALL_DIR}/maven/bin/mvn* || die
+	rm -fr "${D}"/${INSTALL_DIR}/maven/bin/*.bat || die
+
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm AbsoluteLayout.jar  && dosym /usr/share/absolutelayout/lib/absolutelayout.jar ${instdir}/AbsoluteLayout.jar || die
+	rm beansbinding-1.2.1.jar && dosym /usr/share/beansbinding/lib/beansbinding.jar ${instdir}/beansbinding-1.2.1.jar || die
+	rm cglib-2.2.jar && dosym /usr/share/cglib-2.2/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/hibernate
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm antlr-2.7.6.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.6.jar || die
+	rm asm-commons-3.3.1.jar && dosym /usr/share/asm-2.2/lib/asm-commons.jar ${instdir}/asm-commons-3.3.1.jar || die
+	rm asm-3.3.1.jar && dosym /usr/share/asm-2.2/lib/asm.jar ${instdir}/asm-3.3.1.jar || die
+	rm cglib-2.2.jar && dosym /usr/share/cglib-2.1/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
+	rm commons-collections-3.1.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections-3.1.jar || die
+	rm dom4j-1.6.1.jar && dosym /usr/share/dom4j-1/lib/dom4j.jar ${instdir}/dom4j-1.6.1.jar || die
+	rm javassist-3.12.0.GA.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist-3.12.0.GA.jar || die
+	rm jta-1.1.jar && dosym /usr/share/glassfish-transaction-api/lib/jta.jar ${instdir}/jta-1.1.jar || die
+	rm jtidy-r8-20060801.jar && dosym /usr/share/jtidy/lib/Tidy.jar ${instdir}/jtidy-r8-20060801.jar || die
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/modules/ext/jaxws22
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm FastInfoset.jar && dosym /usr/share/fastinfoset/lib/fastinfoset.jar ${instdir}/FastInfoset.jar || die
+	rm mimepull.jar && dosym /usr/share/mimepull/lib/mimepull.jar ${instdir}/mimepull.jar || die
+	rm saaj-impl.jar && dosym /usr/share/saaj/lib/saaj.jar ${instdir}/saaj-impl.jar || die
+	rm stax-ex.jar && dosym /usr/share/stax-ex/lib/stax-ex.jar ${instdir}/stax-ex.jar || die
+	rm streambuffer.jar && dosym /usr/share/xmlstreambuffer/lib/streambuffer.jar ${instdir}/streambuffer.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxws22/api
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-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
+	rm jdom-1.0.jar && dosym /usr/share/jdom-1.0/lib/jdom.jar ${instdir}/jdom-1.0.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java
+}

diff --git a/dev-java/netbeans-javacard/ChangeLog b/dev-java/netbeans-javacard/ChangeLog
index dec4ebd..7ea03f9 100644
--- a/dev-java/netbeans-javacard/ChangeLog
+++ b/dev-java/netbeans-javacard/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javacard-9999_p20130530 (31 May 2013)
+
+  31 May 2013; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-javacard-9999_p20130530.ebuild:
+  bumped to latest nightly sources
+
 *netbeans-javacard-9999_p20130529 (30 May 2013)
 
   30 May 2013; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index 526f9f8..1d6c2e5 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -18,6 +18,7 @@ DIST netbeans-trunk-nightly-201305232300-src.zip 187763774 SHA256 211672ba83f511
 DIST netbeans-trunk-nightly-201305252300-src.zip 187807028 SHA256 b2e70c316de0cd83aa2a1b0ae4f2e1da432199396564f77155b0b74d708e11a6 SHA512 c4cc20ff92b5b35f729539bbebc260452ab89f8c28b6fe986f3ff04f35a02a2039710291411880283901ad515d3ef62a15c615c74bc4df621970abadd0a50c69 WHIRLPOOL e61232b507ae121fd286e136d292f96cfb79a58c7b155a2743301092e209ecf888378fa81aa9752816fb6c2f07d5fef60a2c9fccc3e921bca80449b5cf2c4764
 DIST netbeans-trunk-nightly-201305262300-src.zip 187807028 SHA256 8552e30f84ea1b8483dcc1596dd3612121a068f5c36bc0093de4fda24157e41d SHA512 e69451b64003c4c4feb3b4232f6a6e51308b59a5feb9617217b43295d311ce279219b5a8fdbb2457bff512ae4fa10ea649b5d0b7eba424c3365e5071d56c4436 WHIRLPOOL 400a776d0034dcf78c833c7b80a99524a7634213462f7ad45297cbfa2b02cf70d4699e81d946d874135c4bdd23b07631df65db454214423368ebedbc89a2e0e7
 DIST netbeans-trunk-nightly-201305292301-src.zip 187953498 SHA256 00164aa21766eae8a68e648f3a838da04b98e48a91564bb0c8e7d02e8111ab8c SHA512 e9e3e2d45bf8db8a5c0ad0ef81020916f303554f26c032aea50612cdc9406c1b3c1d594f7fa08faae2676572eb9dc675a9d615efdbf920d61134e6628ec8fbce WHIRLPOOL 6481bfe8871154685314b9bae1c96c1690eb0d770f03a4708f603bed5165f0207d521cc48cc51b81432b98126f9089d3bc06a3c7bbf56347be7edbe2898a47c1
+DIST netbeans-trunk-nightly-201305302301-src.zip 187971727 SHA256 8aa8682d824dc611bfeadf594449af492c5f0403b8fa8daad0f28dd654365830 SHA512 affe9abba9c5970d8492248f46c0edd1d6f011ec1d2a9f238e94d00bbf9c53af563e0a6144b2781683700ec5f69273f956540efdb062746f3c91c545f8cfbff3 WHIRLPOOL 65f8f32ead3f9ce0f23b287f641b96245db0eaf26fa46b52f82843afcd060d9e505c39136980932e906f1aaeea37db4ecd073eb06ec779299843242d8c27dfe3
 EBUILD netbeans-javacard-7.0.1.ebuild 4961 SHA256 566bc7e3275c97d0fe3d68c843b53aee641548ec39a8143aebd56d248da3c32c SHA512 5973c8d4254943473209b0881c0fbe40ac6b61563d508e58adc248dd40c8c2d6b742bd6c1667ee11fb404f9d2e62f08a8e4d822a2a3db9fccab254f73828c3b0 WHIRLPOOL fd1e08943ce754a2abfe8c8b83954399287500ce574a46fe0d76f94b300fd2a5978957f94a3ac1d85781330248a46fefacfbae25db95669c3de910145ef96424
 EBUILD netbeans-javacard-7.1.2.ebuild 4970 SHA256 15ff13152b140edaa549ea6515949d99cdb2a4656918566179836ab2277f01b8 SHA512 b7e52b477f6ba645084034eb27e848fb48361351937fc45455bf4b7d74acbdd257427ec589286f0edc71cc98c8cdb114e55988b6d3dc92143e13f407e3b45a52 WHIRLPOOL 85ab6dc2c230ea89fd19d7602ac24e3d2b0f226590998e6a6e277c24ef60a7e86874f7e95e90921d255e84f05e04ad1998ee7361b4d26c6f14828076792a933c
 EBUILD netbeans-javacard-7.2.ebuild 4718 SHA256 d173c848e825b342a52073ba16b7784016f92124d4bc3b5ad8beebb7a7dda772 SHA512 019183c236c59ec2b961445c49643c6da0b376048f1be1d58677a753890bcb03db126f6441221c7572a74fe45c4c27aeee4acb38db620f9203ad04ae8ff2c426 WHIRLPOOL f2a10183045edd22ef4419b630cedafc093b326eb593178a0f50e8d82ebb25ab732fb8c561d49969073d9fce551c5b9150fb1900b49458ed53f0234baa29a78e
@@ -30,5 +31,6 @@ EBUILD netbeans-javacard-9999_p20130523.ebuild 4953 SHA256 c32401a84c6afe1a1ba9b
 EBUILD netbeans-javacard-9999_p20130525.ebuild 4953 SHA256 f314b7c548297f64cfa9634d0799be432e872f4d36d0c2a522893fd60e563561 SHA512 228358abff17698dacbe313d84460a7455e40aaaa05322cc80a5a5b33bdd6a16efa598e74bdbf5dc38bfb842d89caee6ea0be9f45245050523a047955860053f WHIRLPOOL 856945036a6211958e12ab3107a4a19279d16721f56fced690d97531262e79dd6ffc38d8a5e54a06363601f5c047e889500ff81a1599894ba92281d7718f38fb
 EBUILD netbeans-javacard-9999_p20130526.ebuild 4953 SHA256 6a4815d40d41e5fa51336b404937dacfd19dac8b0e082b77efba089739577acf SHA512 2b7b6cdbdb166a2191082d1cf1a20a192a3ed89dc004c64d68d7baa3da13b8e99df7fd765da46ce338e49b839a9650c64d2715e6d0b47206cac345ec28bfde6b WHIRLPOOL 02dc8e46c880a644db9ccafb9556da868e4d502eaaaac4564622aa24b1b5db8cd0d8e27bc6b1f6416054f26905f0b690ee76eb7b898b27debe8cbcddad3da038
 EBUILD netbeans-javacard-9999_p20130529.ebuild 4953 SHA256 3b6acc6a85c6d9b30fc5e056d4e19fd6e4967f3a1561ecd3875962f21c8856d5 SHA512 e0c5ad003e88270391e68e31514d1e1ceaa6e0a66649e7f52a1142c1dfd849a373fd63042aee8c98828be3a620c701e6394e7e2508eb638c6ce131e6f9ba2358 WHIRLPOOL 51a43757f47fb3304a561273e8c030e1c90fb4ff7406dda6af7f4b31a81b741f6dbde29138a9610d01d5bdb0bf13fda2a4eba7856e18da1d298d523f5383a4be
-MISC ChangeLog 80246 SHA256 2ad3c49bab5ee8eb3c72d0d847927de4a255298d7e8bc83d9a1d70d88c58c77e SHA512 dad5780167d5583354172faa634cc7396698b6e45660d03033228d130d2b7acbef163cea82a2929060e489c53dacd536f952cec6142aac30ef7525eff6e8b051 WHIRLPOOL 36ea7e8c48ed8093e65f57e3d8064407048e013cfcbe6bc491e8afd5396e02fd0f60494b1ff48fbba2500f8807d84eee8ebd02bc755dab30f1a3735dd06dd44d
+EBUILD netbeans-javacard-9999_p20130530.ebuild 4953 SHA256 a572af71e9b1cb7177f4957d8e2bdc8d186ea9241370f174c00653562fb1fd60 SHA512 c08bb3ede722c3028d6978b1648b1d5dde0498a7d2aae6e62a682fa6c2d9de1939fde3e89d915ac2a45918d42a393d9158810e61ad35d0e419c81a7829bc7c5d WHIRLPOOL e2d5cf045e44258fcee78ffdc7d3f1689e8d57f8c0829659908df3a32093cbef9407574da7b1f6050a8c52160adf6ae7aac79061241efe0960beb702958f10f2
+MISC ChangeLog 80427 SHA256 395345029d4d5aebfc2c565ee09f5e0ac023e13c43b2a410ad315f36a4fa3ab7 SHA512 092e85debdd7ac9ba528dac579276a9b9b431bdb30efa4f0c5f90938fa9475a78481213afd3a7196250303393745e6cfca2edc63fda7a87c662239cab5c49bd8 WHIRLPOOL 25652eee1ec8f97312dd86397c2c7c46992554f1a4ac14c23525340e350e4ac24809bb333a5951468af38fe453a875ff0a0cb1f040cecea32b6dd79b1ecdc5b2
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20130530.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20130530.ebuild
new file mode 100644
index 0000000..1a4c183
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20130530.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2013 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 JavaCard Cluster"
+HOMEPAGE="http://netbeans.org/projects/javacard"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2013-05-30_23-01-06/zip/netbeans-trunk-nightly-201305302301-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r8-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-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${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-r8-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-r8-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-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.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/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
+	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
+	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 269079f..66da80e 100644
--- a/dev-java/netbeans-javadoc/ChangeLog
+++ b/dev-java/netbeans-javadoc/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javadoc-9999_p20130530 (31 May 2013)
+
+  31 May 2013; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-javadoc-9999_p20130530.ebuild:
+  bumped to latest nightly sources
+
 *netbeans-javadoc-9999_p20130529 (30 May 2013)
 
   30 May 2013; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index d844176..65ac0c7 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -19,6 +19,7 @@ DIST netbeans-trunk-nightly-201305232300-src.zip 187763774 SHA256 211672ba83f511
 DIST netbeans-trunk-nightly-201305252300-src.zip 187807028 SHA256 b2e70c316de0cd83aa2a1b0ae4f2e1da432199396564f77155b0b74d708e11a6 SHA512 c4cc20ff92b5b35f729539bbebc260452ab89f8c28b6fe986f3ff04f35a02a2039710291411880283901ad515d3ef62a15c615c74bc4df621970abadd0a50c69 WHIRLPOOL e61232b507ae121fd286e136d292f96cfb79a58c7b155a2743301092e209ecf888378fa81aa9752816fb6c2f07d5fef60a2c9fccc3e921bca80449b5cf2c4764
 DIST netbeans-trunk-nightly-201305262300-src.zip 187807028 SHA256 8552e30f84ea1b8483dcc1596dd3612121a068f5c36bc0093de4fda24157e41d SHA512 e69451b64003c4c4feb3b4232f6a6e51308b59a5feb9617217b43295d311ce279219b5a8fdbb2457bff512ae4fa10ea649b5d0b7eba424c3365e5071d56c4436 WHIRLPOOL 400a776d0034dcf78c833c7b80a99524a7634213462f7ad45297cbfa2b02cf70d4699e81d946d874135c4bdd23b07631df65db454214423368ebedbc89a2e0e7
 DIST netbeans-trunk-nightly-201305292301-src.zip 187953498 SHA256 00164aa21766eae8a68e648f3a838da04b98e48a91564bb0c8e7d02e8111ab8c SHA512 e9e3e2d45bf8db8a5c0ad0ef81020916f303554f26c032aea50612cdc9406c1b3c1d594f7fa08faae2676572eb9dc675a9d615efdbf920d61134e6628ec8fbce WHIRLPOOL 6481bfe8871154685314b9bae1c96c1690eb0d770f03a4708f603bed5165f0207d521cc48cc51b81432b98126f9089d3bc06a3c7bbf56347be7edbe2898a47c1
+DIST netbeans-trunk-nightly-201305302301-src.zip 187971727 SHA256 8aa8682d824dc611bfeadf594449af492c5f0403b8fa8daad0f28dd654365830 SHA512 affe9abba9c5970d8492248f46c0edd1d6f011ec1d2a9f238e94d00bbf9c53af563e0a6144b2781683700ec5f69273f956540efdb062746f3c91c545f8cfbff3 WHIRLPOOL 65f8f32ead3f9ce0f23b287f641b96245db0eaf26fa46b52f82843afcd060d9e505c39136980932e906f1aaeea37db4ecd073eb06ec779299843242d8c27dfe3
 EBUILD netbeans-javadoc-7.0.1.ebuild 5814 SHA256 68531c51838c95012830f5ae09e2386ea3179c2b31bfd5191f67993e3b3dbe2f SHA512 3bfe0ecc46f371d2553b031a5699229fb874dad1e94415635558b7d46b6764c31337d03444753e687b19a7c0976c68cb72007ccc82df7d1e5848a81f241f80c3 WHIRLPOOL 6571f7a73c262b3b67407840523b79eecc14bad9678cff05fb32a2811049158400870de51bbcef97ecb3f18f8ff59f965bdca8e788918d53822b92e2f20f75f5
 EBUILD netbeans-javadoc-7.1.2.ebuild 5855 SHA256 af28efb956ac3b7147e254ca3083dfaab11b84ea42e20677ebdd18aa29ff87e0 SHA512 ee06c552782170b51cfe70d603792b4240aef6064ba0a5074f394701a43285ed1e4030f539622c616be3175dab013e791c1a3a1193ad379193f5fa3e92eefa40 WHIRLPOOL dfcc63d6c9fcf094e2998ce1c08e29b4d4acbefbe9bea6498c2e28f84576f628da50164a1e0ab3ff5528720fe54cae71f2f5e6f84aedca5b639f13053464e6c1
 EBUILD netbeans-javadoc-7.2.ebuild 5805 SHA256 20d01deae745a7e8d84ffe55ca63ad74342bd8528c0dd15a20aac6570a1a83e3 SHA512 3947f1ab3efc236b8faa14736406ee3e537bbdbe377ea1bbd4f1eafa06a36d2863f8700dc7c84e6c8501abdf130a78e87ad6a0f52c5172bf0ab52f288617bc86 WHIRLPOOL 8301cce0679ed5f68a09e2e968ab2ba0955547f438758b042a04744539324fd79d83d853dfb8b48421f6dac616362cf1a9dd2a0e0ff8763dc2e12a470d16b95f
@@ -31,5 +32,6 @@ EBUILD netbeans-javadoc-9999_p20130523.ebuild 6040 SHA256 48f5f4ecc5a284c75272ea
 EBUILD netbeans-javadoc-9999_p20130525.ebuild 6040 SHA256 57a876dd37e82960407a23876db9d043801227cf577f7ff8551b3758a1e9a5f6 SHA512 83089a4fbb60e6e727b46d6f6ef063d5e80c14f5d25825151c52c889cb77518fbd5f00fee4aa98310957e2c25f3971b2cead499b840a175eaa9bd6b86c246aa1 WHIRLPOOL 27fb93d76bacb30d317a60d206307cbe4e30f3842263744e2ee362e7848d3c3eb0c271705b91cb9a21cc34e7964593f6cf898052d71f11128841dffd57b0629a
 EBUILD netbeans-javadoc-9999_p20130526.ebuild 6040 SHA256 57501f83a48cc8904e6a668c547981429e90f3d7cc6b6282f2c7bb53c2760d4e SHA512 da0ecf2504f792a42f43380e2cb85157a0aa9b9fc65b2e0300122beb643cc98902b817659308843ed6e6a0ebbddd171aeb0ca3dede97b7d3fa7e77e1286d57f4 WHIRLPOOL 042ec6ab9886734e773772bea259ef40c1a7cafd807a61c9a111c29f7a90a98362a2995f165bce60c82922ce7922d4bdfa9e6ed4157df99a71a273e9d33b43bb
 EBUILD netbeans-javadoc-9999_p20130529.ebuild 6040 SHA256 2731fa170dc896f34ece301e99fb52cf7074c989ee44ef6c989da6c1a890f227 SHA512 1b3753b48dcd126f5be7351d03dd96b170b4a0fa2d1dcf5bc67bcbfefb3d0aca0954e3b67ea5b77945792c407d70875b0d7cbf7062da6c8b9831cc001e42cfa2 WHIRLPOOL b8e522648eb397357168002d7f4436cf5989d9e9cf038dcb79110c4bd09f9e49ad78f68d0fcb9224aafae5a8332bcba11c9761673f2bb6aaae6287ccf933ceee
-MISC ChangeLog 79113 SHA256 f81de0263e226dd8ffdcde6d124c84873b0e600d3a84e5114cb3f12b2e6a716d SHA512 5f348bf16f0698871a388ea43ff8d9c6736eacb08ff2d8fc33d416a9c8c4e6ed7fbdf36c8dd9c17b00fd020ed9513fce6c0c0ac2b7df33417918b34408742c45 WHIRLPOOL b610743cfc33a54dfde4b104a357f4753acfaea09b87148b0d8e1aa5cdde33733f4037b0db5e0b3c69d8e69139f5909b633464f9c6d3f90f52e285bc3f0defa8
+EBUILD netbeans-javadoc-9999_p20130530.ebuild 6040 SHA256 cbce4da924216c9e678ff087ba4bdf4cc74ea8f3178b6e453553c486f9897eec SHA512 2ee7ee23c497e39d9b411438c9290158ffc547d1608439f553eaa1053c0daac2c4d891dd1fdc29e5331ff0947e5cc0af2af1bd781874676286ec992d3308c41d WHIRLPOOL 781b5168113b2f2e6909d79ca6701e7c985c759eb0838cd3cdf0e2fef5d917390d1c9f14b4673cb373fb5a505f3ef2b7d0fe427b3613fd618bac97f422044856
+MISC ChangeLog 79292 SHA256 d9eb4ec6a96337a88c87270820e50f757b170e86b2b3a0636c39b1048d8ba26b SHA512 18a39c513c38bc7aebe1753f177100f92d70e478be178de49a550b42bf78a1165615f39e32323e2692c22690f223cb2ec4c74b0061ab6c17b2c898a35a4530ef WHIRLPOOL 10ae11b261a73bb56f3b6cb65c3f944f90431a124ffcc7430f4ab5a8b997948d90df9fb095cb2ffaf422d2291e30ae9e6a794cc8ef8d201aa5932a04c23505af
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20130530.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20130530.ebuild
new file mode 100644
index 0000000..e52456e
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20130530.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2013 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 JavaDocs"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2013-05-30_23-01-06/zip/netbeans-trunk-nightly-201305302301-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r8-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/3B9300EC2301B54DD0D46CE915F016ACFBCC381B-ant-libs-1.9.0.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+DEPEND=">=virtual/jdk-1.7
+	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-extide-${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-r8-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/3B9300EC2301B54DD0D46CE915F016ACFBCC381B-ant-libs-1.9.0.zip o.apache.tools.ant.module/external/ant-libs-1.9.0.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r8-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-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.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 cac9d58..0db290b 100644
--- a/dev-java/netbeans-javafx/ChangeLog
+++ b/dev-java/netbeans-javafx/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javafx-9999_p20130530 (31 May 2013)
+
+  31 May 2013; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-javafx-9999_p20130530.ebuild:
+  bumped to latest nightly sources
+
 *netbeans-javafx-9999_p20130529 (30 May 2013)
 
   30 May 2013; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index 07ea1c9..dc4e872 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -20,6 +20,7 @@ DIST netbeans-trunk-nightly-201305232300-src.zip 187763774 SHA256 211672ba83f511
 DIST netbeans-trunk-nightly-201305252300-src.zip 187807028 SHA256 b2e70c316de0cd83aa2a1b0ae4f2e1da432199396564f77155b0b74d708e11a6 SHA512 c4cc20ff92b5b35f729539bbebc260452ab89f8c28b6fe986f3ff04f35a02a2039710291411880283901ad515d3ef62a15c615c74bc4df621970abadd0a50c69 WHIRLPOOL e61232b507ae121fd286e136d292f96cfb79a58c7b155a2743301092e209ecf888378fa81aa9752816fb6c2f07d5fef60a2c9fccc3e921bca80449b5cf2c4764
 DIST netbeans-trunk-nightly-201305262300-src.zip 187807028 SHA256 8552e30f84ea1b8483dcc1596dd3612121a068f5c36bc0093de4fda24157e41d SHA512 e69451b64003c4c4feb3b4232f6a6e51308b59a5feb9617217b43295d311ce279219b5a8fdbb2457bff512ae4fa10ea649b5d0b7eba424c3365e5071d56c4436 WHIRLPOOL 400a776d0034dcf78c833c7b80a99524a7634213462f7ad45297cbfa2b02cf70d4699e81d946d874135c4bdd23b07631df65db454214423368ebedbc89a2e0e7
 DIST netbeans-trunk-nightly-201305292301-src.zip 187953498 SHA256 00164aa21766eae8a68e648f3a838da04b98e48a91564bb0c8e7d02e8111ab8c SHA512 e9e3e2d45bf8db8a5c0ad0ef81020916f303554f26c032aea50612cdc9406c1b3c1d594f7fa08faae2676572eb9dc675a9d615efdbf920d61134e6628ec8fbce WHIRLPOOL 6481bfe8871154685314b9bae1c96c1690eb0d770f03a4708f603bed5165f0207d521cc48cc51b81432b98126f9089d3bc06a3c7bbf56347be7edbe2898a47c1
+DIST netbeans-trunk-nightly-201305302301-src.zip 187971727 SHA256 8aa8682d824dc611bfeadf594449af492c5f0403b8fa8daad0f28dd654365830 SHA512 affe9abba9c5970d8492248f46c0edd1d6f011ec1d2a9f238e94d00bbf9c53af563e0a6144b2781683700ec5f69273f956540efdb062746f3c91c545f8cfbff3 WHIRLPOOL 65f8f32ead3f9ce0f23b287f641b96245db0eaf26fa46b52f82843afcd060d9e505c39136980932e906f1aaeea37db4ecd073eb06ec779299843242d8c27dfe3
 EBUILD netbeans-javafx-7.1.2.ebuild 3593 SHA256 76a29b37765000745794e6ae20c6b8528d8637507a257ffef3bef2ce648f05cc SHA512 a04618bda036e6652c7208f90a4dd91e07e75b85243580263f6ec846425ab907a87c318117990d4e8d9044bcd7a0ca8b63bc32bdd0d84e5373a10e67a77b79c0 WHIRLPOOL 11acad585f7315ae6b4edd53c764167567a948cb0e2037d95f2f4de34765909b71d095540c054f4cef3ba70224d294b42720536566e445cbdd06ebf2ad903841
 EBUILD netbeans-javafx-7.2.ebuild 3576 SHA256 3441b901a5074013351bc6c7ba6c424455e2affe52e448f2cfac0058c82345e2 SHA512 ee384d6e4ac767ade82b5d337d7a1c5d2b463c15a7596d91e1a850b37349f88d7867a0ffa11a118c48e2ed463f38dcfa791ec42b3fe85ea1e6bf7c4b27f9b073 WHIRLPOOL 15c7d20f2caa39c6cfcba2f846736754b049483f135ac90ced399672932a6a73467f0b4016550c3b2d8583be20d1467486f5652111893ec16111095a3e9c941c
 EBUILD netbeans-javafx-7.3.ebuild 4476 SHA256 9f268a852d45f37f9d22c3bb58d36be17f438e4b4cb5105d88ac4404731facb3 SHA512 3fa0e48e949d0df0a4404c04379623529f73ff15259f4164fddd10afb9faa046ceed16aac1a7b14728af89bf3a4ed7037638fb7e7e932a64cc71e84f7ecaa44a WHIRLPOOL 0395ca679fa41610c61dceb6ac018d7a76b62c08ca740de2fa2d98523f8e5f840a2d0a8c357b674d171841f93d980b536a671a1f12b5261d402c03b691ac6504
@@ -31,5 +32,6 @@ EBUILD netbeans-javafx-9999_p20130523.ebuild 4694 SHA256 ca414cb15d3b69e919f7f59
 EBUILD netbeans-javafx-9999_p20130525.ebuild 4694 SHA256 329cd8f4fefc7231e7b33fbb9eb6f40d15e6e9bb7f8511276aae7ae432d4c437 SHA512 a732188d3e38f17147ce38195e81d8b89add28cd5595bb73ef0c43e2358bc268b39527a3af666ed3e6bbdc7d96c81bd3069bb108b9b96e7d3053ca5e0f742f76 WHIRLPOOL a83eeec03857b6cc372d1d0633c0f8a589aa52adc561214a5723b65df14e3545c5ef71e1fa96edb2bfeefb90cb499d2add8b08308d1169bf26ad5c725f0ac983
 EBUILD netbeans-javafx-9999_p20130526.ebuild 4694 SHA256 241ff0d5adb9d9d7fad5ae6602956d859c6408331dc2dbada0d4647d1f85c8ee SHA512 d34a317253d58b40fab122767237fff90b6d4c457548c9aa3771e013c265eb4e3c1b8f8027b9a97948bf2f52bc576af252c3dce95b25e9a57306fd517b4b8818 WHIRLPOOL a617335e02bbf150b7f1ab1bd58049894bb1e96004edb759067956875f1bf6d56eee9ebfb2eaa817db43a1a28a98ffb483189fde182885ec2f60282b16df1edd
 EBUILD netbeans-javafx-9999_p20130529.ebuild 4694 SHA256 ffe8b509ad44b987c584332122c903f70fe252b60b8732ca23ff1009f4d65bd4 SHA512 9ec620054b2a28dfdacb1802a299aee17ee8a56a67d24fb10973429bb02a84bb8c9784468615f848509c83c16a63d0af8e8a94ad1da7daf1e7d47658fbaa79bc WHIRLPOOL 75f84281d1896b8ac655181d3600cfa2bb1431a5b43016685677bb51f3cae8c934d75c14c6cc558f7aee60a2145db0ffa7ffcdc72d2987d43e441b1a38b7ec73
-MISC ChangeLog 64847 SHA256 658c9cf62698d7f41ee813735d5dadf9ebb7027f62df05c8068055e358237da8 SHA512 7bad20bfc2df7cf6235803c8f87374c09d83b171bb343087a0f166569c15277f9f8fc334c128b72479e0b03849e7fc13373350c29a48da87b968d4b9c01cb45c WHIRLPOOL c7e57dc8e30750f7107008b2e12142084e7f891220078727c2ffb33378bb30dd357c35b478db2cfd8ca4da9fc06cb52501f28953c9ed5fb9191ef89eef9e8b71
+EBUILD netbeans-javafx-9999_p20130530.ebuild 4694 SHA256 06e42f360507b7c4e348057af7efe2a71495ee247212d892c78fbb7e79333a26 SHA512 327945bdf5891647220ec5eb8af004fb6c0ed4b153f16cb812190e379b67da489f06581ab8acf368c78e8a7c6bb938c218bd3aa651c0688ac004ec3cefd83c44 WHIRLPOOL 5be24afb3f0f4762edeb76d543bd6372145e1edecf47f7f7bdfe715d9c859ebdd4414bce16f056169469c08243874af7fc36bce80e85a768f42f8d07214ed880
+MISC ChangeLog 65024 SHA256 b4dd1706d62903f9319a2606b2fcf37bfd48bab125c924b5ee5e9338c64c6e8a SHA512 1c0bf80d40942f2ba0a0f8ab7d5f91e7acc5409559c82f37a52d98de6694a12200e75009cef958e9efa1b80f1a4d606bc62632611b1c3f4cd86421ee2f093867 WHIRLPOOL 955b89929f9eb1cc7ca8c3a714ea8d035feaf47e92b77c813c7d861dc93698b98012418655b9dd82391436cb6ea811e84cce878b90ad416a8c2da000f2f521b6
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20130530.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20130530.ebuild
new file mode 100644
index 0000000..14c8f2b
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20130530.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2013 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 JavaFX Cluster"
+HOMEPAGE="http://netbeans.org/projects/javafx"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2013-05-30_23-01-06/zip/netbeans-trunk-nightly-201305302301-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r8-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
+	http://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar
+	http://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip
+	http://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip
+	http://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar
+	http://hg.netbeans.org/binaries/0F7FC8D69950B86D5F67529B5C551DB84C5BCF87-nb-javac-api.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	dev-java/junit:4"
+RDEPEND=">=virtual/jdk-1.7
+	${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-r8-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}"/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar apisupport.harness/external/jnlp-servlet.jar || die
+	ln -s "${DISTDIR}"/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar jemmy/external/jemmy-2.3.1.1.jar || die
+	ln -s "${DISTDIR}"/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip jemmy/external/jemmy-2.3.1.1-doc.zip || die
+	ln -s "${DISTDIR}"/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip jemmy/external/jemmy-2.3.1.1-src.zip || die
+	ln -s "${DISTDIR}"/0F7FC8D69950B86D5F67529B5C551DB84C5BCF87-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r8-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-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.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/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 e7bdc49..d09d62d 100644
--- a/dev-java/netbeans-mobility/ChangeLog
+++ b/dev-java/netbeans-mobility/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-mobility-9999_p20130530 (31 May 2013)
+
+  31 May 2013; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-mobility-9999_p20130530.ebuild:
+  bumped to latest nightly sources
+
 *netbeans-mobility-9999_p20130529 (30 May 2013)
 
   30 May 2013; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index e79afe0..062a0aa 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201305232300-src.zip 187763774 SHA256 211672ba83f511
 DIST netbeans-trunk-nightly-201305252300-src.zip 187807028 SHA256 b2e70c316de0cd83aa2a1b0ae4f2e1da432199396564f77155b0b74d708e11a6 SHA512 c4cc20ff92b5b35f729539bbebc260452ab89f8c28b6fe986f3ff04f35a02a2039710291411880283901ad515d3ef62a15c615c74bc4df621970abadd0a50c69 WHIRLPOOL e61232b507ae121fd286e136d292f96cfb79a58c7b155a2743301092e209ecf888378fa81aa9752816fb6c2f07d5fef60a2c9fccc3e921bca80449b5cf2c4764
 DIST netbeans-trunk-nightly-201305262300-src.zip 187807028 SHA256 8552e30f84ea1b8483dcc1596dd3612121a068f5c36bc0093de4fda24157e41d SHA512 e69451b64003c4c4feb3b4232f6a6e51308b59a5feb9617217b43295d311ce279219b5a8fdbb2457bff512ae4fa10ea649b5d0b7eba424c3365e5071d56c4436 WHIRLPOOL 400a776d0034dcf78c833c7b80a99524a7634213462f7ad45297cbfa2b02cf70d4699e81d946d874135c4bdd23b07631df65db454214423368ebedbc89a2e0e7
 DIST netbeans-trunk-nightly-201305292301-src.zip 187953498 SHA256 00164aa21766eae8a68e648f3a838da04b98e48a91564bb0c8e7d02e8111ab8c SHA512 e9e3e2d45bf8db8a5c0ad0ef81020916f303554f26c032aea50612cdc9406c1b3c1d594f7fa08faae2676572eb9dc675a9d615efdbf920d61134e6628ec8fbce WHIRLPOOL 6481bfe8871154685314b9bae1c96c1690eb0d770f03a4708f603bed5165f0207d521cc48cc51b81432b98126f9089d3bc06a3c7bbf56347be7edbe2898a47c1
+DIST netbeans-trunk-nightly-201305302301-src.zip 187971727 SHA256 8aa8682d824dc611bfeadf594449af492c5f0403b8fa8daad0f28dd654365830 SHA512 affe9abba9c5970d8492248f46c0edd1d6f011ec1d2a9f238e94d00bbf9c53af563e0a6144b2781683700ec5f69273f956540efdb062746f3c91c545f8cfbff3 WHIRLPOOL 65f8f32ead3f9ce0f23b287f641b96245db0eaf26fa46b52f82843afcd060d9e505c39136980932e906f1aaeea37db4ecd073eb06ec779299843242d8c27dfe3
 EBUILD netbeans-mobility-7.0.1.ebuild 8655 SHA256 992e214ff2926e2f0db623d96b717bf8f8e4ceb47e96e69b3c6b8f67d6a8d130 SHA512 d51bc003f4b637cfe71c9f49a96427e535596542ac195a9621bc4f92c04a6f720a87fac6eb267732f869ba105f263d9d36f848b54a89c734b6a68a78ed323808 WHIRLPOOL 515da7153b12c3b5779cfad16e3800b4d26ba4b174027d9a7b06a26754fad065751c7eda137ba6199315d024a322d59e7ea39a1b2f4244ea75b30770ac505791
 EBUILD netbeans-mobility-7.1.2.ebuild 7543 SHA256 bb3f1245ad68133798fa507f06dd1ffbc1d55f6ba38f4cccc29ff0240e5b5f22 SHA512 41f663977a0716c5449db597d5f90054717ff3579a9137a910d1943d3e0b39379c34c0d9aa9c98d231037a042074c8ecf5fc62c018cd7cd5e8680734ff854c51 WHIRLPOOL c3c6feb41ce3df356f617ca80530673ac653cdf50da0aead00518854d0850d6420333529aa6591e15ddd4053249191fcb47100c5f39a804352722e54f802bae4
 EBUILD netbeans-mobility-7.2.ebuild 6571 SHA256 58af97ca9a6adc56fa6abe91777a1ac35a3a9b7d68af1e73c23a45dc5631abb2 SHA512 ac42c3a3daa7d55c9c13d1c99dd6880d5d99741f80cfceb683da27e30c70d6228d9434571f2405d0dbbf27d2203e3f877da6347794b07b98331edd1631d3a69d WHIRLPOOL 5a6af3cbcd08180dcdf708a038f3119faacb9c78532b4bb1945c7260fb0a8232af57745e41a73311fafffe185c969e0c88ac34970caab7708313f53417695374
@@ -36,5 +37,6 @@ EBUILD netbeans-mobility-9999_p20130523.ebuild 6806 SHA256 e7e29f1abdbc018719725
 EBUILD netbeans-mobility-9999_p20130525.ebuild 6806 SHA256 cfc5b282e590e8fdeebae9bf8415f3bc0b58646dac57592932b5a849a0d09bb2 SHA512 22f3140f2fe1822713eed75749048e11efeb7220ce4776b132fd5d451d92c6f8f3af69d615ecc16a7fa7a5764c20a53e3e67fd351ff5e72de80de062a079843f WHIRLPOOL b146711dd043c954409a47ed9b235212d737b55c03c759b897b1d1da36b31c8f11ee306fe69cf6b81e9c744fbc7ac3b8a272425506c88d03318b84afec3873e0
 EBUILD netbeans-mobility-9999_p20130526.ebuild 6806 SHA256 9a3f13d51ef5b20b0cb78c975286141ef069cb6974aac78efc09f1e17160b5bb SHA512 926f93a1ecaee9ec62be452f90f7ad47465fbe60df30719bca52ea30255a9fac88da5c37c142cb71a9b539c7c66b1e66bad73f793f8f7077d86eb5e3aa04c538 WHIRLPOOL afd6d577ed7eb4f6126ffe4f26ab2fc7bba5e336eb19851f2eefff61558bd3ed5ac3cbbb8c3000443c6b3dad3dd034da8102304968e0595b6af991a02ab53312
 EBUILD netbeans-mobility-9999_p20130529.ebuild 6806 SHA256 78979979bce5343bf940731bbaf3eeb6f94f6a5031e2f5c71e44ea2b798e6d3c SHA512 e35ad3a5a3f76419a0973edf6c4349f7ef329b032a76b3bdb40c7cf25026286fbd78b98bfb59ee323fea1006dc38094c33a0eac2f5b13daff4fce4fc6e270c23 WHIRLPOOL f3c0a319f5216e7f57ba5d7436413aced203414b48f43ce20372e961938bb3072964d686efafa689670bb1fb52baf37f6597e7a422809c817a3580a4f38ebf6f
-MISC ChangeLog 80387 SHA256 bf6dbf573ecb5c62a264ec092578974b6176eb3873cf1481a7ae0a05c3ab51ff SHA512 db3d1ebe2d1d6137a58f2b16f06730258a6c99ecb610b64e761d383bbf3859b8a1521bf0e3a517edc5d86482b9591961b171c13eec95c95d4bcb9aa07ecccb72 WHIRLPOOL c7c0373a06659f669d7eea4194ee461a2126551d0b4b2bad590df6bfcd087f25e92f637738e89c778e5507efb3d29b445da13b18a250c5e78ab26dd8cd6deca6
+EBUILD netbeans-mobility-9999_p20130530.ebuild 6806 SHA256 69b6767823ce78dce1f9bd02fc41dc0e68863c75d1454dc91776554fb9322dc0 SHA512 9e3f0c305f5b69975eff0e683c46fe1124d4179507cda943520d71cc14ff8d378e97bc77752dfc67bdbf0ddfd1b997f885bcc6c2862752a405190ec76f243196 WHIRLPOOL 07af7e1afb0f90274ef52b58819cafd413c80b3f43092c131b2dae5095f87a4565af7c0ffe7554f65ff5aff7be6162a4194a5027e9b9be189c20d3a5b12deb90
+MISC ChangeLog 80568 SHA256 6aa81d56d5a8cb69c64a7ae421c5d6560391062bad38fc56589f79a077b8348d SHA512 7920c239a0e6f98da1f17c9a1a9ada36fae4c4e650594028042cd758ebad53d4a611e791089d8850f8fd0cf9904149965f81ac22d44cf22030bb4c1f0ee6ce76 WHIRLPOOL e62597288c51a3b937423a55428afbb9e9993210a6fd2d1b5e4fd8d0f384db81296835337da0dc6dbe1e60b237d9e3194e8b45a2aee57728c4c4f3570d39aece
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20130530.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20130530.ebuild
new file mode 100644
index 0000000..67a243b
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20130530.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2013 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 Mobility Cluster"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2013-05-30_23-01-06/zip/netbeans-trunk-nightly-201305302301-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r8-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-extide-${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.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${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-r8-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-r8-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-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.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
+	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
+	rm jdom-1.0.jar && dosym /usr/share/jdom-1.0/lib/jdom.jar ${instdir}/jdom-1.0.jar || die
+	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 3cad640..5dd5204 100644
--- a/dev-java/netbeans-nb/ChangeLog
+++ b/dev-java/netbeans-nb/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-nb-9999_p20130530 (31 May 2013)
+
+  31 May 2013; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-nb-9999_p20130530.ebuild:
+  bumped to latest nightly sources
+
 *netbeans-nb-9999_p20130529 (30 May 2013)
 
   30 May 2013; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index d991675..34f2afb 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -21,6 +21,7 @@ DIST netbeans-trunk-nightly-201305232300-src.zip 187763774 SHA256 211672ba83f511
 DIST netbeans-trunk-nightly-201305252300-src.zip 187807028 SHA256 b2e70c316de0cd83aa2a1b0ae4f2e1da432199396564f77155b0b74d708e11a6 SHA512 c4cc20ff92b5b35f729539bbebc260452ab89f8c28b6fe986f3ff04f35a02a2039710291411880283901ad515d3ef62a15c615c74bc4df621970abadd0a50c69 WHIRLPOOL e61232b507ae121fd286e136d292f96cfb79a58c7b155a2743301092e209ecf888378fa81aa9752816fb6c2f07d5fef60a2c9fccc3e921bca80449b5cf2c4764
 DIST netbeans-trunk-nightly-201305262300-src.zip 187807028 SHA256 8552e30f84ea1b8483dcc1596dd3612121a068f5c36bc0093de4fda24157e41d SHA512 e69451b64003c4c4feb3b4232f6a6e51308b59a5feb9617217b43295d311ce279219b5a8fdbb2457bff512ae4fa10ea649b5d0b7eba424c3365e5071d56c4436 WHIRLPOOL 400a776d0034dcf78c833c7b80a99524a7634213462f7ad45297cbfa2b02cf70d4699e81d946d874135c4bdd23b07631df65db454214423368ebedbc89a2e0e7
 DIST netbeans-trunk-nightly-201305292301-src.zip 187953498 SHA256 00164aa21766eae8a68e648f3a838da04b98e48a91564bb0c8e7d02e8111ab8c SHA512 e9e3e2d45bf8db8a5c0ad0ef81020916f303554f26c032aea50612cdc9406c1b3c1d594f7fa08faae2676572eb9dc675a9d615efdbf920d61134e6628ec8fbce WHIRLPOOL 6481bfe8871154685314b9bae1c96c1690eb0d770f03a4708f603bed5165f0207d521cc48cc51b81432b98126f9089d3bc06a3c7bbf56347be7edbe2898a47c1
+DIST netbeans-trunk-nightly-201305302301-src.zip 187971727 SHA256 8aa8682d824dc611bfeadf594449af492c5f0403b8fa8daad0f28dd654365830 SHA512 affe9abba9c5970d8492248f46c0edd1d6f011ec1d2a9f238e94d00bbf9c53af563e0a6144b2781683700ec5f69273f956540efdb062746f3c91c545f8cfbff3 WHIRLPOOL 65f8f32ead3f9ce0f23b287f641b96245db0eaf26fa46b52f82843afcd060d9e505c39136980932e906f1aaeea37db4ecd073eb06ec779299843242d8c27dfe3
 EBUILD netbeans-nb-7.0.1.ebuild 5116 SHA256 17ac4a9aa7931d052a899ad8649bed42d5c37a06d913e0dc8ded118d7ef01c47 SHA512 932964fcc4d8d614a2ad8531eecd9298b89f06ac97db68e140e77bceb5d9c08c35524ae4766c18f5467bb01391a9c9f29cd4c5e45c29664b91340a33b0804d7e WHIRLPOOL 0e935fc1c63b61a97e60941111cd30fe4f7b740743013074f7722f3556473ccdba8bcd70ac6f544c67e2a60dd2d7c96abc9bf6bfc51aa6e9ff3135d041ebf3a1
 EBUILD netbeans-nb-7.1.2.ebuild 4987 SHA256 075ef11ab57b236061e4df3e905524ecfba2966c5d735d113b878a03219a9cc1 SHA512 321182e1780acfdbff56c1c84748897cf8c4dcf9fc94d0a6db71a018968e8f96e479a2dbb2f97655d50ee836ac1a81fdd62f6f04ba1b2d54157158e577c2b986 WHIRLPOOL 3d3742c6e90f0231ecabf5200446d00900204f51b9fb2be92954668dae86584d8ef477be11cad462a9721a04a1bc97673b8d8d808ef49f0345d979022471d919
 EBUILD netbeans-nb-7.2.ebuild 4970 SHA256 79d73ca57dd63e25afccd44816dd248e79f6974dd7e9ebbf4b3b11eb659092d9 SHA512 083317f6944c5fe38507fbca18804888e25c23070420a3080bb68bf00be95e520541c381482a6c55ff60656b36f8dd3fac60f2c605e4e3ee0ae92427faa468da WHIRLPOOL 7f02ab258612c5035b26326f25aaa08bf60fc0ff3108a2bf61dbcde9fe845e647f91319938206742a5f131fe905678833f3ad2449f68efef7e6ed4203f7538f3
@@ -33,5 +34,6 @@ EBUILD netbeans-nb-9999_p20130523.ebuild 4984 SHA256 f879460ef89d2c93b61f517fa52
 EBUILD netbeans-nb-9999_p20130525.ebuild 4984 SHA256 c9bd10c8067c1db093367b6bc6b4331854479576b6f02e8cc8d5c2ace3d1ff5e SHA512 4c668b2070a733f787229ae1132cb5d07bfaeac4ce378dbcc73c00cea49af826911ddc4a000e2f54da2e0d3453664868b5c9e90d63acb6694671932fc9817571 WHIRLPOOL 4ea4d64c8ac3c25cf479e3cd81a375371cadbd6a3dd05fc996ce7e7cb70665182d02d23224e12560b6c6a100f2c3d5649816964f34aa9dc79dd2a3e3638e6422
 EBUILD netbeans-nb-9999_p20130526.ebuild 4984 SHA256 d9f8c4c2b349666e7611f09bd16c8dd1a6a11197ff938f885c70cb78eb7f2600 SHA512 2d95b1bfb293f53f65a7d48d55d78ed740a2f108b49a5f6378669a5b6d8c17d46b4b5f3453913626e36a9283a7810dadbc023fca3afdbe4b36b5668e64829ff8 WHIRLPOOL de4f774ae4d675137a4a614f9ae4d8d0486757d619aabd6206f946d354880300eabbfe1f17647d066a92ed3f5729f75cde42a84615cb455374782d5a9a8f46b9
 EBUILD netbeans-nb-9999_p20130529.ebuild 4984 SHA256 b4d51d4eb88915517f4be6822f629f5dff99d8da509923e29133a7c2753250a7 SHA512 157dfa3668fcacd0123de50f6a417f45215f79cb7d0090fd260eb76da305e1dfee6c6079688d118595c05419495cd6f264cc99c8bc4726fbd5fb5e3c0bd65377 WHIRLPOOL dcde9b533a15e22f85f567fb1e9a79f121113f3e06046fa1c3a3d74ab8a8de963f550801b974ed0f6c4db4cfa417f3c230beb536b9c9ec57b3ac9e8572205412
-MISC ChangeLog 75031 SHA256 45cbceb0454f1f490cdae8464739304454fa63ba00444d8525c054c67df38cca SHA512 7635f99abd39e97294475e6b3165675f4cf56f1a8c96bfd70ac53adb45e5e2020735833565053a2bef0fbecbb2a8b1b6ce1375e9b026429b4c6ded1f5efef64a WHIRLPOOL 2caaf999b6163826cf97c41190a8f384ca0c5959b39688bea7bfd32a7028a22de82fdac96648a335cb75fcfcf70d2dcee4bbc4bb73a4615fe41efb3c24649161
+EBUILD netbeans-nb-9999_p20130530.ebuild 4984 SHA256 050d1a9419dfce38899ce91e6f3f5d681adf9553fd5957d4bad3f79f2a833633 SHA512 b804821eb55e78056fb40954cb87c426a53314bc479b50c4428462287c63c23219fdbe69f281c5b82b1fbf52d6fbb7ab1f246dae66bf2ddf06cb2080aea95c6b WHIRLPOOL da22e0142b9e908d2db5527dd121301e8a41cd6cf99172abe15ab06cda45770833d4057731b34df6139ccf123f13fa3e14fed8f60309337b1c88b61d7a686fa8
+MISC ChangeLog 75200 SHA256 450283d7f0e0e9c8c8d2e5d43d0598465b8cd9871fd9f3679e91f45aac7d56e8 SHA512 ee573726beec3820a0a443cb2446c7701be8edec9f61c6bbce158fec99dcc74a7fe955967b661ebc898e2613cac32b0b701c1cb46efce7337da709b8b5515ae3 WHIRLPOOL 27604d2786ad653dc2e42b97e1d529fed189fbc2682e4b9f3fb9b430670281f3d67f5c2721bb7a84b3a5198665663c97a481bcbd0b3cd3b974dacb0c3c221979
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20130530.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20130530.ebuild
new file mode 100644
index 0000000..505f63f
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20130530.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2013 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 Branding"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2013-05-30_23-01-06/zip/netbeans-trunk-nightly-201305302301-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r8-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.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${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-r8-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r8-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 e9781c8..4861584 100644
--- a/dev-java/netbeans-php/ChangeLog
+++ b/dev-java/netbeans-php/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-php-9999_p20130530 (31 May 2013)
+
+  31 May 2013; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-php-9999_p20130530.ebuild:
+  bumped to latest nightly sources
+
 *netbeans-php-9999_p20130529 (30 May 2013)
 
   30 May 2013; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index c07ce8c..d326ca5 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201305232300-src.zip 187763774 SHA256 211672ba83f511
 DIST netbeans-trunk-nightly-201305252300-src.zip 187807028 SHA256 b2e70c316de0cd83aa2a1b0ae4f2e1da432199396564f77155b0b74d708e11a6 SHA512 c4cc20ff92b5b35f729539bbebc260452ab89f8c28b6fe986f3ff04f35a02a2039710291411880283901ad515d3ef62a15c615c74bc4df621970abadd0a50c69 WHIRLPOOL e61232b507ae121fd286e136d292f96cfb79a58c7b155a2743301092e209ecf888378fa81aa9752816fb6c2f07d5fef60a2c9fccc3e921bca80449b5cf2c4764
 DIST netbeans-trunk-nightly-201305262300-src.zip 187807028 SHA256 8552e30f84ea1b8483dcc1596dd3612121a068f5c36bc0093de4fda24157e41d SHA512 e69451b64003c4c4feb3b4232f6a6e51308b59a5feb9617217b43295d311ce279219b5a8fdbb2457bff512ae4fa10ea649b5d0b7eba424c3365e5071d56c4436 WHIRLPOOL 400a776d0034dcf78c833c7b80a99524a7634213462f7ad45297cbfa2b02cf70d4699e81d946d874135c4bdd23b07631df65db454214423368ebedbc89a2e0e7
 DIST netbeans-trunk-nightly-201305292301-src.zip 187953498 SHA256 00164aa21766eae8a68e648f3a838da04b98e48a91564bb0c8e7d02e8111ab8c SHA512 e9e3e2d45bf8db8a5c0ad0ef81020916f303554f26c032aea50612cdc9406c1b3c1d594f7fa08faae2676572eb9dc675a9d615efdbf920d61134e6628ec8fbce WHIRLPOOL 6481bfe8871154685314b9bae1c96c1690eb0d770f03a4708f603bed5165f0207d521cc48cc51b81432b98126f9089d3bc06a3c7bbf56347be7edbe2898a47c1
+DIST netbeans-trunk-nightly-201305302301-src.zip 187971727 SHA256 8aa8682d824dc611bfeadf594449af492c5f0403b8fa8daad0f28dd654365830 SHA512 affe9abba9c5970d8492248f46c0edd1d6f011ec1d2a9f238e94d00bbf9c53af563e0a6144b2781683700ec5f69273f956540efdb062746f3c91c545f8cfbff3 WHIRLPOOL 65f8f32ead3f9ce0f23b287f641b96245db0eaf26fa46b52f82843afcd060d9e505c39136980932e906f1aaeea37db4ecd073eb06ec779299843242d8c27dfe3
 EBUILD netbeans-php-7.0.1.ebuild 4151 SHA256 3aee393fe89aa4788ccd17af46f1df43a5681c28af6d580724d8db0f5e804ff0 SHA512 60106805595338b83e17d906c199c54dc4cc5d979f964a41f9938a508e8514670f4e5538eeecd91f8cd06dd2b4376119674f9a7a9f2fac6c1255e14929f2bc19 WHIRLPOOL 1a09962a5bd67a4fd4eed48af3f185146d2de6f506952f626756aabf6a157678fe71e0752ed5988ff414803b83150d9b8b4de956895667e331659bb59f94e09c
 EBUILD netbeans-php-7.1.2.ebuild 3940 SHA256 779f3bceb2b5a49e923fff28c36c653e31e2d11e186fabab1e656c3314b48d28 SHA512 1296c8ccbec945e66588c2a1a490d3ea93a28672e77751e16c3dff1f1aa6e3a00b454345f0b888c684a0d31fe05aad4f44310998eb72bf1febba85da1bcdd08b WHIRLPOOL b0238f8c5aa4a8c0a5cff82b0daa29860fe39712e96110916cd8a26938ca07b8e05c308e1387c84e7d693026590846392227e95668d150bbc7f1cbc660676eec
 EBUILD netbeans-php-7.2.ebuild 4159 SHA256 bb5c66ed19c9341332e1e42efb29a4ab5d19a22c995bae93efc952ec105ad493 SHA512 c919b120bdc51b56f58b390e9a017f9e059c6b5709220e80138caf7ca3e58d432f53c9ed28f899dc9537851a4cb8cafa9e7067eaefc5d5798b05fb0be9d5bd5f WHIRLPOOL 9857d2e6ac50c4daf5c8afc0a5b65b068b6010ecf2ef04f063bc184810c18b50feda683d2d80c84c0e621909bb05b19731135f2a69f1e56db927c42e8057a658
@@ -35,5 +36,6 @@ EBUILD netbeans-php-9999_p20130523.ebuild 4394 SHA256 7382fcd351d75a8c729cbbe874
 EBUILD netbeans-php-9999_p20130525.ebuild 4394 SHA256 208bb29776443cde3f0c4247b10cb07bc8d46cf81ab3c13629f2283f38008aaa SHA512 f27159ed968d1021ed3fd2735dfd6f28f2ec797f252b95b19c1ce0ae8c0b22510a035cf8db7b984c0e6ef3dbc3d278d9d282270168cafcf5e0a2bdd544c5a693 WHIRLPOOL f2486e6420914c5360b9109f93cadd4aad13fe68e1e5baff06b5a685eff3b7e58973c64d98553e802e3649bf6b0c3329075ba3fa360f9415a097728d5809564b
 EBUILD netbeans-php-9999_p20130526.ebuild 4394 SHA256 4461367d571a61b95a42d29612ca04e7b78d373b0e78e83a1ee3ecbd3f83bb25 SHA512 24482498928266c688b684306a5305d11aa948734bf8ce138d43ea6a8564338130c57ec7b572e54baa17d12392f1f35b689d704a5ce18696b47a8a2ea188800f WHIRLPOOL 1803375f79bd187638833f2194aafec5dca89f7ac7ee6c12962c6e8f2ebdc91aa120cdbc71ae9a45c746d5e8faf55eac81c56a46a1dd3f76ac62f29f42fb7cbb
 EBUILD netbeans-php-9999_p20130529.ebuild 4394 SHA256 f44ea19154e6bf5fc7376859c4bfa478f6edc4be0ea06d315438bcffbd62b309 SHA512 910504aa0ac7952314ff0acb7cb0b9ba5b27eef88eab253226dde2512967eb066fd339c7edfcb6b06afcae104bd82c265692f5699f0710efed1639273d4c6646 WHIRLPOOL 6cec35a5add4864b1fb6fa2fd11e2ffaf4ed669d3eda543615185442211729ecc1dd260db4f5c9971df64b4f8dcb1d66bccb4fed88c99955b5c0d2e8011448c9
-MISC ChangeLog 75082 SHA256 166e02a902c98c63dfc84815fa84e2be1a97223b2f2bedaeb69daed854acd486 SHA512 dc3cc91f3c1eaee86329e1c39e6c1ff29bd60142514354a63074b066ba8948847b5dcb5f5610e0bef071641e0c5dbccfe05354db0e365a815e87477ff7a19a8f WHIRLPOOL 93dfd870e5015b8a8f756b74a59c3669504166233f5a00a1b4dc8bde871c57413363ed3b70d53bc56d79bea56f2018d473958cddb9922cd4483cb029a27be82d
+EBUILD netbeans-php-9999_p20130530.ebuild 4394 SHA256 5466e6d7cc6b952c1032ce4b334213e8f7b1be04ca3266255375cd8641f4aa76 SHA512 75e3a5a5f6c8e1bee358017f7b96f86c6e9d23a5a2ef78560dbedb12130c1ae85b614fe27f430ef335a7c52e10f5af2eeb13fe1a55376d35e0d4d9e846c23b89 WHIRLPOOL c67f1162feaa5579c27a3cdd35517a9a8f765cea2947dceff59d90d55e03fb93b1bed4fa083b32a200a79c50abe42aca278159324b04f52b534dc8348c8e43b8
+MISC ChangeLog 75253 SHA256 8ff77c23cf9b2ca823d745df34865ac9c4c442f890ae3b4c65299c7b4c0a99c1 SHA512 d33deba3768407e265a7f4bed292a19d3af436b4e09b8a38cbb5474f83bdd5820a8e78c177a40d4951c3cfcc8ec19c85ccd9bc57351fdce48c9e37a90caa9610 WHIRLPOOL 27ad2c39b602745bf9790f0da22cd7e3c0fcdea098a73be530724865dc7b1da33c118cde7619d926ee6360aecd94084d08ef5e2990555b70cf567aa5abf0093b
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20130530.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20130530.ebuild
new file mode 100644
index 0000000..0848ebd
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20130530.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2013 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 PHP Cluster"
+HOMEPAGE="http://netbeans.org/projects/php"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2013-05-30_23-01-06/zip/netbeans-trunk-nightly-201305302301-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r8-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip
+	http://hg.netbeans.org/binaries/2786575056B65CA8965B8D195E9FDE85BB895DD8-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-extide-${PV}
+	~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.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${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-r8-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}"/2786575056B65CA8965B8D195E9FDE85BB895DD8-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-r8-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-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.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
+
+	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 58fdfa3..45b7b43 100644
--- a/dev-java/netbeans-platform/ChangeLog
+++ b/dev-java/netbeans-platform/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-platform-9999_p20130530 (31 May 2013)
+
+  31 May 2013; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-platform-9999_p20130530.ebuild:
+  bumped to latest nightly sources
+
 *netbeans-platform-9999_p20130529 (30 May 2013)
 
   30 May 2013; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index 44ac8a3..20ce185 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201305232300-src.zip 187763774 SHA256 211672ba83f511
 DIST netbeans-trunk-nightly-201305252300-src.zip 187807028 SHA256 b2e70c316de0cd83aa2a1b0ae4f2e1da432199396564f77155b0b74d708e11a6 SHA512 c4cc20ff92b5b35f729539bbebc260452ab89f8c28b6fe986f3ff04f35a02a2039710291411880283901ad515d3ef62a15c615c74bc4df621970abadd0a50c69 WHIRLPOOL e61232b507ae121fd286e136d292f96cfb79a58c7b155a2743301092e209ecf888378fa81aa9752816fb6c2f07d5fef60a2c9fccc3e921bca80449b5cf2c4764
 DIST netbeans-trunk-nightly-201305262300-src.zip 187807028 SHA256 8552e30f84ea1b8483dcc1596dd3612121a068f5c36bc0093de4fda24157e41d SHA512 e69451b64003c4c4feb3b4232f6a6e51308b59a5feb9617217b43295d311ce279219b5a8fdbb2457bff512ae4fa10ea649b5d0b7eba424c3365e5071d56c4436 WHIRLPOOL 400a776d0034dcf78c833c7b80a99524a7634213462f7ad45297cbfa2b02cf70d4699e81d946d874135c4bdd23b07631df65db454214423368ebedbc89a2e0e7
 DIST netbeans-trunk-nightly-201305292301-src.zip 187953498 SHA256 00164aa21766eae8a68e648f3a838da04b98e48a91564bb0c8e7d02e8111ab8c SHA512 e9e3e2d45bf8db8a5c0ad0ef81020916f303554f26c032aea50612cdc9406c1b3c1d594f7fa08faae2676572eb9dc675a9d615efdbf920d61134e6628ec8fbce WHIRLPOOL 6481bfe8871154685314b9bae1c96c1690eb0d770f03a4708f603bed5165f0207d521cc48cc51b81432b98126f9089d3bc06a3c7bbf56347be7edbe2898a47c1
+DIST netbeans-trunk-nightly-201305302301-src.zip 187971727 SHA256 8aa8682d824dc611bfeadf594449af492c5f0403b8fa8daad0f28dd654365830 SHA512 affe9abba9c5970d8492248f46c0edd1d6f011ec1d2a9f238e94d00bbf9c53af563e0a6144b2781683700ec5f69273f956540efdb062746f3c91c545f8cfbff3 WHIRLPOOL 65f8f32ead3f9ce0f23b287f641b96245db0eaf26fa46b52f82843afcd060d9e505c39136980932e906f1aaeea37db4ecd073eb06ec779299843242d8c27dfe3
 EBUILD netbeans-platform-7.0.1.ebuild 5049 SHA256 b67cf0867358fea808614c02b8b6ea2ab88223f8642175ac3f91dc8c610aca4e SHA512 611b8e831a95d1b4e1c3a1f5e4904c84f9606298a94eb0900ac06cc88670849d218a3a03cce07b2463e206da01ce2931cdb6677948d20d8326908a36851589e6 WHIRLPOOL 01769eca4eb20c2702a432a6180eed16a9a50687016e307e585ab5de5cab8b3b664e456d489ff15d9f5af349f791b161eecb9fef7bfaba09a70e1eaab5d545a0
 EBUILD netbeans-platform-7.1.2.ebuild 5034 SHA256 a069e7e45f768e590e5b30fdda26185d8fde492355e4c530ce44169def991cc6 SHA512 31cfb0d9f13eacfcafd49be995bc456d17a689776e032f68ed4585e068a49f6e992c37c57f23c5e27176fb060996bcfc86b0446ae26efbc488909102fc10c979 WHIRLPOOL 1bd35ac39366fd13192e4a6a177280727bceb2f5f12ff684a288725954a29a240f2d264c3ef2ca38fa3e133063cdd943cce1d0f493f0f8ea9a621833c8f0031b
 EBUILD netbeans-platform-7.2.ebuild 5432 SHA256 227add7f41117667d8487f2bf8eb846c21529e7b2c49dac46e4b3b33062f69b0 SHA512 e49958f21358fe9689336d5cd5edbe435d0a2fd12c315174dcb408bf6ed4e6515d39d458554fb576c342a43f0af50c327bada8fa0b2eb485e14c01ddcdb6248d WHIRLPOOL 4f9101a2d5495fb6002b7791822f85091309c04d6c475060c116725f8da32f9ed270f0c27a9f6a2bd2aa0bd7417b18e9165d1feff7e98f6205bdafff3223e5a3
@@ -41,5 +42,6 @@ EBUILD netbeans-platform-9999_p20130523.ebuild 5441 SHA256 6251183f37e6a65ec0501
 EBUILD netbeans-platform-9999_p20130525.ebuild 5441 SHA256 74f2784787d119345040b9dfd90e128ccc414f17dbd559e47dfd81f6c7963ef4 SHA512 eec2d9ff1b24cf9100182e5700e0918098a764bc2581c98d506606d9f258aa398837d9452504259dcd34b3280bdf0f4d908b2f76c35c57bd8821cf94141e4e1c WHIRLPOOL a586ab01c4bdb3391b871b3aaf17b407ee636246b9defdf9c8e601a13da085de58dee1c3c26bbf97d3a6859c09e09990dea707e4a5849937abfea5a2a069897a
 EBUILD netbeans-platform-9999_p20130526.ebuild 5441 SHA256 13397d324a053616ee9b2a98fa542d2845d3ed6386fa1f19494fe0507e2d4927 SHA512 0ec3fa57247ed70bed38111d5593bc47686b53ab29d9774cff4483eaaa59968502fbaf9af20c5f59604401710e832607c13b6e8918e8796d089c91db2faed6f1 WHIRLPOOL 9f53e84228b5032df24349edf941afe8fb2cdb37ea1f7540034fb4e1aa0ddebe61699e9ec34970e8e9f158357f2d1a09b9e49a09792cb14be12ee5cd49e43a09
 EBUILD netbeans-platform-9999_p20130529.ebuild 5441 SHA256 7f64d62a61839bdea02386402bbd44230f39984557b57b97712b08d24ff3e7d8 SHA512 bf6f67ca8d2540ccd33052492fbc19bafa6779cccdd84d75cd321d58a001470e76d0fc391d674a0312a5df0d58099b0113eaa6e345c09e4724d22c49e82f9bf6 WHIRLPOOL a373b2a2c38d253ae6777471b700dad3e118748da76fb9fdacebab7df5183d1e43ab9495e98c1fd15fddaca136cea970bffb3a087b8745eb704c15774ce93bd4
-MISC ChangeLog 80983 SHA256 1f3ec5284844cadf9375436ca5bf194571a7e790dd3177d380cc9af703f5c139 SHA512 888b05eb7ac7b4e7bde3af4b27d74e112f06eb318a3472428681edcb66697b7dc9529ab879462678147519f68053e77000b14319bee503c8d99406241ca84387 WHIRLPOOL f05cae1a7d22916655167be9425c125de4a6553a4b315f22dda4072a6b60a744d23ddd0d46dea8690954417646fb57265256ca0754633409f75491ff9bbd24e6
+EBUILD netbeans-platform-9999_p20130530.ebuild 5441 SHA256 214422b2320c20aed61d829911cffc84bf2fb9c68eb7782d36767e82cf859ef7 SHA512 2c393e6df3a763143bea8b5b49cf45a0123b339031975f4596fcfb682dfbf3f4f7ad822c6498f477e603ad86b81ccea2062804f08403cdbdf823c62270b0860f WHIRLPOOL cdb1ff5a2a4b802cb708ce8768a768bf9afa3fc629661f6fe66873f203a812ec3321692c6f6e5cf4a7c409767983ecbe14eed89975cbd54eb869090f210bd214
+MISC ChangeLog 81164 SHA256 a1aec60a66d106cc3abbe27c30480465c7afab145ba3569046136855e247f872 SHA512 34d76a8a4a76105d5a8ab1bb982826f30601bd688eb6f049386cb9500de73e459ac6ac904feb97ce8f16f5d7c5c3b71a430408be8c0222142f887613cf3b62c5 WHIRLPOOL a4e9316f86c86efc0b264b2c26488f8a5af16a059a36a93da8b2c05f363bbb77c1a807eadf16d12ed662ffd476412bd6fdfb862fcc25bc4280fd6ac93eca847d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20130530.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20130530.ebuild
new file mode 100644
index 0000000..955e4ff
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20130530.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2013 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 Platform"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2013-05-30_23-01-06/zip/netbeans-trunk-nightly-201305302301-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r8-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/14F630EDF137F54188636B5139432986D5FB19B7-felix-4.0.2.jar
+	http://hg.netbeans.org/binaries/B54E470D47DF378B9DCE9423F919CCF4C7A60138-org.eclipse.osgi_3.8.0.v20120529-1548.jar
+	http://hg.netbeans.org/binaries/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar
+	http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip
+	http://hg.netbeans.org/binaries/AC97B566699146713B3CF0ABC226B5C08EF7CF33-testng-6.8.1-dist.jar
+	http://hg.netbeans.org/binaries/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.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/osgi-core-api-5:0
+	dev-java/swing-layout:1[source]"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}"
+RDEPEND=">=virtual/jdk-1.7
+	${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-r8-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}"/B54E470D47DF378B9DCE9423F919CCF4C7A60138-org.eclipse.osgi_3.8.0.v20120529-1548.jar netbinox/external/org.eclipse.osgi_3.8.0.v20120529-1548.jar || die
+	ln -s "${DISTDIR}"/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar libs.osgi/external/osgi.cmpn-4.2.jar || die
+	ln -s "${DISTDIR}"/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip o.jdesktop.layout/external/swing-layout-1.0.4-doc.zip || die
+	ln -s "${DISTDIR}"/AC97B566699146713B3CF0ABC226B5C08EF7CF33-testng-6.8.1-dist.jar libs.testng/external/testng-6.8.1-dist.jar || die
+	ln -s "${DISTDIR}"/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip libs.testng/external/testng-6.8.1-javadoc.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	# upstream jna jar contains bundled binary libraries so we disable that feature
+	epatch netbeans-9999-r8-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 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 libs.osgi/external osgi-core-api osgi-core-api.jar osgi.core-5.0.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
+	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
+	rm osgi.core-5.0.0.jar && dosym /usr/share/osgi-core-api/lib/osgi-core-api.jar ${instdir}/osgi.core-5.0.0.jar || die
+	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
+	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 13012b3..7324914 100644
--- a/dev-java/netbeans-profiler/ChangeLog
+++ b/dev-java/netbeans-profiler/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-profiler-9999_p20130530 (31 May 2013)
+
+  31 May 2013; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-profiler-9999_p20130530.ebuild:
+  bumped to latest nightly sources
+
 *netbeans-profiler-9999_p20130529 (30 May 2013)
 
   30 May 2013; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index f8a4c8a..4cd2e2b 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -15,6 +15,7 @@ DIST netbeans-trunk-nightly-201305232300-src.zip 187763774 SHA256 211672ba83f511
 DIST netbeans-trunk-nightly-201305252300-src.zip 187807028 SHA256 b2e70c316de0cd83aa2a1b0ae4f2e1da432199396564f77155b0b74d708e11a6 SHA512 c4cc20ff92b5b35f729539bbebc260452ab89f8c28b6fe986f3ff04f35a02a2039710291411880283901ad515d3ef62a15c615c74bc4df621970abadd0a50c69 WHIRLPOOL e61232b507ae121fd286e136d292f96cfb79a58c7b155a2743301092e209ecf888378fa81aa9752816fb6c2f07d5fef60a2c9fccc3e921bca80449b5cf2c4764
 DIST netbeans-trunk-nightly-201305262300-src.zip 187807028 SHA256 8552e30f84ea1b8483dcc1596dd3612121a068f5c36bc0093de4fda24157e41d SHA512 e69451b64003c4c4feb3b4232f6a6e51308b59a5feb9617217b43295d311ce279219b5a8fdbb2457bff512ae4fa10ea649b5d0b7eba424c3365e5071d56c4436 WHIRLPOOL 400a776d0034dcf78c833c7b80a99524a7634213462f7ad45297cbfa2b02cf70d4699e81d946d874135c4bdd23b07631df65db454214423368ebedbc89a2e0e7
 DIST netbeans-trunk-nightly-201305292301-src.zip 187953498 SHA256 00164aa21766eae8a68e648f3a838da04b98e48a91564bb0c8e7d02e8111ab8c SHA512 e9e3e2d45bf8db8a5c0ad0ef81020916f303554f26c032aea50612cdc9406c1b3c1d594f7fa08faae2676572eb9dc675a9d615efdbf920d61134e6628ec8fbce WHIRLPOOL 6481bfe8871154685314b9bae1c96c1690eb0d770f03a4708f603bed5165f0207d521cc48cc51b81432b98126f9089d3bc06a3c7bbf56347be7edbe2898a47c1
+DIST netbeans-trunk-nightly-201305302301-src.zip 187971727 SHA256 8aa8682d824dc611bfeadf594449af492c5f0403b8fa8daad0f28dd654365830 SHA512 affe9abba9c5970d8492248f46c0edd1d6f011ec1d2a9f238e94d00bbf9c53af563e0a6144b2781683700ec5f69273f956540efdb062746f3c91c545f8cfbff3 WHIRLPOOL 65f8f32ead3f9ce0f23b287f641b96245db0eaf26fa46b52f82843afcd060d9e505c39136980932e906f1aaeea37db4ecd073eb06ec779299843242d8c27dfe3
 EBUILD netbeans-profiler-7.0.1.ebuild 3222 SHA256 b1bab800a27c30aaea26b8ff5ab21abdd1bec16b9890133429eca9ea77c018fe SHA512 d6198f44a06561b7e2598fdd6a37f8a3dc13c38f63dfbf6a86a083adbf71e9c62af87cb4e1b5b8dd2dc99feeeb99a7afcbb8f7747c378ad92c71263cc91a6c54 WHIRLPOOL c62613f511636b1f0393ac32c6b50641cdf7df9f9fdc95fd5acbe1a602ffe42fdabb556f989552b05b0607a5ad9d324a2019440c3ae66c50995ef3fc8775f385
 EBUILD netbeans-profiler-7.1.2.ebuild 3231 SHA256 94d87bf6f86add3bdc27f9f20084f35fe584fc2bd697acafa8c23cce16a0d1ee SHA512 dcc8da918a6b6e07ccae513fb4296d16891e205b49098fb8269d16beb9b1367b1920797cc78053b83f4321c1b69faa393365265c72213bb2abfb9d3f84f66319 WHIRLPOOL 18325a1df836e7242838920483c41d43f37b9dae8322d36a2a562b414baa0dc76971f581204ce76a6d64196dd60643089e8704da69617590cda61ce54ce82e8d
 EBUILD netbeans-profiler-7.2.ebuild 3214 SHA256 ddcba9ba672ad566ef256538fc8631ae691aa7c6574269199f26df5382c37f4b SHA512 1bb7eb95381861b8265ab366fe3c7a9b99971d1c4600eb6c7bffb521f4cebb32bcf3d662f82c811d47fe95e77cd39e48f3665f0fcabf9145eb171c2746d89684 WHIRLPOOL 7f74c2be9ec4e7ff419086f1da3b1a12b1c187102def004316ef89ed28f30da62542ed3409a51473a8d9d68d18a30de36b1d0307cd8eeb7e580668fe896c5aa5
@@ -27,5 +28,6 @@ EBUILD netbeans-profiler-9999_p20130523.ebuild 3449 SHA256 23e9571375177d5e514aa
 EBUILD netbeans-profiler-9999_p20130525.ebuild 3449 SHA256 4d75d61e72bb2186136041f437d0772caaf4ed0fd1e780ad0683a1a895bdd75f SHA512 3b19280a159e6d6dd89f84ce150d17a251739e11fd1917f70f2f7d21b4d3c6e9cfb89df6e89480d41e57c12549adad9fb6ec192b8ccbc198860170ab5b554b93 WHIRLPOOL 93143b1c96bccac3d41fde419e7a00842ca074d2fa71b1f29f1788122dea69bff91fc229a24fae40199a69ff75d8579c0c8bffcacf7ec6a3155483bd8a416ea0
 EBUILD netbeans-profiler-9999_p20130526.ebuild 3449 SHA256 0ad28ad4c4de61b0258a211c335ce6cf4b106de48036644c570ac61e040c40ec SHA512 a59417af5fc0f1d9b4e2d5a31035b8c6c2cbcf2a9495a5843b1f3ef7c07d132772a1ad8fccffb4682137998d141aa5b8d90f64e3e382b44c715d0b13c0c7f931 WHIRLPOOL 2e5596b63e092639784fa2dec3b4c65d777402e2f8e73b0340568ce1b63cbc089d08fb663ecc7b642c2ae049ae02d43a5b4cc12d6670f52135f379c38dd893d4
 EBUILD netbeans-profiler-9999_p20130529.ebuild 3449 SHA256 c4400da029a96a0f8baa0046bde96e8501a6ab3cd3397aa2e1c8271f0fe54176 SHA512 cd88fe468ebbf4be64592068b7684f2cfb5d4ad800aecf6d97ba9757c7acabe93636c33a4361ef2cffd9fdb6c5b3369caeaab8f8192e1e7eda46fa961e0dc4c3 WHIRLPOOL 984c83cd7fe50c3025198864743398fdac6157e6d9ee6720e1e71fe01fc716c4813c66cdb8e1b2723fc681bd8fcc404bfa8de4bde12762c2fe694deed0d02475
-MISC ChangeLog 80444 SHA256 ae97c85a3a8480916eb99ca3988ebea00957b98713f5bba4f3511f83550ce970 SHA512 436fbede60965afdd6b99ec265b7ccb74b0434ff9b8f56079aed022e8c4d3c0403068c4a2373052ae9878a4b23628614ce7dfdd976fc1f50c24d210fa713461f WHIRLPOOL f001642953ff0b1798b84c564b87a3d2963abdb356f12e653ef3c7be9ecb3d461db27af6f61c3270afd22c1c3f81d7eb67a2923ae856fd128bfb55a622db4274
+EBUILD netbeans-profiler-9999_p20130530.ebuild 3449 SHA256 ccb9f921b31ab37a53284defa5931ca50ba58d64bd4676fb81963926a7d2442c SHA512 2be61da6bcee948446aba9ccbe6ca08e2be4fe9432ae7193ee4739104c31632417b34f9c8240ad19dc3a671a9b09cb48d1f7dc3802706fd4a1fa71990cd83db9 WHIRLPOOL 790f24f8745d93feaf728d5d5192bd69cacbb5b257682259555a87ba98d29033f35a50a23e348cb3c69c6f614cfa539e32695bddf0eab4b61fc68080b68359f7
+MISC ChangeLog 80625 SHA256 7cf14bd78a91449af160054ec385c73ff1ba8c39ec4afc72202a66b5b055a512 SHA512 91c37e22825b37e07a96cbac7b0de0321989837b0b052f12532f8607a55a46897be94397d8e5a0c71875d79548f07ada2f5d9314a9532f232c65465899d81bb8 WHIRLPOOL 2a7a99fe80c331e6c85697b2308e25269ee53a2391f21a4ee18fab22051e4c6c5a88fe99a056a18d397f04cda56417150b0fdb2914ec96452acdc873a1d26584
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20130530.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20130530.ebuild
new file mode 100644
index 0000000..0ef37a2
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20130530.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2013 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 Profiler Cluster"
+HOMEPAGE="http://netbeans.org/projects/profiler"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2013-05-30_23-01-06/zip/netbeans-trunk-nightly-201305302301-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r8-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+# Binary files needed for remote profiling
+QA_PREBUILT="usr/share/netbeans-profiler-${SLOT}/lib/deployed/*"
+
+CDEPEND="~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${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-r8-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r8-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-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.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/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 7ef3979..05675cd 100644
--- a/dev-java/netbeans-webcommon/ChangeLog
+++ b/dev-java/netbeans-webcommon/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-webcommon-9999_p20130530 (31 May 2013)
+
+  31 May 2013; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-webcommon-9999_p20130530.ebuild:
+  bumped to latest nightly sources
+
 *netbeans-webcommon-9999_p20130529 (30 May 2013)
 
   30 May 2013; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index 4ea538b..65de9cb 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -18,6 +18,7 @@ DIST netbeans-trunk-nightly-201305232300-src.zip 187763774 SHA256 211672ba83f511
 DIST netbeans-trunk-nightly-201305252300-src.zip 187807028 SHA256 b2e70c316de0cd83aa2a1b0ae4f2e1da432199396564f77155b0b74d708e11a6 SHA512 c4cc20ff92b5b35f729539bbebc260452ab89f8c28b6fe986f3ff04f35a02a2039710291411880283901ad515d3ef62a15c615c74bc4df621970abadd0a50c69 WHIRLPOOL e61232b507ae121fd286e136d292f96cfb79a58c7b155a2743301092e209ecf888378fa81aa9752816fb6c2f07d5fef60a2c9fccc3e921bca80449b5cf2c4764
 DIST netbeans-trunk-nightly-201305262300-src.zip 187807028 SHA256 8552e30f84ea1b8483dcc1596dd3612121a068f5c36bc0093de4fda24157e41d SHA512 e69451b64003c4c4feb3b4232f6a6e51308b59a5feb9617217b43295d311ce279219b5a8fdbb2457bff512ae4fa10ea649b5d0b7eba424c3365e5071d56c4436 WHIRLPOOL 400a776d0034dcf78c833c7b80a99524a7634213462f7ad45297cbfa2b02cf70d4699e81d946d874135c4bdd23b07631df65db454214423368ebedbc89a2e0e7
 DIST netbeans-trunk-nightly-201305292301-src.zip 187953498 SHA256 00164aa21766eae8a68e648f3a838da04b98e48a91564bb0c8e7d02e8111ab8c SHA512 e9e3e2d45bf8db8a5c0ad0ef81020916f303554f26c032aea50612cdc9406c1b3c1d594f7fa08faae2676572eb9dc675a9d615efdbf920d61134e6628ec8fbce WHIRLPOOL 6481bfe8871154685314b9bae1c96c1690eb0d770f03a4708f603bed5165f0207d521cc48cc51b81432b98126f9089d3bc06a3c7bbf56347be7edbe2898a47c1
+DIST netbeans-trunk-nightly-201305302301-src.zip 187971727 SHA256 8aa8682d824dc611bfeadf594449af492c5f0403b8fa8daad0f28dd654365830 SHA512 affe9abba9c5970d8492248f46c0edd1d6f011ec1d2a9f238e94d00bbf9c53af563e0a6144b2781683700ec5f69273f956540efdb062746f3c91c545f8cfbff3 WHIRLPOOL 65f8f32ead3f9ce0f23b287f641b96245db0eaf26fa46b52f82843afcd060d9e505c39136980932e906f1aaeea37db4ecd073eb06ec779299843242d8c27dfe3
 EBUILD netbeans-webcommon-7.2.ebuild 2665 SHA256 9328ea550dfeca5be5c2b03aa5f512d451f1673e49a40994155fca0b2fb2f79d SHA512 d8b80b79e78769a70d01605a79a8a91f7e839d4138b4cbf28cafca6f56ae3d7003c2f5f40aff77bbe3f2882f43a7d7dca3f0428f0f2723a42ae5b49e4c71ffff WHIRLPOOL 31254cbd2fc6cfb2d1bed4d22958595dbbf73032439f19e684463efbe466ee80c144f77ab00ced7a07815b1cdc1d45a87ceda83e7a2fd20ac2ce65e45d30a093
 EBUILD netbeans-webcommon-7.3.ebuild 2986 SHA256 327c0a73fb20778d9fbe4a12024fa065e4102a7aff3fcbda7448874656a46420 SHA512 3d270e940424b3bcdc8c7f8ff2016d33eb55420ac4037f4e406b688c2acea1b07a04625772265ac293d80c0d1afe3bbe6f865051ed9234b700619bd0781d8b39 WHIRLPOOL 5bc288949ed3aa9c3c4cd4cd33b817fe317754229ad30e80da8cfea817bfb77e988a1d6d3280aaef90619968e0309fad212deff0f7970f04438494a893a30a5b
 EBUILD netbeans-webcommon-9999_p20130510.ebuild 4595 SHA256 f887c5c190c177ee8650177a630c538902c869cbe1e7463015cb6493d6bbe7ac SHA512 bbab0016f6a639b3f71bb97ad350f2d4ff2e3235eb19bbe147f3958e1194410d37b598f3b0935e647a5ad20dedb8c7b4107332673c7b12d0badd66a73d33e982 WHIRLPOOL 1e7bcd9ee21a9da4202870bc99560034c351c0907978d8db2cb2b3ef4cf90647b065c3e7e478f67724126783a1b7a0865d456e063aaade39d256d9e6f4aa2979
@@ -28,5 +29,6 @@ EBUILD netbeans-webcommon-9999_p20130523.ebuild 4567 SHA256 996a94722a34c91dc265
 EBUILD netbeans-webcommon-9999_p20130525.ebuild 4567 SHA256 2cd66994eeb6f9520eae43d23394d0417dc36a8d21abc9fd747616b09ef3e12a SHA512 aaf014631e19c8379e4e541a6e10e869ac2cc88860d9251b025ede29fc981f61d73396d08af6faea7d5d9f36f341977d3fbdeb4dbb6dae99e79c74229bf33df1 WHIRLPOOL 48a15c43583f729a1dd1814f315501d5e082228c4a9f2c1fa84f6260d5e6c0de8c2a10184aedca02e38d1f1f48fe122170e473bf6e8eafa6012291a9a01e6153
 EBUILD netbeans-webcommon-9999_p20130526.ebuild 4567 SHA256 0245886b8fe60016511429db7a560d036d95aa76c4a8960a15764ffe3be53da7 SHA512 1e5afd2bad1b9336da264a18a3b5f0c30c66e5185d997a8e9842aad46719cfd9fabd77a1946b892d757d256023bbdc6d2c659dcceadbbc3cf55fda67624734e9 WHIRLPOOL f407361aeaab2f1445db098dc9f45c475657a9c890df2c175f8cbda7b342523690d5910068d4c70fc91964b33ebe25464e4b04326462a75eb08cc1de262463b4
 EBUILD netbeans-webcommon-9999_p20130529.ebuild 3602 SHA256 84395e8a419325a1e20c6d546af6e82a803393b5e8ded65f6e3a7ba0f141ea7b SHA512 8a5880daa15fd77f38d5c0f665c5bdd5e4e7736fc588ed8c2105eaeaf9ff1adbc5fc62a99ab52d7a43c5d1a8b2be3eb46b98e250845db85ddd3340e29cf99020 WHIRLPOOL 69e5c412f83b226c4d492cb6a1baf39016d914abd9dd3bfd741fbff5eaaf02469a30a67da9c90797bf43bef797f1ba8d63284bccfddb085a8b3f357d3d79ca64
-MISC ChangeLog 52390 SHA256 0273b57c343de1d5a768fa4210ffecf2a56b482059eb80a148966e7ff76e5245 SHA512 720e8c6530795c18c70186777b1521d7d5dc64ff3e35b0fa32273a59a84deeedf6b97c330d348f22a093167e0b573006a6ffbdcb0e263c463427d46f4c55f984 WHIRLPOOL 8a2850a3212d5f1c4429281503183bd45c95dde7fb8a8b58b1baca4c5af21ac8ad15c03a6ffa250202aaaedf0ab63938a4dc592f5618d3c0f5ae26f066ad09e1
+EBUILD netbeans-webcommon-9999_p20130530.ebuild 3602 SHA256 c3564ec73c169aeff208d80c823c2d693eff7df9e1bd6db921f2658a18c250a3 SHA512 1eb9b3c0d1d05fa74838a5792ebce7219430b6644a378fbe7f333d99b4c097046da73022ffd5b805dd20dbb8f0e1ec0b5544e653aeb956c9f9a3e25673b3a831 WHIRLPOOL 2bc77da7b058896e31bd24ade75a4d1a988c3611f18fa00efb6bf20b90870642a6d302d5c03da263fc37d01800390925295f97b2b58f3e6aea4fbea7dfb067f9
+MISC ChangeLog 52573 SHA256 ac77e4cc8ff39a9b1e093d9515e27d6935609ff7839edcc1456636f57e02ddb7 SHA512 ffef7f631db9883df87535cc7c4a3de9df819a75f1681eb52b7bbe84ae2263dde4168f9d7523518d6d4500fe872b9e0f939c26bb920524918cc802256f766519 WHIRLPOOL 940310e51a7092bd7136f73203340e2989c2ce982b87edb5a0d186899b4e39c373b3b422a652f9358cca62370ea12337c4315ceceb8939891931d171cbc3808a
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20130530.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20130530.ebuild
new file mode 100644
index 0000000..f5325bf
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20130530.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2013 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 Web Services Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2013-05-30_23-01-06/zip/netbeans-trunk-nightly-201305302301-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r8-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar
+	http://hg.netbeans.org/binaries/E1B4ED2DCA9B1BDE7FE6D8F4B0A0CA265BCFFC16-ios-sim
+	http://hg.netbeans.org/binaries/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${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-r8-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar libs.plist/external/dd-plist.jar || die
+	ln -s "${DISTDIR}"/E1B4ED2DCA9B1BDE7FE6D8F4B0A0CA265BCFFC16-ios-sim cordova.platforms.ios/external/ios-sim || die
+	ln -s "${DISTDIR}"/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar libs.jstestdriver/external/libs.jstestdriver-ext.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r8-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-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.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 98b71bf..73c4962 100644
--- a/dev-java/netbeans-websvccommon/ChangeLog
+++ b/dev-java/netbeans-websvccommon/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-websvccommon-9999_p20130530 (31 May 2013)
+
+  31 May 2013; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-websvccommon-9999_p20130530.ebuild:
+  bumped to latest nightly sources
+
 *netbeans-websvccommon-9999_p20130529 (30 May 2013)
 
   30 May 2013; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index f0531ac..01c5846 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -15,6 +15,7 @@ DIST netbeans-trunk-nightly-201305232300-src.zip 187763774 SHA256 211672ba83f511
 DIST netbeans-trunk-nightly-201305252300-src.zip 187807028 SHA256 b2e70c316de0cd83aa2a1b0ae4f2e1da432199396564f77155b0b74d708e11a6 SHA512 c4cc20ff92b5b35f729539bbebc260452ab89f8c28b6fe986f3ff04f35a02a2039710291411880283901ad515d3ef62a15c615c74bc4df621970abadd0a50c69 WHIRLPOOL e61232b507ae121fd286e136d292f96cfb79a58c7b155a2743301092e209ecf888378fa81aa9752816fb6c2f07d5fef60a2c9fccc3e921bca80449b5cf2c4764
 DIST netbeans-trunk-nightly-201305262300-src.zip 187807028 SHA256 8552e30f84ea1b8483dcc1596dd3612121a068f5c36bc0093de4fda24157e41d SHA512 e69451b64003c4c4feb3b4232f6a6e51308b59a5feb9617217b43295d311ce279219b5a8fdbb2457bff512ae4fa10ea649b5d0b7eba424c3365e5071d56c4436 WHIRLPOOL 400a776d0034dcf78c833c7b80a99524a7634213462f7ad45297cbfa2b02cf70d4699e81d946d874135c4bdd23b07631df65db454214423368ebedbc89a2e0e7
 DIST netbeans-trunk-nightly-201305292301-src.zip 187953498 SHA256 00164aa21766eae8a68e648f3a838da04b98e48a91564bb0c8e7d02e8111ab8c SHA512 e9e3e2d45bf8db8a5c0ad0ef81020916f303554f26c032aea50612cdc9406c1b3c1d594f7fa08faae2676572eb9dc675a9d615efdbf920d61134e6628ec8fbce WHIRLPOOL 6481bfe8871154685314b9bae1c96c1690eb0d770f03a4708f603bed5165f0207d521cc48cc51b81432b98126f9089d3bc06a3c7bbf56347be7edbe2898a47c1
+DIST netbeans-trunk-nightly-201305302301-src.zip 187971727 SHA256 8aa8682d824dc611bfeadf594449af492c5f0403b8fa8daad0f28dd654365830 SHA512 affe9abba9c5970d8492248f46c0edd1d6f011ec1d2a9f238e94d00bbf9c53af563e0a6144b2781683700ec5f69273f956540efdb062746f3c91c545f8cfbff3 WHIRLPOOL 65f8f32ead3f9ce0f23b287f641b96245db0eaf26fa46b52f82843afcd060d9e505c39136980932e906f1aaeea37db4ecd073eb06ec779299843242d8c27dfe3
 EBUILD netbeans-websvccommon-7.0.1.ebuild 2692 SHA256 a18cf7fe0a1e38749826cb12651be06c210b038be50117647496ee6cbd184cda SHA512 32b32894713d7235ebd03446c5c411d22eb8701b96e3d3ac54eca78b2abc833babf279085cea3b74bb7bddc6d89a283a21c58a0b0462042ddd10e22dfcadeb84 WHIRLPOOL 59c18168245767acd1f8e53046f8942698237aa6fd903a669c626b7f17cf3d39247b7ae57f2984562230267885a4b6a62be43dc8a330f1dfeb2cc7acbbd7d3c6
 EBUILD netbeans-websvccommon-7.1.2.ebuild 2701 SHA256 3b2a1cf0d32db3c55b66d1c6b8c4ae2ad5487d3fdb27752468ce5c860f9b9515 SHA512 b9be64755f00157c2d6984887b8c0fdc1e34470f21df1fd72b3e399d3ec894af01c9b79fd604778213ac2086a6c96bf66366e8c2c8bf97f7fee23d16ceb36974 WHIRLPOOL 91559de8c8f6391c3c69888854778a91a1a7e0052ae69eb9762bcbd64d8bc5587fb84ebb55d7d0375da5a7855aa8672abfd035b6a38b3eeb5c23a4cd59b3cdce
 EBUILD netbeans-websvccommon-7.2.ebuild 2684 SHA256 8bf8cad1e0469713c63280620fed089600191230f501a78b834b010f8fa9b3e9 SHA512 fe885f92a7c6cfac532c8e40e4df6283253c43294e9d82ee4d0d070425496eee3792479c268b46bf1fd484f753ca1f21e7ca38a5d71816b6d4fd219082e8e276 WHIRLPOOL 9d2d622d4a800470c874d8751e9c2055e0a4ef72ad01a01aefda4e95a7f295d55fc95fdb55fdd1f631212e1f610bdc7a6b4ee631b92492bb85f73b0d9fb4ba26
@@ -27,5 +28,6 @@ EBUILD netbeans-websvccommon-9999_p20130523.ebuild 2698 SHA256 79ed885871231800f
 EBUILD netbeans-websvccommon-9999_p20130525.ebuild 2698 SHA256 224b27622616d878ef890ed4af30c462d1bff8ad02a63dde1543fd527b187f4d SHA512 8ead0f80984564a7bc81a4ca51119effa1f7455af94a3c88339e27c8c6cd26e74ebaf7b9af5c85674230081223b3b531bc49b96fe4a55cece01e821591799cc4 WHIRLPOOL 544931a345d2e4f245996ba12fdcedc7ec901a200def033fcc7aee319731bbd54e34a6a25cb9c0742382f59984996aceefdd3e3cd9d2ebdebf949312b53d068f
 EBUILD netbeans-websvccommon-9999_p20130526.ebuild 2698 SHA256 91a2019d2ab43284025b260fa1d2bb491c0ceada4b186eba2da92d059589bfef SHA512 62980827d753bfca4b6ad89dcdbea41e7e62eb4218b101a6ab72dc61b95c122f0bbdec3ee386c04a7bd73f983be23f0e9e05e363fbca91ed2bde4b11c5e492ec WHIRLPOOL 2a9717a71923e7051cb38c1698b8c106e97187b88dd424f2f175c60d5c1a74ab100eb600ebebf5ed4be87e3061c9c354b1caf2fa38754d2a4f3df13bf5cc601e
 EBUILD netbeans-websvccommon-9999_p20130529.ebuild 2698 SHA256 9246bbc881a93ade14f8f268a44a275792e189f379fb536491a3cae3a1c13f4a SHA512 b68be30cb81e6625e06e91f3e1e6d8638c2afb4e92ae898e1924e762262a1738bbc729ec0197112d326d35af8cfeba402640bffee1a9d7cc88b97ef80693af9f WHIRLPOOL 3237bd1127dc7914e2eb970163c599644f4a8ec32c933da71262d8c6a7e124e07af8a1ae8dffb0657029fbc4fff9477ea3c58bbec5811bb500118f686e1aec17
-MISC ChangeLog 83969 SHA256 6a0cb7087e5b5c9a6340265f0a7e330ff4293ef30802c408ca4f4ee86ac56975 SHA512 b6872ffcd545be42947b055b6baabe543eb61fb615dc8604a6f6e8a4be87cbe46ab7e689ba5fffd849704acccd3eb1f7e3eac1453343a97fc689fe088e6c66a2 WHIRLPOOL e125b5ac8158fb111d40de8dfa7d4c60d13d723ace44fd8255b39e7432a3593354a422b91a1f547f1e7fece5b56e53759614d5259f9d5ccd66b8c69ebe565bd2
+EBUILD netbeans-websvccommon-9999_p20130530.ebuild 2698 SHA256 f54696e10084cd63dc7d28bbd1f4d450c1452a24224b244d600e760f42fc9f47 SHA512 3765ce3054c9388da67d79b5e88fddec395c062f738de07ec4fa1773076069a5f4bcbd696eee30dbb30080d6720397c702fc0e917515f160f65a18f37c353c9b WHIRLPOOL dd51ca4e21ea6bd9f85a7dcb5f875b6e7b22ab81d56c6c27faf6770de809e854ec73cd6af16e333d0ce269a1ce16c2adee4b112cf593c45308cf5014689778d6
+MISC ChangeLog 84158 SHA256 580dcf34fa376f2b753487faa0f0270ce16670d49de764c18a26e5baeff90557 SHA512 3b840185b5fbec20fe151e420eaa28eeb48c1bce99d825d0ae5210ea026446715efe1b25439b51257f8f6e7f842e7342c786216a755726b156700ed4fb264ec2 WHIRLPOOL 01f03ae3a9e786accdfeda72d86da379d4883afdc5510f760ffeffde4710ecd33e8d234d7b428d3dc9a4c14d1558a3706e1ad76a05e51d76f7fc74815fe342ff
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20130530.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20130530.ebuild
new file mode 100644
index 0000000..b3c7be4
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20130530.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2013 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 Web Services Common Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2013-05-30_23-01-06/zip/netbeans-trunk-nightly-201305302301-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r8-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.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${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-r8-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r8-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 322b921..86f934d 100644
--- a/dev-util/netbeans/ChangeLog
+++ b/dev-util/netbeans/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-9999_p20130530 (31 May 2013)
+
+  31 May 2013; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-9999_p20130530.ebuild:
+  bumped to latest nightly sources
+
 *netbeans-9999_p20130529 (30 May 2013)
 
   30 May 2013; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 32627ca..7346844 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -20,6 +20,7 @@ DIST netbeans-trunk-nightly-201305232300-src.zip 187763774 SHA256 211672ba83f511
 DIST netbeans-trunk-nightly-201305252300-src.zip 187807028 SHA256 b2e70c316de0cd83aa2a1b0ae4f2e1da432199396564f77155b0b74d708e11a6 SHA512 c4cc20ff92b5b35f729539bbebc260452ab89f8c28b6fe986f3ff04f35a02a2039710291411880283901ad515d3ef62a15c615c74bc4df621970abadd0a50c69 WHIRLPOOL e61232b507ae121fd286e136d292f96cfb79a58c7b155a2743301092e209ecf888378fa81aa9752816fb6c2f07d5fef60a2c9fccc3e921bca80449b5cf2c4764
 DIST netbeans-trunk-nightly-201305262300-src.zip 187807028 SHA256 8552e30f84ea1b8483dcc1596dd3612121a068f5c36bc0093de4fda24157e41d SHA512 e69451b64003c4c4feb3b4232f6a6e51308b59a5feb9617217b43295d311ce279219b5a8fdbb2457bff512ae4fa10ea649b5d0b7eba424c3365e5071d56c4436 WHIRLPOOL 400a776d0034dcf78c833c7b80a99524a7634213462f7ad45297cbfa2b02cf70d4699e81d946d874135c4bdd23b07631df65db454214423368ebedbc89a2e0e7
 DIST netbeans-trunk-nightly-201305292301-src.zip 187953498 SHA256 00164aa21766eae8a68e648f3a838da04b98e48a91564bb0c8e7d02e8111ab8c SHA512 e9e3e2d45bf8db8a5c0ad0ef81020916f303554f26c032aea50612cdc9406c1b3c1d594f7fa08faae2676572eb9dc675a9d615efdbf920d61134e6628ec8fbce WHIRLPOOL 6481bfe8871154685314b9bae1c96c1690eb0d770f03a4708f603bed5165f0207d521cc48cc51b81432b98126f9089d3bc06a3c7bbf56347be7edbe2898a47c1
+DIST netbeans-trunk-nightly-201305302301-src.zip 187971727 SHA256 8aa8682d824dc611bfeadf594449af492c5f0403b8fa8daad0f28dd654365830 SHA512 affe9abba9c5970d8492248f46c0edd1d6f011ec1d2a9f238e94d00bbf9c53af563e0a6144b2781683700ec5f69273f956540efdb062746f3c91c545f8cfbff3 WHIRLPOOL 65f8f32ead3f9ce0f23b287f641b96245db0eaf26fa46b52f82843afcd060d9e505c39136980932e906f1aaeea37db4ecd073eb06ec779299843242d8c27dfe3
 EBUILD netbeans-7.0.1-r2.ebuild 6736 SHA256 e808fba2ddb516270d93b5cf67cff60d98b37ca58a158878f2e3b3ad696cfc82 SHA512 653fb585d9eaa20fcf88d778a7f34d63c9f29f2af2153a432fcab6d977ef9619c699b19587a48b148ccf717f4b31a43859b81cff80d5d84ad273c5fa16e8f565 WHIRLPOOL 257f2466c3ad198a05db9d5e377cad2707f8a4daf1f421e516d7435670a85fd4bb5f6b3ab657ebda8cc23937e1b4e1f4acce8cccd85bccddc5a7b1f9abbde0ce
 EBUILD netbeans-7.1.2.ebuild 6976 SHA256 4222e248dfb664ccfea85d4938ad691d3685f32d8e9b33289d1dda088057261b SHA512 cc0a20bd542b61621fe08d5413611f7bcbbebf0c37d5f67c590c31324e74eb5594e72efacc86d843ff3abffc98c4859c2733c63ce6f993baf51e24d69197b64d WHIRLPOOL 30fb7b0cbf22fc39a8dabefd27a0073ce73e62ef082d55839fb7f815bb73bc5c3c24c3418ce175f355d7c64138ef7e9616da41c68b3b57a70353d16c6113daf7
 EBUILD netbeans-7.2.ebuild 7057 SHA256 29140b2779f1a24722499605101c286d05415b4f97d2363afedef711cc586067 SHA512 0776f530f9530c533b13019f7b34fc664990a16926bcff768d0a9f3b9035de82dcd2ed66425ad8da27c65aa69fe3e6be966e0a1ee1bc222949e5d42e14f7f7f1 WHIRLPOOL 9fcb95348171fb0bd8d794b80b51b2e3ce36fd84ccc81653bdd0172cbfa99791e527b33c895ebf7b4d81c228f17d4afab367eb55ceffe28df835b2d09dc8f778
@@ -32,5 +33,6 @@ EBUILD netbeans-9999_p20130523.ebuild 7213 SHA256 b8c30d45cebc53b282c193405ce5ac
 EBUILD netbeans-9999_p20130525.ebuild 7213 SHA256 2c90e5011cc3cf5d08adfb299601964d2d6983c454fca6541af2abfab68d1d7f SHA512 6313ca1dadebde3d736961935f4e4ebfe6bb2beb6b7df130a3361d4fe75ec255d01165d98102f7bee786210e79fc29ce4e1e491a4f9867fe191d282758148a79 WHIRLPOOL d71d9c9b20bbba213e41b1f0c542475aab939a14b20a513a150de9bf9aa5a72443704e60ff18810666947d6790b35c683dff28fa23c8e41dbcdc95a79132c88b
 EBUILD netbeans-9999_p20130526.ebuild 7213 SHA256 9cad08da2f3b5e8419769fcc33fd4985ab3f56aa362e1abad1be25a772a8c862 SHA512 bce55070aa223e8b45ddfcb3f6bf563dc4884fae3f3f08cd08cc259b4bb9b34aefa436fc7843e948612950e04d2043cf77aa67692ca528f85dd5e2ee1df2aef7 WHIRLPOOL 04d64aa703678e00a8ad693a120280d17fbe313af570cbf30f9444bc21d61031f9586c5485f4e7950a3d5ea406765b3957c9ca2561a90e0bc4e05c9767ea67d5
 EBUILD netbeans-9999_p20130529.ebuild 7213 SHA256 01c33966636fa8ec3975411d4162c23de4779a6ee43a6619275cd9d1fc4a5ab9 SHA512 80806ddf652b1c9fd03cbd7df929921dbc46cd141d9e202500145001f7751300728e0cbc6880a5bb0735a25db0e781006ee63a69ff9d49e68db58d736d0df69c WHIRLPOOL db83b7ad46489ccff6f84713bc17d89747fcaf9c1ccd3c6d9cbafee73c9f37e60d199c17f09d567c6a47f7fa320fd1d6042c3ffca05df602af2ed725434f5624
-MISC ChangeLog 72631 SHA256 ae174588a30e9f6ca5141a5eb1e7785c62f3c79a38e4b8ff1ad6fecacae19a30 SHA512 beae3e668edbf3bf78453d7e189261d01e4d52b5496b452a9ac0c314dfc051284ea298e63b47a7e246351cee4bac9e8908ff027b0d6c8a463e2c92050e1fb2a5 WHIRLPOOL 977b3376e91904b67677830fa6ae0d0ba273231f50a42cc2fb6050a948be2e1c37c16caf7c993c5a6dc85e840b26b5ccd2fad011abc4faf8745195539478362b
+EBUILD netbeans-9999_p20130530.ebuild 7213 SHA256 330926a67a956904a6d7824d87f691c8c8012129c27bd2bb60408f24be19c1b2 SHA512 0188a63ee954164f37affafba46137aed07a089befe7bc64dad4227b522fe54b131dbd5858b82a2bb8304e02d22371ebd2596adf00611e02287d1ade73a14bbf WHIRLPOOL 4a273bf50da4d276ecb6ae9b1bda3d139687a09431f84eef60890b1001106470b008f077c8250ffba1b8ed3d8302ba1c87b2c1ac08045af814bc20dac0d1f3c4
+MISC ChangeLog 72794 SHA256 b244725308e2447c73ad51b9da66c24e4a253c92faadd737fa6b20dedde12258 SHA512 da19dfe13342e5512ac8dea5b825c7250a2d9a382cfb64c98a4519281e72859b9e15c7e2326bc57571df2f31fc144ccd2e526bb205c5d13e9192ce003f8e8649 WHIRLPOOL e0eecf5ac61d375d2530171f801ff67f68fbc0dc317b039bcde938b3274cf562673770b5b7a37f91227164983c23a7b479a7903f95fcca06f090e3a722942a19
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

diff --git a/dev-util/netbeans/netbeans-9999_p20130530.ebuild b/dev-util/netbeans/netbeans-9999_p20130530.ebuild
new file mode 100644
index 0000000..21bdc4f
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20130530.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2013 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/2013-05-30_23-01-06/zip/netbeans-trunk-nightly-201305302301-src.zip"
+PATCHES_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r8-build.xml.patch.bz2"
+L10N_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-9999-20130214.tar.bz2"
+ALL_URLS="${SOURCE_URL} ${PATCHES_URL} ${L10N_URL}"
+SRC_URI="linguas_af? ( ${ALL_URLS} )
+	linguas_ar? ( ${ALL_URLS} )
+	linguas_bg? ( ${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_extide
+	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_bg
+	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.7
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	~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_extide? ( ~dev-java/netbeans-extide-${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-r8-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-r8-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="" \
+			-Dpermit.jdk7.builds=true -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
+}