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

[Miroslav Šulc]

commit:     9371e2260d25dfe422743fc131af51421830f0c5
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  3 07:33:42 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Jun  3 07:33:42 2015 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=9371e226

netbeans: bumped to the latest sources

 dev-java/netbeans-apisupport/ChangeLog             |   6 +
 dev-java/netbeans-apisupport/Manifest              |   4 +-
 .../netbeans-apisupport-9999_p20150603.ebuild      | 111 ++++++
 dev-java/netbeans-cnd/ChangeLog                    |   6 +
 dev-java/netbeans-cnd/Manifest                     |   5 +-
 .../netbeans-cnd-9999_p20150603.ebuild             | 127 +++++++
 dev-java/netbeans-dlight/ChangeLog                 |   6 +
 dev-java/netbeans-dlight/Manifest                  |   4 +-
 .../netbeans-dlight-9999_p20150603.ebuild          | 101 ++++++
 dev-java/netbeans-enterprise/ChangeLog             |   6 +
 dev-java/netbeans-enterprise/Manifest              |   4 +-
 .../netbeans-enterprise-9999_p20150603.ebuild      | 266 +++++++++++++++
 dev-java/netbeans-ergonomics/ChangeLog             |   6 +
 dev-java/netbeans-ergonomics/Manifest              |   4 +-
 .../netbeans-ergonomics-9999_p20150603.ebuild      | 101 ++++++
 dev-java/netbeans-extide/ChangeLog                 |   6 +
 dev-java/netbeans-extide/Manifest                  |   4 +-
 .../netbeans-extide-9999_p20150603.ebuild          | 108 ++++++
 dev-java/netbeans-groovy/ChangeLog                 |   6 +
 dev-java/netbeans-groovy/Manifest                  |   4 +-
 .../netbeans-groovy-9999_p20150603.ebuild          | 111 ++++++
 dev-java/netbeans-harness/ChangeLog                |   6 +
 dev-java/netbeans-harness/Manifest                 |   4 +-
 .../netbeans-harness-9999_p20150603.ebuild         | 114 +++++++
 dev-java/netbeans-ide/ChangeLog                    |   6 +
 dev-java/netbeans-ide/Manifest                     |   4 +-
 .../netbeans-ide-9999_p20150603.ebuild             | 377 +++++++++++++++++++++
 dev-java/netbeans-java/ChangeLog                   |   6 +
 dev-java/netbeans-java/Manifest                    |   4 +-
 .../netbeans-java-9999_p20150603.ebuild            | 271 +++++++++++++++
 dev-java/netbeans-javacard/ChangeLog               |   6 +
 dev-java/netbeans-javacard/Manifest                |   4 +-
 .../netbeans-javacard-9999_p20150603.ebuild        | 134 ++++++++
 dev-java/netbeans-javadoc/ChangeLog                |   6 +
 dev-java/netbeans-javadoc/Manifest                 |   4 +-
 .../netbeans-javadoc-9999_p20150603.ebuild         | 168 +++++++++
 dev-java/netbeans-javafx/ChangeLog                 |   6 +
 dev-java/netbeans-javafx/Manifest                  |   4 +-
 .../netbeans-javafx-9999_p20150603.ebuild          | 124 +++++++
 dev-java/netbeans-mobility/ChangeLog               |   6 +
 dev-java/netbeans-mobility/Manifest                |   4 +-
 .../netbeans-mobility-9999_p20150603.ebuild        | 126 +++++++
 dev-java/netbeans-nb/ChangeLog                     |   6 +
 dev-java/netbeans-nb/Manifest                      |   4 +-
 .../netbeans-nb/netbeans-nb-9999_p20150603.ebuild  | 148 ++++++++
 dev-java/netbeans-php/ChangeLog                    |   6 +
 dev-java/netbeans-php/Manifest                     |   4 +-
 .../netbeans-php-9999_p20150603.ebuild             | 127 +++++++
 dev-java/netbeans-platform/ChangeLog               |   6 +
 dev-java/netbeans-platform/Manifest                |   4 +-
 .../netbeans-platform-9999_p20150603.ebuild        | 166 +++++++++
 dev-java/netbeans-profiler/ChangeLog               |   6 +
 dev-java/netbeans-profiler/Manifest                |   4 +-
 .../netbeans-profiler-9999_p20150603.ebuild        | 121 +++++++
 dev-java/netbeans-webcommon/ChangeLog              |   6 +
 dev-java/netbeans-webcommon/Manifest               |   4 +-
 .../netbeans-webcommon-9999_p20150603.ebuild       | 123 +++++++
 dev-java/netbeans-websvccommon/ChangeLog           |   6 +
 dev-java/netbeans-websvccommon/Manifest            |   4 +-
 .../netbeans-websvccommon-9999_p20150603.ebuild    |  94 +++++
 dev-util/netbeans/ChangeLog                        |   6 +
 dev-util/netbeans/Manifest                         |   4 +-
 dev-util/netbeans/netbeans-9999_p20150603.ebuild   | 264 +++++++++++++++
 63 files changed, 3472 insertions(+), 21 deletions(-)

diff --git a/dev-java/netbeans-apisupport/ChangeLog b/dev-java/netbeans-apisupport/ChangeLog
index 299198e..fa9b95e 100644
--- a/dev-java/netbeans-apisupport/ChangeLog
+++ b/dev-java/netbeans-apisupport/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-apisupport-9999_p20150603 (03 Jun 2015)
+
+  03 Jun 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-apisupport-9999_p20150603.ebuild:
+  bumped to the latest sources
+
 *netbeans-apisupport-9999_p20150602 (02 Jun 2015)
 
   02 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index eefdadb..20725d5 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201505290001-src.zip 207640635 SHA256 2547cf1181fa33
 DIST netbeans-trunk-nightly-201505300811-src.zip 207777734 SHA256 e9b9f7d8613e07dfdc7cecbd4e323e400625985373cd226101638250c1042cc1 SHA512 2c72c85b85e7016d9863ee8033da81d26e14f2928e8dd703ec4c48b02165bb1d65ce331b66b0367cebe54bc1b233b68dbaad1705796751b1f6d87e34744de08a WHIRLPOOL 8967ee3280bbc33ff4b8e4246c31b4debf324886e0251f75330dce8c67443c5fde66d2ae7f13314abc43e8a8f577baa2a56ff69b3516cd2ece144a49525f7ecb
 DIST netbeans-trunk-nightly-201506010001-src.zip 207778965 SHA256 96bc8cca703517eeffedcffc05a6de8f917ddadf688dd16ac0b8d1848954c5cf SHA512 9fe5670c662d3c21b2594253254aa521997f6c925f2591bbd7be7be7cffc93b3cbd3d4c9ac3c6f7cede21f9dbc7ed39fed45718e47e5bac653228ab07c62dddd WHIRLPOOL 90a459da74f998f4fb70bd03b9f2d581a2c72100f1d7c52a803703b5fadc929863d11d9643cc517e22fa6b3b42d66c197595820e2299d12a5b735d5cd68d3f8e
 DIST netbeans-trunk-nightly-201506020001-src.zip 207781610 SHA256 ed7f2e851ed53dacd5e46091a091490fcf4afbac35b732335f054fc428978850 SHA512 ba5f09aadede76fd0659c3b190a3646a9b57ffda253cf24d1343bace9112c56d96bff7df158e71539a614d0d80041113da73590fe2f9bf9981cbbe9993f9ef3e WHIRLPOOL c9c938d405c92ef00d253a40723ca770aa41d401dd2de6c79652c5df949bb9a9f7c6a92ac4f3895c8d7135e0963f6779b6aff1c3f8251da2fbf9f0d348d724b3
+DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123489cf38c44213cd2de2606f71e6231ac40e6519eb8f5c71294 SHA512 59a40cd092399dc49057144b95c9d8399fd3284a69bece3ccb02e479994ef2dd55140de0d62a455538dce87b17bc10cf3e09b165109271c78af229d1b62cb074 WHIRLPOOL 5ccbd8842aab3d1e2b0141bacaed90605bed668e0f7912b0fdd8e2de091ec24a0a9264d35c536e10bc7b75f8a5c42a60832cc6a2c5dc5c98f955d908dd01886d
 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
@@ -60,5 +61,6 @@ EBUILD netbeans-apisupport-9999_p20150529.ebuild 3390 SHA256 45a42959617a3d010db
 EBUILD netbeans-apisupport-9999_p20150530.ebuild 3390 SHA256 ef79c7f6bb9b954eef1adf9761f55798b35625c298e4fb0b7f20f40b72fd9fa0 SHA512 7b75e4e683b3564f4c5abcf7f4db65efa039f40b36ac4818bcfb4158d942480a55436821a010bf6bdab6f0b42c363668137a9176766c773dc040c201db54050b WHIRLPOOL 8e8589cd4359f86b65cb3e8ae3b78d901f03de90f7821dc01b7b03e20b701478fb57e0996094eba7241b43a4f0941f735b0285e3bc8fc258243a9c3427110384
 EBUILD netbeans-apisupport-9999_p20150601.ebuild 3390 SHA256 2bed2f663d12ea1f2779112acd8f9483edf0e2aa614af2f60be4d85a30220649 SHA512 155619d9c3f97fb7f89997113be6dec7075d23b33ebe281ac115a72333ce303a9b78be377560b76a656226d4bb235b632b8c8a68757b78180344403b93b4c49b WHIRLPOOL bae1dcbf260109354ea1ac78af474304318dac37cb4b25e54966e1a5b9fd0e3d19eb45456d5814bc958d11a4d058952bb7cbc0bd4ab054937d5d2417a6f3d627
 EBUILD netbeans-apisupport-9999_p20150602.ebuild 3390 SHA256 9aa35da13e20b5db579a5fa6e2503cdfdb612aec112163e8f644ae1468438dda SHA512 2d645834001b673c8c81796dad0da30ecb09d817c98afe48fb2912e5020bb2a08ed094636265ea16732c358fbc094052617e10655e5b5a4e118855db73119cee WHIRLPOOL ad3d69a543b46f5b8ae8ec38a2d66b6f77bc791534f6abd51e1c8751e51a44edf86250bafd5e14872db70b3a0377aa16de4b396d4b7ebf5742c7bd478b4cf8ad
-MISC ChangeLog 173922 SHA256 1773ddbef48b6dfcc6d747f75cd743f5943da423265eac5aedf0428bebd9c72c SHA512 d5c766dd76f5a45c69a2b2a935c88d36117dbbbcb3a91438a91bf3dafe9b191c358cff1218a86bbb4ebae3fe65ad04cc755e48697f3d4fd692942786c0a709f5 WHIRLPOOL e8f60aa8578aa24e20d942f7419e2fe444f1c20a38488953bb913f7c4bba63f417429e3d5b852e0006b41eea4e251a4b10d928f587da005c0d6b65de40ea9757
+EBUILD netbeans-apisupport-9999_p20150603.ebuild 3390 SHA256 0cfcc8b9d4892fff7c48622d8465c638e65caf18bd1439f9977bae62213bfa45 SHA512 5108fa31549d5b923949b6422b7f3d52ecd7f0be11b4ee3d9f0981d6a1768113e7091bd736fc82a4cf9fe287cfda32c8c739dfcb996bfde2d39f3c8d0e20b149 WHIRLPOOL 07e268e97f8386a0092ba0cb3429f02ac4cac93a8b9901fd0a0a6fdc7fb66bd40149186a0054e06a026584cc5e2ca7b26bcc8c840deb68cb939cc3f7950e7f34
+MISC ChangeLog 174103 SHA256 a0a0c440545f3201516a6fce1ed86855e8f45e04abdca38628451a5d4b95cb9a SHA512 102c7b34ed3d35b6276a402bfcd812b66c01de3899d721b5bf1782da098b73fe8f6370920fbd8274be2e4028a77fc0f55ec54bb1bc6047d9be39865564dcfb2d WHIRLPOOL 960205136951122aa5356b0590715d3130514a7269c4be2006df30439b1706f6fdc7c8208738e7687e80f969cbaacfbf9b6ce438ed71c34c236894f4ba8ff3fa
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150603.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150603.ebuild
new file mode 100644
index 0000000..7cb2c89
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150603.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 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/2015-06-03_00-01-56/zip/netbeans-trunk-nightly-201506030001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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 -Dpermit.jdk8.builds=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-r14-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-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 656ed9a..0b6321d 100644
--- a/dev-java/netbeans-cnd/ChangeLog
+++ b/dev-java/netbeans-cnd/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-cnd-9999_p20150603 (03 Jun 2015)
+
+  03 Jun 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-cnd-9999_p20150603.ebuild:
+  bumped to the latest sources
+
 *netbeans-cnd-9999_p20150602 (02 Jun 2015)
 
   02 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index 08efec0..2221b11 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -4,6 +4,7 @@ DIST 296C195B720404C2683BA2F65E2A423DD0611B8B-open-fortran-parser-0.7.1.2.zip 86
 DIST 2BCF2047382FB68A2F275677745C80E79B4046AB-cnd-rfs-1.0.zip 152701 SHA256 ee454c52dab7af01a0c292bbbd9bd5fa62e07480d4284a34e38746aba4bb501b SHA512 222ae7d6fc8a1f5610a107264fd249180a7a865094979dd5426fb266b94e1d24ef421199cdcb923ab58577c292a183863c45a1434b4dcb35bd67dbdcde945e54 WHIRLPOOL 821c0e5e9534955ee9b4200476fa1fe65b453520551cb71a71a225bb96ac69ba6c408e9d59b5df7008ec1b8d173035e76358172cf3ebafbbd50d0971db3a8983
 DIST 4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar 164365 SHA256 8633aa79a2566f51a089195e09a4581af3ee71bfc13eb234af5e0cf6383078b4 SHA512 f1300e2d1e47659f6113a0a3dcc953766b5a8ab32f13bedf4d6ac652ffcf828c17474d47edec08d7ad9039d7abb8570770b48fa53b8ff6b47a028836490777bc WHIRLPOOL 765c87803d9cf622ae7936cb922ad9bff8823a09baf01a6c8b4a81df8ba5fd7cd17b513b36da9910b75349de45185f4641680f35be8335e08b9c30283b6d3345
 DIST 547CFC4D4F7C877925CFB0732F303DC1797A58C1-cnd-rfs-1.0.zip 176268 SHA256 c519f28b440fccb0b562d894b55bc5fd297ecd5a9c589ae7c9cb6705bc704305 SHA512 f70fb2710f5a92d471779c9a76634e103d29c2dc9db4ba58e114052e0e0a687b0fda4e03398fb539c6395006a1a8b322608a46ecd1a1793a47c72c3a8734416c WHIRLPOOL 89e48c2951442b5f0ad62b4afc603eb136bba5dcb30bb99d11935a24c08988649b98255a49b940b2d4d83c062eedc6a2570f32784e68e3be5f91292b1af3c506
+DIST 57D6175A444681A040488BB45451867F0C0D0BBA-clank_0.3.6.zip 6868556 SHA256 ce2b66ef35880a9941c885106bd278fe687cc915e9d48c769798e33662dbedce SHA512 5e7df2ac6dd8db85c30d07721629ee0b110ceeb15ce20011ccbab27d4a8703b1cc6b98c3cc2f30d12e67de869cd4f89b9f2a8d0c39b523406e6bc8abfcd9d59e WHIRLPOOL 847e71c0e9e4b486a8e5a98423e361b44885f593fa816301ef8b87509745b987f3685c36312ea3736c1fa6f2c2a97ccb2d8fa798090daa4d303a3c1c30074fd5
 DIST 5C917BCC015510DC6C7E3B511DB85B2978C0774C-cnd-build-trace-1.0.zip 19708 SHA256 e2c7a9e2ae6488e1c7cddfb969f42ac19335077bfe8b39fdb57ad3202648bac3 SHA512 0b409dcdb99dc8972b281ae6614b2780166033d79d7da5c9e8214d5044b46e4561c0d604ab1f35817404f5f6a295bb7c62209810baf16f60fb808da069a328ed WHIRLPOOL 0b092090f9430c8526201db4a591fa82269490f2f4ca7622b2cc3cda379cee24479dd626e3dcb4b91821c2dccbad7590f6639b42cfb6792ab48749355686885a
 DIST 5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar 2388361 SHA256 9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7 SHA512 04be4dfba3a21f3ab9d9e439a64958bd8e844a9f151b798383bd9e0dd6ebc416783ae7cb1d1dbb27fb7288ab9756b13b8338cdb8ceb41a10949c852ad45ab1f2 WHIRLPOOL 488b7b9af1d1d06cca163d43e7be190730e2f0421796c21a26ace11196ee37a16b1bdeea78a1e2e64f8ca0e87f67a2aecd066af21505f3dd92dd76de40a94fa0
 DIST 61CC1E7181A8B26E9B3E1357C06B63F8F0077FA5-open-fortran-parser-0.7.1.2.zip 94483 SHA256 11fa943df02788767f4c3439f142a4d1d9937818e9c0b2812dc824230d890a7c SHA512 c15a6092859c6dffe07a51a78596c09f40b0c4ae7073dc119c19462d955d4b3e4fd0057907a50db50c4936fbc802c8a034659383df0b66842ac9382abb5896e8 WHIRLPOOL 8ae8e818f912709ea38b7702cda934c41c828041244f6f1a6249fa392a98e1b58c6c1dc60921c7625dda0ec7aed30665a58420e35ba94d3c33d1098ccde87d58
@@ -49,6 +50,7 @@ DIST netbeans-trunk-nightly-201505290001-src.zip 207640635 SHA256 2547cf1181fa33
 DIST netbeans-trunk-nightly-201505300811-src.zip 207777734 SHA256 e9b9f7d8613e07dfdc7cecbd4e323e400625985373cd226101638250c1042cc1 SHA512 2c72c85b85e7016d9863ee8033da81d26e14f2928e8dd703ec4c48b02165bb1d65ce331b66b0367cebe54bc1b233b68dbaad1705796751b1f6d87e34744de08a WHIRLPOOL 8967ee3280bbc33ff4b8e4246c31b4debf324886e0251f75330dce8c67443c5fde66d2ae7f13314abc43e8a8f577baa2a56ff69b3516cd2ece144a49525f7ecb
 DIST netbeans-trunk-nightly-201506010001-src.zip 207778965 SHA256 96bc8cca703517eeffedcffc05a6de8f917ddadf688dd16ac0b8d1848954c5cf SHA512 9fe5670c662d3c21b2594253254aa521997f6c925f2591bbd7be7be7cffc93b3cbd3d4c9ac3c6f7cede21f9dbc7ed39fed45718e47e5bac653228ab07c62dddd WHIRLPOOL 90a459da74f998f4fb70bd03b9f2d581a2c72100f1d7c52a803703b5fadc929863d11d9643cc517e22fa6b3b42d66c197595820e2299d12a5b735d5cd68d3f8e
 DIST netbeans-trunk-nightly-201506020001-src.zip 207781610 SHA256 ed7f2e851ed53dacd5e46091a091490fcf4afbac35b732335f054fc428978850 SHA512 ba5f09aadede76fd0659c3b190a3646a9b57ffda253cf24d1343bace9112c56d96bff7df158e71539a614d0d80041113da73590fe2f9bf9981cbbe9993f9ef3e WHIRLPOOL c9c938d405c92ef00d253a40723ca770aa41d401dd2de6c79652c5df949bb9a9f7c6a92ac4f3895c8d7135e0963f6779b6aff1c3f8251da2fbf9f0d348d724b3
+DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123489cf38c44213cd2de2606f71e6231ac40e6519eb8f5c71294 SHA512 59a40cd092399dc49057144b95c9d8399fd3284a69bece3ccb02e479994ef2dd55140de0d62a455538dce87b17bc10cf3e09b165109271c78af229d1b62cb074 WHIRLPOOL 5ccbd8842aab3d1e2b0141bacaed90605bed668e0f7912b0fdd8e2de091ec24a0a9264d35c536e10bc7b75f8a5c42a60832cc6a2c5dc5c98f955d908dd01886d
 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
@@ -76,5 +78,6 @@ EBUILD netbeans-cnd-9999_p20150529.ebuild 4586 SHA256 f1aaa6d0c8f0e52db16364fb96
 EBUILD netbeans-cnd-9999_p20150530.ebuild 4796 SHA256 c6c550a606485a71d280dc39feb80d13e73fb2ba662eb568e2555b941b366a10 SHA512 504cfbedcee2eac1961f252a8af4fff17cf129996f68c547652dc45ad706cda23707f1d97248fb7ef6702f125ce8fc031554d0be3b28eff9d4103e33a6159875 WHIRLPOOL 26e58f8ad7531156ab02a17a62541fc851b77906aed9c55a0519481542deb8c54c6eca49d29b8e2876888fc5330627edb47ff0fdb10b1d0e334d2ac6e9960ce3
 EBUILD netbeans-cnd-9999_p20150601.ebuild 4796 SHA256 664e094a56f5f5660baca2748373c780df7ad33ab23ea1ca090bcd35c363ba50 SHA512 b1e2e7ac57cd6b46239a2719e8f62d2bd3e277ebd63e121194ca5a1fc498fd8aa2ee4d577097021b2b592f475f38d7b7cd681ca20fbc372f03efc855d3db61ac WHIRLPOOL 9549fd2f2da1d46122b2c60aa8ae600ac2495e33bb966d16e29d974667167f4dd49c03009178831ecdd54e99a72e33df3c4e486db67c38a0acf802ddf1598b0c
 EBUILD netbeans-cnd-9999_p20150602.ebuild 4796 SHA256 25c36bf90f5626d2cfd2c51d240c746c06ba663da18c2306c10240cb0d51c6f6 SHA512 1e38592a9569c004434a202179a6a1b84a1bec62272015f83320f182f1b86aca8b103cedddadb46d25c7dfcd7ca8af69ab408e7bd3fc7e55162d2a20bd30fffc WHIRLPOOL abcbd6b8148bd5bc982deaff9d65d01feeeeb5fa8e4745726182773dd85fa398537bc4f8e2dfcdfc7bcc3df57b44eee142a1b1439aeb096ece95b42e7e6dd248
-MISC ChangeLog 158731 SHA256 aec20405dbfd0a03369aa84261ad5d8878d536e5171078dd28bf4effea6ba585 SHA512 c405f797a5a75535f1b0a4f28e42e603a9c3973b6b16cea9371a30b63d519550fb6185a392113000d5f46af5f7c2867ed9e72a158a6650c552b00727b2c4b094 WHIRLPOOL fdc2cb6a5af52515d566b895c040435de621136b6778e8ec752d56ce2919116f428b8a7c1624a8b27c7056fcab0f05a79b3e80d000a9db3ff273cce3114f496a
+EBUILD netbeans-cnd-9999_p20150603.ebuild 4796 SHA256 4fe09a855edbe499a2a07d42385051f7392dbeb662eb4586ae41ab9617b0caa3 SHA512 adf0bafe3d633d4594b1b57bc1c56cf7a9cfcff3bb187cf5331de80a12abe0e85a53c8004905d0408facd3216a4cb40d79d1d6862d24971185c585b01e6458c2 WHIRLPOOL e0f1ae9f831a5605ab90a73196c2315455c669d3cbc574bc733fa3e2b4dc1439e78d7446e5062705be4867c677792a8357016505892e92629991d5d780afd572
+MISC ChangeLog 158898 SHA256 b1be84916ab6a1427efe22d2b000c40d34b6a963d893e9781d1709666e0260ea SHA512 b59fb4459c7b8fe32f67f4f4aa8ba4e6a714ac70763ae9560b3d57e27bd879a11af5a4a1c78717043ece1c26eef1c5d3f99c468b3d20dfc13e517312e5729623 WHIRLPOOL e7948bd3a92bb669610b5def2507d1768f003f44817ea0c5fd1977e3fbd4b08ed9611faf56f0aae09cf3d059418ea3549ad14e54b18674b045c2dd0b1d6c0429
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150603.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150603.ebuild
new file mode 100644
index 0000000..aa6502e
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150603.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2015 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/2015-06-03_00-01-56/zip/netbeans-trunk-nightly-201506030001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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/57D6175A444681A040488BB45451867F0C0D0BBA-clank_0.3.6.zip
+	http://hg.netbeans.org/binaries/BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip
+	http://hg.netbeans.org/binaries/547CFC4D4F7C877925CFB0732F303DC1797A58C1-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 -Dpermit.jdk8.builds=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-r14-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}"/57D6175A444681A040488BB45451867F0C0D0BBA-clank_0.3.6.zip libs.clank/external/clank_0.3.6.zip || die
+	ln -s "${DISTDIR}"/BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip cnd.discovery/external/cnd-build-trace-1.0.zip || die
+	ln -s "${DISTDIR}"/547CFC4D4F7C877925CFB0732F303DC1797A58C1-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-r14-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-4.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-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 b47e0d7..b49d473 100644
--- a/dev-java/netbeans-dlight/ChangeLog
+++ b/dev-java/netbeans-dlight/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-dlight-9999_p20150603 (03 Jun 2015)
+
+  03 Jun 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-dlight-9999_p20150603.ebuild:
+  bumped to the latest sources
+
 *netbeans-dlight-9999_p20150602 (02 Jun 2015)
 
   02 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 6991e63..48c324b 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -40,6 +40,7 @@ DIST netbeans-trunk-nightly-201505290001-src.zip 207640635 SHA256 2547cf1181fa33
 DIST netbeans-trunk-nightly-201505300811-src.zip 207777734 SHA256 e9b9f7d8613e07dfdc7cecbd4e323e400625985373cd226101638250c1042cc1 SHA512 2c72c85b85e7016d9863ee8033da81d26e14f2928e8dd703ec4c48b02165bb1d65ce331b66b0367cebe54bc1b233b68dbaad1705796751b1f6d87e34744de08a WHIRLPOOL 8967ee3280bbc33ff4b8e4246c31b4debf324886e0251f75330dce8c67443c5fde66d2ae7f13314abc43e8a8f577baa2a56ff69b3516cd2ece144a49525f7ecb
 DIST netbeans-trunk-nightly-201506010001-src.zip 207778965 SHA256 96bc8cca703517eeffedcffc05a6de8f917ddadf688dd16ac0b8d1848954c5cf SHA512 9fe5670c662d3c21b2594253254aa521997f6c925f2591bbd7be7be7cffc93b3cbd3d4c9ac3c6f7cede21f9dbc7ed39fed45718e47e5bac653228ab07c62dddd WHIRLPOOL 90a459da74f998f4fb70bd03b9f2d581a2c72100f1d7c52a803703b5fadc929863d11d9643cc517e22fa6b3b42d66c197595820e2299d12a5b735d5cd68d3f8e
 DIST netbeans-trunk-nightly-201506020001-src.zip 207781610 SHA256 ed7f2e851ed53dacd5e46091a091490fcf4afbac35b732335f054fc428978850 SHA512 ba5f09aadede76fd0659c3b190a3646a9b57ffda253cf24d1343bace9112c56d96bff7df158e71539a614d0d80041113da73590fe2f9bf9981cbbe9993f9ef3e WHIRLPOOL c9c938d405c92ef00d253a40723ca770aa41d401dd2de6c79652c5df949bb9a9f7c6a92ac4f3895c8d7135e0963f6779b6aff1c3f8251da2fbf9f0d348d724b3
+DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123489cf38c44213cd2de2606f71e6231ac40e6519eb8f5c71294 SHA512 59a40cd092399dc49057144b95c9d8399fd3284a69bece3ccb02e479994ef2dd55140de0d62a455538dce87b17bc10cf3e09b165109271c78af229d1b62cb074 WHIRLPOOL 5ccbd8842aab3d1e2b0141bacaed90605bed668e0f7912b0fdd8e2de091ec24a0a9264d35c536e10bc7b75f8a5c42a60832cc6a2c5dc5c98f955d908dd01886d
 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
@@ -67,5 +68,6 @@ EBUILD netbeans-dlight-9999_p20150529.ebuild 2995 SHA256 a4a0f330753526d56b9016f
 EBUILD netbeans-dlight-9999_p20150530.ebuild 2995 SHA256 ebb5469756b133d995fecf8916ba1672191425d6ea0176be86cb56e042045527 SHA512 fbc33dbc99fe9ee50f6875a51f4f77864f7eb69bb718e61984ea868c6dee40ea93d48c852c010a6c2337cced2400b07500c104bec44b0788fa519ed99f273e00 WHIRLPOOL 31462e15e837a7fc1c9d89b131d2f50c2d38ff9da081a2a732a888d91bdbe79e94856f64b9fbb37b17775ba930d84aeb2167f83cf5a6f2d6daacf64ae7c7b4a6
 EBUILD netbeans-dlight-9999_p20150601.ebuild 2995 SHA256 35b68bea37227a327dd7aee9428f4d7675357691e495347b68d8de8e206b0b1f SHA512 00fba180fccfec321b816c1e696afb119febc84f69c27c42d3268f874cea13cf21e250b773dbd088c0956bff9b8f9407a7af5a939d6df83048e1fe5f21556b32 WHIRLPOOL a07b3aaaa596275063c0bd4c8b541ea16da0470691ef687382364889ffc056b600b36a50535b233a6c0d03c0090b8f50a3485a3e62c446b142dfaae7c92f2ebf
 EBUILD netbeans-dlight-9999_p20150602.ebuild 2995 SHA256 f041211291a1d289a812238222c501350e6d7706dbdfa3d2252cfeb7f792c843 SHA512 c412089b3a32c316a966272cd90f88225160d6e1cd8e3eca2d1edb9208c4bdca2c4dcea279641e8778d5eeffe4a0fd60b0cf2a8400250608667c110e56c49844 WHIRLPOOL 365efad84dac0109f8edeb9c379570675dfb0941753f4569d0bdf8d793056cb5acd72156ec978d0afb4f93b2d88043e6a4c98225e2b4757befd70b2aaa4365f9
-MISC ChangeLog 165675 SHA256 50a6ab27595d00c6732ba99a1c28421b55ef571a96d01244aa6671455391d680 SHA512 3cd015194b362e0b6774c15470b16c0569e0ef463c654a7fc1df3c2cd1b487197f771b2747cd70fcfb5e1dfd448405e117f74cbae52b5a802d5274e3ac0f5d1a WHIRLPOOL 85bf2b7e965b461bf5f7ad1c8284e5090add1c77db9cc0f09c24dbf1a9a127f7d705d4e0fa50d811618da1e01afefc8e38a533d437bd403e2c72d1bf275dccf9
+EBUILD netbeans-dlight-9999_p20150603.ebuild 2995 SHA256 caf277e178601f479bccf285242e6fc6a0f8e0231cf4bdc99e58cd9ff75aad24 SHA512 04a13631765c452c3fd046d3496903b460234dd67a23610080bbf5546b36482e36556cd8ddc28cb9457f722f04c7c9c037db0a4e95596862697ede4b96e4fa07 WHIRLPOOL b6ca9a3f0907567bce672dfc11ad7a2e971582b23e760512a17d9a3b04e3becd871abbba6d566a7e9f61e379ac4b26fe7cfbc3e00a08366a586e94e1dfe5f088
+MISC ChangeLog 165848 SHA256 575068d4e620d954eeae52fddaaa277af7663d161ecb9f965c5c008debf830b1 SHA512 bc4505f2d99e14aa884b3a0bb089c46c0f1221161c237117e4c25298171803a6d3833e760fc676c8fd325005dc4bbe3d538c2e9601514252bd0ab36a3fc0ba81 WHIRLPOOL 12b2e349ce4f6dcbc3e4e384a8bb60cb8c47b6056e90ff52c6aab8ab1abc3f191e539da54f97639eb7740e13ff7d7f8edae1716b7bee31900e111febbff7a6a1
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150603.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150603.ebuild
new file mode 100644
index 0000000..2691b1d
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150603.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 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/2015-06-03_00-01-56/zip/netbeans-trunk-nightly-201506030001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/DF1C6C0A0B03BC0147D215D01DA34F2E5DC13245-fs_server-1.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
+	${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 -Dpermit.jdk8.builds=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-r14-build.xml.patch.bz2
+
+        pushd "${S}" >/dev/null || die
+        ln -s "${DISTDIR}"/DF1C6C0A0B03BC0147D215D01DA34F2E5DC13245-fs_server-1.0.zip dlight.remote.impl/external/fs_server-1.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-r14-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 de775f3..ee6bf53 100644
--- a/dev-java/netbeans-enterprise/ChangeLog
+++ b/dev-java/netbeans-enterprise/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-enterprise-9999_p20150603 (03 Jun 2015)
+
+  03 Jun 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-enterprise-9999_p20150603.ebuild:
+  bumped to the latest sources
+
 *netbeans-enterprise-9999_p20150602 (02 Jun 2015)
 
   02 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 1cba626..6fbdf9b 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -122,6 +122,7 @@ DIST netbeans-trunk-nightly-201505290001-src.zip 207640635 SHA256 2547cf1181fa33
 DIST netbeans-trunk-nightly-201505300811-src.zip 207777734 SHA256 e9b9f7d8613e07dfdc7cecbd4e323e400625985373cd226101638250c1042cc1 SHA512 2c72c85b85e7016d9863ee8033da81d26e14f2928e8dd703ec4c48b02165bb1d65ce331b66b0367cebe54bc1b233b68dbaad1705796751b1f6d87e34744de08a WHIRLPOOL 8967ee3280bbc33ff4b8e4246c31b4debf324886e0251f75330dce8c67443c5fde66d2ae7f13314abc43e8a8f577baa2a56ff69b3516cd2ece144a49525f7ecb
 DIST netbeans-trunk-nightly-201506010001-src.zip 207778965 SHA256 96bc8cca703517eeffedcffc05a6de8f917ddadf688dd16ac0b8d1848954c5cf SHA512 9fe5670c662d3c21b2594253254aa521997f6c925f2591bbd7be7be7cffc93b3cbd3d4c9ac3c6f7cede21f9dbc7ed39fed45718e47e5bac653228ab07c62dddd WHIRLPOOL 90a459da74f998f4fb70bd03b9f2d581a2c72100f1d7c52a803703b5fadc929863d11d9643cc517e22fa6b3b42d66c197595820e2299d12a5b735d5cd68d3f8e
 DIST netbeans-trunk-nightly-201506020001-src.zip 207781610 SHA256 ed7f2e851ed53dacd5e46091a091490fcf4afbac35b732335f054fc428978850 SHA512 ba5f09aadede76fd0659c3b190a3646a9b57ffda253cf24d1343bace9112c56d96bff7df158e71539a614d0d80041113da73590fe2f9bf9981cbbe9993f9ef3e WHIRLPOOL c9c938d405c92ef00d253a40723ca770aa41d401dd2de6c79652c5df949bb9a9f7c6a92ac4f3895c8d7135e0963f6779b6aff1c3f8251da2fbf9f0d348d724b3
+DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123489cf38c44213cd2de2606f71e6231ac40e6519eb8f5c71294 SHA512 59a40cd092399dc49057144b95c9d8399fd3284a69bece3ccb02e479994ef2dd55140de0d62a455538dce87b17bc10cf3e09b165109271c78af229d1b62cb074 WHIRLPOOL 5ccbd8842aab3d1e2b0141bacaed90605bed668e0f7912b0fdd8e2de091ec24a0a9264d35c536e10bc7b75f8a5c42a60832cc6a2c5dc5c98f955d908dd01886d
 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
@@ -149,5 +150,6 @@ EBUILD netbeans-enterprise-9999_p20150529.ebuild 15937 SHA256 a8b784ec1d64ec5f91
 EBUILD netbeans-enterprise-9999_p20150530.ebuild 15937 SHA256 fd98a8fa2e7615fa2148c4f006f88fdbf67a8c41469a7381e881e15e43490d84 SHA512 ceb8186c08047757313c289caf28cf41a661ad2663c14bdaa25f4ae69f1a7d25b9289f07e5e3f1a5d41dee1b7af3c5bce683fae01ba9a134ec8c4bd4b6f0cdfa WHIRLPOOL 8e71497302e03dab418f418154d4e2d4cb756313943ca1abc4b9b06dddf81357ae8b9ebb514a5bde1234a50724406fcf83ab1e06467d1c403bed12f5b5034de3
 EBUILD netbeans-enterprise-9999_p20150601.ebuild 15937 SHA256 08c56d33f5c7ae27331be4131a5b7e29931adcdfc17fa257c2589d87c182090c SHA512 5c50a24580321982f79bcd5032815aca77af2f4fd641d447a18c7b3a37891d5b5b870f2e0e2a9d040392791468a5d19ae00085dea9f6b40e9a350118e81c7367 WHIRLPOOL 9e9ccb12ed96cc007f42c6dd99f6ae057864419f07f133662ae64193a39ef52b6e4027c61d0d71bedcfefeadef89f225b27e77f1bc12b7210bee1ed861632dd1
 EBUILD netbeans-enterprise-9999_p20150602.ebuild 15937 SHA256 c93bf8cae9a2b9bb7c48506104d7afc02aefc1e37c15bf32de957e5f55284823 SHA512 8a58df0fd507062cbfb5b27a8ca9989e17fe826b1164edcdf32c6797ae3b056413094a7a3239e1cfc210b65ea62f9c67d1f4c93ee346b071a6e430a750ec2451 WHIRLPOOL 8a1f96fe2f7fa178cfdbefe9b7673153015dc9dd470b18cc0bc54ad78af1db6e238d5f181f0eaa0ef7821cc2bb971466b34b421edd29376d72c28819125dce29
-MISC ChangeLog 174447 SHA256 ceb386a71c33fb55bc9efaaf7ee22c8a883fe6fb851db6b7ee9827c7ac039315 SHA512 e881764e611331384d7667cd3ecba8a096c9a11823919a669c12ad02f8c34b76970272d0d959c3c687e8f2d8f8e01444f7c7394a4b37dab4325b2b4ef5e3c0f9 WHIRLPOOL f6158fac8c086e9d23f7e2baa9612bed8a19f4be1e6e4f05e597fc43790b14cdc429249d9cca5a86948823516459f1145a02e653d11b08cf4e47a397c50bef8d
+EBUILD netbeans-enterprise-9999_p20150603.ebuild 15937 SHA256 4e53d7ec87269d1bbfddcc1784eaacedf35468e4da32a2754c9f2eb14ac09ddf SHA512 b24835f83b1db6c73eaef893a0cbce7095be97c2810cbcf99af87703088f9b20e08e181eec5800deef64e704c3670b5946fbafa312e942e772309bd948a1c869 WHIRLPOOL 70cd42d6cd4a43c9fc2589baae5b4feeffce3141fd4d39a5b097a28c4dada7f982f6c3044e7fdcb14cbf1a2b64507b2b5db631aa9608fe6a3a15a7fa1514bef9
+MISC ChangeLog 174628 SHA256 360b2687af0588c405b9192e65928c4c7153dc7cc72ab563b50a158367cf26be SHA512 aaa430e62044a69f80918adc30bf187bd10b9f6eafb1c9410545a10bd6b5bac4219d68b0f13b717a1ad4595e47cb4b9c343b70816f1e255ab5a1aed827f0d75b WHIRLPOOL 7347215df548152f6f02ff45456c625e6b690dfb74ac217c12fcc63fe2555cdc25b169d837ed82fd995cff0d47a3164ec700339f41c499262e07b2147b31c66c
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150603.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150603.ebuild
new file mode 100644
index 0000000..047ee5f
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150603.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2015 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/2015-06-03_00-01-56/zip/netbeans-trunk-nightly-201506030001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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/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/C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip
+	http://hg.netbeans.org/binaries/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar
+	http://hg.netbeans.org/binaries/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip
+	http://hg.netbeans.org/binaries/99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip
+	http://hg.netbeans.org/binaries/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip
+	http://hg.netbeans.org/binaries/F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar
+	http://hg.netbeans.org/binaries/5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar
+	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/065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar
+	http://hg.netbeans.org/binaries/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.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"
+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/cglib: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/glassfish-persistence:0
+	dev-java/guava:14
+	dev-java/jakarta-oro:2.0
+	dev-java/osgi-core-api:0
+	dev-java/validation-api:1.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 -Dpermit.jdk8.builds=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-r14-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}"/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}"/C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip websvc.restlib/external/jaxrs-ri-2.5.1.zip || die
+	ln -s "${DISTDIR}"/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar javaee7.api/external/jaxws-api.jar || die
+	ln -s "${DISTDIR}"/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip web.jsf12/external/jsf-1.2.zip || die
+	ln -s "${DISTDIR}"/99277566601C4D5C2598B0206B5DC071932F3641-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}"/F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar libs.jstl/external/jstl-api.jar || die
+	ln -s "${DISTDIR}"/5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar libs.jstl/external/jstl-impl.jar || 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}"/065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar web.primefaces/external/primefaces-5.0.jar || die
+	ln -s "${DISTDIR}"/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar servletjspapi/external/servlet3.1-jsp2.3-api.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-r14-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.3.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.12.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.3.jar && dosym /usr/share/commons-fileupload/lib/commons-fileupload.jar ${instdir}/commons-fileupload-1.3.jar || die
+	rm jsr88javax.jar && dosym /usr/share/glassfish-deployment-api-1.2/lib/glassfish-deployment-api.jar ${instdir}/jsr88javax.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/javaee7-endorsed
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jersey2/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm cglib-2.2.0-b21.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.0-b21.jar || die
+	rm guava-14.0.1.jar && dosym /usr/share/guava-14/lib/guava.jar ${instdir}/guava-14.0.1.jar || die
+	rm org.osgi.core-4.2.0.jar && dosym /usr/share/osgi-core-api/lib/osgi-core-api.jar ${instdir}/org.osgi.core-4.2.0.jar || die
+	rm persistence-api-1.0.jar && dosym /usr/share/glassfish-persistence/lib/glassfish-persistence.jar ${instdir}/persistence-api-1.0.jar || die
+	rm validation-api-1.1.0.Final.jar && dosym /usr/share/validation-api-1.0/lib/validation-api.jar ${instdir}/validation-api-1.1.0.Final.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 oro-2.0.8.jar && dosym /usr/share/jakarta-oro-2.0/lib/jakarta-oro.jar ${instdir}/oro-2.0.8.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 dc0c867..0bc5cb2 100644
--- a/dev-java/netbeans-ergonomics/ChangeLog
+++ b/dev-java/netbeans-ergonomics/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-ergonomics-9999_p20150603 (03 Jun 2015)
+
+  03 Jun 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-ergonomics-9999_p20150603.ebuild:
+  bumped to the latest sources
+
 *netbeans-ergonomics-9999_p20150602 (02 Jun 2015)
 
   02 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index f293605..f626ed2 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201505290001-src.zip 207640635 SHA256 2547cf1181fa33
 DIST netbeans-trunk-nightly-201505300811-src.zip 207777734 SHA256 e9b9f7d8613e07dfdc7cecbd4e323e400625985373cd226101638250c1042cc1 SHA512 2c72c85b85e7016d9863ee8033da81d26e14f2928e8dd703ec4c48b02165bb1d65ce331b66b0367cebe54bc1b233b68dbaad1705796751b1f6d87e34744de08a WHIRLPOOL 8967ee3280bbc33ff4b8e4246c31b4debf324886e0251f75330dce8c67443c5fde66d2ae7f13314abc43e8a8f577baa2a56ff69b3516cd2ece144a49525f7ecb
 DIST netbeans-trunk-nightly-201506010001-src.zip 207778965 SHA256 96bc8cca703517eeffedcffc05a6de8f917ddadf688dd16ac0b8d1848954c5cf SHA512 9fe5670c662d3c21b2594253254aa521997f6c925f2591bbd7be7be7cffc93b3cbd3d4c9ac3c6f7cede21f9dbc7ed39fed45718e47e5bac653228ab07c62dddd WHIRLPOOL 90a459da74f998f4fb70bd03b9f2d581a2c72100f1d7c52a803703b5fadc929863d11d9643cc517e22fa6b3b42d66c197595820e2299d12a5b735d5cd68d3f8e
 DIST netbeans-trunk-nightly-201506020001-src.zip 207781610 SHA256 ed7f2e851ed53dacd5e46091a091490fcf4afbac35b732335f054fc428978850 SHA512 ba5f09aadede76fd0659c3b190a3646a9b57ffda253cf24d1343bace9112c56d96bff7df158e71539a614d0d80041113da73590fe2f9bf9981cbbe9993f9ef3e WHIRLPOOL c9c938d405c92ef00d253a40723ca770aa41d401dd2de6c79652c5df949bb9a9f7c6a92ac4f3895c8d7135e0963f6779b6aff1c3f8251da2fbf9f0d348d724b3
+DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123489cf38c44213cd2de2606f71e6231ac40e6519eb8f5c71294 SHA512 59a40cd092399dc49057144b95c9d8399fd3284a69bece3ccb02e479994ef2dd55140de0d62a455538dce87b17bc10cf3e09b165109271c78af229d1b62cb074 WHIRLPOOL 5ccbd8842aab3d1e2b0141bacaed90605bed668e0f7912b0fdd8e2de091ec24a0a9264d35c536e10bc7b75f8a5c42a60832cc6a2c5dc5c98f955d908dd01886d
 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
@@ -60,5 +61,6 @@ EBUILD netbeans-ergonomics-9999_p20150529.ebuild 2919 SHA256 e53d9695fa4d8f8d616
 EBUILD netbeans-ergonomics-9999_p20150530.ebuild 2919 SHA256 a4fe9923b76d109c44003bd56a84983484d56cbb52e5ab41ce69d17b858a59ea SHA512 2521461339ba9e9958574366e7a64a33c88ac683dee3277af201a3290bdf0ac6927c77fd90fb0dc93b866462c5af370fe4209bbcab7b25189384ba13b3f688c8 WHIRLPOOL fda13d7b49fc9b64feb1566c1b7e839e1abd706d87361a6e50800bec9f8188bc2e34486345bf831d08c469a1e2771b53abc904a8510d2369406897ffc4b6ff80
 EBUILD netbeans-ergonomics-9999_p20150601.ebuild 2919 SHA256 f843642d11b528dcd6b7465c2fc617938c0805b749b07e601aa8d084d14306bc SHA512 6fef8d3a5f25249499eac9e0e2ae8dcf6f97a8d4b32a3f8e1370f3969c837626da01b8ffffcb8606948e1ea46726d6bc423e00165ddef87b44564bdcacf03394 WHIRLPOOL 7fd93da117486ad27be4e4b4d62522d8596daaefbe668c37b46a1cb7dfd7753396d29921ea471fda90843d5a9187017675d995c2c21896062e081147fb2b6f5b
 EBUILD netbeans-ergonomics-9999_p20150602.ebuild 2919 SHA256 f7156f040794209850f3ea220b2545fd62a5c4e2d91d475884da127273585cb8 SHA512 c3732261e4fc519c39cbe61cc6a654194f47836994f0336dc3b6c79ab29cd92e60d71768e7d6c4f08445b862ef5184efa13464820ecba4a86cea70ebe64a2eda WHIRLPOOL fe8e10e38419660a3c84a050d9bbb0e65c6fb83b4df6e83b1ec98fb2005b3fb127b8aac74786f726d7346f97a092287837587e9fdb104b431e1fb0e7b039397f
-MISC ChangeLog 173922 SHA256 397a1bf52179b883ab448007cfee314940c9344bc6c27b2b684f34ea423f0b7e SHA512 bfc498f9ed0a64848244eb539fec259ed090558589fca86fdef8e662073c868e7b49db0b98814628b7a12cbed1ae5da7184e8e0f3e7d2b3709793097f0cc5e37 WHIRLPOOL 11ab4502b8da434a5c523d5649ada4dafa38622cc3bf8bd1c77d0e284f67f692fc6dcdf73d856aa56887d276ec8c38cbdc37c8e8dc21ccaaded2bba4513a5936
+EBUILD netbeans-ergonomics-9999_p20150603.ebuild 2919 SHA256 950daf3955de8b4f620998cb82a660ba45b0b9b0f05016758c893e5e1b5ee4f8 SHA512 fa389d8734ee486d84e0a5dd461b570d9d67346526cd93db03de44257644a2b12d08642ab71c53bfb2a1546a58a14de20aa135c93969f568c34457b57e3bfd2a WHIRLPOOL 8a2641d2111287c5bdabec6a293683bcab071baa65ae674a091631ebcf16f09ebf1612697b8e0fd9fab16e72ecc5b208c42fe5e2292011ba25681fbb175c5168
+MISC ChangeLog 174103 SHA256 edfcb68e791d32d8cdd02611004e54487060b3151819d6b7282b2c2495032aec SHA512 bd87062bcabfbbb930b587e380c70a9a63177b30cba24bf5a7c08dd276543ba320fca9b07e91d8f104922b5ee31a2334c6c86e97e3191d9f5f774352b9c945ac WHIRLPOOL ea4fdd43e06c9756726bfd982995e6c052691e07980005926fe16a55392ff30a76cbdbd19e31c57172af9a9b5983696b34028b84b1f3040d030da4f99fb64a7d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150603.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150603.ebuild
new file mode 100644
index 0000000..a26bc39
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150603.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 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/2015-06-03_00-01-56/zip/netbeans-trunk-nightly-201506030001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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 -Dpermit.jdk8.builds=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-r14-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-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 68115a8..dd8f5b4 100644
--- a/dev-java/netbeans-extide/ChangeLog
+++ b/dev-java/netbeans-extide/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-extide-9999_p20150603 (03 Jun 2015)
+
+  03 Jun 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-extide-9999_p20150603.ebuild:
+  bumped to the latest sources
+
 *netbeans-extide-9999_p20150602 (02 Jun 2015)
 
   02 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index e80bedf..f1a5faf 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201505290001-src.zip 207640635 SHA256 2547cf1181fa33
 DIST netbeans-trunk-nightly-201505300811-src.zip 207777734 SHA256 e9b9f7d8613e07dfdc7cecbd4e323e400625985373cd226101638250c1042cc1 SHA512 2c72c85b85e7016d9863ee8033da81d26e14f2928e8dd703ec4c48b02165bb1d65ce331b66b0367cebe54bc1b233b68dbaad1705796751b1f6d87e34744de08a WHIRLPOOL 8967ee3280bbc33ff4b8e4246c31b4debf324886e0251f75330dce8c67443c5fde66d2ae7f13314abc43e8a8f577baa2a56ff69b3516cd2ece144a49525f7ecb
 DIST netbeans-trunk-nightly-201506010001-src.zip 207778965 SHA256 96bc8cca703517eeffedcffc05a6de8f917ddadf688dd16ac0b8d1848954c5cf SHA512 9fe5670c662d3c21b2594253254aa521997f6c925f2591bbd7be7be7cffc93b3cbd3d4c9ac3c6f7cede21f9dbc7ed39fed45718e47e5bac653228ab07c62dddd WHIRLPOOL 90a459da74f998f4fb70bd03b9f2d581a2c72100f1d7c52a803703b5fadc929863d11d9643cc517e22fa6b3b42d66c197595820e2299d12a5b735d5cd68d3f8e
 DIST netbeans-trunk-nightly-201506020001-src.zip 207781610 SHA256 ed7f2e851ed53dacd5e46091a091490fcf4afbac35b732335f054fc428978850 SHA512 ba5f09aadede76fd0659c3b190a3646a9b57ffda253cf24d1343bace9112c56d96bff7df158e71539a614d0d80041113da73590fe2f9bf9981cbbe9993f9ef3e WHIRLPOOL c9c938d405c92ef00d253a40723ca770aa41d401dd2de6c79652c5df949bb9a9f7c6a92ac4f3895c8d7135e0963f6779b6aff1c3f8251da2fbf9f0d348d724b3
+DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123489cf38c44213cd2de2606f71e6231ac40e6519eb8f5c71294 SHA512 59a40cd092399dc49057144b95c9d8399fd3284a69bece3ccb02e479994ef2dd55140de0d62a455538dce87b17bc10cf3e09b165109271c78af229d1b62cb074 WHIRLPOOL 5ccbd8842aab3d1e2b0141bacaed90605bed668e0f7912b0fdd8e2de091ec24a0a9264d35c536e10bc7b75f8a5c42a60832cc6a2c5dc5c98f955d908dd01886d
 EBUILD netbeans-extide-7.4.ebuild 3311 SHA256 8585e0b9eac3b9bb35d5b5e0152936f84708a824d76831930a3dfd3d196556b0 SHA512 19eceec7a634923b4712eb277a1ff9900a2eb4d9ac0a2c699175333c263f0c02baaf24eb30bd7919444f5c9df751186689b2d4359ca1c88dca02884d7c18c3cd WHIRLPOOL e64509f198c4d09851f98d5bd2ddd5b469b0a7c0f3122f391c17833e5d6d77b7a6c2fd9e942e34f2df42047504ad40593f97af9b2898450e769c7b012355c316
 EBUILD netbeans-extide-8.0.2.ebuild 3313 SHA256 d147df43b8e55de81e0429604a2497a82861864ae50fbb85368a3070e1c266c9 SHA512 8f2722ce12c1582ca6e9ed348fcb37b9969585037b5432e592e5dd6ef4b3e49c58783da5fe20f088bee07514e3b42de7aa36607900b285c32c4b91fa218df90c WHIRLPOOL 0fb074484787a5e0e688dc734efe027ff6dfd082dd63bc9bccc612f915fbbe33a4f93db6c43d345abc9c191e22ec196aada1e889d1240968916d54c69497a2d6
 EBUILD netbeans-extide-8.0.ebuild 3305 SHA256 b2d57e2e2d92760ead3d383fe4dd5b4fb9fc2807a9b58c6f40b44fc24072b8bb SHA512 6e7f12758188a564ef6b5cf8b0ffdf79e30d1021172d10f215d04e727bc4001e4385fd0961a26a6bb42638089e0919b1d4628a13ba11a3deac94d4693c7210d5 WHIRLPOOL adac8461de43669b7bb98ea8920c0a2944837211a37503b957221149d4b91c4bd92b6db160191990b838c474495c65f62c8a4bb9fdbcaa371b4648a335b1afa9
@@ -54,5 +55,6 @@ EBUILD netbeans-extide-9999_p20150529.ebuild 3383 SHA256 e60f8163b953ab0052d407b
 EBUILD netbeans-extide-9999_p20150530.ebuild 3383 SHA256 3e3178d9556ec5894e44bae14e398788597bfc2b9c4939069c2ea10335b97c3c SHA512 484f8bbd4c00fbd0e3512bd52d085268c88b069cbba386abc4de821c776999c3a054347c1589746916fdae100f05eba583fa8b9f1d15e397f21cb094e4c3af89 WHIRLPOOL aef88ea83aa31424ccdb4d72280228e8755024984e2ba0684600d6015ef43240d44f3ba7cda711c91f51bb644c7708fb4e24cce3ac2ea2d65b8bc6553af5fd0a
 EBUILD netbeans-extide-9999_p20150601.ebuild 3383 SHA256 772bf49232284dc0336bcbe27c5b05fda29ede4c1f1478e7e06ce1a1e0f8cab8 SHA512 b3d5fd768c0275406a14f58694c6f9cafab7e2ca5659fde5890720d5e025fdb6bc8b837099c697b4157f4eb38a45a6249068d0f0c164f990c51655a7536032ff WHIRLPOOL 5be1ea0866882c925e4516dce6f3e654e6aab5d354dba810cc9f1a23134e04e6fbd36e2daf0bf70215067c89045837d2a48d8c84e6d01335e64de2716a959016
 EBUILD netbeans-extide-9999_p20150602.ebuild 3383 SHA256 0e40f77805c0fc12621896b2861b0eaaf8b054579c7f00898273b6e163f8acdf SHA512 0c9bd56b40a49cb9812fd9b89db76c8b566f1baa7746a8777512f7d8d5521864771b24fd8286fff08a0d23c7f93227fa1add5e92cd48a94d01ed9a7ad493b986 WHIRLPOOL 75d7e71d3a636c59456b623e14ce940f07e3281383a55e4329e855ebfddff77e555bcd928195a3c523f1a905242ec629c6fd28056ddd5bec609cb917efd0818d
-MISC ChangeLog 97585 SHA256 1fdd284362451d01c8731256f3fec8b4480b2ceb9b862ce61f341d0cedc33ab1 SHA512 417842d3ab1b80753a3d60f745718533fbcfba6b58a3a40dbea08701c8ac55de45911460a25f845efb27173f52bfa07629bb30f93a07ad13570675449bc797c1 WHIRLPOOL 3bcc06a09234b19ced4a216b552075357bee9154e1ac7b6229202678e71bff185b8528071f3355bb7dc864f51b84d3031852ea519ac2ad3fdc02e7fc1162d358
+EBUILD netbeans-extide-9999_p20150603.ebuild 3383 SHA256 d687a3adef11e7c36d9befb0eb254fe5ca882144c3f05978a5a3d1605cf280c2 SHA512 3e38a2be797baca60cc7005aa5388e6ea0513e261717af6021c8623305f45604853882be9e9103122ebc54732c6c3a89e26e334335d4ec2e2035df2f86bc99ea WHIRLPOOL 2016fadaa385e7131bf10665b17bd06a617c3fb09a4bdbb146dcc7f9012b0e3bf2e496cd894e7684bf4698b773cb31242907007fbc36d3fd0d5ab33f356588ea
+MISC ChangeLog 97758 SHA256 c96c59ce6cf573a46346307d1466de9410a08631efbf07507b9b88286a15c34c SHA512 bafea34a3f286b7fbb804f3f4bda57d11c609235b3bcbfeacfaefee8eba2b6fa29e999478eaaf32d860430659134915f0277e0ba31c9f32d8c51d88a00e56b92 WHIRLPOOL 8534674edf53520a1461212038efc00ab66d36543436909509021f3a2c1d29bf927feba462ba21c013928c9111fde866883bd0d6e39a2d3f5df87e48881fe8fd
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20150603.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20150603.ebuild
new file mode 100644
index 0000000..f83aed0
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20150603.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2015 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/2015-06-03_00-01-56/zip/netbeans-trunk-nightly-201506030001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip
+	http://hg.netbeans.org/binaries/95CCE237B1E9390FBED0440B601822813DB220E6-ant-misc-1.9.4.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 -Dpermit.jdk8.builds=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-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip o.apache.tools.ant.module/external/ant-libs-1.9.4.zip || die
+	ln -s "${DISTDIR}"/95CCE237B1E9390FBED0440B601822813DB220E6-ant-misc-1.9.4.zip o.apache.tools.ant.module/external/ant-misc-1.9.4.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-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 fe04ce9..a0517cc 100644
--- a/dev-java/netbeans-groovy/ChangeLog
+++ b/dev-java/netbeans-groovy/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-groovy-9999_p20150603 (03 Jun 2015)
+
+  03 Jun 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-groovy-9999_p20150603.ebuild:
+  bumped to the latest sources
+
 *netbeans-groovy-9999_p20150602 (02 Jun 2015)
 
   02 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index 3763322..842b3c8 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -37,6 +37,7 @@ DIST netbeans-trunk-nightly-201505290001-src.zip 207640635 SHA256 2547cf1181fa33
 DIST netbeans-trunk-nightly-201505300811-src.zip 207777734 SHA256 e9b9f7d8613e07dfdc7cecbd4e323e400625985373cd226101638250c1042cc1 SHA512 2c72c85b85e7016d9863ee8033da81d26e14f2928e8dd703ec4c48b02165bb1d65ce331b66b0367cebe54bc1b233b68dbaad1705796751b1f6d87e34744de08a WHIRLPOOL 8967ee3280bbc33ff4b8e4246c31b4debf324886e0251f75330dce8c67443c5fde66d2ae7f13314abc43e8a8f577baa2a56ff69b3516cd2ece144a49525f7ecb
 DIST netbeans-trunk-nightly-201506010001-src.zip 207778965 SHA256 96bc8cca703517eeffedcffc05a6de8f917ddadf688dd16ac0b8d1848954c5cf SHA512 9fe5670c662d3c21b2594253254aa521997f6c925f2591bbd7be7be7cffc93b3cbd3d4c9ac3c6f7cede21f9dbc7ed39fed45718e47e5bac653228ab07c62dddd WHIRLPOOL 90a459da74f998f4fb70bd03b9f2d581a2c72100f1d7c52a803703b5fadc929863d11d9643cc517e22fa6b3b42d66c197595820e2299d12a5b735d5cd68d3f8e
 DIST netbeans-trunk-nightly-201506020001-src.zip 207781610 SHA256 ed7f2e851ed53dacd5e46091a091490fcf4afbac35b732335f054fc428978850 SHA512 ba5f09aadede76fd0659c3b190a3646a9b57ffda253cf24d1343bace9112c56d96bff7df158e71539a614d0d80041113da73590fe2f9bf9981cbbe9993f9ef3e WHIRLPOOL c9c938d405c92ef00d253a40723ca770aa41d401dd2de6c79652c5df949bb9a9f7c6a92ac4f3895c8d7135e0963f6779b6aff1c3f8251da2fbf9f0d348d724b3
+DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123489cf38c44213cd2de2606f71e6231ac40e6519eb8f5c71294 SHA512 59a40cd092399dc49057144b95c9d8399fd3284a69bece3ccb02e479994ef2dd55140de0d62a455538dce87b17bc10cf3e09b165109271c78af229d1b62cb074 WHIRLPOOL 5ccbd8842aab3d1e2b0141bacaed90605bed668e0f7912b0fdd8e2de091ec24a0a9264d35c536e10bc7b75f8a5c42a60832cc6a2c5dc5c98f955d908dd01886d
 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
@@ -64,5 +65,6 @@ EBUILD netbeans-groovy-9999_p20150529.ebuild 3422 SHA256 49a9fb4979bdec591587e12
 EBUILD netbeans-groovy-9999_p20150530.ebuild 3422 SHA256 4fe5347da032cb3fada6d8ad5ef9307a506e6c01dc935df78856dd8d019539ee SHA512 47b40e4fc535097c82dbcdf2e83c0ae72e0f3fb2a64db6d835fb5a03d697ebccc95ca2d126cabcb727c4c54e6fa4c1ea6f2f0f36520c7c5b1fb63480e8e52d61 WHIRLPOOL af949214df52b2ba21c6a9ef869c6c6ab0104f96833f3a3f8371487fe13cf548ddd5a5effa78dc539033d5062491a8d2a6e6ad32aed4809a0e346ff62143bc11
 EBUILD netbeans-groovy-9999_p20150601.ebuild 3422 SHA256 a91587febfb20c35b6cd52191a0d7f89bc1648b653bbfe8573eb6c428d90050e SHA512 ea1bca697ab57b301a369b3493d6126bfa91bf70e2c1d4e1d7e7128d5f72476f62cb0d4e213b99b25b0dd14f94c454fc1fb68a2c8a614fd0da74a3c05f815976 WHIRLPOOL 26b17d03b75f8e652acd69932a3fc82a0a038474ca0c5398619daff5cc40ba936a77461dd46e5283d60b198c44dbfb12a7c3e9b1732dbf18de4d92feb34b93c0
 EBUILD netbeans-groovy-9999_p20150602.ebuild 3422 SHA256 d21c7b407d793bf6f80adc25f9ba77fc3424a1a9a6113f55a2744879e8686297 SHA512 a97c118b06976d3e67406f9274231a8f7d6604789412a06aec9dba8a4c6cc56c1f83ee9ac41ede98bca114f677b5158e481993aba19742fe1f2e9c3c0f03ffb3 WHIRLPOOL eaaacf887e88f1245173b3e5fdacc01ea37755b5c5fc76f13475b8c81e68a2cf86d2d899e1670a5ad00f07456210d3aec9d231d397604a44b56d21c99004c22a
-MISC ChangeLog 165565 SHA256 974044ebc6dec3b158721cda6f55a9140435545bc1f9a957a5339274c435d5cc SHA512 42c010711d0602aa80d2261eed13f89b8e276db1f4f8ffaffd6f5b4d01b16a5b908fb013807ea76e1225ac49ab67f3e53b5eab8cc6f118f1767fb7f7705cfb56 WHIRLPOOL 3f926833d62376ad40ff65700de39eff5b8e38af89c9846a572e0e4171734969916233805fbe967e8ac6fcb3d2f98f286a00be01016e1f4f588d515175698ea3
+EBUILD netbeans-groovy-9999_p20150603.ebuild 3422 SHA256 7d272b5b2ada4a6f182d32439302222230e850f49b9f0a821a9d6e3ad2d04c71 SHA512 44b75861c70aa2db7995d138de88878a16726523c5c394846cbd125fabb967b5231497274c7a22db26bafa9e6d83a8f472303ab3d514cb6de0b912b6ed8a375b WHIRLPOOL 2e8ed945c4b9135b60deb7310156bb3d501d2e11e0042964905019c01fc9c4186827068714a23d0c85a6e133ecd7ac504231a1390fafc0ca69d3e14689a9a37c
+MISC ChangeLog 165738 SHA256 7f3a8bed583e3993952b933a727ef8a58bfe57dc93ce338eccbe5e97347fcf8f SHA512 1ed7ad12732e7fdd1b73102662c36896f80f4e5e07ae82fa4647d80dce3d4fe93616ce7edf5e596464944406fcaa08488513b8e62d649f8cdeb285e35793e3d5 WHIRLPOOL 27c3ca15bc5cadb4153a82823736c87582195f5375ea6ab7e17a319400ce122b3c915e6b83e90d5d8e90f34f30906ecf78121c58dda990c70fca2c4039fc23ee
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150603.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150603.ebuild
new file mode 100644
index 0000000..1312776
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150603.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 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/2015-06-03_00-01-56/zip/netbeans-trunk-nightly-201506030001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/C136AE67C3C40740AE986582BAF65BA5C5CE69A0-groovy-all-2.1.7.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 -Dpermit.jdk8.builds=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-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/C136AE67C3C40740AE986582BAF65BA5C5CE69A0-groovy-all-2.1.7.jar libs.groovy/external/groovy-all-2.1.7.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-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 e72c42e..bdcce50 100644
--- a/dev-java/netbeans-harness/ChangeLog
+++ b/dev-java/netbeans-harness/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-harness-9999_p20150603 (03 Jun 2015)
+
+  03 Jun 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-harness-9999_p20150603.ebuild:
+  bumped to the latest sources
+
 *netbeans-harness-9999_p20150602 (02 Jun 2015)
 
   02 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 81896a0..e83f477 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201505290001-src.zip 207640635 SHA256 2547cf1181fa33
 DIST netbeans-trunk-nightly-201505300811-src.zip 207777734 SHA256 e9b9f7d8613e07dfdc7cecbd4e323e400625985373cd226101638250c1042cc1 SHA512 2c72c85b85e7016d9863ee8033da81d26e14f2928e8dd703ec4c48b02165bb1d65ce331b66b0367cebe54bc1b233b68dbaad1705796751b1f6d87e34744de08a WHIRLPOOL 8967ee3280bbc33ff4b8e4246c31b4debf324886e0251f75330dce8c67443c5fde66d2ae7f13314abc43e8a8f577baa2a56ff69b3516cd2ece144a49525f7ecb
 DIST netbeans-trunk-nightly-201506010001-src.zip 207778965 SHA256 96bc8cca703517eeffedcffc05a6de8f917ddadf688dd16ac0b8d1848954c5cf SHA512 9fe5670c662d3c21b2594253254aa521997f6c925f2591bbd7be7be7cffc93b3cbd3d4c9ac3c6f7cede21f9dbc7ed39fed45718e47e5bac653228ab07c62dddd WHIRLPOOL 90a459da74f998f4fb70bd03b9f2d581a2c72100f1d7c52a803703b5fadc929863d11d9643cc517e22fa6b3b42d66c197595820e2299d12a5b735d5cd68d3f8e
 DIST netbeans-trunk-nightly-201506020001-src.zip 207781610 SHA256 ed7f2e851ed53dacd5e46091a091490fcf4afbac35b732335f054fc428978850 SHA512 ba5f09aadede76fd0659c3b190a3646a9b57ffda253cf24d1343bace9112c56d96bff7df158e71539a614d0d80041113da73590fe2f9bf9981cbbe9993f9ef3e WHIRLPOOL c9c938d405c92ef00d253a40723ca770aa41d401dd2de6c79652c5df949bb9a9f7c6a92ac4f3895c8d7135e0963f6779b6aff1c3f8251da2fbf9f0d348d724b3
+DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123489cf38c44213cd2de2606f71e6231ac40e6519eb8f5c71294 SHA512 59a40cd092399dc49057144b95c9d8399fd3284a69bece3ccb02e479994ef2dd55140de0d62a455538dce87b17bc10cf3e09b165109271c78af229d1b62cb074 WHIRLPOOL 5ccbd8842aab3d1e2b0141bacaed90605bed668e0f7912b0fdd8e2de091ec24a0a9264d35c536e10bc7b75f8a5c42a60832cc6a2c5dc5c98f955d908dd01886d
 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
@@ -66,5 +67,6 @@ EBUILD netbeans-harness-9999_p20150529.ebuild 4131 SHA256 6d2fb6afea8e28868c3498
 EBUILD netbeans-harness-9999_p20150530.ebuild 4131 SHA256 b8cbf67cb6c89abbd50d54d714843e35168ad398ce02ae057ecdb2549f6e6c54 SHA512 0557e16d8bb073d7c562a7a42c6afe921e0f00e45ca42cfa7ab354dea86587756d55395cb463b0b94b1caa44090b8a072251c9aa206f22fc170f0f107528ea1b WHIRLPOOL 82b051ba8c61253614a14c3f0195f70c0ee83594626266739938fa09632668f2906b1819cc9542d5b7cacd441ce2567b8feaba1ddcdf8e0889620f4dc54b082c
 EBUILD netbeans-harness-9999_p20150601.ebuild 4131 SHA256 287294cfc4d9b2f685370a3f67556d61ef2b2773bda1d237a50f88adb57ce267 SHA512 1a34433cbf31a8c87facb840eaf70842d6a2f103da9d92a442c3a2cb4d6a5710d2fc5a02449623db7b72679e164c3a69778aec92fe85fc7b79d3452c3fa71e00 WHIRLPOOL 59c84fed4e210dca48a86fc7f1534bd20da5fb65df77fe3f1d87ca709b3effb8a96aafa4caebb1490fa68f925def7eebc58122110b8eaf916bfda0c8667e3947
 EBUILD netbeans-harness-9999_p20150602.ebuild 4131 SHA256 2d6d1b03d6f70e02ec9ec733f38d0efc0ebfad7098087112c833fa2744a9927f SHA512 241debe4d1d2a25022d15de32c743d9a68f58826ea1a99e89161180e2c825a0f710208b34bd51214cca01eb3ebc7168884ec3c7e9e03802961ffc042c3c1f833 WHIRLPOOL b9eb65f0d699da31dc7f50bdc83204fc6533d1807e6c7eb1acd64d3a2e343e73c12faa202da593f81ff7ab74ed651c98d215d849bd597013d193a13bfdaae698
-MISC ChangeLog 167683 SHA256 bc3377a2e11adfb366526df2d1bae0f86bdef027f6c730691974e934a2fdb873 SHA512 cde08cb03af89d009424d82c3c665402720573d8b1c155faea1f16cf6541efe546852d1a795abe5c045e2e7477b72d59d2571c24da5057822333771ca98d3ac4 WHIRLPOOL 5e69142638f556a9e85e15b5d529001c71ede0b987020d464e6a540eb4f018dfd47402baed0accc02844de7665160fc9fd913b96e9fbd17a5f5ac00bce5425be
+EBUILD netbeans-harness-9999_p20150603.ebuild 4131 SHA256 6d11bc06afc57c6907b454a83997613a8e91ea4399d68601b91e1b4ead945143 SHA512 52c9287b85514f38ace5caef580b06b8495999520d10c37f3b2caaa475504702fa90586dfb9d412ef74890c56086fe85ba8d15abc962353823bea7d4fd94199c WHIRLPOOL 9453d9b2b8b707781f75e9fe5db32755d254d3bc2f3c7e5a3084bcd2b7be7c54413c601cf7f232cfecfb7f66dbed60e6bc82e37c846b68969a5fdfbb76b7e5c7
+MISC ChangeLog 167858 SHA256 c5a490b1cce85f445f0f83f8cb492bc8146c0cab6f8b318080c1d65bdd8d230d SHA512 81591f9d06a8c54bb1bbf2d948343ea52a96355780cb8b21196b7cda9f918f8818bda6d91f47a07203e9290a68b4821886921a30f7dc466de89a6fed8a510c29 WHIRLPOOL 173be65836acdd1590000676f83227d94491f85600dc4f65917156606c6536a49b3a1b92a30e4fb8faef3e324d7f186f4393edcf8869bee0aac8750b574b4e89
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20150603.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20150603.ebuild
new file mode 100644
index 0000000..dcca663
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20150603.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2015 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/2015-06-03_00-01-56/zip/netbeans-trunk-nightly-201506030001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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 -Dpermit.jdk8.builds=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-r14-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-r14-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.12.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 474a8c6..34e81d1 100644
--- a/dev-java/netbeans-ide/ChangeLog
+++ b/dev-java/netbeans-ide/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-ide-9999_p20150603 (03 Jun 2015)
+
+  03 Jun 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-ide-9999_p20150603.ebuild:
+  bumped to the latest sources
+
 *netbeans-ide-9999_p20150602 (02 Jun 2015)
 
   02 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index d190edb..501eef1 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -243,6 +243,7 @@ DIST netbeans-trunk-nightly-201505290001-src.zip 207640635 SHA256 2547cf1181fa33
 DIST netbeans-trunk-nightly-201505300811-src.zip 207777734 SHA256 e9b9f7d8613e07dfdc7cecbd4e323e400625985373cd226101638250c1042cc1 SHA512 2c72c85b85e7016d9863ee8033da81d26e14f2928e8dd703ec4c48b02165bb1d65ce331b66b0367cebe54bc1b233b68dbaad1705796751b1f6d87e34744de08a WHIRLPOOL 8967ee3280bbc33ff4b8e4246c31b4debf324886e0251f75330dce8c67443c5fde66d2ae7f13314abc43e8a8f577baa2a56ff69b3516cd2ece144a49525f7ecb
 DIST netbeans-trunk-nightly-201506010001-src.zip 207778965 SHA256 96bc8cca703517eeffedcffc05a6de8f917ddadf688dd16ac0b8d1848954c5cf SHA512 9fe5670c662d3c21b2594253254aa521997f6c925f2591bbd7be7be7cffc93b3cbd3d4c9ac3c6f7cede21f9dbc7ed39fed45718e47e5bac653228ab07c62dddd WHIRLPOOL 90a459da74f998f4fb70bd03b9f2d581a2c72100f1d7c52a803703b5fadc929863d11d9643cc517e22fa6b3b42d66c197595820e2299d12a5b735d5cd68d3f8e
 DIST netbeans-trunk-nightly-201506020001-src.zip 207781610 SHA256 ed7f2e851ed53dacd5e46091a091490fcf4afbac35b732335f054fc428978850 SHA512 ba5f09aadede76fd0659c3b190a3646a9b57ffda253cf24d1343bace9112c56d96bff7df158e71539a614d0d80041113da73590fe2f9bf9981cbbe9993f9ef3e WHIRLPOOL c9c938d405c92ef00d253a40723ca770aa41d401dd2de6c79652c5df949bb9a9f7c6a92ac4f3895c8d7135e0963f6779b6aff1c3f8251da2fbf9f0d348d724b3
+DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123489cf38c44213cd2de2606f71e6231ac40e6519eb8f5c71294 SHA512 59a40cd092399dc49057144b95c9d8399fd3284a69bece3ccb02e479994ef2dd55140de0d62a455538dce87b17bc10cf3e09b165109271c78af229d1b62cb074 WHIRLPOOL 5ccbd8842aab3d1e2b0141bacaed90605bed668e0f7912b0fdd8e2de091ec24a0a9264d35c536e10bc7b75f8a5c42a60832cc6a2c5dc5c98f955d908dd01886d
 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
@@ -272,5 +273,6 @@ EBUILD netbeans-ide-9999_p20150529.ebuild 30352 SHA256 3927eb8ed800b02360091f8b6
 EBUILD netbeans-ide-9999_p20150530.ebuild 30352 SHA256 dbfd399cbca66342be218b55563597d793c93a6b1aa6bc6dc463e5b0253e3af9 SHA512 2cb4403eb0c82bccad8f16623611d4b77cd698448d44f7adaf5b41e8bef75354d31cbb29939d8e6acffab47c448ec32d4029520495ccfd38e6246ad9c29418fe WHIRLPOOL ab71cf6ad4ddd0939cc30dd4d25d0bd4fb3a75b5154edd227bb43af455ea3ba380d022738c80245a22dd0fe78cb7ad47165f8a7bfce8ae40b13988325b3cb8d9
 EBUILD netbeans-ide-9999_p20150601.ebuild 30352 SHA256 301de6419926472e19a586d1ee666257bf36d4e48eb2990f4a01213f3654f30d SHA512 2d019a6686c4ab2ea494b6a4780925d582318db9cef12b2f5c0f29bd8e8486df253695cd9549911ac856f561129c7b0c44bc6ffa7116f7d6f5558afe1e5ef7cd WHIRLPOOL c9e600d6484b6ea6dbcf134035b10a6fdce98d79d9f3677a7c9ecd8d29fc72c5ab61d731ce31fa88e7c1145f28e06641769d3bc1d57d6a21bdb93937f8862e11
 EBUILD netbeans-ide-9999_p20150602.ebuild 30352 SHA256 04dd4bbd6534258e7dee19c02a7f557bd02b2a42d187b7fcdb19a4e0269b765f SHA512 bb6d22db2d315391eaa34001f6d1cf59dd192368209704ea820b04ec1adc16e00268e76ef92eb030263ce77201d78262c17742d99c0e44e3ae348c158a381271 WHIRLPOOL c4d36fdd5b41ad461e9d1bdb9ff7958e489abd0f1bd9c853badc828f7e99d9735808ee832cdde2d66300875076dcad8679fb93d7b8a7f11e5c7b68971472a3d5
-MISC ChangeLog 159645 SHA256 67dde1e4b3ca688e879edd072509effac596f8859eabd37a1684114b7a868607 SHA512 9d90d3e1289efdca9992ac615fa579c6833356c4a5135ac972408ec3c50033317b1df107de934371af0641d9960cbe63d88a909e9c09a9e6e2484f3056e1273b WHIRLPOOL 579dceeb6cfdb27a571f4db4e8c8922bdf718f895cbfbe1b2327af8e90ce86f8f5f528cca81955d5965d83f8cad1889b02084ac5dba4a0dcc826fabcde8c99f3
+EBUILD netbeans-ide-9999_p20150603.ebuild 30352 SHA256 0e3da65867194e9ddfebfa794292616d5dc50063a7ebc6f2036d359a5b34a427 SHA512 bd38660630929edae836420ec2f4abd09f6dca2afda67d963c6aa7ceebe49c63f44de44e4051114fc128f831f920b6b56bdf23d3675bf43e900f6d6bf32c0a9c WHIRLPOOL 00167cc4fa4ebd07ca0b597e0ae623c6070ab6d8ee142e35427cd59f9910c9c842d7dbc586806a79ffee0fb77e631669b5f79571cf5f39d5c34ced7b30dca271
+MISC ChangeLog 159812 SHA256 eb5cf945c76eafb996fcc6fdebe8362495ea055fb70b2eddc406e12c2a2087eb SHA512 5ec7aecc213114c2736d0f2d4333501cc50dacd6e223a67805c2702b52d8126908fe8180092b7f5fc4ef2030b8cfbd2e10a8914a5ee3a5c3968f2fc6846408e2 WHIRLPOOL fe79d13134a136d49ece9fb4e5848f25d453196404729775c6cbe7d4df61f4cfe80a2a14888231b44b128dd394d8c9b3fcd624c08925c491d5a20af46ede9e56
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20150603.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20150603.ebuild
new file mode 100644
index 0000000..d0fed45
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20150603.ebuild
@@ -0,0 +1,377 @@
+# Copyright 1999-2015 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/2015-06-03_00-01-56/zip/netbeans-trunk-nightly-201506030001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.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/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip
+	http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.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/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar
+	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/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-js-corestubs.zip
+	http://hg.netbeans.org/binaries/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip
+	http://hg.netbeans.org/binaries/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip
+	http://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar
+	http://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar
+	http://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar
+	http://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar
+	http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
+	http://hg.netbeans.org/binaries/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar
+	http://hg.netbeans.org/binaries/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar
+	http://hg.netbeans.org/binaries/F27BF427BE72709F3094BF76ECA8C5A2B9AC6DA9-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar
+	http://hg.netbeans.org/binaries/9BC512C5BB9A9F5276B9E8672F6B30AD0BD97D88-org.eclipse.core.jobs-3.5.101_nosignature.jar
+	http://hg.netbeans.org/binaries/105DC9A1A93E6EA9A6CD368AD12897B1F247D6AE-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar
+	http://hg.netbeans.org/binaries/E99C3C29A90F8AB29078A38CF8EBC3860249640C-org.eclipse.core.runtime-3.7.0_nosignature.jar
+	http://hg.netbeans.org/binaries/84FC6D443CD0816FA87093B6B7AD6876ADFC4207-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar
+	http://hg.netbeans.org/binaries/74069BFD03B2C66A9EBB4370C0B8064E3F5B6594-org.eclipse.equinox.app-1.3.100_nosignature.jar
+	http://hg.netbeans.org/binaries/A7953EEE9D4D7CD896C7D0AD6D21902E6259979B-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar
+	http://hg.netbeans.org/binaries/3FB169C95F095B70F05B96BE9496DA63FAE7F707-org.eclipse.equinox.preferences-3.4.2_nosignature.jar
+	http://hg.netbeans.org/binaries/CD5919A707EB6B5C1FC29964C8EF5E2CF3F5A3D4-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar
+	http://hg.netbeans.org/binaries/A4634373DC60650C49CC98AEA2090889F7ADC68F-org.eclipse.equinox.security-1.1.1_nosignature.jar
+	http://hg.netbeans.org/binaries/278049664FFA5447191BD5FE96B0B62B0CFD15D1-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar
+	http://hg.netbeans.org/binaries/9039A0C1FA0E56CB56A1A192908814478FA747C5-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar
+	http://hg.netbeans.org/binaries/DAA45A7EE529A7532F5DC08625A5A3E81DB2D4CB-org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar
+	http://hg.netbeans.org/binaries/F5AC8FBA216A8C52F319EC2CB455B44FFD734B38-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar
+	http://hg.netbeans.org/binaries/B43E7CE55F0DECA3BE1A6E695A3E3ABC6D62567F-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar
+	http://hg.netbeans.org/binaries/1B9CBEC0FCB47C279519E52D360199C24EC99B01-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar
+	http://hg.netbeans.org/binaries/6B0A6E9F9179E314944E4ADB831A9D6FCADED3DC-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar
+	http://hg.netbeans.org/binaries/B28B8EE777232102471EA5334FD70E20851845DD-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar
+	http://hg.netbeans.org/binaries/24A15BD37950663933CC4975EE6E518BEB2C28A3-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar
+	http://hg.netbeans.org/binaries/01CD242F06F6F7E4E61C9E05ABBE07318E501D51-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar
+	http://hg.netbeans.org/binaries/75928E4368CA748131A6767BA1A97D9DA643C306-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar
+	http://hg.netbeans.org/binaries/934DCAB9534B8FE12FD9C90759B26B6B0D442837-org.tmatesoft.svnkit_1.8.7.r10376_v20141223_2131.jar
+	http://hg.netbeans.org/binaries/E90EF50215FFD23928B3308DC76A17B7DADE5F33-processtreekiller-1.0.5.jar
+	http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar
+	http://hg.netbeans.org/binaries/D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar
+	http://hg.netbeans.org/binaries/2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar
+	http://hg.netbeans.org/binaries/5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar
+	http://hg.netbeans.org/binaries/24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.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/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar
+	http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar
+	http://hg.netbeans.org/binaries/CE9A1C96875443F2FDD5127B750DA39CF4CE818B-com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.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/jsch-0.1.46:0
+	>=dev-java/json-simple-1.1:0
+	dev-java/jsr173:0
+	dev-java/jzlib: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>=1.8.4:0[java] missing from the tree
+#	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
+	${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 -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+JAVA_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-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}"/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar libs.commons_net/external/commons-net-3.3.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}"/3502EB7D4A72C2C684D23AFC241CCF50797079D1-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}"/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}"/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar c.googlecode.javaewah.JavaEWAH/external/JavaEWAH-0.7.9.jar || 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 libs.javafx/external/jfxrt.jar || die
+	ln -s "${DISTDIR}"/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar html.validation/external/jing.jar || die
+	ln -s "${DISTDIR}"/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-js-corestubs.zip javascript2.editor/external/js-corestubs.zip || die
+	ln -s "${DISTDIR}"/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip javascript2.editor/external/js-domstubs.zip || die
+	ln -s "${DISTDIR}"/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip javascript2.editor/external/js-reststubs.zip || die
+	ln -s "${DISTDIR}"/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.core-0.0.7.jar || die
+	ln -s "${DISTDIR}"/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.sshagent-0.0.7.jar || die
+	ln -s "${DISTDIR}"/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.pageant-0.0.7.jar || die
+	ln -s "${DISTDIR}"/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.usocket-jna-0.0.7.jar || die
+	ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.process/external/libpam4j-1.1.jar || die
+	ln -s "${DISTDIR}"/76E901A1F432323E7E90FC86FDB2534A28952293-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}"/F27BF427BE72709F3094BF76ECA8C5A2B9AC6DA9-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar o.eclipse.core.contenttype/external/org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar || die
+	ln -s "${DISTDIR}"/9BC512C5BB9A9F5276B9E8672F6B30AD0BD97D88-org.eclipse.core.jobs-3.5.101_nosignature.jar o.eclipse.core.jobs/external/org.eclipse.core.jobs-3.5.101_nosignature.jar || die
+	ln -s "${DISTDIR}"/105DC9A1A93E6EA9A6CD368AD12897B1F247D6AE-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar o.eclipse.core.net/external/org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar || die
+	ln -s "${DISTDIR}"/E99C3C29A90F8AB29078A38CF8EBC3860249640C-org.eclipse.core.runtime-3.7.0_nosignature.jar o.eclipse.core.runtime/external/org.eclipse.core.runtime-3.7.0_nosignature.jar || die
+	ln -s "${DISTDIR}"/84FC6D443CD0816FA87093B6B7AD6876ADFC4207-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar o.eclipse.core.runtime.compatibility.auth/external/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar || die
+	ln -s "${DISTDIR}"/74069BFD03B2C66A9EBB4370C0B8064E3F5B6594-org.eclipse.equinox.app-1.3.100_nosignature.jar o.eclipse.equinox.app/external/org.eclipse.equinox.app-1.3.100_nosignature.jar || die
+	ln -s "${DISTDIR}"/A7953EEE9D4D7CD896C7D0AD6D21902E6259979B-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar o.eclipse.equinox.common/external/org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar || die
+	ln -s "${DISTDIR}"/3FB169C95F095B70F05B96BE9496DA63FAE7F707-org.eclipse.equinox.preferences-3.4.2_nosignature.jar o.eclipse.equinox.preferences/external/org.eclipse.equinox.preferences-3.4.2_nosignature.jar || die
+	ln -s "${DISTDIR}"/CD5919A707EB6B5C1FC29964C8EF5E2CF3F5A3D4-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar o.eclipse.equinox.registry/external/org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar || die
+	ln -s "${DISTDIR}"/A4634373DC60650C49CC98AEA2090889F7ADC68F-org.eclipse.equinox.security-1.1.1_nosignature.jar o.eclipse.equinox.security/external/org.eclipse.equinox.security-1.1.1_nosignature.jar || die
+	ln -s "${DISTDIR}"/278049664FFA5447191BD5FE96B0B62B0CFD15D1-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit/external/org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar || die
+	ln -s "${DISTDIR}"/9039A0C1FA0E56CB56A1A192908814478FA747C5-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit.java7/external/org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar || die
+	ln -s "${DISTDIR}"/DAA45A7EE529A7532F5DC08625A5A3E81DB2D4CB-org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar || die
+	ln -s "${DISTDIR}"/F5AC8FBA216A8C52F319EC2CB455B44FFD734B38-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar || die
+	ln -s "${DISTDIR}"/B43E7CE55F0DECA3BE1A6E695A3E3ABC6D62567F-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar || die
+	ln -s "${DISTDIR}"/1B9CBEC0FCB47C279519E52D360199C24EC99B01-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar o.eclipse.mylyn.commons.repositories.core/external/org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar || die
+	ln -s "${DISTDIR}"/6B0A6E9F9179E314944E4ADB831A9D6FCADED3DC-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar || die
+	ln -s "${DISTDIR}"/B28B8EE777232102471EA5334FD70E20851845DD-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar || die
+	ln -s "${DISTDIR}"/24A15BD37950663933CC4975EE6E518BEB2C28A3-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.confluence.core/external/org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar || die
+	ln -s "${DISTDIR}"/01CD242F06F6F7E4E61C9E05ABBE07318E501D51-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar || die
+	ln -s "${DISTDIR}"/75928E4368CA748131A6767BA1A97D9DA643C306-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.textile.core/external/org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar  || die
+	ln -s "${DISTDIR}"/934DCAB9534B8FE12FD9C90759B26B6B0D442837-org.tmatesoft.svnkit_1.8.7.r10376_v20141223_2131.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.7.r10376_v20141223_2131.jar || die
+	ln -s "${DISTDIR}"/E90EF50215FFD23928B3308DC76A17B7DADE5F33-processtreekiller-1.0.5.jar extexecution.process/external/processtreekiller-1.0.5.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}"/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar o.apache.xml.resolver/external/resolver-1.2.jar || die
+	ln -s "${DISTDIR}"/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar libs.svnClientAdapter.svnkit/external/sqljet-1.1.10.jar || die
+	ln -s "${DISTDIR}"/D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-javahl-1.10.3.jar || die
+	ln -s "${DISTDIR}"/2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.10.3.jar || die
+	ln -s "${DISTDIR}"/5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.10.3.jar || die
+	ln -s "${DISTDIR}"/24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.jar libs.svnClientAdapter.javahl/external/svnjavahl-1.8.4.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}"/CE9A1C96875443F2FDD5127B750DA39CF4CE818B-com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.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}"/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar extexecution.process/external/winp-1.14-patched.jar || die
+	ln -s "${DISTDIR}"/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar o.apache.xmlrpc/external/xmlrpc-client-3.0.jar || die
+	ln -s "${DISTDIR}"/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar o.apache.xmlrpc/external/xmlrpc-common-3.0.jar || die
+	ln -s "${DISTDIR}"/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar o.apache.xmlrpc/external/xmlrpc-server-3.0.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-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 --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.51.jar
+	java-pkg_jar-from --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.7.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.8.4.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
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm com-jcraft-jsch.jar && dosym /usr/share/jsch/lib/jsch.jar ${instdir}/com-jcraft-jsch.jar || die
+	rm com-jcraft-jzlib.jar && dosym /usr/share/jzlib/lib/jzlib.jar ${instdir}/com-jcraft-jzlib.jar || die
+	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.7.jar && dosym /usr/share/jvyamlb/lib/jvyamlb.jar ${instdir}/jvyamlb-0.2.7.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 88cf923..262356c 100644
--- a/dev-java/netbeans-java/ChangeLog
+++ b/dev-java/netbeans-java/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-java-9999_p20150603 (03 Jun 2015)
+
+  03 Jun 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-java-9999_p20150603.ebuild:
+  bumped to the latest sources
+
 *netbeans-java-9999_p20150602 (02 Jun 2015)
 
   02 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index cf5c9d1..9002fa5 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -114,6 +114,7 @@ DIST netbeans-trunk-nightly-201505290001-src.zip 207640635 SHA256 2547cf1181fa33
 DIST netbeans-trunk-nightly-201505300811-src.zip 207777734 SHA256 e9b9f7d8613e07dfdc7cecbd4e323e400625985373cd226101638250c1042cc1 SHA512 2c72c85b85e7016d9863ee8033da81d26e14f2928e8dd703ec4c48b02165bb1d65ce331b66b0367cebe54bc1b233b68dbaad1705796751b1f6d87e34744de08a WHIRLPOOL 8967ee3280bbc33ff4b8e4246c31b4debf324886e0251f75330dce8c67443c5fde66d2ae7f13314abc43e8a8f577baa2a56ff69b3516cd2ece144a49525f7ecb
 DIST netbeans-trunk-nightly-201506010001-src.zip 207778965 SHA256 96bc8cca703517eeffedcffc05a6de8f917ddadf688dd16ac0b8d1848954c5cf SHA512 9fe5670c662d3c21b2594253254aa521997f6c925f2591bbd7be7be7cffc93b3cbd3d4c9ac3c6f7cede21f9dbc7ed39fed45718e47e5bac653228ab07c62dddd WHIRLPOOL 90a459da74f998f4fb70bd03b9f2d581a2c72100f1d7c52a803703b5fadc929863d11d9643cc517e22fa6b3b42d66c197595820e2299d12a5b735d5cd68d3f8e
 DIST netbeans-trunk-nightly-201506020001-src.zip 207781610 SHA256 ed7f2e851ed53dacd5e46091a091490fcf4afbac35b732335f054fc428978850 SHA512 ba5f09aadede76fd0659c3b190a3646a9b57ffda253cf24d1343bace9112c56d96bff7df158e71539a614d0d80041113da73590fe2f9bf9981cbbe9993f9ef3e WHIRLPOOL c9c938d405c92ef00d253a40723ca770aa41d401dd2de6c79652c5df949bb9a9f7c6a92ac4f3895c8d7135e0963f6779b6aff1c3f8251da2fbf9f0d348d724b3
+DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123489cf38c44213cd2de2606f71e6231ac40e6519eb8f5c71294 SHA512 59a40cd092399dc49057144b95c9d8399fd3284a69bece3ccb02e479994ef2dd55140de0d62a455538dce87b17bc10cf3e09b165109271c78af229d1b62cb074 WHIRLPOOL 5ccbd8842aab3d1e2b0141bacaed90605bed668e0f7912b0fdd8e2de091ec24a0a9264d35c536e10bc7b75f8a5c42a60832cc6a2c5dc5c98f955d908dd01886d
 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
@@ -143,5 +144,6 @@ EBUILD netbeans-java-9999_p20150529.ebuild 14590 SHA256 6b61c2a18eafb21b7523e81e
 EBUILD netbeans-java-9999_p20150530.ebuild 14590 SHA256 edd111bc21b433f78b3b9bc24819f07590de7256ab34631e4cae4f2cb34e3b25 SHA512 503453c5af8ef31505aefb31f23299b309d5555fa50a905dc3c6b16170c5e8137f66c500d4bd677df36df54adfcd2b95426e2691a4ba1841bf3ac11fc9c5a961 WHIRLPOOL 5a752736b4b6ae7f377c3f29a30168d60b256a6003102cae1203e0b85c1ba957cfbbb8547bd51e21ddb34f5e6ebd15e1f31224d4bb76b66c8b31097e3729996b
 EBUILD netbeans-java-9999_p20150601.ebuild 14590 SHA256 066382cd72ac39b6c6c1b339f0abd7145807b32aa423f21350ab51f7bdbfd83a SHA512 fc89e1757158a84ab6e557e571256da5eeb74ab11df8f91d15131269259789fa82a451708eb35c3a268da66e8901056fdcb108cc626014bdfcbe476fe08ef2d6 WHIRLPOOL 5a9e2e815ebf3248b4c2a9b9f9eaa46dd162d2f686819a1903db72b32a4ec646978d1a946add42aa129b3220f35aad0a08b2ff8c4141029b5bb8fa0fe725bf86
 EBUILD netbeans-java-9999_p20150602.ebuild 14590 SHA256 24e7f6bc16b17dedfe705d02ab7b5ceadc27dd45e47ba6d8c9180181fced3d05 SHA512 57e6b11cd41865d51ad808043a1dcfb4ab325a255081cadbed41d51d41ccc086a1548cbd97c03d9a7ccbf13651dd1c1fed98ead69fe0d77bdd13759691acaf4d WHIRLPOOL ff14de84808ab5bf135ca3250e7752e42a59942e6ceacd4ac1e06044680f72aedcacfcaf6444a99d3a8375bd4f96c9b0fb584f86e770caca7221977b7744a26e
-MISC ChangeLog 162865 SHA256 8e62d4b86b7bc5556ee89a14050f08ef06557f561b0b3e0e391ceb1b8279029c SHA512 5b24fcdec2368dfa9a43dbc3c5b2f0714b72f21df56048318666504a016bf3dbc1678c9cc713d8543416fccccebd8548a1c951930aada868b58571f83fbe8003 WHIRLPOOL 19cbf580937a55c58fbcca33fd9b617778de7e483cc09c285fb6dc5c9c8e6e84765007bdab218309123efa9bd930fc3b31c7bdd6601e2f74e8bef131f6fae033
+EBUILD netbeans-java-9999_p20150603.ebuild 14590 SHA256 26047a0c118360cd6aaa11c82ec741778f3d6b366a908dbeba0aa53fcbc3e816 SHA512 213f9307e7a20d22380dfc19257dbdeba154ba35a594c80fa9b713a367d6c634eb9b685673c3a85c608a641edf5843bceed7b0870b6eae9623222b2089334aab WHIRLPOOL 6e3eff7142313075ecf2afdd54e1cb607fbaf46e9e39ee6b4bfc2d123ef28bbf705bd0ed55a62c366b329f32fc0b879b838cf0ccb2580deee3fd5754abb6c81e
+MISC ChangeLog 163034 SHA256 1ff4e5ba7d3b1d98091ba0e0a6a25b7a64943c46163696a50fe406046c601f71 SHA512 211a2ab7635bbc60c4507ab7b80778e4740846dfdbb40897a5f7d18f51c50c492103d099e157fd9f72e06b300791e8df3c56b73c5d4f8200827c2e1752b1fb30 WHIRLPOOL 6d4ecd0789e3f4fd7b6af379d101a0d16abba2c7a116db06f1fffe099a54bfd4e6f849bbfda770a980dd397d10a290998a15da95931737d077103100cb3b8e01
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20150603.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20150603.ebuild
new file mode 100644
index 0000000..79fe8b5
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20150603.ebuild
@@ -0,0 +1,271 @@
+# Copyright 1999-2015 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/2015-06-03_00-01-56/zip/netbeans-trunk-nightly-201506030001-src.zip"
+# jarjar-1.4 contains also asm libraries
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar
+	http://hg.netbeans.org/binaries/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip
+	http://hg.netbeans.org/binaries/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar
+	http://hg.netbeans.org/binaries/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.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/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.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/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar
+	http://hg.netbeans.org/binaries/7E6F9D542174220D44E7488907BA5073D330ED18-nb-javac-impl.jar
+	http://hg.netbeans.org/binaries/CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.jar
+	http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
+	http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar
+	http://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip
+	http://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.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:3
+	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/c3p0:0
+	dev-java/commons-cli:1
+	dev-java/commons-collections:0
+	dev-java/dom4j:1
+	dev-java/fastinfoset:0
+	dev-java/glassfish-transaction-api:0
+	dev-java/javassist:3
+	dev-java/jboss-logging:0
+	dev-java/jsr67:0
+	dev-java/jsr181:0
+	dev-java/jtidy:0
+	dev-java/log4j:0
+	dev-java/mimepull:0
+	dev-java/oracle-javamail:0
+	dev-java/saaj:0
+	dev-java/slf4j-api:0
+	dev-java/slf4j-log4j12:0
+	dev-java/slf4j-simple:0
+	dev-java/stax-ex:0
+	dev-java/stax2-api: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 -Dpermit.jdk8.builds=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 ]; then
+		if [ -n "$(find /usr/share/netbeans-java-${SLOT}/ant -type l)" ]; then
+			eerror "Please remove following symlinks and run emerge again:"
+			find /usr/share/netbeans-java-${SLOT}/ant -type l
+			die_now="1"
+		fi
+	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-r14-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}"/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar j2ee.eclipselink/external/eclipselink.jar || die
+	ln -s "${DISTDIR}"/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip hibernate4lib/external/hibernate-release-4.3.1-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}"/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar maven.indexer/external/indexer-core-5.1.1-patched.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}"/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip j2ee.eclipselink/external/JPAjavadocs04032013.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}"/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
+	ln -s "${DISTDIR}"/7E6F9D542174220D44E7488907BA5073D330ED18-nb-javac-impl.jar libs.javacimpl/external/nb-javac-impl.jar || die
+	ln -s "${DISTDIR}"/CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.jar maven/external/netbeans-cos.jar || die
+	ln -s "${DISTDIR}"/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselink/external/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar || die
+	ln -s "${DISTDIR}"/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselinkmodelgen/external/org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar || die
+	ln -s "${DISTDIR}"/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip libs.springframework/external/spring-framework-3.2.7.RELEASE.zip || die
+	ln -s "${DISTDIR}"/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip libs.springframework/external/spring-framework-4.0.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-r14-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-3 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.12.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}/maven/lib
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-cli-1.2.jar && dosym /usr/share/commons-cli-1/lib/commons-cli.jar ${instdir}/commons-cli-1.2.jar || 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-3/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/hibernate4
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm antlr-2.7.7.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.7.jar || die
+	rm c3p0-0.9.2.1.jar && dosym /usr/share/c3p0/lib/c3p0.jar ${instdir}/c3p0-0.9.2.1.jar || die
+	rm cglib-2.2.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
+	rm commons-collections-3.2.1.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections-3.2.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.18.1-GA.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist-3.18.1-GA.jar || die
+	rm jboss-logging-3.1.3.GA.jar && dosym /usr/share/jboss-logging/lib/jboss-logging.jar ${instdir}/jboss-logging-3.1.3.GA.jar || die
+	rm jboss-transaction-api_1.2_spec-1.0.0.Final.jar && dosym /usr/share/glassfish-transaction-api/lib/jta.jar ${instdir}/jboss-transaction-api_1.2_spec-1.0.0.Final.jar || die
+	rm jtidy-r8-20060801.jar && dosym /usr/share/jtidy/lib/Tidy.jar ${instdir}/jtidy-r8-20060801.jar || die
+	rm log4j-1.2.12.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.12.jar || die
+	rm slf4j-api-1.6.1.jar && dosym /usr/share/slf4j-api/lib/slf4j-api.jar ${instdir}/slf4j-api-1.6.1.jar || die
+	rm slf4j-log4j12-1.6.1.jar && dosym /usr/share/slf4j-log4j12/lib/slf4j-log4j12.jar ${instdir}/slf4j-log4j12-1.6.1.jar || die
+	rm slf4j-simple-1.6.1.jar && dosym /usr/share/slf4j-simple/lib/slf4j-simple.jar ${instdir}/slf4j-simple-1.6.1.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 javax.mail_1.4.jar && dosym /usr/share/oracle-javamail/lib/mail.jar ${instdir}/javax.mail_1.4.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 stax2-api.jar && dosym /usr/share/stax2-api/lib/stax2-api.jar ${instdir}/stax2-api.jar || die
+	rm streambuffer.jar && dosym /usr/share/xmlstreambuffer/lib/xmlstreambuffer.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 1d34081..dde398b 100644
--- a/dev-java/netbeans-javacard/ChangeLog
+++ b/dev-java/netbeans-javacard/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javacard-9999_p20150603 (03 Jun 2015)
+
+  03 Jun 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-javacard-9999_p20150603.ebuild:
+  bumped to the latest sources
+
 *netbeans-javacard-9999_p20150602 (02 Jun 2015)
 
   02 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index 02b87e4..bfef976 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201505290001-src.zip 207640635 SHA256 2547cf1181fa33
 DIST netbeans-trunk-nightly-201505300811-src.zip 207777734 SHA256 e9b9f7d8613e07dfdc7cecbd4e323e400625985373cd226101638250c1042cc1 SHA512 2c72c85b85e7016d9863ee8033da81d26e14f2928e8dd703ec4c48b02165bb1d65ce331b66b0367cebe54bc1b233b68dbaad1705796751b1f6d87e34744de08a WHIRLPOOL 8967ee3280bbc33ff4b8e4246c31b4debf324886e0251f75330dce8c67443c5fde66d2ae7f13314abc43e8a8f577baa2a56ff69b3516cd2ece144a49525f7ecb
 DIST netbeans-trunk-nightly-201506010001-src.zip 207778965 SHA256 96bc8cca703517eeffedcffc05a6de8f917ddadf688dd16ac0b8d1848954c5cf SHA512 9fe5670c662d3c21b2594253254aa521997f6c925f2591bbd7be7be7cffc93b3cbd3d4c9ac3c6f7cede21f9dbc7ed39fed45718e47e5bac653228ab07c62dddd WHIRLPOOL 90a459da74f998f4fb70bd03b9f2d581a2c72100f1d7c52a803703b5fadc929863d11d9643cc517e22fa6b3b42d66c197595820e2299d12a5b735d5cd68d3f8e
 DIST netbeans-trunk-nightly-201506020001-src.zip 207781610 SHA256 ed7f2e851ed53dacd5e46091a091490fcf4afbac35b732335f054fc428978850 SHA512 ba5f09aadede76fd0659c3b190a3646a9b57ffda253cf24d1343bace9112c56d96bff7df158e71539a614d0d80041113da73590fe2f9bf9981cbbe9993f9ef3e WHIRLPOOL c9c938d405c92ef00d253a40723ca770aa41d401dd2de6c79652c5df949bb9a9f7c6a92ac4f3895c8d7135e0963f6779b6aff1c3f8251da2fbf9f0d348d724b3
+DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123489cf38c44213cd2de2606f71e6231ac40e6519eb8f5c71294 SHA512 59a40cd092399dc49057144b95c9d8399fd3284a69bece3ccb02e479994ef2dd55140de0d62a455538dce87b17bc10cf3e09b165109271c78af229d1b62cb074 WHIRLPOOL 5ccbd8842aab3d1e2b0141bacaed90605bed668e0f7912b0fdd8e2de091ec24a0a9264d35c536e10bc7b75f8a5c42a60832cc6a2c5dc5c98f955d908dd01886d
 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
@@ -63,5 +64,6 @@ EBUILD netbeans-javacard-9999_p20150529.ebuild 4982 SHA256 7ed88de020947665c5793
 EBUILD netbeans-javacard-9999_p20150530.ebuild 4982 SHA256 d70c3061848985e6d3e2a150d98dd548402f85dfb1f4d9ef357c4050e95f2094 SHA512 fb4bc534e9c9fb73706284e32685733e1cbd2504a962d3d56562f7b238e729bfdbb1baab054e13ab646cdaf74f97d979ba964d201da3af75685fe5ef9571f5ff WHIRLPOOL ed7963e64d2864832e579215e4ee496d4cab94ab2c266aa212d36818b3bc1fe28760fdfeef200ec7f9b61c0c15df379ba3dd4cb876403067120fb41d50acb592
 EBUILD netbeans-javacard-9999_p20150601.ebuild 4982 SHA256 66f8d215ecbef16358f0b87d22490044c04aa9b6263b5e77e5c4bfdcf62138d4 SHA512 5c09f8d8caefe8a6465d9cede685afe3de09122442a6d43bb3fe7ac130d54cc1d238ffe0ad2bfe17223670fe91abf76e35cf81cf063a50a5669c9d16707a9fbb WHIRLPOOL 4695c1e9ef26a1501b682e80b574be0524a86730664dfec0073bc322cc983a5861e333db0f569fc1ca90836ad26efd5bae97367189a0e6824c7fd343071f061e
 EBUILD netbeans-javacard-9999_p20150602.ebuild 4982 SHA256 041c83a674a0058109814847236c229f5b64feb2b2ee44503dc1b6a5a078eac1 SHA512 7a15b93fc514a7c926dec90d3b5ee05bf873187c08614d2fe5f4c1135583b89efdaecd1c118953dc8f64010e43247e63bdd88ddd05189a9f697a800f4be1b07e WHIRLPOOL e3abced37d933696c2b8af7f67d538b431ecefd1d071df3da4e931415fe3a2c669dd718ec9c9cb32067331d8867f717109a409991deaf8936cc517886b05e949
-MISC ChangeLog 169801 SHA256 3e1f91152075933a8642871c17a4aaa3151f126f0471a287fcbbd6ec1fb0c419 SHA512 83abbec1f10059458a59f740f45343e61f0fc5aaca4978baf6c6f039225c4aac468418e8d4c26c083ac9fc0f4a40916c63af0a37bd946d7e6dd3f25958f3c1fb WHIRLPOOL d9e78492d4ba0b235afe63bcf4b0eeed5a061de2e410f1cbfb9946541159bbf26b63ac15449cd073687a2540b390f96cf28bdc254cd372ab6207ed04c21e64ea
+EBUILD netbeans-javacard-9999_p20150603.ebuild 4982 SHA256 6ee39d39fe18b37fc6e03b2834cff46d82390b1499a81d8595aecf1eb83fcb33 SHA512 d59c64b42607f77fa52cfc46766c07eb37a6a87697c43074eb99b348df220fa55ae9b9422f046f1a870863dfdff7d5df046175c5073c658a772302a879b71bb7 WHIRLPOOL 7652b33df2763ac08d93bf5c8ca132d329c6ea2103bd9940ce9b6015c347a79b7e13d5e6855c9c6575a3aa24dbe8c5150956754a4de48d8000ecd455c04dd52b
+MISC ChangeLog 169978 SHA256 728e208c8be344d4e02b7355a7dfbc545f83cca9bb6efefd1ec7c211bda7fa4d SHA512 666468941c372a77ba88276f1a67b2a06d56ae66885d5767fac7038603fb73d45339f5c7c8d9b558885be725fe65f2ca6716983e8d546e9bb1033da2e901f67b WHIRLPOOL 28979576b7535df574d6721b91359d4040e0aaba1dbfca84e04eec91f7dc4183acf7184ec44a78abaa59993ea7a340158df9323ef706525b31f01c24abc1513b
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150603.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150603.ebuild
new file mode 100644
index 0000000..46f5b32
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150603.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2015 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/2015-06-03_00-01-56/zip/netbeans-trunk-nightly-201506030001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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 -Dpermit.jdk8.builds=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-r14-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-r14-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 2efd311..3c0525a 100644
--- a/dev-java/netbeans-javadoc/ChangeLog
+++ b/dev-java/netbeans-javadoc/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javadoc-9999_p20150603 (03 Jun 2015)
+
+  03 Jun 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-javadoc-9999_p20150603.ebuild:
+  bumped to the latest sources
+
 *netbeans-javadoc-9999_p20150602 (02 Jun 2015)
 
   02 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index 71f61ca..ec3da04 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201505290001-src.zip 207640635 SHA256 2547cf1181fa33
 DIST netbeans-trunk-nightly-201505300811-src.zip 207777734 SHA256 e9b9f7d8613e07dfdc7cecbd4e323e400625985373cd226101638250c1042cc1 SHA512 2c72c85b85e7016d9863ee8033da81d26e14f2928e8dd703ec4c48b02165bb1d65ce331b66b0367cebe54bc1b233b68dbaad1705796751b1f6d87e34744de08a WHIRLPOOL 8967ee3280bbc33ff4b8e4246c31b4debf324886e0251f75330dce8c67443c5fde66d2ae7f13314abc43e8a8f577baa2a56ff69b3516cd2ece144a49525f7ecb
 DIST netbeans-trunk-nightly-201506010001-src.zip 207778965 SHA256 96bc8cca703517eeffedcffc05a6de8f917ddadf688dd16ac0b8d1848954c5cf SHA512 9fe5670c662d3c21b2594253254aa521997f6c925f2591bbd7be7be7cffc93b3cbd3d4c9ac3c6f7cede21f9dbc7ed39fed45718e47e5bac653228ab07c62dddd WHIRLPOOL 90a459da74f998f4fb70bd03b9f2d581a2c72100f1d7c52a803703b5fadc929863d11d9643cc517e22fa6b3b42d66c197595820e2299d12a5b735d5cd68d3f8e
 DIST netbeans-trunk-nightly-201506020001-src.zip 207781610 SHA256 ed7f2e851ed53dacd5e46091a091490fcf4afbac35b732335f054fc428978850 SHA512 ba5f09aadede76fd0659c3b190a3646a9b57ffda253cf24d1343bace9112c56d96bff7df158e71539a614d0d80041113da73590fe2f9bf9981cbbe9993f9ef3e WHIRLPOOL c9c938d405c92ef00d253a40723ca770aa41d401dd2de6c79652c5df949bb9a9f7c6a92ac4f3895c8d7135e0963f6779b6aff1c3f8251da2fbf9f0d348d724b3
+DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123489cf38c44213cd2de2606f71e6231ac40e6519eb8f5c71294 SHA512 59a40cd092399dc49057144b95c9d8399fd3284a69bece3ccb02e479994ef2dd55140de0d62a455538dce87b17bc10cf3e09b165109271c78af229d1b62cb074 WHIRLPOOL 5ccbd8842aab3d1e2b0141bacaed90605bed668e0f7912b0fdd8e2de091ec24a0a9264d35c536e10bc7b75f8a5c42a60832cc6a2c5dc5c98f955d908dd01886d
 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
@@ -66,5 +67,6 @@ EBUILD netbeans-javadoc-9999_p20150529.ebuild 6234 SHA256 dc23e71f11df005115e9fe
 EBUILD netbeans-javadoc-9999_p20150530.ebuild 6234 SHA256 294d5f7ff8e641aa69a3811af1423fefc8e7add6db9f90ac7a832055b76239c3 SHA512 2c20255059fd6efd7610f8a26e64a42c94d62b5ccd3e3014452974af8e350e9921d7fe1252d70a1f73c1ac846c9794eb66c9c9ba137efbbce48b0d3d519c7889 WHIRLPOOL 3c6b2884dc89a6a31c422dac79773564c3ffbf8e362a321686d9957d6776f3db719f042c893c552ab2cc6cf86ff38b3717f72b0777d1de9d5714da03d6ffc339
 EBUILD netbeans-javadoc-9999_p20150601.ebuild 6234 SHA256 6986033fdb91b373c57ac90b1b8128a413ce105ec5527088619bd089271e8c84 SHA512 e75c04098838235118f061cef4683f8cc133dbbdd561a50bb2b0659900914196d16a4a02caf7089887e91038ead21583094d71131ff3d152871d595c4a399a90 WHIRLPOOL c0c541f98030352f50d28d3a01bb9d3d43167a935d8d747cc94f7ecc922b368b42f3382710c2a06bd8a4e4fc50e96b9a2e9d630926da2161dccf559c7a58f216
 EBUILD netbeans-javadoc-9999_p20150602.ebuild 6234 SHA256 59a9132cb267091b084941817518bc49d963db3957e4c9c9626d1b64fcbc771f SHA512 cbe7934f8448dd80b897f824495cc5ecaa8eda657f7a7384de52d61c9d22bb091c1fabf09fc31b77b656cdab5bee2797d03833e2d39694cb6209489e1fc5260c WHIRLPOOL 85ab1597a451918a1145b2cdbbe7eb2fc11e2710cf9b8233e455ae462a562a1b450fd10ae8a55674c9fd104d2ca518d035e71fb937b224ccf6b65a539c1c2857
-MISC ChangeLog 167509 SHA256 f56f1cdab8c4d26206ccc5124dfed0289279951a76dde17c1de81f06ea0dc21b SHA512 3689fc053256ec06ed579f30ace2dbd92ca47adbd4cc591a90abb5caf80b34bd0197482da6b2684b332224149d8894ff9abd98db92dc4c2e628f7bfbd6836293 WHIRLPOOL fa250baee9c77ce1fb005c990800ffb86fbfaa6094ee0fbfd7b1cfb6b945d25faac3cf6a644549e7c1a6e6a11ee9e7f747707cbbb3570ced3b048c42d9a6c1b9
+EBUILD netbeans-javadoc-9999_p20150603.ebuild 6234 SHA256 62f387d00d3696c71c0d7d68ad4cb957ee186d8c43cbf9c718cf2de5995e8faf SHA512 8823be10c119958fb0007f8f751824441fbb811dfd381049ac579eaae68d89b7fb927924204319c4289a09f96899e9482f878931e23e86c525f88f574d1372f1 WHIRLPOOL 9cdd46658ddc130c57ec6357389378742489361f6f7dda410e7e55392934480c1ecbecec77fe56e66289f1f29aa3c7724d3d2d7cce66a7970ec466a870108e66
+MISC ChangeLog 167684 SHA256 fd5cf66b6bf67b7219b55cb6cb35328d1ffedba4b6f72686d04ac22f6167fbe6 SHA512 60fe813a6348a2e3cb028977121a88398bb19195c24e91c36fc655ff0fbaf0dc853e77d91df8a848ee509cdf0bc38685583c0ffc0f4141ebac5ccea75d496079 WHIRLPOOL 926415a56dbb7e30700713f16493cf4f3f8cffd8599e6ce07630fa06555f2c1696230f9a80f6508573192203fc22f7803a60d17a9e7912e8421f1337846bd2d0
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150603.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150603.ebuild
new file mode 100644
index 0000000..ad234a0
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150603.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2015 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/2015-06-03_00-01-56/zip/netbeans-trunk-nightly-201506030001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+# oracle-jdk-bin is needed because other jdks do not contain jre/lib/ext/jfxrt.jar
+DEPEND="dev-java/oracle-jdk-bin: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"
+JAVA_PKG_WANT_BUILD_VM="oracle-jdk-bin-1.7"
+JAVA_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip o.apache.tools.ant.module/external/ant-libs-1.9.4.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-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.12.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 b1ca828..5b6b013 100644
--- a/dev-java/netbeans-javafx/ChangeLog
+++ b/dev-java/netbeans-javafx/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-javafx-9999_p20150603 (03 Jun 2015)
+
+  03 Jun 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-javafx-9999_p20150603.ebuild:
+  bumped to the latest sources
+
 *netbeans-javafx-9999_p20150602 (02 Jun 2015)
 
   02 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index 54d6c56..bfba211 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201505290001-src.zip 207640635 SHA256 2547cf1181fa33
 DIST netbeans-trunk-nightly-201505300811-src.zip 207777734 SHA256 e9b9f7d8613e07dfdc7cecbd4e323e400625985373cd226101638250c1042cc1 SHA512 2c72c85b85e7016d9863ee8033da81d26e14f2928e8dd703ec4c48b02165bb1d65ce331b66b0367cebe54bc1b233b68dbaad1705796751b1f6d87e34744de08a WHIRLPOOL 8967ee3280bbc33ff4b8e4246c31b4debf324886e0251f75330dce8c67443c5fde66d2ae7f13314abc43e8a8f577baa2a56ff69b3516cd2ece144a49525f7ecb
 DIST netbeans-trunk-nightly-201506010001-src.zip 207778965 SHA256 96bc8cca703517eeffedcffc05a6de8f917ddadf688dd16ac0b8d1848954c5cf SHA512 9fe5670c662d3c21b2594253254aa521997f6c925f2591bbd7be7be7cffc93b3cbd3d4c9ac3c6f7cede21f9dbc7ed39fed45718e47e5bac653228ab07c62dddd WHIRLPOOL 90a459da74f998f4fb70bd03b9f2d581a2c72100f1d7c52a803703b5fadc929863d11d9643cc517e22fa6b3b42d66c197595820e2299d12a5b735d5cd68d3f8e
 DIST netbeans-trunk-nightly-201506020001-src.zip 207781610 SHA256 ed7f2e851ed53dacd5e46091a091490fcf4afbac35b732335f054fc428978850 SHA512 ba5f09aadede76fd0659c3b190a3646a9b57ffda253cf24d1343bace9112c56d96bff7df158e71539a614d0d80041113da73590fe2f9bf9981cbbe9993f9ef3e WHIRLPOOL c9c938d405c92ef00d253a40723ca770aa41d401dd2de6c79652c5df949bb9a9f7c6a92ac4f3895c8d7135e0963f6779b6aff1c3f8251da2fbf9f0d348d724b3
+DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123489cf38c44213cd2de2606f71e6231ac40e6519eb8f5c71294 SHA512 59a40cd092399dc49057144b95c9d8399fd3284a69bece3ccb02e479994ef2dd55140de0d62a455538dce87b17bc10cf3e09b165109271c78af229d1b62cb074 WHIRLPOOL 5ccbd8842aab3d1e2b0141bacaed90605bed668e0f7912b0fdd8e2de091ec24a0a9264d35c536e10bc7b75f8a5c42a60832cc6a2c5dc5c98f955d908dd01886d
 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
@@ -65,5 +66,6 @@ EBUILD netbeans-javafx-9999_p20150529.ebuild 4723 SHA256 8ea7c1d1285e06a34bb9801
 EBUILD netbeans-javafx-9999_p20150530.ebuild 4723 SHA256 c099d417028e8e051877a2757b6eafcc1efa8c3ffeda4f40c143c4ea8a761c41 SHA512 d4d00a4b5d9e48919c71de955100dc12877627d73494fd0695cbe893294dc27895317d74bd266677f823d9fca8292d1b0b04b4d5c3285d2dfa2f2baf20154f6f WHIRLPOOL 6eb9a047e940777369ab800d25f1bca5c1e6859c3bae22e5d0704428eecd90eed7f1feacf9f16fd045162439225e3fa988caf788f97c9fabdea48d4331d6a63f
 EBUILD netbeans-javafx-9999_p20150601.ebuild 4723 SHA256 e19d173c00f127c2fcf5dc2fba97c976dba2e0175e7567f29e3e0222439f6184 SHA512 5c99aeeaef9019ac8cbadbd06e0f59aa5cb0de81bc5478b537cbfc83787b94e882d6d66f9e79b3c7a5662017167672450b14757728f0a04973e3c613bce916e1 WHIRLPOOL 49a4db1b7ed7599e438d5f058f3808f46e6afcfc4357d4ea3a51636a8ff0d75c576bf35823c253e5242b6d00f51d591ab2b03f0736a97400c62f749a052c689d
 EBUILD netbeans-javafx-9999_p20150602.ebuild 4723 SHA256 ac25af74b95164fd3172b7981be0b8359f0bdaeb3576e38545d01e87397c3046 SHA512 8b22e0ce9b56df108e5562e8a590a939413c7a593282130a2909794c1d203a52b09a691409a66c21603de203b940217e9cc75ca67014d868c5dc2a554b92cd72 WHIRLPOOL 306ddefed4850d5f94983458c68ecfb1f0fd30a8691bc446262409382706cf0d124ad0f0fa7d937e4748a44c7ca62afe8631b3121b35fda6fa03e150dbae751e
-MISC ChangeLog 152084 SHA256 166cef9120265fc5f50e33f2bb5f1281c3b5672d6680d6c007b2a27714e31864 SHA512 d2578cd88a37c8b7042190832b4b11fa46a636288e3765f988a275a276472013abcb9570fa616f1f7bbe1dbf67b4b1e7733f418f7e971bfe6c65822a21a9842d WHIRLPOOL 28bf10f487bca5859af17c6131d215c536be34611c191302fca455da2484ba5bc57fd51e45b41121990c25d91bd5ac7e1bb9a19bf56760e526c1026ef2f401a4
+EBUILD netbeans-javafx-9999_p20150603.ebuild 4723 SHA256 f8609e52f1a824ca2e7d4719e9835cfd5f5a1b5f4ae3af3ce1450251ca0caa89 SHA512 00495abdd9bbf0cc4ce3d179d91e51bda594a9ceb76c14ed008c6f6453fb120ed6a5b5d551abf79b9dbd889d45f26c11292d78b7d4fd75e4a17f775866ceeabf WHIRLPOOL deac0e0f9085e9f66b1cbbe3c4907d028a5e540e8b2f87e9f8442af497a06762a4fd17e8521e66098a0abbf5ebee26246cc107b2741995e0b74b81179b17c7dc
+MISC ChangeLog 152257 SHA256 cac804c80ec018fb4dce48661e20dd32452340c03ca2867720a328770c2c7965 SHA512 c0cfdacde58665a263995c8d8ff52fc796a04c5c9fe4c1d37a8b33eed74379a85925cbbe2035095ccd41dba2c0ae0bda023228e2888b26eeb4c2f4830faa9615 WHIRLPOOL 92d4c8fac992e76a799bcd4d90d0cfdba97c891b489c2aa665e78fcd8998bf0fcc843dfd89d1d2ef2dde67b5a38d4b580191452687490b63a73800da4308e4dd
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150603.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150603.ebuild
new file mode 100644
index 0000000..9effe60
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150603.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2015 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/2015-06-03_00-01-56/zip/netbeans-trunk-nightly-201506030001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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/B2EB2006BCDB022420BDB4C2D596564539C65699-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 -Dpermit.jdk8.builds=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-r14-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}"/B2EB2006BCDB022420BDB4C2D596564539C65699-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-r14-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.12.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 2b0df45..15cd9d5 100644
--- a/dev-java/netbeans-mobility/ChangeLog
+++ b/dev-java/netbeans-mobility/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-mobility-9999_p20150603 (03 Jun 2015)
+
+  03 Jun 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-mobility-9999_p20150603.ebuild:
+  bumped to the latest sources
+
 *netbeans-mobility-9999_p20150602 (02 Jun 2015)
 
   02 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 0f6d29c..ae683b7 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -42,6 +42,7 @@ DIST netbeans-trunk-nightly-201505290001-src.zip 207640635 SHA256 2547cf1181fa33
 DIST netbeans-trunk-nightly-201505300811-src.zip 207777734 SHA256 e9b9f7d8613e07dfdc7cecbd4e323e400625985373cd226101638250c1042cc1 SHA512 2c72c85b85e7016d9863ee8033da81d26e14f2928e8dd703ec4c48b02165bb1d65ce331b66b0367cebe54bc1b233b68dbaad1705796751b1f6d87e34744de08a WHIRLPOOL 8967ee3280bbc33ff4b8e4246c31b4debf324886e0251f75330dce8c67443c5fde66d2ae7f13314abc43e8a8f577baa2a56ff69b3516cd2ece144a49525f7ecb
 DIST netbeans-trunk-nightly-201506010001-src.zip 207778965 SHA256 96bc8cca703517eeffedcffc05a6de8f917ddadf688dd16ac0b8d1848954c5cf SHA512 9fe5670c662d3c21b2594253254aa521997f6c925f2591bbd7be7be7cffc93b3cbd3d4c9ac3c6f7cede21f9dbc7ed39fed45718e47e5bac653228ab07c62dddd WHIRLPOOL 90a459da74f998f4fb70bd03b9f2d581a2c72100f1d7c52a803703b5fadc929863d11d9643cc517e22fa6b3b42d66c197595820e2299d12a5b735d5cd68d3f8e
 DIST netbeans-trunk-nightly-201506020001-src.zip 207781610 SHA256 ed7f2e851ed53dacd5e46091a091490fcf4afbac35b732335f054fc428978850 SHA512 ba5f09aadede76fd0659c3b190a3646a9b57ffda253cf24d1343bace9112c56d96bff7df158e71539a614d0d80041113da73590fe2f9bf9981cbbe9993f9ef3e WHIRLPOOL c9c938d405c92ef00d253a40723ca770aa41d401dd2de6c79652c5df949bb9a9f7c6a92ac4f3895c8d7135e0963f6779b6aff1c3f8251da2fbf9f0d348d724b3
+DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123489cf38c44213cd2de2606f71e6231ac40e6519eb8f5c71294 SHA512 59a40cd092399dc49057144b95c9d8399fd3284a69bece3ccb02e479994ef2dd55140de0d62a455538dce87b17bc10cf3e09b165109271c78af229d1b62cb074 WHIRLPOOL 5ccbd8842aab3d1e2b0141bacaed90605bed668e0f7912b0fdd8e2de091ec24a0a9264d35c536e10bc7b75f8a5c42a60832cc6a2c5dc5c98f955d908dd01886d
 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
@@ -69,5 +70,6 @@ EBUILD netbeans-mobility-9999_p20150529.ebuild 4418 SHA256 7ea367c73b8543d4cbfbd
 EBUILD netbeans-mobility-9999_p20150530.ebuild 4418 SHA256 4f50491e714eb896bd15e4fd7953d77d4d9d90a40f4471b8d41a21abff7c7ddc SHA512 baac30aca3d954fa42324fa048e41dec129b22d8af1ab1b61e6bbd596e0c42f84472f1b5d04d9c54d00e45e0862f101701724150f21dc86d3a70aec28a29799a WHIRLPOOL 513c89bfa9238693e00ad826029fe6d1368f4179b7abf1c25f498bd39b4aedb02b7cf8a26a036a7668cf3344dac56a2b75b3cd0cf4f5de1058416d9bac783368
 EBUILD netbeans-mobility-9999_p20150601.ebuild 4418 SHA256 db644a8daa422ac5ba4a1a4f93db4122f147161b1f5740d2d6b3066d4157f23c SHA512 3f004dd19ff1ef966f280262c4aaf069e3071799de113e9d1775d1aabc75a63a17a3bd1cdfe58a530013760949c4ee802d0ed47fe16c2fa345ed0418ac5992da WHIRLPOOL df49f3e02cd41a1f49fec45137ab23eb7151b4625621a83927946d0fa5bb0d31540b7be6a309f913b0d839198a1d75bda06e949aa6d4e813cdf69f281ce8b5ca
 EBUILD netbeans-mobility-9999_p20150602.ebuild 4418 SHA256 e5cd2d087dcb85ea967a5358bd76d94ad1a1df9804a664b154084db9febf9f46 SHA512 6daa7c386bb7e4bfbe25d11427cc46df7d262ed20d1845d49475ecd8fc786b9e97b5c80953051ca5ad8e9423be89c3c7285e3c50506333bd892c9d87a09b1c33 WHIRLPOOL 3e2572b1bd3ffc2706038fcce1fdbfdd193c56171f3699068b494d651c2a72b30b1d955b0107bcb7cfb501ad0c7de085e0856a1b16eae314a8a9f8154c513389
-MISC ChangeLog 169942 SHA256 68dab2e0161c6fd2889873aa01f5b910fbe6008aedc61e83d38d4aa0780270a4 SHA512 722f87bd9d1092b72c7f8da12b461cb395021d1cd82f67379e54637f7689673a5003a39a10053ebe484f259f9f48168e3ca8feddd5b340b0dc655c721367f354 WHIRLPOOL 4634675d90995205cf3f5d3db6fd81d39c6c1dad28944f627a1c36a5d082f0a5cb7f9425c91372ca17fd2bda46002fff58fc7d6ea08eabe4194e8d71f9c69d30
+EBUILD netbeans-mobility-9999_p20150603.ebuild 4418 SHA256 a8867b930129feed269ee91974828350f5413d93a1820d7169eab7fa298dc0df SHA512 2cbdd21c16c454c25b9b16651160dc9149759ad6e3aac84a8e7345cecd2cfa508b7063788f6a7d72c1b9f30a3945c3d53f75c9cf49436a84e5b873cec2aac4ba WHIRLPOOL 85c438ba7128429178ece97ba437766b7d7993e16398264ce3215aaae18da801a29c8f1ffd33135e5cbd2431a4a5eb7f5f065d1f236833519a6d4405f0599641
+MISC ChangeLog 170119 SHA256 af7bb9901dc1e0eb81969685ea7e0bd280f67660145a31bc73e7f8b33b1c53a5 SHA512 8805b8a1ad6a82daae7eab343b9739e188d45f4631ce0d109c87d319f2cfb3d3c5066ec3892140386f3703ca557164de5c25c18c7680ad85f3fba9b3e52c3520 WHIRLPOOL 5e4efc8b2dacd3c151eead29fc343c5f2b76c7ede07eee988fc6f2cea9b4ee36d25e16cd5f2c607c77ccfb5c5cc6b6d424dfde8f2c75d84e3d3a333f91bd9471
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150603.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150603.ebuild
new file mode 100644
index 0000000..5fbc4a2
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150603.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2015 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/2015-06-03_00-01-56/zip/netbeans-trunk-nightly-201506030001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2"
+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}"
+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 -Dpermit.jdk8.builds=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-r14-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-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-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
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/mobility
+}

diff --git a/dev-java/netbeans-nb/ChangeLog b/dev-java/netbeans-nb/ChangeLog
index 849c036..646a0cb 100644
--- a/dev-java/netbeans-nb/ChangeLog
+++ b/dev-java/netbeans-nb/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-nb-9999_p20150603 (03 Jun 2015)
+
+  03 Jun 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-nb-9999_p20150603.ebuild:
+  bumped to the latest sources
+
 *netbeans-nb-9999_p20150602 (02 Jun 2015)
 
   02 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index 8c2fac5..9c75bca 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -41,6 +41,7 @@ DIST netbeans-trunk-nightly-201505290001-src.zip 207640635 SHA256 2547cf1181fa33
 DIST netbeans-trunk-nightly-201505300811-src.zip 207777734 SHA256 e9b9f7d8613e07dfdc7cecbd4e323e400625985373cd226101638250c1042cc1 SHA512 2c72c85b85e7016d9863ee8033da81d26e14f2928e8dd703ec4c48b02165bb1d65ce331b66b0367cebe54bc1b233b68dbaad1705796751b1f6d87e34744de08a WHIRLPOOL 8967ee3280bbc33ff4b8e4246c31b4debf324886e0251f75330dce8c67443c5fde66d2ae7f13314abc43e8a8f577baa2a56ff69b3516cd2ece144a49525f7ecb
 DIST netbeans-trunk-nightly-201506010001-src.zip 207778965 SHA256 96bc8cca703517eeffedcffc05a6de8f917ddadf688dd16ac0b8d1848954c5cf SHA512 9fe5670c662d3c21b2594253254aa521997f6c925f2591bbd7be7be7cffc93b3cbd3d4c9ac3c6f7cede21f9dbc7ed39fed45718e47e5bac653228ab07c62dddd WHIRLPOOL 90a459da74f998f4fb70bd03b9f2d581a2c72100f1d7c52a803703b5fadc929863d11d9643cc517e22fa6b3b42d66c197595820e2299d12a5b735d5cd68d3f8e
 DIST netbeans-trunk-nightly-201506020001-src.zip 207781610 SHA256 ed7f2e851ed53dacd5e46091a091490fcf4afbac35b732335f054fc428978850 SHA512 ba5f09aadede76fd0659c3b190a3646a9b57ffda253cf24d1343bace9112c56d96bff7df158e71539a614d0d80041113da73590fe2f9bf9981cbbe9993f9ef3e WHIRLPOOL c9c938d405c92ef00d253a40723ca770aa41d401dd2de6c79652c5df949bb9a9f7c6a92ac4f3895c8d7135e0963f6779b6aff1c3f8251da2fbf9f0d348d724b3
+DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123489cf38c44213cd2de2606f71e6231ac40e6519eb8f5c71294 SHA512 59a40cd092399dc49057144b95c9d8399fd3284a69bece3ccb02e479994ef2dd55140de0d62a455538dce87b17bc10cf3e09b165109271c78af229d1b62cb074 WHIRLPOOL 5ccbd8842aab3d1e2b0141bacaed90605bed668e0f7912b0fdd8e2de091ec24a0a9264d35c536e10bc7b75f8a5c42a60832cc6a2c5dc5c98f955d908dd01886d
 EBUILD netbeans-nb-7.0.1.ebuild 5106 SHA256 3c68751bf5face5f80e2d7dcedb7466e69343f2d06c0a4dd30a722a987fbb207 SHA512 d79343e0ca8655b074a8f96b9898e4bc0123d60e346602ba8d7a239597993cadb33a036b43862ef1a39630e4f0ba7e79892d8b2eed8b30535f12a5d0b9f4b581 WHIRLPOOL 9f2cd645e34fbcfa8f0059fbda4f355f411aaff7966121360dfe5b3c769966c5a4586bbc04142b279e3a3fa323bc4b51a6349cf3eafe89063db44fcae58ef119
 EBUILD netbeans-nb-7.1.2.ebuild 4977 SHA256 265f9e4a9490937a65632ddaef48e3a731154b07b9ee5f9536a991181fc2fcbd SHA512 65d1065993dba3b1fece428beb1b75f17d89eddb08aacd2cbf5ecd3ee5ca844e75e9100c324ecdeeed5b138b1da4ab8cd5a4598e584a17545ffc2c52ea763779 WHIRLPOOL 9b63f2b5671bd38d24ff6b280de37fc19c74170bf80c22818da5e8af415a85211c6cfcf690e68d7697c41a1b749a3c7b48ec9b362782df140856f892d381e360
 EBUILD netbeans-nb-7.2.ebuild 4960 SHA256 bef2020a6e0d722ca77c0931b9a06014cedc822f14a21d8d916200e358dcdfb8 SHA512 988d902bbef52e123b5800e56049210d69c4dd6dbeca80396aeac58c70d90b76da65b338e664368ea3f9a3973b7b94ffd0a47a77b01be53452c2cc04c4067442 WHIRLPOOL a27fa8a1a066499a3fc2cb82e955b6b18b1725889b088ea1e94528cde3ec58f3b46c1e757fa597af6ad4ba96218dacfacff9561799f46add316e233d46127d28
@@ -68,5 +69,6 @@ EBUILD netbeans-nb-9999_p20150529.ebuild 5003 SHA256 fd86b367283d9150d2d061f1bec
 EBUILD netbeans-nb-9999_p20150530.ebuild 5003 SHA256 e070aa78b4cceebf1e46ef5c830edfe5a90ff5f04cd87f9cca162cfee3bae420 SHA512 c674ab80427811284b83125deee0c21d4ec679163eb9b6c35f2871da291f2f8d8e59c2df63c1e5e4faf93fb76e242f8fb87c2941e6e24b39201e2703e1cb83ee WHIRLPOOL 05ab5a6bd0d3fe152cb985cc932571e995d1c1228e3207be3db1735fe68b28229f5a603cfad4aaf5a3dcd1177e46a6525c5cfceb5d9dfc3db3c42ae7835611d5
 EBUILD netbeans-nb-9999_p20150601.ebuild 5003 SHA256 4f7e5314d52a37644806e28ca09750c4aa30059333bc9c41fa5dc580f1f8c0c9 SHA512 910893f3c80282db9cb6e307c0143ee4fddecf7b9726632a95acb3eb8c889c7b6f821f7e438748563ee4d0d7e2085812c59e7b2ff327c7f5d1d9f3f4a2be1b57 WHIRLPOOL ec572cfcb5d304f3178be3226a6636ee3616f341ade1c4ca8fdc94cc7e33e8c74fbb0d4ecd2346a89e13194c35079d60ce514ead95a6f9a0196cac223ca1557e
 EBUILD netbeans-nb-9999_p20150602.ebuild 5003 SHA256 585a35d212e77d0813c60b678974db1e55d8d98244e79ac5794a53b1604fce30 SHA512 ca0f80bca3d619e202d7aef224382aa9ebaf545dfc0609666961a95fcfbaa4b8335bde44d2bc5beaf6d773e444ab65811ce35860cb2b19bb4fe2e9f9cd25fe22 WHIRLPOOL 9b749aeab52b56e1b80f99d5a94cbb0f7bf57336a20125fd057da547bbecd9b2b17e64902fb0f8de67179cc31ea5f3adc9504c4d55fef2bec416c58ea79f70a5
-MISC ChangeLog 158724 SHA256 b364a93d7cd6cc74b894671780267876d03a58f070eba969a1e940ffee9d07a6 SHA512 0c1168045f2c0587f3db685640791c6e9261f43e1c560097c2ab47bfbbb54c242fe848835775c255671b45bd48d6ba845d998782da20e4f1103efabde7b1f770 WHIRLPOOL 1c288eb8b12596ffa16b975c4ae9a207d1e1f2838c76f720d88ff896283cb01d75279195ef0683b0d5e72c972a8039d5d5674edaad27ef5f94807a41adf04f6e
+EBUILD netbeans-nb-9999_p20150603.ebuild 5003 SHA256 fd6f9a1c75356ee0e8dccdc8b948ba82387299f96a322debebd5dc76dabc1c11 SHA512 fafe8d854e5fb35420c9b875be4e768159307c4f6c2a2b795cfd1989113c5fc45d27ed0783dc7e1d606f549964dfea3a44e284f8a26031c180c7fafcb597c732 WHIRLPOOL 1e6850f2921576b7eff35f1254ac3679df2bba134f598e3133d680e863555cb6a816f80f1fb96dabf12a2fe1a8feaf7eb42be1491ccc978d4f767d424f528fb4
+MISC ChangeLog 158889 SHA256 49c30096d3643dda8e45f96e3ed981b10db00fa65b192751a7f527c5bcfc0d91 SHA512 7a2cb5bb0fddad7f51a38ee306b2301e6f8f17e6126e4a41454728ee4e7e54eef93c3a910b13171496f259ba3758952ee5fccdeb2106d8c82d71b1ef12e25cf0 WHIRLPOOL 497d61c687291daa1cab1335f92a53a852827521281bfa939815b982101cead5f71764b0185a4605addd7a73a18eb304396ef8640bb800ddfa7085cb80e6fb33
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20150603.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20150603.ebuild
new file mode 100644
index 0000000..bde8295
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20150603.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2015 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/2015-06-03_00-01-56/zip/netbeans-trunk-nightly-201506030001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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 -Dpermit.jdk8.builds=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-r14-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-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 https://wiki.gentoo.org/wiki/Keychain"
+	fi
+}

diff --git a/dev-java/netbeans-php/ChangeLog b/dev-java/netbeans-php/ChangeLog
index 36cc7fb..a7e5f2b 100644
--- a/dev-java/netbeans-php/ChangeLog
+++ b/dev-java/netbeans-php/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-php-9999_p20150603 (03 Jun 2015)
+
+  03 Jun 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-php-9999_p20150603.ebuild:
+  bumped to the latest sources
+
 *netbeans-php-9999_p20150602 (02 Jun 2015)
 
   02 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index f9365f9..24b97ce 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -46,6 +46,7 @@ DIST netbeans-trunk-nightly-201505290001-src.zip 207640635 SHA256 2547cf1181fa33
 DIST netbeans-trunk-nightly-201505300811-src.zip 207777734 SHA256 e9b9f7d8613e07dfdc7cecbd4e323e400625985373cd226101638250c1042cc1 SHA512 2c72c85b85e7016d9863ee8033da81d26e14f2928e8dd703ec4c48b02165bb1d65ce331b66b0367cebe54bc1b233b68dbaad1705796751b1f6d87e34744de08a WHIRLPOOL 8967ee3280bbc33ff4b8e4246c31b4debf324886e0251f75330dce8c67443c5fde66d2ae7f13314abc43e8a8f577baa2a56ff69b3516cd2ece144a49525f7ecb
 DIST netbeans-trunk-nightly-201506010001-src.zip 207778965 SHA256 96bc8cca703517eeffedcffc05a6de8f917ddadf688dd16ac0b8d1848954c5cf SHA512 9fe5670c662d3c21b2594253254aa521997f6c925f2591bbd7be7be7cffc93b3cbd3d4c9ac3c6f7cede21f9dbc7ed39fed45718e47e5bac653228ab07c62dddd WHIRLPOOL 90a459da74f998f4fb70bd03b9f2d581a2c72100f1d7c52a803703b5fadc929863d11d9643cc517e22fa6b3b42d66c197595820e2299d12a5b735d5cd68d3f8e
 DIST netbeans-trunk-nightly-201506020001-src.zip 207781610 SHA256 ed7f2e851ed53dacd5e46091a091490fcf4afbac35b732335f054fc428978850 SHA512 ba5f09aadede76fd0659c3b190a3646a9b57ffda253cf24d1343bace9112c56d96bff7df158e71539a614d0d80041113da73590fe2f9bf9981cbbe9993f9ef3e WHIRLPOOL c9c938d405c92ef00d253a40723ca770aa41d401dd2de6c79652c5df949bb9a9f7c6a92ac4f3895c8d7135e0963f6779b6aff1c3f8251da2fbf9f0d348d724b3
+DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123489cf38c44213cd2de2606f71e6231ac40e6519eb8f5c71294 SHA512 59a40cd092399dc49057144b95c9d8399fd3284a69bece3ccb02e479994ef2dd55140de0d62a455538dce87b17bc10cf3e09b165109271c78af229d1b62cb074 WHIRLPOOL 5ccbd8842aab3d1e2b0141bacaed90605bed668e0f7912b0fdd8e2de091ec24a0a9264d35c536e10bc7b75f8a5c42a60832cc6a2c5dc5c98f955d908dd01886d
 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
@@ -73,5 +74,6 @@ EBUILD netbeans-php-9999_p20150529.ebuild 4423 SHA256 e9e1f1fc15a8a44156c1dd5020
 EBUILD netbeans-php-9999_p20150530.ebuild 4423 SHA256 82e160a99671ad5654ea5fb9e0837b15b006c96cb3e63c5d08aa49b3ceb6c513 SHA512 f4450df338df6ba2dd0e19b3d62ef3db3488acb3fb945d8c034455197a0f95128cc30aba21db6cd8bdf177d1c3cbe552a6da14a8526fb3ac05c188b2d643c06a WHIRLPOOL 86f19d470305c22eb372e324e2bfd6b0f9b64043fdf60806394cf027bcf9cf0fab1426e9811ca3651f5a29d99c3bd98fc252a1372c9d2f58725aab76c7b6f113
 EBUILD netbeans-php-9999_p20150601.ebuild 4423 SHA256 587dd538f6c412edc946ecbee2239772ea875b87c40e2b8eafeacdcb3d5f5abf SHA512 0762ce2f4cca596ef5fd31eea0c15a9b58a3726ad35d673445ac3518ff805dfb23faeba4d25f360cd2e75eb129924919637db0cbbe838264a263bd953ff89427 WHIRLPOOL 4fc38b40397f6a702546bd39ce14bdf52f9196995674bb00ad1b2e7c9f53d6569d20f69d72baa97d9ff7dce9f31334b7b7385fb36d3dd4e1b5d16e49ca1ce9e6
 EBUILD netbeans-php-9999_p20150602.ebuild 4423 SHA256 90613c4883f94d2fd2c731460ca94430e34e9ca2b6e7378bf2a6509727e82d73 SHA512 e363a16a33b1598f5ec32de14ab2c280762b99b10068a10cf692b77442dc2ca93df3d9d49907769ffd12ec19db6c5662b82ba35925b99d455bc45656f9c7c921 WHIRLPOOL 4c76cf5c2ae724a3aadb6475e873ef92be0f22e8f127250bdd481a7a93bdabef7f1142a0d10df996bf6531b53d171ff44adca9d2e6642ce56df0b4ef15cafcc4
-MISC ChangeLog 158474 SHA256 8df91baa68cfb00dedaa9751d3e7cdc0135f3b9e50138111d291e10ffc329389 SHA512 50499145f67f0b111b08dfd0779c3f2dacee3aadbe70e6de2959c2b581fadcced7d428c2c0b74ef6f44cf5e530e7c48bcef689efdc3a538ae4bcbe875dd7341b WHIRLPOOL 7aff35f73b3ab4671b2e14af46f13a16825a6a6114f2a893d85de934110844cb753cbf6552973fcde9cb48e532b9c5f96ed4454eef77f1eaabb401c0646ec671
+EBUILD netbeans-php-9999_p20150603.ebuild 4423 SHA256 97370ca944836c20a10c43028b9570d4b00189db870419aa211b3bba49e0eb34 SHA512 d77dfe7c8b73cbe3558864c2a764fb3ba463a964bffeb83a9e2d7517bfd0b5dabec2b40bf0f58d5498f40fb4aef810b278cd04afa86f19180a40c12947348c23 WHIRLPOOL 8da049be0e3a6073d8c2cfe573f0b125cfa514b0b33110aec2b1a6399452bb17a1d7e5626090ad65b5aacfbe69276939b2c4ef0575d804a52f3665ef1bf5b3a9
+MISC ChangeLog 158641 SHA256 f3985ae1376a949b1d8903517387c3ea822bab0df15bb5ded6f26f1f5a151175 SHA512 bbc238c84a0cb407223ad0d8896f027787f499109d6d0f0034e6b4502e762067a0eaa77ae12a2b348bdd8e9421874385c4b4e290bce42d93b671223dc625ed66 WHIRLPOOL 24efeb0f92284b0b2b13d284528f232ed60d9ee1371dca590a9092c43eba90e7e4da344663ee8cac542a9dada462078fa620f42a548f11da2f770be08ddaec68
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20150603.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20150603.ebuild
new file mode 100644
index 0000000..ede411a
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20150603.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2015 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/2015-06-03_00-01-56/zip/netbeans-trunk-nightly-201506030001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip
+	http://hg.netbeans.org/binaries/52AE855B57FF0326574A5B07D0BDDD9D8010D3C4-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 -Dpermit.jdk8.builds=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-r14-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}"/52AE855B57FF0326574A5B07D0BDDD9D8010D3C4-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-r14-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 b3be4b3..db87d5c 100644
--- a/dev-java/netbeans-platform/ChangeLog
+++ b/dev-java/netbeans-platform/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-platform-9999_p20150603 (03 Jun 2015)
+
+  03 Jun 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-platform-9999_p20150603.ebuild:
+  bumped to the latest sources
+
 *netbeans-platform-9999_p20150602 (02 Jun 2015)
 
   02 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index a9147b1..28122df 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -60,6 +60,7 @@ DIST netbeans-trunk-nightly-201505290001-src.zip 207640635 SHA256 2547cf1181fa33
 DIST netbeans-trunk-nightly-201505300811-src.zip 207777734 SHA256 e9b9f7d8613e07dfdc7cecbd4e323e400625985373cd226101638250c1042cc1 SHA512 2c72c85b85e7016d9863ee8033da81d26e14f2928e8dd703ec4c48b02165bb1d65ce331b66b0367cebe54bc1b233b68dbaad1705796751b1f6d87e34744de08a WHIRLPOOL 8967ee3280bbc33ff4b8e4246c31b4debf324886e0251f75330dce8c67443c5fde66d2ae7f13314abc43e8a8f577baa2a56ff69b3516cd2ece144a49525f7ecb
 DIST netbeans-trunk-nightly-201506010001-src.zip 207778965 SHA256 96bc8cca703517eeffedcffc05a6de8f917ddadf688dd16ac0b8d1848954c5cf SHA512 9fe5670c662d3c21b2594253254aa521997f6c925f2591bbd7be7be7cffc93b3cbd3d4c9ac3c6f7cede21f9dbc7ed39fed45718e47e5bac653228ab07c62dddd WHIRLPOOL 90a459da74f998f4fb70bd03b9f2d581a2c72100f1d7c52a803703b5fadc929863d11d9643cc517e22fa6b3b42d66c197595820e2299d12a5b735d5cd68d3f8e
 DIST netbeans-trunk-nightly-201506020001-src.zip 207781610 SHA256 ed7f2e851ed53dacd5e46091a091490fcf4afbac35b732335f054fc428978850 SHA512 ba5f09aadede76fd0659c3b190a3646a9b57ffda253cf24d1343bace9112c56d96bff7df158e71539a614d0d80041113da73590fe2f9bf9981cbbe9993f9ef3e WHIRLPOOL c9c938d405c92ef00d253a40723ca770aa41d401dd2de6c79652c5df949bb9a9f7c6a92ac4f3895c8d7135e0963f6779b6aff1c3f8251da2fbf9f0d348d724b3
+DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123489cf38c44213cd2de2606f71e6231ac40e6519eb8f5c71294 SHA512 59a40cd092399dc49057144b95c9d8399fd3284a69bece3ccb02e479994ef2dd55140de0d62a455538dce87b17bc10cf3e09b165109271c78af229d1b62cb074 WHIRLPOOL 5ccbd8842aab3d1e2b0141bacaed90605bed668e0f7912b0fdd8e2de091ec24a0a9264d35c536e10bc7b75f8a5c42a60832cc6a2c5dc5c98f955d908dd01886d
 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
@@ -87,5 +88,6 @@ EBUILD netbeans-platform-9999_p20150529.ebuild 9652 SHA256 c5ce4e3db8dadf0e2b419
 EBUILD netbeans-platform-9999_p20150530.ebuild 9244 SHA256 f3dcac01f9d5f4a8248ff1cb460e587674d450e509907003202c28503c17dc0c SHA512 498ab266b5591b248e75195d26515229a25d2ff4f647825b2a7829d152d1bac95f69ef421a9ff7f71053ac0b3e0bbd36e7c2e6d703ac6d62c907e19b2d290653 WHIRLPOOL cc4bf165b311f29c2d3969efbb17c3294edec5acd978f87ed5e550bf2a457a78c2eeedc11ca13bcbd69d43dfb08955176ab194858b0fb405b94e32606e93c1e0
 EBUILD netbeans-platform-9999_p20150601.ebuild 9244 SHA256 7689acbd3e51b5967780185f6f7142cf316b583a57051d2ad5f2c8f642d6971b SHA512 cd047a373f2c88ef8fd3bb68dbdad7a2fa588ef691bc909903283b3d07721937dcf039bd8de0183ec087f896fb79b7204643b48393063f242b4076b6c96c7c96 WHIRLPOOL c32e7fcb3bbb7f3a2d8c25e2ba781520073038bda38df9677b680822ae70f17da1d1ce4f6331295464d01b139e3750e0b3fbb9ca9232cb030fffb2d020dcf61c
 EBUILD netbeans-platform-9999_p20150602.ebuild 9244 SHA256 ade9d5a043d5e49f2e2900677b87111f9d5a12197cd8cf32bffa25b55bd42aef SHA512 9a5499620c62d6b5e073f3bca046004615d71a210fe79a8e4d37e6d9e7306172268dfa5c68c1c756f9075e1f582939b076f77f91a232fb5c00d1f5de349abc6a WHIRLPOOL 08a13296b469562d565791f7d4d56d49bb8ce3c42776548bc9ae01f25ec6102464951e640ad6914fbf054e3518ad600994724e802d2a69154c2154993a547f70
-MISC ChangeLog 170538 SHA256 b8f4ed11178e75a80d56a28a17a9f639564668423326ae4db1722362474931ed SHA512 824f7b30b2f1372d848236dcba17028044324b2bb41aa22810edce6eaac257cce303e5e9843c661958f46abf6bc113391b255db35cb6b647b984481de6a3f6be WHIRLPOOL a5d67bad1b47791864d66b311a2c00e2855f0bb3f5db1a19be317ab8351db51411cb8faa6e66c4d73e97e9fc71b28504f15791933d0d68a9e09ceebf1c5ce2ea
+EBUILD netbeans-platform-9999_p20150603.ebuild 9244 SHA256 b7029a431e47639f8e6707ad315afbcdc5eeef5c02b63608f45cda1f4ac5c667 SHA512 daf71b2294c58828e04b8b45bb56c209df88a2f5e417f1d7149f9f9f99891c856804f04e386c936bb8dca7893e0eac201e88e66df58cb30a67a73dec840ab33f WHIRLPOOL afc5ee4a9d9e7bdc74a8e90f326f11eab949966523451f07b11c4171e0a62717bff18bb5e2c2007e2d9bc0be2fccb42224d10137ade341eacbb19e47bc8a9f96
+MISC ChangeLog 170715 SHA256 137a0cb46ec54ac90791fae376247e648cc98a49eb25f168424ac7e2c33828b6 SHA512 5ec61cb36d7929f8aea3c6d7ec0aed7db8061c8ecd9897cbcc6d0943aff1dded3e8b0b5d1ed8fb333160ea28785e5fcbc663b6c9143d518e145540be2426d637 WHIRLPOOL 7897e60bf0aff181bbcc994dacc40c2d3ce94b8e1c4827b03e97c978d74bb8e2366efeb34f7c0aa07743f68872e64ab1dad14faf0d884a1d90e148d7b729e302
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20150603.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20150603.ebuild
new file mode 100644
index 0000000..ee36e74
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20150603.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2015 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/2015-06-03_00-01-56/zip/netbeans-trunk-nightly-201506030001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar
+	http://hg.netbeans.org/binaries/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar
+	http://hg.netbeans.org/binaries/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar
+	http://hg.netbeans.org/binaries/B250509C67194E89C3A27F96933DB7EB0E027E56-ko4j.jar
+	http://hg.netbeans.org/binaries/E556F74DF0942B304F94D9F82CAA8102FED6356E-net-java-html.jar
+	http://hg.netbeans.org/binaries/C74AC1ED160379872826FDC4A3C0CA924A3A0A83-net-java-html-boot.jar
+	http://hg.netbeans.org/binaries/03FE10857B0689B1F98B8D96DE87E80DF5D87A69-net-java-html-boot-fx.jar
+	http://hg.netbeans.org/binaries/31C9329E78A222E38CB86716ACFCEF81EF0BA1FD-net-java-html-boot-script.jar
+	http://hg.netbeans.org/binaries/24ED356FF3C72665CB5FB972B428824FABBC1987-net-java-html-geo.jar
+	http://hg.netbeans.org/binaries/432EDFB05C0F44E6ADAC4B1F3E08C67D1F52FB4B-net-java-html-json.jar
+	http://hg.netbeans.org/binaries/A7B6C3470DB8821A3587CE04844FF504A7C62354-net-java-html-sound.jar
+	http://hg.netbeans.org/binaries/B27F1304F18FEDE876F940AEFA6C9EB5632619D7-org.eclipse.osgi_3.9.1.v20140110-1610.jar
+	http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip
+	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/hamcrest-core:1.3
+	dev-java/javahelp:0
+	>=dev-java/jna-3.4:0
+	dev-java/junit:4[source]
+	>=dev-java/osgi-core-api-5:0
+	dev-java/osgi-compendium:0
+	dev-java/swing-layout:1[source]
+	dev-java/testng:0"
+# oracle-jdk-bin is needed because other jdks do not contain file jre/lib/ext/jfxrt.jar
+# the error:
+#  [parseprojectxml] Distilling /var/tmp/portage/dev-java/netbeans-platform-9999_p20140922/work/nbbuild/build/public-package-jars/org-netbeans-libs-javafx.jar from [/var/tmp/portage/dev-java/netbeans-platform-9999_p20140922/work/nbbuild/netbeans/platform/modules/org-netbeans-libs-javafx.jar, /opt/icedtea-bin-7.2.4.7/jre/lib/ext/jfxrt.jar]
+#  [parseprojectxml] Classpath entry /opt/icedtea-bin-7.2.4.7/jre/lib/ext/jfxrt.jar does not exist; skipping
+#  [nbmerge] Failed to build target: all-api.html4j
+
+DEPEND="dev-java/oracle-jdk-bin: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 -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+JAVA_PKG_WANT_BUILD_VM="oracle-jdk-bin-1.7"
+JAVA_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar libs.asm/external/asm-all-5.0.1.jar || die
+	ln -s "${DISTDIR}"/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar libs.felix/external/felix-4.2.1.jar || die
+	ln -s "${DISTDIR}"/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar junitlib/external/junit-4.12-javadoc.jar || die
+	ln -s "${DISTDIR}"/B250509C67194E89C3A27F96933DB7EB0E027E56-ko4j.jar o.n.html.ko4j/external/ko4j.jar || die
+	ln -s "${DISTDIR}"/E556F74DF0942B304F94D9F82CAA8102FED6356E-net-java-html.jar net.java.html/external/net-java-html.jar || die
+	ln -s "${DISTDIR}"/C74AC1ED160379872826FDC4A3C0CA924A3A0A83-net-java-html-boot.jar net.java.html.boot/external/net-java-html-boot.jar || die
+	ln -s "${DISTDIR}"/03FE10857B0689B1F98B8D96DE87E80DF5D87A69-net-java-html-boot-fx.jar net.java.html.boot.fx/external/net-java-html-boot-fx.jar || die
+	ln -s "${DISTDIR}"/31C9329E78A222E38CB86716ACFCEF81EF0BA1FD-net-java-html-boot-script.jar net.java.html.boot.script/external/net-java-html-boot-script.jar || die
+	ln -s "${DISTDIR}"/24ED356FF3C72665CB5FB972B428824FABBC1987-net-java-html-geo.jar net.java.html.geo/external/net-java-html-geo.jar || die
+	ln -s "${DISTDIR}"/432EDFB05C0F44E6ADAC4B1F3E08C67D1F52FB4B-net-java-html-json.jar net.java.html.json/external/net-java-html-json.jar || die
+	ln -s "${DISTDIR}"/A7B6C3470DB8821A3587CE04844FF504A7C62354-net-java-html-sound.jar net.java.html.sound/external/net-java-html-sound.jar || die
+	ln -s "${DISTDIR}"/B27F1304F18FEDE876F940AEFA6C9EB5632619D7-org.eclipse.osgi_3.9.1.v20140110-1610.jar netbinox/external/org.eclipse.osgi_3.9.1.v20140110-1610.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}"/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-r14-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 libs.junit4/external hamcrest-core-1.3 hamcrest-core.jar hamcrest-core-1.3.jar
+	java-pkg_jar-from --into libs.jna.platform/external jna platform.jar jna-platform-4.1.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-4.1.0.jar
+	java-pkg_jar-from --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+	ln -s /usr/share/junit-4/sources/junit-src.zip junitlib/external/junit-4.12-sources.jar || die
+	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 libs.osgi/external osgi-compendium osgi-compendium.jar osgi.cmpn-4.2.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_jar-from --into libs.testng/external testng testng.jar testng-6.8.1-dist.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/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/junit-4.12-sources.jar || die
+	dosym /usr/share/junit-4/sources/junit-src.zip ${INSTALL_DIR}/docs/junit-4.12-sources.jar
+	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 hamcrest-core-1.3.jar && dosym /usr/share/hamcrest-core-1.3/lib/hamcrest-core.jar ${instdir}/hamcrest-core-1.3.jar || die
+	rm jhall-2.0_05.jar && dosym /usr/share/javahelp/lib/jhall.jar ${instdir}/jhall-2.0_05.jar || die
+	rm jna-4.1.0.jar && dosym /usr/share/jna/lib/jna.jar ${instdir}/jna-4.1.0.jar || die
+	rm jna-platform-4.1.0.jar && dosym /usr/share/jna/lib/platform.jar ${instdir}/jna-platform-4.1.0.jar || die
+	rm junit-4.12.jar && dosym /usr/share/junit-4/lib/junit.jar ${instdir}/junit-4.12.jar || die
+	rm osgi.cmpn-4.2.jar && dosym /usr/share/osgi-compendium/lib/osgi-compendium.jar ${instdir}/osgi.cmpn-4.2.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 swing-layout-1.0.4.jar && dosym /usr/share/swing-layout-1/lib/swing-layout.jar ${instdir}/swing-layout-1.0.4.jar || die
+	rm testng-6.8.1-dist.jar && dosym /usr/share/testng/lib/testng.jar ${instdir}/testng-6.8.1-dist.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 5b22df1..ca745c8 100644
--- a/dev-java/netbeans-profiler/ChangeLog
+++ b/dev-java/netbeans-profiler/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-profiler-9999_p20150603 (03 Jun 2015)
+
+  03 Jun 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-profiler-9999_p20150603.ebuild:
+  bumped to the latest sources
+
 *netbeans-profiler-9999_p20150602 (02 Jun 2015)
 
   02 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index c970f8b..7441099 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201505290001-src.zip 207640635 SHA256 2547cf1181fa33
 DIST netbeans-trunk-nightly-201505300811-src.zip 207777734 SHA256 e9b9f7d8613e07dfdc7cecbd4e323e400625985373cd226101638250c1042cc1 SHA512 2c72c85b85e7016d9863ee8033da81d26e14f2928e8dd703ec4c48b02165bb1d65ce331b66b0367cebe54bc1b233b68dbaad1705796751b1f6d87e34744de08a WHIRLPOOL 8967ee3280bbc33ff4b8e4246c31b4debf324886e0251f75330dce8c67443c5fde66d2ae7f13314abc43e8a8f577baa2a56ff69b3516cd2ece144a49525f7ecb
 DIST netbeans-trunk-nightly-201506010001-src.zip 207778965 SHA256 96bc8cca703517eeffedcffc05a6de8f917ddadf688dd16ac0b8d1848954c5cf SHA512 9fe5670c662d3c21b2594253254aa521997f6c925f2591bbd7be7be7cffc93b3cbd3d4c9ac3c6f7cede21f9dbc7ed39fed45718e47e5bac653228ab07c62dddd WHIRLPOOL 90a459da74f998f4fb70bd03b9f2d581a2c72100f1d7c52a803703b5fadc929863d11d9643cc517e22fa6b3b42d66c197595820e2299d12a5b735d5cd68d3f8e
 DIST netbeans-trunk-nightly-201506020001-src.zip 207781610 SHA256 ed7f2e851ed53dacd5e46091a091490fcf4afbac35b732335f054fc428978850 SHA512 ba5f09aadede76fd0659c3b190a3646a9b57ffda253cf24d1343bace9112c56d96bff7df158e71539a614d0d80041113da73590fe2f9bf9981cbbe9993f9ef3e WHIRLPOOL c9c938d405c92ef00d253a40723ca770aa41d401dd2de6c79652c5df949bb9a9f7c6a92ac4f3895c8d7135e0963f6779b6aff1c3f8251da2fbf9f0d348d724b3
+DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123489cf38c44213cd2de2606f71e6231ac40e6519eb8f5c71294 SHA512 59a40cd092399dc49057144b95c9d8399fd3284a69bece3ccb02e479994ef2dd55140de0d62a455538dce87b17bc10cf3e09b165109271c78af229d1b62cb074 WHIRLPOOL 5ccbd8842aab3d1e2b0141bacaed90605bed668e0f7912b0fdd8e2de091ec24a0a9264d35c536e10bc7b75f8a5c42a60832cc6a2c5dc5c98f955d908dd01886d
 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
@@ -60,5 +61,6 @@ EBUILD netbeans-profiler-9999_p20150529.ebuild 3478 SHA256 e1279fa5d3b1ea27c1c3d
 EBUILD netbeans-profiler-9999_p20150530.ebuild 3478 SHA256 be73ecc6d1562e58e3e36d867866f82fd11dec396e83e72fddfebb35d48e52cd SHA512 ca71f21d7f2a009512f59bde785e17dde91c9ce82d44ce7413c08007bdc105c501c0711b31344f283b62008275f01d9e20aab4e8135673f8bc78f46bc5d207fe WHIRLPOOL 205eeb1e6e04c0f8756e1069913da5d7164e63b600524e0199101767e0b993730ff248a56ef65a5a550de3071c11e02aa862cc41e8ef21ba3813f96b27f1fbd2
 EBUILD netbeans-profiler-9999_p20150601.ebuild 3478 SHA256 27e2d4e6635b31c110cfea6eba00af8b8a5f1a1141d16cf3b941ef2b0574ba54 SHA512 f4a4bf330ce263c74b0eeca2ffc9df854862e8247d1ff307e59d5ac1974250d7cde22d15ee46575eeb58321d87b4ff3df46d8698c385c154343db8237c75826b WHIRLPOOL 289829e3d03c83780b812ec76f8c6b04e004c804992f34da0d6b7b0017fe6c40abaa348588fc4918b3c36b67128e3d38acaf7663dd4bb7fdef2ebe024ab33f91
 EBUILD netbeans-profiler-9999_p20150602.ebuild 3478 SHA256 9f3b4ed5e3666cd371c571331d4f153f1cf145ae3fdc868722b837d4479a7f95 SHA512 247544424e6818f606cdcbcf3743b130d7a3e7cffdd45ff8ca2ab89857d8efc87446516e8b9379c13757e0303ef940c20dd7be2b4ead6361b1f56acf5b887abd WHIRLPOOL f0295a001ad36484d93153446a810d33a1309689384ac981ced24896c4647e342c0c24dbd0d9610f47bba6b817de42093ebe0e9ef37d7300e09beea586fc379b
-MISC ChangeLog 169999 SHA256 e2e0a689a7103a537b6db7ecc90aee611255ad9716490f2362f35915a74de392 SHA512 6fb026762e28059199430b6ae5defc4805939ddadd7916d512152a29eec751f56fbc9f7db8489161a478b7870222151bafee1a88d4932716621e3724dc612d08 WHIRLPOOL 520f0afb8576c7dde4d70983061e7cde599661cda9f77d1c9d3dcec0491964289d67ec0ff5266e17d4b60cf27747a2f02ffa603308083b8ee28b00987579f6ab
+EBUILD netbeans-profiler-9999_p20150603.ebuild 3478 SHA256 ce39e74cc381dd78c7163084ebf6b47482220efaf04113bd17a05d8fa51e336a SHA512 5bf1aaa3a277efaddcf021f78137cef02b919965f0cc5f5d8c88a9ef5836848f9d041b4279ae52030136fe5cdc8895f7d257d1098eaf0e28cb5f76504f3b8de0 WHIRLPOOL ab01ac7f21e224fd19f9dac889c7ce8c5a523113b29a0d64959816739a1b041ebc6cd83ac7f5976e02f6023efad862048b357ec0454f43d6b461a6929880c0a9
+MISC ChangeLog 170176 SHA256 e7ab126efe81d552041b648fa15b0ccfc6e501c0b9852c07f60d46ad1cba33f9 SHA512 1a00e12424e8c14ae1a00b6b950c4eb24b705bc25945ace60655faa1ff67cefb01df64f56f64b5a0ae78ae81d91673d4fed631a23e9bbbdebf7322c2e7cc1f78 WHIRLPOOL da00224c4aefbbe172e8aa8ae810e1d1120011eb49f3753f82fcec406e74c4ee2e30898d94a6f84893aa287b73929ad80d464d9ff53aa25876c43498638000a4
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150603.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150603.ebuild
new file mode 100644
index 0000000..1a77c4b
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150603.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2015 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/2015-06-03_00-01-56/zip/netbeans-trunk-nightly-201506030001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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 -Dpermit.jdk8.builds=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-r14-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-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 b8f4fc0..53a0301 100644
--- a/dev-java/netbeans-webcommon/ChangeLog
+++ b/dev-java/netbeans-webcommon/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-webcommon-9999_p20150603 (03 Jun 2015)
+
+  03 Jun 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-webcommon-9999_p20150603.ebuild:
+  bumped to the latest sources
+
 *netbeans-webcommon-9999_p20150602 (02 Jun 2015)
 
   02 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index a20751d..4f81607 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201505290001-src.zip 207640635 SHA256 2547cf1181fa33
 DIST netbeans-trunk-nightly-201505300811-src.zip 207777734 SHA256 e9b9f7d8613e07dfdc7cecbd4e323e400625985373cd226101638250c1042cc1 SHA512 2c72c85b85e7016d9863ee8033da81d26e14f2928e8dd703ec4c48b02165bb1d65ce331b66b0367cebe54bc1b233b68dbaad1705796751b1f6d87e34744de08a WHIRLPOOL 8967ee3280bbc33ff4b8e4246c31b4debf324886e0251f75330dce8c67443c5fde66d2ae7f13314abc43e8a8f577baa2a56ff69b3516cd2ece144a49525f7ecb
 DIST netbeans-trunk-nightly-201506010001-src.zip 207778965 SHA256 96bc8cca703517eeffedcffc05a6de8f917ddadf688dd16ac0b8d1848954c5cf SHA512 9fe5670c662d3c21b2594253254aa521997f6c925f2591bbd7be7be7cffc93b3cbd3d4c9ac3c6f7cede21f9dbc7ed39fed45718e47e5bac653228ab07c62dddd WHIRLPOOL 90a459da74f998f4fb70bd03b9f2d581a2c72100f1d7c52a803703b5fadc929863d11d9643cc517e22fa6b3b42d66c197595820e2299d12a5b735d5cd68d3f8e
 DIST netbeans-trunk-nightly-201506020001-src.zip 207781610 SHA256 ed7f2e851ed53dacd5e46091a091490fcf4afbac35b732335f054fc428978850 SHA512 ba5f09aadede76fd0659c3b190a3646a9b57ffda253cf24d1343bace9112c56d96bff7df158e71539a614d0d80041113da73590fe2f9bf9981cbbe9993f9ef3e WHIRLPOOL c9c938d405c92ef00d253a40723ca770aa41d401dd2de6c79652c5df949bb9a9f7c6a92ac4f3895c8d7135e0963f6779b6aff1c3f8251da2fbf9f0d348d724b3
+DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123489cf38c44213cd2de2606f71e6231ac40e6519eb8f5c71294 SHA512 59a40cd092399dc49057144b95c9d8399fd3284a69bece3ccb02e479994ef2dd55140de0d62a455538dce87b17bc10cf3e09b165109271c78af229d1b62cb074 WHIRLPOOL 5ccbd8842aab3d1e2b0141bacaed90605bed668e0f7912b0fdd8e2de091ec24a0a9264d35c536e10bc7b75f8a5c42a60832cc6a2c5dc5c98f955d908dd01886d
 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-7.4.ebuild 4727 SHA256 54a0b63527001da34a21ae3ed69c2cfbf9a446ee69bda4bb6ac5ebb939ebb68d SHA512 96895c972cf7092426ec8bc06dccc6ab4f33334da4e67fd4da01e586801110bda8d955f2f29ecd93b8bb58ae64c4af4139e9954a784c10dec925e2beaeab2394 WHIRLPOOL aa7b3b59d315bd37553052470b1f56f435979569e5ef033493cf6f93c29827f2ecd30f6b874f07a0cd8824469c6546982ac3ed360bf3b6cbf211d95943a3398a
@@ -64,5 +65,6 @@ EBUILD netbeans-webcommon-9999_p20150529.ebuild 4997 SHA256 5a61b3878af4b9169695
 EBUILD netbeans-webcommon-9999_p20150530.ebuild 4997 SHA256 1b6839c13a522df7c183bf7dd243e5d1ee69d9b6742ed842a62c00433d49571f SHA512 e46b51c45c4266ed9bb614f8fd2d4172eaf01782d35749b7d7a240cbfc5cc9fcf918b56fad1d0dc112424265ff947f46e830ea8a362d33c4e13debd3cdb06542 WHIRLPOOL 38b24782d30861ee3bef4b310f42f393d49ca1b272fdf1d22a95305996d68df0d753fe1b36ceeb4b236ac3f6e83d92d4762051b6bf646253cae0c2faee8c9cc9
 EBUILD netbeans-webcommon-9999_p20150601.ebuild 4997 SHA256 17bd45659ab65a9b6d066cf3e30aeec284f3870e8b14a5e1986b3794f0d95839 SHA512 f52942b768cf19647daf807168c903aa96b50658ad8a319486ac38cbfa56475d6f734854fc0645587dc0e23ea58fbfce2a22a74807369dc95a93751ffc6c46b8 WHIRLPOOL c52e8d7dfe6f44a45db6eeffa03eb0f666bf5cdb6e3416e8475451222bcb5f5944c517224f9baaa557c22df3f06df416f93c18475978acc323417d89dc645623
 EBUILD netbeans-webcommon-9999_p20150602.ebuild 4997 SHA256 778feea37abbb98888785d48977bfafe6b433358ce5dad10523bffb53a22b2dc SHA512 3dd97dc3f906167bbea96a1e4b2c8543991b9eab4c7aa130cd10ca1fa52a5626e5b298801fb760c97da41624a093699767caeb1bb21ab7ce4d79eabf4b929060 WHIRLPOOL 853f5ec7b64ce57d694bd07c2fcbc57d08ff424668f2666e90a48e1ff2ac1e104bebf159f1d1e8407dca952d0344b736e10402bc15799c51208867519f6445f4
-MISC ChangeLog 143104 SHA256 56b0f79525f4a0237a8ddbd0b03ff291767cf8c5c3b3db5957be5537d9cee33d SHA512 5d5b276740088a22dbcaa03fd3e53f3083cde226ec98aba0e382c0f3fb38de5624e15ce89a31cd5745f87d53e9dff3d4fd332388dfaa6aebe642d2094c59842c WHIRLPOOL 7ed3be5f046dfa07741519c3baed699d732be5345ed1f83dbfd94156781670755f47bdf71f77c4c1b2d62954f5a5df10347b912a71b39a83916d99a274b516fe
+EBUILD netbeans-webcommon-9999_p20150603.ebuild 4997 SHA256 737abbad2db0969800e19b03eb199a78c490a275d724b67578a595875ab581a2 SHA512 1c6624288a50655da03bb12e2aee5483d4240ecd200149a9a09e4f544d67e1f6991d35c2d7094f7a03f32fc8f32d9226a8f973385d4dfd2cdc129aea90495f35 WHIRLPOOL 6d4d887ea6f14803b4fd84f04ab9ab913bb68793140f3b671dd865a816b76474549eec3cd92f5fca768e45ccae546519cd86b81f3193667fe822afe3fc9db7d9
+MISC ChangeLog 143283 SHA256 fb99edbd531d277bacdbbe1db6d53feea2fb5c34495133b982b79685d5626aec SHA512 d3ae764c039fdb1ebf5e7da3c5129cb0ce281359592fbb58f7457c2429b21ac97ac22217e8c9becb234444e43d7429d37a7b6ab50b616416e25db54055926649 WHIRLPOOL e6b8e8876e3e3865a047ca3f807cc77ce7c862fccf4a74897340084df7f357497470fe78f77e7d4bd15a8c96f2a562806081e2e4971225b0e56c4bf9b0337cec
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150603.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150603.ebuild
new file mode 100644
index 0000000..8119909
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150603.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2015 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/2015-06-03_00-01-56/zip/netbeans-trunk-nightly-201506030001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar
+	http://hg.netbeans.org/binaries/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim
+	http://hg.netbeans.org/binaries/9D29F2A9722C91A403F32971E97DD0E49E97B02E-libiDeviceNativeBinding.dylib
+	http://hg.netbeans.org/binaries/9F0D0D95F57E73C0110FA023813A4F9756D543B1-libimobiledevice.4.dylib
+	http://hg.netbeans.org/binaries/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib
+	http://hg.netbeans.org/binaries/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar
+	http://hg.netbeans.org/binaries/D05B7274396C8EED185207399B6D0400DE347DB7-libusbmuxd.2.dylib"
+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}
+	dev-java/commons-compress: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.webcommon -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=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-r14-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}"/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim cordova.platforms.ios/external/ios-sim || die
+	ln -s "${DISTDIR}"/9D29F2A9722C91A403F32971E97DD0E49E97B02E-libiDeviceNativeBinding.dylib cordova.platforms.ios/external/libiDeviceNativeBinding.dylib || die
+	ln -s "${DISTDIR}"/9F0D0D95F57E73C0110FA023813A4F9756D543B1-libimobiledevice.4.dylib cordova.platforms.ios/external/libimobiledevice.4.dylib || die
+	ln -s "${DISTDIR}"/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib cordova.platforms.ios/external/libplist.1.dylib || die
+	ln -s "${DISTDIR}"/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar libs.jstestdriver/external/libs.jstestdriver-ext.jar || die
+	ln -s "${DISTDIR}"/D05B7274396C8EED185207399B6D0400DE347DB7-libusbmuxd.2.dylib cordova.platforms.ios/external/libusbmuxd.2.dylib || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-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 libs.commons_compress/external commons-compress commons-compress.jar commons-compress-1.8.1.jar
+	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
+
+	local instdir=/${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-compress-1.8.1.jar  && dosym /usr/share/commons-compress/lib/commons-compress.jar ${instdir}/commons-compress-1.8.1.jar || die
+	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 645c00a..3bca177 100644
--- a/dev-java/netbeans-websvccommon/ChangeLog
+++ b/dev-java/netbeans-websvccommon/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-websvccommon-9999_p20150603 (03 Jun 2015)
+
+  03 Jun 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-websvccommon-9999_p20150603.ebuild:
+  bumped to the latest sources
+
 *netbeans-websvccommon-9999_p20150602 (02 Jun 2015)
 
   02 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 0b0f6a4..9da4a5f 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201505290001-src.zip 207640635 SHA256 2547cf1181fa33
 DIST netbeans-trunk-nightly-201505300811-src.zip 207777734 SHA256 e9b9f7d8613e07dfdc7cecbd4e323e400625985373cd226101638250c1042cc1 SHA512 2c72c85b85e7016d9863ee8033da81d26e14f2928e8dd703ec4c48b02165bb1d65ce331b66b0367cebe54bc1b233b68dbaad1705796751b1f6d87e34744de08a WHIRLPOOL 8967ee3280bbc33ff4b8e4246c31b4debf324886e0251f75330dce8c67443c5fde66d2ae7f13314abc43e8a8f577baa2a56ff69b3516cd2ece144a49525f7ecb
 DIST netbeans-trunk-nightly-201506010001-src.zip 207778965 SHA256 96bc8cca703517eeffedcffc05a6de8f917ddadf688dd16ac0b8d1848954c5cf SHA512 9fe5670c662d3c21b2594253254aa521997f6c925f2591bbd7be7be7cffc93b3cbd3d4c9ac3c6f7cede21f9dbc7ed39fed45718e47e5bac653228ab07c62dddd WHIRLPOOL 90a459da74f998f4fb70bd03b9f2d581a2c72100f1d7c52a803703b5fadc929863d11d9643cc517e22fa6b3b42d66c197595820e2299d12a5b735d5cd68d3f8e
 DIST netbeans-trunk-nightly-201506020001-src.zip 207781610 SHA256 ed7f2e851ed53dacd5e46091a091490fcf4afbac35b732335f054fc428978850 SHA512 ba5f09aadede76fd0659c3b190a3646a9b57ffda253cf24d1343bace9112c56d96bff7df158e71539a614d0d80041113da73590fe2f9bf9981cbbe9993f9ef3e WHIRLPOOL c9c938d405c92ef00d253a40723ca770aa41d401dd2de6c79652c5df949bb9a9f7c6a92ac4f3895c8d7135e0963f6779b6aff1c3f8251da2fbf9f0d348d724b3
+DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123489cf38c44213cd2de2606f71e6231ac40e6519eb8f5c71294 SHA512 59a40cd092399dc49057144b95c9d8399fd3284a69bece3ccb02e479994ef2dd55140de0d62a455538dce87b17bc10cf3e09b165109271c78af229d1b62cb074 WHIRLPOOL 5ccbd8842aab3d1e2b0141bacaed90605bed668e0f7912b0fdd8e2de091ec24a0a9264d35c536e10bc7b75f8a5c42a60832cc6a2c5dc5c98f955d908dd01886d
 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
@@ -60,5 +61,6 @@ EBUILD netbeans-websvccommon-9999_p20150529.ebuild 2727 SHA256 e7dd364b5b3ef0566
 EBUILD netbeans-websvccommon-9999_p20150530.ebuild 2727 SHA256 bee88c9c629ffae49073a7c01f18fdfb8f71be809bed7f1dec78d086f57ac2ee SHA512 7cbac1a99b579156b14e4066756910a88b4814cb40bf909ec480ca303f871da0fcb7721aeff3cf456a8cc63e90c32b39f8cd00c11827a2460f7f8813ca9cfefe WHIRLPOOL cf1536b6892ca55bba2812875b96fbbc9840834cd0cdac2403a2fa79877df3651aa3ec3bbbd6baae270ecd028b97b42110e1d22b4226a6939bc11c67ff6c70d9
 EBUILD netbeans-websvccommon-9999_p20150601.ebuild 2727 SHA256 3ab4e9da0d917bff4738ff8584d7cf5d45a2e76bc50907230fb704a118a75e9d SHA512 fa514f1d5556fe79db365dcf635993b599eee167554fd47c5073c19cffa7280912802090be72077db8b6aed022809a7370c323cf006a436dff80f3e84e2a0613 WHIRLPOOL 10fde86ffbf9868e8e137b2631bb12c2c5c3984d63756c8e1c054e67d78f3f0885ce1dae8a3019c5237fa0e179321e51a322baa71a68ba4bc7812ea4f716c221
 EBUILD netbeans-websvccommon-9999_p20150602.ebuild 2727 SHA256 397f5d80ee8aa96fae2b4084223d0028c748d530001d418035534622a5ad6bfe SHA512 36c345ac5cbaa707824b9aadebc020f0e998da02c53034cb96cf89c6a72d846e63442066712192d5c9316c4661ece7d5ff521cee3584a00d3c59c4e31fb6f7f2 WHIRLPOOL 92756af1905238c0b63187603179fb2ae689bc22e684f9f285c700088d03faa0efda95cece3fe871bf5f78500198bd7cbed94b0171232cf241fdd1eec5717c53
-MISC ChangeLog 178160 SHA256 691f37ab5f3e9112b216dd2399f54643f2348d48ba4a208348da8809f588b8ac SHA512 02e48a090297c1a011d2739b0b578137347bf95b6c1328c2f6f2afdfa6edfd0837f9bd5fd55ce3c4be7bf4e9dbea5cb3a438432bb426a8ea35fc488e92f6bae3 WHIRLPOOL b8a3a3bbaa482083ddeef700ef5e66c6ffca8caf04fd568de2961c76078a6b0fb008109a19e5038f27f2dcf1a0f9fec299de1f701a09527c52290d2cf9e5bf85
+EBUILD netbeans-websvccommon-9999_p20150603.ebuild 2727 SHA256 a9755a774d305ba7df97f6bf5c31d30b6221291d8c74b1a512b3ca0d899b706f SHA512 e2382456c4a5d5e6d5a804890da52b760f1e94790fb1057bc5298518f9f3c8c8956ec82c4d0d3c7a5daaa63c541cf1b185719b32be121bf787dd248a3485bb79 WHIRLPOOL c39391efe3146cd4fd688ba5d4001d130bf8a3ef6704e532258f5d60da4b00a289cde7ee7d5e19efca3c52c66ba9ff614e8084c474645f9379bfcfaa005debf5
+MISC ChangeLog 178345 SHA256 572b971323eda98457b410d792b109146fa7f1e77411e37822e07b3097906fb1 SHA512 448bdb21ccff7fbd91c89ea82f044a56ad9cbcdd2e9e3b6ec83c5eddabdb5c2120f60c8396b5ab7b2b9f31d37628e4ac265fcf19b236cbaea4d7d57c6dffaa3f WHIRLPOOL e6baa446dba4d6b9d3876fd5e8c2836bef0fa044c0b701a571cffad0248e88590eef17ec8fb4d69a24ae70d01d1b8c1efe0f34de5591e54b737a81c5a16e87d4
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150603.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150603.ebuild
new file mode 100644
index 0000000..ee383df
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150603.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 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/2015-06-03_00-01-56/zip/netbeans-trunk-nightly-201506030001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-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 -Dpermit.jdk8.builds=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-r14-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-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 f4f529a..7605d52 100644
--- a/dev-util/netbeans/ChangeLog
+++ b/dev-util/netbeans/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netbeans-9999_p20150603 (03 Jun 2015)
+
+  03 Jun 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-9999_p20150603.ebuild:
+  bumped to the latest sources
+
 *netbeans-9999_p20150602 (02 Jun 2015)
 
   02 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 15b7a46..3831062 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -41,6 +41,7 @@ DIST netbeans-trunk-nightly-201505290001-src.zip 207640635 SHA256 2547cf1181fa33
 DIST netbeans-trunk-nightly-201505300811-src.zip 207777734 SHA256 e9b9f7d8613e07dfdc7cecbd4e323e400625985373cd226101638250c1042cc1 SHA512 2c72c85b85e7016d9863ee8033da81d26e14f2928e8dd703ec4c48b02165bb1d65ce331b66b0367cebe54bc1b233b68dbaad1705796751b1f6d87e34744de08a WHIRLPOOL 8967ee3280bbc33ff4b8e4246c31b4debf324886e0251f75330dce8c67443c5fde66d2ae7f13314abc43e8a8f577baa2a56ff69b3516cd2ece144a49525f7ecb
 DIST netbeans-trunk-nightly-201506010001-src.zip 207778965 SHA256 96bc8cca703517eeffedcffc05a6de8f917ddadf688dd16ac0b8d1848954c5cf SHA512 9fe5670c662d3c21b2594253254aa521997f6c925f2591bbd7be7be7cffc93b3cbd3d4c9ac3c6f7cede21f9dbc7ed39fed45718e47e5bac653228ab07c62dddd WHIRLPOOL 90a459da74f998f4fb70bd03b9f2d581a2c72100f1d7c52a803703b5fadc929863d11d9643cc517e22fa6b3b42d66c197595820e2299d12a5b735d5cd68d3f8e
 DIST netbeans-trunk-nightly-201506020001-src.zip 207781610 SHA256 ed7f2e851ed53dacd5e46091a091490fcf4afbac35b732335f054fc428978850 SHA512 ba5f09aadede76fd0659c3b190a3646a9b57ffda253cf24d1343bace9112c56d96bff7df158e71539a614d0d80041113da73590fe2f9bf9981cbbe9993f9ef3e WHIRLPOOL c9c938d405c92ef00d253a40723ca770aa41d401dd2de6c79652c5df949bb9a9f7c6a92ac4f3895c8d7135e0963f6779b6aff1c3f8251da2fbf9f0d348d724b3
+DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123489cf38c44213cd2de2606f71e6231ac40e6519eb8f5c71294 SHA512 59a40cd092399dc49057144b95c9d8399fd3284a69bece3ccb02e479994ef2dd55140de0d62a455538dce87b17bc10cf3e09b165109271c78af229d1b62cb074 WHIRLPOOL 5ccbd8842aab3d1e2b0141bacaed90605bed668e0f7912b0fdd8e2de091ec24a0a9264d35c536e10bc7b75f8a5c42a60832cc6a2c5dc5c98f955d908dd01886d
 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
@@ -68,5 +69,6 @@ EBUILD netbeans-9999_p20150529.ebuild 7216 SHA256 0b6009bdcf959d83bd1846e8e073db
 EBUILD netbeans-9999_p20150530.ebuild 7216 SHA256 085f889a4185c0322377a0a2ffb8dc426f1e62e483cf7423992ebc527eef2435 SHA512 307c44ff4d58b5a2b5ec0ae01be85edf98e8070be6a17e167fdf1d3cca3e64021709be882a54bfcbf10027c5813ee1e68d72ee9d8fa9bedf083b5130684e4967 WHIRLPOOL 0f6868ebbbf91961dfeae3865f92e584f8b00dd5ca2dcdaa58dcad04e415521ed71a303c47e94df5fa39c7ee8d987f8f5aa92131fa654d02c153f2a9d611b927
 EBUILD netbeans-9999_p20150601.ebuild 7216 SHA256 744d3a946ec58931611acfd440c459fc897ee7e104086f41a85bf5f93c04dd5a SHA512 1088f596f2f76eafdca93eca1491c436db0d8f33afd27e385b236110a7aef945cecb1e95a22991d0c1c8ed0da9c6fe00c08ea190743285295daafe3f951db56b WHIRLPOOL 2cc51c922da236bb8cd5c289891c45f5b63dccb475cdccff7baba1718ff2144b6ca6a3cb19896ecf242818c5357d8391fbb5f7235c03a69dfc3e97667605580b
 EBUILD netbeans-9999_p20150602.ebuild 7216 SHA256 2f89c318da5bb463b1d9b31c943ac0e6c6e4b032bbdf0b49c89c8580c9b7377a SHA512 d79f2e694c5229ac3e116e13d861786228fbe951ee17fa1494041b012574a1c079facbb29d4d7d27ad2a013c99352a69a5e415ebd0f66e6c4b520f1dceb1ca7d WHIRLPOOL b2affb1935d2b5fc91d14f5172c0824e41309c70daa3b097a50915acb9c68c3723941d348bf3ac24c986f27f3d6a6d6143bbf3cb95a29696749f31da0b181070
-MISC ChangeLog 151387 SHA256 0459019517ac7f0f645765719943da1bbe56591848c613e6eaabb53d2c57e743 SHA512 140b63d4bd76e5fd2edeadd1eb560fcc3ac56bea98f2aa40a5a8171b93b2f66a4c89957146e5e5fdb5361f728615e3198c7ac8ebb8702621f81f10c5dc87f0b8 WHIRLPOOL af162b2c7a94b96cece172cbc6329d3e19dc940af78e7aaa9193bad6cb8afbc0f170e39094aa91f238dd3c49d6d4ac6d4557a1f301b23b0377922ed5cd62086d
+EBUILD netbeans-9999_p20150603.ebuild 7216 SHA256 46251a2ff40cfb411973cc76556f3b2597252d26a615eb2feafc0a5fd8c0b229 SHA512 fe907cc16cbb746b10abe5e8d1a5f7225e914b31fcb9d1ffd1ec0ce4d13e213cfb18b61b6d34ff66a5ff22d40d9fcb73b98633fd748954abef558cf401e7c2b6 WHIRLPOOL 7fa4f1e15e3c4372f71c08e8b29c666893602d544bc75a2b9544e13f44679c59ed4e2133683ca20a32a9ddb9ad9bf4855240a80251a42a06cd23562b133640e5
+MISC ChangeLog 151546 SHA256 dc9772c59b760c4b25ec23bffc1d282bc9a673bb97891a5c5ae5586526118dcd SHA512 4dbc8d01a8a2101f7679837af6f481cd93eedac260f75b7de7700a781c965dab966cf8a1cd69f8f279f08ea169fcb1b4060bbe34ff1bd208cf04abb1cb432fac WHIRLPOOL ea7632807d93683107e1363fcb10fee19662d35d09230dd6b8f1c9b543b91915f0c64961dc0345f0c8562e66d5999b6f986d5a7d3d0983644c51e526bd6e1b9d
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

diff --git a/dev-util/netbeans/netbeans-9999_p20150603.ebuild b/dev-util/netbeans/netbeans-9999_p20150603.ebuild
new file mode 100644
index 0000000..d41e282
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20150603.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2015 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/2015-06-03_00-01-56/zip/netbeans-trunk-nightly-201506030001-src.zip"
+PATCHES_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2"
+L10N_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-9999-20131010.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-r14-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-r14-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
+}