[gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-harness/, dev-java/netbeans-webcommon/, dev-java/netbeans-ide/, ...

[Miroslav Šulc]

commit:     5bad2ade93ce1f2cc567c8c07fd09d841b9d983e
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat May 30 17:37:09 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat May 30 17:37:09 2015 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=5bad2ade

netbeans: bumped to the latest sources

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

diff --git a/dev-java/netbeans-apisupport/ChangeLog b/dev-java/netbeans-apisupport/ChangeLog
index d4951fe..5a64261 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_p20150530 (30 May 2015)
+
+  30 May 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-apisupport-9999_p20150530.ebuild:
+  bumped to the latest sources
+
 *netbeans-apisupport-9999_p20150529 (29 May 2015)
 
   29 May 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index c3da3e5..ee6575c 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -44,6 +44,7 @@ DIST netbeans-trunk-nightly-201505260001-src.zip 207634232 SHA256 15df00f2440c7d
 DIST netbeans-trunk-nightly-201505270357-src.zip 207634435 SHA256 894cd7284081fbb41d7295c08015bf7f6c7578023cb3b2c7488413c19a389f9b SHA512 a273255018cfae2335cffc1ccae90cfc42ec700d4051e03418f2b914e4978ae1aaf85f2b699c0b89cd8b19dfb43d9513fe3f6ace9eff569575e896f82e6eb2d8 WHIRLPOOL b5c5d6f9c166d3129864f830fa33b3c3ab5c6b03b4b5f0f96e2b8871c6f8bbceb0789bad8b7d045e717faa30ef29de2d07f5fdf415a2f65ac65ebe31866d6b60
 DIST netbeans-trunk-nightly-201505280001-src.zip 207639044 SHA256 61715449f3161ede9507bc6cef992c5fc8fbb0e7e8103962b5a06e2dd1742f47 SHA512 030550ee15839a75ef8aa5f6651de8c430eb07e4ce7413317030f76f362e9324530ab5e9e2d945b0cf4ba104459cdcc0a9db89d648d12df72f6b400739baeaf5 WHIRLPOOL 3ef1959e7c28b9de9882a4cbc3370db8e0432108d7072a53344d0281020731decbd70a36ec9e826c859111d47756707c85668349368bb49a25a60b1991812555
 DIST netbeans-trunk-nightly-201505290001-src.zip 207640635 SHA256 2547cf1181fa330f1ac519fbcc91ccc9e31497239f962ddcebeace72f4a6e2f2 SHA512 ab02d0ffd3aced66a79c8917980f5200bde50192c12b2a5fbc2def5122ff83525220581cacea70ee76e8bd1af377c67083fdbdde16d8de5f5550337aaa6e73e5 WHIRLPOOL 4d81036c5308b3dbb50743e688fcb8ee07c1a45aeba75f89a97a1e8d69e04119a456e6899cd7500eec5c0d03828d1f8b0a49637bdf5a9b3cd2b088f90311e4ca
+DIST netbeans-trunk-nightly-201505300811-src.zip 207777734 SHA256 e9b9f7d8613e07dfdc7cecbd4e323e400625985373cd226101638250c1042cc1 SHA512 2c72c85b85e7016d9863ee8033da81d26e14f2928e8dd703ec4c48b02165bb1d65ce331b66b0367cebe54bc1b233b68dbaad1705796751b1f6d87e34744de08a WHIRLPOOL 8967ee3280bbc33ff4b8e4246c31b4debf324886e0251f75330dce8c67443c5fde66d2ae7f13314abc43e8a8f577baa2a56ff69b3516cd2ece144a49525f7ecb
 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
@@ -82,5 +83,6 @@ EBUILD netbeans-apisupport-9999_p20150526.ebuild 3390 SHA256 db5beaba7533c5009c1
 EBUILD netbeans-apisupport-9999_p20150527.ebuild 3390 SHA256 22249e81cd80b39dc80b23ad08a3c6447db319053abd7ed97682f0498d365dae SHA512 d5c69388128622c25505c2b0c85a0302e178b1757954fc59c9e65e45d3088642bcb60767f5b7575efc0b250f9891f8ffbae10df89e37b90dffef281c31c89ed0 WHIRLPOOL 964ee5e857aa2097ef4f180d9cee769afbd2d2cc0b1f430124988e0ed84cdd09badfec58a6b1f10df4a7ee77df16da0a6e3d22dd05880ea7e846fcc5d02acf39
 EBUILD netbeans-apisupport-9999_p20150528.ebuild 3390 SHA256 ce753135548a4b143fde726cef244976bb09533207c12fd20a77dd94d8221fd5 SHA512 f8e398484a2fa19ea9fe8afc7ca871b97b27fc40268aa7bdc4e8132890bbce0d8e2be51a2821edde8cc416a006ec907a7f8ddb0c6390656e27281408bb6ddb67 WHIRLPOOL 8e8b856d1253e8cf737ca1d524bebd31106936da4139a179a581a23a27065cdbf49dffe7e34a6ac5b6704d93dbc5b4aefa573161afb1e55a6778a0c5a589571e
 EBUILD netbeans-apisupport-9999_p20150529.ebuild 3390 SHA256 45a42959617a3d010db7311d8546d7639527dfcea72632e84838cf23f1375834 SHA512 1841847f7b5d114faf62f364d66b3e1c4c24a5990a622b10f1e2c8c898fd4de5a613848157876235909586c3da4916d1c1322e2f0cb0d0564d86c3eaf33b9bea WHIRLPOOL eb142cfe43387305bfc4c7bddf599e156396689c74d7923c10ce040ee0d0b5f29b104dee7699f04dcd2f17054e14318612f51b91f07b69bdb1e4efa4b3d4e0fd
-MISC ChangeLog 172655 SHA256 c0f1493bc9956841a5d20db3c7689fc005e0f3c57e989181fad092d1a9c1cd45 SHA512 eedb6bb0cdeb8e542d93593c3568823246cf29e70e58305fdee1c3830390411b143cadf4f388d54e2a6c07261d257a523f33a5a4f574f7d2f9a62076c1235953 WHIRLPOOL d02ca365b275467ba12b11d2405a9838322bf90e5e09bcafece6532f181d5892bfd4ddb8634a197060e131647250b775d1954348b22de838159b9a56cca1e7a9
+EBUILD netbeans-apisupport-9999_p20150530.ebuild 3390 SHA256 ef79c7f6bb9b954eef1adf9761f55798b35625c298e4fb0b7f20f40b72fd9fa0 SHA512 7b75e4e683b3564f4c5abcf7f4db65efa039f40b36ac4818bcfb4158d942480a55436821a010bf6bdab6f0b42c363668137a9176766c773dc040c201db54050b WHIRLPOOL 8e8589cd4359f86b65cb3e8ae3b78d901f03de90f7821dc01b7b03e20b701478fb57e0996094eba7241b43a4f0941f735b0285e3bc8fc258243a9c3427110384
+MISC ChangeLog 172836 SHA256 e35cac904f79b816c964e2a6c5e44997169e1f11d02e82c67a9416d606d2ece5 SHA512 2c870c5fbbeff6a2830b3c65e4a7042ae7b7fd6a2caf7fbf0910d01f56ee279a299abe3402880057d0654ef556a480f1cc8a3d4cbcdb193ab3f2916c21dac92a WHIRLPOOL ee251dae40ac7479e124e848354b99c3956aadc2fd756b43e7f006ba1aa176bed532829fc9daaccd1525add8be088eb062414ddf0007c05aa41f18d70e8c8ff2
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150530.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150530.ebuild
new file mode 100644
index 0000000..a81f439
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150530.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-05-30_08-11-16/zip/netbeans-trunk-nightly-201505300811-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 48f2b63..8dc7868 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_p20150530 (30 May 2015)
+
+  30 May 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-cnd-9999_p20150530.ebuild:
+  bumped to the latest sources
+
 *netbeans-cnd-9999_p20150529 (29 May 2015)
 
   29 May 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index 2cf7414..c9dba3d 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -12,6 +12,7 @@ DIST A17998A985D048F3195B6ADE1A360440FCE30102-open-fortran-parser-0.7.1.2.zip 94
 DIST BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip 31891 SHA256 dd9105ad309b56d22ef08573ec48a5f21baa2c50f8606df9c7b6245abd9dbe72 SHA512 288229a85536a45fbae6ba5a4dc085fa2053264259f14833cd435f64191a4b2f4b93c3e9981589087ec293afbb0fc76e97d2b5312a196e3b3fed11a605ab650a WHIRLPOOL 69379d331a68e1c4eb15aa8b1ff5256c9b98d9fad4688f2d306841973b151fd22ddbca25c5388af39b487b8810a2e521ffefbbb9775cf02271626179c3810c04
 DIST C4CF9314A530E51B891D46DB65806A5A0ED240AF-cnd-build-trace-1.0.zip 27300 SHA256 8bcfad100ee9664b7fb2b6b8f20b14b3790121b06487e790214c571c9ec1f21e SHA512 21e69d6881efaa27ae91eb88cd851bb1e67c755668b1f96bdbdf8f4af2b2aee093c37b5edbb85317c22143083ea1fd1ca7386cb9523c32f502d86d933e27b739 WHIRLPOOL e09be2e79f88d6dd9d2e3cc89710fdcc67d4f825d44916a70a5625ec8b2f12112c9d9c0c39cd2e579d3c7846e9bfbf5ab709197cc784f5742a2ab9b22ae89b07
 DIST C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip 92177 SHA256 71e6d46d9c7e624bc83dbfa4edde20bfdcb47ae76dc2b19dd553d23f22b454e7 SHA512 64b15aa898a45c1dce0d9c58ec4ef8c3dc1a32e1213543d98002cbf5419d67b3caf4357c8a252e36951197f3edd70e34a226c989e5479ce3b2d1405783d3d530 WHIRLPOOL 675db7f81ecadcecfe52f18cf8bd465867c1dac12f818717248da9a7d071d45adeb3c6af2e6ac1863bb5ccca36ae9383722d2361c28af52e51e5f2ac34736e89
+DIST DA2DF3E815DADCD2B6A18AB8DD0ED832BA70D077-clank_0.3.6.zip 6865670 SHA256 fe921bfc83944ea1f00a01ea78b5f202b26b8dcd15687e13da2d3877608a7e83 SHA512 02e4e5ee4618ad53a2ba2553d86d6ade7c42e66e2372de575940dd1f72f7e4a864016bec28424ed5282022f60bcafa37cfbf31db069afb378365682809519fff WHIRLPOOL 646469d1e2434f760d8854b27810904f7b964c4e2e8d061bb365e8d1457fef962ae883b92b69b2eacc479fbe4131caadd35c8144a25548b42975724e16938f22
 DIST E0710C0DAFAA51881A5981061C4D94D3C4AC9FE6-open-fortran-parser-0.7.1.2.zip 94447 SHA256 e1a955c8a4468f8272e5bd769660e454bead719b2e0bad511167c410f75dfd1d SHA512 727e5f95961acd04fc44a42c9104887dcf82c832ac5f33b40954b88ae7c1ca2a9185a4c87906b5b80beaa371c8d0997edec463c549d3609798a190ea90881f64 WHIRLPOOL 43f9f3de0073c8b6c7fea32c06de18c991d11aad6e1746dfb05f736659999dc43e3b8056345e6ac4dead482f7a812c03f31a0a9ac777c8ea57569229a6f6acf4
 DIST netbeans-7.0-build.xml-r1.patch.bz2 1344 SHA256 f323cb4694f6351fe47b76fa8b8b3e3f8e456e7d45ca76f9b88c5c6b90cc103f SHA512 ec81bbef311f891dd4371644afd549bef460e8e70eed49f7dbb5aec68f386097f340a411932345ba7bc786a1aef1f0b70a719d8e784b048d5ebf8b1e9ef3bb44 WHIRLPOOL 5c4440c6e2b75209b00030d1e78c28600dc387cc836be8b74bd2d55a6426c5a10d57e21a9572b83f499aa9ed6c33e2ecce44a82c440bba818e4d22c1cf856a55
 DIST netbeans-7.0.1-201107282000-src.zip 175987235 SHA256 8bf4dd2375bc9fd02adf64ca9066118e0392a33428232ccf3f9091b96557b9aa SHA512 c2b4122d7bf8332455ac71d72e76d29bc31e13d892997e153ee1bb99a019f58bfc12179a24ab2bdaaf1c61ad823b7c24857523d0363ea6856b81a0aaef9d2eca WHIRLPOOL 296b51405e16e580101f15a459f4e07ec31ab353fec1e4c4d5ae79ff7d378e994291c7c378f380fbf83d1718366f38bbb3801834079db466a1c3bade099d7fd0
@@ -59,6 +60,7 @@ DIST netbeans-trunk-nightly-201505260001-src.zip 207634232 SHA256 15df00f2440c7d
 DIST netbeans-trunk-nightly-201505270357-src.zip 207634435 SHA256 894cd7284081fbb41d7295c08015bf7f6c7578023cb3b2c7488413c19a389f9b SHA512 a273255018cfae2335cffc1ccae90cfc42ec700d4051e03418f2b914e4978ae1aaf85f2b699c0b89cd8b19dfb43d9513fe3f6ace9eff569575e896f82e6eb2d8 WHIRLPOOL b5c5d6f9c166d3129864f830fa33b3c3ab5c6b03b4b5f0f96e2b8871c6f8bbceb0789bad8b7d045e717faa30ef29de2d07f5fdf415a2f65ac65ebe31866d6b60
 DIST netbeans-trunk-nightly-201505280001-src.zip 207639044 SHA256 61715449f3161ede9507bc6cef992c5fc8fbb0e7e8103962b5a06e2dd1742f47 SHA512 030550ee15839a75ef8aa5f6651de8c430eb07e4ce7413317030f76f362e9324530ab5e9e2d945b0cf4ba104459cdcc0a9db89d648d12df72f6b400739baeaf5 WHIRLPOOL 3ef1959e7c28b9de9882a4cbc3370db8e0432108d7072a53344d0281020731decbd70a36ec9e826c859111d47756707c85668349368bb49a25a60b1991812555
 DIST netbeans-trunk-nightly-201505290001-src.zip 207640635 SHA256 2547cf1181fa330f1ac519fbcc91ccc9e31497239f962ddcebeace72f4a6e2f2 SHA512 ab02d0ffd3aced66a79c8917980f5200bde50192c12b2a5fbc2def5122ff83525220581cacea70ee76e8bd1af377c67083fdbdde16d8de5f5550337aaa6e73e5 WHIRLPOOL 4d81036c5308b3dbb50743e688fcb8ee07c1a45aeba75f89a97a1e8d69e04119a456e6899cd7500eec5c0d03828d1f8b0a49637bdf5a9b3cd2b088f90311e4ca
+DIST netbeans-trunk-nightly-201505300811-src.zip 207777734 SHA256 e9b9f7d8613e07dfdc7cecbd4e323e400625985373cd226101638250c1042cc1 SHA512 2c72c85b85e7016d9863ee8033da81d26e14f2928e8dd703ec4c48b02165bb1d65ce331b66b0367cebe54bc1b233b68dbaad1705796751b1f6d87e34744de08a WHIRLPOOL 8967ee3280bbc33ff4b8e4246c31b4debf324886e0251f75330dce8c67443c5fde66d2ae7f13314abc43e8a8f577baa2a56ff69b3516cd2ece144a49525f7ecb
 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
@@ -97,5 +99,6 @@ EBUILD netbeans-cnd-9999_p20150526.ebuild 4586 SHA256 796a4f9ee19d9ff185f4edea73
 EBUILD netbeans-cnd-9999_p20150527.ebuild 4586 SHA256 48b0e7ade9674de4605e240d2ffeed3ca7611ae92a79404fc243f99b46d7422c SHA512 e08f74cce6ebdeb5df8e4e94d65f7595ded6dc5c3c286e5dfcbb82d186bd623e85f1f896ebf7f12e9cb87421fa20e54ea4d34d6d31a9eff1a4dbd32f96b41179 WHIRLPOOL 45636e70632198358c39cb1ebeba157be9400f077cb7830581383372c45017ba032a34eb480e101901be1c6110c56cd80c8aefabb2e985c5b3c0e5e56b0e2228
 EBUILD netbeans-cnd-9999_p20150528.ebuild 4586 SHA256 8c8ea3b3f0676331bbc2adef6ee9c830f73fb120523ae47f0892b944aa7a4934 SHA512 c6818afb3d774c193449d968a85f4d4fd1d1fd5e18f129e3cd317e80777de7e15cc9008c6ac807c345df8ab333a4d104841f1f46d9f4e647aa77148b49822a7d WHIRLPOOL 75f913f25052474df74734e25f289efb53d1046933c0f691bcaa1306d3e4138a803af972c2c9f3b109faa1fcb023a0eaf614f6558f7893805716678480a963cb
 EBUILD netbeans-cnd-9999_p20150529.ebuild 4586 SHA256 f1aaa6d0c8f0e52db16364fb9641c39fcff0502c4693bc7b18d570940024420a SHA512 6bbb0f79ea9634a8c8cdfd8f598a22be6889a388cc5eb334f711a3b5e7c206614f119bf5ccca6838c2053b019905cc248dc9ed152034d64a89062e3973caadc2 WHIRLPOOL 5e97c096a8a0a4ddc3927ff30900fc2de3331034752eb9f5ec37233a50241dc46b01803ad74390561d712cd7a84574f819e118973cede98315de316411529bed
-MISC ChangeLog 157618 SHA256 9b97ce1730c94c2f82016000869282a089dbcb8ec3fc1ddc2f16d0d44cbbaaaf SHA512 903cc086615daa88320913119438d6c9203e73412dc39b63f6aaf1662c59a91ef30a75033b835e85b77c1eea2b0b40e43416e16cf28e77c0586c144bad6c305d WHIRLPOOL 7ff29da9bec7e323596dd607b0a0f17fa058cf2b55ae771a072f996c11c44faf4ed31a56047c87c07da5e96bc3bf87c6418d166d89224b26b38da68ad5bf144a
+EBUILD netbeans-cnd-9999_p20150530.ebuild 4796 SHA256 c6c550a606485a71d280dc39feb80d13e73fb2ba662eb568e2555b941b366a10 SHA512 504cfbedcee2eac1961f252a8af4fff17cf129996f68c547652dc45ad706cda23707f1d97248fb7ef6702f125ce8fc031554d0be3b28eff9d4103e33a6159875 WHIRLPOOL 26e58f8ad7531156ab02a17a62541fc851b77906aed9c55a0519481542deb8c54c6eca49d29b8e2876888fc5330627edb47ff0fdb10b1d0e334d2ac6e9960ce3
+MISC ChangeLog 157785 SHA256 a24d4d094daa7769fad73683696bf6e00a0f08948b8faea6f3ed9c6ed381df07 SHA512 e67ea3fb14fa39178b1c74dce5de8525f53295b7dc513afa11309be5a53acf62f1747f67d410495e0e8ec2cd368748af656dd816ebc9ccb10ffe8ac8875c3a15 WHIRLPOOL c953dc515348dc47dfd30b0a2cbe02f1d427db8e510515eea82e39cbd72ceb9c06e4d817987d011c59cbc676c55cbf3418256674f774ed7ae7c0d7c2d5e6dd2c
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150530.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150530.ebuild
new file mode 100644
index 0000000..af9c40a
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150530.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-05-30_08-11-16/zip/netbeans-trunk-nightly-201505300811-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/DA2DF3E815DADCD2B6A18AB8DD0ED832BA70D077-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}"/DA2DF3E815DADCD2B6A18AB8DD0ED832BA70D077-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 4cd7e0d..2074a58 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_p20150530 (30 May 2015)
+
+  30 May 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-dlight-9999_p20150530.ebuild:
+  bumped to the latest sources
+
 *netbeans-dlight-9999_p20150529 (29 May 2015)
 
   29 May 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 5be518d..a338270 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -52,6 +52,7 @@ DIST netbeans-trunk-nightly-201505260001-src.zip 207634232 SHA256 15df00f2440c7d
 DIST netbeans-trunk-nightly-201505270357-src.zip 207634435 SHA256 894cd7284081fbb41d7295c08015bf7f6c7578023cb3b2c7488413c19a389f9b SHA512 a273255018cfae2335cffc1ccae90cfc42ec700d4051e03418f2b914e4978ae1aaf85f2b699c0b89cd8b19dfb43d9513fe3f6ace9eff569575e896f82e6eb2d8 WHIRLPOOL b5c5d6f9c166d3129864f830fa33b3c3ab5c6b03b4b5f0f96e2b8871c6f8bbceb0789bad8b7d045e717faa30ef29de2d07f5fdf415a2f65ac65ebe31866d6b60
 DIST netbeans-trunk-nightly-201505280001-src.zip 207639044 SHA256 61715449f3161ede9507bc6cef992c5fc8fbb0e7e8103962b5a06e2dd1742f47 SHA512 030550ee15839a75ef8aa5f6651de8c430eb07e4ce7413317030f76f362e9324530ab5e9e2d945b0cf4ba104459cdcc0a9db89d648d12df72f6b400739baeaf5 WHIRLPOOL 3ef1959e7c28b9de9882a4cbc3370db8e0432108d7072a53344d0281020731decbd70a36ec9e826c859111d47756707c85668349368bb49a25a60b1991812555
 DIST netbeans-trunk-nightly-201505290001-src.zip 207640635 SHA256 2547cf1181fa330f1ac519fbcc91ccc9e31497239f962ddcebeace72f4a6e2f2 SHA512 ab02d0ffd3aced66a79c8917980f5200bde50192c12b2a5fbc2def5122ff83525220581cacea70ee76e8bd1af377c67083fdbdde16d8de5f5550337aaa6e73e5 WHIRLPOOL 4d81036c5308b3dbb50743e688fcb8ee07c1a45aeba75f89a97a1e8d69e04119a456e6899cd7500eec5c0d03828d1f8b0a49637bdf5a9b3cd2b088f90311e4ca
+DIST netbeans-trunk-nightly-201505300811-src.zip 207777734 SHA256 e9b9f7d8613e07dfdc7cecbd4e323e400625985373cd226101638250c1042cc1 SHA512 2c72c85b85e7016d9863ee8033da81d26e14f2928e8dd703ec4c48b02165bb1d65ce331b66b0367cebe54bc1b233b68dbaad1705796751b1f6d87e34744de08a WHIRLPOOL 8967ee3280bbc33ff4b8e4246c31b4debf324886e0251f75330dce8c67443c5fde66d2ae7f13314abc43e8a8f577baa2a56ff69b3516cd2ece144a49525f7ecb
 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
@@ -90,5 +91,6 @@ EBUILD netbeans-dlight-9999_p20150526.ebuild 2995 SHA256 e60324fc3045ae2252e20f8
 EBUILD netbeans-dlight-9999_p20150527.ebuild 2995 SHA256 e6c8b3b9a8abd52c7415b96a8ff50c292235f61c5a0f3a269d899e9f2d027404 SHA512 5f58ecb37035e73304353a25eea7477206ff69e4269dc14c3b8537245e866c79b953c416a5c5ac42342659a21ba3669f8731bca0efe3bf860e790f1c52fe0204 WHIRLPOOL 0ed55303aae1dbb747eb5e2931c30e050c5cae12afbabea524650648ed0629b8448f1945e872c4fa7b9f0d20007a1ef0b1ac6840bfd40e24a42ceafecd2abf63
 EBUILD netbeans-dlight-9999_p20150528.ebuild 2995 SHA256 909de1de9a87390839a83adc5cf843293f9d4067a14af1e2c95b9ad386207738 SHA512 3fb9ea829c4ff73fd42235e21337707ee6a41f2a70b0ad17a52f11ba6aeaa6bb4cc013a134772fe5a57d2142c8ddd672f3f355dc1a01c8da70d28ec5cdde17bb WHIRLPOOL a79abc1c26d31db74990eba445791d4edc78c163be194c9014053b6dd35c72e675e5f5d03adebb6caa676a2b815e889adefc6e24e46f0394014371c8375777d6
 EBUILD netbeans-dlight-9999_p20150529.ebuild 2995 SHA256 a4a0f330753526d56b9016f777a6cfb4fa36226a8be8954f4974d1f01443971b SHA512 17b50d158494c240b445bf035b8c53d3256d81dab1f70f7c87621d72186fe0f65223dfe9bbec3e593e4d37effef0fc325c95b35ecd011cd49d1b09284af0288d WHIRLPOOL 1956d581f84d06cbfefe3d8b676dccb9291ec6a23bf5ea8db3e772e398ef22aba5b0174228dd6a76d6109fb554e90586dffba0dbaa749378cdd1c078a0008541
-MISC ChangeLog 164488 SHA256 734a2ff63980e047882f40f04d78bc0988a3459eb1a24ce6ca153459874d9957 SHA512 cd329a0ff37aba410b265f91222bef0c3f5b971f15f6da1eeedc110015f34fa8df20efb960cfaeb7f7543bb52e56a79c538561fed27c2e98549313126efcb06d WHIRLPOOL 4b14c231169682899e74b1eed8fbf032bbf9b5559f6d4505bb0cfd3c6c17331856cc5bff85627b99fcd43cf04bd1832a112335e75d3dd2953df6f1011f14e542
+EBUILD netbeans-dlight-9999_p20150530.ebuild 2995 SHA256 ebb5469756b133d995fecf8916ba1672191425d6ea0176be86cb56e042045527 SHA512 fbc33dbc99fe9ee50f6875a51f4f77864f7eb69bb718e61984ea868c6dee40ea93d48c852c010a6c2337cced2400b07500c104bec44b0788fa519ed99f273e00 WHIRLPOOL 31462e15e837a7fc1c9d89b131d2f50c2d38ff9da081a2a732a888d91bdbe79e94856f64b9fbb37b17775ba930d84aeb2167f83cf5a6f2d6daacf64ae7c7b4a6
+MISC ChangeLog 164661 SHA256 7137f9ad5e31913331da22bf635d0a53cd1e8792e41dbdc8dc4ae4ce947e1718 SHA512 ff416064773847f12410888e93d52f537bbea4d80e93d698945f93665decb28ac5e1818e25e288c2b958d1e87f71236f15919c6cac9d524c82beac21fad85475 WHIRLPOOL 8b67562ed1020701d7c81f23e2a5579cdf6c4b53da54bc37fc3f544248f42e12b5e21ae6d985eef887b31e12c2d5a359b7acf7af53aa94c729f202614a06c136
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150530.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150530.ebuild
new file mode 100644
index 0000000..e823760
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150530.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-05-30_08-11-16/zip/netbeans-trunk-nightly-201505300811-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 3452ac8..b02fb85 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_p20150530 (30 May 2015)
+
+  30 May 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-enterprise-9999_p20150530.ebuild:
+  bumped to the latest sources
+
 *netbeans-enterprise-9999_p20150529 (29 May 2015)
 
   29 May 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 4ec42e8..bda6640 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -133,6 +133,7 @@ DIST netbeans-trunk-nightly-201505260001-src.zip 207634232 SHA256 15df00f2440c7d
 DIST netbeans-trunk-nightly-201505270357-src.zip 207634435 SHA256 894cd7284081fbb41d7295c08015bf7f6c7578023cb3b2c7488413c19a389f9b SHA512 a273255018cfae2335cffc1ccae90cfc42ec700d4051e03418f2b914e4978ae1aaf85f2b699c0b89cd8b19dfb43d9513fe3f6ace9eff569575e896f82e6eb2d8 WHIRLPOOL b5c5d6f9c166d3129864f830fa33b3c3ab5c6b03b4b5f0f96e2b8871c6f8bbceb0789bad8b7d045e717faa30ef29de2d07f5fdf415a2f65ac65ebe31866d6b60
 DIST netbeans-trunk-nightly-201505280001-src.zip 207639044 SHA256 61715449f3161ede9507bc6cef992c5fc8fbb0e7e8103962b5a06e2dd1742f47 SHA512 030550ee15839a75ef8aa5f6651de8c430eb07e4ce7413317030f76f362e9324530ab5e9e2d945b0cf4ba104459cdcc0a9db89d648d12df72f6b400739baeaf5 WHIRLPOOL 3ef1959e7c28b9de9882a4cbc3370db8e0432108d7072a53344d0281020731decbd70a36ec9e826c859111d47756707c85668349368bb49a25a60b1991812555
 DIST netbeans-trunk-nightly-201505290001-src.zip 207640635 SHA256 2547cf1181fa330f1ac519fbcc91ccc9e31497239f962ddcebeace72f4a6e2f2 SHA512 ab02d0ffd3aced66a79c8917980f5200bde50192c12b2a5fbc2def5122ff83525220581cacea70ee76e8bd1af377c67083fdbdde16d8de5f5550337aaa6e73e5 WHIRLPOOL 4d81036c5308b3dbb50743e688fcb8ee07c1a45aeba75f89a97a1e8d69e04119a456e6899cd7500eec5c0d03828d1f8b0a49637bdf5a9b3cd2b088f90311e4ca
+DIST netbeans-trunk-nightly-201505300811-src.zip 207777734 SHA256 e9b9f7d8613e07dfdc7cecbd4e323e400625985373cd226101638250c1042cc1 SHA512 2c72c85b85e7016d9863ee8033da81d26e14f2928e8dd703ec4c48b02165bb1d65ce331b66b0367cebe54bc1b233b68dbaad1705796751b1f6d87e34744de08a WHIRLPOOL 8967ee3280bbc33ff4b8e4246c31b4debf324886e0251f75330dce8c67443c5fde66d2ae7f13314abc43e8a8f577baa2a56ff69b3516cd2ece144a49525f7ecb
 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
@@ -171,5 +172,6 @@ EBUILD netbeans-enterprise-9999_p20150526.ebuild 15937 SHA256 277c387ea3d3b8a30f
 EBUILD netbeans-enterprise-9999_p20150527.ebuild 15937 SHA256 8df2473fbb494511e7ef8c852b1ef75fe96ff27a8c40e45328f0b9a8d1ded084 SHA512 80302e80e38503a8a47bd182c3ae924adf574dfbf91f57d3fa875a4791fd3eb90043507b9c72182af455c5455eca936c70572a9f079f3398fe789c6173de149d WHIRLPOOL 9c643964fdd5778e5aae6f7325e9768858d8c7014edbb1982b3f35cc27dc83d11ec5c8c26f22131d12ba06f54769969aa47a3777f6126379814be5336a0be268
 EBUILD netbeans-enterprise-9999_p20150528.ebuild 15937 SHA256 c71244f32eef3f87091341c5e7d4219b6506fc59fc7a82ba560137861841b717 SHA512 bfd810c6b190ca0c9d73c72057e750e8d8d9774ac583aa8daa9da95a78a9570f573cd3a2eeadbae6c530a92debf240de3f691312018ac64104d873b26056144d WHIRLPOOL d03e75a7e9703d169cda1e154176eace1752ed4c9edea081dea7cad13aba58ffba39bf1199d52ba3809ebebc9a33d7ee61480d02b3c29106220535a801975a0e
 EBUILD netbeans-enterprise-9999_p20150529.ebuild 15937 SHA256 a8b784ec1d64ec5f9159f1b87478cf4c67c0297f29461b1dea329f53b6fc1c03 SHA512 ce8ad66cb3cdeda4df421e8ad64132bb3f8744a6531aca844d54960ec92719c095e663a39cae8f5ec583e5a9e3e80ee42589f477178c9ddc60396dec960436ed WHIRLPOOL be56d99f20822c9ba502f762b1603b4310cf99cf00512820bf395be3622320563493fd04d70defac64a470166c795d5db76a82931061674f09feed6bf77c242b
-MISC ChangeLog 173180 SHA256 d5c68dee9fb5aa22f6187912ef1b09384de9aca2aa18009804f22aafb764a378 SHA512 a3ba8225fb30b7c6f1c82a564533b4c1498661492de93172feca69389cdd41af246c6ac7c1539a6c5aaddd7395e501db9fdcfb687751ca74451a73f1d9d15157 WHIRLPOOL f567168c758e9937bf88e5d3e47728f4e7b7b09d0a1c856920452cce6ef088dc41ee48b6e60ce2ef727d02f31d24b3f9cf2604aee6890e775fdd8daf3eefa7fc
+EBUILD netbeans-enterprise-9999_p20150530.ebuild 15937 SHA256 fd98a8fa2e7615fa2148c4f006f88fdbf67a8c41469a7381e881e15e43490d84 SHA512 ceb8186c08047757313c289caf28cf41a661ad2663c14bdaa25f4ae69f1a7d25b9289f07e5e3f1a5d41dee1b7af3c5bce683fae01ba9a134ec8c4bd4b6f0cdfa WHIRLPOOL 8e71497302e03dab418f418154d4e2d4cb756313943ca1abc4b9b06dddf81357ae8b9ebb514a5bde1234a50724406fcf83ab1e06467d1c403bed12f5b5034de3
+MISC ChangeLog 173361 SHA256 e13734608a335045cc2da8466072e175e3df68c98270be3ef72aa2b10d44cbcf SHA512 7692354d53456b9905944c154ed75bdcda640a78eda9790865a3b95582525a9c6da8c24bb802d3d54d151859775db5e99f23243457fa6674ddbd8becd85be924 WHIRLPOOL 377b9cd7b9b0aba2d2f52d060758388cabe36d8111bcb0ccb33555e4530b7d23b91325eee9875896d25033f51636ce616494e5b91c906c5433c3374d8de5fe28
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150530.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150530.ebuild
new file mode 100644
index 0000000..1738e87
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150530.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-05-30_08-11-16/zip/netbeans-trunk-nightly-201505300811-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 cfdc96c..ac62bf6 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_p20150530 (30 May 2015)
+
+  30 May 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-ergonomics-9999_p20150530.ebuild:
+  bumped to the latest sources
+
 *netbeans-ergonomics-9999_p20150529 (29 May 2015)
 
   29 May 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index b2b49e7..b32531e 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -44,6 +44,7 @@ DIST netbeans-trunk-nightly-201505260001-src.zip 207634232 SHA256 15df00f2440c7d
 DIST netbeans-trunk-nightly-201505270357-src.zip 207634435 SHA256 894cd7284081fbb41d7295c08015bf7f6c7578023cb3b2c7488413c19a389f9b SHA512 a273255018cfae2335cffc1ccae90cfc42ec700d4051e03418f2b914e4978ae1aaf85f2b699c0b89cd8b19dfb43d9513fe3f6ace9eff569575e896f82e6eb2d8 WHIRLPOOL b5c5d6f9c166d3129864f830fa33b3c3ab5c6b03b4b5f0f96e2b8871c6f8bbceb0789bad8b7d045e717faa30ef29de2d07f5fdf415a2f65ac65ebe31866d6b60
 DIST netbeans-trunk-nightly-201505280001-src.zip 207639044 SHA256 61715449f3161ede9507bc6cef992c5fc8fbb0e7e8103962b5a06e2dd1742f47 SHA512 030550ee15839a75ef8aa5f6651de8c430eb07e4ce7413317030f76f362e9324530ab5e9e2d945b0cf4ba104459cdcc0a9db89d648d12df72f6b400739baeaf5 WHIRLPOOL 3ef1959e7c28b9de9882a4cbc3370db8e0432108d7072a53344d0281020731decbd70a36ec9e826c859111d47756707c85668349368bb49a25a60b1991812555
 DIST netbeans-trunk-nightly-201505290001-src.zip 207640635 SHA256 2547cf1181fa330f1ac519fbcc91ccc9e31497239f962ddcebeace72f4a6e2f2 SHA512 ab02d0ffd3aced66a79c8917980f5200bde50192c12b2a5fbc2def5122ff83525220581cacea70ee76e8bd1af377c67083fdbdde16d8de5f5550337aaa6e73e5 WHIRLPOOL 4d81036c5308b3dbb50743e688fcb8ee07c1a45aeba75f89a97a1e8d69e04119a456e6899cd7500eec5c0d03828d1f8b0a49637bdf5a9b3cd2b088f90311e4ca
+DIST netbeans-trunk-nightly-201505300811-src.zip 207777734 SHA256 e9b9f7d8613e07dfdc7cecbd4e323e400625985373cd226101638250c1042cc1 SHA512 2c72c85b85e7016d9863ee8033da81d26e14f2928e8dd703ec4c48b02165bb1d65ce331b66b0367cebe54bc1b233b68dbaad1705796751b1f6d87e34744de08a WHIRLPOOL 8967ee3280bbc33ff4b8e4246c31b4debf324886e0251f75330dce8c67443c5fde66d2ae7f13314abc43e8a8f577baa2a56ff69b3516cd2ece144a49525f7ecb
 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
@@ -82,5 +83,6 @@ EBUILD netbeans-ergonomics-9999_p20150526.ebuild 2919 SHA256 0bee6f48b662c0188e9
 EBUILD netbeans-ergonomics-9999_p20150527.ebuild 2919 SHA256 9adbf2e8d753b1d3b048132f5caa64593e29a67e419a6f263babfe98fd4fdb09 SHA512 7b257cb2fb0de48c7800909bc66f046e26d7ee6d33887c88f7017f030a4d4fadbd5b4b03c8a7d4a1d1ae7c07608bf8e7819cb536ef561a251f0127910bfd9c11 WHIRLPOOL c4981d646e6de588f2757315ce3138654ea92648f27eb8352ccc298df45f359d12a9a3c31a1a85eac6034a17ecc73a11beee802b6ee3d6e2122020f5c2c57b33
 EBUILD netbeans-ergonomics-9999_p20150528.ebuild 2919 SHA256 c335dfca9149acfd4d0fee09fd8cd30119d01b6a91e8e741f73e633a168e599c SHA512 e8c75a69141ca2c0df8c3524e639decdb3928e3fff0ac097045f1764cf60b4bbff1f7366dcc5038284da919974e83029c179fa1a181d23a4e4a2f72bb41785fb WHIRLPOOL ca2b90a67b513f743866af61e1709257976d17f3b74f5039817aee498ead0f6030c9b90f39fb31d64b5ef821767352b2c3647c7a53362f1e43eee7b81672d567
 EBUILD netbeans-ergonomics-9999_p20150529.ebuild 2919 SHA256 e53d9695fa4d8f8d616d3365e055a9367e553175a7948dfe172908be4896ec37 SHA512 569a8b8d73d0fa9e5f1e8d41ade476914aeaa9f3ef7e4a0cdfe55b16049f340e8ed74f53f5b16438c62ee03a665a8cf62491fec7086f195b3c713a0ea7476f17 WHIRLPOOL 0ad038723e208c31e5249b472753b7871e5a146279ef9a4cae1c3dcdbf048ae56652f41f69b08f43bbb27b883779b1a3183d887339126d08d809a58b2abc4ad8
-MISC ChangeLog 172655 SHA256 77d088600cc120bb192d8991a52f3797e5f4587dea5449ee8f8d82db47c415cb SHA512 fb3e8c723c4e48ad7832c29373e23dfbadab361e3dc9e3200c33031ce3161df24535a6ec15f8619c37d83d025dafd63534cdfecf98d185499938f6832a9f40c0 WHIRLPOOL 62957f4ad8b54f80b8fec67c46c2add46d007ba7fc9c70c7dd9ca6167350b9b93fcf5af7d02c263a75a5b4d8cca9724d7dd811b8be202513ebad7ba7f08f7d0d
+EBUILD netbeans-ergonomics-9999_p20150530.ebuild 2919 SHA256 a4fe9923b76d109c44003bd56a84983484d56cbb52e5ab41ce69d17b858a59ea SHA512 2521461339ba9e9958574366e7a64a33c88ac683dee3277af201a3290bdf0ac6927c77fd90fb0dc93b866462c5af370fe4209bbcab7b25189384ba13b3f688c8 WHIRLPOOL fda13d7b49fc9b64feb1566c1b7e839e1abd706d87361a6e50800bec9f8188bc2e34486345bf831d08c469a1e2771b53abc904a8510d2369406897ffc4b6ff80
+MISC ChangeLog 172836 SHA256 42b50441041c32b1f12e9bc7860c4dc98636409ad19ffed02536f7a52c8c4e35 SHA512 e299b3eef89d2f85d78abae0048d4a1143fdf709abb9cc655e17c5ba13f3b9225d0cfc6ec2668bd998d3a4cc51a41a40a09004be839f5381f7f3b5cfb60009a8 WHIRLPOOL 0b9e756ee28c6dacb2fc880cbe24da3c13794872890c0b9b4cc1408b5984a321842e71e36c5365c1793b505ba7f031f6437434564aa2b5f27f53e18fc4a8b3a6
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150530.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150530.ebuild
new file mode 100644
index 0000000..2e8bd48
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150530.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-05-30_08-11-16/zip/netbeans-trunk-nightly-201505300811-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 10702c6..b2626eb 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_p20150530 (30 May 2015)
+
+  30 May 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-extide-9999_p20150530.ebuild:
+  bumped to the latest sources
+
 *netbeans-extide-9999_p20150529 (29 May 2015)
 
   29 May 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index 390daa9..c657dec 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -42,6 +42,7 @@ DIST netbeans-trunk-nightly-201505260001-src.zip 207634232 SHA256 15df00f2440c7d
 DIST netbeans-trunk-nightly-201505270357-src.zip 207634435 SHA256 894cd7284081fbb41d7295c08015bf7f6c7578023cb3b2c7488413c19a389f9b SHA512 a273255018cfae2335cffc1ccae90cfc42ec700d4051e03418f2b914e4978ae1aaf85f2b699c0b89cd8b19dfb43d9513fe3f6ace9eff569575e896f82e6eb2d8 WHIRLPOOL b5c5d6f9c166d3129864f830fa33b3c3ab5c6b03b4b5f0f96e2b8871c6f8bbceb0789bad8b7d045e717faa30ef29de2d07f5fdf415a2f65ac65ebe31866d6b60
 DIST netbeans-trunk-nightly-201505280001-src.zip 207639044 SHA256 61715449f3161ede9507bc6cef992c5fc8fbb0e7e8103962b5a06e2dd1742f47 SHA512 030550ee15839a75ef8aa5f6651de8c430eb07e4ce7413317030f76f362e9324530ab5e9e2d945b0cf4ba104459cdcc0a9db89d648d12df72f6b400739baeaf5 WHIRLPOOL 3ef1959e7c28b9de9882a4cbc3370db8e0432108d7072a53344d0281020731decbd70a36ec9e826c859111d47756707c85668349368bb49a25a60b1991812555
 DIST netbeans-trunk-nightly-201505290001-src.zip 207640635 SHA256 2547cf1181fa330f1ac519fbcc91ccc9e31497239f962ddcebeace72f4a6e2f2 SHA512 ab02d0ffd3aced66a79c8917980f5200bde50192c12b2a5fbc2def5122ff83525220581cacea70ee76e8bd1af377c67083fdbdde16d8de5f5550337aaa6e73e5 WHIRLPOOL 4d81036c5308b3dbb50743e688fcb8ee07c1a45aeba75f89a97a1e8d69e04119a456e6899cd7500eec5c0d03828d1f8b0a49637bdf5a9b3cd2b088f90311e4ca
+DIST netbeans-trunk-nightly-201505300811-src.zip 207777734 SHA256 e9b9f7d8613e07dfdc7cecbd4e323e400625985373cd226101638250c1042cc1 SHA512 2c72c85b85e7016d9863ee8033da81d26e14f2928e8dd703ec4c48b02165bb1d65ce331b66b0367cebe54bc1b233b68dbaad1705796751b1f6d87e34744de08a WHIRLPOOL 8967ee3280bbc33ff4b8e4246c31b4debf324886e0251f75330dce8c67443c5fde66d2ae7f13314abc43e8a8f577baa2a56ff69b3516cd2ece144a49525f7ecb
 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
@@ -76,5 +77,6 @@ EBUILD netbeans-extide-9999_p20150526.ebuild 3383 SHA256 cc603dd5da234966a7562ae
 EBUILD netbeans-extide-9999_p20150527.ebuild 3383 SHA256 c1a497f306c466dc44fed3672b4fa0995aa5086d2104da533223593dc80a734b SHA512 efdd37dbb263ea211de9a874f54295143402310d181c98aefe457dbceed304ae4c62cf7356ab028d8ddbbe805ec28ef4ca86973084158e1074f5e76d889e54d7 WHIRLPOOL 473dfced7d0159c32a7710f4eab58f47021a5b6ca2b5183bc40e530f391e3b32a80271b589e200125cebd4ef66f81d79a8594a84b93527c61fb3637157a0b9e2
 EBUILD netbeans-extide-9999_p20150528.ebuild 3383 SHA256 5b34c8bedb7f1bc96f4e87276f8a7b651377376781adc6ca8f3aa6f6413fc40b SHA512 285df24e9d6884c66f5eb18768fce3a222b75a06099dc1339939a9d88988829387daaf24c8367244a269f8217872c4f0ca4c528b63c60dc0e766fb91b54ebd01 WHIRLPOOL c79fd902d04a55156e54e9a6bbfc38b3ea8e4158b1f3b0f5852d05fc5066eb45219beece78b20f9c1cf766bbb2dd4c7198b5a76faa1c43e359c021c8dc92fafa
 EBUILD netbeans-extide-9999_p20150529.ebuild 3383 SHA256 e60f8163b953ab0052d407b977ba12828df8dc297603b10bc51af687eb56f37e SHA512 039bb3b014b6ffc121c2902fb901b5c47da9282951ae3b201ac39060adaa6811eb3673add05d43a357c7527ca4e16558238eea2ea1b26d47e6488a8270fb45c0 WHIRLPOOL 4b24d6e786f0bc92737e4ccddbe60f181d17f66dec088a24f71aa4e4dc73363885f240fdeff1d7f83654a1805c4bb3d14f62f1d0ea3684a5023e66833b272612
-MISC ChangeLog 96398 SHA256 f6c9f67e16c9ec7faa68a762ee9699351b904731cde97324a2572b280f7107f5 SHA512 51cfb74fc36b96dd0ea270b55449d0aa6555efb02c667a3446e98f5237dced56413705b3960c412e56a602f175dac9542f4231b1eb9a78495d5bf5abc27a6974 WHIRLPOOL 9b375c861b1310ebcd2d13d527c54d44da65c7c1907c88b0a992e60bbb866c3d76db0bac07bd18c2d3f8f96236082c5b1569332a963444a873279cfadc0b0dc2
+EBUILD netbeans-extide-9999_p20150530.ebuild 3383 SHA256 3e3178d9556ec5894e44bae14e398788597bfc2b9c4939069c2ea10335b97c3c SHA512 484f8bbd4c00fbd0e3512bd52d085268c88b069cbba386abc4de821c776999c3a054347c1589746916fdae100f05eba583fa8b9f1d15e397f21cb094e4c3af89 WHIRLPOOL aef88ea83aa31424ccdb4d72280228e8755024984e2ba0684600d6015ef43240d44f3ba7cda711c91f51bb644c7708fb4e24cce3ac2ea2d65b8bc6553af5fd0a
+MISC ChangeLog 96571 SHA256 3498dd1ad330363206a79fafb3f9753561f6e1dea4105a9ca69d258a7c674c07 SHA512 532483927e3d1caa104dd74da3c511d9a9d71b39d2ff749f54b313b1663599b38915227df5b5fc905c2329a677ae12781105d91b76daa0a7ce06f1f673e536ae WHIRLPOOL 5667fb540d8cbfe843952adc2f78f009697b517f875c80d8d39966230dd81556d974caa047c84458a06ec03fdb06049d541d57349e3e302b14d25ffb70b0c07d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20150530.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20150530.ebuild
new file mode 100644
index 0000000..4f4d208
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20150530.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-05-30_08-11-16/zip/netbeans-trunk-nightly-201505300811-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 a503138..dd3fc4b 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_p20150530 (30 May 2015)
+
+  30 May 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-groovy-9999_p20150530.ebuild:
+  bumped to the latest sources
+
 *netbeans-groovy-9999_p20150529 (29 May 2015)
 
   29 May 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index f4e1dca..16eb8bd 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -48,6 +48,7 @@ DIST netbeans-trunk-nightly-201505260001-src.zip 207634232 SHA256 15df00f2440c7d
 DIST netbeans-trunk-nightly-201505270357-src.zip 207634435 SHA256 894cd7284081fbb41d7295c08015bf7f6c7578023cb3b2c7488413c19a389f9b SHA512 a273255018cfae2335cffc1ccae90cfc42ec700d4051e03418f2b914e4978ae1aaf85f2b699c0b89cd8b19dfb43d9513fe3f6ace9eff569575e896f82e6eb2d8 WHIRLPOOL b5c5d6f9c166d3129864f830fa33b3c3ab5c6b03b4b5f0f96e2b8871c6f8bbceb0789bad8b7d045e717faa30ef29de2d07f5fdf415a2f65ac65ebe31866d6b60
 DIST netbeans-trunk-nightly-201505280001-src.zip 207639044 SHA256 61715449f3161ede9507bc6cef992c5fc8fbb0e7e8103962b5a06e2dd1742f47 SHA512 030550ee15839a75ef8aa5f6651de8c430eb07e4ce7413317030f76f362e9324530ab5e9e2d945b0cf4ba104459cdcc0a9db89d648d12df72f6b400739baeaf5 WHIRLPOOL 3ef1959e7c28b9de9882a4cbc3370db8e0432108d7072a53344d0281020731decbd70a36ec9e826c859111d47756707c85668349368bb49a25a60b1991812555
 DIST netbeans-trunk-nightly-201505290001-src.zip 207640635 SHA256 2547cf1181fa330f1ac519fbcc91ccc9e31497239f962ddcebeace72f4a6e2f2 SHA512 ab02d0ffd3aced66a79c8917980f5200bde50192c12b2a5fbc2def5122ff83525220581cacea70ee76e8bd1af377c67083fdbdde16d8de5f5550337aaa6e73e5 WHIRLPOOL 4d81036c5308b3dbb50743e688fcb8ee07c1a45aeba75f89a97a1e8d69e04119a456e6899cd7500eec5c0d03828d1f8b0a49637bdf5a9b3cd2b088f90311e4ca
+DIST netbeans-trunk-nightly-201505300811-src.zip 207777734 SHA256 e9b9f7d8613e07dfdc7cecbd4e323e400625985373cd226101638250c1042cc1 SHA512 2c72c85b85e7016d9863ee8033da81d26e14f2928e8dd703ec4c48b02165bb1d65ce331b66b0367cebe54bc1b233b68dbaad1705796751b1f6d87e34744de08a WHIRLPOOL 8967ee3280bbc33ff4b8e4246c31b4debf324886e0251f75330dce8c67443c5fde66d2ae7f13314abc43e8a8f577baa2a56ff69b3516cd2ece144a49525f7ecb
 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
@@ -86,5 +87,6 @@ EBUILD netbeans-groovy-9999_p20150526.ebuild 3422 SHA256 49ddc4517e76440e12192e4
 EBUILD netbeans-groovy-9999_p20150527.ebuild 3422 SHA256 613b269a7608e93b205f1f97caee55081de7ec53459767c25344e36fd4305a1e SHA512 861526d4a21e2a01bdbf6af42074dbe5f5923bd2414693cf13cf26b3124f1a3043f441708df68a8d1b35e22d6affbc927d84ceeee6fecd319c3b19028b6cd41c WHIRLPOOL 8d3d8814e182e0232f2c73e0ea5c5763d1b2533d2a054d1791d98bdcf268cc5a5d54babdaca9302af5aa784ddf21cc21dc38d5801d701f3578757c150935c804
 EBUILD netbeans-groovy-9999_p20150528.ebuild 3422 SHA256 beb721c0e3897ebad39b8c8c65f7d46820a667f057335e83d204218a26178c17 SHA512 edc93f64cf329a6aa232a6ef22ef96dd5a25a60b3dd7a5dd3fdb2d427aa67487922811adfd00936831bef806e4a81f366acb3d6f73fb265799fc6ce73cc89789 WHIRLPOOL 861d489db8b84a651cb5f9e80dc02a1b019c976c131aa97e162848ef0f66e86d0aa04bddac571ac3f7098cec2dcbe4166dd75bb95a802b8a12d65cff30bc51cd
 EBUILD netbeans-groovy-9999_p20150529.ebuild 3422 SHA256 49a9fb4979bdec591587e12a2e8b82520ddbaf16056c0542b4ecbde38036551e SHA512 b7e9333525e8e8bcac38d481baa3791842845a85ff79581175b47f35eff070dbafd443361a671288a1cb0b64f3fcc4abcaf994c8b6e97b319fe687adbef99d12 WHIRLPOOL 43049c908fdd05c4e539bd15d31e89c8649918fc423ad12278474f5dd27c5eca365f092f7b048fb89756dac4574dee3af548345fc29ad139a8adc61adf5b629e
-MISC ChangeLog 164378 SHA256 ebf376c4de53cabbe7d5bf7e64c69408ccc90f3e2fc6ed6dd544b910b2486001 SHA512 fe9629b29db338f7a9590b5cb78c39027cf691badafbe4a7afec54682617f76553d07f669de317a9941bac4adc5a445990b570bbd39455bf9a8312986607eea2 WHIRLPOOL 82cde94f9eed3eac8891a06a0d713170a0cc26316b1e36ab6cd0c5c1047ccbd4cdf39e72123c682d916c40a757e160d01e994be8d9a2af447c61c0a59e8741f1
+EBUILD netbeans-groovy-9999_p20150530.ebuild 3422 SHA256 4fe5347da032cb3fada6d8ad5ef9307a506e6c01dc935df78856dd8d019539ee SHA512 47b40e4fc535097c82dbcdf2e83c0ae72e0f3fb2a64db6d835fb5a03d697ebccc95ca2d126cabcb727c4c54e6fa4c1ea6f2f0f36520c7c5b1fb63480e8e52d61 WHIRLPOOL af949214df52b2ba21c6a9ef869c6c6ab0104f96833f3a3f8371487fe13cf548ddd5a5effa78dc539033d5062491a8d2a6e6ad32aed4809a0e346ff62143bc11
+MISC ChangeLog 164551 SHA256 03ba6e02b4420edb1530a8285e916e2125cd277f25ab9f5f60cbede56647d126 SHA512 a2bc5abdecf8e30834be70c33581fd9189a249abd17a37bbf9f01acb79b1cd967c5bb4132e981aadbd81f2005479481b26c907e0b75696e0fe3369b78938b0c3 WHIRLPOOL da7f4bd54a59d93e63e9a00282cea9dab2c23f9715b0c9611f0d5e4db77117d34673d778593fda4239f85dae2853d52f660d427e7add532dd4b15a11ee580c69
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150530.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150530.ebuild
new file mode 100644
index 0000000..4506a79
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150530.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-05-30_08-11-16/zip/netbeans-trunk-nightly-201505300811-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 c32e1b6..989e153 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_p20150530 (30 May 2015)
+
+  30 May 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-harness-9999_p20150530.ebuild:
+  bumped to the latest sources
+
 *netbeans-harness-9999_p20150529 (29 May 2015)
 
   29 May 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 4e21e44..935a4a3 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -50,6 +50,7 @@ DIST netbeans-trunk-nightly-201505260001-src.zip 207634232 SHA256 15df00f2440c7d
 DIST netbeans-trunk-nightly-201505270357-src.zip 207634435 SHA256 894cd7284081fbb41d7295c08015bf7f6c7578023cb3b2c7488413c19a389f9b SHA512 a273255018cfae2335cffc1ccae90cfc42ec700d4051e03418f2b914e4978ae1aaf85f2b699c0b89cd8b19dfb43d9513fe3f6ace9eff569575e896f82e6eb2d8 WHIRLPOOL b5c5d6f9c166d3129864f830fa33b3c3ab5c6b03b4b5f0f96e2b8871c6f8bbceb0789bad8b7d045e717faa30ef29de2d07f5fdf415a2f65ac65ebe31866d6b60
 DIST netbeans-trunk-nightly-201505280001-src.zip 207639044 SHA256 61715449f3161ede9507bc6cef992c5fc8fbb0e7e8103962b5a06e2dd1742f47 SHA512 030550ee15839a75ef8aa5f6651de8c430eb07e4ce7413317030f76f362e9324530ab5e9e2d945b0cf4ba104459cdcc0a9db89d648d12df72f6b400739baeaf5 WHIRLPOOL 3ef1959e7c28b9de9882a4cbc3370db8e0432108d7072a53344d0281020731decbd70a36ec9e826c859111d47756707c85668349368bb49a25a60b1991812555
 DIST netbeans-trunk-nightly-201505290001-src.zip 207640635 SHA256 2547cf1181fa330f1ac519fbcc91ccc9e31497239f962ddcebeace72f4a6e2f2 SHA512 ab02d0ffd3aced66a79c8917980f5200bde50192c12b2a5fbc2def5122ff83525220581cacea70ee76e8bd1af377c67083fdbdde16d8de5f5550337aaa6e73e5 WHIRLPOOL 4d81036c5308b3dbb50743e688fcb8ee07c1a45aeba75f89a97a1e8d69e04119a456e6899cd7500eec5c0d03828d1f8b0a49637bdf5a9b3cd2b088f90311e4ca
+DIST netbeans-trunk-nightly-201505300811-src.zip 207777734 SHA256 e9b9f7d8613e07dfdc7cecbd4e323e400625985373cd226101638250c1042cc1 SHA512 2c72c85b85e7016d9863ee8033da81d26e14f2928e8dd703ec4c48b02165bb1d65ce331b66b0367cebe54bc1b233b68dbaad1705796751b1f6d87e34744de08a WHIRLPOOL 8967ee3280bbc33ff4b8e4246c31b4debf324886e0251f75330dce8c67443c5fde66d2ae7f13314abc43e8a8f577baa2a56ff69b3516cd2ece144a49525f7ecb
 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
@@ -88,5 +89,6 @@ EBUILD netbeans-harness-9999_p20150526.ebuild 4131 SHA256 7a9162cf78e09d163abc80
 EBUILD netbeans-harness-9999_p20150527.ebuild 4131 SHA256 ba0fa9bda3d428ad671a914c415863239c7d42cd37bcf86c361de9fb53958d41 SHA512 dcd2f4c17b10bea4c70eb6b846ff913d3c1d733e9ed335c9089df1604339d4c7f2535d4bf46a9ab378cd20a55ccdf468349c18733d5e2d1ea141ccec9f2934b8 WHIRLPOOL ab29bce35e64b966e9801f7eef168c38a1972dfde02eb01ca3ce94ab4d4e0921f2fd16fc6796f96eb483f8133b94c506b409c156626ec28b91caaefd5f9fea12
 EBUILD netbeans-harness-9999_p20150528.ebuild 4131 SHA256 21ff67ea134388c122e22ba56e50c0f774b2b4b0a839255ecf5e15c0bce7027a SHA512 37ab275f1259ef0c89d1888b4b7fae3e0ce379907373cec99429977eb066cf8620966ce44a6ad1502c8e6b01cdc1495f2bd53098469feb20c17920feb4edd6bb WHIRLPOOL 07c6052ca1dfba7c42b9a6d61c274b613086247b79fe7c2eccaca03f64558b1406e826ba628cab03602cd3a014d12fd6835056d76e9686a812ab7ed2086bb5f4
 EBUILD netbeans-harness-9999_p20150529.ebuild 4131 SHA256 6d2fb6afea8e28868c3498df908dc3ad734c5c3bb97e07406a4106105c92c66c SHA512 b2bf7ab611bd457b6c3773d736ffde4a6c6ef4c69afd7a964c059d0ef9baa53626623e9500c8e5f8423d4bbd09b548d08fa2514e2bc077ddf4643001681ab7bc WHIRLPOOL 2bdc92afddae6bd94e07e604e865214a5147b5832d9d40c7ea02d76364cfdd6a425a3cb380bad59831f477ac391a7123893aa735b79f8aa8a679298949888a60
-MISC ChangeLog 166476 SHA256 bb2e5f3ea4d4cd2489f8c8790535f41bf026dc396c788ef52f59c9192a41e1f9 SHA512 89186ef61dc219b108ddbb9c42059fca33eead60d0796aa31667f0bf9ae7b0e91ed474535e19aada3289ce6ac62b94f759ea1b221fc59d60b2d895f7ce1f71f7 WHIRLPOOL 31103cf60c099d70014bcdd08ee31fc587fbc229c9e936eb7ade3a5220aad1a224277fc89539e2292919812929865cd505f386c11f82da2b49fa0834e8fa402e
+EBUILD netbeans-harness-9999_p20150530.ebuild 4131 SHA256 b8cbf67cb6c89abbd50d54d714843e35168ad398ce02ae057ecdb2549f6e6c54 SHA512 0557e16d8bb073d7c562a7a42c6afe921e0f00e45ca42cfa7ab354dea86587756d55395cb463b0b94b1caa44090b8a072251c9aa206f22fc170f0f107528ea1b WHIRLPOOL 82b051ba8c61253614a14c3f0195f70c0ee83594626266739938fa09632668f2906b1819cc9542d5b7cacd441ce2567b8feaba1ddcdf8e0889620f4dc54b082c
+MISC ChangeLog 166651 SHA256 bae9bd589d5a073ebbe48d3be4549c758ebf045fe5bcfb65488c11a9de4cab49 SHA512 67bfda079c6db26b44b37347d82af31cfcd46e2a3c61ca6797c1c6dcfcf2732bf2d7c9ab1a8cae7ebc2010d12f94aa4d7adc4deb79d0aea012c402cba42528aa WHIRLPOOL 44d1b91c36a483696dfc9289eeb15cc92852c75fa61375f4872c4840c24186ea490d4720233893031aade538fbe8df257cd0e581442c3b2c42d223547b4fcc41
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20150530.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20150530.ebuild
new file mode 100644
index 0000000..1e5d884
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20150530.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-05-30_08-11-16/zip/netbeans-trunk-nightly-201505300811-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 2fb86c7..eb71236 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_p20150530 (30 May 2015)
+
+  30 May 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-ide-9999_p20150530.ebuild:
+  bumped to the latest sources
+
 *netbeans-ide-9999_p20150529 (29 May 2015)
 
   29 May 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 34296af..273254a 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -42,6 +42,7 @@ DIST 2EB57252FE095468DF7CA74E5D0D5882D17DAB11-org.tmatesoft.svnkit_1.7.4.t201204
 DIST 2EC69BD69B66B0DABEA392DE713A11F975001760-jaxb-impl.jar 872839 SHA256 4e0788d4b3638b98e67a6501d47e0ca666116ea7b6dbaa8a15dc65ed349b6918 SHA512 37f801dc853b0ba9c1374fb0eccf0240ee6065b91ff26f6bdae245135e26025fff6efe75c5970090163148b042093cb3021006c03ce4e7b04c5e85bdc93be13b WHIRLPOOL 69edb53b365ef9512f81ce9789828d8e5d2132c251b5ffb1d43d1f8c1dbffdfabd109d2685e693aab4b509ab9f582b460d95aba502e805168899f0a972244c2d
 DIST 3483ECE4E30CCA034BEC49979C6E735C6B1FBB13-org.eclipse.mylyn.commons.net_3.8.2.v20120916-1200.jar 80270 SHA256 1eaa24d5e024d5862cec6909504468157c23e58133ed43df59dea34d8a044dd2 SHA512 ae6092ba1c6489fa2489c2e5a488ddc5df4e5e2e0f74ed6ca1369c02686c2818d362d7e1097417e34ed76fa25587d4fe4f55a63e4dba2a680a264e5d4068ebcf WHIRLPOOL 321886360130669b8da9fb316f294c0d8541fe651a456b592716f140f3d7f56bd2113d58706ae3277258a599ad6c4ccee3ca3c02f8f09b84079b1974fc570dda
 DIST 34E70691382D67EE5C84EF207FB8D3784594BA2C-org.eclipse.jgit-1.0.0.201106090707-r.jar 1351561 SHA256 39dcd5780356c55ac3f2c80fc091184557a99e638abe0c020d363fb6ba7a1c51 SHA512 055adb6139f90a66718512d6dfe3275ee5be69dc125410abeea00ba108c11b82dd0fd7dcbe9c8e3540ad13bc824716dc45113447c15b3c9b2567677037e39cdb WHIRLPOOL a77874f89785e353cd8533fd4aeac1c214eb343b51ed69f7aee5212b32375fad86ba55b5f0054af1d4800d61e59812aaa4e733a6b8628305ea2147704fb38aeb
+DIST 3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip 270250 SHA256 246cd067e04f499117a3d71f8505617c3740445948f727e4d85beb1e8f4e1d8d SHA512 963422b8f498824b880b3f61aaed3aca41e3b3ee81e2710564293c4a694907d187722bdae4b7ab9d7bb98e69cfac99726e269c2fab1f96d56c96f3a097d23ecf WHIRLPOOL 88d859656157133edbacd756e2c567afcc40ddc2844d05450138de9cad656c6f56e0be8b4e8a6448f3ed760674ea1b4a4b69361599825d9b483b2645fa8d95ec
 DIST 3699DFFE17089F9B9C73857EDA9B8669AAD657D3-js-corestubs.zip 14667 SHA256 05c20527749f4817e036c2105209318ef42dbec79d34db739bf3a6cfa061b57e SHA512 c391d2bdabe047127a0be9ae622afabb32fef086a4941bd50918bd140e84dc79097cdae018e74c661c957146e08fabed4e8b0270f9b27caee92c0831dc3aea1e WHIRLPOOL d07aa54a5d6555ffb7d0a4d0b6ad691a73e138ab527b616127b7a37bdc094470908f89a77f46204dde3c317a216688ffd57641419cf7bc17284d7077c71ec0ed
 DIST 387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar 1106410 SHA256 2c522a693651bdcfbc43767149e4c224b516df3ab835159621af9e0071330cb0 SHA512 51076f5933ba9923d7004b2b205e68f88a564b77c168935a1e96ad9deffb19b9182685bd368d0e0ebb3ec28f0e45a61fb555ff7eaf2acc748f8786136a91ed28 WHIRLPOOL 16ed29e8b00e87838ab4aded0e3c9085b9dda2eee47997ab1fc042781ed83537b092abda41d0dd31b6a8b8edf851da8cfd6041df072e4f5833a4541c1002ba4a
 DIST 3AFA53AE20ADC7C11AF4791A85E6CECD7A5009A6-org.tmatesoft.svnkit_1.7.6.r9487_v20121029_2008.jar 3770712 SHA256 8973e846e5ded3b75fcf3d24813852aa8af2b3287df6e4b4e6a48420c3aab425 SHA512 a186bf959cbde17d3c0373d2c43b999baff88d0d94ee617e8a7d55926b1ac880915df183822cb48f7dc28cfef3c9aefe953369f709b1b39fc9ac8eb332cfa8e5 WHIRLPOOL 9bc777cf7e13ead1acd1157185765ad3e20da081847edf01fee81f5f982ab08cb6460cb13c84696ea9c0686ea50985bf87be253411df69b4f6eee2985654b8f4
@@ -255,6 +256,7 @@ DIST netbeans-trunk-nightly-201505260001-src.zip 207634232 SHA256 15df00f2440c7d
 DIST netbeans-trunk-nightly-201505270357-src.zip 207634435 SHA256 894cd7284081fbb41d7295c08015bf7f6c7578023cb3b2c7488413c19a389f9b SHA512 a273255018cfae2335cffc1ccae90cfc42ec700d4051e03418f2b914e4978ae1aaf85f2b699c0b89cd8b19dfb43d9513fe3f6ace9eff569575e896f82e6eb2d8 WHIRLPOOL b5c5d6f9c166d3129864f830fa33b3c3ab5c6b03b4b5f0f96e2b8871c6f8bbceb0789bad8b7d045e717faa30ef29de2d07f5fdf415a2f65ac65ebe31866d6b60
 DIST netbeans-trunk-nightly-201505280001-src.zip 207639044 SHA256 61715449f3161ede9507bc6cef992c5fc8fbb0e7e8103962b5a06e2dd1742f47 SHA512 030550ee15839a75ef8aa5f6651de8c430eb07e4ce7413317030f76f362e9324530ab5e9e2d945b0cf4ba104459cdcc0a9db89d648d12df72f6b400739baeaf5 WHIRLPOOL 3ef1959e7c28b9de9882a4cbc3370db8e0432108d7072a53344d0281020731decbd70a36ec9e826c859111d47756707c85668349368bb49a25a60b1991812555
 DIST netbeans-trunk-nightly-201505290001-src.zip 207640635 SHA256 2547cf1181fa330f1ac519fbcc91ccc9e31497239f962ddcebeace72f4a6e2f2 SHA512 ab02d0ffd3aced66a79c8917980f5200bde50192c12b2a5fbc2def5122ff83525220581cacea70ee76e8bd1af377c67083fdbdde16d8de5f5550337aaa6e73e5 WHIRLPOOL 4d81036c5308b3dbb50743e688fcb8ee07c1a45aeba75f89a97a1e8d69e04119a456e6899cd7500eec5c0d03828d1f8b0a49637bdf5a9b3cd2b088f90311e4ca
+DIST netbeans-trunk-nightly-201505300811-src.zip 207777734 SHA256 e9b9f7d8613e07dfdc7cecbd4e323e400625985373cd226101638250c1042cc1 SHA512 2c72c85b85e7016d9863ee8033da81d26e14f2928e8dd703ec4c48b02165bb1d65ce331b66b0367cebe54bc1b233b68dbaad1705796751b1f6d87e34744de08a WHIRLPOOL 8967ee3280bbc33ff4b8e4246c31b4debf324886e0251f75330dce8c67443c5fde66d2ae7f13314abc43e8a8f577baa2a56ff69b3516cd2ece144a49525f7ecb
 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
@@ -295,5 +297,6 @@ EBUILD netbeans-ide-9999_p20150526.ebuild 30352 SHA256 2001ad7ad713af39539f0d9c8
 EBUILD netbeans-ide-9999_p20150527.ebuild 30352 SHA256 c72e65773b670a4e03638f486a972274c7e50ec3c22e4149c16e154f0fa413ad SHA512 f14eee55617a25efa334eff7a7a7196155d9bd8f3620f05c92946c70482eaf9ec5e57cea88392f5b604fe21c7f80dc175dc645d3728fb3b9f212d6018e9fc183 WHIRLPOOL 742a85c38d96f80d8877482945bef1332b0273181e65e274586dd656813634da06a69d103d348b7917acb29e0e2956ece738744635ba8071f9716e336745c97f
 EBUILD netbeans-ide-9999_p20150528.ebuild 30352 SHA256 d468710ff815df17efad4f5949abff52703d44fb8839e6ed84f864ce9307a6de SHA512 f1621ec89f471762ea3b03e9ee917315652749295b6f1da9ae748942c09fc2b6dd1620c115517fe3964c617471de66e8c7bce1657c06480c152883847cc1d76b WHIRLPOOL 053c54643e27874f711365304218de177a4d8bfe03f93f56d596976f856036da99baf7c74c87cd7cd6b6ce65b9fcf9a551c64163c070381387facdcc97c95c78
 EBUILD netbeans-ide-9999_p20150529.ebuild 30352 SHA256 3927eb8ed800b02360091f8b679f42935cb206996f353cd66055d766b1aee43e SHA512 0b09f37353d4062318da51a08cd3f8f914db971b3f85cc43192d4c371922e79565c75fadb7c091388fe02be1bda26a158b3b92e670e787e1c8c4c5677de50d17 WHIRLPOOL 75047cec6b30b7331dd6a05e2b9e1a4312fea394a0e6cd51d9acd6b3695d20b6433702b9bfdb4aae911e1b2584244c5a5293b4ceff212b4340bce6b6167edbcb
-MISC ChangeLog 158532 SHA256 55aba8765cbcc22151e89b7814f7e0e6fef75069f6ed92084645854c2fce3780 SHA512 f47ca1000f5afa88fd1f202072656d82e11ff726244508f8716f1c3bac5f4d07b33552c64c7ea65e3b75b07214e943e804ba640573813bda23addcfc91d4ebc0 WHIRLPOOL 7f82f0e3440e60cc81025e474bdd1df2824741546467210a32d64c1a714d7acf50dfe8705f3228259eb3dd343874856700142692d234fd1ef1d7d15e10f15b6f
+EBUILD netbeans-ide-9999_p20150530.ebuild 30352 SHA256 dbfd399cbca66342be218b55563597d793c93a6b1aa6bc6dc463e5b0253e3af9 SHA512 2cb4403eb0c82bccad8f16623611d4b77cd698448d44f7adaf5b41e8bef75354d31cbb29939d8e6acffab47c448ec32d4029520495ccfd38e6246ad9c29418fe WHIRLPOOL ab71cf6ad4ddd0939cc30dd4d25d0bd4fb3a75b5154edd227bb43af455ea3ba380d022738c80245a22dd0fe78cb7ad47165f8a7bfce8ae40b13988325b3cb8d9
+MISC ChangeLog 158699 SHA256 608ab2287fa4c76a23d887e501bc863f3fd91a0c7d5a12effb36dd008c83095b SHA512 0e2b0f971fce19d9e64826c4caf22ca666b75d6b4d81b89be2286ec57e76dc26aa366147b784e49fe7bc148b3522b5626678ebfd139cd7a7c4b2e3bed719473b WHIRLPOOL b543be4aa6446a4e00677458aa502f120e875b2b07bf61653c70f7b19c53ecfa89f1f40e47da9141f81ae8e9dba66e9ab61006c98c2583edb3285486a85df3f2
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20150530.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20150530.ebuild
new file mode 100644
index 0000000..b23f1ac
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20150530.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-05-30_08-11-16/zip/netbeans-trunk-nightly-201505300811-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 1351f76..79f4cd6 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_p20150530 (30 May 2015)
+
+  30 May 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-java-9999_p20150530.ebuild:
+  bumped to the latest sources
+
 *netbeans-java-9999_p20150529 (29 May 2015)
 
   29 May 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 81fe550..e2905d0 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -129,6 +129,7 @@ DIST netbeans-trunk-nightly-201505260001-src.zip 207634232 SHA256 15df00f2440c7d
 DIST netbeans-trunk-nightly-201505270357-src.zip 207634435 SHA256 894cd7284081fbb41d7295c08015bf7f6c7578023cb3b2c7488413c19a389f9b SHA512 a273255018cfae2335cffc1ccae90cfc42ec700d4051e03418f2b914e4978ae1aaf85f2b699c0b89cd8b19dfb43d9513fe3f6ace9eff569575e896f82e6eb2d8 WHIRLPOOL b5c5d6f9c166d3129864f830fa33b3c3ab5c6b03b4b5f0f96e2b8871c6f8bbceb0789bad8b7d045e717faa30ef29de2d07f5fdf415a2f65ac65ebe31866d6b60
 DIST netbeans-trunk-nightly-201505280001-src.zip 207639044 SHA256 61715449f3161ede9507bc6cef992c5fc8fbb0e7e8103962b5a06e2dd1742f47 SHA512 030550ee15839a75ef8aa5f6651de8c430eb07e4ce7413317030f76f362e9324530ab5e9e2d945b0cf4ba104459cdcc0a9db89d648d12df72f6b400739baeaf5 WHIRLPOOL 3ef1959e7c28b9de9882a4cbc3370db8e0432108d7072a53344d0281020731decbd70a36ec9e826c859111d47756707c85668349368bb49a25a60b1991812555
 DIST netbeans-trunk-nightly-201505290001-src.zip 207640635 SHA256 2547cf1181fa330f1ac519fbcc91ccc9e31497239f962ddcebeace72f4a6e2f2 SHA512 ab02d0ffd3aced66a79c8917980f5200bde50192c12b2a5fbc2def5122ff83525220581cacea70ee76e8bd1af377c67083fdbdde16d8de5f5550337aaa6e73e5 WHIRLPOOL 4d81036c5308b3dbb50743e688fcb8ee07c1a45aeba75f89a97a1e8d69e04119a456e6899cd7500eec5c0d03828d1f8b0a49637bdf5a9b3cd2b088f90311e4ca
+DIST netbeans-trunk-nightly-201505300811-src.zip 207777734 SHA256 e9b9f7d8613e07dfdc7cecbd4e323e400625985373cd226101638250c1042cc1 SHA512 2c72c85b85e7016d9863ee8033da81d26e14f2928e8dd703ec4c48b02165bb1d65ce331b66b0367cebe54bc1b233b68dbaad1705796751b1f6d87e34744de08a WHIRLPOOL 8967ee3280bbc33ff4b8e4246c31b4debf324886e0251f75330dce8c67443c5fde66d2ae7f13314abc43e8a8f577baa2a56ff69b3516cd2ece144a49525f7ecb
 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
@@ -169,5 +170,6 @@ EBUILD netbeans-java-9999_p20150526.ebuild 14590 SHA256 8936e3ef0f88d7d015c42ef0
 EBUILD netbeans-java-9999_p20150527.ebuild 14590 SHA256 031554463ef7577123736b9a9d0efa2c05d01e60d6c3655ae75799b5750e2553 SHA512 79d2ff5155c2a974c0501012288b7531abb7604c467fb5094201ed9e2e9c6874223995e7c797a7d534cbea0d4e3fb915ba385018690a130106c43da42bb62c31 WHIRLPOOL 20259ed1e87035c965e67f31bcfa4d85860da6acf5ec9122133c7d09aa1e40d583515f07a965645aed78fb6d0c640555a5470e4fa2394f1a0a9dafd85074fbf5
 EBUILD netbeans-java-9999_p20150528.ebuild 14590 SHA256 a442523f4aeb3987e9682ecb222b20d2a2fef6586214fbe9b7f81904fbfe5490 SHA512 f33b7ace6e900b16e87b1340f8c05afd3e3792da36f639ddf67e58617e975d2234059906c394a194c645aab32705777e51733ead680b09158bd1793fc550c62d WHIRLPOOL ed1a3af97c8c770dfc2bb073496c14e3f84467b8f0a99009106aea112749375da115383892fe745df7e669005a246bed08ace95c8370d9ec21d0f860ee81a06a
 EBUILD netbeans-java-9999_p20150529.ebuild 14590 SHA256 6b61c2a18eafb21b7523e81e1ee0be563904aa140c62c1c4d2f54a300c899986 SHA512 4e476ae9290fda7de9e7ca941adad5cdbc55310246d1053159e3e4b01c3e96becccb4b408209bf94c9227bb155bb9fbd6a3d162ad56f60e6fc43059c077bc1a7 WHIRLPOOL a53d37057d22ae5a85b6e42883bc3b0180425353f0edf69c09a8784cb824f5631e82064f2cf0f9a3aeb649d0a855c9188618ada2da6fdd31d43365d9e6987524
-MISC ChangeLog 161732 SHA256 34fbef9161b309ac1dc20052e7db614636d634bcb3da4a154dbb9329af2c9cbd SHA512 dfb249a716303acf6805333c01cf4f4056e76e7ea01509d41c7ec5feb4914e3f28e8ffdee00f0024dd1a1bc76da0f7fc70b8ada623a9ac4dcebc87b71209f748 WHIRLPOOL 9b0d3a2020871b8929c1cf4adf074f5fa9a1221c14de6c4af04c642f56a4bc7cfe31c6ff160538aa1c9d3c0189123857809399060960c6aa6d0ba7df6cb719ea
+EBUILD netbeans-java-9999_p20150530.ebuild 14590 SHA256 edd111bc21b433f78b3b9bc24819f07590de7256ab34631e4cae4f2cb34e3b25 SHA512 503453c5af8ef31505aefb31f23299b309d5555fa50a905dc3c6b16170c5e8137f66c500d4bd677df36df54adfcd2b95426e2691a4ba1841bf3ac11fc9c5a961 WHIRLPOOL 5a752736b4b6ae7f377c3f29a30168d60b256a6003102cae1203e0b85c1ba957cfbbb8547bd51e21ddb34f5e6ebd15e1f31224d4bb76b66c8b31097e3729996b
+MISC ChangeLog 161901 SHA256 eefe5ff2db827b37075e08bbbda82e10971f0182831f5f902adbaa5cdb123f7e SHA512 f09cf565c132ecc39458b9b4617cdc58a35f8dbdd23f53732efb1a3cd6319de7b32ad6ba54bf1ed8b5b8c007450289dd5a55061ed4d60652815e79608901746e WHIRLPOOL 9a482d48c22bd6a39644b70b5c293cca90a6368fbb324cf54edd705c06153abf9b7dd9abe744716054aaf7e3fa91e5d732f28cf325b9ef35861452736e764f89
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20150530.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20150530.ebuild
new file mode 100644
index 0000000..11a102e
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20150530.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-05-30_08-11-16/zip/netbeans-trunk-nightly-201505300811-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 26e4edb..162847c 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_p20150530 (30 May 2015)
+
+  30 May 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-javacard-9999_p20150530.ebuild:
+  bumped to the latest sources
+
 *netbeans-javacard-9999_p20150529 (29 May 2015)
 
   29 May 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index 544a878..4b9a206 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -47,6 +47,7 @@ DIST netbeans-trunk-nightly-201505260001-src.zip 207634232 SHA256 15df00f2440c7d
 DIST netbeans-trunk-nightly-201505270357-src.zip 207634435 SHA256 894cd7284081fbb41d7295c08015bf7f6c7578023cb3b2c7488413c19a389f9b SHA512 a273255018cfae2335cffc1ccae90cfc42ec700d4051e03418f2b914e4978ae1aaf85f2b699c0b89cd8b19dfb43d9513fe3f6ace9eff569575e896f82e6eb2d8 WHIRLPOOL b5c5d6f9c166d3129864f830fa33b3c3ab5c6b03b4b5f0f96e2b8871c6f8bbceb0789bad8b7d045e717faa30ef29de2d07f5fdf415a2f65ac65ebe31866d6b60
 DIST netbeans-trunk-nightly-201505280001-src.zip 207639044 SHA256 61715449f3161ede9507bc6cef992c5fc8fbb0e7e8103962b5a06e2dd1742f47 SHA512 030550ee15839a75ef8aa5f6651de8c430eb07e4ce7413317030f76f362e9324530ab5e9e2d945b0cf4ba104459cdcc0a9db89d648d12df72f6b400739baeaf5 WHIRLPOOL 3ef1959e7c28b9de9882a4cbc3370db8e0432108d7072a53344d0281020731decbd70a36ec9e826c859111d47756707c85668349368bb49a25a60b1991812555
 DIST netbeans-trunk-nightly-201505290001-src.zip 207640635 SHA256 2547cf1181fa330f1ac519fbcc91ccc9e31497239f962ddcebeace72f4a6e2f2 SHA512 ab02d0ffd3aced66a79c8917980f5200bde50192c12b2a5fbc2def5122ff83525220581cacea70ee76e8bd1af377c67083fdbdde16d8de5f5550337aaa6e73e5 WHIRLPOOL 4d81036c5308b3dbb50743e688fcb8ee07c1a45aeba75f89a97a1e8d69e04119a456e6899cd7500eec5c0d03828d1f8b0a49637bdf5a9b3cd2b088f90311e4ca
+DIST netbeans-trunk-nightly-201505300811-src.zip 207777734 SHA256 e9b9f7d8613e07dfdc7cecbd4e323e400625985373cd226101638250c1042cc1 SHA512 2c72c85b85e7016d9863ee8033da81d26e14f2928e8dd703ec4c48b02165bb1d65ce331b66b0367cebe54bc1b233b68dbaad1705796751b1f6d87e34744de08a WHIRLPOOL 8967ee3280bbc33ff4b8e4246c31b4debf324886e0251f75330dce8c67443c5fde66d2ae7f13314abc43e8a8f577baa2a56ff69b3516cd2ece144a49525f7ecb
 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
@@ -85,5 +86,6 @@ EBUILD netbeans-javacard-9999_p20150526.ebuild 4982 SHA256 01d71b6163de428cd0bd1
 EBUILD netbeans-javacard-9999_p20150527.ebuild 4982 SHA256 b72e62b4d8edb057f19a9491dce4971a0f37d4eb14d9f58578b4d055282d09aa SHA512 430842ed6aa8a7baf5f93b22fca4e1f11aa686c28fb86d5897f76873050487e565605d7d946acab81eb2b5c645ab87e6d0fc69d18187e35065124f4bea1d5538 WHIRLPOOL cd8b3bd8c8408d7084cfdc7758f007f64124f53d1ffe3adc3b72a34489d498c2174fb8deeb73e5ea03165fa29429dfc6c3496b06d9eacedd6f986ffcead34549
 EBUILD netbeans-javacard-9999_p20150528.ebuild 4982 SHA256 4a1db82d0784e8f4934ce6282faf34ba688fbc3ae330f98e1478dc281cab0b17 SHA512 668dfcfbe53336f14cf2289cf6b622efc88958adfeecca0b35a67436a2a7f418b36d9841532fe91e4fb10bb49d3034e70cc8456903cbbb246da7479722343e91 WHIRLPOOL a7ff8f6bd5273a50f1a448b9c9c44c3537ff846fe199490d595c991e8f32ae213f4270c4217c67cfe496da0a072c8ebc4dfb54c32e27189dc08b9de494650ff0
 EBUILD netbeans-javacard-9999_p20150529.ebuild 4982 SHA256 7ed88de020947665c57939089e526eb9a6dfe02d1a191519eb5e0fa923959abe SHA512 1eed9da1ef89285cdd802d39b10067922543a654f2e9a88fd52a38dd2b13a682931d35c100db8afb4f644f7f964287670dba1d246c91743008f30a38d88bb463 WHIRLPOOL e7fbfbba7529b5e03774e3c281d7560427dc102f74b5e98989670952d9e9a5290db0f0eca84e1e7257bf7bc1ef8c6289811008ddbc8676d3b6fe4241512fb463
-MISC ChangeLog 168574 SHA256 f0a1dcafdca48842ba5223b0c76cbe156d33922d2821f7092b75b16f3ad68541 SHA512 45874e30fbf2f3f1dc9dc4ced112cd1eb22b5c7924bd80cc768b3c98c8abc1fc008d8456776f7efa5356f2f8c0ce7e26a83b56aa090fbcaad42730eb71f15172 WHIRLPOOL fe09ff94b354472157108d3dc7d4edbe59cafaed58346a0e01f73ced6f03059774d61b33db91194f136058fb035ad6ab490ebb9849a4dce1ff055e5b9c778f35
+EBUILD netbeans-javacard-9999_p20150530.ebuild 4982 SHA256 d70c3061848985e6d3e2a150d98dd548402f85dfb1f4d9ef357c4050e95f2094 SHA512 fb4bc534e9c9fb73706284e32685733e1cbd2504a962d3d56562f7b238e729bfdbb1baab054e13ab646cdaf74f97d979ba964d201da3af75685fe5ef9571f5ff WHIRLPOOL ed7963e64d2864832e579215e4ee496d4cab94ab2c266aa212d36818b3bc1fe28760fdfeef200ec7f9b61c0c15df379ba3dd4cb876403067120fb41d50acb592
+MISC ChangeLog 168751 SHA256 ec64c6d8339843e6d63359d77c7f5fac698a9e8d5fdf2754d0439def3f5ed738 SHA512 ed7ea01738df454cc2469c783b0ffcdaf7a899daab67ca7aafb66ef3739f0288f07044049a99690a83499862a4790555d7d93f97d35d5ff33b4c5d3acb9913f2 WHIRLPOOL c5ac10c9b5b84a5f499965f358d1ac1197ef15d11f7b5d330de85d22f54de91be5576cc9cc3bdb0e6e5f1b528dadaa03d1c9ca3fc02c859c3ca111e8c1146c53
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150530.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150530.ebuild
new file mode 100644
index 0000000..098e293
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150530.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-05-30_08-11-16/zip/netbeans-trunk-nightly-201505300811-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 cc7d2db..a1f3572 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_p20150530 (30 May 2015)
+
+  30 May 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-javadoc-9999_p20150530.ebuild:
+  bumped to the latest sources
+
 *netbeans-javadoc-9999_p20150529 (29 May 2015)
 
   29 May 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index fe7ba3a..e184d68 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -50,6 +50,7 @@ DIST netbeans-trunk-nightly-201505260001-src.zip 207634232 SHA256 15df00f2440c7d
 DIST netbeans-trunk-nightly-201505270357-src.zip 207634435 SHA256 894cd7284081fbb41d7295c08015bf7f6c7578023cb3b2c7488413c19a389f9b SHA512 a273255018cfae2335cffc1ccae90cfc42ec700d4051e03418f2b914e4978ae1aaf85f2b699c0b89cd8b19dfb43d9513fe3f6ace9eff569575e896f82e6eb2d8 WHIRLPOOL b5c5d6f9c166d3129864f830fa33b3c3ab5c6b03b4b5f0f96e2b8871c6f8bbceb0789bad8b7d045e717faa30ef29de2d07f5fdf415a2f65ac65ebe31866d6b60
 DIST netbeans-trunk-nightly-201505280001-src.zip 207639044 SHA256 61715449f3161ede9507bc6cef992c5fc8fbb0e7e8103962b5a06e2dd1742f47 SHA512 030550ee15839a75ef8aa5f6651de8c430eb07e4ce7413317030f76f362e9324530ab5e9e2d945b0cf4ba104459cdcc0a9db89d648d12df72f6b400739baeaf5 WHIRLPOOL 3ef1959e7c28b9de9882a4cbc3370db8e0432108d7072a53344d0281020731decbd70a36ec9e826c859111d47756707c85668349368bb49a25a60b1991812555
 DIST netbeans-trunk-nightly-201505290001-src.zip 207640635 SHA256 2547cf1181fa330f1ac519fbcc91ccc9e31497239f962ddcebeace72f4a6e2f2 SHA512 ab02d0ffd3aced66a79c8917980f5200bde50192c12b2a5fbc2def5122ff83525220581cacea70ee76e8bd1af377c67083fdbdde16d8de5f5550337aaa6e73e5 WHIRLPOOL 4d81036c5308b3dbb50743e688fcb8ee07c1a45aeba75f89a97a1e8d69e04119a456e6899cd7500eec5c0d03828d1f8b0a49637bdf5a9b3cd2b088f90311e4ca
+DIST netbeans-trunk-nightly-201505300811-src.zip 207777734 SHA256 e9b9f7d8613e07dfdc7cecbd4e323e400625985373cd226101638250c1042cc1 SHA512 2c72c85b85e7016d9863ee8033da81d26e14f2928e8dd703ec4c48b02165bb1d65ce331b66b0367cebe54bc1b233b68dbaad1705796751b1f6d87e34744de08a WHIRLPOOL 8967ee3280bbc33ff4b8e4246c31b4debf324886e0251f75330dce8c67443c5fde66d2ae7f13314abc43e8a8f577baa2a56ff69b3516cd2ece144a49525f7ecb
 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
@@ -88,5 +89,6 @@ EBUILD netbeans-javadoc-9999_p20150526.ebuild 6234 SHA256 0b5b71284ea5ab2f48c38e
 EBUILD netbeans-javadoc-9999_p20150527.ebuild 6234 SHA256 1d28b5e50aea158b8fcf19f55d10167d2c45bb59c6d2ce197bc83b1d80318061 SHA512 5fd4743e9701d0445c609faea9ce1f2a13f01c344c6838f9111217d6e1b919dc864146ddd01863f34960ec2442de150d3dc4299f41d6165a354902d30ed6f0d9 WHIRLPOOL 8d1cd126820aaf3a974f869fac048e3e0faf7b3c86b338496651de5be4a8577a26c5dae9f04de0069920172f2e432eb7335e0585c0bd44a9b9fcde464d1926ee
 EBUILD netbeans-javadoc-9999_p20150528.ebuild 6234 SHA256 14e1773fb0e80cb03203093f853d4dc993a5391f9a71936cdb77dc99e1e8750b SHA512 944c109654e5dd2dcb41f033407bab0d126877d7db1e39f673d07878d2ca55d80e6c8c850f537846709f050c156f10aaf33697f0c1b67d00821df6dc25f4de32 WHIRLPOOL a7d32e6579ba304e46cb54b2594103f7504d14645136fbde613f77cdb67143ddf93cb8a0f050f64445455a3de744b0df25e3a5148f827d970f6cab8857524faa
 EBUILD netbeans-javadoc-9999_p20150529.ebuild 6234 SHA256 dc23e71f11df005115e9fed9c6cd82703f9f994e526e8893bee762c480f532eb SHA512 acbea7d458cfaa491453a1d2ffc6d95ef3d29380dcd36d0b6eeef56b8db87362eed9365caed8fa15033d611a86209cd117d1e1f911f2eb9b936171d5d90d104c WHIRLPOOL 8483cb9c11adabad3b8be98bfa1ddb95d8060cdbd504fdd5e0c97b18113f09c519bbc9408ed1bc4265c739b94126eed1d579aa88c94b4c7f36423a7cbe33b96b
-MISC ChangeLog 166302 SHA256 4df54ea211f2f61f54c46575f0d27af43c8f6a9b26a303174b6682842c3a6647 SHA512 983e54bd8699b74b44fbf7a47fffcefa85308e2fc386f9661443e0b8dc99aa36680fae6a9ee54555147140b62bad70c066624b979587e51914261e948af23c15 WHIRLPOOL 477754c1d229e1cfc00b421a5d0fafa9a9390921c214a040c31bf9d284045ce9a4b5200572107745ccbf9ff207faee44ccc19e2fd43d1298f6f2f32889ce9fb4
+EBUILD netbeans-javadoc-9999_p20150530.ebuild 6234 SHA256 294d5f7ff8e641aa69a3811af1423fefc8e7add6db9f90ac7a832055b76239c3 SHA512 2c20255059fd6efd7610f8a26e64a42c94d62b5ccd3e3014452974af8e350e9921d7fe1252d70a1f73c1ac846c9794eb66c9c9ba137efbbce48b0d3d519c7889 WHIRLPOOL 3c6b2884dc89a6a31c422dac79773564c3ffbf8e362a321686d9957d6776f3db719f042c893c552ab2cc6cf86ff38b3717f72b0777d1de9d5714da03d6ffc339
+MISC ChangeLog 166477 SHA256 d60ea8ed8217be4d550da71fecb1464aa5285d0a48baf3841d333834fd67e4bf SHA512 7f08a8286ccf8e089cb901628650948157bb95345d49260968eed4a7c1d611bfc0d854dc027443437d44c2a3b03d9206223ea0308b9b45f70434c6d777813138 WHIRLPOOL 574413b91d181bd5c382a5040f3cc3725e9530b40f64200618319a08a59ada643cec1bd8a91a9d95f9e96d806209e799063caea8af2063fedc6f0571bf75eb43
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150530.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150530.ebuild
new file mode 100644
index 0000000..23e4576
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150530.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-05-30_08-11-16/zip/netbeans-trunk-nightly-201505300811-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 3503e19..ae44de4 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_p20150530 (30 May 2015)
+
+  30 May 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-javafx-9999_p20150530.ebuild:
+  bumped to the latest sources
+
 *netbeans-javafx-9999_p20150529 (29 May 2015)
 
   29 May 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index c452f9d..cd7d649 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -50,6 +50,7 @@ DIST netbeans-trunk-nightly-201505260001-src.zip 207634232 SHA256 15df00f2440c7d
 DIST netbeans-trunk-nightly-201505270357-src.zip 207634435 SHA256 894cd7284081fbb41d7295c08015bf7f6c7578023cb3b2c7488413c19a389f9b SHA512 a273255018cfae2335cffc1ccae90cfc42ec700d4051e03418f2b914e4978ae1aaf85f2b699c0b89cd8b19dfb43d9513fe3f6ace9eff569575e896f82e6eb2d8 WHIRLPOOL b5c5d6f9c166d3129864f830fa33b3c3ab5c6b03b4b5f0f96e2b8871c6f8bbceb0789bad8b7d045e717faa30ef29de2d07f5fdf415a2f65ac65ebe31866d6b60
 DIST netbeans-trunk-nightly-201505280001-src.zip 207639044 SHA256 61715449f3161ede9507bc6cef992c5fc8fbb0e7e8103962b5a06e2dd1742f47 SHA512 030550ee15839a75ef8aa5f6651de8c430eb07e4ce7413317030f76f362e9324530ab5e9e2d945b0cf4ba104459cdcc0a9db89d648d12df72f6b400739baeaf5 WHIRLPOOL 3ef1959e7c28b9de9882a4cbc3370db8e0432108d7072a53344d0281020731decbd70a36ec9e826c859111d47756707c85668349368bb49a25a60b1991812555
 DIST netbeans-trunk-nightly-201505290001-src.zip 207640635 SHA256 2547cf1181fa330f1ac519fbcc91ccc9e31497239f962ddcebeace72f4a6e2f2 SHA512 ab02d0ffd3aced66a79c8917980f5200bde50192c12b2a5fbc2def5122ff83525220581cacea70ee76e8bd1af377c67083fdbdde16d8de5f5550337aaa6e73e5 WHIRLPOOL 4d81036c5308b3dbb50743e688fcb8ee07c1a45aeba75f89a97a1e8d69e04119a456e6899cd7500eec5c0d03828d1f8b0a49637bdf5a9b3cd2b088f90311e4ca
+DIST netbeans-trunk-nightly-201505300811-src.zip 207777734 SHA256 e9b9f7d8613e07dfdc7cecbd4e323e400625985373cd226101638250c1042cc1 SHA512 2c72c85b85e7016d9863ee8033da81d26e14f2928e8dd703ec4c48b02165bb1d65ce331b66b0367cebe54bc1b233b68dbaad1705796751b1f6d87e34744de08a WHIRLPOOL 8967ee3280bbc33ff4b8e4246c31b4debf324886e0251f75330dce8c67443c5fde66d2ae7f13314abc43e8a8f577baa2a56ff69b3516cd2ece144a49525f7ecb
 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
@@ -87,5 +88,6 @@ EBUILD netbeans-javafx-9999_p20150526.ebuild 4723 SHA256 5fd5e50e0f1f7b9e0bc2743
 EBUILD netbeans-javafx-9999_p20150527.ebuild 4723 SHA256 b9bbdb6ad3d9fa95849acbf2fdbf92bfedfb1048cb5445697b1686e07a9071a3 SHA512 dc104b962cce46e9eb7c03ca0e0eef3c86bccd061368b9420ebbac176f1d197be1f04fd6f58a99c05182e48e65856e79aea320c0111e9589d97ebc08771fedf8 WHIRLPOOL d634cab1593930a9d1c4a0bed905b8a103438004ceda2bd8799ce621b05b5bd037b73e6ca78d44e6cbeaca0cf9264f7bd9be4cf7884ac59d07304c1724bee4ee
 EBUILD netbeans-javafx-9999_p20150528.ebuild 4723 SHA256 42254b134cb8b3d8c39aa07f04bb57f7174635395b1962dee3db173894e0b69e SHA512 ad2f567ed9f303e5d967aee251fd39dd978d60fad8726bb9a4bff91f677a42151861dee8bffbde720850b753b0070b4d208a9576114cfa9e5de0b0a91e339d40 WHIRLPOOL 486c86a8f43f67c0a2c1a0fc234476f1e6efd2571cddfec1f703b6a91df2c6e8827ff954ff501c2d97d85ad47bde20b647ba6836aaa7cfda973ce7a2055fa66a
 EBUILD netbeans-javafx-9999_p20150529.ebuild 4723 SHA256 8ea7c1d1285e06a34bb980145ca5d87d137bfb47ddac05dc98ebb28b411d661f SHA512 11e61ac0df77c8cb2f42408518edc75e9bc7470b7b989d1e5f012ed1ac76de7e22f530f14b0d7844cbee6d91ad5fe29245dd8213ec69049cc7a45993ec24d581 WHIRLPOOL efeb5ed35a0fd58cf9c46494dd97633b185a8fd9b5f1236f52a75708d3999be1f2df45c770699dd91586a0c9be866a211c44ff0ea60a591924ca35719a56d3da
-MISC ChangeLog 150897 SHA256 b1a6246ca2ad1926cb8384d0d27bb90a285e1ebbce69abd7fd87df78a4966d86 SHA512 d5c4ac3323ad5e863eb3bf2601bfb66bce4b76f9c2148af7715bb0e7c533d23cc3155f7bf310e94600454fb09c4e0c7a70715195385f7256907eb763ffcac58d WHIRLPOOL 14278cf7da68c923f7e811e37f29c183676456bda0f560b2ce47b82000a9a04e52ae687785a04667a40de4915da1bbb444d573ba8e65d724969df60b6e80f6d4
+EBUILD netbeans-javafx-9999_p20150530.ebuild 4723 SHA256 c099d417028e8e051877a2757b6eafcc1efa8c3ffeda4f40c143c4ea8a761c41 SHA512 d4d00a4b5d9e48919c71de955100dc12877627d73494fd0695cbe893294dc27895317d74bd266677f823d9fca8292d1b0b04b4d5c3285d2dfa2f2baf20154f6f WHIRLPOOL 6eb9a047e940777369ab800d25f1bca5c1e6859c3bae22e5d0704428eecd90eed7f1feacf9f16fd045162439225e3fa988caf788f97c9fabdea48d4331d6a63f
+MISC ChangeLog 151070 SHA256 8592d9a23492141fc6b7bc67004e4aa4172970b76fc1ed7a4628ed55b38e2bc7 SHA512 cd47ddf67c3e7fc278ded248cf6d188417ba78c5128a0ccb8d02a14ed2deb7a980661280ab7b7b1488c354a0fd70c38be36a6309b1a1ecc01c5f5b2735c78139 WHIRLPOOL 34c50cb1d6c2589e4b5fc3ad4a4c821044e282d7061ec6ab675f531abc2beafaf57f9c85d07ff76af6e930a56c0f8492c458640a47bd6f646bf28260377a9d1a
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150530.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150530.ebuild
new file mode 100644
index 0000000..37e9ce2
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150530.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-05-30_08-11-16/zip/netbeans-trunk-nightly-201505300811-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 9e52562..e0681ee 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_p20150530 (30 May 2015)
+
+  30 May 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-mobility-9999_p20150530.ebuild:
+  bumped to the latest sources
+
 *netbeans-mobility-9999_p20150529 (29 May 2015)
 
   29 May 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index db881f8..1ef02de 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -53,6 +53,7 @@ DIST netbeans-trunk-nightly-201505260001-src.zip 207634232 SHA256 15df00f2440c7d
 DIST netbeans-trunk-nightly-201505270357-src.zip 207634435 SHA256 894cd7284081fbb41d7295c08015bf7f6c7578023cb3b2c7488413c19a389f9b SHA512 a273255018cfae2335cffc1ccae90cfc42ec700d4051e03418f2b914e4978ae1aaf85f2b699c0b89cd8b19dfb43d9513fe3f6ace9eff569575e896f82e6eb2d8 WHIRLPOOL b5c5d6f9c166d3129864f830fa33b3c3ab5c6b03b4b5f0f96e2b8871c6f8bbceb0789bad8b7d045e717faa30ef29de2d07f5fdf415a2f65ac65ebe31866d6b60
 DIST netbeans-trunk-nightly-201505280001-src.zip 207639044 SHA256 61715449f3161ede9507bc6cef992c5fc8fbb0e7e8103962b5a06e2dd1742f47 SHA512 030550ee15839a75ef8aa5f6651de8c430eb07e4ce7413317030f76f362e9324530ab5e9e2d945b0cf4ba104459cdcc0a9db89d648d12df72f6b400739baeaf5 WHIRLPOOL 3ef1959e7c28b9de9882a4cbc3370db8e0432108d7072a53344d0281020731decbd70a36ec9e826c859111d47756707c85668349368bb49a25a60b1991812555
 DIST netbeans-trunk-nightly-201505290001-src.zip 207640635 SHA256 2547cf1181fa330f1ac519fbcc91ccc9e31497239f962ddcebeace72f4a6e2f2 SHA512 ab02d0ffd3aced66a79c8917980f5200bde50192c12b2a5fbc2def5122ff83525220581cacea70ee76e8bd1af377c67083fdbdde16d8de5f5550337aaa6e73e5 WHIRLPOOL 4d81036c5308b3dbb50743e688fcb8ee07c1a45aeba75f89a97a1e8d69e04119a456e6899cd7500eec5c0d03828d1f8b0a49637bdf5a9b3cd2b088f90311e4ca
+DIST netbeans-trunk-nightly-201505300811-src.zip 207777734 SHA256 e9b9f7d8613e07dfdc7cecbd4e323e400625985373cd226101638250c1042cc1 SHA512 2c72c85b85e7016d9863ee8033da81d26e14f2928e8dd703ec4c48b02165bb1d65ce331b66b0367cebe54bc1b233b68dbaad1705796751b1f6d87e34744de08a WHIRLPOOL 8967ee3280bbc33ff4b8e4246c31b4debf324886e0251f75330dce8c67443c5fde66d2ae7f13314abc43e8a8f577baa2a56ff69b3516cd2ece144a49525f7ecb
 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
@@ -91,5 +92,6 @@ EBUILD netbeans-mobility-9999_p20150526.ebuild 4418 SHA256 4ef87b8a8eb1efe14a318
 EBUILD netbeans-mobility-9999_p20150527.ebuild 4418 SHA256 4e26c1af556951b0931ddc1773f6e53c7858b7db3203fafce73ebf568f481244 SHA512 5914caf94d35b6ad05621b00b52054b50406c985952a0c8eb1b5ee5a82b22f4644e0e5323ffaef90bb8df7d196409633aa1293bfa6a7893890d7e2bb1d13eb98 WHIRLPOOL 1223734174fcebfd49308cf842753a6fc8e3c07c29962dac3c72df4aef21d2bf88afdf3e31c7457aeaab87d123edb764498fad4a12e35a79351ad79a817ced19
 EBUILD netbeans-mobility-9999_p20150528.ebuild 4418 SHA256 9e18de7c5798356177a191993609f2c7b985957356ddc022396956af2dc1ea1e SHA512 a204f56b049d27f32d03273b4db0bf7ee6b482b0c53511cf5963178bf4e4334f7895b7c91279c8e14de78c537bd9dc3b9f45184c7ff9c23ea28b6521dcf9c0a9 WHIRLPOOL b90b6b02f41d354dc349003afc68608f9981702f26124ddde78abbb3c0be36342a4b010dac52720df87e62dcbb04fbbc144a9c96a151880795f31e50fe1f6ef3
 EBUILD netbeans-mobility-9999_p20150529.ebuild 4418 SHA256 7ea367c73b8543d4cbfbd687823bc5c0ed597e2ab57645384938be415e4fbcae SHA512 979424374eedd88a186c0b663d78ea65ba9529eb12e914a53dfb1a7c84f03819faf1cc844ed5e2d648db95bdde14b07dec6be708e42d562e03b5fe3522c9e7a9 WHIRLPOOL 20cf3b7deb1fb7706b352889853f5785edba8c3fe31aef315f163ed049dbc1cb45a2f7eb41caf3ff0fceac9f621beebf148d4dccfcd1759facd121ef741a7855
-MISC ChangeLog 168715 SHA256 2a1d44d99f61d0d4871bb735f527aa54735107de4787290126812034387f8e70 SHA512 55fcd22e50f37b8c99d65137cbfdfef865163eaf3d6fca7f24e9ca3ddd3e4b416c0099287a9d978d1b84c42ffc3aa267f354f2acfab023604493339acd124326 WHIRLPOOL 70c4940c4162c66ca7124d0f0873d9c1578f524f1f4c81dcc3d5768975c4e05c7452bbcd8a43becdca809d20ba3a27adb1257feefa0d8c673f7f468435d35205
+EBUILD netbeans-mobility-9999_p20150530.ebuild 4418 SHA256 4f50491e714eb896bd15e4fd7953d77d4d9d90a40f4471b8d41a21abff7c7ddc SHA512 baac30aca3d954fa42324fa048e41dec129b22d8af1ab1b61e6bbd596e0c42f84472f1b5d04d9c54d00e45e0862f101701724150f21dc86d3a70aec28a29799a WHIRLPOOL 513c89bfa9238693e00ad826029fe6d1368f4179b7abf1c25f498bd39b4aedb02b7cf8a26a036a7668cf3344dac56a2b75b3cd0cf4f5de1058416d9bac783368
+MISC ChangeLog 168892 SHA256 1d2a01697d393c5b19e55f319853101a434e58e9ee9684e26f1d37349f8d6d6d SHA512 4fb61a71cc8f75e0503e63308b160a2be4c6216f3bf5b5ee6a480b8c7615ce341f821dce4e1a23e8ee1f32d1488ab4743b07eb1e505510ed22889660ca9bc079 WHIRLPOOL b2a717825cc3599bc9c763c986fbb8cb2310993fb582701aaf549e5ac6d38e4922ee4f209c9d727f714449ff96b237e846b327536c8f00b2772f1667d8f94252
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150530.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150530.ebuild
new file mode 100644
index 0000000..24a9b3d
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150530.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-05-30_08-11-16/zip/netbeans-trunk-nightly-201505300811-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 467d7ac..916c10c 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_p20150530 (30 May 2015)
+
+  30 May 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-nb-9999_p20150530.ebuild:
+  bumped to the latest sources
+
 *netbeans-nb-9999_p20150529 (29 May 2015)
 
   29 May 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index 71450af..9e701d0 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -52,6 +52,7 @@ DIST netbeans-trunk-nightly-201505260001-src.zip 207634232 SHA256 15df00f2440c7d
 DIST netbeans-trunk-nightly-201505270357-src.zip 207634435 SHA256 894cd7284081fbb41d7295c08015bf7f6c7578023cb3b2c7488413c19a389f9b SHA512 a273255018cfae2335cffc1ccae90cfc42ec700d4051e03418f2b914e4978ae1aaf85f2b699c0b89cd8b19dfb43d9513fe3f6ace9eff569575e896f82e6eb2d8 WHIRLPOOL b5c5d6f9c166d3129864f830fa33b3c3ab5c6b03b4b5f0f96e2b8871c6f8bbceb0789bad8b7d045e717faa30ef29de2d07f5fdf415a2f65ac65ebe31866d6b60
 DIST netbeans-trunk-nightly-201505280001-src.zip 207639044 SHA256 61715449f3161ede9507bc6cef992c5fc8fbb0e7e8103962b5a06e2dd1742f47 SHA512 030550ee15839a75ef8aa5f6651de8c430eb07e4ce7413317030f76f362e9324530ab5e9e2d945b0cf4ba104459cdcc0a9db89d648d12df72f6b400739baeaf5 WHIRLPOOL 3ef1959e7c28b9de9882a4cbc3370db8e0432108d7072a53344d0281020731decbd70a36ec9e826c859111d47756707c85668349368bb49a25a60b1991812555
 DIST netbeans-trunk-nightly-201505290001-src.zip 207640635 SHA256 2547cf1181fa330f1ac519fbcc91ccc9e31497239f962ddcebeace72f4a6e2f2 SHA512 ab02d0ffd3aced66a79c8917980f5200bde50192c12b2a5fbc2def5122ff83525220581cacea70ee76e8bd1af377c67083fdbdde16d8de5f5550337aaa6e73e5 WHIRLPOOL 4d81036c5308b3dbb50743e688fcb8ee07c1a45aeba75f89a97a1e8d69e04119a456e6899cd7500eec5c0d03828d1f8b0a49637bdf5a9b3cd2b088f90311e4ca
+DIST netbeans-trunk-nightly-201505300811-src.zip 207777734 SHA256 e9b9f7d8613e07dfdc7cecbd4e323e400625985373cd226101638250c1042cc1 SHA512 2c72c85b85e7016d9863ee8033da81d26e14f2928e8dd703ec4c48b02165bb1d65ce331b66b0367cebe54bc1b233b68dbaad1705796751b1f6d87e34744de08a WHIRLPOOL 8967ee3280bbc33ff4b8e4246c31b4debf324886e0251f75330dce8c67443c5fde66d2ae7f13314abc43e8a8f577baa2a56ff69b3516cd2ece144a49525f7ecb
 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
@@ -90,5 +91,6 @@ EBUILD netbeans-nb-9999_p20150526.ebuild 5003 SHA256 8193593c6fe34905284cafa542e
 EBUILD netbeans-nb-9999_p20150527.ebuild 5003 SHA256 6c129f9b5cb991211ee1ee1d43e8d2fc2a590f39e35210df603e5dc24843012b SHA512 90483821e94dde6724f37d7dd8d34b08bd0d63efaa8b8d75db114978647ba95911cd29af8b709aedc78850fa66b26a8ad7c213925cf79d630e1ae2440e52510d WHIRLPOOL d5fb2763fb64d3775afa351d5586df8c0e1574f67ec4231651b2f394dc3a401425e99a8f951945904ae4fe05667430c94ff796b0249fe86fd8c8b47bec988729
 EBUILD netbeans-nb-9999_p20150528.ebuild 5003 SHA256 01b900208ccde88f2008ed8bab7e683b73f9aae859d894431be548776b5c70b6 SHA512 564f219ebffc99324b084e5d509179b398b20e7a316c33f7f1782e7e4acfcd070df0877bdf8d16db1537e2367088c2265113bcae945e24e82a6d38884a94bc42 WHIRLPOOL 5eb6869668bcf1d41ef9953cfeeea045752853bff922bd4142fdfe93bc14a89ecd99d2c0a2983d8c6b531a616470a70337f612bbcbea1c5265b43e123385ca4a
 EBUILD netbeans-nb-9999_p20150529.ebuild 5003 SHA256 fd86b367283d9150d2d061f1bec355404841e4e3cfec5f3d5f95dd1733d90469 SHA512 b2e16320720c05c07f601c0f200a35f63249b252efb607361de894f2ac922c123e218f3d709363ad43451f27398e722ef06fd92385ecc312aa26f287df74dc71 WHIRLPOOL 70682942456b361051404246d5363cc2e46728c4dc2cf22e8d32fb127137c82d6e40f13dbd98f9dfd2f27135e1eb4d18a86e82fb329a45bb3393baabccfcb387
-MISC ChangeLog 157631 SHA256 b0f0bca149563ef99c3a8ae26e751a3f5476854a00634229e7722b5a748edbff SHA512 0e645ac8e6b04cd8d196f97a89a8d8ce473042bbc90441f72b538dfbc9ddfffa11c106f3520f2674de8a14dc0e6e3971ddd6c8d050fcde7b164eb71fab34687c WHIRLPOOL e1f88330b298bc0d9423f0d6e863fdce2e888418c96f7b884a83c2cf16c709cc261c562d64a67db72dcc71c2dafe79ffc4ed4d042f539b5348ba6d20cee9866a
+EBUILD netbeans-nb-9999_p20150530.ebuild 5003 SHA256 e070aa78b4cceebf1e46ef5c830edfe5a90ff5f04cd87f9cca162cfee3bae420 SHA512 c674ab80427811284b83125deee0c21d4ec679163eb9b6c35f2871da291f2f8d8e59c2df63c1e5e4faf93fb76e242f8fb87c2941e6e24b39201e2703e1cb83ee WHIRLPOOL 05ab5a6bd0d3fe152cb985cc932571e995d1c1228e3207be3db1735fe68b28229f5a603cfad4aaf5a3dcd1177e46a6525c5cfceb5d9dfc3db3c42ae7835611d5
+MISC ChangeLog 157796 SHA256 ab271d0d4586e05613427fdb5257c5eb0870793908e5aa03b99732ef33b9b14a SHA512 52fca4dc8fc679d4d63c36bf2e11c902768241c79cba138ec4090077c2172410f5f28589da6773bd201b77338df0cc7433584fd5bbbbc40c9469ebe779a57a26 WHIRLPOOL a1efd6adb44f953187f97ebc2230c2270293ac71f568333f75d6110ca0145e8598715de868ee0f232bf13f9b0a8a739c81b547889478fd5905c73eb9a30e7b84
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20150530.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20150530.ebuild
new file mode 100644
index 0000000..807657b
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20150530.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-05-30_08-11-16/zip/netbeans-trunk-nightly-201505300811-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 ca3dc92..5157624 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_p20150530 (30 May 2015)
+
+  30 May 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-php-9999_p20150530.ebuild:
+  bumped to the latest sources
+
 *netbeans-php-9999_p20150529 (29 May 2015)
 
   29 May 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index f4bf283..78fa57e 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -57,6 +57,7 @@ DIST netbeans-trunk-nightly-201505260001-src.zip 207634232 SHA256 15df00f2440c7d
 DIST netbeans-trunk-nightly-201505270357-src.zip 207634435 SHA256 894cd7284081fbb41d7295c08015bf7f6c7578023cb3b2c7488413c19a389f9b SHA512 a273255018cfae2335cffc1ccae90cfc42ec700d4051e03418f2b914e4978ae1aaf85f2b699c0b89cd8b19dfb43d9513fe3f6ace9eff569575e896f82e6eb2d8 WHIRLPOOL b5c5d6f9c166d3129864f830fa33b3c3ab5c6b03b4b5f0f96e2b8871c6f8bbceb0789bad8b7d045e717faa30ef29de2d07f5fdf415a2f65ac65ebe31866d6b60
 DIST netbeans-trunk-nightly-201505280001-src.zip 207639044 SHA256 61715449f3161ede9507bc6cef992c5fc8fbb0e7e8103962b5a06e2dd1742f47 SHA512 030550ee15839a75ef8aa5f6651de8c430eb07e4ce7413317030f76f362e9324530ab5e9e2d945b0cf4ba104459cdcc0a9db89d648d12df72f6b400739baeaf5 WHIRLPOOL 3ef1959e7c28b9de9882a4cbc3370db8e0432108d7072a53344d0281020731decbd70a36ec9e826c859111d47756707c85668349368bb49a25a60b1991812555
 DIST netbeans-trunk-nightly-201505290001-src.zip 207640635 SHA256 2547cf1181fa330f1ac519fbcc91ccc9e31497239f962ddcebeace72f4a6e2f2 SHA512 ab02d0ffd3aced66a79c8917980f5200bde50192c12b2a5fbc2def5122ff83525220581cacea70ee76e8bd1af377c67083fdbdde16d8de5f5550337aaa6e73e5 WHIRLPOOL 4d81036c5308b3dbb50743e688fcb8ee07c1a45aeba75f89a97a1e8d69e04119a456e6899cd7500eec5c0d03828d1f8b0a49637bdf5a9b3cd2b088f90311e4ca
+DIST netbeans-trunk-nightly-201505300811-src.zip 207777734 SHA256 e9b9f7d8613e07dfdc7cecbd4e323e400625985373cd226101638250c1042cc1 SHA512 2c72c85b85e7016d9863ee8033da81d26e14f2928e8dd703ec4c48b02165bb1d65ce331b66b0367cebe54bc1b233b68dbaad1705796751b1f6d87e34744de08a WHIRLPOOL 8967ee3280bbc33ff4b8e4246c31b4debf324886e0251f75330dce8c67443c5fde66d2ae7f13314abc43e8a8f577baa2a56ff69b3516cd2ece144a49525f7ecb
 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
@@ -95,5 +96,6 @@ EBUILD netbeans-php-9999_p20150526.ebuild 4423 SHA256 d76da63a424b08d8b2677a3bd5
 EBUILD netbeans-php-9999_p20150527.ebuild 4423 SHA256 2d3d91dc9c1a6ecdd882edbd9715cb764055c91db5da7d0a718fc77d0486c032 SHA512 f45bf54265968808d23aac6743a584b35a77695e102a149f37cab846a6670c0a5e44b81ec685ace1b1e817e5695ea1248790d82db98b7a42d61e1eea54b18d3b WHIRLPOOL cabfba72950d5c3b4c66599e47ed8675be8993be18d5e7968c650bfe61b24a6f75085a476d7821f04d1f9b4843a4d8cf825e73b6588e15c1d15dbdff9be50cdd
 EBUILD netbeans-php-9999_p20150528.ebuild 4423 SHA256 7a05f3a20255e1fe7e548db47db3de8707b76850c4735bdcaaf100cd9c9eb2ac SHA512 846e4791d6a890b51a05cbe865a66e023827ed4798f6b43412416b9327705652d40aabe954e44e31cf48cfb29281043f4568a520e8803d7139c40a1ef2fd7208 WHIRLPOOL 9ec9ee8e67fbe6b6af6e8cb649d70aac92487e80103539617bd0a4aa081490ad6fed9a2acd3ce77278e1a5d7a0f4e0fa3833da1d5111c91cfa29b201ce085833
 EBUILD netbeans-php-9999_p20150529.ebuild 4423 SHA256 e9e1f1fc15a8a44156c1dd5020c30a467fa86a1a52b369c89ac1b8f1e8c26c65 SHA512 59a8fa7bff0120205a517da18320198fd105a2ee78e2e86abf285dd0bcf043d31a12fed532aa41d0d7adf9484e1eabe629f68fdb9090f447a67c500f018ba7f0 WHIRLPOOL 2b1fa4f1031a59190081ede49428dc45b2f6984e2b3b1093516d0ae5bc5aa48c4e9e7f8ddffa102bd04329456dea4cd8773dd7274242e854097eb9493593e3e3
-MISC ChangeLog 157361 SHA256 12741ffbdb89dbcd8acadabb42724d8925154f3ae348ec5aa8e100f14a27b9c4 SHA512 6a8ba79f78918f6ee493b10b339b656124693d89a3d7fcfbfcbdd5a1d7738cdd7faae0c86b34aa1864f7f829f1fd00a7418557c731c6b70cc4fa9fbadd8f2f19 WHIRLPOOL 1700b5c9f8a8461d854477afaeda7c5c0f02733ebd94e7a8b9b2890fd7a250d83e007384d80b2a06caf06d6d3249ccda6866b9b378f1a0346d1e1bc5aa11b9cd
+EBUILD netbeans-php-9999_p20150530.ebuild 4423 SHA256 82e160a99671ad5654ea5fb9e0837b15b006c96cb3e63c5d08aa49b3ceb6c513 SHA512 f4450df338df6ba2dd0e19b3d62ef3db3488acb3fb945d8c034455197a0f95128cc30aba21db6cd8bdf177d1c3cbe552a6da14a8526fb3ac05c188b2d643c06a WHIRLPOOL 86f19d470305c22eb372e324e2bfd6b0f9b64043fdf60806394cf027bcf9cf0fab1426e9811ca3651f5a29d99c3bd98fc252a1372c9d2f58725aab76c7b6f113
+MISC ChangeLog 157528 SHA256 059349aaba1ae3aa20ce1daa0146f28057ff985807d1630f7f1e80f1198315bb SHA512 4601fa7a8062b641076adb263a513250f05d3f0783da4a36c49b006b10d2122205eee01b3c286feb13366506090f390f65e3e32bdaa7870f7aab7939db69ecea WHIRLPOOL 83e3a495d40214c43fba9902aee8e775633d53e08042a27c935d89cca7eaf9a086e984fbf209697e43bcafe0083d8c4751d7a710bc589d74c6192736e5ae95a0
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20150530.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20150530.ebuild
new file mode 100644
index 0000000..6ccd6ea
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20150530.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-05-30_08-11-16/zip/netbeans-trunk-nightly-201505300811-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 5e47d6d..1078ead 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_p20150530 (30 May 2015)
+
+  30 May 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-platform-9999_p20150530.ebuild:
+  bumped to the latest sources
+
 *netbeans-platform-9999_p20150529 (29 May 2015)
 
   29 May 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index d21e7d2..3eea418 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -71,6 +71,7 @@ DIST netbeans-trunk-nightly-201505260001-src.zip 207634232 SHA256 15df00f2440c7d
 DIST netbeans-trunk-nightly-201505270357-src.zip 207634435 SHA256 894cd7284081fbb41d7295c08015bf7f6c7578023cb3b2c7488413c19a389f9b SHA512 a273255018cfae2335cffc1ccae90cfc42ec700d4051e03418f2b914e4978ae1aaf85f2b699c0b89cd8b19dfb43d9513fe3f6ace9eff569575e896f82e6eb2d8 WHIRLPOOL b5c5d6f9c166d3129864f830fa33b3c3ab5c6b03b4b5f0f96e2b8871c6f8bbceb0789bad8b7d045e717faa30ef29de2d07f5fdf415a2f65ac65ebe31866d6b60
 DIST netbeans-trunk-nightly-201505280001-src.zip 207639044 SHA256 61715449f3161ede9507bc6cef992c5fc8fbb0e7e8103962b5a06e2dd1742f47 SHA512 030550ee15839a75ef8aa5f6651de8c430eb07e4ce7413317030f76f362e9324530ab5e9e2d945b0cf4ba104459cdcc0a9db89d648d12df72f6b400739baeaf5 WHIRLPOOL 3ef1959e7c28b9de9882a4cbc3370db8e0432108d7072a53344d0281020731decbd70a36ec9e826c859111d47756707c85668349368bb49a25a60b1991812555
 DIST netbeans-trunk-nightly-201505290001-src.zip 207640635 SHA256 2547cf1181fa330f1ac519fbcc91ccc9e31497239f962ddcebeace72f4a6e2f2 SHA512 ab02d0ffd3aced66a79c8917980f5200bde50192c12b2a5fbc2def5122ff83525220581cacea70ee76e8bd1af377c67083fdbdde16d8de5f5550337aaa6e73e5 WHIRLPOOL 4d81036c5308b3dbb50743e688fcb8ee07c1a45aeba75f89a97a1e8d69e04119a456e6899cd7500eec5c0d03828d1f8b0a49637bdf5a9b3cd2b088f90311e4ca
+DIST netbeans-trunk-nightly-201505300811-src.zip 207777734 SHA256 e9b9f7d8613e07dfdc7cecbd4e323e400625985373cd226101638250c1042cc1 SHA512 2c72c85b85e7016d9863ee8033da81d26e14f2928e8dd703ec4c48b02165bb1d65ce331b66b0367cebe54bc1b233b68dbaad1705796751b1f6d87e34744de08a WHIRLPOOL 8967ee3280bbc33ff4b8e4246c31b4debf324886e0251f75330dce8c67443c5fde66d2ae7f13314abc43e8a8f577baa2a56ff69b3516cd2ece144a49525f7ecb
 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
@@ -109,5 +110,6 @@ EBUILD netbeans-platform-9999_p20150526.ebuild 9652 SHA256 7a34da20da52ee7793d72
 EBUILD netbeans-platform-9999_p20150527.ebuild 9652 SHA256 fbfb2254e1347e4c8507e6a7127ba407e1aa5f7da893d9bdd41dd9aa313843cc SHA512 dbdcaf2058d207ad3dd10eafb9d9c1ff77fc2b5c5e62faa0dd422e49cf33fb289a6357a3ca86048f51b604639b16518951875e4a56801b985b55515cc2b5a3fa WHIRLPOOL 95d429dada6ab9c7cb616feda0cfcf75571895d7eca5a358970fa8a5f446c31a2c7a1d2e9f2d2b461e5f4ea0c434270a895827e61e593ab386ca183975b4b470
 EBUILD netbeans-platform-9999_p20150528.ebuild 9652 SHA256 71825293c8106a9e8c0420c2455d9410e7ba816e09856e4bb8176c67c2635db6 SHA512 18284f862dc866a3bc4c9fcf3fc06a00c0c4500b925a71f6b8433128e1aa5093b6e42b0cba088b877751df5564930d74a886f31c74847c1fac6acb5a029d73ae WHIRLPOOL d8b8597c067a3be148befe9382a76ac24b25d1f316fffd642a9ca5f186c4e79489bd069c7e51660d77d376afea8a40a4ff07af6887c9754f4a993c144d167e14
 EBUILD netbeans-platform-9999_p20150529.ebuild 9652 SHA256 c5ce4e3db8dadf0e2b419609f396edfd7cc67de8550a28469e091ccf4beff27e SHA512 2ed0d1562a8b328fea04ccb369fe565e7afec76790b0d2ef339d747d8fe728cb7f9e8ab6e710a4d026e922a1717fedd8e5004a7d2972baa539b3c431af707d8e WHIRLPOOL 59d1350ebc380c2083b76a5829b955b926a48cb46b00dd73b2269e984dd6cbe8b9622ec8f779c99675d133e1fefbb77c0824a91e24127c03380173aa8df7a066
-MISC ChangeLog 169311 SHA256 aecde778fecf9472240b79d1449bf02e7ef46bbdf9d4ae483b37dc5fd48ec85f SHA512 5d9c968616069330730be92a6220a3d0355b8e8e394434d34818c2ba93fd68146579ddd474daf64be013398a224998daa75cc62ca1cc53317125d6d9a1817071 WHIRLPOOL c2c6445b75aeb5c53a04af5a10984b6161fab82f421f75f2df94690769784dc3360f598b24c3d347982e225da80476644f611e40f48d4bff3a24143738622425
+EBUILD netbeans-platform-9999_p20150530.ebuild 9244 SHA256 f3dcac01f9d5f4a8248ff1cb460e587674d450e509907003202c28503c17dc0c SHA512 498ab266b5591b248e75195d26515229a25d2ff4f647825b2a7829d152d1bac95f69ef421a9ff7f71053ac0b3e0bbd36e7c2e6d703ac6d62c907e19b2d290653 WHIRLPOOL cc4bf165b311f29c2d3969efbb17c3294edec5acd978f87ed5e550bf2a457a78c2eeedc11ca13bcbd69d43dfb08955176ab194858b0fb405b94e32606e93c1e0
+MISC ChangeLog 169488 SHA256 66cf3a8252cd9e625503e06545aad25312ce0abbf2621f527d3452967b3b0e39 SHA512 590b87c1ea7db7b09a15d3deb57db744bd515ff215ab019bc47c09d8724efe5a68a17c9920ecb71222882682c1c086cbd275812511f5f85bb6fbc6cc3c8c214d WHIRLPOOL e69d7591afe5a7371ddc0e662090c70f20ab4107c2541eefbbcf61da66d483a570902635d1b8078e9eccde41d4389bd26a4b2c5c951fe626da3d824907fd255d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20150530.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20150530.ebuild
new file mode 100644
index 0000000..5aba75f
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20150530.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-05-30_08-11-16/zip/netbeans-trunk-nightly-201505300811-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 bf517a4..db255d0 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_p20150530 (30 May 2015)
+
+  30 May 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-profiler-9999_p20150530.ebuild:
+  bumped to the latest sources
+
 *netbeans-profiler-9999_p20150529 (29 May 2015)
 
   29 May 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 83951a1..cf4c561 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -44,6 +44,7 @@ DIST netbeans-trunk-nightly-201505260001-src.zip 207634232 SHA256 15df00f2440c7d
 DIST netbeans-trunk-nightly-201505270357-src.zip 207634435 SHA256 894cd7284081fbb41d7295c08015bf7f6c7578023cb3b2c7488413c19a389f9b SHA512 a273255018cfae2335cffc1ccae90cfc42ec700d4051e03418f2b914e4978ae1aaf85f2b699c0b89cd8b19dfb43d9513fe3f6ace9eff569575e896f82e6eb2d8 WHIRLPOOL b5c5d6f9c166d3129864f830fa33b3c3ab5c6b03b4b5f0f96e2b8871c6f8bbceb0789bad8b7d045e717faa30ef29de2d07f5fdf415a2f65ac65ebe31866d6b60
 DIST netbeans-trunk-nightly-201505280001-src.zip 207639044 SHA256 61715449f3161ede9507bc6cef992c5fc8fbb0e7e8103962b5a06e2dd1742f47 SHA512 030550ee15839a75ef8aa5f6651de8c430eb07e4ce7413317030f76f362e9324530ab5e9e2d945b0cf4ba104459cdcc0a9db89d648d12df72f6b400739baeaf5 WHIRLPOOL 3ef1959e7c28b9de9882a4cbc3370db8e0432108d7072a53344d0281020731decbd70a36ec9e826c859111d47756707c85668349368bb49a25a60b1991812555
 DIST netbeans-trunk-nightly-201505290001-src.zip 207640635 SHA256 2547cf1181fa330f1ac519fbcc91ccc9e31497239f962ddcebeace72f4a6e2f2 SHA512 ab02d0ffd3aced66a79c8917980f5200bde50192c12b2a5fbc2def5122ff83525220581cacea70ee76e8bd1af377c67083fdbdde16d8de5f5550337aaa6e73e5 WHIRLPOOL 4d81036c5308b3dbb50743e688fcb8ee07c1a45aeba75f89a97a1e8d69e04119a456e6899cd7500eec5c0d03828d1f8b0a49637bdf5a9b3cd2b088f90311e4ca
+DIST netbeans-trunk-nightly-201505300811-src.zip 207777734 SHA256 e9b9f7d8613e07dfdc7cecbd4e323e400625985373cd226101638250c1042cc1 SHA512 2c72c85b85e7016d9863ee8033da81d26e14f2928e8dd703ec4c48b02165bb1d65ce331b66b0367cebe54bc1b233b68dbaad1705796751b1f6d87e34744de08a WHIRLPOOL 8967ee3280bbc33ff4b8e4246c31b4debf324886e0251f75330dce8c67443c5fde66d2ae7f13314abc43e8a8f577baa2a56ff69b3516cd2ece144a49525f7ecb
 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
@@ -82,5 +83,6 @@ EBUILD netbeans-profiler-9999_p20150526.ebuild 3478 SHA256 6a0d7a0bff7da9e920be1
 EBUILD netbeans-profiler-9999_p20150527.ebuild 3478 SHA256 58d72c35b942ed7a20dd4cedfed9474835c362a96c3cf5f652f7824f4f2b53bb SHA512 36f89aa9fd864193bfefcb3fa9ed4d87a53d6791648a3de40d8b331ca3e601c0b55d2eaa913e35e1bea3dbed4c5c6a2a809cf848624828be7cd45e48e7db23cc WHIRLPOOL 4de3e76f205bb0697d8b848f4accb5673354aa0fa68e7231d4da412453ad914f11a90e93e475fe33ae4f6606d8318b71650aa8b485d3d27527152f69618f0fb9
 EBUILD netbeans-profiler-9999_p20150528.ebuild 3478 SHA256 b58a10bfcf22e83186334a15c276c6955ceaa1119eb5630d7cf5577bffa9aac7 SHA512 9f0ebe40d19d80f95fc5c1e9984bb79870d51961210c5ece9c9a7c0185bd5ba285d70afcfd4b1870048c0bc74915c5379082342d6072773fed783dd7bc4a8ab5 WHIRLPOOL 940b8fe74dc151afc3f74c28b2ad526e1e33a12ab492b9cd874911fe61cbaaf163ee75ec52550adc84af36ab4da391b85b8ad14a14162dceabbe670eb1734935
 EBUILD netbeans-profiler-9999_p20150529.ebuild 3478 SHA256 e1279fa5d3b1ea27c1c3da24828b5f759a93670f982e28edf0e79afa54b0f9d7 SHA512 5da8e08832d0254a302a4b38eacf76a966307ba7ea260572043a11f1389c3d38657a310c3384cf86de6d83998a5d5a178368399b88fefa5cde7771c6aa94620a WHIRLPOOL a8a8bfcdd692f76eb3a1e90e7fd043697e59d4a1b8f948b09bc4cae60904efac346986782600e4ff8541c144aac5d263f6405dd9baea7b68726421984a66397e
-MISC ChangeLog 168772 SHA256 0fb5669c9a05395c919397810a02a9a23f9caf282475b0a2284c3a480c1a38f5 SHA512 ceea076ed011f703138b4b066c519f2d436b9d703a8271e8e517fdf435576a110994355ef625c7b960a9ec028fd6299054322d60e3cd2856df715a9da00f505e WHIRLPOOL 7d8e4f18df2714f54af961c635cdcb4808f8bb24bd0c25417439f40652855ad498133f7eeac111fcfe7306eb68cea4414fa717480c8057789ab6eb68dd440d2f
+EBUILD netbeans-profiler-9999_p20150530.ebuild 3478 SHA256 be73ecc6d1562e58e3e36d867866f82fd11dec396e83e72fddfebb35d48e52cd SHA512 ca71f21d7f2a009512f59bde785e17dde91c9ce82d44ce7413c08007bdc105c501c0711b31344f283b62008275f01d9e20aab4e8135673f8bc78f46bc5d207fe WHIRLPOOL 205eeb1e6e04c0f8756e1069913da5d7164e63b600524e0199101767e0b993730ff248a56ef65a5a550de3071c11e02aa862cc41e8ef21ba3813f96b27f1fbd2
+MISC ChangeLog 168949 SHA256 14a4c0cab763347eed20652a528dd888de43f37d78676b6d9e4bf2874e5d172b SHA512 d1336b0e2a8d4ddfbd99a5c488194a154f7a749785ed7044c413f146008ecca70a7467493683fb59e6d94036e4d6e46710487000afc5c10c874eed600a77a222 WHIRLPOOL 18f9f3f1b34d3a00c78d6c94589bdd4a615fa8b917efb2ca911fc372860d491569174f1479d5c0e4ffe5d1c9189c2117669cf44b7dbefdbc41dce1f6a6d7f941
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150530.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150530.ebuild
new file mode 100644
index 0000000..14b524b
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150530.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-05-30_08-11-16/zip/netbeans-trunk-nightly-201505300811-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 dec8ec5..89178a9 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_p20150530 (30 May 2015)
+
+  30 May 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-webcommon-9999_p20150530.ebuild:
+  bumped to the latest sources
+
 *netbeans-webcommon-9999_p20150529 (29 May 2015)
 
   29 May 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index 46c2e69..2447bde 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -50,6 +50,7 @@ DIST netbeans-trunk-nightly-201505260001-src.zip 207634232 SHA256 15df00f2440c7d
 DIST netbeans-trunk-nightly-201505270357-src.zip 207634435 SHA256 894cd7284081fbb41d7295c08015bf7f6c7578023cb3b2c7488413c19a389f9b SHA512 a273255018cfae2335cffc1ccae90cfc42ec700d4051e03418f2b914e4978ae1aaf85f2b699c0b89cd8b19dfb43d9513fe3f6ace9eff569575e896f82e6eb2d8 WHIRLPOOL b5c5d6f9c166d3129864f830fa33b3c3ab5c6b03b4b5f0f96e2b8871c6f8bbceb0789bad8b7d045e717faa30ef29de2d07f5fdf415a2f65ac65ebe31866d6b60
 DIST netbeans-trunk-nightly-201505280001-src.zip 207639044 SHA256 61715449f3161ede9507bc6cef992c5fc8fbb0e7e8103962b5a06e2dd1742f47 SHA512 030550ee15839a75ef8aa5f6651de8c430eb07e4ce7413317030f76f362e9324530ab5e9e2d945b0cf4ba104459cdcc0a9db89d648d12df72f6b400739baeaf5 WHIRLPOOL 3ef1959e7c28b9de9882a4cbc3370db8e0432108d7072a53344d0281020731decbd70a36ec9e826c859111d47756707c85668349368bb49a25a60b1991812555
 DIST netbeans-trunk-nightly-201505290001-src.zip 207640635 SHA256 2547cf1181fa330f1ac519fbcc91ccc9e31497239f962ddcebeace72f4a6e2f2 SHA512 ab02d0ffd3aced66a79c8917980f5200bde50192c12b2a5fbc2def5122ff83525220581cacea70ee76e8bd1af377c67083fdbdde16d8de5f5550337aaa6e73e5 WHIRLPOOL 4d81036c5308b3dbb50743e688fcb8ee07c1a45aeba75f89a97a1e8d69e04119a456e6899cd7500eec5c0d03828d1f8b0a49637bdf5a9b3cd2b088f90311e4ca
+DIST netbeans-trunk-nightly-201505300811-src.zip 207777734 SHA256 e9b9f7d8613e07dfdc7cecbd4e323e400625985373cd226101638250c1042cc1 SHA512 2c72c85b85e7016d9863ee8033da81d26e14f2928e8dd703ec4c48b02165bb1d65ce331b66b0367cebe54bc1b233b68dbaad1705796751b1f6d87e34744de08a WHIRLPOOL 8967ee3280bbc33ff4b8e4246c31b4debf324886e0251f75330dce8c67443c5fde66d2ae7f13314abc43e8a8f577baa2a56ff69b3516cd2ece144a49525f7ecb
 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
@@ -86,5 +87,6 @@ EBUILD netbeans-webcommon-9999_p20150526.ebuild 4997 SHA256 1afc82db4dadb5c61e0f
 EBUILD netbeans-webcommon-9999_p20150527.ebuild 4997 SHA256 1650c4a13f34f26f4aca4c7daa8aa0f6b896ba95d4861ac1a6130e8cc794e442 SHA512 f695b89914acf620c677579f4000f8fb12e60598e211bcc4424e12719325e67486ca6ebd2b7ddd88c757c9cdaad10445395c8ea08e7cf99ae4fb04dcef560338 WHIRLPOOL a2187326f0d114f4c8407e75c452a7fd15d130c9c4085f33c805b8ee4d13083bff830f324572081893976a494b2f78fd7340ee70da66b585fbabdb3860ec3065
 EBUILD netbeans-webcommon-9999_p20150528.ebuild 4997 SHA256 9a09b615e02a71ceba38dbbec707b6f6331ce4f2179ccad3f129792fa62db18e SHA512 ce8d2d96fbbff607ddb5f8bc478f9e22b233591a6b662f0ce59a8769276b742776d3a00f4e9ff34ea0c6eb51517abf59af1c0cf1e889ab8773bd8b4fd3d54053 WHIRLPOOL 63d518815caaed083a73d9fd0d786ad871bbb634c023405adef5d882bbb765b5d4665204e379df0d03d70c662c72654e793f43f64600f40072fafee8fa548a2d
 EBUILD netbeans-webcommon-9999_p20150529.ebuild 4997 SHA256 5a61b3878af4b9169695aaa6e26f013b299f7de45241d64944ab8e79b583638a SHA512 7c44cd2b8f44137b3377a6e5449a408407078b9c55d898ce12809232f959453a70be5659bfd9ce044214c644196481e6746e1cd11f2e4b64792f38b511e655ba WHIRLPOOL 943cf60aae10f12e4c8bcb73b137395c8ea83c9f4a6f455fc093a978ca0c34f502daa156555e1b4ee09050d5151dcfeb6064628b2e0c9a308b4d05cea3f399ed
-MISC ChangeLog 141857 SHA256 6dcccfe2e0d6349d940d7fec28a8eec3356524316b93d61d05bcb25334cbe57c SHA512 255eb155892c34764e3d551ed88240a2ed740126a6e1c79d43956284c94d1346bf3be42873735e3cd714e89e8c2a6055431d683721d5d5b679637be159c04af3 WHIRLPOOL 60770f06e42b85961b61433add4d86f1d0a92ab929f45d019ed6e1f4ba63aa75ca115d1c1a8b38d6eed811980ac14cffcd2038acd952d626ae931bebd3c0aa9a
+EBUILD netbeans-webcommon-9999_p20150530.ebuild 4997 SHA256 1b6839c13a522df7c183bf7dd243e5d1ee69d9b6742ed842a62c00433d49571f SHA512 e46b51c45c4266ed9bb614f8fd2d4172eaf01782d35749b7d7a240cbfc5cc9fcf918b56fad1d0dc112424265ff947f46e830ea8a362d33c4e13debd3cdb06542 WHIRLPOOL 38b24782d30861ee3bef4b310f42f393d49ca1b272fdf1d22a95305996d68df0d753fe1b36ceeb4b236ac3f6e83d92d4762051b6bf646253cae0c2faee8c9cc9
+MISC ChangeLog 142036 SHA256 35454512f4855523af8462271a608490445993a75ce9975eec7f70fc29417de9 SHA512 c71fb67b5bad931e9d2696152f4308187862ac9d77ffb28e8ba2e548ae4405db9dbf6b8fbb5c0426bd2dd4c2585fb2871b9217ad2e61fb32f3cbd2b850e3cde1 WHIRLPOOL 3ee62f906c1eb2fe732e25323973e2da2a7eba76292b64d4efc1e2de6629087afb40659308b4f41ec149c7d942bbbdcd719002d3632da3d3515ac81bca86c4da
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150530.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150530.ebuild
new file mode 100644
index 0000000..4a59348
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150530.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-05-30_08-11-16/zip/netbeans-trunk-nightly-201505300811-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 26aa28f..b660bfb 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_p20150530 (30 May 2015)
+
+  30 May 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-websvccommon-9999_p20150530.ebuild:
+  bumped to the latest sources
+
 *netbeans-websvccommon-9999_p20150529 (29 May 2015)
 
   29 May 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 2ff58e3..13cefd5 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -44,6 +44,7 @@ DIST netbeans-trunk-nightly-201505260001-src.zip 207634232 SHA256 15df00f2440c7d
 DIST netbeans-trunk-nightly-201505270357-src.zip 207634435 SHA256 894cd7284081fbb41d7295c08015bf7f6c7578023cb3b2c7488413c19a389f9b SHA512 a273255018cfae2335cffc1ccae90cfc42ec700d4051e03418f2b914e4978ae1aaf85f2b699c0b89cd8b19dfb43d9513fe3f6ace9eff569575e896f82e6eb2d8 WHIRLPOOL b5c5d6f9c166d3129864f830fa33b3c3ab5c6b03b4b5f0f96e2b8871c6f8bbceb0789bad8b7d045e717faa30ef29de2d07f5fdf415a2f65ac65ebe31866d6b60
 DIST netbeans-trunk-nightly-201505280001-src.zip 207639044 SHA256 61715449f3161ede9507bc6cef992c5fc8fbb0e7e8103962b5a06e2dd1742f47 SHA512 030550ee15839a75ef8aa5f6651de8c430eb07e4ce7413317030f76f362e9324530ab5e9e2d945b0cf4ba104459cdcc0a9db89d648d12df72f6b400739baeaf5 WHIRLPOOL 3ef1959e7c28b9de9882a4cbc3370db8e0432108d7072a53344d0281020731decbd70a36ec9e826c859111d47756707c85668349368bb49a25a60b1991812555
 DIST netbeans-trunk-nightly-201505290001-src.zip 207640635 SHA256 2547cf1181fa330f1ac519fbcc91ccc9e31497239f962ddcebeace72f4a6e2f2 SHA512 ab02d0ffd3aced66a79c8917980f5200bde50192c12b2a5fbc2def5122ff83525220581cacea70ee76e8bd1af377c67083fdbdde16d8de5f5550337aaa6e73e5 WHIRLPOOL 4d81036c5308b3dbb50743e688fcb8ee07c1a45aeba75f89a97a1e8d69e04119a456e6899cd7500eec5c0d03828d1f8b0a49637bdf5a9b3cd2b088f90311e4ca
+DIST netbeans-trunk-nightly-201505300811-src.zip 207777734 SHA256 e9b9f7d8613e07dfdc7cecbd4e323e400625985373cd226101638250c1042cc1 SHA512 2c72c85b85e7016d9863ee8033da81d26e14f2928e8dd703ec4c48b02165bb1d65ce331b66b0367cebe54bc1b233b68dbaad1705796751b1f6d87e34744de08a WHIRLPOOL 8967ee3280bbc33ff4b8e4246c31b4debf324886e0251f75330dce8c67443c5fde66d2ae7f13314abc43e8a8f577baa2a56ff69b3516cd2ece144a49525f7ecb
 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
@@ -82,5 +83,6 @@ EBUILD netbeans-websvccommon-9999_p20150526.ebuild 2727 SHA256 4cd4985cb0de645e2
 EBUILD netbeans-websvccommon-9999_p20150527.ebuild 2727 SHA256 af31d7a94dd03ee9ef39a0baaa18c83ec7be1ce298dbae2df0ec9b6179abb6b4 SHA512 220725660b158811b472ce6ae1606409a83503790e3014013a3d93191b05e7b4b65631c2e0d9324c1b22681f4be8b15bdb19661db5994a46a5abeccd16c74a0d WHIRLPOOL d453f1022353a454e6390ff75323e6799bb29a0ffb0e6c9539eddfb76877752d950e668712c9be6a4f5bcd3de95505902c700571de25149b2b50bdf02493bd2c
 EBUILD netbeans-websvccommon-9999_p20150528.ebuild 2727 SHA256 63bea5cd01fbee2653f5f7c9040f9a4cbb478f271736f756b61ff4e0c7845ca6 SHA512 568265727a45add573938c36da47f8ec024c5e12af45127d62fb35bbc55422eaa643b720ec0d1d378e5a92d0367cdb752b9b1381cb9d864e6db6638c42700e58 WHIRLPOOL 3e6f8e20922fb7e5744f0d16d4f692f96760bff7308ab810f2c2e1be380f7c189675df1c954940b89ea7be586b010f90d5b78ba071f382541699c8510a42b7a4
 EBUILD netbeans-websvccommon-9999_p20150529.ebuild 2727 SHA256 e7dd364b5b3ef05660e8b449f1bd1c266f865b9b63613e5d0af817b8366ccd4f SHA512 9e9e495b4d4190c23dfd51a0b8b72c1d4b7f8d6c6cb656f96b663d4903927923b1d064775899c05bfc0e22f3fe089407e470aa40936d39a0da2f733a47329223 WHIRLPOOL f6913b8c0ba9b15cb25f24c76a6919c471183bf962142b9504ce6d4c27fdc229b32e4b19e3af686944d56711656f8eb145aa9aa87dfbc292166952321a1ef1c2
-MISC ChangeLog 176853 SHA256 1d8c94182fa00aa76ecf53a575bf6bbff01700b2c9021a83f89059f7cc598d35 SHA512 1c1c1a5cbbd6df41b36de9f84cf339a76fe0f077d76a9c447d8aa2a090cc31337a98cbcdf220dc1e5a6ca2da1112dee0ef524a5ea7e877437c2a5c5c3ac6dfbe WHIRLPOOL 459913c22808f43755ce62676587a905830a270893465e6b54194f86b57125facf7d0143871c0503509ff2618c7824c58700e75a10bea12afbed6734b1d6ed44
+EBUILD netbeans-websvccommon-9999_p20150530.ebuild 2727 SHA256 bee88c9c629ffae49073a7c01f18fdfb8f71be809bed7f1dec78d086f57ac2ee SHA512 7cbac1a99b579156b14e4066756910a88b4814cb40bf909ec480ca303f871da0fcb7721aeff3cf456a8cc63e90c32b39f8cd00c11827a2460f7f8813ca9cfefe WHIRLPOOL cf1536b6892ca55bba2812875b96fbbc9840834cd0cdac2403a2fa79877df3651aa3ec3bbbd6baae270ecd028b97b42110e1d22b4226a6939bc11c67ff6c70d9
+MISC ChangeLog 177038 SHA256 622de469a0e9650e8c2a95a6efb33381a8193bd6241c2702c8167295f471a3de SHA512 2b0868090860f71e1da0583474748240eedcaa6117e580c306a180bd3f329226fe76bcc46b95eb8b2ce08fcadf6189ae1accbf27aacbe737cf922973bed3f4c9 WHIRLPOOL e09eb7470428c27f2a47e31b6eebab7b238a7f5eacf34df31e1ed930b7320bd5e75701f2b99bbe587242d8a1cd78a75c718f8f1b93faff8b5e8f22937e1a1926
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150530.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150530.ebuild
new file mode 100644
index 0000000..8c0249c
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150530.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-05-30_08-11-16/zip/netbeans-trunk-nightly-201505300811-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 7b6cc10..591a201 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_p20150530 (30 May 2015)
+
+  30 May 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-9999_p20150530.ebuild:
+  bumped to the latest sources
+
 *netbeans-9999_p20150529 (29 May 2015)
 
   29 May 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 00fbf6c..33cff6e 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -52,6 +52,7 @@ DIST netbeans-trunk-nightly-201505260001-src.zip 207634232 SHA256 15df00f2440c7d
 DIST netbeans-trunk-nightly-201505270357-src.zip 207634435 SHA256 894cd7284081fbb41d7295c08015bf7f6c7578023cb3b2c7488413c19a389f9b SHA512 a273255018cfae2335cffc1ccae90cfc42ec700d4051e03418f2b914e4978ae1aaf85f2b699c0b89cd8b19dfb43d9513fe3f6ace9eff569575e896f82e6eb2d8 WHIRLPOOL b5c5d6f9c166d3129864f830fa33b3c3ab5c6b03b4b5f0f96e2b8871c6f8bbceb0789bad8b7d045e717faa30ef29de2d07f5fdf415a2f65ac65ebe31866d6b60
 DIST netbeans-trunk-nightly-201505280001-src.zip 207639044 SHA256 61715449f3161ede9507bc6cef992c5fc8fbb0e7e8103962b5a06e2dd1742f47 SHA512 030550ee15839a75ef8aa5f6651de8c430eb07e4ce7413317030f76f362e9324530ab5e9e2d945b0cf4ba104459cdcc0a9db89d648d12df72f6b400739baeaf5 WHIRLPOOL 3ef1959e7c28b9de9882a4cbc3370db8e0432108d7072a53344d0281020731decbd70a36ec9e826c859111d47756707c85668349368bb49a25a60b1991812555
 DIST netbeans-trunk-nightly-201505290001-src.zip 207640635 SHA256 2547cf1181fa330f1ac519fbcc91ccc9e31497239f962ddcebeace72f4a6e2f2 SHA512 ab02d0ffd3aced66a79c8917980f5200bde50192c12b2a5fbc2def5122ff83525220581cacea70ee76e8bd1af377c67083fdbdde16d8de5f5550337aaa6e73e5 WHIRLPOOL 4d81036c5308b3dbb50743e688fcb8ee07c1a45aeba75f89a97a1e8d69e04119a456e6899cd7500eec5c0d03828d1f8b0a49637bdf5a9b3cd2b088f90311e4ca
+DIST netbeans-trunk-nightly-201505300811-src.zip 207777734 SHA256 e9b9f7d8613e07dfdc7cecbd4e323e400625985373cd226101638250c1042cc1 SHA512 2c72c85b85e7016d9863ee8033da81d26e14f2928e8dd703ec4c48b02165bb1d65ce331b66b0367cebe54bc1b233b68dbaad1705796751b1f6d87e34744de08a WHIRLPOOL 8967ee3280bbc33ff4b8e4246c31b4debf324886e0251f75330dce8c67443c5fde66d2ae7f13314abc43e8a8f577baa2a56ff69b3516cd2ece144a49525f7ecb
 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
@@ -90,5 +91,6 @@ EBUILD netbeans-9999_p20150526.ebuild 7216 SHA256 29a649e44af7b653ea2c50e273c598
 EBUILD netbeans-9999_p20150527.ebuild 7216 SHA256 05e0a57c17edfeea65a6a8eddde859c594510e7376783119899f8d3faa877c3e SHA512 b2f7880f40e87b1e6c35459c3b96add5e51407263ac413bf73b9e3fef19199d1c779f62c1cafd27edb13356a09f2ae4b661d31fab32d0fc319bce1c6ce030ffc WHIRLPOOL 2e8b69bb782e2512433ddd6a1e2ed5f42702252d06aa32660fd85b25af5ca782238921cd5a28826fb4e4c76fc9c488002f54bbe98d941245aa85b90659c60c3d
 EBUILD netbeans-9999_p20150528.ebuild 7216 SHA256 47abc9543687deeb9c04a35da68d8787846d094edf6728ef37a3f4bd197d21b0 SHA512 44cc5e36d38e40a1ae4f2231123810c9224ee2c6d032ef5465abdd25b5f7e49f9c9e3db221bdcbeea8ac033560f8e17f373793dcdf2fae79d2fe7f1d38c8a118 WHIRLPOOL 020658d7d8377be6d5cc0e9580d14db9f8917a45124eee907315f41545b09da63138722d17bf741a2b52fd6743f21b7c25b5298af9952ff05e49bd46d37689f0
 EBUILD netbeans-9999_p20150529.ebuild 7216 SHA256 0b6009bdcf959d83bd1846e8e073db25b24658b8c65928b2b9a7760ba9a3f5bd SHA512 6503d1671479cdd93ce43ae4cf09870f7586254b44c02764bb3b9eaeca5f6025b17922c439f4f72045e0a8c858a28e1b911fc5dacdd12a52388031b647c6f9ea WHIRLPOOL 5c31a63e11a9bcfd4c78ef93a66ce3a3466dc09ec2a5f402ec55f7962f9907dd828039db6e0dfe3bcbbb6cec4f495368b96619b562391a3546e6fa27b553d237
-MISC ChangeLog 150354 SHA256 19666444de1d4eef712d0d8386f070d9a4df8ef26fa52ba1f2a70f84b39fbb5c SHA512 cbeb06df17d551ad12b774352ada39d7c734d1058bc4ab22a52aa33657bdd87346bc3c90450cede5c8877bbc6b984e7643c7c180b70a426a399034713eb4fde3 WHIRLPOOL ac9246c0e1333d018161be5b4b65ea10b51bd1cdcb7dd60fcb18c013e8beb48959c6ba0b19829134bcb02f9176a9ba835256f822ae236736fc5d66d20a87a227
+EBUILD netbeans-9999_p20150530.ebuild 7216 SHA256 085f889a4185c0322377a0a2ffb8dc426f1e62e483cf7423992ebc527eef2435 SHA512 307c44ff4d58b5a2b5ec0ae01be85edf98e8070be6a17e167fdf1d3cca3e64021709be882a54bfcbf10027c5813ee1e68d72ee9d8fa9bedf083b5130684e4967 WHIRLPOOL 0f6868ebbbf91961dfeae3865f92e584f8b00dd5ca2dcdaa58dcad04e415521ed71a303c47e94df5fa39c7ee8d987f8f5aa92131fa654d02c153f2a9d611b927
+MISC ChangeLog 150513 SHA256 53a95d9d0f0dc329620de7eabee43f46a3a171f9381cf47fd1497341e50a969c SHA512 9d0b76510b0bdd3049f598e6f227af057b02e7da11697073ed85d248617f253cd73c8d219cac274a8c6589c9934f26439c644d91a248fa5ec6278f1d94358f2d WHIRLPOOL 03315bbca8f236a7b58f20c6c87ae7552eb6c53389ef3e21f0e641f9e8b6d4107efe67c7801f134b1b9e413c717a9e66d81a2e8552a21b46d4b4509ef114c7d7
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

diff --git a/dev-util/netbeans/netbeans-9999_p20150530.ebuild b/dev-util/netbeans/netbeans-9999_p20150530.ebuild
new file mode 100644
index 0000000..bfdba63
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20150530.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-05-30_08-11-16/zip/netbeans-trunk-nightly-201505300811-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
+}