public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-java/, dev-java/netbeans-dlight/, dev-java/netbeans-groovy/, ...
@ 2015-08-07  7:49 Miroslav Šulc
  0 siblings, 0 replies; only message in thread
From: Miroslav Šulc @ 2015-08-07  7:49 UTC (permalink / raw
  To: gentoo-commits

commit:     5fb3915503d01435578da3a1fb0bfeaa93b204bb
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  7 07:49:11 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Aug  7 07:49:11 2015 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=5fb39155

netbeans: bumped to the latest sources

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

diff --git a/dev-java/netbeans-apisupport/ChangeLog b/dev-java/netbeans-apisupport/ChangeLog
index b18e9b5..797a749 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_p20150807 (07 Aug 2015)
+
+  07 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-apisupport-9999_p20150807.ebuild:
+  updated to the latest sources
+
 *netbeans-apisupport-9999_p20150805 (05 Aug 2015)
 
   05 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 88548c0..78bb178 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201508010002-src.zip 208741865 SHA256 2ade7e4e9f2b80
 DIST netbeans-trunk-nightly-201508030002-src.zip 208748030 SHA256 933445356a68c17218a1e5d047568b7493208f5e4ac5cb083b6c0c840080e08f SHA512 000a443f1e02911e29996d0ab6021863faf1ea3649cb71dff7df5c262087dda663d4d670f64a238df86220fb1bf0fb713a990bd78671077ac86d5e0c7d0a52a6 WHIRLPOOL c71739d059f35e7f3f6b301f7291f8ddec3d286eec918a18f9ce924068f1ff84a3138c50f5c59d4efb297b5aa8c748988c6695656deb47a4fe49fcaf35b86bd3
 DIST netbeans-trunk-nightly-201508040002-src.zip 208761490 SHA256 b001f001aff1c4a6e29cf289beeefea7e766fd278a7144a028970bd9b65b0459 SHA512 87a1c41db0c76a01150c08247dc76f397e0e9ac2d87ff3fc5a6f7d91265812bc8471ae87edd781ea2518c8b47f48ad374b4fddccb38ba1ef888e001c3b295224 WHIRLPOOL bae5b1c4f71cb87f223d8232c29da2fdfc3a3482db42cd3783f2c249aeb7c409f2b40fe815e290006797307a5ba296316f21a44988cb098659b6d1969359c371
 DIST netbeans-trunk-nightly-201508050002-src.zip 208776240 SHA256 740052c5a604bf1908a1a6643ce9b5b1b43b92291544a59a68cad2378b5734c6 SHA512 890f8967825f1eed1c3bc265fa2e359d258fe8e502469b463de8878070d350463f4f5cc39bb2a5c0a65e01cdf989497038373879e1d55904047868e1d6511290 WHIRLPOOL ef52d09526d51662f243f55f3ebd143c8902fc3dc5d00c9507250881abf9ff20239a1c017b951ad9ae08c32f3afa057f2a7a5d6e27bab4072eb3ba1b7caf96d5
+DIST netbeans-trunk-nightly-201508070002-src.zip 208777237 SHA256 3f1014a410386bb7b1fa0772db4a7fc9bf6cb5f0177868ce727daf6b6029a89c SHA512 6de45ad0050121f9510b7daca7701328698ffeea7a8c8204c06458caf978246d7a0a0a576759367d3966933b063fc630e7d710595cefc934e3637c7792c94267 WHIRLPOOL c7ec2e93ce0b71fa6fd39adcb3b1ef122c0961378939074ec837dd8c393ec3c60475cfc26238408a07aa1e52c735d06275c9616e5fa007ca915c413765de294e
 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
@@ -54,5 +55,6 @@ EBUILD netbeans-apisupport-9999_p20150801.ebuild 3390 SHA256 b07e5fe4a1dbbe58da7
 EBUILD netbeans-apisupport-9999_p20150803.ebuild 3390 SHA256 79c1d9ea1c5125f5001bbbd962ff646f39f239a85dcd3f4f755ec1a7dd6de08a SHA512 b71e4a81aa471d030fa71f8e9634d6e0eb58c359624af19b47125125f9b528381b7eb4ffef3032f9896f7b9e475500c54e0c47ddc53a89ea9ccdcd44422af87b WHIRLPOOL 27c98bbe09ddf9073ead7c827123ae0eb9fcc8a061c340a9d53f03a17c994d792251a3e648c919a0d6264735d225120d375119e49d8ee75cc2c8c062532315c0
 EBUILD netbeans-apisupport-9999_p20150804.ebuild 3390 SHA256 8cabcfdc6dab27b4a985146c920a00cdff2d8b57b283a6829d127c30a8eb6bec SHA512 5e0822cc8581cc90ec76dba7359f0a337b977c93449876a0cfa7ddfb38c1f084ad33a9d9d7995b7859a5b0fe596777da225dae071dcf3130898dac08414130bb WHIRLPOOL be9dea8ef2f09645f1e913682ca8452ff26df05609fdedca8b88e7e8eb4b13560af5a0d802f8ed54c88941161c9c0b49832cfff5ce09214a9f2940106b628308
 EBUILD netbeans-apisupport-9999_p20150805.ebuild 3390 SHA256 fccc699c513cce60b37a74601e7e50d31a5127670a38ac528b5f8b712ee36481 SHA512 c3cd00c6abc8321a23acce1957ba3b164cfaa99f7d93fccb51d5287a5947182acb9bd7fc5a869714e1d0ecc95693d349260e88b82a4df92b264e71d8eb85ad9c WHIRLPOOL 1379058c661f1b7beb567f0e9dda65a7251d674b52d4959473c297a3a4007854efb7eda230dceaa2fc2816bd8fe233773bb1d06ddfd31a3fdadd59a3c6d9aeda
-MISC ChangeLog 182193 SHA256 a5bfdce0263de09fffd5283d2e090110aef3fca910072ec43448023e6c1acfd2 SHA512 08d09a22681cea9419bb7f2a0aef74960b28872825dd18d5b30e7bb8c2cd6331480e3d86a963f1eb0c00c8af17fa8d7f75d71f8aa1070e677f3554196e5baae1 WHIRLPOOL 8a3fabf7ebbee66bf3c31499d213cb20b4a8a0eb375eb1229ffe8228994b26f2d7f7fed8407975c92284b5d6adad3f2e185f24067cc466b84a7add2966644c59
+EBUILD netbeans-apisupport-9999_p20150807.ebuild 3390 SHA256 f7388007be037d10acd11968ca13a100f77082862d337bd1a91040790d77c412 SHA512 9d8262dd799ba1d966048be2b4f2d8f7b8cead3b1ae30c90cfe92d850a8c09f6fa6236101be68280ab53002c1abe084e7186fb4f43d804646249847e37aba023 WHIRLPOOL 8de77dea1e911254d9fbf843c9c04d90c250c5047355f8740a5532d4bb35e998502b8b2da54d40fff44bf8fa94a1a46c5c7b6be47e3bf007ead7d8774895881d
+MISC ChangeLog 182375 SHA256 4b7b73e2cd2f658d90654ca4d40c2de34a171416ed0c90eacf4b8fa04b3ff9d2 SHA512 e0a63a078bef7ede190fec4cf3f8e4f49ba452346803f04461f4de2eae7465a6f8ed2e5a6d41600089572e307f6b9768b4369b04d8b201bf966a7317a4a0c1a9 WHIRLPOOL b2e64d8484e0a86dcbba6090ba6cc1af7de6d23d69fd5bc7ddcef97c3367cb4267f47e350cba1ff2b314edb130e6b2dbfb1b60284f409b8a59ed69b3bb7c3ba0
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150807.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150807.ebuild
new file mode 100644
index 0000000..8d4d18a
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150807.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-08-07_00-02-28/zip/netbeans-trunk-nightly-201508070002-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 0413162..5023c5d 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_p20150807 (07 Aug 2015)
+
+  07 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-cnd-9999_p20150807.ebuild:
+  updated to the latest sources
+
 *netbeans-cnd-9999_p20150805 (05 Aug 2015)
 
   05 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index 870ec42..1d5b6f8 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -54,6 +54,7 @@ DIST netbeans-trunk-nightly-201508010002-src.zip 208741865 SHA256 2ade7e4e9f2b80
 DIST netbeans-trunk-nightly-201508030002-src.zip 208748030 SHA256 933445356a68c17218a1e5d047568b7493208f5e4ac5cb083b6c0c840080e08f SHA512 000a443f1e02911e29996d0ab6021863faf1ea3649cb71dff7df5c262087dda663d4d670f64a238df86220fb1bf0fb713a990bd78671077ac86d5e0c7d0a52a6 WHIRLPOOL c71739d059f35e7f3f6b301f7291f8ddec3d286eec918a18f9ce924068f1ff84a3138c50f5c59d4efb297b5aa8c748988c6695656deb47a4fe49fcaf35b86bd3
 DIST netbeans-trunk-nightly-201508040002-src.zip 208761490 SHA256 b001f001aff1c4a6e29cf289beeefea7e766fd278a7144a028970bd9b65b0459 SHA512 87a1c41db0c76a01150c08247dc76f397e0e9ac2d87ff3fc5a6f7d91265812bc8471ae87edd781ea2518c8b47f48ad374b4fddccb38ba1ef888e001c3b295224 WHIRLPOOL bae5b1c4f71cb87f223d8232c29da2fdfc3a3482db42cd3783f2c249aeb7c409f2b40fe815e290006797307a5ba296316f21a44988cb098659b6d1969359c371
 DIST netbeans-trunk-nightly-201508050002-src.zip 208776240 SHA256 740052c5a604bf1908a1a6643ce9b5b1b43b92291544a59a68cad2378b5734c6 SHA512 890f8967825f1eed1c3bc265fa2e359d258fe8e502469b463de8878070d350463f4f5cc39bb2a5c0a65e01cdf989497038373879e1d55904047868e1d6511290 WHIRLPOOL ef52d09526d51662f243f55f3ebd143c8902fc3dc5d00c9507250881abf9ff20239a1c017b951ad9ae08c32f3afa057f2a7a5d6e27bab4072eb3ba1b7caf96d5
+DIST netbeans-trunk-nightly-201508070002-src.zip 208777237 SHA256 3f1014a410386bb7b1fa0772db4a7fc9bf6cb5f0177868ce727daf6b6029a89c SHA512 6de45ad0050121f9510b7daca7701328698ffeea7a8c8204c06458caf978246d7a0a0a576759367d3966933b063fc630e7d710595cefc934e3637c7792c94267 WHIRLPOOL c7ec2e93ce0b71fa6fd39adcb3b1ef122c0961378939074ec837dd8c393ec3c60475cfc26238408a07aa1e52c735d06275c9616e5fa007ca915c413765de294e
 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_p20150801.ebuild 4796 SHA256 534a147d634e1e346648e532b8
 EBUILD netbeans-cnd-9999_p20150803.ebuild 4796 SHA256 079b31ad24d8c743a89c42bf7688750ff343db10cdd2f652951b82e8809bc816 SHA512 be5b6a759253a9820c13e2e315ad9605e46d5d8b8087f85fd871a32a331815e11e1c82ecef586e9ffde76fd38a7f9261d01c9f46eacd48690b0893ad5fd2a3d9 WHIRLPOOL 7392955c95ee686653d4e9d0a460018e510a57d91297f37f5d372e3815c30dbd52f48f7e0ebd7b03c1e7de906b952652e8d52029aed8cfffb2c84d83660fdfe1
 EBUILD netbeans-cnd-9999_p20150804.ebuild 4796 SHA256 fd17c8b0d16a51015ce4ce20a0df3f03ecd37199a0c01f5af51f42a4b3365660 SHA512 c886fbe646b94e2f6daf026588549101c4c162a406f522079836f5023195b15b66e549c13eba91cd6cc0b798baa3e29589b00952ffb3973d104470353a47a78b WHIRLPOOL 98e5cf832aaf3b21177c0940213411626bba54ef404130619f052b9ef61a118ae71220031cd49b009033c24d5b5c90e4e9b61a889daabca7bf080c3baae50fe0
 EBUILD netbeans-cnd-9999_p20150805.ebuild 4796 SHA256 7849000f1bef6215343d6345762eb34ee76bf91731e53288af9d89f066e1d107 SHA512 0f48fa12192a14be1d242c10e70dc284545be080da065ba51e67b191808050470fefc3a21e628dcc8045cb1f54ec6d85cc7730f910785f966afd3c3e3bce8973 WHIRLPOOL 4c127aec0408bcbc7e72cf4c8fa1c110f645cb54f7b36a4adb5fc712c2a7c3be8f2bb84fef12fab5f8d9abfd0d07990238b13a390027cf93266c6252f2e85fad
-MISC ChangeLog 166225 SHA256 38419572ed2ede93152dab393a98525503d719f2e99c32cb2629c331af267633 SHA512 709189bdc08d8af1be95529880b623c567763c321d54be8ba5c70a96c10ec3eadf3abb3ba013e2928cc40e1e4ce7ccfed46fd83631ea00ed687a20eafca978f9 WHIRLPOOL 327c2d60e6a4394021e21df610aa07cb292f676209d711f221ef58fa82be4b4c7b22b77b7c87ed7246ebfb506931c20508dd57e670e71fa7de6515099544ce44
+EBUILD netbeans-cnd-9999_p20150807.ebuild 4796 SHA256 7842b549114664616a3934f53476153384c7de6a381ed48c407e14355a010af4 SHA512 e3ad86eb1e87368f066e43ac2ea9bae0daf3df551c43d9ca6dd9052ba366da204eb4d6e11489966b6eb42f7558c26b255646b981b57aebbd34587bac3c555e89 WHIRLPOOL 83d3e1fc55dec305659133d9ef59eb470e879cd7d5b6eaae7f6857519f4a2fa1ddd8363b116d41d851ecff43a203d8cbe5517aa668b7f92901951404fe5fea66
+MISC ChangeLog 166393 SHA256 fadd4215ff4246e71c052f2a357d55af897e78e152362f40184d72dd1005c93e SHA512 def1fac4ed7c567ca5408dbfc2040b2ac438186f8432be380f406aacca705d6cdf4247a48f71da0407b65573ceeaa6091305161b9da533baf352326e9492b1c4 WHIRLPOOL 068fb508793b0262f682300ae3095cecdca073b3e78052b2e3500ee2bc432c68a78743ec0bf5f5296bc2f6f8456ef92b31f33ad5f203fdd5adf47ef32e3cbf2d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-dlight/ChangeLog b/dev-java/netbeans-dlight/ChangeLog
index 07fc2cc..1e5212f 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_p20150807 (07 Aug 2015)
+
+  07 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-dlight-9999_p20150807.ebuild:
+  updated to the latest sources
+
 *netbeans-dlight-9999_p20150805 (05 Aug 2015)
 
   05 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 49b20ff..56a56d9 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -37,6 +37,7 @@ DIST netbeans-trunk-nightly-201508010002-src.zip 208741865 SHA256 2ade7e4e9f2b80
 DIST netbeans-trunk-nightly-201508030002-src.zip 208748030 SHA256 933445356a68c17218a1e5d047568b7493208f5e4ac5cb083b6c0c840080e08f SHA512 000a443f1e02911e29996d0ab6021863faf1ea3649cb71dff7df5c262087dda663d4d670f64a238df86220fb1bf0fb713a990bd78671077ac86d5e0c7d0a52a6 WHIRLPOOL c71739d059f35e7f3f6b301f7291f8ddec3d286eec918a18f9ce924068f1ff84a3138c50f5c59d4efb297b5aa8c748988c6695656deb47a4fe49fcaf35b86bd3
 DIST netbeans-trunk-nightly-201508040002-src.zip 208761490 SHA256 b001f001aff1c4a6e29cf289beeefea7e766fd278a7144a028970bd9b65b0459 SHA512 87a1c41db0c76a01150c08247dc76f397e0e9ac2d87ff3fc5a6f7d91265812bc8471ae87edd781ea2518c8b47f48ad374b4fddccb38ba1ef888e001c3b295224 WHIRLPOOL bae5b1c4f71cb87f223d8232c29da2fdfc3a3482db42cd3783f2c249aeb7c409f2b40fe815e290006797307a5ba296316f21a44988cb098659b6d1969359c371
 DIST netbeans-trunk-nightly-201508050002-src.zip 208776240 SHA256 740052c5a604bf1908a1a6643ce9b5b1b43b92291544a59a68cad2378b5734c6 SHA512 890f8967825f1eed1c3bc265fa2e359d258fe8e502469b463de8878070d350463f4f5cc39bb2a5c0a65e01cdf989497038373879e1d55904047868e1d6511290 WHIRLPOOL ef52d09526d51662f243f55f3ebd143c8902fc3dc5d00c9507250881abf9ff20239a1c017b951ad9ae08c32f3afa057f2a7a5d6e27bab4072eb3ba1b7caf96d5
+DIST netbeans-trunk-nightly-201508070002-src.zip 208777237 SHA256 3f1014a410386bb7b1fa0772db4a7fc9bf6cb5f0177868ce727daf6b6029a89c SHA512 6de45ad0050121f9510b7daca7701328698ffeea7a8c8204c06458caf978246d7a0a0a576759367d3966933b063fc630e7d710595cefc934e3637c7792c94267 WHIRLPOOL c7ec2e93ce0b71fa6fd39adcb3b1ef122c0961378939074ec837dd8c393ec3c60475cfc26238408a07aa1e52c735d06275c9616e5fa007ca915c413765de294e
 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
@@ -61,5 +62,6 @@ EBUILD netbeans-dlight-9999_p20150801.ebuild 2995 SHA256 cfd3f15b18ed32e44a9ade5
 EBUILD netbeans-dlight-9999_p20150803.ebuild 2995 SHA256 ac07fc700c717b717defd189c849fa7e2bdb70368c2773f66001bf9c5a6bce0f SHA512 380323a633232c031b3c424fd4bb18d172485fbdf57cdbe8cc2ffb0c92328dd80cf82dc88d125145c36f08dba30d6b9dca45cb1382714a927029a7b294b85246 WHIRLPOOL 2eb487045ced9ac90a3791dfd263ad73bf066451eb2843f5e57615c3eddc293880f96049008e7d458b4e7245eea80aecfd9887239b4710406abc9f163fc8e3e8
 EBUILD netbeans-dlight-9999_p20150804.ebuild 2995 SHA256 40d1a6f4b7dded0fad824f01dfa2b21eb24fd3d2913317e47e4cf49780eec794 SHA512 8457aa1df443156495609ba072254e6a9aa6df095c91951b3a047928faa90e853d9774850460a1bb65227a8d4cd0311ab04b5951f7a64a7a9891dc15b0903575 WHIRLPOOL 53672445e024f1f171e1ec5a79532084fd16590c6a54f101554309ac57da04e1d30fa5e122cc0a0717fc9056e895e54d38f77ddc45421448ca39242f29e6c2bc
 EBUILD netbeans-dlight-9999_p20150805.ebuild 2995 SHA256 7221a38e7bb815f53ef3f0988bbd155cb3becf4142f5448b132abf80820b7a7b SHA512 06e6f60c5e1c32e8b97f29e140c4e4061806b4a352197506d0813bdbd6a720656d5734613a476a4f5b6670989eac140e28905d319dc6001a13e2befa9f733ed3 WHIRLPOOL 554cea04d253430bc6c1395bc0cf48636a3596adfc7486cb7e62bb88bde0b0043eca8e000355adc3c8842cb6daf0acc29f2c426cc133a4d6c21cac2b1063f91a
-MISC ChangeLog 173526 SHA256 ef40b3642d3a79f63a09afa6867b280e6e309c033213963ac7197d963ccd63b0 SHA512 1e39f646a2ef04f56cd8b331673d8266353e94bbd735a3ec1556c15e7a80e90a5402261cafe4372e289b8a2d4ec8dcaea2bb4c4bafafb8af975000d3183204f8 WHIRLPOOL 8a378574b7462d549eee6f991f4fa4fffa59c93133c3808dd468123c764dff693959c6fca01054997640735958215bc144ed80ccf9e3a054d89d3e6bb3f65966
+EBUILD netbeans-dlight-9999_p20150807.ebuild 2995 SHA256 40b6809bfcd722a0c2831f6cc27a05a141f2be9c2edb753221384a45fb9e6a68 SHA512 7909b02971cbfc43118464f713e4e7aa8b9bccc9886222334524d7d7c3e5f6f26b52256cfc018d29f84fc8c712a84f97ecc4e306fff8a607e4f386fab736b873 WHIRLPOOL dcbd5eb69499e997fc2e46721ff128ebda386766236c7ad45d2fafde83f503adf522800fce91caf7268a72d5f2991e49f414ed5e6d304d193dbcf67e5d7d6e48
+MISC ChangeLog 173700 SHA256 47c32a4527024d75a1ff3ef276a02725e6e8fc801e9299bf1c15e9fcfdfc4a6f SHA512 03da840a4c6fefae84f5fb6bfe19359ad12a440ee1957e782ce442bf6cf699c6316c23b2ec2c3c904e4448ac8539e53f72cfd95dc5eaba9d246deeffcdaaa9f8 WHIRLPOOL d1e7f5de497845cb1a02564680bee91e2619b08c1a95819bb10cf2607382df6d055c3da3c7f2537456e8c01e647296f967e1d670b388f6d5a23323f4cfa3d226
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150807.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150807.ebuild
new file mode 100644
index 0000000..b167a07
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150807.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-08-07_00-02-28/zip/netbeans-trunk-nightly-201508070002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/6396ED8427E5068B5331C0A3A03A2235135D6D75-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}"/6396ED8427E5068B5331C0A3A03A2235135D6D75-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 16794b6..6ad72c6 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_p20150807 (07 Aug 2015)
+
+  07 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-enterprise-9999_p20150807.ebuild:
+  updated to the latest sources
+
 *netbeans-enterprise-9999_p20150805 (05 Aug 2015)
 
   05 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 568aaf2..815009f 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -119,6 +119,7 @@ DIST netbeans-trunk-nightly-201508010002-src.zip 208741865 SHA256 2ade7e4e9f2b80
 DIST netbeans-trunk-nightly-201508030002-src.zip 208748030 SHA256 933445356a68c17218a1e5d047568b7493208f5e4ac5cb083b6c0c840080e08f SHA512 000a443f1e02911e29996d0ab6021863faf1ea3649cb71dff7df5c262087dda663d4d670f64a238df86220fb1bf0fb713a990bd78671077ac86d5e0c7d0a52a6 WHIRLPOOL c71739d059f35e7f3f6b301f7291f8ddec3d286eec918a18f9ce924068f1ff84a3138c50f5c59d4efb297b5aa8c748988c6695656deb47a4fe49fcaf35b86bd3
 DIST netbeans-trunk-nightly-201508040002-src.zip 208761490 SHA256 b001f001aff1c4a6e29cf289beeefea7e766fd278a7144a028970bd9b65b0459 SHA512 87a1c41db0c76a01150c08247dc76f397e0e9ac2d87ff3fc5a6f7d91265812bc8471ae87edd781ea2518c8b47f48ad374b4fddccb38ba1ef888e001c3b295224 WHIRLPOOL bae5b1c4f71cb87f223d8232c29da2fdfc3a3482db42cd3783f2c249aeb7c409f2b40fe815e290006797307a5ba296316f21a44988cb098659b6d1969359c371
 DIST netbeans-trunk-nightly-201508050002-src.zip 208776240 SHA256 740052c5a604bf1908a1a6643ce9b5b1b43b92291544a59a68cad2378b5734c6 SHA512 890f8967825f1eed1c3bc265fa2e359d258fe8e502469b463de8878070d350463f4f5cc39bb2a5c0a65e01cdf989497038373879e1d55904047868e1d6511290 WHIRLPOOL ef52d09526d51662f243f55f3ebd143c8902fc3dc5d00c9507250881abf9ff20239a1c017b951ad9ae08c32f3afa057f2a7a5d6e27bab4072eb3ba1b7caf96d5
+DIST netbeans-trunk-nightly-201508070002-src.zip 208777237 SHA256 3f1014a410386bb7b1fa0772db4a7fc9bf6cb5f0177868ce727daf6b6029a89c SHA512 6de45ad0050121f9510b7daca7701328698ffeea7a8c8204c06458caf978246d7a0a0a576759367d3966933b063fc630e7d710595cefc934e3637c7792c94267 WHIRLPOOL c7ec2e93ce0b71fa6fd39adcb3b1ef122c0961378939074ec837dd8c393ec3c60475cfc26238408a07aa1e52c735d06275c9616e5fa007ca915c413765de294e
 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
@@ -143,5 +144,6 @@ EBUILD netbeans-enterprise-9999_p20150801.ebuild 15937 SHA256 a56828c48349c37457
 EBUILD netbeans-enterprise-9999_p20150803.ebuild 15937 SHA256 8f68b85ec72bd40f801ca6ee9019db8d49726e6e18291be48b7b138970578324 SHA512 b50ae017b9677ab6170a086168b58df92cd93d64efc6c01db873b6d1028ca2daf5f7d4905d01adabf5906224ca876d3fa5fc76f95c77adf5fc82de2a67e9c32e WHIRLPOOL 8ad088278d2da7fe44864f817ead8f3308f666d62c631d4ef6332367ee988494e6482865c747fdd0c7557547dba8939a14bb40590ec01d871c692e9571f3bcc3
 EBUILD netbeans-enterprise-9999_p20150804.ebuild 15937 SHA256 b1b94b27b30038c5054c302ae258861926ff9f3e0823c24b3d6b7ac9f87aebce SHA512 44cdbb5654edf638a5711abc8c4b1f8d322005a706dc1a9a042f8c91e7d6266b4139925f26a0402f3dd49238d762e4cb7e5ee68ae30ba556e4aff1a01c7314fc WHIRLPOOL 9d2c3e61929290d3df831f6698150be19c1840b39f9a5584fc221e2293b4324e5a8f30ee95d5284476132a320e492b209939ee8c44870afbc86c43991e106050
 EBUILD netbeans-enterprise-9999_p20150805.ebuild 15937 SHA256 6ec94a45728d64bfa6e7d3b9a3dd0260d9f2b795fa773ba159f55e670b136b19 SHA512 bba2c1360deecdd1b3c23bdfb375893c990de8edcefbcd7b80be9a2fae0b344af89bfc5ff55155d1a533fc57b603e4ed4051047a8916ee9c5dccc1cc2bcd8faa WHIRLPOOL 8838f330b960a0d49445f9190f6f63bb5473080ab81a83a1d56afd1f8fb9bd3de6752568391013716a59b7acc98224e243009c9af4e41154e461d325a2adeb68
-MISC ChangeLog 182832 SHA256 3ac6441e43c80bb15082b1c12a86626dc4fd20b02e5456a7e3cae8a91c748e6c SHA512 3890c6dfb49f32b7d362325c59f182f0a3f8f8d49b8e4d6a1d76b263322561a44f36cd9f874a7d5ee81eea5f895bf819ac40b47d500310077161b1f5671b6745 WHIRLPOOL f7ceb629e184d71f6e70ffa2fb0426294436acabb43d58c430d039c597ec9878efd0b22780733245dbd6a3359f833547de7670280fc9bb23413e358e7bbe73ad
+EBUILD netbeans-enterprise-9999_p20150807.ebuild 15937 SHA256 27ed8ce31515ea68c79b44243d1c99c41a96e6b01bc5a4a1b9a35da523e2865c SHA512 f63a8caefd8039c042519264a651affa819b63001ac22a111c7c78b53b17bb432c6e7de44553c863ca63b2345d53886ea94780ce6beff03793e066c78c1350d8 WHIRLPOOL 69f9fa5b99e51387cf2413b3da858736af4b1020dc2dda34be16bbe4271598a21748b0269faa700c7aa4987ca96ff6dbfe40cca0bc7b428539ea83ad42e71654
+MISC ChangeLog 183014 SHA256 195952bf85609de961a8311cc97b59d5aca71c8dcd980fe8b638a76c939fa811 SHA512 4d2e6f8104cf97d1959e62942bd4af81cc75648ce58945db31d1749290998852014cacd95b8b5cf908f24e644f341d8067f312ab1505e6f0476b796385786465 WHIRLPOOL ba65b30cae03c691103d2a991a9a043fa3f6082e6b16dd0d76d20fe085f58bcf8db638b821b00a2ec36edf5a67a741e24b2f4a862b982d102debfd4cdab54c7e
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150807.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150807.ebuild
new file mode 100644
index 0000000..7f41fdc
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150807.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-08-07_00-02-28/zip/netbeans-trunk-nightly-201508070002-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 cf34612..641bb11 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_p20150807 (07 Aug 2015)
+
+  07 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ergonomics-9999_p20150807.ebuild:
+  updated to the latest sources
+
 *netbeans-ergonomics-9999_p20150805 (05 Aug 2015)
 
   05 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 86b407b..9b7520b 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201508010002-src.zip 208741865 SHA256 2ade7e4e9f2b80
 DIST netbeans-trunk-nightly-201508030002-src.zip 208748030 SHA256 933445356a68c17218a1e5d047568b7493208f5e4ac5cb083b6c0c840080e08f SHA512 000a443f1e02911e29996d0ab6021863faf1ea3649cb71dff7df5c262087dda663d4d670f64a238df86220fb1bf0fb713a990bd78671077ac86d5e0c7d0a52a6 WHIRLPOOL c71739d059f35e7f3f6b301f7291f8ddec3d286eec918a18f9ce924068f1ff84a3138c50f5c59d4efb297b5aa8c748988c6695656deb47a4fe49fcaf35b86bd3
 DIST netbeans-trunk-nightly-201508040002-src.zip 208761490 SHA256 b001f001aff1c4a6e29cf289beeefea7e766fd278a7144a028970bd9b65b0459 SHA512 87a1c41db0c76a01150c08247dc76f397e0e9ac2d87ff3fc5a6f7d91265812bc8471ae87edd781ea2518c8b47f48ad374b4fddccb38ba1ef888e001c3b295224 WHIRLPOOL bae5b1c4f71cb87f223d8232c29da2fdfc3a3482db42cd3783f2c249aeb7c409f2b40fe815e290006797307a5ba296316f21a44988cb098659b6d1969359c371
 DIST netbeans-trunk-nightly-201508050002-src.zip 208776240 SHA256 740052c5a604bf1908a1a6643ce9b5b1b43b92291544a59a68cad2378b5734c6 SHA512 890f8967825f1eed1c3bc265fa2e359d258fe8e502469b463de8878070d350463f4f5cc39bb2a5c0a65e01cdf989497038373879e1d55904047868e1d6511290 WHIRLPOOL ef52d09526d51662f243f55f3ebd143c8902fc3dc5d00c9507250881abf9ff20239a1c017b951ad9ae08c32f3afa057f2a7a5d6e27bab4072eb3ba1b7caf96d5
+DIST netbeans-trunk-nightly-201508070002-src.zip 208777237 SHA256 3f1014a410386bb7b1fa0772db4a7fc9bf6cb5f0177868ce727daf6b6029a89c SHA512 6de45ad0050121f9510b7daca7701328698ffeea7a8c8204c06458caf978246d7a0a0a576759367d3966933b063fc630e7d710595cefc934e3637c7792c94267 WHIRLPOOL c7ec2e93ce0b71fa6fd39adcb3b1ef122c0961378939074ec837dd8c393ec3c60475cfc26238408a07aa1e52c735d06275c9616e5fa007ca915c413765de294e
 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
@@ -54,5 +55,6 @@ EBUILD netbeans-ergonomics-9999_p20150801.ebuild 2919 SHA256 af2178befef2a366ca4
 EBUILD netbeans-ergonomics-9999_p20150803.ebuild 2919 SHA256 e0b8f85c81a246bd12dea6331eba9ad112b7828be522dc7a84b77c3df4c41be2 SHA512 446abe687666770cf0c68fa2a3a1984c51330d961314260b1bc0175b617a6282432f700524b36e357d97a57162cb3e29a480da633039fe84f644f187a32633c2 WHIRLPOOL 9d99eb329a7bf226f42fabb7998323b0a2f59b1c6c108796b9899ae53c278820731de8ad549972ab305f1dd06f1d49bfdb09cf113b724d054bc850985ecd1230
 EBUILD netbeans-ergonomics-9999_p20150804.ebuild 2919 SHA256 e42849213f6ea1b34729ee9ad20db69730b84c3f1bfa1323f652b7e7c05e2017 SHA512 b7255aa7982aa396c9ed1687451dd3a08f8f4de831a09b12d96c39f8e1ac4c68eb51b92e367209c832646db3e57fc4717477595b235c82c99a6806784ea6f9e6 WHIRLPOOL d46b5df4d0bbc3f4468946b6099ec54f2295df0dd8bbd041c6350e6a4558e3107d7833cdba7e845557a1ca4149577ca5e0e8e29b7cbfcca82784726aef3b2b06
 EBUILD netbeans-ergonomics-9999_p20150805.ebuild 2919 SHA256 0f8853783c7e719fbae8e4e3493a1e80e96f4a3b94dc443e737a98dafafde964 SHA512 4362a1f51dc8fda6eaf879ea2c34f82ec7703d440fc0f04a060dd3c90a7b5de3c49824f5c124b7d85831ea1e44b62053d383821df567562a3576eaf50c7c37dc WHIRLPOOL 1e8c96c22830cb586f3474dce1aef0087d7551219848521bd111f084adaafed9b62072da65ce4dd6e46b8f61f3037451305103fe3b2fff173c5736f00dd0d8e0
-MISC ChangeLog 182193 SHA256 97e6067483c7f60356374ebd1415ae2b46faa905be3847c57f37e5c34bf215d4 SHA512 9e5ae2cc8a41137495b239631211293ab1fc36cd2653091a31adfcac1b7204bcd0f83a35a4c9d8a1bbfdee0c3d12de1b2d12a0327caa57e3a7021a91c144c234 WHIRLPOOL 0c276894c53a5417be3c113697e6521e7659322b8a2903fa6e6d83fc5b90af3ddcccc103f73a5b89b0e9e68cafd0067d624f35c7dec2610d98acca1fcaef676d
+EBUILD netbeans-ergonomics-9999_p20150807.ebuild 2919 SHA256 97850b9f60529f23a0689b16a40a816b80a5f274d3652a290eca5fe0baed18c6 SHA512 f0bde8634e0b5daaaa734b1cfa2ee162b4219b0b516d657cb3c4af3dda666d268fdb1f45c84bdf08133f8981dd4f9a36bf8f3307094e328bccb691ddf31fb5d6 WHIRLPOOL 1337f0e78cf1270fd37b91d5915d6dc3ade08cade32608030b79e9e39c651d5d79c140d394f8c8dfb47fc1ef443c7641409c0df3c21af18471953691f8db1b0f
+MISC ChangeLog 182375 SHA256 65e0fa47c524f96e2006e53fb726aaa410de96867d7ebf83aabc1cdfef8b2bc0 SHA512 7f03157d5cd9783c98f149167b22003b85384813349931c5b8e902d4de19d7dad597c7e268f4c1e5746ad5d2693ebd7b8fab0d32fe4032da7593df42689fd8f8 WHIRLPOOL 41018e8c159bd0372f1c06c2c4fdbc26c4326f37b76c4768b07214005724b0a4148b9ee51e446f3eb2c5640ebca5d5c5387f1761fb25f69d24c0f788b6670751
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150807.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150807.ebuild
new file mode 100644
index 0000000..1e50cb8
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150807.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-08-07_00-02-28/zip/netbeans-trunk-nightly-201508070002-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 dbd241c..8abe102 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_p20150807 (07 Aug 2015)
+
+  07 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-extide-9999_p20150807.ebuild:
+  updated to the latest sources
+
 *netbeans-extide-9999_p20150805 (05 Aug 2015)
 
   05 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index 4787d98..9ffb90d 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201508010002-src.zip 208741865 SHA256 2ade7e4e9f2b80
 DIST netbeans-trunk-nightly-201508030002-src.zip 208748030 SHA256 933445356a68c17218a1e5d047568b7493208f5e4ac5cb083b6c0c840080e08f SHA512 000a443f1e02911e29996d0ab6021863faf1ea3649cb71dff7df5c262087dda663d4d670f64a238df86220fb1bf0fb713a990bd78671077ac86d5e0c7d0a52a6 WHIRLPOOL c71739d059f35e7f3f6b301f7291f8ddec3d286eec918a18f9ce924068f1ff84a3138c50f5c59d4efb297b5aa8c748988c6695656deb47a4fe49fcaf35b86bd3
 DIST netbeans-trunk-nightly-201508040002-src.zip 208761490 SHA256 b001f001aff1c4a6e29cf289beeefea7e766fd278a7144a028970bd9b65b0459 SHA512 87a1c41db0c76a01150c08247dc76f397e0e9ac2d87ff3fc5a6f7d91265812bc8471ae87edd781ea2518c8b47f48ad374b4fddccb38ba1ef888e001c3b295224 WHIRLPOOL bae5b1c4f71cb87f223d8232c29da2fdfc3a3482db42cd3783f2c249aeb7c409f2b40fe815e290006797307a5ba296316f21a44988cb098659b6d1969359c371
 DIST netbeans-trunk-nightly-201508050002-src.zip 208776240 SHA256 740052c5a604bf1908a1a6643ce9b5b1b43b92291544a59a68cad2378b5734c6 SHA512 890f8967825f1eed1c3bc265fa2e359d258fe8e502469b463de8878070d350463f4f5cc39bb2a5c0a65e01cdf989497038373879e1d55904047868e1d6511290 WHIRLPOOL ef52d09526d51662f243f55f3ebd143c8902fc3dc5d00c9507250881abf9ff20239a1c017b951ad9ae08c32f3afa057f2a7a5d6e27bab4072eb3ba1b7caf96d5
+DIST netbeans-trunk-nightly-201508070002-src.zip 208777237 SHA256 3f1014a410386bb7b1fa0772db4a7fc9bf6cb5f0177868ce727daf6b6029a89c SHA512 6de45ad0050121f9510b7daca7701328698ffeea7a8c8204c06458caf978246d7a0a0a576759367d3966933b063fc630e7d710595cefc934e3637c7792c94267 WHIRLPOOL c7ec2e93ce0b71fa6fd39adcb3b1ef122c0961378939074ec837dd8c393ec3c60475cfc26238408a07aa1e52c735d06275c9616e5fa007ca915c413765de294e
 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
@@ -48,5 +49,6 @@ EBUILD netbeans-extide-9999_p20150801.ebuild 3383 SHA256 d478d0d29948a63b5db3f6a
 EBUILD netbeans-extide-9999_p20150803.ebuild 3383 SHA256 551fbfe1847fc1dc666d2d2db81faf9aed2146205717c6813ef0f9a398359531 SHA512 e85363a597f5f7363e01548ee75a786c0ca505e4d38a2a25dde4796d68e6d12d06b5ec65fe00e0012806d48f5fc1c88922c041065be298fec357c61a993adfd9 WHIRLPOOL 9b3d900f9ee3d086bc2cce7c073b5b252541064565aa4fd647783f258700e24762e051db54bcee3eaac3f7b5cf37557b447f098f3505f18062a64ee7b50d9917
 EBUILD netbeans-extide-9999_p20150804.ebuild 3383 SHA256 37c0d207b4026a14f4cd55caa4b1e8332e61f6a956ee17261b7f410e94ee996c SHA512 8e54a6a1736d35a6dbda53f9d19d6f9600567a149f02f29a282a6d79ae37325ecd2e34d0b9c42c9aaf8d552a696ea08d6bdbf71813e8bb1b700edc5f093d7827 WHIRLPOOL 77447716c3d431e9a642f333108f161f8d00fda9e0396b885e58f3c8be4b223f49f8b330444aad2bc77f42513fc224e814d8f8d27ba3b3588b21931b90f0a599
 EBUILD netbeans-extide-9999_p20150805.ebuild 3383 SHA256 e386f37a3addc69bed1feccb82c0a782ba8b3860fc4b98a046dedce2a04123ef SHA512 40f50d9081e030700914f484c0f9f383fa76b5e7c926d5cd35b18a44d7e6562e8998683c306a941c123c0eb57cda85f2955b764b42c65d825bf94c27faf4ba5e WHIRLPOOL 13cb55b9f1b913063d3ee9b15e3f55c512cf56abcf93ddbf87ac01e2574c4c269fe77821b39b460d38ef7e152fe7a42c7bef08ee04808fbc680be8e1d2d1c5b8
-MISC ChangeLog 105436 SHA256 2092e99dc08558c8dd59c6cb880ce559a04fc94c2213bcc3ee6c4366d3078f7d SHA512 5b1364c3730eb37a2209095966e3353adb755b866e5d85ddef9ff588b19abf408f87e296c77c3208dc308fb523986f747083583fb472e77da618891ac66c14dd WHIRLPOOL 80cfcb146b4f3503402b36065e7cc7531306e8e88e8ff49d59dcc4bec3a7af914d8ffe2f2d6d8fcd8d6750895d78fd0cd87956abdc48ceea17bc699e6d342730
+EBUILD netbeans-extide-9999_p20150807.ebuild 3383 SHA256 89a2fadd1ff8f448cc12a9f20d1c9c88a480ec523a8dd15cc0973bdc884cb5c0 SHA512 d8e7803aece3b75140f69b275ae4f1c2cb7a94c3fdaf1ee57e51a085281328666e364a1bc357560775f04000f969cb37787d1815760a4e6157191f327438dd34 WHIRLPOOL 913e0013d58e9facaa94ab1686f3d215a9a85461096836d17f04aaa3b23b7e9246065171bc2eb6eefa8cea7e1a1521f427c17e3549ce955baf37a2052c151cab
+MISC ChangeLog 105610 SHA256 9d3ad2bccb9354b0c663534c4263620d7d0365607a1185054854ee1638bd1277 SHA512 67ad20d4ebd6cb19ccafa899ebb8dc08d9c6993357918ef7ba7175c44fd06175ac46498d76fa2aba950be130877fa5d3e1bbe36ac993d867cc9f4a434cfcd8bd WHIRLPOOL 1a9fcb491cfe59309bb390b076ed3a0a7c6a16b768b9e58d4923f51551332cce5993fabaa7c05908be9811496b691c827fcc27e5e464726366833218935716f0
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20150807.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20150807.ebuild
new file mode 100644
index 0000000..280fc24
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20150807.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-08-07_00-02-28/zip/netbeans-trunk-nightly-201508070002-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 44de387..106beb8 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_p20150807 (07 Aug 2015)
+
+  07 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-groovy-9999_p20150807.ebuild:
+  updated to the latest sources
+
 *netbeans-groovy-9999_p20150805 (05 Aug 2015)
 
   05 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index 8c95eb0..7eb26d3 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201508010002-src.zip 208741865 SHA256 2ade7e4e9f2b80
 DIST netbeans-trunk-nightly-201508030002-src.zip 208748030 SHA256 933445356a68c17218a1e5d047568b7493208f5e4ac5cb083b6c0c840080e08f SHA512 000a443f1e02911e29996d0ab6021863faf1ea3649cb71dff7df5c262087dda663d4d670f64a238df86220fb1bf0fb713a990bd78671077ac86d5e0c7d0a52a6 WHIRLPOOL c71739d059f35e7f3f6b301f7291f8ddec3d286eec918a18f9ce924068f1ff84a3138c50f5c59d4efb297b5aa8c748988c6695656deb47a4fe49fcaf35b86bd3
 DIST netbeans-trunk-nightly-201508040002-src.zip 208761490 SHA256 b001f001aff1c4a6e29cf289beeefea7e766fd278a7144a028970bd9b65b0459 SHA512 87a1c41db0c76a01150c08247dc76f397e0e9ac2d87ff3fc5a6f7d91265812bc8471ae87edd781ea2518c8b47f48ad374b4fddccb38ba1ef888e001c3b295224 WHIRLPOOL bae5b1c4f71cb87f223d8232c29da2fdfc3a3482db42cd3783f2c249aeb7c409f2b40fe815e290006797307a5ba296316f21a44988cb098659b6d1969359c371
 DIST netbeans-trunk-nightly-201508050002-src.zip 208776240 SHA256 740052c5a604bf1908a1a6643ce9b5b1b43b92291544a59a68cad2378b5734c6 SHA512 890f8967825f1eed1c3bc265fa2e359d258fe8e502469b463de8878070d350463f4f5cc39bb2a5c0a65e01cdf989497038373879e1d55904047868e1d6511290 WHIRLPOOL ef52d09526d51662f243f55f3ebd143c8902fc3dc5d00c9507250881abf9ff20239a1c017b951ad9ae08c32f3afa057f2a7a5d6e27bab4072eb3ba1b7caf96d5
+DIST netbeans-trunk-nightly-201508070002-src.zip 208777237 SHA256 3f1014a410386bb7b1fa0772db4a7fc9bf6cb5f0177868ce727daf6b6029a89c SHA512 6de45ad0050121f9510b7daca7701328698ffeea7a8c8204c06458caf978246d7a0a0a576759367d3966933b063fc630e7d710595cefc934e3637c7792c94267 WHIRLPOOL c7ec2e93ce0b71fa6fd39adcb3b1ef122c0961378939074ec837dd8c393ec3c60475cfc26238408a07aa1e52c735d06275c9616e5fa007ca915c413765de294e
 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
@@ -58,5 +59,6 @@ EBUILD netbeans-groovy-9999_p20150801.ebuild 3422 SHA256 c8251f94ce0d6a7cc16fc08
 EBUILD netbeans-groovy-9999_p20150803.ebuild 3422 SHA256 ea843ad158af81488850f41710d7d0bf965d6fd5ed996535449a1987d2c227f8 SHA512 9077aeb5c92780065bca7405432699195c5a97b41e724757b9dbe23e31985481664742e9449436e057b73cf4db892b3801fd3dd7f23659a29676d8cb0ba41aaa WHIRLPOOL 5527ca45f1e87e2452b8ae8b26034f28fa6520b90ee3f0967161bab86d2b6d74a544ee997b1ba06d22dcae9cdc94f323641987a222836782e824fb9925e12dce
 EBUILD netbeans-groovy-9999_p20150804.ebuild 3422 SHA256 3a3eb4a582925d69721718af292837f2e2b6b7318428cf16472a79a80e140a03 SHA512 63e522a73431dcf8dd799df22451daac7294b70c597b21c83a43985fa6142dc4bb17549706b40e777bbe76c70da0edebbe71542733ede02f187aebfc39b278ee WHIRLPOOL 41809ebbb79649bbf993c8bd38657a09451360c32cd85291ab451602518746c697c20f2bff3296cfd7fbcdd3c0bf553738f291fa923e6025b14f9180d8bc6208
 EBUILD netbeans-groovy-9999_p20150805.ebuild 3422 SHA256 198af8fbdc6805afc02e80b01978cd22e0941a48cef4ad8ca65db58754207f25 SHA512 ccaafe134e197e4c1d498aac6e8833a1e85992db598a81bd4d01ae7932d42778916d5210ce747a8225767d6d46f72f58bc1adb99907f78bacc602107d73e52d9 WHIRLPOOL 84bb610607a70fb8070f684c0d9ec9afd612edf8fc9fb02c4b70ad63a062f96c77ba278705341f63d273e40afae3d665f8c00c95edc75d4961603141ad46ce6d
-MISC ChangeLog 173416 SHA256 0b472dadae4239f878244e889250cb5f1733a3755e648a96f7fe0906daae8a57 SHA512 246d9f2ae43e8c250d2e7ba90fcbe74942de6ad0dc30c0d2f5b877f07f7477137fde2e3e975a1f0ede294a0a9511585002e5d0fb9675bba13f0893983b339e64 WHIRLPOOL fee38ea0147acba90962fd9f78e8c02ee50c3e33230ef2db9382947bce0a340d943b1af34a4368a7ce01959b9559b53d2522bf810a25ff4aa7ec72892f945278
+EBUILD netbeans-groovy-9999_p20150807.ebuild 3422 SHA256 e6398e3f673332c8c0d9156c2c81b8e812e04221715069275b853c3b78d044b8 SHA512 687e670cf4b7de7a9b0efb54303b22d38a4640caa78374ee8ca9127d22020d231e30667000987ac5914ad6156ebdcb06ff6a3d120a01c0fea15f840ba2dc4bbd WHIRLPOOL 0db9d63c4f83b570e09dfc7db2fcbe797bbc31bf0f5a46875cabac9b191a37c2f9b93c0071e47a03c04e0f950ada415100e768148ef0f18ccbcc8691dd714e79
+MISC ChangeLog 173590 SHA256 ff2522f38ac3a32c9925f285abfce464ed4704bfcf4bd6458b4f05822ad757b5 SHA512 e636976e1fa705fb418e5af35d39e9bf5879a8da7e0649b75373b154850187cea125b5a3d8c8128d915cbf930dc71c3229d0e8ca700b0b634e822d81d52412b3 WHIRLPOOL 97f259b0c2feede2fd243dd26e7fd826ed2ca83666be924dcd322bc98047cdf9b24120730258884d933b34cc618c8abb1c2865df8068bd188fab3ef4246fe40e
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150807.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150807.ebuild
new file mode 100644
index 0000000..fe62fd6
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150807.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-08-07_00-02-28/zip/netbeans-trunk-nightly-201508070002-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 2a3cb85..f27285c 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_p20150807 (07 Aug 2015)
+
+  07 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-harness-9999_p20150807.ebuild:
+  updated to the latest sources
+
 *netbeans-harness-9999_p20150805 (05 Aug 2015)
 
   05 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index dfabdfe..a7ba7c1 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201508010002-src.zip 208741865 SHA256 2ade7e4e9f2b80
 DIST netbeans-trunk-nightly-201508030002-src.zip 208748030 SHA256 933445356a68c17218a1e5d047568b7493208f5e4ac5cb083b6c0c840080e08f SHA512 000a443f1e02911e29996d0ab6021863faf1ea3649cb71dff7df5c262087dda663d4d670f64a238df86220fb1bf0fb713a990bd78671077ac86d5e0c7d0a52a6 WHIRLPOOL c71739d059f35e7f3f6b301f7291f8ddec3d286eec918a18f9ce924068f1ff84a3138c50f5c59d4efb297b5aa8c748988c6695656deb47a4fe49fcaf35b86bd3
 DIST netbeans-trunk-nightly-201508040002-src.zip 208761490 SHA256 b001f001aff1c4a6e29cf289beeefea7e766fd278a7144a028970bd9b65b0459 SHA512 87a1c41db0c76a01150c08247dc76f397e0e9ac2d87ff3fc5a6f7d91265812bc8471ae87edd781ea2518c8b47f48ad374b4fddccb38ba1ef888e001c3b295224 WHIRLPOOL bae5b1c4f71cb87f223d8232c29da2fdfc3a3482db42cd3783f2c249aeb7c409f2b40fe815e290006797307a5ba296316f21a44988cb098659b6d1969359c371
 DIST netbeans-trunk-nightly-201508050002-src.zip 208776240 SHA256 740052c5a604bf1908a1a6643ce9b5b1b43b92291544a59a68cad2378b5734c6 SHA512 890f8967825f1eed1c3bc265fa2e359d258fe8e502469b463de8878070d350463f4f5cc39bb2a5c0a65e01cdf989497038373879e1d55904047868e1d6511290 WHIRLPOOL ef52d09526d51662f243f55f3ebd143c8902fc3dc5d00c9507250881abf9ff20239a1c017b951ad9ae08c32f3afa057f2a7a5d6e27bab4072eb3ba1b7caf96d5
+DIST netbeans-trunk-nightly-201508070002-src.zip 208777237 SHA256 3f1014a410386bb7b1fa0772db4a7fc9bf6cb5f0177868ce727daf6b6029a89c SHA512 6de45ad0050121f9510b7daca7701328698ffeea7a8c8204c06458caf978246d7a0a0a576759367d3966933b063fc630e7d710595cefc934e3637c7792c94267 WHIRLPOOL c7ec2e93ce0b71fa6fd39adcb3b1ef122c0961378939074ec837dd8c393ec3c60475cfc26238408a07aa1e52c735d06275c9616e5fa007ca915c413765de294e
 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
@@ -60,5 +61,6 @@ EBUILD netbeans-harness-9999_p20150801.ebuild 4131 SHA256 29ed2cb63d26495f768bc4
 EBUILD netbeans-harness-9999_p20150803.ebuild 4131 SHA256 d17a4eed1a4081a5e7e7121dd8322cbfe35360ea576af0829e03adcd6e391e1b SHA512 b9cbe296621ce49ba40748f44318ad1144b74d4ac61590be00d620fa0013b5f5934407375515d160f1d58dbabe29b677507ec3fbafaa55bcd47fbd7d687bdbd0 WHIRLPOOL 1ab8e541182f1c39c4f0ef49287bc8cbcaaf787c070d3105a45eb9b9a5893db0fec7e3714188353d49d46e5c63c04862cbbe153a59035fa39e68fe460c80da12
 EBUILD netbeans-harness-9999_p20150804.ebuild 4131 SHA256 44f6efcad40a1d1145942b05049bad461cde137f9f448e6942d97bb93b59f182 SHA512 5fb700116926b5fbe23e7d15fd44b92f9f1130794c1e127a1f50d555e00184ed6c28eb1cf8a21abf5074e7b36b0f44014a9c46e1456c20984a5e41bc5d271fc0 WHIRLPOOL a1eca6f27bc07f65e9675ec916028b3bc8d0bfcbfb5ddc8c53ec490a2500984b3eeda8062884df616e5e5027425da210e858e2b40b502854c2fdae9cdb09d1a0
 EBUILD netbeans-harness-9999_p20150805.ebuild 4131 SHA256 59cb4e25cae6fe72ce5200377498d582250c56a54d62a42d789c32c886bf4f02 SHA512 8d6a65dd7ea3603c6baff0afdc0ba013b3f47a00a214ef88071b4d31ab9edde0c07fe7c6eb95ffd6d7fff9d8575a6f5096ce11e94e63b844c5a45bd004b09d24 WHIRLPOOL aad87b9c97c1560fa6d252abcc522ce5d37be3c5b2cfc867ec2b019c2677916626f03f44e8793aae642516345c2d9acb24d706c939e1faa8a6aef19bfece4566
-MISC ChangeLog 175639 SHA256 a4029491e6e406a1d501f7fa1ad7419b4a6be85a18beb4c8570dc0d129c11488 SHA512 7f6764351486a4a7e798ae2e1c82dc72bf3d0ae73f3389e49d536845c0bed071e38c0d8e95df0ac1e32aa4b61b99b85f491f7d3cfb504edbe791e4183e7bf608 WHIRLPOOL 12673edb8a542b3806dd0bd51f2374c2a90109b1c6b2d2074675eb1db99f4486878ca8fe1f821d4536909962398553abb2fceba07d4829a1cbb2ae12fdca7282
+EBUILD netbeans-harness-9999_p20150807.ebuild 4131 SHA256 5584f33add2383d55865d7b169e67daa3b543db679b2bf497bae0ad8d571a98a SHA512 d8f30d793c890b15dfa9ea5474586c2e70fb65dc7ef65172b27e98a6b2a7d4f06d1b0af2d3f5914bcb274ec88959671169d3d2853674e989fafc6dff3a4c4514 WHIRLPOOL 6c38903d2ca2b1f2f857b595efd9b5195ccdf261d133f7e649e6335ccf971708a1ce5a9999db1ed6825ea7b7de81341d33d6ea947eb458113f69ac12f6a45e7c
+MISC ChangeLog 175815 SHA256 b177405b325b9b4fbc636909cb28c7e82bd69201315ef9d8a357d26a6e87b97f SHA512 6edea4f16150ee06fda4db14d15624f8fb890439ad387c214eacc0c6e7f352818b67dff6136d058bca6c853129f765b813853277ee4fdccc0de21a4f9dcd2f3f WHIRLPOOL 05de28f3db7029fe3bc692d062cc6c3292e724981ef676b837f6f5fe43404be433f5a658bd2a667d5bd4a076d9f141807ccbc5fccfb0d4845e9459a1f8d861d0
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20150807.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20150807.ebuild
new file mode 100644
index 0000000..01bafd0
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20150807.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-08-07_00-02-28/zip/netbeans-trunk-nightly-201508070002-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 c4474ae..8e83ce9 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_p20150807 (07 Aug 2015)
+
+  07 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ide-9999_p20150807.ebuild:
+  updated to the latest sources
+
 *netbeans-ide-9999_p20150805 (05 Aug 2015)
 
   05 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 969039a..7af5aa2 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -241,6 +241,7 @@ DIST netbeans-trunk-nightly-201508010002-src.zip 208741865 SHA256 2ade7e4e9f2b80
 DIST netbeans-trunk-nightly-201508030002-src.zip 208748030 SHA256 933445356a68c17218a1e5d047568b7493208f5e4ac5cb083b6c0c840080e08f SHA512 000a443f1e02911e29996d0ab6021863faf1ea3649cb71dff7df5c262087dda663d4d670f64a238df86220fb1bf0fb713a990bd78671077ac86d5e0c7d0a52a6 WHIRLPOOL c71739d059f35e7f3f6b301f7291f8ddec3d286eec918a18f9ce924068f1ff84a3138c50f5c59d4efb297b5aa8c748988c6695656deb47a4fe49fcaf35b86bd3
 DIST netbeans-trunk-nightly-201508040002-src.zip 208761490 SHA256 b001f001aff1c4a6e29cf289beeefea7e766fd278a7144a028970bd9b65b0459 SHA512 87a1c41db0c76a01150c08247dc76f397e0e9ac2d87ff3fc5a6f7d91265812bc8471ae87edd781ea2518c8b47f48ad374b4fddccb38ba1ef888e001c3b295224 WHIRLPOOL bae5b1c4f71cb87f223d8232c29da2fdfc3a3482db42cd3783f2c249aeb7c409f2b40fe815e290006797307a5ba296316f21a44988cb098659b6d1969359c371
 DIST netbeans-trunk-nightly-201508050002-src.zip 208776240 SHA256 740052c5a604bf1908a1a6643ce9b5b1b43b92291544a59a68cad2378b5734c6 SHA512 890f8967825f1eed1c3bc265fa2e359d258fe8e502469b463de8878070d350463f4f5cc39bb2a5c0a65e01cdf989497038373879e1d55904047868e1d6511290 WHIRLPOOL ef52d09526d51662f243f55f3ebd143c8902fc3dc5d00c9507250881abf9ff20239a1c017b951ad9ae08c32f3afa057f2a7a5d6e27bab4072eb3ba1b7caf96d5
+DIST netbeans-trunk-nightly-201508070002-src.zip 208777237 SHA256 3f1014a410386bb7b1fa0772db4a7fc9bf6cb5f0177868ce727daf6b6029a89c SHA512 6de45ad0050121f9510b7daca7701328698ffeea7a8c8204c06458caf978246d7a0a0a576759367d3966933b063fc630e7d710595cefc934e3637c7792c94267 WHIRLPOOL c7ec2e93ce0b71fa6fd39adcb3b1ef122c0961378939074ec837dd8c393ec3c60475cfc26238408a07aa1e52c735d06275c9616e5fa007ca915c413765de294e
 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
@@ -267,5 +268,6 @@ EBUILD netbeans-ide-9999_p20150801.ebuild 30340 SHA256 c1e6c4225c75ef76b10983664
 EBUILD netbeans-ide-9999_p20150803.ebuild 30340 SHA256 02a7615aca64e86a2a91d13d6b12a19f37ab4c4ef3f7f784b6dcbc03b3195a16 SHA512 f754b6de928e7c2012f06b7cca81aa59d3b096f63f2f61bb8781a428219e6101fca58e46b36fb8f08cc67120fe2d8fb803a54445cc7e435b2f2f286f829d7c94 WHIRLPOOL a787b3a7c7fb2c4bbb3267c7428bb96d439bb9cd878a4e3835b615b2cf3ee37c7ebaa225a3f29c136c4b24f39785f47c3beb1ee1a24a715da09cce03d47782ea
 EBUILD netbeans-ide-9999_p20150804.ebuild 30340 SHA256 2bac2b00467ea17cd02d3ff817af6d1249a79be9cd69bfeb285013934769e340 SHA512 a01bb29275fb1cf76b1e764396dbbbfa0651f8aace995c6a37399a89a32ed229b7a1b7c946502635335b804f544e0d61abf343421c2fc5ca859b2b4a97ea07ac WHIRLPOOL acefb0816585debf803b126e11add4f989cabbcd5782d5af0b16687242f9df930fffb666f5592026048513f57ead920bee208c95d431314ff9b468fa65f5401d
 EBUILD netbeans-ide-9999_p20150805.ebuild 30340 SHA256 d625ef788c53684c9a1a6edafdb422e3b1019ce5205af7c5c001619f8bbfd51c SHA512 724b8bf540510a640e64f8eae7659b6939079f6688de2c049e87669b8b030b4ab6a02dfcc7a4feb99a3248b7c19ec476490d8bc0978932320b96d0222f06be38 WHIRLPOOL e7e8ff7e3819ad73e3d97b5993a9bde8cebc090a7ccf9af517c6313b77e7ab3de95aa7e72bcf4c89c7cf65352b7f2e61e8cbc91e8e007f91e83245c882aa8adc
-MISC ChangeLog 167147 SHA256 17845e28721075dda48816c700e5406b109bed24ece66e6dfa7e82bde77d7b1c SHA512 75c3d66d2c0fcf1643e197ccaa7e53ad47995bc6d759e719b4c43a65329ab57ae84c415c32e71275c1b825a20774b46925c2bd92558aa7d7a09557c8cecd05eb WHIRLPOOL 9f45827d2ffdc9310cc1dee25ae8ea181b80fe248c96999851708ac84a58d058b7f124f17f8d95ace457f364dc8e3040c5d697b393c83a7dd8b2a8bbe4d26689
+EBUILD netbeans-ide-9999_p20150807.ebuild 30340 SHA256 8b3c73d8ee41dc46dbef7d349ea36db08107cca83d5e3bf474c0c21e34560c22 SHA512 435e175fb6b028e241f76d74d5b21debcaa4fc0ae6b54324df5f341f1b3799c324fd3c7d53ba6231b6c91e2ddabd1f8244ceedee816101e7b49f79c30fc98eaf WHIRLPOOL 66411db5ec7fee1b7954a932888c993ee7c22e585798fb99f3ddb43e660c8afa8c668caca7ceb6b099557e5d83afac4b11f363f31b6f117be99e29bc93ae75ce
+MISC ChangeLog 167315 SHA256 0aee433417d786830504a6e6d4cab0097be8d020d2d68a1b78c70676b7fad5a3 SHA512 d6bfbbbe84a2ff6f0cb081b199c675ccebc89c0d92cff8848a2284ddbd6efa4ce532b349c89d4a83d56f3db34bc734ec7f65e78b83848feed79395e76ef587c1 WHIRLPOOL 092086cd1b413b3051b1e9995b7e157c68a108680999c4b4b7e17a6df5d1f879e7d376a3d9788765b55aacf60e511c58558992942670d3d2228c7646902e8da1
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20150807.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20150807.ebuild
new file mode 100644
index 0000000..d7df83f
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20150807.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-08-07_00-02-28/zip/netbeans-trunk-nightly-201508070002-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/ACAB7C860DF78C4A528FD8A64F2C62A0A96639E5-com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar
+	http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar
+	http://hg.netbeans.org/binaries/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar
+	http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip
+	http://hg.netbeans.org/binaries/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip
+	http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip
+	http://hg.netbeans.org/binaries/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip
+	http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar
+	http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
+	http://hg.netbeans.org/binaries/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar
+	http://hg.netbeans.org/binaries/4388C34B9F085A42FBEA06C5B00FDF0A251171EC-html5doc.zip
+	http://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar
+	http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar
+	http://hg.netbeans.org/binaries/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar
+	http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar
+	http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip
+	http://hg.netbeans.org/binaries/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar
+	http://hg.netbeans.org/binaries/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar
+	http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip
+	http://hg.netbeans.org/binaries/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar
+	http://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar
+	http://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar
+	http://hg.netbeans.org/binaries/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar
+	http://hg.netbeans.org/binaries/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar
+	http://hg.netbeans.org/binaries/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-js-corestubs.zip
+	http://hg.netbeans.org/binaries/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip
+	http://hg.netbeans.org/binaries/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip
+	http://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar
+	http://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar
+	http://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar
+	http://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar
+	http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
+	http://hg.netbeans.org/binaries/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar
+	http://hg.netbeans.org/binaries/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar
+	http://hg.netbeans.org/binaries/F27BF427BE72709F3094BF76ECA8C5A2B9AC6DA9-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar
+	http://hg.netbeans.org/binaries/9BC512C5BB9A9F5276B9E8672F6B30AD0BD97D88-org.eclipse.core.jobs-3.5.101_nosignature.jar
+	http://hg.netbeans.org/binaries/105DC9A1A93E6EA9A6CD368AD12897B1F247D6AE-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar
+	http://hg.netbeans.org/binaries/E99C3C29A90F8AB29078A38CF8EBC3860249640C-org.eclipse.core.runtime-3.7.0_nosignature.jar
+	http://hg.netbeans.org/binaries/84FC6D443CD0816FA87093B6B7AD6876ADFC4207-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar
+	http://hg.netbeans.org/binaries/74069BFD03B2C66A9EBB4370C0B8064E3F5B6594-org.eclipse.equinox.app-1.3.100_nosignature.jar
+	http://hg.netbeans.org/binaries/A7953EEE9D4D7CD896C7D0AD6D21902E6259979B-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar
+	http://hg.netbeans.org/binaries/3FB169C95F095B70F05B96BE9496DA63FAE7F707-org.eclipse.equinox.preferences-3.4.2_nosignature.jar
+	http://hg.netbeans.org/binaries/CD5919A707EB6B5C1FC29964C8EF5E2CF3F5A3D4-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar
+	http://hg.netbeans.org/binaries/A4634373DC60650C49CC98AEA2090889F7ADC68F-org.eclipse.equinox.security-1.1.1_nosignature.jar
+	http://hg.netbeans.org/binaries/278049664FFA5447191BD5FE96B0B62B0CFD15D1-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar
+	http://hg.netbeans.org/binaries/9039A0C1FA0E56CB56A1A192908814478FA747C5-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar
+	http://hg.netbeans.org/binaries/DAA45A7EE529A7532F5DC08625A5A3E81DB2D4CB-org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar
+	http://hg.netbeans.org/binaries/F5AC8FBA216A8C52F319EC2CB455B44FFD734B38-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar
+	http://hg.netbeans.org/binaries/B43E7CE55F0DECA3BE1A6E695A3E3ABC6D62567F-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar
+	http://hg.netbeans.org/binaries/1B9CBEC0FCB47C279519E52D360199C24EC99B01-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar
+	http://hg.netbeans.org/binaries/6B0A6E9F9179E314944E4ADB831A9D6FCADED3DC-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar
+	http://hg.netbeans.org/binaries/B28B8EE777232102471EA5334FD70E20851845DD-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar
+	http://hg.netbeans.org/binaries/24A15BD37950663933CC4975EE6E518BEB2C28A3-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar
+	http://hg.netbeans.org/binaries/01CD242F06F6F7E4E61C9E05ABBE07318E501D51-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar
+	http://hg.netbeans.org/binaries/75928E4368CA748131A6767BA1A97D9DA643C306-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar
+	http://hg.netbeans.org/binaries/8307A44D3F150F1BB317532097A0C7D125C00F2D-org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.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/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}"/ACAB7C860DF78C4A528FD8A64F2C62A0A96639E5-com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar || die
+	ln -s "${DISTDIR}"/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar o.apache.commons.io/external/commons-io-1.4.jar || die
+	ln -s "${DISTDIR}"/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar libs.commons_net/external/commons-net-3.3.jar || die
+	ln -s "${DISTDIR}"/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip css.editor/external/css21-spec.zip || die
+	ln -s "${DISTDIR}"/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip css.editor/external/css3-spec.zip || die
+	ln -s "${DISTDIR}"/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip derby/external/derbysampledb.zip || die
+	ln -s "${DISTDIR}"/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip dlight.nativeexecution/external/exechlp-1.0.zip || die
+	ln -s "${DISTDIR}"/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar libs.freemarker/external/freemarker-2.3.19.jar || die
+	ln -s "${DISTDIR}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || die
+	ln -s "${DISTDIR}"/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar html.validation/external/html5-datatypes.jar || die
+	ln -s "${DISTDIR}"/4388C34B9F085A42FBEA06C5B00FDF0A251171EC-html5doc.zip html.parser/external/html5doc.zip || die
+	ln -s "${DISTDIR}"/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar html.parser/external/htmlparser-1.2.1.jar || die
+	ln -s "${DISTDIR}"/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar libs.ini4j/external/ini4j-0.5.1.jar || die
+	ln -s "${DISTDIR}"/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar html.validation/external/io-xml-util.jar || die
+	ln -s "${DISTDIR}"/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar html.validation/external/iri.jar || die
+	ln -s "${DISTDIR}"/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip spellchecker.dictionary_en/external/ispell-enwl-3.1.20.zip || die
+	ln -s "${DISTDIR}"/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar c.googlecode.javaewah.JavaEWAH/external/JavaEWAH-0.7.9.jar || die
+	ln -s "${DISTDIR}"/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar xml.jaxb.api/external/jaxb-api.jar || die
+	ln -s "${DISTDIR}"/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip libs.jaxb/external/jaxb-api-doc.zip || die
+	ln -s "${DISTDIR}"/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar libs.jaxb/external/jaxb-impl.jar || die
+	ln -s "${DISTDIR}"/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar libs.jaxb/external/jaxb-xjc.jar || die
+	ln -s "${DISTDIR}"/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar libs.jaxb/external/jaxb1-impl.jar || die
+	ln -s "${DISTDIR}"/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar libs.javafx/external/jfxrt.jar || die
+	ln -s "${DISTDIR}"/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar html.validation/external/jing.jar || die
+	ln -s "${DISTDIR}"/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-js-corestubs.zip javascript2.editor/external/js-corestubs.zip || die
+	ln -s "${DISTDIR}"/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip javascript2.editor/external/js-domstubs.zip || die
+	ln -s "${DISTDIR}"/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip javascript2.editor/external/js-reststubs.zip || die
+	ln -s "${DISTDIR}"/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.core-0.0.7.jar || die
+	ln -s "${DISTDIR}"/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.sshagent-0.0.7.jar || die
+	ln -s "${DISTDIR}"/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.pageant-0.0.7.jar || die
+	ln -s "${DISTDIR}"/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.usocket-jna-0.0.7.jar || die
+	ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.process/external/libpam4j-1.1.jar || die
+	ln -s "${DISTDIR}"/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar libs.nashorn/external/nashorn-02f810c26ff9-patched.jar || die
+	ln -s "${DISTDIR}"/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar html.validation/external/non-schema.jar || die
+	ln -s "${DISTDIR}"/F27BF427BE72709F3094BF76ECA8C5A2B9AC6DA9-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar o.eclipse.core.contenttype/external/org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar || die
+	ln -s "${DISTDIR}"/9BC512C5BB9A9F5276B9E8672F6B30AD0BD97D88-org.eclipse.core.jobs-3.5.101_nosignature.jar o.eclipse.core.jobs/external/org.eclipse.core.jobs-3.5.101_nosignature.jar || die
+	ln -s "${DISTDIR}"/105DC9A1A93E6EA9A6CD368AD12897B1F247D6AE-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar o.eclipse.core.net/external/org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar || die
+	ln -s "${DISTDIR}"/E99C3C29A90F8AB29078A38CF8EBC3860249640C-org.eclipse.core.runtime-3.7.0_nosignature.jar o.eclipse.core.runtime/external/org.eclipse.core.runtime-3.7.0_nosignature.jar || die
+	ln -s "${DISTDIR}"/84FC6D443CD0816FA87093B6B7AD6876ADFC4207-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar o.eclipse.core.runtime.compatibility.auth/external/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar || die
+	ln -s "${DISTDIR}"/74069BFD03B2C66A9EBB4370C0B8064E3F5B6594-org.eclipse.equinox.app-1.3.100_nosignature.jar o.eclipse.equinox.app/external/org.eclipse.equinox.app-1.3.100_nosignature.jar || die
+	ln -s "${DISTDIR}"/A7953EEE9D4D7CD896C7D0AD6D21902E6259979B-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar o.eclipse.equinox.common/external/org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar || die
+	ln -s "${DISTDIR}"/3FB169C95F095B70F05B96BE9496DA63FAE7F707-org.eclipse.equinox.preferences-3.4.2_nosignature.jar o.eclipse.equinox.preferences/external/org.eclipse.equinox.preferences-3.4.2_nosignature.jar || die
+	ln -s "${DISTDIR}"/CD5919A707EB6B5C1FC29964C8EF5E2CF3F5A3D4-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar o.eclipse.equinox.registry/external/org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar || die
+	ln -s "${DISTDIR}"/A4634373DC60650C49CC98AEA2090889F7ADC68F-org.eclipse.equinox.security-1.1.1_nosignature.jar o.eclipse.equinox.security/external/org.eclipse.equinox.security-1.1.1_nosignature.jar || die
+	ln -s "${DISTDIR}"/278049664FFA5447191BD5FE96B0B62B0CFD15D1-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit/external/org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar || die
+	ln -s "${DISTDIR}"/9039A0C1FA0E56CB56A1A192908814478FA747C5-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit.java7/external/org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar || die
+	ln -s "${DISTDIR}"/DAA45A7EE529A7532F5DC08625A5A3E81DB2D4CB-org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar || die
+	ln -s "${DISTDIR}"/F5AC8FBA216A8C52F319EC2CB455B44FFD734B38-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar || die
+	ln -s "${DISTDIR}"/B43E7CE55F0DECA3BE1A6E695A3E3ABC6D62567F-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar || die
+	ln -s "${DISTDIR}"/1B9CBEC0FCB47C279519E52D360199C24EC99B01-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar o.eclipse.mylyn.commons.repositories.core/external/org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar || die
+	ln -s "${DISTDIR}"/6B0A6E9F9179E314944E4ADB831A9D6FCADED3DC-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar || die
+	ln -s "${DISTDIR}"/B28B8EE777232102471EA5334FD70E20851845DD-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar || die
+	ln -s "${DISTDIR}"/24A15BD37950663933CC4975EE6E518BEB2C28A3-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.confluence.core/external/org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar || die
+	ln -s "${DISTDIR}"/01CD242F06F6F7E4E61C9E05ABBE07318E501D51-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar || die
+	ln -s "${DISTDIR}"/75928E4368CA748131A6767BA1A97D9DA643C306-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.textile.core/external/org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar  || die
+	ln -s "${DISTDIR}"/8307A44D3F150F1BB317532097A0C7D125C00F2D-org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.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}"/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 f070d82..f50dd17 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_p20150807 (07 Aug 2015)
+
+  07 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-java-9999_p20150807.ebuild:
+  updated to the latest sources
+
 *netbeans-java-9999_p20150805 (05 Aug 2015)
 
   05 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 90f9bfb..8fd4044 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -115,6 +115,7 @@ DIST netbeans-trunk-nightly-201508010002-src.zip 208741865 SHA256 2ade7e4e9f2b80
 DIST netbeans-trunk-nightly-201508030002-src.zip 208748030 SHA256 933445356a68c17218a1e5d047568b7493208f5e4ac5cb083b6c0c840080e08f SHA512 000a443f1e02911e29996d0ab6021863faf1ea3649cb71dff7df5c262087dda663d4d670f64a238df86220fb1bf0fb713a990bd78671077ac86d5e0c7d0a52a6 WHIRLPOOL c71739d059f35e7f3f6b301f7291f8ddec3d286eec918a18f9ce924068f1ff84a3138c50f5c59d4efb297b5aa8c748988c6695656deb47a4fe49fcaf35b86bd3
 DIST netbeans-trunk-nightly-201508040002-src.zip 208761490 SHA256 b001f001aff1c4a6e29cf289beeefea7e766fd278a7144a028970bd9b65b0459 SHA512 87a1c41db0c76a01150c08247dc76f397e0e9ac2d87ff3fc5a6f7d91265812bc8471ae87edd781ea2518c8b47f48ad374b4fddccb38ba1ef888e001c3b295224 WHIRLPOOL bae5b1c4f71cb87f223d8232c29da2fdfc3a3482db42cd3783f2c249aeb7c409f2b40fe815e290006797307a5ba296316f21a44988cb098659b6d1969359c371
 DIST netbeans-trunk-nightly-201508050002-src.zip 208776240 SHA256 740052c5a604bf1908a1a6643ce9b5b1b43b92291544a59a68cad2378b5734c6 SHA512 890f8967825f1eed1c3bc265fa2e359d258fe8e502469b463de8878070d350463f4f5cc39bb2a5c0a65e01cdf989497038373879e1d55904047868e1d6511290 WHIRLPOOL ef52d09526d51662f243f55f3ebd143c8902fc3dc5d00c9507250881abf9ff20239a1c017b951ad9ae08c32f3afa057f2a7a5d6e27bab4072eb3ba1b7caf96d5
+DIST netbeans-trunk-nightly-201508070002-src.zip 208777237 SHA256 3f1014a410386bb7b1fa0772db4a7fc9bf6cb5f0177868ce727daf6b6029a89c SHA512 6de45ad0050121f9510b7daca7701328698ffeea7a8c8204c06458caf978246d7a0a0a576759367d3966933b063fc630e7d710595cefc934e3637c7792c94267 WHIRLPOOL c7ec2e93ce0b71fa6fd39adcb3b1ef122c0961378939074ec837dd8c393ec3c60475cfc26238408a07aa1e52c735d06275c9616e5fa007ca915c413765de294e
 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_p20150801.ebuild 14824 SHA256 de02fac7dc2e959899632871
 EBUILD netbeans-java-9999_p20150803.ebuild 14824 SHA256 715bb7be7c2de116b1afe8c190d08ecff0f161567486dd59df8de833d12655f1 SHA512 0d742dfe9f17123646e3c0da0c18702698940c3a853723fce27c67eede55d6f1cf66bb004f4bd83709546e3a10cf789edba9dd705339184f169ab758acbe7c30 WHIRLPOOL 6fe3071fe790647ec84026e1963f88bfcb2c0e013117d468b71d11a01db9d9d9e358f4e426333e8300c2d25b61f0b564a2627aea7db8c5fba54349bb78ca1f69
 EBUILD netbeans-java-9999_p20150804.ebuild 14824 SHA256 8a51867fbf4233981237398924d4ff1d3e77a553eecfd2f045743742a18599c2 SHA512 aa7ab2bcb9c663a3d080ca649202937d22488401d0fa1aff18681e74351a9fe465e803f0be23a69b2703126cf8bc178d6d692e5d4cd52534d316f086dc036437 WHIRLPOOL ecf7e200c266865ca1bcc3a2dbbe547b7770388dd80bf6e6f3e4356aa28286129a225032c57fe814b489cc2384543312b65f2542a23054f106ebe6e53d28fd83
 EBUILD netbeans-java-9999_p20150805.ebuild 14824 SHA256 afb435b9edf2500d2886e06c1388f9108e8abab086a78304cf77473c9182eb0f SHA512 7f3019e3b405ec33a3da06f5dc90b84374cd90faa71a7e3f79605e8a2643345e4145b718a25050c9f0ffee140afea93f09f999e1c0d929d418f6d0ebea7c2a81 WHIRLPOOL 31c20707568dfb6ef86bce15a4bd71edcc52c5e21aa1d2c4faaea38777165df42778aeaf67eabddd3545f33975e164715c0a241bc262aebcae900301d80c6d3c
-MISC ChangeLog 170635 SHA256 c50c623ae25f7e5310459f4266efa639ffc9ad178413d0438a76d3c727df2990 SHA512 d1054a4f42d0c44112221d96b0458990ff55277cd5a455e1e017a7726ff6ab1bb9386fba3cf03eb892afd22f278937aafdddf8c5a92c9c062defe5e2c38a3d7e WHIRLPOOL 8f364e89c290df60c1548b811327060d95e7a41b758769db9d1d48a9c68023df42c5b306fd1e929d279aa29d431bd3612db4e9ae0751afbac1f7904dc9b8266e
+EBUILD netbeans-java-9999_p20150807.ebuild 14824 SHA256 01929b478870de4d177bd9ddbc817d5c5ea991bb85640a808aafbd0fd8ae368f SHA512 d1f1d2a74d34168aa92f44757cad508f3e6f532f3b433fac7ad06823609f45ddb31441a757ae4b92f634d7b517f5a18888baa5acef3f27eda8933e11800962e5 WHIRLPOOL 1fd95bd2c506ab9621d78af1694f0d61bea79a026265898c4109699524bbd4f9665248f598074d622d852193e5351c1d75dc3a37359db4d9f7d8eb2270651b28
+MISC ChangeLog 170805 SHA256 b79a2c5cf4578507da29ce7c62b76f39b1354ee4a74e280d92443b0f9c30e056 SHA512 95ef9a056d42cf7ec9fce5d8e192b54dba04da3da6a13c29c8f4199ca0f79622661ec887849ecce1f03811e01881fba4caf7852687f5462f27ec16c438562b9a WHIRLPOOL d539c79266eb092c2ccab4555b35a5ae6da68acd0f7b85a6892afb95b89ff7249820414051bfc0c620a48104a87caf855f944bbe770532f751bd175bbe6c7b82
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-javacard/ChangeLog b/dev-java/netbeans-javacard/ChangeLog
index 668bd5e..5e879f8 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_p20150807 (07 Aug 2015)
+
+  07 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javacard-9999_p20150807.ebuild:
+  updated to the latest sources
+
 *netbeans-javacard-9999_p20150805 (05 Aug 2015)
 
   05 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index a67b2b1..0625585 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201508010002-src.zip 208741865 SHA256 2ade7e4e9f2b80
 DIST netbeans-trunk-nightly-201508030002-src.zip 208748030 SHA256 933445356a68c17218a1e5d047568b7493208f5e4ac5cb083b6c0c840080e08f SHA512 000a443f1e02911e29996d0ab6021863faf1ea3649cb71dff7df5c262087dda663d4d670f64a238df86220fb1bf0fb713a990bd78671077ac86d5e0c7d0a52a6 WHIRLPOOL c71739d059f35e7f3f6b301f7291f8ddec3d286eec918a18f9ce924068f1ff84a3138c50f5c59d4efb297b5aa8c748988c6695656deb47a4fe49fcaf35b86bd3
 DIST netbeans-trunk-nightly-201508040002-src.zip 208761490 SHA256 b001f001aff1c4a6e29cf289beeefea7e766fd278a7144a028970bd9b65b0459 SHA512 87a1c41db0c76a01150c08247dc76f397e0e9ac2d87ff3fc5a6f7d91265812bc8471ae87edd781ea2518c8b47f48ad374b4fddccb38ba1ef888e001c3b295224 WHIRLPOOL bae5b1c4f71cb87f223d8232c29da2fdfc3a3482db42cd3783f2c249aeb7c409f2b40fe815e290006797307a5ba296316f21a44988cb098659b6d1969359c371
 DIST netbeans-trunk-nightly-201508050002-src.zip 208776240 SHA256 740052c5a604bf1908a1a6643ce9b5b1b43b92291544a59a68cad2378b5734c6 SHA512 890f8967825f1eed1c3bc265fa2e359d258fe8e502469b463de8878070d350463f4f5cc39bb2a5c0a65e01cdf989497038373879e1d55904047868e1d6511290 WHIRLPOOL ef52d09526d51662f243f55f3ebd143c8902fc3dc5d00c9507250881abf9ff20239a1c017b951ad9ae08c32f3afa057f2a7a5d6e27bab4072eb3ba1b7caf96d5
+DIST netbeans-trunk-nightly-201508070002-src.zip 208777237 SHA256 3f1014a410386bb7b1fa0772db4a7fc9bf6cb5f0177868ce727daf6b6029a89c SHA512 6de45ad0050121f9510b7daca7701328698ffeea7a8c8204c06458caf978246d7a0a0a576759367d3966933b063fc630e7d710595cefc934e3637c7792c94267 WHIRLPOOL c7ec2e93ce0b71fa6fd39adcb3b1ef122c0961378939074ec837dd8c393ec3c60475cfc26238408a07aa1e52c735d06275c9616e5fa007ca915c413765de294e
 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
@@ -57,5 +58,6 @@ EBUILD netbeans-javacard-9999_p20150801.ebuild 4982 SHA256 6e5aee567dd281d7b9a65
 EBUILD netbeans-javacard-9999_p20150803.ebuild 4982 SHA256 c1c4371369efea6676bdbdfea6bf39ea4b69043ed7ebb45a1d9ba6b2feafd8ad SHA512 2e1895efc622f5c10a82a82f7f11fa7c46a896abf3bfe436683dfa7a471f873d1f0c0533528e5c2cc1ac7b3779bd8c6d7dc9cbf46b5a4730beaba6107eeecc09 WHIRLPOOL f5634e839e5479b549fe8fb14fcedcdd3eec2012095883401672db69d6ae12dad8f004f4e1e17718f8f4e6e23f1e5e905dd464f480daf651337a94310d84d48b
 EBUILD netbeans-javacard-9999_p20150804.ebuild 4982 SHA256 f676f958b5f1dbcdff8b9e22a958b756f056d22834e791e51ab5a88947dc8032 SHA512 052f054b27cbbaa5d0df25c2b0c996ebf50fadb2c24ecfb12d790455aa0eaa387eec58c807d2ccfd24626cd04ce639c0d778608f9bb4739b641c13c4aea44dc9 WHIRLPOOL 76ce76c67cf2aa3a6d23488cb4cc1398febe121e16b919cb6bef6d11d86d56aeedb785e8a146a397d5ad86945ad20842aca2971ad8bda03622862a9b51093bf5
 EBUILD netbeans-javacard-9999_p20150805.ebuild 4982 SHA256 be3127a2c69a7f8c908ce58af79bf59c49fc47b6f997984953b5197292a70002 SHA512 bcfa6aaab5fcd79c546b7a1cc1c35c3739d6ff9a918dc46de9b76958dd5117eaecebef1bc59c217d8d9bd1184d1cd28a6bf32c8ada547c0b613cf4a21a6da9a6 WHIRLPOOL 17a92bf05d434e76e341d0b490c1828db94d22040673c6513a9e5307fe3a13f53373208ce834d8a566cb6cf6de2a051db3f154cb5045d631ad7fbeaa05a38092
-MISC ChangeLog 177862 SHA256 9a661842be24df09edd82bfb696716e9935d77af98223748e99f1c7737f26575 SHA512 c3d0a939259d966baa22af04aa7b94d32168dad979f3637eab6924d4dffe155ee2338e5ca7d5ff331d0948b57b38e9d60f3c4edf40a5b533b09f29bb47aa01e4 WHIRLPOOL 65a680995c86f8572f402ce27baee9dac993fad0b472364f52de8ac5216b069791b9562808388bb8a7e4166880d8cb331219f610853b5e0f5f58efd06eeb09e4
+EBUILD netbeans-javacard-9999_p20150807.ebuild 4982 SHA256 e899b6e58084a78a843d8ba000747a88efdf35875afac05cc7036717a409823a SHA512 c6e38b72dedf3f0ee219825e014145e7c9ffe31e09ba526c9a3af525403ea9cfa73cf57c095be24ae8074e9b0451811dabcb46da02ee19b2edcd90509ca87e42 WHIRLPOOL f0884a6d40d2d267e5fe6bc17a2b3fb538c1dd0f4ff6f9c1548220ce26aa0b8247f148cce0767906fa2595d57cda8d6e113af0243e65c973683bc462c64bc2be
+MISC ChangeLog 178040 SHA256 83ab8ae8ddf10a0f3a8412dbe40a7f51f00d98f57d082526af994c7abeee31d7 SHA512 b969cfcebb752a5eb9f43594aa33fbdd047ac5e7d6dd737428392181af79a03b92410d7bfa6a545ff95b73912bc210f52e840f5eb2b7bcb7c42ef746b5f63ca3 WHIRLPOOL 4e1910766ff7947db141a86b55fceea7aa1df2e957124da9f4acb8cde0e2a67a6f2cf510b93bd50557dc448c65faa8b5a35233ef9d6bd788f996b47a656e7a8d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150807.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150807.ebuild
new file mode 100644
index 0000000..ee29980
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150807.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-08-07_00-02-28/zip/netbeans-trunk-nightly-201508070002-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 f9fec49..1ddfea2 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_p20150807 (07 Aug 2015)
+
+  07 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javadoc-9999_p20150807.ebuild:
+  updated to the latest sources
+
 *netbeans-javadoc-9999_p20150805 (05 Aug 2015)
 
   05 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index 75b16a1..c99cec4 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201508010002-src.zip 208741865 SHA256 2ade7e4e9f2b80
 DIST netbeans-trunk-nightly-201508030002-src.zip 208748030 SHA256 933445356a68c17218a1e5d047568b7493208f5e4ac5cb083b6c0c840080e08f SHA512 000a443f1e02911e29996d0ab6021863faf1ea3649cb71dff7df5c262087dda663d4d670f64a238df86220fb1bf0fb713a990bd78671077ac86d5e0c7d0a52a6 WHIRLPOOL c71739d059f35e7f3f6b301f7291f8ddec3d286eec918a18f9ce924068f1ff84a3138c50f5c59d4efb297b5aa8c748988c6695656deb47a4fe49fcaf35b86bd3
 DIST netbeans-trunk-nightly-201508040002-src.zip 208761490 SHA256 b001f001aff1c4a6e29cf289beeefea7e766fd278a7144a028970bd9b65b0459 SHA512 87a1c41db0c76a01150c08247dc76f397e0e9ac2d87ff3fc5a6f7d91265812bc8471ae87edd781ea2518c8b47f48ad374b4fddccb38ba1ef888e001c3b295224 WHIRLPOOL bae5b1c4f71cb87f223d8232c29da2fdfc3a3482db42cd3783f2c249aeb7c409f2b40fe815e290006797307a5ba296316f21a44988cb098659b6d1969359c371
 DIST netbeans-trunk-nightly-201508050002-src.zip 208776240 SHA256 740052c5a604bf1908a1a6643ce9b5b1b43b92291544a59a68cad2378b5734c6 SHA512 890f8967825f1eed1c3bc265fa2e359d258fe8e502469b463de8878070d350463f4f5cc39bb2a5c0a65e01cdf989497038373879e1d55904047868e1d6511290 WHIRLPOOL ef52d09526d51662f243f55f3ebd143c8902fc3dc5d00c9507250881abf9ff20239a1c017b951ad9ae08c32f3afa057f2a7a5d6e27bab4072eb3ba1b7caf96d5
+DIST netbeans-trunk-nightly-201508070002-src.zip 208777237 SHA256 3f1014a410386bb7b1fa0772db4a7fc9bf6cb5f0177868ce727daf6b6029a89c SHA512 6de45ad0050121f9510b7daca7701328698ffeea7a8c8204c06458caf978246d7a0a0a576759367d3966933b063fc630e7d710595cefc934e3637c7792c94267 WHIRLPOOL c7ec2e93ce0b71fa6fd39adcb3b1ef122c0961378939074ec837dd8c393ec3c60475cfc26238408a07aa1e52c735d06275c9616e5fa007ca915c413765de294e
 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
@@ -60,5 +61,6 @@ EBUILD netbeans-javadoc-9999_p20150801.ebuild 6234 SHA256 03de92babc01e84089dfdf
 EBUILD netbeans-javadoc-9999_p20150803.ebuild 6234 SHA256 46b1e16415c054e7b46a2d5dee47221e982e940d7527815d9583ff5f88810148 SHA512 2809b91207e2d8a27090d9c0d22cef5b48a3f393f59422f57e0d1bbae27f99c53c0632769023f0a2b989e535cfac1f2788569384aaa0d20636cd287e85ba1f6c WHIRLPOOL b296de929bf9da7cff5f70367fe2a99131b0812adb1173ec6157be3f7d0e6610c1a68bf8bc961a2f03abaabc81d643a043aba48d9d393a051f8fac238c1697d9
 EBUILD netbeans-javadoc-9999_p20150804.ebuild 6234 SHA256 c22bb01c15c8108de9a43d9e6ef3da10acda064dbe99f1df926d4779d1130fa8 SHA512 f8a2a06bbc7b5fb89efbd5ec7036f5f9aa88b53841fc8d7429c398adadb3eeabd01524f4e95b9341bc05f7c3286ab6064ef5162150d3ca9c0433f2b500de12e2 WHIRLPOOL 5c528d76d3e65794bcc75e5b8385f5d0717efb89c9a25d8b3cd76ddd282b97ea5e11a1da9f1cb3816fd2e4dd251774acd2cbb20210cb9b9abab1126ef7b7ed90
 EBUILD netbeans-javadoc-9999_p20150805.ebuild 6234 SHA256 643eabd01af8d7ed73b582aa757073e7a2f8b2332d7e6501669a41fd5ecde107 SHA512 8870cd6905171b59c6bcbc2e43d7ac523a719ff145d6f057d981af77b5b1be6b487b470a0893197bb22ea3c5f89abfd415ac3d458f083eb0e7e4d002fb2f266f WHIRLPOOL 384bf72c5c83c72217a11f52cc9232a4a1c57957fc416810d51cb1ff30f931c1b18f30b8a5f1d85b68f7e96ca722e538c7f1a4ef2600a199d07bd17a250992e7
-MISC ChangeLog 175465 SHA256 5f3aa2bdc71d02919cbbe0dbd99f997202c2d4b010325b69c50f697b877c5f54 SHA512 faa1dfbf7f4dbb2699fbbc31412a76dcf4835c17f3fc607d0aac71286767c9e2b2aa1798dd55af3b52e1c79ba8ca840ad0b1c7cbfdfb816c41f06444b9b05c6c WHIRLPOOL e0f89001a90f34ff7eaddc7f05d62656ffeaae61e9f3bd05681fcaa492efa7970d91804cce0227ac05cb0473427c5d080b977a3e3303e2108cab897013822f72
+EBUILD netbeans-javadoc-9999_p20150807.ebuild 6234 SHA256 398f9d0d83a6ec12f4263f2429b23ade97f8a4ea0a403f4e247e5a6868573f21 SHA512 77f08cdeda3e3aa76ef885125ad1381ee75a09b271f42652938c2284dea54600f811cc2f713dcf983bcde62634f02981d42bc32f13f69462c87ee1e8bfc404f5 WHIRLPOOL 3e1871fda5160adcb4079357b90ae032ab1dae87144cf9e4839b15e648e8e70a6d135d7879bc359cc436317864b7afca4105ef72daf5c18a001751615392fce6
+MISC ChangeLog 175641 SHA256 a935e9969badae0539dc103ce8e798852d14c84f53112f97cfc7031e1f8423de SHA512 168180ae244adef63d6a468ecabef6628df0641baea4db8a09b146670ddd6482d2182cee48a13724c0efe1473e2299f409d20289ff9df3374b300e2c23ff8f99 WHIRLPOOL cf75bcfda3a4299c1ab0bcc3ff754a75b4a139db360fc7ca2017a1425fcdcabededb4c644bdec012635c28f18ec53c7f5755e2badb1cbbd6f05920112dbee04a
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150807.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150807.ebuild
new file mode 100644
index 0000000..2df397b
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150807.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-08-07_00-02-28/zip/netbeans-trunk-nightly-201508070002-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 046725d..e781764 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_p20150807 (07 Aug 2015)
+
+  07 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javafx-9999_p20150807.ebuild:
+  updated to the latest sources
+
 *netbeans-javafx-9999_p20150805 (05 Aug 2015)
 
   05 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index 6f8e47f..50a0f7e 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201508010002-src.zip 208741865 SHA256 2ade7e4e9f2b80
 DIST netbeans-trunk-nightly-201508030002-src.zip 208748030 SHA256 933445356a68c17218a1e5d047568b7493208f5e4ac5cb083b6c0c840080e08f SHA512 000a443f1e02911e29996d0ab6021863faf1ea3649cb71dff7df5c262087dda663d4d670f64a238df86220fb1bf0fb713a990bd78671077ac86d5e0c7d0a52a6 WHIRLPOOL c71739d059f35e7f3f6b301f7291f8ddec3d286eec918a18f9ce924068f1ff84a3138c50f5c59d4efb297b5aa8c748988c6695656deb47a4fe49fcaf35b86bd3
 DIST netbeans-trunk-nightly-201508040002-src.zip 208761490 SHA256 b001f001aff1c4a6e29cf289beeefea7e766fd278a7144a028970bd9b65b0459 SHA512 87a1c41db0c76a01150c08247dc76f397e0e9ac2d87ff3fc5a6f7d91265812bc8471ae87edd781ea2518c8b47f48ad374b4fddccb38ba1ef888e001c3b295224 WHIRLPOOL bae5b1c4f71cb87f223d8232c29da2fdfc3a3482db42cd3783f2c249aeb7c409f2b40fe815e290006797307a5ba296316f21a44988cb098659b6d1969359c371
 DIST netbeans-trunk-nightly-201508050002-src.zip 208776240 SHA256 740052c5a604bf1908a1a6643ce9b5b1b43b92291544a59a68cad2378b5734c6 SHA512 890f8967825f1eed1c3bc265fa2e359d258fe8e502469b463de8878070d350463f4f5cc39bb2a5c0a65e01cdf989497038373879e1d55904047868e1d6511290 WHIRLPOOL ef52d09526d51662f243f55f3ebd143c8902fc3dc5d00c9507250881abf9ff20239a1c017b951ad9ae08c32f3afa057f2a7a5d6e27bab4072eb3ba1b7caf96d5
+DIST netbeans-trunk-nightly-201508070002-src.zip 208777237 SHA256 3f1014a410386bb7b1fa0772db4a7fc9bf6cb5f0177868ce727daf6b6029a89c SHA512 6de45ad0050121f9510b7daca7701328698ffeea7a8c8204c06458caf978246d7a0a0a576759367d3966933b063fc630e7d710595cefc934e3637c7792c94267 WHIRLPOOL c7ec2e93ce0b71fa6fd39adcb3b1ef122c0961378939074ec837dd8c393ec3c60475cfc26238408a07aa1e52c735d06275c9616e5fa007ca915c413765de294e
 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
@@ -59,5 +60,6 @@ EBUILD netbeans-javafx-9999_p20150801.ebuild 4723 SHA256 baecf0118cbd25818f4a121
 EBUILD netbeans-javafx-9999_p20150803.ebuild 4723 SHA256 12c8ae9e42f12155f44fd5d8ffe60a59e5450ee4738454649d0c3f6e051ad265 SHA512 3f90ec7a03aad00e87b76af9d370d929a145d69c1b675959f7d5c9775dea9e4e98bf0be098dc0107177af584d0e32a9fbd61db1402c0d99d460c1cea6fdbaee7 WHIRLPOOL 405bdbf39d29f13b5be946b5f74682456cb9e213b6e1f7ec47590ca95f39539329edc0452afb98a5f5308c04437ed0f40e198a0bab8c2e5473a438beda8406e4
 EBUILD netbeans-javafx-9999_p20150804.ebuild 4723 SHA256 93ef750dcfa2dcb194b7dc3add3121860300da027925ff555176dfd75f8fe6e0 SHA512 a62f2b341a0642a29065d8ba4f21de812bd888c22e3ff21e478cf3f25a2ef28c018776e589ca1927c871ac6ec53d103d794fc70d13fb31b9e66afdb36858d47a WHIRLPOOL 5e247dbe1d2da2328139870122d401a423dedecc9e76af72ca6f2ac06093e2382429b6e208062ff4c3f2095a17868f93657a80c71c482efea252844a10d4ae19
 EBUILD netbeans-javafx-9999_p20150805.ebuild 4723 SHA256 793c1edf374b6ac593dc79ee2c211b1e749576216a5b77d32d7169416df00cbc SHA512 e826a443e48d2bdfc01c51963ff9ef5385497886b80c6dd35a0c50e404ae89c24409d413c4ebfb1807406e051fee10b37e0dc0cae01a110e3ab2e391e9f35d60 WHIRLPOOL 018ff15995ad9407ef33bb0b28f34d5d3e5b99ec08960b5276039dcc5b55e45d25f43fa3f85b796a22e51b69210f5bcc26c757f39434a6afe5a99e9507d32014
-MISC ChangeLog 159935 SHA256 3712f59aeb3325e6d8ef479f592dec98a8ee3e6f25d8093e67155d200e58d922 SHA512 6ded45dad7eef83e3094c00eb162c3b94843fac518af08e9ac9461a7b4a46bd4b909e6ad2841191395e83749ac025359ae1b76f89b89805d125e668c2ccd5b5a WHIRLPOOL fa6ddf1bbaa87dd06877b46156f0f57ee98068530d4d8138d1b34f3983a4a36df80f4b2175b3ca08cc3dd3dd8ec69595ff86e433f27d9fc2d0b4e4f4bca4b86a
+EBUILD netbeans-javafx-9999_p20150807.ebuild 4723 SHA256 a636ad02460b0d0ea89132e173e0d96c04cf7205df447118b72192b30a4df470 SHA512 155b9f14497a299c79e0a1aba9ac8bdf93f5153dec460ce5a497c87b6b5d72b4d669ee11eb169e6ef5497d6d752e296220d3edff3024899512c65629881680a6 WHIRLPOOL 1d0a0e5c6c05ee3074580ebcc296f5bc551d14176147855d07d276f5cbb54b3adbf69bb464031eb388da9a61ad49fdde39161eb11184ff7ee67e0d4459c44c99
+MISC ChangeLog 160109 SHA256 6398650c09b8242a291f081f1c2f9ef6e5f2c3d546952ac466b6cb57c5bbca41 SHA512 c9dd7f85a92f16789e921882e343d7d4286f7755aa5f4ac64134f4316f15e7a8eb4243bd97a26e0cb0566a8ba210ae4086066b01c0f60b64cdbb4a46421af065 WHIRLPOOL 48cd61c00d6e45de5225f5c07063c907980ff0afac0d286e6eed86bf246be6e2ae5ce41570a71459259f02f24588b268abc59c2b4d9b70c7f7af8046f14c5a2b
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150807.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150807.ebuild
new file mode 100644
index 0000000..d601183
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150807.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-08-07_00-02-28/zip/netbeans-trunk-nightly-201508070002-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 bc60c63..80cac84 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_p20150807 (07 Aug 2015)
+
+  07 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-mobility-9999_p20150807.ebuild:
+  updated to the latest sources
+
 *netbeans-mobility-9999_p20150805 (05 Aug 2015)
 
   05 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index b3e558a..2d19728 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201508010002-src.zip 208741865 SHA256 2ade7e4e9f2b80
 DIST netbeans-trunk-nightly-201508030002-src.zip 208748030 SHA256 933445356a68c17218a1e5d047568b7493208f5e4ac5cb083b6c0c840080e08f SHA512 000a443f1e02911e29996d0ab6021863faf1ea3649cb71dff7df5c262087dda663d4d670f64a238df86220fb1bf0fb713a990bd78671077ac86d5e0c7d0a52a6 WHIRLPOOL c71739d059f35e7f3f6b301f7291f8ddec3d286eec918a18f9ce924068f1ff84a3138c50f5c59d4efb297b5aa8c748988c6695656deb47a4fe49fcaf35b86bd3
 DIST netbeans-trunk-nightly-201508040002-src.zip 208761490 SHA256 b001f001aff1c4a6e29cf289beeefea7e766fd278a7144a028970bd9b65b0459 SHA512 87a1c41db0c76a01150c08247dc76f397e0e9ac2d87ff3fc5a6f7d91265812bc8471ae87edd781ea2518c8b47f48ad374b4fddccb38ba1ef888e001c3b295224 WHIRLPOOL bae5b1c4f71cb87f223d8232c29da2fdfc3a3482db42cd3783f2c249aeb7c409f2b40fe815e290006797307a5ba296316f21a44988cb098659b6d1969359c371
 DIST netbeans-trunk-nightly-201508050002-src.zip 208776240 SHA256 740052c5a604bf1908a1a6643ce9b5b1b43b92291544a59a68cad2378b5734c6 SHA512 890f8967825f1eed1c3bc265fa2e359d258fe8e502469b463de8878070d350463f4f5cc39bb2a5c0a65e01cdf989497038373879e1d55904047868e1d6511290 WHIRLPOOL ef52d09526d51662f243f55f3ebd143c8902fc3dc5d00c9507250881abf9ff20239a1c017b951ad9ae08c32f3afa057f2a7a5d6e27bab4072eb3ba1b7caf96d5
+DIST netbeans-trunk-nightly-201508070002-src.zip 208777237 SHA256 3f1014a410386bb7b1fa0772db4a7fc9bf6cb5f0177868ce727daf6b6029a89c SHA512 6de45ad0050121f9510b7daca7701328698ffeea7a8c8204c06458caf978246d7a0a0a576759367d3966933b063fc630e7d710595cefc934e3637c7792c94267 WHIRLPOOL c7ec2e93ce0b71fa6fd39adcb3b1ef122c0961378939074ec837dd8c393ec3c60475cfc26238408a07aa1e52c735d06275c9616e5fa007ca915c413765de294e
 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
@@ -63,5 +64,6 @@ EBUILD netbeans-mobility-9999_p20150801.ebuild 4418 SHA256 faf9180dd09ecec4d7fbc
 EBUILD netbeans-mobility-9999_p20150803.ebuild 4418 SHA256 7f96c52f1a5dd8123f28c5d80c30a13fe385a44501b5c06bc195842026fc9b18 SHA512 a0ba1e992bb425c95c2811bd9c30cd46bda4ef9303f616446a27d97691f0a78d932f65c511dd2655c2177f973477d37a42b61abb497d34ab1507047dc437ff26 WHIRLPOOL 84825224f719accfd17e7ceb876ea2440af357a184dee3d440e536e8a249fce1b570e774c8102df137c557e59ee86701fe641a78576192d88f891b7f3e96bf7c
 EBUILD netbeans-mobility-9999_p20150804.ebuild 4418 SHA256 81d9f7e892ae814e703b7eb1518b2f60075bf956e3084820d03a6da21f36f4c2 SHA512 977331a49dee42e6eb948afc0d76d609c90c16366f9d560ad48d932a8b3454963af33f6f2de9d5bcd7d91e0d16949c2b11300dedfe24c872cdbe5bb7828f52f2 WHIRLPOOL 70f847185f48911a552a6bc94b72650c8e5d796b9299a936b64d952703add8b495407b0d42187d1d7d8ca87a30c9d8ddb8da94896fc935c79fd9e1f1d0b84fd1
 EBUILD netbeans-mobility-9999_p20150805.ebuild 4418 SHA256 f9977590960936eb25e3e088d34035f86461cbdef42120aca80fedbbd7d28bbb SHA512 4bdd64259e6411cff339e19d6876f7f5da839c711f10ab8a403a47871255a800e3efd6bd32d92d20649d0925bb0a0ce50c9e9d3f2bbc0be6f96ba4ff06b29b09 WHIRLPOOL 859c4fad9b553db221d43742d964ed6e6b20f8bf56ac0bc8e701d638a30ca1fa824ccc51d00045ebdf15995dd84c30a31447e05fa129c5c1ef90c6d17efcb8d7
-MISC ChangeLog 178003 SHA256 87cf1a3093d3365038cbb396c2b20c969affd8ff06c0205c08280d0fd803ee3b SHA512 7d5ef7a1e50f48594310e14a86d56365893eacb29af97ff71c58fbc3739ab88058937192d95eb0568f5b1fee535f1d86d3f46c254a451f652a6f7f732dfea267 WHIRLPOOL 3dc6b03d0a55518430d355a41f9f32af3ad76031c2afb12e13e7d8f4994f0540fb0ede5af3d41f4b78daf8ee3bddb5129c87816117f904cf9d25d424e07fe41e
+EBUILD netbeans-mobility-9999_p20150807.ebuild 4418 SHA256 6f3d723ded134605dfc7171a5a5287c39e8bfb01d71c60a4c8f1429c8257dcef SHA512 58163a45fa7523defefbe4e8c3e89aef679f33e3f26e51c33bfb6789f7fa0a0f461524c7e89a54c9bbefeb717470efe042919232ac00af4fc38795e665656cd6 WHIRLPOOL 1c5be15a674f8b48296945f69d6c7f943435790cb59b7e5583ad7b49999b12aed69cdb1def740a4092173087d0f483c15e309c64e266d38c89ee5bd5e69ef35d
+MISC ChangeLog 178181 SHA256 99494efda6dc14dc4cea3357e1eaa7892c7502c85af88afb3f6bf541c44d814f SHA512 ea2a6a0ea82d8dd3df9a4541661ad23a75f9a09b8ac034d7dd56e9a9a41e49d1fa4076403b420be3620646d7cd61d8321bf516bd4f21752f9bc2a8f4f2fa0876 WHIRLPOOL b319de6454523bb1ae33e35fc14407fd22e379bd45a82a6d296c52f0f156c2af4d86a095c8da3c4e5f1ca0a1fa1823591ee15324fa68ceef43f1bd4cb046ea0a
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150807.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150807.ebuild
new file mode 100644
index 0000000..385c37a
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150807.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-08-07_00-02-28/zip/netbeans-trunk-nightly-201508070002-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 728ac4f..518a1d2 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_p20150807 (07 Aug 2015)
+
+  07 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-nb-9999_p20150807.ebuild:
+  updated to the latest sources
+
 *netbeans-nb-9999_p20150805 (05 Aug 2015)
 
   05 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index 6cb4a95..2d7ac88 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201508010002-src.zip 208741865 SHA256 2ade7e4e9f2b80
 DIST netbeans-trunk-nightly-201508030002-src.zip 208748030 SHA256 933445356a68c17218a1e5d047568b7493208f5e4ac5cb083b6c0c840080e08f SHA512 000a443f1e02911e29996d0ab6021863faf1ea3649cb71dff7df5c262087dda663d4d670f64a238df86220fb1bf0fb713a990bd78671077ac86d5e0c7d0a52a6 WHIRLPOOL c71739d059f35e7f3f6b301f7291f8ddec3d286eec918a18f9ce924068f1ff84a3138c50f5c59d4efb297b5aa8c748988c6695656deb47a4fe49fcaf35b86bd3
 DIST netbeans-trunk-nightly-201508040002-src.zip 208761490 SHA256 b001f001aff1c4a6e29cf289beeefea7e766fd278a7144a028970bd9b65b0459 SHA512 87a1c41db0c76a01150c08247dc76f397e0e9ac2d87ff3fc5a6f7d91265812bc8471ae87edd781ea2518c8b47f48ad374b4fddccb38ba1ef888e001c3b295224 WHIRLPOOL bae5b1c4f71cb87f223d8232c29da2fdfc3a3482db42cd3783f2c249aeb7c409f2b40fe815e290006797307a5ba296316f21a44988cb098659b6d1969359c371
 DIST netbeans-trunk-nightly-201508050002-src.zip 208776240 SHA256 740052c5a604bf1908a1a6643ce9b5b1b43b92291544a59a68cad2378b5734c6 SHA512 890f8967825f1eed1c3bc265fa2e359d258fe8e502469b463de8878070d350463f4f5cc39bb2a5c0a65e01cdf989497038373879e1d55904047868e1d6511290 WHIRLPOOL ef52d09526d51662f243f55f3ebd143c8902fc3dc5d00c9507250881abf9ff20239a1c017b951ad9ae08c32f3afa057f2a7a5d6e27bab4072eb3ba1b7caf96d5
+DIST netbeans-trunk-nightly-201508070002-src.zip 208777237 SHA256 3f1014a410386bb7b1fa0772db4a7fc9bf6cb5f0177868ce727daf6b6029a89c SHA512 6de45ad0050121f9510b7daca7701328698ffeea7a8c8204c06458caf978246d7a0a0a576759367d3966933b063fc630e7d710595cefc934e3637c7792c94267 WHIRLPOOL c7ec2e93ce0b71fa6fd39adcb3b1ef122c0961378939074ec837dd8c393ec3c60475cfc26238408a07aa1e52c735d06275c9616e5fa007ca915c413765de294e
 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
@@ -62,5 +63,6 @@ EBUILD netbeans-nb-9999_p20150801.ebuild 5003 SHA256 6a693b4176aab9789f8c0354cf4
 EBUILD netbeans-nb-9999_p20150803.ebuild 5003 SHA256 0928e147aeaf5605d1ada6ba25cc1305193e7ea885d33215cae382a4c78ddc77 SHA512 47109e41665cc334f3233ec10b669d10d304d6d9b0e5dd19966b00699c0c7e845a867bcf61a410b8e8a442d5b1e696a6b44aa06ab0e1abb60f94ba39c97bc096 WHIRLPOOL 906722f2763904ca0933d1c6ece21f277cd5ffdd2881f99ab75c02a48306f992d975dce723bfe6c9a7592c3dfa878dd25636260b8b6d067f6bb1ed7cb83e9a2b
 EBUILD netbeans-nb-9999_p20150804.ebuild 5003 SHA256 8460f2f119f1705eb4c78aa56f7f58860f7affa426f2f408b6a998aaf84d0d7b SHA512 a98ababe8b35e499834b09293938370725733d3d667a0647880c7dab860e056214566d8718b00762b130ec7f37e50e3d5af1b15894273651175c3e7b344a6c8f WHIRLPOOL 52280ac64d6e8ce9f5c9bc1795acafe73929254aa73fbc6ae15cbbf27aa64c7e2ef176c3aa77157661429ec215f937241f18d5ff1f9fa82855527414d329a711
 EBUILD netbeans-nb-9999_p20150805.ebuild 5003 SHA256 35d9f19dcca2e3e2136ba1e217bb810d03107938dc21fde3c5d52e1e75aec038 SHA512 a6fd92339fdaa9c5295dc95aa8df86986041c0b5659d50be8a92b3d3f3956f193f483dc60de552fb1a0f5d4984463894a47d6144c49359615bf93e695fe097ca WHIRLPOOL 22d429f9ccd29b2a44a63a4732e7971908e31516858d977cc15c2d2d18c1b2525688016381f5e2fe62bec3a15f5382284fb2f3c9ec22966efeb21687d8756df2
-MISC ChangeLog 166121 SHA256 4a83fa583e5f23ab97ac2457fc062fef3a8e8e9ae2a26fddce8307cfd184a2f6 SHA512 b7a8cd788fabd260068b05dfbfe7e6b4bdda30358a67e22ef31ab4136d0a6ecd7f2c51ca5a2be0f2dfa4bad9819045e9e2bd77718b6fe05fedcf82240530d0c6 WHIRLPOOL a3d09cb22921691d2c1a04f9a74d0aca8fbd214ad85aa7114b1c023ecd021246321c88393ad0ea4ec04658ede487d0ac41afe39a7197e125ebb6d5be54baf7eb
+EBUILD netbeans-nb-9999_p20150807.ebuild 5003 SHA256 2fd5bdc73318018fa21530ac27ac0a79883d3fd8f2120f2a1493d46f50b55a90 SHA512 9eb6a5fd5fab062a29446de91c2a39c1ce28a82b3a6a6d78ef2321551189e65eeccb9f31afde159c50bff6be96df52c99bbf65ae7ef785353b49a9267faa854f WHIRLPOOL 6d8cc97abecc30f5462146a737b50fb229808bf422aa3e8a0e7d4cbb135077ba625238a5178b0cd8c280de469969e3cb833c3d30af5a7347ea0c70f46ef1ac33
+MISC ChangeLog 166287 SHA256 f105ecce7527969421b68ae6ec06ed7f4cd6e4c07b49d10f87b291aa4c05c2e6 SHA512 a29506d047fd40926b47892759fe926b5e13c0102ca241df8e177139497fab8b91ef58bda7456ee3ff58cf59b241df92a20fddc6cc3066e1ef74957710208703 WHIRLPOOL 6807cf04568003b7502c479bca84e86b5a6e4f0a17bc7938097be6f125b0bac4f55a8aa0063df8786dcfec1fbfcba14f7d0a275098e74fa82e964170a1f2a704
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20150807.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20150807.ebuild
new file mode 100644
index 0000000..aaadd18
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20150807.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-08-07_00-02-28/zip/netbeans-trunk-nightly-201508070002-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 65d8293..adfe1e2 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_p20150807 (07 Aug 2015)
+
+  07 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-php-9999_p20150807.ebuild:
+  updated to the latest sources
+
 *netbeans-php-9999_p20150805 (05 Aug 2015)
 
   05 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index e19f075..a8f770e 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -42,6 +42,7 @@ DIST netbeans-trunk-nightly-201508010002-src.zip 208741865 SHA256 2ade7e4e9f2b80
 DIST netbeans-trunk-nightly-201508030002-src.zip 208748030 SHA256 933445356a68c17218a1e5d047568b7493208f5e4ac5cb083b6c0c840080e08f SHA512 000a443f1e02911e29996d0ab6021863faf1ea3649cb71dff7df5c262087dda663d4d670f64a238df86220fb1bf0fb713a990bd78671077ac86d5e0c7d0a52a6 WHIRLPOOL c71739d059f35e7f3f6b301f7291f8ddec3d286eec918a18f9ce924068f1ff84a3138c50f5c59d4efb297b5aa8c748988c6695656deb47a4fe49fcaf35b86bd3
 DIST netbeans-trunk-nightly-201508040002-src.zip 208761490 SHA256 b001f001aff1c4a6e29cf289beeefea7e766fd278a7144a028970bd9b65b0459 SHA512 87a1c41db0c76a01150c08247dc76f397e0e9ac2d87ff3fc5a6f7d91265812bc8471ae87edd781ea2518c8b47f48ad374b4fddccb38ba1ef888e001c3b295224 WHIRLPOOL bae5b1c4f71cb87f223d8232c29da2fdfc3a3482db42cd3783f2c249aeb7c409f2b40fe815e290006797307a5ba296316f21a44988cb098659b6d1969359c371
 DIST netbeans-trunk-nightly-201508050002-src.zip 208776240 SHA256 740052c5a604bf1908a1a6643ce9b5b1b43b92291544a59a68cad2378b5734c6 SHA512 890f8967825f1eed1c3bc265fa2e359d258fe8e502469b463de8878070d350463f4f5cc39bb2a5c0a65e01cdf989497038373879e1d55904047868e1d6511290 WHIRLPOOL ef52d09526d51662f243f55f3ebd143c8902fc3dc5d00c9507250881abf9ff20239a1c017b951ad9ae08c32f3afa057f2a7a5d6e27bab4072eb3ba1b7caf96d5
+DIST netbeans-trunk-nightly-201508070002-src.zip 208777237 SHA256 3f1014a410386bb7b1fa0772db4a7fc9bf6cb5f0177868ce727daf6b6029a89c SHA512 6de45ad0050121f9510b7daca7701328698ffeea7a8c8204c06458caf978246d7a0a0a576759367d3966933b063fc630e7d710595cefc934e3637c7792c94267 WHIRLPOOL c7ec2e93ce0b71fa6fd39adcb3b1ef122c0961378939074ec837dd8c393ec3c60475cfc26238408a07aa1e52c735d06275c9616e5fa007ca915c413765de294e
 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
@@ -66,5 +67,6 @@ EBUILD netbeans-php-9999_p20150801.ebuild 4423 SHA256 de5f663933b4733a5d16c49d75
 EBUILD netbeans-php-9999_p20150803.ebuild 4423 SHA256 196117d43272d65d160a242ba9a4ca6b7cb28518f67fe5b96c3fa7f1bfcf1481 SHA512 0f53726d663d68362bcc947eecc4655d638bee682e08c548082f3ffb5f31e2265777b9476e424ce7eaf30df6bfdcf72e212b8b648a331c8cc485cf150b3f4557 WHIRLPOOL ba6fb9b400bfd0e05dda4688aae2fc8b8a301f382dae2410531c4613535420d2c3912a4c227fdaa2f834152b205d358d6e2503fdf67d68e0649d3af19436394b
 EBUILD netbeans-php-9999_p20150804.ebuild 4423 SHA256 0bd97a93019df459b6637762c707185e2a0654491b65174a25378a56196d6227 SHA512 85c7a7f5692e98e1539dd50c3f4d2b0778e8da3b642d303e400df2fbb568c79aa1d56e5f311067b31054045332a632b2ad054fcbbd473596a1d0359cd044aa0e WHIRLPOOL 054303a264626d0318fe15fc0d40674e47fb94940391576a990b820cb9b81f13604907ee115a24c78dc689c71ee96f1ec8faf204bb41517cfd19f70d1e39c1e6
 EBUILD netbeans-php-9999_p20150805.ebuild 4423 SHA256 0358031c91ac631e4fef270c4a93f80258cc1118d53f62015a27ba26104da529 SHA512 ec9d86220360b8a496fe7233e000b2891436413fa736c99ed020fa6d1d105bdca1a77b7cacb889f4d481d0bcff25ea6bc1b4cfde935acd8ea90623929f3e86ea WHIRLPOOL b979a56e455f9a7fbd291c797f4f02018b31195df4e114daca61277015e3983f6d5ea13b2a083e008a0230b69717e7e784debbf8cd86b5820cb7886be43fb287
-MISC ChangeLog 165976 SHA256 91dc79aecfc1b174779bb0b897468176b39044d75a9d720d662ae393e030b746 SHA512 94c3ddf41b3b82fd8c63d607ee3c96844580612acca00be016a3822fab71dee2e408cd8d90280acb948d63c515fb4f2d332138b2119783f6f1cd17bb2d82c5cd WHIRLPOOL 1c18265da5bcf057d1917c5aa0a9586586875049ed6bc660ad5ca0cdc0c4dab0b4b2016b597c68209eb3eda91f4d46f8bfc5472323f99872333c41bfacf97856
+EBUILD netbeans-php-9999_p20150807.ebuild 4423 SHA256 021ecae37871b83cd73bcd718cd3107a2fae82b020f704df51db8b5945fbc2fc SHA512 bff9dfd61b4c9d01e76f4964e1916acb6511cbd7c3b5f90f668fb5a07a2f3fd05713373f863c3dbf3d72083334888a09c2b21ec2bbb5307f192d11f185982364 WHIRLPOOL 1a325d26eee05e8b14d03c97f6b6a4996de5d77a4555da1affa62296cd0788d0ee2cfabbf1952fe4bb7cd233810f09ac9fcf9892368556098f355ba9d6cd078f
+MISC ChangeLog 166144 SHA256 30c512b12a0c1075d632b08cda4d7be649d908241b5cb0e4f7f541bc3c3899f5 SHA512 2ae6c60301c6ab317ba0b7b47bcfcc9b85910ef56fac1b9303d92eccb7da433555d112258242b3ef67f07c6b929a5d205fb63fe6c68be23cacef88245d73b06b WHIRLPOOL 204d0ed5e8315da2679c65861ab10e05bdf30f4d29fd33a9ecb07c45436026051c26240bc6af6d05eadd4c33de0458f7fe2bd969cd2659eb3605e5d6b3a50fe0
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20150807.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20150807.ebuild
new file mode 100644
index 0000000..f3b59f1
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20150807.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-08-07_00-02-28/zip/netbeans-trunk-nightly-201508070002-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 35de7a6..897338b 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_p20150807 (07 Aug 2015)
+
+  07 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-platform-9999_p20150807.ebuild:
+  updated to the latest sources
+
 *netbeans-platform-9999_p20150805 (05 Aug 2015)
 
   05 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index 88be43c..0401ff8 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -56,6 +56,7 @@ DIST netbeans-trunk-nightly-201508010002-src.zip 208741865 SHA256 2ade7e4e9f2b80
 DIST netbeans-trunk-nightly-201508030002-src.zip 208748030 SHA256 933445356a68c17218a1e5d047568b7493208f5e4ac5cb083b6c0c840080e08f SHA512 000a443f1e02911e29996d0ab6021863faf1ea3649cb71dff7df5c262087dda663d4d670f64a238df86220fb1bf0fb713a990bd78671077ac86d5e0c7d0a52a6 WHIRLPOOL c71739d059f35e7f3f6b301f7291f8ddec3d286eec918a18f9ce924068f1ff84a3138c50f5c59d4efb297b5aa8c748988c6695656deb47a4fe49fcaf35b86bd3
 DIST netbeans-trunk-nightly-201508040002-src.zip 208761490 SHA256 b001f001aff1c4a6e29cf289beeefea7e766fd278a7144a028970bd9b65b0459 SHA512 87a1c41db0c76a01150c08247dc76f397e0e9ac2d87ff3fc5a6f7d91265812bc8471ae87edd781ea2518c8b47f48ad374b4fddccb38ba1ef888e001c3b295224 WHIRLPOOL bae5b1c4f71cb87f223d8232c29da2fdfc3a3482db42cd3783f2c249aeb7c409f2b40fe815e290006797307a5ba296316f21a44988cb098659b6d1969359c371
 DIST netbeans-trunk-nightly-201508050002-src.zip 208776240 SHA256 740052c5a604bf1908a1a6643ce9b5b1b43b92291544a59a68cad2378b5734c6 SHA512 890f8967825f1eed1c3bc265fa2e359d258fe8e502469b463de8878070d350463f4f5cc39bb2a5c0a65e01cdf989497038373879e1d55904047868e1d6511290 WHIRLPOOL ef52d09526d51662f243f55f3ebd143c8902fc3dc5d00c9507250881abf9ff20239a1c017b951ad9ae08c32f3afa057f2a7a5d6e27bab4072eb3ba1b7caf96d5
+DIST netbeans-trunk-nightly-201508070002-src.zip 208777237 SHA256 3f1014a410386bb7b1fa0772db4a7fc9bf6cb5f0177868ce727daf6b6029a89c SHA512 6de45ad0050121f9510b7daca7701328698ffeea7a8c8204c06458caf978246d7a0a0a576759367d3966933b063fc630e7d710595cefc934e3637c7792c94267 WHIRLPOOL c7ec2e93ce0b71fa6fd39adcb3b1ef122c0961378939074ec837dd8c393ec3c60475cfc26238408a07aa1e52c735d06275c9616e5fa007ca915c413765de294e
 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
@@ -80,5 +81,6 @@ EBUILD netbeans-platform-9999_p20150801.ebuild 9244 SHA256 caa91f5b1f095f70a59d0
 EBUILD netbeans-platform-9999_p20150803.ebuild 9244 SHA256 0910f8266f070af49f8ff6f0b64186f01d479eb95cb8e08aa21d6fc9d1495b74 SHA512 7ce1fcb4c15ec58f8ad9b9988adf8b8d9be3d97738ace47a5914641e2b00273c1936cb8f167c2f811107fa7dd202b66e78254efdf14b01740eca69272a1df901 WHIRLPOOL 8452273c0a8ed71b94f8337cb5fc1a83dd8d9039c5d34c8df11b93665576589f657908cdeb9f2ebb881008aa6f191c94675b39708c4f54cef4328bb3627460ee
 EBUILD netbeans-platform-9999_p20150804.ebuild 9244 SHA256 2df8e602aad108e3441e511f16505b3f37ad99b7396cf785c2eb5eb69b8b444f SHA512 81cbee251a6c16d7cadc164f06790d8207a6328c45baaca8dd64a3d76049568b12eff0c83524b92d945f545a731e1680e5e0b17705e6b68fc1f2b59b6fdcb54f WHIRLPOOL e0a2b7780e053d2ec4d82e1cafff5259d05dba48e3994e03ba809287cf8983c49841d4f0299e01950151f1081f06819043b9c06a6f82fe7191c314eb41d861a3
 EBUILD netbeans-platform-9999_p20150805.ebuild 9244 SHA256 26a2303e713075273c1ba197d6418635ca03201d1633b50e187d1a2a07b562cc SHA512 110fcaab0d80515b140accace33b3ca9a79d14f1a9af83534ade477a64be21b05c71d341729578c327d7d6310d03a2aee9b2af71ecba99002b5e7c620cca6666 WHIRLPOOL 02419f3928eb19346570dbb96b95821e81cca4034365f117c9fbf9b4329f577de59d39e98e9235ca71f4af43ac0b6c075510cdaf12fa82fe2b66e34a5efdf889
-MISC ChangeLog 178599 SHA256 75f6bdadadc1ae870af728465f2ab155cd2f3241a616307697a7c718c9395ac7 SHA512 f76eede7eb217d86c735d918e54ebff9ca0d5833b2fc28db8245acec2b0344240c54cc024d4c75f772fc2cf17f32f042cfb609e2e1adef6afa4d1a8e36d4dae1 WHIRLPOOL 6814b84d8544ab318a9a0ba61adaa961b9f8172e7e529d6225fe74367ba8855f8ee5e749598be5edf03e64429bfff26871d7eaedde7cd7207ffcd0cead29cc58
+EBUILD netbeans-platform-9999_p20150807.ebuild 9244 SHA256 39484adbf2e1cf3b9ef93ccb08f0e86159e3bb12816be136c9d6460bf6b1e513 SHA512 7be47b05f0259c222ae8328836fafa4afb9078b0e786bb82deb3de092492fa433a8b9870d355dd89a79d9e2d595f2efa9f109bfd4253cb783e056f26a8a846a0 WHIRLPOOL c4a0c50ef76e100988b3a070f75fee82fd02ef51603dd865cc6aad4522be07401a356bd4f8ea186ecf2afd4de378e3cc2758a3395f11cc0d6553ad9f548ae8ec
+MISC ChangeLog 178777 SHA256 16b3cb51d58ce5fb491665ae8820107e87079495a2c0bb4adc7fe36437b5539b SHA512 9cc23505a45fd8d2734258c06f422313aca1be3b2c5a2a9a333db49c337ffb4fdfd508e9928a7d65a9a2c174156f916014b3b63836d115990d571eee22bedfa8 WHIRLPOOL c3477bb0c2a3307a598a0b867c7805f99db76c76fe103f26ded014034311a9636b4df81429c70fe229a55cc1116abc14db73231bb4f87dda7683b6f1d3affd31
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20150807.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20150807.ebuild
new file mode 100644
index 0000000..f8f1aa5
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20150807.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-08-07_00-02-28/zip/netbeans-trunk-nightly-201508070002-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 3607a6f..47e4b4b 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_p20150807 (07 Aug 2015)
+
+  07 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-profiler-9999_p20150807.ebuild:
+  updated to the latest sources
+
 *netbeans-profiler-9999_p20150805 (05 Aug 2015)
 
   05 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 2cf54ad..a673ae2 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201508010002-src.zip 208741865 SHA256 2ade7e4e9f2b80
 DIST netbeans-trunk-nightly-201508030002-src.zip 208748030 SHA256 933445356a68c17218a1e5d047568b7493208f5e4ac5cb083b6c0c840080e08f SHA512 000a443f1e02911e29996d0ab6021863faf1ea3649cb71dff7df5c262087dda663d4d670f64a238df86220fb1bf0fb713a990bd78671077ac86d5e0c7d0a52a6 WHIRLPOOL c71739d059f35e7f3f6b301f7291f8ddec3d286eec918a18f9ce924068f1ff84a3138c50f5c59d4efb297b5aa8c748988c6695656deb47a4fe49fcaf35b86bd3
 DIST netbeans-trunk-nightly-201508040002-src.zip 208761490 SHA256 b001f001aff1c4a6e29cf289beeefea7e766fd278a7144a028970bd9b65b0459 SHA512 87a1c41db0c76a01150c08247dc76f397e0e9ac2d87ff3fc5a6f7d91265812bc8471ae87edd781ea2518c8b47f48ad374b4fddccb38ba1ef888e001c3b295224 WHIRLPOOL bae5b1c4f71cb87f223d8232c29da2fdfc3a3482db42cd3783f2c249aeb7c409f2b40fe815e290006797307a5ba296316f21a44988cb098659b6d1969359c371
 DIST netbeans-trunk-nightly-201508050002-src.zip 208776240 SHA256 740052c5a604bf1908a1a6643ce9b5b1b43b92291544a59a68cad2378b5734c6 SHA512 890f8967825f1eed1c3bc265fa2e359d258fe8e502469b463de8878070d350463f4f5cc39bb2a5c0a65e01cdf989497038373879e1d55904047868e1d6511290 WHIRLPOOL ef52d09526d51662f243f55f3ebd143c8902fc3dc5d00c9507250881abf9ff20239a1c017b951ad9ae08c32f3afa057f2a7a5d6e27bab4072eb3ba1b7caf96d5
+DIST netbeans-trunk-nightly-201508070002-src.zip 208777237 SHA256 3f1014a410386bb7b1fa0772db4a7fc9bf6cb5f0177868ce727daf6b6029a89c SHA512 6de45ad0050121f9510b7daca7701328698ffeea7a8c8204c06458caf978246d7a0a0a576759367d3966933b063fc630e7d710595cefc934e3637c7792c94267 WHIRLPOOL c7ec2e93ce0b71fa6fd39adcb3b1ef122c0961378939074ec837dd8c393ec3c60475cfc26238408a07aa1e52c735d06275c9616e5fa007ca915c413765de294e
 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
@@ -54,5 +55,6 @@ EBUILD netbeans-profiler-9999_p20150801.ebuild 3478 SHA256 fa737f5ff1cd24e350fa6
 EBUILD netbeans-profiler-9999_p20150803.ebuild 3478 SHA256 455148003d67eaf91b46f01ffdc23604494877f767698d6f3fc1d6a980660b1a SHA512 c5595bc96b4d85468d43ddef85aee5045936f053998d6f3d5aeaf0649ea84cfefcf9439a62fb3a7b1b923d136279ce5a8bef1623e9c357d8f546d63bffe837ce WHIRLPOOL fb185ea142eed9efb8a57747b3a1ffde38032e2954a1ff5605930d8e9f48d611e855df4ffb4fb360fcd55368b2ec911b707ffd967e860b8e94421c4749207e29
 EBUILD netbeans-profiler-9999_p20150804.ebuild 3478 SHA256 2bc6d4b8f610bbcf6f7f0967c404031bfb53a65ef76dff6ea4b57fdbecfeb799 SHA512 1797a1ffbf8a2f9f6255ab97f031d9cf170a7540073fc0bdd0338fa03f6a40f50fcb412b76b956ae00ca582a8cb65b844f04c9ffa88121de7fe905c19b7e40b8 WHIRLPOOL bd3b895d16911ed55635207471c85e34320a28efab52b40b0884f41914db4dfe399bceea4aa62287b895376c00c8937c413f6b525f1e005c7c338696362ff90d
 EBUILD netbeans-profiler-9999_p20150805.ebuild 3478 SHA256 02c3a9cf05ecdb1db31b83bb21ab634dc531d0f1357f79d4bc228138615d0d1b SHA512 fb3aa5ae4fc1523900b4ddd87f6fade3ed8762508a1777e84e560d4603b04a1200c25bd3216cc6893afd1f338e154fb37f630e92d46524bf9d22b404281d233b WHIRLPOOL 999f93f2e1b12bb045c79fcc9da291fc1d94065e4a979e1f20f07c5aaa7e3ecdcf663d9116e0efe03f5d3cded5f90a55181f99c9a765da4d4dc6a01adeff6d74
-MISC ChangeLog 178060 SHA256 5ded6af161f8debe6cfd7f93f1a2c440de2f68e2b934c283311b67d8620ffcc6 SHA512 068a9bba84fc11abdaff3460f9600985de7a3357798d8e6b5eb0981543d1e2710b2f0b044d391d306d4c0b52bf8fe40fc6fb14eaed3526f8adc9e654f43196b3 WHIRLPOOL 3f2f86e11309ff83a38639dfcde1179953b7e50a65b06334cc21f1b8b7e6f11ab6e19784d1ed2aa2c4f05b1143d4a437501a55eeaaf63e85aa440f4446704d8c
+EBUILD netbeans-profiler-9999_p20150807.ebuild 3478 SHA256 3ed39461b0da63ba9d23c0966871ec932c1bb773cda2f931f13adf81075b387e SHA512 fc968cd3c4f40d90d90c001bd190d1804d868c072992a86eb8d9b27b1630de56ecd767df3a07a5a0e93c2792a569e05a74ddf9292557471bb88b2f174b93ec43 WHIRLPOOL 38cab47608bd73e57f3976a4943744ca77780a81897993c93ddb40cc2e12c9b14ffce828111b499675d35d1e05a3ae41aea6c888c8ea95258272a0ab62715fe1
+MISC ChangeLog 178238 SHA256 2f62555f806d07a8ca11d987049d68b7e5950d0404435ee51546f2cfb86cd670 SHA512 8a41e54b8b65670f6dbf81c687f1749fea57ade4c9005e7fdd63c2c17ece74efe72f30d8b18dcbb0c22c9d75597733f88e531e43d56626656915115f0a701adb WHIRLPOOL 9fd2cf40fc5463a77a13f5ba702575463d659299a1d824fde496cf0304fe8ca534585e211694937566099ca38ac537fc0884afbdb03d96de4ba9e454570ded2d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150807.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150807.ebuild
new file mode 100644
index 0000000..33d01a3
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150807.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-08-07_00-02-28/zip/netbeans-trunk-nightly-201508070002-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 4ae07a4..ce5e1a9 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_p20150807 (07 Aug 2015)
+
+  07 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-webcommon-9999_p20150807.ebuild:
+  updated to the latest sources
+
 *netbeans-webcommon-9999_p20150805 (05 Aug 2015)
 
   05 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index 7e81930..cfcde9c 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201508010002-src.zip 208741865 SHA256 2ade7e4e9f2b80
 DIST netbeans-trunk-nightly-201508030002-src.zip 208748030 SHA256 933445356a68c17218a1e5d047568b7493208f5e4ac5cb083b6c0c840080e08f SHA512 000a443f1e02911e29996d0ab6021863faf1ea3649cb71dff7df5c262087dda663d4d670f64a238df86220fb1bf0fb713a990bd78671077ac86d5e0c7d0a52a6 WHIRLPOOL c71739d059f35e7f3f6b301f7291f8ddec3d286eec918a18f9ce924068f1ff84a3138c50f5c59d4efb297b5aa8c748988c6695656deb47a4fe49fcaf35b86bd3
 DIST netbeans-trunk-nightly-201508040002-src.zip 208761490 SHA256 b001f001aff1c4a6e29cf289beeefea7e766fd278a7144a028970bd9b65b0459 SHA512 87a1c41db0c76a01150c08247dc76f397e0e9ac2d87ff3fc5a6f7d91265812bc8471ae87edd781ea2518c8b47f48ad374b4fddccb38ba1ef888e001c3b295224 WHIRLPOOL bae5b1c4f71cb87f223d8232c29da2fdfc3a3482db42cd3783f2c249aeb7c409f2b40fe815e290006797307a5ba296316f21a44988cb098659b6d1969359c371
 DIST netbeans-trunk-nightly-201508050002-src.zip 208776240 SHA256 740052c5a604bf1908a1a6643ce9b5b1b43b92291544a59a68cad2378b5734c6 SHA512 890f8967825f1eed1c3bc265fa2e359d258fe8e502469b463de8878070d350463f4f5cc39bb2a5c0a65e01cdf989497038373879e1d55904047868e1d6511290 WHIRLPOOL ef52d09526d51662f243f55f3ebd143c8902fc3dc5d00c9507250881abf9ff20239a1c017b951ad9ae08c32f3afa057f2a7a5d6e27bab4072eb3ba1b7caf96d5
+DIST netbeans-trunk-nightly-201508070002-src.zip 208777237 SHA256 3f1014a410386bb7b1fa0772db4a7fc9bf6cb5f0177868ce727daf6b6029a89c SHA512 6de45ad0050121f9510b7daca7701328698ffeea7a8c8204c06458caf978246d7a0a0a576759367d3966933b063fc630e7d710595cefc934e3637c7792c94267 WHIRLPOOL c7ec2e93ce0b71fa6fd39adcb3b1ef122c0961378939074ec837dd8c393ec3c60475cfc26238408a07aa1e52c735d06275c9616e5fa007ca915c413765de294e
 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
@@ -58,5 +59,6 @@ EBUILD netbeans-webcommon-9999_p20150801.ebuild 4997 SHA256 0babe71313353859161a
 EBUILD netbeans-webcommon-9999_p20150803.ebuild 4997 SHA256 05fc6b38b7a2f40baf7aa2a54baf85dc4f9e78f4894279dd30a1681f852ac6a3 SHA512 45e34f542c769c1016565439bd825dda57a40f2cf25a6bd27974313bffb8f0dc60bf514e2d346892f25a8f21a9258837d612f323a984e85709dc434b5ffc4a08 WHIRLPOOL 7e696fd38247c6d205db8f66175a53d317b4a0cdb1149735abf1a7c2241ed52e86431e462beda2d2204e136e9857c90ec43cc42ddc6510435385c17eaf6cf3a6
 EBUILD netbeans-webcommon-9999_p20150804.ebuild 4997 SHA256 2ee56e7faae37fbdfa3eb305fd1a5bf11528f825cef20134fb3b7f4a427a2f82 SHA512 95c62efe6b7faef971a38056fea116a5ff30870395d89516e780dfb2da3324f97581ed1bee3eff5512eff1afeeb21e196352c113d8e0d0dfc26040fca8172fc6 WHIRLPOOL f8cdf66b8faaddb27ea44df8a7047a34d378378d2e36dd5f460d624a0f5df95c6f59a00548a76796816824a82caab5ec05b480fb53c7ce629ec2034375b5217b
 EBUILD netbeans-webcommon-9999_p20150805.ebuild 4997 SHA256 337be42b4b43b94f2aff4a439bba137a19ed479040a53f05649cd13ca71c94ad SHA512 62c4aec7a080f16b5086630119e090b9832bad11f484af0a4c72422ec4b6c19dccfd3efc6830b84df2608a96b5e65e38ad0b20e1adec027ca7e707d61d5de396 WHIRLPOOL 455a651168887a66aed1dd8cd122fb9eced26c5c9d0cb2bc1448c9e204a4370d8e9857f6b5a504cd3c18e3b8504aea3fac42093de180f4edd1fbf89f6678cb9b
-MISC ChangeLog 151270 SHA256 19a74922080e3047664bf517171be6adfad23284f1cd0eec0dbd11f28f6388f3 SHA512 8e994eef835be9423007232bf6cb28a2a57e02fc2f24358f89fc7265e9f036e8e3f5475dc5a3081d0290ab2841486ffb5ee4cf74bebeb23bc0c4728face2decc WHIRLPOOL 26d5d688907965bfc25e2eb76df61d533658d53c3ee3817dc82094d15394c7b010c44ae25ecdafda1a274430d1254ed1607900bbf19f3824f0faba4393f3e917
+EBUILD netbeans-webcommon-9999_p20150807.ebuild 4997 SHA256 5de7867b394a76fc262c1b90771ae4d65829ca95c99539996cf26c0f9c8539e0 SHA512 6d5d80840c30a19d9d04b65e13086c94412f98bdb416ea867ad40ba8545b741c09452ab36e766b07a2689f6ae0904b81d4216f797ad938dd86b95f9eb8a1f3e4 WHIRLPOOL 0a8df686fef9c62e34a457541aaf710eb44fea5ec0f44d9b929a4baa738de961fa461dde870634d79d7af0a43173ba483699bc5265568ac9eca88d5b197e18a5
+MISC ChangeLog 151450 SHA256 1794db25512a4c3bbb8de4514a1b0bbf8fa6f039b908f5133b9ce7168b32ab74 SHA512 3f5a359f6040ebc1aeaa75cb701972a5a37cee7f08d72a7cfd11e14c005a1f6b3e8574b7d0943cb72e08e361bdbf98a2994f28e4adfc67ffdf55081689dbd78f WHIRLPOOL 640de1af806bf7dbd93c557a90f712138871306f0866b9b6dbd07cb4628306b0e9d2ff22f4ff46046acb0616e8e6465d5dc624e8fb3049bdd4023c4b015207d8
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150807.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150807.ebuild
new file mode 100644
index 0000000..13b17f8
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150807.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-08-07_00-02-28/zip/netbeans-trunk-nightly-201508070002-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 1a2e306..78f63a7 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_p20150807 (07 Aug 2015)
+
+  07 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-websvccommon-9999_p20150807.ebuild:
+  updated to the latest sources
+
 *netbeans-websvccommon-9999_p20150805 (05 Aug 2015)
 
   05 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index a42458e..acbf876 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201508010002-src.zip 208741865 SHA256 2ade7e4e9f2b80
 DIST netbeans-trunk-nightly-201508030002-src.zip 208748030 SHA256 933445356a68c17218a1e5d047568b7493208f5e4ac5cb083b6c0c840080e08f SHA512 000a443f1e02911e29996d0ab6021863faf1ea3649cb71dff7df5c262087dda663d4d670f64a238df86220fb1bf0fb713a990bd78671077ac86d5e0c7d0a52a6 WHIRLPOOL c71739d059f35e7f3f6b301f7291f8ddec3d286eec918a18f9ce924068f1ff84a3138c50f5c59d4efb297b5aa8c748988c6695656deb47a4fe49fcaf35b86bd3
 DIST netbeans-trunk-nightly-201508040002-src.zip 208761490 SHA256 b001f001aff1c4a6e29cf289beeefea7e766fd278a7144a028970bd9b65b0459 SHA512 87a1c41db0c76a01150c08247dc76f397e0e9ac2d87ff3fc5a6f7d91265812bc8471ae87edd781ea2518c8b47f48ad374b4fddccb38ba1ef888e001c3b295224 WHIRLPOOL bae5b1c4f71cb87f223d8232c29da2fdfc3a3482db42cd3783f2c249aeb7c409f2b40fe815e290006797307a5ba296316f21a44988cb098659b6d1969359c371
 DIST netbeans-trunk-nightly-201508050002-src.zip 208776240 SHA256 740052c5a604bf1908a1a6643ce9b5b1b43b92291544a59a68cad2378b5734c6 SHA512 890f8967825f1eed1c3bc265fa2e359d258fe8e502469b463de8878070d350463f4f5cc39bb2a5c0a65e01cdf989497038373879e1d55904047868e1d6511290 WHIRLPOOL ef52d09526d51662f243f55f3ebd143c8902fc3dc5d00c9507250881abf9ff20239a1c017b951ad9ae08c32f3afa057f2a7a5d6e27bab4072eb3ba1b7caf96d5
+DIST netbeans-trunk-nightly-201508070002-src.zip 208777237 SHA256 3f1014a410386bb7b1fa0772db4a7fc9bf6cb5f0177868ce727daf6b6029a89c SHA512 6de45ad0050121f9510b7daca7701328698ffeea7a8c8204c06458caf978246d7a0a0a576759367d3966933b063fc630e7d710595cefc934e3637c7792c94267 WHIRLPOOL c7ec2e93ce0b71fa6fd39adcb3b1ef122c0961378939074ec837dd8c393ec3c60475cfc26238408a07aa1e52c735d06275c9616e5fa007ca915c413765de294e
 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
@@ -54,5 +55,6 @@ EBUILD netbeans-websvccommon-9999_p20150801.ebuild 2727 SHA256 bd0b5d7b7e290a84d
 EBUILD netbeans-websvccommon-9999_p20150803.ebuild 2727 SHA256 0b4e1060cf47223a7f9292d72d097979c98bd17e373390f605c27bd9c9c6f329 SHA512 8cb0e719b3ab38e6ad534e2cd9021e0c5572943506e89f438b4832069cea730c0164fe0a41e58db8c5d91c87881cd5623057a2048eb8f2e6da15756ba3589983 WHIRLPOOL 2bef19eee9fee2999101607955a28e6fd175444fb7679932090c1b6f4216f6b846bce7d48d7d63bd5be0824408a49492c026e96b94f2fa417fcf1977c615f6ef
 EBUILD netbeans-websvccommon-9999_p20150804.ebuild 2727 SHA256 ad28ca1da8df543c6930499f238867a77f80deaa35bdbd5dee69c046320d8e3d SHA512 0a21f5a876cd7333b79f321baa4f363f48d3b15f68ad6267485ea0961a2f16e9e1ed94fa72fbd126ea7434050109f8d301b93a93f0b004d44fb127f8e9c96fd0 WHIRLPOOL cee0517d37db8a7cae77102ac1afb3645aa7c636696f94b2f5f77078357642d3db2c86e2dbff20a86f3d2673d538f6ef06e2de6366fdee59c3459f918ebfbe7b
 EBUILD netbeans-websvccommon-9999_p20150805.ebuild 2727 SHA256 d12e367c0d58789e3b8a9226ce2af76b179f593ad4dbc47808fc0dc1d0634f97 SHA512 c5c4b92458d9e3fb611604e9c5798dd1b83ed4bbb0d1e0b9f0d94b5ad85597f7d58ad5b26e1bdb1afc246c328895ba345a422055fa181ffd4e8a9d98bc25ee3a WHIRLPOOL 3da23dad7104611f6ce1dcd0f0cf53cfe860e328e91eb6a14536b71ea98d006daff88e81a88a334e7d2c4ab75cf40d69138e3457b67d98ca44dafc5e618ce81e
-MISC ChangeLog 186818 SHA256 641d6a6f7ae1a0ffffc90da9e0e16d188e5734d11f47df4728b4d0b07c438e97 SHA512 271827cf46a1e78b992a1d6c7ab0c4a583dc5d72b22816331d2d9dfe93fb59b33698607acd89612e5a70b0f8e7496f2b875857b3bb503209bfe619166b83bc4a WHIRLPOOL c3443e9f30f25db0d44eab561debb1ef26e69b8553b63d74715a9817bea17c3a94003da1b1b57fcd5d629c17a2d6b11f39f3e3d6e95297b7bdb1485ffc8bf4bf
+EBUILD netbeans-websvccommon-9999_p20150807.ebuild 2727 SHA256 59374d8026f966f22746fc2c6f02e4855106a1777cb3bb8599d9935442b503e9 SHA512 52a0f6d72359a3210f6ba6506f32c6c95196b060643695ca2994208f789658e16ce9e8fe586943c98d232cfd2b8755eedc430da4628d7da1d2fbfe0559243263 WHIRLPOOL edeb7d066480c161da900811bb4186f5d612d75102dee79cf3ff8a6ff9280895a9508277e721c5cd846c3617116e81790101c5830844d7b3f50efd23494d2882
+MISC ChangeLog 187004 SHA256 fb510aaf7b88a9e5b82583ea8d50b705c91662d0089dc324e82df26cdb1525fd SHA512 ac62a1362624acdfaff5fb3c63e596bbde42d4edb35d9203945dc26068fc857fd079daa9c622d712812da6b569943caade769cd14558b81270955780d2a0e408 WHIRLPOOL e138b3303e8941520b32baf871076e5c97ddd47278dc1986c2711a32d5ead54a91b32209f7d99d4e8fe4214cdd0dc80bd57011394134fa87a6cb22f1e0ce63a1
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150807.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150807.ebuild
new file mode 100644
index 0000000..15a988d
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150807.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-08-07_00-02-28/zip/netbeans-trunk-nightly-201508070002-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 d914c95..495ef3e 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_p20150807 (07 Aug 2015)
+
+  07 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-9999_p20150807.ebuild:
+  updated to the latest sources
+
 *netbeans-9999_p20150805 (05 Aug 2015)
 
   05 Aug 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index c231e11..367a799 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201508010002-src.zip 208741865 SHA256 2ade7e4e9f2b80
 DIST netbeans-trunk-nightly-201508030002-src.zip 208748030 SHA256 933445356a68c17218a1e5d047568b7493208f5e4ac5cb083b6c0c840080e08f SHA512 000a443f1e02911e29996d0ab6021863faf1ea3649cb71dff7df5c262087dda663d4d670f64a238df86220fb1bf0fb713a990bd78671077ac86d5e0c7d0a52a6 WHIRLPOOL c71739d059f35e7f3f6b301f7291f8ddec3d286eec918a18f9ce924068f1ff84a3138c50f5c59d4efb297b5aa8c748988c6695656deb47a4fe49fcaf35b86bd3
 DIST netbeans-trunk-nightly-201508040002-src.zip 208761490 SHA256 b001f001aff1c4a6e29cf289beeefea7e766fd278a7144a028970bd9b65b0459 SHA512 87a1c41db0c76a01150c08247dc76f397e0e9ac2d87ff3fc5a6f7d91265812bc8471ae87edd781ea2518c8b47f48ad374b4fddccb38ba1ef888e001c3b295224 WHIRLPOOL bae5b1c4f71cb87f223d8232c29da2fdfc3a3482db42cd3783f2c249aeb7c409f2b40fe815e290006797307a5ba296316f21a44988cb098659b6d1969359c371
 DIST netbeans-trunk-nightly-201508050002-src.zip 208776240 SHA256 740052c5a604bf1908a1a6643ce9b5b1b43b92291544a59a68cad2378b5734c6 SHA512 890f8967825f1eed1c3bc265fa2e359d258fe8e502469b463de8878070d350463f4f5cc39bb2a5c0a65e01cdf989497038373879e1d55904047868e1d6511290 WHIRLPOOL ef52d09526d51662f243f55f3ebd143c8902fc3dc5d00c9507250881abf9ff20239a1c017b951ad9ae08c32f3afa057f2a7a5d6e27bab4072eb3ba1b7caf96d5
+DIST netbeans-trunk-nightly-201508070002-src.zip 208777237 SHA256 3f1014a410386bb7b1fa0772db4a7fc9bf6cb5f0177868ce727daf6b6029a89c SHA512 6de45ad0050121f9510b7daca7701328698ffeea7a8c8204c06458caf978246d7a0a0a576759367d3966933b063fc630e7d710595cefc934e3637c7792c94267 WHIRLPOOL c7ec2e93ce0b71fa6fd39adcb3b1ef122c0961378939074ec837dd8c393ec3c60475cfc26238408a07aa1e52c735d06275c9616e5fa007ca915c413765de294e
 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
@@ -62,5 +63,6 @@ EBUILD netbeans-9999_p20150801.ebuild 7216 SHA256 b0369c1a5fddeb43d91147b9b4ed93
 EBUILD netbeans-9999_p20150803.ebuild 7216 SHA256 4eacdc7dc432c28af186bd513a896d98c3f3feef06e1f976a19555d8b3154d46 SHA512 67fe0b8c0db7276e5d16ade381f37186a5b2405ec6dabe41dcfdc8db4cb2d8d08ddc52af463d800adc390eac430210a16f87c1ae16b844ce89b15df3da33117f WHIRLPOOL 46ce3ce7c938fb53642a2c48d725c2ccae2a107f76012ca1d34822a915a6cf887ec2c0e66943a8ad7ee3f989f19f7dd540a26f3643482e123b503e479115f888
 EBUILD netbeans-9999_p20150804.ebuild 7216 SHA256 4b6fce6e6afa6fc523b3861709e065c83cd3d5e12529cd68052ad6eb5b1ace73 SHA512 d90300dba4c6fa499badcd055455f0d6e0a429196298841b7ec78cc043a3b38a121c0a18be34246b658d70ef263784a79b5d1705f48c9f60cdabe359bfb1697a WHIRLPOOL d24fc657f92451b43851fa3d27210040c2108411a13c10ec297981e4c82f48b377759d77c2e17fbd3a345e03814bd2539f23c4d4a004ab6a3c7246de67e3d396
 EBUILD netbeans-9999_p20150805.ebuild 7216 SHA256 35fc3d0d06f634f7a4e4d47ea92abdbf506ef98be9bdf616f3aa37c700860302 SHA512 d45abc982efb9764a97ce55123ff090518e4e2602dba6a5a3f4edb5f5ce907145df84236bc7f8dd58ef0762ba1db58c5c2c6772e7ddfe7fbe9248b39ead7747b WHIRLPOOL e4b2fc0215cd018aa50bb8a169dd7fae7211159b67337b37d1c8b605996a186e746017c79de0eacae9a785db934184cd78d0228c639fbc29b0b57a95423bb0da
-MISC ChangeLog 158469 SHA256 4ae014f98a410ec145208af1956fd0e05e7ec34fd8508f0db1121fce8715885d SHA512 4eda6a17317c8336daa64702b52cec5c0ce258d46eb55defd67ed30cc00c5318c97c22a6550f93ed600e5de69b1aa6dde3def1cb9ca6eb94b1d7b2abd527a8ea WHIRLPOOL ce54b64bd71c905dc98f743d42e82e764fe803b67bcacf5241541c4d3aefe555fa1397a09aa7a52939a596f1b79ba7bfb04e02b428032e8060bc695d0e18bdb3
+EBUILD netbeans-9999_p20150807.ebuild 7216 SHA256 c288d2b3c7da7020e28e33acdf8adb6bbb1b7a5d70b8a51073f231ea63d80aa0 SHA512 9c43baca5f3e1af8a7aa0a3802514ce32a0fda7eb5ea279bc23042669e045c51b4c8bf766fd4d04b460bdaff0a964c34d36dba509f6b4defce78e1a0a22e7414 WHIRLPOOL d15ed81efceb8537b787eb0182e1517abccc0ca8ab5075a4f0ad502fb64616ba4012b2a0d6ad7e7454621a48dd102b22ef3b8d71fd5ab480a1d7a39a378745a7
+MISC ChangeLog 158629 SHA256 41c72310d10e4739f519881947a4d1cf304129f53f2feef443166b69af682dbc SHA512 939e33bf13d381adcea80fa47c56414e2739fa0b1f53ae4b9bde772c283aeb0e0ffc56ef1eff4fef866f51f813b3420850bc05f0f828f118532653ac76255294 WHIRLPOOL ea9bff79e31cef6049dec6460099bad0090c4752f3c8da5d5e34139678ffad22ac7c984879fdcc7f11aa4021424961fcb59d48e36527b5532c8e2488f1cb6927
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

diff --git a/dev-util/netbeans/netbeans-9999_p20150807.ebuild b/dev-util/netbeans/netbeans-9999_p20150807.ebuild
new file mode 100644
index 0000000..94973c6
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20150807.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-08-07_00-02-28/zip/netbeans-trunk-nightly-201508070002-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
+}


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2015-08-07  7:49 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-07  7:49 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-java/, dev-java/netbeans-dlight/, dev-java/netbeans-groovy/, Miroslav Šulc

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox