public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Miroslav Šulc" <fordfrog@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-java/, dev-util/netbeans/, dev-java/netbeans-dlight/, ...
Date: Wed, 10 Jun 2015 07:38:20 +0000 (UTC)	[thread overview]
Message-ID: <1433921882.5ee4e9f37e2807a7945890c1f1dd1f5906db2fa7.fordfrog@gentoo> (raw)

commit:     5ee4e9f37e2807a7945890c1f1dd1f5906db2fa7
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 10 07:38:02 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Jun 10 07:38:02 2015 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=5ee4e9f3

netbeans: bumped to the latest sources

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

diff --git a/dev-java/netbeans-apisupport/ChangeLog b/dev-java/netbeans-apisupport/ChangeLog
index c178495..34e7083 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_p20150610 (10 Jun 2015)
+
+  10 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-apisupport-9999_p20150610.ebuild:
+  bumped to the latest sources
+
 *netbeans-apisupport-9999_p20150609 (09 Jun 2015)
 
   09 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index ad5ea65..4712b67 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123
 DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9aea7ed9f8b11cbdcca02d11fc314c4ec32c015cbd605344644 SHA512 c69868f00a50d9d0f1744137a66c4944330d4c0f7a7b58f13d3e7c72fbd7d31fbe97d3d98cbb4011e4ddf5eaf637991d7a4fe1d32fb98a0627ed28012ebdafaa WHIRLPOOL 89e0b90e509f4771366e6baddb861f4c922f9d5f8f0c5561fcb89e78466cfba40e2d657743ed142d12e7778a796ce049a03703d661660a1d540ceb4798e51b61
 DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 DIST netbeans-trunk-nightly-201506090001-src.zip 207886954 SHA256 ae0945f940a854d3314f1be40e4f915788eaa7902a71ca7ca645456236230f71 SHA512 61b3be2bba95f4a08ed4fa340d441c3f01ac9de230c8125b94a61adb47b0c09e312e0c75eba3ff4eb446468d00982edf66b7fa709263f50cae6690da85d9ac66 WHIRLPOOL 16a5f826bfafcf74c32fa3e6620825fb0287b904d9cc9ad76aa24001731c83029d641ec658559d6ad479b1169e49512906e5aa2c8df806d6e695da6af41f141f
+DIST netbeans-trunk-nightly-201506100001-src.zip 207888598 SHA256 ffbd120304de4f26f654fb22f4eb73ab9778b7795204002270a69eef6be1ab55 SHA512 c238bbc661698ca4b143aec8677f64a26191703175f1096d4e662e533e59dc13f08ef85d81e70e2ee104563cde8b026befb192b660604230cd53ac4cc23a2c9c WHIRLPOOL f8682cb4006efebe7f1a750a6a76734e95e4ceb5529b3cd47c01b6ffd4e4d3594e25a043ed8b21d510655192f85f88dbaefe85fcbe4d42e5123bda3c81c7ecf7
 EBUILD netbeans-apisupport-7.0.1.ebuild 3134 SHA256 41c32033c9945a39c0aebb6b0271767031d53a47e5c8365d9e3a7c86712e24cd SHA512 dd4bdde9574a87b46b02fd7204b1e90394bd87dc572dfa015b601203b026b35571f20323db834a310f90aefe6e4a822044b0d71d535a7351137219b50ecb2aa8 WHIRLPOOL f3721521a33b337d7dc24d6b49b0b2fe723f5ec446a5a4befb085051140a41bfd2d3081876e9f02f8b9932a3a0997b92211cd964fe372e40b42813df5db5170e
 EBUILD netbeans-apisupport-7.1.2.ebuild 3143 SHA256 cf24048c0ecca98a7d6371624bb0ddfb78663bead073d515a7c84229dbec00a8 SHA512 ec44c263e786210fd64c9ebb253bc9d4fc34d3be9493157dad06007c19734672bfd767765c003393d1e5cc6755fd5d1eda956b00c2092e98592a73ec1af4e729 WHIRLPOOL d619c304a994a2b818d892fb6315d092588f2ebf95e566f7a909f92daf21bb368a28c4e1af876ae585980dc82996e62aba30b12c41461103c23620a215480b76
 EBUILD netbeans-apisupport-7.2.ebuild 3126 SHA256 b0d64795b8403a932e3e20721a116c755c4de66fc36f7191476fcb4a226bad13 SHA512 cea062a72a8e75a9c2fe91c323f83d542a70149336360e1c41479f401fcae5ead6a301c8a7d5704d5beb27f7810b5d1e3cff0196cce7a26890a001c570179f6a WHIRLPOOL c286f4e4d3a02cbeb1a6e13b2005dc5435a6e9ec026a98fcc00bb83222014b800cd83f437c69352b48d16bdf442a6c7ebbed6aff86f10b3c5e6cdfb7edd9e184
@@ -60,5 +61,6 @@ EBUILD netbeans-apisupport-9999_p20150603.ebuild 3390 SHA256 0cfcc8b9d4892fff7c4
 EBUILD netbeans-apisupport-9999_p20150604.ebuild 3390 SHA256 2ce302d24287a7b24719bff16999435a73c16fdbe666b69321edd5fa12628852 SHA512 c0c58444d6619dbbbf1635f02410344f385d72b5a78b805645c1503a1d7a749e0c6cba325c5702be3e8524b5c5b2258208aa9d67c06382275fe54df447bb6baa WHIRLPOOL 41369acd7c88344cfc156f0919399610bd1ad719728c5aee2ff9b1a3854b12b7ea37cf164a65180c43ce591dc9f815308f3e3ab4db2ca3d48247024b25057717
 EBUILD netbeans-apisupport-9999_p20150608.ebuild 3390 SHA256 42b521a5d1b7d478a4c8b23b7028161ce2695a8bdb4100200c02377eab9b0d77 SHA512 d81ad1554cf8d82af6b4239597e83e3a3e54ff9c6df542073f172fbd1716d4af7035490b37ea6d54eb26fbb483e6168296d6900258e788e2e142b7fa4b5a982c WHIRLPOOL 60b2257bad40562b6a9c9ad54126889761e1dd3faf13f25eb8df56f842c5083a63fe3f01da5f6536bf6627b95a96a4e4a6ef1ec3399369734e0e1c92bb146b4d
 EBUILD netbeans-apisupport-9999_p20150609.ebuild 3390 SHA256 8b0c7ccd68c66ca64ebbe2497cb636799b01fe27bc4367729b54d96be054e6d6 SHA512 5d843c46914ab5f2ca74e5d0ef386f4250fce3eea4c87257c3096ab1c97cd1e058ad6011c6596250b7062e223c440ec161ee2cfa3fb722d9000506425aa6a054 WHIRLPOOL f284d2d93ed7fd3ef69429bb904fcb2b9caeb33e7459f9aacf2754ff3d249b2d9ca5d84ded9b14e2c436de56c480df5109c17f35d8cf12a42d6576fbb1a84dce
-MISC ChangeLog 174910 SHA256 02ff5a9a8c83484e840fb7ea095de8f998ab0122e942ae19fdb7c044e7759d00 SHA512 c6ece5d768aaa2d39e15af876906f257473dad7a354941211d79c45f5c8c5e394d80fd7ccbfaa80f4a92126e30ac66ddd25baf46bf274923c8ea7cb896113209 WHIRLPOOL 0da09d2cfdebfe93cb534c51db3a626d265c6cd80dfb5487660aee1fcaeec0a4e8e772d11c8de87e154ccc8d8826af2c62b3c8bdb669b5e2adafeec9b824dd21
+EBUILD netbeans-apisupport-9999_p20150610.ebuild 3390 SHA256 c143277ba5cddebd3f82469b98ef7c00693217b7db6565f6aff056f71d866c15 SHA512 d40520fb2c4365a23455e38e6aefaafa200e035f2690587a4d4cb40c4463bcabd84d654528b1cc65663b3a445450628c297ea75a3697245e68cc2e9c37d271e5 WHIRLPOOL 5335dbcbff8a4afb24d7edbd5dfaa5aeaf6aecfbb3f6b14c4d1f03ad507f4e52661e16dd09f53c08834b84a7af6032f076ab342150e2d9eaa048190a57652085
+MISC ChangeLog 175091 SHA256 2c1fbd69ffdd7ae69dcc3a4e4985c1be3322c0ac33a996994b0390ecf1807a0a SHA512 06545d1ba69b7502ac864eb529a50c79844f6d95ad5d67cdc344ab7b526beb4ca6b2c7ff9fd6a010305da576893f57edf387db200042a132e87c18e92fbe432a WHIRLPOOL 51e2bb0ee2fbfe7aa87477be169d7af83cce7d4edadd52f18a0aa8902f977132c7be0a1d5e25f09107c097711ac16ae6b9617689f179bb058579572b032b302e
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150610.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150610.ebuild
new file mode 100644
index 0000000..ab465b9
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150610.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-10_00-01-56/zip/netbeans-trunk-nightly-201506100001-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 83881fb..6a871db 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_p20150610 (10 Jun 2015)
+
+  10 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-cnd-9999_p20150610.ebuild:
+  bumped to the latest sources
+
 *netbeans-cnd-9999_p20150609 (09 Jun 2015)
 
   09 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index 86e9f9d..7353e77 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -51,6 +51,7 @@ DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123
 DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9aea7ed9f8b11cbdcca02d11fc314c4ec32c015cbd605344644 SHA512 c69868f00a50d9d0f1744137a66c4944330d4c0f7a7b58f13d3e7c72fbd7d31fbe97d3d98cbb4011e4ddf5eaf637991d7a4fe1d32fb98a0627ed28012ebdafaa WHIRLPOOL 89e0b90e509f4771366e6baddb861f4c922f9d5f8f0c5561fcb89e78466cfba40e2d657743ed142d12e7778a796ce049a03703d661660a1d540ceb4798e51b61
 DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 DIST netbeans-trunk-nightly-201506090001-src.zip 207886954 SHA256 ae0945f940a854d3314f1be40e4f915788eaa7902a71ca7ca645456236230f71 SHA512 61b3be2bba95f4a08ed4fa340d441c3f01ac9de230c8125b94a61adb47b0c09e312e0c75eba3ff4eb446468d00982edf66b7fa709263f50cae6690da85d9ac66 WHIRLPOOL 16a5f826bfafcf74c32fa3e6620825fb0287b904d9cc9ad76aa24001731c83029d641ec658559d6ad479b1169e49512906e5aa2c8df806d6e695da6af41f141f
+DIST netbeans-trunk-nightly-201506100001-src.zip 207888598 SHA256 ffbd120304de4f26f654fb22f4eb73ab9778b7795204002270a69eef6be1ab55 SHA512 c238bbc661698ca4b143aec8677f64a26191703175f1096d4e662e533e59dc13f08ef85d81e70e2ee104563cde8b026befb192b660604230cd53ac4cc23a2c9c WHIRLPOOL f8682cb4006efebe7f1a750a6a76734e95e4ceb5529b3cd47c01b6ffd4e4d3594e25a043ed8b21d510655192f85f88dbaefe85fcbe4d42e5123bda3c81c7ecf7
 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
@@ -78,5 +79,6 @@ EBUILD netbeans-cnd-9999_p20150603.ebuild 4796 SHA256 4fe09a855edbe499a2a07d4238
 EBUILD netbeans-cnd-9999_p20150604.ebuild 4796 SHA256 b5de94bf182c4a01c0f20efdb0bf633ad5a781fbafbb4acefd5cb3f3b8944fd7 SHA512 fb7516639d9a33a5121f2e3247cdda8181fe5ecaaeaaddc61765a7513138f354bc6dda6b7dc2bcac8dcd8cb709e3c0f3ead6f2660eaecabe4e162a53294699ff WHIRLPOOL df37822b8cd969548694d81e1ba82c599a4cb69a564e625dfc37aec21de0daa398b13993956a969c330f78ef8f72034df75705ceab11eeac87a0dc90bb59a737
 EBUILD netbeans-cnd-9999_p20150608.ebuild 4796 SHA256 32bd9168ea0fa02bb13c14b7457cdb45add30b4fd9e2d88cf2b2ab179b3ea5d7 SHA512 2345902d0153a6ea232c3c3fc7fcfbdd353bb4a350bb1a009fbd1a3d8c1c7bc82b62c011afe8e106c584b3e1eda5310d3e9ca876b9cff1a2b664cc687be3ad69 WHIRLPOOL 2e458f4ad1e51caf412333062b970e59015fda6e6b5ee72ec1e93719ca9e874b2caa2ed10082f278de541f31f769465c77dd43fecaab6c1b7571629e0ea1f299
 EBUILD netbeans-cnd-9999_p20150609.ebuild 4796 SHA256 902fd686ea72a8809f5ea9ccc9972149d8eec5a665620b42555308cf8ff01859 SHA512 e2f7cb2fc0d93ea0a68fbd3d46954ee165b9cd3f47e7899f5d208926f89400881a119a59d56ac2eed414f3c864fd85ac6223493b5946b097fd9defa90810c4c4 WHIRLPOOL 1db54be590a7a9329ac324fd1ab269f49b6f3d51f88374e9cb3d2b0288a46ee1dd6720a886fea2cb34bc9da261c876e6f970699a0f400d92ba31b273d0db145c
-MISC ChangeLog 159631 SHA256 fdfbb3787b2289f544a37f4f27c2fac7c7a4f2530e14cd8dbbd34ce709789193 SHA512 49213e38898b816e4a3734f0971ad54917d4a959ac15d0634215f01532819dc2a538e393489338e2e2c74728c0104c177258234ae42e2ef49593cd4e940f220b WHIRLPOOL 76fc3ee1db92e851f62884f0f8c31fe9990edc6e97c99b6facba897f41047437d7f58cc3556214cb4b3353c82876584f51145d727b2458f96e2a8d6e00ad8aed
+EBUILD netbeans-cnd-9999_p20150610.ebuild 4796 SHA256 309b75036865c69240c59b309e7059e14d7f324e6bf7a804649d7454401c063b SHA512 a4a722b6b9f265c40542b31d96d0824af8a85b3a17735924d08078428edb769a6798bf1e2b281bf858bcf64549dffedb9efbb4a8872a875faed8c22698f19f71 WHIRLPOOL af5a0ddedbe641597cfba99a2fc98cb19e0d266c3eb2059b916677e907b82c8ed96cd4b64dbfff08ffd98a35f7789b5874cb85caca71a966944fcc789ca731f7
+MISC ChangeLog 159798 SHA256 f77d235e0c822eb8e0f5bed6ee463a7b54335b47b7bff13875afb212fd3d77ba SHA512 795a593dbd9647de7151bbfa91a4e590278ca2a0f73a597c1e7e5fb12f95afbfd0101394b7453b17fc1bf974d0004ec4d99d70e9af4630fb221463a504ddee29 WHIRLPOOL 0358f02ace85201ca6b61da5a6cbfc6137bac881d81108b35cb51c75642cd4ee6861708be6fa755177bfdf8885cd7b99f51948b50ca2db82e2f0e0e36386a0df
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150610.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150610.ebuild
new file mode 100644
index 0000000..4e32828
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150610.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-10_00-01-56/zip/netbeans-trunk-nightly-201506100001-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/D4BF6B1BBE51F2D8EEC23CCB28C40BA587885B71-clank_0.3.6.zip
+	http://hg.netbeans.org/binaries/BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip
+	http://hg.netbeans.org/binaries/547CFC4D4F7C877925CFB0732F303DC1797A58C1-cnd-rfs-1.0.zip
+	http://hg.netbeans.org/binaries/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+# These files are for remote development and debugging
+QA_PREBUILT="usr/share/netbeans-cnd-${SLOT}/bin/*"
+
+CDEPEND="~dev-java/netbeans-dlight-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	>=dev-java/jna-3.4.0
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.cnd -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar libs.antlr3.devel/external/antlr-3.4.jar || die
+	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
+	ln -s "${DISTDIR}"/D4BF6B1BBE51F2D8EEC23CCB28C40BA587885B71-clank_0.3.6.zip libs.clank/external/clank_0.3.6.zip || die
+	ln -s "${DISTDIR}"/BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip cnd.discovery/external/cnd-build-trace-1.0.zip || die
+	ln -s "${DISTDIR}"/547CFC4D4F7C877925CFB0732F303DC1797A58C1-cnd-rfs-1.0.zip cnd.remote/external/cnd-rfs-1.0.zip || die
+	ln -s "${DISTDIR}"/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip cnd.modelimpl/external/open-fortran-parser-0.7.1.2.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.jna/external jna jna.jar jna-4.1.0.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-dlight-${SLOT} dlight || die
+	cat /usr/share/netbeans-dlight-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.dlight.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/cnd >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/cnd$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	fperms 755 bin/dorun.sh
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/cnd
+}

diff --git a/dev-java/netbeans-dlight/ChangeLog b/dev-java/netbeans-dlight/ChangeLog
index 6bb71ca..fe61984 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_p20150610 (10 Jun 2015)
+
+  10 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-dlight-9999_p20150610.ebuild:
+  bumped to the latest sources
+
 *netbeans-dlight-9999_p20150609 (09 Jun 2015)
 
   09 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 95fc7ff..bbbaeaf 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123
 DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9aea7ed9f8b11cbdcca02d11fc314c4ec32c015cbd605344644 SHA512 c69868f00a50d9d0f1744137a66c4944330d4c0f7a7b58f13d3e7c72fbd7d31fbe97d3d98cbb4011e4ddf5eaf637991d7a4fe1d32fb98a0627ed28012ebdafaa WHIRLPOOL 89e0b90e509f4771366e6baddb861f4c922f9d5f8f0c5561fcb89e78466cfba40e2d657743ed142d12e7778a796ce049a03703d661660a1d540ceb4798e51b61
 DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 DIST netbeans-trunk-nightly-201506090001-src.zip 207886954 SHA256 ae0945f940a854d3314f1be40e4f915788eaa7902a71ca7ca645456236230f71 SHA512 61b3be2bba95f4a08ed4fa340d441c3f01ac9de230c8125b94a61adb47b0c09e312e0c75eba3ff4eb446468d00982edf66b7fa709263f50cae6690da85d9ac66 WHIRLPOOL 16a5f826bfafcf74c32fa3e6620825fb0287b904d9cc9ad76aa24001731c83029d641ec658559d6ad479b1169e49512906e5aa2c8df806d6e695da6af41f141f
+DIST netbeans-trunk-nightly-201506100001-src.zip 207888598 SHA256 ffbd120304de4f26f654fb22f4eb73ab9778b7795204002270a69eef6be1ab55 SHA512 c238bbc661698ca4b143aec8677f64a26191703175f1096d4e662e533e59dc13f08ef85d81e70e2ee104563cde8b026befb192b660604230cd53ac4cc23a2c9c WHIRLPOOL f8682cb4006efebe7f1a750a6a76734e95e4ceb5529b3cd47c01b6ffd4e4d3594e25a043ed8b21d510655192f85f88dbaefe85fcbe4d42e5123bda3c81c7ecf7
 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
@@ -66,5 +67,6 @@ EBUILD netbeans-dlight-9999_p20150603.ebuild 2995 SHA256 caf277e178601f479bccf28
 EBUILD netbeans-dlight-9999_p20150604.ebuild 2995 SHA256 3a0be776b2ece68eb4ba8893d8ad94737e7828e72fc001d406249abae27b8921 SHA512 4ca4055e56ec4e886f1f1c5855629c4173089d48d8a3e41e9f35bdca06b5945580fd694817ec621e3c252ca6079dd2fd27da84d07fb5c3cbe4de1f487ea60051 WHIRLPOOL bfdaa2e3c28554494b05e3380d8d5dffc40b301217e44b752d407361bdce0ef320baaf0a2d0ffd1975c4bbc5be223afb0199ce4af1bc6dc8d6dcf32d5521e61e
 EBUILD netbeans-dlight-9999_p20150608.ebuild 2995 SHA256 bde2ecb345e5605601a5dbf2f00c4ecbe9e63b6e76db811e258b014e3fe6a6a1 SHA512 41ed62a733ae786f500143ebe73a771219dbb666b019b46b370b046bd816d7dc3ceb7ca76c42fb506c0797cd36473d034dfcaf349184def301c2efb4edff7758 WHIRLPOOL d871dca265829ebc97a4a129bf6c64d03a0c79cfa3181615f9e49721b18edd9a83b6db5994612b1e1a23154651013bdaa3199a8779492aae30153790457fe028
 EBUILD netbeans-dlight-9999_p20150609.ebuild 2995 SHA256 f9b4cda2bf9ce9435839986fe26263464ab99f552dbb62313920bb239bcd75be SHA512 7cf4217786bcd3320634329218b0225847a8871a0ce44d9b9be621be76b54dcf7fcc151f784d6bfd0d384f0353f839c6819ad41b09e06764ceb2e70a179ce18b WHIRLPOOL 26c9cb420e29e9f4480f8884ea8fb44c7742d11255751ac6fa19a8d8b42b84f918739957ae370173710761e593573b504b4cc6cfffa4874aa11331b54973f4ac
-MISC ChangeLog 166615 SHA256 95c007088d8907a6ee47a020cffac557f543c412f0f104974c21fcaf02d0b1d4 SHA512 33d6094a6619525f9f43d6d1cc19c6030023331c7de292e563ca5ba8a3e098f84d3276d4e8cab6ddc930e3c3a7c2550388feab09e51c412ca360da4dc6b052b8 WHIRLPOOL 1220a86a4be1ccaa1b49213ce37eac2280430a759ce8ecb2ceec0ee6dee90c84ae1ce615cd82acff33902aea6ab8995e401de6b1104cfac5e7f094884077fe76
+EBUILD netbeans-dlight-9999_p20150610.ebuild 2995 SHA256 1d7eb32911c50b1bfd6157c6a88a43474c2df88a8644ab4fc767687176c78683 SHA512 9afb018098d5516bc3f8bb56b7d33a3179c697d6c32a14aae088261e612b04bb3c7e3c135f4eb423790532caa18968677fd8a3f2eafe0cc224a87a783e974662 WHIRLPOOL 180ddaa5a280ee97341810ba37481c0116f162993fa779b87ade47935a90386ac3a15312896656af079acc942350eb1f2985c6dc8806eb16e466592627ea3c49
+MISC ChangeLog 166788 SHA256 ca57cc0b077eb8e0b5417d43fc1a088d69ef85c12681bb566894990c6c6b81ce SHA512 6d3adf6e2735a39fc4c2ebd8df72562ca1505e080e3687f710c349fed6ace61b203c06474a8463301b6b253b13d0d37e8eb55c97c451ee9dbc0009d918ca0e2c WHIRLPOOL 1091a162ac31b7baedef8348fb36cc9a460520aba1b99ad6f592d8d94735acf50285266366a97baf44c95965aba080292c040c6698170981bffab1643bd53d3c
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150610.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150610.ebuild
new file mode 100644
index 0000000..e3fa267
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150610.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-10_00-01-56/zip/netbeans-trunk-nightly-201506100001-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 c13868a..1843414 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_p20150610 (10 Jun 2015)
+
+  10 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-enterprise-9999_p20150610.ebuild:
+  bumped to the latest sources
+
 *netbeans-enterprise-9999_p20150609 (09 Jun 2015)
 
   09 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 7c01be2..b8d3376 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -122,6 +122,7 @@ DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123
 DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9aea7ed9f8b11cbdcca02d11fc314c4ec32c015cbd605344644 SHA512 c69868f00a50d9d0f1744137a66c4944330d4c0f7a7b58f13d3e7c72fbd7d31fbe97d3d98cbb4011e4ddf5eaf637991d7a4fe1d32fb98a0627ed28012ebdafaa WHIRLPOOL 89e0b90e509f4771366e6baddb861f4c922f9d5f8f0c5561fcb89e78466cfba40e2d657743ed142d12e7778a796ce049a03703d661660a1d540ceb4798e51b61
 DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 DIST netbeans-trunk-nightly-201506090001-src.zip 207886954 SHA256 ae0945f940a854d3314f1be40e4f915788eaa7902a71ca7ca645456236230f71 SHA512 61b3be2bba95f4a08ed4fa340d441c3f01ac9de230c8125b94a61adb47b0c09e312e0c75eba3ff4eb446468d00982edf66b7fa709263f50cae6690da85d9ac66 WHIRLPOOL 16a5f826bfafcf74c32fa3e6620825fb0287b904d9cc9ad76aa24001731c83029d641ec658559d6ad479b1169e49512906e5aa2c8df806d6e695da6af41f141f
+DIST netbeans-trunk-nightly-201506100001-src.zip 207888598 SHA256 ffbd120304de4f26f654fb22f4eb73ab9778b7795204002270a69eef6be1ab55 SHA512 c238bbc661698ca4b143aec8677f64a26191703175f1096d4e662e533e59dc13f08ef85d81e70e2ee104563cde8b026befb192b660604230cd53ac4cc23a2c9c WHIRLPOOL f8682cb4006efebe7f1a750a6a76734e95e4ceb5529b3cd47c01b6ffd4e4d3594e25a043ed8b21d510655192f85f88dbaefe85fcbe4d42e5123bda3c81c7ecf7
 EBUILD netbeans-enterprise-7.0.1.ebuild 16338 SHA256 03ea08daaf5d4c5592937929bac33b4af3bac00a23f2167a7ef7b3c172a72abe SHA512 4d24162c7920b9a1c65e6c6753900ead387a4941c2db98b522631bb09889c281bce048a74e2e584f8b5732cfaad1d7125e0cfd37aa2dc81fe85160b0e123ccd8 WHIRLPOOL 35eb648c37cb6e59aca7969c1074c2c280814529aa7ec3c3191b0d3f2a92fa24e1a8d981f343e4217fff52f6100b4884b970df734c45145759889aa6e6661ff2
 EBUILD netbeans-enterprise-7.1.2.ebuild 18060 SHA256 f63721b8ce5e1afbc58f783348f66f1e3501be519a1c9c1287ef860acc64ceda SHA512 2ca89ec8f89f106a284136d4d0ed52fe3bcf49c650d56ded6e62306c531e5e41f62b8aa923cb544842cf6e34e5f433fecb278bc1515abac987e2d00fb68ffa26 WHIRLPOOL 879067d72285aa6c7273e84ddc3dfef7d09c7cb9f9a6c279fddfbd3eea6439dea053d3c648fcd56d47ef2292db14d101307eb1aa8b3081dfcdbc3dac4d0c3ed9
 EBUILD netbeans-enterprise-7.2.ebuild 17752 SHA256 2f46916df731fe33c5d4626ae580a77686c392932a3388f755324bc3184bd636 SHA512 3543d033b971108fa2b8e6633ed640e812a83b34807e1cb5a69d425823d1fec1c13ecba3cc36fa4504fbfd6297e7eff1ecabe07d01725d9f13c99ffd70d220ba WHIRLPOOL 512753153bbf714ae3fbf9c580f350234d88bd5ce5690e7bc0fadd1c355bd38c2a5c1e9adb7993c3678d759661bbfb1654b0630e3535a2fb9198742fa7fd2c1e
@@ -149,5 +150,6 @@ EBUILD netbeans-enterprise-9999_p20150603.ebuild 15937 SHA256 4e53d7ec87269d1bbf
 EBUILD netbeans-enterprise-9999_p20150604.ebuild 15937 SHA256 ab4c0ed4122c716ce905cbef27202e94e374ffa2681c1bac87557fe3c202e2e2 SHA512 22977c337c6d49fbe1c654ddcddba09f93ef6b8a79498124bec25677b899a5193003ba32c20079d84384bb04fdcb3299d37bc800e3a930402b069ff3d9be1946 WHIRLPOOL e058ddc7c230bb5288ee04ed85494cc1f0c4d75f295fb79e7b31bbf245174d4dde87e303d658cb93986337244d7c70a69004ab23698bc8471214d61616c42825
 EBUILD netbeans-enterprise-9999_p20150608.ebuild 15937 SHA256 8c499723bc3c267164ec7518d5628de6e2f3b46af3af2ec02ac504d543e16f60 SHA512 b52a744aad67643bbb01824322bda14914f1f8c025b5699109a00b7fe5679c3fd3d5ac16e03285cf08968671faf3e2b5d3430177ae08dbd496938b596d71c80d WHIRLPOOL 470a27b88c68f8d4e1e7b2ce324e3676ea8f571861579ab4a02d811c909aee735dd884e1cb684b26596f7b758690dc613db3fd3ef90e92a6f11c98617d720086
 EBUILD netbeans-enterprise-9999_p20150609.ebuild 15937 SHA256 6fa51d9104b26a97da9a4465b05a7e41d01ea8c0f948a9e1d65018afd3a09b40 SHA512 c2d102270178d8847c84d524139ada2cf1507a06d0a6c9e73e51708431303ffed64fc3120c1325ade03cb95684f0b808dc97c45712070f7178bc19c3c0d54129 WHIRLPOOL 3e141d35ffac1edf8243f9c8778319d58a5a3acc732807628111877f79ac2575293869995a209444d90b0f7833b21d65e0e8146d7248e9982bbebcb115afd778
-MISC ChangeLog 175435 SHA256 13ef810a159627310152e2a2296aa6fa986218f882cfedead40fefee2fc18c19 SHA512 0410533927a972bee201b97c5d3a1091b85375c8e82d0f99b010cec89585ea24121e904c30f77ea4306915a06a60da21a2206c930f6a313551b29fb23b990bca WHIRLPOOL 17b6bdaee4f5b83b56588f41e107a8441d08c2936302a5c735cde994bf661e39b510732b117a6508e91ff3a360151551db943c2db257b0a5e1afca02e3155d15
+EBUILD netbeans-enterprise-9999_p20150610.ebuild 15937 SHA256 f5a66cb22da8ff8e49c2fe5751e82bc07564a363f8303d525497253c66aa749b SHA512 4136b70f60b528270b6b28a2ce5ee68659ce0d85fb30bf7c6c1d395ff7116e890d5ce355357ed4b033687ced3ef141577dac97e00c34373e4db57ab78752fec6 WHIRLPOOL 395b26b01b770d76374c7e83ea927c8f7e33b30fdd8fea64015bf27a27a3210d4cce859787680494f39993abb08547a5de9de8415624791b26cc573006cff62c
+MISC ChangeLog 175616 SHA256 f502e135a0da616dc84b55ef28ee7f8b9cef01649375b0c42f50182974302d65 SHA512 fba3bbda7ae36ae461037070124dd4fa38851be6f007014aaf11940ba434dca53f3c116c6fb6563e1d45b3606e39b39cc67b4391c071ba3190f4d81297b66240 WHIRLPOOL babdc79940fbc26fffae539f6d6786a0eb67132bf5e74b0134235adb3647c9d6bed086ba3493c5421844c891728342cf23b08b8d95031bbd8c320dc7ec1e7ede
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150610.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150610.ebuild
new file mode 100644
index 0000000..f3eda90
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150610.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-10_00-01-56/zip/netbeans-trunk-nightly-201506100001-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 dcd17ca..431c476 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_p20150610 (10 Jun 2015)
+
+  10 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ergonomics-9999_p20150610.ebuild:
+  bumped to the latest sources
+
 *netbeans-ergonomics-9999_p20150609 (09 Jun 2015)
 
   09 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index f74050b..9b27495 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123
 DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9aea7ed9f8b11cbdcca02d11fc314c4ec32c015cbd605344644 SHA512 c69868f00a50d9d0f1744137a66c4944330d4c0f7a7b58f13d3e7c72fbd7d31fbe97d3d98cbb4011e4ddf5eaf637991d7a4fe1d32fb98a0627ed28012ebdafaa WHIRLPOOL 89e0b90e509f4771366e6baddb861f4c922f9d5f8f0c5561fcb89e78466cfba40e2d657743ed142d12e7778a796ce049a03703d661660a1d540ceb4798e51b61
 DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 DIST netbeans-trunk-nightly-201506090001-src.zip 207886954 SHA256 ae0945f940a854d3314f1be40e4f915788eaa7902a71ca7ca645456236230f71 SHA512 61b3be2bba95f4a08ed4fa340d441c3f01ac9de230c8125b94a61adb47b0c09e312e0c75eba3ff4eb446468d00982edf66b7fa709263f50cae6690da85d9ac66 WHIRLPOOL 16a5f826bfafcf74c32fa3e6620825fb0287b904d9cc9ad76aa24001731c83029d641ec658559d6ad479b1169e49512906e5aa2c8df806d6e695da6af41f141f
+DIST netbeans-trunk-nightly-201506100001-src.zip 207888598 SHA256 ffbd120304de4f26f654fb22f4eb73ab9778b7795204002270a69eef6be1ab55 SHA512 c238bbc661698ca4b143aec8677f64a26191703175f1096d4e662e533e59dc13f08ef85d81e70e2ee104563cde8b026befb192b660604230cd53ac4cc23a2c9c WHIRLPOOL f8682cb4006efebe7f1a750a6a76734e95e4ceb5529b3cd47c01b6ffd4e4d3594e25a043ed8b21d510655192f85f88dbaefe85fcbe4d42e5123bda3c81c7ecf7
 EBUILD netbeans-ergonomics-7.0.1.ebuild 2884 SHA256 e8e4a785fc11b6d0d3c722826761581b8c9c779c5460dc7d1487b3154f4402ab SHA512 3ba2810e650726f48fbdb1bc0c58b6ee1e7d9d29d4be3b27c00bc981b773f26d979fd90154184276e044eafd1d4d8940b47d6f0f58589f9cff7fbadef5fbb05f WHIRLPOOL 5fab7fe6492f91bd0e97a8a95c0652266d771e9b60957e16ce6ff683c1e38081372151cd8c7bea44ee1f1dd7bf435f8b00b9a1a23e4c6106c990794c6093ba10
 EBUILD netbeans-ergonomics-7.1.2.ebuild 2893 SHA256 cd56250980429160b8fa9deb17f15050d016394d5fdef19bf772cf29988c86d8 SHA512 32d4556218791a32efb8cf8ec8303f7e8f27bfb03b97af0c66cee717563c7e02fcd9e350b0425ec0cec28ab09865d4815aba1471ee958e05e7c42e421a7f71c2 WHIRLPOOL 318c8528c2338c1e2f6e342c263be52753fa74c9ac934b0ee60fe0fff2146e86d1761fef8eaeca8eab844709bea2196fbe181fad1f689a9d5b9994da3271b4db
 EBUILD netbeans-ergonomics-7.2.ebuild 2876 SHA256 ca7184ac24c255941c4ec3e686c4237ef0af4be7242c44417fa799813083515e SHA512 c6537bedf2fed4ea914c74a208124fe692af837ab2c81c98b8aa0347cb9d5af496378a8c042437facced26d3b42b101225dfa8b81dfc3d6ec4e3e5613e359f72 WHIRLPOOL c7e4c08ace118690f454dbf6a9040bff3e7013c646947fd02b05bca2b4d802393b6eca3234c6228f8e4df4da1ed193ecfd93c848038e4dd9ae3f50959692aa15
@@ -60,5 +61,6 @@ EBUILD netbeans-ergonomics-9999_p20150603.ebuild 2919 SHA256 950daf3955de8b4f620
 EBUILD netbeans-ergonomics-9999_p20150604.ebuild 2919 SHA256 6177e568d9df40438bec28e03fe46461667f51c65086fc05f09daa85950654f0 SHA512 500f6bfc1d5e0ab46c9d89a93082226b345184f46863c793ad0fab680c07e4d244acb5e0e7acb92843fe0f228911187f716bdcb8489c1047ed955bcd8573c7e3 WHIRLPOOL 023626b58ac67751154c3001989c0a299c8700dc32f179707376f3b94066e31fda5a4e4af3b527a3721b23396a833d684ac435c62d9889f73c95005507526724
 EBUILD netbeans-ergonomics-9999_p20150608.ebuild 2919 SHA256 1732a4ca82269658893854f737c811c770c6a91663ef365c7416765e29e65846 SHA512 0e73873948418205860e8def34a9ed4c61036a2cd2492f6f19bb084d249f4152a471c12cf309743c7713c72a7511eb7f6443ecea0e2fbd99abdea95c0d35a8a0 WHIRLPOOL 7df46b5b4ed3904bc5abd55a53f7f68197b0397269170a6a6a58307fcc86e000982a89d31115432b69dd823c5f8badb1992ee976b08b7d8b4169eef47d2b6987
 EBUILD netbeans-ergonomics-9999_p20150609.ebuild 2919 SHA256 18bffba43421353a6081d94d3a78d363b7f9170bc929295a6bbbf73a6d71a957 SHA512 ec482920aa85a28e98208073f5c01ca7eb762e226d0a5e7e3e94dc289fc116ca323787863cc7bcf469880310a2d4879fc5aec129353ecebd2546e665ee93f983 WHIRLPOOL c07489d3ae3086888a23b89ad8447ebe7da53cd3e45aa160fae3d3fd7327e5bd235495d446d437acc04b046d3b9f1ecb7fdab00e9bb47074ad661e8f461d2ca2
-MISC ChangeLog 174910 SHA256 9b8139f0589dbfe794a9d748dcc9a64ac8c23edef697765b5e5279f1a8358305 SHA512 173c6fc06b597fdfc2a4b8bc738c8b0a92846f572a9280e028d558926023465e182732edcc3ac39596ce3193298f141bb8b58a27ee83de0796b9f7a0d317d5e7 WHIRLPOOL 338b8847fc4827884ff8348c9121bd17c9fa14bef8479e6d95b24f8f2dc9eea3cd3059cc2969fb749a32f58baf6fda08d4820c286d7b3ddfa0142972d28e2785
+EBUILD netbeans-ergonomics-9999_p20150610.ebuild 2919 SHA256 0c9413d27db22170d596c8273baa862ddcbd5b77889c0d60ac1597ccedc0e763 SHA512 5b2c7a23a37963efd8c93264d3b31daa9925cd3708336c25bae10e05de802fb951e3bb4bf5e12ad5787d09f08219994ad42e301ca19e65d06edaa3172635045a WHIRLPOOL 434dfd660c9414e4ab5f486ebf2c1cea577022f06cf6588b27a6f31d987a690758d9f6a785e4082c670b49629aa9a8dba5eebe8bd0d47d31afbcc3f4a9343b08
+MISC ChangeLog 175091 SHA256 2094a850a6e649e2fab62332d9354b28f34c4d05657e6ad466e7cbaf967d308d SHA512 3f817999e92b4c492316054699efcc5bee33f19d14950b332da5b89c6dceb5584701d2c181005b2f06f9f5808492ec557214651c9e0c1e7e0f4427915d863c56 WHIRLPOOL ac591dc671ef0996414348b768ad8cb4a1ad50295cba214ff41026472f70b2001d126837dc6d86b04193991f87a0cee18f4d64d502ffa17c3edd18811b4f1c79
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150610.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150610.ebuild
new file mode 100644
index 0000000..0b54b6d
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150610.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-10_00-01-56/zip/netbeans-trunk-nightly-201506100001-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 9a3dc71..90b57d2 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_p20150610 (10 Jun 2015)
+
+  10 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-extide-9999_p20150610.ebuild:
+  bumped to the latest sources
+
 *netbeans-extide-9999_p20150609 (09 Jun 2015)
 
   09 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index a72ef85..4206036 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123
 DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9aea7ed9f8b11cbdcca02d11fc314c4ec32c015cbd605344644 SHA512 c69868f00a50d9d0f1744137a66c4944330d4c0f7a7b58f13d3e7c72fbd7d31fbe97d3d98cbb4011e4ddf5eaf637991d7a4fe1d32fb98a0627ed28012ebdafaa WHIRLPOOL 89e0b90e509f4771366e6baddb861f4c922f9d5f8f0c5561fcb89e78466cfba40e2d657743ed142d12e7778a796ce049a03703d661660a1d540ceb4798e51b61
 DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 DIST netbeans-trunk-nightly-201506090001-src.zip 207886954 SHA256 ae0945f940a854d3314f1be40e4f915788eaa7902a71ca7ca645456236230f71 SHA512 61b3be2bba95f4a08ed4fa340d441c3f01ac9de230c8125b94a61adb47b0c09e312e0c75eba3ff4eb446468d00982edf66b7fa709263f50cae6690da85d9ac66 WHIRLPOOL 16a5f826bfafcf74c32fa3e6620825fb0287b904d9cc9ad76aa24001731c83029d641ec658559d6ad479b1169e49512906e5aa2c8df806d6e695da6af41f141f
+DIST netbeans-trunk-nightly-201506100001-src.zip 207888598 SHA256 ffbd120304de4f26f654fb22f4eb73ab9778b7795204002270a69eef6be1ab55 SHA512 c238bbc661698ca4b143aec8677f64a26191703175f1096d4e662e533e59dc13f08ef85d81e70e2ee104563cde8b026befb192b660604230cd53ac4cc23a2c9c WHIRLPOOL f8682cb4006efebe7f1a750a6a76734e95e4ceb5529b3cd47c01b6ffd4e4d3594e25a043ed8b21d510655192f85f88dbaefe85fcbe4d42e5123bda3c81c7ecf7
 EBUILD netbeans-extide-7.4.ebuild 3311 SHA256 8585e0b9eac3b9bb35d5b5e0152936f84708a824d76831930a3dfd3d196556b0 SHA512 19eceec7a634923b4712eb277a1ff9900a2eb4d9ac0a2c699175333c263f0c02baaf24eb30bd7919444f5c9df751186689b2d4359ca1c88dca02884d7c18c3cd WHIRLPOOL e64509f198c4d09851f98d5bd2ddd5b469b0a7c0f3122f391c17833e5d6d77b7a6c2fd9e942e34f2df42047504ad40593f97af9b2898450e769c7b012355c316
 EBUILD netbeans-extide-8.0.2.ebuild 3313 SHA256 d147df43b8e55de81e0429604a2497a82861864ae50fbb85368a3070e1c266c9 SHA512 8f2722ce12c1582ca6e9ed348fcb37b9969585037b5432e592e5dd6ef4b3e49c58783da5fe20f088bee07514e3b42de7aa36607900b285c32c4b91fa218df90c WHIRLPOOL 0fb074484787a5e0e688dc734efe027ff6dfd082dd63bc9bccc612f915fbbe33a4f93db6c43d345abc9c191e22ec196aada1e889d1240968916d54c69497a2d6
 EBUILD netbeans-extide-8.0.ebuild 3305 SHA256 b2d57e2e2d92760ead3d383fe4dd5b4fb9fc2807a9b58c6f40b44fc24072b8bb SHA512 6e7f12758188a564ef6b5cf8b0ffdf79e30d1021172d10f215d04e727bc4001e4385fd0961a26a6bb42638089e0919b1d4628a13ba11a3deac94d4693c7210d5 WHIRLPOOL adac8461de43669b7bb98ea8920c0a2944837211a37503b957221149d4b91c4bd92b6db160191990b838c474495c65f62c8a4bb9fdbcaa371b4648a335b1afa9
@@ -54,5 +55,6 @@ EBUILD netbeans-extide-9999_p20150603.ebuild 3383 SHA256 d687a3adef11e7c36d9befb
 EBUILD netbeans-extide-9999_p20150604.ebuild 3383 SHA256 9c193b2bdb3db4adb09513efce27b3b941a432ee065e24b46d43ff49b8aa59a8 SHA512 bff6dadca8d70c44e592b883163be9df4f23a26c8278b463071bc03b45b746393efe2eb52e281589ff87256b9f82aab342d1bf7b09f212432c4d04de66c90b36 WHIRLPOOL cb46c881573d755d1733fbebd45196f01a4f473a2a943b579fe1abec578ba57810bc00029ac3826b87a365b572adc856e18c708c960a975b348011dd84f7719f
 EBUILD netbeans-extide-9999_p20150608.ebuild 3383 SHA256 dab40ad3b573060f0ff43d3f08e277f5dbc73f96d80890d7ed0f6a9ca6977e0c SHA512 e7079c349865d0174cdedc409eedfd8cd10591b35dac57782944b90c6a3f628d9f33e3aebd5544d2e5d3b053663f3fc84b7634474df7425998a99788b410b135 WHIRLPOOL 9e1d47f29d8d9b5d1068c539d02df1366885155ecce34de64c60a82b59c5d30e51b07bf6ae7e064c9dfa5b762259134624b0d50cedee4806772e30f0e97b202e
 EBUILD netbeans-extide-9999_p20150609.ebuild 3383 SHA256 94014522db266e45d9a7be7afe3993a8480d8706247d9a3b197601e31b44e5ee SHA512 de972db50a141a58eeb9b51d69705e6bbdf9c5737d05bbca450c347398874e4f62d99903ef1e59796f636e9aaa95ba354c30ed410cc28d2ac3201fd75ec1fe03 WHIRLPOOL 205d3a9fa443268066ac6f33aa1c30fd9503505454e22a9ea1935f141c8ef25f32a0e5729323afdfccb3f47d15811846ce17548e0044f9f3fe95192bd603c553
-MISC ChangeLog 98525 SHA256 f733ea0a7b2404aeec702226809cbbb9633a76a842fbccec006aeb3b2ef0817d SHA512 7de505fce782ea1ff216c63e9e7a0bd49c5a1968c3870b0bb230b68d6831e32b1928dc42bdf6685903725fae39c15265a95e66b48b8e56aaf87badda8a7c416b WHIRLPOOL e0c07a940c7b0d3d5a5893cf6a9cdbeb4d293914cdb13dbdc424703bb695ef39f1e1d32a3533d8cf042f137419e899f2d59bf21680d11e908e9b4cd88073b52f
+EBUILD netbeans-extide-9999_p20150610.ebuild 3383 SHA256 3f718eccf59ca8645ece6414ff50c6423c8ef814d785fd2db5a0a59a7496b3d1 SHA512 728a988e2db3d7c0a68ee682c9257e375ce4eccdab60f8875d1ee00d37061cf8ab8dfcec05950327593bc6041c8fb7965ad02000c0d6bca29d71772c5b983a63 WHIRLPOOL c525f912670927cdcb3083be622ec61c26de2b4b2309b573f3f77d3e99c7c9ce2404b4d9e759228a1a27ae1167debf52fe6ad7acd8470b64fea70ae909124516
+MISC ChangeLog 98698 SHA256 51926a27dc605acac4347714b6004fa677fc5e8b4a97cccb64a2086d1d8a7bc5 SHA512 3314ca3edb6fddcb63dea90aed2d26179eac6ce198961c9a6b7687e143420713d89e1ea4dd041c53781e635ef53539bcb178ad341b9f17db37daafeedd5c7c0a WHIRLPOOL 5622291443556c65257e8e45d3d23e7197f0a7234b362d633f5a1e1d8dd8c36107e8ccefbeffc083283dc1a9462208dafd20a6e3be19fd4d484ec91cd3f55c61
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20150610.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20150610.ebuild
new file mode 100644
index 0000000..f90aaa1
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20150610.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-10_00-01-56/zip/netbeans-trunk-nightly-201506100001-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 7a83150..7d19685 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_p20150610 (10 Jun 2015)
+
+  10 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-groovy-9999_p20150610.ebuild:
+  bumped to the latest sources
+
 *netbeans-groovy-9999_p20150609 (09 Jun 2015)
 
   09 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index f6b2d5a..a0d209e 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -37,6 +37,7 @@ DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123
 DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9aea7ed9f8b11cbdcca02d11fc314c4ec32c015cbd605344644 SHA512 c69868f00a50d9d0f1744137a66c4944330d4c0f7a7b58f13d3e7c72fbd7d31fbe97d3d98cbb4011e4ddf5eaf637991d7a4fe1d32fb98a0627ed28012ebdafaa WHIRLPOOL 89e0b90e509f4771366e6baddb861f4c922f9d5f8f0c5561fcb89e78466cfba40e2d657743ed142d12e7778a796ce049a03703d661660a1d540ceb4798e51b61
 DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 DIST netbeans-trunk-nightly-201506090001-src.zip 207886954 SHA256 ae0945f940a854d3314f1be40e4f915788eaa7902a71ca7ca645456236230f71 SHA512 61b3be2bba95f4a08ed4fa340d441c3f01ac9de230c8125b94a61adb47b0c09e312e0c75eba3ff4eb446468d00982edf66b7fa709263f50cae6690da85d9ac66 WHIRLPOOL 16a5f826bfafcf74c32fa3e6620825fb0287b904d9cc9ad76aa24001731c83029d641ec658559d6ad479b1169e49512906e5aa2c8df806d6e695da6af41f141f
+DIST netbeans-trunk-nightly-201506100001-src.zip 207888598 SHA256 ffbd120304de4f26f654fb22f4eb73ab9778b7795204002270a69eef6be1ab55 SHA512 c238bbc661698ca4b143aec8677f64a26191703175f1096d4e662e533e59dc13f08ef85d81e70e2ee104563cde8b026befb192b660604230cd53ac4cc23a2c9c WHIRLPOOL f8682cb4006efebe7f1a750a6a76734e95e4ceb5529b3cd47c01b6ffd4e4d3594e25a043ed8b21d510655192f85f88dbaefe85fcbe4d42e5123bda3c81c7ecf7
 EBUILD netbeans-groovy-7.0.1.ebuild 3296 SHA256 29c3d304eca5999e78550fd715dbcbef9d15639d4e4f17fa0e45a46803080729 SHA512 43a0ddb43354bb3c0b8e29004ab547da508662d037b0006dfd24250c49470ddc0384bfffb6423f1e3eeaca98410c5de8b314a69970189306869a16380ab098a1 WHIRLPOOL bf626cecf6dec0c51e7e0b95ac4ff26a795e44a5dabd25719eeb2244742d96d33cb20ebbd9a68728dc27d28b8e558a7e2a3ee318c2e4fde234e0b5e8d32e6a58
 EBUILD netbeans-groovy-7.1.2.ebuild 3305 SHA256 1e00f335b8cc1e90deec3c3251629ba699286b25be5b6945d135d271004dc34b SHA512 3a1d67d02054478ed15e11789292fcce3fcfd343b8feebde5e07a9463c380c644310603a3f9f984e8071b0b097075809dce423b888e1f2aed316cb90a562d20e WHIRLPOOL a790c1e186c4d1949de6b4dd975b929c132e3e7b7c455c7867bd1445f59fb6ace72b5c9adf09d0c6079718fdc6c34a0c5f0c9c437517b55b7ae109ce3e20b064
 EBUILD netbeans-groovy-7.2.ebuild 3160 SHA256 6d709b7cc07d7ebb59c3ede0a19c9890ca3230144d7f455cf24d984ac2f633b0 SHA512 e30c8d58165b87a39a356f8b813c593910cd2c247de41420369fee21157c2f2881db34612711f77c9ecd9501aa6d7235ab7bc41d4092be1e68fab778c16d8288 WHIRLPOOL 4a6495ca077f3c374105b25698c8251aaa89daf56c2749bdc73867b0ea1ae404cfc7b2a8b435ef7b19f00aee8128be051c04d6a24fb631379fbe98d6854a507b
@@ -64,5 +65,6 @@ EBUILD netbeans-groovy-9999_p20150603.ebuild 3422 SHA256 7d272b5b2ada4a6f182d324
 EBUILD netbeans-groovy-9999_p20150604.ebuild 3422 SHA256 eca2cef95c98febc6b7e7e42b77e28b5cd6a7d2494f96d9ea784a2117fcd4263 SHA512 3f2aafc1099b05d3e89da14329947b78d94960e81f1d294552ab19814bb2dbc1ea38a2b5a90f74f8e74efb5bc5b424940bacfa84c18496dc32edf2ed41be90d7 WHIRLPOOL 0e198bdfa530da0be06c562b1c069937364c52866dcb1f4de89ac0ade2d51fce18d5f4bfd1fb1558db6e44fdd109a7aa042a8c52fa94c302ea3d4bd374f45be4
 EBUILD netbeans-groovy-9999_p20150608.ebuild 3422 SHA256 df8294d60d04b723c6e7456735c8ea473f6e2ed19f30ccee57024dc27673da98 SHA512 84f508d6e4c95ddecaf88dbd5530dd2d39d6f911aac92712fe46a85a2e1b9d4a0204225751367d9d0867170d8a726ff4e3766c651a756031d6bd2cae3de133fc WHIRLPOOL d27ae0caf732b7634ec350e1919018dd895ac2ef6c829fa43f1b7b3f4c5050773b5e32bd4eb1f9929b42cc0b1d0474e7d3e0418dda7aac680fe1afee010ab3f9
 EBUILD netbeans-groovy-9999_p20150609.ebuild 3422 SHA256 8fa59d6718ee79806c957035a537205f336be29e292641374cb545e0b83c4a1a SHA512 cc882741991d90e364e701cf40f65fa0babab8601d3453c7fbeb3948e08388b46d1e36ea55b7b66101a30553efc1d7f6b5b5173a37ff7c8a74bfbbc86d9320b0 WHIRLPOOL 9adc86583e53e965133ececa32bdf6a01c53f199c44be4cd17cc9fef45e0cda7c4a84801a026dd12cbf1b4dc161ae40d6469a9292c2daffde788037794bc23ab
-MISC ChangeLog 166505 SHA256 ac7a459f32944d550c79590755702719d1c594ce3ea92128594f3fb73d33d02a SHA512 b9f2b59e656fd91e53ecca204c7c93eebf892c03f858dbb0b07f9b1e0bebaf613d1c931eb7e0671d2f27453bb0b0b839da923e980cbca816c89f87e2004560f3 WHIRLPOOL 3cc2b16cd6c27671886811e33a7312e63710535b7b0c7df683c6929e244ccc5abb7c51c7760bc8d4769848178baa45207fd979864fa512fabe4e4f48005dbbba
+EBUILD netbeans-groovy-9999_p20150610.ebuild 3422 SHA256 6fb4076d1216094c25d2fc4c22aad35592797e700265d4664f384608966a883a SHA512 8c01cd8819a14b6c82b624180e9cf1eb66f78da37a2780d6d0988961dbcb3569a549d15c4822cebb0f982df4defa05525a41cc561b29d973b361aee8452b4557 WHIRLPOOL 7e583d2867f1f571dd8d87261e0401a46ee2762f22fbc777ced5eff67015ae73f749119541336846be9eb747e671511511dd06b7bf5bc021b05a234d7dd8942e
+MISC ChangeLog 166678 SHA256 de82018f0a4bc6b81f9f1b65439ab7d1e09b42cda2ed14398a17b2d6d281fcb0 SHA512 43f0d6d08388b4bbf0ad6f883a2d54511f30ed6591c987d2decbc2d715c02a0d1900e4adc0b74a73e29d85840998ba25120e017779b7009f1e88a40d6a820ba7 WHIRLPOOL e9f668c974b47e9f5f105cdbd9947d2f0d1eefb35e4e2748535dbcb057bacc28ab73b3e247ec89d44d094f9a49a616d466a3d70785a2ef5ecfb2a1e5e7dd70de
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150610.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150610.ebuild
new file mode 100644
index 0000000..e0769c1
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150610.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-10_00-01-56/zip/netbeans-trunk-nightly-201506100001-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 cc0e1cf..4e495c6 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_p20150610 (10 Jun 2015)
+
+  10 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-harness-9999_p20150610.ebuild:
+  bumped to the latest sources
+
 *netbeans-harness-9999_p20150609 (09 Jun 2015)
 
   09 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index d24b991..1f5cdca 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123
 DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9aea7ed9f8b11cbdcca02d11fc314c4ec32c015cbd605344644 SHA512 c69868f00a50d9d0f1744137a66c4944330d4c0f7a7b58f13d3e7c72fbd7d31fbe97d3d98cbb4011e4ddf5eaf637991d7a4fe1d32fb98a0627ed28012ebdafaa WHIRLPOOL 89e0b90e509f4771366e6baddb861f4c922f9d5f8f0c5561fcb89e78466cfba40e2d657743ed142d12e7778a796ce049a03703d661660a1d540ceb4798e51b61
 DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 DIST netbeans-trunk-nightly-201506090001-src.zip 207886954 SHA256 ae0945f940a854d3314f1be40e4f915788eaa7902a71ca7ca645456236230f71 SHA512 61b3be2bba95f4a08ed4fa340d441c3f01ac9de230c8125b94a61adb47b0c09e312e0c75eba3ff4eb446468d00982edf66b7fa709263f50cae6690da85d9ac66 WHIRLPOOL 16a5f826bfafcf74c32fa3e6620825fb0287b904d9cc9ad76aa24001731c83029d641ec658559d6ad479b1169e49512906e5aa2c8df806d6e695da6af41f141f
+DIST netbeans-trunk-nightly-201506100001-src.zip 207888598 SHA256 ffbd120304de4f26f654fb22f4eb73ab9778b7795204002270a69eef6be1ab55 SHA512 c238bbc661698ca4b143aec8677f64a26191703175f1096d4e662e533e59dc13f08ef85d81e70e2ee104563cde8b026befb192b660604230cd53ac4cc23a2c9c WHIRLPOOL f8682cb4006efebe7f1a750a6a76734e95e4ceb5529b3cd47c01b6ffd4e4d3594e25a043ed8b21d510655192f85f88dbaefe85fcbe4d42e5123bda3c81c7ecf7
 EBUILD netbeans-harness-7.0.1.ebuild 3579 SHA256 f4d09cb7bd5e8485caf75a3020ddb8102d3ea326878ac384ef4aecb011a1f6a5 SHA512 390c26b4a3dbc81ad1ef210b3ea668926398cb38ea13fa37dceb6782b4478b1ceb7a49e9db300f691fb8b31c21c56b25f4c3237c0890f0c637ca45f596c88294 WHIRLPOOL ae1e34af6dd61c30f645f39a825b6235e3eb1f9a42dd23431225513733209a2eb225a741b75342f827a4be0ffbf41b9786a6a6430051f543c321abe3c20da6bd
 EBUILD netbeans-harness-7.1.2.ebuild 3587 SHA256 e0adc470109009641bf48569623bf0fc51a400ac1ba686475c7dae1a5b561c96 SHA512 e4157a6b294c17fd7430802b33253d473120dc16173557e0d7840078f4043a383d5e3672af64f124509e54cc85d590abfa4375f181a32ab8b49e976cb6613cea WHIRLPOOL 423a5844a2c55ea99db4ac78e1c605a55a04f634601c0ac054e739c0ab4a3e9c765778dbd81ccf4a1e50e9d9e4cc29ecfad2ec64b483197927f434b67cd4d773
 EBUILD netbeans-harness-7.2.ebuild 3421 SHA256 47a5281d140b47e0235592c58657a9065d1827175ccca7d0c73fd81e90710090 SHA512 403fd1f49e11b27ef8002c4066fc911dbeadcccc7adddcdded86c6cd95e8bddaf0603c0ccafd0e91ef31a0909508deab1eb326e98e621bcbae7304413acca291 WHIRLPOOL fe3c5f95a606db39861a80201c185cb5a25e2d80698ac78ff724587b54e859f861b834b89aa79aac22f2c5da700532eaafae67fbcc33259ee07d578ba5c7f9ee
@@ -66,5 +67,6 @@ EBUILD netbeans-harness-9999_p20150603.ebuild 4131 SHA256 6d11bc06afc57c6907b454
 EBUILD netbeans-harness-9999_p20150604.ebuild 4131 SHA256 4a162eed1c989fb10d80782db1d9b749b5f3132431b8748728e242ed6d1c2ba9 SHA512 e6d028ff418894c3322238bf67439f05518dd3d50e81a4e4a3d75a15ce5883c6cc2da876e1a9bebbcade2f3f1f2ede69a32b1fcec15d250a68960f1d652f780d WHIRLPOOL 0c6f9ca16ce5a278ff0541eabe19ab5f2ad4950ec0450b7ef55854ace56d332e008b6ef6e316180a003527d1a219d324acf1f8887fd46540a2d93b1ff7f732f8
 EBUILD netbeans-harness-9999_p20150608.ebuild 4131 SHA256 47f82ea467f026ee9dad193e6db46c73ad4d86da7f7d9bc2c5671881455f5efa SHA512 109a1093fd112516ef2630e7e98241655d1a705825f32eb8539ad99a33ee6449cfbcca2cbb0b3fd0d619cc7309827ae6e45fe183f07d30a960cb42421648d8d2 WHIRLPOOL 5a1d9663383b976507dfb2fa05bfca35c0b0047c6e698cd81e9fdc3a70f1c18c107afe71ae3c98aee3b2506ee106dc6dbb960261dac36467201f031bfe3c5739
 EBUILD netbeans-harness-9999_p20150609.ebuild 4131 SHA256 1c129d94cc72654eb5d00c5ec2788ae8855595002c8d9840ede0288f35782342 SHA512 308589b57eb442110b81f5ddf3bb5139c52e92b6adcc7f410e40f745b6dea60ff0f53e08c6b56340a37111380f4da34887d2a924cd3fa36efbaaf3d158ffc9ec WHIRLPOOL 466f24097a2ed37a192714e4c9301e4fd05d28d6aa5963a18f12123268a3e9ac7732aee9d41d4cee3330598414e41821876a88ec31fa522844cbd35f2056f27b
-MISC ChangeLog 168635 SHA256 9774f75c32a818641ec07cded494a55ae87a0545c1e694ee23760c7d84934c92 SHA512 e639ec9551b6eb06e049bb2c0f8dcc964ed4786090f98c34284c6bcc68d7bb44413685effa507c1fad0c6fcd0779a9a643869479cc46caebfc45a694460636c7 WHIRLPOOL aeb70383341d21754a2fd75bab1264021435ab598cdc2dd3228ba83c3da8e1b7c5bd7083dd39f9be20654bc5942ef4efdc7b2d571ac2edfe5f3850d8d4125fc3
+EBUILD netbeans-harness-9999_p20150610.ebuild 4131 SHA256 7389bdc5b150ebf93af078b900e73be8f2a8aa57fa6775fed2c47df4dd33b375 SHA512 c0e9c7c596f5698e2a76af82c29bd281df82fe8af495f8fe86fec3d12b74e5deb74048fbd9e971fcaf1269886e27ba2d300cc363f2a37e123e497fed9afb8ea4 WHIRLPOOL 2468b748ec3ddc30b533eda9eec8d1475a511a8917cea4de7462ed2804f65025ec6faca63832e0f7f758f5b2e4770e3b115fda5d2eac2900769a99f1081fea03
+MISC ChangeLog 168810 SHA256 77fc12a728f5e06b78437a750ee9fa3e05935848e41bac0665605ace42f20dfe SHA512 a54cb236ce989b784e5e925d56e3ee2ef35b00fbb6c7ea58b7a1450c6b54f716ef9c4565665bded3daa90ac752c3cd274d75c307992f3023b6a3f37d0a8d85c3 WHIRLPOOL c0e13e40ec65de1e1b3b2ba1f0bf68a9eca46260c06fe359138328dc67b770b72863a0dea290ae2c9e334d8b8c765b54ada72f9030e3ccb062e68459dd9a2392
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20150610.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20150610.ebuild
new file mode 100644
index 0000000..de46e8a
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20150610.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-10_00-01-56/zip/netbeans-trunk-nightly-201506100001-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 58660a8..52074e3 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_p20150610 (10 Jun 2015)
+
+  10 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ide-9999_p20150610.ebuild:
+  bumped to the latest sources
+
 *netbeans-ide-9999_p20150609 (09 Jun 2015)
 
   09 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 0c2ea69..c12db2f 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -243,6 +243,7 @@ DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123
 DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9aea7ed9f8b11cbdcca02d11fc314c4ec32c015cbd605344644 SHA512 c69868f00a50d9d0f1744137a66c4944330d4c0f7a7b58f13d3e7c72fbd7d31fbe97d3d98cbb4011e4ddf5eaf637991d7a4fe1d32fb98a0627ed28012ebdafaa WHIRLPOOL 89e0b90e509f4771366e6baddb861f4c922f9d5f8f0c5561fcb89e78466cfba40e2d657743ed142d12e7778a796ce049a03703d661660a1d540ceb4798e51b61
 DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 DIST netbeans-trunk-nightly-201506090001-src.zip 207886954 SHA256 ae0945f940a854d3314f1be40e4f915788eaa7902a71ca7ca645456236230f71 SHA512 61b3be2bba95f4a08ed4fa340d441c3f01ac9de230c8125b94a61adb47b0c09e312e0c75eba3ff4eb446468d00982edf66b7fa709263f50cae6690da85d9ac66 WHIRLPOOL 16a5f826bfafcf74c32fa3e6620825fb0287b904d9cc9ad76aa24001731c83029d641ec658559d6ad479b1169e49512906e5aa2c8df806d6e695da6af41f141f
+DIST netbeans-trunk-nightly-201506100001-src.zip 207888598 SHA256 ffbd120304de4f26f654fb22f4eb73ab9778b7795204002270a69eef6be1ab55 SHA512 c238bbc661698ca4b143aec8677f64a26191703175f1096d4e662e533e59dc13f08ef85d81e70e2ee104563cde8b026befb192b660604230cd53ac4cc23a2c9c WHIRLPOOL f8682cb4006efebe7f1a750a6a76734e95e4ceb5529b3cd47c01b6ffd4e4d3594e25a043ed8b21d510655192f85f88dbaefe85fcbe4d42e5123bda3c81c7ecf7
 EBUILD netbeans-ide-7.0.1.ebuild 22653 SHA256 4c1b3e46e2a6cb89d902c7f4fe6ad9306cbd0c9463a514e87d4c6ec019dc0356 SHA512 5dd526a85a70720686c612efb3aa5602c395111d507b91ae4db04c5814b27bafd1480ab7e44e1148b7412f768543110ff58abdf676de303cd3be9d87b87bd373 WHIRLPOOL abaedc56df115c6050ad7824929ee959ba1669fc1f3f9d4cd1eb9f9f948a608828621f46aeedd0b6062c85b1ad4481d12f952a504559e52c110ff37b88ae0d72
 EBUILD netbeans-ide-7.1.2-r1.ebuild 26831 SHA256 2643a4435aa093e292a2728583d8ffbf213dac6a13dad8e47029ed13a2478493 SHA512 5ba14c7b820f2daae788588ae2fdebdc8af6bb870d6ed56adcc2d43810e5dbd2ea21ae639e6b864d6d0b1e69c9aa4f86dfb15e99eb4a170434aadf0109ad876a WHIRLPOOL c9367735f073f9fcf6bb992b6d481aaea1ebe8526907cb6366d432a3f47a0c4d76bc9224206e0e512708dfe896b465878a2a1ad68836c7cd9b51a3a4efa2aecc
 EBUILD netbeans-ide-7.1.2.ebuild 26834 SHA256 1e57e60a1a00b4530f917319b5d8eef915b9669b9dd3ab82b5afabe171d8959a SHA512 4242265c0783a87c028f955425c86596038aa477e3256ff8ba244220a573486bb7f2e47b07b3c94fbef07940a3b32c313a1320b58656a67cb15a490e7307b1ca WHIRLPOOL 1e23b1e4370292500f154527ecd7a0e7ca315ee73588806413f630355677ee8fe9318a0e672b5f6ad60f829c0a5579b37eedbd737bc8ec154aba9f59c53bd337
@@ -272,5 +273,6 @@ EBUILD netbeans-ide-9999_p20150603.ebuild 30352 SHA256 0e3da65867194e9ddfebfa794
 EBUILD netbeans-ide-9999_p20150604.ebuild 30352 SHA256 f987f4da5399cde056dc8f9496b25e010576f706e79d9aa8a5b2dbead5b1f4ad SHA512 0e57468c18790b8513dd8094dceccb2dde5a2c7e6254647d79950dc828704dd5dfb0ee6ea5b9e24c702d53d08e184a463c9e592bd54f11193caf2783385c7e13 WHIRLPOOL e691c15f9a427be7121cf3dfadba936efa146ddbcc2731834966cf8d6eb38b51fe81947cd64a6739129a9582138c036a5f6d4945ab4c7a21751ea43e59422bf5
 EBUILD netbeans-ide-9999_p20150608.ebuild 30352 SHA256 1dc75e6d3fc2e22ac46f455f4daeb43d6c73c51fb296460c22453ca2d080e81b SHA512 6226ffee5280fbaca45e2ced2a2aab08a5452ad133a883ed481150905a33432d7d92cb7f33b3ff6820348ad51e8c3ead253775a27111e8da78ae92aa20e32057 WHIRLPOOL 9f6e8c6d6f339cb1d63cef29ec6b6b41ae0b61939ed3a96de628ef063621308d2e390c56fb2f9fe89a3a64429a3ad3cc107e9daddce46a304a0e3f3e8680826b
 EBUILD netbeans-ide-9999_p20150609.ebuild 30352 SHA256 31d3b3930c1b4f9b992e033e3df394670e4b3443046bf22d778539622b98ab34 SHA512 d1ffff4e97ce3d48ac81c1e35321d82bb31b29058264f8d2277e8ff5451a9639010a263a6e79e0dd608b1c829f14a8a18d0f0afb5655f02dbebc1fd0a44ee053 WHIRLPOOL e06d8e8391357816bf096d93f04515d759094a90774d7cb81aa5d8741c02b31bfe381a4a8a1d017d6804272207b548bb6eca0a1b102495651cc1f12209c79eb0
-MISC ChangeLog 160545 SHA256 11a28e952603b0aad82144f1cda421db502d83c9ad9703a21e8e0ba0f69152d5 SHA512 64a81f4ccc1e65b3e90ffe59210e94755942888d045ea58b4f10dce195c3fca43968f46b549b14cc2a151411a586c9e86700e2112ec90786e8066906ea5ecc57 WHIRLPOOL 42ceb1024085f62df4bea60d9e3ef7d0a97da1253d824e2f8c14dd6d0daacb56c5ad2fb095635a211e50ce8a70d106b8d76095163ac13b2e1394635f1eab65fd
+EBUILD netbeans-ide-9999_p20150610.ebuild 30352 SHA256 699b09086b20442d7bc27fd4bbdb051e9ed56a06cb942cc0fdc6e7dd120515dd SHA512 907c7391471096cfe5fc526ae73a9e76243fe790de06ddcd3f3a677176ddcbef834b562f426f22cb22cdc48f3949da17e01c6c2322a7faae8c71a089677da098 WHIRLPOOL 665c281d6e9cfbbae89ca98a61edd4879b02d624f8181324acaf4b0aae28e86e15947b412337fcb83201a8cfabb81ab733a6566b0184ff5ba909f74bacde0c21
+MISC ChangeLog 160712 SHA256 bb1eb01e380afe142aae108b07f087a7753d63489cb00877e6c2168c59aa0db3 SHA512 57d0af4eb06712b877f13986c701de750c0aedc245c66af5892036081fcbda35aa5c85a99fb0145a1c8505fa2a545eaa6b7538b23017595844503f23d9135018 WHIRLPOOL 2d87ac41ef97503ff7f65d71a00126829f2a795c3dd7bb0c58ac0f9368842aa334f8a269bdb07802c8b8350baea3daf225f4742d7c6db08600c6f8a08c75f325
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20150610.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20150610.ebuild
new file mode 100644
index 0000000..1736c5e
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20150610.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-10_00-01-56/zip/netbeans-trunk-nightly-201506100001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
+	http://hg.netbeans.org/binaries/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar
+	http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
+	http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar
+	http://hg.netbeans.org/binaries/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar
+	http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip
+	http://hg.netbeans.org/binaries/53AFD6CAA1B476204557B0626E7D673FBD5D245C-css3-spec.zip
+	http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip
+	http://hg.netbeans.org/binaries/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip
+	http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar
+	http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
+	http://hg.netbeans.org/binaries/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar
+	http://hg.netbeans.org/binaries/4388C34B9F085A42FBEA06C5B00FDF0A251171EC-html5doc.zip
+	http://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar
+	http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar
+	http://hg.netbeans.org/binaries/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar
+	http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar
+	http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip
+	http://hg.netbeans.org/binaries/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar
+	http://hg.netbeans.org/binaries/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar
+	http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip
+	http://hg.netbeans.org/binaries/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar
+	http://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar
+	http://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar
+	http://hg.netbeans.org/binaries/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar
+	http://hg.netbeans.org/binaries/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar
+	http://hg.netbeans.org/binaries/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-js-corestubs.zip
+	http://hg.netbeans.org/binaries/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip
+	http://hg.netbeans.org/binaries/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip
+	http://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar
+	http://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar
+	http://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar
+	http://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar
+	http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
+	http://hg.netbeans.org/binaries/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar
+	http://hg.netbeans.org/binaries/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar
+	http://hg.netbeans.org/binaries/F27BF427BE72709F3094BF76ECA8C5A2B9AC6DA9-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar
+	http://hg.netbeans.org/binaries/9BC512C5BB9A9F5276B9E8672F6B30AD0BD97D88-org.eclipse.core.jobs-3.5.101_nosignature.jar
+	http://hg.netbeans.org/binaries/105DC9A1A93E6EA9A6CD368AD12897B1F247D6AE-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar
+	http://hg.netbeans.org/binaries/E99C3C29A90F8AB29078A38CF8EBC3860249640C-org.eclipse.core.runtime-3.7.0_nosignature.jar
+	http://hg.netbeans.org/binaries/84FC6D443CD0816FA87093B6B7AD6876ADFC4207-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar
+	http://hg.netbeans.org/binaries/74069BFD03B2C66A9EBB4370C0B8064E3F5B6594-org.eclipse.equinox.app-1.3.100_nosignature.jar
+	http://hg.netbeans.org/binaries/A7953EEE9D4D7CD896C7D0AD6D21902E6259979B-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar
+	http://hg.netbeans.org/binaries/3FB169C95F095B70F05B96BE9496DA63FAE7F707-org.eclipse.equinox.preferences-3.4.2_nosignature.jar
+	http://hg.netbeans.org/binaries/CD5919A707EB6B5C1FC29964C8EF5E2CF3F5A3D4-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar
+	http://hg.netbeans.org/binaries/A4634373DC60650C49CC98AEA2090889F7ADC68F-org.eclipse.equinox.security-1.1.1_nosignature.jar
+	http://hg.netbeans.org/binaries/278049664FFA5447191BD5FE96B0B62B0CFD15D1-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar
+	http://hg.netbeans.org/binaries/9039A0C1FA0E56CB56A1A192908814478FA747C5-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar
+	http://hg.netbeans.org/binaries/DAA45A7EE529A7532F5DC08625A5A3E81DB2D4CB-org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar
+	http://hg.netbeans.org/binaries/F5AC8FBA216A8C52F319EC2CB455B44FFD734B38-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar
+	http://hg.netbeans.org/binaries/B43E7CE55F0DECA3BE1A6E695A3E3ABC6D62567F-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar
+	http://hg.netbeans.org/binaries/1B9CBEC0FCB47C279519E52D360199C24EC99B01-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar
+	http://hg.netbeans.org/binaries/6B0A6E9F9179E314944E4ADB831A9D6FCADED3DC-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar
+	http://hg.netbeans.org/binaries/B28B8EE777232102471EA5334FD70E20851845DD-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar
+	http://hg.netbeans.org/binaries/24A15BD37950663933CC4975EE6E518BEB2C28A3-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar
+	http://hg.netbeans.org/binaries/01CD242F06F6F7E4E61C9E05ABBE07318E501D51-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar
+	http://hg.netbeans.org/binaries/75928E4368CA748131A6767BA1A97D9DA643C306-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar
+	http://hg.netbeans.org/binaries/934DCAB9534B8FE12FD9C90759B26B6B0D442837-org.tmatesoft.svnkit_1.8.7.r10376_v20141223_2131.jar
+	http://hg.netbeans.org/binaries/E90EF50215FFD23928B3308DC76A17B7DADE5F33-processtreekiller-1.0.5.jar
+	http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar
+	http://hg.netbeans.org/binaries/D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar
+	http://hg.netbeans.org/binaries/2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar
+	http://hg.netbeans.org/binaries/5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar
+	http://hg.netbeans.org/binaries/24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.jar
+	http://hg.netbeans.org/binaries/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar
+	http://hg.netbeans.org/binaries/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar
+	http://hg.netbeans.org/binaries/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar
+	http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar
+	http://hg.netbeans.org/binaries/CE9A1C96875443F2FDD5127B750DA39CF4CE818B-com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.jar
+	http://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar
+	http://hg.netbeans.org/binaries/6FC6098C230D7CBA5730106D379CBBB42F6EC48A-validator.jar
+	http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar
+	http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar
+	http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar
+	http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-platform-${PV}
+	dev-java/commons-httpclient:3
+	dev-java/commons-lang:2.1
+	dev-java/commons-logging:0
+	dev-java/icu4j:4.4
+	dev-java/iso-relax:0
+	dev-java/jdbc-mysql:0
+	dev-java/jdbc-postgresql:0
+	>=dev-java/jsch-0.1.46:0
+	>=dev-java/json-simple-1.1:0
+	dev-java/jsr173:0
+	dev-java/jzlib:0
+	dev-java/jvyamlb:0
+	dev-java/log4j:0
+	dev-java/lucene:3.5
+	dev-java/rhino:1.6
+	dev-java/saxon:9
+	dev-java/smack:2.2
+	dev-java/sun-jaf:0
+	dev-java/tomcat-servlet-api:2.2
+	dev-java/ws-commons-util:0
+	dev-java/xerces:2"
+#	dev-vcs/subversion>=1.8.4:0[java] missing from the tree
+#	app-text/jing:0 our version is probably too old
+#	dev-java/commons-io:1 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/freemarker:2.3
+#	dev-java/ini4j:0 our version is too old
+#	dev-java/jaxb:2 upstream version contains more stuff so websvccommon does not compile with ours
+#	dev-java/trilead-ssh2:0 in overlay
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	dev-java/commons-codec:0
+	${CDEPEND}
+	dev-java/javacc:0
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ide -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+JAVA_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
+	ln -s "${DISTDIR}"/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar libs.nashorn/external/asm-all-4.0.jar || die
+	ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die
+	ln -s "${DISTDIR}"/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar o.apache.commons.io/external/commons-io-1.4.jar || die
+	ln -s "${DISTDIR}"/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar libs.commons_net/external/commons-net-3.3.jar || die
+	ln -s "${DISTDIR}"/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip css.editor/external/css21-spec.zip || die
+	ln -s "${DISTDIR}"/53AFD6CAA1B476204557B0626E7D673FBD5D245C-css3-spec.zip css.editor/external/css3-spec.zip || die
+	ln -s "${DISTDIR}"/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip derby/external/derbysampledb.zip || die
+	ln -s "${DISTDIR}"/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip dlight.nativeexecution/external/exechlp-1.0.zip || die
+	ln -s "${DISTDIR}"/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar libs.freemarker/external/freemarker-2.3.19.jar || die
+	ln -s "${DISTDIR}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || die
+	ln -s "${DISTDIR}"/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar html.validation/external/html5-datatypes.jar || die
+	ln -s "${DISTDIR}"/4388C34B9F085A42FBEA06C5B00FDF0A251171EC-html5doc.zip html.parser/external/html5doc.zip || die
+	ln -s "${DISTDIR}"/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar html.parser/external/htmlparser-1.2.1.jar || die
+	ln -s "${DISTDIR}"/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar libs.ini4j/external/ini4j-0.5.1.jar || die
+	ln -s "${DISTDIR}"/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar html.validation/external/io-xml-util.jar || die
+	ln -s "${DISTDIR}"/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar html.validation/external/iri.jar || die
+	ln -s "${DISTDIR}"/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip spellchecker.dictionary_en/external/ispell-enwl-3.1.20.zip || die
+	ln -s "${DISTDIR}"/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar c.googlecode.javaewah.JavaEWAH/external/JavaEWAH-0.7.9.jar || die
+	ln -s "${DISTDIR}"/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar xml.jaxb.api/external/jaxb-api.jar || die
+	ln -s "${DISTDIR}"/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip libs.jaxb/external/jaxb-api-doc.zip || die
+	ln -s "${DISTDIR}"/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar libs.jaxb/external/jaxb-impl.jar || die
+	ln -s "${DISTDIR}"/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar libs.jaxb/external/jaxb-xjc.jar || die
+	ln -s "${DISTDIR}"/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar libs.jaxb/external/jaxb1-impl.jar || die
+	ln -s "${DISTDIR}"/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar libs.javafx/external/jfxrt.jar || die
+	ln -s "${DISTDIR}"/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar html.validation/external/jing.jar || die
+	ln -s "${DISTDIR}"/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-js-corestubs.zip javascript2.editor/external/js-corestubs.zip || die
+	ln -s "${DISTDIR}"/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip javascript2.editor/external/js-domstubs.zip || die
+	ln -s "${DISTDIR}"/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip javascript2.editor/external/js-reststubs.zip || die
+	ln -s "${DISTDIR}"/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.core-0.0.7.jar || die
+	ln -s "${DISTDIR}"/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.sshagent-0.0.7.jar || die
+	ln -s "${DISTDIR}"/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.pageant-0.0.7.jar || die
+	ln -s "${DISTDIR}"/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.usocket-jna-0.0.7.jar || die
+	ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.process/external/libpam4j-1.1.jar || die
+	ln -s "${DISTDIR}"/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar libs.nashorn/external/nashorn-02f810c26ff9-patched.jar || die
+	ln -s "${DISTDIR}"/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar html.validation/external/non-schema.jar || die
+	ln -s "${DISTDIR}"/F27BF427BE72709F3094BF76ECA8C5A2B9AC6DA9-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar o.eclipse.core.contenttype/external/org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar || die
+	ln -s "${DISTDIR}"/9BC512C5BB9A9F5276B9E8672F6B30AD0BD97D88-org.eclipse.core.jobs-3.5.101_nosignature.jar o.eclipse.core.jobs/external/org.eclipse.core.jobs-3.5.101_nosignature.jar || die
+	ln -s "${DISTDIR}"/105DC9A1A93E6EA9A6CD368AD12897B1F247D6AE-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar o.eclipse.core.net/external/org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar || die
+	ln -s "${DISTDIR}"/E99C3C29A90F8AB29078A38CF8EBC3860249640C-org.eclipse.core.runtime-3.7.0_nosignature.jar o.eclipse.core.runtime/external/org.eclipse.core.runtime-3.7.0_nosignature.jar || die
+	ln -s "${DISTDIR}"/84FC6D443CD0816FA87093B6B7AD6876ADFC4207-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar o.eclipse.core.runtime.compatibility.auth/external/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar || die
+	ln -s "${DISTDIR}"/74069BFD03B2C66A9EBB4370C0B8064E3F5B6594-org.eclipse.equinox.app-1.3.100_nosignature.jar o.eclipse.equinox.app/external/org.eclipse.equinox.app-1.3.100_nosignature.jar || die
+	ln -s "${DISTDIR}"/A7953EEE9D4D7CD896C7D0AD6D21902E6259979B-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar o.eclipse.equinox.common/external/org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar || die
+	ln -s "${DISTDIR}"/3FB169C95F095B70F05B96BE9496DA63FAE7F707-org.eclipse.equinox.preferences-3.4.2_nosignature.jar o.eclipse.equinox.preferences/external/org.eclipse.equinox.preferences-3.4.2_nosignature.jar || die
+	ln -s "${DISTDIR}"/CD5919A707EB6B5C1FC29964C8EF5E2CF3F5A3D4-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar o.eclipse.equinox.registry/external/org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar || die
+	ln -s "${DISTDIR}"/A4634373DC60650C49CC98AEA2090889F7ADC68F-org.eclipse.equinox.security-1.1.1_nosignature.jar o.eclipse.equinox.security/external/org.eclipse.equinox.security-1.1.1_nosignature.jar || die
+	ln -s "${DISTDIR}"/278049664FFA5447191BD5FE96B0B62B0CFD15D1-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit/external/org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar || die
+	ln -s "${DISTDIR}"/9039A0C1FA0E56CB56A1A192908814478FA747C5-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit.java7/external/org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar || die
+	ln -s "${DISTDIR}"/DAA45A7EE529A7532F5DC08625A5A3E81DB2D4CB-org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar || die
+	ln -s "${DISTDIR}"/F5AC8FBA216A8C52F319EC2CB455B44FFD734B38-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar || die
+	ln -s "${DISTDIR}"/B43E7CE55F0DECA3BE1A6E695A3E3ABC6D62567F-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar || die
+	ln -s "${DISTDIR}"/1B9CBEC0FCB47C279519E52D360199C24EC99B01-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar o.eclipse.mylyn.commons.repositories.core/external/org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar || die
+	ln -s "${DISTDIR}"/6B0A6E9F9179E314944E4ADB831A9D6FCADED3DC-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar || die
+	ln -s "${DISTDIR}"/B28B8EE777232102471EA5334FD70E20851845DD-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar || die
+	ln -s "${DISTDIR}"/24A15BD37950663933CC4975EE6E518BEB2C28A3-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.confluence.core/external/org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar || die
+	ln -s "${DISTDIR}"/01CD242F06F6F7E4E61C9E05ABBE07318E501D51-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar || die
+	ln -s "${DISTDIR}"/75928E4368CA748131A6767BA1A97D9DA643C306-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.textile.core/external/org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar  || die
+	ln -s "${DISTDIR}"/934DCAB9534B8FE12FD9C90759B26B6B0D442837-org.tmatesoft.svnkit_1.8.7.r10376_v20141223_2131.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.7.r10376_v20141223_2131.jar || die
+	ln -s "${DISTDIR}"/E90EF50215FFD23928B3308DC76A17B7DADE5F33-processtreekiller-1.0.5.jar extexecution.process/external/processtreekiller-1.0.5.jar || die
+	ln -s "${DISTDIR}"/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar libs.svnClientAdapter.svnkit/external/svnkit_1.7.8.r9538_v20130107_2001.jar || die
+	ln -s "${DISTDIR}"/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar o.apache.xml.resolver/external/resolver-1.2.jar || die
+	ln -s "${DISTDIR}"/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar libs.svnClientAdapter.svnkit/external/sqljet-1.1.10.jar || die
+	ln -s "${DISTDIR}"/D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-javahl-1.10.3.jar || die
+	ln -s "${DISTDIR}"/2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.10.3.jar || die
+	ln -s "${DISTDIR}"/5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.10.3.jar || die
+	ln -s "${DISTDIR}"/24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.jar libs.svnClientAdapter.javahl/external/svnjavahl-1.8.4.jar || die
+	ln -s "${DISTDIR}"/3B91269E9055504778F57744D24F505856698602-svnkit-1.7.0-beta4-20120316.233307-1.jar libs.svnClientAdapter.svnkit/external/svnkit-1.7.0-beta4-20120316.233307-1.jar || die
+	ln -s "${DISTDIR}"/015525209A02BD74254930FF844C7C13498B7FB9-svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar libs.svnClientAdapter.svnkit/external/svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar || die
+	ln -s "${DISTDIR}"/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar libs.swingx/external/swingx-all-1.6.4.jar || die
+	ln -s "${DISTDIR}"/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar httpserver/external/tomcat-webserver-3.2.jar || die
+	ln -s "${DISTDIR}"/CE9A1C96875443F2FDD5127B750DA39CF4CE818B-com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.jar || die
+	ln -s "${DISTDIR}"/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar swing.validation/external/ValidationAPI.jar || die
+	ln -s "${DISTDIR}"/6FC6098C230D7CBA5730106D379CBBB42F6EC48A-validator.jar html.validation/external/validator.jar || die
+	ln -s "${DISTDIR}"/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar extexecution.process/external/winp-1.14-patched.jar || die
+	ln -s "${DISTDIR}"/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar o.apache.xmlrpc/external/xmlrpc-client-3.0.jar || die
+	ln -s "${DISTDIR}"/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar o.apache.xmlrpc/external/xmlrpc-common-3.0.jar || die
+	ln -s "${DISTDIR}"/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar o.apache.xmlrpc/external/xmlrpc-server-3.0.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	popd >/dev/null || die
+
+	java-pkg_jar-from --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.51.jar
+	java-pkg_jar-from --into c.jcraft.jzlib/external jzlib jzlib.jar jzlib-1.0.7.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar
+	java-pkg_jar-from --build-only --into db.sql.visualeditor/external javacc javacc.jar javacc-3.2.jar
+	java-pkg_jar-from --into html.parser/external icu4j-4.4 icu4j.jar icu4j-4_4_2.jar
+	java-pkg_jar-from --into html.validation/external iso-relax isorelax.jar isorelax.jar
+	java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar
+	java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar
+	# java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.19.jar
+	java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
+	java-pkg_jar-from --into libs.lucene/external lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
+	java-pkg_jar-from --into libs.smack/external smack-2.2 smack.jar smack.jar
+	java-pkg_jar-from --into libs.smack/external smack-2.2 smackx.jar smackx.jar
+	# java-pkg_jar-from --into libs.svnClientAdapter.javahl/external subversion svn-javahl.jar svnjavahl-1.8.4.jar
+	java-pkg_jar-from --into libs.xerces/external xerces-2 xercesImpl.jar xerces-2.8.0.jar
+	java-pkg_jar-from --build-only --into o.apache.commons.codec/external commons-codec commons-codec.jar apache-commons-codec-1.3.jar
+	java-pkg_jar-from --into o.apache.commons.httpclient/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.1.jar
+	java-pkg_jar-from --into o.apache.commons.lang/external commons-lang-2.1 commons-lang.jar commons-lang-2.4.jar
+	java-pkg_jar-from --into o.apache.commons.logging/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
+	java-pkg_jar-from --into o.apache.ws.commons.util/external ws-commons-util ws-commons-util.jar ws-commons-util-1.0.1.jar
+	java-pkg_jar-from --into servletapi/external tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
+	java-pkg_jar-from --into xml.jaxb.api/external sun-jaf activation.jar activation.jar
+	java-pkg_jar-from --into xml.jaxb.api/external jsr173 jsr173.jar jsr173_1.0_api.jar
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	unset DISPLAY
+	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+	pushd nbbuild/netbeans/ide >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/ide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	rm -fr "${D}"/${INSTALL_DIR}/bin/nativeexecution || die
+	rm -fr "${D}"/${INSTALL_DIR}/modules/lib || die
+
+	insinto ${INSTALL_DIR}/bin/nativeexecution
+	doins bin/nativeexecution/*
+
+	pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution >/dev/null || die
+	for file in *.sh ; do
+		fperms 755 ${file}
+	done
+	popd >/dev/null || die
+
+	if use x86 ; then
+		doins -r bin/nativeexecution/Linux-x86
+		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86 >/dev/null || die
+		for file in * ; do
+			fperms 755 ${file}
+		done
+		popd >/dev/null || die
+	elif use amd64 ; then
+		doins -r bin/nativeexecution/Linux-x86_64
+		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86_64 >/dev/null || die
+		for file in * ; do
+			fperms 755 ${file}
+		done
+		popd >/dev/null || die
+	fi
+
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm com-jcraft-jsch.jar && dosym /usr/share/jsch/lib/jsch.jar ${instdir}/com-jcraft-jsch.jar || die
+	rm com-jcraft-jzlib.jar && dosym /usr/share/jzlib/lib/jzlib.jar ${instdir}/com-jcraft-jzlib.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	# rm freemarker-2.3.19.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.19.jar || die
+	rm icu4j-4_4_2.jar && dosym /usr/share/icu4j-4.4/lib/icu4j.jar ${instdir}/icu4j-4_4_2.jar || die
+	rm isorelax.jar && dosym /usr/share/iso-relax/lib/isorelax.jar ${instdir}/isorelax.jar || die
+	rm json-simple-1.1.1.jar && dosym /usr/share/json-simple/lib/json-simple.jar ${instdir}/json-simple-1.1.1.jar || die
+	rm jvyamlb-0.2.7.jar && dosym /usr/share/jvyamlb/lib/jvyamlb.jar ${instdir}/jvyamlb-0.2.7.jar || die
+	rm log4j-1.2.15.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.15.jar || die
+	rm lucene-core-3.5.0.jar && dosym /usr/share/lucene-3.5/lib/lucene-core.jar ${instdir}/lucene-core-3.5.0.jar || die
+	rm mysql-connector-java-5.1.23-bin.jar && dosym /usr/share/jdbc-mysql/lib/jdbc-mysql.jar ${instdir}/mysql-connector-java-5.1.23-bin.jar || die
+	rm postgresql-9.2-1002.jdbc4.jar && dosym /usr/share/jdbc-postgresql/lib/jdbc-postgresql.jar ${instdir}/postgresql-9.2-1002.jdbc4.jar || die
+	rm saxon9B.jar && dosym /usr/share/saxon-9/lib/saxon.jar ${instdir}/saxon9B.jar || die
+	rm servlet-2.2.jar && dosym /usr/share/tomcat-servlet-api-2.2/lib/servlet.jar ${instdir}/servlet-2.2.jar || die
+	rm smack.jar && dosym /usr/share/smack-2.2/lib/smack.jar ${instdir}/smack.jar || die
+	rm smackx.jar && dosym /usr/share/smack-2.2/lib/smackx.jar ${instdir}/smackx.jar || die
+	# rm svnjavahl.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl.jar || die
+	rm xerces-2.8.0.jar && dosym /usr/share/xerces-2/lib/xercesImpl.jar ${instdir}/xerces-2.8.0.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxb
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm activation.jar && dosym /usr/share/sun-jaf/lib/activation.jar ${instdir}/activation.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxb/api
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsr173_1.0_api.jar && dosym /usr/share/jsr173/lib/jsr173.jar ${instdir}/jsr173_1.0_api.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ide
+}

diff --git a/dev-java/netbeans-java/ChangeLog b/dev-java/netbeans-java/ChangeLog
index 45d3b73..42b1369 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_p20150610 (10 Jun 2015)
+
+  10 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-java-9999_p20150610.ebuild:
+  bumped to the latest sources
+
 *netbeans-java-9999_p20150609 (09 Jun 2015)
 
   09 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 312bfcc..028d175 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -113,6 +113,7 @@ DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123
 DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9aea7ed9f8b11cbdcca02d11fc314c4ec32c015cbd605344644 SHA512 c69868f00a50d9d0f1744137a66c4944330d4c0f7a7b58f13d3e7c72fbd7d31fbe97d3d98cbb4011e4ddf5eaf637991d7a4fe1d32fb98a0627ed28012ebdafaa WHIRLPOOL 89e0b90e509f4771366e6baddb861f4c922f9d5f8f0c5561fcb89e78466cfba40e2d657743ed142d12e7778a796ce049a03703d661660a1d540ceb4798e51b61
 DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 DIST netbeans-trunk-nightly-201506090001-src.zip 207886954 SHA256 ae0945f940a854d3314f1be40e4f915788eaa7902a71ca7ca645456236230f71 SHA512 61b3be2bba95f4a08ed4fa340d441c3f01ac9de230c8125b94a61adb47b0c09e312e0c75eba3ff4eb446468d00982edf66b7fa709263f50cae6690da85d9ac66 WHIRLPOOL 16a5f826bfafcf74c32fa3e6620825fb0287b904d9cc9ad76aa24001731c83029d641ec658559d6ad479b1169e49512906e5aa2c8df806d6e695da6af41f141f
+DIST netbeans-trunk-nightly-201506100001-src.zip 207888598 SHA256 ffbd120304de4f26f654fb22f4eb73ab9778b7795204002270a69eef6be1ab55 SHA512 c238bbc661698ca4b143aec8677f64a26191703175f1096d4e662e533e59dc13f08ef85d81e70e2ee104563cde8b026befb192b660604230cd53ac4cc23a2c9c WHIRLPOOL f8682cb4006efebe7f1a750a6a76734e95e4ceb5529b3cd47c01b6ffd4e4d3594e25a043ed8b21d510655192f85f88dbaefe85fcbe4d42e5123bda3c81c7ecf7
 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
@@ -142,5 +143,6 @@ EBUILD netbeans-java-9999_p20150603.ebuild 14590 SHA256 26047a0c118360cd6aaa11c8
 EBUILD netbeans-java-9999_p20150604.ebuild 14590 SHA256 5df785c849a644e93a68215202f391afcaf0ba2db75fdfb9d9ea08fca4a9b81f SHA512 8a29e17cdfa6c33091a3cfb3afaf12f5756dde8a32cd466ee477d2c24fbe82f8a45211907f6e4d620a538b7b37f0a25817f10091cb9386f47bac5985454db2f9 WHIRLPOOL d17a87527e29952ff430bcb576ddd59f753e074d2c757c7f2614b80ecea7702986cac67505f96a6aab9f07468c0d30c0887ce062f8da614ed56318b4a58a6d68
 EBUILD netbeans-java-9999_p20150608.ebuild 14590 SHA256 50c2cd985701ff57f7ca1144a01cb52da625e56b41ca7321b7915ac3394704bb SHA512 c8b440e8e2c9646bf26a742abb5e2e302f74b4360cd9c285b85202955b3150c01ea40229c5f4e7682de7ea038068ccaed1811debbf189bce1842463f1e689a53 WHIRLPOOL 007749552d73056283b3d699a693b5200a65546a63e1a0d7d698c4de7b07dcdb4b859696da4c78760725cbeeb647dfb03b27e7301e06a4b1abea1c455610303e
 EBUILD netbeans-java-9999_p20150609.ebuild 14590 SHA256 9c44466c3a38df69266d56aa17e26de4a03c6b759bed5d3d3ba629b890a9d803 SHA512 a2c221fe1cb21bdc04e33868c719bc17cc4bb2f33c01b6664bfff967e9f67d98cb9a87d52ed9d06d192d801d1e800b1522a5edee9b3afeee55223c5187df73d6 WHIRLPOOL 7272325ce1455689c30917698952ee603c5fcd1968866598b2839fdd8ba664f22db27903b17f18495d473bb8fe5d682f233a41fdece73f4bacddd566eef80fdb
-MISC ChangeLog 163777 SHA256 97a2ddcfc913045be45a9798b47770e2344cd4f48d5a059ad48587dea379fff4 SHA512 32d20967de1f56adf6fd2646a6e022cd1d5d42f0829d5f1a8d93ddc66fa91665a602809a25d84a2b020686c8dde2ead3e63f9210a9f9476748eadd65d59fba45 WHIRLPOOL 523912f1cf849d9e408ff533ce9aebb09faa23b8e9e0ae28105065bf9cbbcb42bbdce11c588c7422478bac47a6360c14382b12c5b2167452a88f097776b07abe
+EBUILD netbeans-java-9999_p20150610.ebuild 14590 SHA256 c53fa8109890fde3604ade2fa72cb524170c01667b29b14036514d779b202699 SHA512 549948b286f1b88dfc9ea45c1dfcb1f27857d80b1bfc33c0baa115e71aaa87924c49d23d7f2d88d5723bb3f336312b08af5fd2a6784a7bda169268867f0fd67d WHIRLPOOL e66b2385266e78b2b7173d4555460dcb79e91906d754563a56c19917e888e28fd5a0a8e13b75c4c80fea06ba0361c4830f4de36855befb3b2b426187f6104616
+MISC ChangeLog 163946 SHA256 c674eb7eaa82252d2f3c90f526a80b0c0f7a9689475e596fcb3f28b63252751c SHA512 7316050fef504361cb6642b1e7a99952edbe7c9d72d7011a9e10ccb658b8f19366c3d50969b2fee7e4071fb7e4e7a0c765aa650fe6f03ebfdd8ef787eab55a10 WHIRLPOOL 6bfd4b2d7da1471f28c09a57e28518def55984a32c90bb1334aebc89f399f529f4d2d17714fa1bc7343a5e470d161f6821f03b3f116f5606ee4cacd1b7d79f95
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20150610.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20150610.ebuild
new file mode 100644
index 0000000..5fb4424
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20150610.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-10_00-01-56/zip/netbeans-trunk-nightly-201506100001-src.zip"
+# jarjar-1.4 contains also asm libraries
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip
+	http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip
+	http://hg.netbeans.org/binaries/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar
+	http://hg.netbeans.org/binaries/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip
+	http://hg.netbeans.org/binaries/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar
+	http://hg.netbeans.org/binaries/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar
+	http://hg.netbeans.org/binaries/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar
+	http://hg.netbeans.org/binaries/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar
+	http://hg.netbeans.org/binaries/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip
+	http://hg.netbeans.org/binaries/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip
+	http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip
+	http://hg.netbeans.org/binaries/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip
+	http://hg.netbeans.org/binaries/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar
+	http://hg.netbeans.org/binaries/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar
+	http://hg.netbeans.org/binaries/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar
+	http://hg.netbeans.org/binaries/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar
+	http://hg.netbeans.org/binaries/7E6F9D542174220D44E7488907BA5073D330ED18-nb-javac-impl.jar
+	http://hg.netbeans.org/binaries/CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.jar
+	http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
+	http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar
+	http://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip
+	http://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/beansbinding:0
+	dev-java/cglib:3
+	dev-java/jdom:1.0"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	dev-java/json-simple:0
+	dev-java/junit:4"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}
+	dev-java/absolutelayout:0
+	dev-java/antlr:0[java]
+	dev-java/c3p0:0
+	dev-java/commons-cli:1
+	dev-java/commons-collections:0
+	dev-java/dom4j:1
+	dev-java/fastinfoset:0
+	dev-java/glassfish-transaction-api:0
+	dev-java/javassist:3
+	dev-java/jboss-logging:0
+	dev-java/jsr67:0
+	dev-java/jsr181:0
+	dev-java/jtidy:0
+	dev-java/log4j:0
+	dev-java/mimepull:0
+	dev-java/oracle-javamail:0
+	dev-java/saaj:0
+	dev-java/slf4j-api:0
+	dev-java/slf4j-log4j12:0
+	dev-java/slf4j-simple:0
+	dev-java/stax-ex:0
+	dev-java/stax2-api:0
+	dev-java/xmlstreambuffer:0"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.java -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+pkg_pretend() {
+	local die_now=""
+
+	if [ -d /usr/share/netbeans-java-${SLOT}/ant ]; then
+		if [ -n "$(find /usr/share/netbeans-java-${SLOT}/ant -type l)" ]; then
+			eerror "Please remove following symlinks and run emerge again:"
+			find /usr/share/netbeans-java-${SLOT}/ant -type l
+			die_now="1"
+		fi
+	fi
+
+	if [ -L /usr/share/netbeans-java-${SLOT}/maven ]; then
+		if [ -z "${die_now}" ]; then
+			eerror "Please remove following symlinks and run emerge again:"
+		fi
+
+		echo "/usr/share/netbeans-java-${SLOT}/maven"
+		die_now="1"
+	fi
+
+	if [ -n "${die_now}" ]; then
+		die "Symlinks exist"
+	fi
+}
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip maven.embedder/external/apache-maven-3.0.5-bin.zip || die
+	ln -s "${DISTDIR}"/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip o.jdesktop.beansbinding/external/beansbinding-1.2.1-doc.zip || die
+	ln -s "${DISTDIR}"/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar j2ee.eclipselink/external/eclipselink.jar || die
+	ln -s "${DISTDIR}"/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip hibernate4lib/external/hibernate-release-4.3.1-lib.zip || die
+	ln -s "${DISTDIR}"/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar maven.indexer/external/indexer-artifact-5.1.1.jar || die
+	ln -s "${DISTDIR}"/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar maven.indexer/external/indexer-core-5.1.1-patched.jar || die
+	ln -s "${DISTDIR}"/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar maven/external/jarjar-1.4.jar || die
+	ln -s "${DISTDIR}"/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar j2ee.eclipselink/external/javax.persistence_2.1.0.v201304241213.jar || die
+	ln -s "${DISTDIR}"/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip websvc.jaxws21/external/jaxws-2.2.6.zip || die
+	ln -s "${DISTDIR}"/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip websvc.jaxws21api/external/jaxws-2.2.6-api.zip || die
+	ln -s "${DISTDIR}"/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip websvc.jaxws21/external/jaxws-api-doc.zip || die
+	ln -s "${DISTDIR}"/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip j2ee.eclipselink/external/JPAjavadocs04032013.zip || die
+	ln -s "${DISTDIR}"/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar maven.indexer/external/lucene-core-3.6.2.jar || die
+	ln -s "${DISTDIR}"/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar maven.indexer/external/lucene-highlighter-3.6.2.jar || die
+	ln -s "${DISTDIR}"/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar maven.embedder/external/maven-dependency-tree-2.0.jar || die
+	ln -s "${DISTDIR}"/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
+	ln -s "${DISTDIR}"/7E6F9D542174220D44E7488907BA5073D330ED18-nb-javac-impl.jar libs.javacimpl/external/nb-javac-impl.jar || die
+	ln -s "${DISTDIR}"/CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.jar maven/external/netbeans-cos.jar || die
+	ln -s "${DISTDIR}"/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselink/external/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar || die
+	ln -s "${DISTDIR}"/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselinkmodelgen/external/org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar || die
+	ln -s "${DISTDIR}"/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip libs.springframework/external/spring-framework-3.2.7.RELEASE.zip || die
+	ln -s "${DISTDIR}"/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip libs.springframework/external/spring-framework-4.0.1.RELEASE.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.cglib/external cglib-3 cglib.jar cglib-2.2.jar
+	java-pkg_jar-from --build-only --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+	java-pkg_jar-from --into maven.embedder/external jdom-1.0 jdom.jar jdom-1.0.jar
+	java-pkg_jar-from --into o.jdesktop.beansbinding/external beansbinding beansbinding.jar beansbinding-1.2.1.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
+	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.extide.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/java >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+	grep -E "/java$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	chmod 755 "${D}"/${INSTALL_DIR}/maven/bin/mvn* || die
+	rm -fr "${D}"/${INSTALL_DIR}/maven/bin/*.bat || die
+
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/maven/lib
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm commons-cli-1.2.jar && dosym /usr/share/commons-cli-1/lib/commons-cli.jar ${instdir}/commons-cli-1.2.jar || die
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm AbsoluteLayout.jar  && dosym /usr/share/absolutelayout/lib/absolutelayout.jar ${instdir}/AbsoluteLayout.jar || die
+	rm beansbinding-1.2.1.jar && dosym /usr/share/beansbinding/lib/beansbinding.jar ${instdir}/beansbinding-1.2.1.jar || die
+	rm cglib-2.2.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/hibernate4
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm antlr-2.7.7.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.7.jar || die
+	rm c3p0-0.9.2.1.jar && dosym /usr/share/c3p0/lib/c3p0.jar ${instdir}/c3p0-0.9.2.1.jar || die
+	rm cglib-2.2.jar && dosym /usr/share/cglib-3/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
+	rm commons-collections-3.2.1.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections-3.2.1.jar || die
+	rm dom4j-1.6.1.jar && dosym /usr/share/dom4j-1/lib/dom4j.jar ${instdir}/dom4j-1.6.1.jar || die
+	rm javassist-3.18.1-GA.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist-3.18.1-GA.jar || die
+	rm jboss-logging-3.1.3.GA.jar && dosym /usr/share/jboss-logging/lib/jboss-logging.jar ${instdir}/jboss-logging-3.1.3.GA.jar || die
+	rm jboss-transaction-api_1.2_spec-1.0.0.Final.jar && dosym /usr/share/glassfish-transaction-api/lib/jta.jar ${instdir}/jboss-transaction-api_1.2_spec-1.0.0.Final.jar || die
+	rm jtidy-r8-20060801.jar && dosym /usr/share/jtidy/lib/Tidy.jar ${instdir}/jtidy-r8-20060801.jar || die
+	rm log4j-1.2.12.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.12.jar || die
+	rm slf4j-api-1.6.1.jar && dosym /usr/share/slf4j-api/lib/slf4j-api.jar ${instdir}/slf4j-api-1.6.1.jar || die
+	rm slf4j-log4j12-1.6.1.jar && dosym /usr/share/slf4j-log4j12/lib/slf4j-log4j12.jar ${instdir}/slf4j-log4j12-1.6.1.jar || die
+	rm slf4j-simple-1.6.1.jar && dosym /usr/share/slf4j-simple/lib/slf4j-simple.jar ${instdir}/slf4j-simple-1.6.1.jar || die
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/modules/ext/jaxws22
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm FastInfoset.jar && dosym /usr/share/fastinfoset/lib/fastinfoset.jar ${instdir}/FastInfoset.jar || die
+	rm javax.mail_1.4.jar && dosym /usr/share/oracle-javamail/lib/mail.jar ${instdir}/javax.mail_1.4.jar || die
+	rm mimepull.jar && dosym /usr/share/mimepull/lib/mimepull.jar ${instdir}/mimepull.jar || die
+	rm saaj-impl.jar && dosym /usr/share/saaj/lib/saaj.jar ${instdir}/saaj-impl.jar || die
+	rm stax-ex.jar && dosym /usr/share/stax-ex/lib/stax-ex.jar ${instdir}/stax-ex.jar || die
+	rm stax2-api.jar && dosym /usr/share/stax2-api/lib/stax2-api.jar ${instdir}/stax2-api.jar || die
+	rm streambuffer.jar && dosym /usr/share/xmlstreambuffer/lib/xmlstreambuffer.jar ${instdir}/streambuffer.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxws22/api
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
+	rm saaj-api.jar && dosym /usr/share/jsr67/lib/jsr67.jar ${instdir}/saaj-api.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/maven
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm jdom-1.0.jar && dosym /usr/share/jdom-1.0/lib/jdom.jar ${instdir}/jdom-1.0.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java
+}

diff --git a/dev-java/netbeans-javacard/ChangeLog b/dev-java/netbeans-javacard/ChangeLog
index a203c40..01afd62 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_p20150610 (10 Jun 2015)
+
+  10 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javacard-9999_p20150610.ebuild:
+  bumped to the latest sources
+
 *netbeans-javacard-9999_p20150609 (09 Jun 2015)
 
   09 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index e5cb2a5..a7f68f2 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123
 DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9aea7ed9f8b11cbdcca02d11fc314c4ec32c015cbd605344644 SHA512 c69868f00a50d9d0f1744137a66c4944330d4c0f7a7b58f13d3e7c72fbd7d31fbe97d3d98cbb4011e4ddf5eaf637991d7a4fe1d32fb98a0627ed28012ebdafaa WHIRLPOOL 89e0b90e509f4771366e6baddb861f4c922f9d5f8f0c5561fcb89e78466cfba40e2d657743ed142d12e7778a796ce049a03703d661660a1d540ceb4798e51b61
 DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 DIST netbeans-trunk-nightly-201506090001-src.zip 207886954 SHA256 ae0945f940a854d3314f1be40e4f915788eaa7902a71ca7ca645456236230f71 SHA512 61b3be2bba95f4a08ed4fa340d441c3f01ac9de230c8125b94a61adb47b0c09e312e0c75eba3ff4eb446468d00982edf66b7fa709263f50cae6690da85d9ac66 WHIRLPOOL 16a5f826bfafcf74c32fa3e6620825fb0287b904d9cc9ad76aa24001731c83029d641ec658559d6ad479b1169e49512906e5aa2c8df806d6e695da6af41f141f
+DIST netbeans-trunk-nightly-201506100001-src.zip 207888598 SHA256 ffbd120304de4f26f654fb22f4eb73ab9778b7795204002270a69eef6be1ab55 SHA512 c238bbc661698ca4b143aec8677f64a26191703175f1096d4e662e533e59dc13f08ef85d81e70e2ee104563cde8b026befb192b660604230cd53ac4cc23a2c9c WHIRLPOOL f8682cb4006efebe7f1a750a6a76734e95e4ceb5529b3cd47c01b6ffd4e4d3594e25a043ed8b21d510655192f85f88dbaefe85fcbe4d42e5123bda3c81c7ecf7
 EBUILD netbeans-javacard-7.0.1.ebuild 4961 SHA256 566bc7e3275c97d0fe3d68c843b53aee641548ec39a8143aebd56d248da3c32c SHA512 5973c8d4254943473209b0881c0fbe40ac6b61563d508e58adc248dd40c8c2d6b742bd6c1667ee11fb404f9d2e62f08a8e4d822a2a3db9fccab254f73828c3b0 WHIRLPOOL fd1e08943ce754a2abfe8c8b83954399287500ce574a46fe0d76f94b300fd2a5978957f94a3ac1d85781330248a46fefacfbae25db95669c3de910145ef96424
 EBUILD netbeans-javacard-7.1.2.ebuild 4970 SHA256 15ff13152b140edaa549ea6515949d99cdb2a4656918566179836ab2277f01b8 SHA512 b7e52b477f6ba645084034eb27e848fb48361351937fc45455bf4b7d74acbdd257427ec589286f0edc71cc98c8cdb114e55988b6d3dc92143e13f407e3b45a52 WHIRLPOOL 85ab6dc2c230ea89fd19d7602ac24e3d2b0f226590998e6a6e277c24ef60a7e86874f7e95e90921d255e84f05e04ad1998ee7361b4d26c6f14828076792a933c
 EBUILD netbeans-javacard-7.2.ebuild 4718 SHA256 d173c848e825b342a52073ba16b7784016f92124d4bc3b5ad8beebb7a7dda772 SHA512 019183c236c59ec2b961445c49643c6da0b376048f1be1d58677a753890bcb03db126f6441221c7572a74fe45c4c27aeee4acb38db620f9203ad04ae8ff2c426 WHIRLPOOL f2a10183045edd22ef4419b630cedafc093b326eb593178a0f50e8d82ebb25ab732fb8c561d49969073d9fce551c5b9150fb1900b49458ed53f0234baa29a78e
@@ -63,5 +64,6 @@ EBUILD netbeans-javacard-9999_p20150603.ebuild 4982 SHA256 6ee39d39fe18b37fc6e03
 EBUILD netbeans-javacard-9999_p20150604.ebuild 4982 SHA256 0b085fe452879f737d76512949d14af2f806172b949341b986be2bb0e49ef8d7 SHA512 781aca4752c3a5358eb0c7cc67c49da616a010cdb03b1175f57706010d6749c190e2b27727bad3af01b8f8e9045e52862c649c723a55e3225f9008a03784e40b WHIRLPOOL 592a8dd2be69a1a3d6a447070863fc00ecd366dd45ea053bf32545e024672dced8f87cdb025f2a510e4e629bde2e37c99bdbf7afd6e12f477136bf301709b276
 EBUILD netbeans-javacard-9999_p20150608.ebuild 4982 SHA256 bd493a5bd267593768778615a5a45e34235c4713f6efcc10e09ed22ad5154427 SHA512 c161dda42ae739e6a5e422efe684f0f7ecc62c92c3a5d9f768d4b240b7c04d1a83a2142b1e27283411601c9b60a4527cf9708a95dabe01178fd520c7b2e1e4bd WHIRLPOOL 7206b2e6371e6e4cdae7e5c34859e2336e79d5913593fd30c30aa0ca7c889792f0a14fa2251b25cb0678b9ae981f7c26e4a3858359d1b46e104947cc05aa315a
 EBUILD netbeans-javacard-9999_p20150609.ebuild 4982 SHA256 aca6bac72191eaacd9c9e82c0248d7c80cbb1b7a04f75d7645c41ab7dbf65343 SHA512 798c622188a287a58218fe97dd437f093708d938799b5de24e683d421a3f042845d3ab73cc082a08022e35c5b187103eb97661e1b16979a14f63e85e24ff0afa WHIRLPOOL 2922063d306948acf05b73ebf18a01cc669fb7c2d55f5d609e09707515989b1e502382ccebcbc59750c1602c73a97e55c6a06e6767e3880a389a451186e6b9d8
-MISC ChangeLog 170765 SHA256 5413ab7d416ffadf543b8b081d9777fe2c7ebf5828577c90763256930b64e9b8 SHA512 96e1778dc17c308cbe2c8d6b20a202376421a73e4845600c7b0b0bf4c40502a26546babb9300f4992d4b2ec48ec4e859cb36fc99644132caa6220842d989979d WHIRLPOOL 5cf8964f222627c5b5a623cd5c7f5a885f53776e47742b4d2c234850ac8c2514c69fe8dc69e7290756b6ece09962fdec3c54b169580d4b26ff0b00b38a97b06f
+EBUILD netbeans-javacard-9999_p20150610.ebuild 4982 SHA256 9aa7851599560173b7b835f3110821bd833668cff7e944481c537a7616b5075f SHA512 97d23da4da9edb0df0d6e5d3112b949a62a7bdb74f580828b5ca1f7acd043096bdd42f36f5a31eb84944ea0b122275f14a4e63fc242f438eb63da1e4209062e2 WHIRLPOOL 7a196cb27af720dc8daa00cb7f84932dd94660fb640b40b598b9784a057fe388bb1a10122dba9b35b586f824a2ed1b86b5db38cef6290bae46d4222de890f234
+MISC ChangeLog 170942 SHA256 4ed928379affbd46e505ec8ed941cb8e14f77d3e11f0e01b34c94e1131a1f64b SHA512 fc3a8d15fc917616b825c1a8820ad21e5480f5a61b081837f414218cebf86a518224d851ee4dc8be1b7b1556fe8e41c30655dafa284d7107cf985b5228c9c5d0 WHIRLPOOL 90963b75d177502307431769465f4186487e38dff210ca0af93fbd80b89f391a390c0746fce13b5106a89cca87f4f2cfd46b8128967bc1e5602f5ef78d64ccda
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150610.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150610.ebuild
new file mode 100644
index 0000000..2987b39
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150610.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-10_00-01-56/zip/netbeans-trunk-nightly-201506100001-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 4c5f785..44685c3 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_p20150610 (10 Jun 2015)
+
+  10 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javadoc-9999_p20150610.ebuild:
+  bumped to the latest sources
+
 *netbeans-javadoc-9999_p20150609 (09 Jun 2015)
 
   09 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index 788151d..dbd3ec7 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123
 DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9aea7ed9f8b11cbdcca02d11fc314c4ec32c015cbd605344644 SHA512 c69868f00a50d9d0f1744137a66c4944330d4c0f7a7b58f13d3e7c72fbd7d31fbe97d3d98cbb4011e4ddf5eaf637991d7a4fe1d32fb98a0627ed28012ebdafaa WHIRLPOOL 89e0b90e509f4771366e6baddb861f4c922f9d5f8f0c5561fcb89e78466cfba40e2d657743ed142d12e7778a796ce049a03703d661660a1d540ceb4798e51b61
 DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 DIST netbeans-trunk-nightly-201506090001-src.zip 207886954 SHA256 ae0945f940a854d3314f1be40e4f915788eaa7902a71ca7ca645456236230f71 SHA512 61b3be2bba95f4a08ed4fa340d441c3f01ac9de230c8125b94a61adb47b0c09e312e0c75eba3ff4eb446468d00982edf66b7fa709263f50cae6690da85d9ac66 WHIRLPOOL 16a5f826bfafcf74c32fa3e6620825fb0287b904d9cc9ad76aa24001731c83029d641ec658559d6ad479b1169e49512906e5aa2c8df806d6e695da6af41f141f
+DIST netbeans-trunk-nightly-201506100001-src.zip 207888598 SHA256 ffbd120304de4f26f654fb22f4eb73ab9778b7795204002270a69eef6be1ab55 SHA512 c238bbc661698ca4b143aec8677f64a26191703175f1096d4e662e533e59dc13f08ef85d81e70e2ee104563cde8b026befb192b660604230cd53ac4cc23a2c9c WHIRLPOOL f8682cb4006efebe7f1a750a6a76734e95e4ceb5529b3cd47c01b6ffd4e4d3594e25a043ed8b21d510655192f85f88dbaefe85fcbe4d42e5123bda3c81c7ecf7
 EBUILD netbeans-javadoc-7.0.1.ebuild 5814 SHA256 68531c51838c95012830f5ae09e2386ea3179c2b31bfd5191f67993e3b3dbe2f SHA512 3bfe0ecc46f371d2553b031a5699229fb874dad1e94415635558b7d46b6764c31337d03444753e687b19a7c0976c68cb72007ccc82df7d1e5848a81f241f80c3 WHIRLPOOL 6571f7a73c262b3b67407840523b79eecc14bad9678cff05fb32a2811049158400870de51bbcef97ecb3f18f8ff59f965bdca8e788918d53822b92e2f20f75f5
 EBUILD netbeans-javadoc-7.1.2.ebuild 5855 SHA256 af28efb956ac3b7147e254ca3083dfaab11b84ea42e20677ebdd18aa29ff87e0 SHA512 ee06c552782170b51cfe70d603792b4240aef6064ba0a5074f394701a43285ed1e4030f539622c616be3175dab013e791c1a3a1193ad379193f5fa3e92eefa40 WHIRLPOOL dfcc63d6c9fcf094e2998ce1c08e29b4d4acbefbe9bea6498c2e28f84576f628da50164a1e0ab3ff5528720fe54cae71f2f5e6f84aedca5b639f13053464e6c1
 EBUILD netbeans-javadoc-7.2.ebuild 5805 SHA256 20d01deae745a7e8d84ffe55ca63ad74342bd8528c0dd15a20aac6570a1a83e3 SHA512 3947f1ab3efc236b8faa14736406ee3e537bbdbe377ea1bbd4f1eafa06a36d2863f8700dc7c84e6c8501abdf130a78e87ad6a0f52c5172bf0ab52f288617bc86 WHIRLPOOL 8301cce0679ed5f68a09e2e968ab2ba0955547f438758b042a04744539324fd79d83d853dfb8b48421f6dac616362cf1a9dd2a0e0ff8763dc2e12a470d16b95f
@@ -66,5 +67,6 @@ EBUILD netbeans-javadoc-9999_p20150603.ebuild 6234 SHA256 62f387d00d3696c71c0d7d
 EBUILD netbeans-javadoc-9999_p20150604.ebuild 6234 SHA256 457be63312f0a84436df3d45ee844414e139591115b76344c1a5598bd9481da8 SHA512 f5cd534851cdd20281f59e813f409986bfd2be855a67f42117c6c0a030b1b744b9f2d3053e7abcceea8d1d7886bb8af55f4f11497f67ea5efc31c3f7569938ba WHIRLPOOL a158af29713fdc0aafe6d65da79d3cb72a811c44ddca5d035f75304f92b8d8b7e66e9914aba8644e2566e1f25908cba8fbf05bd5825c7b385c7466644b558492
 EBUILD netbeans-javadoc-9999_p20150608.ebuild 6234 SHA256 2cb2d2bb193a613f0e799d7df8e138130ba55e2bf17907f1549505502164cd8c SHA512 a64893f14f9af258fe9a22ad9f89b2c7a678906b34903377a8c0a616f75a1d598b69c255a8070f5a32ba908e7fd82db4672bae3c5da07140a307dc7cc61ffc92 WHIRLPOOL c088e4082cb672c6c3b82142dd6fa09c0216df9f6b33ce469b4074d60efb5dd950443c12bc271cf10a94d194bcdf9a9b72e45f997c9f769159f02a0c0dbb6e09
 EBUILD netbeans-javadoc-9999_p20150609.ebuild 6234 SHA256 0a0e6474c003fcd3370dc334e69920873ebdcb5648808f9b4d4e04432fc8d93c SHA512 3c2043feff5b1ab3ea077463da8352e08cb9f24608f8fe3ee3f9ef45129fe3e99cf44a82a86839de215655adfd82089930f7745fd560b888b5ba4fb834f125cb WHIRLPOOL ed92c62909a364a6c23c091fa129bd537d8ba20906745b07d9cdf4bcefd98bfd2311fd3ab470e12bc3edcd7ab0d37799e6260e5eacc4476905abc473f2e1e7cb
-MISC ChangeLog 168461 SHA256 4455c313c896ea6fc84391dd00535626cb6b7c13decfcd9b1e0b2faae8998985 SHA512 80276ee18c2e1dbec287ee34307e179aa19197d5cd74fdd38cc733ecb97335d04c82059acd5dbc4d2013da672d525811eb89dee5bba764d7cd63c9aded3edd8c WHIRLPOOL 527462ca5f1ac6b4fb919a2989b446716476cd410762661d67870726e874c11acba7f6cd32d1472db3cf5a21d10e1379108f6c0958320748408d5d7356b6ab2c
+EBUILD netbeans-javadoc-9999_p20150610.ebuild 6234 SHA256 a504a7dd2defff2182cff062606d81d6a6fc930ca782cb0136ca3ad809a16bd8 SHA512 b165619b79c5f4e154559dac7d35eb9efd2177f1796dd96d2a8e58eef2ef7ed4695b9ab42908bb7afd8f88d522cc87060125e2ac7fc58733e8cfc2df9a621bea WHIRLPOOL 510cb2a6d755d9aae5a0dc7e0898a9af99f2d8564e5aa26e11ede323f648e22cf3920210ef4e50112735c47436940814817a772e24cc669b85a85c3c56c7b501
+MISC ChangeLog 168636 SHA256 e1674b047383aac4898fa4b5f27be22ee8eb0d2215fcc9f97307bee5f1d04b2f SHA512 e92cfd9e561b98eb74fc8fc0421eea080fc38b958a0fd702dfd081688a5c043509dd17a62cb0a31f6e3986d0dbd6b1e56fce56fc22b9fd455e83c5309753a504 WHIRLPOOL 29e10d304dee6326f344d7e926796ddfe6384aa7a908fd9ed5b021601a3c63ba4d8ddcc51b11240abe2a7418187e3b4840dfbc14d0ffd3b6d246ad592b251a8f
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150610.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150610.ebuild
new file mode 100644
index 0000000..3ac9e54
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150610.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-10_00-01-56/zip/netbeans-trunk-nightly-201506100001-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 c9c441e..940b4aa 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_p20150610 (10 Jun 2015)
+
+  10 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javafx-9999_p20150610.ebuild:
+  bumped to the latest sources
+
 *netbeans-javafx-9999_p20150609 (09 Jun 2015)
 
   09 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index ab2867a..d1846d6 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123
 DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9aea7ed9f8b11cbdcca02d11fc314c4ec32c015cbd605344644 SHA512 c69868f00a50d9d0f1744137a66c4944330d4c0f7a7b58f13d3e7c72fbd7d31fbe97d3d98cbb4011e4ddf5eaf637991d7a4fe1d32fb98a0627ed28012ebdafaa WHIRLPOOL 89e0b90e509f4771366e6baddb861f4c922f9d5f8f0c5561fcb89e78466cfba40e2d657743ed142d12e7778a796ce049a03703d661660a1d540ceb4798e51b61
 DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 DIST netbeans-trunk-nightly-201506090001-src.zip 207886954 SHA256 ae0945f940a854d3314f1be40e4f915788eaa7902a71ca7ca645456236230f71 SHA512 61b3be2bba95f4a08ed4fa340d441c3f01ac9de230c8125b94a61adb47b0c09e312e0c75eba3ff4eb446468d00982edf66b7fa709263f50cae6690da85d9ac66 WHIRLPOOL 16a5f826bfafcf74c32fa3e6620825fb0287b904d9cc9ad76aa24001731c83029d641ec658559d6ad479b1169e49512906e5aa2c8df806d6e695da6af41f141f
+DIST netbeans-trunk-nightly-201506100001-src.zip 207888598 SHA256 ffbd120304de4f26f654fb22f4eb73ab9778b7795204002270a69eef6be1ab55 SHA512 c238bbc661698ca4b143aec8677f64a26191703175f1096d4e662e533e59dc13f08ef85d81e70e2ee104563cde8b026befb192b660604230cd53ac4cc23a2c9c WHIRLPOOL f8682cb4006efebe7f1a750a6a76734e95e4ceb5529b3cd47c01b6ffd4e4d3594e25a043ed8b21d510655192f85f88dbaefe85fcbe4d42e5123bda3c81c7ecf7
 EBUILD netbeans-javafx-7.1.2.ebuild 3593 SHA256 76a29b37765000745794e6ae20c6b8528d8637507a257ffef3bef2ce648f05cc SHA512 a04618bda036e6652c7208f90a4dd91e07e75b85243580263f6ec846425ab907a87c318117990d4e8d9044bcd7a0ca8b63bc32bdd0d84e5373a10e67a77b79c0 WHIRLPOOL 11acad585f7315ae6b4edd53c764167567a948cb0e2037d95f2f4de34765909b71d095540c054f4cef3ba70224d294b42720536566e445cbdd06ebf2ad903841
 EBUILD netbeans-javafx-7.2.ebuild 3576 SHA256 3441b901a5074013351bc6c7ba6c424455e2affe52e448f2cfac0058c82345e2 SHA512 ee384d6e4ac767ade82b5d337d7a1c5d2b463c15a7596d91e1a850b37349f88d7867a0ffa11a118c48e2ed463f38dcfa791ec42b3fe85ea1e6bf7c4b27f9b073 WHIRLPOOL 15c7d20f2caa39c6cfcba2f846736754b049483f135ac90ced399672932a6a73467f0b4016550c3b2d8583be20d1467486f5652111893ec16111095a3e9c941c
 EBUILD netbeans-javafx-7.3.ebuild 4476 SHA256 9f268a852d45f37f9d22c3bb58d36be17f438e4b4cb5105d88ac4404731facb3 SHA512 3fa0e48e949d0df0a4404c04379623529f73ff15259f4164fddd10afb9faa046ceed16aac1a7b14728af89bf3a4ed7037638fb7e7e932a64cc71e84f7ecaa44a WHIRLPOOL 0395ca679fa41610c61dceb6ac018d7a76b62c08ca740de2fa2d98523f8e5f840a2d0a8c357b674d171841f93d980b536a671a1f12b5261d402c03b691ac6504
@@ -65,5 +66,6 @@ EBUILD netbeans-javafx-9999_p20150603.ebuild 4723 SHA256 f8609e52f1a824ca2e7d471
 EBUILD netbeans-javafx-9999_p20150604.ebuild 4723 SHA256 6cd0605bac8888cb74de12c872c35f4d51892a93eca3aa35fe4035a152480ee5 SHA512 af2da58a7931db354b5fb3143f57ba1767bb2f3bbf2595fa25fa781ef2067bdc0c6acc782cd327d632c800472aa1fb37a7f8c4f2875c6947f711bed12b85f2e0 WHIRLPOOL 4236f3a96b0fe4f2bb3efbad5ab27792e88a4284f0dc49299780176b555bbe987bfa71939a37bbc0f500f24699ffe561000906bbeeb59bb282070b69ace11bef
 EBUILD netbeans-javafx-9999_p20150608.ebuild 4723 SHA256 8f0b8c624aca3928eb99f67fec66d08bcc3b40b8464a067e7ffec56b9e4fe5a7 SHA512 bf8b14a87956e0f6eebbd2c9f1799cf01a1ff2746a2e99e324002bafe4072cdc675fcc7b2b0beba6f56fd7acffcec9e414371fb5e09008bf08098a3bb3d5d1da WHIRLPOOL 45150f4b4e6403e3dd581a23e0394a80add97a85f55352083c089dc70fa8c97d7b8094d6649848ee58c3c88bbfe5af17a9fa911bad0834339a7555c445e61766
 EBUILD netbeans-javafx-9999_p20150609.ebuild 4723 SHA256 04a093fe4e95dd71676760b7e1604042e44fb28a5dd40f1a8e9bb69d76007b44 SHA512 5fde99555c54cfb6c48c3d3e6065f62c68e362225a4f4b9fe670c9bdb0f77550b7320d8a037aa5e03f82efd3925f6ad457a992e609f712188c3102cae72bc9e1 WHIRLPOOL b7db901e10cdf2f520bd5ce38b785178b8138bbee516caa31578b848425046e824a12417a8a7e1fc72cafa5101b229b5b1f46d1e24c045c5e5ea5d3b085cddc8
-MISC ChangeLog 153024 SHA256 3bee24a0503d66ccbda7c2b8cfd955fee43a15bff310fa7b323a4619b52d514e SHA512 b84e4028759afd9e0061ce5b4aaf9dc869cad6b25b7e6eda9068865817f5a0a572b160b802ba99e7cb56f73d5d48befee2fdb58556d0013c3dba4cfe11026f97 WHIRLPOOL 98a4484f610cef08c19324150288f25ca15f95ac8e36cd878711a31cb0fea95d9f95d9eec7b6401be15ca38ec12a036c10ecc56f27bb3114b63ca35f9e3c88e4
+EBUILD netbeans-javafx-9999_p20150610.ebuild 4723 SHA256 1f633c6eabf2df02c49934031e41a433d91abdab2fed91722c5b00e71cbdfa0a SHA512 aeff3344cdbd67c584b9a0334462d5a99b5ee777d6f0ed7fcf895933a91df195f57e829097d23f4d70aac62fc5206837e5ec1eb3b7e6fd40e720f6f632121bde WHIRLPOOL c862e570a22e85ab6f231e0fc7858387a14ce4eb0f5d0d766d28dbec93abea6d0f4fe0955f74974d1551ed8eccd1b5957082867231a5890d7f6dd02ea7158c8b
+MISC ChangeLog 153197 SHA256 3e845e3ad79cbb6b75b1d20d251d7924f6d6e27df7bf2f55a1a95bef98cd1612 SHA512 ea5c89843978476691432c7f8c33e0608cddd33b5399b5df36c99b60b1288ecda78fdec0e24548722d9ea60b62135cfc0ea380a2b68039f735a879a50e8090eb WHIRLPOOL 0841e40b1848518ffd53a17a3af75f3aeb5b95132cf084412be0b499bf4bfd31baad76ae7ac6b5099e482b2b70093fa9387e6cb2363e3107e709a5f614853eb9
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150610.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150610.ebuild
new file mode 100644
index 0000000..512ca22
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150610.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-10_00-01-56/zip/netbeans-trunk-nightly-201506100001-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 8631613..94b4a7a 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_p20150610 (10 Jun 2015)
+
+  10 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-mobility-9999_p20150610.ebuild:
+  bumped to the latest sources
+
 *netbeans-mobility-9999_p20150609 (09 Jun 2015)
 
   09 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 6b010e9..c322c81 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -42,6 +42,7 @@ DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123
 DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9aea7ed9f8b11cbdcca02d11fc314c4ec32c015cbd605344644 SHA512 c69868f00a50d9d0f1744137a66c4944330d4c0f7a7b58f13d3e7c72fbd7d31fbe97d3d98cbb4011e4ddf5eaf637991d7a4fe1d32fb98a0627ed28012ebdafaa WHIRLPOOL 89e0b90e509f4771366e6baddb861f4c922f9d5f8f0c5561fcb89e78466cfba40e2d657743ed142d12e7778a796ce049a03703d661660a1d540ceb4798e51b61
 DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 DIST netbeans-trunk-nightly-201506090001-src.zip 207886954 SHA256 ae0945f940a854d3314f1be40e4f915788eaa7902a71ca7ca645456236230f71 SHA512 61b3be2bba95f4a08ed4fa340d441c3f01ac9de230c8125b94a61adb47b0c09e312e0c75eba3ff4eb446468d00982edf66b7fa709263f50cae6690da85d9ac66 WHIRLPOOL 16a5f826bfafcf74c32fa3e6620825fb0287b904d9cc9ad76aa24001731c83029d641ec658559d6ad479b1169e49512906e5aa2c8df806d6e695da6af41f141f
+DIST netbeans-trunk-nightly-201506100001-src.zip 207888598 SHA256 ffbd120304de4f26f654fb22f4eb73ab9778b7795204002270a69eef6be1ab55 SHA512 c238bbc661698ca4b143aec8677f64a26191703175f1096d4e662e533e59dc13f08ef85d81e70e2ee104563cde8b026befb192b660604230cd53ac4cc23a2c9c WHIRLPOOL f8682cb4006efebe7f1a750a6a76734e95e4ceb5529b3cd47c01b6ffd4e4d3594e25a043ed8b21d510655192f85f88dbaefe85fcbe4d42e5123bda3c81c7ecf7
 EBUILD netbeans-mobility-7.0.1.ebuild 8655 SHA256 992e214ff2926e2f0db623d96b717bf8f8e4ceb47e96e69b3c6b8f67d6a8d130 SHA512 d51bc003f4b637cfe71c9f49a96427e535596542ac195a9621bc4f92c04a6f720a87fac6eb267732f869ba105f263d9d36f848b54a89c734b6a68a78ed323808 WHIRLPOOL 515da7153b12c3b5779cfad16e3800b4d26ba4b174027d9a7b06a26754fad065751c7eda137ba6199315d024a322d59e7ea39a1b2f4244ea75b30770ac505791
 EBUILD netbeans-mobility-7.1.2.ebuild 7543 SHA256 bb3f1245ad68133798fa507f06dd1ffbc1d55f6ba38f4cccc29ff0240e5b5f22 SHA512 41f663977a0716c5449db597d5f90054717ff3579a9137a910d1943d3e0b39379c34c0d9aa9c98d231037a042074c8ecf5fc62c018cd7cd5e8680734ff854c51 WHIRLPOOL c3c6feb41ce3df356f617ca80530673ac653cdf50da0aead00518854d0850d6420333529aa6591e15ddd4053249191fcb47100c5f39a804352722e54f802bae4
 EBUILD netbeans-mobility-7.2.ebuild 6571 SHA256 58af97ca9a6adc56fa6abe91777a1ac35a3a9b7d68af1e73c23a45dc5631abb2 SHA512 ac42c3a3daa7d55c9c13d1c99dd6880d5d99741f80cfceb683da27e30c70d6228d9434571f2405d0dbbf27d2203e3f877da6347794b07b98331edd1631d3a69d WHIRLPOOL 5a6af3cbcd08180dcdf708a038f3119faacb9c78532b4bb1945c7260fb0a8232af57745e41a73311fafffe185c969e0c88ac34970caab7708313f53417695374
@@ -69,5 +70,6 @@ EBUILD netbeans-mobility-9999_p20150603.ebuild 4418 SHA256 a8867b930129feed269ee
 EBUILD netbeans-mobility-9999_p20150604.ebuild 4418 SHA256 2563246d9db894af2f5ba064c3bc55903e94de96a6524657f64adaef28a7aae3 SHA512 99997d476dd701c67bf55fe6146a1c39fb98cdf10cc10a880e909b313aacc16d978040066763fa041295d7f101ecf0d49679ece6fe7c20a0d6f0b27e3b6a8be3 WHIRLPOOL bfa1547fc5a4b015ebc928bce3a81974f2af5b7a070e4b0dc06e78ad8aeb82d88fff55144da62779ebac114d1db0cffbb78aec497e3f995dec9bca1f4b810731
 EBUILD netbeans-mobility-9999_p20150608.ebuild 4418 SHA256 e92b80bd7851a29dbb8fca839c63889d01fd3a691b3369dd27d6edc837b3c01d SHA512 600dff56b344b749ba2b6bcb4672864ed503e3117fdf9bb63e540d5c0d77c087a2c04847545929ac3410e6651d1ecb098ebe1568b10da91f5c997e17402eb159 WHIRLPOOL be7f1ed87e998d1626a75a71d199c128978ebed7cf5db79dd4bb9f482f1495e96796b5a34b0626130171819ba7685a3ba7943a4aac7feee6d7b3e85c122be43e
 EBUILD netbeans-mobility-9999_p20150609.ebuild 4418 SHA256 0b43946987a7a5a80015e31f08eca7081e0ed9ff74570b20d6fa70685ccb479c SHA512 f385efcad1775c6b29207a1c513dd64e3e7d13f5db6fddd1fce8eb388975356989d290ae940a66f10e01484ee9f26ff24c972d7aa9a65787609892765010258f WHIRLPOOL 6f25dae1bfd51a95901435d6b597a078f616868de7033041dab26c9806d463b671fe77ddf7f3800a3458fc9b846572d23f08fc19a896b1f1d11ac534f34a7a19
-MISC ChangeLog 170906 SHA256 e8f6dd41bb5ec8f368a5608a23afac075684485bdc38dc6b6d666ff7b1db9e5a SHA512 24e3a4d861f44d36d064431c2515cfc2d7c8171a4aafc0b865efec57747edf2179f61e782756d20d68ef5991f8beac77ef1e6f60a2fc990253b564bca6987634 WHIRLPOOL c9f4a8992531389081e86c202989fc8e2c88bc08361fd71d9290ce3702a16c0de5b708edcbd5cf5552421c736ac061b8c0143cfe39c28051273f12d0cedab4a3
+EBUILD netbeans-mobility-9999_p20150610.ebuild 4418 SHA256 1caada7b74de28a14f831e72d4df5d7936907ba921a927ec7873478678f88c4b SHA512 309f109de35edc2c7c5f84d7b17ead6049d33779df2067aaf4e0c8d58a8099040e80059cf6ce47ad8d8b840c68c3c5301251d507a436a6c7d56d87fa490f8124 WHIRLPOOL 04eaacd10f663a7c460cc0c09af86202ca73f73f31c6fa9b3b75f81eb32e558f1f9da69f50ec4ab58e1bb8a508419585f2e0d1700a07fab8aa20548868a0bc68
+MISC ChangeLog 171083 SHA256 75f1d58eb0a335d7b85098a3bdf45b2eabe39fff29c0ded7b02e70219a18965f SHA512 8e1ee680b290219b63f71e0e9c1f7aa680ab9aa18affe1358e0c34b824f46681b081add32134b0c6889e89a78cf64d6fe9d2f44f67390e0d7252c064756f37a8 WHIRLPOOL 1ec5e5810b1e0d6fb1c21c12d37d0743b027621322b15332b660fdcd9f77d8961d63f6ccddf61d7ec7b04c9da863186439f08c5d06226e42dfe8489eaf9d242b
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150610.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150610.ebuild
new file mode 100644
index 0000000..d12ff84
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150610.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-10_00-01-56/zip/netbeans-trunk-nightly-201506100001-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 89eaff6..0c16593 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_p20150610 (10 Jun 2015)
+
+  10 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-nb-9999_p20150610.ebuild:
+  bumped to the latest sources
+
 *netbeans-nb-9999_p20150609 (09 Jun 2015)
 
   09 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index 0181a27..54b9475 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -41,6 +41,7 @@ DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123
 DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9aea7ed9f8b11cbdcca02d11fc314c4ec32c015cbd605344644 SHA512 c69868f00a50d9d0f1744137a66c4944330d4c0f7a7b58f13d3e7c72fbd7d31fbe97d3d98cbb4011e4ddf5eaf637991d7a4fe1d32fb98a0627ed28012ebdafaa WHIRLPOOL 89e0b90e509f4771366e6baddb861f4c922f9d5f8f0c5561fcb89e78466cfba40e2d657743ed142d12e7778a796ce049a03703d661660a1d540ceb4798e51b61
 DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 DIST netbeans-trunk-nightly-201506090001-src.zip 207886954 SHA256 ae0945f940a854d3314f1be40e4f915788eaa7902a71ca7ca645456236230f71 SHA512 61b3be2bba95f4a08ed4fa340d441c3f01ac9de230c8125b94a61adb47b0c09e312e0c75eba3ff4eb446468d00982edf66b7fa709263f50cae6690da85d9ac66 WHIRLPOOL 16a5f826bfafcf74c32fa3e6620825fb0287b904d9cc9ad76aa24001731c83029d641ec658559d6ad479b1169e49512906e5aa2c8df806d6e695da6af41f141f
+DIST netbeans-trunk-nightly-201506100001-src.zip 207888598 SHA256 ffbd120304de4f26f654fb22f4eb73ab9778b7795204002270a69eef6be1ab55 SHA512 c238bbc661698ca4b143aec8677f64a26191703175f1096d4e662e533e59dc13f08ef85d81e70e2ee104563cde8b026befb192b660604230cd53ac4cc23a2c9c WHIRLPOOL f8682cb4006efebe7f1a750a6a76734e95e4ceb5529b3cd47c01b6ffd4e4d3594e25a043ed8b21d510655192f85f88dbaefe85fcbe4d42e5123bda3c81c7ecf7
 EBUILD netbeans-nb-7.0.1.ebuild 5106 SHA256 3c68751bf5face5f80e2d7dcedb7466e69343f2d06c0a4dd30a722a987fbb207 SHA512 d79343e0ca8655b074a8f96b9898e4bc0123d60e346602ba8d7a239597993cadb33a036b43862ef1a39630e4f0ba7e79892d8b2eed8b30535f12a5d0b9f4b581 WHIRLPOOL 9f2cd645e34fbcfa8f0059fbda4f355f411aaff7966121360dfe5b3c769966c5a4586bbc04142b279e3a3fa323bc4b51a6349cf3eafe89063db44fcae58ef119
 EBUILD netbeans-nb-7.1.2.ebuild 4977 SHA256 265f9e4a9490937a65632ddaef48e3a731154b07b9ee5f9536a991181fc2fcbd SHA512 65d1065993dba3b1fece428beb1b75f17d89eddb08aacd2cbf5ecd3ee5ca844e75e9100c324ecdeeed5b138b1da4ab8cd5a4598e584a17545ffc2c52ea763779 WHIRLPOOL 9b63f2b5671bd38d24ff6b280de37fc19c74170bf80c22818da5e8af415a85211c6cfcf690e68d7697c41a1b749a3c7b48ec9b362782df140856f892d381e360
 EBUILD netbeans-nb-7.2.ebuild 4960 SHA256 bef2020a6e0d722ca77c0931b9a06014cedc822f14a21d8d916200e358dcdfb8 SHA512 988d902bbef52e123b5800e56049210d69c4dd6dbeca80396aeac58c70d90b76da65b338e664368ea3f9a3973b7b94ffd0a47a77b01be53452c2cc04c4067442 WHIRLPOOL a27fa8a1a066499a3fc2cb82e955b6b18b1725889b088ea1e94528cde3ec58f3b46c1e757fa597af6ad4ba96218dacfacff9561799f46add316e233d46127d28
@@ -68,5 +69,6 @@ EBUILD netbeans-nb-9999_p20150603.ebuild 5003 SHA256 fd6f9a1c75356ee0e8dccdc8b94
 EBUILD netbeans-nb-9999_p20150604.ebuild 5003 SHA256 211c996e360e5d6097eeb932b4230eeb397f45ce851b9dbac466d94b18ae1b84 SHA512 e116752c7228dfce6c033d1ec1282c9fe156822e7baa58772e3b6908fc443e17fbf9bde147c7099813b7246e94d2c7f8c4da6e9c093fbbd5aed5ab3e5d1931fa WHIRLPOOL d2f51f82b88f98414956bbef13ce28084cf66ae3f6957ebefbd197e8f25b1aedf6c124c8a7f33b6250db74f44e77398533ec7a5ea03dc5908ff4686b7508378c
 EBUILD netbeans-nb-9999_p20150608.ebuild 5003 SHA256 038667681b9fa30d57c7c200a906e7d1237629c4c4c439459062cbf5d08a63cf SHA512 1e030704f86f5632599d0ae91000d5cc954919f7e4a1cf98a628e1a4103b1cddb1d2b4d8215d390b1912cb7c95058342d4dedf5339a59770aec55b178761fe65 WHIRLPOOL 3bff022dfa9726d3fe010f7911fc0b9ffc77a3875273033cdb5c087abe49cfc9e889f3b3a1c5cfef1bd03651a51ace8591d873d0065eeb253335d9c3ec7c2d7a
 EBUILD netbeans-nb-9999_p20150609.ebuild 5003 SHA256 2cddf0fe3f823023dfa046c2b0a7ebdc8acd8cfe91e9062cffea626c9db8f097 SHA512 3cfecdccc5e8483e677a55e7a627ae6dbbb677e41e4c95c5bbd2c9b516b5d34a053fea7024fe7c08bfaf5f3cfca0e63f8f9a632abc1b1c8235a2cac01b83bc06 WHIRLPOOL 12df18edcad1c8127214227f5a953fd6279d9c32a9f1261c9439a8a780e030b5b9c0d8a78db3fdb26b4d2cda5821f0c8ae2794c4bade56f5092510bc2c2be909
-MISC ChangeLog 159612 SHA256 64aa6eeb70fd0e44deff0bbcb2e833ee5a6d18fada077b5a833159a25711918c SHA512 e05b6105217bdfea0e0cec446a25c9a698749b1f3e2c7190d7154d17bbf8dfce42b37eb0ca8c2d6b8f932dcb54ffe53218d66fde6e66f9bfdbb161294e848fdc WHIRLPOOL 3d1cc4c10947ca04663d1ca7025949c62d7dbfafd9488af01d1c19fbcde6fe76dfde2673fe51e05065bb2d24c532cb31cf4481d79ad95fb59173d85c25cce9e9
+EBUILD netbeans-nb-9999_p20150610.ebuild 5003 SHA256 b929d864513827174498541473cba811eee3131d02f48d091d1e68a9d424e27f SHA512 ae9fe3dbcd85dd69faae4b83d87c398f565a88973be15defb88155e67a66102af4b8ceceb0bbb56ad83c17c175dd0f74848bb70bbdb3e4ee52f6949409151367 WHIRLPOOL eae965ad68850c3dec8e5453cb0cefd26aedaa6abe55640ac77ae9e9a3b37b16ade560a42d804db2988b8331dab2483fa51350a6e8d1eebb595110b96fae804e
+MISC ChangeLog 159777 SHA256 15ea91584dc785bfc3f0523e4b9d3490ff3e9bca9d4f4ea592e91b026e8f0fce SHA512 7c3a75e7ef836277cc4c0d1872eab1a0276674e211dd536eeba52ce2af6499215b7c891e11e4aecf042db29e192bc63641e3adea65e299beaf7ec998b426c5b1 WHIRLPOOL 4d0bb19b465d1aeeab5c825ea4e89ba4b7f8aff095aad411844f1b862cd40de34b593324ea4fe5f462ed5f87fb8624d4d59fcd5028eb01944a3cc78ace6f2988
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20150610.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20150610.ebuild
new file mode 100644
index 0000000..8b2797c
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20150610.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-10_00-01-56/zip/netbeans-trunk-nightly-201506100001-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 7c4a10e..faacbe6 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_p20150610 (10 Jun 2015)
+
+  10 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-php-9999_p20150610.ebuild:
+  bumped to the latest sources
+
 *netbeans-php-9999_p20150609 (09 Jun 2015)
 
   09 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index a3469b7..dee90d9 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -46,6 +46,7 @@ DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123
 DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9aea7ed9f8b11cbdcca02d11fc314c4ec32c015cbd605344644 SHA512 c69868f00a50d9d0f1744137a66c4944330d4c0f7a7b58f13d3e7c72fbd7d31fbe97d3d98cbb4011e4ddf5eaf637991d7a4fe1d32fb98a0627ed28012ebdafaa WHIRLPOOL 89e0b90e509f4771366e6baddb861f4c922f9d5f8f0c5561fcb89e78466cfba40e2d657743ed142d12e7778a796ce049a03703d661660a1d540ceb4798e51b61
 DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 DIST netbeans-trunk-nightly-201506090001-src.zip 207886954 SHA256 ae0945f940a854d3314f1be40e4f915788eaa7902a71ca7ca645456236230f71 SHA512 61b3be2bba95f4a08ed4fa340d441c3f01ac9de230c8125b94a61adb47b0c09e312e0c75eba3ff4eb446468d00982edf66b7fa709263f50cae6690da85d9ac66 WHIRLPOOL 16a5f826bfafcf74c32fa3e6620825fb0287b904d9cc9ad76aa24001731c83029d641ec658559d6ad479b1169e49512906e5aa2c8df806d6e695da6af41f141f
+DIST netbeans-trunk-nightly-201506100001-src.zip 207888598 SHA256 ffbd120304de4f26f654fb22f4eb73ab9778b7795204002270a69eef6be1ab55 SHA512 c238bbc661698ca4b143aec8677f64a26191703175f1096d4e662e533e59dc13f08ef85d81e70e2ee104563cde8b026befb192b660604230cd53ac4cc23a2c9c WHIRLPOOL f8682cb4006efebe7f1a750a6a76734e95e4ceb5529b3cd47c01b6ffd4e4d3594e25a043ed8b21d510655192f85f88dbaefe85fcbe4d42e5123bda3c81c7ecf7
 EBUILD netbeans-php-7.0.1.ebuild 4151 SHA256 3aee393fe89aa4788ccd17af46f1df43a5681c28af6d580724d8db0f5e804ff0 SHA512 60106805595338b83e17d906c199c54dc4cc5d979f964a41f9938a508e8514670f4e5538eeecd91f8cd06dd2b4376119674f9a7a9f2fac6c1255e14929f2bc19 WHIRLPOOL 1a09962a5bd67a4fd4eed48af3f185146d2de6f506952f626756aabf6a157678fe71e0752ed5988ff414803b83150d9b8b4de956895667e331659bb59f94e09c
 EBUILD netbeans-php-7.1.2.ebuild 3940 SHA256 779f3bceb2b5a49e923fff28c36c653e31e2d11e186fabab1e656c3314b48d28 SHA512 1296c8ccbec945e66588c2a1a490d3ea93a28672e77751e16c3dff1f1aa6e3a00b454345f0b888c684a0d31fe05aad4f44310998eb72bf1febba85da1bcdd08b WHIRLPOOL b0238f8c5aa4a8c0a5cff82b0daa29860fe39712e96110916cd8a26938ca07b8e05c308e1387c84e7d693026590846392227e95668d150bbc7f1cbc660676eec
 EBUILD netbeans-php-7.2.ebuild 4159 SHA256 bb5c66ed19c9341332e1e42efb29a4ab5d19a22c995bae93efc952ec105ad493 SHA512 c919b120bdc51b56f58b390e9a017f9e059c6b5709220e80138caf7ca3e58d432f53c9ed28f899dc9537851a4cb8cafa9e7067eaefc5d5798b05fb0be9d5bd5f WHIRLPOOL 9857d2e6ac50c4daf5c8afc0a5b65b068b6010ecf2ef04f063bc184810c18b50feda683d2d80c84c0e621909bb05b19731135f2a69f1e56db927c42e8057a658
@@ -73,5 +74,6 @@ EBUILD netbeans-php-9999_p20150603.ebuild 4423 SHA256 97370ca944836c20a10c43028b
 EBUILD netbeans-php-9999_p20150604.ebuild 4423 SHA256 489ad7dfe954dd589134d78aa57a233c4e74f5c4df26a456546f4c44977e4b88 SHA512 5cf92d507053bc405adcdb9003e6e951f189b3c6306b17de34193a9b4a097f2e2ace21f5cc8b4edcf469a17cc2716b8ccc0e7f5ebc5a86eb21949657c9aacc4a WHIRLPOOL 893b5eb0c34c74e5c1924c1e586e1bd413eee6518bdd4521f039e353853b3927885ce903602d5a469621216185ee073e5180d8986ecc3204ff20b5120fe16a15
 EBUILD netbeans-php-9999_p20150608.ebuild 4423 SHA256 a5c2a4c5c7366a650cf2771b7b4a81ea3ddb9e2fcab5bab54e658d49e77fda28 SHA512 83cd4e9b9cafef85782cbef5c88783fa9a5651e9c176376b6814daad6cfbda409b57d42d786991fb2e60dc2e34ca42164072ec8ede3fa06c48660be021fe0642 WHIRLPOOL 0089d2a15da9c3e875c5b5ccf3fb9250f2185fc2a8fe7824dad0dcaac9f1102ae76fde539b95c7f2f7673a14c0d5eaac84673f382d0a01a0f7b8a439d389b583
 EBUILD netbeans-php-9999_p20150609.ebuild 4423 SHA256 2015d85d3b0199d9a7b3c02f2ec42e7c2ecb22c9698e23cbfbea1e4b4a0e90cc SHA512 84e4df2400802c45b3e5aec87b606e5963844c9a664ebcf94ba0584e31e98341f8f1017319f5aa0abe8207b8ae00bc9d25ad62e633ea43e096e732cd1d19c88d WHIRLPOOL 93d52e96e0d3d95090560bc5df00927c549675aa19d4873a80b914f467a9a7261bd70d9d329db1378214bb10da8db1511a5434e8d256d28dfd7bfdc9de286a5c
-MISC ChangeLog 159374 SHA256 5ae7104a869e309ed4fec603260d67b098975158da0efff70757dc8fa2e5bba2 SHA512 f84cce39c40fb726f2319e2236210c02e956a2131d78bc4c10a5bcfcfeb6a687716ddc33b54c6e4a9dfd09232f75d7a47dce1bb1c26a39c80150025b6bac418f WHIRLPOOL edbd2975521c5852a855049c36148bb043b997e9e54fcab35d4fced9e77c36255281a55958cd73cbaec011c8b2fa9f3144a133fcee8c92096e8c99e1e132743a
+EBUILD netbeans-php-9999_p20150610.ebuild 4423 SHA256 085f470788498366adff452d8b9f78945708304021ea086e60891cb45b5a0e93 SHA512 6cb142929f7eb9a4c1c494fc2956ad95476b4effbf2058ddad25e38b3a6c6f34b24998be1d26200776fa409625f0ba7f485e4012d1139f65724b1bacdbf5207b WHIRLPOOL ac782795b9e486446cf5c5f8dd8681422a062d1167ad3f9785136eaba2477b0ba8c0fd05cba0235cba5c06cf50026ccaa6ffe2621918a9353acc7caf751b3fdc
+MISC ChangeLog 159541 SHA256 c23fcd670563fb0c5f60576f0b25c38d4976b3955e08f18579e40d12f82b2bb4 SHA512 566704b39950690142fc886b93a796f7f43b6ba3f4fdcfe47650326e4432dec104b2127183b121ff939d7dca53ea8431a11d70c657142ddcf627c8c961932d22 WHIRLPOOL 34aaeeade137b5eae56e000f2916546ee057f3e6c3e03b99121855a107f3ae9b9b411e9d086c95e0a366715916793b4a9253e48bf1a1083e80e8393eda61ee17
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20150610.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20150610.ebuild
new file mode 100644
index 0000000..e56c999
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20150610.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-10_00-01-56/zip/netbeans-trunk-nightly-201506100001-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 dab681d..a65d9d0 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_p20150610 (10 Jun 2015)
+
+  10 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-platform-9999_p20150610.ebuild:
+  bumped to the latest sources
+
 *netbeans-platform-9999_p20150609 (09 Jun 2015)
 
   09 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index c5b8cd0..8278c86 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -60,6 +60,7 @@ DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123
 DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9aea7ed9f8b11cbdcca02d11fc314c4ec32c015cbd605344644 SHA512 c69868f00a50d9d0f1744137a66c4944330d4c0f7a7b58f13d3e7c72fbd7d31fbe97d3d98cbb4011e4ddf5eaf637991d7a4fe1d32fb98a0627ed28012ebdafaa WHIRLPOOL 89e0b90e509f4771366e6baddb861f4c922f9d5f8f0c5561fcb89e78466cfba40e2d657743ed142d12e7778a796ce049a03703d661660a1d540ceb4798e51b61
 DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 DIST netbeans-trunk-nightly-201506090001-src.zip 207886954 SHA256 ae0945f940a854d3314f1be40e4f915788eaa7902a71ca7ca645456236230f71 SHA512 61b3be2bba95f4a08ed4fa340d441c3f01ac9de230c8125b94a61adb47b0c09e312e0c75eba3ff4eb446468d00982edf66b7fa709263f50cae6690da85d9ac66 WHIRLPOOL 16a5f826bfafcf74c32fa3e6620825fb0287b904d9cc9ad76aa24001731c83029d641ec658559d6ad479b1169e49512906e5aa2c8df806d6e695da6af41f141f
+DIST netbeans-trunk-nightly-201506100001-src.zip 207888598 SHA256 ffbd120304de4f26f654fb22f4eb73ab9778b7795204002270a69eef6be1ab55 SHA512 c238bbc661698ca4b143aec8677f64a26191703175f1096d4e662e533e59dc13f08ef85d81e70e2ee104563cde8b026befb192b660604230cd53ac4cc23a2c9c WHIRLPOOL f8682cb4006efebe7f1a750a6a76734e95e4ceb5529b3cd47c01b6ffd4e4d3594e25a043ed8b21d510655192f85f88dbaefe85fcbe4d42e5123bda3c81c7ecf7
 EBUILD netbeans-platform-7.0.1.ebuild 5049 SHA256 b67cf0867358fea808614c02b8b6ea2ab88223f8642175ac3f91dc8c610aca4e SHA512 611b8e831a95d1b4e1c3a1f5e4904c84f9606298a94eb0900ac06cc88670849d218a3a03cce07b2463e206da01ce2931cdb6677948d20d8326908a36851589e6 WHIRLPOOL 01769eca4eb20c2702a432a6180eed16a9a50687016e307e585ab5de5cab8b3b664e456d489ff15d9f5af349f791b161eecb9fef7bfaba09a70e1eaab5d545a0
 EBUILD netbeans-platform-7.1.2.ebuild 5034 SHA256 a069e7e45f768e590e5b30fdda26185d8fde492355e4c530ce44169def991cc6 SHA512 31cfb0d9f13eacfcafd49be995bc456d17a689776e032f68ed4585e068a49f6e992c37c57f23c5e27176fb060996bcfc86b0446ae26efbc488909102fc10c979 WHIRLPOOL 1bd35ac39366fd13192e4a6a177280727bceb2f5f12ff684a288725954a29a240f2d264c3ef2ca38fa3e133063cdd943cce1d0f493f0f8ea9a621833c8f0031b
 EBUILD netbeans-platform-7.2.ebuild 5432 SHA256 227add7f41117667d8487f2bf8eb846c21529e7b2c49dac46e4b3b33062f69b0 SHA512 e49958f21358fe9689336d5cd5edbe435d0a2fd12c315174dcb408bf6ed4e6515d39d458554fb576c342a43f0af50c327bada8fa0b2eb485e14c01ddcdb6248d WHIRLPOOL 4f9101a2d5495fb6002b7791822f85091309c04d6c475060c116725f8da32f9ed270f0c27a9f6a2bd2aa0bd7417b18e9165d1feff7e98f6205bdafff3223e5a3
@@ -87,5 +88,6 @@ EBUILD netbeans-platform-9999_p20150603.ebuild 9244 SHA256 b7029a431e47639f8e670
 EBUILD netbeans-platform-9999_p20150604.ebuild 9244 SHA256 5ea34a955267886224c7ccce8d1195b92231cccae2a51352b321acf5015eb828 SHA512 049ea26c154975bc30e095834c5e4fc4ef283a9a5027ae132dfb3eca6a7167ed52d20c5e9544851274d3f741b242a8c1e9bbd4b705cb560cd98d4be1fe74d997 WHIRLPOOL 19e2a5cb3ffde213a4f53151f187b9c5516f7edaf1ae59b53c35c579dcf5a68f08510501879b0734b06bd3dafd90597fc05d024776d1ddc7dc075b5ca8d88396
 EBUILD netbeans-platform-9999_p20150608.ebuild 9244 SHA256 73a79f9d69488dcf1ec402bd6944cfcd6b0925e78587b9796c675cde13a659c4 SHA512 5792edf278a0704feb9e038f269e627839dc27558cc02513eada5bf1455d907e3d53de947ca2242c0c989c85a8cf629d1039209d316ede50c9e451f8e96e019b WHIRLPOOL 7bdffecd036a6f9137ed4d2d43b07afbc0409d34be4c2a40a066b036b5339fdb0d3031932f557ffe9b558ebfea4c708c14711424dcd586111b1b16d174dfd933
 EBUILD netbeans-platform-9999_p20150609.ebuild 9244 SHA256 e2308bf12544895b4972a5a0f6992269b18558df5c29a923527faac08324d2c9 SHA512 cbac97a3d871ce70aec2f2961028939ae28974ea3fc02cd66d52184963c009f86d25b07a1a49a1db4ac99f5eb5568cf770131341e62ebb5314ce626ac21b4500 WHIRLPOOL 998678ef8f5345137c568ab40ba1c0888c84e3a1100d77921aaf8f92b17d28217c036b505e536384aa71e21c569ac652501de01ce9a5ae897c45943b6a62dfe7
-MISC ChangeLog 171502 SHA256 caa5dce010a833dce76c23fade399751ea8b6bf36a1a9ef58b9def1f8fb5ca7f SHA512 f586039fa18d429b752c7a496260cd82cd65ccf736d82525b1527bc08482626ed947dda0f611852f84f79fdf1701793e81e45003394d3fef5f13f5483c5ee1c2 WHIRLPOOL 721b3324a9bcea1118a92d1cef5617690101d68554bdd72b101c60a1142af0d6c079311fec24051d47cb99f84ce0ee33181024cbbe39cb6f3cdd3ecdeb3849d2
+EBUILD netbeans-platform-9999_p20150610.ebuild 9244 SHA256 81df9a6597c98752335066f10f752ba50cafa5c97965f06ce4596512e919009c SHA512 ff2b6afa5b89fcc923b2b4a208b1f2b8535e250ff9211e7e47358c8549e765cc9e40166b39f013460864068224780acc8e428f1a00a6596b766c48e0467b05cd WHIRLPOOL 127adc1e79e6d4285d60c843babfd35d71f90e89fd24da05ce1076857a702cce159a64894070d3bf590a6032874bf7b48ae9e4f53caa2884a8d830a62c8ce099
+MISC ChangeLog 171679 SHA256 1eb60444385249a6a7030866a19f96b94d4e8fe02da3bb8525edd92c8472891c SHA512 2edbf6d5804b38e0065116965dc2a6a593444fb4dea260d90c92af62eddebbd644681572324d6184f870082fea7b32e274baea32f1b169e09f0202c1de0af4c3 WHIRLPOOL 1ec1bdea56437974b37079f9de78eebdb337f0fd2f1482f35e176e0e1b629ac76ba9425f4d775b07fb96d96c29b1f4276446a0d00d031cc8551fc99194e3c831
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20150610.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20150610.ebuild
new file mode 100644
index 0000000..a5c36da
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20150610.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-10_00-01-56/zip/netbeans-trunk-nightly-201506100001-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 75ef3d3..a6e209b 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_p20150610 (10 Jun 2015)
+
+  10 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-profiler-9999_p20150610.ebuild:
+  bumped to the latest sources
+
 *netbeans-profiler-9999_p20150609 (09 Jun 2015)
 
   09 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 814c0e1..f766ec1 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123
 DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9aea7ed9f8b11cbdcca02d11fc314c4ec32c015cbd605344644 SHA512 c69868f00a50d9d0f1744137a66c4944330d4c0f7a7b58f13d3e7c72fbd7d31fbe97d3d98cbb4011e4ddf5eaf637991d7a4fe1d32fb98a0627ed28012ebdafaa WHIRLPOOL 89e0b90e509f4771366e6baddb861f4c922f9d5f8f0c5561fcb89e78466cfba40e2d657743ed142d12e7778a796ce049a03703d661660a1d540ceb4798e51b61
 DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 DIST netbeans-trunk-nightly-201506090001-src.zip 207886954 SHA256 ae0945f940a854d3314f1be40e4f915788eaa7902a71ca7ca645456236230f71 SHA512 61b3be2bba95f4a08ed4fa340d441c3f01ac9de230c8125b94a61adb47b0c09e312e0c75eba3ff4eb446468d00982edf66b7fa709263f50cae6690da85d9ac66 WHIRLPOOL 16a5f826bfafcf74c32fa3e6620825fb0287b904d9cc9ad76aa24001731c83029d641ec658559d6ad479b1169e49512906e5aa2c8df806d6e695da6af41f141f
+DIST netbeans-trunk-nightly-201506100001-src.zip 207888598 SHA256 ffbd120304de4f26f654fb22f4eb73ab9778b7795204002270a69eef6be1ab55 SHA512 c238bbc661698ca4b143aec8677f64a26191703175f1096d4e662e533e59dc13f08ef85d81e70e2ee104563cde8b026befb192b660604230cd53ac4cc23a2c9c WHIRLPOOL f8682cb4006efebe7f1a750a6a76734e95e4ceb5529b3cd47c01b6ffd4e4d3594e25a043ed8b21d510655192f85f88dbaefe85fcbe4d42e5123bda3c81c7ecf7
 EBUILD netbeans-profiler-7.0.1.ebuild 3222 SHA256 b1bab800a27c30aaea26b8ff5ab21abdd1bec16b9890133429eca9ea77c018fe SHA512 d6198f44a06561b7e2598fdd6a37f8a3dc13c38f63dfbf6a86a083adbf71e9c62af87cb4e1b5b8dd2dc99feeeb99a7afcbb8f7747c378ad92c71263cc91a6c54 WHIRLPOOL c62613f511636b1f0393ac32c6b50641cdf7df9f9fdc95fd5acbe1a602ffe42fdabb556f989552b05b0607a5ad9d324a2019440c3ae66c50995ef3fc8775f385
 EBUILD netbeans-profiler-7.1.2.ebuild 3231 SHA256 94d87bf6f86add3bdc27f9f20084f35fe584fc2bd697acafa8c23cce16a0d1ee SHA512 dcc8da918a6b6e07ccae513fb4296d16891e205b49098fb8269d16beb9b1367b1920797cc78053b83f4321c1b69faa393365265c72213bb2abfb9d3f84f66319 WHIRLPOOL 18325a1df836e7242838920483c41d43f37b9dae8322d36a2a562b414baa0dc76971f581204ce76a6d64196dd60643089e8704da69617590cda61ce54ce82e8d
 EBUILD netbeans-profiler-7.2.ebuild 3214 SHA256 ddcba9ba672ad566ef256538fc8631ae691aa7c6574269199f26df5382c37f4b SHA512 1bb7eb95381861b8265ab366fe3c7a9b99971d1c4600eb6c7bffb521f4cebb32bcf3d662f82c811d47fe95e77cd39e48f3665f0fcabf9145eb171c2746d89684 WHIRLPOOL 7f74c2be9ec4e7ff419086f1da3b1a12b1c187102def004316ef89ed28f30da62542ed3409a51473a8d9d68d18a30de36b1d0307cd8eeb7e580668fe896c5aa5
@@ -60,5 +61,6 @@ EBUILD netbeans-profiler-9999_p20150603.ebuild 3478 SHA256 ce39e74cc381dd78c7163
 EBUILD netbeans-profiler-9999_p20150604.ebuild 3478 SHA256 4b1ce387effb3c87747d941793546126996bb969ef4576b7bde52799e059b58c SHA512 58e654a791b22da498920e455b58aa6738fac43ffe2ec51f2f948e9c33980c8abacbdc89b56d4a546cddaa532048159cb07955900ee7821eb15bae48049a71d7 WHIRLPOOL 5ff07910b825bb386b6a81defc36783571c95e975b68d684a0f534d294902d8aefbfdbab83c72a28237c8b2f509a97127c3eee5d8044357f985e5c9a9b77bbe4
 EBUILD netbeans-profiler-9999_p20150608.ebuild 3478 SHA256 d1b533b348106f61218ec72b99fe9073b57f412bd0cd1a5d94beabaefd0df8d1 SHA512 2b84841a66192ad3baa4651051846a6a06c1c5501339e206ada82a5211539d4cd0a180ae326e0e3223278176164d7d099e8038d4228733eddbcde30f2edd3ff8 WHIRLPOOL c898d2ad0bc573cc445c22b78cd9a047d602f11add25472b21b6080586634d0cd733a29e762e132f1e048a53a930ff224d812371b59d5c7793b7479f053be81b
 EBUILD netbeans-profiler-9999_p20150609.ebuild 3478 SHA256 7dd96822235ef01c7cf50609f1d8320b377e8f410d7b59ce23f20770096bbc76 SHA512 28a00b8e794134c0c327eb020fffe1f6e6f0819b4277e8b23fae7934569ffaea6f33e82ab2893650d7cb150ba03504f758283a583db4af3baec65e73d529ea41 WHIRLPOOL f1e9d42b1f4323ff183a7571d4bd7a51852d2eec27e4886dd2bf777ba11bc1d10b9ed50fb277e8d98c80aafa8a4850ecad7d7bfba8441923a1574dcefdf8fd6e
-MISC ChangeLog 170963 SHA256 ca86aaff005f08e5f99e4f86ebc8c5f9cda63a36b600484d5d3c0456987c3526 SHA512 28cc71bbc3bebe5158621483420d4bda747a8328d4f3b7bef9d6c82448d0c1490f11c24718c250a5bac57a892d07ccdaee2ef44ac9564331ea243f616331d978 WHIRLPOOL 513e2d58244d148a64cd86201fb885c050efe02dfa5b02e2277726d217621f64907567f62947254186dbb8f25c68c63ea840369e2cd4f56fc93adf6fe0445b7a
+EBUILD netbeans-profiler-9999_p20150610.ebuild 3478 SHA256 a3717d98e4328942703517006834361a990b91847c2add7712230211859736e3 SHA512 f527bf9ae359474b7a450bce67391a989a5be8cef6d5bd7044eec7e73d94fffbd833c2bd1f62edbca695d21a0e63ee2b6520a2439d7c6c264846a0ec3e5c3380 WHIRLPOOL 996deb3e4afe5e58fdcdf1c8081f7efaebb5e76745294e4d59ac2a7223d6f756d762afa61dc371f93ce3485809d1e5926d3243304ef2e63e4f4e1f974fa80816
+MISC ChangeLog 171140 SHA256 aa35c98e97f5dc652098f39c4084e08f375327180ae62596346a05876c361d38 SHA512 ee0a2c8316e9e53f3d65a2674189cd7ee883b90be6149cb6d8768a4eb239bf01214477150a245151eb18bdeb41d3de1605ff4675e12dbe0caa0269e76c4b5625 WHIRLPOOL 875a336530a4c793f43328aa993bd2e9de49b50ae791d0416b1af1a1cd772215eac2310a4a9b2224ec0b10168d4e831b6acf523b0f7c1266e02d63045c13fba6
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150610.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150610.ebuild
new file mode 100644
index 0000000..ec59e30
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150610.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-10_00-01-56/zip/netbeans-trunk-nightly-201506100001-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 f58584e..ddbfc05 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_p20150610 (10 Jun 2015)
+
+  10 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-webcommon-9999_p20150610.ebuild:
+  bumped to the latest sources
+
 *netbeans-webcommon-9999_p20150609 (09 Jun 2015)
 
   09 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index cc2455e..3f6b986 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123
 DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9aea7ed9f8b11cbdcca02d11fc314c4ec32c015cbd605344644 SHA512 c69868f00a50d9d0f1744137a66c4944330d4c0f7a7b58f13d3e7c72fbd7d31fbe97d3d98cbb4011e4ddf5eaf637991d7a4fe1d32fb98a0627ed28012ebdafaa WHIRLPOOL 89e0b90e509f4771366e6baddb861f4c922f9d5f8f0c5561fcb89e78466cfba40e2d657743ed142d12e7778a796ce049a03703d661660a1d540ceb4798e51b61
 DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 DIST netbeans-trunk-nightly-201506090001-src.zip 207886954 SHA256 ae0945f940a854d3314f1be40e4f915788eaa7902a71ca7ca645456236230f71 SHA512 61b3be2bba95f4a08ed4fa340d441c3f01ac9de230c8125b94a61adb47b0c09e312e0c75eba3ff4eb446468d00982edf66b7fa709263f50cae6690da85d9ac66 WHIRLPOOL 16a5f826bfafcf74c32fa3e6620825fb0287b904d9cc9ad76aa24001731c83029d641ec658559d6ad479b1169e49512906e5aa2c8df806d6e695da6af41f141f
+DIST netbeans-trunk-nightly-201506100001-src.zip 207888598 SHA256 ffbd120304de4f26f654fb22f4eb73ab9778b7795204002270a69eef6be1ab55 SHA512 c238bbc661698ca4b143aec8677f64a26191703175f1096d4e662e533e59dc13f08ef85d81e70e2ee104563cde8b026befb192b660604230cd53ac4cc23a2c9c WHIRLPOOL f8682cb4006efebe7f1a750a6a76734e95e4ceb5529b3cd47c01b6ffd4e4d3594e25a043ed8b21d510655192f85f88dbaefe85fcbe4d42e5123bda3c81c7ecf7
 EBUILD netbeans-webcommon-7.2.ebuild 2665 SHA256 9328ea550dfeca5be5c2b03aa5f512d451f1673e49a40994155fca0b2fb2f79d SHA512 d8b80b79e78769a70d01605a79a8a91f7e839d4138b4cbf28cafca6f56ae3d7003c2f5f40aff77bbe3f2882f43a7d7dca3f0428f0f2723a42ae5b49e4c71ffff WHIRLPOOL 31254cbd2fc6cfb2d1bed4d22958595dbbf73032439f19e684463efbe466ee80c144f77ab00ced7a07815b1cdc1d45a87ceda83e7a2fd20ac2ce65e45d30a093
 EBUILD netbeans-webcommon-7.3.ebuild 2986 SHA256 327c0a73fb20778d9fbe4a12024fa065e4102a7aff3fcbda7448874656a46420 SHA512 3d270e940424b3bcdc8c7f8ff2016d33eb55420ac4037f4e406b688c2acea1b07a04625772265ac293d80c0d1afe3bbe6f865051ed9234b700619bd0781d8b39 WHIRLPOOL 5bc288949ed3aa9c3c4cd4cd33b817fe317754229ad30e80da8cfea817bfb77e988a1d6d3280aaef90619968e0309fad212deff0f7970f04438494a893a30a5b
 EBUILD netbeans-webcommon-7.4.ebuild 4727 SHA256 54a0b63527001da34a21ae3ed69c2cfbf9a446ee69bda4bb6ac5ebb939ebb68d SHA512 96895c972cf7092426ec8bc06dccc6ab4f33334da4e67fd4da01e586801110bda8d955f2f29ecd93b8bb58ae64c4af4139e9954a784c10dec925e2beaeab2394 WHIRLPOOL aa7b3b59d315bd37553052470b1f56f435979569e5ef033493cf6f93c29827f2ecd30f6b874f07a0cd8824469c6546982ac3ed360bf3b6cbf211d95943a3398a
@@ -64,5 +65,6 @@ EBUILD netbeans-webcommon-9999_p20150603.ebuild 4997 SHA256 737abbad2db0969800e1
 EBUILD netbeans-webcommon-9999_p20150604.ebuild 4997 SHA256 9156b46ccc1937d0671d8558cb6e25f82655ca2f0bc8298aaf8fa8db47f27a9d SHA512 e5c863306951ce35d5a7a790d1f6a5591177907c8a316c8cee78e7f51223ed37b020644905ac4493d8b4a8ae3699bd5f70568406ce610b70ec3032a8cfd1b0ff WHIRLPOOL 25575267c3833b6de29eba263faf4c36f8ac5a08795be66c872e9a5237f8a6dc144fb084c826e1cc406caf35c5ab130dfc8fb467224a062628c52b88db474792
 EBUILD netbeans-webcommon-9999_p20150608.ebuild 4997 SHA256 f470f52b2580da76df36ff2836d3b345eee45b30588c0c842aa96939774872ce SHA512 8b7e4a3931b65857b88944f762bbc8f0043108e37a7fd35be5ac76bd5482a3a358d53c5cef19534b3b159a7944db6818bf0affdc4a2b4bfce76094626bd8805f WHIRLPOOL 90d18b1491df605fe664de57c6626968d09ee7c9740aea94e2dae7fd68203ea52411d21a70e5f8156293e5afe4c729aa9ae5e76520ad9bd018fbfde789c1c122
 EBUILD netbeans-webcommon-9999_p20150609.ebuild 4997 SHA256 d8e0d173d66255410f7affae31c82ecec63b733d9a86f1977bd4ac77e5ed09f5 SHA512 289cbccb65686a549b06061abb6f48a0f2a4852a7191b9a8144c46e4e2b2d26889d6d9512e7df7484b3019be423de7eb1a0287a2abe3807609459d7f2d198b9b WHIRLPOOL 465cad540cb7cb2f0953fac34b55a5c6db05388daffb8743688e9c909710e4857932df00d1fafdc574756a67e22a69f245de3ee672b8fdde64e7abbb95a4abda
-MISC ChangeLog 144080 SHA256 8e6702125cd11e1df4d3ac819543c51401a8cf6cb9e62ecb4cde9eef5bfb5c92 SHA512 5cde28d2c60c1c5325492476c8d4aa23b01eb3ce1d9f384328acd12b3440dd5bc2844a37aba9e257b79ede0b59f06beb7db15bac7246f628b6465a3b904d3010 WHIRLPOOL bc2a29c5cbfb060b0bd33b9adade6e2e47cf312b502deed35dd69a7562e91af7268b29ffe9cd95e83488f7765465cd66edec3470ab3761743602060e3fab3f7b
+EBUILD netbeans-webcommon-9999_p20150610.ebuild 4997 SHA256 3c4810e6dc719c17845478dfddce950e1f73a97994e9d9f18f9f347bcfc21ec0 SHA512 f4151a6b86a9b2332e362a804cc83b9c1642f016446191cfd8d7eb155f9772ded8629f0893e9f03110d684a31568e8c0952c4243491d8fc58fca3dc296750185 WHIRLPOOL 8156f3867bd51dd95df4c6d534aacdea3cf595e45f12dbbf6cbda00e28a5194526b73c2d640180ae8011c6e540102e9f50eb3ff22a493e260924137932ce0aa5
+MISC ChangeLog 144259 SHA256 ad43f6a477aaf60f47afad599e76d5d21b6000813383d6c9d2096e1a6fe39e7b SHA512 ff101b229974f294eeae4acaac9caae2fe14a9e15372114d9dca99cd1f47a32ee031c2c5cc3ce87b9794e59421761aad8e3413e6eb851091e14f9173241795b4 WHIRLPOOL 4dc84541ee32b7e7eca7c16a799fd6598d48654d5b705e981fe30fdb5d40f7d4467163d545a7dc88fc82479e2ee01e2bca1bfb70f61f2038e5d31736d5693624
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150610.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150610.ebuild
new file mode 100644
index 0000000..93c3a59
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150610.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-10_00-01-56/zip/netbeans-trunk-nightly-201506100001-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 45e8d65..4cd83fc 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_p20150610 (10 Jun 2015)
+
+  10 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-websvccommon-9999_p20150610.ebuild:
+  bumped to the latest sources
+
 *netbeans-websvccommon-9999_p20150609 (09 Jun 2015)
 
   09 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 29179db..e11acaf 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123
 DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9aea7ed9f8b11cbdcca02d11fc314c4ec32c015cbd605344644 SHA512 c69868f00a50d9d0f1744137a66c4944330d4c0f7a7b58f13d3e7c72fbd7d31fbe97d3d98cbb4011e4ddf5eaf637991d7a4fe1d32fb98a0627ed28012ebdafaa WHIRLPOOL 89e0b90e509f4771366e6baddb861f4c922f9d5f8f0c5561fcb89e78466cfba40e2d657743ed142d12e7778a796ce049a03703d661660a1d540ceb4798e51b61
 DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 DIST netbeans-trunk-nightly-201506090001-src.zip 207886954 SHA256 ae0945f940a854d3314f1be40e4f915788eaa7902a71ca7ca645456236230f71 SHA512 61b3be2bba95f4a08ed4fa340d441c3f01ac9de230c8125b94a61adb47b0c09e312e0c75eba3ff4eb446468d00982edf66b7fa709263f50cae6690da85d9ac66 WHIRLPOOL 16a5f826bfafcf74c32fa3e6620825fb0287b904d9cc9ad76aa24001731c83029d641ec658559d6ad479b1169e49512906e5aa2c8df806d6e695da6af41f141f
+DIST netbeans-trunk-nightly-201506100001-src.zip 207888598 SHA256 ffbd120304de4f26f654fb22f4eb73ab9778b7795204002270a69eef6be1ab55 SHA512 c238bbc661698ca4b143aec8677f64a26191703175f1096d4e662e533e59dc13f08ef85d81e70e2ee104563cde8b026befb192b660604230cd53ac4cc23a2c9c WHIRLPOOL f8682cb4006efebe7f1a750a6a76734e95e4ceb5529b3cd47c01b6ffd4e4d3594e25a043ed8b21d510655192f85f88dbaefe85fcbe4d42e5123bda3c81c7ecf7
 EBUILD netbeans-websvccommon-7.0.1.ebuild 2692 SHA256 a18cf7fe0a1e38749826cb12651be06c210b038be50117647496ee6cbd184cda SHA512 32b32894713d7235ebd03446c5c411d22eb8701b96e3d3ac54eca78b2abc833babf279085cea3b74bb7bddc6d89a283a21c58a0b0462042ddd10e22dfcadeb84 WHIRLPOOL 59c18168245767acd1f8e53046f8942698237aa6fd903a669c626b7f17cf3d39247b7ae57f2984562230267885a4b6a62be43dc8a330f1dfeb2cc7acbbd7d3c6
 EBUILD netbeans-websvccommon-7.1.2.ebuild 2701 SHA256 3b2a1cf0d32db3c55b66d1c6b8c4ae2ad5487d3fdb27752468ce5c860f9b9515 SHA512 b9be64755f00157c2d6984887b8c0fdc1e34470f21df1fd72b3e399d3ec894af01c9b79fd604778213ac2086a6c96bf66366e8c2c8bf97f7fee23d16ceb36974 WHIRLPOOL 91559de8c8f6391c3c69888854778a91a1a7e0052ae69eb9762bcbd64d8bc5587fb84ebb55d7d0375da5a7855aa8672abfd035b6a38b3eeb5c23a4cd59b3cdce
 EBUILD netbeans-websvccommon-7.2.ebuild 2684 SHA256 8bf8cad1e0469713c63280620fed089600191230f501a78b834b010f8fa9b3e9 SHA512 fe885f92a7c6cfac532c8e40e4df6283253c43294e9d82ee4d0d070425496eee3792479c268b46bf1fd484f753ca1f21e7ca38a5d71816b6d4fd219082e8e276 WHIRLPOOL 9d2d622d4a800470c874d8751e9c2055e0a4ef72ad01a01aefda4e95a7f295d55fc95fdb55fdd1f631212e1f610bdc7a6b4ee631b92492bb85f73b0d9fb4ba26
@@ -60,5 +61,6 @@ EBUILD netbeans-websvccommon-9999_p20150603.ebuild 2727 SHA256 a9755a774d305ba7d
 EBUILD netbeans-websvccommon-9999_p20150604.ebuild 2727 SHA256 279e6e26da36760323730eb935aa5acf60a4cd9eb6fff1361d1bc7a7bef71f19 SHA512 bea24aa43bdedca2122bdeabbccf7c33700fccea438deb8a3110c00026c429f3098a0c1b4a09077db3706326e144c52e7f8c16aeba9595cb1411dcff3a0c4a64 WHIRLPOOL 0cba8be12b4fa5c1076555e6372f292981a3f97d3e16d6a15d150ae7837618a3912847e7d8b8b4add3018d52cb5d1df70b28096bde4814d60d82a99a42af4c22
 EBUILD netbeans-websvccommon-9999_p20150608.ebuild 2727 SHA256 7bc4ecc4478b440d3a8988ba0737d1f6f3eaeae276a04e466ede6ee83674c7f9 SHA512 634ca980e020854c5bf8940e4d11c6ecf62932186f20af5cc946bd36cf621989b2359eea534c49817aa715a3d064bb9f5587fb6b8d1708b996d4fc00b65a9f8e WHIRLPOOL 26c0b79318137999a80305180b17be026ee7e22a7787f74b2fa98930bfd759afab9696512153b32fc54accc7c0c138d8d60f0b4ddfe9c0fb0c151a12d5483a00
 EBUILD netbeans-websvccommon-9999_p20150609.ebuild 2727 SHA256 a605e36da4ebcc31519fd3782526eb38660047d8cde87706837502abb309e165 SHA512 238917cae4bba6f27675a78f66740f3de805d41c2006d9cdd9eeb237693fb26d1beb762a4bb3635aae1e2ce44bf69952a4a7ab1a6b1631b77e649045c7052e1a WHIRLPOOL 4dae45a516537e362dbf0f05c43dd61688b35f2ac87d4f574a15b6835a34c317e65eaf5ca6a4ec4f15bd1119aac1b5c55f3e2761de932c54431d10d23e882c7d
-MISC ChangeLog 179172 SHA256 dcf838fe5dc28e08426f26893ac19c483489587b26381fd35e233c543825bb62 SHA512 2c7eb887ed5b3c365ffa937fc10a141dc27470f062eacf1f315cf2f0ea076bbfdd777514d42396c0895d4f98ec3fd33d0f876acbfe938e27ed3cdffd1f88c8e0 WHIRLPOOL 3972ec848292bfab1297f6226b236a9e3bd23c013d9cf54dca6b68550ba145bc6221ae1e46a175a67819be3b57885db4bfd4ee7c9b07f0e4e09a19e489230989
+EBUILD netbeans-websvccommon-9999_p20150610.ebuild 2727 SHA256 a932256c72ffba50aca1fe816e2e929ff8acc1699fe0fe6f70f9d707f0d9c134 SHA512 2bc302e82d1b8dfbe1b4aabbce14969921ef0da1ad3d9b7a650dfdb14b0bff71d8262b1324b3edd530741b57d14dee9a6f348f57ba9074b6c434bff959c0b810 WHIRLPOOL d4e8301d1e2eb56ce6e50327ff9f2382bd24f7c4cc41fc58f2bba683df5ea5021e785ddca2a5d5d80b2686c2104767b888ffdd62d67a094d2373ea6fb7d47083
+MISC ChangeLog 179357 SHA256 f3b31e3ddbe3ef2a80bf57127e426bf6885268392d611617ff6922e598288ce5 SHA512 f2a8a86895ff67fc8cb599113b40d09be9333c9d957fbb1afe2a105375e6a41b00644877cfd4583c2ebc2cd7c152ce6e7bd7db70ba26e5872a53b3e96c25fdc7 WHIRLPOOL 6136ba1a80e5ebbfea47e6431016680f5186a949d6807ecf105523fbea9bd9a969dcf590d4db0e63396b6d683eceb7f5f50734c6569d5279de496d450b8daf38
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150610.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150610.ebuild
new file mode 100644
index 0000000..b6b08d7
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150610.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-10_00-01-56/zip/netbeans-trunk-nightly-201506100001-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 1dd962c..e9ce002 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_p20150610 (10 Jun 2015)
+
+  10 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-9999_p20150610.ebuild:
+  bumped to the latest sources
+
 *netbeans-9999_p20150609 (09 Jun 2015)
 
   09 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 40e89b7..af9e387 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -41,6 +41,7 @@ DIST netbeans-trunk-nightly-201506030001-src.zip 207796398 SHA256 5928069eac7123
 DIST netbeans-trunk-nightly-201506040001-src.zip 207803760 SHA256 2bff80f7e693d9aea7ed9f8b11cbdcca02d11fc314c4ec32c015cbd605344644 SHA512 c69868f00a50d9d0f1744137a66c4944330d4c0f7a7b58f13d3e7c72fbd7d31fbe97d3d98cbb4011e4ddf5eaf637991d7a4fe1d32fb98a0627ed28012ebdafaa WHIRLPOOL 89e0b90e509f4771366e6baddb861f4c922f9d5f8f0c5561fcb89e78466cfba40e2d657743ed142d12e7778a796ce049a03703d661660a1d540ceb4798e51b61
 DIST netbeans-trunk-nightly-201506080001-src.zip 207879725 SHA256 045df258f8ee5b3dbb0464731067053db0fc2edd7e42b464946ac5e0ae4fdafb SHA512 1dd5b616893e70914c1f66715158a0dc4ba79f423f32d84132843d03cc2c7ff171a8d6cad82ceaff7e139930ddcca625034860c8d02ccde8c33aad03b278463a WHIRLPOOL a8100c51192a34410cbab0b36f5efeaaed4e9c416822709fe3144ec6cdef8adf9fe018956853420f674ab7a5cac1fd5a1f81bcb8759764dda99196d8bca0e86a
 DIST netbeans-trunk-nightly-201506090001-src.zip 207886954 SHA256 ae0945f940a854d3314f1be40e4f915788eaa7902a71ca7ca645456236230f71 SHA512 61b3be2bba95f4a08ed4fa340d441c3f01ac9de230c8125b94a61adb47b0c09e312e0c75eba3ff4eb446468d00982edf66b7fa709263f50cae6690da85d9ac66 WHIRLPOOL 16a5f826bfafcf74c32fa3e6620825fb0287b904d9cc9ad76aa24001731c83029d641ec658559d6ad479b1169e49512906e5aa2c8df806d6e695da6af41f141f
+DIST netbeans-trunk-nightly-201506100001-src.zip 207888598 SHA256 ffbd120304de4f26f654fb22f4eb73ab9778b7795204002270a69eef6be1ab55 SHA512 c238bbc661698ca4b143aec8677f64a26191703175f1096d4e662e533e59dc13f08ef85d81e70e2ee104563cde8b026befb192b660604230cd53ac4cc23a2c9c WHIRLPOOL f8682cb4006efebe7f1a750a6a76734e95e4ceb5529b3cd47c01b6ffd4e4d3594e25a043ed8b21d510655192f85f88dbaefe85fcbe4d42e5123bda3c81c7ecf7
 EBUILD netbeans-7.0.1-r2.ebuild 6736 SHA256 e808fba2ddb516270d93b5cf67cff60d98b37ca58a158878f2e3b3ad696cfc82 SHA512 653fb585d9eaa20fcf88d778a7f34d63c9f29f2af2153a432fcab6d977ef9619c699b19587a48b148ccf717f4b31a43859b81cff80d5d84ad273c5fa16e8f565 WHIRLPOOL 257f2466c3ad198a05db9d5e377cad2707f8a4daf1f421e516d7435670a85fd4bb5f6b3ab657ebda8cc23937e1b4e1f4acce8cccd85bccddc5a7b1f9abbde0ce
 EBUILD netbeans-7.1.2.ebuild 6976 SHA256 4222e248dfb664ccfea85d4938ad691d3685f32d8e9b33289d1dda088057261b SHA512 cc0a20bd542b61621fe08d5413611f7bcbbebf0c37d5f67c590c31324e74eb5594e72efacc86d843ff3abffc98c4859c2733c63ce6f993baf51e24d69197b64d WHIRLPOOL 30fb7b0cbf22fc39a8dabefd27a0073ce73e62ef082d55839fb7f815bb73bc5c3c24c3418ce175f355d7c64138ef7e9616da41c68b3b57a70353d16c6113daf7
 EBUILD netbeans-7.2.ebuild 7057 SHA256 29140b2779f1a24722499605101c286d05415b4f97d2363afedef711cc586067 SHA512 0776f530f9530c533b13019f7b34fc664990a16926bcff768d0a9f3b9035de82dcd2ed66425ad8da27c65aa69fe3e6be966e0a1ee1bc222949e5d42e14f7f7f1 WHIRLPOOL 9fcb95348171fb0bd8d794b80b51b2e3ce36fd84ccc81653bdd0172cbfa99791e527b33c895ebf7b4d81c228f17d4afab367eb55ceffe28df835b2d09dc8f778
@@ -68,5 +69,6 @@ EBUILD netbeans-9999_p20150603.ebuild 7216 SHA256 46251a2ff40cfb411973cc76556f3b
 EBUILD netbeans-9999_p20150604.ebuild 7216 SHA256 06a59be2e208bc610695eb3a27c6bc662eb12796c1c21587ab37f0299999ae71 SHA512 e1c37b1a71b7e9fe115103238937d4a421fae8eb78b4f4dcc71b71ea86bb931a71cf26790ae5938525ba233b5e630adb8c71eaf04e2d0cc7298987d1110981ea WHIRLPOOL b825a68c2f73218a2eae7e6fb3b526deeef9d30bcd5c7410d7253b0950f6e3fb876d616cc29b12f8780f111fe47d6f9d03ca441c8975590c74186edddc091518
 EBUILD netbeans-9999_p20150608.ebuild 7216 SHA256 e8fceb97a55aea7179726636c49b018eefc62ed0b2f8798e5391760383afbe71 SHA512 bac3f10ed7edfb9b7700c227c93189cb2f96f6b9d741bdfde5c62fd076c87cfac471053a3f0c5d6ec2e4040c8f8d18788ab44955a8208914b96a062c13ebdd87 WHIRLPOOL f9151e1b34f100dcd7b92ca1e9a8e812f0d7fed0e6e84f2f6cb6a85c92077e493f98e036e79a5e8a6460eea7c19a605d187698f27a5b108365432ac3b0f0530e
 EBUILD netbeans-9999_p20150609.ebuild 7216 SHA256 5dcf28a33c80d67d6db66e4e3b60140ee64e379a6590e3f475a64d2fdf57d247 SHA512 a83fdc4d9432c8f618d9a6566d36db9acbe97b9c5b4f8326788a2c3795efd021055af23c2cc1737574b7ce4c21f424ba897bf816f12a550ab7acf779879fb566 WHIRLPOOL 3a5be6175d842940ddaf62d3af54f2606178d056ba4b95c5603a2b9ea4fad2357bf89e0aae925678ff4c1070965c7d77f740f5e9a562e9ce784734ac2b3e4cdf
-MISC ChangeLog 152239 SHA256 7df010f4334963c9240fe7fb390ba7c636ab85ecb5abb77c2321e809807dde96 SHA512 756b5769b5dea95cd3f7f3e8b36171381ca5ba3831996126c4e6f8010b382af9fae7ac666d883a5ebfc25ad0a775929827c463a68dc7d77d3dce0a40eb7a5584 WHIRLPOOL abe3d60f095ac9fa062b6b691487983090083b0d46ce0f0b729eacdcf771e04a226f2582e1921d3e6bca9841a4cfe29c9541399cb7f6786012ad013f3c061e79
+EBUILD netbeans-9999_p20150610.ebuild 7216 SHA256 18a284b32e9682f4a07f59243f7f0dd5f2c8782640fc5eae2429c2f88bbe4f55 SHA512 22c09f22e9f12ec1901af9eb2874926f929f6255eeea730a1573b368cf4dcdd47d8631a61f7394342cc50469bf66350f9e30caca00b3186474338c702b779862 WHIRLPOOL 7b6200ffa670ac4423af0faeb280bac46e6653db3a9e59415666fb1edd4f26249ed31744d0b7c6d66683fa871193a6e11d95dcc9befcb7dc8a272985c825e7be
+MISC ChangeLog 152398 SHA256 045336592fb5a9a713c6ad39ae7bd161a1fc83b79d5f435f1f2413e39a16bedf SHA512 4cb53a1d9b7479a6b0c064ecf5e2844e95fd9d8c9701e39c682545d706e36f636785f3eff473d3eb36b0b4bde22d005d9f66f386ba218766159c76380d69d3c6 WHIRLPOOL 803846708e041a1df4a7713c915ea7af9e6c410541d396b7860a8145c848ef123f6ad17712ba28f01985c38f171c7399a6dce489a3e8a0372df278f90c1f8855
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

diff --git a/dev-util/netbeans/netbeans-9999_p20150610.ebuild b/dev-util/netbeans/netbeans-9999_p20150610.ebuild
new file mode 100644
index 0000000..9f192a0
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20150610.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-10_00-01-56/zip/netbeans-trunk-nightly-201506100001-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
+}


                 reply	other threads:[~2015-06-10  7:38 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1433921882.5ee4e9f37e2807a7945890c1f1dd1f5906db2fa7.fordfrog@gentoo \
    --to=fordfrog@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox