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

[Miroslav Šulc]

commit:     36cc393bfc32c37d727f231ac9f89288c992a8c5
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 23 08:40:54 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Jun 23 08:40:54 2015 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=36cc393b

netbeans: bumped to the latest sources

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

diff --git a/dev-java/netbeans-apisupport/ChangeLog b/dev-java/netbeans-apisupport/ChangeLog
index 7a6d801..a2f2d69 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_p20150623 (23 Jun 2015)
+
+  23 Jun 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-apisupport-9999_p20150623.ebuild:
+  bumped to the latest sources
+
 *netbeans-apisupport-9999_p20150622 (22 Jun 2015)
 
   22 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 6fd434c..9e6428d 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -37,6 +37,7 @@ DIST netbeans-trunk-nightly-201506160001-src.zip 207930175 SHA256 fae079edd3ea6b
 DIST netbeans-trunk-nightly-201506180001-src.zip 207938768 SHA256 2dd02e87aaeabc7b80a5a41a732817077bbc3e750dd7f27b4c049e1f87aeb240 SHA512 f841a6374c9859391c2b2bab8da32dda91e87944bb6de017c2ffec0e3506a3949b88915247a2192d2d4e3046edf5bb09a26bc8d4a5bcdaa4d683dc0928720c8f WHIRLPOOL 8245bd39b2e3c65e64b0273910c44cd40c01bdfb70a8ab82c3cbcc4e4670fd3d57156807603eb0dcc9b9d9256f0e2d994c7898d934ce485e91623f6b32be301c
 DIST netbeans-trunk-nightly-201506190001-src.zip 207946096 SHA256 5efc0e1a1e9c0321958cb784f65aaf2a804049b3412eb4da7d26018d073c90bf SHA512 80a5b8eeb4dcde61072d9a7e69e08c95fdcc903c5a6165361545fe48e9053056a0861deac96684743f2ef4899777277cf320fd320c21ba9de2eb4dad11c365c9 WHIRLPOOL 0c3395a48fde0a83b4400078e046dd9129ce43922b35f61cfc913d3b4ff6857b2bb81267b55c3fd29a44e8f8663eb3480c5b382c557eb3706bca6ec960358953
 DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d64768e171b41b9164dfe43922947325e7f96ca9c95f73961bd5ae SHA512 b7cfd9b0c0e557bfd5bda998cbe910a7193402fc44bce07d00c97edabbd50fff14d9f28fff4ac169a6aeef965db7acf4939db18ca9aefea8b09e1885b7b83a21 WHIRLPOOL c105483067cdcde190cea21475c96b7ad272533a9e20fabcf4a45a97fdf7ac7252d8422cd6a6ccbc986aab7fa6fb8f35436acfdc7723f158eac771b4e1a229fc
+DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
 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
@@ -68,5 +69,6 @@ EBUILD netbeans-apisupport-9999_p20150616.ebuild 3390 SHA256 4b641dbba017868862f
 EBUILD netbeans-apisupport-9999_p20150618.ebuild 3390 SHA256 6bb14847fea5c96c5a6e4703eeb3c18076d0d857dd4356e8e1f79c6145c3b219 SHA512 df986e17b33dfa89f4328878ed15a931a6a42575a61c13ffcdaa825642b1256e1f5f2a557b5e61b0352a571f22489a3e7f09a708ab751160bb4aa9f9b48f68b7 WHIRLPOOL 88632d7ca3963206a4c1630322b1dbe6fa7a19e27d36f26e74bd50db4d4449fba58fabf5130b8e04b03f73d0101d9000b79ae5847a47786bb91a49c71af4ea77
 EBUILD netbeans-apisupport-9999_p20150619.ebuild 3390 SHA256 d52197982cc34f3cb544d8aa81dfe4c4d6a751246ecf04c4de35655aeecfadb0 SHA512 108ef4dd076a4e86f7c8cd3f1816aa3ecd15f9b43f25e717815719ebb81c61c27e2b644eec71bd408e542d779a6d375d6fb76bdce8a4d0f8de418ca9253cb506 WHIRLPOOL 66d8aadd289fc4f5de76991d9457d690ac4a6ff158242bda8371fb6a5585e2ef16d3c3e053c55ac678889c86019e21f1d9e5b76ceb0b43d272d48ca49293b4d2
 EBUILD netbeans-apisupport-9999_p20150622.ebuild 3390 SHA256 6d1d7e7e42fe9fca915bd0bfd440f2b47cc63e3b60634a724759875bb6c0c660 SHA512 d78b9f2287e979675b8805954ba81da56be9830bd28c70c2ad2c2f74c8fdd81745ad1f269e22b9d1cd1560392c16b33f3b5984f2db933fd98fdac7d4bf698233 WHIRLPOOL 5423cf431ba14b86ed2e6a7e61a3336700a5564841503ad818ae9c80c6243c18647efe53fb9bb3d5ca3c82e832b68a6d2ff37c7e4db6a6ba1487a96d159ada8b
-MISC ChangeLog 176395 SHA256 386ff998c4e0071240ca6565df3275158163d22569b5a7f1289bb4776dbddced SHA512 801cb731ab0e15cd7de6584af3b1abb6058030abf61d2477cefb32e7455db9a06d064e886f995c7ba0f4964e838f8b77e52ff2995cf0790b829e80898f977277 WHIRLPOOL 5f4505ec3ce984526ad319c3fe4992fa6540f282e58c015f510efd0854634aaf77ec87d9aea6aaffe4cd4f36c170a85673995809fcfb761331d6f7a5ecfc8a6c
+EBUILD netbeans-apisupport-9999_p20150623.ebuild 3390 SHA256 e9a13e3ae0b7ab31ca13547e691979ad55fbd1f0f94d0b0ca6290cfb20ced4a4 SHA512 dbffb75be14f63efb3af802443e850765d380c28bb0293e577fa5b369adfa231912fe6749057788f80883710a8ece8da8ca606d1031f21e70f07cfc6f85eac74 WHIRLPOOL 3031f2cbd256fe6101d6f4d096634c7b8fb0a80677820c02e9021406cee9aef36057a4d86afe418515b7dddba1de8b7eff39db5594284b5c3460ae0235417785
+MISC ChangeLog 176576 SHA256 08e27899af7c9d3b854f9866955a225b2c4afa7f696952f7319c821f16f02df0 SHA512 7c0bdc1fb9680bd2f849e29610392a99ce4d7d22036962c1f5cd455a98d0bc291eb2b4d6a5c3aa38cfe99062cc773face6bc38049547d22dcd85ec244f8ceb71 WHIRLPOOL c51c3e2d1bd7ba2d88f7ca7b3cba153e71ed2ae0d34d532c95b0086b8a142b0ea1cf756d343b11f7d6d9160e78cae4088c8ff7dd46e475c48ba04e9943331fc3
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150623.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150623.ebuild
new file mode 100644
index 0000000..b5ba1ee
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150623.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans API Support Cluster"
+HOMEPAGE="http://netbeans.org/projects/apisupport"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-06-23_00-01-56/zip/netbeans-trunk-nightly-201506230001-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 9550e75..47907dc 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_p20150623 (23 Jun 2015)
+
+  23 Jun 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-cnd-9999_p20150623.ebuild:
+  bumped to the latest sources
+
 *netbeans-cnd-9999_p20150622 (22 Jun 2015)
 
   22 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index a493f28..eaa1fd4 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -19,6 +19,7 @@ DIST C4CF9314A530E51B891D46DB65806A5A0ED240AF-cnd-build-trace-1.0.zip 27300 SHA2
 DIST C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip 92177 SHA256 71e6d46d9c7e624bc83dbfa4edde20bfdcb47ae76dc2b19dd553d23f22b454e7 SHA512 64b15aa898a45c1dce0d9c58ec4ef8c3dc1a32e1213543d98002cbf5419d67b3caf4357c8a252e36951197f3edd70e34a226c989e5479ce3b2d1405783d3d530 WHIRLPOOL 675db7f81ecadcecfe52f18cf8bd465867c1dac12f818717248da9a7d071d45adeb3c6af2e6ac1863bb5ccca36ae9383722d2361c28af52e51e5f2ac34736e89
 DIST D4BF6B1BBE51F2D8EEC23CCB28C40BA587885B71-clank_0.3.6.zip 6872400 SHA256 89d0d5e295ffb487e42110e304c158886fe211073e99534ca4bcda75eef4db40 SHA512 9dd5413575fa88406709a0e930a13ade04965ef4684ad7a78b89abc81974f3af2a55d2cb56acee649c4b116da8cc39aec9b733d2090dd05c8138ab3d9d33bd21 WHIRLPOOL 7b2bce0748303766e4ec6f4f46425c3c584d87a1940ad9f29c7331c9e14a99bf128c4d43704a70b3444302874bb43dcfa3a3f70b8a7a7d87d58927b10586b0e0
 DIST DA2DF3E815DADCD2B6A18AB8DD0ED832BA70D077-clank_0.3.6.zip 6865670 SHA256 fe921bfc83944ea1f00a01ea78b5f202b26b8dcd15687e13da2d3877608a7e83 SHA512 02e4e5ee4618ad53a2ba2553d86d6ade7c42e66e2372de575940dd1f72f7e4a864016bec28424ed5282022f60bcafa37cfbf31db069afb378365682809519fff WHIRLPOOL 646469d1e2434f760d8854b27810904f7b964c4e2e8d061bb365e8d1457fef962ae883b92b69b2eacc479fbe4131caadd35c8144a25548b42975724e16938f22
+DIST E03865DA6B38B4F87DEC7F3066A6259B47EB449D-clank_0.3.6.zip 8218974 SHA256 f2a55be466df9441d628cd5ae09113e2bb65719d2297ab36d6c7223d4a27a14f SHA512 6ed22fd49a523904b4b77fd6c5e1d1cdc748ef50dedd7278dd3060c8e9466c6288ad38a93ddf0077b2f84c2f8c9c3c0ab3390ac6aaba6835d4a83807758f324a WHIRLPOOL bf1dc9b7906716456e691ddb736a336208fe8800025ca9298989f5910a6869da2a312cd718059b837b64c093ffe2be48347ca90b97b787879e0f90642376eee4
 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-201506160001-src.zip 207930175 SHA256 fae079edd3ea6b
 DIST netbeans-trunk-nightly-201506180001-src.zip 207938768 SHA256 2dd02e87aaeabc7b80a5a41a732817077bbc3e750dd7f27b4c049e1f87aeb240 SHA512 f841a6374c9859391c2b2bab8da32dda91e87944bb6de017c2ffec0e3506a3949b88915247a2192d2d4e3046edf5bb09a26bc8d4a5bcdaa4d683dc0928720c8f WHIRLPOOL 8245bd39b2e3c65e64b0273910c44cd40c01bdfb70a8ab82c3cbcc4e4670fd3d57156807603eb0dcc9b9d9256f0e2d994c7898d934ce485e91623f6b32be301c
 DIST netbeans-trunk-nightly-201506190001-src.zip 207946096 SHA256 5efc0e1a1e9c0321958cb784f65aaf2a804049b3412eb4da7d26018d073c90bf SHA512 80a5b8eeb4dcde61072d9a7e69e08c95fdcc903c5a6165361545fe48e9053056a0861deac96684743f2ef4899777277cf320fd320c21ba9de2eb4dad11c365c9 WHIRLPOOL 0c3395a48fde0a83b4400078e046dd9129ce43922b35f61cfc913d3b4ff6857b2bb81267b55c3fd29a44e8f8663eb3480c5b382c557eb3706bca6ec960358953
 DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d64768e171b41b9164dfe43922947325e7f96ca9c95f73961bd5ae SHA512 b7cfd9b0c0e557bfd5bda998cbe910a7193402fc44bce07d00c97edabbd50fff14d9f28fff4ac169a6aeef965db7acf4939db18ca9aefea8b09e1885b7b83a21 WHIRLPOOL c105483067cdcde190cea21475c96b7ad272533a9e20fabcf4a45a97fdf7ac7252d8422cd6a6ccbc986aab7fa6fb8f35436acfdc7723f158eac771b4e1a229fc
+DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
 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
@@ -90,5 +92,6 @@ EBUILD netbeans-cnd-9999_p20150616.ebuild 4796 SHA256 b27c0e5eef9244aa5df09ee32c
 EBUILD netbeans-cnd-9999_p20150618.ebuild 4796 SHA256 13d1f966322dfdf8cf470d0b2e0f5ef2f5fc443d520e13c7d246c0b4187f5c7a SHA512 28ebc6c9fc01b1e97088b62c7b80d01cb8d214d8e3878c47025086132333371bf45ba3624839008c82bedb8015105315fdc2807a6e76ece1e67608e2a08ce098 WHIRLPOOL b1220e8608e5240bb3b8bbcdbb3af66a5c09086bc057f7ed46f0a5dc04f6bd6d10907d6a23745dd2d38b7fe05cf76b1c8a1defaf20987a8eb6b99b7a2cfc662e
 EBUILD netbeans-cnd-9999_p20150619.ebuild 4796 SHA256 43713c208534b156aef66111c1b32df58993b8669c55e3847dd19d624d1d3aa5 SHA512 59b2223cacc3251725b0f07a582179c333caaae537ecc04ae82f31c6dbca3bb0264fa211c9779e68a54e821e1664f9cc93cd74484116b710a81aedc63d7343c9 WHIRLPOOL 2bc9cae96d3b08b2853b10d11961cce770f6c229d49c77daf72628c26ef63cec96af8db244db3db42a158c0eff102c28462afac0c79a4b79ea2ccd607405f247
 EBUILD netbeans-cnd-9999_p20150622.ebuild 4796 SHA256 6d8ca45394764d4e89e818f5979f61a369f9cead282bf3e68e0a19e0d94331cd SHA512 aa4ed6e6100396e84a07e089e63365a5a8ae61a7d904d0efbfb13c68a0cd7d311643eb69d7bf41c5ed0e933169fd8fa93ebe77e6f1d6cbe16d5822153404ea0b WHIRLPOOL f051022db67d0786c4f77b14099376d0d1f042f14b126a62a14a48505afcc01067ce511210163b894427d2bc9b5524e5c4054249b953e255b92e4520b65a074f
-MISC ChangeLog 160987 SHA256 98895a032a1e2d6a23a4c24e327b225e704dfa12310db86fa00276e7d12e8adf SHA512 651e1e94d0a7992a8aae308ee0e3eab75ded1ac8f7d614683a6834ada244a15b4cd94cc24c8b65664f3e17ca896386c09aa5c8a10f2b811097533cb96c4f99e0 WHIRLPOOL d2649a43c7f911de07efda5a1e70a7e9b448a15dcc3f96c6f0f035454fa1a2c8ceb97160a5d5a5807df3ea0dd0f566df0589e5d518dee683c3d81a1d0153e8e7
+EBUILD netbeans-cnd-9999_p20150623.ebuild 4796 SHA256 ba2734186171529a127344d87d65fadc502e27a5a973b70cf39956d646dc5d90 SHA512 34cd5fbc07751b7367e2ed410161dcd160780dad4f886f188169c352c65b80ab9fb531c4b920d840543194d272d86df12bedaba2fb21d54a308a8bf5c871fe67 WHIRLPOOL cd4d29828acc8526e218f1b90f306746e9bcfb253d6010437c9121a6c8e322bfb539b1aa98b2cc1c191ec1b27b2fbe560736e8537cfe814886d2b39d0ccdaf42
+MISC ChangeLog 161154 SHA256 9c96d1cdd01d7c437fab18e6f821c8f05b3f252e2d76689ae7cdd431ba516d73 SHA512 7874ed6ce67e0f9ff413261767a362dd07d8f40ed3cb49504e7b59b67f6a418ff5bf65dc4a6606d2af7abae7087546fa1f6b9d07091c8b3f90313a1ca19c9d82 WHIRLPOOL 47e98b4caacafd881fc22d009381b8165a750f9bee54afe0153f61fd9cd5931d9c26e6db7085169f03ca66e8d9ad55dca003a2fac793db9cbdc7c72cd6a9701e
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150623.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150623.ebuild
new file mode 100644
index 0000000..539b8bb
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150623.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans CND Cluster"
+HOMEPAGE="http://netbeans.org/projects/cnd"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-06-23_00-01-56/zip/netbeans-trunk-nightly-201506230001-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/E03865DA6B38B4F87DEC7F3066A6259B47EB449D-clank_0.3.6.zip
+	http://hg.netbeans.org/binaries/BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip
+	http://hg.netbeans.org/binaries/BB83D4F8047D608858154CB041054F5CAE35B903-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}"/E03865DA6B38B4F87DEC7F3066A6259B47EB449D-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}"/BB83D4F8047D608858154CB041054F5CAE35B903-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 cc3ee16..872dde6 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_p20150623 (23 Jun 2015)
+
+  23 Jun 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-dlight-9999_p20150623.ebuild:
+  bumped to the latest sources
+
 *netbeans-dlight-9999_p20150622 (22 Jun 2015)
 
   22 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 0a595d6..68cc25b 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -43,6 +43,7 @@ DIST netbeans-trunk-nightly-201506160001-src.zip 207930175 SHA256 fae079edd3ea6b
 DIST netbeans-trunk-nightly-201506180001-src.zip 207938768 SHA256 2dd02e87aaeabc7b80a5a41a732817077bbc3e750dd7f27b4c049e1f87aeb240 SHA512 f841a6374c9859391c2b2bab8da32dda91e87944bb6de017c2ffec0e3506a3949b88915247a2192d2d4e3046edf5bb09a26bc8d4a5bcdaa4d683dc0928720c8f WHIRLPOOL 8245bd39b2e3c65e64b0273910c44cd40c01bdfb70a8ab82c3cbcc4e4670fd3d57156807603eb0dcc9b9d9256f0e2d994c7898d934ce485e91623f6b32be301c
 DIST netbeans-trunk-nightly-201506190001-src.zip 207946096 SHA256 5efc0e1a1e9c0321958cb784f65aaf2a804049b3412eb4da7d26018d073c90bf SHA512 80a5b8eeb4dcde61072d9a7e69e08c95fdcc903c5a6165361545fe48e9053056a0861deac96684743f2ef4899777277cf320fd320c21ba9de2eb4dad11c365c9 WHIRLPOOL 0c3395a48fde0a83b4400078e046dd9129ce43922b35f61cfc913d3b4ff6857b2bb81267b55c3fd29a44e8f8663eb3480c5b382c557eb3706bca6ec960358953
 DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d64768e171b41b9164dfe43922947325e7f96ca9c95f73961bd5ae SHA512 b7cfd9b0c0e557bfd5bda998cbe910a7193402fc44bce07d00c97edabbd50fff14d9f28fff4ac169a6aeef965db7acf4939db18ca9aefea8b09e1885b7b83a21 WHIRLPOOL c105483067cdcde190cea21475c96b7ad272533a9e20fabcf4a45a97fdf7ac7252d8422cd6a6ccbc986aab7fa6fb8f35436acfdc7723f158eac771b4e1a229fc
+DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
 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
@@ -74,5 +75,6 @@ EBUILD netbeans-dlight-9999_p20150616.ebuild 2995 SHA256 37b3999e3971c2cbfcc3777
 EBUILD netbeans-dlight-9999_p20150618.ebuild 2995 SHA256 83385674972b51bb96ee73a8b8e3f20fc554b0ebf9cb181940b549311aa2cb73 SHA512 938e0c72dafcba3d8073e66d7621cf4defca6d94c28804d7f8aa17b093c8f27ce47cae28d623febde8e79781401528018b073cb4857e0fc7e3ccaf52bfd9cb42 WHIRLPOOL ac5c0d6f49393acb3103638038642769423830e0e39d8edd3b9cc48f02cac9f7edb8af2463d2e0d86b3397fa8dcc8a0a4996a76c30c8abfdec5ec06f5760ed63
 EBUILD netbeans-dlight-9999_p20150619.ebuild 2995 SHA256 c9076dab190e3e69ca4be2ebe9ef827b4e0df0650b9988059cbf57361025e72e SHA512 39746233fd8a80f138e497ea7d73d0ec2c30ce76cf5cfa0b6a637dd1e7949177d15dd7b73d0f9bab204654bce5d28c253fe9f7650fcd9b8328ea5f2637cdfe62 WHIRLPOOL 3e9f49c4dc9548fd7b40796a839e2f3045dfe1629fca78fb6dcb4d46c357cf83485c58cf00824804e5ce022dac91b4a224f2759017c64ae973cc24eeff1d5793
 EBUILD netbeans-dlight-9999_p20150622.ebuild 2995 SHA256 e3ee6b5e9e27eb097d2a4a1e89760fc0ae59f788f951c80c0dbfe012bcd69a39 SHA512 9c30f7ed6f542aa3035188327c8392fc35e01ad81339e9a3cf8baf849411db9295fb94e615fe4a758ebe47048ad93bddb3e82a8c53c37f84f1a11ddad1588abd WHIRLPOOL 1b9bc344df495ca42f24258e668d08b3c330ca5b2a7d38742aad1b6adfef3b58df430fddf5296c1a65dbcadc30448785ee66e108b6471713e9b1c1af9954456c
-MISC ChangeLog 168032 SHA256 357d42d40fa13fbefcd4b41d6c2e888cd4e452adf0fd7ccd432c729d7514af54 SHA512 9d8dd1ed4a88a27dbf05cf3590881cd06b9c23212cf7f3c5f137e322676e8c819189c84bd42f1a396a8c05552e355fc0d1e78fd400bab8b35e288c85f76d3213 WHIRLPOOL 2605e3c3b81567bdd9748bf020b3574da7f9a8f6e9c31f7cb43d02108a87a1fe53280f85f0548e9b65723860072c632e44a13496668c5f55242ddfb84250f7e9
+EBUILD netbeans-dlight-9999_p20150623.ebuild 2995 SHA256 023ef7005d8efab5f4208b7f7783605b97016f74d3f0aa5f3c31da67b45927d5 SHA512 8625f5579bf7ca840f841537a4816082a3bbf49811994b34c3a8d4321b18b6c9b60a1ce8411ea8292643ea274eceff803fd1b28541cb814f901911f5b3ccaec5 WHIRLPOOL 326dae952cea6ac05ce6acff903f2452731615fbe1a7f937012d072cf168f5a620a10dbdd3cdd54c1ed1617eea0bb21fceab4d12cfae67b923ebebd920083f95
+MISC ChangeLog 168205 SHA256 8681c14edbb21146df0a14724f7bb3e5a5b01b98fac748e02c80c130cffd4d5a SHA512 58f7c113006da9cabfcf449471a687d15b8a0f7648580fcf1279838692c00bbc3f986fa80fdfdbbf4bc2f20522c92c73fdc790b80eb81e144912aa476ead8278 WHIRLPOOL 7781a6777b59a75d74d21ae4dd67e51baf5dc35e0652aeed9f086f5aac759a3ff842584f3e27e7a6a8d77b2689a292d0edb269bcbcf5cd28f384444faf6e72bd
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150623.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150623.ebuild
new file mode 100644
index 0000000..dc05c93
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150623.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans D-Light Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-06-23_00-01-56/zip/netbeans-trunk-nightly-201506230001-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 57dfccf..91d28b0 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_p20150623 (23 Jun 2015)
+
+  23 Jun 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-enterprise-9999_p20150623.ebuild:
+  bumped to the latest sources
+
 *netbeans-enterprise-9999_p20150622 (22 Jun 2015)
 
   22 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 52538d8..6fa233e 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -126,6 +126,7 @@ DIST netbeans-trunk-nightly-201506160001-src.zip 207930175 SHA256 fae079edd3ea6b
 DIST netbeans-trunk-nightly-201506180001-src.zip 207938768 SHA256 2dd02e87aaeabc7b80a5a41a732817077bbc3e750dd7f27b4c049e1f87aeb240 SHA512 f841a6374c9859391c2b2bab8da32dda91e87944bb6de017c2ffec0e3506a3949b88915247a2192d2d4e3046edf5bb09a26bc8d4a5bcdaa4d683dc0928720c8f WHIRLPOOL 8245bd39b2e3c65e64b0273910c44cd40c01bdfb70a8ab82c3cbcc4e4670fd3d57156807603eb0dcc9b9d9256f0e2d994c7898d934ce485e91623f6b32be301c
 DIST netbeans-trunk-nightly-201506190001-src.zip 207946096 SHA256 5efc0e1a1e9c0321958cb784f65aaf2a804049b3412eb4da7d26018d073c90bf SHA512 80a5b8eeb4dcde61072d9a7e69e08c95fdcc903c5a6165361545fe48e9053056a0861deac96684743f2ef4899777277cf320fd320c21ba9de2eb4dad11c365c9 WHIRLPOOL 0c3395a48fde0a83b4400078e046dd9129ce43922b35f61cfc913d3b4ff6857b2bb81267b55c3fd29a44e8f8663eb3480c5b382c557eb3706bca6ec960358953
 DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d64768e171b41b9164dfe43922947325e7f96ca9c95f73961bd5ae SHA512 b7cfd9b0c0e557bfd5bda998cbe910a7193402fc44bce07d00c97edabbd50fff14d9f28fff4ac169a6aeef965db7acf4939db18ca9aefea8b09e1885b7b83a21 WHIRLPOOL c105483067cdcde190cea21475c96b7ad272533a9e20fabcf4a45a97fdf7ac7252d8422cd6a6ccbc986aab7fa6fb8f35436acfdc7723f158eac771b4e1a229fc
+DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
 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
@@ -157,5 +158,6 @@ EBUILD netbeans-enterprise-9999_p20150616.ebuild 15937 SHA256 ada19946d7e6cc50ab
 EBUILD netbeans-enterprise-9999_p20150618.ebuild 15937 SHA256 8ab6fe3af92c4c4ff10ec4e2f889d7f037c81e582e4ad4c1b0e7ecc84b5baf5d SHA512 df5fc8aa14205ca8ff19b24631e0b3d19a16b82aaaad0a2d06a1be5d0b76f4475e8d00d4f2db4f4dffd2c62fba9a4f5c31800f089a10e72033efeba47c63cfea WHIRLPOOL f615c5060bc7a9d1b9160292ca7f0d502b050c2292ab74d621c2da51e88a0d3a6abeb2926a6edfd53bfa894c908c0b2648a1433650bdac80e142a8b481cd7263
 EBUILD netbeans-enterprise-9999_p20150619.ebuild 15937 SHA256 9a5089a5528103c1c5dba41f154cf62aa64779ab124c214d743d170855a3be9d SHA512 0d71a1e2e37e4a59dbe6c9403d648264aeb37c9a35676741d0d2b11f4d4f393a816a641bf57f64b7321cfe994fe5d1cf7319752287b6843a6cf58a0c84f8ead3 WHIRLPOOL 4dde778720cb18a25561fded5aa14a06ab4c285df293549a86e216a2cc5ffc436e1bdb4db30ae379fe6a3422696ca0d296e1eb093216c53dea74963c5073a89e
 EBUILD netbeans-enterprise-9999_p20150622.ebuild 15937 SHA256 553cc4267b2f764078db17f85e01c14593247d4ab5b4a933318f1f16eb0e415a SHA512 857902dc48dad3b66872ad877351317271cbd4189a70ab65fa6fb002435312dcc29a1536e80a8fbbadf1cda72e08d6966fac822885f91a4a0b655a2b80cbfa54 WHIRLPOOL d93f81f81a4f0f6c62a899818839deb6bcac8fa6fdcb9a72b76b8ae65c5e7522d610a0e98440e4edcbadb0afaacb186652b64c0d0257493526259ee63eb416fc
-MISC ChangeLog 176920 SHA256 6a4af0c397c28eea80362e4912b1a589137ad2db9574ee6c8e3f8f8af1e50dff SHA512 4c8e229409ed99f02165962018a274b824d3f69d8df186fc0483beb5ca2f59da2dee6a31a4dce709afc04cef44be4b767840ed9a95566309e25209415375c015 WHIRLPOOL 9b0ebac9066882475d14423eb2386ca94abd839078206b0cf683b9f305c94c1ce7d91526eefec74193ec348cd9dfe3e74336e87e51898bb9c9a5e783fbb1ddf9
+EBUILD netbeans-enterprise-9999_p20150623.ebuild 15937 SHA256 1d8efdc54fa71fa498bf6d070fe69d7ad632ce9039e2ca560633809e94096866 SHA512 51cf05407054872aaed969d6834da649e61edcd3d6fad0189e9674b54ce5692dc71710e883aca6c5550602710632c095289fd3884cfd3176edb9a399a6191fe8 WHIRLPOOL c65b5aaefaf0126dbee18ef36e2c00e56adf97fc46e821688001b800ab08c156b2fb56f6b3990ff5cf4bf7740b8d1dcf5ed7cf79e16eee70d7cb965d385efa3b
+MISC ChangeLog 177101 SHA256 cb4f3537afcfb33421beb3cfb4c02222709c945fad12aed749083a22012af079 SHA512 55842d02e8220448f6fc8ec4800efd711bf9ef6604dfdd23b014fff10113a21cc56e05d44345915223e244ab3d793ab7dc39654400e523df91ae9ffda4eec750 WHIRLPOOL 9115687db7347068788b9a456fcd439e3450ae74e4cf94ff2424d4129873cd68807ef74b36e4ce34d11bbe0aa5458f7078fb6d14a9cddbf7d7fe9d5bf1256b30
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150623.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150623.ebuild
new file mode 100644
index 0000000..1b1717e
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150623.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Enterprise cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-06-23_00-01-56/zip/netbeans-trunk-nightly-201506230001-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 49bcbb4..e97bc15 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_p20150623 (23 Jun 2015)
+
+  23 Jun 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-ergonomics-9999_p20150623.ebuild:
+  bumped to the latest sources
+
 *netbeans-ergonomics-9999_p20150622 (22 Jun 2015)
 
   22 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 7ea4897..30d2a4f 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -37,6 +37,7 @@ DIST netbeans-trunk-nightly-201506160001-src.zip 207930175 SHA256 fae079edd3ea6b
 DIST netbeans-trunk-nightly-201506180001-src.zip 207938768 SHA256 2dd02e87aaeabc7b80a5a41a732817077bbc3e750dd7f27b4c049e1f87aeb240 SHA512 f841a6374c9859391c2b2bab8da32dda91e87944bb6de017c2ffec0e3506a3949b88915247a2192d2d4e3046edf5bb09a26bc8d4a5bcdaa4d683dc0928720c8f WHIRLPOOL 8245bd39b2e3c65e64b0273910c44cd40c01bdfb70a8ab82c3cbcc4e4670fd3d57156807603eb0dcc9b9d9256f0e2d994c7898d934ce485e91623f6b32be301c
 DIST netbeans-trunk-nightly-201506190001-src.zip 207946096 SHA256 5efc0e1a1e9c0321958cb784f65aaf2a804049b3412eb4da7d26018d073c90bf SHA512 80a5b8eeb4dcde61072d9a7e69e08c95fdcc903c5a6165361545fe48e9053056a0861deac96684743f2ef4899777277cf320fd320c21ba9de2eb4dad11c365c9 WHIRLPOOL 0c3395a48fde0a83b4400078e046dd9129ce43922b35f61cfc913d3b4ff6857b2bb81267b55c3fd29a44e8f8663eb3480c5b382c557eb3706bca6ec960358953
 DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d64768e171b41b9164dfe43922947325e7f96ca9c95f73961bd5ae SHA512 b7cfd9b0c0e557bfd5bda998cbe910a7193402fc44bce07d00c97edabbd50fff14d9f28fff4ac169a6aeef965db7acf4939db18ca9aefea8b09e1885b7b83a21 WHIRLPOOL c105483067cdcde190cea21475c96b7ad272533a9e20fabcf4a45a97fdf7ac7252d8422cd6a6ccbc986aab7fa6fb8f35436acfdc7723f158eac771b4e1a229fc
+DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
 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
@@ -68,5 +69,6 @@ EBUILD netbeans-ergonomics-9999_p20150616.ebuild 2919 SHA256 aaa47477b0c8772cbf7
 EBUILD netbeans-ergonomics-9999_p20150618.ebuild 2919 SHA256 0892d9dc18861a7da08835699b97c5b1f74efd9e17a0a6d2c087c2009a105076 SHA512 6787dce9222ee6c650afa5264aa2ec1ba4a06b4c2f2db9a3b5ae4a7e9a4b3da922312415609fe499a0d66b604b3556d644226a013ccdd7fa632a8dcb13b86816 WHIRLPOOL d5f8f9aadbcb29ddcde74bf40d237f9349fe1b3d63f3806bd687c188f9d67af5dde808bec7dece7c807793486dc71816de99b31a0306e0ef818f9812d42b6bc1
 EBUILD netbeans-ergonomics-9999_p20150619.ebuild 2919 SHA256 36561513c737ce9f8a1f3fd82732b119bc740d3e517bb5e83cc216c0d920d55e SHA512 2bb072a3d82385caf873a87ff0537f18965f2cb0d202504457f49bbc21831f39b556ab20c0204282fa558575cc9b20c470a1062baf4c4f6f0dba6bb4ec357aaf WHIRLPOOL 0f8a5c3133a64ec90f0979c28f20f0719bbc095acbffbc8452a5ccf69de4bd4968a89fe76dd0775d81b7c241644efb106092404d2d2d143c8cb3c408fe8dfda1
 EBUILD netbeans-ergonomics-9999_p20150622.ebuild 2919 SHA256 8da3e419b1d99804f3d6bc50455c70d4adb2fdc51446505d495d0a444c751ed7 SHA512 affd09bf2a993613bccde89fbc3784b1dfb2093b786f83ef3336d2a5649c64ea2e9022e433388134324a7f1fa950fd79898e37bdbebde4437b2ab3df40b85f0d WHIRLPOOL 71de681f76c869b22f947a089730a5b8e44582ccedea3c77b301a13969a86592dd6b7a6da2fc94b4a651ce50eb11ed6338b7c87439a1fd0a24c801b277b531eb
-MISC ChangeLog 176395 SHA256 4a1bdf95267876010aff07012e73b5f4691a6f27e028dbcaba335063ecfa3358 SHA512 4659b03813d97ee995dbb982d2eb623969d5f39a8054e2bc103c759e1afcced8921820a17da166935e787e6d9a20e855f3e090b299161e1b1609cea8a4beb895 WHIRLPOOL 05dfe98d3476d5e9ecfec27125751a1b4f98add7df1b4441cb473eeb4836bc5ed13f26119e66aece689c5611831a8e1d373b9d415f4eb935d01289bae26dd4df
+EBUILD netbeans-ergonomics-9999_p20150623.ebuild 2919 SHA256 087ceaa07b425a532efc2bd8ccd971c06ff9d296775cbb6e68758734e2516bc9 SHA512 9c22ca4638195e1fb3c5a6d142487bada6abbbb99983627fc9d5b94f0dcc6a97e247474fe64d82b8337c7e284ec809c88aac6f86e7ee6b6ecbcef3bb642ca34a WHIRLPOOL 87cd7d8bac43a7dacacee6c5785233ccf683242e9adb597e5d84fc1ecdc14892bea44be82fbea626239dcd780a9af2e8b1421b77f18a957db67737becdad1c72
+MISC ChangeLog 176576 SHA256 7e148ccc9deccbd56f85d112918694bf6bf2bf0035298bb5fddfbae8db49fa93 SHA512 ee2d9a0255c3ef8dd3587a69b950513962a4f503b68857197e13648abe2a2d62fe41b8c6327fcc3222752ab09d3f126519f24aacb9fbda33651b0dfd81ca3aeb WHIRLPOOL 41fc6cbe835153df2defc9161283a0fdcc178c165e0c3f61e90323c9341826a4ee9980aa9d99671fb80bd226daae1c30b21e6696941d1fcaa3433e2151a6b135
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150623.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150623.ebuild
new file mode 100644
index 0000000..1e0f054
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150623.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Ergonomics Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-06-23_00-01-56/zip/netbeans-trunk-nightly-201506230001-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 2fb012d..6932bde 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_p20150623 (23 Jun 2015)
+
+  23 Jun 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-extide-9999_p20150623.ebuild:
+  bumped to the latest sources
+
 *netbeans-extide-9999_p20150622 (22 Jun 2015)
 
   22 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index 260bae5..ad0a5dd 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201506160001-src.zip 207930175 SHA256 fae079edd3ea6b
 DIST netbeans-trunk-nightly-201506180001-src.zip 207938768 SHA256 2dd02e87aaeabc7b80a5a41a732817077bbc3e750dd7f27b4c049e1f87aeb240 SHA512 f841a6374c9859391c2b2bab8da32dda91e87944bb6de017c2ffec0e3506a3949b88915247a2192d2d4e3046edf5bb09a26bc8d4a5bcdaa4d683dc0928720c8f WHIRLPOOL 8245bd39b2e3c65e64b0273910c44cd40c01bdfb70a8ab82c3cbcc4e4670fd3d57156807603eb0dcc9b9d9256f0e2d994c7898d934ce485e91623f6b32be301c
 DIST netbeans-trunk-nightly-201506190001-src.zip 207946096 SHA256 5efc0e1a1e9c0321958cb784f65aaf2a804049b3412eb4da7d26018d073c90bf SHA512 80a5b8eeb4dcde61072d9a7e69e08c95fdcc903c5a6165361545fe48e9053056a0861deac96684743f2ef4899777277cf320fd320c21ba9de2eb4dad11c365c9 WHIRLPOOL 0c3395a48fde0a83b4400078e046dd9129ce43922b35f61cfc913d3b4ff6857b2bb81267b55c3fd29a44e8f8663eb3480c5b382c557eb3706bca6ec960358953
 DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d64768e171b41b9164dfe43922947325e7f96ca9c95f73961bd5ae SHA512 b7cfd9b0c0e557bfd5bda998cbe910a7193402fc44bce07d00c97edabbd50fff14d9f28fff4ac169a6aeef965db7acf4939db18ca9aefea8b09e1885b7b83a21 WHIRLPOOL c105483067cdcde190cea21475c96b7ad272533a9e20fabcf4a45a97fdf7ac7252d8422cd6a6ccbc986aab7fa6fb8f35436acfdc7723f158eac771b4e1a229fc
+DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
 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
@@ -62,5 +63,6 @@ EBUILD netbeans-extide-9999_p20150616.ebuild 3383 SHA256 220be9f9bd1a109e757e700
 EBUILD netbeans-extide-9999_p20150618.ebuild 3383 SHA256 9f87ffa058c7847c0814eee36b1a0c0c948b921f885bced31bcd757741d9c4f2 SHA512 9bd928b64660e6b577af34deedc94496ae665e1c004e08284d5efc0eaaef0bfb01f7b6699badc96f798bd1fdb6f7287b82a98ddd50d19f6bc0a1548b1a63ceb6 WHIRLPOOL 5d30e35a3db7d2389ebf6ea90086e4f19f01ac0f6ec28419bc003d2d0a8608e43d765c965b0553b258b28dae1f39199bd2b65f92e37a8e00cab45af6ebf0addb
 EBUILD netbeans-extide-9999_p20150619.ebuild 3383 SHA256 45520261a44b6416c3c2cce31247c7a20405d2eb025f76b6fd774920724d9acb SHA512 3285210a064ab7d97d1e1d03d57faea51217a39bd2c9f1b08dbd064326ef98819dabd0087f710d010adce7b84ee490ad0faa607479fbe989d38787d37410ee3e WHIRLPOOL 1528579e0e2cfd9cfdb1b039b423206387e49af25c6171ee0f186c72086214b25d72d897c71b9ee17890cf4c7b3482556922db5df4492516b7b7ffbf0572285b
 EBUILD netbeans-extide-9999_p20150622.ebuild 3383 SHA256 aa494307b06e0be42731c46a4d13cce00648d435325edeb1b197c5a60e05f426 SHA512 b7dae23938b76f920805f02a5ea0f1b97a63302b6d833bbbf60581914c8949c333c5d26ce1245e649425b60e945c0e3acdde59f4e4cf581a3f2bc65f20f277f9 WHIRLPOOL 66262495a67f1e2e1f53416d06880bbbec8e540509e6be7340daf2cac9f8d60dcc00448aa66ace3824f1eff17bf0938bff8f3571d9e5729b16c91fd15954296a
-MISC ChangeLog 99942 SHA256 153eff7048dce8a8aedda2510098b35a168cf9b1d436eea73c09c7d5979b6a16 SHA512 d4df49a3de510db7e0764131ad78348d95cf1e16aca7b5a184aca2ab3bd87936e587cb09a1d8465def205ff3132de12f4e069593ab54f71f9177a3def4e37e8e WHIRLPOOL af42eb6152e365fa0a7c68e7d534c521e4010b9089a8cf64445f92d0e3a7dd8010999d4587ee29bce25572c7a8d38c4a51701e3ea057ae3e5484d71d73dc92c9
+EBUILD netbeans-extide-9999_p20150623.ebuild 3383 SHA256 c498b22167a52f98b69b8e53d5547c90f0177228f85252465c386a63e57fab0a SHA512 47ac2a62be72a52965445738587b87e484c292f983e6d87f7002bec85018135fce7bde09304f7a05bdf2fdbbca87f39477f37ea15e9f43c5c0564b9992b6a418 WHIRLPOOL af11dbf88874e0599d597733fee1f8f5465d4f9a40cb09de832b634cea6016267cd244e4ac77abb14ea554ef4365421ff8e0443799dba582ebf526b38920fcf8
+MISC ChangeLog 100115 SHA256 3d546bf34035151b294793a383e07ba19bddda45fadcf1160d3e511d16f442bb SHA512 9a5854b1083459a1ec3ccfeb3d6f4bd53d0fffe8eea973a102c56e0b230aecb3d0048c75dbfc8a63bfaf8dd39cd2d3ad75e9535da69ef2322ef2aa54993342ed WHIRLPOOL 05186f00f88f36009c29448cd704523d3bd8d2c4fd7fc6d20ab9817905df1b87bbc905e8795dd9943e2050b63d739c501d17bfaec31fa6f86cf2acff66c38d91
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20150623.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20150623.ebuild
new file mode 100644
index 0000000..acc013b
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20150623.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans ExtIDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-06-23_00-01-56/zip/netbeans-trunk-nightly-201506230001-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 39e3d1c..ba0b375 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_p20150623 (23 Jun 2015)
+
+  23 Jun 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-groovy-9999_p20150623.ebuild:
+  bumped to the latest sources
+
 *netbeans-groovy-9999_p20150622 (22 Jun 2015)
 
   22 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index 51a0f80..83d82c6 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -41,6 +41,7 @@ DIST netbeans-trunk-nightly-201506160001-src.zip 207930175 SHA256 fae079edd3ea6b
 DIST netbeans-trunk-nightly-201506180001-src.zip 207938768 SHA256 2dd02e87aaeabc7b80a5a41a732817077bbc3e750dd7f27b4c049e1f87aeb240 SHA512 f841a6374c9859391c2b2bab8da32dda91e87944bb6de017c2ffec0e3506a3949b88915247a2192d2d4e3046edf5bb09a26bc8d4a5bcdaa4d683dc0928720c8f WHIRLPOOL 8245bd39b2e3c65e64b0273910c44cd40c01bdfb70a8ab82c3cbcc4e4670fd3d57156807603eb0dcc9b9d9256f0e2d994c7898d934ce485e91623f6b32be301c
 DIST netbeans-trunk-nightly-201506190001-src.zip 207946096 SHA256 5efc0e1a1e9c0321958cb784f65aaf2a804049b3412eb4da7d26018d073c90bf SHA512 80a5b8eeb4dcde61072d9a7e69e08c95fdcc903c5a6165361545fe48e9053056a0861deac96684743f2ef4899777277cf320fd320c21ba9de2eb4dad11c365c9 WHIRLPOOL 0c3395a48fde0a83b4400078e046dd9129ce43922b35f61cfc913d3b4ff6857b2bb81267b55c3fd29a44e8f8663eb3480c5b382c557eb3706bca6ec960358953
 DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d64768e171b41b9164dfe43922947325e7f96ca9c95f73961bd5ae SHA512 b7cfd9b0c0e557bfd5bda998cbe910a7193402fc44bce07d00c97edabbd50fff14d9f28fff4ac169a6aeef965db7acf4939db18ca9aefea8b09e1885b7b83a21 WHIRLPOOL c105483067cdcde190cea21475c96b7ad272533a9e20fabcf4a45a97fdf7ac7252d8422cd6a6ccbc986aab7fa6fb8f35436acfdc7723f158eac771b4e1a229fc
+DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
 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
@@ -72,5 +73,6 @@ EBUILD netbeans-groovy-9999_p20150616.ebuild 3422 SHA256 31495a20205c510910477e0
 EBUILD netbeans-groovy-9999_p20150618.ebuild 3422 SHA256 f9f5fdae5fa693c17124413e03b444d572e4b5ad96a4a963bddb133239048fe4 SHA512 da3f3a7a5ec686f9677c35ac107a99cc3498ceda85d9f457a2beefefde1b4cd841dc4ca2566547b2565df92e0a954e1bbe8fa42287c1df1a1cbd12fd3ec55a07 WHIRLPOOL 8bb981ed9d69fbc98d3852cd47f4ab21fa62dfe2f95f20e98b1bfe3cf201cdb5b248533c97be7651779e907cc92fe681284fdafd1a622161c911789a5f3530dc
 EBUILD netbeans-groovy-9999_p20150619.ebuild 3422 SHA256 904fe44e35c313ec6aa73cf759b3115823e04465678753e8c254c155705fb2ef SHA512 d3cf7d15babdb93122ec1f12cd3ce422c6725da34fad0139491e2324874be3812379d4ec0b9aa693c381cd4e7a5f32445aaf7b8dfc4f9038cc09f7e256f9ffed WHIRLPOOL 2386816e7f0449429a5363c82a09bcca481f7e86b927ea33565f5060fdc162f0601c0cddf27b75d18ba3635072b2e8722bd7eed2f3e7c64e4316060aaaec0ed4
 EBUILD netbeans-groovy-9999_p20150622.ebuild 3422 SHA256 539222c0376c3e77a01877505864bc03b1456235caaf73e3c418f6c49d7a5044 SHA512 e5d6555ca1bc2f27bc6781a1fffbf58cea3ad4c70db315c65e009ca2dde99e4a86fe6cb279813eb4000d68f1b738516b4af4e9a8ef90e4020547b02dceeddf91 WHIRLPOOL 79798674360373edc1d7bf0b5e7fac984c664a15668c9b067ec59e7478f970349e1e37b1f92b622da2f8963a12382e0ca0b89bc2c9c910557d504398fe4d27a3
-MISC ChangeLog 167922 SHA256 3f5b2978a9638dd4f9de2014e74eba17e98f805febf2d78e35c119a1946dc343 SHA512 2aafec7baffb0dffa865de7982fca3af29e6fc4aa24b1b3c9b37da6bd62bfaca151653f463247051ab05ecf46b6b9e79e677f1b3d0160c86203a3da54f09f6b6 WHIRLPOOL e34e6e62929032cdb868903b8585a0b5994935c5181404bcdc200091da195cbe7bff92eab6533014112f97e3228efe5898eb259954c7c1a9cd19abce7f66b3f8
+EBUILD netbeans-groovy-9999_p20150623.ebuild 3422 SHA256 5d01889ef49edb266f8cd09946311a055f512f9b1f6a26b55339a19f0f532797 SHA512 3e071072ec9d3e495d51a991888e1efd6386d8375ed4516f5c5b7466bd79660c3b031f5efeabc3de1e0aac93273f5cf44fed583952d3f314da8c83df577e0aba WHIRLPOOL f9a34054f588fc90c5ad4ca4f90866121a3b7f4add9e38e5ce41652fdeb75ff61d488d3906568e23187734cefd3c889ea4fb8b26c62b3aa6173921ac578edb9e
+MISC ChangeLog 168095 SHA256 e66920521b39fb47e33af84c73f5ac9f6dfff0a690549a200cc7fe9a93dbbaa5 SHA512 3456327de0e373f984058a5828c4640daa8dbee0cae04e165e9a219050ec1384533c21cad6b8038db9fb68b1f118d0170a9a97f411c2fccaac04df77b9c5eb1c WHIRLPOOL 4eaecc14407da12533c5cb3b0660c5b7d2aad4a59cb795c7d16683e96cc821342ddc62a7d6172b579539c008e746fc8e8f6e2427762376a7c9c398666bcc2357
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150623.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150623.ebuild
new file mode 100644
index 0000000..ed0b94a
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150623.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Groovy Cluster"
+HOMEPAGE="http://netbeans.org/projects/groovy"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-06-23_00-01-56/zip/netbeans-trunk-nightly-201506230001-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 6e2e172..224e6b1 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_p20150623 (23 Jun 2015)
+
+  23 Jun 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-harness-9999_p20150623.ebuild:
+  bumped to the latest sources
+
 *netbeans-harness-9999_p20150622 (22 Jun 2015)
 
   22 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 1416eb4..16a26d8 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -43,6 +43,7 @@ DIST netbeans-trunk-nightly-201506160001-src.zip 207930175 SHA256 fae079edd3ea6b
 DIST netbeans-trunk-nightly-201506180001-src.zip 207938768 SHA256 2dd02e87aaeabc7b80a5a41a732817077bbc3e750dd7f27b4c049e1f87aeb240 SHA512 f841a6374c9859391c2b2bab8da32dda91e87944bb6de017c2ffec0e3506a3949b88915247a2192d2d4e3046edf5bb09a26bc8d4a5bcdaa4d683dc0928720c8f WHIRLPOOL 8245bd39b2e3c65e64b0273910c44cd40c01bdfb70a8ab82c3cbcc4e4670fd3d57156807603eb0dcc9b9d9256f0e2d994c7898d934ce485e91623f6b32be301c
 DIST netbeans-trunk-nightly-201506190001-src.zip 207946096 SHA256 5efc0e1a1e9c0321958cb784f65aaf2a804049b3412eb4da7d26018d073c90bf SHA512 80a5b8eeb4dcde61072d9a7e69e08c95fdcc903c5a6165361545fe48e9053056a0861deac96684743f2ef4899777277cf320fd320c21ba9de2eb4dad11c365c9 WHIRLPOOL 0c3395a48fde0a83b4400078e046dd9129ce43922b35f61cfc913d3b4ff6857b2bb81267b55c3fd29a44e8f8663eb3480c5b382c557eb3706bca6ec960358953
 DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d64768e171b41b9164dfe43922947325e7f96ca9c95f73961bd5ae SHA512 b7cfd9b0c0e557bfd5bda998cbe910a7193402fc44bce07d00c97edabbd50fff14d9f28fff4ac169a6aeef965db7acf4939db18ca9aefea8b09e1885b7b83a21 WHIRLPOOL c105483067cdcde190cea21475c96b7ad272533a9e20fabcf4a45a97fdf7ac7252d8422cd6a6ccbc986aab7fa6fb8f35436acfdc7723f158eac771b4e1a229fc
+DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
 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
@@ -74,5 +75,6 @@ EBUILD netbeans-harness-9999_p20150616.ebuild 4131 SHA256 f3413dd6899e5d4260d273
 EBUILD netbeans-harness-9999_p20150618.ebuild 4131 SHA256 053532d252d74c63b1701f8e484b477143bd5a4081875a67f08c8033a20308f0 SHA512 5cec9c26b953627269d51288913090bc2c394e2b271b31a9b96275a28a86c5dac99dce5e1a6c7a5f67be91680724e34ba8e6ad28931e696e507edaf722c49b96 WHIRLPOOL 8d07ed3db8a0fba8b0473fffe503751afa1095e520f205bd378257ac3b47d83c7b15adf1aba64b548fe63f8b28cf9196fab5b9497ac5dc340c082e87611ce9e9
 EBUILD netbeans-harness-9999_p20150619.ebuild 4131 SHA256 cf050c8975800de8108b4628295985b15fff0231a94fc6925761daee7a4080c2 SHA512 1e56536830c99562504d42621c495f053e824d19852b616802a50e8cbaeaccd15326234ee3a241a4cc441135303dc9d5a60d3495c9374aaea3eeadfe42d0708b WHIRLPOOL 9f041430e5d445785127a62f411454f937be1469fbc9fbbc473def3f944c699e058554efd0ae32b39838454bb76bd25238d6ea253374727fd97d6a56d4036417
 EBUILD netbeans-harness-9999_p20150622.ebuild 4131 SHA256 9aa81d2a5ba42bd4060f6b3ffed9ec01aa7bf4d620500e67cf3a5c719c6338fc SHA512 c5995a04c5df0cbe3d562a7f11e20c029c21cfb231ffdfcd19abb0d538e71ad6a710b3d20c82bb388ec16a06785ad5af65cc96c7f0ea65d3b9c490981e0840d0 WHIRLPOOL b010b9dffed2b9f2fcb2b20550a55d3e9da033d11dbf8b17eb12a8d10c4bb10a768bad2afd12afe488d44279b8ad089ac6f5a500529be7bccf864a6703d02f6e
-MISC ChangeLog 170069 SHA256 ad656f5cb1d22b9218a5a24cd2ccecaf27e1e98d655c258f334000cea1de34cc SHA512 2eaa06cb0b11e9155df4dd898facdab78120edf1c23cba18cc7e345e9dbfbed61a2b853f44621e42773390e412dade2d26e3ec692011e74c3155cb426d64ae11 WHIRLPOOL 3f5b83270628329e5c62f45a69b1d80d30551d2be724ed651fbc593cd8cf27d1b5dedcd35d225dde41a1f467edef6c906404e008d055f437cf76ad8fadc849d1
+EBUILD netbeans-harness-9999_p20150623.ebuild 4131 SHA256 1f68cc88fca77963b04400e450bd2d646f6919a5c2a106574549f00434c7aee0 SHA512 4e71bd35b514815874db23b330871c93bc4c0a82dff398e54d62386b5520646dd35c51056ddf3335912834d6f3c00310eb505eeee13ae2d589f7e6b65b732e9c WHIRLPOOL 1ce0b289e93d33b9a112ee42d1379c5d1eca05c7ad0975af2d5a32fad0a8f7a49e27cd7e85da678dc8466476ad4763278fa44147369e8fedd9f7f92d8d004b18
+MISC ChangeLog 170244 SHA256 1dc2979ba750b615757e0861ec2c36f9b22c3383169e4b18656f5842feb3a4f5 SHA512 25da614d320462ba3ee5ef7fc42e9b1fe28fa90e62942b5be87eb68e7b63823959f4ace26cbd8276092fb47311eb43e0bd4897218f16db5de42b49c0e6bc22b7 WHIRLPOOL 47b7cc0081b6905a337a2526e3e7dcc5cf82554e158ba5d2dde17382d0e5d17c2b1f41da5c86720481d4e42950e8f7749ef87016d8165b1ecfb4b5aa8746fe6e
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20150623.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20150623.ebuild
new file mode 100644
index 0000000..e10985c
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20150623.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Harness"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-06-23_00-01-56/zip/netbeans-trunk-nightly-201506230001-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 fb78b0a..2841f0e 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_p20150623 (23 Jun 2015)
+
+  23 Jun 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-ide-9999_p20150623.ebuild:
+  bumped to the latest sources
+
 *netbeans-ide-9999_p20150622 (22 Jun 2015)
 
   22 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 57c865d..51fe2f0 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -247,6 +247,7 @@ DIST netbeans-trunk-nightly-201506160001-src.zip 207930175 SHA256 fae079edd3ea6b
 DIST netbeans-trunk-nightly-201506180001-src.zip 207938768 SHA256 2dd02e87aaeabc7b80a5a41a732817077bbc3e750dd7f27b4c049e1f87aeb240 SHA512 f841a6374c9859391c2b2bab8da32dda91e87944bb6de017c2ffec0e3506a3949b88915247a2192d2d4e3046edf5bb09a26bc8d4a5bcdaa4d683dc0928720c8f WHIRLPOOL 8245bd39b2e3c65e64b0273910c44cd40c01bdfb70a8ab82c3cbcc4e4670fd3d57156807603eb0dcc9b9d9256f0e2d994c7898d934ce485e91623f6b32be301c
 DIST netbeans-trunk-nightly-201506190001-src.zip 207946096 SHA256 5efc0e1a1e9c0321958cb784f65aaf2a804049b3412eb4da7d26018d073c90bf SHA512 80a5b8eeb4dcde61072d9a7e69e08c95fdcc903c5a6165361545fe48e9053056a0861deac96684743f2ef4899777277cf320fd320c21ba9de2eb4dad11c365c9 WHIRLPOOL 0c3395a48fde0a83b4400078e046dd9129ce43922b35f61cfc913d3b4ff6857b2bb81267b55c3fd29a44e8f8663eb3480c5b382c557eb3706bca6ec960358953
 DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d64768e171b41b9164dfe43922947325e7f96ca9c95f73961bd5ae SHA512 b7cfd9b0c0e557bfd5bda998cbe910a7193402fc44bce07d00c97edabbd50fff14d9f28fff4ac169a6aeef965db7acf4939db18ca9aefea8b09e1885b7b83a21 WHIRLPOOL c105483067cdcde190cea21475c96b7ad272533a9e20fabcf4a45a97fdf7ac7252d8422cd6a6ccbc986aab7fa6fb8f35436acfdc7723f158eac771b4e1a229fc
+DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
 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
@@ -280,5 +281,6 @@ EBUILD netbeans-ide-9999_p20150616.ebuild 30352 SHA256 0e9a172340d3664e06edb32ce
 EBUILD netbeans-ide-9999_p20150618.ebuild 30352 SHA256 ab774f8edd05a8166b689b9ad7d5f9fea3098bcc4b4a908ee293b376d2e37501 SHA512 9bc099e80c348729946315183f62f0185db5481608fd096286bfdcf2f8a43143f13905c7250e05378661cda81a8d5d9c126cec1b6c1b298d4ca4483416053dc0 WHIRLPOOL 0ca44946a038138d51aed50f564348f7e626b8a98d54388e58560de5751f4f9e43da6435c028500d7eded2968275ed289218600b99878b0b5966ecb55f8d91af
 EBUILD netbeans-ide-9999_p20150619.ebuild 30352 SHA256 699737c86fb0e1025f15bfd7d714881b25ff065c1e6597aefa40daca8bb5f579 SHA512 3a8401f0b3e3d8f22fe5b7e178e5242e7894f8e672bcbfb7835293cfed0a48bb6d101c97ada35de2c2641120c87929b57052e4af0a2b119b7f924d372c350cd1 WHIRLPOOL 9b2a5d165e5f8081081b729c8f72bf845bc7517a1971f81258a47016ff657abb74b758460ef0ace23e30c521c51aea994fdee45722d9c584ab2dbd794750f303
 EBUILD netbeans-ide-9999_p20150622.ebuild 30352 SHA256 8e4d2e4f4f33361adff639a0b457abd0d4121988efc2d1eb0af969dca4163e0a SHA512 87a763b8a33f7a34fd3e051020bfb5cd828a47f365c4e64f77546ee3e07f54df30d7da40a2776884519174ef32b0b3d796d9896a5bb14c863945bcd2e39d2b0e WHIRLPOOL 5ba7f76413354fd8a71ff0f6c5f394f27a7a747352ef15cd28206fc196d6b3785e6d01e52277f792d5ecc2d6aa83cc2cb82dfbb87659041a4b15dd9313228e13
-MISC ChangeLog 161909 SHA256 47339580c3c889eb33386bdab1a6a823b04208cd5aef2012154002982a832386 SHA512 faddc323428988069cac6d6f8bf18978238a8e169145b6177e858e339fd29b4f4f5a7fb62d97db145c0c0020f151169d787308e359ce6dadd3d4284408199222 WHIRLPOOL 3173ea1ba00c195eb1af076ce765ad9d04c064bdff107453a04c9099d4b218bc7335b03e08199a3711376d45f0a0df59d746d5746b5b6a5d709cc56aa2394caa
+EBUILD netbeans-ide-9999_p20150623.ebuild 30352 SHA256 a957ba66af43cb0590a9545d2ca9e99925a7d3e859bfa29ba15e77106f4263e7 SHA512 28e92e6f5d489bcb4b149f5b8a731cfb6b41413f76f2e1c13fd97bffd7cb25d9bae762f543e55f1e4d3f154172f23dcffb41a842eff52a9edce2f0e7eb0fd1a3 WHIRLPOOL 6fa6a8cada06684bb43d96c3936d4942fd963d5cbb0b2824e482bf5bff1db2e17eb0dcb4680a9ee6647f8311fd9d3cae607969467c96f1317d95e87d7c81df0a
+MISC ChangeLog 162076 SHA256 2003e157914989682ef93fdfaa01fac39546f63055f53d9f684e2237600c9894 SHA512 01bff0e633470a07e68fd8fd6c65f605faad2f8205755050d2ebc84e8f9b2c7d8950bf89189aa14286bfced06f27fbe9d7695ef279315d0d26d0bf539351ee83 WHIRLPOOL 07efad72ea52e1ab6020c2e2edeb816c97dc77edf6a89f1e1e7d0215f2663082ff798c9b00c539b52961f3c83bbba122c58e0113298279682a8f43d90c656c3e
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20150623.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20150623.ebuild
new file mode 100644
index 0000000..bc47450
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20150623.ebuild
@@ -0,0 +1,377 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-06-23_00-01-56/zip/netbeans-trunk-nightly-201506230001-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/83E794DFF9A39401AC65252C8E10157761584224-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}"/83E794DFF9A39401AC65252C8E10157761584224-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 74f6084..c663d07 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_p20150623 (23 Jun 2015)
+
+  23 Jun 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-java-9999_p20150623.ebuild:
+  bumped to the latest sources
+
 *netbeans-java-9999_p20150622 (22 Jun 2015)
 
   22 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 6d180a3..29d26f0 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -1,4 +1,5 @@
 DIST 0F7FC8D69950B86D5F67529B5C551DB84C5BCF87-nb-javac-api.jar 132323 SHA256 e3591d9a40c8829eca5f12a12513f3919be4b07923b0aabad1ba4b9f472d79d1 SHA512 4aacd1a1bf7a177e496d604af5d55a05efeeb3c3d2aa6ebe7606bab9278980dc7ef37ef6debb405bf71bf4d4907b8ad2792a7a224987f2ca02fe7fa1be6808d4 WHIRLPOOL 23406d70f15bf7ddcda79a86985b9978a3b72fafcab6e8e3c665cf0958cc07aa095e9a857e5d9c097de52fe6d2bc4f0216f7cb50d4984d83e14d9fad1eba3e53
+DIST 0FA9517D00E0783DBFD1C9633CF9EF159FFCEAA9-nb-javac-impl.jar 2761915 SHA256 ed22b043ab5c2eb095bf0ec9eb7cbe90d8b59be37d56a0d1c64b74be021e8603 SHA512 1667e6f203b8f09da1ef1f1289a03949efb9976059df614b9a51fbdb5252df05d9c72f4f4cd0368d9afc6dccb35d459fe4245bda0ed3227e48dae685ead1719f WHIRLPOOL 43b6291c8940a17965dbe0cb9560609b80e5709d5c1ed22686b6f41c9462f755d1feec2e75a564ac9dbc32f915456a4f0bd211c9509bf2935faa005488d88b14
 DIST 13BDBD486B15C1C7FD2D8392FE5D62D5A5AC10D6-eclipselink.jar 8613667 SHA256 61afc55662d2683adfda5c5f17bad1f1e9ec1911a1fe086a359cbad188fac0d0 SHA512 0c9b58ed573d5ab378eeb11394e1c0e27ec73cc78809b58c53cda3a178c633b65334067c4a43da1d9182e7558304e221306ac1371f1f26daab6a3187f2fe1527 WHIRLPOOL 5b27e0ba67c6d32eff5f77b99164a8a5d1061dfce5432984d884b4d0cea0e014f67dbe38ac17323a22f80e27e04714ebb552ed03d693d1ad3e452cbef3f26967
 DIST 1A78676E734C72549EE6D9F166BAFE22F7CBA8CD-ant-libs-1.8.3.zip 2266616 SHA256 0a3cff406a0146bba304253003dd8bfa5ce1ab10b115e7789f410a61e4e5294f SHA512 5cbb33bfdb154d0816df4e0dc131e49b40bb80df410b1164322a996c1ad4e26726a1c26c6ee2129f9f74627ddfb8368139c7b0fc7615a2ee2e2c49f2a38f350f WHIRLPOOL e5c5eb631f6ed151581f173b2365769733de89d50be8ddc0e3087a71a88a320e32524a835d44705d42e9c1be0cdd468e3af1784928b200020e266de2166359c0
 DIST 1FC667D74A0BB8B767F6974099F6C282C0D7EEBC-nb-javac-api.jar 174955 SHA256 ba97ad115955e917a238677a7f44115a61ce6931237b7512357e4c3ea1fd0e6e SHA512 77dfb011f9c5e6b33649101c64ab869601f1c7b3f729af8365fcbc3b6798869287d655809808fc0eb70666cc73c9d8efba252e835b72a5978d302a46306714e1 WHIRLPOOL bd61095052e097b5aa339357acf46c82def35305ee8869faac340fdc733a3851867c6ebc60138b5a4a9854ec549b5fc0121f65462809b172e27b05d8517ea6dc
@@ -117,6 +118,7 @@ DIST netbeans-trunk-nightly-201506160001-src.zip 207930175 SHA256 fae079edd3ea6b
 DIST netbeans-trunk-nightly-201506180001-src.zip 207938768 SHA256 2dd02e87aaeabc7b80a5a41a732817077bbc3e750dd7f27b4c049e1f87aeb240 SHA512 f841a6374c9859391c2b2bab8da32dda91e87944bb6de017c2ffec0e3506a3949b88915247a2192d2d4e3046edf5bb09a26bc8d4a5bcdaa4d683dc0928720c8f WHIRLPOOL 8245bd39b2e3c65e64b0273910c44cd40c01bdfb70a8ab82c3cbcc4e4670fd3d57156807603eb0dcc9b9d9256f0e2d994c7898d934ce485e91623f6b32be301c
 DIST netbeans-trunk-nightly-201506190001-src.zip 207946096 SHA256 5efc0e1a1e9c0321958cb784f65aaf2a804049b3412eb4da7d26018d073c90bf SHA512 80a5b8eeb4dcde61072d9a7e69e08c95fdcc903c5a6165361545fe48e9053056a0861deac96684743f2ef4899777277cf320fd320c21ba9de2eb4dad11c365c9 WHIRLPOOL 0c3395a48fde0a83b4400078e046dd9129ce43922b35f61cfc913d3b4ff6857b2bb81267b55c3fd29a44e8f8663eb3480c5b382c557eb3706bca6ec960358953
 DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d64768e171b41b9164dfe43922947325e7f96ca9c95f73961bd5ae SHA512 b7cfd9b0c0e557bfd5bda998cbe910a7193402fc44bce07d00c97edabbd50fff14d9f28fff4ac169a6aeef965db7acf4939db18ca9aefea8b09e1885b7b83a21 WHIRLPOOL c105483067cdcde190cea21475c96b7ad272533a9e20fabcf4a45a97fdf7ac7252d8422cd6a6ccbc986aab7fa6fb8f35436acfdc7723f158eac771b4e1a229fc
+DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
 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
@@ -151,5 +153,6 @@ EBUILD netbeans-java-9999_p20150616.ebuild 14580 SHA256 58b8364499c90b669716b014
 EBUILD netbeans-java-9999_p20150618.ebuild 14580 SHA256 10643d7390023c67096c7a70884f944e6db90df33cf53080c4ea8b56ab5f78e9 SHA512 0e9dd27273ca70d902a8a570db30d1763377e60a3ed38335ccdd8e346dee2499a50615d4ad446011f18cfef9fbad7b9fa3f00b60b3244b861590ea9d90134052 WHIRLPOOL 9ca0dbbe3c28191362c3401651e98a2168a2b33cf48522cf20548b7276b009cd3df81cc4d8b82ac9ace8273ae283824c68f09e8f583fdaa48c1f2a03278c5be7
 EBUILD netbeans-java-9999_p20150619.ebuild 14580 SHA256 4cfdda657af0a9f21dc84de33a1e3ea6675016bf98b3bbc5eef0c82f2fe21de0 SHA512 5f0643d9705ca99fb47a7db4d0e39290457809dc43a716cb2d3538032ad3bae6402b19f56af8a7dd453ea122c9f8467e60f511f8310191220119693e93e6f992 WHIRLPOOL b6166eaa8fbf96dce7b238e51cd77f78f8e510bf15ec48252335b59580af9e451e2a0d04fa7061012572f601355b3a6c7c5dbd667f4eb2bd8dca6f09c652ba1f
 EBUILD netbeans-java-9999_p20150622.ebuild 14580 SHA256 24604e42d0e9d1ce1ee2e898440a49ca2a5703e5c122534c6fb4222b65aa6b63 SHA512 3458b4ddf09bf80a4f4ee8a2a124273616619a6afbf8484845814d686e13ef4ae433c7217c0c5b87e8588e0e98b47830bea24b246aa636f0f7d3b4a1674dbde6 WHIRLPOOL 772e5d76b58892be22c8a296a7e6354ea8ac5350c9a01eb4f3fee4b5544543b1cff1f5122e1a58d49142603ea5cb70e8a82e2278592841fc642d4f14a11c824c
-MISC ChangeLog 165321 SHA256 b542453f412f8343102aa69374f741fb7cabfaa225a7ec91b062d67a5db4708a SHA512 1b76a160f792d43174323a09acc023593cb80f816ebd44bdb1d2294cbfc71cffdb6a50b115aba250be20a5dec2fe9d39ba168395827f61a777467e753da6fa03 WHIRLPOOL 667b076995addb8d7725d684ce1805aa6c3d14c1d111b07e387203b1fade7181309f960a4fa3be2b6b78a6753ab0b17b64eec7dbdcf2b22a0b5fbe83ef1e55e0
+EBUILD netbeans-java-9999_p20150623.ebuild 14580 SHA256 258048e7ed2f6925e14d13d83338ed5970912586e8c2e13deb2ef1d4db0a6f4b SHA512 d4adc703a66552021ad1925903c95b9a2f5eab412183a123eaee91b192d2dc0ab0402b50891a9005ce5dbf8428c1c69e343493bab7cfebb3ad871e010d390ba8 WHIRLPOOL 5cd318fb121c31154a952550d85b2e861903a49e32622795ecabbca254ac1e33dde849d9ebd4b597b604cb52d6230dda0635d86cf2ca8301eae2f7ca31af63e7
+MISC ChangeLog 165490 SHA256 b53b7a6eb51b65caaf531b5224ea73cf620fbc69c2696fc65dd65f285f798948 SHA512 e785143e806ad45bdfacac32a311e0933cd9d3392ef7e73680bc213b41a8f0d0a7ad91c09c8486192559833cd02b8b7d0e1e2f9e7401be7149c3f1325769a0e3 WHIRLPOOL 4d9d484342acf77e1d2a15b157e233fd34eabb59303fa702bd0d2647c9ecd3b65470207720b33915236432e20d3d0477e4aa7d79858ac04bde4308aaee1b816d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20150623.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20150623.ebuild
new file mode 100644
index 0000000..f50c306
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20150623.ebuild
@@ -0,0 +1,271 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+# Maven cannot be unbundled because it depends on exact maven version and exact content of maven directory
+
+DESCRIPTION="Netbeans Java Cluster"
+HOMEPAGE="http://netbeans.org/projects/java"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-06-23_00-01-56/zip/netbeans-trunk-nightly-201506230001-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/0FA9517D00E0783DBFD1C9633CF9EF159FFCEAA9-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: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}"/0FA9517D00E0783DBFD1C9633CF9EF159FFCEAA9-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 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/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 4caf569..2a597da 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_p20150623 (23 Jun 2015)
+
+  23 Jun 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-javacard-9999_p20150623.ebuild:
+  bumped to the latest sources
+
 *netbeans-javacard-9999_p20150622 (22 Jun 2015)
 
   22 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index c64752e..75b4a62 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -40,6 +40,7 @@ DIST netbeans-trunk-nightly-201506160001-src.zip 207930175 SHA256 fae079edd3ea6b
 DIST netbeans-trunk-nightly-201506180001-src.zip 207938768 SHA256 2dd02e87aaeabc7b80a5a41a732817077bbc3e750dd7f27b4c049e1f87aeb240 SHA512 f841a6374c9859391c2b2bab8da32dda91e87944bb6de017c2ffec0e3506a3949b88915247a2192d2d4e3046edf5bb09a26bc8d4a5bcdaa4d683dc0928720c8f WHIRLPOOL 8245bd39b2e3c65e64b0273910c44cd40c01bdfb70a8ab82c3cbcc4e4670fd3d57156807603eb0dcc9b9d9256f0e2d994c7898d934ce485e91623f6b32be301c
 DIST netbeans-trunk-nightly-201506190001-src.zip 207946096 SHA256 5efc0e1a1e9c0321958cb784f65aaf2a804049b3412eb4da7d26018d073c90bf SHA512 80a5b8eeb4dcde61072d9a7e69e08c95fdcc903c5a6165361545fe48e9053056a0861deac96684743f2ef4899777277cf320fd320c21ba9de2eb4dad11c365c9 WHIRLPOOL 0c3395a48fde0a83b4400078e046dd9129ce43922b35f61cfc913d3b4ff6857b2bb81267b55c3fd29a44e8f8663eb3480c5b382c557eb3706bca6ec960358953
 DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d64768e171b41b9164dfe43922947325e7f96ca9c95f73961bd5ae SHA512 b7cfd9b0c0e557bfd5bda998cbe910a7193402fc44bce07d00c97edabbd50fff14d9f28fff4ac169a6aeef965db7acf4939db18ca9aefea8b09e1885b7b83a21 WHIRLPOOL c105483067cdcde190cea21475c96b7ad272533a9e20fabcf4a45a97fdf7ac7252d8422cd6a6ccbc986aab7fa6fb8f35436acfdc7723f158eac771b4e1a229fc
+DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
 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
@@ -71,5 +72,6 @@ EBUILD netbeans-javacard-9999_p20150616.ebuild 4982 SHA256 3578b5b679e587b16cd30
 EBUILD netbeans-javacard-9999_p20150618.ebuild 4982 SHA256 5a9e1ea46d22d7000b19e6c467453feb290ae2e11c667c57361a553369ff7d1e SHA512 575cd5e2ecd45167959eaa422910d5e25c3e0fdfc74a014a1b2989894a749b39d625422821943587b9836cbb76a185d37ad42e4578a2177db392071d1f588452 WHIRLPOOL d2fdaf6fb8d528b2fb809f30954c77c691aea37796e5bef93916403fdbbfe955d67cbd4e446262b8cc962146a2e019f0872a04df6206578a32cbcf507c19e0f0
 EBUILD netbeans-javacard-9999_p20150619.ebuild 4982 SHA256 0ae776d18ebcae5d1de363b9516ebb364d5ddb86d92dac91fb052bd808c1e804 SHA512 87a436f878d010ad8007d173766f796eacfb2ec5bf54e9347730f0f9628d36c55358063e2b0f9800be70a7cd4da04b7eeaf9dcff8d823cba4a87845989648767 WHIRLPOOL 8f6a40b560efe717181bf25f7fba750b63c807dccf232da145dd2d224ca9b7a305e62d4896c84ee33d162a619db60f0402c9daec9ce7f641142e9dd478c46cea
 EBUILD netbeans-javacard-9999_p20150622.ebuild 4982 SHA256 f735867bccfea50fc245bcf14816cc4db5bb5507fa85ce01a2ee82b959ab6ebe SHA512 5bed776927ca66309fa4b44e6db90cfb28d7ab38367b6322d08bdd3b17a045a0f487b78a84a484a59ebec78b9ec7e3bab8ed5394a53f2e63c87e3b1422485cc7 WHIRLPOOL 0814ce221e3bbe538a42f9de580a72517cd45ff761e298be2fe442f57f1a6b5234de5f44c00c52e8c68d28f5c3ef3b9d6fbf6394a0580a95f58daee356eab0fe
-MISC ChangeLog 172216 SHA256 49e547f97c8ab39b22addfb2a6e21743188be50a84794c51049d8e3fb97c914e SHA512 a58774fcbaed9d2ee16488955574547abb96b7d6788fc7012ac764e08dae905860b33133e7a7de7af14199f499d9066ed84dbfb178eff2a7b465ae875b755a2c WHIRLPOOL 34f9fade57eeb84050c89532f430feda8c198f746b396151c2723bf1c58a180d3b4daba996fd2f0322e9c1a82bfee420c616eb8f4b7fec5b4572b23a5a19ccf8
+EBUILD netbeans-javacard-9999_p20150623.ebuild 4982 SHA256 ae8d81378ae0a749b093e2f6e49f3984cc5c2b3c4e6ae24c95de411c2cd6bddf SHA512 c6936e4f97efeab5411090b008a404a633c25fdc08a573435a7e97cdcf4ab8dc067a8bbd129053ecb902e5bb5e0147a89b43b553cdb094458578003eae6f3788 WHIRLPOOL 202e6e3b8fc63ef22e328fce638b5d0db90869d57f24c1c7cb86b9d040d39324d6e6dc4596aae57735ed4f78b45defd9311ad22b9af826db07e3f21f2a5888b1
+MISC ChangeLog 172393 SHA256 e6a4efaf10968a4da549f294110495c45419372183ff6e0c816b4b8fd89ad4d2 SHA512 5ad46e93ade5a4440dd153a0319044f41b78381af80274f0e4bee84f7aae6a85a1f7d9bc2f0958fab056a805dac762aac1028518af7e439a7c47c8cce0710944 WHIRLPOOL 71dae5de11a3f86bbde64541596ec8927fba9e6f3cd6b86450b89ef372abeb744972b7f3973239ac5c1339374137dc16929dcfd206c13721521badb422e49b82
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150623.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150623.ebuild
new file mode 100644
index 0000000..9032f21
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150623.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaCard Cluster"
+HOMEPAGE="http://netbeans.org/projects/javacard"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-06-23_00-01-56/zip/netbeans-trunk-nightly-201506230001-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 20da23b..5394c46 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_p20150623 (23 Jun 2015)
+
+  23 Jun 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-javadoc-9999_p20150623.ebuild:
+  bumped to the latest sources
+
 *netbeans-javadoc-9999_p20150622 (22 Jun 2015)
 
   22 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index 31de4fb..c979919 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -43,6 +43,7 @@ DIST netbeans-trunk-nightly-201506160001-src.zip 207930175 SHA256 fae079edd3ea6b
 DIST netbeans-trunk-nightly-201506180001-src.zip 207938768 SHA256 2dd02e87aaeabc7b80a5a41a732817077bbc3e750dd7f27b4c049e1f87aeb240 SHA512 f841a6374c9859391c2b2bab8da32dda91e87944bb6de017c2ffec0e3506a3949b88915247a2192d2d4e3046edf5bb09a26bc8d4a5bcdaa4d683dc0928720c8f WHIRLPOOL 8245bd39b2e3c65e64b0273910c44cd40c01bdfb70a8ab82c3cbcc4e4670fd3d57156807603eb0dcc9b9d9256f0e2d994c7898d934ce485e91623f6b32be301c
 DIST netbeans-trunk-nightly-201506190001-src.zip 207946096 SHA256 5efc0e1a1e9c0321958cb784f65aaf2a804049b3412eb4da7d26018d073c90bf SHA512 80a5b8eeb4dcde61072d9a7e69e08c95fdcc903c5a6165361545fe48e9053056a0861deac96684743f2ef4899777277cf320fd320c21ba9de2eb4dad11c365c9 WHIRLPOOL 0c3395a48fde0a83b4400078e046dd9129ce43922b35f61cfc913d3b4ff6857b2bb81267b55c3fd29a44e8f8663eb3480c5b382c557eb3706bca6ec960358953
 DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d64768e171b41b9164dfe43922947325e7f96ca9c95f73961bd5ae SHA512 b7cfd9b0c0e557bfd5bda998cbe910a7193402fc44bce07d00c97edabbd50fff14d9f28fff4ac169a6aeef965db7acf4939db18ca9aefea8b09e1885b7b83a21 WHIRLPOOL c105483067cdcde190cea21475c96b7ad272533a9e20fabcf4a45a97fdf7ac7252d8422cd6a6ccbc986aab7fa6fb8f35436acfdc7723f158eac771b4e1a229fc
+DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
 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
@@ -74,5 +75,6 @@ EBUILD netbeans-javadoc-9999_p20150616.ebuild 6234 SHA256 b53690da9875e69ffb579b
 EBUILD netbeans-javadoc-9999_p20150618.ebuild 6234 SHA256 54b492a5ff9fb89c8e6fc84592dd90db713935e097e7be7741c61427e682c090 SHA512 7ae8aa53f0f62b469189e89fbe6f5d4b7a3b197151f658dcdff50c0ee66d6d0b32335c85b41616d7d781d4974a3732c4a882b286b96fc59f89cf92655015f25b WHIRLPOOL 778fa7cd68612c37dc02f7a3685286ab3aab1cb90311fb24d7faa039425a1581ecc21ff53942b3a7240c8e654d1a3af34d1c4a88eecc80639cfeb3783401de28
 EBUILD netbeans-javadoc-9999_p20150619.ebuild 6234 SHA256 e1a5a3405299344ac995c29ac75b3ef350ff47d4cfe3d9e1b28e50ab972c4257 SHA512 ca6fa34dbe0bc6fcd87a28fc6f0263d36acad8c90402447c36f218aaca4be83b479dea61ff986cbd6f4d9ae4e67fc29df5f1f0730508b264daa315d1fa356c8e WHIRLPOOL 5b2f73ad0228320c55e949a40ec8149791151c1b03c6c428ea9d3435525c18eb3b48452813d8fb77234eeaf2bbd5c4950e008251c54862edfe13b5a8f9d20ad7
 EBUILD netbeans-javadoc-9999_p20150622.ebuild 6234 SHA256 741fc0a8d00bcd19850f4fb0f4f4654c21ee744dea56818113b8dc57619889ed SHA512 82c988b2f6b9260fa45d3dc575628cdc2f39f0f60020a1b7ec6044e6b1764cb73dc802c72baf39d2a579e2819cb29f242178070be071f9d1978ef23b09c33e0a WHIRLPOOL 5dbb75a93762eddcfa02d7deb83d084ebaffcea3e20b4c468365c9a5aa38ba26aeeea91577e20622b142045dd8fe5de68740c1267a4dc7d7f16732904e29eabc
-MISC ChangeLog 169895 SHA256 2374c4004c0bb9a888b7d27175053970b0b6c34e94f15e998a33d1a3d62db610 SHA512 355e659f6f4dcbb72c71b388726daa847acdaaf6cf3a68331256a4d2fd9f65fab15355041e7a55bc1f776f28c8088f8f06df4456996028b7f484e179bab49ad8 WHIRLPOOL 2a464643068140c55601c48c188c52fcb72792ff39a1d56f819db3fc368866260ac3814a474c104c6b4921826096866731d24937761c3926779f45c79a960bbf
+EBUILD netbeans-javadoc-9999_p20150623.ebuild 6234 SHA256 945e7480a12bb433530b2cbe347b1e07c7195ddda1e593ab802921ae8e0cf4da SHA512 64ef41fa0e67ad8f3939b82c154403f162bc14bf1932945ea4896ae0411dd6c04bafc33e3fffc376993c525c851bbf396ec3af854c16da36a747045c857f9a81 WHIRLPOOL 15d361ffecf902fbf5e3b55a94678c706a675311a665d0eaef2f5aaeec0bea179f362cb777290345765290ff3134afd21e4da677c8ab33fb6764e2f7e8842f74
+MISC ChangeLog 170070 SHA256 44fe5220e8c80ac2a6e66349e3caad1f4067606aa4a9a857c91c5cae76f100d7 SHA512 bcc9d47e4d66b7bfa45d7371774994171d884e696f28fc2eb7ce8ab7594a2395e240e2186e0e398e3b0a0fb809b74e0a0ca3fcd37987b16a5e2312c12aa2b5ca WHIRLPOOL 32305760e60daaa67e13b7cad358b5e934bc2e77d7ef66c4eeff459a4eb2da6196ceca828478f7a71f7bfb046c015efb4eaa38a1d3d6945857c7597bf11fedbb
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150623.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150623.ebuild
new file mode 100644
index 0000000..66279f1
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150623.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaDocs"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-06-23_00-01-56/zip/netbeans-trunk-nightly-201506230001-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 87076b0..8b8e671 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_p20150623 (23 Jun 2015)
+
+  23 Jun 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-javafx-9999_p20150623.ebuild:
+  bumped to the latest sources
+
 *netbeans-javafx-9999_p20150622 (22 Jun 2015)
 
   22 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index 0c679e0..3c8b0fd 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -43,6 +43,7 @@ DIST netbeans-trunk-nightly-201506160001-src.zip 207930175 SHA256 fae079edd3ea6b
 DIST netbeans-trunk-nightly-201506180001-src.zip 207938768 SHA256 2dd02e87aaeabc7b80a5a41a732817077bbc3e750dd7f27b4c049e1f87aeb240 SHA512 f841a6374c9859391c2b2bab8da32dda91e87944bb6de017c2ffec0e3506a3949b88915247a2192d2d4e3046edf5bb09a26bc8d4a5bcdaa4d683dc0928720c8f WHIRLPOOL 8245bd39b2e3c65e64b0273910c44cd40c01bdfb70a8ab82c3cbcc4e4670fd3d57156807603eb0dcc9b9d9256f0e2d994c7898d934ce485e91623f6b32be301c
 DIST netbeans-trunk-nightly-201506190001-src.zip 207946096 SHA256 5efc0e1a1e9c0321958cb784f65aaf2a804049b3412eb4da7d26018d073c90bf SHA512 80a5b8eeb4dcde61072d9a7e69e08c95fdcc903c5a6165361545fe48e9053056a0861deac96684743f2ef4899777277cf320fd320c21ba9de2eb4dad11c365c9 WHIRLPOOL 0c3395a48fde0a83b4400078e046dd9129ce43922b35f61cfc913d3b4ff6857b2bb81267b55c3fd29a44e8f8663eb3480c5b382c557eb3706bca6ec960358953
 DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d64768e171b41b9164dfe43922947325e7f96ca9c95f73961bd5ae SHA512 b7cfd9b0c0e557bfd5bda998cbe910a7193402fc44bce07d00c97edabbd50fff14d9f28fff4ac169a6aeef965db7acf4939db18ca9aefea8b09e1885b7b83a21 WHIRLPOOL c105483067cdcde190cea21475c96b7ad272533a9e20fabcf4a45a97fdf7ac7252d8422cd6a6ccbc986aab7fa6fb8f35436acfdc7723f158eac771b4e1a229fc
+DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
 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
@@ -73,5 +74,6 @@ EBUILD netbeans-javafx-9999_p20150616.ebuild 4723 SHA256 a11308e998d418aebd9953c
 EBUILD netbeans-javafx-9999_p20150618.ebuild 4723 SHA256 0b291bcd1c70488aa3c49fa4d3731e5b7f09ad65676c682a53cf4df5d0bd37db SHA512 db7ca47e3aa8bba6a31ab230d0b28a6353739faecf5bd3380b775cf30d75b766976c8ec73d040792db0652336678b9ff497350de624091518fca19c7a6dcb4b8 WHIRLPOOL ce303aa39c56e37973bbf89c2530955c05e4367bd3116f19e79f419ce85268a776a1b06e1a55b271cbb223782840df2e8ed8293433a76e605e0b7b48fb2a764f
 EBUILD netbeans-javafx-9999_p20150619.ebuild 4723 SHA256 a4ae02f68222e812c1e48fcf60c4f8259642c09d95385cfccd7c44d3c50aa3b5 SHA512 1a1b21ca818b7d3ccbc48fc37b7c3ae5f50c6c4505cf0b5659deec15bb7ebba74dae72c7cd6119189bbf3ec6fadc427306102618a2a68b9e6e91803af3201e3f WHIRLPOOL 658b2960dd7a8e726c6620f09a0845a4b9e110d6fc74f19b819090f9f3c2ded440fda38be3a5ed67ad0e4869c735c3250560880da2741b989de1e8b0f9912b7f
 EBUILD netbeans-javafx-9999_p20150622.ebuild 4723 SHA256 a958c7c5ed32d17a2f8a7aeeabe9d9c3fba67d065d97aa46eb0a5bcaca66d15d SHA512 74ed45e1f4b3829503766fbff230b1e93132be45c511b80ff6d6beacf5789196150ed9c72418a0d3e72aab5df505b36ef315a8e8243f32af9a46c113921127fb WHIRLPOOL 176baaa7588ac436134fc15a79508df6b31322d1c278fbdcb758e27e82af5143dc4fca19177114d33021ba6247e0d75b4541e8a9a37e91d795efe6ba473d2625
-MISC ChangeLog 154441 SHA256 2ce6b6ab0c7e370029ce48f55dadf072fd3c974224ad02e83dfb4a06f6df329d SHA512 cde96886db3c86d74b01e30d5f75abdc7e91427329e1e2ef073de9ad335d3902524cd970b7406a388330846102ab85c330ba7ca7eefd49de5c3dc99785b89791 WHIRLPOOL 94149898827595cf4c0b918187e0e6741de4f4657daa5ea92360e7ff207be0dde75bbc32561e32990928d30bdab01c86ad2c4126425458dc63b8807cf710f9d0
+EBUILD netbeans-javafx-9999_p20150623.ebuild 4723 SHA256 43d90e935df3e49353f9b86d4aee56b1c8972e755e552254d92738acf61b1a3c SHA512 86355dcad9b925c8d78578e531c163e4eec7b840165c8dd2aad6b79d363e25b0a5359428c2cfb6467514ee9ab653210a4eaa62aee78440541ef4a92349f1d413 WHIRLPOOL ae78143d619ad69aa10693e99035c17f96c864ee011cdc59f180e4cab7a8efe93d312611b324f432ef32f6b89cf940f2761321bfc7921be4ba840d23bf1662e4
+MISC ChangeLog 154614 SHA256 ae23b9b44994a7692b0913189d6d0d877ecd081d7a483271edf9deb7b1fa73a9 SHA512 013c00de0a83fe9b2079833e9d6b00c088929775d8a1dd8ec27f8bff2a70a0bd499a3c7024925f85505fb9851d864fb55027acd8ba04a8f2a26df6bba0c774ef WHIRLPOOL 24e41c4677c5ee0ad23765ef8309843c54f1a6f39fb1a220b570c2af3b2a893e49b70c1d412feb18e7bfb86617b6c2ef98916dc89db5f9d5ac713db6277df008
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150623.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150623.ebuild
new file mode 100644
index 0000000..eef8ea9
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150623.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaFX Cluster"
+HOMEPAGE="http://netbeans.org/projects/javafx"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-06-23_00-01-56/zip/netbeans-trunk-nightly-201506230001-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 1b6004c..26a33f5 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_p20150623 (23 Jun 2015)
+
+  23 Jun 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-mobility-9999_p20150623.ebuild:
+  bumped to the latest sources
+
 *netbeans-mobility-9999_p20150622 (22 Jun 2015)
 
   22 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 8f47abf..6b953e0 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -46,6 +46,7 @@ DIST netbeans-trunk-nightly-201506160001-src.zip 207930175 SHA256 fae079edd3ea6b
 DIST netbeans-trunk-nightly-201506180001-src.zip 207938768 SHA256 2dd02e87aaeabc7b80a5a41a732817077bbc3e750dd7f27b4c049e1f87aeb240 SHA512 f841a6374c9859391c2b2bab8da32dda91e87944bb6de017c2ffec0e3506a3949b88915247a2192d2d4e3046edf5bb09a26bc8d4a5bcdaa4d683dc0928720c8f WHIRLPOOL 8245bd39b2e3c65e64b0273910c44cd40c01bdfb70a8ab82c3cbcc4e4670fd3d57156807603eb0dcc9b9d9256f0e2d994c7898d934ce485e91623f6b32be301c
 DIST netbeans-trunk-nightly-201506190001-src.zip 207946096 SHA256 5efc0e1a1e9c0321958cb784f65aaf2a804049b3412eb4da7d26018d073c90bf SHA512 80a5b8eeb4dcde61072d9a7e69e08c95fdcc903c5a6165361545fe48e9053056a0861deac96684743f2ef4899777277cf320fd320c21ba9de2eb4dad11c365c9 WHIRLPOOL 0c3395a48fde0a83b4400078e046dd9129ce43922b35f61cfc913d3b4ff6857b2bb81267b55c3fd29a44e8f8663eb3480c5b382c557eb3706bca6ec960358953
 DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d64768e171b41b9164dfe43922947325e7f96ca9c95f73961bd5ae SHA512 b7cfd9b0c0e557bfd5bda998cbe910a7193402fc44bce07d00c97edabbd50fff14d9f28fff4ac169a6aeef965db7acf4939db18ca9aefea8b09e1885b7b83a21 WHIRLPOOL c105483067cdcde190cea21475c96b7ad272533a9e20fabcf4a45a97fdf7ac7252d8422cd6a6ccbc986aab7fa6fb8f35436acfdc7723f158eac771b4e1a229fc
+DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
 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
@@ -77,5 +78,6 @@ EBUILD netbeans-mobility-9999_p20150616.ebuild 4418 SHA256 9596be093f0c8f622680c
 EBUILD netbeans-mobility-9999_p20150618.ebuild 4418 SHA256 6945633a19d51b431334e4e89c9d29aee8e429423342d5d1d84568d8248b53e5 SHA512 b18cdc9a7a27c448ec2413f774bf783feb7e28cf0619bb6abeccb90ee75d3096b385e5404e8fd54df7c2fc513299cdbb64b42da98124c6a2b0ea42c6503a0492 WHIRLPOOL 5201df4dbe497e34dae5f1c81d29f70d86bc0ed254901a112240841edae1db0de5af3e2b9ebe8c82580c4329cb1354fc04bd5f13657862db4b0ba7b1da62141e
 EBUILD netbeans-mobility-9999_p20150619.ebuild 4418 SHA256 051f3b8c515152a704d4188a2e2663fd92e848b9a676e2ac1d202b2f0512bce6 SHA512 70d29230183e636d08bfd173c9908ac8bfd1aa43ca7f605d7b2dbb607a934912f4eff04846576a97182d700c869d43f40df5927a43fb5a318e8e071dfa43aa0e WHIRLPOOL 2ec48d85eb9993f32ee2b13ecb804cef176217ac9440bf3feeeefe2b165272188daf2494c59e62fc27b7e066dbc3b0ef23f4d23b3bda578b8ef25f6d37b6f12e
 EBUILD netbeans-mobility-9999_p20150622.ebuild 4418 SHA256 a49264104713680b693f0a6474ca8696ec5c3fe8e0d467437bbb43f1edcd6a1a SHA512 289445404b6f1041d39551c231274c601f79d7f02253fd65046e4b8c6cd3904ea4c1dd5aba19ea80b8528f0ee6cf0d66d94218412d8c59eac86d2d5864fd991f WHIRLPOOL e590cb19b0b6ed8f75982c97bbcf6bcfac2c6dcf3e82a264c720f404216dbba6fdcbd83c914b62e9652194571a1d932f7f639711614ab78cc75a6f37dfc2a868
-MISC ChangeLog 172357 SHA256 755cc17800172c2612bd1dbbc5b1cf4a7ff779063bd41ad21a9085b5afce06b6 SHA512 c689cc1b6dad092c1ed93f3d8277213418367b683b40b8121b7cfe87a9974d74af6c30f3c09cd6490880a08331efca3e83b2c9c09da0c94be2a60253c6e70c1a WHIRLPOOL f7c63b0c7bf8a13b2082b207228e11657774371d15047c4b501568cac726a1d1fac12505c5829aa1347ea676df6b1b2da68f95c8a935a52499f84c8e09047e12
+EBUILD netbeans-mobility-9999_p20150623.ebuild 4418 SHA256 64ff0aedcbbdad5d1895a0f51cd57d7ba46654a67ae8828254983c6a94064202 SHA512 785272cb0b97308b13bc086403c7a6e87454c7e8878261ab5382c95e42583d89fc3f70cd30913a18ab068cb6743c24c0b9089d174239115ca7ae5cee74728c12 WHIRLPOOL d8fb9c890728f7670b317e36908b656d7c40e693d0b8ff1f1a228b0f64670bfb5db9c3e478015362373208fd85f6c9bd6ac95dce888eb5052fef57eb923558b5
+MISC ChangeLog 172534 SHA256 d2f22fd01d99cd81908780c56f8a35319f254ae5a5b2203ccd3bb6cab5f6e237 SHA512 a6aac120f7204922f8ef9a9e8c0bc6a38c83c820f3fd1cd1e76f8573c6f530fcd9825da0f66f0b950ee4641f1033ef64b5b40b9dbedf5a8f9b8dc63ad00b66b3 WHIRLPOOL 669545e253e1614a47408890f60f24fd82c751cfdca91c32c8e4aa83e4c099861e0597880715bdeea9dae3042b81abe17abf9a64c6cdfe00f65d02f0564c2f31
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150623.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150623.ebuild
new file mode 100644
index 0000000..0d78fc7
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150623.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Mobility Cluster"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-06-23_00-01-56/zip/netbeans-trunk-nightly-201506230001-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 8333495..881f67e 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_p20150623 (23 Jun 2015)
+
+  23 Jun 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-nb-9999_p20150623.ebuild:
+  bumped to the latest sources
+
 *netbeans-nb-9999_p20150622 (22 Jun 2015)
 
   22 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index 136b568..77c0fde 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -45,6 +45,7 @@ DIST netbeans-trunk-nightly-201506160001-src.zip 207930175 SHA256 fae079edd3ea6b
 DIST netbeans-trunk-nightly-201506180001-src.zip 207938768 SHA256 2dd02e87aaeabc7b80a5a41a732817077bbc3e750dd7f27b4c049e1f87aeb240 SHA512 f841a6374c9859391c2b2bab8da32dda91e87944bb6de017c2ffec0e3506a3949b88915247a2192d2d4e3046edf5bb09a26bc8d4a5bcdaa4d683dc0928720c8f WHIRLPOOL 8245bd39b2e3c65e64b0273910c44cd40c01bdfb70a8ab82c3cbcc4e4670fd3d57156807603eb0dcc9b9d9256f0e2d994c7898d934ce485e91623f6b32be301c
 DIST netbeans-trunk-nightly-201506190001-src.zip 207946096 SHA256 5efc0e1a1e9c0321958cb784f65aaf2a804049b3412eb4da7d26018d073c90bf SHA512 80a5b8eeb4dcde61072d9a7e69e08c95fdcc903c5a6165361545fe48e9053056a0861deac96684743f2ef4899777277cf320fd320c21ba9de2eb4dad11c365c9 WHIRLPOOL 0c3395a48fde0a83b4400078e046dd9129ce43922b35f61cfc913d3b4ff6857b2bb81267b55c3fd29a44e8f8663eb3480c5b382c557eb3706bca6ec960358953
 DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d64768e171b41b9164dfe43922947325e7f96ca9c95f73961bd5ae SHA512 b7cfd9b0c0e557bfd5bda998cbe910a7193402fc44bce07d00c97edabbd50fff14d9f28fff4ac169a6aeef965db7acf4939db18ca9aefea8b09e1885b7b83a21 WHIRLPOOL c105483067cdcde190cea21475c96b7ad272533a9e20fabcf4a45a97fdf7ac7252d8422cd6a6ccbc986aab7fa6fb8f35436acfdc7723f158eac771b4e1a229fc
+DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
 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
@@ -76,5 +77,6 @@ EBUILD netbeans-nb-9999_p20150616.ebuild 5003 SHA256 b3f73855aa1327318b5eed3a245
 EBUILD netbeans-nb-9999_p20150618.ebuild 5003 SHA256 16295082c0858a9c7ba5ee3954d7f9a1e3d313c35bb0e7ca2bc03952b9c240d2 SHA512 957478de1c947bbf0910ac50973552253f78680b02edb4c8a2d8efe8183518224b4ef294bdb7d7087a6e2901e910b3d4a35ee7bb9178a4d97bc81087cec246bf WHIRLPOOL bec6acb4bef8adfbcce8dd371fc35dbe95266f6a05f9339a49358bed9593f72a64d3fa1a6a6d16461b31c6a6bc7252d0ae0806c7eaaefc3a17e2c642d347263d
 EBUILD netbeans-nb-9999_p20150619.ebuild 5003 SHA256 bed9e90b1fd03e6c95748e633270ab2a8cb11c6fe3062dadaf1efbbc62b24ef5 SHA512 d63238287d5135b9bd4abd4823217a7c3ec294555717caba7dc2a36ba8d5dbb8dbba4ef77200dd9fc79342a84703ea948b489f1c300ebad06e6f5bab6f70d5c5 WHIRLPOOL c18d3188804284b0ed1f74fddd2dfe0428d9aeea5c716d8e54d421e76c543ebad68119ee486754722eea2ef460311a86d43d854034f7b38438fbe1499f387fac
 EBUILD netbeans-nb-9999_p20150622.ebuild 5003 SHA256 2c2cc6f5fea254e9637db5c649cc5a5186e60c94e802ae539535cf9fb483efbb SHA512 c135783dca0859eeecd2d0e33dfa4d113baf2aa0d57e7eea8dbdd1edb940923032c370327b450a920e82d55961b4831e3944c78ede0aa2646e6e2a2433831d53 WHIRLPOOL e08354b74fc5dd9ea7235013eb4b9f979e9b580a031463f93088ca83100eb045f53121ab82e5e3498da7da07085f22a79b1bd676468b4ddf838dba40993e2bbc
-MISC ChangeLog 160959 SHA256 07f8e2c97b58163e2baeed567afa8935e2c72cec5984e0c2b05f4130961a3a29 SHA512 b0cb61274b1144f13efcfed6a7f039b7b728e68ed7b4e46797297a38788e5036ecbdef5622a1a66e23645695c28f266caff517ddf7305151b81076f04efd4bc2 WHIRLPOOL c27ac423d4ad525ab826a3bef202f1857376e1e1f69cccc91951c9dfb63379d9e869a443d2b27c556734d813c9896ef5fd2bb847862a6dc3c1160db6c67e91b9
+EBUILD netbeans-nb-9999_p20150623.ebuild 5003 SHA256 5695da21b2b81c3cf587294c90f190564e16a59184ef46144041e70990e3678d SHA512 6b1233a76d69cbe1a32a7e5a11658144a59f2d2d89245560e00ccfb72dd3a60f7e765e6b55eb1a31b7e5dff1e2d416889725cb2aaccc418807e029df7957ec95 WHIRLPOOL 1b67799dfb54da0133e18e0515ceb192156e5771beb6f39a618d8397f7cfc10f5b5ad492db0062983cbc4b06dcafec4ae2711f94b2c84211dcda62cf4f68afde
+MISC ChangeLog 161124 SHA256 21bad3ea1bb789b1a67aec072628e6ef23064367c270caf8aa7009052dc7a350 SHA512 6dc6a561eee3cfc76a48b3a8e3e5302f04f80cc287722f0fbf48d815fc2be8ae16806af92b87843d5351622184dd51b3fa75bcd3e55eafc06a61d408616794b5 WHIRLPOOL c4574dd5432bc324588b3d229cacffda28002278689a75dd0d3ae76cc25b700cff677a4e85ef35d567ca01744291ce4fe177c2d07e3dfccfc7929fb9c14dc298
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20150623.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20150623.ebuild
new file mode 100644
index 0000000..d4843ce
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20150623.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Branding"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-06-23_00-01-56/zip/netbeans-trunk-nightly-201506230001-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 5891123..5487f63 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_p20150623 (23 Jun 2015)
+
+  23 Jun 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-php-9999_p20150623.ebuild:
+  bumped to the latest sources
+
 *netbeans-php-9999_p20150622 (22 Jun 2015)
 
   22 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index f615972..1a42baa 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -50,6 +50,7 @@ DIST netbeans-trunk-nightly-201506160001-src.zip 207930175 SHA256 fae079edd3ea6b
 DIST netbeans-trunk-nightly-201506180001-src.zip 207938768 SHA256 2dd02e87aaeabc7b80a5a41a732817077bbc3e750dd7f27b4c049e1f87aeb240 SHA512 f841a6374c9859391c2b2bab8da32dda91e87944bb6de017c2ffec0e3506a3949b88915247a2192d2d4e3046edf5bb09a26bc8d4a5bcdaa4d683dc0928720c8f WHIRLPOOL 8245bd39b2e3c65e64b0273910c44cd40c01bdfb70a8ab82c3cbcc4e4670fd3d57156807603eb0dcc9b9d9256f0e2d994c7898d934ce485e91623f6b32be301c
 DIST netbeans-trunk-nightly-201506190001-src.zip 207946096 SHA256 5efc0e1a1e9c0321958cb784f65aaf2a804049b3412eb4da7d26018d073c90bf SHA512 80a5b8eeb4dcde61072d9a7e69e08c95fdcc903c5a6165361545fe48e9053056a0861deac96684743f2ef4899777277cf320fd320c21ba9de2eb4dad11c365c9 WHIRLPOOL 0c3395a48fde0a83b4400078e046dd9129ce43922b35f61cfc913d3b4ff6857b2bb81267b55c3fd29a44e8f8663eb3480c5b382c557eb3706bca6ec960358953
 DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d64768e171b41b9164dfe43922947325e7f96ca9c95f73961bd5ae SHA512 b7cfd9b0c0e557bfd5bda998cbe910a7193402fc44bce07d00c97edabbd50fff14d9f28fff4ac169a6aeef965db7acf4939db18ca9aefea8b09e1885b7b83a21 WHIRLPOOL c105483067cdcde190cea21475c96b7ad272533a9e20fabcf4a45a97fdf7ac7252d8422cd6a6ccbc986aab7fa6fb8f35436acfdc7723f158eac771b4e1a229fc
+DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
 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
@@ -81,5 +82,6 @@ EBUILD netbeans-php-9999_p20150616.ebuild 4423 SHA256 ab6fa282a74f32cced5499d594
 EBUILD netbeans-php-9999_p20150618.ebuild 4423 SHA256 9e9ce64db2ef2df173f4d99965967158b5d117713b1cfc0ea5a3efd1f60f7a65 SHA512 97b461fc6788ab5c75b7ca590956afabf930d0dd6de7996204f4cad40f9d47286aeda10d271256022c34c0f112f966b177e227e48e85997d3a6f9be922fc5b49 WHIRLPOOL 11238623cadd3cbaa34892c04f040eb1efae05e287e56515dfc0f3fdf18f10b2dcc859fa15c2a33614121b999fd3f3a64dc390392945889950e23a89da1cc945
 EBUILD netbeans-php-9999_p20150619.ebuild 4423 SHA256 a90a219c1b36c8128216f667c0d8958109c342bf297ae70fe196eb0d59b649ab SHA512 4ad0e6e4469ed439c24263b21e541763f3a420fa0d6570f37e61462dc033b2221fb02e0d133ae00f119112c2f266b6e96701bba4da5835e129fa8c3e2a34d2b1 WHIRLPOOL 60e3112f20b2820ba93f0682f1d152069dc867ba15d51e1213cfb00aee07cb3afd9f793ead944dcc0061236274271fa7f90f0a94fa2fc714f74484fea652b477
 EBUILD netbeans-php-9999_p20150622.ebuild 4423 SHA256 4682fce5e05fd39786fd8be2b42bd4a83327eda8163535e66de2f3ab112801a9 SHA512 6cb32aff21e8553eacbffe642a2ac74c963c92ec065b97b6bccbc897d9924057405cb25b332caf16f366779d5b3ada2416d66616d2fd69d8c1cb25179a9f3746 WHIRLPOOL 35f48640f8e7f37c7e01074137275556ad3c52852b707c46e7e82749e4e0d05ff6cfca204d2f1bd844c6c574c05ae4898a5ee914b1639f5e95058673cdc9a412
-MISC ChangeLog 160738 SHA256 a84ec9d00966d2465480a7451ae92d9843dccaa273f1acfae729c7ecccc2e356 SHA512 4c4eb396d3accfb3d2548ef04c0480b02fb97582bca2d8eb2e328e2f62bd64a933a67085ea977313b675c158b5ece7cc7b020c7519cf2466ff4ee047b6b58d18 WHIRLPOOL c0a812bcdc2113109496a0413545db6fc5377a253211aa167e9479bdba4e684805e81329ba64b95590d77d98cef8be2cb7f645ee13ab674a02fab7990a6ba438
+EBUILD netbeans-php-9999_p20150623.ebuild 4423 SHA256 7ec2838526999ec4a59673776212f11a5ed6d9fd0e2000c52764c8bedfd56112 SHA512 70436da36c54c95ed8fe02d45d8b8c3db82d52b76e287e90e176edfb309b5d0096426e54d2df88abd518d89c5d7effa381ef76f18ba184b8c94d0bf89d85f181 WHIRLPOOL d15018ef173c28788d6be8e3e86f28c7d4841bb9b5f0d42690e585c22665710f735cdbc6e073b9a1e627110e37d4c34053f2ce86583cdf5d01037e91ec8d9fe4
+MISC ChangeLog 160905 SHA256 f03f21ecfc76f7df9ae2234a8d463ee0b0b1fac988293118b4d241751d44572d SHA512 14cb8e0f158628811c0b71415552b6478b88d4b33b5ad4f27fd2b5fb181aead2feee9b18e8c0de707895cfeb253f0f3d0487e492454d0d1b59a6675a2ce06e98 WHIRLPOOL 5ece62f87e252d65d4c8888b90572f71fdcefefb016f31247c250163a35cceb5dfcb0ec019435cec4033c098862e0605a7e8b8586963d323d7fe2f1673ca487e
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20150623.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20150623.ebuild
new file mode 100644
index 0000000..17ad1af
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20150623.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans PHP Cluster"
+HOMEPAGE="http://netbeans.org/projects/php"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-06-23_00-01-56/zip/netbeans-trunk-nightly-201506230001-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 d2597dd..857f555 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_p20150623 (23 Jun 2015)
+
+  23 Jun 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-platform-9999_p20150623.ebuild:
+  bumped to the latest sources
+
 *netbeans-platform-9999_p20150622 (22 Jun 2015)
 
   22 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index 3e8ffac..da831a2 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -64,6 +64,7 @@ DIST netbeans-trunk-nightly-201506160001-src.zip 207930175 SHA256 fae079edd3ea6b
 DIST netbeans-trunk-nightly-201506180001-src.zip 207938768 SHA256 2dd02e87aaeabc7b80a5a41a732817077bbc3e750dd7f27b4c049e1f87aeb240 SHA512 f841a6374c9859391c2b2bab8da32dda91e87944bb6de017c2ffec0e3506a3949b88915247a2192d2d4e3046edf5bb09a26bc8d4a5bcdaa4d683dc0928720c8f WHIRLPOOL 8245bd39b2e3c65e64b0273910c44cd40c01bdfb70a8ab82c3cbcc4e4670fd3d57156807603eb0dcc9b9d9256f0e2d994c7898d934ce485e91623f6b32be301c
 DIST netbeans-trunk-nightly-201506190001-src.zip 207946096 SHA256 5efc0e1a1e9c0321958cb784f65aaf2a804049b3412eb4da7d26018d073c90bf SHA512 80a5b8eeb4dcde61072d9a7e69e08c95fdcc903c5a6165361545fe48e9053056a0861deac96684743f2ef4899777277cf320fd320c21ba9de2eb4dad11c365c9 WHIRLPOOL 0c3395a48fde0a83b4400078e046dd9129ce43922b35f61cfc913d3b4ff6857b2bb81267b55c3fd29a44e8f8663eb3480c5b382c557eb3706bca6ec960358953
 DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d64768e171b41b9164dfe43922947325e7f96ca9c95f73961bd5ae SHA512 b7cfd9b0c0e557bfd5bda998cbe910a7193402fc44bce07d00c97edabbd50fff14d9f28fff4ac169a6aeef965db7acf4939db18ca9aefea8b09e1885b7b83a21 WHIRLPOOL c105483067cdcde190cea21475c96b7ad272533a9e20fabcf4a45a97fdf7ac7252d8422cd6a6ccbc986aab7fa6fb8f35436acfdc7723f158eac771b4e1a229fc
+DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
 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
@@ -95,5 +96,6 @@ EBUILD netbeans-platform-9999_p20150616.ebuild 9244 SHA256 f261f097a11ca0c12527d
 EBUILD netbeans-platform-9999_p20150618.ebuild 9244 SHA256 046c36e733bf3b2dc5601caade88dabf3a60ce1dc3677a8b58cb079dc5105d0c SHA512 bbd88bb8f56e761a6398b94b98127ab34465d1795be11277d46800a303ec594675fd9e5a52c1193050501d043e4b67bf3c832887b28db354029962548fdce7b4 WHIRLPOOL 7b5ec6167c8d916331dd05f0221908f70fc63571843674af63adc1ce0736538eada999b3a5dd2b599f1cccdef70ef9ee219d5b3894b4dd6eb21fac5bab9d4fc7
 EBUILD netbeans-platform-9999_p20150619.ebuild 9244 SHA256 7d14f0ad50f1c2a9ea909e7e32a81c97d2732db3bfe3ef8cb32f40de711a1ac1 SHA512 79ea3c5966e20684ebfb3759b78813b194c69827c9dbdbbe65965c3cc473a7f789c54882c26d7927110a5978e8da81b8f8d8fd42812b210199dbf80074379d4f WHIRLPOOL 714f25b2a27e38835b6a1f38dafb3a21e27e8512ae79798bed57425c1513862ce45abd542d1664ac1ce415287590534e608e4188af982d262db2948e7442c1d2
 EBUILD netbeans-platform-9999_p20150622.ebuild 9244 SHA256 e59792820ed01a99633a9accfa5cd1b054c74cae8ef41c91d8310cd87606d0af SHA512 eea097a64988f19185024722c2cfb019ed5fcafd20ef632587c1a20c265e15d1d54084324f0fa60e58657d208a252b7eacc41f7f6b3a0b40fc49bd4e48023576 WHIRLPOOL 052834872cc01758fe31deed61864a94aa04418396ad28eb791369bfede6bfc273a936661b372faacc9b79223eafe24072dc79a4dd3e3069ad31ab997a678bf9
-MISC ChangeLog 172953 SHA256 8358307afe527d2042f3e6df4b34f933344080d35ea39f0ae15e101e416625b5 SHA512 aa76f9f4229fa3b4973dde97515095f19ce37c45808d33c9d8ea23352d290e216eb97a875da879f5f4b28a561db69d7e0c9a5a9dc022095ba2a1662c42ae0aa0 WHIRLPOOL bebe938e008c8aee323d82cc7c063159d09b2398a86658953f9f816ba88dab5edca34d4e8b8941eeb7d3393457d3dc29d859c3737716b06baa1b33eeb895b30e
+EBUILD netbeans-platform-9999_p20150623.ebuild 9244 SHA256 3060bfc11247e766c63404bee34ceee585a08819292e436adfe341c9d0114afa SHA512 9261cef23c879d621008eee6b316cf7b5e02b2f629d8cf58c3dd60a6a676523d42eff848706093a115653832f8c1ce17d3d76542252130167b1f1c27838b7799 WHIRLPOOL 474db05f46a19c92dd747e1bf8a6471e864d399331cb6a4fd4ceb085fe88b7b5a6415106f61bdf5fd2172421d2a738187ded9eb9e4a8f3e068e183f9572102ed
+MISC ChangeLog 173130 SHA256 8cf11ee779eaa99d7e1f8c733aca2d4376ea83c06dde37d6d91413d135ef35b2 SHA512 1937dfe8fd6814db1592247f280ff2bc788de4d9e1be14acb592c5e3aa2b2ade88272e519979cd7ab2c4be52943456e0bb3b170093adf5a4e35a06dee40ae20a WHIRLPOOL 3500b293f1b0f4e4fcc27c33e7b06b5d58d0ff3366c73a8f8483066b2d3d5319d269b94ef0532101b9ef8ee167db0d033a3e77d212ca4b8d0ab96e869feb7220
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20150623.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20150623.ebuild
new file mode 100644
index 0000000..57771bc
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20150623.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Platform"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-06-23_00-01-56/zip/netbeans-trunk-nightly-201506230001-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 4f99b49..caf6a1c 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_p20150623 (23 Jun 2015)
+
+  23 Jun 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-profiler-9999_p20150623.ebuild:
+  bumped to the latest sources
+
 *netbeans-profiler-9999_p20150622 (22 Jun 2015)
 
   22 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index fc6d6f6..6866e8f 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -37,6 +37,7 @@ DIST netbeans-trunk-nightly-201506160001-src.zip 207930175 SHA256 fae079edd3ea6b
 DIST netbeans-trunk-nightly-201506180001-src.zip 207938768 SHA256 2dd02e87aaeabc7b80a5a41a732817077bbc3e750dd7f27b4c049e1f87aeb240 SHA512 f841a6374c9859391c2b2bab8da32dda91e87944bb6de017c2ffec0e3506a3949b88915247a2192d2d4e3046edf5bb09a26bc8d4a5bcdaa4d683dc0928720c8f WHIRLPOOL 8245bd39b2e3c65e64b0273910c44cd40c01bdfb70a8ab82c3cbcc4e4670fd3d57156807603eb0dcc9b9d9256f0e2d994c7898d934ce485e91623f6b32be301c
 DIST netbeans-trunk-nightly-201506190001-src.zip 207946096 SHA256 5efc0e1a1e9c0321958cb784f65aaf2a804049b3412eb4da7d26018d073c90bf SHA512 80a5b8eeb4dcde61072d9a7e69e08c95fdcc903c5a6165361545fe48e9053056a0861deac96684743f2ef4899777277cf320fd320c21ba9de2eb4dad11c365c9 WHIRLPOOL 0c3395a48fde0a83b4400078e046dd9129ce43922b35f61cfc913d3b4ff6857b2bb81267b55c3fd29a44e8f8663eb3480c5b382c557eb3706bca6ec960358953
 DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d64768e171b41b9164dfe43922947325e7f96ca9c95f73961bd5ae SHA512 b7cfd9b0c0e557bfd5bda998cbe910a7193402fc44bce07d00c97edabbd50fff14d9f28fff4ac169a6aeef965db7acf4939db18ca9aefea8b09e1885b7b83a21 WHIRLPOOL c105483067cdcde190cea21475c96b7ad272533a9e20fabcf4a45a97fdf7ac7252d8422cd6a6ccbc986aab7fa6fb8f35436acfdc7723f158eac771b4e1a229fc
+DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
 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
@@ -68,5 +69,6 @@ EBUILD netbeans-profiler-9999_p20150616.ebuild 3478 SHA256 b28fb37402054e99b4e0f
 EBUILD netbeans-profiler-9999_p20150618.ebuild 3478 SHA256 f1733ece7027732b6c184b57ab9f25a6c125d2633dd1b0aec10478a848892639 SHA512 32164e0a932eaf2e0d03a752abb33af1aab51ad7dbfa9fe5d47e4f10e856ec5229e14fb1f7b4ed832aee8650a5328a6add8ad190989ef4445bb5ea8754c2dd8c WHIRLPOOL 4f5493ce06ea9c0154d743858e3ce328c9444feeaee6387db99caf24d81b7d998665ff4754ff0fbc86b598adb4a0563966fd6f77e6b0832ab94a7da000d1b349
 EBUILD netbeans-profiler-9999_p20150619.ebuild 3478 SHA256 3b8c17cec6b4b9e9398b84729b98387e7926b0199e685ed3b054e05f9094520a SHA512 06161d3b10976c2a710e131c6d399d37922509fa7d32f65452ff622ad3f3d40ea46d9b2cf43c13d08c52c2cf57bc5064b69f6d4bd35f2657be6dc607eac9e90f WHIRLPOOL 7f3394f60312af24f9fed565cf65104f9a0f486a4ac18bc960cc8b0d8c662761420884f5eac67e4906611365501694606d33c78512f1ca02d9ec6885c20f6abc
 EBUILD netbeans-profiler-9999_p20150622.ebuild 3478 SHA256 c3273743b4847a79771dbcbbcebcdf458e916647b99199a46ea65c13982649f6 SHA512 54d2d6a159ff1b4c8dfb0e6161a5ef9fb63258eb1e7b142a4333ba9f4843b9e521ed53cf601e199f5faf3295d3d1eadff20dca6a12c20e0c6fdada70a469fe78 WHIRLPOOL c28866b03c2c77f5428cdd352c53c4b2406bf5831b9790896067934b9782bb9c0a8375ced3ae0468c70f3a60286083b5293875240014a210c92ab2a7fd58e09e
-MISC ChangeLog 172414 SHA256 727f889e376c7975ba435a82abe04252c3ec4178ad13a3f1ac78c5a31c0d1210 SHA512 6d59252e99affb5d08caeaca14ac6d2d517c1f9c5febbffac4094269b3450375015c6fd12d6b4e5ddaaef3904bc06781d1c510d8cda84034d89e5f584df1af98 WHIRLPOOL f2c39b4b56628c358114b7414a0bf5b744dcd355952f6cd6038aa4027417ed31e20caa72d23d878731078707cb7df6aaec8b2f2e33a3837a4b1ac7f51cfdd1b1
+EBUILD netbeans-profiler-9999_p20150623.ebuild 3478 SHA256 033f524b6223f24efab778cddff8bb79d2ffde04deec10ff1af7a5bf9293690d SHA512 2813514a6163309d082908aa3c109286d97cab9db096140463920cd54e5e3f70e97b7c963c6278bd41e692360cbecbe0dee44b4bbbdfaf843c079ea13aff69c8 WHIRLPOOL b60265f79b33cd5edbe05251661f40ac29a0fb4edba8ad935ec74e12476f36652fef5730a79bbed6bc0b09ae9835efb6b13a6e4ea5102a274a8fe0fc9812fdd8
+MISC ChangeLog 172591 SHA256 20de366c5ad84c18b648c5b45ca7e35583f8fcd4743309604a952ac6b05203a6 SHA512 3a2dff8a47f6df05f19c97de558ea938eb96fe60d2afc5c7c218a171b4868f1df18317790695880da1fb64c0d160c863c026e7da9dee3a3205d8492c7073eed3 WHIRLPOOL bc7cb2f6a33e8531b70f7a805d8ad7d1565fbce3d7b90f00c0c214b87de98351f251ff725729ff9f7acf9697f4b1f39b1409b5f9d0351ed07d97058deb055e02
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150623.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150623.ebuild
new file mode 100644
index 0000000..0184344
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150623.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Profiler Cluster"
+HOMEPAGE="http://netbeans.org/projects/profiler"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-06-23_00-01-56/zip/netbeans-trunk-nightly-201506230001-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 c765549..aa4296f 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_p20150623 (23 Jun 2015)
+
+  23 Jun 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-webcommon-9999_p20150623.ebuild:
+  bumped to the latest sources
+
 *netbeans-webcommon-9999_p20150622 (22 Jun 2015)
 
   22 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index 4e9c87f..f6f2887 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -43,6 +43,7 @@ DIST netbeans-trunk-nightly-201506160001-src.zip 207930175 SHA256 fae079edd3ea6b
 DIST netbeans-trunk-nightly-201506180001-src.zip 207938768 SHA256 2dd02e87aaeabc7b80a5a41a732817077bbc3e750dd7f27b4c049e1f87aeb240 SHA512 f841a6374c9859391c2b2bab8da32dda91e87944bb6de017c2ffec0e3506a3949b88915247a2192d2d4e3046edf5bb09a26bc8d4a5bcdaa4d683dc0928720c8f WHIRLPOOL 8245bd39b2e3c65e64b0273910c44cd40c01bdfb70a8ab82c3cbcc4e4670fd3d57156807603eb0dcc9b9d9256f0e2d994c7898d934ce485e91623f6b32be301c
 DIST netbeans-trunk-nightly-201506190001-src.zip 207946096 SHA256 5efc0e1a1e9c0321958cb784f65aaf2a804049b3412eb4da7d26018d073c90bf SHA512 80a5b8eeb4dcde61072d9a7e69e08c95fdcc903c5a6165361545fe48e9053056a0861deac96684743f2ef4899777277cf320fd320c21ba9de2eb4dad11c365c9 WHIRLPOOL 0c3395a48fde0a83b4400078e046dd9129ce43922b35f61cfc913d3b4ff6857b2bb81267b55c3fd29a44e8f8663eb3480c5b382c557eb3706bca6ec960358953
 DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d64768e171b41b9164dfe43922947325e7f96ca9c95f73961bd5ae SHA512 b7cfd9b0c0e557bfd5bda998cbe910a7193402fc44bce07d00c97edabbd50fff14d9f28fff4ac169a6aeef965db7acf4939db18ca9aefea8b09e1885b7b83a21 WHIRLPOOL c105483067cdcde190cea21475c96b7ad272533a9e20fabcf4a45a97fdf7ac7252d8422cd6a6ccbc986aab7fa6fb8f35436acfdc7723f158eac771b4e1a229fc
+DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
 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
@@ -72,5 +73,6 @@ EBUILD netbeans-webcommon-9999_p20150616.ebuild 4997 SHA256 1e4fc984a7d66a1e474c
 EBUILD netbeans-webcommon-9999_p20150618.ebuild 4997 SHA256 2674ecefc351277e7874279c650f50f3b6f02438abce5255538bfdb5b8aa6a03 SHA512 432d04a50c14a568c49afd7e295edc6f4debea94f31d5e89ed0b5fabf3d2d8a1dd11ad3c24406a5e76b72ed82b2e8d3e282d0b72f54d587c7d47a0cf45ae7b30 WHIRLPOOL f2b191dbc3d4f4afba7b54c1084fd4b44ba4dd82e46cd5c620e8820008a300406196ceb44dcdab6204d2c90874161edcd4840b8e4af6a6513fc1e805309bbb6b
 EBUILD netbeans-webcommon-9999_p20150619.ebuild 4997 SHA256 4454d668ef4073b706ecad2c5dcecd8ce32dbf5a2d7893a2f795d3439c2efc33 SHA512 9356f53c767962964605f6b0cdd137104aed0941f5ae2d1b468b3619b1b55116edfb4b5d4b6b98fb72a10e4b1b2c20320fb04ebe9884b7455ed67c3b6c7ad9fd WHIRLPOOL 7e1e9938a4771332da30198abc55ef8aea138a69351ecf89ee5cfa25ee5d02f35f4e3f0c1d2a82441f575f4681a490077387d6a037c98017dca9d7b4447539c7
 EBUILD netbeans-webcommon-9999_p20150622.ebuild 4997 SHA256 dc2258582fc740f4b2a27ad3be86a59a4d7074bfef040ec0ffd861de8cb217ee SHA512 ff1542fe64f93d69cc742167ce61602eaed85e439988868fb78e14f4f79930f49c9596c47d9c1bae6693184f1f580f00e2aa3c9923edc2a3a5488e61dcf57fe3 WHIRLPOOL 34e05c0f646dc0380dc4910adfd01966a1a8dfe2f72e71e11095b795d45034903a89abd6121f8c4dbcd3392800b6944d1f422def7b20969d6b2d3d45a9a07f70
-MISC ChangeLog 145548 SHA256 5be83afafec20e8d033b2c7c508e82fac5c8ce57e60a048529a93bb97af4b6e8 SHA512 605e0506d1cce059838672c0bbab67fde367a5e4bc86354668560e9bb703a8c7618c821e4679291e8da6907afe580500a0a2b7fd4d3245b8084e568d0314c231 WHIRLPOOL 2efaa80fa080f345426e9ded87841802cbe20e684802f3a65edbb6fb4be69dc9b0fbc925b330ac787f5811e4d9fcf3ba56ac29bed86491b79025c64b8e02988c
+EBUILD netbeans-webcommon-9999_p20150623.ebuild 4997 SHA256 faf8e44b97ccb871c2ec2ea2d37587bfe06c3a614beff0f680a7d893c009c698 SHA512 07720be89dfae00530e9268323e48a1c137cdd2d41c1e3041c38be61ae153757a64ee029651be6583ddc0701e74fbb50928f4ab4f4c2cacf4c31e1a3f7dd25f2 WHIRLPOOL 7e82597c9ef5bfbc11edc02882ed51d13a2a5d19354b3440e41db0b13213281b892bd480137c61d1794ec5cee73cdb459701ffb2201120a158dc1ef1710bb55f
+MISC ChangeLog 145727 SHA256 a784ca7c3ebea686cb3fd7a15d3b1bcd6e0ae332333c016ffea9bb307674c669 SHA512 d8d7abfe21f74d580c216c3b3eadab6cc2b8c7dcd38dd097d925e10ac36d1e834bee7e72ac9a94cf782887ced0d888c3ffadccb53c792bbd6bb1aae799253a81 WHIRLPOOL 2e3afb8b056bcacc1dd5236ad34663e7ab3342192c9225fa11675988e241bc01e61600b66e43487d34be67d472aa42b87ab315695c14fb786193be45002514c5
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150623.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150623.ebuild
new file mode 100644
index 0000000..07767d5
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150623.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-06-23_00-01-56/zip/netbeans-trunk-nightly-201506230001-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 afc1e54..03fa529 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_p20150623 (23 Jun 2015)
+
+  23 Jun 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-websvccommon-9999_p20150623.ebuild:
+  bumped to the latest sources
+
 *netbeans-websvccommon-9999_p20150622 (22 Jun 2015)
 
   22 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 3ccc420..5ba9fca 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201506160001-src.zip 207930175 SHA256 fae079edd3ea6b
 DIST netbeans-trunk-nightly-201506180001-src.zip 207938768 SHA256 2dd02e87aaeabc7b80a5a41a732817077bbc3e750dd7f27b4c049e1f87aeb240 SHA512 f841a6374c9859391c2b2bab8da32dda91e87944bb6de017c2ffec0e3506a3949b88915247a2192d2d4e3046edf5bb09a26bc8d4a5bcdaa4d683dc0928720c8f WHIRLPOOL 8245bd39b2e3c65e64b0273910c44cd40c01bdfb70a8ab82c3cbcc4e4670fd3d57156807603eb0dcc9b9d9256f0e2d994c7898d934ce485e91623f6b32be301c
 DIST netbeans-trunk-nightly-201506190001-src.zip 207946096 SHA256 5efc0e1a1e9c0321958cb784f65aaf2a804049b3412eb4da7d26018d073c90bf SHA512 80a5b8eeb4dcde61072d9a7e69e08c95fdcc903c5a6165361545fe48e9053056a0861deac96684743f2ef4899777277cf320fd320c21ba9de2eb4dad11c365c9 WHIRLPOOL 0c3395a48fde0a83b4400078e046dd9129ce43922b35f61cfc913d3b4ff6857b2bb81267b55c3fd29a44e8f8663eb3480c5b382c557eb3706bca6ec960358953
 DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d64768e171b41b9164dfe43922947325e7f96ca9c95f73961bd5ae SHA512 b7cfd9b0c0e557bfd5bda998cbe910a7193402fc44bce07d00c97edabbd50fff14d9f28fff4ac169a6aeef965db7acf4939db18ca9aefea8b09e1885b7b83a21 WHIRLPOOL c105483067cdcde190cea21475c96b7ad272533a9e20fabcf4a45a97fdf7ac7252d8422cd6a6ccbc986aab7fa6fb8f35436acfdc7723f158eac771b4e1a229fc
+DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
 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
@@ -69,5 +70,6 @@ EBUILD netbeans-websvccommon-9999_p20150616.ebuild 2727 SHA256 2f26cf9e9b0bd0acc
 EBUILD netbeans-websvccommon-9999_p20150618.ebuild 2727 SHA256 caa0da8d02beb6889a6246e9281d3ef3712e43cbf917db931c2b566fbe187548 SHA512 eb8037e48fe7b7f78b3610a9b567b709950f880632afc82cf65b51452e53b5d211f2bd107a6f7fb24ae729933b51853751994b80906cdfd25eee1d5e620e4383 WHIRLPOOL 4dccfcb2031695580782e85bc4f31d19c035ded283799ec7203118811d9b08f12d1e5b3c544455afea00170d5504b2fe30dbfa8450b63ca145ab369451bf05e1
 EBUILD netbeans-websvccommon-9999_p20150619.ebuild 2727 SHA256 411b35ac74f948280b6c120f7ba69d96298fc20797869bcfa50246a2ba4a4715 SHA512 bdb29a69b2a4484a4a6871148f86c1901e02a9a31ad9c4fea0489fd5ea255453f9db45969d78efdf706ffeb4f690a63d761d1ac5f24e39d4d80955923363621f WHIRLPOOL 3a1fe0f1a6140a639b36976931e95afacfe64bf8c9900d2d500e21a0a32289524d3969808d3f78019b6026d9b0a05cfad17d3a80eed66936db584c7ac8132689
 EBUILD netbeans-websvccommon-9999_p20150622.ebuild 2727 SHA256 626b4908237c30b4189f96af550b8753c107956c5db693179439b0317b081082 SHA512 1049451a4c48e83cf330c41e78847214f283e7f6757959d2e73d495a153ac7d3582b8b954262046d386e697312d6192cb08aed568d0be8e6fb7259cc257409ca WHIRLPOOL a1c1282110a272561e326798e1d443abb3871f7e5748f7167bb6bb3926de0a131f305381a83a94f4bc2b607711745dde3e4a28027e3726c79eca175bddebd435
-MISC ChangeLog 180704 SHA256 b8cbf9d6d3734a0ca8ffcc4ae40b7d4ec29a52ff031fe65031de5b6483298c9c SHA512 92b1ff793ff5e026dfa0100dc5d755e36fa8db6eb51773e6bdde5cf764a04ced7c514fcf8c44a381e3146a9ed8bbd342ca81a75cbb7aaaecf8066d88ac5d6364 WHIRLPOOL 129a64ac2bdb9f9a0a4700404e99f4a4cb943d3f2e5174cc6c442ad9b8f86a0d523f08ffaee1b8d83c911d523b3ccd8975a398a4eaede90c449b207e61ee9739
+EBUILD netbeans-websvccommon-9999_p20150623.ebuild 2727 SHA256 3cb41c7858bb52b2f7462c8c9d28cc2472c050a5aaf36d5e2f1dc97b253cd8cb SHA512 eaa443502c3b782894767bdf3d5cb62bcaa136e716326f4e62379c4f74217badd1637f3fb5ba5684d54eeec99c579030027391bbaa9018aac072308bfe726d90 WHIRLPOOL b7d38514410ea3e385cec2210ef6ce3177efed4772d97bfeab6c0dc37114fba8ed2bc44e86945654b91c22a803510e08ce0afbe2e9cffc632004ff18954fac35
+MISC ChangeLog 180889 SHA256 86235305b36fc0fa84a7f23ae28d8972ffd822f0008bee1691cb857bad23c96b SHA512 b63e95c1184c5d6bb8e772b50b10fc3e66e83ff25295c506f4d6a6a6ac2223b0f99ceeb6516779a547be72366b5c5e8339e74e394f382b9765395f6c34cdd055 WHIRLPOOL 26a58c252813ea672a0b08025d87863b58a6dfa5ff49b80faaa68ac68103650447527a2716175cf0a3cbfb928060545fbb19ecbdcfe56ea79b7aab9ae5fdb374
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150623.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150623.ebuild
new file mode 100644
index 0000000..e615250
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150623.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Common Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-06-23_00-01-56/zip/netbeans-trunk-nightly-201506230001-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 16f9485..1e78eff 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_p20150623 (23 Jun 2015)
+
+  23 Jun 2015; Miroslav Šulc <fordfrog@g.o>
+  +netbeans-9999_p20150623.ebuild:
+  bumped to the latest sources
+
 *netbeans-9999_p20150622 (22 Jun 2015)
 
   22 Jun 2015; Miroslav Šulc <fordfrog@g.o>

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 37e1dbb..3419100 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -45,6 +45,7 @@ DIST netbeans-trunk-nightly-201506160001-src.zip 207930175 SHA256 fae079edd3ea6b
 DIST netbeans-trunk-nightly-201506180001-src.zip 207938768 SHA256 2dd02e87aaeabc7b80a5a41a732817077bbc3e750dd7f27b4c049e1f87aeb240 SHA512 f841a6374c9859391c2b2bab8da32dda91e87944bb6de017c2ffec0e3506a3949b88915247a2192d2d4e3046edf5bb09a26bc8d4a5bcdaa4d683dc0928720c8f WHIRLPOOL 8245bd39b2e3c65e64b0273910c44cd40c01bdfb70a8ab82c3cbcc4e4670fd3d57156807603eb0dcc9b9d9256f0e2d994c7898d934ce485e91623f6b32be301c
 DIST netbeans-trunk-nightly-201506190001-src.zip 207946096 SHA256 5efc0e1a1e9c0321958cb784f65aaf2a804049b3412eb4da7d26018d073c90bf SHA512 80a5b8eeb4dcde61072d9a7e69e08c95fdcc903c5a6165361545fe48e9053056a0861deac96684743f2ef4899777277cf320fd320c21ba9de2eb4dad11c365c9 WHIRLPOOL 0c3395a48fde0a83b4400078e046dd9129ce43922b35f61cfc913d3b4ff6857b2bb81267b55c3fd29a44e8f8663eb3480c5b382c557eb3706bca6ec960358953
 DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d64768e171b41b9164dfe43922947325e7f96ca9c95f73961bd5ae SHA512 b7cfd9b0c0e557bfd5bda998cbe910a7193402fc44bce07d00c97edabbd50fff14d9f28fff4ac169a6aeef965db7acf4939db18ca9aefea8b09e1885b7b83a21 WHIRLPOOL c105483067cdcde190cea21475c96b7ad272533a9e20fabcf4a45a97fdf7ac7252d8422cd6a6ccbc986aab7fa6fb8f35436acfdc7723f158eac771b4e1a229fc
+DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
 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
@@ -76,5 +77,6 @@ EBUILD netbeans-9999_p20150616.ebuild 7216 SHA256 5a385f9ff511b6f19193dc97df6716
 EBUILD netbeans-9999_p20150618.ebuild 7216 SHA256 00abce2134882984bc727768ab577dc738a03b6ebe67546c57f8398c4e40ef7f SHA512 a1d2fb65ab69de8db0219af96141dbbb9f792c920bf006177b09f3580b8281359553c0ee1accfc62f5c27431a69b7d64a3e8ccef5aeca90621c5c14f073d14fc WHIRLPOOL ae46889e5aca57c017642e4dba354828587b01626fa1eb2d57280d6eaf3211e8f25069cb4829f6f482a46f4bdd6cd00cb6a0a76078ff4b3eeed03751c9e59004
 EBUILD netbeans-9999_p20150619.ebuild 7216 SHA256 b99ca970c74329c6a19ecc992c8cc71134291f339c8861619b2024e2269ca0fa SHA512 e3b1236eff36ee0c0cb0b22f3c3469a297df94bf22cd7721db75c48580c9150292a6e244db0f48efb4bee57515de31355061e7a47d90b277354299ed9b4bd62e WHIRLPOOL 47afcddd46a8394fc1789bd5fe312f97023a92bbe75b90c9e5ca21389856cc1b46426238d48bea4d000480b091416bfd18eb87aa1657c01844db3c82e105177e
 EBUILD netbeans-9999_p20150622.ebuild 7216 SHA256 85df1dfe57fb936b3049e70447d6c23d69995fd54699a3feea635c462b4b41f9 SHA512 083843ed02d3ea9a635a688a7934d39688d8d638db0e7ede24bac732de7a488371fda61ce5b7668a0011ca94bb9c08371296f39a901c6ca4884bd8e7f4213897 WHIRLPOOL a3ad44239632961d35c9f03e003768cc749a557013e626c9c104ccbe94d221542e0d2a169a701a9d03dc3442581784317deba6608214c054cbf7a2f79ec38983
-MISC ChangeLog 153535 SHA256 123d5a3c6bc0afef884a8c5768e6fed17f044e91acceadd449074e5b82d648c8 SHA512 1a2a2f6223cacaeddef58cf403b0bff3a5846697eab6926874880b2185a4d54161aad3ddb95ef2bc5602b5270804bf75734ad82f297be68e6ad22d446bb0b374 WHIRLPOOL 3c9153e45cd539586f48067e0a33586bc37181ed6067d338eddfe9a90c115c7e09b8d60e173de63dacdee6abc6e1cd13a11fab0bf12fac17b9cd0cdd73dc071a
+EBUILD netbeans-9999_p20150623.ebuild 7216 SHA256 abaaff082baac7e72c50d5f9846bad7bfa0fea7f87b2b5a0e623805015330d8e SHA512 eef668f3660ba12027e253008f9bc85af466fe30516f44ffc16e87540f22bda7ab6ebf0a0a3950293738478c7a978c1e2695d55bd55a417862cc99533037bffa WHIRLPOOL 637186f87d1642260245436386a7fa5b40f1d910b74d931cd0224ed886f9d005086f5b25e604ece385bd2652f294b6ceee169538b46e4f38e8f60633e2c0f9a2
+MISC ChangeLog 153694 SHA256 d87d753b18c55d6720c6d6f3d3a4b53074f914203b8e7780d4347e7b3846fc5e SHA512 3876a952d8e7ef9ce913e1fb1ca541e6c9aa7f09f2cde06e1286a82372b758fa1f48f93ba1e24b6e4e7683c134449e9525f66f5668bf1d32280234312ce7bcfd WHIRLPOOL 0bbbbe24d8043fc6ea7d9ad0e33d8c39ea4d57e93c09a8919cef3bfbbba9bfcaf179c02863bd4fdf60c414086dc90aca230f8ca4ac16369b8903ef917d047e89
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

diff --git a/dev-util/netbeans/netbeans-9999_p20150623.ebuild b/dev-util/netbeans/netbeans-9999_p20150623.ebuild
new file mode 100644
index 0000000..577ee7f
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20150623.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-06-23_00-01-56/zip/netbeans-trunk-nightly-201506230001-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
+}