public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-javadoc/, dev-java/netbeans-websvccommon/, ...
@ 2015-04-29 10:38 Miroslav Šulc
  0 siblings, 0 replies; 4+ messages in thread
From: Miroslav Šulc @ 2015-04-29 10:38 UTC (permalink / raw
  To: gentoo-commits

commit:     5afe54156d734e3726ab456a565f2ae22b9ce074
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 28 07:50:30 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Apr 28 07:50:30 2015 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=5afe5415

netbeans: bumped to the latest sources

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

diff --git a/dev-java/netbeans-apisupport/ChangeLog b/dev-java/netbeans-apisupport/ChangeLog
index 2fae7ce..c8635e4 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_p20150428 (28 Apr 2015)
+
+  28 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-apisupport-9999_p20150428.ebuild:
+  bumped to the latest sources
+
 *netbeans-apisupport-9999_p20150427 (27 Apr 2015)
 
   27 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 4cf2414..0d48a87 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201504170001-src.zip 207165961 SHA256 a30747f33bf216
 DIST netbeans-trunk-nightly-201504210001-src.zip 207178961 SHA256 b277aeba16c941024cc88c8d36a4183ff078adf054721dadc8593be14c963c0d SHA512 d421faa83f70a9ec7cb58d88290aa1104839d2b3e5f3e4582f1c2294fa2647913911eb298d625ad8a97bbf7aa2c35314a4480e20d36c0f4abb7f909c5f2c3481 WHIRLPOOL 5b2becf39729c209e27bd3cbcf0f7fe88b1829c3e898c24fc6d5c1efb4345cd17637243390886151cdba80d05cff65da6eedf7fcb9bb3fca42afb08d26ed2fa8
 DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9ebdb4fae53f4999d1bb357dad09966f36c050e52d9cf53507f6 SHA512 2a2a5dab10d0dcf6797f1a51f58af7a2f39c9c10a29f5e3f231e895e20333b434273cb69192209e400c75bde82a6d7175c0018fba94998911f4e71abf30f4119 WHIRLPOOL 7ae4e39d0a8f0e7ee249e3f8fa7aa0a77f837734e9e7dfa3b2b648c015fba99f5f0d1088474c8678cf9de0728c1ce1eb9bd6de0319369c862011531c84c1e0f5
 DIST netbeans-trunk-nightly-201504270341-src.zip 207311520 SHA256 acf9098ac80b152d852b40943cbf6ec50878ee0d089ce4bf7666aab656303127 SHA512 344f9e396f20c463801b44a264ca55ba4d05c7c51f83c650f2a6ee9d4858947962db8a7d9f0ab1e77eb921c9d974dafd7cfd8cd641005c468d7511cbfe0be57c WHIRLPOOL 8b5915c7c222f965ac8848b198be9afe4b227d5e3bd87f2c391ee06032914af414aa1ca438a92262b0921f6918fb2135513a648adac56e0dee3ba236225f9dd1
+DIST netbeans-trunk-nightly-201504280001-src.zip 207313287 SHA256 4d9e7bce832a438a5a030d15d0c65c5dd930a81e910efe56a6e98302db7c6aba SHA512 6355cc5666f6cb654bae79e37a06e4ccd4637ea1f093cd6dbdc8d99a109e61de6e644a4e9489bf67d72f27ce6797c175f948244a2d80b59e0f43fc64961b41ba WHIRLPOOL 70666a34cb2cabab59abe6fad18f85cf3cac3c6bc417ac2b0098c881625ec8292b1f2edc6a606370ead0f491be39815022978156d09c4ebd927778f1f8f9291d
 EBUILD netbeans-apisupport-7.0.1.ebuild 3134 SHA256 41c32033c9945a39c0aebb6b0271767031d53a47e5c8365d9e3a7c86712e24cd SHA512 dd4bdde9574a87b46b02fd7204b1e90394bd87dc572dfa015b601203b026b35571f20323db834a310f90aefe6e4a822044b0d71d535a7351137219b50ecb2aa8 WHIRLPOOL f3721521a33b337d7dc24d6b49b0b2fe723f5ec446a5a4befb085051140a41bfd2d3081876e9f02f8b9932a3a0997b92211cd964fe372e40b42813df5db5170e
 EBUILD netbeans-apisupport-7.1.2.ebuild 3143 SHA256 cf24048c0ecca98a7d6371624bb0ddfb78663bead073d515a7c84229dbec00a8 SHA512 ec44c263e786210fd64c9ebb253bc9d4fc34d3be9493157dad06007c19734672bfd767765c003393d1e5cc6755fd5d1eda956b00c2092e98592a73ec1af4e729 WHIRLPOOL d619c304a994a2b818d892fb6315d092588f2ebf95e566f7a909f92daf21bb368a28c4e1af876ae585980dc82996e62aba30b12c41461103c23620a215480b76
 EBUILD netbeans-apisupport-7.2.ebuild 3126 SHA256 b0d64795b8403a932e3e20721a116c755c4de66fc36f7191476fcb4a226bad13 SHA512 cea062a72a8e75a9c2fe91c323f83d542a70149336360e1c41479f401fcae5ead6a301c8a7d5704d5beb27f7810b5d1e3cff0196cce7a26890a001c570179f6a WHIRLPOOL c286f4e4d3a02cbeb1a6e13b2005dc5435a6e9ec026a98fcc00bb83222014b800cd83f437c69352b48d16bdf442a6c7ebbed6aff86f10b3c5e6cdfb7edd9e184
@@ -60,5 +61,6 @@ EBUILD netbeans-apisupport-9999_p20150417.ebuild 3390 SHA256 0d85a2d19ab9ccc2102
 EBUILD netbeans-apisupport-9999_p20150421.ebuild 3390 SHA256 0304c8008fda731adc0cd938fc3925ed618d4766e27407e354ac823b2332bb77 SHA512 dc7c1fb007da9bda4426a6732545eeb4688acf56b9e2285549078083c900882d0f8604513fe12e6b587de3aaef6825acfb9fd02b30e5d4844b73606b3d040c90 WHIRLPOOL 6b4f330d87938032860dca5c7b5fdb41ee0ee8d789cf44ccfdea8bd51326a27b0069b9d34985b689d601e42cf322a0c9d1c6f36f8b2adddf43938b4a5f5992b7
 EBUILD netbeans-apisupport-9999_p20150423.ebuild 3390 SHA256 07a92b64899e853f4475b621623394c72f58603297b75fcf8ca901315b2b3e2c SHA512 2f211f6623f179b33670e5988caeb1a8497aeec812b96c9eedf795d2b67d07740efbd9b8558dd77abc8f65a481d2a61c2bf01a5590d0794b7e828932407455ec WHIRLPOOL 37fd850be51d1c788f793e0ec4c1813c290f7c016f49516e10c6fabec25a445340fb01ba6ec8bafaeecd6825100c1e29fd10fc2676b6b30706fa5f1833e60a26
 EBUILD netbeans-apisupport-9999_p20150427.ebuild 3390 SHA256 198afd8736b37d36a133c1fc01deff0d5d0471cade75919e8107a67338d2dd70 SHA512 8a821ffd9c2a3725f63092206a8b741c8ee5097eea7cbe4ca73a1fe5230c4e5c91e56955c9fc61079ce9a2378cc02994e24cac9803871ce982b363a84f1f748f WHIRLPOOL c134a327c96527c4927e265d250e542b1f552da3ff79b589da2ed94b6eb739af751849bc8d80a80463412bc40233e1c085a9cd357b0a9d2c1826a1ea4cf20d14
-MISC ChangeLog 168688 SHA256 014bb3ae1d4bdde75b0af8c476dd975ceaffa7a1d79ae17fd23050b6f32d8ed8 SHA512 f14f600977744338426dc0480eda00e42f67ba755964350157b2be5ae676cf701c02fdb61339cb8e81c9531c943d88f834e24718101a33cd8744c09e360ebec6 WHIRLPOOL 2b3e3b06690bd8474d4236c6ef835881eae94a84d75b1c3623bd5140a8618df6cc0ecde2f5920763e353ace2a87395be88b67f5e01fd23b09aeda27a4490d01c
+EBUILD netbeans-apisupport-9999_p20150428.ebuild 3390 SHA256 cb54d026e3812c5ae2200afc7cbc5ba05d718c4987b7205dfa097cebf5a8ee12 SHA512 00451b562c9ffe298776bfaacd4b0a63ed5d7faf7691b1d85cf1b9c40f72e458543f4e7901d213b066794fa9bd4a2eb67eb14c36cabd8d6701de83a3dfb0455a WHIRLPOOL 49826a6e23ec3821b23da72eeb245ff91352cc54fc0ac787df7a7369db9190525f2d5a2fa819d405dce107a030281fef1cd036e0bc54007cde74594b127e5f90
+MISC ChangeLog 168869 SHA256 0724316c343815248a7fcd8c668e659c4fb3ad70a5e362d0d5538ac7c227a596 SHA512 bab8bb30f587693093db47d83605185264fb1199169b10f8c458fe1ba6a631b593e0fb88a8908406a5e1e4013e4d9109a378048978d55ec600229c44b57b9faf WHIRLPOOL 6aa996556d578d34c69dbc0730376a388c4db30cfe8542fd7e9a4a4ef5712e45548b055df9de4d63cebd77f8183ceed3e40d63c2ff286d4f960b09ff11310ab0
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150428.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150428.ebuild
new file mode 100644
index 0000000..6468a4e
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150428.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-04-28_00-01-56/zip/netbeans-trunk-nightly-201504280001-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 8a76eca..e777223 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_p20150428 (28 Apr 2015)
+
+  28 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-cnd-9999_p20150428.ebuild:
+  bumped to the latest sources
+
 *netbeans-cnd-9999_p20150427 (27 Apr 2015)
 
   27 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index 0496f0d..69a22c5 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -48,6 +48,7 @@ DIST netbeans-trunk-nightly-201504170001-src.zip 207165961 SHA256 a30747f33bf216
 DIST netbeans-trunk-nightly-201504210001-src.zip 207178961 SHA256 b277aeba16c941024cc88c8d36a4183ff078adf054721dadc8593be14c963c0d SHA512 d421faa83f70a9ec7cb58d88290aa1104839d2b3e5f3e4582f1c2294fa2647913911eb298d625ad8a97bbf7aa2c35314a4480e20d36c0f4abb7f909c5f2c3481 WHIRLPOOL 5b2becf39729c209e27bd3cbcf0f7fe88b1829c3e898c24fc6d5c1efb4345cd17637243390886151cdba80d05cff65da6eedf7fcb9bb3fca42afb08d26ed2fa8
 DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9ebdb4fae53f4999d1bb357dad09966f36c050e52d9cf53507f6 SHA512 2a2a5dab10d0dcf6797f1a51f58af7a2f39c9c10a29f5e3f231e895e20333b434273cb69192209e400c75bde82a6d7175c0018fba94998911f4e71abf30f4119 WHIRLPOOL 7ae4e39d0a8f0e7ee249e3f8fa7aa0a77f837734e9e7dfa3b2b648c015fba99f5f0d1088474c8678cf9de0728c1ce1eb9bd6de0319369c862011531c84c1e0f5
 DIST netbeans-trunk-nightly-201504270341-src.zip 207311520 SHA256 acf9098ac80b152d852b40943cbf6ec50878ee0d089ce4bf7666aab656303127 SHA512 344f9e396f20c463801b44a264ca55ba4d05c7c51f83c650f2a6ee9d4858947962db8a7d9f0ab1e77eb921c9d974dafd7cfd8cd641005c468d7511cbfe0be57c WHIRLPOOL 8b5915c7c222f965ac8848b198be9afe4b227d5e3bd87f2c391ee06032914af414aa1ca438a92262b0921f6918fb2135513a648adac56e0dee3ba236225f9dd1
+DIST netbeans-trunk-nightly-201504280001-src.zip 207313287 SHA256 4d9e7bce832a438a5a030d15d0c65c5dd930a81e910efe56a6e98302db7c6aba SHA512 6355cc5666f6cb654bae79e37a06e4ccd4637ea1f093cd6dbdc8d99a109e61de6e644a4e9489bf67d72f27ce6797c175f948244a2d80b59e0f43fc64961b41ba WHIRLPOOL 70666a34cb2cabab59abe6fad18f85cf3cac3c6bc417ac2b0098c881625ec8292b1f2edc6a606370ead0f491be39815022978156d09c4ebd927778f1f8f9291d
 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
@@ -75,5 +76,6 @@ EBUILD netbeans-cnd-9999_p20150417.ebuild 4586 SHA256 43318076d210601bbb4027e62f
 EBUILD netbeans-cnd-9999_p20150421.ebuild 4586 SHA256 9e5244ff0758a679429ad0c044f7d3749192455d490585a84034372d610a179f SHA512 fbb8026f59c406120d3c4140b35a7f18aad966545fec714bccaee15bdbaddf2726c36470c9632512b275f462c4944e7a4809f5bf3bd7736ca2fa2aea902f3bc0 WHIRLPOOL 1a0b339a07e4e51efe337597269e6b5cbee593e98044bfd84fe9eb3ef4f2ac2ba604fb885d687a4ae55e24ac8d08da0b88a7fa490560daf3c66fc8f0889b0f88
 EBUILD netbeans-cnd-9999_p20150423.ebuild 4586 SHA256 057bfa9973b0107d35f55f04c0f85e631896ce0de008732d2a7f2da318191bc8 SHA512 b1cda5c65e7ff9048a7afa770cd7adde0fc641f7fda52e35351b46591a60219a2284b96662ee98f0491a799323fefd92cf008fa138aba002fa1a9449f24ea380 WHIRLPOOL 90acbd507dc4bd7db5257c61f089e06eb4bbbb622a13afefd31746ed57f09773d44ed9d06a704a1026e982d88b12e337c84378e9def037d412ad780eb71aac77
 EBUILD netbeans-cnd-9999_p20150427.ebuild 4586 SHA256 6cbb94d3254267706de1d842a9e8469fa39b541dd5c15fa641f177747ee5bb0e SHA512 f6c4492992ec4805ca76f90d3d13c115fb06f54648a19b3a73e87155e5ca64ae09200557779e3ed806ec794f87e69778571c5b228ed1db882b663eb0980ea482 WHIRLPOOL 05271a9115e207081c8bfdd32ae9dcdbddedff6d834bf04accb28982fb4acb734d74884110ce16b29b8acb379b96d78eabd2ec4b5fdcc06c3542b0b3ebc7c4d2
-MISC ChangeLog 153979 SHA256 3d80d5b567d74d94d98d5b41791909402056358b68b84db634d39b5a9f9f800c SHA512 264309fc695d91f9db10f181edd9b9ca08260d0fa0f80b2767c5ea5555d0e19b8d88dfe7ca40e061e07d66e0b7aef0ccfbb41b43f39706ba48e9244f9b312207 WHIRLPOOL df7296b6a6e39908a8bd5f3e47d8ecc4c2922a4abee9d9f6e286347dc97a45a5d53336b83fad60a9e9ba06e446201894caa7bafb5d6d1a66f1e8ac62c2f93e7c
+EBUILD netbeans-cnd-9999_p20150428.ebuild 4586 SHA256 9c90ec42fa6c75c31c5edde4087dd9a58ae529ce530c791174364dc4bf88f0b1 SHA512 1b019f06fe35c05999418b0034d57b2d0e7b36a1e6def27efa53f4396bfdccf07782c507ac5a3c3982288e7abc4b2e3c5e9ec0bfee5c448417631b58ef56cb87 WHIRLPOOL 420dcb77711e86867496d8d0e5498b0c25c31a3a8fd5eca72b13590bd53598a32da59cf92d6cf584dd5300424dd86bb1ea453a00d4a7b0e94f49adb092557da9
+MISC ChangeLog 154146 SHA256 4259f162a6b0567b4a41944bb5a6d1f9071748b67a2f312889bbddfd14e58569 SHA512 f918878c4fbb531513af973c30a842dbc2b6ab87e0c4b1edd1b2674047c25f903a1722b96195abf83c3735fb9a9f12ef5e5f7200ab43d264a8ef69143d0857ff WHIRLPOOL 0f6f652d2092faf9ff18f6ad274962e819e092651f8c2504aa30f60366ba8ce1a6c8df010f0d0a5068f7a8e12e39ae3ce039428549f18d45c84f6ba231376e09
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-dlight/ChangeLog b/dev-java/netbeans-dlight/ChangeLog
index d904951..21145bd 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_p20150428 (28 Apr 2015)
+
+  28 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-dlight-9999_p20150428.ebuild:
+  bumped to the latest sources
+
 *netbeans-dlight-9999_p20150427 (27 Apr 2015)
 
   27 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 9c05823..3cd918b 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -42,6 +42,7 @@ DIST netbeans-trunk-nightly-201504170001-src.zip 207165961 SHA256 a30747f33bf216
 DIST netbeans-trunk-nightly-201504210001-src.zip 207178961 SHA256 b277aeba16c941024cc88c8d36a4183ff078adf054721dadc8593be14c963c0d SHA512 d421faa83f70a9ec7cb58d88290aa1104839d2b3e5f3e4582f1c2294fa2647913911eb298d625ad8a97bbf7aa2c35314a4480e20d36c0f4abb7f909c5f2c3481 WHIRLPOOL 5b2becf39729c209e27bd3cbcf0f7fe88b1829c3e898c24fc6d5c1efb4345cd17637243390886151cdba80d05cff65da6eedf7fcb9bb3fca42afb08d26ed2fa8
 DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9ebdb4fae53f4999d1bb357dad09966f36c050e52d9cf53507f6 SHA512 2a2a5dab10d0dcf6797f1a51f58af7a2f39c9c10a29f5e3f231e895e20333b434273cb69192209e400c75bde82a6d7175c0018fba94998911f4e71abf30f4119 WHIRLPOOL 7ae4e39d0a8f0e7ee249e3f8fa7aa0a77f837734e9e7dfa3b2b648c015fba99f5f0d1088474c8678cf9de0728c1ce1eb9bd6de0319369c862011531c84c1e0f5
 DIST netbeans-trunk-nightly-201504270341-src.zip 207311520 SHA256 acf9098ac80b152d852b40943cbf6ec50878ee0d089ce4bf7666aab656303127 SHA512 344f9e396f20c463801b44a264ca55ba4d05c7c51f83c650f2a6ee9d4858947962db8a7d9f0ab1e77eb921c9d974dafd7cfd8cd641005c468d7511cbfe0be57c WHIRLPOOL 8b5915c7c222f965ac8848b198be9afe4b227d5e3bd87f2c391ee06032914af414aa1ca438a92262b0921f6918fb2135513a648adac56e0dee3ba236225f9dd1
+DIST netbeans-trunk-nightly-201504280001-src.zip 207313287 SHA256 4d9e7bce832a438a5a030d15d0c65c5dd930a81e910efe56a6e98302db7c6aba SHA512 6355cc5666f6cb654bae79e37a06e4ccd4637ea1f093cd6dbdc8d99a109e61de6e644a4e9489bf67d72f27ce6797c175f948244a2d80b59e0f43fc64961b41ba WHIRLPOOL 70666a34cb2cabab59abe6fad18f85cf3cac3c6bc417ac2b0098c881625ec8292b1f2edc6a606370ead0f491be39815022978156d09c4ebd927778f1f8f9291d
 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
@@ -69,5 +70,6 @@ EBUILD netbeans-dlight-9999_p20150417.ebuild 2995 SHA256 940ff2ce90d19b0574f8efa
 EBUILD netbeans-dlight-9999_p20150421.ebuild 2995 SHA256 ba1a8bba2548d7ed29b960961d15b253d8ea6f03449ae90fae539f49ec77d766 SHA512 df9b191108aad68624653b934b17c04628999381c4254fcef25f8239a0f9247802683706288f9be70d695c994f1108b0951cae55a8a8708ebe331c4bc2ca5f01 WHIRLPOOL 85a11aeea2fc4447978a9b9005323408200dd0fc9e90fd42ac1e9af9b7c9cd66480a020fa8b582036d82a803a142f53b8e5e85307fbc2caa7939afd43e010091
 EBUILD netbeans-dlight-9999_p20150423.ebuild 2995 SHA256 b810e07b435dd806dc61cf07bd22f29aa3b875622e0c016717c6202b77275e8b SHA512 99cc93c1ffd99857072111905218d30a289db30783fb89c231fe4ab5a06942b935f4bce3ba0f72901893c5b3708a5b607ba4d46fab7e952a3478796058b0996b WHIRLPOOL dbc79e69924e7d63a94faee5ff7914980d487491ce1caaee92a93104902ac05e0eb11f7473ba0bd3822c820701c1fffaba98d3ae28fe29eebe1e972327fd4f4b
 EBUILD netbeans-dlight-9999_p20150427.ebuild 2995 SHA256 412547df83fb0c839216f770effd629cd96f20b36b0d76ef9415340d6f296053 SHA512 71babb389601fb0645c7eb4f5ad1643b9b90e9814d880ef1c4a12c17b8c14076459da780334ad145f37a64edfc5b82f4e04488a8b5b6f24e4ad1d3a0e5a4281b WHIRLPOOL 751e5f39da310a3aa5a691c945f776e388040004af703556e8d13e24f1cf07cc95a4989cd80580ea13d86c840e6a47d5d0c732416f84c7681f2799ea789f5801
-MISC ChangeLog 160705 SHA256 755c540c195a10402a334942f00be4ff388ece5c45af8a270d51ea5b6011d8b3 SHA512 769da74499201a293c9acbd0faccd08eff85280cfcfca8a0511118e87f9ab5f0e11dbdc5b775f5545c1cfcb78cf00dc0f7c159b7139fbf2186c175b6e76c09c3 WHIRLPOOL e0e72d0eae4179b5cc70b6e5f39a293c85c8d9ff07035aaf43753e4494039a676d7747128c63498de9e775dfd9d94e5b78488de1a98bc12e8731035304452c56
+EBUILD netbeans-dlight-9999_p20150428.ebuild 2995 SHA256 ec28d97d0b04c66f25481049d1ad950e914bb63ab37eb3df2225c695c66865b7 SHA512 93af3520f84f3d8afef9bbae39d2df74a4d00b8d91267fe98f05215ca4138b0cd840af6f3072f571f0b9165af18411190734b3bbe912aeb23d366fe64d01b2a1 WHIRLPOOL 05d10d9ba7744583c15acd75c07c1f6034df12e6d0852487cb02131af7a6549a074fb90e78c004d0368d2f1ba64c2d3a7b2351da8a8aa780ac0e6886b4ec0815
+MISC ChangeLog 160878 SHA256 15abf0c225ce67208ab49469e6626101d436db57487cf522e179b4e8d53bced0 SHA512 4a8da64d36ff36dc3601a4318ef80646cca4c0c8e8d279d32125396f2f10569281af6a09a436a127ca5326fdef3d5f9bfc922c86415d0d4b6f14c75f60c31112 WHIRLPOOL dfacb2c07d9a6134c37a17ebf89e572f6904c1aff383579df895e9eb66dc35d1e1d1b64fbafe633ba15bbc42a038392549bb9fe135a5b0f826a773a7cf05d610
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150428.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150428.ebuild
new file mode 100644
index 0000000..03f1935
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150428.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-04-28_00-01-56/zip/netbeans-trunk-nightly-201504280001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/E2B00E95C773FCD0B68CEF4980D19D04C02722EB-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}"/E2B00E95C773FCD0B68CEF4980D19D04C02722EB-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 11c9429..a7fe825 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_p20150428 (28 Apr 2015)
+
+  28 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-enterprise-9999_p20150428.ebuild:
+  bumped to the latest sources
+
 *netbeans-enterprise-9999_p20150427 (27 Apr 2015)
 
   27 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 6d85ee4..877ba50 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -122,6 +122,7 @@ DIST netbeans-trunk-nightly-201504170001-src.zip 207165961 SHA256 a30747f33bf216
 DIST netbeans-trunk-nightly-201504210001-src.zip 207178961 SHA256 b277aeba16c941024cc88c8d36a4183ff078adf054721dadc8593be14c963c0d SHA512 d421faa83f70a9ec7cb58d88290aa1104839d2b3e5f3e4582f1c2294fa2647913911eb298d625ad8a97bbf7aa2c35314a4480e20d36c0f4abb7f909c5f2c3481 WHIRLPOOL 5b2becf39729c209e27bd3cbcf0f7fe88b1829c3e898c24fc6d5c1efb4345cd17637243390886151cdba80d05cff65da6eedf7fcb9bb3fca42afb08d26ed2fa8
 DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9ebdb4fae53f4999d1bb357dad09966f36c050e52d9cf53507f6 SHA512 2a2a5dab10d0dcf6797f1a51f58af7a2f39c9c10a29f5e3f231e895e20333b434273cb69192209e400c75bde82a6d7175c0018fba94998911f4e71abf30f4119 WHIRLPOOL 7ae4e39d0a8f0e7ee249e3f8fa7aa0a77f837734e9e7dfa3b2b648c015fba99f5f0d1088474c8678cf9de0728c1ce1eb9bd6de0319369c862011531c84c1e0f5
 DIST netbeans-trunk-nightly-201504270341-src.zip 207311520 SHA256 acf9098ac80b152d852b40943cbf6ec50878ee0d089ce4bf7666aab656303127 SHA512 344f9e396f20c463801b44a264ca55ba4d05c7c51f83c650f2a6ee9d4858947962db8a7d9f0ab1e77eb921c9d974dafd7cfd8cd641005c468d7511cbfe0be57c WHIRLPOOL 8b5915c7c222f965ac8848b198be9afe4b227d5e3bd87f2c391ee06032914af414aa1ca438a92262b0921f6918fb2135513a648adac56e0dee3ba236225f9dd1
+DIST netbeans-trunk-nightly-201504280001-src.zip 207313287 SHA256 4d9e7bce832a438a5a030d15d0c65c5dd930a81e910efe56a6e98302db7c6aba SHA512 6355cc5666f6cb654bae79e37a06e4ccd4637ea1f093cd6dbdc8d99a109e61de6e644a4e9489bf67d72f27ce6797c175f948244a2d80b59e0f43fc64961b41ba WHIRLPOOL 70666a34cb2cabab59abe6fad18f85cf3cac3c6bc417ac2b0098c881625ec8292b1f2edc6a606370ead0f491be39815022978156d09c4ebd927778f1f8f9291d
 EBUILD netbeans-enterprise-7.0.1.ebuild 16338 SHA256 03ea08daaf5d4c5592937929bac33b4af3bac00a23f2167a7ef7b3c172a72abe SHA512 4d24162c7920b9a1c65e6c6753900ead387a4941c2db98b522631bb09889c281bce048a74e2e584f8b5732cfaad1d7125e0cfd37aa2dc81fe85160b0e123ccd8 WHIRLPOOL 35eb648c37cb6e59aca7969c1074c2c280814529aa7ec3c3191b0d3f2a92fa24e1a8d981f343e4217fff52f6100b4884b970df734c45145759889aa6e6661ff2
 EBUILD netbeans-enterprise-7.1.2.ebuild 18060 SHA256 f63721b8ce5e1afbc58f783348f66f1e3501be519a1c9c1287ef860acc64ceda SHA512 2ca89ec8f89f106a284136d4d0ed52fe3bcf49c650d56ded6e62306c531e5e41f62b8aa923cb544842cf6e34e5f433fecb278bc1515abac987e2d00fb68ffa26 WHIRLPOOL 879067d72285aa6c7273e84ddc3dfef7d09c7cb9f9a6c279fddfbd3eea6439dea053d3c648fcd56d47ef2292db14d101307eb1aa8b3081dfcdbc3dac4d0c3ed9
 EBUILD netbeans-enterprise-7.2.ebuild 17752 SHA256 2f46916df731fe33c5d4626ae580a77686c392932a3388f755324bc3184bd636 SHA512 3543d033b971108fa2b8e6633ed640e812a83b34807e1cb5a69d425823d1fec1c13ecba3cc36fa4504fbfd6297e7eff1ecabe07d01725d9f13c99ffd70d220ba WHIRLPOOL 512753153bbf714ae3fbf9c580f350234d88bd5ce5690e7bc0fadd1c355bd38c2a5c1e9adb7993c3678d759661bbfb1654b0630e3535a2fb9198742fa7fd2c1e
@@ -149,5 +150,6 @@ EBUILD netbeans-enterprise-9999_p20150417.ebuild 14851 SHA256 2212eea015a05f31f7
 EBUILD netbeans-enterprise-9999_p20150421.ebuild 14851 SHA256 b5a66e12c6f06069d745da67b49826befaa05a82eea5b2c04f614bdcdf040106 SHA512 9f5df1090ba60ec1e28d84bcffbcc8c5c9db282c60d51803d4417392640df55ac8b8f0ae74ddc0011f970e2390f2070048ff6e2d7780546b4ffc8dc37628762b WHIRLPOOL 186e3dcfb48a32ccbaad5aeb4142b5a69d18b310d85f76c1995905c77fefcf75f3229fd8950277f19ca5b222b1af56d2cf1c03224bfc0e33ad7e940413eac431
 EBUILD netbeans-enterprise-9999_p20150423.ebuild 15937 SHA256 0e9ed7f410cb4331dc93ab942d00e5d93a81299324e4be3a36f1f91eac1c9cdf SHA512 774b7771477ef745181a5bb00d2e7bb8add058aaa80a3cd998c24a4d62f84ecc445a07f6f0f6e7944c404c037c2ea98477b3a1e910cf5d53b08ad72f99d2f611 WHIRLPOOL d34b4e08d533bdbe511bcb26abc12666c4bce6419e396a96d5c0664bb4435436aa4bacbcd4a1e1be47414ed48cb9f9c93502e991970bb118e5b355006ec79bac
 EBUILD netbeans-enterprise-9999_p20150427.ebuild 15937 SHA256 55e50746f80f3ed1814ae3fd18ae78df7f7667a28b1f229189b6542007153f7c SHA512 befd2b711056afcabb8a6e1a13bc39ab8602869b9a6b2b15bfb6965f677a04d4773e7b9a7b19c9b2693cc2906ab60dbc34b12a0185ec84f3e5f50edbe9a4f35c WHIRLPOOL 96f2d017e295d8cda3d7502c1468b50b855fe8b2a0293736e8e0909df5dc3b075c17ea8ee86cf737fdf3d5f1c412ed2343de1565cb9ed38901cb0779c1b568a6
-MISC ChangeLog 169213 SHA256 ebfed99921d014ed100a96f249add416873d27b8a9cd56ee2028d75a07ab67ee SHA512 e5ec0dd7190ccfa79f95825e016eb6eabf52f5db3a085f39f6b911e258a0c764d0ff7f9b4f00f1c0953941904a067b993db5188023502adf1459cf3c7e3a4d86 WHIRLPOOL fc313b2ac324b05e09f2de309978cb503bf8b039b6e6a369eca43edf3cbaf7e17fbd02a76a2ccafe3d19bdf1a9ede2a6d19820ff3a75f1483b530e2b25f5760b
+EBUILD netbeans-enterprise-9999_p20150428.ebuild 15937 SHA256 9151153c90b54c9de15c8bcccffb9a1ce4c7c948b0b12f4b3d2cb0898a1c353a SHA512 be52f8c25556f4203ef348021bf83d377609a8d613e4f5408d04f735f7ed37b1b19ed79822b0390f16ee770930e308b14aa2a5145d25e5394db6c9a5aa56ca20 WHIRLPOOL c8eba13148d9a06b88e1fc7ec00d0f31ee6c2c747dbbebbaab0316fdd85acb2aa0cda2d724d3b7a75d0e45c70d04f33f35ad67dc3287571879f61f12f036f13a
+MISC ChangeLog 169394 SHA256 f1b4f6061503f454a9801d6ccd4653fa31c539a98002ddd667bb8d59308d564c SHA512 8f93a62815908740a1f65bd0ae077d3befe3378749eeb041921efbb1ae0b7796df40e0565bcc73bf1fb6ac5a270516ac1ce6febfad82e2f94a95c424941ac1f0 WHIRLPOOL ec2c458db46df8fd6ce4e259cd5f5cf84e03cce59ef7729b9e2aa6a5fcc3519aadfe0b17833e539ac0949e64a56994410bd89e7a37a5989362246cef953b5252
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150428.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150428.ebuild
new file mode 100644
index 0000000..dfab765
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150428.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-04-28_00-01-56/zip/netbeans-trunk-nightly-201504280001-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 f807214..46f785b 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_p20150428 (28 Apr 2015)
+
+  28 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ergonomics-9999_p20150428.ebuild:
+  bumped to the latest sources
+
 *netbeans-ergonomics-9999_p20150427 (27 Apr 2015)
 
   27 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index c1b1ae6..11854e3 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201504170001-src.zip 207165961 SHA256 a30747f33bf216
 DIST netbeans-trunk-nightly-201504210001-src.zip 207178961 SHA256 b277aeba16c941024cc88c8d36a4183ff078adf054721dadc8593be14c963c0d SHA512 d421faa83f70a9ec7cb58d88290aa1104839d2b3e5f3e4582f1c2294fa2647913911eb298d625ad8a97bbf7aa2c35314a4480e20d36c0f4abb7f909c5f2c3481 WHIRLPOOL 5b2becf39729c209e27bd3cbcf0f7fe88b1829c3e898c24fc6d5c1efb4345cd17637243390886151cdba80d05cff65da6eedf7fcb9bb3fca42afb08d26ed2fa8
 DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9ebdb4fae53f4999d1bb357dad09966f36c050e52d9cf53507f6 SHA512 2a2a5dab10d0dcf6797f1a51f58af7a2f39c9c10a29f5e3f231e895e20333b434273cb69192209e400c75bde82a6d7175c0018fba94998911f4e71abf30f4119 WHIRLPOOL 7ae4e39d0a8f0e7ee249e3f8fa7aa0a77f837734e9e7dfa3b2b648c015fba99f5f0d1088474c8678cf9de0728c1ce1eb9bd6de0319369c862011531c84c1e0f5
 DIST netbeans-trunk-nightly-201504270341-src.zip 207311520 SHA256 acf9098ac80b152d852b40943cbf6ec50878ee0d089ce4bf7666aab656303127 SHA512 344f9e396f20c463801b44a264ca55ba4d05c7c51f83c650f2a6ee9d4858947962db8a7d9f0ab1e77eb921c9d974dafd7cfd8cd641005c468d7511cbfe0be57c WHIRLPOOL 8b5915c7c222f965ac8848b198be9afe4b227d5e3bd87f2c391ee06032914af414aa1ca438a92262b0921f6918fb2135513a648adac56e0dee3ba236225f9dd1
+DIST netbeans-trunk-nightly-201504280001-src.zip 207313287 SHA256 4d9e7bce832a438a5a030d15d0c65c5dd930a81e910efe56a6e98302db7c6aba SHA512 6355cc5666f6cb654bae79e37a06e4ccd4637ea1f093cd6dbdc8d99a109e61de6e644a4e9489bf67d72f27ce6797c175f948244a2d80b59e0f43fc64961b41ba WHIRLPOOL 70666a34cb2cabab59abe6fad18f85cf3cac3c6bc417ac2b0098c881625ec8292b1f2edc6a606370ead0f491be39815022978156d09c4ebd927778f1f8f9291d
 EBUILD netbeans-ergonomics-7.0.1.ebuild 2884 SHA256 e8e4a785fc11b6d0d3c722826761581b8c9c779c5460dc7d1487b3154f4402ab SHA512 3ba2810e650726f48fbdb1bc0c58b6ee1e7d9d29d4be3b27c00bc981b773f26d979fd90154184276e044eafd1d4d8940b47d6f0f58589f9cff7fbadef5fbb05f WHIRLPOOL 5fab7fe6492f91bd0e97a8a95c0652266d771e9b60957e16ce6ff683c1e38081372151cd8c7bea44ee1f1dd7bf435f8b00b9a1a23e4c6106c990794c6093ba10
 EBUILD netbeans-ergonomics-7.1.2.ebuild 2893 SHA256 cd56250980429160b8fa9deb17f15050d016394d5fdef19bf772cf29988c86d8 SHA512 32d4556218791a32efb8cf8ec8303f7e8f27bfb03b97af0c66cee717563c7e02fcd9e350b0425ec0cec28ab09865d4815aba1471ee958e05e7c42e421a7f71c2 WHIRLPOOL 318c8528c2338c1e2f6e342c263be52753fa74c9ac934b0ee60fe0fff2146e86d1761fef8eaeca8eab844709bea2196fbe181fad1f689a9d5b9994da3271b4db
 EBUILD netbeans-ergonomics-7.2.ebuild 2876 SHA256 ca7184ac24c255941c4ec3e686c4237ef0af4be7242c44417fa799813083515e SHA512 c6537bedf2fed4ea914c74a208124fe692af837ab2c81c98b8aa0347cb9d5af496378a8c042437facced26d3b42b101225dfa8b81dfc3d6ec4e3e5613e359f72 WHIRLPOOL c7e4c08ace118690f454dbf6a9040bff3e7013c646947fd02b05bca2b4d802393b6eca3234c6228f8e4df4da1ed193ecfd93c848038e4dd9ae3f50959692aa15
@@ -60,5 +61,6 @@ EBUILD netbeans-ergonomics-9999_p20150417.ebuild 2919 SHA256 d9431f95460bd69f95a
 EBUILD netbeans-ergonomics-9999_p20150421.ebuild 2919 SHA256 975d1649145cc6c160a3a724192d7b5d1cf6e5309e05fac4e05f4630461fbb1f SHA512 eebf700fa23b0a1bbefe785d35222ea78e07b1233050276db84e74c4d254056a328ea3bc00115f3aa7ccd2f47f55361d2bef6a49feecc2a232085fb719393c11 WHIRLPOOL 4be6b36a9b9e09c3dad813b7658dcef5f031d45fa42ca7af41a788dd3bc1657b9280e9c9381cdbb9eec2712a95501fd6c961ad443705de813592ef02c7ac09e6
 EBUILD netbeans-ergonomics-9999_p20150423.ebuild 2919 SHA256 b407b9c8c0273b431ffa67b1f77c6ff531ae9b8f30e2594d1665c3cefa0bd649 SHA512 bd5520652574a37fe377d03a8cb6d965941aa11a49cd24f0a9a9b802b16a74c09609129f0b7e12fcad44dcdbd65b9ba14112ef4c8a78e18092e6419162c5a3df WHIRLPOOL 2958c546a060b9743000572d794cebe729f5089439dc7adbd36961b2d429308685b2f5a167e95bca15b463fb7b91fee842508fb03d8f9933f7cb25e1e59b2d98
 EBUILD netbeans-ergonomics-9999_p20150427.ebuild 2919 SHA256 982f6a43e34cce3860e93811258f82dc737cc3676f138a8f24dc2356cbc9c382 SHA512 2b4fc54fac15b05599ca4eb9b8fb8ce61a48fd11a64e2db829b01c394fa1369171cd120da49cc1ca27cc0dcb99c2194bc3ef66812088b03fdd2155c89a2dbbda WHIRLPOOL 6e3c5d0f8a221281132997025a7d0a24ac725dd4aeee86086340d269672296f45e718ad5656136ac8d45bff69b5a62a0e575602efa803e80c089e703067adf57
-MISC ChangeLog 168688 SHA256 2be8f2aef997c745bace58bdc2e091538002935d0b89b69a65ddd6f1931beaf4 SHA512 095a2e19e382df1082946b2922bee3a59c5e77da0731ce61d843a5806a7384877951e983070eed7106c36b9d7e13a05ddc000f901f8ff908dcfdeb63bddf5fa4 WHIRLPOOL 690a724830f4b6ac4f7060ff447970613d190570cb6ef7ae4b724667748c1be751b70a136068993636c90f049d4b44409ea03501d1480d4a1d636a0229ff4a4f
+EBUILD netbeans-ergonomics-9999_p20150428.ebuild 2919 SHA256 a4c45be51883f4c369ddbb4e2782353a59dfeccfae1ce03c04597fec9502873d SHA512 be3e15685921f73a6d7f9b614860eff924b1734ee9ceaafd3a891a2b65b02f68973993d5177aa392f7d75e67ce84b93e394eb6e6b334b3b41976a392e0f626c2 WHIRLPOOL 69c7af8e97cab5bb2f148c7ec8e1323b1344746c92a765d180fbceeaff10091928ffd2f4d9609cf049ea660a55a052e2692a60ea7c68b89bce0d8332b8394efb
+MISC ChangeLog 168869 SHA256 4a398372b82963f92b24af72ac93fcb93c1e9b505800fa4192d13fece8873f14 SHA512 d6eba85d0d790d8770cde0175a6136612188d977dcd5ee4873c91efae7cb9872593a6a34f488ce5006e17b219ef9118c72fab269387844d9ab23b93ed93c5395 WHIRLPOOL ca4de456bf1638cd864d38511ee1057227a8da3942e8a7fb8791317cbc4509c8aa2df158d66bef1d766695015172ac8145a6eea653d343cc48c65ead36a326d8
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150428.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150428.ebuild
new file mode 100644
index 0000000..6326d35
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150428.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-04-28_00-01-56/zip/netbeans-trunk-nightly-201504280001-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 d54d7c6..d55e27e 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_p20150428 (28 Apr 2015)
+
+  28 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-extide-9999_p20150428.ebuild:
+  bumped to the latest sources
+
 *netbeans-extide-9999_p20150427 (27 Apr 2015)
 
   27 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index 1101f78..702e7fe 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201504170001-src.zip 207165961 SHA256 a30747f33bf216
 DIST netbeans-trunk-nightly-201504210001-src.zip 207178961 SHA256 b277aeba16c941024cc88c8d36a4183ff078adf054721dadc8593be14c963c0d SHA512 d421faa83f70a9ec7cb58d88290aa1104839d2b3e5f3e4582f1c2294fa2647913911eb298d625ad8a97bbf7aa2c35314a4480e20d36c0f4abb7f909c5f2c3481 WHIRLPOOL 5b2becf39729c209e27bd3cbcf0f7fe88b1829c3e898c24fc6d5c1efb4345cd17637243390886151cdba80d05cff65da6eedf7fcb9bb3fca42afb08d26ed2fa8
 DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9ebdb4fae53f4999d1bb357dad09966f36c050e52d9cf53507f6 SHA512 2a2a5dab10d0dcf6797f1a51f58af7a2f39c9c10a29f5e3f231e895e20333b434273cb69192209e400c75bde82a6d7175c0018fba94998911f4e71abf30f4119 WHIRLPOOL 7ae4e39d0a8f0e7ee249e3f8fa7aa0a77f837734e9e7dfa3b2b648c015fba99f5f0d1088474c8678cf9de0728c1ce1eb9bd6de0319369c862011531c84c1e0f5
 DIST netbeans-trunk-nightly-201504270341-src.zip 207311520 SHA256 acf9098ac80b152d852b40943cbf6ec50878ee0d089ce4bf7666aab656303127 SHA512 344f9e396f20c463801b44a264ca55ba4d05c7c51f83c650f2a6ee9d4858947962db8a7d9f0ab1e77eb921c9d974dafd7cfd8cd641005c468d7511cbfe0be57c WHIRLPOOL 8b5915c7c222f965ac8848b198be9afe4b227d5e3bd87f2c391ee06032914af414aa1ca438a92262b0921f6918fb2135513a648adac56e0dee3ba236225f9dd1
+DIST netbeans-trunk-nightly-201504280001-src.zip 207313287 SHA256 4d9e7bce832a438a5a030d15d0c65c5dd930a81e910efe56a6e98302db7c6aba SHA512 6355cc5666f6cb654bae79e37a06e4ccd4637ea1f093cd6dbdc8d99a109e61de6e644a4e9489bf67d72f27ce6797c175f948244a2d80b59e0f43fc64961b41ba WHIRLPOOL 70666a34cb2cabab59abe6fad18f85cf3cac3c6bc417ac2b0098c881625ec8292b1f2edc6a606370ead0f491be39815022978156d09c4ebd927778f1f8f9291d
 EBUILD netbeans-extide-7.4.ebuild 3311 SHA256 8585e0b9eac3b9bb35d5b5e0152936f84708a824d76831930a3dfd3d196556b0 SHA512 19eceec7a634923b4712eb277a1ff9900a2eb4d9ac0a2c699175333c263f0c02baaf24eb30bd7919444f5c9df751186689b2d4359ca1c88dca02884d7c18c3cd WHIRLPOOL e64509f198c4d09851f98d5bd2ddd5b469b0a7c0f3122f391c17833e5d6d77b7a6c2fd9e942e34f2df42047504ad40593f97af9b2898450e769c7b012355c316
 EBUILD netbeans-extide-8.0.2.ebuild 3313 SHA256 d147df43b8e55de81e0429604a2497a82861864ae50fbb85368a3070e1c266c9 SHA512 8f2722ce12c1582ca6e9ed348fcb37b9969585037b5432e592e5dd6ef4b3e49c58783da5fe20f088bee07514e3b42de7aa36607900b285c32c4b91fa218df90c WHIRLPOOL 0fb074484787a5e0e688dc734efe027ff6dfd082dd63bc9bccc612f915fbbe33a4f93db6c43d345abc9c191e22ec196aada1e889d1240968916d54c69497a2d6
 EBUILD netbeans-extide-8.0.ebuild 3305 SHA256 b2d57e2e2d92760ead3d383fe4dd5b4fb9fc2807a9b58c6f40b44fc24072b8bb SHA512 6e7f12758188a564ef6b5cf8b0ffdf79e30d1021172d10f215d04e727bc4001e4385fd0961a26a6bb42638089e0919b1d4628a13ba11a3deac94d4693c7210d5 WHIRLPOOL adac8461de43669b7bb98ea8920c0a2944837211a37503b957221149d4b91c4bd92b6db160191990b838c474495c65f62c8a4bb9fdbcaa371b4648a335b1afa9
@@ -54,5 +55,6 @@ EBUILD netbeans-extide-9999_p20150417.ebuild 3383 SHA256 db844cf3cbd16f8c38f1e05
 EBUILD netbeans-extide-9999_p20150421.ebuild 3383 SHA256 7518f83d097ee412ba5c6131c6a007c73c9f650f202fdb42a66e98ca427bf981 SHA512 3ca03569170302875417e61d11bd3516f74a1d3feff3c46fec9e3718eed9ccb2c766357e691634b85a9b02981801cc9d79ac7aae6740127034531afa8b90297b WHIRLPOOL 71087faa2d76b8d1f5a15d59509b559734d951ba178ebe140d0c5d3f6e6c6e6ba33a0bb5714ac110823459bead755c96ae07e9e178266816c5a71952d67f627a
 EBUILD netbeans-extide-9999_p20150423.ebuild 3383 SHA256 0274d22f28d2378c853a723ee32cda98ddb319287b62ba03006b6b2c21c7f19e SHA512 895dc683ca7a15667ef645e8458da00f15aba38988fc02ae0eecc4d90ff831071940286e735b0ce845410c536796ae6695ec6573ff08d562418c346117f4ca8a WHIRLPOOL 6f4bea1a211417315e63e150f6bdeceafbf0f6126e8176e268b05cf95abe738006538a8e9a872c13e4f06a7f04c2b02706cfb4bf4c6af9c95beca37061366998
 EBUILD netbeans-extide-9999_p20150427.ebuild 3383 SHA256 67f5b845dc3c25b2c03cd412d92694f39c995f789e6d2569060b1cc7ea897fc5 SHA512 711aee1658a6e4b93d7ffd393fefe6ea92965ce7dd3838c6d6b59a3b534fab5c36f607eeb2a26d847d0e4926701aa0a5ffd132316936f1c5dbe9c33cd17b2316 WHIRLPOOL 249e1b8b4988abc39875b1941aca723b18431beec6b2456a9ae259167ed309d3295fc97f29663b63ca5186113d1be24dcc4bae7ec6d5cfdae339992cfbf0c76b
-MISC ChangeLog 92615 SHA256 a971cde8977f19d33cb056ed29fbcd6dfced8aba346388a05c96ad643ecbcba5 SHA512 68ddb5cdb8750a827bf2e8022505bb697e883c68a5af721aaa3edfdf88f08f6234253186b1461d33fdd6a7df8342ec5bbe9b6ec1a5130e27deddcb4c6822faf7 WHIRLPOOL 21ff134ffb48d77a9fd2f5bd8a95913e6da0a147c0f836df7090df448b8631677b526f5fe688f797876cd93d10001d72ca04c67331a5bc654ad1dd0d05b58abd
+EBUILD netbeans-extide-9999_p20150428.ebuild 3383 SHA256 80bdc693d7598c5ba2513b6f07352b3d98adb7fee5703f483f106dd8d7ba2d2c SHA512 d8271c167b4bddbef48567097d289ee30367fe745b290bfd4766eb06756f3a1581560a1081c5fadef0adaab52905bd1677869f24f0229d3b06d6940f2e9c6b54 WHIRLPOOL f5f502248a445ad6f94952237a5f9fd061303762ea6db043eec16c4b496c907a0262c9a40247006500a7a56feb3f18ce048d6225922d6fab9b3b54b52c82fa51
+MISC ChangeLog 92788 SHA256 7e1d9fab29fa80bf58c96dae14299b1e083103b83d3ac9dbe164271532cee653 SHA512 8c7a3d10d087864fb1e39f8e82a9ec8985afcf673fff602f3d6370f625b833b856cc1dc489612740d33084ed3fabe3a12b769cfed93a9e4a03f827fe45887e84 WHIRLPOOL d779a471b21a6df982397a4b88d637f66c8746eeaa4d4134f29b726f6a381cf0dc04eb9e8f66a7bc168964d548cae17e2266c5e6e82643ad401390aebe05beba
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20150428.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20150428.ebuild
new file mode 100644
index 0000000..6fe9d99
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20150428.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-04-28_00-01-56/zip/netbeans-trunk-nightly-201504280001-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 967b283..0cd22c3 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_p20150428 (28 Apr 2015)
+
+  28 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-groovy-9999_p20150428.ebuild:
+  bumped to the latest sources
+
 *netbeans-groovy-9999_p20150427 (27 Apr 2015)
 
   27 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index ff4d691..c0266e2 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -37,6 +37,7 @@ DIST netbeans-trunk-nightly-201504170001-src.zip 207165961 SHA256 a30747f33bf216
 DIST netbeans-trunk-nightly-201504210001-src.zip 207178961 SHA256 b277aeba16c941024cc88c8d36a4183ff078adf054721dadc8593be14c963c0d SHA512 d421faa83f70a9ec7cb58d88290aa1104839d2b3e5f3e4582f1c2294fa2647913911eb298d625ad8a97bbf7aa2c35314a4480e20d36c0f4abb7f909c5f2c3481 WHIRLPOOL 5b2becf39729c209e27bd3cbcf0f7fe88b1829c3e898c24fc6d5c1efb4345cd17637243390886151cdba80d05cff65da6eedf7fcb9bb3fca42afb08d26ed2fa8
 DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9ebdb4fae53f4999d1bb357dad09966f36c050e52d9cf53507f6 SHA512 2a2a5dab10d0dcf6797f1a51f58af7a2f39c9c10a29f5e3f231e895e20333b434273cb69192209e400c75bde82a6d7175c0018fba94998911f4e71abf30f4119 WHIRLPOOL 7ae4e39d0a8f0e7ee249e3f8fa7aa0a77f837734e9e7dfa3b2b648c015fba99f5f0d1088474c8678cf9de0728c1ce1eb9bd6de0319369c862011531c84c1e0f5
 DIST netbeans-trunk-nightly-201504270341-src.zip 207311520 SHA256 acf9098ac80b152d852b40943cbf6ec50878ee0d089ce4bf7666aab656303127 SHA512 344f9e396f20c463801b44a264ca55ba4d05c7c51f83c650f2a6ee9d4858947962db8a7d9f0ab1e77eb921c9d974dafd7cfd8cd641005c468d7511cbfe0be57c WHIRLPOOL 8b5915c7c222f965ac8848b198be9afe4b227d5e3bd87f2c391ee06032914af414aa1ca438a92262b0921f6918fb2135513a648adac56e0dee3ba236225f9dd1
+DIST netbeans-trunk-nightly-201504280001-src.zip 207313287 SHA256 4d9e7bce832a438a5a030d15d0c65c5dd930a81e910efe56a6e98302db7c6aba SHA512 6355cc5666f6cb654bae79e37a06e4ccd4637ea1f093cd6dbdc8d99a109e61de6e644a4e9489bf67d72f27ce6797c175f948244a2d80b59e0f43fc64961b41ba WHIRLPOOL 70666a34cb2cabab59abe6fad18f85cf3cac3c6bc417ac2b0098c881625ec8292b1f2edc6a606370ead0f491be39815022978156d09c4ebd927778f1f8f9291d
 EBUILD netbeans-groovy-7.0.1.ebuild 3296 SHA256 29c3d304eca5999e78550fd715dbcbef9d15639d4e4f17fa0e45a46803080729 SHA512 43a0ddb43354bb3c0b8e29004ab547da508662d037b0006dfd24250c49470ddc0384bfffb6423f1e3eeaca98410c5de8b314a69970189306869a16380ab098a1 WHIRLPOOL bf626cecf6dec0c51e7e0b95ac4ff26a795e44a5dabd25719eeb2244742d96d33cb20ebbd9a68728dc27d28b8e558a7e2a3ee318c2e4fde234e0b5e8d32e6a58
 EBUILD netbeans-groovy-7.1.2.ebuild 3305 SHA256 1e00f335b8cc1e90deec3c3251629ba699286b25be5b6945d135d271004dc34b SHA512 3a1d67d02054478ed15e11789292fcce3fcfd343b8feebde5e07a9463c380c644310603a3f9f984e8071b0b097075809dce423b888e1f2aed316cb90a562d20e WHIRLPOOL a790c1e186c4d1949de6b4dd975b929c132e3e7b7c455c7867bd1445f59fb6ace72b5c9adf09d0c6079718fdc6c34a0c5f0c9c437517b55b7ae109ce3e20b064
 EBUILD netbeans-groovy-7.2.ebuild 3160 SHA256 6d709b7cc07d7ebb59c3ede0a19c9890ca3230144d7f455cf24d984ac2f633b0 SHA512 e30c8d58165b87a39a356f8b813c593910cd2c247de41420369fee21157c2f2881db34612711f77c9ecd9501aa6d7235ab7bc41d4092be1e68fab778c16d8288 WHIRLPOOL 4a6495ca077f3c374105b25698c8251aaa89daf56c2749bdc73867b0ea1ae404cfc7b2a8b435ef7b19f00aee8128be051c04d6a24fb631379fbe98d6854a507b
@@ -64,5 +65,6 @@ EBUILD netbeans-groovy-9999_p20150417.ebuild 3422 SHA256 058bdada7aeeab9680620bb
 EBUILD netbeans-groovy-9999_p20150421.ebuild 3422 SHA256 8840d448cf98e8f98876276a8c7c698b76d7d181286d15a4a695f01d23c17f25 SHA512 709da54247b84827c176b92a5907dcdf9473da0f1773333b475232025aede4ccbc9276cfabd2ae6ddaea546e71b59e931f80774fc2a96adcd0d9c4139d621ceb WHIRLPOOL 9cc6a4ab042b47222908826a12acc214d59b1ff86e061a612498d905a7c7507334d576f34eaf54f0bf887346408f0309232ea9aa6cfa232826d4b388a40e71c2
 EBUILD netbeans-groovy-9999_p20150423.ebuild 3422 SHA256 50f7029938d8bebfe4261e7f7a856e0e8d1a747d51a1dadf04adaa56c87fae1e SHA512 c0d9863e1c012f1c2a9bfb92c98005d488647ece4135eaa9a3dadc7422645a14e60bbe29674eb0b555e1caa324975c013f510f0ef7f90295a60ca6542559b37b WHIRLPOOL c2ecda2f6d147e17cd0f53647fc1de9a1621d4ef8b5b3ed927b52c6a35c400d149160895582dbd354ddd04755d7c2dcb2a652aeb759e2b91f83371b276fd3332
 EBUILD netbeans-groovy-9999_p20150427.ebuild 3422 SHA256 d5cf5aa1db1903b0c9489c7c01a44e960700f4ec1020e255e4a5528d5d457b8e SHA512 53147d30cd4e100f5e462fb7a6ef3e3b475d926e2e836b54991a53b42a999431983021621e10122b9eb15fa12b2c03af3f280da5e2f63bf5686259ab1325b364 WHIRLPOOL e68ba23059f8457a045c8bbdb4780f788f845483134a587e7c1e50e73820e3ef8bc527293a684b8829d0324153c1f370104ae7138617fd11883c95d7e56e7909
-MISC ChangeLog 160595 SHA256 b42c65423a73f187937b9c7adb57bffb64e9f31efe15a3a8d60225774eda3b2b SHA512 f67980850e5ba12ebd74d374fea6c484dcaa30d7f2266ce74eabd7b60e25c5e669cb5fc0586fa99fd9657de0c614d6de162a4414d5b2fb47ee0393776d1f8a9c WHIRLPOOL 4a399b8294ac83d332fa375ead2f47a3678711a22f5d56a85042c71b54fe3945fc8d2c882858ee682c2e2a78c275e4984aee055286d665eecd8cf07f20cf2751
+EBUILD netbeans-groovy-9999_p20150428.ebuild 3422 SHA256 96ef663061a25b1b77b8ad9bedec1ebcd0fd78d50806cc2bdfa955ce19e82444 SHA512 521214c6e377f1c9ebadfe460db3ed33c6350b0f603701bd862d88c6d596b74972e134976581630df34c7e04fafd3a0b518ff77d6044586fa7cb97d028aba901 WHIRLPOOL 937b7af1ce428965f70a711c169c8f23e138457897b6017ead8816ad8dacd86474a8c8baab8fd1617f4c582a52a299a0f1031b28e1b36fee9f0cedf8889de8f9
+MISC ChangeLog 160768 SHA256 12062fa2a0c9412663fd96d0e9c2d1297b8cbfd044b93d6774c2324214666f50 SHA512 abfd216ee320a3869de193157b9fc630623742a019af082284bb12d1b567daf83ec1ee0476f9f7144e8e63059b841e7cfa1c2d5eda6466449edf5468a3fe0841 WHIRLPOOL 1759114c0b3945ebcb3dcebba852c1b4fca02c1a79960304f53b3598f32bfd41ada2c9f3a9cb0368d82497b79d2e43258453cb4923d0bdcf31a54f0ac89f3449
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150428.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150428.ebuild
new file mode 100644
index 0000000..8112cca
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150428.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-04-28_00-01-56/zip/netbeans-trunk-nightly-201504280001-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 faa59eb..25bb7e0 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_p20150428 (28 Apr 2015)
+
+  28 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-harness-9999_p20150428.ebuild:
+  bumped to the latest sources
+
 *netbeans-harness-9999_p20150427 (27 Apr 2015)
 
   27 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index b2a8419..3126412 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201504170001-src.zip 207165961 SHA256 a30747f33bf216
 DIST netbeans-trunk-nightly-201504210001-src.zip 207178961 SHA256 b277aeba16c941024cc88c8d36a4183ff078adf054721dadc8593be14c963c0d SHA512 d421faa83f70a9ec7cb58d88290aa1104839d2b3e5f3e4582f1c2294fa2647913911eb298d625ad8a97bbf7aa2c35314a4480e20d36c0f4abb7f909c5f2c3481 WHIRLPOOL 5b2becf39729c209e27bd3cbcf0f7fe88b1829c3e898c24fc6d5c1efb4345cd17637243390886151cdba80d05cff65da6eedf7fcb9bb3fca42afb08d26ed2fa8
 DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9ebdb4fae53f4999d1bb357dad09966f36c050e52d9cf53507f6 SHA512 2a2a5dab10d0dcf6797f1a51f58af7a2f39c9c10a29f5e3f231e895e20333b434273cb69192209e400c75bde82a6d7175c0018fba94998911f4e71abf30f4119 WHIRLPOOL 7ae4e39d0a8f0e7ee249e3f8fa7aa0a77f837734e9e7dfa3b2b648c015fba99f5f0d1088474c8678cf9de0728c1ce1eb9bd6de0319369c862011531c84c1e0f5
 DIST netbeans-trunk-nightly-201504270341-src.zip 207311520 SHA256 acf9098ac80b152d852b40943cbf6ec50878ee0d089ce4bf7666aab656303127 SHA512 344f9e396f20c463801b44a264ca55ba4d05c7c51f83c650f2a6ee9d4858947962db8a7d9f0ab1e77eb921c9d974dafd7cfd8cd641005c468d7511cbfe0be57c WHIRLPOOL 8b5915c7c222f965ac8848b198be9afe4b227d5e3bd87f2c391ee06032914af414aa1ca438a92262b0921f6918fb2135513a648adac56e0dee3ba236225f9dd1
+DIST netbeans-trunk-nightly-201504280001-src.zip 207313287 SHA256 4d9e7bce832a438a5a030d15d0c65c5dd930a81e910efe56a6e98302db7c6aba SHA512 6355cc5666f6cb654bae79e37a06e4ccd4637ea1f093cd6dbdc8d99a109e61de6e644a4e9489bf67d72f27ce6797c175f948244a2d80b59e0f43fc64961b41ba WHIRLPOOL 70666a34cb2cabab59abe6fad18f85cf3cac3c6bc417ac2b0098c881625ec8292b1f2edc6a606370ead0f491be39815022978156d09c4ebd927778f1f8f9291d
 EBUILD netbeans-harness-7.0.1.ebuild 3579 SHA256 f4d09cb7bd5e8485caf75a3020ddb8102d3ea326878ac384ef4aecb011a1f6a5 SHA512 390c26b4a3dbc81ad1ef210b3ea668926398cb38ea13fa37dceb6782b4478b1ceb7a49e9db300f691fb8b31c21c56b25f4c3237c0890f0c637ca45f596c88294 WHIRLPOOL ae1e34af6dd61c30f645f39a825b6235e3eb1f9a42dd23431225513733209a2eb225a741b75342f827a4be0ffbf41b9786a6a6430051f543c321abe3c20da6bd
 EBUILD netbeans-harness-7.1.2.ebuild 3587 SHA256 e0adc470109009641bf48569623bf0fc51a400ac1ba686475c7dae1a5b561c96 SHA512 e4157a6b294c17fd7430802b33253d473120dc16173557e0d7840078f4043a383d5e3672af64f124509e54cc85d590abfa4375f181a32ab8b49e976cb6613cea WHIRLPOOL 423a5844a2c55ea99db4ac78e1c605a55a04f634601c0ac054e739c0ab4a3e9c765778dbd81ccf4a1e50e9d9e4cc29ecfad2ec64b483197927f434b67cd4d773
 EBUILD netbeans-harness-7.2.ebuild 3421 SHA256 47a5281d140b47e0235592c58657a9065d1827175ccca7d0c73fd81e90710090 SHA512 403fd1f49e11b27ef8002c4066fc911dbeadcccc7adddcdded86c6cd95e8bddaf0603c0ccafd0e91ef31a0909508deab1eb326e98e621bcbae7304413acca291 WHIRLPOOL fe3c5f95a606db39861a80201c185cb5a25e2d80698ac78ff724587b54e859f861b834b89aa79aac22f2c5da700532eaafae67fbcc33259ee07d578ba5c7f9ee
@@ -66,5 +67,6 @@ EBUILD netbeans-harness-9999_p20150417.ebuild 4131 SHA256 53b8c795c6398f31355098
 EBUILD netbeans-harness-9999_p20150421.ebuild 4131 SHA256 26a35a0b824e7a7beb25befaba9b250d121cd53cd60a11fc988e1848ba129d4f SHA512 49d53a70313c1a8fa030a7d6bf461794702ad11978eec2f604abbd4bbf896c3506b76ae9c8244118e4f8fda9c21c698a38dfa5ff03e1a39ef1fa2db0b4a19a62 WHIRLPOOL f54503653b529cc7e96e6e18c4fedf356bf0c484b7bc37a824983a19365ac5d5a177f23e7c35e028118d5fc0993092981b7a26dab9ec9b1513482ceae9d11807
 EBUILD netbeans-harness-9999_p20150423.ebuild 4131 SHA256 46418b1805335786c9436e2b5b2d8d4ac8a2f14c946955023c19efe99cf9c7cb SHA512 b8d0b8e718e0718b8b991c82e4d752302c46ebdb44e2bb9732f3be4d16bed4e3f6b9dbcd2f104808fde2ac201e36662148f6726901ef6162c31539fefcff05c5 WHIRLPOOL 441d2eb0ef8c270a5e6d7193f1fa80e2a9dd1190c033e7b8d58a8e32464df7dda8c5f756d9f72903117597a07645ad6fde193d46c9adf6152080764cf6925e64
 EBUILD netbeans-harness-9999_p20150427.ebuild 4131 SHA256 7f7253017c21ef70df2357ca22626108a54f219f964618af6cf239fc5476cca3 SHA512 f18122585da32ac348ce3a6b629750b85be53e1e9a638f00a35f21e5fd187f40be542cccfb737301ba68fca7be5befee177cafbe39f6c714a61083d2de2fd64a WHIRLPOOL 45c836babc4ee23bcd27d4be6bd9df3d6047a736089279b89bbd191f42b22179402eb30b202891b960e2ff58df8ad505df766c11c34dfccd872b361c921ad7a7
-MISC ChangeLog 162647 SHA256 dc7123760997b63ff2c912ddaced23437f4c40f9f5f31ee1b49b3770d9cb01a7 SHA512 e4ba5b11ac4feb10ce4c632ffc86897a732ffc3c39ea7b5a2621632cec0113176ed9d85877f043ca8ba1fb6b7fbd5ec4d2e8805b5fd580c5e1ca7377d4e603f3 WHIRLPOOL a59099d9e03f71437b31ad3c94c3c5f79c47f389ea20a353f21b6aae2467ce9c4d6ce098a30cd44e2a4b041a1546263c80afb6708c288ca1b32fe7151ad6ab57
+EBUILD netbeans-harness-9999_p20150428.ebuild 4131 SHA256 1fb43ea642f28eb06b67a9caf923f5f7fe16ef6c952c581ee2f3fffdbbd920bc SHA512 8ccfeddb5e51a2dc6e715d43558ce39bff56782359e27514e94a158ff0032fb1bfd7f7aea56593f4a6e9ee64dd00e4b1b2726ea0bc9cfd77e0e3f5fec7340c36 WHIRLPOOL 61851c7b366dc8fb17193ce9026ea680f5032de6f26918a54b4307cea2fccf6cd14e20d6c93fbcd0fb70744524ed20b7aa9a6625a2d3368a3c8da4b469012f08
+MISC ChangeLog 162822 SHA256 0d7c3806ede7d0b04d275667ae5f646900bc766a5ee67418228eccd23be1003d SHA512 668a8fbbf2fe7a974a8bae81c9278aa560b9fd36ab4699e624a40a5f3029ed27e80bbf360754a4fa05180c3e7a11823880038be1e3b12e0972ca40e15d24e3fd WHIRLPOOL ebcea7d26c7b2e8591f3cb16963427adc4f8d81bbd99a1c232d2aea40ad49a3b54511f04ed1fba22e46aa1604872ba1b2926107ddb44b60bf03ebdc0a3843870
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20150428.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20150428.ebuild
new file mode 100644
index 0000000..3253eed
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20150428.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-04-28_00-01-56/zip/netbeans-trunk-nightly-201504280001-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 0a88d10..32e15d0 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_p20150428 (28 Apr 2015)
+
+  28 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ide-9999_p20150428.ebuild:
+  bumped to the latest sources
+
 *netbeans-ide-9999_p20150427 (27 Apr 2015)
 
   27 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 1447e30..86809be 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -243,6 +243,7 @@ DIST netbeans-trunk-nightly-201504170001-src.zip 207165961 SHA256 a30747f33bf216
 DIST netbeans-trunk-nightly-201504210001-src.zip 207178961 SHA256 b277aeba16c941024cc88c8d36a4183ff078adf054721dadc8593be14c963c0d SHA512 d421faa83f70a9ec7cb58d88290aa1104839d2b3e5f3e4582f1c2294fa2647913911eb298d625ad8a97bbf7aa2c35314a4480e20d36c0f4abb7f909c5f2c3481 WHIRLPOOL 5b2becf39729c209e27bd3cbcf0f7fe88b1829c3e898c24fc6d5c1efb4345cd17637243390886151cdba80d05cff65da6eedf7fcb9bb3fca42afb08d26ed2fa8
 DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9ebdb4fae53f4999d1bb357dad09966f36c050e52d9cf53507f6 SHA512 2a2a5dab10d0dcf6797f1a51f58af7a2f39c9c10a29f5e3f231e895e20333b434273cb69192209e400c75bde82a6d7175c0018fba94998911f4e71abf30f4119 WHIRLPOOL 7ae4e39d0a8f0e7ee249e3f8fa7aa0a77f837734e9e7dfa3b2b648c015fba99f5f0d1088474c8678cf9de0728c1ce1eb9bd6de0319369c862011531c84c1e0f5
 DIST netbeans-trunk-nightly-201504270341-src.zip 207311520 SHA256 acf9098ac80b152d852b40943cbf6ec50878ee0d089ce4bf7666aab656303127 SHA512 344f9e396f20c463801b44a264ca55ba4d05c7c51f83c650f2a6ee9d4858947962db8a7d9f0ab1e77eb921c9d974dafd7cfd8cd641005c468d7511cbfe0be57c WHIRLPOOL 8b5915c7c222f965ac8848b198be9afe4b227d5e3bd87f2c391ee06032914af414aa1ca438a92262b0921f6918fb2135513a648adac56e0dee3ba236225f9dd1
+DIST netbeans-trunk-nightly-201504280001-src.zip 207313287 SHA256 4d9e7bce832a438a5a030d15d0c65c5dd930a81e910efe56a6e98302db7c6aba SHA512 6355cc5666f6cb654bae79e37a06e4ccd4637ea1f093cd6dbdc8d99a109e61de6e644a4e9489bf67d72f27ce6797c175f948244a2d80b59e0f43fc64961b41ba WHIRLPOOL 70666a34cb2cabab59abe6fad18f85cf3cac3c6bc417ac2b0098c881625ec8292b1f2edc6a606370ead0f491be39815022978156d09c4ebd927778f1f8f9291d
 EBUILD netbeans-ide-7.0.1.ebuild 22653 SHA256 4c1b3e46e2a6cb89d902c7f4fe6ad9306cbd0c9463a514e87d4c6ec019dc0356 SHA512 5dd526a85a70720686c612efb3aa5602c395111d507b91ae4db04c5814b27bafd1480ab7e44e1148b7412f768543110ff58abdf676de303cd3be9d87b87bd373 WHIRLPOOL abaedc56df115c6050ad7824929ee959ba1669fc1f3f9d4cd1eb9f9f948a608828621f46aeedd0b6062c85b1ad4481d12f952a504559e52c110ff37b88ae0d72
 EBUILD netbeans-ide-7.1.2-r1.ebuild 26831 SHA256 2643a4435aa093e292a2728583d8ffbf213dac6a13dad8e47029ed13a2478493 SHA512 5ba14c7b820f2daae788588ae2fdebdc8af6bb870d6ed56adcc2d43810e5dbd2ea21ae639e6b864d6d0b1e69c9aa4f86dfb15e99eb4a170434aadf0109ad876a WHIRLPOOL c9367735f073f9fcf6bb992b6d481aaea1ebe8526907cb6366d432a3f47a0c4d76bc9224206e0e512708dfe896b465878a2a1ad68836c7cd9b51a3a4efa2aecc
 EBUILD netbeans-ide-7.1.2.ebuild 26834 SHA256 1e57e60a1a00b4530f917319b5d8eef915b9669b9dd3ab82b5afabe171d8959a SHA512 4242265c0783a87c028f955425c86596038aa477e3256ff8ba244220a573486bb7f2e47b07b3c94fbef07940a3b32c313a1320b58656a67cb15a490e7307b1ca WHIRLPOOL 1e23b1e4370292500f154527ecd7a0e7ca315ee73588806413f630355677ee8fe9318a0e672b5f6ad60f829c0a5579b37eedbd737bc8ec154aba9f59c53bd337
@@ -272,5 +273,6 @@ EBUILD netbeans-ide-9999_p20150417.ebuild 30068 SHA256 7b7987c3406df7650b2a17724
 EBUILD netbeans-ide-9999_p20150421.ebuild 30068 SHA256 4d795d834ffe7cd7c27d0dc17da0d5eb91bd0620ac7fbdd13d2162b3f06e8c22 SHA512 315b4675a5e83d625f4452f74316833bd2a72beb996de8abd6b89f3fada49a71785cd1665b0f1d06f26224269f11da2228705b1464000965b2638982f130732e WHIRLPOOL 99d06711689269fd1efcbdcf8c09d5ecb74c15d4b4c5f7fbe745e9e304e90141e1126aa2b8fc0bd9e209b2650d59e5c98338a037c3e065ecd302e413349de655
 EBUILD netbeans-ide-9999_p20150423.ebuild 30352 SHA256 0d010b14d34de4dd841a003b026271645829aef1ef22d945147522682435cfe5 SHA512 934b1f684192046766e54a379b53665d4ff3da45828ec6250155874208bfde12fb74ee4ffe7b2092d9c8233b78fc8d4ff0811e628b0e6097c6f5337820aac704 WHIRLPOOL 74b015195633cf064ca65f5409930b74eb526ada36146403309116ff3681ca04e2e540992485c53566f945755f9b5343c1afc922c4daf41fd611232b176a62ed
 EBUILD netbeans-ide-9999_p20150427.ebuild 30352 SHA256 0a412fbd03e44955ebe4317b1ca11af5b8194393bd13b160433406cd73df616b SHA512 7a3f5f3a0fd38f8322f1fce5ae3d192df449bf0c7d9a1f21d6a40a8b57e5c8299a3dfed9eb28b93ee9ef85d4bae2d7670f5ce5fbf92e0882a6efb9ec1328306d WHIRLPOOL 4224a71ad4367cb48cba500290b4b011ad751a992924922e9dc9b64b107288b6781ac5f46e730d7e42428b449a75d0411452f7b5ff2cc568e809d1fa4e6f444f
-MISC ChangeLog 154893 SHA256 5fb355148ffe9c6614697dea37ab994d36fdae7b7ead13a63c79a8a69b252121 SHA512 3dfe08344cd6aa27887f4e80b998f3880f3656870c5fe591af2613e89e8610978e2e253549341d6561eb94822f79290990a665f96fa68e5e00617f4e1a50fcb0 WHIRLPOOL c0f004b8f27a4718f1be8547f7f7f7dcfac808fca2f0c44ec42c20d264f8be186871f3f5954856935f473a91392d34135874b442e31f9f0553c8023e5ca8f148
+EBUILD netbeans-ide-9999_p20150428.ebuild 30352 SHA256 c07244f3118630e56cc5a966f83f0af49d66226586f16bab14e688f6b5e68d87 SHA512 dc309d637ae6ba3ecf44a5394ef9c1a69725d4d7ae0dfe675849832a8d84cd1150b4dcab5034ebcdda9bff78570930b509cc40f2c42b18ffc07effbafcb807f8 WHIRLPOOL 4d0b6f5d7a1668c49b64e80c507cd1780927c4d0749d0e0018ecd61610f391aa65040675b77169b91853dcac139df55bfd784295c99d3eedec268f0a5db3e2f7
+MISC ChangeLog 155060 SHA256 2f76af2eab96f669275cbe37a585e36c742ee618a0ba5a243e48914719cf0e39 SHA512 40c7086b4ce363c8671ccb6c4d782c3694b689d88230a1a0889b7607463c6d622fe2f3490aa078d0ad5e2d8feeddc007f5aba44eaea0935b1ab287241962e7a1 WHIRLPOOL 439face54209c2480120969230456da9183426fbd630c5d6805102c6a0ac1981327ce29a13770543c5afde6e1bb7806e20e5fcdb0b4c63a032ea2ec44686ce64
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-java/ChangeLog b/dev-java/netbeans-java/ChangeLog
index c522ce9..decaea7 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_p20150428 (28 Apr 2015)
+
+  28 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-java-9999_p20150428.ebuild:
+  bumped to the latest sources
+
 *netbeans-java-9999_p20150427 (27 Apr 2015)
 
   27 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index ea76b2e..8f1318c 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -116,6 +116,7 @@ DIST netbeans-trunk-nightly-201504170001-src.zip 207165961 SHA256 a30747f33bf216
 DIST netbeans-trunk-nightly-201504210001-src.zip 207178961 SHA256 b277aeba16c941024cc88c8d36a4183ff078adf054721dadc8593be14c963c0d SHA512 d421faa83f70a9ec7cb58d88290aa1104839d2b3e5f3e4582f1c2294fa2647913911eb298d625ad8a97bbf7aa2c35314a4480e20d36c0f4abb7f909c5f2c3481 WHIRLPOOL 5b2becf39729c209e27bd3cbcf0f7fe88b1829c3e898c24fc6d5c1efb4345cd17637243390886151cdba80d05cff65da6eedf7fcb9bb3fca42afb08d26ed2fa8
 DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9ebdb4fae53f4999d1bb357dad09966f36c050e52d9cf53507f6 SHA512 2a2a5dab10d0dcf6797f1a51f58af7a2f39c9c10a29f5e3f231e895e20333b434273cb69192209e400c75bde82a6d7175c0018fba94998911f4e71abf30f4119 WHIRLPOOL 7ae4e39d0a8f0e7ee249e3f8fa7aa0a77f837734e9e7dfa3b2b648c015fba99f5f0d1088474c8678cf9de0728c1ce1eb9bd6de0319369c862011531c84c1e0f5
 DIST netbeans-trunk-nightly-201504270341-src.zip 207311520 SHA256 acf9098ac80b152d852b40943cbf6ec50878ee0d089ce4bf7666aab656303127 SHA512 344f9e396f20c463801b44a264ca55ba4d05c7c51f83c650f2a6ee9d4858947962db8a7d9f0ab1e77eb921c9d974dafd7cfd8cd641005c468d7511cbfe0be57c WHIRLPOOL 8b5915c7c222f965ac8848b198be9afe4b227d5e3bd87f2c391ee06032914af414aa1ca438a92262b0921f6918fb2135513a648adac56e0dee3ba236225f9dd1
+DIST netbeans-trunk-nightly-201504280001-src.zip 207313287 SHA256 4d9e7bce832a438a5a030d15d0c65c5dd930a81e910efe56a6e98302db7c6aba SHA512 6355cc5666f6cb654bae79e37a06e4ccd4637ea1f093cd6dbdc8d99a109e61de6e644a4e9489bf67d72f27ce6797c175f948244a2d80b59e0f43fc64961b41ba WHIRLPOOL 70666a34cb2cabab59abe6fad18f85cf3cac3c6bc417ac2b0098c881625ec8292b1f2edc6a606370ead0f491be39815022978156d09c4ebd927778f1f8f9291d
 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
@@ -145,5 +146,6 @@ EBUILD netbeans-java-9999_p20150417.ebuild 13404 SHA256 87f8ddd3b3312c9aa9a6ca12
 EBUILD netbeans-java-9999_p20150421.ebuild 13404 SHA256 0cef5013ed56bd13bf0b12099a50e6f0f49701a025cced57ef4253a4fba27ed8 SHA512 e39130e1c3a7f8036728cd5db58ae4f0e28af596ff1f854bf792cb864c0da273f281e0c37cba2c3c8bea312cc99709518eeed8390b3375317b0a6680d7574559 WHIRLPOOL dbc44fe02f09454cc414a4dedc45af755b0f52c502bab13195b3bba4f6c4c41174f00207bd9c5f972c4d3f6730685273b2af0a22b2f5cba2ae5798b6990fe462
 EBUILD netbeans-java-9999_p20150423.ebuild 14341 SHA256 1b63cb478076e34742f75f8e3c06ea91c1d0c1dfd2af623968121c4e8deed96c SHA512 8c2523fc1f2b32fc31bcd351924d143222e77088dc8f3432fbfba57eaf6989663e6d726b56d6a0d0804e995ad1decba41b039009a2479611822c4756af632db1 WHIRLPOOL a0ba2f519585b07489c1e42e0b612ad1f06f4cf7094be87a42599293231ea5996e3876d72dfb67e7e0ede436102c30422f5d40284751e609fef7c94d74c9fed1
 EBUILD netbeans-java-9999_p20150427.ebuild 14341 SHA256 606f890330064641e1e067b04e5731883fbda12f73c10264a762720d9fb1116e SHA512 8365a95c4d89b20b0e72454e6023f723638b43f1fd94ae20c01546695845e53974447f3f9eaf4a5c763d020b3309fecceedbd68b7f61e13bf50aca543d7ad5c7 WHIRLPOOL 967abdc625251e6ea1e82dc0493288a68daf53b0775062e90cb1db585fe0bb9c368144cab0d151424cd2d44211785d748b1433d97de9a28872fc96891869a9c9
-MISC ChangeLog 158047 SHA256 d1c2f4e18d0a8095c547d5866638e113c0287aa693f9d8117c81da76169a3fe2 SHA512 57deed7ed2f42bbb258d2a89359d96e21a6aa86e68c784a84344d410469c396ad113cfc6f1c34f25d28d8300e856d1c617f1fe016446c4f146013bc71d656864 WHIRLPOOL 2a9ad9e3901c6ad5e49abe7eb60305d016a6f4d42c776a22e36512a8b4df30f5bda03a6c33a81aef5365ed4e004e8ebeb1bff7b7646447dddd7de63f535d6007
+EBUILD netbeans-java-9999_p20150428.ebuild 14341 SHA256 1fbcae56a88b16e49efa8dd088682b08ef2619a6272a41331463921cf93b530c SHA512 2689734a95e66435ae7cb2aaa407ce3ad2dc01097eed51edf737683328d56360e827948805cef692a15a66432410acc3c1a626c74870f841bfaa885ede7ab150 WHIRLPOOL 55ef7036f8e519fc7de7caa85183bdb878ec33f86eae44731bf0ec089c85eb5243ae935d46fc152226b4a897768b04e6d2afdbd9647086bedab10bbbd1138d7d
+MISC ChangeLog 158216 SHA256 a50b092b1579614d62910807b27bcfb703072101472c78dde4a1952bac726346 SHA512 078767f61d0023c2904d67a8206fea92408aaacd6720e5d11bd4f96f53a5d630dd70c8cb8220943cf40b63acd2a5331308ac2874250a59f9737cdc2379e0ed0a WHIRLPOOL b6303efcce64e3945112cb2f50d7c65e5d95c563d93769649fccb99343e2d7152aab5b20a87a163fffac7de2de10d4ed2616b58e86ad50035044fb4146cd5fd1
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-javacard/ChangeLog b/dev-java/netbeans-javacard/ChangeLog
index faeb2a2..cfcbc4c 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_p20150428 (28 Apr 2015)
+
+  28 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javacard-9999_p20150428.ebuild:
+  bumped to the latest sources
+
 *netbeans-javacard-9999_p20150427 (27 Apr 2015)
 
   27 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index 813c947..6350c0e 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201504170001-src.zip 207165961 SHA256 a30747f33bf216
 DIST netbeans-trunk-nightly-201504210001-src.zip 207178961 SHA256 b277aeba16c941024cc88c8d36a4183ff078adf054721dadc8593be14c963c0d SHA512 d421faa83f70a9ec7cb58d88290aa1104839d2b3e5f3e4582f1c2294fa2647913911eb298d625ad8a97bbf7aa2c35314a4480e20d36c0f4abb7f909c5f2c3481 WHIRLPOOL 5b2becf39729c209e27bd3cbcf0f7fe88b1829c3e898c24fc6d5c1efb4345cd17637243390886151cdba80d05cff65da6eedf7fcb9bb3fca42afb08d26ed2fa8
 DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9ebdb4fae53f4999d1bb357dad09966f36c050e52d9cf53507f6 SHA512 2a2a5dab10d0dcf6797f1a51f58af7a2f39c9c10a29f5e3f231e895e20333b434273cb69192209e400c75bde82a6d7175c0018fba94998911f4e71abf30f4119 WHIRLPOOL 7ae4e39d0a8f0e7ee249e3f8fa7aa0a77f837734e9e7dfa3b2b648c015fba99f5f0d1088474c8678cf9de0728c1ce1eb9bd6de0319369c862011531c84c1e0f5
 DIST netbeans-trunk-nightly-201504270341-src.zip 207311520 SHA256 acf9098ac80b152d852b40943cbf6ec50878ee0d089ce4bf7666aab656303127 SHA512 344f9e396f20c463801b44a264ca55ba4d05c7c51f83c650f2a6ee9d4858947962db8a7d9f0ab1e77eb921c9d974dafd7cfd8cd641005c468d7511cbfe0be57c WHIRLPOOL 8b5915c7c222f965ac8848b198be9afe4b227d5e3bd87f2c391ee06032914af414aa1ca438a92262b0921f6918fb2135513a648adac56e0dee3ba236225f9dd1
+DIST netbeans-trunk-nightly-201504280001-src.zip 207313287 SHA256 4d9e7bce832a438a5a030d15d0c65c5dd930a81e910efe56a6e98302db7c6aba SHA512 6355cc5666f6cb654bae79e37a06e4ccd4637ea1f093cd6dbdc8d99a109e61de6e644a4e9489bf67d72f27ce6797c175f948244a2d80b59e0f43fc64961b41ba WHIRLPOOL 70666a34cb2cabab59abe6fad18f85cf3cac3c6bc417ac2b0098c881625ec8292b1f2edc6a606370ead0f491be39815022978156d09c4ebd927778f1f8f9291d
 EBUILD netbeans-javacard-7.0.1.ebuild 4961 SHA256 566bc7e3275c97d0fe3d68c843b53aee641548ec39a8143aebd56d248da3c32c SHA512 5973c8d4254943473209b0881c0fbe40ac6b61563d508e58adc248dd40c8c2d6b742bd6c1667ee11fb404f9d2e62f08a8e4d822a2a3db9fccab254f73828c3b0 WHIRLPOOL fd1e08943ce754a2abfe8c8b83954399287500ce574a46fe0d76f94b300fd2a5978957f94a3ac1d85781330248a46fefacfbae25db95669c3de910145ef96424
 EBUILD netbeans-javacard-7.1.2.ebuild 4970 SHA256 15ff13152b140edaa549ea6515949d99cdb2a4656918566179836ab2277f01b8 SHA512 b7e52b477f6ba645084034eb27e848fb48361351937fc45455bf4b7d74acbdd257427ec589286f0edc71cc98c8cdb114e55988b6d3dc92143e13f407e3b45a52 WHIRLPOOL 85ab6dc2c230ea89fd19d7602ac24e3d2b0f226590998e6a6e277c24ef60a7e86874f7e95e90921d255e84f05e04ad1998ee7361b4d26c6f14828076792a933c
 EBUILD netbeans-javacard-7.2.ebuild 4718 SHA256 d173c848e825b342a52073ba16b7784016f92124d4bc3b5ad8beebb7a7dda772 SHA512 019183c236c59ec2b961445c49643c6da0b376048f1be1d58677a753890bcb03db126f6441221c7572a74fe45c4c27aeee4acb38db620f9203ad04ae8ff2c426 WHIRLPOOL f2a10183045edd22ef4419b630cedafc093b326eb593178a0f50e8d82ebb25ab732fb8c561d49969073d9fce551c5b9150fb1900b49458ed53f0234baa29a78e
@@ -63,5 +64,6 @@ EBUILD netbeans-javacard-9999_p20150417.ebuild 4982 SHA256 b9ac669d3ae305f65fe89
 EBUILD netbeans-javacard-9999_p20150421.ebuild 4982 SHA256 aa18f52776de46de10979c45bd08f1e22b59ce6ee87c1e52c344a43e2de62909 SHA512 fc67dde704afddd6398e254535e1ca9b15fed1d01398a63c487f4528a68803779373609d3dbcac3aa02fee7c8f9342032c37b6b3ae357da5da26dfe2c8a043b5 WHIRLPOOL 5cd01326fce53b2ec01f73c18fdbd25c1948c2c6c1331c93b876dd4e8e276caead4014defc2749f5a21c554c407728a07dfe0921a10e4e758f4e3eec88a04c39
 EBUILD netbeans-javacard-9999_p20150423.ebuild 4982 SHA256 1175aa72d1b45318417a9fb1500853724b1cbef29b3106b22ed83e51b8d03e54 SHA512 570955e042c5ebfc7c40f0a1902af2bdd213053341d81170a5bed2d609d9eba279dee5393b00f77b6b4a5e76e6102a0c235d7f10f7a8868f5618f2d5aa9c9875 WHIRLPOOL 332262b34f2c436bf28faaf03508543faa82e8e70de762e0daa5d384e6268fc982da9a864dc01911f43529d38da4ab502dbc9e2426fa893f141621f25e52031b
 EBUILD netbeans-javacard-9999_p20150427.ebuild 4982 SHA256 6b3db19adf9dfa5229cae46971e9018237eb863d0df32550b59068fa373e1a32 SHA512 43d2698b764f77ced918b97ce39d872e014337a4bd4e1d37dd78de8311eea3ed6e133c143b5e7e31e91b65e74a8414520b4cf47be581255bdd47340c5a524607 WHIRLPOOL c899689db29299feab69cf9a201de631c212e8ba80776917e91113c0ebed271807a475d6197bbcd714b24b7334b1f453e7a8b4b39a65a961b858260b3f6ceca8
-MISC ChangeLog 164699 SHA256 fe822e0fcad6d63847c2406e3f419efe3641f31705c52f4266e696cd7cb1c72a SHA512 c84c61129335b914cbd2cf6d6895fb746e665c07fc5c395aec250d08d01a8b4933308881a37fe4de1b28a468cef3a0236e9ee246c5f7ebafac0fd4dd6290003b WHIRLPOOL 8545f1ce35540ff8912d1b8e1a9b9bfd58e1e4974161d51b72c5a675daee2e6ab3917a9098d623629112b64af7e133fd651d02cbc958d8704c4b9fb35d52acc6
+EBUILD netbeans-javacard-9999_p20150428.ebuild 4982 SHA256 d30842111139f8a831dadc65f2c2888445aa768561cdefaa116639eb293fbe8d SHA512 47bd246775219aec0be750bd85adb2998b3496f7c720cf4ffdba7f170b297aa295ec0ad601b95644abf20155e54d53b11bb2bd7efc75c6f39a23a1bbd7c5f063 WHIRLPOOL 163ade38ea94b4efe0ebed2d2d85bda86acc09233e0fb60db4d025bdb7a64aaa0afeab1fe2a89f7f1341d0137bc7a192ba3dafc223e2717c5463a764f1e0ac97
+MISC ChangeLog 164876 SHA256 4aee7cc280823072395ab099e7050f564ba6afc5a4fa53ec1bcc4579ed26ee5c SHA512 ee85b76325a1f2b8ffe114b39c8d57bc1a3b6e4d5b012311d6982704e0a0141b93be345ccf4b78ba9f0fff9ead30479fc842f93cef99f43a3f2fdb29e9b58b9b WHIRLPOOL 61d99015973178e490527a5f34e1dcddf325693935ea4aee1d2d9f155a8a4905e598a9c6fb5dae7b7a94f7bba3afd408e8d9ec68b9d274e4b5871dff2823ff6e
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150428.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150428.ebuild
new file mode 100644
index 0000000..f37f1bc
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150428.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-04-28_00-01-56/zip/netbeans-trunk-nightly-201504280001-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 20a7f63..4f22066 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_p20150428 (28 Apr 2015)
+
+  28 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javadoc-9999_p20150428.ebuild:
+  bumped to the latest sources
+
 *netbeans-javadoc-9999_p20150427 (27 Apr 2015)
 
   27 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index add91fa..c23c3fa 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201504170001-src.zip 207165961 SHA256 a30747f33bf216
 DIST netbeans-trunk-nightly-201504210001-src.zip 207178961 SHA256 b277aeba16c941024cc88c8d36a4183ff078adf054721dadc8593be14c963c0d SHA512 d421faa83f70a9ec7cb58d88290aa1104839d2b3e5f3e4582f1c2294fa2647913911eb298d625ad8a97bbf7aa2c35314a4480e20d36c0f4abb7f909c5f2c3481 WHIRLPOOL 5b2becf39729c209e27bd3cbcf0f7fe88b1829c3e898c24fc6d5c1efb4345cd17637243390886151cdba80d05cff65da6eedf7fcb9bb3fca42afb08d26ed2fa8
 DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9ebdb4fae53f4999d1bb357dad09966f36c050e52d9cf53507f6 SHA512 2a2a5dab10d0dcf6797f1a51f58af7a2f39c9c10a29f5e3f231e895e20333b434273cb69192209e400c75bde82a6d7175c0018fba94998911f4e71abf30f4119 WHIRLPOOL 7ae4e39d0a8f0e7ee249e3f8fa7aa0a77f837734e9e7dfa3b2b648c015fba99f5f0d1088474c8678cf9de0728c1ce1eb9bd6de0319369c862011531c84c1e0f5
 DIST netbeans-trunk-nightly-201504270341-src.zip 207311520 SHA256 acf9098ac80b152d852b40943cbf6ec50878ee0d089ce4bf7666aab656303127 SHA512 344f9e396f20c463801b44a264ca55ba4d05c7c51f83c650f2a6ee9d4858947962db8a7d9f0ab1e77eb921c9d974dafd7cfd8cd641005c468d7511cbfe0be57c WHIRLPOOL 8b5915c7c222f965ac8848b198be9afe4b227d5e3bd87f2c391ee06032914af414aa1ca438a92262b0921f6918fb2135513a648adac56e0dee3ba236225f9dd1
+DIST netbeans-trunk-nightly-201504280001-src.zip 207313287 SHA256 4d9e7bce832a438a5a030d15d0c65c5dd930a81e910efe56a6e98302db7c6aba SHA512 6355cc5666f6cb654bae79e37a06e4ccd4637ea1f093cd6dbdc8d99a109e61de6e644a4e9489bf67d72f27ce6797c175f948244a2d80b59e0f43fc64961b41ba WHIRLPOOL 70666a34cb2cabab59abe6fad18f85cf3cac3c6bc417ac2b0098c881625ec8292b1f2edc6a606370ead0f491be39815022978156d09c4ebd927778f1f8f9291d
 EBUILD netbeans-javadoc-7.0.1.ebuild 5814 SHA256 68531c51838c95012830f5ae09e2386ea3179c2b31bfd5191f67993e3b3dbe2f SHA512 3bfe0ecc46f371d2553b031a5699229fb874dad1e94415635558b7d46b6764c31337d03444753e687b19a7c0976c68cb72007ccc82df7d1e5848a81f241f80c3 WHIRLPOOL 6571f7a73c262b3b67407840523b79eecc14bad9678cff05fb32a2811049158400870de51bbcef97ecb3f18f8ff59f965bdca8e788918d53822b92e2f20f75f5
 EBUILD netbeans-javadoc-7.1.2.ebuild 5855 SHA256 af28efb956ac3b7147e254ca3083dfaab11b84ea42e20677ebdd18aa29ff87e0 SHA512 ee06c552782170b51cfe70d603792b4240aef6064ba0a5074f394701a43285ed1e4030f539622c616be3175dab013e791c1a3a1193ad379193f5fa3e92eefa40 WHIRLPOOL dfcc63d6c9fcf094e2998ce1c08e29b4d4acbefbe9bea6498c2e28f84576f628da50164a1e0ab3ff5528720fe54cae71f2f5e6f84aedca5b639f13053464e6c1
 EBUILD netbeans-javadoc-7.2.ebuild 5805 SHA256 20d01deae745a7e8d84ffe55ca63ad74342bd8528c0dd15a20aac6570a1a83e3 SHA512 3947f1ab3efc236b8faa14736406ee3e537bbdbe377ea1bbd4f1eafa06a36d2863f8700dc7c84e6c8501abdf130a78e87ad6a0f52c5172bf0ab52f288617bc86 WHIRLPOOL 8301cce0679ed5f68a09e2e968ab2ba0955547f438758b042a04744539324fd79d83d853dfb8b48421f6dac616362cf1a9dd2a0e0ff8763dc2e12a470d16b95f
@@ -66,5 +67,6 @@ EBUILD netbeans-javadoc-9999_p20150417.ebuild 6234 SHA256 6ce43f1cc14979b660c02a
 EBUILD netbeans-javadoc-9999_p20150421.ebuild 6234 SHA256 079767078c911cc2098a67ec1844e73598d1e54c063f03ac67f7335dcdc80e0d SHA512 8d9e3a6105753a5a6a4cb53ed59abbca3ab68cb561004c828cf5857deb16a10c7b4a62836f6dc40ca9999c78291bdd95721aaa49721a910fed75611ad9a92f67 WHIRLPOOL 7ceb9363c7c6d8d60c493254c39ba07f2154c0c9f8daca3f748d5ceab584630950060f965685573a79aa14ef6d7fe80da15009f35eb32e3c2d321cbca7768172
 EBUILD netbeans-javadoc-9999_p20150423.ebuild 6234 SHA256 f166b7057cfcd2262ab0bf9a72db99244dc6fa030f8eece5aafa78066eb91816 SHA512 fa39cb36ecb08315d85a5b59165f2ef7b9ee2ed7a819a9db478626a297bbac5427da5fdb00905a9ee8f2de813663be23dcf5c6cf1391295210d7d94af62c2ac8 WHIRLPOOL 35cd90bf7747a00c2154d1b2ff9a0d5bec6ba74734983c22ca2d9f6d2069bc4ae2e18bc2ebdcfb7e908a629c8ab751ea61dd5373c5aafe3352d8346a1102e5ba
 EBUILD netbeans-javadoc-9999_p20150427.ebuild 6234 SHA256 1798ae618bd9ff5589eccd9f5c0978602ede05ab724a562768285114f825ba64 SHA512 0ef02973fc988331ab1d2aa3db4664f87cb1fc01127922e601176a08587ce8918f1f985feff03ce8267c603d8cf4c6e5e6ce3acd1e14be321a2f9be38b561e03 WHIRLPOOL a098e2ea134981307677632f4175cdf15dfbe951682e7ca53bba86316cdc5950cd542eafd446be79c4b6544319ec2150b06422750cff5b57f9e9cdac36cd4c8f
-MISC ChangeLog 162473 SHA256 d7b846e0b3c83181a86ed2b976189a0afd2fbda44ebacafb04095abf8a52be4c SHA512 d1581ed4c612b596ce98a9582d9a0d347c7ed2cf616164e75602e08b00620b1b968cb69cf06cc0ba8b96a7bdac83d2b7fb36be6a3ece8cc4fb84aea72c4c8d96 WHIRLPOOL f5e09b3d5823a98bcb14de6cfa283683d16c7e57ada03d246e4b9df760e8c07773e5d04a6e30c85a3c63c22cf19f284358693b79e3602737a523ac1431175e65
+EBUILD netbeans-javadoc-9999_p20150428.ebuild 6234 SHA256 b16d0df9c6e745becb0ca9f6b4f2ec68fc76799ba06b7e771afcb1765f83bb46 SHA512 df497e9ee28965aefc2b4ce2c255f7a81430e2f5c875054fec37525983325c8e137d987a9dc5f37cff6e12ec7eba88767151f83e9cb5ef1046d520bc9c50c1e5 WHIRLPOOL 53787459d4bb7a04990068d71735004c289ae993fb6008cc5a5dc174544dddc099e004b379c2df9051e38d291c953cbb8df5f0cc28d7b4a3c469d1968c164ee9
+MISC ChangeLog 162648 SHA256 8dae089637b3f61c8cf5a8f53835f8d85a5cf2194b78030885002ae4040a7456 SHA512 58ddde983b723e74e12e39484a26b0f2edd9d741133ba58d497955826e576118529938e6c8a649646f5f7646222600669c00059862255fc1bfece1c9c2acde71 WHIRLPOOL ddd95d0158feb2ed8183ae4e5dde32e75b4d26dec401e332e5ef595279306c195dab3d3a7ebb57acbe573b043e1a50de37f0195d586d937f5d650b1691f42a90
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150428.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150428.ebuild
new file mode 100644
index 0000000..fb25be9
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150428.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-04-28_00-01-56/zip/netbeans-trunk-nightly-201504280001-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 96865f6..43e92c3 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_p20150428 (28 Apr 2015)
+
+  28 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javafx-9999_p20150428.ebuild:
+  bumped to the latest sources
+
 *netbeans-javafx-9999_p20150427 (27 Apr 2015)
 
   27 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index 647eb6e..2e692f3 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201504170001-src.zip 207165961 SHA256 a30747f33bf216
 DIST netbeans-trunk-nightly-201504210001-src.zip 207178961 SHA256 b277aeba16c941024cc88c8d36a4183ff078adf054721dadc8593be14c963c0d SHA512 d421faa83f70a9ec7cb58d88290aa1104839d2b3e5f3e4582f1c2294fa2647913911eb298d625ad8a97bbf7aa2c35314a4480e20d36c0f4abb7f909c5f2c3481 WHIRLPOOL 5b2becf39729c209e27bd3cbcf0f7fe88b1829c3e898c24fc6d5c1efb4345cd17637243390886151cdba80d05cff65da6eedf7fcb9bb3fca42afb08d26ed2fa8
 DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9ebdb4fae53f4999d1bb357dad09966f36c050e52d9cf53507f6 SHA512 2a2a5dab10d0dcf6797f1a51f58af7a2f39c9c10a29f5e3f231e895e20333b434273cb69192209e400c75bde82a6d7175c0018fba94998911f4e71abf30f4119 WHIRLPOOL 7ae4e39d0a8f0e7ee249e3f8fa7aa0a77f837734e9e7dfa3b2b648c015fba99f5f0d1088474c8678cf9de0728c1ce1eb9bd6de0319369c862011531c84c1e0f5
 DIST netbeans-trunk-nightly-201504270341-src.zip 207311520 SHA256 acf9098ac80b152d852b40943cbf6ec50878ee0d089ce4bf7666aab656303127 SHA512 344f9e396f20c463801b44a264ca55ba4d05c7c51f83c650f2a6ee9d4858947962db8a7d9f0ab1e77eb921c9d974dafd7cfd8cd641005c468d7511cbfe0be57c WHIRLPOOL 8b5915c7c222f965ac8848b198be9afe4b227d5e3bd87f2c391ee06032914af414aa1ca438a92262b0921f6918fb2135513a648adac56e0dee3ba236225f9dd1
+DIST netbeans-trunk-nightly-201504280001-src.zip 207313287 SHA256 4d9e7bce832a438a5a030d15d0c65c5dd930a81e910efe56a6e98302db7c6aba SHA512 6355cc5666f6cb654bae79e37a06e4ccd4637ea1f093cd6dbdc8d99a109e61de6e644a4e9489bf67d72f27ce6797c175f948244a2d80b59e0f43fc64961b41ba WHIRLPOOL 70666a34cb2cabab59abe6fad18f85cf3cac3c6bc417ac2b0098c881625ec8292b1f2edc6a606370ead0f491be39815022978156d09c4ebd927778f1f8f9291d
 EBUILD netbeans-javafx-7.1.2.ebuild 3593 SHA256 76a29b37765000745794e6ae20c6b8528d8637507a257ffef3bef2ce648f05cc SHA512 a04618bda036e6652c7208f90a4dd91e07e75b85243580263f6ec846425ab907a87c318117990d4e8d9044bcd7a0ca8b63bc32bdd0d84e5373a10e67a77b79c0 WHIRLPOOL 11acad585f7315ae6b4edd53c764167567a948cb0e2037d95f2f4de34765909b71d095540c054f4cef3ba70224d294b42720536566e445cbdd06ebf2ad903841
 EBUILD netbeans-javafx-7.2.ebuild 3576 SHA256 3441b901a5074013351bc6c7ba6c424455e2affe52e448f2cfac0058c82345e2 SHA512 ee384d6e4ac767ade82b5d337d7a1c5d2b463c15a7596d91e1a850b37349f88d7867a0ffa11a118c48e2ed463f38dcfa791ec42b3fe85ea1e6bf7c4b27f9b073 WHIRLPOOL 15c7d20f2caa39c6cfcba2f846736754b049483f135ac90ced399672932a6a73467f0b4016550c3b2d8583be20d1467486f5652111893ec16111095a3e9c941c
 EBUILD netbeans-javafx-7.3.ebuild 4476 SHA256 9f268a852d45f37f9d22c3bb58d36be17f438e4b4cb5105d88ac4404731facb3 SHA512 3fa0e48e949d0df0a4404c04379623529f73ff15259f4164fddd10afb9faa046ceed16aac1a7b14728af89bf3a4ed7037638fb7e7e932a64cc71e84f7ecaa44a WHIRLPOOL 0395ca679fa41610c61dceb6ac018d7a76b62c08ca740de2fa2d98523f8e5f840a2d0a8c357b674d171841f93d980b536a671a1f12b5261d402c03b691ac6504
@@ -65,5 +66,6 @@ EBUILD netbeans-javafx-9999_p20150417.ebuild 4723 SHA256 3a368542bce30f542a38833
 EBUILD netbeans-javafx-9999_p20150421.ebuild 4723 SHA256 0d37ad047a7e40f954001bfe274c10ea812fc7376265a270d5770f2b12d153aa SHA512 abffa36d38e534ab214e1e3b6fd5dfcc58584dc8c1a28c98cbb0501bbfa6234405cf2c9b815fb1746e66d1ebde78be3a3f29efdc4e75b1fcce1aac7762230ca6 WHIRLPOOL 8320bf8436d4bc47a5802a9f6456d605c858170dc8492a86a08edd806ee48eab3d740d945d73891f3689874aa74d5115a7593251384a11f12fc054241938bdda
 EBUILD netbeans-javafx-9999_p20150423.ebuild 4723 SHA256 0454454b4ed0bd6b0d990cbc8aec15535fc17d9e2ef103015c7608027590b784 SHA512 134045bedbe4081472e1ec9bc26641877fcd544cce2f4d287796fa693abb765befb97db03460b14c9ca7017699e362da71a3dd8605777763e58ffd6c33b5d4bb WHIRLPOOL a718f9de62662f780de1cc4e4d751f4c41173c416a232d243eb0c9d8bd62175623b353d67b4fecfff60e097a6ff2115107d0e209002e9c5a1dbf9cbba157c1b3
 EBUILD netbeans-javafx-9999_p20150427.ebuild 4723 SHA256 247ef1f1954182d036b90ccf659598f991deebeee281942a2edfba4f029134d5 SHA512 c979e5febafae784ed51a89f9ddc880cf6a5717514df6e4b4666a063278b5a925a381a4781172fd5b8e900c52a7b85c77b5961609ae9ea025d1311b011a26608 WHIRLPOOL 4e4eaa130d4ca62e252c8fe5aa92b933afef468e75c46956cc6f1a48475246f83edefca9a8db76e4d5970c0a262637859b2cd44b26c209efad97db6a59af6ac8
-MISC ChangeLog 147114 SHA256 e3ce98f9b10cc5e636a544b0b1941050a32102c85283d2b2fc97ddb94e309429 SHA512 51465ccebeda1f6bc1d86d557e89f85b352058dd9fa0ea63e70a1af3bed7c6b9b64835e8873e65b8387a601f6e2b9331fac457396975d20b232edabb56c30344 WHIRLPOOL b50efeeb1f3d2c3adf5405a95ec703811210d777a72c48862440600430685f21ef1f8730a1e304f789441c2dac65295da122c1a58a0ca9cac8322b0fb2c5fa5a
+EBUILD netbeans-javafx-9999_p20150428.ebuild 4723 SHA256 d9e4637df5ffd9a178549eeabba579a9e74fd047ff123cb0511a5203c54aaab1 SHA512 83e1232fb99b3fc1f6ea0ae2feb587db74ad52b0e946dcf6942d83f0cc2db4166121b14346985c48930369a14ab8896f3ddc53eec953c07edccb10460881eb81 WHIRLPOOL db2eb7e7d046481b0fb5b7971feb3f1eab3f4dfefdb424a50a07ce213f79ace93c786668fb20476c607a62488e0c0e965635d6910e3de86c7c9d3b3bd82c85f7
+MISC ChangeLog 147287 SHA256 6839e67b2da6620151400f2562ba7b2e1fa025ed7d2a58465a940ad984811634 SHA512 24f430b138aa8d14a9e93bc07eb97ee3e1e15d94eda833708cb418350d745a856e29d655b1a9e6afc834a58f7957fb31960f6b484beb93c918306a93050846ce WHIRLPOOL 02c71f2ffd7391657d48f0971050614d05e3139d797a77b832e05c39c881c5a528229d0c587398a16fad9124e7761d4fc3598d11f2335d0585a6548c770e14cb
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150428.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150428.ebuild
new file mode 100644
index 0000000..8c52d39
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150428.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-04-28_00-01-56/zip/netbeans-trunk-nightly-201504280001-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 fe7caa2..e27ec17 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_p20150428 (28 Apr 2015)
+
+  28 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-mobility-9999_p20150428.ebuild:
+  bumped to the latest sources
+
 *netbeans-mobility-9999_p20150427 (27 Apr 2015)
 
   27 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index cd141e6..67226cb 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -42,6 +42,7 @@ DIST netbeans-trunk-nightly-201504170001-src.zip 207165961 SHA256 a30747f33bf216
 DIST netbeans-trunk-nightly-201504210001-src.zip 207178961 SHA256 b277aeba16c941024cc88c8d36a4183ff078adf054721dadc8593be14c963c0d SHA512 d421faa83f70a9ec7cb58d88290aa1104839d2b3e5f3e4582f1c2294fa2647913911eb298d625ad8a97bbf7aa2c35314a4480e20d36c0f4abb7f909c5f2c3481 WHIRLPOOL 5b2becf39729c209e27bd3cbcf0f7fe88b1829c3e898c24fc6d5c1efb4345cd17637243390886151cdba80d05cff65da6eedf7fcb9bb3fca42afb08d26ed2fa8
 DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9ebdb4fae53f4999d1bb357dad09966f36c050e52d9cf53507f6 SHA512 2a2a5dab10d0dcf6797f1a51f58af7a2f39c9c10a29f5e3f231e895e20333b434273cb69192209e400c75bde82a6d7175c0018fba94998911f4e71abf30f4119 WHIRLPOOL 7ae4e39d0a8f0e7ee249e3f8fa7aa0a77f837734e9e7dfa3b2b648c015fba99f5f0d1088474c8678cf9de0728c1ce1eb9bd6de0319369c862011531c84c1e0f5
 DIST netbeans-trunk-nightly-201504270341-src.zip 207311520 SHA256 acf9098ac80b152d852b40943cbf6ec50878ee0d089ce4bf7666aab656303127 SHA512 344f9e396f20c463801b44a264ca55ba4d05c7c51f83c650f2a6ee9d4858947962db8a7d9f0ab1e77eb921c9d974dafd7cfd8cd641005c468d7511cbfe0be57c WHIRLPOOL 8b5915c7c222f965ac8848b198be9afe4b227d5e3bd87f2c391ee06032914af414aa1ca438a92262b0921f6918fb2135513a648adac56e0dee3ba236225f9dd1
+DIST netbeans-trunk-nightly-201504280001-src.zip 207313287 SHA256 4d9e7bce832a438a5a030d15d0c65c5dd930a81e910efe56a6e98302db7c6aba SHA512 6355cc5666f6cb654bae79e37a06e4ccd4637ea1f093cd6dbdc8d99a109e61de6e644a4e9489bf67d72f27ce6797c175f948244a2d80b59e0f43fc64961b41ba WHIRLPOOL 70666a34cb2cabab59abe6fad18f85cf3cac3c6bc417ac2b0098c881625ec8292b1f2edc6a606370ead0f491be39815022978156d09c4ebd927778f1f8f9291d
 EBUILD netbeans-mobility-7.0.1.ebuild 8655 SHA256 992e214ff2926e2f0db623d96b717bf8f8e4ceb47e96e69b3c6b8f67d6a8d130 SHA512 d51bc003f4b637cfe71c9f49a96427e535596542ac195a9621bc4f92c04a6f720a87fac6eb267732f869ba105f263d9d36f848b54a89c734b6a68a78ed323808 WHIRLPOOL 515da7153b12c3b5779cfad16e3800b4d26ba4b174027d9a7b06a26754fad065751c7eda137ba6199315d024a322d59e7ea39a1b2f4244ea75b30770ac505791
 EBUILD netbeans-mobility-7.1.2.ebuild 7543 SHA256 bb3f1245ad68133798fa507f06dd1ffbc1d55f6ba38f4cccc29ff0240e5b5f22 SHA512 41f663977a0716c5449db597d5f90054717ff3579a9137a910d1943d3e0b39379c34c0d9aa9c98d231037a042074c8ecf5fc62c018cd7cd5e8680734ff854c51 WHIRLPOOL c3c6feb41ce3df356f617ca80530673ac653cdf50da0aead00518854d0850d6420333529aa6591e15ddd4053249191fcb47100c5f39a804352722e54f802bae4
 EBUILD netbeans-mobility-7.2.ebuild 6571 SHA256 58af97ca9a6adc56fa6abe91777a1ac35a3a9b7d68af1e73c23a45dc5631abb2 SHA512 ac42c3a3daa7d55c9c13d1c99dd6880d5d99741f80cfceb683da27e30c70d6228d9434571f2405d0dbbf27d2203e3f877da6347794b07b98331edd1631d3a69d WHIRLPOOL 5a6af3cbcd08180dcdf708a038f3119faacb9c78532b4bb1945c7260fb0a8232af57745e41a73311fafffe185c969e0c88ac34970caab7708313f53417695374
@@ -69,5 +70,6 @@ EBUILD netbeans-mobility-9999_p20150417.ebuild 4418 SHA256 a9c8a5b4b3bbb2992e93b
 EBUILD netbeans-mobility-9999_p20150421.ebuild 4418 SHA256 13aa9acf107dbd5eea12f6a656f80b383f79ab0b4de73e237739aa5d746b008a SHA512 04bc05fd045d3c4bb2d00968cd78979fb2bec4fcb42e310412b8fe75b08c62b8116809fd476cf2e90e0d88cf77831dcee6552b3253bf0ef8b02050e1fefefd84 WHIRLPOOL 2291d2d97a880c65fb6903a9d6ca9cee8a8362f6146b2bed7098974660d331fb0eb9a0c79c58e8cd25aad2b4708e0d3f6aafb6e75ad36865ccf7a69b46bcfc67
 EBUILD netbeans-mobility-9999_p20150423.ebuild 4418 SHA256 4e12acf22c14b142cb3ddc9d14f6046f2f0d00d3840789e6d637634961974bc9 SHA512 dfb3c104f00a9fdbb8290994164831272416eb185eb2a2c2df3ece7137e0ae1aace5c53f168f077f9e655d086bd2f58b47c1fef5c59a9062b735a74a040bfbcf WHIRLPOOL 94ca1ea65a53067aa6b2eb6bb6998badaa0f4f85f43828deaabcb70c712266ccd8f3f181ea3588a199173fb73c342ae25af5848ecc7615308a967d53181ccccf
 EBUILD netbeans-mobility-9999_p20150427.ebuild 4418 SHA256 056c28e3a1d12e7fa79b47c5e396a62a077f9030d49195821554290620432aaf SHA512 180dfe0ebdfee1ba4d20f96e330b69f5431ca4c384514bb77697dd90140464fc7d214ee3fa3cbd7c19f583813071cabf708eaa459d490c148aa2951418dfc2b2 WHIRLPOOL dd49d8f7a49679b662212834ce724f8c78956a0956c2ad5c1adffaa6eaff30bd59f4d392873d6920e8f8ed5b7863a97d2c7311605278a64b7e30f7e7c237569e
-MISC ChangeLog 164840 SHA256 ec5ac17f009a13a0186d5063fb26d45a5f054d607e697b50d4cbfc032fb6cd4d SHA512 060f8c063d36403defc0504cbd36358bc2f256690babd094c44e48849889bb47270291ce22e17284189434a88af0e9de079259753fd2a3b39776ceebd98b6359 WHIRLPOOL b0ca4727969f3ba14019a5a7fc6724d323f63c592044b0a3a0b87f9a0d8ad756729f430455ff88706d50f9a6601951bd1ae9d5b31a6182ed9f8a22b42e4042e3
+EBUILD netbeans-mobility-9999_p20150428.ebuild 4418 SHA256 8fe440192867e6d9d40d94c27d118c62b624d53f7d1e125b0f6e0ec6b64354b4 SHA512 d8961460885407ff7e3afa3c7c57cf60769a7cbb941fc3c704534cbc77534a48e7c2904adc93fda689b653163f4140dd7706384800d8af8b90cd87032986c0f2 WHIRLPOOL e4c9c40748930018e9522a4c5993ae857d6eae9c621f938815b20b58d3e77e95555c75fe3e2167aa69bd829a32caac6fb6df245c54dfefc80ef733dc593d1f23
+MISC ChangeLog 165017 SHA256 f469ba5a792b227843e6a5cc7cbfd4e7f34648836c644f60e257805076d1980a SHA512 0a69441caa825443627c1ac10fdd47c2820eb77923644ed5f3fe54e9ad583fb40e107028cc120a1b968a30b1f87ac45a2fed9783565af88620be0694c7668823 WHIRLPOOL 17b97f981f47e2dfd15bcbdaea3662589f12cd7ed48ecb0015a3fdfca965f63b444dca66c6015abf96b70e24dc279d54da6a768feb0c431faa00b900a2649db6
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150428.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150428.ebuild
new file mode 100644
index 0000000..674f59e
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150428.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-04-28_00-01-56/zip/netbeans-trunk-nightly-201504280001-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 069d7a7..030a204 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_p20150428 (28 Apr 2015)
+
+  28 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-nb-9999_p20150428.ebuild:
+  bumped to the latest sources
+
 *netbeans-nb-9999_p20150427 (27 Apr 2015)
 
   27 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index e0c4cd0..c68dcf2 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -41,6 +41,7 @@ DIST netbeans-trunk-nightly-201504170001-src.zip 207165961 SHA256 a30747f33bf216
 DIST netbeans-trunk-nightly-201504210001-src.zip 207178961 SHA256 b277aeba16c941024cc88c8d36a4183ff078adf054721dadc8593be14c963c0d SHA512 d421faa83f70a9ec7cb58d88290aa1104839d2b3e5f3e4582f1c2294fa2647913911eb298d625ad8a97bbf7aa2c35314a4480e20d36c0f4abb7f909c5f2c3481 WHIRLPOOL 5b2becf39729c209e27bd3cbcf0f7fe88b1829c3e898c24fc6d5c1efb4345cd17637243390886151cdba80d05cff65da6eedf7fcb9bb3fca42afb08d26ed2fa8
 DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9ebdb4fae53f4999d1bb357dad09966f36c050e52d9cf53507f6 SHA512 2a2a5dab10d0dcf6797f1a51f58af7a2f39c9c10a29f5e3f231e895e20333b434273cb69192209e400c75bde82a6d7175c0018fba94998911f4e71abf30f4119 WHIRLPOOL 7ae4e39d0a8f0e7ee249e3f8fa7aa0a77f837734e9e7dfa3b2b648c015fba99f5f0d1088474c8678cf9de0728c1ce1eb9bd6de0319369c862011531c84c1e0f5
 DIST netbeans-trunk-nightly-201504270341-src.zip 207311520 SHA256 acf9098ac80b152d852b40943cbf6ec50878ee0d089ce4bf7666aab656303127 SHA512 344f9e396f20c463801b44a264ca55ba4d05c7c51f83c650f2a6ee9d4858947962db8a7d9f0ab1e77eb921c9d974dafd7cfd8cd641005c468d7511cbfe0be57c WHIRLPOOL 8b5915c7c222f965ac8848b198be9afe4b227d5e3bd87f2c391ee06032914af414aa1ca438a92262b0921f6918fb2135513a648adac56e0dee3ba236225f9dd1
+DIST netbeans-trunk-nightly-201504280001-src.zip 207313287 SHA256 4d9e7bce832a438a5a030d15d0c65c5dd930a81e910efe56a6e98302db7c6aba SHA512 6355cc5666f6cb654bae79e37a06e4ccd4637ea1f093cd6dbdc8d99a109e61de6e644a4e9489bf67d72f27ce6797c175f948244a2d80b59e0f43fc64961b41ba WHIRLPOOL 70666a34cb2cabab59abe6fad18f85cf3cac3c6bc417ac2b0098c881625ec8292b1f2edc6a606370ead0f491be39815022978156d09c4ebd927778f1f8f9291d
 EBUILD netbeans-nb-7.0.1.ebuild 5106 SHA256 3c68751bf5face5f80e2d7dcedb7466e69343f2d06c0a4dd30a722a987fbb207 SHA512 d79343e0ca8655b074a8f96b9898e4bc0123d60e346602ba8d7a239597993cadb33a036b43862ef1a39630e4f0ba7e79892d8b2eed8b30535f12a5d0b9f4b581 WHIRLPOOL 9f2cd645e34fbcfa8f0059fbda4f355f411aaff7966121360dfe5b3c769966c5a4586bbc04142b279e3a3fa323bc4b51a6349cf3eafe89063db44fcae58ef119
 EBUILD netbeans-nb-7.1.2.ebuild 4977 SHA256 265f9e4a9490937a65632ddaef48e3a731154b07b9ee5f9536a991181fc2fcbd SHA512 65d1065993dba3b1fece428beb1b75f17d89eddb08aacd2cbf5ecd3ee5ca844e75e9100c324ecdeeed5b138b1da4ab8cd5a4598e584a17545ffc2c52ea763779 WHIRLPOOL 9b63f2b5671bd38d24ff6b280de37fc19c74170bf80c22818da5e8af415a85211c6cfcf690e68d7697c41a1b749a3c7b48ec9b362782df140856f892d381e360
 EBUILD netbeans-nb-7.2.ebuild 4960 SHA256 bef2020a6e0d722ca77c0931b9a06014cedc822f14a21d8d916200e358dcdfb8 SHA512 988d902bbef52e123b5800e56049210d69c4dd6dbeca80396aeac58c70d90b76da65b338e664368ea3f9a3973b7b94ffd0a47a77b01be53452c2cc04c4067442 WHIRLPOOL a27fa8a1a066499a3fc2cb82e955b6b18b1725889b088ea1e94528cde3ec58f3b46c1e757fa597af6ad4ba96218dacfacff9561799f46add316e233d46127d28
@@ -68,5 +69,6 @@ EBUILD netbeans-nb-9999_p20150417.ebuild 5003 SHA256 928e26af64f731d12b686606533
 EBUILD netbeans-nb-9999_p20150421.ebuild 5003 SHA256 bf40f1a0d120b6e613800bd9d4a201275ca7a7b14a106933abf6718123e4e70d SHA512 44ec2ed13eeb90bb4cadd3bbd5f8dc550800c03b34ac976ba7295a3da92dd0f4a965a90aae77f108b0d4b9f86b3b3e88cf2899b11ca52e05341a57c456a64c03 WHIRLPOOL 89d97210ccac3633d25a1110b30a3678c40f0d5a1fbbf6c9242ac18290db96c1765e92f9d474322ae901e8b5712f2af329463e3828762d79d2837e2b639f1fec
 EBUILD netbeans-nb-9999_p20150423.ebuild 5003 SHA256 f19f2c6d6e80b7967f9fe1c00900d2da84b9a9677a7da89b42a3f223c53fe7c7 SHA512 4cbdda0402cbc8fb152b27cf7bd618b0b4cceb129ed1e58723b3c4a06a63fc82c20a4056cca7dabe4af544f52984c84b15f83bc48ce0b2ec82af0420705b52fe WHIRLPOOL 999fd12a494dd6612864bb4abba78182f3fd6b06c6b587b187ca8b1dfe1c6fdfcce8c327328ea9d94cfffb31b01a44012127e3320e894ba72a3a5b3478d5e2dd
 EBUILD netbeans-nb-9999_p20150427.ebuild 5003 SHA256 dec42363921719f2115fcf18f0c59967972efa9abea4a1a2c40f9eb727e7ef6a SHA512 21fde58278ef9be8656605d77e807bcb23b7efe7af1188d34c0e6760afc0a770e14c0999e12e4bec9efa673c7f6d6a0ee9cbc3bedd4bf4a6cb88b2193955362f WHIRLPOOL 30cd1532af638506afa4cf67d9a91eaa19385939a8330fcffdbd5567d8223e4f13a551124f68521da11f3a8f06b93f1a42b54f63ca1731c2da20727676764ff5
-MISC ChangeLog 154038 SHA256 000a412904756185701bea260d127650fe30fb1e4c89940f55a446955a6142d1 SHA512 ef59ee65ca549933335c5843c4d4ce009f4fc35f7e186943a6b926fedae565c2d3b59997525ee12953db3b0ac18a78bfea40fa2b8415bd92f1efadffdd79e76c WHIRLPOOL 1d8974ddfe352f4cc6fe091456882d0a15536c13e9257d7be3ce85d9b41aa78c0ecb851e337a5f0f11569b1a223d0080c5f2db9a3ed5d4aab08ff22b7274ba5c
+EBUILD netbeans-nb-9999_p20150428.ebuild 5003 SHA256 2d20c00dc017fdae44e9b1d9fb2b6d70ba99c109436a5b18e1987e5ad26d0fed SHA512 6ca17e46cd1a362c974cff9c44f889dc95657ee407b9f61b4711b4ed8a0f22117cbcc023bd54bfeaf50041f7b6e9511462dedc9640c0887ec16a011b3239b2b1 WHIRLPOOL ad958f705accdd6288d7c67db119c048eebf54ba39af9e85dd672a52d68e18e424e78e11d8bfc7a47011d4bbe7222b8acb2c5a9df8c48017e6754dfda182dbe3
+MISC ChangeLog 154203 SHA256 b731e2f529ff061224217060a4aedc9e210d2221e89a803569c8078c0a593f59 SHA512 e3449c5be8b369545065d43e8aa144c726377a627d5edf9b31c22d8f45fb4577fe6b6743e58173868304a83d2954d87274d9a6723e3b7323f2eb90e83d482488 WHIRLPOOL 7943ca545d26db03f82be15a2a2c76cb83d7a6c0d46adb27fe3c712ea2142ebef4500d15d02349e82e20303a652e45072453dd9a24354d98770fe66df9b617b8
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20150428.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20150428.ebuild
new file mode 100644
index 0000000..0b9c351
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20150428.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-04-28_00-01-56/zip/netbeans-trunk-nightly-201504280001-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 f1ad3fe..5f7b1fa 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_p20150428 (28 Apr 2015)
+
+  28 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-php-9999_p20150428.ebuild:
+  bumped to the latest sources
+
 *netbeans-php-9999_p20150427 (27 Apr 2015)
 
   27 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index b59b858..92ce50d 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -44,6 +44,7 @@ DIST netbeans-trunk-nightly-201504170001-src.zip 207165961 SHA256 a30747f33bf216
 DIST netbeans-trunk-nightly-201504210001-src.zip 207178961 SHA256 b277aeba16c941024cc88c8d36a4183ff078adf054721dadc8593be14c963c0d SHA512 d421faa83f70a9ec7cb58d88290aa1104839d2b3e5f3e4582f1c2294fa2647913911eb298d625ad8a97bbf7aa2c35314a4480e20d36c0f4abb7f909c5f2c3481 WHIRLPOOL 5b2becf39729c209e27bd3cbcf0f7fe88b1829c3e898c24fc6d5c1efb4345cd17637243390886151cdba80d05cff65da6eedf7fcb9bb3fca42afb08d26ed2fa8
 DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9ebdb4fae53f4999d1bb357dad09966f36c050e52d9cf53507f6 SHA512 2a2a5dab10d0dcf6797f1a51f58af7a2f39c9c10a29f5e3f231e895e20333b434273cb69192209e400c75bde82a6d7175c0018fba94998911f4e71abf30f4119 WHIRLPOOL 7ae4e39d0a8f0e7ee249e3f8fa7aa0a77f837734e9e7dfa3b2b648c015fba99f5f0d1088474c8678cf9de0728c1ce1eb9bd6de0319369c862011531c84c1e0f5
 DIST netbeans-trunk-nightly-201504270341-src.zip 207311520 SHA256 acf9098ac80b152d852b40943cbf6ec50878ee0d089ce4bf7666aab656303127 SHA512 344f9e396f20c463801b44a264ca55ba4d05c7c51f83c650f2a6ee9d4858947962db8a7d9f0ab1e77eb921c9d974dafd7cfd8cd641005c468d7511cbfe0be57c WHIRLPOOL 8b5915c7c222f965ac8848b198be9afe4b227d5e3bd87f2c391ee06032914af414aa1ca438a92262b0921f6918fb2135513a648adac56e0dee3ba236225f9dd1
+DIST netbeans-trunk-nightly-201504280001-src.zip 207313287 SHA256 4d9e7bce832a438a5a030d15d0c65c5dd930a81e910efe56a6e98302db7c6aba SHA512 6355cc5666f6cb654bae79e37a06e4ccd4637ea1f093cd6dbdc8d99a109e61de6e644a4e9489bf67d72f27ce6797c175f948244a2d80b59e0f43fc64961b41ba WHIRLPOOL 70666a34cb2cabab59abe6fad18f85cf3cac3c6bc417ac2b0098c881625ec8292b1f2edc6a606370ead0f491be39815022978156d09c4ebd927778f1f8f9291d
 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
@@ -71,5 +72,6 @@ EBUILD netbeans-php-9999_p20150417.ebuild 4423 SHA256 b40d0a2ece1f8424b3794b3a07
 EBUILD netbeans-php-9999_p20150421.ebuild 4423 SHA256 bfa7b69c5d065c2efdd80d319a3a35aa7c2c154c4feb33667dbc8e4fbb4b498a SHA512 f701317c5380a3994ab5a5ba91b70d21cf5975dc6d33e52e7178e97fd455730ba4ea11037ef9418c1db09a14615b59431052f41b13ddb0ade38c994c0ac0f665 WHIRLPOOL 195de15aa35c4e014dd683508ae3803e542626ef78f8940aaaaa6afd005ebe2711d16f4cc415fbaa463fcb685b99a8eb27a1e09c5ecb189d8fd88c741fc39db2
 EBUILD netbeans-php-9999_p20150423.ebuild 4423 SHA256 854bcc4abeb870e9f7541903cc540214244e03821e7acacea2b6766bd6970821 SHA512 ee4675752e73b0b9971155275b28244f49af7175c540d1679738180bbc33c068273b83ff6708ed2536b54a4652cfa3072cfaa159c6f88c1fcede4e15c783d7c5 WHIRLPOOL c2e3a56e6fa66b27fbfa473a1f48772426ab7b21caa0b965cc1ef60a627a0cb39a31f8f404eeb1c52ab1d3ab006407f02f80c389e95a3569336a336b228c81a6
 EBUILD netbeans-php-9999_p20150427.ebuild 4423 SHA256 f0f83722f41e72c491f29f6cd3504b356e97f3155415ddca6c2111bdbcb63ad2 SHA512 b096bc10e4e7c385a4dbb54c09c4f8a3cedf020e37e526cd00ebfb1c902cb3f746d86bc4f8d91dd29912eea88eb98712413da7da8915effba4808da31750f98d WHIRLPOOL 873537e236101f23b6c712f174b6c8ee549c9e7a21174d6770e7339f1df23ab46de54d7316f6a6613c21cf9a671f5f9016eb26e1b4506912ebe5d88a54e0510d
-MISC ChangeLog 153722 SHA256 e6d49cf8444bf13a8bc73700902e8e1c5a8050ae3dd44f12d16e6fa3174c7cf3 SHA512 0275eca10f908592f830901a90f1e3a774cbe57a17d9983fe8454a3ab79900c04ba953a6046650b441586c5fc0f03502393a190a8789e6f41cce2e9d5a297210 WHIRLPOOL 731bce8eb987f0fcdaac81719897488f1052fa7e338c431a1c4fac7240a78203eed5e13dce9839b471d1c5ed386445a2d0956bcc38334041a0a6c083a21a15da
+EBUILD netbeans-php-9999_p20150428.ebuild 4423 SHA256 b1c6474cf4b7d80ee8e28847a06127051bf270ca43ae7399a1a004638b93c571 SHA512 f546c502f71cacf5f996a6dc3cdd7a3f4ce68f9102ee548fcd8505237b7fe7d5dcc9cbcfa425b036b4140b1c83a89f0e338d0791a978b053661c9bdb4b3afaf4 WHIRLPOOL 72465b71cda3e33c16112cf610aaeed08a18c20002ff1d589676b570fb3f684b7635b0a1a547e5ed55f81ac2956f11357adc1a2a23d59f5d0d6fd0f0f9400ca1
+MISC ChangeLog 153889 SHA256 f8aca7542b658c1cd358f778d32a4947f854095cf3302ffc32df2978e7dedbca SHA512 ce012feebce7609450fedfce128c44c532746b360a3906240dfe5ed44cc3a3d42c41aa09c15f15e21facff909796914b7a2bec08be86ca09f7ec9f87614b0429 WHIRLPOOL 7696c90cad88aaec96eb3b9f8a70467599c736ef4fbddcd0cbb09459cf812e8217218f6bf5d6f58e68147cb1605578ca2be84dd98a51d4198bde81e455778aa7
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20150428.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20150428.ebuild
new file mode 100644
index 0000000..41d6287
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20150428.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-04-28_00-01-56/zip/netbeans-trunk-nightly-201504280001-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/BFB982F9B33E2F1A1766C212C8208793F9B7E77C-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}"/BFB982F9B33E2F1A1766C212C8208793F9B7E77C-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 53866db..e7b3402 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_p20150428 (28 Apr 2015)
+
+  28 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-platform-9999_p20150428.ebuild:
+  bumped to the latest sources
+
 *netbeans-platform-9999_p20150427 (27 Apr 2015)
 
   27 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index f198c26..d2a6ca1 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -60,6 +60,7 @@ DIST netbeans-trunk-nightly-201504170001-src.zip 207165961 SHA256 a30747f33bf216
 DIST netbeans-trunk-nightly-201504210001-src.zip 207178961 SHA256 b277aeba16c941024cc88c8d36a4183ff078adf054721dadc8593be14c963c0d SHA512 d421faa83f70a9ec7cb58d88290aa1104839d2b3e5f3e4582f1c2294fa2647913911eb298d625ad8a97bbf7aa2c35314a4480e20d36c0f4abb7f909c5f2c3481 WHIRLPOOL 5b2becf39729c209e27bd3cbcf0f7fe88b1829c3e898c24fc6d5c1efb4345cd17637243390886151cdba80d05cff65da6eedf7fcb9bb3fca42afb08d26ed2fa8
 DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9ebdb4fae53f4999d1bb357dad09966f36c050e52d9cf53507f6 SHA512 2a2a5dab10d0dcf6797f1a51f58af7a2f39c9c10a29f5e3f231e895e20333b434273cb69192209e400c75bde82a6d7175c0018fba94998911f4e71abf30f4119 WHIRLPOOL 7ae4e39d0a8f0e7ee249e3f8fa7aa0a77f837734e9e7dfa3b2b648c015fba99f5f0d1088474c8678cf9de0728c1ce1eb9bd6de0319369c862011531c84c1e0f5
 DIST netbeans-trunk-nightly-201504270341-src.zip 207311520 SHA256 acf9098ac80b152d852b40943cbf6ec50878ee0d089ce4bf7666aab656303127 SHA512 344f9e396f20c463801b44a264ca55ba4d05c7c51f83c650f2a6ee9d4858947962db8a7d9f0ab1e77eb921c9d974dafd7cfd8cd641005c468d7511cbfe0be57c WHIRLPOOL 8b5915c7c222f965ac8848b198be9afe4b227d5e3bd87f2c391ee06032914af414aa1ca438a92262b0921f6918fb2135513a648adac56e0dee3ba236225f9dd1
+DIST netbeans-trunk-nightly-201504280001-src.zip 207313287 SHA256 4d9e7bce832a438a5a030d15d0c65c5dd930a81e910efe56a6e98302db7c6aba SHA512 6355cc5666f6cb654bae79e37a06e4ccd4637ea1f093cd6dbdc8d99a109e61de6e644a4e9489bf67d72f27ce6797c175f948244a2d80b59e0f43fc64961b41ba WHIRLPOOL 70666a34cb2cabab59abe6fad18f85cf3cac3c6bc417ac2b0098c881625ec8292b1f2edc6a606370ead0f491be39815022978156d09c4ebd927778f1f8f9291d
 EBUILD netbeans-platform-7.0.1.ebuild 5049 SHA256 b67cf0867358fea808614c02b8b6ea2ab88223f8642175ac3f91dc8c610aca4e SHA512 611b8e831a95d1b4e1c3a1f5e4904c84f9606298a94eb0900ac06cc88670849d218a3a03cce07b2463e206da01ce2931cdb6677948d20d8326908a36851589e6 WHIRLPOOL 01769eca4eb20c2702a432a6180eed16a9a50687016e307e585ab5de5cab8b3b664e456d489ff15d9f5af349f791b161eecb9fef7bfaba09a70e1eaab5d545a0
 EBUILD netbeans-platform-7.1.2.ebuild 5034 SHA256 a069e7e45f768e590e5b30fdda26185d8fde492355e4c530ce44169def991cc6 SHA512 31cfb0d9f13eacfcafd49be995bc456d17a689776e032f68ed4585e068a49f6e992c37c57f23c5e27176fb060996bcfc86b0446ae26efbc488909102fc10c979 WHIRLPOOL 1bd35ac39366fd13192e4a6a177280727bceb2f5f12ff684a288725954a29a240f2d264c3ef2ca38fa3e133063cdd943cce1d0f493f0f8ea9a621833c8f0031b
 EBUILD netbeans-platform-7.2.ebuild 5432 SHA256 227add7f41117667d8487f2bf8eb846c21529e7b2c49dac46e4b3b33062f69b0 SHA512 e49958f21358fe9689336d5cd5edbe435d0a2fd12c315174dcb408bf6ed4e6515d39d458554fb576c342a43f0af50c327bada8fa0b2eb485e14c01ddcdb6248d WHIRLPOOL 4f9101a2d5495fb6002b7791822f85091309c04d6c475060c116725f8da32f9ed270f0c27a9f6a2bd2aa0bd7417b18e9165d1feff7e98f6205bdafff3223e5a3
@@ -87,5 +88,6 @@ EBUILD netbeans-platform-9999_p20150417.ebuild 8293 SHA256 a80d37afb86dfd29c47ff
 EBUILD netbeans-platform-9999_p20150421.ebuild 8293 SHA256 c105494e3e301bdd8c1c8308c85b10ce70877196cddc072bd64f77da07e132f7 SHA512 324ba652b8c61270ff98ba5d36202b4988107097afb9c072cf5d881587229927b19facc24b5a1a9ae2c59d7b5e3eee67c32525d8b7074b3b22bf0da81b4db099 WHIRLPOOL d829e13dad887dc8ddfba5dfe09c612f3593514d4f0c04b1153abba453dbd19710d46292fa992ea6370d6423c057f93d4b1a3f4f5ad8649a0e0173d5eed83f72
 EBUILD netbeans-platform-9999_p20150423.ebuild 9652 SHA256 ca973ab7c88079bd9a3e3c81229569f5e7e16fa503805b9e6ee72b99af31c0af SHA512 659bae8fe33ef47daff830517b808135ed2f984efeb186d603f13f62ceee9f4b63f0d032ab5dae007d198f9c281ebaafeeb6e04adcd351e99182ce12554d3598 WHIRLPOOL 06a0ac403e2a2d91660661a32d185728c9c059306b1ad7b5d729835282d39463b2b85a23dad29dd4af0794a10fb5d404eedcc76b21b011ce56af9e1a654ccb12
 EBUILD netbeans-platform-9999_p20150427.ebuild 9652 SHA256 9f04dca2fe9cc4cc57a17fa7f1deae2ef2b78f6df535a5a374a87dd11f71b9d9 SHA512 d67506e345f99a9a6125e45724c2f99af1f773cf1050aab298b81bf2102a00502f997a5222292b174a90211f069a88541082a815a5cca4cf31f3deff0365ae07 WHIRLPOOL fb219e7a90a676f9b5a0e4f121311f29bbadd1a2bc20516e19b783af1b85f1d5e82e1eb03021e50d0e72eb53685251e84574c3162a7828cc5b8da2422fd50400
-MISC ChangeLog 165436 SHA256 961d517a264c6e23ea907ffa5c1d194ff7408e847e0d0e339b6979977ef4b4f0 SHA512 d157deffb72c9ddd7e1559a580662ab553adf299447a6daa73f48d87d65379889f46539f85862f7e20ef41e4414350940c4288a9c416ba55c577764b1d7a7f1e WHIRLPOOL 30547d34a67e30e31cb446dbdc99c341515067ae7391ab5a983803e10ddcfcaf8000ce6ca6e891ba2ecd84bb3e76cde317881f78eb9c875d587c8dd6ec2cd9f1
+EBUILD netbeans-platform-9999_p20150428.ebuild 9652 SHA256 e675ff3ebfaea0f48a281aade2510b0ecd36e035c20feaf78d8ddc86f31dd61a SHA512 61621a91c58ec46923385bc51faabf3ce7b46f420ab3c1af229b23f785b01c15423719d2809460ddea54930896f7828287a55dec61f788b9bbe6800fc6750e21 WHIRLPOOL a4eea3c1d9e3879376c88957db67a1d0beabbb24635157e45be92000b3d6fccb9e88b7f94c22ff0844063cd7edc24d4e2296e36bb1207fb974df8d70a1fe8456
+MISC ChangeLog 165613 SHA256 f74f12c64e47b128102441859bbfc88adc3adec7773245e3db4137f5ad59a4a9 SHA512 badc5447ac2b615b9ad20d31a16d9b8162e161663589b51d74c7c1b3d432cf383edc230cc4ff9a2749df576d0a19ffe8dbae18536f417d3363c5744ffbde668d WHIRLPOOL 0db5757a7c089ceea02ef8dbc7577cfc461b9642ebc8ffc1ecad55e1d77a9993347746c363a3e9e66d2d93fc1987f4f8365c8d5a362997f195bbcacd863f7610
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20150428.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20150428.ebuild
new file mode 100644
index 0000000..43cdc7f
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20150428.ebuild
@@ -0,0 +1,171 @@
+# 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-04-28_00-01-56/zip/netbeans-trunk-nightly-201504280001-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/0027BC49CBF5E88B68CCD58BD1EEB2EA7188D069-junit-3.8.2-api.zip
+	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: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}"/0027BC49CBF5E88B68CCD58BD1EEB2EA7188D069-junit-3.8.2-api.zip junitlib/external/junit-3.8.2-api.zip || 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 junitlib/external junit junit.jar junit-3.8.2.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-3.8.2.jar && dosym /usr/share/junit/lib/junit.jar ${instdir}/junit-3.8.2.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 0587d30..eae8075 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_p20150428 (28 Apr 2015)
+
+  28 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-profiler-9999_p20150428.ebuild:
+  bumped to the latest sources
+
 *netbeans-profiler-9999_p20150427 (27 Apr 2015)
 
   27 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 0d761db..762ca72 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201504170001-src.zip 207165961 SHA256 a30747f33bf216
 DIST netbeans-trunk-nightly-201504210001-src.zip 207178961 SHA256 b277aeba16c941024cc88c8d36a4183ff078adf054721dadc8593be14c963c0d SHA512 d421faa83f70a9ec7cb58d88290aa1104839d2b3e5f3e4582f1c2294fa2647913911eb298d625ad8a97bbf7aa2c35314a4480e20d36c0f4abb7f909c5f2c3481 WHIRLPOOL 5b2becf39729c209e27bd3cbcf0f7fe88b1829c3e898c24fc6d5c1efb4345cd17637243390886151cdba80d05cff65da6eedf7fcb9bb3fca42afb08d26ed2fa8
 DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9ebdb4fae53f4999d1bb357dad09966f36c050e52d9cf53507f6 SHA512 2a2a5dab10d0dcf6797f1a51f58af7a2f39c9c10a29f5e3f231e895e20333b434273cb69192209e400c75bde82a6d7175c0018fba94998911f4e71abf30f4119 WHIRLPOOL 7ae4e39d0a8f0e7ee249e3f8fa7aa0a77f837734e9e7dfa3b2b648c015fba99f5f0d1088474c8678cf9de0728c1ce1eb9bd6de0319369c862011531c84c1e0f5
 DIST netbeans-trunk-nightly-201504270341-src.zip 207311520 SHA256 acf9098ac80b152d852b40943cbf6ec50878ee0d089ce4bf7666aab656303127 SHA512 344f9e396f20c463801b44a264ca55ba4d05c7c51f83c650f2a6ee9d4858947962db8a7d9f0ab1e77eb921c9d974dafd7cfd8cd641005c468d7511cbfe0be57c WHIRLPOOL 8b5915c7c222f965ac8848b198be9afe4b227d5e3bd87f2c391ee06032914af414aa1ca438a92262b0921f6918fb2135513a648adac56e0dee3ba236225f9dd1
+DIST netbeans-trunk-nightly-201504280001-src.zip 207313287 SHA256 4d9e7bce832a438a5a030d15d0c65c5dd930a81e910efe56a6e98302db7c6aba SHA512 6355cc5666f6cb654bae79e37a06e4ccd4637ea1f093cd6dbdc8d99a109e61de6e644a4e9489bf67d72f27ce6797c175f948244a2d80b59e0f43fc64961b41ba WHIRLPOOL 70666a34cb2cabab59abe6fad18f85cf3cac3c6bc417ac2b0098c881625ec8292b1f2edc6a606370ead0f491be39815022978156d09c4ebd927778f1f8f9291d
 EBUILD netbeans-profiler-7.0.1.ebuild 3222 SHA256 b1bab800a27c30aaea26b8ff5ab21abdd1bec16b9890133429eca9ea77c018fe SHA512 d6198f44a06561b7e2598fdd6a37f8a3dc13c38f63dfbf6a86a083adbf71e9c62af87cb4e1b5b8dd2dc99feeeb99a7afcbb8f7747c378ad92c71263cc91a6c54 WHIRLPOOL c62613f511636b1f0393ac32c6b50641cdf7df9f9fdc95fd5acbe1a602ffe42fdabb556f989552b05b0607a5ad9d324a2019440c3ae66c50995ef3fc8775f385
 EBUILD netbeans-profiler-7.1.2.ebuild 3231 SHA256 94d87bf6f86add3bdc27f9f20084f35fe584fc2bd697acafa8c23cce16a0d1ee SHA512 dcc8da918a6b6e07ccae513fb4296d16891e205b49098fb8269d16beb9b1367b1920797cc78053b83f4321c1b69faa393365265c72213bb2abfb9d3f84f66319 WHIRLPOOL 18325a1df836e7242838920483c41d43f37b9dae8322d36a2a562b414baa0dc76971f581204ce76a6d64196dd60643089e8704da69617590cda61ce54ce82e8d
 EBUILD netbeans-profiler-7.2.ebuild 3214 SHA256 ddcba9ba672ad566ef256538fc8631ae691aa7c6574269199f26df5382c37f4b SHA512 1bb7eb95381861b8265ab366fe3c7a9b99971d1c4600eb6c7bffb521f4cebb32bcf3d662f82c811d47fe95e77cd39e48f3665f0fcabf9145eb171c2746d89684 WHIRLPOOL 7f74c2be9ec4e7ff419086f1da3b1a12b1c187102def004316ef89ed28f30da62542ed3409a51473a8d9d68d18a30de36b1d0307cd8eeb7e580668fe896c5aa5
@@ -60,5 +61,6 @@ EBUILD netbeans-profiler-9999_p20150417.ebuild 3478 SHA256 42f6975b88eb8b89437a3
 EBUILD netbeans-profiler-9999_p20150421.ebuild 3478 SHA256 42fe361da62f2c704dcafc54fe338c80af6c670115ea9b8e9110c161bc1a2794 SHA512 445cbcbee658afa7d5e362a535f89ed2b86ee3ed8778ff74bae9eb945cca638f5985ae75a3d6564a7d46e7c8c3fc5197af804f6c29c2f7b0dfadad58a29cd7e4 WHIRLPOOL 9848b6d16506c9173153e43f411de318812e4695db1da1e60b014c917d5a567b066360a46bc54f0253ad692e7ba40630f0e236cf677e2c4999e6ec7be0d32a09
 EBUILD netbeans-profiler-9999_p20150423.ebuild 3478 SHA256 9162330ec844e959136d17a95b00a3e619be96572e6f5ca43fb5ee5b0b6d84fe SHA512 cb7a3e3f829904279a4ff61539c75d432d6767a44d683ecccbd11e02592d185a137dd03c28ba659bc2996d250a55462b82b376ea1ff0f8bac3ef0e55d4e4ddf6 WHIRLPOOL 1cba3f741c0b05782c8a9cb207eb1341df03490de02208da0859d1efe01d86a6d3c34967ecabfcf05029beb3742aff05cfe36b1584f31d071916fd53ec0e502a
 EBUILD netbeans-profiler-9999_p20150427.ebuild 3478 SHA256 af507e9b79e69c1afda97e176b1fbd9f72ea71739b562d7e7b586421a9a49af2 SHA512 f6cbccbf58f9295c4444ec57bc46ab32aa124482d09760cfa53c2bea5a497e33e9492d9efccf074975c1fd1f3745bb045abc451f473a3a5a5b249075eab3c254 WHIRLPOOL 47f5b39158da0ddbcfc168a76a5cf156f5267f57633fa5881c9d94cf3e0eb8e0e8e36e2b05a89eacd0ac2f19fc03e991a0b2d5a463ddf5e7f3f8eb89951cf39e
-MISC ChangeLog 164897 SHA256 e3b2f068def427fbc1ddd744398c092fa51c06e93007a773639f723bdf967aac SHA512 26bcef627b6abf4ff233220484c8b623fde1575808d97c19d367bafb44408f5d524cba94331c8ff22304146fb7d08dfee043d7386dc10a5ccc2fa2134bb91a72 WHIRLPOOL 6c9c302e4a1435dba620fd80e7863b5e17bf12647f87e2fba5f55c2110abb8cee6de41bdc61008d888111cf7fca6df8a277dc08ec974a8900818cecf9dd8065d
+EBUILD netbeans-profiler-9999_p20150428.ebuild 3478 SHA256 757f9e27561411acdea981714a3fa51e5f38b2f05250aca1baec58042081c87d SHA512 607d4b9cf5e38d36bd43de7fff124f51f5be8d3a44dbd5c114d222e2b815b95a2b0c49e1b3aed3f3fd330025137f032093afa8ed1b41e1e9485226cfeeaa87b2 WHIRLPOOL 39aca8304897e0075c5b590483740fd19bf715b1a2d85b1d5fe0e7fabb1101c696d444054a9567ceabc5955ee708ca1aec9a92b7d401dde3878f177c194878dc
+MISC ChangeLog 165074 SHA256 1f05b75e5dd797042b5d3c613d4db6753c4058529a261a54460509d6757f2684 SHA512 5198e54d3058b0da9805adfb8ba8a172077e524546740e964a2f1aed2ee3984e34b3f6073c9f816ac771370928e3b00c7be3ef79b2d5adbcfff6e761a80558a8 WHIRLPOOL bfb36e0513542eaea6b2eae7f64b09152c00bcda7fa1fb917f963901a1987697572dfe028bfb615195c7ef8c95af07e35fe8ab5f47d9a8087a5fe5955e51e298
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150428.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150428.ebuild
new file mode 100644
index 0000000..b702d18
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150428.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-04-28_00-01-56/zip/netbeans-trunk-nightly-201504280001-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 86733a2..b13f2dd 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_p20150428 (28 Apr 2015)
+
+  28 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-webcommon-9999_p20150428.ebuild:
+  bumped to the latest sources
+
 *netbeans-webcommon-9999_p20150427 (27 Apr 2015)
 
   27 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index 43040d8..bf2e7c1 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201504170001-src.zip 207165961 SHA256 a30747f33bf216
 DIST netbeans-trunk-nightly-201504210001-src.zip 207178961 SHA256 b277aeba16c941024cc88c8d36a4183ff078adf054721dadc8593be14c963c0d SHA512 d421faa83f70a9ec7cb58d88290aa1104839d2b3e5f3e4582f1c2294fa2647913911eb298d625ad8a97bbf7aa2c35314a4480e20d36c0f4abb7f909c5f2c3481 WHIRLPOOL 5b2becf39729c209e27bd3cbcf0f7fe88b1829c3e898c24fc6d5c1efb4345cd17637243390886151cdba80d05cff65da6eedf7fcb9bb3fca42afb08d26ed2fa8
 DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9ebdb4fae53f4999d1bb357dad09966f36c050e52d9cf53507f6 SHA512 2a2a5dab10d0dcf6797f1a51f58af7a2f39c9c10a29f5e3f231e895e20333b434273cb69192209e400c75bde82a6d7175c0018fba94998911f4e71abf30f4119 WHIRLPOOL 7ae4e39d0a8f0e7ee249e3f8fa7aa0a77f837734e9e7dfa3b2b648c015fba99f5f0d1088474c8678cf9de0728c1ce1eb9bd6de0319369c862011531c84c1e0f5
 DIST netbeans-trunk-nightly-201504270341-src.zip 207311520 SHA256 acf9098ac80b152d852b40943cbf6ec50878ee0d089ce4bf7666aab656303127 SHA512 344f9e396f20c463801b44a264ca55ba4d05c7c51f83c650f2a6ee9d4858947962db8a7d9f0ab1e77eb921c9d974dafd7cfd8cd641005c468d7511cbfe0be57c WHIRLPOOL 8b5915c7c222f965ac8848b198be9afe4b227d5e3bd87f2c391ee06032914af414aa1ca438a92262b0921f6918fb2135513a648adac56e0dee3ba236225f9dd1
+DIST netbeans-trunk-nightly-201504280001-src.zip 207313287 SHA256 4d9e7bce832a438a5a030d15d0c65c5dd930a81e910efe56a6e98302db7c6aba SHA512 6355cc5666f6cb654bae79e37a06e4ccd4637ea1f093cd6dbdc8d99a109e61de6e644a4e9489bf67d72f27ce6797c175f948244a2d80b59e0f43fc64961b41ba WHIRLPOOL 70666a34cb2cabab59abe6fad18f85cf3cac3c6bc417ac2b0098c881625ec8292b1f2edc6a606370ead0f491be39815022978156d09c4ebd927778f1f8f9291d
 EBUILD netbeans-webcommon-7.2.ebuild 2665 SHA256 9328ea550dfeca5be5c2b03aa5f512d451f1673e49a40994155fca0b2fb2f79d SHA512 d8b80b79e78769a70d01605a79a8a91f7e839d4138b4cbf28cafca6f56ae3d7003c2f5f40aff77bbe3f2882f43a7d7dca3f0428f0f2723a42ae5b49e4c71ffff WHIRLPOOL 31254cbd2fc6cfb2d1bed4d22958595dbbf73032439f19e684463efbe466ee80c144f77ab00ced7a07815b1cdc1d45a87ceda83e7a2fd20ac2ce65e45d30a093
 EBUILD netbeans-webcommon-7.3.ebuild 2986 SHA256 327c0a73fb20778d9fbe4a12024fa065e4102a7aff3fcbda7448874656a46420 SHA512 3d270e940424b3bcdc8c7f8ff2016d33eb55420ac4037f4e406b688c2acea1b07a04625772265ac293d80c0d1afe3bbe6f865051ed9234b700619bd0781d8b39 WHIRLPOOL 5bc288949ed3aa9c3c4cd4cd33b817fe317754229ad30e80da8cfea817bfb77e988a1d6d3280aaef90619968e0309fad212deff0f7970f04438494a893a30a5b
 EBUILD netbeans-webcommon-7.4.ebuild 4727 SHA256 54a0b63527001da34a21ae3ed69c2cfbf9a446ee69bda4bb6ac5ebb939ebb68d SHA512 96895c972cf7092426ec8bc06dccc6ab4f33334da4e67fd4da01e586801110bda8d955f2f29ecd93b8bb58ae64c4af4139e9954a784c10dec925e2beaeab2394 WHIRLPOOL aa7b3b59d315bd37553052470b1f56f435979569e5ef033493cf6f93c29827f2ecd30f6b874f07a0cd8824469c6546982ac3ed360bf3b6cbf211d95943a3398a
@@ -64,5 +65,6 @@ EBUILD netbeans-webcommon-9999_p20150417.ebuild 4997 SHA256 a8524d36207f7b09eefe
 EBUILD netbeans-webcommon-9999_p20150421.ebuild 4997 SHA256 3b435a5a6c5c06a297180a526f702932fa37cf9e24fe08e20cf489136f07c920 SHA512 2daeba1bb1e64ad00186c3be0c28077d94db6cb70b54fc38b2a66758672a253817380a876678fee89db42743b251b6aabfd41414bc1806cece0ac84fdc43b10b WHIRLPOOL c1a6ee48403e031b0e7a61f73b256b8976cdc9b648516397e2307a4b84223198ec2cbbd007dc89907e0332a35b97a746f41b4dfd582143b3a0550f3dcea8e908
 EBUILD netbeans-webcommon-9999_p20150423.ebuild 4997 SHA256 02f1c52b633ae50b4b48c917c38700b8eb724d136a584438b83d423d39d8a7f9 SHA512 c3769d3dc4e35f9289eacc60a53ca2dc5d734bfb23b0a6b2b01afe6fcae23f3cc8befd03d782a5f4d5f1f9262d471c769024a9bc02ba37a00a406795d7a82e70 WHIRLPOOL 1e7c0843f31758579fc3b9510a164bd361e55d971e97f8be2aa66d5a5f4a7b833a0beec36bda168f8ae48a1f83af34f744239bc292b28bba4acb75c51d9d6085
 EBUILD netbeans-webcommon-9999_p20150427.ebuild 4997 SHA256 e0cd428c7cb03d78fd7023ef2b6d59c899092a727bac6e4326912e7e62d0c11b SHA512 c22b88cb84fb94e6719d4cb4b550b99c8e9af2ada53e556a9c6617213b85b7cc821a5bd3bd60b73a909eb1e3d8bb18ad36127131b99b14d094ee09bd13133b61 WHIRLPOOL 26d2f0dc7518b0bfd36df5c2f14f581e576e4071c8206633f574cf4d2ad9c18f3e1f3535a3ed26bb7034df67910d50c632f57c09a94f9c356a0727f26fa879f3
-MISC ChangeLog 137936 SHA256 44c9c4fd73de4908d5b129d78852e56fac4064aab0eedea94bf9d1ca417c238a SHA512 f193d8e62e06c841fda4b301b3e020ced2bbf54be892403ff61dad6b217d2f6e9ab56e8476b67608046259c3bf52dc65d3327e2c6e06c1668cdaa18b7abba414 WHIRLPOOL f8dd3014494a03769f3ee86d446ef96a46815aad4df14e23ab0e7d4439ffd02d4c9789af0c1258a829d150020edbfa1fd9716d70b791455eb3ab4e1cd3ab8cc1
+EBUILD netbeans-webcommon-9999_p20150428.ebuild 4997 SHA256 9a3272fc2fedcde2a3d805a47be2e017f296848373098f8a110a59bcb422727f SHA512 681996db36bfc44668a1092f6b56aaad0220d254377c88e03528bd47389c15149cfb23c77a3827f4663a6a255f16a11c07eace07f54f0cc1379703217bdd899a WHIRLPOOL 3c1334403f41b71d4fe792d8918e5cf0f64380665e6c9cc2abe96a153c39decb4faa69568161bdd1e1b4b4079067614adc5ac813888b8a7fc03530474121912e
+MISC ChangeLog 138115 SHA256 57c75f1cd66f891083646eae70748560a1cab78e31602346d6897ff6d78a3e51 SHA512 4826310ae5bc9e50a73c6485859f415b85a11cb7916cf7a6d2954672dc8e75c19d03b42288e1fdf45ffc98296c9b77866149029e2662f3a2a6aafa2f8201d2cb WHIRLPOOL d772d36a25ee076af9a486d15411018444377ecd76b4e17593170edcbb014ef2a0fb38c6f49176d355d1b6ac8d81a44695ea7e3f0b8e3a90eae86acc6511e2cb
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150428.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150428.ebuild
new file mode 100644
index 0000000..fecf6c6
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150428.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-04-28_00-01-56/zip/netbeans-trunk-nightly-201504280001-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 e672adb..6c1e1ea 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_p20150428 (28 Apr 2015)
+
+  28 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-websvccommon-9999_p20150428.ebuild:
+  bumped to the latest sources
+
 *netbeans-websvccommon-9999_p20150427 (27 Apr 2015)
 
   27 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index e59a196..0a1b3db 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201504170001-src.zip 207165961 SHA256 a30747f33bf216
 DIST netbeans-trunk-nightly-201504210001-src.zip 207178961 SHA256 b277aeba16c941024cc88c8d36a4183ff078adf054721dadc8593be14c963c0d SHA512 d421faa83f70a9ec7cb58d88290aa1104839d2b3e5f3e4582f1c2294fa2647913911eb298d625ad8a97bbf7aa2c35314a4480e20d36c0f4abb7f909c5f2c3481 WHIRLPOOL 5b2becf39729c209e27bd3cbcf0f7fe88b1829c3e898c24fc6d5c1efb4345cd17637243390886151cdba80d05cff65da6eedf7fcb9bb3fca42afb08d26ed2fa8
 DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9ebdb4fae53f4999d1bb357dad09966f36c050e52d9cf53507f6 SHA512 2a2a5dab10d0dcf6797f1a51f58af7a2f39c9c10a29f5e3f231e895e20333b434273cb69192209e400c75bde82a6d7175c0018fba94998911f4e71abf30f4119 WHIRLPOOL 7ae4e39d0a8f0e7ee249e3f8fa7aa0a77f837734e9e7dfa3b2b648c015fba99f5f0d1088474c8678cf9de0728c1ce1eb9bd6de0319369c862011531c84c1e0f5
 DIST netbeans-trunk-nightly-201504270341-src.zip 207311520 SHA256 acf9098ac80b152d852b40943cbf6ec50878ee0d089ce4bf7666aab656303127 SHA512 344f9e396f20c463801b44a264ca55ba4d05c7c51f83c650f2a6ee9d4858947962db8a7d9f0ab1e77eb921c9d974dafd7cfd8cd641005c468d7511cbfe0be57c WHIRLPOOL 8b5915c7c222f965ac8848b198be9afe4b227d5e3bd87f2c391ee06032914af414aa1ca438a92262b0921f6918fb2135513a648adac56e0dee3ba236225f9dd1
+DIST netbeans-trunk-nightly-201504280001-src.zip 207313287 SHA256 4d9e7bce832a438a5a030d15d0c65c5dd930a81e910efe56a6e98302db7c6aba SHA512 6355cc5666f6cb654bae79e37a06e4ccd4637ea1f093cd6dbdc8d99a109e61de6e644a4e9489bf67d72f27ce6797c175f948244a2d80b59e0f43fc64961b41ba WHIRLPOOL 70666a34cb2cabab59abe6fad18f85cf3cac3c6bc417ac2b0098c881625ec8292b1f2edc6a606370ead0f491be39815022978156d09c4ebd927778f1f8f9291d
 EBUILD netbeans-websvccommon-7.0.1.ebuild 2692 SHA256 a18cf7fe0a1e38749826cb12651be06c210b038be50117647496ee6cbd184cda SHA512 32b32894713d7235ebd03446c5c411d22eb8701b96e3d3ac54eca78b2abc833babf279085cea3b74bb7bddc6d89a283a21c58a0b0462042ddd10e22dfcadeb84 WHIRLPOOL 59c18168245767acd1f8e53046f8942698237aa6fd903a669c626b7f17cf3d39247b7ae57f2984562230267885a4b6a62be43dc8a330f1dfeb2cc7acbbd7d3c6
 EBUILD netbeans-websvccommon-7.1.2.ebuild 2701 SHA256 3b2a1cf0d32db3c55b66d1c6b8c4ae2ad5487d3fdb27752468ce5c860f9b9515 SHA512 b9be64755f00157c2d6984887b8c0fdc1e34470f21df1fd72b3e399d3ec894af01c9b79fd604778213ac2086a6c96bf66366e8c2c8bf97f7fee23d16ceb36974 WHIRLPOOL 91559de8c8f6391c3c69888854778a91a1a7e0052ae69eb9762bcbd64d8bc5587fb84ebb55d7d0375da5a7855aa8672abfd035b6a38b3eeb5c23a4cd59b3cdce
 EBUILD netbeans-websvccommon-7.2.ebuild 2684 SHA256 8bf8cad1e0469713c63280620fed089600191230f501a78b834b010f8fa9b3e9 SHA512 fe885f92a7c6cfac532c8e40e4df6283253c43294e9d82ee4d0d070425496eee3792479c268b46bf1fd484f753ca1f21e7ca38a5d71816b6d4fd219082e8e276 WHIRLPOOL 9d2d622d4a800470c874d8751e9c2055e0a4ef72ad01a01aefda4e95a7f295d55fc95fdb55fdd1f631212e1f610bdc7a6b4ee631b92492bb85f73b0d9fb4ba26
@@ -60,5 +61,6 @@ EBUILD netbeans-websvccommon-9999_p20150417.ebuild 2727 SHA256 f405fbac18106121e
 EBUILD netbeans-websvccommon-9999_p20150421.ebuild 2727 SHA256 31e0f629e921a3f9441d4d92658d45e0ad2521f4bbc07b6f66cea69b28dc84a3 SHA512 924b7777a51fe421c7ef9100c029347ccedd21c7c002abc2a4591c0ff66646d87c707a35a6c46aca3a48bac825b90f777e7bb3c5eebada6934a6a5363dafd21a WHIRLPOOL 76bb7c7d83a4fe16e9f703ce51aa7089634baad04c9780fa2b6238b577ed406d808ebfe051571d63e8edf166c0e594a948e684ae3a49686167478325d87cdbc8
 EBUILD netbeans-websvccommon-9999_p20150423.ebuild 2727 SHA256 6e542e53ab1e0980371b27a60c7888dbfb3fa793ac5ae39137a83454e9dadd4e SHA512 54636685103899b9b8415a7f451b968d804d158849356bc89dc45f6a398a85489aae8e305d3a427f4f240db168a23b0a9f0cb115934afca0ac73c3298380da83 WHIRLPOOL fc2e039d630ffc1b06deb522df76bdce6d1954949c0f018852fa494bf59f5ab177c2faaae4bad71c68efa3d5b78b184a05f3829522041a5848a6672dc83d5273
 EBUILD netbeans-websvccommon-9999_p20150427.ebuild 2727 SHA256 183a2484dd3677211f3de5839523cc44d9a54f1365ce6ddaebc2e67ecde83c54 SHA512 2eeff1fbaae77c6fd3dbba42b8459c630e7a1893702c5742c78122e59e7f5cdd796e3370c060a690b1cc92a8d2d8c70e9ae4c8bf93f3e8f39f47ebc20ff45803 WHIRLPOOL 34f5d7de78c8b30093b663e295b7121e62d23ab0904f9e0823155131b0852c1ab28b3d10a9f211f187c1d601a4e5e3244b8dfdacc4f55682e4ea9a103ecbe3c4
-MISC ChangeLog 172794 SHA256 3f92fcc89d141020f76843bc6245d0245f6f9ef6c0d7be2aee036d9d30fe32e1 SHA512 fb71c324370ae94f8643fd23e4f54cee8038bd58f7036d93f9aa7e4d54a906a0b4b18bf5d63e4ad400358441837befe954afe56e897866298991eff2b3d3f666 WHIRLPOOL 14d4736709f27d6ca426642dbe1a66c51a9842b83735efc1632e5f4bab689a4d02738be738bc0def35d795701dc1c405918354d156e4dae477285315bf9f5d37
+EBUILD netbeans-websvccommon-9999_p20150428.ebuild 2727 SHA256 8662f239f1e2d05d0174bb8c7dd529358bb04408bf79f388a3d0cf184e0f1daf SHA512 dd6b5e3ff736e99fdfc30b162c2fa26da49281f79b113351e0d9fc4b49be1b95d26ec3afcbe97eab8e382a5df05fe81776a68e7e4c0e08e0ada59450547ad614 WHIRLPOOL 6b93dd9c05ae3f2a3ac520f250cce8ed8a777b872b0c39794f5bd545677ca3d6fc4d127cda9b3e44f5282f910b748c5f0b3feea1178e8dffb3cbbb8979ba9c2a
+MISC ChangeLog 172979 SHA256 39d9ac00728ccdb5a8fc3a889d726ed1abe8b773d6c5496064bf0e01ab6d252f SHA512 2bd39066185c5cd656a32463753118d17429bbe560f37751db3d3d16ecbd206385bd51f61c8a02cd97e9b22868a13d7337e8895123dce31b8eafe570ec2cb4cd WHIRLPOOL b5a3f157a1d613afd8065adb3ac3024a10e0d3767579fad0127a57dabc07c97fd1c3b2b844002205d88242c27bd64a816791d976b19c2051097f8368713d820d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150428.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150428.ebuild
new file mode 100644
index 0000000..fc4576b
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150428.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-04-28_00-01-56/zip/netbeans-trunk-nightly-201504280001-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 f5591c8..8e0508f 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_p20150428 (28 Apr 2015)
+
+  28 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-9999_p20150428.ebuild:
+  bumped to the latest sources
+
 *netbeans-9999_p20150427 (27 Apr 2015)
 
   27 Apr 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index e2ce94d..b55d082 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -41,6 +41,7 @@ DIST netbeans-trunk-nightly-201504170001-src.zip 207165961 SHA256 a30747f33bf216
 DIST netbeans-trunk-nightly-201504210001-src.zip 207178961 SHA256 b277aeba16c941024cc88c8d36a4183ff078adf054721dadc8593be14c963c0d SHA512 d421faa83f70a9ec7cb58d88290aa1104839d2b3e5f3e4582f1c2294fa2647913911eb298d625ad8a97bbf7aa2c35314a4480e20d36c0f4abb7f909c5f2c3481 WHIRLPOOL 5b2becf39729c209e27bd3cbcf0f7fe88b1829c3e898c24fc6d5c1efb4345cd17637243390886151cdba80d05cff65da6eedf7fcb9bb3fca42afb08d26ed2fa8
 DIST netbeans-trunk-nightly-201504230001-src.zip 207307251 SHA256 5b1b08f9380f9ebdb4fae53f4999d1bb357dad09966f36c050e52d9cf53507f6 SHA512 2a2a5dab10d0dcf6797f1a51f58af7a2f39c9c10a29f5e3f231e895e20333b434273cb69192209e400c75bde82a6d7175c0018fba94998911f4e71abf30f4119 WHIRLPOOL 7ae4e39d0a8f0e7ee249e3f8fa7aa0a77f837734e9e7dfa3b2b648c015fba99f5f0d1088474c8678cf9de0728c1ce1eb9bd6de0319369c862011531c84c1e0f5
 DIST netbeans-trunk-nightly-201504270341-src.zip 207311520 SHA256 acf9098ac80b152d852b40943cbf6ec50878ee0d089ce4bf7666aab656303127 SHA512 344f9e396f20c463801b44a264ca55ba4d05c7c51f83c650f2a6ee9d4858947962db8a7d9f0ab1e77eb921c9d974dafd7cfd8cd641005c468d7511cbfe0be57c WHIRLPOOL 8b5915c7c222f965ac8848b198be9afe4b227d5e3bd87f2c391ee06032914af414aa1ca438a92262b0921f6918fb2135513a648adac56e0dee3ba236225f9dd1
+DIST netbeans-trunk-nightly-201504280001-src.zip 207313287 SHA256 4d9e7bce832a438a5a030d15d0c65c5dd930a81e910efe56a6e98302db7c6aba SHA512 6355cc5666f6cb654bae79e37a06e4ccd4637ea1f093cd6dbdc8d99a109e61de6e644a4e9489bf67d72f27ce6797c175f948244a2d80b59e0f43fc64961b41ba WHIRLPOOL 70666a34cb2cabab59abe6fad18f85cf3cac3c6bc417ac2b0098c881625ec8292b1f2edc6a606370ead0f491be39815022978156d09c4ebd927778f1f8f9291d
 EBUILD netbeans-7.0.1-r2.ebuild 6736 SHA256 e808fba2ddb516270d93b5cf67cff60d98b37ca58a158878f2e3b3ad696cfc82 SHA512 653fb585d9eaa20fcf88d778a7f34d63c9f29f2af2153a432fcab6d977ef9619c699b19587a48b148ccf717f4b31a43859b81cff80d5d84ad273c5fa16e8f565 WHIRLPOOL 257f2466c3ad198a05db9d5e377cad2707f8a4daf1f421e516d7435670a85fd4bb5f6b3ab657ebda8cc23937e1b4e1f4acce8cccd85bccddc5a7b1f9abbde0ce
 EBUILD netbeans-7.1.2.ebuild 6976 SHA256 4222e248dfb664ccfea85d4938ad691d3685f32d8e9b33289d1dda088057261b SHA512 cc0a20bd542b61621fe08d5413611f7bcbbebf0c37d5f67c590c31324e74eb5594e72efacc86d843ff3abffc98c4859c2733c63ce6f993baf51e24d69197b64d WHIRLPOOL 30fb7b0cbf22fc39a8dabefd27a0073ce73e62ef082d55839fb7f815bb73bc5c3c24c3418ce175f355d7c64138ef7e9616da41c68b3b57a70353d16c6113daf7
 EBUILD netbeans-7.2.ebuild 7057 SHA256 29140b2779f1a24722499605101c286d05415b4f97d2363afedef711cc586067 SHA512 0776f530f9530c533b13019f7b34fc664990a16926bcff768d0a9f3b9035de82dcd2ed66425ad8da27c65aa69fe3e6be966e0a1ee1bc222949e5d42e14f7f7f1 WHIRLPOOL 9fcb95348171fb0bd8d794b80b51b2e3ce36fd84ccc81653bdd0172cbfa99791e527b33c895ebf7b4d81c228f17d4afab367eb55ceffe28df835b2d09dc8f778
@@ -68,5 +69,6 @@ EBUILD netbeans-9999_p20150417.ebuild 7216 SHA256 e4e7c9041975dea0715480a7de2cbb
 EBUILD netbeans-9999_p20150421.ebuild 7216 SHA256 424c295f177f3ec8b9aaeaf5ffb8b35a4b6fcfdb0caa4509295889b47a6481fe SHA512 ead9deac4500e89d7ead39a82dd44247cc9f1971591c505734593123ce87a16ba9fed52bfafecbcef07f634eb17ae87ed3da12c6f0d7d14e106b9a0d13d8a02e WHIRLPOOL b98a1e590fe6bb021abeaa7a7abdc40c4819b217984263d19a61598bfcf298ceed585fbcb5daac63730bb2128d794b61e9482d8f915623fd00008ebd7d37472f
 EBUILD netbeans-9999_p20150423.ebuild 7216 SHA256 828f90dd1fa9106f4576de2f9ce71244c0aaebae5cd59f34f64983762e4b6270 SHA512 d51d5a3473fa6a69bf7c72df4dd864709f31bafc720076c9444ef4f192395a55ece4ad16473a7faf1ca08232dcad95ed055784987fcc38e0b793e8353bf3e6b0 WHIRLPOOL 3c9ce0c3ceb8816b311d58e80c4f0288cc0bf8bdf02f656469871f996ddf1f493979d06e57aba35fac825ddb5eb0cc07a2ebe4aa60a7c110b32c050cb62ce43e
 EBUILD netbeans-9999_p20150427.ebuild 7216 SHA256 be3ee4a2b3383442eb360729053227c5ba5c5f7b752775977dd8d0a52c983328 SHA512 c62ecd4f4122107927ec79c867b483e28da84c34d2d027b531325fe55f503153f80f0f74425cba50ede6a9c7c5d82e1ba556c64157f7c309206b249467f3f8f4 WHIRLPOOL 7cee809a3ac9514a5c88944f724ea5f4dcea4c538d46a402530535a7818e2e3ae48dc6d60fc05c845d5bb1efb2ca8c33ac0033acfac0add3acad70ac144ba8e1
-MISC ChangeLog 146899 SHA256 b372d3457b6219cf3eec07562329c31980081b0c09112d5921a76320fdb87dac SHA512 00acd07e3182082e28f8a70e781eaba3d0fcd807437a2683805da45faa636c4f62e85095a03f42fbb1465a2106b2d87997eb14acf1e5f2cd540e430c08e25306 WHIRLPOOL 7ed840ca006b9bb16c50fb4e2ead02a075ed9cf6d58bba8972db5cefbe762142eba3de4fb1210ed0b742f2d8acf4025528284ffcc1280c66e1a7cde5e97bb686
+EBUILD netbeans-9999_p20150428.ebuild 7216 SHA256 b25a91f0f1379c46ffb3a25159b86c8e5ca3388c41e9356078548b9f78e44325 SHA512 5a192f0de1d4e2abaa365e240f281acf1822cd6fdef53d17b964427a4940d0ac2f2ebdc4b4144721e515fb47b661b7455978622af55922e73d04a40df7f7d95d WHIRLPOOL 583c7edcb67afc32a8919f90a22bfed00e6f9b266bd6f2a52b38f07919569d8f084702c84b7b444a0f6f45097f5eb4710b55f8a847e400d4a21395b7acdc7415
+MISC ChangeLog 147058 SHA256 d9c54545df21e7a653d79d99c3555857763cd6e21d531869761624794b38e68e SHA512 2716dd74e9083ddcc597a078f82ce30bf917882f4d42f5be49a3a3e33a52526f9eb300783f4d3668f60d2f8f3a21db82c382237d6ff9c460a90a77d913110ad8 WHIRLPOOL 492035bb4b79f9bf0c798806c1243e48091f0478c9c05b2d84d197772d51d90712c4cc4d5fb586688fb5c501a055eb472f244f5cf7a3606d50219bba429b0c46
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

diff --git a/dev-util/netbeans/netbeans-9999_p20150428.ebuild b/dev-util/netbeans/netbeans-9999_p20150428.ebuild
new file mode 100644
index 0000000..a6c49c2
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20150428.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-04-28_00-01-56/zip/netbeans-trunk-nightly-201504280001-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] 4+ messages in thread

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-javadoc/, dev-java/netbeans-websvccommon/, ...
@ 2015-06-24  8:44 Miroslav Šulc
  0 siblings, 0 replies; 4+ messages in thread
From: Miroslav Šulc @ 2015-06-24  8:44 UTC (permalink / raw
  To: gentoo-commits

commit:     fa8b7f2b7e73555f074248e419c58453592b3176
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 24 08:41:15 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Jun 24 08:41:15 2015 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=fa8b7f2b

netbeans: bumped to the latest sources

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

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 9e6428d..95fb693 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201506180001-src.zip 207938768 SHA256 2dd02e87aaeabc
 DIST netbeans-trunk-nightly-201506190001-src.zip 207946096 SHA256 5efc0e1a1e9c0321958cb784f65aaf2a804049b3412eb4da7d26018d073c90bf SHA512 80a5b8eeb4dcde61072d9a7e69e08c95fdcc903c5a6165361545fe48e9053056a0861deac96684743f2ef4899777277cf320fd320c21ba9de2eb4dad11c365c9 WHIRLPOOL 0c3395a48fde0a83b4400078e046dd9129ce43922b35f61cfc913d3b4ff6857b2bb81267b55c3fd29a44e8f8663eb3480c5b382c557eb3706bca6ec960358953
 DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d64768e171b41b9164dfe43922947325e7f96ca9c95f73961bd5ae SHA512 b7cfd9b0c0e557bfd5bda998cbe910a7193402fc44bce07d00c97edabbd50fff14d9f28fff4ac169a6aeef965db7acf4939db18ca9aefea8b09e1885b7b83a21 WHIRLPOOL c105483067cdcde190cea21475c96b7ad272533a9e20fabcf4a45a97fdf7ac7252d8422cd6a6ccbc986aab7fa6fb8f35436acfdc7723f158eac771b4e1a229fc
 DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
+DIST netbeans-trunk-nightly-201506240001-src.zip 207969165 SHA256 c59efebe690e08dd20cf83322141bb5b984755b67ab400fa87e9ec0fdcfe1d15 SHA512 1b6007d583cb82f0380736c57048fa0ab77944fd066cf8d643e7dc016049ea73f811b440386631ac8c50d08016d1d1bee015ccfed452c12e504518f1005cfeb9 WHIRLPOOL 8d0a362d61f5e8f57e9bad9c11add5ffc0bae4321302c4a5ab17786a3443d68041211db7f4cafe1f20c174e54b9e0525a7b85fea163751ae4a6efa4386109679
 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
@@ -70,5 +71,6 @@ EBUILD netbeans-apisupport-9999_p20150618.ebuild 3390 SHA256 6bb14847fea5c96c5a6
 EBUILD netbeans-apisupport-9999_p20150619.ebuild 3390 SHA256 d52197982cc34f3cb544d8aa81dfe4c4d6a751246ecf04c4de35655aeecfadb0 SHA512 108ef4dd076a4e86f7c8cd3f1816aa3ecd15f9b43f25e717815719ebb81c61c27e2b644eec71bd408e542d779a6d375d6fb76bdce8a4d0f8de418ca9253cb506 WHIRLPOOL 66d8aadd289fc4f5de76991d9457d690ac4a6ff158242bda8371fb6a5585e2ef16d3c3e053c55ac678889c86019e21f1d9e5b76ceb0b43d272d48ca49293b4d2
 EBUILD netbeans-apisupport-9999_p20150622.ebuild 3390 SHA256 6d1d7e7e42fe9fca915bd0bfd440f2b47cc63e3b60634a724759875bb6c0c660 SHA512 d78b9f2287e979675b8805954ba81da56be9830bd28c70c2ad2c2f74c8fdd81745ad1f269e22b9d1cd1560392c16b33f3b5984f2db933fd98fdac7d4bf698233 WHIRLPOOL 5423cf431ba14b86ed2e6a7e61a3336700a5564841503ad818ae9c80c6243c18647efe53fb9bb3d5ca3c82e832b68a6d2ff37c7e4db6a6ba1487a96d159ada8b
 EBUILD netbeans-apisupport-9999_p20150623.ebuild 3390 SHA256 e9a13e3ae0b7ab31ca13547e691979ad55fbd1f0f94d0b0ca6290cfb20ced4a4 SHA512 dbffb75be14f63efb3af802443e850765d380c28bb0293e577fa5b369adfa231912fe6749057788f80883710a8ece8da8ca606d1031f21e70f07cfc6f85eac74 WHIRLPOOL 3031f2cbd256fe6101d6f4d096634c7b8fb0a80677820c02e9021406cee9aef36057a4d86afe418515b7dddba1de8b7eff39db5594284b5c3460ae0235417785
-MISC ChangeLog 176576 SHA256 08e27899af7c9d3b854f9866955a225b2c4afa7f696952f7319c821f16f02df0 SHA512 7c0bdc1fb9680bd2f849e29610392a99ce4d7d22036962c1f5cd455a98d0bc291eb2b4d6a5c3aa38cfe99062cc773face6bc38049547d22dcd85ec244f8ceb71 WHIRLPOOL c51c3e2d1bd7ba2d88f7ca7b3cba153e71ed2ae0d34d532c95b0086b8a142b0ea1cf756d343b11f7d6d9160e78cae4088c8ff7dd46e475c48ba04e9943331fc3
+EBUILD netbeans-apisupport-9999_p20150624.ebuild 3390 SHA256 976c4217f4930420bff614346bf558cbf90c83bd8a2846dc42f3b4c18c7522da SHA512 53f333e6719f291d35417b610767209377699c5c510dcd53c14bfefe5722399ea377d2160d31b27e9707366f955cbd56f0e685e1d1f7f2980a488c4e1830a59d WHIRLPOOL 4cb98b1b95e5f0662e43929692c9834971ed1cc9edb906a92125a2d71b56c6a575c58535cba36672c2cdea7c2e004799278e1aeb4f49df739abe7334293135e9
+MISC ChangeLog 176757 SHA256 72fa2eb39be61b0db0836dce6391671deff2a55d6aa67d9dc72cb42e723d8d0c SHA512 1042e03c50b5cfcb833b548ba5d16b8849f76d989b992f8143b6d011f82a9acb417ce968316ff04c44b2b0c162da6dc6fc9b6471106868ca11f12033757a6828 WHIRLPOOL 5a53216cb7bfdfcbefac50959cc146962a760ddbf6e6142048994f889ac701172d1d9251152cb759e61295366a8758dfa456451043d1af06fc6040fda992f857
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index eaa1fd4..5961d8c 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -61,6 +61,7 @@ DIST netbeans-trunk-nightly-201506180001-src.zip 207938768 SHA256 2dd02e87aaeabc
 DIST netbeans-trunk-nightly-201506190001-src.zip 207946096 SHA256 5efc0e1a1e9c0321958cb784f65aaf2a804049b3412eb4da7d26018d073c90bf SHA512 80a5b8eeb4dcde61072d9a7e69e08c95fdcc903c5a6165361545fe48e9053056a0861deac96684743f2ef4899777277cf320fd320c21ba9de2eb4dad11c365c9 WHIRLPOOL 0c3395a48fde0a83b4400078e046dd9129ce43922b35f61cfc913d3b4ff6857b2bb81267b55c3fd29a44e8f8663eb3480c5b382c557eb3706bca6ec960358953
 DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d64768e171b41b9164dfe43922947325e7f96ca9c95f73961bd5ae SHA512 b7cfd9b0c0e557bfd5bda998cbe910a7193402fc44bce07d00c97edabbd50fff14d9f28fff4ac169a6aeef965db7acf4939db18ca9aefea8b09e1885b7b83a21 WHIRLPOOL c105483067cdcde190cea21475c96b7ad272533a9e20fabcf4a45a97fdf7ac7252d8422cd6a6ccbc986aab7fa6fb8f35436acfdc7723f158eac771b4e1a229fc
 DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
+DIST netbeans-trunk-nightly-201506240001-src.zip 207969165 SHA256 c59efebe690e08dd20cf83322141bb5b984755b67ab400fa87e9ec0fdcfe1d15 SHA512 1b6007d583cb82f0380736c57048fa0ab77944fd066cf8d643e7dc016049ea73f811b440386631ac8c50d08016d1d1bee015ccfed452c12e504518f1005cfeb9 WHIRLPOOL 8d0a362d61f5e8f57e9bad9c11add5ffc0bae4321302c4a5ab17786a3443d68041211db7f4cafe1f20c174e54b9e0525a7b85fea163751ae4a6efa4386109679
 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
@@ -93,5 +94,6 @@ EBUILD netbeans-cnd-9999_p20150618.ebuild 4796 SHA256 13d1f966322dfdf8cf470d0b2e
 EBUILD netbeans-cnd-9999_p20150619.ebuild 4796 SHA256 43713c208534b156aef66111c1b32df58993b8669c55e3847dd19d624d1d3aa5 SHA512 59b2223cacc3251725b0f07a582179c333caaae537ecc04ae82f31c6dbca3bb0264fa211c9779e68a54e821e1664f9cc93cd74484116b710a81aedc63d7343c9 WHIRLPOOL 2bc9cae96d3b08b2853b10d11961cce770f6c229d49c77daf72628c26ef63cec96af8db244db3db42a158c0eff102c28462afac0c79a4b79ea2ccd607405f247
 EBUILD netbeans-cnd-9999_p20150622.ebuild 4796 SHA256 6d8ca45394764d4e89e818f5979f61a369f9cead282bf3e68e0a19e0d94331cd SHA512 aa4ed6e6100396e84a07e089e63365a5a8ae61a7d904d0efbfb13c68a0cd7d311643eb69d7bf41c5ed0e933169fd8fa93ebe77e6f1d6cbe16d5822153404ea0b WHIRLPOOL f051022db67d0786c4f77b14099376d0d1f042f14b126a62a14a48505afcc01067ce511210163b894427d2bc9b5524e5c4054249b953e255b92e4520b65a074f
 EBUILD netbeans-cnd-9999_p20150623.ebuild 4796 SHA256 ba2734186171529a127344d87d65fadc502e27a5a973b70cf39956d646dc5d90 SHA512 34cd5fbc07751b7367e2ed410161dcd160780dad4f886f188169c352c65b80ab9fb531c4b920d840543194d272d86df12bedaba2fb21d54a308a8bf5c871fe67 WHIRLPOOL cd4d29828acc8526e218f1b90f306746e9bcfb253d6010437c9121a6c8e322bfb539b1aa98b2cc1c191ec1b27b2fbe560736e8537cfe814886d2b39d0ccdaf42
-MISC ChangeLog 161154 SHA256 9c96d1cdd01d7c437fab18e6f821c8f05b3f252e2d76689ae7cdd431ba516d73 SHA512 7874ed6ce67e0f9ff413261767a362dd07d8f40ed3cb49504e7b59b67f6a418ff5bf65dc4a6606d2af7abae7087546fa1f6b9d07091c8b3f90313a1ca19c9d82 WHIRLPOOL 47e98b4caacafd881fc22d009381b8165a750f9bee54afe0153f61fd9cd5931d9c26e6db7085169f03ca66e8d9ad55dca003a2fac793db9cbdc7c72cd6a9701e
+EBUILD netbeans-cnd-9999_p20150624.ebuild 4796 SHA256 ff08bb313f32497f9a5c8a8b55661a9109cb8228b247008f3c540572db742ce8 SHA512 9c03107d6d756e80856293037ff2f3b4737bbc2aee0a728460f99f9b0013acd3062bf6dfa0c784eadac7e35d995cdff7f416bd76537cfb9d0a4e4512a2ec988f WHIRLPOOL a95d1928c419693899587f3c22db14d4944603f14ef45f659d3c39814b619dc57b4cb756c93939bfba65a2b879784d42cd6d0a9d39a8682e5c716ffb577b4644
+MISC ChangeLog 161321 SHA256 11d5e6a8e72939587a904d202069254b417c47f1cc0a0ecbfab07de681b03c3a SHA512 88865165a8935335128cde97c55479bd7a152cba3b180a86069e34e5658d881d408620cfcef403091e9c5e5d685f919c8a51c660815c5cdcb41a6061f95c906e WHIRLPOOL 0420eaec55a72e1bf9dc52d8984fbe09394f402b0a5f4036f844ab2ca0e53db50bf179de7a308eb5823765ff7b21f7e5bd67183bee2ceb60cfbe85c7f2052102
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150624.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150624.ebuild
new file mode 100644
index 0000000..c438d7d
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150624.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans CND Cluster"
+HOMEPAGE="http://netbeans.org/projects/cnd"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-06-24_00-01-56/zip/netbeans-trunk-nightly-201506240001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar
+	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
+	http://hg.netbeans.org/binaries/E03865DA6B38B4F87DEC7F3066A6259B47EB449D-clank_0.3.6.zip
+	http://hg.netbeans.org/binaries/BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip
+	http://hg.netbeans.org/binaries/BB83D4F8047D608858154CB041054F5CAE35B903-cnd-rfs-1.0.zip
+	http://hg.netbeans.org/binaries/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+# These files are for remote development and debugging
+QA_PREBUILT="usr/share/netbeans-cnd-${SLOT}/bin/*"
+
+CDEPEND="~dev-java/netbeans-dlight-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	>=dev-java/jna-3.4.0
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.cnd -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar libs.antlr3.devel/external/antlr-3.4.jar || die
+	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
+	ln -s "${DISTDIR}"/E03865DA6B38B4F87DEC7F3066A6259B47EB449D-clank_0.3.6.zip libs.clank/external/clank_0.3.6.zip || die
+	ln -s "${DISTDIR}"/BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip cnd.discovery/external/cnd-build-trace-1.0.zip || die
+	ln -s "${DISTDIR}"/BB83D4F8047D608858154CB041054F5CAE35B903-cnd-rfs-1.0.zip cnd.remote/external/cnd-rfs-1.0.zip || die
+	ln -s "${DISTDIR}"/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip cnd.modelimpl/external/open-fortran-parser-0.7.1.2.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --build-only --into libs.jna/external jna jna.jar jna-4.1.0.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-dlight-${SLOT} dlight || die
+	cat /usr/share/netbeans-dlight-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.dlight.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/cnd >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/cnd$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	fperms 755 bin/dorun.sh
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/cnd
+}

diff --git a/dev-java/netbeans-dlight/ChangeLog b/dev-java/netbeans-dlight/ChangeLog
index 872dde6..a7140dc 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_p20150624 (24 Jun 2015)
+
+  24 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-dlight-9999_p20150624.ebuild:
+  bumped to the latest sources
+
 *netbeans-dlight-9999_p20150623 (23 Jun 2015)
 
   23 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 68cc25b..8970f7e 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -44,6 +44,7 @@ DIST netbeans-trunk-nightly-201506180001-src.zip 207938768 SHA256 2dd02e87aaeabc
 DIST netbeans-trunk-nightly-201506190001-src.zip 207946096 SHA256 5efc0e1a1e9c0321958cb784f65aaf2a804049b3412eb4da7d26018d073c90bf SHA512 80a5b8eeb4dcde61072d9a7e69e08c95fdcc903c5a6165361545fe48e9053056a0861deac96684743f2ef4899777277cf320fd320c21ba9de2eb4dad11c365c9 WHIRLPOOL 0c3395a48fde0a83b4400078e046dd9129ce43922b35f61cfc913d3b4ff6857b2bb81267b55c3fd29a44e8f8663eb3480c5b382c557eb3706bca6ec960358953
 DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d64768e171b41b9164dfe43922947325e7f96ca9c95f73961bd5ae SHA512 b7cfd9b0c0e557bfd5bda998cbe910a7193402fc44bce07d00c97edabbd50fff14d9f28fff4ac169a6aeef965db7acf4939db18ca9aefea8b09e1885b7b83a21 WHIRLPOOL c105483067cdcde190cea21475c96b7ad272533a9e20fabcf4a45a97fdf7ac7252d8422cd6a6ccbc986aab7fa6fb8f35436acfdc7723f158eac771b4e1a229fc
 DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
+DIST netbeans-trunk-nightly-201506240001-src.zip 207969165 SHA256 c59efebe690e08dd20cf83322141bb5b984755b67ab400fa87e9ec0fdcfe1d15 SHA512 1b6007d583cb82f0380736c57048fa0ab77944fd066cf8d643e7dc016049ea73f811b440386631ac8c50d08016d1d1bee015ccfed452c12e504518f1005cfeb9 WHIRLPOOL 8d0a362d61f5e8f57e9bad9c11add5ffc0bae4321302c4a5ab17786a3443d68041211db7f4cafe1f20c174e54b9e0525a7b85fea163751ae4a6efa4386109679
 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
@@ -76,5 +77,6 @@ EBUILD netbeans-dlight-9999_p20150618.ebuild 2995 SHA256 83385674972b51bb96ee73a
 EBUILD netbeans-dlight-9999_p20150619.ebuild 2995 SHA256 c9076dab190e3e69ca4be2ebe9ef827b4e0df0650b9988059cbf57361025e72e SHA512 39746233fd8a80f138e497ea7d73d0ec2c30ce76cf5cfa0b6a637dd1e7949177d15dd7b73d0f9bab204654bce5d28c253fe9f7650fcd9b8328ea5f2637cdfe62 WHIRLPOOL 3e9f49c4dc9548fd7b40796a839e2f3045dfe1629fca78fb6dcb4d46c357cf83485c58cf00824804e5ce022dac91b4a224f2759017c64ae973cc24eeff1d5793
 EBUILD netbeans-dlight-9999_p20150622.ebuild 2995 SHA256 e3ee6b5e9e27eb097d2a4a1e89760fc0ae59f788f951c80c0dbfe012bcd69a39 SHA512 9c30f7ed6f542aa3035188327c8392fc35e01ad81339e9a3cf8baf849411db9295fb94e615fe4a758ebe47048ad93bddb3e82a8c53c37f84f1a11ddad1588abd WHIRLPOOL 1b9bc344df495ca42f24258e668d08b3c330ca5b2a7d38742aad1b6adfef3b58df430fddf5296c1a65dbcadc30448785ee66e108b6471713e9b1c1af9954456c
 EBUILD netbeans-dlight-9999_p20150623.ebuild 2995 SHA256 023ef7005d8efab5f4208b7f7783605b97016f74d3f0aa5f3c31da67b45927d5 SHA512 8625f5579bf7ca840f841537a4816082a3bbf49811994b34c3a8d4321b18b6c9b60a1ce8411ea8292643ea274eceff803fd1b28541cb814f901911f5b3ccaec5 WHIRLPOOL 326dae952cea6ac05ce6acff903f2452731615fbe1a7f937012d072cf168f5a620a10dbdd3cdd54c1ed1617eea0bb21fceab4d12cfae67b923ebebd920083f95
-MISC ChangeLog 168205 SHA256 8681c14edbb21146df0a14724f7bb3e5a5b01b98fac748e02c80c130cffd4d5a SHA512 58f7c113006da9cabfcf449471a687d15b8a0f7648580fcf1279838692c00bbc3f986fa80fdfdbbf4bc2f20522c92c73fdc790b80eb81e144912aa476ead8278 WHIRLPOOL 7781a6777b59a75d74d21ae4dd67e51baf5dc35e0652aeed9f086f5aac759a3ff842584f3e27e7a6a8d77b2689a292d0edb269bcbcf5cd28f384444faf6e72bd
+EBUILD netbeans-dlight-9999_p20150624.ebuild 2995 SHA256 1ae59bdb2ab86f999aa943942de0bc5337c54c82702fe8e8ab9f6276e77c55ad SHA512 7fe4532dcdbde4e5ee65266c3744d3236f3145f701a9177ca15c7da6adf3d0eb7a782db79ff039961c64a5f19a59d0b49d9ce40bcb4251da49ac4edd32f263ee WHIRLPOOL 1c3a6f5796fd98ebb1eb40234ed7a26b245bbe1d85041f296dd322a0dff75fba99b29e873f6899d4d1c807f5500f38a71649457382fe02ff9b5e9eaef4f71080
+MISC ChangeLog 168378 SHA256 f47b77da3c40bf5f694552c24b6008d1b93e32a8dcafdda8450e990d676d2502 SHA512 c75b2f429144dba778ab230238501b04eb2901a2919c806755138b76fa4391ada47274a29f26dd12585902191b4420dc3d499a72cd70c5964fd80d9ae0c4dbdf WHIRLPOOL cbdd63293870aa8555d50244f13a604ffeb7eade94415042e2bf9657bd0fb633ba64c4330bfa37638435240dbf33e3438810296096adc280699526a04a4c23cb
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150624.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150624.ebuild
new file mode 100644
index 0000000..b879f72
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150624.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans D-Light Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-06-24_00-01-56/zip/netbeans-trunk-nightly-201506240001-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/DF1C6C0A0B03BC0147D215D01DA34F2E5DC13245-fs_server-1.0.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.dlight -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+        pushd "${S}" >/dev/null || die
+        ln -s "${DISTDIR}"/DF1C6C0A0B03BC0147D215D01DA34F2E5DC13245-fs_server-1.0.zip dlight.remote.impl/external/fs_server-1.0.zip || die
+        popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/dlight >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/dlight$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/dlight
+}

diff --git a/dev-java/netbeans-enterprise/ChangeLog b/dev-java/netbeans-enterprise/ChangeLog
index 91d28b0..9b21750 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_p20150624 (24 Jun 2015)
+
+  24 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-enterprise-9999_p20150624.ebuild:
+  bumped to the latest sources
+
 *netbeans-enterprise-9999_p20150623 (23 Jun 2015)
 
   23 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 6fa233e..4c815e2 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -127,6 +127,7 @@ DIST netbeans-trunk-nightly-201506180001-src.zip 207938768 SHA256 2dd02e87aaeabc
 DIST netbeans-trunk-nightly-201506190001-src.zip 207946096 SHA256 5efc0e1a1e9c0321958cb784f65aaf2a804049b3412eb4da7d26018d073c90bf SHA512 80a5b8eeb4dcde61072d9a7e69e08c95fdcc903c5a6165361545fe48e9053056a0861deac96684743f2ef4899777277cf320fd320c21ba9de2eb4dad11c365c9 WHIRLPOOL 0c3395a48fde0a83b4400078e046dd9129ce43922b35f61cfc913d3b4ff6857b2bb81267b55c3fd29a44e8f8663eb3480c5b382c557eb3706bca6ec960358953
 DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d64768e171b41b9164dfe43922947325e7f96ca9c95f73961bd5ae SHA512 b7cfd9b0c0e557bfd5bda998cbe910a7193402fc44bce07d00c97edabbd50fff14d9f28fff4ac169a6aeef965db7acf4939db18ca9aefea8b09e1885b7b83a21 WHIRLPOOL c105483067cdcde190cea21475c96b7ad272533a9e20fabcf4a45a97fdf7ac7252d8422cd6a6ccbc986aab7fa6fb8f35436acfdc7723f158eac771b4e1a229fc
 DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
+DIST netbeans-trunk-nightly-201506240001-src.zip 207969165 SHA256 c59efebe690e08dd20cf83322141bb5b984755b67ab400fa87e9ec0fdcfe1d15 SHA512 1b6007d583cb82f0380736c57048fa0ab77944fd066cf8d643e7dc016049ea73f811b440386631ac8c50d08016d1d1bee015ccfed452c12e504518f1005cfeb9 WHIRLPOOL 8d0a362d61f5e8f57e9bad9c11add5ffc0bae4321302c4a5ab17786a3443d68041211db7f4cafe1f20c174e54b9e0525a7b85fea163751ae4a6efa4386109679
 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
@@ -159,5 +160,6 @@ EBUILD netbeans-enterprise-9999_p20150618.ebuild 15937 SHA256 8ab6fe3af92c4c4ff1
 EBUILD netbeans-enterprise-9999_p20150619.ebuild 15937 SHA256 9a5089a5528103c1c5dba41f154cf62aa64779ab124c214d743d170855a3be9d SHA512 0d71a1e2e37e4a59dbe6c9403d648264aeb37c9a35676741d0d2b11f4d4f393a816a641bf57f64b7321cfe994fe5d1cf7319752287b6843a6cf58a0c84f8ead3 WHIRLPOOL 4dde778720cb18a25561fded5aa14a06ab4c285df293549a86e216a2cc5ffc436e1bdb4db30ae379fe6a3422696ca0d296e1eb093216c53dea74963c5073a89e
 EBUILD netbeans-enterprise-9999_p20150622.ebuild 15937 SHA256 553cc4267b2f764078db17f85e01c14593247d4ab5b4a933318f1f16eb0e415a SHA512 857902dc48dad3b66872ad877351317271cbd4189a70ab65fa6fb002435312dcc29a1536e80a8fbbadf1cda72e08d6966fac822885f91a4a0b655a2b80cbfa54 WHIRLPOOL d93f81f81a4f0f6c62a899818839deb6bcac8fa6fdcb9a72b76b8ae65c5e7522d610a0e98440e4edcbadb0afaacb186652b64c0d0257493526259ee63eb416fc
 EBUILD netbeans-enterprise-9999_p20150623.ebuild 15937 SHA256 1d8efdc54fa71fa498bf6d070fe69d7ad632ce9039e2ca560633809e94096866 SHA512 51cf05407054872aaed969d6834da649e61edcd3d6fad0189e9674b54ce5692dc71710e883aca6c5550602710632c095289fd3884cfd3176edb9a399a6191fe8 WHIRLPOOL c65b5aaefaf0126dbee18ef36e2c00e56adf97fc46e821688001b800ab08c156b2fb56f6b3990ff5cf4bf7740b8d1dcf5ed7cf79e16eee70d7cb965d385efa3b
-MISC ChangeLog 177101 SHA256 cb4f3537afcfb33421beb3cfb4c02222709c945fad12aed749083a22012af079 SHA512 55842d02e8220448f6fc8ec4800efd711bf9ef6604dfdd23b014fff10113a21cc56e05d44345915223e244ab3d793ab7dc39654400e523df91ae9ffda4eec750 WHIRLPOOL 9115687db7347068788b9a456fcd439e3450ae74e4cf94ff2424d4129873cd68807ef74b36e4ce34d11bbe0aa5458f7078fb6d14a9cddbf7d7fe9d5bf1256b30
+EBUILD netbeans-enterprise-9999_p20150624.ebuild 15937 SHA256 142179795f1fb1362d22ded2b54001440426d2feefa4573d5cee586e4c293705 SHA512 eba2296b17f1b2baf76c86dc8fc100a78eb9095adf3b6fb7474835de132f8c2a80151e97e9879bb964986bd03da7a2f84df4aa0d5c86fa0bbf6b6e38cd9e3de6 WHIRLPOOL 67be4e1c22f13fe3970ed186c682bc7e74e37a4a4ad91e9db24af3a3860f0993f3ee964d0f278ee51ea5fb00527cd4e2e8f24c135821a9e9ce4fcefd094af76f
+MISC ChangeLog 177282 SHA256 c4414c9341754b751e50fe6590e0772c1e5c5310aa61b6067d6c0ee3d3b55da1 SHA512 586bc1b0898937c3bbe1fa79cf0e3c9c995409036a170abd15415d31f0bc791e58dbaf9ccc471b7f1532759e2a66cf0a3adafd434a94be9379ee02ae75ec95bf WHIRLPOOL faadcc0c46ead3a94240441de3972511abf4e70e3864511af0b5763de7690518345ffce15f1d0e7e7637d7ab0d8c14cdd02a3fdc6428b89f479f6194acffbf17
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 30d2a4f..b718f9f 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201506180001-src.zip 207938768 SHA256 2dd02e87aaeabc
 DIST netbeans-trunk-nightly-201506190001-src.zip 207946096 SHA256 5efc0e1a1e9c0321958cb784f65aaf2a804049b3412eb4da7d26018d073c90bf SHA512 80a5b8eeb4dcde61072d9a7e69e08c95fdcc903c5a6165361545fe48e9053056a0861deac96684743f2ef4899777277cf320fd320c21ba9de2eb4dad11c365c9 WHIRLPOOL 0c3395a48fde0a83b4400078e046dd9129ce43922b35f61cfc913d3b4ff6857b2bb81267b55c3fd29a44e8f8663eb3480c5b382c557eb3706bca6ec960358953
 DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d64768e171b41b9164dfe43922947325e7f96ca9c95f73961bd5ae SHA512 b7cfd9b0c0e557bfd5bda998cbe910a7193402fc44bce07d00c97edabbd50fff14d9f28fff4ac169a6aeef965db7acf4939db18ca9aefea8b09e1885b7b83a21 WHIRLPOOL c105483067cdcde190cea21475c96b7ad272533a9e20fabcf4a45a97fdf7ac7252d8422cd6a6ccbc986aab7fa6fb8f35436acfdc7723f158eac771b4e1a229fc
 DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
+DIST netbeans-trunk-nightly-201506240001-src.zip 207969165 SHA256 c59efebe690e08dd20cf83322141bb5b984755b67ab400fa87e9ec0fdcfe1d15 SHA512 1b6007d583cb82f0380736c57048fa0ab77944fd066cf8d643e7dc016049ea73f811b440386631ac8c50d08016d1d1bee015ccfed452c12e504518f1005cfeb9 WHIRLPOOL 8d0a362d61f5e8f57e9bad9c11add5ffc0bae4321302c4a5ab17786a3443d68041211db7f4cafe1f20c174e54b9e0525a7b85fea163751ae4a6efa4386109679
 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
@@ -70,5 +71,6 @@ EBUILD netbeans-ergonomics-9999_p20150618.ebuild 2919 SHA256 0892d9dc18861a7da08
 EBUILD netbeans-ergonomics-9999_p20150619.ebuild 2919 SHA256 36561513c737ce9f8a1f3fd82732b119bc740d3e517bb5e83cc216c0d920d55e SHA512 2bb072a3d82385caf873a87ff0537f18965f2cb0d202504457f49bbc21831f39b556ab20c0204282fa558575cc9b20c470a1062baf4c4f6f0dba6bb4ec357aaf WHIRLPOOL 0f8a5c3133a64ec90f0979c28f20f0719bbc095acbffbc8452a5ccf69de4bd4968a89fe76dd0775d81b7c241644efb106092404d2d2d143c8cb3c408fe8dfda1
 EBUILD netbeans-ergonomics-9999_p20150622.ebuild 2919 SHA256 8da3e419b1d99804f3d6bc50455c70d4adb2fdc51446505d495d0a444c751ed7 SHA512 affd09bf2a993613bccde89fbc3784b1dfb2093b786f83ef3336d2a5649c64ea2e9022e433388134324a7f1fa950fd79898e37bdbebde4437b2ab3df40b85f0d WHIRLPOOL 71de681f76c869b22f947a089730a5b8e44582ccedea3c77b301a13969a86592dd6b7a6da2fc94b4a651ce50eb11ed6338b7c87439a1fd0a24c801b277b531eb
 EBUILD netbeans-ergonomics-9999_p20150623.ebuild 2919 SHA256 087ceaa07b425a532efc2bd8ccd971c06ff9d296775cbb6e68758734e2516bc9 SHA512 9c22ca4638195e1fb3c5a6d142487bada6abbbb99983627fc9d5b94f0dcc6a97e247474fe64d82b8337c7e284ec809c88aac6f86e7ee6b6ecbcef3bb642ca34a WHIRLPOOL 87cd7d8bac43a7dacacee6c5785233ccf683242e9adb597e5d84fc1ecdc14892bea44be82fbea626239dcd780a9af2e8b1421b77f18a957db67737becdad1c72
-MISC ChangeLog 176576 SHA256 7e148ccc9deccbd56f85d112918694bf6bf2bf0035298bb5fddfbae8db49fa93 SHA512 ee2d9a0255c3ef8dd3587a69b950513962a4f503b68857197e13648abe2a2d62fe41b8c6327fcc3222752ab09d3f126519f24aacb9fbda33651b0dfd81ca3aeb WHIRLPOOL 41fc6cbe835153df2defc9161283a0fdcc178c165e0c3f61e90323c9341826a4ee9980aa9d99671fb80bd226daae1c30b21e6696941d1fcaa3433e2151a6b135
+EBUILD netbeans-ergonomics-9999_p20150624.ebuild 2919 SHA256 a47078ed54d952c1fa788a6c88aef504950d2cbc3fd2fcdd55ec0b5a23b8e192 SHA512 ea0a10f09c1af3a0ae649f6d6398f195261ca616a692bdd1a716257c0957df08a958f4dc45012afdef0d422427d1887182931e2c7e42a4502d60cf0ff856f3f4 WHIRLPOOL c93bd19ad2930925ec10eef2e19cf5738c1e6402432345f3ba4591054f24fca7fe8b99e7c144a3a7cb362d00c00ea2f46b57e184d6905cd4e3fb38710d8741b3
+MISC ChangeLog 176757 SHA256 135f9763f59ea76c5f5cf1a47af3f7ba38b3a17b4eb5313bf894da8fa6b85e23 SHA512 606e4e802b85d658bcbc8d69ddef5beb1cdba66fd1772a9bc315639c842603d3ec898314370e75b0bc1cb063cad8048b322720693bcbb00dade55c5af55deeaf WHIRLPOOL 2277f720cfaee28fa86535a454dfb2a391c04a7e663e765b1cc51ec6a6536e309fa85d5bd7605661da847101ed383565bbca2ece0e19db1caaecb8d894fbb6ba
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index ad0a5dd..7936a8b 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201506180001-src.zip 207938768 SHA256 2dd02e87aaeabc
 DIST netbeans-trunk-nightly-201506190001-src.zip 207946096 SHA256 5efc0e1a1e9c0321958cb784f65aaf2a804049b3412eb4da7d26018d073c90bf SHA512 80a5b8eeb4dcde61072d9a7e69e08c95fdcc903c5a6165361545fe48e9053056a0861deac96684743f2ef4899777277cf320fd320c21ba9de2eb4dad11c365c9 WHIRLPOOL 0c3395a48fde0a83b4400078e046dd9129ce43922b35f61cfc913d3b4ff6857b2bb81267b55c3fd29a44e8f8663eb3480c5b382c557eb3706bca6ec960358953
 DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d64768e171b41b9164dfe43922947325e7f96ca9c95f73961bd5ae SHA512 b7cfd9b0c0e557bfd5bda998cbe910a7193402fc44bce07d00c97edabbd50fff14d9f28fff4ac169a6aeef965db7acf4939db18ca9aefea8b09e1885b7b83a21 WHIRLPOOL c105483067cdcde190cea21475c96b7ad272533a9e20fabcf4a45a97fdf7ac7252d8422cd6a6ccbc986aab7fa6fb8f35436acfdc7723f158eac771b4e1a229fc
 DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
+DIST netbeans-trunk-nightly-201506240001-src.zip 207969165 SHA256 c59efebe690e08dd20cf83322141bb5b984755b67ab400fa87e9ec0fdcfe1d15 SHA512 1b6007d583cb82f0380736c57048fa0ab77944fd066cf8d643e7dc016049ea73f811b440386631ac8c50d08016d1d1bee015ccfed452c12e504518f1005cfeb9 WHIRLPOOL 8d0a362d61f5e8f57e9bad9c11add5ffc0bae4321302c4a5ab17786a3443d68041211db7f4cafe1f20c174e54b9e0525a7b85fea163751ae4a6efa4386109679
 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
@@ -64,5 +65,6 @@ EBUILD netbeans-extide-9999_p20150618.ebuild 3383 SHA256 9f87ffa058c7847c0814eee
 EBUILD netbeans-extide-9999_p20150619.ebuild 3383 SHA256 45520261a44b6416c3c2cce31247c7a20405d2eb025f76b6fd774920724d9acb SHA512 3285210a064ab7d97d1e1d03d57faea51217a39bd2c9f1b08dbd064326ef98819dabd0087f710d010adce7b84ee490ad0faa607479fbe989d38787d37410ee3e WHIRLPOOL 1528579e0e2cfd9cfdb1b039b423206387e49af25c6171ee0f186c72086214b25d72d897c71b9ee17890cf4c7b3482556922db5df4492516b7b7ffbf0572285b
 EBUILD netbeans-extide-9999_p20150622.ebuild 3383 SHA256 aa494307b06e0be42731c46a4d13cce00648d435325edeb1b197c5a60e05f426 SHA512 b7dae23938b76f920805f02a5ea0f1b97a63302b6d833bbbf60581914c8949c333c5d26ce1245e649425b60e945c0e3acdde59f4e4cf581a3f2bc65f20f277f9 WHIRLPOOL 66262495a67f1e2e1f53416d06880bbbec8e540509e6be7340daf2cac9f8d60dcc00448aa66ace3824f1eff17bf0938bff8f3571d9e5729b16c91fd15954296a
 EBUILD netbeans-extide-9999_p20150623.ebuild 3383 SHA256 c498b22167a52f98b69b8e53d5547c90f0177228f85252465c386a63e57fab0a SHA512 47ac2a62be72a52965445738587b87e484c292f983e6d87f7002bec85018135fce7bde09304f7a05bdf2fdbbca87f39477f37ea15e9f43c5c0564b9992b6a418 WHIRLPOOL af11dbf88874e0599d597733fee1f8f5465d4f9a40cb09de832b634cea6016267cd244e4ac77abb14ea554ef4365421ff8e0443799dba582ebf526b38920fcf8
-MISC ChangeLog 100115 SHA256 3d546bf34035151b294793a383e07ba19bddda45fadcf1160d3e511d16f442bb SHA512 9a5854b1083459a1ec3ccfeb3d6f4bd53d0fffe8eea973a102c56e0b230aecb3d0048c75dbfc8a63bfaf8dd39cd2d3ad75e9535da69ef2322ef2aa54993342ed WHIRLPOOL 05186f00f88f36009c29448cd704523d3bd8d2c4fd7fc6d20ab9817905df1b87bbc905e8795dd9943e2050b63d739c501d17bfaec31fa6f86cf2acff66c38d91
+EBUILD netbeans-extide-9999_p20150624.ebuild 3383 SHA256 9380c0d85ba704aa097dd7a0b15ca94706ca4ab173aa875df9cc871787d24cb3 SHA512 6e65e77276adbeda5d3472b92a74d98b05f5485deab91be53dab4aea76004672409bb19561b329f32f96fdac0041b694bc44c0b7679941190387717e03c2aa50 WHIRLPOOL 00a7f25bf809100ffccaabc3db87c2d5788fa107f2054e329c11d9d1c1f24019175a8555850ef479bce04f8a7c8514ec5ac9c7331abb4b5a6e109a4c4baf72c1
+MISC ChangeLog 100288 SHA256 04c36e21fdee3f61ccfe3c9ae83dea4a2cc99d68f1ef3d193315c47e77f4536e SHA512 2b3bbde835f7892e2845925e4f0a57963ccd345e3fa18fac0a0d7efdbde8496497ad3bda1da2da49e9734c51af4fe59e99aaf1b299663af0e763b0bb86611314 WHIRLPOOL 3feefe27fe69177066356a6e6ac9469a059ebdc57717b549ecae1250a7d03b61410f10883e7c2e2cc73ef9eefa3177d28ed98b27e4855a24280d01d0458c9cfe
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index 83d82c6..c443ed2 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -42,6 +42,7 @@ DIST netbeans-trunk-nightly-201506180001-src.zip 207938768 SHA256 2dd02e87aaeabc
 DIST netbeans-trunk-nightly-201506190001-src.zip 207946096 SHA256 5efc0e1a1e9c0321958cb784f65aaf2a804049b3412eb4da7d26018d073c90bf SHA512 80a5b8eeb4dcde61072d9a7e69e08c95fdcc903c5a6165361545fe48e9053056a0861deac96684743f2ef4899777277cf320fd320c21ba9de2eb4dad11c365c9 WHIRLPOOL 0c3395a48fde0a83b4400078e046dd9129ce43922b35f61cfc913d3b4ff6857b2bb81267b55c3fd29a44e8f8663eb3480c5b382c557eb3706bca6ec960358953
 DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d64768e171b41b9164dfe43922947325e7f96ca9c95f73961bd5ae SHA512 b7cfd9b0c0e557bfd5bda998cbe910a7193402fc44bce07d00c97edabbd50fff14d9f28fff4ac169a6aeef965db7acf4939db18ca9aefea8b09e1885b7b83a21 WHIRLPOOL c105483067cdcde190cea21475c96b7ad272533a9e20fabcf4a45a97fdf7ac7252d8422cd6a6ccbc986aab7fa6fb8f35436acfdc7723f158eac771b4e1a229fc
 DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
+DIST netbeans-trunk-nightly-201506240001-src.zip 207969165 SHA256 c59efebe690e08dd20cf83322141bb5b984755b67ab400fa87e9ec0fdcfe1d15 SHA512 1b6007d583cb82f0380736c57048fa0ab77944fd066cf8d643e7dc016049ea73f811b440386631ac8c50d08016d1d1bee015ccfed452c12e504518f1005cfeb9 WHIRLPOOL 8d0a362d61f5e8f57e9bad9c11add5ffc0bae4321302c4a5ab17786a3443d68041211db7f4cafe1f20c174e54b9e0525a7b85fea163751ae4a6efa4386109679
 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
@@ -74,5 +75,6 @@ EBUILD netbeans-groovy-9999_p20150618.ebuild 3422 SHA256 f9f5fdae5fa693c17124413
 EBUILD netbeans-groovy-9999_p20150619.ebuild 3422 SHA256 904fe44e35c313ec6aa73cf759b3115823e04465678753e8c254c155705fb2ef SHA512 d3cf7d15babdb93122ec1f12cd3ce422c6725da34fad0139491e2324874be3812379d4ec0b9aa693c381cd4e7a5f32445aaf7b8dfc4f9038cc09f7e256f9ffed WHIRLPOOL 2386816e7f0449429a5363c82a09bcca481f7e86b927ea33565f5060fdc162f0601c0cddf27b75d18ba3635072b2e8722bd7eed2f3e7c64e4316060aaaec0ed4
 EBUILD netbeans-groovy-9999_p20150622.ebuild 3422 SHA256 539222c0376c3e77a01877505864bc03b1456235caaf73e3c418f6c49d7a5044 SHA512 e5d6555ca1bc2f27bc6781a1fffbf58cea3ad4c70db315c65e009ca2dde99e4a86fe6cb279813eb4000d68f1b738516b4af4e9a8ef90e4020547b02dceeddf91 WHIRLPOOL 79798674360373edc1d7bf0b5e7fac984c664a15668c9b067ec59e7478f970349e1e37b1f92b622da2f8963a12382e0ca0b89bc2c9c910557d504398fe4d27a3
 EBUILD netbeans-groovy-9999_p20150623.ebuild 3422 SHA256 5d01889ef49edb266f8cd09946311a055f512f9b1f6a26b55339a19f0f532797 SHA512 3e071072ec9d3e495d51a991888e1efd6386d8375ed4516f5c5b7466bd79660c3b031f5efeabc3de1e0aac93273f5cf44fed583952d3f314da8c83df577e0aba WHIRLPOOL f9a34054f588fc90c5ad4ca4f90866121a3b7f4add9e38e5ce41652fdeb75ff61d488d3906568e23187734cefd3c889ea4fb8b26c62b3aa6173921ac578edb9e
-MISC ChangeLog 168095 SHA256 e66920521b39fb47e33af84c73f5ac9f6dfff0a690549a200cc7fe9a93dbbaa5 SHA512 3456327de0e373f984058a5828c4640daa8dbee0cae04e165e9a219050ec1384533c21cad6b8038db9fb68b1f118d0170a9a97f411c2fccaac04df77b9c5eb1c WHIRLPOOL 4eaecc14407da12533c5cb3b0660c5b7d2aad4a59cb795c7d16683e96cc821342ddc62a7d6172b579539c008e746fc8e8f6e2427762376a7c9c398666bcc2357
+EBUILD netbeans-groovy-9999_p20150624.ebuild 3422 SHA256 f18870c680fccc5852bae13ca1801de412585cd601ab042a48e71a1d63d89301 SHA512 8cf356216fd2779a436e436b72cf14898c743978227bc16ca10192e86b6f32f889589292733d02771a9470cde5ca68933b997fe42526fb86ba568e4ce4eb1884 WHIRLPOOL cf02068a23430e551ffd9b3244635a7db1244510f3004912bfc87cbef6800d1bc8c15ed94fc0ab3b0169336a57e635685a6c48034d66defcff7e5dbd4ef47427
+MISC ChangeLog 168268 SHA256 583c77997830e9f62bcff21dd959f17d7f95428acc913790b69a7d9fcc745b38 SHA512 c1027a89dc2c09350723ce0b4ebe4ccaf81d45c64da2eb58ba1a897b5494b9bfe0c0258f0bf2b0e850c1a9a43e36cad577a4ffa32a4d5291a320532ee60336ba WHIRLPOOL 8593f6dfc00f588a100c256041eddac9d33bd62680dd42732f07f151813d7a35d5f812fe9400a21a8707277448d7b9d3a38bb94d32528b59386682e807bca0ff
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 16a26d8..9135bba 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -44,6 +44,7 @@ DIST netbeans-trunk-nightly-201506180001-src.zip 207938768 SHA256 2dd02e87aaeabc
 DIST netbeans-trunk-nightly-201506190001-src.zip 207946096 SHA256 5efc0e1a1e9c0321958cb784f65aaf2a804049b3412eb4da7d26018d073c90bf SHA512 80a5b8eeb4dcde61072d9a7e69e08c95fdcc903c5a6165361545fe48e9053056a0861deac96684743f2ef4899777277cf320fd320c21ba9de2eb4dad11c365c9 WHIRLPOOL 0c3395a48fde0a83b4400078e046dd9129ce43922b35f61cfc913d3b4ff6857b2bb81267b55c3fd29a44e8f8663eb3480c5b382c557eb3706bca6ec960358953
 DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d64768e171b41b9164dfe43922947325e7f96ca9c95f73961bd5ae SHA512 b7cfd9b0c0e557bfd5bda998cbe910a7193402fc44bce07d00c97edabbd50fff14d9f28fff4ac169a6aeef965db7acf4939db18ca9aefea8b09e1885b7b83a21 WHIRLPOOL c105483067cdcde190cea21475c96b7ad272533a9e20fabcf4a45a97fdf7ac7252d8422cd6a6ccbc986aab7fa6fb8f35436acfdc7723f158eac771b4e1a229fc
 DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
+DIST netbeans-trunk-nightly-201506240001-src.zip 207969165 SHA256 c59efebe690e08dd20cf83322141bb5b984755b67ab400fa87e9ec0fdcfe1d15 SHA512 1b6007d583cb82f0380736c57048fa0ab77944fd066cf8d643e7dc016049ea73f811b440386631ac8c50d08016d1d1bee015ccfed452c12e504518f1005cfeb9 WHIRLPOOL 8d0a362d61f5e8f57e9bad9c11add5ffc0bae4321302c4a5ab17786a3443d68041211db7f4cafe1f20c174e54b9e0525a7b85fea163751ae4a6efa4386109679
 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
@@ -76,5 +77,6 @@ EBUILD netbeans-harness-9999_p20150618.ebuild 4131 SHA256 053532d252d74c63b1701f
 EBUILD netbeans-harness-9999_p20150619.ebuild 4131 SHA256 cf050c8975800de8108b4628295985b15fff0231a94fc6925761daee7a4080c2 SHA512 1e56536830c99562504d42621c495f053e824d19852b616802a50e8cbaeaccd15326234ee3a241a4cc441135303dc9d5a60d3495c9374aaea3eeadfe42d0708b WHIRLPOOL 9f041430e5d445785127a62f411454f937be1469fbc9fbbc473def3f944c699e058554efd0ae32b39838454bb76bd25238d6ea253374727fd97d6a56d4036417
 EBUILD netbeans-harness-9999_p20150622.ebuild 4131 SHA256 9aa81d2a5ba42bd4060f6b3ffed9ec01aa7bf4d620500e67cf3a5c719c6338fc SHA512 c5995a04c5df0cbe3d562a7f11e20c029c21cfb231ffdfcd19abb0d538e71ad6a710b3d20c82bb388ec16a06785ad5af65cc96c7f0ea65d3b9c490981e0840d0 WHIRLPOOL b010b9dffed2b9f2fcb2b20550a55d3e9da033d11dbf8b17eb12a8d10c4bb10a768bad2afd12afe488d44279b8ad089ac6f5a500529be7bccf864a6703d02f6e
 EBUILD netbeans-harness-9999_p20150623.ebuild 4131 SHA256 1f68cc88fca77963b04400e450bd2d646f6919a5c2a106574549f00434c7aee0 SHA512 4e71bd35b514815874db23b330871c93bc4c0a82dff398e54d62386b5520646dd35c51056ddf3335912834d6f3c00310eb505eeee13ae2d589f7e6b65b732e9c WHIRLPOOL 1ce0b289e93d33b9a112ee42d1379c5d1eca05c7ad0975af2d5a32fad0a8f7a49e27cd7e85da678dc8466476ad4763278fa44147369e8fedd9f7f92d8d004b18
-MISC ChangeLog 170244 SHA256 1dc2979ba750b615757e0861ec2c36f9b22c3383169e4b18656f5842feb3a4f5 SHA512 25da614d320462ba3ee5ef7fc42e9b1fe28fa90e62942b5be87eb68e7b63823959f4ace26cbd8276092fb47311eb43e0bd4897218f16db5de42b49c0e6bc22b7 WHIRLPOOL 47b7cc0081b6905a337a2526e3e7dcc5cf82554e158ba5d2dde17382d0e5d17c2b1f41da5c86720481d4e42950e8f7749ef87016d8165b1ecfb4b5aa8746fe6e
+EBUILD netbeans-harness-9999_p20150624.ebuild 4131 SHA256 87e6e72d89be5c1bbac5af87f8aaadac17359956402ae021c00c39fffbcf2820 SHA512 09c8145c007f3d7f06fccfcbce5841bdd2788142ca2b42267348eb544af79b4746d92d022bb1bfaa571357427404d741aa9fe4816cd168bcc20fa03c86affbba WHIRLPOOL 8b213dccc2030a34633d68c7facad25e16e7554c24d492ce07797a3d92d517047aec09fec374bd54ef1d6dd706db0f3c40fd9b29fc31dd013d6d6efd71806f43
+MISC ChangeLog 170419 SHA256 063b634dbf826310f945ab5eb9bb96b448a0b3b232ef4d7811cae48528a8463c SHA512 0274901b9097774aba5d5ea6953e359a9c57207db6365b07b7372a947a75495093d594c27eb7b528ac54abb6085ea5eb82dce974a28bd74224270088962a6429 WHIRLPOOL a8515b89687168dc5c92a80006492c322fe1696f7c43db4b0dda314a5e1c84c88f78945b9de191fd056b855d4b2af997183297c6508dcd48929adefe5e5ee094
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 51fe2f0..d236c4f 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -248,6 +248,7 @@ DIST netbeans-trunk-nightly-201506180001-src.zip 207938768 SHA256 2dd02e87aaeabc
 DIST netbeans-trunk-nightly-201506190001-src.zip 207946096 SHA256 5efc0e1a1e9c0321958cb784f65aaf2a804049b3412eb4da7d26018d073c90bf SHA512 80a5b8eeb4dcde61072d9a7e69e08c95fdcc903c5a6165361545fe48e9053056a0861deac96684743f2ef4899777277cf320fd320c21ba9de2eb4dad11c365c9 WHIRLPOOL 0c3395a48fde0a83b4400078e046dd9129ce43922b35f61cfc913d3b4ff6857b2bb81267b55c3fd29a44e8f8663eb3480c5b382c557eb3706bca6ec960358953
 DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d64768e171b41b9164dfe43922947325e7f96ca9c95f73961bd5ae SHA512 b7cfd9b0c0e557bfd5bda998cbe910a7193402fc44bce07d00c97edabbd50fff14d9f28fff4ac169a6aeef965db7acf4939db18ca9aefea8b09e1885b7b83a21 WHIRLPOOL c105483067cdcde190cea21475c96b7ad272533a9e20fabcf4a45a97fdf7ac7252d8422cd6a6ccbc986aab7fa6fb8f35436acfdc7723f158eac771b4e1a229fc
 DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
+DIST netbeans-trunk-nightly-201506240001-src.zip 207969165 SHA256 c59efebe690e08dd20cf83322141bb5b984755b67ab400fa87e9ec0fdcfe1d15 SHA512 1b6007d583cb82f0380736c57048fa0ab77944fd066cf8d643e7dc016049ea73f811b440386631ac8c50d08016d1d1bee015ccfed452c12e504518f1005cfeb9 WHIRLPOOL 8d0a362d61f5e8f57e9bad9c11add5ffc0bae4321302c4a5ab17786a3443d68041211db7f4cafe1f20c174e54b9e0525a7b85fea163751ae4a6efa4386109679
 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
@@ -282,5 +283,6 @@ EBUILD netbeans-ide-9999_p20150618.ebuild 30352 SHA256 ab774f8edd05a8166b689b9ad
 EBUILD netbeans-ide-9999_p20150619.ebuild 30352 SHA256 699737c86fb0e1025f15bfd7d714881b25ff065c1e6597aefa40daca8bb5f579 SHA512 3a8401f0b3e3d8f22fe5b7e178e5242e7894f8e672bcbfb7835293cfed0a48bb6d101c97ada35de2c2641120c87929b57052e4af0a2b119b7f924d372c350cd1 WHIRLPOOL 9b2a5d165e5f8081081b729c8f72bf845bc7517a1971f81258a47016ff657abb74b758460ef0ace23e30c521c51aea994fdee45722d9c584ab2dbd794750f303
 EBUILD netbeans-ide-9999_p20150622.ebuild 30352 SHA256 8e4d2e4f4f33361adff639a0b457abd0d4121988efc2d1eb0af969dca4163e0a SHA512 87a763b8a33f7a34fd3e051020bfb5cd828a47f365c4e64f77546ee3e07f54df30d7da40a2776884519174ef32b0b3d796d9896a5bb14c863945bcd2e39d2b0e WHIRLPOOL 5ba7f76413354fd8a71ff0f6c5f394f27a7a747352ef15cd28206fc196d6b3785e6d01e52277f792d5ecc2d6aa83cc2cb82dfbb87659041a4b15dd9313228e13
 EBUILD netbeans-ide-9999_p20150623.ebuild 30352 SHA256 a957ba66af43cb0590a9545d2ca9e99925a7d3e859bfa29ba15e77106f4263e7 SHA512 28e92e6f5d489bcb4b149f5b8a731cfb6b41413f76f2e1c13fd97bffd7cb25d9bae762f543e55f1e4d3f154172f23dcffb41a842eff52a9edce2f0e7eb0fd1a3 WHIRLPOOL 6fa6a8cada06684bb43d96c3936d4942fd963d5cbb0b2824e482bf5bff1db2e17eb0dcb4680a9ee6647f8311fd9d3cae607969467c96f1317d95e87d7c81df0a
-MISC ChangeLog 162076 SHA256 2003e157914989682ef93fdfaa01fac39546f63055f53d9f684e2237600c9894 SHA512 01bff0e633470a07e68fd8fd6c65f605faad2f8205755050d2ebc84e8f9b2c7d8950bf89189aa14286bfced06f27fbe9d7695ef279315d0d26d0bf539351ee83 WHIRLPOOL 07efad72ea52e1ab6020c2e2edeb816c97dc77edf6a89f1e1e7d0215f2663082ff798c9b00c539b52961f3c83bbba122c58e0113298279682a8f43d90c656c3e
+EBUILD netbeans-ide-9999_p20150624.ebuild 30352 SHA256 3dbbc95fcd8e1449f100eac6863d19d72a99ff84aa7a444a27b8d4087f97b110 SHA512 f731fa250e913c3effff9825f9c4f92062855653067c7a3700b9991bd00ac6b0de5ea21048ce0e250fefcdeadb095f929eb2e99856c621bde9cdec60871dbca7 WHIRLPOOL ec084429be657cadcc83e15c8f01e484707e686d780b6e4bf272f330f3b3d6b81424ad248bdad5ef2abde18069cb370b8102e0fd94cd3c1335e95fe33d1f3f67
+MISC ChangeLog 162243 SHA256 100341f83868bd741b3207695b05ca7d4715f8dd8bcb135ce0dbb54faf20bef1 SHA512 4bdd0a68a6fe70ce0cc7061c3b78aeaaef8dce398e77168038dcb5188287ca9d2ce4b1974f1fe511c7f81daec37e38d027fd70ec3be9198ea0470b7289fa66dc WHIRLPOOL 2534aa3b9974db7dd7f03b00d1a162f4729398e9cd7316d43561fa347048e9be8bba5abc14d0bd896249fa6ec3f7c5e3e613f9f6b0f9a2b4b52630d524bf39cd
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-java/ChangeLog b/dev-java/netbeans-java/ChangeLog
index c663d07..5172cbe 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_p20150624 (24 Jun 2015)
+
+  24 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-java-9999_p20150624.ebuild:
+  bumped to the latest sources
+
 *netbeans-java-9999_p20150623 (23 Jun 2015)
 
   23 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 29d26f0..0cb6ecb 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -119,6 +119,7 @@ DIST netbeans-trunk-nightly-201506180001-src.zip 207938768 SHA256 2dd02e87aaeabc
 DIST netbeans-trunk-nightly-201506190001-src.zip 207946096 SHA256 5efc0e1a1e9c0321958cb784f65aaf2a804049b3412eb4da7d26018d073c90bf SHA512 80a5b8eeb4dcde61072d9a7e69e08c95fdcc903c5a6165361545fe48e9053056a0861deac96684743f2ef4899777277cf320fd320c21ba9de2eb4dad11c365c9 WHIRLPOOL 0c3395a48fde0a83b4400078e046dd9129ce43922b35f61cfc913d3b4ff6857b2bb81267b55c3fd29a44e8f8663eb3480c5b382c557eb3706bca6ec960358953
 DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d64768e171b41b9164dfe43922947325e7f96ca9c95f73961bd5ae SHA512 b7cfd9b0c0e557bfd5bda998cbe910a7193402fc44bce07d00c97edabbd50fff14d9f28fff4ac169a6aeef965db7acf4939db18ca9aefea8b09e1885b7b83a21 WHIRLPOOL c105483067cdcde190cea21475c96b7ad272533a9e20fabcf4a45a97fdf7ac7252d8422cd6a6ccbc986aab7fa6fb8f35436acfdc7723f158eac771b4e1a229fc
 DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
+DIST netbeans-trunk-nightly-201506240001-src.zip 207969165 SHA256 c59efebe690e08dd20cf83322141bb5b984755b67ab400fa87e9ec0fdcfe1d15 SHA512 1b6007d583cb82f0380736c57048fa0ab77944fd066cf8d643e7dc016049ea73f811b440386631ac8c50d08016d1d1bee015ccfed452c12e504518f1005cfeb9 WHIRLPOOL 8d0a362d61f5e8f57e9bad9c11add5ffc0bae4321302c4a5ab17786a3443d68041211db7f4cafe1f20c174e54b9e0525a7b85fea163751ae4a6efa4386109679
 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
@@ -154,5 +155,6 @@ EBUILD netbeans-java-9999_p20150618.ebuild 14580 SHA256 10643d7390023c67096c7a70
 EBUILD netbeans-java-9999_p20150619.ebuild 14580 SHA256 4cfdda657af0a9f21dc84de33a1e3ea6675016bf98b3bbc5eef0c82f2fe21de0 SHA512 5f0643d9705ca99fb47a7db4d0e39290457809dc43a716cb2d3538032ad3bae6402b19f56af8a7dd453ea122c9f8467e60f511f8310191220119693e93e6f992 WHIRLPOOL b6166eaa8fbf96dce7b238e51cd77f78f8e510bf15ec48252335b59580af9e451e2a0d04fa7061012572f601355b3a6c7c5dbd667f4eb2bd8dca6f09c652ba1f
 EBUILD netbeans-java-9999_p20150622.ebuild 14580 SHA256 24604e42d0e9d1ce1ee2e898440a49ca2a5703e5c122534c6fb4222b65aa6b63 SHA512 3458b4ddf09bf80a4f4ee8a2a124273616619a6afbf8484845814d686e13ef4ae433c7217c0c5b87e8588e0e98b47830bea24b246aa636f0f7d3b4a1674dbde6 WHIRLPOOL 772e5d76b58892be22c8a296a7e6354ea8ac5350c9a01eb4f3fee4b5544543b1cff1f5122e1a58d49142603ea5cb70e8a82e2278592841fc642d4f14a11c824c
 EBUILD netbeans-java-9999_p20150623.ebuild 14580 SHA256 258048e7ed2f6925e14d13d83338ed5970912586e8c2e13deb2ef1d4db0a6f4b SHA512 d4adc703a66552021ad1925903c95b9a2f5eab412183a123eaee91b192d2dc0ab0402b50891a9005ce5dbf8428c1c69e343493bab7cfebb3ad871e010d390ba8 WHIRLPOOL 5cd318fb121c31154a952550d85b2e861903a49e32622795ecabbca254ac1e33dde849d9ebd4b597b604cb52d6230dda0635d86cf2ca8301eae2f7ca31af63e7
-MISC ChangeLog 165490 SHA256 b53b7a6eb51b65caaf531b5224ea73cf620fbc69c2696fc65dd65f285f798948 SHA512 e785143e806ad45bdfacac32a311e0933cd9d3392ef7e73680bc213b41a8f0d0a7ad91c09c8486192559833cd02b8b7d0e1e2f9e7401be7149c3f1325769a0e3 WHIRLPOOL 4d9d484342acf77e1d2a15b157e233fd34eabb59303fa702bd0d2647c9ecd3b65470207720b33915236432e20d3d0477e4aa7d79858ac04bde4308aaee1b816d
+EBUILD netbeans-java-9999_p20150624.ebuild 14580 SHA256 e8ef9d13edc37950e8ea0949975ac1bae293fbea560003df00e8dc1d209d34df SHA512 3014719f5165651feae3a0058fb260235ef37b26d6bc2b4f438155cfca1df4cca92bb9303dada57e8fdf4128fed822a9c6b571885a626ed68ed8117e8742aa8d WHIRLPOOL 6db38828a839ade2d3bbc6d13c86fb970b94369e3db895c6012d7313526ae1a230d29e0e04ba8f1f1574a2d093cb73d7f8d82750dfa7fd9dcaeca0e01296e135
+MISC ChangeLog 165659 SHA256 e20bff6d85748f4da8c0f031821f034a947b93df8b6fff7eb6ef5b8f3606dda6 SHA512 bd22bb4d57c7fd7939a6d4c6746592dbae10ebc534cd8919ae35c9442f2b99a758c2a9d992ea47042c5ee7fc5c55a4e77fc9f75278c86e783f47034b5a799279 WHIRLPOOL 81ce982b245ecf38984064994f807bf1ac5db1c3af4e01815723884922c25bb8d460746dadf114a51f3574115b43b9eeb00a36cedfbb62572f4fddf5e65b176e
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-javacard/ChangeLog b/dev-java/netbeans-javacard/ChangeLog
index 2a597da..f2122b5 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_p20150624 (24 Jun 2015)
+
+  24 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javacard-9999_p20150624.ebuild:
+  bumped to the latest sources
+
 *netbeans-javacard-9999_p20150623 (23 Jun 2015)
 
   23 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index 75b4a62..6f2792d 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -41,6 +41,7 @@ DIST netbeans-trunk-nightly-201506180001-src.zip 207938768 SHA256 2dd02e87aaeabc
 DIST netbeans-trunk-nightly-201506190001-src.zip 207946096 SHA256 5efc0e1a1e9c0321958cb784f65aaf2a804049b3412eb4da7d26018d073c90bf SHA512 80a5b8eeb4dcde61072d9a7e69e08c95fdcc903c5a6165361545fe48e9053056a0861deac96684743f2ef4899777277cf320fd320c21ba9de2eb4dad11c365c9 WHIRLPOOL 0c3395a48fde0a83b4400078e046dd9129ce43922b35f61cfc913d3b4ff6857b2bb81267b55c3fd29a44e8f8663eb3480c5b382c557eb3706bca6ec960358953
 DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d64768e171b41b9164dfe43922947325e7f96ca9c95f73961bd5ae SHA512 b7cfd9b0c0e557bfd5bda998cbe910a7193402fc44bce07d00c97edabbd50fff14d9f28fff4ac169a6aeef965db7acf4939db18ca9aefea8b09e1885b7b83a21 WHIRLPOOL c105483067cdcde190cea21475c96b7ad272533a9e20fabcf4a45a97fdf7ac7252d8422cd6a6ccbc986aab7fa6fb8f35436acfdc7723f158eac771b4e1a229fc
 DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
+DIST netbeans-trunk-nightly-201506240001-src.zip 207969165 SHA256 c59efebe690e08dd20cf83322141bb5b984755b67ab400fa87e9ec0fdcfe1d15 SHA512 1b6007d583cb82f0380736c57048fa0ab77944fd066cf8d643e7dc016049ea73f811b440386631ac8c50d08016d1d1bee015ccfed452c12e504518f1005cfeb9 WHIRLPOOL 8d0a362d61f5e8f57e9bad9c11add5ffc0bae4321302c4a5ab17786a3443d68041211db7f4cafe1f20c174e54b9e0525a7b85fea163751ae4a6efa4386109679
 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
@@ -73,5 +74,6 @@ EBUILD netbeans-javacard-9999_p20150618.ebuild 4982 SHA256 5a9e1ea46d22d7000b19e
 EBUILD netbeans-javacard-9999_p20150619.ebuild 4982 SHA256 0ae776d18ebcae5d1de363b9516ebb364d5ddb86d92dac91fb052bd808c1e804 SHA512 87a436f878d010ad8007d173766f796eacfb2ec5bf54e9347730f0f9628d36c55358063e2b0f9800be70a7cd4da04b7eeaf9dcff8d823cba4a87845989648767 WHIRLPOOL 8f6a40b560efe717181bf25f7fba750b63c807dccf232da145dd2d224ca9b7a305e62d4896c84ee33d162a619db60f0402c9daec9ce7f641142e9dd478c46cea
 EBUILD netbeans-javacard-9999_p20150622.ebuild 4982 SHA256 f735867bccfea50fc245bcf14816cc4db5bb5507fa85ce01a2ee82b959ab6ebe SHA512 5bed776927ca66309fa4b44e6db90cfb28d7ab38367b6322d08bdd3b17a045a0f487b78a84a484a59ebec78b9ec7e3bab8ed5394a53f2e63c87e3b1422485cc7 WHIRLPOOL 0814ce221e3bbe538a42f9de580a72517cd45ff761e298be2fe442f57f1a6b5234de5f44c00c52e8c68d28f5c3ef3b9d6fbf6394a0580a95f58daee356eab0fe
 EBUILD netbeans-javacard-9999_p20150623.ebuild 4982 SHA256 ae8d81378ae0a749b093e2f6e49f3984cc5c2b3c4e6ae24c95de411c2cd6bddf SHA512 c6936e4f97efeab5411090b008a404a633c25fdc08a573435a7e97cdcf4ab8dc067a8bbd129053ecb902e5bb5e0147a89b43b553cdb094458578003eae6f3788 WHIRLPOOL 202e6e3b8fc63ef22e328fce638b5d0db90869d57f24c1c7cb86b9d040d39324d6e6dc4596aae57735ed4f78b45defd9311ad22b9af826db07e3f21f2a5888b1
-MISC ChangeLog 172393 SHA256 e6a4efaf10968a4da549f294110495c45419372183ff6e0c816b4b8fd89ad4d2 SHA512 5ad46e93ade5a4440dd153a0319044f41b78381af80274f0e4bee84f7aae6a85a1f7d9bc2f0958fab056a805dac762aac1028518af7e439a7c47c8cce0710944 WHIRLPOOL 71dae5de11a3f86bbde64541596ec8927fba9e6f3cd6b86450b89ef372abeb744972b7f3973239ac5c1339374137dc16929dcfd206c13721521badb422e49b82
+EBUILD netbeans-javacard-9999_p20150624.ebuild 4982 SHA256 776dbe8f2e26e665a09b7a54ebd9ac107778e83b7dc5896ed8e049f773d665fa SHA512 26da13dff0ab0ad1f28723397fb1a4c80b93720dd015c0be35bdbfb77632f1e9fbba7b072b91d2a6ba9b5e59128ed436ddc0e8ad3e3276e15b7f05c498174e6f WHIRLPOOL cacc99ef79140a470e9fe118156d6981c54ce8a9bfd60bee81c4abddbb75e382a2ca4cefd37ec155b5bde55cee9d4f2c1b3226130d601638bce35a578f2a8fd4
+MISC ChangeLog 172570 SHA256 11e47223313aee12f77ee72e5d8da3bce23b0d82b7f6ed4f06fa8e571a24efd4 SHA512 2f2a88b1f8077f02256eebb788e86b527403a8bab093070c419618644590fa5ff4e0b4e39bc5ee28f539cd86c9c2ce01583822814bd05ff48c120fcfb0d8614d WHIRLPOOL a0d42789a5b863d85cb7e4760d8f7588db63d701d5bad4d6824577965eb4b0d6e2683e2001ff7b27de13d6d452c04f3b46d12062f01486c737cb89ca2d7b7b3a
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index c979919..f317588 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -44,6 +44,7 @@ DIST netbeans-trunk-nightly-201506180001-src.zip 207938768 SHA256 2dd02e87aaeabc
 DIST netbeans-trunk-nightly-201506190001-src.zip 207946096 SHA256 5efc0e1a1e9c0321958cb784f65aaf2a804049b3412eb4da7d26018d073c90bf SHA512 80a5b8eeb4dcde61072d9a7e69e08c95fdcc903c5a6165361545fe48e9053056a0861deac96684743f2ef4899777277cf320fd320c21ba9de2eb4dad11c365c9 WHIRLPOOL 0c3395a48fde0a83b4400078e046dd9129ce43922b35f61cfc913d3b4ff6857b2bb81267b55c3fd29a44e8f8663eb3480c5b382c557eb3706bca6ec960358953
 DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d64768e171b41b9164dfe43922947325e7f96ca9c95f73961bd5ae SHA512 b7cfd9b0c0e557bfd5bda998cbe910a7193402fc44bce07d00c97edabbd50fff14d9f28fff4ac169a6aeef965db7acf4939db18ca9aefea8b09e1885b7b83a21 WHIRLPOOL c105483067cdcde190cea21475c96b7ad272533a9e20fabcf4a45a97fdf7ac7252d8422cd6a6ccbc986aab7fa6fb8f35436acfdc7723f158eac771b4e1a229fc
 DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
+DIST netbeans-trunk-nightly-201506240001-src.zip 207969165 SHA256 c59efebe690e08dd20cf83322141bb5b984755b67ab400fa87e9ec0fdcfe1d15 SHA512 1b6007d583cb82f0380736c57048fa0ab77944fd066cf8d643e7dc016049ea73f811b440386631ac8c50d08016d1d1bee015ccfed452c12e504518f1005cfeb9 WHIRLPOOL 8d0a362d61f5e8f57e9bad9c11add5ffc0bae4321302c4a5ab17786a3443d68041211db7f4cafe1f20c174e54b9e0525a7b85fea163751ae4a6efa4386109679
 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
@@ -76,5 +77,6 @@ EBUILD netbeans-javadoc-9999_p20150618.ebuild 6234 SHA256 54b492a5ff9fb89c8e6fc8
 EBUILD netbeans-javadoc-9999_p20150619.ebuild 6234 SHA256 e1a5a3405299344ac995c29ac75b3ef350ff47d4cfe3d9e1b28e50ab972c4257 SHA512 ca6fa34dbe0bc6fcd87a28fc6f0263d36acad8c90402447c36f218aaca4be83b479dea61ff986cbd6f4d9ae4e67fc29df5f1f0730508b264daa315d1fa356c8e WHIRLPOOL 5b2f73ad0228320c55e949a40ec8149791151c1b03c6c428ea9d3435525c18eb3b48452813d8fb77234eeaf2bbd5c4950e008251c54862edfe13b5a8f9d20ad7
 EBUILD netbeans-javadoc-9999_p20150622.ebuild 6234 SHA256 741fc0a8d00bcd19850f4fb0f4f4654c21ee744dea56818113b8dc57619889ed SHA512 82c988b2f6b9260fa45d3dc575628cdc2f39f0f60020a1b7ec6044e6b1764cb73dc802c72baf39d2a579e2819cb29f242178070be071f9d1978ef23b09c33e0a WHIRLPOOL 5dbb75a93762eddcfa02d7deb83d084ebaffcea3e20b4c468365c9a5aa38ba26aeeea91577e20622b142045dd8fe5de68740c1267a4dc7d7f16732904e29eabc
 EBUILD netbeans-javadoc-9999_p20150623.ebuild 6234 SHA256 945e7480a12bb433530b2cbe347b1e07c7195ddda1e593ab802921ae8e0cf4da SHA512 64ef41fa0e67ad8f3939b82c154403f162bc14bf1932945ea4896ae0411dd6c04bafc33e3fffc376993c525c851bbf396ec3af854c16da36a747045c857f9a81 WHIRLPOOL 15d361ffecf902fbf5e3b55a94678c706a675311a665d0eaef2f5aaeec0bea179f362cb777290345765290ff3134afd21e4da677c8ab33fb6764e2f7e8842f74
-MISC ChangeLog 170070 SHA256 44fe5220e8c80ac2a6e66349e3caad1f4067606aa4a9a857c91c5cae76f100d7 SHA512 bcc9d47e4d66b7bfa45d7371774994171d884e696f28fc2eb7ce8ab7594a2395e240e2186e0e398e3b0a0fb809b74e0a0ca3fcd37987b16a5e2312c12aa2b5ca WHIRLPOOL 32305760e60daaa67e13b7cad358b5e934bc2e77d7ef66c4eeff459a4eb2da6196ceca828478f7a71f7bfb046c015efb4eaa38a1d3d6945857c7597bf11fedbb
+EBUILD netbeans-javadoc-9999_p20150624.ebuild 6234 SHA256 fed8acf863c0d0f58d2009c03183444ee55539c08a79c595fe869846269cf419 SHA512 55d029f0c6d3c30aacb15a244a08532c7030ba96a781651f36ef8fefcf92bc632613ad6578fdc6d709513ce9e83b80e721f29fa9b2907cc00ca4658d058c46af WHIRLPOOL 86c2d11f307a963b1b299393073eca1607a7b6f1ccfbad28a0ee14b787fa51ef8c3e33a5fc027d04169b95b0e5b6c4df39202d434793acbc72691771719b981e
+MISC ChangeLog 170245 SHA256 d32caa06fce1845d0a7026534ccc51988f9c0202102a2e6dc2d64bb6ef3a5640 SHA512 845d03bb17ccd4bd3701d241cbf767d7f1f82e2772a4dceef7e27b76501672b2e591fe324586152898cabb7ca4d6ca4f16920dab3529b7f326e137734141ace9 WHIRLPOOL 3c7785e839dd2a545e078917fa0095edb475440d849ae5929673f63ee84f9f9d1e671889c82deeec4d2fa10e02c5e26f4cca364051d52810684c63607efea914
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index 3c8b0fd..fd8655d 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -44,6 +44,7 @@ DIST netbeans-trunk-nightly-201506180001-src.zip 207938768 SHA256 2dd02e87aaeabc
 DIST netbeans-trunk-nightly-201506190001-src.zip 207946096 SHA256 5efc0e1a1e9c0321958cb784f65aaf2a804049b3412eb4da7d26018d073c90bf SHA512 80a5b8eeb4dcde61072d9a7e69e08c95fdcc903c5a6165361545fe48e9053056a0861deac96684743f2ef4899777277cf320fd320c21ba9de2eb4dad11c365c9 WHIRLPOOL 0c3395a48fde0a83b4400078e046dd9129ce43922b35f61cfc913d3b4ff6857b2bb81267b55c3fd29a44e8f8663eb3480c5b382c557eb3706bca6ec960358953
 DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d64768e171b41b9164dfe43922947325e7f96ca9c95f73961bd5ae SHA512 b7cfd9b0c0e557bfd5bda998cbe910a7193402fc44bce07d00c97edabbd50fff14d9f28fff4ac169a6aeef965db7acf4939db18ca9aefea8b09e1885b7b83a21 WHIRLPOOL c105483067cdcde190cea21475c96b7ad272533a9e20fabcf4a45a97fdf7ac7252d8422cd6a6ccbc986aab7fa6fb8f35436acfdc7723f158eac771b4e1a229fc
 DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
+DIST netbeans-trunk-nightly-201506240001-src.zip 207969165 SHA256 c59efebe690e08dd20cf83322141bb5b984755b67ab400fa87e9ec0fdcfe1d15 SHA512 1b6007d583cb82f0380736c57048fa0ab77944fd066cf8d643e7dc016049ea73f811b440386631ac8c50d08016d1d1bee015ccfed452c12e504518f1005cfeb9 WHIRLPOOL 8d0a362d61f5e8f57e9bad9c11add5ffc0bae4321302c4a5ab17786a3443d68041211db7f4cafe1f20c174e54b9e0525a7b85fea163751ae4a6efa4386109679
 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
@@ -75,5 +76,6 @@ EBUILD netbeans-javafx-9999_p20150618.ebuild 4723 SHA256 0b291bcd1c70488aa3c49fa
 EBUILD netbeans-javafx-9999_p20150619.ebuild 4723 SHA256 a4ae02f68222e812c1e48fcf60c4f8259642c09d95385cfccd7c44d3c50aa3b5 SHA512 1a1b21ca818b7d3ccbc48fc37b7c3ae5f50c6c4505cf0b5659deec15bb7ebba74dae72c7cd6119189bbf3ec6fadc427306102618a2a68b9e6e91803af3201e3f WHIRLPOOL 658b2960dd7a8e726c6620f09a0845a4b9e110d6fc74f19b819090f9f3c2ded440fda38be3a5ed67ad0e4869c735c3250560880da2741b989de1e8b0f9912b7f
 EBUILD netbeans-javafx-9999_p20150622.ebuild 4723 SHA256 a958c7c5ed32d17a2f8a7aeeabe9d9c3fba67d065d97aa46eb0a5bcaca66d15d SHA512 74ed45e1f4b3829503766fbff230b1e93132be45c511b80ff6d6beacf5789196150ed9c72418a0d3e72aab5df505b36ef315a8e8243f32af9a46c113921127fb WHIRLPOOL 176baaa7588ac436134fc15a79508df6b31322d1c278fbdcb758e27e82af5143dc4fca19177114d33021ba6247e0d75b4541e8a9a37e91d795efe6ba473d2625
 EBUILD netbeans-javafx-9999_p20150623.ebuild 4723 SHA256 43d90e935df3e49353f9b86d4aee56b1c8972e755e552254d92738acf61b1a3c SHA512 86355dcad9b925c8d78578e531c163e4eec7b840165c8dd2aad6b79d363e25b0a5359428c2cfb6467514ee9ab653210a4eaa62aee78440541ef4a92349f1d413 WHIRLPOOL ae78143d619ad69aa10693e99035c17f96c864ee011cdc59f180e4cab7a8efe93d312611b324f432ef32f6b89cf940f2761321bfc7921be4ba840d23bf1662e4
-MISC ChangeLog 154614 SHA256 ae23b9b44994a7692b0913189d6d0d877ecd081d7a483271edf9deb7b1fa73a9 SHA512 013c00de0a83fe9b2079833e9d6b00c088929775d8a1dd8ec27f8bff2a70a0bd499a3c7024925f85505fb9851d864fb55027acd8ba04a8f2a26df6bba0c774ef WHIRLPOOL 24e41c4677c5ee0ad23765ef8309843c54f1a6f39fb1a220b570c2af3b2a893e49b70c1d412feb18e7bfb86617b6c2ef98916dc89db5f9d5ac713db6277df008
+EBUILD netbeans-javafx-9999_p20150624.ebuild 4723 SHA256 4dc7fe4498885efa5d412eb1f8a676c7fc6e65aa24172a55dc2f286129c1bc25 SHA512 846221261b11a6b71eeeb8d68c4159547c29a73d823c7763764a5b9c59eb6aa2e126c691841415fdd5dec474f8ca4bbe25ed736ff15254cfdab2a5b2783d8541 WHIRLPOOL 1a13976ca97db2e523f64503d604df1807fd71a70c1a41b1786d6849e176894659dfa7a250ecc12e9a78f57d517659ce2e094e9f9a513201b9fe81d16df0ffdf
+MISC ChangeLog 154787 SHA256 3e50e530645b25be38c6c57cacdbbe6d72b2facb7b79d9c4e9de90737cab39f1 SHA512 02579def4032fe6c5e855ca4a734771e1ab5de7f43e17a14319481d54066eb33370ffdf27141b26aca7dcf84b235d8f3a15fb77094f0978266c524eda2f563e6 WHIRLPOOL aa207331b20132b0313aa7134e0582c44c9bd2b8e94dd6c4ed4a5f8790e50db0df374ef9efe13a65f2dc3d7649db7eba21d950e5c04afa68fd72e6b58fdefce9
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 6b953e0..af2674e 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -47,6 +47,7 @@ DIST netbeans-trunk-nightly-201506180001-src.zip 207938768 SHA256 2dd02e87aaeabc
 DIST netbeans-trunk-nightly-201506190001-src.zip 207946096 SHA256 5efc0e1a1e9c0321958cb784f65aaf2a804049b3412eb4da7d26018d073c90bf SHA512 80a5b8eeb4dcde61072d9a7e69e08c95fdcc903c5a6165361545fe48e9053056a0861deac96684743f2ef4899777277cf320fd320c21ba9de2eb4dad11c365c9 WHIRLPOOL 0c3395a48fde0a83b4400078e046dd9129ce43922b35f61cfc913d3b4ff6857b2bb81267b55c3fd29a44e8f8663eb3480c5b382c557eb3706bca6ec960358953
 DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d64768e171b41b9164dfe43922947325e7f96ca9c95f73961bd5ae SHA512 b7cfd9b0c0e557bfd5bda998cbe910a7193402fc44bce07d00c97edabbd50fff14d9f28fff4ac169a6aeef965db7acf4939db18ca9aefea8b09e1885b7b83a21 WHIRLPOOL c105483067cdcde190cea21475c96b7ad272533a9e20fabcf4a45a97fdf7ac7252d8422cd6a6ccbc986aab7fa6fb8f35436acfdc7723f158eac771b4e1a229fc
 DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
+DIST netbeans-trunk-nightly-201506240001-src.zip 207969165 SHA256 c59efebe690e08dd20cf83322141bb5b984755b67ab400fa87e9ec0fdcfe1d15 SHA512 1b6007d583cb82f0380736c57048fa0ab77944fd066cf8d643e7dc016049ea73f811b440386631ac8c50d08016d1d1bee015ccfed452c12e504518f1005cfeb9 WHIRLPOOL 8d0a362d61f5e8f57e9bad9c11add5ffc0bae4321302c4a5ab17786a3443d68041211db7f4cafe1f20c174e54b9e0525a7b85fea163751ae4a6efa4386109679
 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
@@ -79,5 +80,6 @@ EBUILD netbeans-mobility-9999_p20150618.ebuild 4418 SHA256 6945633a19d51b431334e
 EBUILD netbeans-mobility-9999_p20150619.ebuild 4418 SHA256 051f3b8c515152a704d4188a2e2663fd92e848b9a676e2ac1d202b2f0512bce6 SHA512 70d29230183e636d08bfd173c9908ac8bfd1aa43ca7f605d7b2dbb607a934912f4eff04846576a97182d700c869d43f40df5927a43fb5a318e8e071dfa43aa0e WHIRLPOOL 2ec48d85eb9993f32ee2b13ecb804cef176217ac9440bf3feeeefe2b165272188daf2494c59e62fc27b7e066dbc3b0ef23f4d23b3bda578b8ef25f6d37b6f12e
 EBUILD netbeans-mobility-9999_p20150622.ebuild 4418 SHA256 a49264104713680b693f0a6474ca8696ec5c3fe8e0d467437bbb43f1edcd6a1a SHA512 289445404b6f1041d39551c231274c601f79d7f02253fd65046e4b8c6cd3904ea4c1dd5aba19ea80b8528f0ee6cf0d66d94218412d8c59eac86d2d5864fd991f WHIRLPOOL e590cb19b0b6ed8f75982c97bbcf6bcfac2c6dcf3e82a264c720f404216dbba6fdcbd83c914b62e9652194571a1d932f7f639711614ab78cc75a6f37dfc2a868
 EBUILD netbeans-mobility-9999_p20150623.ebuild 4418 SHA256 64ff0aedcbbdad5d1895a0f51cd57d7ba46654a67ae8828254983c6a94064202 SHA512 785272cb0b97308b13bc086403c7a6e87454c7e8878261ab5382c95e42583d89fc3f70cd30913a18ab068cb6743c24c0b9089d174239115ca7ae5cee74728c12 WHIRLPOOL d8fb9c890728f7670b317e36908b656d7c40e693d0b8ff1f1a228b0f64670bfb5db9c3e478015362373208fd85f6c9bd6ac95dce888eb5052fef57eb923558b5
-MISC ChangeLog 172534 SHA256 d2f22fd01d99cd81908780c56f8a35319f254ae5a5b2203ccd3bb6cab5f6e237 SHA512 a6aac120f7204922f8ef9a9e8c0bc6a38c83c820f3fd1cd1e76f8573c6f530fcd9825da0f66f0b950ee4641f1033ef64b5b40b9dbedf5a8f9b8dc63ad00b66b3 WHIRLPOOL 669545e253e1614a47408890f60f24fd82c751cfdca91c32c8e4aa83e4c099861e0597880715bdeea9dae3042b81abe17abf9a64c6cdfe00f65d02f0564c2f31
+EBUILD netbeans-mobility-9999_p20150624.ebuild 4418 SHA256 171aa21974b15d2d764a76690ccd02d3db1060a0e50f4ba0db6bbe64a96c129e SHA512 4894aaadcafc2a5a2d3539bb2d5d0cc987d7417147d8da006b65f239d26fb79ed0a8179626dbdf74456bac179e6597396515d7e4860ac617386f561f5ca019c0 WHIRLPOOL 4ddbee5633ab50c145d03c843b670f95b6b5f566219d40be358017a10330f0bce087d63c661c0eb433f8a130458237b9fe755152428bfb1c6b2c5baab72956e3
+MISC ChangeLog 172711 SHA256 aeaf5708ab504fcc5e4b77219fd623bf964a85be41e4a94846925f24c3ef4761 SHA512 f12d38eb950bba250c4b87a2428ee8dc83208f2367de0d227bccabda7a9b80855b1373a1ed24cfeb1eb6ae81a0137f71da231835ab77d509a86877184e2fb749 WHIRLPOOL 53d5540a620426c7c0f16a8a6cc6f8a404364f27b70b238a822d028effdf98292ebb8272fcda212390f9527717fbcb49d8d7e6ba551d11face89af5d416cf19b
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index 77c0fde..e927600 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -46,6 +46,7 @@ DIST netbeans-trunk-nightly-201506180001-src.zip 207938768 SHA256 2dd02e87aaeabc
 DIST netbeans-trunk-nightly-201506190001-src.zip 207946096 SHA256 5efc0e1a1e9c0321958cb784f65aaf2a804049b3412eb4da7d26018d073c90bf SHA512 80a5b8eeb4dcde61072d9a7e69e08c95fdcc903c5a6165361545fe48e9053056a0861deac96684743f2ef4899777277cf320fd320c21ba9de2eb4dad11c365c9 WHIRLPOOL 0c3395a48fde0a83b4400078e046dd9129ce43922b35f61cfc913d3b4ff6857b2bb81267b55c3fd29a44e8f8663eb3480c5b382c557eb3706bca6ec960358953
 DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d64768e171b41b9164dfe43922947325e7f96ca9c95f73961bd5ae SHA512 b7cfd9b0c0e557bfd5bda998cbe910a7193402fc44bce07d00c97edabbd50fff14d9f28fff4ac169a6aeef965db7acf4939db18ca9aefea8b09e1885b7b83a21 WHIRLPOOL c105483067cdcde190cea21475c96b7ad272533a9e20fabcf4a45a97fdf7ac7252d8422cd6a6ccbc986aab7fa6fb8f35436acfdc7723f158eac771b4e1a229fc
 DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
+DIST netbeans-trunk-nightly-201506240001-src.zip 207969165 SHA256 c59efebe690e08dd20cf83322141bb5b984755b67ab400fa87e9ec0fdcfe1d15 SHA512 1b6007d583cb82f0380736c57048fa0ab77944fd066cf8d643e7dc016049ea73f811b440386631ac8c50d08016d1d1bee015ccfed452c12e504518f1005cfeb9 WHIRLPOOL 8d0a362d61f5e8f57e9bad9c11add5ffc0bae4321302c4a5ab17786a3443d68041211db7f4cafe1f20c174e54b9e0525a7b85fea163751ae4a6efa4386109679
 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
@@ -78,5 +79,6 @@ EBUILD netbeans-nb-9999_p20150618.ebuild 5003 SHA256 16295082c0858a9c7ba5ee3954d
 EBUILD netbeans-nb-9999_p20150619.ebuild 5003 SHA256 bed9e90b1fd03e6c95748e633270ab2a8cb11c6fe3062dadaf1efbbc62b24ef5 SHA512 d63238287d5135b9bd4abd4823217a7c3ec294555717caba7dc2a36ba8d5dbb8dbba4ef77200dd9fc79342a84703ea948b489f1c300ebad06e6f5bab6f70d5c5 WHIRLPOOL c18d3188804284b0ed1f74fddd2dfe0428d9aeea5c716d8e54d421e76c543ebad68119ee486754722eea2ef460311a86d43d854034f7b38438fbe1499f387fac
 EBUILD netbeans-nb-9999_p20150622.ebuild 5003 SHA256 2c2cc6f5fea254e9637db5c649cc5a5186e60c94e802ae539535cf9fb483efbb SHA512 c135783dca0859eeecd2d0e33dfa4d113baf2aa0d57e7eea8dbdd1edb940923032c370327b450a920e82d55961b4831e3944c78ede0aa2646e6e2a2433831d53 WHIRLPOOL e08354b74fc5dd9ea7235013eb4b9f979e9b580a031463f93088ca83100eb045f53121ab82e5e3498da7da07085f22a79b1bd676468b4ddf838dba40993e2bbc
 EBUILD netbeans-nb-9999_p20150623.ebuild 5003 SHA256 5695da21b2b81c3cf587294c90f190564e16a59184ef46144041e70990e3678d SHA512 6b1233a76d69cbe1a32a7e5a11658144a59f2d2d89245560e00ccfb72dd3a60f7e765e6b55eb1a31b7e5dff1e2d416889725cb2aaccc418807e029df7957ec95 WHIRLPOOL 1b67799dfb54da0133e18e0515ceb192156e5771beb6f39a618d8397f7cfc10f5b5ad492db0062983cbc4b06dcafec4ae2711f94b2c84211dcda62cf4f68afde
-MISC ChangeLog 161124 SHA256 21bad3ea1bb789b1a67aec072628e6ef23064367c270caf8aa7009052dc7a350 SHA512 6dc6a561eee3cfc76a48b3a8e3e5302f04f80cc287722f0fbf48d815fc2be8ae16806af92b87843d5351622184dd51b3fa75bcd3e55eafc06a61d408616794b5 WHIRLPOOL c4574dd5432bc324588b3d229cacffda28002278689a75dd0d3ae76cc25b700cff677a4e85ef35d567ca01744291ce4fe177c2d07e3dfccfc7929fb9c14dc298
+EBUILD netbeans-nb-9999_p20150624.ebuild 5003 SHA256 db488ed91884a6f8533af7c5c85c43ca26d6759bcca9b189319fb782ceba76a9 SHA512 be68e3139ab585eb230e76326eccddf7fa5a2d60cd6ff5f9c2e37fd0934e6054134137838593e222c2db59c5fd5c7c0b38c3bf28be974e57008068189bd0f42f WHIRLPOOL 94ba7afa747719a7831c64c59e8f9c8884c635d07c69fcc43e8868c6b2c4b906ffc058461db34fdd6e5d10c384e8da1aacf7e2524f1978f4b64dbd5d5ff69c0d
+MISC ChangeLog 161289 SHA256 3ece990c1a58a1721f740c79de6489a3433f92240d3a89be6c7ef8309e3c2e12 SHA512 bc0e431298b866001f788dd37d551531676b0cacccae32896822724b3a12af0c1e6004284429bf1a9926b7223c1d89df8295be6491a31fa09ed60b30214bec33 WHIRLPOOL b3d2c6ef821c15106d507d415a73f56d02f814ef055255913e8bd362c5f57441de0f2d86dcd0467b2de36ebd80f4121f174c286fee6ea40a1a6c369b730f99aa
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

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

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index 1a42baa..e819193 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -51,6 +51,7 @@ DIST netbeans-trunk-nightly-201506180001-src.zip 207938768 SHA256 2dd02e87aaeabc
 DIST netbeans-trunk-nightly-201506190001-src.zip 207946096 SHA256 5efc0e1a1e9c0321958cb784f65aaf2a804049b3412eb4da7d26018d073c90bf SHA512 80a5b8eeb4dcde61072d9a7e69e08c95fdcc903c5a6165361545fe48e9053056a0861deac96684743f2ef4899777277cf320fd320c21ba9de2eb4dad11c365c9 WHIRLPOOL 0c3395a48fde0a83b4400078e046dd9129ce43922b35f61cfc913d3b4ff6857b2bb81267b55c3fd29a44e8f8663eb3480c5b382c557eb3706bca6ec960358953
 DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d64768e171b41b9164dfe43922947325e7f96ca9c95f73961bd5ae SHA512 b7cfd9b0c0e557bfd5bda998cbe910a7193402fc44bce07d00c97edabbd50fff14d9f28fff4ac169a6aeef965db7acf4939db18ca9aefea8b09e1885b7b83a21 WHIRLPOOL c105483067cdcde190cea21475c96b7ad272533a9e20fabcf4a45a97fdf7ac7252d8422cd6a6ccbc986aab7fa6fb8f35436acfdc7723f158eac771b4e1a229fc
 DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
+DIST netbeans-trunk-nightly-201506240001-src.zip 207969165 SHA256 c59efebe690e08dd20cf83322141bb5b984755b67ab400fa87e9ec0fdcfe1d15 SHA512 1b6007d583cb82f0380736c57048fa0ab77944fd066cf8d643e7dc016049ea73f811b440386631ac8c50d08016d1d1bee015ccfed452c12e504518f1005cfeb9 WHIRLPOOL 8d0a362d61f5e8f57e9bad9c11add5ffc0bae4321302c4a5ab17786a3443d68041211db7f4cafe1f20c174e54b9e0525a7b85fea163751ae4a6efa4386109679
 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
@@ -83,5 +84,6 @@ EBUILD netbeans-php-9999_p20150618.ebuild 4423 SHA256 9e9ce64db2ef2df173f4d99965
 EBUILD netbeans-php-9999_p20150619.ebuild 4423 SHA256 a90a219c1b36c8128216f667c0d8958109c342bf297ae70fe196eb0d59b649ab SHA512 4ad0e6e4469ed439c24263b21e541763f3a420fa0d6570f37e61462dc033b2221fb02e0d133ae00f119112c2f266b6e96701bba4da5835e129fa8c3e2a34d2b1 WHIRLPOOL 60e3112f20b2820ba93f0682f1d152069dc867ba15d51e1213cfb00aee07cb3afd9f793ead944dcc0061236274271fa7f90f0a94fa2fc714f74484fea652b477
 EBUILD netbeans-php-9999_p20150622.ebuild 4423 SHA256 4682fce5e05fd39786fd8be2b42bd4a83327eda8163535e66de2f3ab112801a9 SHA512 6cb32aff21e8553eacbffe642a2ac74c963c92ec065b97b6bccbc897d9924057405cb25b332caf16f366779d5b3ada2416d66616d2fd69d8c1cb25179a9f3746 WHIRLPOOL 35f48640f8e7f37c7e01074137275556ad3c52852b707c46e7e82749e4e0d05ff6cfca204d2f1bd844c6c574c05ae4898a5ee914b1639f5e95058673cdc9a412
 EBUILD netbeans-php-9999_p20150623.ebuild 4423 SHA256 7ec2838526999ec4a59673776212f11a5ed6d9fd0e2000c52764c8bedfd56112 SHA512 70436da36c54c95ed8fe02d45d8b8c3db82d52b76e287e90e176edfb309b5d0096426e54d2df88abd518d89c5d7effa381ef76f18ba184b8c94d0bf89d85f181 WHIRLPOOL d15018ef173c28788d6be8e3e86f28c7d4841bb9b5f0d42690e585c22665710f735cdbc6e073b9a1e627110e37d4c34053f2ce86583cdf5d01037e91ec8d9fe4
-MISC ChangeLog 160905 SHA256 f03f21ecfc76f7df9ae2234a8d463ee0b0b1fac988293118b4d241751d44572d SHA512 14cb8e0f158628811c0b71415552b6478b88d4b33b5ad4f27fd2b5fb181aead2feee9b18e8c0de707895cfeb253f0f3d0487e492454d0d1b59a6675a2ce06e98 WHIRLPOOL 5ece62f87e252d65d4c8888b90572f71fdcefefb016f31247c250163a35cceb5dfcb0ec019435cec4033c098862e0605a7e8b8586963d323d7fe2f1673ca487e
+EBUILD netbeans-php-9999_p20150624.ebuild 4423 SHA256 7fc5e83a789b0c5c06ecbdb99589899ab369ba999e89a8880c1c96014a6b1937 SHA512 07144c39232951721782d1fed6270e2b1f64ae590cd3fd94ed51f94b482547a5ad49dd3753c2bd87a554ff9fa4956a63de006fe4386dc444ea606dc2d29ee85b WHIRLPOOL 366994d7d3500fd744d12815a5a2136e0d121c069dcd36eb1bc804ee3ab10d4cf14aa5c083109d3fb5dfdda4f84441150c1af5a26578b40586d84e939dc44246
+MISC ChangeLog 161072 SHA256 896e4669a937b204f370859551a479645d41d8ab41b44cb71e690aa159775ae8 SHA512 24fb5ab94de7982da36aa106145bda1d6f2fc2ab89f85a2ebe67a43428c85adcf40d93ab7975e6eaf9f8064b35ca1d164a54d2603adfc6c12e584a2393a97b37 WHIRLPOOL 9785d15cf9e3c401d650bf0499b0c75f45fee3852a2322114b8ddfc4769ae79393b064811ce9d9fe5cfe20723da1304aaa748aff953843f71d08fd395db254bf
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index da831a2..38d8546 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -65,6 +65,7 @@ DIST netbeans-trunk-nightly-201506180001-src.zip 207938768 SHA256 2dd02e87aaeabc
 DIST netbeans-trunk-nightly-201506190001-src.zip 207946096 SHA256 5efc0e1a1e9c0321958cb784f65aaf2a804049b3412eb4da7d26018d073c90bf SHA512 80a5b8eeb4dcde61072d9a7e69e08c95fdcc903c5a6165361545fe48e9053056a0861deac96684743f2ef4899777277cf320fd320c21ba9de2eb4dad11c365c9 WHIRLPOOL 0c3395a48fde0a83b4400078e046dd9129ce43922b35f61cfc913d3b4ff6857b2bb81267b55c3fd29a44e8f8663eb3480c5b382c557eb3706bca6ec960358953
 DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d64768e171b41b9164dfe43922947325e7f96ca9c95f73961bd5ae SHA512 b7cfd9b0c0e557bfd5bda998cbe910a7193402fc44bce07d00c97edabbd50fff14d9f28fff4ac169a6aeef965db7acf4939db18ca9aefea8b09e1885b7b83a21 WHIRLPOOL c105483067cdcde190cea21475c96b7ad272533a9e20fabcf4a45a97fdf7ac7252d8422cd6a6ccbc986aab7fa6fb8f35436acfdc7723f158eac771b4e1a229fc
 DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
+DIST netbeans-trunk-nightly-201506240001-src.zip 207969165 SHA256 c59efebe690e08dd20cf83322141bb5b984755b67ab400fa87e9ec0fdcfe1d15 SHA512 1b6007d583cb82f0380736c57048fa0ab77944fd066cf8d643e7dc016049ea73f811b440386631ac8c50d08016d1d1bee015ccfed452c12e504518f1005cfeb9 WHIRLPOOL 8d0a362d61f5e8f57e9bad9c11add5ffc0bae4321302c4a5ab17786a3443d68041211db7f4cafe1f20c174e54b9e0525a7b85fea163751ae4a6efa4386109679
 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
@@ -97,5 +98,6 @@ EBUILD netbeans-platform-9999_p20150618.ebuild 9244 SHA256 046c36e733bf3b2dc5601
 EBUILD netbeans-platform-9999_p20150619.ebuild 9244 SHA256 7d14f0ad50f1c2a9ea909e7e32a81c97d2732db3bfe3ef8cb32f40de711a1ac1 SHA512 79ea3c5966e20684ebfb3759b78813b194c69827c9dbdbbe65965c3cc473a7f789c54882c26d7927110a5978e8da81b8f8d8fd42812b210199dbf80074379d4f WHIRLPOOL 714f25b2a27e38835b6a1f38dafb3a21e27e8512ae79798bed57425c1513862ce45abd542d1664ac1ce415287590534e608e4188af982d262db2948e7442c1d2
 EBUILD netbeans-platform-9999_p20150622.ebuild 9244 SHA256 e59792820ed01a99633a9accfa5cd1b054c74cae8ef41c91d8310cd87606d0af SHA512 eea097a64988f19185024722c2cfb019ed5fcafd20ef632587c1a20c265e15d1d54084324f0fa60e58657d208a252b7eacc41f7f6b3a0b40fc49bd4e48023576 WHIRLPOOL 052834872cc01758fe31deed61864a94aa04418396ad28eb791369bfede6bfc273a936661b372faacc9b79223eafe24072dc79a4dd3e3069ad31ab997a678bf9
 EBUILD netbeans-platform-9999_p20150623.ebuild 9244 SHA256 3060bfc11247e766c63404bee34ceee585a08819292e436adfe341c9d0114afa SHA512 9261cef23c879d621008eee6b316cf7b5e02b2f629d8cf58c3dd60a6a676523d42eff848706093a115653832f8c1ce17d3d76542252130167b1f1c27838b7799 WHIRLPOOL 474db05f46a19c92dd747e1bf8a6471e864d399331cb6a4fd4ceb085fe88b7b5a6415106f61bdf5fd2172421d2a738187ded9eb9e4a8f3e068e183f9572102ed
-MISC ChangeLog 173130 SHA256 8cf11ee779eaa99d7e1f8c733aca2d4376ea83c06dde37d6d91413d135ef35b2 SHA512 1937dfe8fd6814db1592247f280ff2bc788de4d9e1be14acb592c5e3aa2b2ade88272e519979cd7ab2c4be52943456e0bb3b170093adf5a4e35a06dee40ae20a WHIRLPOOL 3500b293f1b0f4e4fcc27c33e7b06b5d58d0ff3366c73a8f8483066b2d3d5319d269b94ef0532101b9ef8ee167db0d033a3e77d212ca4b8d0ab96e869feb7220
+EBUILD netbeans-platform-9999_p20150624.ebuild 9244 SHA256 10ce4c9aff5422430bda74e5660b34f5b3b0d60dc2d8611baaa7fd447a76547e SHA512 9f19ce7d77a95409d04dbdb82dcdab6e799eb8a9b01e94414e7854e069bd4e621ec6be4c76d84b70056cf3113c7e97faced035e5e68988e8eb8b51b26efba64d WHIRLPOOL f4f01c508d3f8c97a59d85233152490e6fc75f58f48c5cd39cd6d632ef1005bc464885a11376485233ee1114a67c979d877636dbbe7febca9bebf980140dc6e5
+MISC ChangeLog 173307 SHA256 c9a9e1ed6314947c9a2c97d05c2c5a0f33febd5c1ead6a333b16f282f22d65a5 SHA512 0a746b78428226834996aab9308de6c460969ec49a8f2f011b275edb940892f8e2c13d21e782a8b26facf94b92a534065ffce397641ab056ccd6b05c2d71cd3d WHIRLPOOL c0be15fc3f1a5783819ca64e2895696a87040559421ba461fbe4e2000517a41c355987d5fa7adb91090c7b5916b5a13e7948d90a03fff349cd097de2b625dbf2
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 6866e8f..12b245a 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201506180001-src.zip 207938768 SHA256 2dd02e87aaeabc
 DIST netbeans-trunk-nightly-201506190001-src.zip 207946096 SHA256 5efc0e1a1e9c0321958cb784f65aaf2a804049b3412eb4da7d26018d073c90bf SHA512 80a5b8eeb4dcde61072d9a7e69e08c95fdcc903c5a6165361545fe48e9053056a0861deac96684743f2ef4899777277cf320fd320c21ba9de2eb4dad11c365c9 WHIRLPOOL 0c3395a48fde0a83b4400078e046dd9129ce43922b35f61cfc913d3b4ff6857b2bb81267b55c3fd29a44e8f8663eb3480c5b382c557eb3706bca6ec960358953
 DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d64768e171b41b9164dfe43922947325e7f96ca9c95f73961bd5ae SHA512 b7cfd9b0c0e557bfd5bda998cbe910a7193402fc44bce07d00c97edabbd50fff14d9f28fff4ac169a6aeef965db7acf4939db18ca9aefea8b09e1885b7b83a21 WHIRLPOOL c105483067cdcde190cea21475c96b7ad272533a9e20fabcf4a45a97fdf7ac7252d8422cd6a6ccbc986aab7fa6fb8f35436acfdc7723f158eac771b4e1a229fc
 DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
+DIST netbeans-trunk-nightly-201506240001-src.zip 207969165 SHA256 c59efebe690e08dd20cf83322141bb5b984755b67ab400fa87e9ec0fdcfe1d15 SHA512 1b6007d583cb82f0380736c57048fa0ab77944fd066cf8d643e7dc016049ea73f811b440386631ac8c50d08016d1d1bee015ccfed452c12e504518f1005cfeb9 WHIRLPOOL 8d0a362d61f5e8f57e9bad9c11add5ffc0bae4321302c4a5ab17786a3443d68041211db7f4cafe1f20c174e54b9e0525a7b85fea163751ae4a6efa4386109679
 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
@@ -70,5 +71,6 @@ EBUILD netbeans-profiler-9999_p20150618.ebuild 3478 SHA256 f1733ece7027732b6c184
 EBUILD netbeans-profiler-9999_p20150619.ebuild 3478 SHA256 3b8c17cec6b4b9e9398b84729b98387e7926b0199e685ed3b054e05f9094520a SHA512 06161d3b10976c2a710e131c6d399d37922509fa7d32f65452ff622ad3f3d40ea46d9b2cf43c13d08c52c2cf57bc5064b69f6d4bd35f2657be6dc607eac9e90f WHIRLPOOL 7f3394f60312af24f9fed565cf65104f9a0f486a4ac18bc960cc8b0d8c662761420884f5eac67e4906611365501694606d33c78512f1ca02d9ec6885c20f6abc
 EBUILD netbeans-profiler-9999_p20150622.ebuild 3478 SHA256 c3273743b4847a79771dbcbbcebcdf458e916647b99199a46ea65c13982649f6 SHA512 54d2d6a159ff1b4c8dfb0e6161a5ef9fb63258eb1e7b142a4333ba9f4843b9e521ed53cf601e199f5faf3295d3d1eadff20dca6a12c20e0c6fdada70a469fe78 WHIRLPOOL c28866b03c2c77f5428cdd352c53c4b2406bf5831b9790896067934b9782bb9c0a8375ced3ae0468c70f3a60286083b5293875240014a210c92ab2a7fd58e09e
 EBUILD netbeans-profiler-9999_p20150623.ebuild 3478 SHA256 033f524b6223f24efab778cddff8bb79d2ffde04deec10ff1af7a5bf9293690d SHA512 2813514a6163309d082908aa3c109286d97cab9db096140463920cd54e5e3f70e97b7c963c6278bd41e692360cbecbe0dee44b4bbbdfaf843c079ea13aff69c8 WHIRLPOOL b60265f79b33cd5edbe05251661f40ac29a0fb4edba8ad935ec74e12476f36652fef5730a79bbed6bc0b09ae9835efb6b13a6e4ea5102a274a8fe0fc9812fdd8
-MISC ChangeLog 172591 SHA256 20de366c5ad84c18b648c5b45ca7e35583f8fcd4743309604a952ac6b05203a6 SHA512 3a2dff8a47f6df05f19c97de558ea938eb96fe60d2afc5c7c218a171b4868f1df18317790695880da1fb64c0d160c863c026e7da9dee3a3205d8492c7073eed3 WHIRLPOOL bc7cb2f6a33e8531b70f7a805d8ad7d1565fbce3d7b90f00c0c214b87de98351f251ff725729ff9f7acf9697f4b1f39b1409b5f9d0351ed07d97058deb055e02
+EBUILD netbeans-profiler-9999_p20150624.ebuild 3478 SHA256 ba0406e4c2db0c8a9e283cd6b5b6ccdc8b60aea9b1b5904c99f1b45f5dffcd4f SHA512 58d17574521261368c90188a99a478ad2d9d2ba4867ec5b6676f5e3d2b7644ebb095536672c309682e3c06e1be2c17395342d79407c14a05ba6e86ebc2422fcc WHIRLPOOL d7cf8f7aa81c7a6637e384b34576c8d7d92c0b921525ddfd7f54ddc519b3882d5ea845f0c4293a522d7abaca2a171a1c6de08dca119afa20514b8f838ef1a001
+MISC ChangeLog 172768 SHA256 87a2416b413d023d14b951eecbea6b86752bc3fd1d39080ca37956dd339d4b2e SHA512 5d1bd1fb9dcb40da94a23ad475d38e5b3782f442fd61964557a57454a9f05207132fddf4461fa2d52b90f1afad135f8bde30d41972dc20b8c00eb26548233e6a WHIRLPOOL a52c8e2672b964a2b15208344327ac5224e001f425cf8e4b8ddc79e06c7c9bf673cda36a86cf9457d9ceaebe9668c8086c8b5eacf75bd71b880d8d7b8caa6486
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index f6f2887..b3491d8 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -44,6 +44,7 @@ DIST netbeans-trunk-nightly-201506180001-src.zip 207938768 SHA256 2dd02e87aaeabc
 DIST netbeans-trunk-nightly-201506190001-src.zip 207946096 SHA256 5efc0e1a1e9c0321958cb784f65aaf2a804049b3412eb4da7d26018d073c90bf SHA512 80a5b8eeb4dcde61072d9a7e69e08c95fdcc903c5a6165361545fe48e9053056a0861deac96684743f2ef4899777277cf320fd320c21ba9de2eb4dad11c365c9 WHIRLPOOL 0c3395a48fde0a83b4400078e046dd9129ce43922b35f61cfc913d3b4ff6857b2bb81267b55c3fd29a44e8f8663eb3480c5b382c557eb3706bca6ec960358953
 DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d64768e171b41b9164dfe43922947325e7f96ca9c95f73961bd5ae SHA512 b7cfd9b0c0e557bfd5bda998cbe910a7193402fc44bce07d00c97edabbd50fff14d9f28fff4ac169a6aeef965db7acf4939db18ca9aefea8b09e1885b7b83a21 WHIRLPOOL c105483067cdcde190cea21475c96b7ad272533a9e20fabcf4a45a97fdf7ac7252d8422cd6a6ccbc986aab7fa6fb8f35436acfdc7723f158eac771b4e1a229fc
 DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
+DIST netbeans-trunk-nightly-201506240001-src.zip 207969165 SHA256 c59efebe690e08dd20cf83322141bb5b984755b67ab400fa87e9ec0fdcfe1d15 SHA512 1b6007d583cb82f0380736c57048fa0ab77944fd066cf8d643e7dc016049ea73f811b440386631ac8c50d08016d1d1bee015ccfed452c12e504518f1005cfeb9 WHIRLPOOL 8d0a362d61f5e8f57e9bad9c11add5ffc0bae4321302c4a5ab17786a3443d68041211db7f4cafe1f20c174e54b9e0525a7b85fea163751ae4a6efa4386109679
 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
@@ -74,5 +75,6 @@ EBUILD netbeans-webcommon-9999_p20150618.ebuild 4997 SHA256 2674ecefc351277e7874
 EBUILD netbeans-webcommon-9999_p20150619.ebuild 4997 SHA256 4454d668ef4073b706ecad2c5dcecd8ce32dbf5a2d7893a2f795d3439c2efc33 SHA512 9356f53c767962964605f6b0cdd137104aed0941f5ae2d1b468b3619b1b55116edfb4b5d4b6b98fb72a10e4b1b2c20320fb04ebe9884b7455ed67c3b6c7ad9fd WHIRLPOOL 7e1e9938a4771332da30198abc55ef8aea138a69351ecf89ee5cfa25ee5d02f35f4e3f0c1d2a82441f575f4681a490077387d6a037c98017dca9d7b4447539c7
 EBUILD netbeans-webcommon-9999_p20150622.ebuild 4997 SHA256 dc2258582fc740f4b2a27ad3be86a59a4d7074bfef040ec0ffd861de8cb217ee SHA512 ff1542fe64f93d69cc742167ce61602eaed85e439988868fb78e14f4f79930f49c9596c47d9c1bae6693184f1f580f00e2aa3c9923edc2a3a5488e61dcf57fe3 WHIRLPOOL 34e05c0f646dc0380dc4910adfd01966a1a8dfe2f72e71e11095b795d45034903a89abd6121f8c4dbcd3392800b6944d1f422def7b20969d6b2d3d45a9a07f70
 EBUILD netbeans-webcommon-9999_p20150623.ebuild 4997 SHA256 faf8e44b97ccb871c2ec2ea2d37587bfe06c3a614beff0f680a7d893c009c698 SHA512 07720be89dfae00530e9268323e48a1c137cdd2d41c1e3041c38be61ae153757a64ee029651be6583ddc0701e74fbb50928f4ab4f4c2cacf4c31e1a3f7dd25f2 WHIRLPOOL 7e82597c9ef5bfbc11edc02882ed51d13a2a5d19354b3440e41db0b13213281b892bd480137c61d1794ec5cee73cdb459701ffb2201120a158dc1ef1710bb55f
-MISC ChangeLog 145727 SHA256 a784ca7c3ebea686cb3fd7a15d3b1bcd6e0ae332333c016ffea9bb307674c669 SHA512 d8d7abfe21f74d580c216c3b3eadab6cc2b8c7dcd38dd097d925e10ac36d1e834bee7e72ac9a94cf782887ced0d888c3ffadccb53c792bbd6bb1aae799253a81 WHIRLPOOL 2e3afb8b056bcacc1dd5236ad34663e7ab3342192c9225fa11675988e241bc01e61600b66e43487d34be67d472aa42b87ab315695c14fb786193be45002514c5
+EBUILD netbeans-webcommon-9999_p20150624.ebuild 4997 SHA256 be62498e5a59abead95fd875a9d56b00da18780a84ddf10d640e0173ddefb405 SHA512 0c10a25f7f4d52c4c14fba154553aecd236a20a24ad4ad8b399bf71e75b9da7b97f98a493e2a5af567f271970af8628bc0364aeb0813b1cde1fdd64f6907bcdb WHIRLPOOL b3455776fd01e5ed39d754a4e1157f79b3efdad882abf82698aa5a0d47a2a01bc83c7e29a1d08093b3dfdae4e9378c5000bb426c39bf27c10f34855677f60395
+MISC ChangeLog 145906 SHA256 d894b1b6b5c8db9f9336cfeed5baf1195d0245a60c5e018d277a09245bebe6e7 SHA512 133699b1d06622640ebf0f49885df6685e8773a3822b06ea5649e75a06ad705fe669efbbc930ccb2a862fce76bee0b7070d173a5b7886896b8b8e7eebea9c2f6 WHIRLPOOL 1a4dfa606d233785a0340752002a9f57c722481594bf04fcd057131b7f941f384e2583c35044e9c8743f923aae074a9e514539d66021fd8af32d1e3b83193b4b
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 5ba9fca..da6739e 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201506180001-src.zip 207938768 SHA256 2dd02e87aaeabc
 DIST netbeans-trunk-nightly-201506190001-src.zip 207946096 SHA256 5efc0e1a1e9c0321958cb784f65aaf2a804049b3412eb4da7d26018d073c90bf SHA512 80a5b8eeb4dcde61072d9a7e69e08c95fdcc903c5a6165361545fe48e9053056a0861deac96684743f2ef4899777277cf320fd320c21ba9de2eb4dad11c365c9 WHIRLPOOL 0c3395a48fde0a83b4400078e046dd9129ce43922b35f61cfc913d3b4ff6857b2bb81267b55c3fd29a44e8f8663eb3480c5b382c557eb3706bca6ec960358953
 DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d64768e171b41b9164dfe43922947325e7f96ca9c95f73961bd5ae SHA512 b7cfd9b0c0e557bfd5bda998cbe910a7193402fc44bce07d00c97edabbd50fff14d9f28fff4ac169a6aeef965db7acf4939db18ca9aefea8b09e1885b7b83a21 WHIRLPOOL c105483067cdcde190cea21475c96b7ad272533a9e20fabcf4a45a97fdf7ac7252d8422cd6a6ccbc986aab7fa6fb8f35436acfdc7723f158eac771b4e1a229fc
 DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
+DIST netbeans-trunk-nightly-201506240001-src.zip 207969165 SHA256 c59efebe690e08dd20cf83322141bb5b984755b67ab400fa87e9ec0fdcfe1d15 SHA512 1b6007d583cb82f0380736c57048fa0ab77944fd066cf8d643e7dc016049ea73f811b440386631ac8c50d08016d1d1bee015ccfed452c12e504518f1005cfeb9 WHIRLPOOL 8d0a362d61f5e8f57e9bad9c11add5ffc0bae4321302c4a5ab17786a3443d68041211db7f4cafe1f20c174e54b9e0525a7b85fea163751ae4a6efa4386109679
 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
@@ -71,5 +72,6 @@ EBUILD netbeans-websvccommon-9999_p20150618.ebuild 2727 SHA256 caa0da8d02beb6889
 EBUILD netbeans-websvccommon-9999_p20150619.ebuild 2727 SHA256 411b35ac74f948280b6c120f7ba69d96298fc20797869bcfa50246a2ba4a4715 SHA512 bdb29a69b2a4484a4a6871148f86c1901e02a9a31ad9c4fea0489fd5ea255453f9db45969d78efdf706ffeb4f690a63d761d1ac5f24e39d4d80955923363621f WHIRLPOOL 3a1fe0f1a6140a639b36976931e95afacfe64bf8c9900d2d500e21a0a32289524d3969808d3f78019b6026d9b0a05cfad17d3a80eed66936db584c7ac8132689
 EBUILD netbeans-websvccommon-9999_p20150622.ebuild 2727 SHA256 626b4908237c30b4189f96af550b8753c107956c5db693179439b0317b081082 SHA512 1049451a4c48e83cf330c41e78847214f283e7f6757959d2e73d495a153ac7d3582b8b954262046d386e697312d6192cb08aed568d0be8e6fb7259cc257409ca WHIRLPOOL a1c1282110a272561e326798e1d443abb3871f7e5748f7167bb6bb3926de0a131f305381a83a94f4bc2b607711745dde3e4a28027e3726c79eca175bddebd435
 EBUILD netbeans-websvccommon-9999_p20150623.ebuild 2727 SHA256 3cb41c7858bb52b2f7462c8c9d28cc2472c050a5aaf36d5e2f1dc97b253cd8cb SHA512 eaa443502c3b782894767bdf3d5cb62bcaa136e716326f4e62379c4f74217badd1637f3fb5ba5684d54eeec99c579030027391bbaa9018aac072308bfe726d90 WHIRLPOOL b7d38514410ea3e385cec2210ef6ce3177efed4772d97bfeab6c0dc37114fba8ed2bc44e86945654b91c22a803510e08ce0afbe2e9cffc632004ff18954fac35
-MISC ChangeLog 180889 SHA256 86235305b36fc0fa84a7f23ae28d8972ffd822f0008bee1691cb857bad23c96b SHA512 b63e95c1184c5d6bb8e772b50b10fc3e66e83ff25295c506f4d6a6a6ac2223b0f99ceeb6516779a547be72366b5c5e8339e74e394f382b9765395f6c34cdd055 WHIRLPOOL 26a58c252813ea672a0b08025d87863b58a6dfa5ff49b80faaa68ac68103650447527a2716175cf0a3cbfb928060545fbb19ecbdcfe56ea79b7aab9ae5fdb374
+EBUILD netbeans-websvccommon-9999_p20150624.ebuild 2727 SHA256 8b927ec218b16e9b193d82c3901b79465911878d4b25bfb9de13460de51b4c73 SHA512 ab34bffcfedb23cbd15078b8ae274ef9b89f60a8a1ea11409514c167eec1c499bbd63a222a422a5458f5acb84884aaee140dc2473b0d08573ba2f486b18daeb1 WHIRLPOOL c4fda4e9d64543219984869322c00c3b32bd91c0736f93333b9c8f447c91ef9595ee14e3f467b7e7f49cf42aa7ada8c38d3e3351f6dc62ca68f2bedcc049b30f
+MISC ChangeLog 181074 SHA256 2410a2154819b68492dbd0715967bc9f42e94b59cf4cfff4ccea19ec73005a43 SHA512 ea578b0abd4b83d0d1596bf590ed550f505e5b42044bfc4b7fab9b5135c11b0c8f95993744c0678d6ce05dbbe3b6512287ec58c089e9ebb463d17470997205aa WHIRLPOOL ab0f7e41ebbe2014838d61c6d0d1319d1d6dc4a38eb00f65dfcecd8810634cba03b5613cee76bd72cbdbdc8eec7589fd60f547305a59a7cee01f6927ebca6c78
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 3419100..66704f8 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -46,6 +46,7 @@ DIST netbeans-trunk-nightly-201506180001-src.zip 207938768 SHA256 2dd02e87aaeabc
 DIST netbeans-trunk-nightly-201506190001-src.zip 207946096 SHA256 5efc0e1a1e9c0321958cb784f65aaf2a804049b3412eb4da7d26018d073c90bf SHA512 80a5b8eeb4dcde61072d9a7e69e08c95fdcc903c5a6165361545fe48e9053056a0861deac96684743f2ef4899777277cf320fd320c21ba9de2eb4dad11c365c9 WHIRLPOOL 0c3395a48fde0a83b4400078e046dd9129ce43922b35f61cfc913d3b4ff6857b2bb81267b55c3fd29a44e8f8663eb3480c5b382c557eb3706bca6ec960358953
 DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d64768e171b41b9164dfe43922947325e7f96ca9c95f73961bd5ae SHA512 b7cfd9b0c0e557bfd5bda998cbe910a7193402fc44bce07d00c97edabbd50fff14d9f28fff4ac169a6aeef965db7acf4939db18ca9aefea8b09e1885b7b83a21 WHIRLPOOL c105483067cdcde190cea21475c96b7ad272533a9e20fabcf4a45a97fdf7ac7252d8422cd6a6ccbc986aab7fa6fb8f35436acfdc7723f158eac771b4e1a229fc
 DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
+DIST netbeans-trunk-nightly-201506240001-src.zip 207969165 SHA256 c59efebe690e08dd20cf83322141bb5b984755b67ab400fa87e9ec0fdcfe1d15 SHA512 1b6007d583cb82f0380736c57048fa0ab77944fd066cf8d643e7dc016049ea73f811b440386631ac8c50d08016d1d1bee015ccfed452c12e504518f1005cfeb9 WHIRLPOOL 8d0a362d61f5e8f57e9bad9c11add5ffc0bae4321302c4a5ab17786a3443d68041211db7f4cafe1f20c174e54b9e0525a7b85fea163751ae4a6efa4386109679
 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
@@ -78,5 +79,6 @@ EBUILD netbeans-9999_p20150618.ebuild 7216 SHA256 00abce2134882984bc727768ab577d
 EBUILD netbeans-9999_p20150619.ebuild 7216 SHA256 b99ca970c74329c6a19ecc992c8cc71134291f339c8861619b2024e2269ca0fa SHA512 e3b1236eff36ee0c0cb0b22f3c3469a297df94bf22cd7721db75c48580c9150292a6e244db0f48efb4bee57515de31355061e7a47d90b277354299ed9b4bd62e WHIRLPOOL 47afcddd46a8394fc1789bd5fe312f97023a92bbe75b90c9e5ca21389856cc1b46426238d48bea4d000480b091416bfd18eb87aa1657c01844db3c82e105177e
 EBUILD netbeans-9999_p20150622.ebuild 7216 SHA256 85df1dfe57fb936b3049e70447d6c23d69995fd54699a3feea635c462b4b41f9 SHA512 083843ed02d3ea9a635a688a7934d39688d8d638db0e7ede24bac732de7a488371fda61ce5b7668a0011ca94bb9c08371296f39a901c6ca4884bd8e7f4213897 WHIRLPOOL a3ad44239632961d35c9f03e003768cc749a557013e626c9c104ccbe94d221542e0d2a169a701a9d03dc3442581784317deba6608214c054cbf7a2f79ec38983
 EBUILD netbeans-9999_p20150623.ebuild 7216 SHA256 abaaff082baac7e72c50d5f9846bad7bfa0fea7f87b2b5a0e623805015330d8e SHA512 eef668f3660ba12027e253008f9bc85af466fe30516f44ffc16e87540f22bda7ab6ebf0a0a3950293738478c7a978c1e2695d55bd55a417862cc99533037bffa WHIRLPOOL 637186f87d1642260245436386a7fa5b40f1d910b74d931cd0224ed886f9d005086f5b25e604ece385bd2652f294b6ceee169538b46e4f38e8f60633e2c0f9a2
-MISC ChangeLog 153694 SHA256 d87d753b18c55d6720c6d6f3d3a4b53074f914203b8e7780d4347e7b3846fc5e SHA512 3876a952d8e7ef9ce913e1fb1ca541e6c9aa7f09f2cde06e1286a82372b758fa1f48f93ba1e24b6e4e7683c134449e9525f66f5668bf1d32280234312ce7bcfd WHIRLPOOL 0bbbbe24d8043fc6ea7d9ad0e33d8c39ea4d57e93c09a8919cef3bfbbba9bfcaf179c02863bd4fdf60c414086dc90aca230f8ca4ac16369b8903ef917d047e89
+EBUILD netbeans-9999_p20150624.ebuild 7216 SHA256 693d8d02a4e3e0cc3d4082521bd51f545b537cc094ebeec9929860787ddf382b SHA512 f1b08410cf3255f699ab0e92ccfb97174f19dfde7ad252af6270bd216c4445d9eb1da6d79372a5097f7c5932c661308963d0f88681111545797028d068ef60cb WHIRLPOOL 209f5e268e8e652db5391d806d832b282c37dc99ccfb398c35f10f132fc6e634778b1db6d526f00b82cec5ffa86fe340d059a3bbdaa4e27232a8092c9370b1c7
+MISC ChangeLog 153853 SHA256 b90c7c8c26afe3e980211f86ea1c3ddaa709d96416f8fdd7fcd830565458b214 SHA512 d06e0985ce1e5ab8213a0e1c065d6d159b94ea3e341ae2214e5340855dc295a95718fc306fe6e25771057d7d908109e0e4f9e4eb4c01ebd6558f66e23f5b1eff WHIRLPOOL 2dc5d3d751ddd3c9c4cbaedf46764764d4df7383b8c4e19778a135a0bdab3bb23904f04efdf02e47d6e8155778263959808e534019895bf74b3c9ed543186ce5
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

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

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-javadoc/, dev-java/netbeans-websvccommon/, ...
@ 2015-07-31 17:27 Miroslav Šulc
  0 siblings, 0 replies; 4+ messages in thread
From: Miroslav Šulc @ 2015-07-31 17:27 UTC (permalink / raw
  To: gentoo-commits

commit:     4a7b0c58c7c302cd8519148485d5ceb8b2ea7f11
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 31 17:27:18 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Jul 31 17:27:18 2015 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=4a7b0c58

netbeans: bumped to the latest sources

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

diff --git a/dev-java/netbeans-apisupport/ChangeLog b/dev-java/netbeans-apisupport/ChangeLog
index 1838e51..e3dee2a 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_p20150731 (31 Jul 2015)
+
+  31 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-apisupport-9999_p20150731.ebuild:
+  updated to the latest sources
+
 *netbeans-apisupport-9999_p20150730 (30 Jul 2015)
 
   30 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 1802e34..b835f63 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201507200001-src.zip 208844011 SHA256 d913ef4e2aa53c
 DIST netbeans-trunk-nightly-201507270002-src.zip 208903918 SHA256 522afa33b0389ef48a5deb3c91ba3c4aa1ca4acf710e2c316479e6892aa3d39a SHA512 078b84e423f0769fb1a2c14bb092c50dd2f1901126b5f3c7b11700858c71b43230281799c248eb4198a22fad17f5a7c34baedd3aac241e2d07d91c72a1aad861 WHIRLPOOL ae082652979d1ba8f26a6001e6402f587809b2586406f93e42eb9b7d38e4216e290167888ab5d6836ff9a712d555cec66c9f54afea7ca6171dee6cf56c7c0fdb
 DIST netbeans-trunk-nightly-201507280002-src.zip 208905091 SHA256 502a75b45a6d7c2421fa6629cede99d70bb69b19287083ee9ed9cbcd9540343c SHA512 b94b76f709f931ecc1414eb80c1791bada942e7a6a7b2cebe4749453de1c17f929ba497b961a7ea9837057986a463f1d335dc7f2ab460f99c1fb168604d07196 WHIRLPOOL 119f4bb30844c9655760a23c0a48ddbc5abf32c07652165d508061b70f37861c123127735d14be01f506da65d072701514d5a4adb678fe8748f62762bcda6052
 DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae2846b93e0836ed96caddf2d425df5bab2a004b0417879a36e4dd3 SHA512 04e2e8f58102752a45b089cb70c62e6b920b5397cb427179fb042604eec4a78d6380341ab700e70b9190313ea5fc10fb94471a072fa8ad567e4d652b1fa2c3b6 WHIRLPOOL 153cd8da3506e0e3397a06b4341e90b2dc55170bb432a21d66bf425895deef5bf0611bdb181beefc29fd18648d60b827d9e453bca827c26305f55ffb01319f18
+DIST netbeans-trunk-nightly-201507310002-src.zip 208736792 SHA256 f2794218686a678f2e826bb542663753c97f1b5cf839657ed6540b36d85e0eed SHA512 31cab9432e2668d4a90c99e561faa6a78c89210bd76625e4274c45ff634783967e9170bbd504e60fcd08df88c57b57f5c357f30c9c8dc06d6d0c0ae72f3ef0a3 WHIRLPOOL fccf16a822b7d43c1dd709c2357cb2fa6ec518e291f4f306c5c2aa4838f734ef9d2c800795dde592d17b3685826e00d26611e8b3cc4c68e6ee5332cff9aa7129
 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
@@ -66,5 +67,6 @@ EBUILD netbeans-apisupport-9999_p20150720.ebuild 3390 SHA256 6a46bd788ff98b8e02a
 EBUILD netbeans-apisupport-9999_p20150727.ebuild 3390 SHA256 98d1aaa395813a57422e69ccbc9fe15ea7e6be0500b051da3c153d01f5aaca08 SHA512 71b793f8d81431e283da9970bca0ee8170153103b40e1800f8e549f0f47c0cfdcb9843e040ddb07ca36080671ef6bd308f28a98a329355b937ea2000dc04b2ec WHIRLPOOL 365854a982514b773f57b6a09991360e3dd1e4dff2ded18061e5660b31f0d29a840eba6c6e4f9ee500a42e397c48d5f2452c608c57d3e8d494cb3be9241c0e57
 EBUILD netbeans-apisupport-9999_p20150728.ebuild 3390 SHA256 1adc5f262cb3aa01f7797d774e556f77ac3e00f0fdadd6e5564bf5d8107ad70d SHA512 7629b16d67bf33c3b4d205dcc78ffc9828fafff45689d70d5d9b43c3fd7ce92dd7ac3c538a291bb5426dc9ce6288a1e7c2c9a4faaf65267c6fb7fb471b432d40 WHIRLPOOL d9a48a2cca40d40ad3cd589b4a5678bdd456362e2cd27d99e4681757641d0c0a60def46f845ba7bfce186416d8b78f7c250f0b7104b0d4d239e4985f4dfce7c0
 EBUILD netbeans-apisupport-9999_p20150730.ebuild 3390 SHA256 9e67ae8db251259a1054001c1beea20a1049158a90e5e55da3b7fc575f096dc6 SHA512 17c96a241036e37ebfcd61ed43f9221262b4b74d26a4e47536ef673b3dbda8a8f4be443d924663c0e1fb69667462e9874a6d61822ea30d5cfdf2c981ec04f936 WHIRLPOOL 1d761dbe8923b4a1980a308e5185a2dba4453d9c7c42161327368de6f96bca1e40c3898b52e7b182acc62384c691b65eb3fe3d9c8e2d44e45810ab9b65cf8e80
-MISC ChangeLog 180697 SHA256 7e4623c4a09f962f28004b7b1d6518ec928043457fc28119609f0156776394aa SHA512 97a7b3854c4a8248bea8592453ecf3699e11c7bd89f60b66ef2dcc2cc69778b82a8ebfb668063d62919fee2b825e94b5090c3c8b9cd9d3faa745037cbe616f21 WHIRLPOOL 4bceed294ba750f51155c6e6b85b6a58e0c66e3cd3f4432d11f75b86d4bb4aa620902e1ad0c61108fdb1a17df6118d6a1fc90d85603e8c74fbd62311ee0b59e6
+EBUILD netbeans-apisupport-9999_p20150731.ebuild 3390 SHA256 8539dfe0cfc10617039c2f8d898980edb951c4136895d9afe34f9d878c757024 SHA512 8b99ae5b64ce2cd803a8d643ffaaf7ae919361b93aa42987e6988d78b924f396da6e95436650a2ec362ff39ba53ae27828c5aea57aa59c5bfd93290f2cf7b397 WHIRLPOOL 6551f46972e7a0461cbe4a402bdceb26e9339ad0557bfacf2d981e55b0b2a86e485a346fa24eef98141468d3697313c13bccffca94d516d43ad57c255ff5f7b5
+MISC ChangeLog 180879 SHA256 8db5dce3893c54e949438c39b004455a61618e3a455ab492bc0ea88cb6ea6e83 SHA512 005ea4cec0b456b0c80679aff020d057ecb38ee4d89d14a7ae7846036985b335a3d8847a4e8600b4ff7794b3666a6f3a54c51ba5019d271608ce185e89cc3fd9 WHIRLPOOL c221df561cf173ab3540034b7d04a64416016ce55f46b4a0d5fadbc82b748493596217897e04d3d86a84c8769062723efdfe2f11aac3ec2a6d61bdeb6aeb79a0
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150731.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150731.ebuild
new file mode 100644
index 0000000..e93aaa6
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150731.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-07-31_00-02-28/zip/netbeans-trunk-nightly-201507310002-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 f8c88b9..862cc1a 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_p20150731 (31 Jul 2015)
+
+  31 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-cnd-9999_p20150731.ebuild:
+  updated to the latest sources
+
 *netbeans-cnd-9999_p20150730 (30 Jul 2015)
 
   30 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index 5a7de78..4355207 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -64,6 +64,7 @@ DIST netbeans-trunk-nightly-201507200001-src.zip 208844011 SHA256 d913ef4e2aa53c
 DIST netbeans-trunk-nightly-201507270002-src.zip 208903918 SHA256 522afa33b0389ef48a5deb3c91ba3c4aa1ca4acf710e2c316479e6892aa3d39a SHA512 078b84e423f0769fb1a2c14bb092c50dd2f1901126b5f3c7b11700858c71b43230281799c248eb4198a22fad17f5a7c34baedd3aac241e2d07d91c72a1aad861 WHIRLPOOL ae082652979d1ba8f26a6001e6402f587809b2586406f93e42eb9b7d38e4216e290167888ab5d6836ff9a712d555cec66c9f54afea7ca6171dee6cf56c7c0fdb
 DIST netbeans-trunk-nightly-201507280002-src.zip 208905091 SHA256 502a75b45a6d7c2421fa6629cede99d70bb69b19287083ee9ed9cbcd9540343c SHA512 b94b76f709f931ecc1414eb80c1791bada942e7a6a7b2cebe4749453de1c17f929ba497b961a7ea9837057986a463f1d335dc7f2ab460f99c1fb168604d07196 WHIRLPOOL 119f4bb30844c9655760a23c0a48ddbc5abf32c07652165d508061b70f37861c123127735d14be01f506da65d072701514d5a4adb678fe8748f62762bcda6052
 DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae2846b93e0836ed96caddf2d425df5bab2a004b0417879a36e4dd3 SHA512 04e2e8f58102752a45b089cb70c62e6b920b5397cb427179fb042604eec4a78d6380341ab700e70b9190313ea5fc10fb94471a072fa8ad567e4d652b1fa2c3b6 WHIRLPOOL 153cd8da3506e0e3397a06b4341e90b2dc55170bb432a21d66bf425895deef5bf0611bdb181beefc29fd18648d60b827d9e453bca827c26305f55ffb01319f18
+DIST netbeans-trunk-nightly-201507310002-src.zip 208736792 SHA256 f2794218686a678f2e826bb542663753c97f1b5cf839657ed6540b36d85e0eed SHA512 31cab9432e2668d4a90c99e561faa6a78c89210bd76625e4274c45ff634783967e9170bbd504e60fcd08df88c57b57f5c357f30c9c8dc06d6d0c0ae72f3ef0a3 WHIRLPOOL fccf16a822b7d43c1dd709c2357cb2fa6ec518e291f4f306c5c2aa4838f734ef9d2c800795dde592d17b3685826e00d26611e8b3cc4c68e6ee5332cff9aa7129
 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
@@ -94,5 +95,6 @@ EBUILD netbeans-cnd-9999_p20150720.ebuild 4796 SHA256 44c07043c6843ec47db68302e5
 EBUILD netbeans-cnd-9999_p20150727.ebuild 4796 SHA256 cb73618c1a63f1639f54bcc2fffdd6f2654f0707685a8f93593d9a0766000465 SHA512 395e878d0ecc839f7860e8a5dfbb49846902a83b0b6cf48d7fc05a3a87755e0d046d13072a4aefa69a83deaccb67c4c2f515e56adf62274b72e0cb8a9423e6b7 WHIRLPOOL b6eef3ea89f8d4e9159f6cc7a61e813447ebcbb7d3c956c5bbc3cdc3d460dff36f1c437615d4c2f935905e3658a115af0cce262f7e60a790efea7a3592240d0a
 EBUILD netbeans-cnd-9999_p20150728.ebuild 4796 SHA256 a07167b489b444d2fe9c8232190fcb791b071997209d952a0e2d104f60c8f459 SHA512 bde312b57f345f9b2c57f72efcc803c333e3ecf8d7eb94ebe676660475434e1d622e8259afeb0e0439b030d82bc389364b62a2d21f9c927f55b3a990484f8bda WHIRLPOOL 38a2cfde1515d6e369094aca2e74dd12c4af99397e9d12577e29278551f9487be1febe080c97bfee1979617d5aa64282722b5067194dc211f7c1eadb56609e25
 EBUILD netbeans-cnd-9999_p20150730.ebuild 4796 SHA256 9afca2683b1c39fee7e02702de7b3cf0c68781a4d461525e7238a6896adf049e SHA512 d35cd253927426752f89a8df7ea63d1d25d12084a20605bb106365474e69afe376dd18a0697ca722edc7a0536af9cc862112dcbcb9e869ce58b99c10c614ab2d WHIRLPOOL 5f0fd87f14aa44c59a77f97084c6fe00b5fc75f94fce4ab7dd9d5710d1f797d5f32aa43d60f113c7ddb9ea26062e4ee1c9a2f0fc59d56df47aed23eace352e5c
-MISC ChangeLog 164886 SHA256 b77ed409a6c411c37c206876aa50f5691093d1ffb924ba39053ee54999ada07c SHA512 6a21913c12d77e1e216dc840ee48127aa3b6f960d94d92c8a5f64d9cf542668264a0ed9981606e49736bf2a5401a3eb4a5025b1ecb8d24d956a9a9a9345b223b WHIRLPOOL cc157021abf3776d85c2a594a90eb1e27a2344a7babcb72b317219137a53c625e58f4c3da17928d51a0886b6ab2d53427b7571df9020336edc2967dacf94fa7d
+EBUILD netbeans-cnd-9999_p20150731.ebuild 4796 SHA256 88c9aee6a037a3fa3f207e962e07c41971575a909b9a64add005bdbc2e25be42 SHA512 4e0de5d5ca98f33358c38a86e3e02f0d374c9f10b00e1ff4af06b2ae84de3f891a0f347e098ef081e787c990cf4da0304d7e56a44a2fb57a128c51144c79e63a WHIRLPOOL 20ea256070611a9870685316f5d69b077279ea82b43f708e485dc40e82894dcc9270cb651056db7192acea2a450f575304c543af599e38de089b987e2088751a
+MISC ChangeLog 165054 SHA256 4eff50b40ac74fd6d9841b608961850d2c39c3089bc99ed818e587a4a558aca1 SHA512 9f7dd00b3b2b60965ee32d863aa1686cd603497b694eb6bdb06765ae02c2f58cd7c00b37e6249da7264138e5fd711c39714f894a44b15102e87f33ab8a8d75e8 WHIRLPOOL d728b35831e2ef0f495dc62aab75685e5798d0e0a0f1c29c5aa5f69b0ddbc05a5a85b6ee4e27137a5ff0210e34c619ea0fffc6afa6010b549368eca2bf0b0062
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150731.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150731.ebuild
new file mode 100644
index 0000000..98e9a96
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150731.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-07-31_00-02-28/zip/netbeans-trunk-nightly-201507310002-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/CF1982D5AFB4D85AB1CD9455744074063F13389B-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}"/CF1982D5AFB4D85AB1CD9455744074063F13389B-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 b2d1871..456581e 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_p20150731 (31 Jul 2015)
+
+  31 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-dlight-9999_p20150731.ebuild:
+  updated to the latest sources
+
 *netbeans-dlight-9999_p20150730 (30 Jul 2015)
 
   30 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 514ba82..8fde77e 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -43,6 +43,7 @@ DIST netbeans-trunk-nightly-201507200001-src.zip 208844011 SHA256 d913ef4e2aa53c
 DIST netbeans-trunk-nightly-201507270002-src.zip 208903918 SHA256 522afa33b0389ef48a5deb3c91ba3c4aa1ca4acf710e2c316479e6892aa3d39a SHA512 078b84e423f0769fb1a2c14bb092c50dd2f1901126b5f3c7b11700858c71b43230281799c248eb4198a22fad17f5a7c34baedd3aac241e2d07d91c72a1aad861 WHIRLPOOL ae082652979d1ba8f26a6001e6402f587809b2586406f93e42eb9b7d38e4216e290167888ab5d6836ff9a712d555cec66c9f54afea7ca6171dee6cf56c7c0fdb
 DIST netbeans-trunk-nightly-201507280002-src.zip 208905091 SHA256 502a75b45a6d7c2421fa6629cede99d70bb69b19287083ee9ed9cbcd9540343c SHA512 b94b76f709f931ecc1414eb80c1791bada942e7a6a7b2cebe4749453de1c17f929ba497b961a7ea9837057986a463f1d335dc7f2ab460f99c1fb168604d07196 WHIRLPOOL 119f4bb30844c9655760a23c0a48ddbc5abf32c07652165d508061b70f37861c123127735d14be01f506da65d072701514d5a4adb678fe8748f62762bcda6052
 DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae2846b93e0836ed96caddf2d425df5bab2a004b0417879a36e4dd3 SHA512 04e2e8f58102752a45b089cb70c62e6b920b5397cb427179fb042604eec4a78d6380341ab700e70b9190313ea5fc10fb94471a072fa8ad567e4d652b1fa2c3b6 WHIRLPOOL 153cd8da3506e0e3397a06b4341e90b2dc55170bb432a21d66bf425895deef5bf0611bdb181beefc29fd18648d60b827d9e453bca827c26305f55ffb01319f18
+DIST netbeans-trunk-nightly-201507310002-src.zip 208736792 SHA256 f2794218686a678f2e826bb542663753c97f1b5cf839657ed6540b36d85e0eed SHA512 31cab9432e2668d4a90c99e561faa6a78c89210bd76625e4274c45ff634783967e9170bbd504e60fcd08df88c57b57f5c357f30c9c8dc06d6d0c0ae72f3ef0a3 WHIRLPOOL fccf16a822b7d43c1dd709c2357cb2fa6ec518e291f4f306c5c2aa4838f734ef9d2c800795dde592d17b3685826e00d26611e8b3cc4c68e6ee5332cff9aa7129
 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
@@ -73,5 +74,6 @@ EBUILD netbeans-dlight-9999_p20150720.ebuild 2995 SHA256 66b9a4a1ff5e8a4ed3b3d2c
 EBUILD netbeans-dlight-9999_p20150727.ebuild 2995 SHA256 a57351f4989673c8579c0852143f5e801f163806a57577cbd033aabb4b518f35 SHA512 6a9d9c0f6e1b872f95c84d75b604f32e0d18e92fcfc14053d5989aca319537d97d5e06d1ae97ce83a48c9ff050a4f5951dad72755a4bf44c27b5457e9ce89f52 WHIRLPOOL d63acb503908021df032372e4ab36c7a086a1a32b794a1e24c39faa2d0bc3691f7c8d3d0789f74825c4ecba6875e0154f65c5ac7bbf110f2457f03733b49e6a1
 EBUILD netbeans-dlight-9999_p20150728.ebuild 2995 SHA256 9bb15dd21cd918721433afa99c3b06df5bed1be8b0decc2b761d5d21290ac25a SHA512 53aa99bfdabd92460a8cddad2b394a545ba81eac10fa30242c35edec9940cc64032687e37bc2f666c20c02b1cc028601e00e97648f19b663186bbe5ef1135ecd WHIRLPOOL c9344a98444a0b1e2deea705212a8520a285467ccef026f5cabb543fc279f5a815b8febed49c8a557ed60cca97741a34848cacc5de9be14c69c5270ab27f14da
 EBUILD netbeans-dlight-9999_p20150730.ebuild 2995 SHA256 d84fe5648153e8541466deb68d61c0a0eb5e8677b9c5f781c87c819be916f28c SHA512 27cb3c73e706f0a83a5a1a742f0a167d1d9e2c9cd4d5d36ed5ce88febf80442ae6b9db79d84f57cca98b9a79eee9c0e51bd0e309458d2ea5d84235a210c441a6 WHIRLPOOL a18c8cc68a14e3bab634ce8a1e746ef54b8292ba9d12e1bbf44dcf474ca58d1a34403ec627b7e96759b0bf091a4b96a33fe0dd30fdb228f01ce1576159c04b97
-MISC ChangeLog 172114 SHA256 4d8b9ac9ec41b4d4dbd53b05216b37e9ffe996c4035c55186491625774f0bd3f SHA512 529200894606643a875aa9c9519c0a639d9bd5859c084e79bf7446543d467428abc6bb69c47d4e32d06aa4ab4b5cc622ac7745848a400c9cf450fcada588b0f1 WHIRLPOOL 20fe87fef50f71cafa07583985a6be1746948cdbeb62558f7b73888b31271c0ed7eaec9e87c08d92240119fe01d618994112c8765cf5528586e77fc1d2b01249
+EBUILD netbeans-dlight-9999_p20150731.ebuild 2995 SHA256 4f9c5a4d043088d9ed1c595826a775fc3eb50e9730c7d21eaecbdb138dfba44a SHA512 1e0475da6ef59e375473015c697c0ad67cc785ed090ee05b1d3810ab4c195cc6e58ef78086b7ff0fc650992482299e22aa49dc10194d81df63a262dd6d192156 WHIRLPOOL c43efed4e50c7e2a6d9e4f17fd7a7106f9338d96565dc43c2b8d529c4c506a9cfc921990c37597e081ebd994b37240a134de8835d6e449446a7fc39083bf10e1
+MISC ChangeLog 172288 SHA256 9eaf5502a74ac56840086ffadb1e647578cf7ed4a94eb033d3f582da0b03c420 SHA512 903f9bb988f86ea4e8c163acb03a2a4ccb06d61db8b22759ea772e58fe630c8b550ef8bebf43c247f2dacf2c831b2d539d89059dbcb759f7948e8e948cda280d WHIRLPOOL 90378f11859dafcfef79786165b7965b723e506adede928f2ae49aeca7ed0fb513f3f90a3c9d0d8ff5cefd1a4c5511e2eca3c071593a55e2e89f323ab2da68bc
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150731.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150731.ebuild
new file mode 100644
index 0000000..03ec70a
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150731.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-07-31_00-02-28/zip/netbeans-trunk-nightly-201507310002-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 d6d69dd..ab92487 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_p20150731 (31 Jul 2015)
+
+  31 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-enterprise-9999_p20150731.ebuild:
+  updated to the latest sources
+
 *netbeans-enterprise-9999_p20150730 (30 Jul 2015)
 
   30 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 3e18057..b942b55 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -125,6 +125,7 @@ DIST netbeans-trunk-nightly-201507200001-src.zip 208844011 SHA256 d913ef4e2aa53c
 DIST netbeans-trunk-nightly-201507270002-src.zip 208903918 SHA256 522afa33b0389ef48a5deb3c91ba3c4aa1ca4acf710e2c316479e6892aa3d39a SHA512 078b84e423f0769fb1a2c14bb092c50dd2f1901126b5f3c7b11700858c71b43230281799c248eb4198a22fad17f5a7c34baedd3aac241e2d07d91c72a1aad861 WHIRLPOOL ae082652979d1ba8f26a6001e6402f587809b2586406f93e42eb9b7d38e4216e290167888ab5d6836ff9a712d555cec66c9f54afea7ca6171dee6cf56c7c0fdb
 DIST netbeans-trunk-nightly-201507280002-src.zip 208905091 SHA256 502a75b45a6d7c2421fa6629cede99d70bb69b19287083ee9ed9cbcd9540343c SHA512 b94b76f709f931ecc1414eb80c1791bada942e7a6a7b2cebe4749453de1c17f929ba497b961a7ea9837057986a463f1d335dc7f2ab460f99c1fb168604d07196 WHIRLPOOL 119f4bb30844c9655760a23c0a48ddbc5abf32c07652165d508061b70f37861c123127735d14be01f506da65d072701514d5a4adb678fe8748f62762bcda6052
 DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae2846b93e0836ed96caddf2d425df5bab2a004b0417879a36e4dd3 SHA512 04e2e8f58102752a45b089cb70c62e6b920b5397cb427179fb042604eec4a78d6380341ab700e70b9190313ea5fc10fb94471a072fa8ad567e4d652b1fa2c3b6 WHIRLPOOL 153cd8da3506e0e3397a06b4341e90b2dc55170bb432a21d66bf425895deef5bf0611bdb181beefc29fd18648d60b827d9e453bca827c26305f55ffb01319f18
+DIST netbeans-trunk-nightly-201507310002-src.zip 208736792 SHA256 f2794218686a678f2e826bb542663753c97f1b5cf839657ed6540b36d85e0eed SHA512 31cab9432e2668d4a90c99e561faa6a78c89210bd76625e4274c45ff634783967e9170bbd504e60fcd08df88c57b57f5c357f30c9c8dc06d6d0c0ae72f3ef0a3 WHIRLPOOL fccf16a822b7d43c1dd709c2357cb2fa6ec518e291f4f306c5c2aa4838f734ef9d2c800795dde592d17b3685826e00d26611e8b3cc4c68e6ee5332cff9aa7129
 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
@@ -155,5 +156,6 @@ EBUILD netbeans-enterprise-9999_p20150720.ebuild 15937 SHA256 375b00d76a464be843
 EBUILD netbeans-enterprise-9999_p20150727.ebuild 15937 SHA256 b7f3909d0f872aa1e28cee5e4c9a8e675cbe4b5e9959ad35b6de9268a6d406eb SHA512 69ab3d95aedce659a10c111c82eea6109b3cce63d6b3cbc1d1fd9f17900db63d39c98b1b709792b6e73a0a138536d9d7106b4d5a785af9dc95ff35d52a2ff252 WHIRLPOOL a5253c4295a96ee7a997bec49aef9b6d51657e3b57dc4b5185e116a89177467ef63e94fe09c84e9e91e493a0bc98774c5201e505147ef4913a94e872605b77dc
 EBUILD netbeans-enterprise-9999_p20150728.ebuild 15937 SHA256 7a4554c3758390eeec5b83ccc120c7daae09b08cc0c9f6f05495901cd1c54c67 SHA512 8a9fda673f57d9c94db528832e6f7698f4513181a0f7636fadaf9dc4f676866d30ebee39cf3491433ace47d09da4297a2abd18118e369a0ef718d6e0365fb104 WHIRLPOOL afee88455f34c31d9dd1d9993fdd43d8dc5f4f8ce3779c85d2f7fe064db4a86c4d140adfef4c53e67cdf06e8260e93ea807aa7309eca2cea25b48d3622ef58aa
 EBUILD netbeans-enterprise-9999_p20150730.ebuild 15937 SHA256 b15d462d4e5a48a815776bdaf518626cf0e31515ff82f059382e8b3cbce9fb9a SHA512 09261894d00d34feb5822df39e6a89b7917ce9db93c1347ee5aaf4d0f367e915b23e70e89eb969e84e737e7691eb6d41046e679c861a7b12196a7ca993bb68a0 WHIRLPOOL 38f8d6bdae7bdf03f48323ad0174ffeaf95cd8e9acc773cd33911229db416f4ed45fc9dad08c6edbf2fd39328abc271da28bd9d8aa68c58952a0fc70932f4ca1
-MISC ChangeLog 181336 SHA256 3473c72c207479bd1b00d56a67cf3391e475ffd458c038cf8e309928d5868204 SHA512 209d06677a6ae75898ba2b30aa7dd3462a38165393e6867101bf8dae8f4c4982f4c5f87976b90aac528ccfe40f08460dfc12b55565f317d0be60b3c38099d775 WHIRLPOOL 658e087ef96531a3c0208e97b34314cee6dfcebf25b2d39e86df415c1428faf959d4f3d3dccae7fd2d80b008741efeaf21f5d6c20784e92f1de666f3ab6c5d2b
+EBUILD netbeans-enterprise-9999_p20150731.ebuild 15937 SHA256 ec9eb8265a4be177797abaef2b30966cc666138c84de15ee2905b22ebe465aa7 SHA512 fb776131ff87fee183cc49f51b87ba92e8cff873e6bc9baa542ec5698b962614d8e688e28b013669de1020e35191f3f226b91538e90e4e48024ea9c86ce3558f WHIRLPOOL 94839a8423dac5dfb2c57c0ec25381fbc42246194277251b4bb76629e9b95bc58276e2ca61f66ae116d0b1a50d63eb6e7da31d521c679e5981a8a15c23206661
+MISC ChangeLog 181518 SHA256 718f8b6181a1de90fdee4afd2cc05dc1f9931baf378a7c09a9f654269a45569d SHA512 f007ac3ecfc4e7f8db42edb25c651cb109e1dd49169b879032d8708456de248dac2a51d134bc774195b4e7d8a7766720d33166cb337d68fcf7d9b9526784071a WHIRLPOOL bb6b4af4b0eeb20bf3c4b8eef888de0076a9ea95e0079550e677e37d121fd16b3682b650d10f9e76a3a1543b3f00e047a4f309e1b108e12fb43d09b698733435
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150731.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150731.ebuild
new file mode 100644
index 0000000..93db966
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150731.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-07-31_00-02-28/zip/netbeans-trunk-nightly-201507310002-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 fa5cc2b..08ca6c3 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_p20150731 (31 Jul 2015)
+
+  31 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ergonomics-9999_p20150731.ebuild:
+  updated to the latest sources
+
 *netbeans-ergonomics-9999_p20150730 (30 Jul 2015)
 
   30 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index f22bf5a..921126b 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201507200001-src.zip 208844011 SHA256 d913ef4e2aa53c
 DIST netbeans-trunk-nightly-201507270002-src.zip 208903918 SHA256 522afa33b0389ef48a5deb3c91ba3c4aa1ca4acf710e2c316479e6892aa3d39a SHA512 078b84e423f0769fb1a2c14bb092c50dd2f1901126b5f3c7b11700858c71b43230281799c248eb4198a22fad17f5a7c34baedd3aac241e2d07d91c72a1aad861 WHIRLPOOL ae082652979d1ba8f26a6001e6402f587809b2586406f93e42eb9b7d38e4216e290167888ab5d6836ff9a712d555cec66c9f54afea7ca6171dee6cf56c7c0fdb
 DIST netbeans-trunk-nightly-201507280002-src.zip 208905091 SHA256 502a75b45a6d7c2421fa6629cede99d70bb69b19287083ee9ed9cbcd9540343c SHA512 b94b76f709f931ecc1414eb80c1791bada942e7a6a7b2cebe4749453de1c17f929ba497b961a7ea9837057986a463f1d335dc7f2ab460f99c1fb168604d07196 WHIRLPOOL 119f4bb30844c9655760a23c0a48ddbc5abf32c07652165d508061b70f37861c123127735d14be01f506da65d072701514d5a4adb678fe8748f62762bcda6052
 DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae2846b93e0836ed96caddf2d425df5bab2a004b0417879a36e4dd3 SHA512 04e2e8f58102752a45b089cb70c62e6b920b5397cb427179fb042604eec4a78d6380341ab700e70b9190313ea5fc10fb94471a072fa8ad567e4d652b1fa2c3b6 WHIRLPOOL 153cd8da3506e0e3397a06b4341e90b2dc55170bb432a21d66bf425895deef5bf0611bdb181beefc29fd18648d60b827d9e453bca827c26305f55ffb01319f18
+DIST netbeans-trunk-nightly-201507310002-src.zip 208736792 SHA256 f2794218686a678f2e826bb542663753c97f1b5cf839657ed6540b36d85e0eed SHA512 31cab9432e2668d4a90c99e561faa6a78c89210bd76625e4274c45ff634783967e9170bbd504e60fcd08df88c57b57f5c357f30c9c8dc06d6d0c0ae72f3ef0a3 WHIRLPOOL fccf16a822b7d43c1dd709c2357cb2fa6ec518e291f4f306c5c2aa4838f734ef9d2c800795dde592d17b3685826e00d26611e8b3cc4c68e6ee5332cff9aa7129
 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
@@ -66,5 +67,6 @@ EBUILD netbeans-ergonomics-9999_p20150720.ebuild 2919 SHA256 30f6009db592e3a2148
 EBUILD netbeans-ergonomics-9999_p20150727.ebuild 2919 SHA256 29a685cf29da593a33c8394ca8cd3e8d90b9f1113be4af48c4b163ae493de3ae SHA512 6733d724388b2cc96c1eed5f445b6031da212f2a67d13d28464e94d22e12f49fc7505aed24fe8323c165f88e8e043c695038a615a5c735e6d9e37e12c4dd2f93 WHIRLPOOL 2f4554e63b30b65d1ea58e55660f95b191ec34a3eb6e44516f9f2aae6dac55d2f0bc8dee80e241d1d07cceba5263555377d2c7d622aa8676754f31324e292317
 EBUILD netbeans-ergonomics-9999_p20150728.ebuild 2919 SHA256 9da6bce0a54b8ad426e2b44e8116b2d7d858b1b4502625d33a98958ad783d62b SHA512 34eebfad9c8513979c2464f6a77b76e3fe12d8e97db757d32406006f4eda4617b842d90ef176e653025944075feaf7b475c5559770832dd3e0887167e3827335 WHIRLPOOL 902bc1628af71b4585fdf2298b90ef983093d1e015398522f01310ec7323bcfa22817b850af90442d158e77b0e4506f81077f0bfe09fe345643b78b0e0f72ea1
 EBUILD netbeans-ergonomics-9999_p20150730.ebuild 2919 SHA256 4e8310005c36503d28ec6c6a6e48d58c33c9689d7a49899354392eead08ff955 SHA512 36e0787eed10bff97afe808d3d28f9179595f0f1c84ae3748f533cd731cc3fcb0070b17178a8ba7c647620fdc7f39623b3ff0f50b4d979fe8d56ab7cb8237ce8 WHIRLPOOL 2d778e6fe29bfe80346a8206065de5deaaa924f5d6aff4f29e6695be5e873fe28e27a3990fb84b13d083da9870906d3ca7c0a6e830251b6c1d835c46309108db
-MISC ChangeLog 180697 SHA256 ff97f122b469b845817dfb37fe93652123cd9972ef0bba397b069118f5703613 SHA512 e8de55d4e3f6be43fcca71e0cdf2d884336e68f73f09b04de6e046aa1c3bf92270d5fea2d5e59022a99f48df464e9cdb6416d4c5419efb125b0495f42f359f26 WHIRLPOOL b544f34c81d4e0603908794b2d7cf5f8c3afc8a3fe250b7e1510e206ab01e6c6274baf27712e3c4912eac9b4f1ba6615e8e601c19a0397e0db7437589f2f58bf
+EBUILD netbeans-ergonomics-9999_p20150731.ebuild 2919 SHA256 016b7ea355e14b1378a24557bac70c0b082a8e8221223db360128c669e8e2923 SHA512 f4653727270056be2e6f8f18819060c3680f17e92e55699c744e00da64c15bdd8efd887fb176f0a2a71128f2cf1b25efc49cd5287ab14ce8239c7292a6d07456 WHIRLPOOL 899f09dffc01dd2f535132ca0c4a0687001ba476001ac08512ea78b1cca4c6d426bc068565457f86583309a298f0921e4cda6c11091937b7f9e9490b69d5b6a2
+MISC ChangeLog 180879 SHA256 284cf92bc4d35437233365830bd142aa849b94a741c5c19251769c1f2005cafe SHA512 469f11eaef14eee2fd92fc25424248b640afd9a4e9a8a67d8a3c5ee5acaf980dc369b33655972da50aa2c4464d9188b490bea178b33e347468850e14f689781b WHIRLPOOL 27cb3f6cf1766853f8f314b3e5f65b769486beb439b52ce75364ae024d05b4bd0f4b5f6040fc4d23105bffe1ba2d28dbc3a6bace0196459dd115bed9b57587f9
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150731.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150731.ebuild
new file mode 100644
index 0000000..5c7bf58
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150731.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-07-31_00-02-28/zip/netbeans-trunk-nightly-201507310002-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 ae11500..fc796b2 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_p20150731 (31 Jul 2015)
+
+  31 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-extide-9999_p20150731.ebuild:
+  updated to the latest sources
+
 *netbeans-extide-9999_p20150730 (30 Jul 2015)
 
   30 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index f998f3e..f141901 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201507200001-src.zip 208844011 SHA256 d913ef4e2aa53c
 DIST netbeans-trunk-nightly-201507270002-src.zip 208903918 SHA256 522afa33b0389ef48a5deb3c91ba3c4aa1ca4acf710e2c316479e6892aa3d39a SHA512 078b84e423f0769fb1a2c14bb092c50dd2f1901126b5f3c7b11700858c71b43230281799c248eb4198a22fad17f5a7c34baedd3aac241e2d07d91c72a1aad861 WHIRLPOOL ae082652979d1ba8f26a6001e6402f587809b2586406f93e42eb9b7d38e4216e290167888ab5d6836ff9a712d555cec66c9f54afea7ca6171dee6cf56c7c0fdb
 DIST netbeans-trunk-nightly-201507280002-src.zip 208905091 SHA256 502a75b45a6d7c2421fa6629cede99d70bb69b19287083ee9ed9cbcd9540343c SHA512 b94b76f709f931ecc1414eb80c1791bada942e7a6a7b2cebe4749453de1c17f929ba497b961a7ea9837057986a463f1d335dc7f2ab460f99c1fb168604d07196 WHIRLPOOL 119f4bb30844c9655760a23c0a48ddbc5abf32c07652165d508061b70f37861c123127735d14be01f506da65d072701514d5a4adb678fe8748f62762bcda6052
 DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae2846b93e0836ed96caddf2d425df5bab2a004b0417879a36e4dd3 SHA512 04e2e8f58102752a45b089cb70c62e6b920b5397cb427179fb042604eec4a78d6380341ab700e70b9190313ea5fc10fb94471a072fa8ad567e4d652b1fa2c3b6 WHIRLPOOL 153cd8da3506e0e3397a06b4341e90b2dc55170bb432a21d66bf425895deef5bf0611bdb181beefc29fd18648d60b827d9e453bca827c26305f55ffb01319f18
+DIST netbeans-trunk-nightly-201507310002-src.zip 208736792 SHA256 f2794218686a678f2e826bb542663753c97f1b5cf839657ed6540b36d85e0eed SHA512 31cab9432e2668d4a90c99e561faa6a78c89210bd76625e4274c45ff634783967e9170bbd504e60fcd08df88c57b57f5c357f30c9c8dc06d6d0c0ae72f3ef0a3 WHIRLPOOL fccf16a822b7d43c1dd709c2357cb2fa6ec518e291f4f306c5c2aa4838f734ef9d2c800795dde592d17b3685826e00d26611e8b3cc4c68e6ee5332cff9aa7129
 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
@@ -60,5 +61,6 @@ EBUILD netbeans-extide-9999_p20150720.ebuild 3383 SHA256 18787d19709051ba423181b
 EBUILD netbeans-extide-9999_p20150727.ebuild 3383 SHA256 f70fe4a371ceba622e0475d6eea2be2ca78c773dc24a458f39ea6d66919c21e6 SHA512 27fc00e2e71d6c7f3b5333068ff2246e346e48a5c4dd7a7eb5bbcc53d50de8aa9ec4a6ea587530f7cd889680287f173f1c163d0a28e31fb0953e9f4451f16756 WHIRLPOOL 52a74327154d82fa1e4c3cc1b1ed522d7476e65c1ee2a6ea204bb8a7667943d1422a5e61afd90ca9c4de6e23033ccdb8db05f99175897df0a93e037f403426c0
 EBUILD netbeans-extide-9999_p20150728.ebuild 3383 SHA256 8c235cd6a79b093b4720cf7c3d662caf86e8aefb631fe029b7d931fbb3d80ef6 SHA512 6dc65333e5b2029d46d2b98d25a3648c06d6f0f8e3b340dbdfe145cc0d657e37fc810528290f6eabe598ee5507528c6f7febdaa83a58df39763cb8a497102a67 WHIRLPOOL 25d0b7f43d6c87a249b0149fb7de956bdbddad235e39f8dd7e0b24b620479d2b7a2085ee932018124c490748bec242a3d524c176be444da4d0d5fe95e5ac6c2b
 EBUILD netbeans-extide-9999_p20150730.ebuild 3383 SHA256 fb5ea1313370371921139c6eec3e4d5df7d0ba2a82e4d2b5f513f5fc000e650f SHA512 2a62ebff93b523cf6e55da9f0d2082657a41c77d898eb3a62737350448f92e2f2d350cf35bcddfeffc37c80559800a8c07fee122506caea7e9e2a5e4dbef6e7a WHIRLPOOL 9c9dde84e7e5605d158098439a32a5fc542f58e5bf783b21a178308bd8806196bb1935c2aa4406b3f2c6a5146e1ca541d94419967bbad0f3c8a882fbf2b97ebf
-MISC ChangeLog 104024 SHA256 ecee161487f63c6946205a0f4e3acd05f46c0aaf01afff864428fd3f23f35243 SHA512 af3b3cfe355e7a6c365ce5e8a4610f0fc19e5c21da15fe7517a1d4a09ec5bb5ecaad18afb56457196e07e74deca57ebef216bf479b1d1426170e6126fcf35834 WHIRLPOOL 9ca14def06d57775197739bc3eaf211ffb84fc607ca53a006184887d1430f71c4cefd01492d5d6843b649306f46f68697e332a396bd3cf5e691a4eaf27e106d5
+EBUILD netbeans-extide-9999_p20150731.ebuild 3383 SHA256 39fa8d9070e33927331aeabd8ac0d4fac7bca2cdc129dabddad4f620cf085f40 SHA512 b94c0a680763c32071cf539521f4784316acd0091089a47ac6e6e8bc46155631158839b369ef1ca31cbfacadb2009965ce92bf7d0d0bb4b89d45f3dfd8f3e966 WHIRLPOOL ae8760e8dd96acc341b1f700852998be7efe3179583961a021e735985940b87e5db6cc40cd5ef5ea6a8aff5c8c651b8d19b173d92e41d8f3a5bc9cde56ed9697
+MISC ChangeLog 104198 SHA256 9420e9f5671990afbb47828286f8bab7229f3225169db54311c01cdc92ef0e6d SHA512 fb1cc7a1a41aff5832e835b00a9ac5dddef2e71a00ae1816edb43a6258262e47646c164b78fc061841392b7689f3c27309ad49a1f36274ee7ed883e01a08e5d8 WHIRLPOOL fe140d10ac9477dd99e2c450b7d6667142ddd8f00c8bbc49785381fff0e3de0a406770142b6704748656154899962fe4e7d72cca1de2ae58314ce9dbac0b91a4
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20150731.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20150731.ebuild
new file mode 100644
index 0000000..fa4dc4c
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20150731.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-07-31_00-02-28/zip/netbeans-trunk-nightly-201507310002-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 8680bec..7952b0a 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_p20150731 (31 Jul 2015)
+
+  31 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-groovy-9999_p20150731.ebuild:
+  updated to the latest sources
+
 *netbeans-groovy-9999_p20150730 (30 Jul 2015)
 
   30 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index 5290a1c..d7c0e8e 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -40,6 +40,7 @@ DIST netbeans-trunk-nightly-201507200001-src.zip 208844011 SHA256 d913ef4e2aa53c
 DIST netbeans-trunk-nightly-201507270002-src.zip 208903918 SHA256 522afa33b0389ef48a5deb3c91ba3c4aa1ca4acf710e2c316479e6892aa3d39a SHA512 078b84e423f0769fb1a2c14bb092c50dd2f1901126b5f3c7b11700858c71b43230281799c248eb4198a22fad17f5a7c34baedd3aac241e2d07d91c72a1aad861 WHIRLPOOL ae082652979d1ba8f26a6001e6402f587809b2586406f93e42eb9b7d38e4216e290167888ab5d6836ff9a712d555cec66c9f54afea7ca6171dee6cf56c7c0fdb
 DIST netbeans-trunk-nightly-201507280002-src.zip 208905091 SHA256 502a75b45a6d7c2421fa6629cede99d70bb69b19287083ee9ed9cbcd9540343c SHA512 b94b76f709f931ecc1414eb80c1791bada942e7a6a7b2cebe4749453de1c17f929ba497b961a7ea9837057986a463f1d335dc7f2ab460f99c1fb168604d07196 WHIRLPOOL 119f4bb30844c9655760a23c0a48ddbc5abf32c07652165d508061b70f37861c123127735d14be01f506da65d072701514d5a4adb678fe8748f62762bcda6052
 DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae2846b93e0836ed96caddf2d425df5bab2a004b0417879a36e4dd3 SHA512 04e2e8f58102752a45b089cb70c62e6b920b5397cb427179fb042604eec4a78d6380341ab700e70b9190313ea5fc10fb94471a072fa8ad567e4d652b1fa2c3b6 WHIRLPOOL 153cd8da3506e0e3397a06b4341e90b2dc55170bb432a21d66bf425895deef5bf0611bdb181beefc29fd18648d60b827d9e453bca827c26305f55ffb01319f18
+DIST netbeans-trunk-nightly-201507310002-src.zip 208736792 SHA256 f2794218686a678f2e826bb542663753c97f1b5cf839657ed6540b36d85e0eed SHA512 31cab9432e2668d4a90c99e561faa6a78c89210bd76625e4274c45ff634783967e9170bbd504e60fcd08df88c57b57f5c357f30c9c8dc06d6d0c0ae72f3ef0a3 WHIRLPOOL fccf16a822b7d43c1dd709c2357cb2fa6ec518e291f4f306c5c2aa4838f734ef9d2c800795dde592d17b3685826e00d26611e8b3cc4c68e6ee5332cff9aa7129
 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
@@ -70,5 +71,6 @@ EBUILD netbeans-groovy-9999_p20150720.ebuild 3422 SHA256 758223d173c611bb9033402
 EBUILD netbeans-groovy-9999_p20150727.ebuild 3422 SHA256 fc31156e3406c0887d998bc8bab80681784def4b4d9b7836287c91a40c6785d4 SHA512 fd0fafb49595d2ab87421d506a931ff8f92d32822bc07109a6b7a99e9c2b8a453c80b88cac409cf92863d7639b27bd55aafd15758a8569627061e6f8633e121d WHIRLPOOL 5ba0f26c6d7bfb823aa36618f7565f83173ff645bd0411e9e6e1c0c7059f26f474505afa6672743da124cacb502f9ef55d6e94e7ca8d69bec284b356efdec6e0
 EBUILD netbeans-groovy-9999_p20150728.ebuild 3422 SHA256 92101c8b314445578a0226765f7b246ba4dcc9fafb94514706795d48027a60b0 SHA512 566faeca8cd3b4303a5c962c221b1a62259f64e0745ddb14466e64a8956ec1221105494c0e28d403aa6e5b5711bbca8c854b31f0d144954716c3d354ae547362 WHIRLPOOL f70b42e3635eb4657852f5f36be3d5201a779915c2c31d7cee4ae25788e92b897f876761e3bc834ed5e49c9b0cb675ed3250e8286e8b4d0f5826d5d19324e7ed
 EBUILD netbeans-groovy-9999_p20150730.ebuild 3422 SHA256 6cbb55db70c8950e51631d02f53d0aecf6de64853cbf0c8a474de17025cb7f46 SHA512 06f571e2a1ef01fe5800b2ce83053949a17d847abafb640eb647ebcbb7536b7e5d0ea6712f572eb490a3dea1bb47df70bfe9aeafcc770af1e3770da0a47afc37 WHIRLPOOL ca5e0ef8813585ca8c3f442e6fe4b800cd9d5b8497278e252924898eb60115bf0af90c2d583ff824366a47d45b4fb5335f9a7cad11d9cebcbbf8673f0a8e5963
-MISC ChangeLog 172004 SHA256 cae7859bdb1e39ffef79bd934998cdfbb1811bb2e4bfd54c13555c446bddc390 SHA512 d63588d0dfe7a8d79d9bd33e0f3f34d7f86189f297da9a59e66971ddf3d6b45dd7a9b1cf9e9d9c6fe8071758e4a3f490f5f19ca5e9a845b6ee598d6a966ee1d1 WHIRLPOOL 4c09ca85cb13cf73599e38d09c89540091a2eb688b563bbd88930660a5dc62ec41144a5fa3bf65398223dbf8537a1a16507b241d2e302dedec9d9f1ff4678dfd
+EBUILD netbeans-groovy-9999_p20150731.ebuild 3422 SHA256 ff3405ce8b134fdec229ac91f2922735d5a8ca7dcbe8a292965732bc089593ed SHA512 89d3d1580b6616666af0002ea68e70ab4804fc9ca0584227049ffd7197896b500db983b830d7967eb704c6edffc27f5d6ca7b86211566e69d04e07f1e740ccf6 WHIRLPOOL f38544fd67c1f84ef9c379ab63c79c220659c1d5e4911eddc6760431579ed589e4e19233586904d80c30a0ea05ed2924712ed3b26bded3386ede92e713b676d3
+MISC ChangeLog 172178 SHA256 aab5b402009d6fbfa756714a79abc7cf80a4c552d9449c4dde8df9fae45a75a8 SHA512 8eccad66345bae802752768cd274e0be36ab0ba6640bc7acbc259701bab8f1847fb1e14921dd9cf93e4accd96a5cb800d33a58e968b28f079efa6821ee851bb4 WHIRLPOOL 408a6d8c3ca8acf25b0630cd93f9f0b03d3b5cc73a6e70afad35835f8db3380359fea22b5fc8cd121a5a4bbf7a1c111df07cb5509bc0255b68ea5f6fa8dc37cc
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150731.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150731.ebuild
new file mode 100644
index 0000000..a712b2b
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150731.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-07-31_00-02-28/zip/netbeans-trunk-nightly-201507310002-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 5aded48..ee9d44e 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_p20150731 (31 Jul 2015)
+
+  31 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-harness-9999_p20150731.ebuild:
+  updated to the latest sources
+
 *netbeans-harness-9999_p20150730 (30 Jul 2015)
 
   30 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 046085e..24772b2 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -42,6 +42,7 @@ DIST netbeans-trunk-nightly-201507200001-src.zip 208844011 SHA256 d913ef4e2aa53c
 DIST netbeans-trunk-nightly-201507270002-src.zip 208903918 SHA256 522afa33b0389ef48a5deb3c91ba3c4aa1ca4acf710e2c316479e6892aa3d39a SHA512 078b84e423f0769fb1a2c14bb092c50dd2f1901126b5f3c7b11700858c71b43230281799c248eb4198a22fad17f5a7c34baedd3aac241e2d07d91c72a1aad861 WHIRLPOOL ae082652979d1ba8f26a6001e6402f587809b2586406f93e42eb9b7d38e4216e290167888ab5d6836ff9a712d555cec66c9f54afea7ca6171dee6cf56c7c0fdb
 DIST netbeans-trunk-nightly-201507280002-src.zip 208905091 SHA256 502a75b45a6d7c2421fa6629cede99d70bb69b19287083ee9ed9cbcd9540343c SHA512 b94b76f709f931ecc1414eb80c1791bada942e7a6a7b2cebe4749453de1c17f929ba497b961a7ea9837057986a463f1d335dc7f2ab460f99c1fb168604d07196 WHIRLPOOL 119f4bb30844c9655760a23c0a48ddbc5abf32c07652165d508061b70f37861c123127735d14be01f506da65d072701514d5a4adb678fe8748f62762bcda6052
 DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae2846b93e0836ed96caddf2d425df5bab2a004b0417879a36e4dd3 SHA512 04e2e8f58102752a45b089cb70c62e6b920b5397cb427179fb042604eec4a78d6380341ab700e70b9190313ea5fc10fb94471a072fa8ad567e4d652b1fa2c3b6 WHIRLPOOL 153cd8da3506e0e3397a06b4341e90b2dc55170bb432a21d66bf425895deef5bf0611bdb181beefc29fd18648d60b827d9e453bca827c26305f55ffb01319f18
+DIST netbeans-trunk-nightly-201507310002-src.zip 208736792 SHA256 f2794218686a678f2e826bb542663753c97f1b5cf839657ed6540b36d85e0eed SHA512 31cab9432e2668d4a90c99e561faa6a78c89210bd76625e4274c45ff634783967e9170bbd504e60fcd08df88c57b57f5c357f30c9c8dc06d6d0c0ae72f3ef0a3 WHIRLPOOL fccf16a822b7d43c1dd709c2357cb2fa6ec518e291f4f306c5c2aa4838f734ef9d2c800795dde592d17b3685826e00d26611e8b3cc4c68e6ee5332cff9aa7129
 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
@@ -72,5 +73,6 @@ EBUILD netbeans-harness-9999_p20150720.ebuild 4131 SHA256 77eb04102b20495134978a
 EBUILD netbeans-harness-9999_p20150727.ebuild 4131 SHA256 2c6db0d270ed892e0fd1217f681ca60e80ae0a531926da8bea2041515d8131ee SHA512 3e58aa21793c8118fc58dd7985f2f2c456d5fd9a825ed9b1ed7d8bf17bec6f4bfab30918852365fbed75a0a3b0a351bca749752da2e975c1e2e470373fdcdc7d WHIRLPOOL 7cf0c2bd8ae0af42dc224ebb0965c364f803128b1a52fce9e1c7c21d2f90961b996ac586a391d371d372e060236c5a33a93904c64905e5f9b572b961407f5481
 EBUILD netbeans-harness-9999_p20150728.ebuild 4131 SHA256 f45f93b22763c1b72a1dfd1004d6ea1d481b3c7075dff844d78618dc97144b53 SHA512 7fc21d70b4cdc12aa5cfdd03b969369a18f29527a35623d87840bfe448fd391c26d3a30922e8520cb1e8355edc65b5678f502a0786e46f7dda1fecb80292137e WHIRLPOOL 32424b6877d6a53e2565d1ae069d8b3762780b0d0a72c6361d6b9af34d3d6e9586f10744cb3840908b55d563a2c7b1ef73e4adf8ba539de4aa4fa0a2bbbc928d
 EBUILD netbeans-harness-9999_p20150730.ebuild 4131 SHA256 a7a162ff6dab4fcec33e9b099184bd64eab0dc03f037e258a8bd98a3e7321650 SHA512 e10eefca2151bdb74625dab8d24d58e681edf34f4e5b8bdb2eb72ae697432369d98c91045167b5b871ea23ac5faacb49d7596a0e272696810f51543ec38e9799 WHIRLPOOL 02139643a8c610a42120239e55933a15a16c30c7936ecc8e1a26b665099370eee0a356f8f0a4f916d1b385602251ea9447780b3c4f7f2cf1cadd1fb3cd6829db
-MISC ChangeLog 174206 SHA256 bc6f6c3305d301b6d7c7167ccb2dec902ff20377f8af8d2d0c307a8110beb452 SHA512 d2c868bc1e7fd20e6e9768a6b8e05457440345c86bdfbf1684988cc025a0cca9d84ae22c709a736e93f6cb219bdd05ad8aa8ed3698e3d4ac61793d52c6b9f557 WHIRLPOOL 4eb233c9f169564ad90d8a278cd6563697acd3786396248cdcce65d26f9ae51ed2e44157c54e80a2c08682835ceb173d7a5d55a124b0e774a2f889848a7b905f
+EBUILD netbeans-harness-9999_p20150731.ebuild 4131 SHA256 90dfe437e65390c834b3816ca5a1401eb744785f9e6334c2590a53ec8d8f46e6 SHA512 7fcca5ac708f07223e96cee9f5533e62a9e95c882580e10651c97eeac1d02571a3612aba6a3ba4e237013b0a0f2a92249511a67f740a54b6db033b84637f707b WHIRLPOOL c2e58db171c8858f50a63cc15a675316688c71c8fed0ecb4760018310eddf7bb9bf533f68856410832496c5d1ad485841c3d46e02edd007b4b236f4be5f1863c
+MISC ChangeLog 174382 SHA256 f4f9d93b6fe64e67ae7f825d9880db07433a4a5b51e706c465e2dc297c7be62a SHA512 bd7cdd8eef50689e6efe98415f1d22e72593c3a60f5176ba7535b76cd04c63b5e61d4ba07318d518121b7c430433808151781e57c420cf3b2c3dbd02b9ae2da8 WHIRLPOOL d1af9001099fcd1230014ca106bcc19415f14748d022b2b47ea3c61011f47b644c417f58974f7e03f886a3a7193b60d07c27016d4928e2e7be0ca6a6dca54627
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20150731.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20150731.ebuild
new file mode 100644
index 0000000..b9085b2
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20150731.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-07-31_00-02-28/zip/netbeans-trunk-nightly-201507310002-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 aef0678..bcf5893 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_p20150731 (31 Jul 2015)
+
+  31 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ide-9999_p20150731.ebuild:
+  updated to the latest sources
+
 *netbeans-ide-9999_p20150730 (30 Jul 2015)
 
   30 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index dbf2665..8f71bdc 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -247,6 +247,7 @@ DIST netbeans-trunk-nightly-201507200001-src.zip 208844011 SHA256 d913ef4e2aa53c
 DIST netbeans-trunk-nightly-201507270002-src.zip 208903918 SHA256 522afa33b0389ef48a5deb3c91ba3c4aa1ca4acf710e2c316479e6892aa3d39a SHA512 078b84e423f0769fb1a2c14bb092c50dd2f1901126b5f3c7b11700858c71b43230281799c248eb4198a22fad17f5a7c34baedd3aac241e2d07d91c72a1aad861 WHIRLPOOL ae082652979d1ba8f26a6001e6402f587809b2586406f93e42eb9b7d38e4216e290167888ab5d6836ff9a712d555cec66c9f54afea7ca6171dee6cf56c7c0fdb
 DIST netbeans-trunk-nightly-201507280002-src.zip 208905091 SHA256 502a75b45a6d7c2421fa6629cede99d70bb69b19287083ee9ed9cbcd9540343c SHA512 b94b76f709f931ecc1414eb80c1791bada942e7a6a7b2cebe4749453de1c17f929ba497b961a7ea9837057986a463f1d335dc7f2ab460f99c1fb168604d07196 WHIRLPOOL 119f4bb30844c9655760a23c0a48ddbc5abf32c07652165d508061b70f37861c123127735d14be01f506da65d072701514d5a4adb678fe8748f62762bcda6052
 DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae2846b93e0836ed96caddf2d425df5bab2a004b0417879a36e4dd3 SHA512 04e2e8f58102752a45b089cb70c62e6b920b5397cb427179fb042604eec4a78d6380341ab700e70b9190313ea5fc10fb94471a072fa8ad567e4d652b1fa2c3b6 WHIRLPOOL 153cd8da3506e0e3397a06b4341e90b2dc55170bb432a21d66bf425895deef5bf0611bdb181beefc29fd18648d60b827d9e453bca827c26305f55ffb01319f18
+DIST netbeans-trunk-nightly-201507310002-src.zip 208736792 SHA256 f2794218686a678f2e826bb542663753c97f1b5cf839657ed6540b36d85e0eed SHA512 31cab9432e2668d4a90c99e561faa6a78c89210bd76625e4274c45ff634783967e9170bbd504e60fcd08df88c57b57f5c357f30c9c8dc06d6d0c0ae72f3ef0a3 WHIRLPOOL fccf16a822b7d43c1dd709c2357cb2fa6ec518e291f4f306c5c2aa4838f734ef9d2c800795dde592d17b3685826e00d26611e8b3cc4c68e6ee5332cff9aa7129
 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
@@ -279,5 +280,6 @@ EBUILD netbeans-ide-9999_p20150720.ebuild 30340 SHA256 8e2d82c480497b49791e21f54
 EBUILD netbeans-ide-9999_p20150727.ebuild 30340 SHA256 37abae4dd75ce8c8b26f8125c6b3ad565545ca483070253ab4e2337591f7b691 SHA512 30475800f7f251aa623b866c3a7d1c198561a17cd7bd21a6c2c67c9ffcc8a97ae003ca9517ca61e1fb3accb4d4438d1c68d0687b981f4f28f366e7127220022b WHIRLPOOL bb4b4bb3a3ddac29b45b0f26132568145bb0549214e1a43c8edefc4c33626657f97d3cf04ffc6a474c829ce15dfe9cfb13169ff7bd1f25916cc78d230a97f286
 EBUILD netbeans-ide-9999_p20150728.ebuild 30340 SHA256 79442867eabc2f2c6cc8eaa30bd896ec4495dde8c08e60a63f4ba2ff9faf7a07 SHA512 371655b926079ddc124fc44f16bd7242a81d563a5131e467950548ea0dbd244e274dc96e976d8bb756d6d2adec48c94d854b6a8d8a4f5f596131277c4b757299 WHIRLPOOL 27bd1e638486cf04a606d7b230dd0f037797882c65ba4c376e70983c346a8e64cec3d09ab285b129dcfe5b80ffd5ae1f41dfd441f2e450c40b6a2f38ee55fdcc
 EBUILD netbeans-ide-9999_p20150730.ebuild 30340 SHA256 85e711d85b2d4dff1254b9db90bc273861b64bab4347ed8526a3df34f2805ea7 SHA512 788e9aae609557981a746f1048f03648c8d0352cb9f8ae618c81eb2a3a0145bbd554350199019eb776a5f3b4034f20d41c1d6f7068e607b91db3bff08df77611 WHIRLPOOL 8772b17059223739be3b60e75f411460447232b9e5308896587af11be82c41ab0627dce1afdb523ff0d8b573bfd65ccf4954e253d7082b948512a599643fb9ad
-MISC ChangeLog 165808 SHA256 9612c56e81959b58a263a860a92d78e219232ef625d9346ddfb8c943b9cd0216 SHA512 975f9d3be13d455bf28e1633a2cfecaed654ed5f73844fb6b921b638a1e356b877f378c12e4b7b8186b1a5c075e6adfe60f297a052b1293d98796f19d9be0b1e WHIRLPOOL a64f426a11207d2398dd1ae5bbe1cd1e16876b57da8d082d4377c367db3bea1377469b28604e9316397b69cf5e7a03a64456cc4f24dfcf2038536429e61ec4dc
+EBUILD netbeans-ide-9999_p20150731.ebuild 30340 SHA256 87c77a6385ef651d14eda7f77c2fe5d290cd9f22ea8d5db6af43ae62dbe10da2 SHA512 95d057f7d6e6a6d2126545ed79e6c4d0511bb0d1ab369de74b9a4a255345a8f6b6e207d1a83868af2614953a68efa260ad65b3cfa5013d6eb0c28c80cda79ab7 WHIRLPOOL f226f3be8b52d9e1efc5f3f44641b33406d8bf5ec81886dbceab28520f8c4fad24998027974224d2874b83c032d9ad706507caaf9e3b021e717f2b6bcd3a1cd6
+MISC ChangeLog 165976 SHA256 13d0c900146b70ad097535447f2e00e0fb36f6034d6c0ac874885b0ac0fe79d9 SHA512 4cc395b5492b4f3e41a8d3caa50f6ecf986cd35258bc8f8e2cd5d79f036a49f224e866fad6d5f9cc2fe27a1f2104b2ffbc99a0d1bdfdd8fa16a0503de16994ca WHIRLPOOL e1bf751732a3fac24ae41440423743d62d5dfde8e45073f4ae06a9fcfb8ba21e8d3eeb5cf9e7932e532cba489544733908922745a9d1bbce048c43ab8347a5cd
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20150731.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20150731.ebuild
new file mode 100644
index 0000000..e290e4d
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20150731.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-07-31_00-02-28/zip/netbeans-trunk-nightly-201507310002-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 ccf9f55..8b1624f 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_p20150731 (31 Jul 2015)
+
+  31 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-java-9999_p20150731.ebuild:
+  updated to the latest sources
+
 *netbeans-java-9999_p20150730 (30 Jul 2015)
 
   30 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index 18440b9..7fdd19a 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -69,6 +69,7 @@ DIST C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip 5029407 SH
 DIST CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.jar 10121 SHA256 c229a949b35bacebe798971b05b1fa6bdee4e923fcc08f02a7ae0a71fc6de4c7 SHA512 22333aab9419fafc86544492d384683a14c7f5feb313d9555f424ed4db46dd82c5a53b74b6e41221cf7d48d640145a63a653b4a05575df8ab2a2fba1b85815fa WHIRLPOOL 18dbad03b5cbcaa76ab528b2af074f566b3cd0a786e3e8bf2b56b8e0e265461fc15527a41e013f8685d1c824f48e28607833f30e02143a09be360574be38f3d3
 DIST CAF99EFBB25E9183609D6FBA4F63D85E7606903F-indexer-core-4.1.0.jar 220841 SHA256 f6140d9e9f52a50c381ac500c119b268bae84e84c9ba37d361baf22d4e4ec68f SHA512 3fbf7b2e6d4674f6ee4dd210e80d3d61452399a2722959105bd276b5e959edce39ac932c0ef9e8453eb6c7598aff244c5072ad8f9a927ea720c3226a548cbcd6 WHIRLPOOL b0bf637ce741808e87f7d5f1d97a1d4fa90e1548836dda90cb498e333f995bff6973fe1cdfb251391a36bae5c1a473f097b9ebd1f2f08e3aa46f050d9cc607b4
 DIST CB686A65B6C4516A32173CB60385D02027440620-spring-2.5.6.SEC03.jar 2949268 SHA256 7865677c19d1373c7126751c30bf9719bbe7431f9b8a160e78cd53d74534f4f1 SHA512 c8902a4f552f558f83ced82d7983ddcc05b49acfd85f7062d544648ac433fef98f5c77eb089a7401ea454220ff249f61445d833ec7a2697bccdbf78d13dc224a WHIRLPOOL 6f6d80865869242354c3d900217c48f6a28e5412234cc9cd637748941762822cebbd7a6398bbe6ede9aae30bad0987c8b4bf674b483fa78c4854a3dd7b7d95aa
+DIST CCFE36D2A4B54345A8A3643C3D2DEAC2DF9C0693-nb-javac-impl.jar 2766563 SHA256 f6efa34a24c769732553ac67ade8055720d8f8ab9293fae33ee3aa18a0865179 SHA512 ec13b96e51de2e43b32d0e6dcbc77187fa3a247b8bb67f1f75971a03d427b4b7f5d4f8b5dd6a124233d7213e112cb6cbb363206f29573bf6f5e7be20b396e7ff WHIRLPOOL 6b973c96f5d04224309f09a0f35776cabc1e9dac8db08cac9167cb370e9488c7eaac250b3d6f4834862a72c0e125e7d91ab53c37d3d2ed1ef6381933025e9deb
 DIST CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar 8632395 SHA256 67d175c1858005308ae9a02ff85c0bc7efc9a2a3c058a6838d51769f417f5247 SHA512 56559a40532fa42775a92d82296a86033a587116870d8201dd42f07e29990a28de5b1547e3fb59ddedadfe6b4fc3dd109b108cc65cf7b253ac1b0fbb9cc03fcc WHIRLPOOL fc40cf8d49919d3ef38f6c3473736f56ee5ac1d4db848681536c3bd3532cb112e9490e76c1ef7b15d88b2ab87ed54e58dbf1227c173a3256194b5887d37f8a84
 DIST D388DFD4853B4C82C4BE4EDB38AB56904208723E-nb-javac-impl.jar 1780249 SHA256 788c63ffba904422041d310eb218c48b36170fcddffa6dd98b4a066bb1b45bd7 SHA512 d06e63a5c3b5ed27e05ca5b735fdc79b713c7d2c948799a642354b30b56e59f33c12f33b0c1db8069ee75e0410ae183c518522263b814aed922995d262f5b3d3 WHIRLPOOL 9c53bc9cc140e187e79a22e8336db6a09a82dde30ad011abd881f9ce6f9e30ec7144320b6013260fd3701d6d26133eedd96182e4de8563d7df024d50e3f062be
 DIST D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip 84706 SHA256 214c8f6da105d8bcc4583f3f160d94fa4a8ec266c4fea4b5e12929a6386fec3a SHA512 5dd4270d3514f448f2d1533b099dbe64aab97c21e89066c467a3332d354f0675e27f6ed5ca1b23c01a2222c8e1ad261c374ae6549b9323951763b7a542a386f5 WHIRLPOOL 88a6357f335bd50d3cf3608cee0228b0c99b4b20a962e2dcd68b83c3fdd49b113618342f87cb8b758ad18612efdff0128876ae9018eeba5b682cd8267f97f8fb
@@ -120,6 +121,7 @@ DIST netbeans-trunk-nightly-201507200001-src.zip 208844011 SHA256 d913ef4e2aa53c
 DIST netbeans-trunk-nightly-201507270002-src.zip 208903918 SHA256 522afa33b0389ef48a5deb3c91ba3c4aa1ca4acf710e2c316479e6892aa3d39a SHA512 078b84e423f0769fb1a2c14bb092c50dd2f1901126b5f3c7b11700858c71b43230281799c248eb4198a22fad17f5a7c34baedd3aac241e2d07d91c72a1aad861 WHIRLPOOL ae082652979d1ba8f26a6001e6402f587809b2586406f93e42eb9b7d38e4216e290167888ab5d6836ff9a712d555cec66c9f54afea7ca6171dee6cf56c7c0fdb
 DIST netbeans-trunk-nightly-201507280002-src.zip 208905091 SHA256 502a75b45a6d7c2421fa6629cede99d70bb69b19287083ee9ed9cbcd9540343c SHA512 b94b76f709f931ecc1414eb80c1791bada942e7a6a7b2cebe4749453de1c17f929ba497b961a7ea9837057986a463f1d335dc7f2ab460f99c1fb168604d07196 WHIRLPOOL 119f4bb30844c9655760a23c0a48ddbc5abf32c07652165d508061b70f37861c123127735d14be01f506da65d072701514d5a4adb678fe8748f62762bcda6052
 DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae2846b93e0836ed96caddf2d425df5bab2a004b0417879a36e4dd3 SHA512 04e2e8f58102752a45b089cb70c62e6b920b5397cb427179fb042604eec4a78d6380341ab700e70b9190313ea5fc10fb94471a072fa8ad567e4d652b1fa2c3b6 WHIRLPOOL 153cd8da3506e0e3397a06b4341e90b2dc55170bb432a21d66bf425895deef5bf0611bdb181beefc29fd18648d60b827d9e453bca827c26305f55ffb01319f18
+DIST netbeans-trunk-nightly-201507310002-src.zip 208736792 SHA256 f2794218686a678f2e826bb542663753c97f1b5cf839657ed6540b36d85e0eed SHA512 31cab9432e2668d4a90c99e561faa6a78c89210bd76625e4274c45ff634783967e9170bbd504e60fcd08df88c57b57f5c357f30c9c8dc06d6d0c0ae72f3ef0a3 WHIRLPOOL fccf16a822b7d43c1dd709c2357cb2fa6ec518e291f4f306c5c2aa4838f734ef9d2c800795dde592d17b3685826e00d26611e8b3cc4c68e6ee5332cff9aa7129
 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
@@ -153,5 +155,6 @@ EBUILD netbeans-java-9999_p20150720.ebuild 14580 SHA256 eb95d49e2d0df457ceb45f0a
 EBUILD netbeans-java-9999_p20150727.ebuild 14824 SHA256 707482952d85ecf6d6f6f94c0460be70eea6f4196eab9b8fb8d0e6cb03888e8c SHA512 da92cddbbf51c3ae23a16295ac977dec6716d441d6281113d1d219cf3bbb1f5717a4a786309d23505277b77210848cd4d418de19ae1ebd4b212fda77f9831b9e WHIRLPOOL 91d9a87b971813acfb1ba00eb8385916fbc604607a63a974e5c11826d1055e4c00d698e9cb199b50d378979b1edbca577f6e84d077b07081c86df5ea9d43fb1c
 EBUILD netbeans-java-9999_p20150728.ebuild 14824 SHA256 9792fbf469239ab11cfcbcad697bc615b02d9ae1e83d335a02ad050ca68b6230 SHA512 f8f949ba3cfdec2b9377fe03e5bbfae37bfae8fa986516fe4e43b6f16726a11012b4e2c99dbf056113721e9134cb9461d3bf8369da55d43ac563986ff12a1990 WHIRLPOOL 762aeb8b8de127dd74ae28d13de93ec634bc929b883aea3de81a2a11eafbc8a1e575a789097daf724debab1ec6933bdce3c924fc02412aeb8f7c9950d16be8b0
 EBUILD netbeans-java-9999_p20150730.ebuild 14824 SHA256 67072d22553ac772665d6494247af3d71a55abcda00f96c3d88fdeb10651c373 SHA512 29a201debf56b114d9493e238283ea00a5ca822d2087b51ba88d2dcf9ca000ae49e3a7330b2ad2e58293da91846a71507ab16b4a8c3c508fbb98ad0615c4a66b WHIRLPOOL be89979784635a4d0b96075ef1cef9a661890e895889e554b397791f94488720f88b18049229bff78871c55122942b74c8fe422b0a15725ae9e24aa73c89f9a8
-MISC ChangeLog 169275 SHA256 827d497cdf0b8e8cfbe2ab167263fb5de4b172ca592f575009f010a6a4a414e4 SHA512 b36790112949f7e5648256314fbca5be7113f1e452d71f16a1d25380da4580e1b9b34df7f6c1076e7a1c14e391cfcd6b0c45fdf26e77e5a076b120674ff3e02b WHIRLPOOL a7c7f4dd4254cf696c6570be44d6c75972fa7be53b5bc553aba2f08ecd077758e0394569d71ac6856ea95cf84e45919788dcbe4c9dd2de147f3c78daeb88021b
+EBUILD netbeans-java-9999_p20150731.ebuild 14824 SHA256 cea27f8f7558675da359bd729f8afb55e11961fe577330593fc048826d5346c6 SHA512 7b5d31e28d47a4313e9dd32bca0aab5a3bc215160f314160581badf1bf4a1b8f20690b2ddfa89a114eef713ea6bfc2f4fbf89dcd19ddcfb17ce0e0a6b5112d0f WHIRLPOOL c780d686e084b469e137073927636101557bd10de1eeb4d32b6c12efc7d128f7edcf5ba66748f81ade9e08db8ddcbfdbdc7a4e9801bda6f4e970b0136a91ba32
+MISC ChangeLog 169445 SHA256 ccf131e9db33732fbaed7c0451ef7a826074c4f1cf39fb917e56dd0e126555e7 SHA512 5c64b38c5fd30b8309b1b8cb28188bea2ed8525f6e122adc6eae26d4ab176731f2c6d035973803f205bb066ccd14697e48dccf815a0e43b1ebbd7e8cdde512cf WHIRLPOOL c18bc6aa0d1b61061fe1adfa6be4e40660f70d1d5de1b005aee89030633f4f9fa55ebdca19c34fc24fcdbf9af00bb7ab5652f4169315a22bd7b41f75b6cbb5c5
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20150731.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20150731.ebuild
new file mode 100644
index 0000000..5148a9f
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20150731.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-07-31_00-02-28/zip/netbeans-trunk-nightly-201507310002-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/CCFE36D2A4B54345A8A3643C3D2DEAC2DF9C0693-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}"/CCFE36D2A4B54345A8A3643C3D2DEAC2DF9C0693-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 321bdc5..d6d97e2 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_p20150731 (31 Jul 2015)
+
+  31 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javacard-9999_p20150731.ebuild:
+  updated to the latest sources
+
 *netbeans-javacard-9999_p20150730 (30 Jul 2015)
 
   30 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index 9aa610b..43795fd 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201507200001-src.zip 208844011 SHA256 d913ef4e2aa53c
 DIST netbeans-trunk-nightly-201507270002-src.zip 208903918 SHA256 522afa33b0389ef48a5deb3c91ba3c4aa1ca4acf710e2c316479e6892aa3d39a SHA512 078b84e423f0769fb1a2c14bb092c50dd2f1901126b5f3c7b11700858c71b43230281799c248eb4198a22fad17f5a7c34baedd3aac241e2d07d91c72a1aad861 WHIRLPOOL ae082652979d1ba8f26a6001e6402f587809b2586406f93e42eb9b7d38e4216e290167888ab5d6836ff9a712d555cec66c9f54afea7ca6171dee6cf56c7c0fdb
 DIST netbeans-trunk-nightly-201507280002-src.zip 208905091 SHA256 502a75b45a6d7c2421fa6629cede99d70bb69b19287083ee9ed9cbcd9540343c SHA512 b94b76f709f931ecc1414eb80c1791bada942e7a6a7b2cebe4749453de1c17f929ba497b961a7ea9837057986a463f1d335dc7f2ab460f99c1fb168604d07196 WHIRLPOOL 119f4bb30844c9655760a23c0a48ddbc5abf32c07652165d508061b70f37861c123127735d14be01f506da65d072701514d5a4adb678fe8748f62762bcda6052
 DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae2846b93e0836ed96caddf2d425df5bab2a004b0417879a36e4dd3 SHA512 04e2e8f58102752a45b089cb70c62e6b920b5397cb427179fb042604eec4a78d6380341ab700e70b9190313ea5fc10fb94471a072fa8ad567e4d652b1fa2c3b6 WHIRLPOOL 153cd8da3506e0e3397a06b4341e90b2dc55170bb432a21d66bf425895deef5bf0611bdb181beefc29fd18648d60b827d9e453bca827c26305f55ffb01319f18
+DIST netbeans-trunk-nightly-201507310002-src.zip 208736792 SHA256 f2794218686a678f2e826bb542663753c97f1b5cf839657ed6540b36d85e0eed SHA512 31cab9432e2668d4a90c99e561faa6a78c89210bd76625e4274c45ff634783967e9170bbd504e60fcd08df88c57b57f5c357f30c9c8dc06d6d0c0ae72f3ef0a3 WHIRLPOOL fccf16a822b7d43c1dd709c2357cb2fa6ec518e291f4f306c5c2aa4838f734ef9d2c800795dde592d17b3685826e00d26611e8b3cc4c68e6ee5332cff9aa7129
 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
@@ -69,5 +70,6 @@ EBUILD netbeans-javacard-9999_p20150720.ebuild 4982 SHA256 7b1b75221ebd2124c6dba
 EBUILD netbeans-javacard-9999_p20150727.ebuild 4982 SHA256 eb7097c9a06603ec6790a6b0619a6404d90289d16780ed561f1ee3cd29fc649e SHA512 cf8b28238380b878e30866ee8f99b05a6aba864f6e78a03f5adbaf2750a901405231217b978d12a03adc0ae9d0e2695cedbcc56265dea130ef2909893cf13b9b WHIRLPOOL de2c3e36394be10c0a11d72ad6b6f592215a46d2c6cb7f22aab0a9a454d56d0f5e175e02aa8f4abe08392d96e7c1462b8e34c8d1f01b5636b214ac5179d31f63
 EBUILD netbeans-javacard-9999_p20150728.ebuild 4982 SHA256 feee309dffa69933a33d82682e665c8e5338d3a7f37c3383b58f52ca234005c3 SHA512 e8008556703c03fc00d2ed1927afb59bd059a4dd210ea1a4719b7b7419cd6e955e91b583c5a5a86867e77cda811e6625715056d4fbca758d5d0421bd565d8751 WHIRLPOOL a663b90e74066ce4922ec382240d1e80430de2ebc2fa6389b86f31fafe5735e7fcbab00a12393d7b98a697bdb75fc3226aa0f198f5885bd1fc363483f92d7e83
 EBUILD netbeans-javacard-9999_p20150730.ebuild 4982 SHA256 433c1c35a0d23a8faa58d46e23355516ffa41ac6148af40e8c41dc7792eece38 SHA512 069215542b8e4057bb293e534e6e31a49d823fee4b78571ea1cd6f3b1e7ed34219ea41ab5a24e8202084c94489953966b14641b76922bc227cd9fe8bf64dae10 WHIRLPOOL e9aadf14f77282e811a9ecba52ce9bd5af5240fcdbccd471221131a2d97fbd65e20dcf1a89a0784f57db9e243cf66ae1b3cef7f67f049f29fb16e4729df73133
-MISC ChangeLog 176408 SHA256 819ed6267ff32cac3f3a79ea583a44bfd23c86a870eb4068839a4fe7ba060953 SHA512 996faeb28bf25fbd0d24a1172c81d4a6ad29cb521223c923eb59aed8bd510acb6d9af8bf2f1408f13d7074e8e9b0d5f76d439379ab7e2d436065b3edd94d871c WHIRLPOOL 849257052efb48ceb7a1632656c00ab5df4a0b20b9e01335d78f5a24a25b80acb0f5273f09d54c4b40e5367f3fc7dc509f663e66f89ea8c6d0bd3d0af8084810
+EBUILD netbeans-javacard-9999_p20150731.ebuild 4982 SHA256 b21863514228a9a060f20f2d6f9c855590419d98138563d5741d0aa793671776 SHA512 3e23ae91e3093fa53c86aac8ca5991cbbd0bc869ea6953ebf97d2e6870950fd869d9d1b5f8da6c09b8012d8982f9c2ac8eb8766e7deee5e49bdfb83fb7a801bb WHIRLPOOL 6edfb4ed472f901c8337bdf7774baf726eea4379b0f94e51e52e25c4003aba7db35e00e60a0558a4422a8b98bb07fc95d6d7cdcf9acf7f59b9d526aeea19e969
+MISC ChangeLog 176586 SHA256 014a8cb7eb180e043096089b53e2f668b32572966f77c85653717e2485a9d019 SHA512 3967636c2ac1af756378f68214d59cbde779cd54e3f48a38638a7ac1e296cc204650df4a6ba7de9195602669fa9b1fac4f6be6b3dc6cf756a569f713fc212dac WHIRLPOOL 0b11bb556df5610035bbcde8429c1295fc942d15d6768a13bb92d9d3cc013107994942d06a572c35a4ae05bd81149aff916ddf3c3489c7a21f1de1fc0f99afb5
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150731.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150731.ebuild
new file mode 100644
index 0000000..b6723bf
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150731.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-07-31_00-02-28/zip/netbeans-trunk-nightly-201507310002-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 222f37f..1beaaea 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_p20150731 (31 Jul 2015)
+
+  31 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javadoc-9999_p20150731.ebuild:
+  updated to the latest sources
+
 *netbeans-javadoc-9999_p20150730 (30 Jul 2015)
 
   30 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index cdc1147..83b98a0 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -42,6 +42,7 @@ DIST netbeans-trunk-nightly-201507200001-src.zip 208844011 SHA256 d913ef4e2aa53c
 DIST netbeans-trunk-nightly-201507270002-src.zip 208903918 SHA256 522afa33b0389ef48a5deb3c91ba3c4aa1ca4acf710e2c316479e6892aa3d39a SHA512 078b84e423f0769fb1a2c14bb092c50dd2f1901126b5f3c7b11700858c71b43230281799c248eb4198a22fad17f5a7c34baedd3aac241e2d07d91c72a1aad861 WHIRLPOOL ae082652979d1ba8f26a6001e6402f587809b2586406f93e42eb9b7d38e4216e290167888ab5d6836ff9a712d555cec66c9f54afea7ca6171dee6cf56c7c0fdb
 DIST netbeans-trunk-nightly-201507280002-src.zip 208905091 SHA256 502a75b45a6d7c2421fa6629cede99d70bb69b19287083ee9ed9cbcd9540343c SHA512 b94b76f709f931ecc1414eb80c1791bada942e7a6a7b2cebe4749453de1c17f929ba497b961a7ea9837057986a463f1d335dc7f2ab460f99c1fb168604d07196 WHIRLPOOL 119f4bb30844c9655760a23c0a48ddbc5abf32c07652165d508061b70f37861c123127735d14be01f506da65d072701514d5a4adb678fe8748f62762bcda6052
 DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae2846b93e0836ed96caddf2d425df5bab2a004b0417879a36e4dd3 SHA512 04e2e8f58102752a45b089cb70c62e6b920b5397cb427179fb042604eec4a78d6380341ab700e70b9190313ea5fc10fb94471a072fa8ad567e4d652b1fa2c3b6 WHIRLPOOL 153cd8da3506e0e3397a06b4341e90b2dc55170bb432a21d66bf425895deef5bf0611bdb181beefc29fd18648d60b827d9e453bca827c26305f55ffb01319f18
+DIST netbeans-trunk-nightly-201507310002-src.zip 208736792 SHA256 f2794218686a678f2e826bb542663753c97f1b5cf839657ed6540b36d85e0eed SHA512 31cab9432e2668d4a90c99e561faa6a78c89210bd76625e4274c45ff634783967e9170bbd504e60fcd08df88c57b57f5c357f30c9c8dc06d6d0c0ae72f3ef0a3 WHIRLPOOL fccf16a822b7d43c1dd709c2357cb2fa6ec518e291f4f306c5c2aa4838f734ef9d2c800795dde592d17b3685826e00d26611e8b3cc4c68e6ee5332cff9aa7129
 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
@@ -72,5 +73,6 @@ EBUILD netbeans-javadoc-9999_p20150720.ebuild 6234 SHA256 e95b71c3b5023733ac618f
 EBUILD netbeans-javadoc-9999_p20150727.ebuild 6234 SHA256 8f7b74e7988100e5df19e5739f30bda40c43cb5909148bc2befec724548b88fc SHA512 2a2a1de7cdb57e5180b0161db4d9b86925418901c79b92c94cb859b3f464d4f0383fe326fef3031c932a2936897aa657dfeb9d9c28c172d8fa2567cd10fa4156 WHIRLPOOL 1a491e39339e92dde73faa2e29fadfa49166e7297b33b67ec1e439026b8817ff583c0afba639ee1617b2c0e7245aa47733f5799c23a44ff5eb07808c51c16f7e
 EBUILD netbeans-javadoc-9999_p20150728.ebuild 6234 SHA256 b332ce72f528179ed2376bf7c2067122c582d6e54531966efcec5f4d77dac790 SHA512 f58aa0e59a8ac7809fba2c5fc2ef7b02e03cfdbcfbe0a3ad16f966ebd071789a6577520a89bf24e4687409138a2612374ac69aae720285233a2373af4f342b59 WHIRLPOOL 00046ba80d80360ae8da7fa5c207f4488b3ea2c09fae5ebbfd6663cece8a913f3512a016a2c3b3ed90f21f2f593ecbbf592f5ee6b483841d22f1c79cffffcdc7
 EBUILD netbeans-javadoc-9999_p20150730.ebuild 6234 SHA256 0942cd98e72ce51fbe9c9271bd5eee2758da5209680ac383f3b9b8705ffd39c6 SHA512 c309e015422b5133e4eab29692b5c2a299f72d0602c5d3c1de15bf442fa2eb66eefa3b3f1c2656053d809552992893a004042c74c28e2fa4273b24ee3c7bcd14 WHIRLPOOL 02698f286e7bc743163d51d5fdc5a7209d67f14a31a78030ef1edc2db2924cb0c7b204c4b8ed9d6f5938c3f5168afefc00447cd0e453b6bad5f8c0f05782f365
-MISC ChangeLog 174032 SHA256 c6d2f7f9d5e2ec05332b1b28b7a6e21ccd2a209260eede8a5795fca712101070 SHA512 b3366d843ce64c45a9de21ede769d7966f26214a1fa9670ce3aa4e1da913f186cfa668ab7a1357161774161025bcf7dce23fc328c4f46e037d7fb2bbc3943faf WHIRLPOOL 880d1c1bbc6d47eda02b91f59566fa7cd1a44d63d879c2911c71cae90993e97aa168303fc03e472dafe150d8d0851eb1bd670438dce7346af9cfd9379151048e
+EBUILD netbeans-javadoc-9999_p20150731.ebuild 6234 SHA256 30d960f58c467921cdd63a316b8fa96d393e0cc896790692afbb2879aa0b67ae SHA512 19520d88cc8f83ca5ca6e512817ecea276c212ddfbba3decfcaa2cc37560dd6c6c6c7ec73892edb2a5f22437ee7ab1b2e6c4da7a1fd087123f604ea4bce64ccd WHIRLPOOL ca208b3bd8cc9ce0c33b3d89618a4288b63aa2e2dfd4d8e19deceece1ac6c7db2fcc1bfc5ec91a84e99b6948fd0e0adb7774fb26244b382a72aa4fa2012fbc6e
+MISC ChangeLog 174208 SHA256 7fc41e8562581bfb78dcb2ebcf9c9f218f726aa01b5b6e8d0c8015c9907eef2e SHA512 20318889e1eeef182c63409ec4764accfbc20aa15485147308f5b1d9f36e8e9c16c1329cdfdd672f03c318a85993f6cf9f7b5b2b4b61e2c88c6707ff02e1ba98 WHIRLPOOL f6a3b4788dfe7a8ce89826a60624aa0bbffa58f04be05dd41c4b4610505aa38c1a730f7462a63d6c0e152a6aa741e2aeafda031ad16c4b38300d1083feedf248
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150731.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150731.ebuild
new file mode 100644
index 0000000..bef044d
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150731.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-07-31_00-02-28/zip/netbeans-trunk-nightly-201507310002-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 028f162..7d1c70f 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_p20150731 (31 Jul 2015)
+
+  31 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javafx-9999_p20150731.ebuild:
+  updated to the latest sources
+
 *netbeans-javafx-9999_p20150730 (30 Jul 2015)
 
   30 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index f855bc7..9a69053 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -42,6 +42,7 @@ DIST netbeans-trunk-nightly-201507200001-src.zip 208844011 SHA256 d913ef4e2aa53c
 DIST netbeans-trunk-nightly-201507270002-src.zip 208903918 SHA256 522afa33b0389ef48a5deb3c91ba3c4aa1ca4acf710e2c316479e6892aa3d39a SHA512 078b84e423f0769fb1a2c14bb092c50dd2f1901126b5f3c7b11700858c71b43230281799c248eb4198a22fad17f5a7c34baedd3aac241e2d07d91c72a1aad861 WHIRLPOOL ae082652979d1ba8f26a6001e6402f587809b2586406f93e42eb9b7d38e4216e290167888ab5d6836ff9a712d555cec66c9f54afea7ca6171dee6cf56c7c0fdb
 DIST netbeans-trunk-nightly-201507280002-src.zip 208905091 SHA256 502a75b45a6d7c2421fa6629cede99d70bb69b19287083ee9ed9cbcd9540343c SHA512 b94b76f709f931ecc1414eb80c1791bada942e7a6a7b2cebe4749453de1c17f929ba497b961a7ea9837057986a463f1d335dc7f2ab460f99c1fb168604d07196 WHIRLPOOL 119f4bb30844c9655760a23c0a48ddbc5abf32c07652165d508061b70f37861c123127735d14be01f506da65d072701514d5a4adb678fe8748f62762bcda6052
 DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae2846b93e0836ed96caddf2d425df5bab2a004b0417879a36e4dd3 SHA512 04e2e8f58102752a45b089cb70c62e6b920b5397cb427179fb042604eec4a78d6380341ab700e70b9190313ea5fc10fb94471a072fa8ad567e4d652b1fa2c3b6 WHIRLPOOL 153cd8da3506e0e3397a06b4341e90b2dc55170bb432a21d66bf425895deef5bf0611bdb181beefc29fd18648d60b827d9e453bca827c26305f55ffb01319f18
+DIST netbeans-trunk-nightly-201507310002-src.zip 208736792 SHA256 f2794218686a678f2e826bb542663753c97f1b5cf839657ed6540b36d85e0eed SHA512 31cab9432e2668d4a90c99e561faa6a78c89210bd76625e4274c45ff634783967e9170bbd504e60fcd08df88c57b57f5c357f30c9c8dc06d6d0c0ae72f3ef0a3 WHIRLPOOL fccf16a822b7d43c1dd709c2357cb2fa6ec518e291f4f306c5c2aa4838f734ef9d2c800795dde592d17b3685826e00d26611e8b3cc4c68e6ee5332cff9aa7129
 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
@@ -71,5 +72,6 @@ EBUILD netbeans-javafx-9999_p20150720.ebuild 4723 SHA256 a2264c5ce0e692c4fae8ef9
 EBUILD netbeans-javafx-9999_p20150727.ebuild 4723 SHA256 12523f9becc1ffbbbb42c86585d0b35f935256b93e38c762935a757e36cf1ccc SHA512 f3a347c42d7a5040101ac3f6bf24dd5193eb9505d152836b82a7532fd876de398f0bc12556d0f10ebce437bb0f7c57ab8ec5b0e10542de686f52a06bf3eefd6d WHIRLPOOL 0a3dfd96624850ea1f5e43d0a776bac05ef9a5be0e2111df90fed7665e09f46bc14d391aeb0ff082988c752eb0aa33f7aa0978777c7a8fc4404c9f51f6ffdf14
 EBUILD netbeans-javafx-9999_p20150728.ebuild 4723 SHA256 18f5104d26209089ec53c5c6ea3aa5da3b1435db0b12ffc686e0128c5f2f5fd3 SHA512 501b61d8142f58daf359cae9e8ab4d610b06ec4a8e5a0b6876c41b36ed9e689b4cfe8de4a1b18e4fca7071a31c8231f9d3e7913f0d0dfe8119d44e60304e051d WHIRLPOOL f2e14fe995c4858cd9b1c7979d7a30c4bacc0ed15d2abdba6b52c772239e74571e0109a8c04734215c006334b8be90cfe2d660e31058344db94dfcd0377a7b66
 EBUILD netbeans-javafx-9999_p20150730.ebuild 4723 SHA256 42aff9ca84192bf7713b7c1cfc295f11e264772596ff85afcb966f0e3d912c24 SHA512 d7c398a361fea8834dde4824e952bb772b97b71bfa135abbad030e941774c30fe5276468c2f822ac255b6d3c5992d76490ec0409a1adcba47f842948b21e7404 WHIRLPOOL a89cad33b2fa11e5265a413ca4de49ac7b064ee097a8aafcaba78d9be40ec43b16bba3984f65a40b4d0fffa5508424b84d6065331b35787c5f393a6c050b4eea
-MISC ChangeLog 158523 SHA256 a74f70ac29169adeb4b6aa0def08d9869d064f9fe17b14dad0a24685f7ca5f9d SHA512 1adb8ecadf942c92ca89194212cb4dc1307a6109c07cf11dd3d45cb0a2ad3f8212befe05795de66fd5cab166c291dabf33ff90538d9290460c231980f72b0975 WHIRLPOOL 05564758b09809765ac9f5dfeb021f52c17c1dd9ac4908c4787072631a6a093595cb8713f525de3faa2a88b8422a35ca22f60644c1878bc114aabebe4b793525
+EBUILD netbeans-javafx-9999_p20150731.ebuild 4723 SHA256 2b83208f33464fa4d2c7581235691fd4b328cf963f251af275590ba48a4f6b2e SHA512 5f01bed019519bac5a1e4e5e8a4d6ea02646a672b009835f7b9054497fca75663fbc2826b9cf86a1d7916ca2a5c01778f9a8bbb881f088fac320bb4766241059 WHIRLPOOL 2af991d1d31e2b299c8d847de4d676e1a41dd255e14eda1391361dac7eb315087f652b611dc454aca1c48b767f650dd4ebf2dd2fa531e5f6e1699e91d21d189d
+MISC ChangeLog 158697 SHA256 fb507a25c897b464810086896a7a7a6099cdc4aeb29639ac7521726cf21535c0 SHA512 fde2a45d742d75082b28d24b318093d7b0608949b1e160e6894a7435907263b5cf1d0662540ab275d295b3bda89ebf8d6eccb1df9bff3b80f588705358cd6c39 WHIRLPOOL eb35ecfab9c0de87c5bd7a454ba6703c02cf163178c392802cee117a14913c087518a6c3421e7a169ca1eb51040f102316578d9fb8fecb617414ded5b1179dd2
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150731.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150731.ebuild
new file mode 100644
index 0000000..2871b24
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150731.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-07-31_00-02-28/zip/netbeans-trunk-nightly-201507310002-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 f23e8cd..fde48e4 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_p20150731 (31 Jul 2015)
+
+  31 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-mobility-9999_p20150731.ebuild:
+  updated to the latest sources
+
 *netbeans-mobility-9999_p20150730 (30 Jul 2015)
 
   30 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 3e79089..ff597ac 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -45,6 +45,7 @@ DIST netbeans-trunk-nightly-201507200001-src.zip 208844011 SHA256 d913ef4e2aa53c
 DIST netbeans-trunk-nightly-201507270002-src.zip 208903918 SHA256 522afa33b0389ef48a5deb3c91ba3c4aa1ca4acf710e2c316479e6892aa3d39a SHA512 078b84e423f0769fb1a2c14bb092c50dd2f1901126b5f3c7b11700858c71b43230281799c248eb4198a22fad17f5a7c34baedd3aac241e2d07d91c72a1aad861 WHIRLPOOL ae082652979d1ba8f26a6001e6402f587809b2586406f93e42eb9b7d38e4216e290167888ab5d6836ff9a712d555cec66c9f54afea7ca6171dee6cf56c7c0fdb
 DIST netbeans-trunk-nightly-201507280002-src.zip 208905091 SHA256 502a75b45a6d7c2421fa6629cede99d70bb69b19287083ee9ed9cbcd9540343c SHA512 b94b76f709f931ecc1414eb80c1791bada942e7a6a7b2cebe4749453de1c17f929ba497b961a7ea9837057986a463f1d335dc7f2ab460f99c1fb168604d07196 WHIRLPOOL 119f4bb30844c9655760a23c0a48ddbc5abf32c07652165d508061b70f37861c123127735d14be01f506da65d072701514d5a4adb678fe8748f62762bcda6052
 DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae2846b93e0836ed96caddf2d425df5bab2a004b0417879a36e4dd3 SHA512 04e2e8f58102752a45b089cb70c62e6b920b5397cb427179fb042604eec4a78d6380341ab700e70b9190313ea5fc10fb94471a072fa8ad567e4d652b1fa2c3b6 WHIRLPOOL 153cd8da3506e0e3397a06b4341e90b2dc55170bb432a21d66bf425895deef5bf0611bdb181beefc29fd18648d60b827d9e453bca827c26305f55ffb01319f18
+DIST netbeans-trunk-nightly-201507310002-src.zip 208736792 SHA256 f2794218686a678f2e826bb542663753c97f1b5cf839657ed6540b36d85e0eed SHA512 31cab9432e2668d4a90c99e561faa6a78c89210bd76625e4274c45ff634783967e9170bbd504e60fcd08df88c57b57f5c357f30c9c8dc06d6d0c0ae72f3ef0a3 WHIRLPOOL fccf16a822b7d43c1dd709c2357cb2fa6ec518e291f4f306c5c2aa4838f734ef9d2c800795dde592d17b3685826e00d26611e8b3cc4c68e6ee5332cff9aa7129
 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
@@ -75,5 +76,6 @@ EBUILD netbeans-mobility-9999_p20150720.ebuild 4418 SHA256 07916e46805042f524506
 EBUILD netbeans-mobility-9999_p20150727.ebuild 4418 SHA256 a9db20c3f3c34671f1d942f184e28c5162f8607bb28dafc13dcd8971791a672b SHA512 628e99da220515b0527f2f2bd0553df35f03b38d85089d67b774465c55461ce4ab109cfea464573d6d16e75505d0b62245df23b30380958a0da335ef5885c698 WHIRLPOOL c14cae94be28a95127b6fe516aefcf5b6d00fae9978dbf7a2bf760861a9a155d637b7ced0a9ca8307c6858737a59d4953baf4f807bef92a69762ee82e3240072
 EBUILD netbeans-mobility-9999_p20150728.ebuild 4418 SHA256 007145639d8dbdc39a9aed1e00c4b735cf87f56cc0fa540502a5f2001962324d SHA512 59424251379dc398c32f4da7a10ff09b05801c2ba92100e886c01abda5bbc086606d396008fa5d679feb9504ccc2fdc8a636836d87d7baf721b34d9dc55cdbdd WHIRLPOOL c01af890a60af0d92eb765e07175f4004066b972b0f0d7acbf789827f77d6b1ae03d6bd7fb0685f2c73207111e6acaa6851eeb34d59efb5adaf5444a2bf71486
 EBUILD netbeans-mobility-9999_p20150730.ebuild 4418 SHA256 90ee43a5d568d434912f06248dc2d0046d72a82d6c3cc07eb1c3c2bd481b68fb SHA512 ef10f2482ec138aba5e55f517b7b35e479f5ecbc7459590a2138923f3cc83f5c0e1d29a765669f5d4babe11bca397bb758f01ed782a21c173eba00c386d145ca WHIRLPOOL 34c7a476cd5160f5571780c3904f8dc55df99d331ae80fbe6ce341dec8e605d7b88396feff00455d32925e8e43d52922feb552d17b92271fb9a6f3f763364fd9
-MISC ChangeLog 176549 SHA256 4e737a7b6ac732432a8ea28d3daa2cfe696140a04f3560e57e2f4966f5d423aa SHA512 76d5c74594ccfdd0e04a2190e5c984aa489c2e0c3ad5be888b39f248de6d24511497a929ab6a8fa0a3c8f2dde5fa75cd8c6824a572e81e26567ffd583196d23d WHIRLPOOL c65e19d614899cf26e7c9d75f9197a5529306f9862cf993c1d8e289810959afd64d4b4d51367a08de9915c9bd61200833b4c28ee3d7d26d42bb9cf37bf459242
+EBUILD netbeans-mobility-9999_p20150731.ebuild 4418 SHA256 f2c93a98cd70a128e672154f300324d3c16c7fa03a563656cba7940fbcedd3ba SHA512 825927647003ac614330a342289b5aae5b519932501c2e77037e8616fca55be2810abb15e6ca1374ea25020486c02a4f340deecec05fd94457be32e2c5b4e7fe WHIRLPOOL 5ba190f5e7ed66043bbb97bd5162d7ea1dd139714af44b7153c1fe7fc16c9ee6ad31c82c2484aa8f83db6f5ad97770922e6f2cbaa6d78686ade55e334c7afdad
+MISC ChangeLog 176727 SHA256 09e8ea4de5d2c92da7dad1b137c41ad0cce128d789f0128868ef3f2cbb8d7e40 SHA512 37f3d6c7223e9b0b2bccab733d792b7268f6cf6ca55c499cbd0b66f30388a54b9e456faf0f3dbde21bdbb90456c1a871414313787a4cec67fb2ee914a10140fb WHIRLPOOL 4483f2288732335fbac42bb2bf53475006e6f28f889870e7aea5b5508729d6870da782bf9a02c3dddc7c202c3062cd30b524cc5131a609cac24110c2aadb8489
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150731.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150731.ebuild
new file mode 100644
index 0000000..848998a
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150731.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-07-31_00-02-28/zip/netbeans-trunk-nightly-201507310002-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 7c12bef..879e2b6 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_p20150731 (31 Jul 2015)
+
+  31 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-nb-9999_p20150731.ebuild:
+  updated to the latest sources
+
 *netbeans-nb-9999_p20150730 (30 Jul 2015)
 
   30 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index 28011ec..c3d08b6 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -44,6 +44,7 @@ DIST netbeans-trunk-nightly-201507200001-src.zip 208844011 SHA256 d913ef4e2aa53c
 DIST netbeans-trunk-nightly-201507270002-src.zip 208903918 SHA256 522afa33b0389ef48a5deb3c91ba3c4aa1ca4acf710e2c316479e6892aa3d39a SHA512 078b84e423f0769fb1a2c14bb092c50dd2f1901126b5f3c7b11700858c71b43230281799c248eb4198a22fad17f5a7c34baedd3aac241e2d07d91c72a1aad861 WHIRLPOOL ae082652979d1ba8f26a6001e6402f587809b2586406f93e42eb9b7d38e4216e290167888ab5d6836ff9a712d555cec66c9f54afea7ca6171dee6cf56c7c0fdb
 DIST netbeans-trunk-nightly-201507280002-src.zip 208905091 SHA256 502a75b45a6d7c2421fa6629cede99d70bb69b19287083ee9ed9cbcd9540343c SHA512 b94b76f709f931ecc1414eb80c1791bada942e7a6a7b2cebe4749453de1c17f929ba497b961a7ea9837057986a463f1d335dc7f2ab460f99c1fb168604d07196 WHIRLPOOL 119f4bb30844c9655760a23c0a48ddbc5abf32c07652165d508061b70f37861c123127735d14be01f506da65d072701514d5a4adb678fe8748f62762bcda6052
 DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae2846b93e0836ed96caddf2d425df5bab2a004b0417879a36e4dd3 SHA512 04e2e8f58102752a45b089cb70c62e6b920b5397cb427179fb042604eec4a78d6380341ab700e70b9190313ea5fc10fb94471a072fa8ad567e4d652b1fa2c3b6 WHIRLPOOL 153cd8da3506e0e3397a06b4341e90b2dc55170bb432a21d66bf425895deef5bf0611bdb181beefc29fd18648d60b827d9e453bca827c26305f55ffb01319f18
+DIST netbeans-trunk-nightly-201507310002-src.zip 208736792 SHA256 f2794218686a678f2e826bb542663753c97f1b5cf839657ed6540b36d85e0eed SHA512 31cab9432e2668d4a90c99e561faa6a78c89210bd76625e4274c45ff634783967e9170bbd504e60fcd08df88c57b57f5c357f30c9c8dc06d6d0c0ae72f3ef0a3 WHIRLPOOL fccf16a822b7d43c1dd709c2357cb2fa6ec518e291f4f306c5c2aa4838f734ef9d2c800795dde592d17b3685826e00d26611e8b3cc4c68e6ee5332cff9aa7129
 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
@@ -74,5 +75,6 @@ EBUILD netbeans-nb-9999_p20150720.ebuild 5003 SHA256 e188ad5aa924579f2e8b20c5642
 EBUILD netbeans-nb-9999_p20150727.ebuild 5003 SHA256 58b7035c69061b34d640b584a8e5858558cc9a95775161c33a0a0f1279869d0b SHA512 4b2c7807d9e50fd72ff7f05c523e15d15cd0542dbc3f7ca02c994b37176befa45436dd55b538b92fd3f77a93b298764d7d81077313d4374c6f8f664eb733a9a0 WHIRLPOOL b5423e11ecb6af13a5a9e3a84be028623a928f364dd1d74ee8d43ae7a2a796b99870f388bcd8d741d73396b78ccf1d7d6f6c57df3d33df0b0ccca3decdadaf84
 EBUILD netbeans-nb-9999_p20150728.ebuild 5003 SHA256 0ec5d396fa06208ed27c7d54c22c5c165fa64b489d464727d58b9634c04845a8 SHA512 c0434601ed6b72a22cd64864d35afb19e6a14cf20627c943d6c35912b831d5f9cf6eb5ed829a24facd186d44134178df80d9123f4fe62ec0bd373abe0ae79274 WHIRLPOOL 024018c5f6e338d5dddbbee3b0a0a2c026dd5713791c76526da8356ef51819b8063ce5a7ed2e63ef72346fc8115ff9befa4a96a5aa72b28002ce175e4366a3ed
 EBUILD netbeans-nb-9999_p20150730.ebuild 5003 SHA256 2cd87115aa8d82423528d11c8da122d7a1910749a0d3eed508a88d63ffa446e5 SHA512 41c00ab01418dd96618dccb8980af262bca11313641ccadc8b84f652c12a6dd6d79589cff2be7d92eafc0d6a840dc8baa6ea21ac8a1c414edf2287ca09f19ede WHIRLPOOL 27f7df29330ef5dd8a1c9cabb2b04128ead1814ee5df34b03fb2db130b3a86136a810b00396a543a4b9d01f51657a3041dddaa8c1dc544d6d1f0e93446021c36
-MISC ChangeLog 164803 SHA256 150f17787f5f3e44f64abe741a424fd8a00e5e4e60bff90b1473fb580b101f6c SHA512 617b14fcee847a555711d86a322f8392e2de4e741097451501704794b662ae6014eedd5204ac631e2fa957237b2511fd72a24bbc376f61bee68dbca360af4443 WHIRLPOOL 819fb9076feee0784b128b3b34db9627f8efed79ba41fdd12dacdaa759273ba1ae0e115f01853172f8897ec756bc0a41ef6ffdf53519141fea706350bc1438c1
+EBUILD netbeans-nb-9999_p20150731.ebuild 5003 SHA256 8097aad2f282f19c474cc145f0669d51aa8a06954299f92fce2f90746a2e0496 SHA512 bb3a3a5b5b7c14f3ae2790ed1199280436eea12af19eacfd041101490f64aefc817dca567afab05e6e73285fef95a2903f081c0fedeecdbd95cfa8e6acc73f98 WHIRLPOOL aa8544fa96a9364da483c1de99a57f9495fc96b4cad3a9828d6d9db2fb19628f68f9baf88ce63e7efcb2bcb061774841889d4abbcb3d913a299f2dbc710f0124
+MISC ChangeLog 164969 SHA256 8296f7a71657986984dd8e323e9d36ba656ce557aede3cf96fd1443df4f18ad1 SHA512 9026cda95b167fe9b469bb9f2d835a067e5bb510038a9d159520df513222b6fea42ae00e49f7bb55386707a81c0161031fdd2ebd1dd46513f87718e21383acde WHIRLPOOL 6833f8df7a9d8c85ea0d12d386dad6f3dd5b24b698cee5f0c4c37463b49918ce97608f570c86f99e9a8ced2014fe4909defa074c2433208d64a5579168e9941b
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20150731.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20150731.ebuild
new file mode 100644
index 0000000..bd79a85
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20150731.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-07-31_00-02-28/zip/netbeans-trunk-nightly-201507310002-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 9013a4d..e286427 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_p20150731 (31 Jul 2015)
+
+  31 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-php-9999_p20150731.ebuild:
+  updated to the latest sources
+
 *netbeans-php-9999_p20150730 (30 Jul 2015)
 
   30 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index d55516d..425896a 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -48,6 +48,7 @@ DIST netbeans-trunk-nightly-201507200001-src.zip 208844011 SHA256 d913ef4e2aa53c
 DIST netbeans-trunk-nightly-201507270002-src.zip 208903918 SHA256 522afa33b0389ef48a5deb3c91ba3c4aa1ca4acf710e2c316479e6892aa3d39a SHA512 078b84e423f0769fb1a2c14bb092c50dd2f1901126b5f3c7b11700858c71b43230281799c248eb4198a22fad17f5a7c34baedd3aac241e2d07d91c72a1aad861 WHIRLPOOL ae082652979d1ba8f26a6001e6402f587809b2586406f93e42eb9b7d38e4216e290167888ab5d6836ff9a712d555cec66c9f54afea7ca6171dee6cf56c7c0fdb
 DIST netbeans-trunk-nightly-201507280002-src.zip 208905091 SHA256 502a75b45a6d7c2421fa6629cede99d70bb69b19287083ee9ed9cbcd9540343c SHA512 b94b76f709f931ecc1414eb80c1791bada942e7a6a7b2cebe4749453de1c17f929ba497b961a7ea9837057986a463f1d335dc7f2ab460f99c1fb168604d07196 WHIRLPOOL 119f4bb30844c9655760a23c0a48ddbc5abf32c07652165d508061b70f37861c123127735d14be01f506da65d072701514d5a4adb678fe8748f62762bcda6052
 DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae2846b93e0836ed96caddf2d425df5bab2a004b0417879a36e4dd3 SHA512 04e2e8f58102752a45b089cb70c62e6b920b5397cb427179fb042604eec4a78d6380341ab700e70b9190313ea5fc10fb94471a072fa8ad567e4d652b1fa2c3b6 WHIRLPOOL 153cd8da3506e0e3397a06b4341e90b2dc55170bb432a21d66bf425895deef5bf0611bdb181beefc29fd18648d60b827d9e453bca827c26305f55ffb01319f18
+DIST netbeans-trunk-nightly-201507310002-src.zip 208736792 SHA256 f2794218686a678f2e826bb542663753c97f1b5cf839657ed6540b36d85e0eed SHA512 31cab9432e2668d4a90c99e561faa6a78c89210bd76625e4274c45ff634783967e9170bbd504e60fcd08df88c57b57f5c357f30c9c8dc06d6d0c0ae72f3ef0a3 WHIRLPOOL fccf16a822b7d43c1dd709c2357cb2fa6ec518e291f4f306c5c2aa4838f734ef9d2c800795dde592d17b3685826e00d26611e8b3cc4c68e6ee5332cff9aa7129
 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
@@ -78,5 +79,6 @@ EBUILD netbeans-php-9999_p20150720.ebuild 4423 SHA256 4aa288a1604921bcc28d5ab311
 EBUILD netbeans-php-9999_p20150727.ebuild 4423 SHA256 450bb08288ad87c1a2642988172baca403d7506e376b8c02654a0329c4e1309f SHA512 13d373ea8ba686bea9e95447006f106554063579ae6734e151b4d0bef285d40aa7b4e69da3cb6592d64de6c5743b27afd6b612be22879b8320da35bc59f02019 WHIRLPOOL d85908e748eea560c3e54eecedd91cf986db16af25293162635c94d6f8fa049353bc80a6c37e7d691b52b97abcc5a9f4823fed694c036f8c28b935445e5c2b2f
 EBUILD netbeans-php-9999_p20150728.ebuild 4423 SHA256 b62c543abf980d2c71170057e19797778210b709ae02b30bb91e2310f6e6bda2 SHA512 e3a9909aa3395e3d11a03be42b2e6ebcf69e6041c861897af83f2f419b16e60800e0f83c56053692a0c8fe199f45122e798059c9ec60c8729fbc138feadd2d0f WHIRLPOOL be12752ec1254f389ecd786b28823885a40570ed68f91e0da813baf969375c8e8e066ff67a45fac30a6c1128ec223628b302a6b04413d74ec4cd9ee164716198
 EBUILD netbeans-php-9999_p20150730.ebuild 4423 SHA256 529764502cff24b10ec331e0ec36caef96d6bc14c1ed80cc4e45bd32f6065ecc SHA512 bc9b0e132357a2048b6c8a7c7b8a277dd3d56f0e07ed78aac740994318dfbb2eb1345a2dceb7396eec850a15c50939a86bcacabab0c829f29ad37ebe8c526aa5 WHIRLPOOL f22577e2296949e14861b089dc506080641f933a934e54ba8e2e569ce7afbd1f9fe76f7a4a98c1077cd0dc30df2858eeda44fe916c493842f5efae442912ba96
-MISC ChangeLog 164637 SHA256 24df76cb374d7a5f0a6ce5ee63dc2a2e267f62f2641f3ba1d6c0392924411e03 SHA512 c16ee9fe40260b41d951d2980c4b732b30682e70129ac56503ff550ee41a2e3a0653dc70acbc061fb51bba4b3fa390f0c82688ee7c18377fc307babd04dc59e2 WHIRLPOOL c76c6b3aa42716254dfbf8797a1089345ded9d56628819f9beb58b81ac710a21b382118733c51270d7351e7d2b3b367dde045d562e5184e0f5ca519686f9f79f
+EBUILD netbeans-php-9999_p20150731.ebuild 4423 SHA256 3c3a4e083d65e7238c7f35b3b9d0b7f056f974e7b256abdd760aa75f87ec35c7 SHA512 0dcff13d4590c82b6f6c9fa17c1b57af41f45f1a5624a90831481de2e1ac2b039fe8bd05bceabed4bf17537e17d8411313a8ffd16475592fad1dfae9ef79ec74 WHIRLPOOL e64a4ff0961578f30614ab6a48967a25b9c4d0fcde2f44e542c4968984ff69cb873ed2666ee6398cc72f01b097a148f6ef68b3fae0b73bb10785c03086ebb844
+MISC ChangeLog 164805 SHA256 f8acd3e7e09b032b9eeb64db586e5a838a6d69c4b103d8df1ce568a16915f637 SHA512 89ed7be267048fc7539bb28f3c6e26c3db3ef16574387bf203bbd5398fce53d3e027b6b0d7a5fea1d44541497841bb7ffaa1183188f4eb1dbd706277cf8551cd WHIRLPOOL 95d9aeca8c950aae2654dca241d8fea0e79dc8e9b3a54c942d81402beb12eab5b119d0ca69e5f77288a2ea4841448b0c1a14844c8cd9f4aa9005bcb4662135c1
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20150731.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20150731.ebuild
new file mode 100644
index 0000000..e40a1eb
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20150731.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-07-31_00-02-28/zip/netbeans-trunk-nightly-201507310002-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 18eb1b8..b1612de 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_p20150731 (31 Jul 2015)
+
+  31 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-platform-9999_p20150731.ebuild:
+  updated to the latest sources
+
 *netbeans-platform-9999_p20150730 (30 Jul 2015)
 
   30 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index dc163f4..663a436 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -62,6 +62,7 @@ DIST netbeans-trunk-nightly-201507200001-src.zip 208844011 SHA256 d913ef4e2aa53c
 DIST netbeans-trunk-nightly-201507270002-src.zip 208903918 SHA256 522afa33b0389ef48a5deb3c91ba3c4aa1ca4acf710e2c316479e6892aa3d39a SHA512 078b84e423f0769fb1a2c14bb092c50dd2f1901126b5f3c7b11700858c71b43230281799c248eb4198a22fad17f5a7c34baedd3aac241e2d07d91c72a1aad861 WHIRLPOOL ae082652979d1ba8f26a6001e6402f587809b2586406f93e42eb9b7d38e4216e290167888ab5d6836ff9a712d555cec66c9f54afea7ca6171dee6cf56c7c0fdb
 DIST netbeans-trunk-nightly-201507280002-src.zip 208905091 SHA256 502a75b45a6d7c2421fa6629cede99d70bb69b19287083ee9ed9cbcd9540343c SHA512 b94b76f709f931ecc1414eb80c1791bada942e7a6a7b2cebe4749453de1c17f929ba497b961a7ea9837057986a463f1d335dc7f2ab460f99c1fb168604d07196 WHIRLPOOL 119f4bb30844c9655760a23c0a48ddbc5abf32c07652165d508061b70f37861c123127735d14be01f506da65d072701514d5a4adb678fe8748f62762bcda6052
 DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae2846b93e0836ed96caddf2d425df5bab2a004b0417879a36e4dd3 SHA512 04e2e8f58102752a45b089cb70c62e6b920b5397cb427179fb042604eec4a78d6380341ab700e70b9190313ea5fc10fb94471a072fa8ad567e4d652b1fa2c3b6 WHIRLPOOL 153cd8da3506e0e3397a06b4341e90b2dc55170bb432a21d66bf425895deef5bf0611bdb181beefc29fd18648d60b827d9e453bca827c26305f55ffb01319f18
+DIST netbeans-trunk-nightly-201507310002-src.zip 208736792 SHA256 f2794218686a678f2e826bb542663753c97f1b5cf839657ed6540b36d85e0eed SHA512 31cab9432e2668d4a90c99e561faa6a78c89210bd76625e4274c45ff634783967e9170bbd504e60fcd08df88c57b57f5c357f30c9c8dc06d6d0c0ae72f3ef0a3 WHIRLPOOL fccf16a822b7d43c1dd709c2357cb2fa6ec518e291f4f306c5c2aa4838f734ef9d2c800795dde592d17b3685826e00d26611e8b3cc4c68e6ee5332cff9aa7129
 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
@@ -92,5 +93,6 @@ EBUILD netbeans-platform-9999_p20150720.ebuild 9244 SHA256 6329530818769a03c46d4
 EBUILD netbeans-platform-9999_p20150727.ebuild 9244 SHA256 63397251acbd1137bb08bf2fabc2b6760a6b5e9e412f5bf80fc977e235030e38 SHA512 51e7814845e00af407fd26971c0486d3efc40d2a0312ac5736d63587529022f9b75a4b4d1c3a220c8e715259e9e11a2ffa12411527236c28363c9ca51aa107b1 WHIRLPOOL 07302e7582831a5708adefb3e54756e4c239377d88702c47978523f9982c1ded922013a9a705b34a5c4c360e71d9dc884c5fe36b5a9e7f4a21fa5bb4a43863d2
 EBUILD netbeans-platform-9999_p20150728.ebuild 9244 SHA256 e0a5027ea47218dd0892ae0f98c42ae2cf76af65c391e5fb53670fa2bf9bd09e SHA512 6ee37adae01eae7dab0c7c082a3ed4634dd12102b2d6c405eab7d1fdfc4b838e78489cbe0c0b67fc81dd44a48c37ad22df3a65f6f93df9294f786209d5f60135 WHIRLPOOL f01c821be3932e8e664d1bb39a054c1300d83335adfb095762f04f2ffd5dc3fc07aa6ebc41b15506359f2d4b2314ceab58f13da023031f841237357ef32633f4
 EBUILD netbeans-platform-9999_p20150730.ebuild 9244 SHA256 4c7b1a2af829ad060267af4a62f1b5ac8335bd94ae876b6fe097b67b4be6e833 SHA512 080fa5cb0e3cb5be3f8f163df35cdef24a70a89d9e2b768d1cb3d487d1861e8a0ab0c7ad19291e10aa01b2faa53e7ab7ca95ecf1b133f715b5a7aa59aaac97c8 WHIRLPOOL 78514736f031a22efe2fbb059e7f928485ade6a175089e95bcae9f57bdb50fd2fc4930568947061c4b6a8dccf938f68beb3c4cdc2729298f2e95ec6c4c7467b3
-MISC ChangeLog 177145 SHA256 63a6bceeb9e4791b10acb223d74096400bdb52fbc1a4858ad76df9f17d3d2b41 SHA512 902fa29d60160a54ea4a3658ff21630fbff89e5d2fdc46d2e33b171d101e0dcac8bc710c4dea4113497df7bcde79dfa32e450f183ef2337196951d7d68ceeff1 WHIRLPOOL 5501dfc5459481711ddd041c6e088da44cf1c8ac308901f32f1c723641edb23b7de1787b0cda1d9b44f14bcc95df473c47e24cd3014b06b8bd5cac350d07d729
+EBUILD netbeans-platform-9999_p20150731.ebuild 9244 SHA256 6d0b186af8056320b121a27e00eb6a5dbcc152a59c9d4cfd8282c47b17760b1b SHA512 70a797b3d42ce999ffb54089edb6bc24fa8104e7b5fcbf32127dc6ba09e3e93a60fd3a151ca359f4089a2ccc4329ad9b8c35cebcb070704d2fbde18ade459116 WHIRLPOOL 4db79eab85b92b27a68b73c17badefd2d4d86d656c41ccd75201e18466ebd5e82cec480bfc27a09076d9b7c658f8ddbe84b2686999b56fd09a4503ed16b95b58
+MISC ChangeLog 177323 SHA256 5034c114eae0bf2609ea24d1ff580ae2543d838823e1c8dbd54a7aeed4c37435 SHA512 d09701c12fa7764f27645a16bfd7acb7dd0f9c7e23d134bc3f1f07345b69ca4f454d58340f632b54ba816418966aa316df17f2bd381f6024cfeff002e521ae95 WHIRLPOOL 4cba56b4950e24fee9401a095f08bdaede1a21924fdd376ed1bd57104d6233eecdf00c573c99a3c31e25bb19687add3919fb2273b2c1b18176b101943e2108d0
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20150731.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20150731.ebuild
new file mode 100644
index 0000000..afc7344
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20150731.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-07-31_00-02-28/zip/netbeans-trunk-nightly-201507310002-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 0769ebc..4769fd4 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_p20150731 (31 Jul 2015)
+
+  31 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-profiler-9999_p20150731.ebuild:
+  updated to the latest sources
+
 *netbeans-profiler-9999_p20150730 (30 Jul 2015)
 
   30 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 19da543..cef380c 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201507200001-src.zip 208844011 SHA256 d913ef4e2aa53c
 DIST netbeans-trunk-nightly-201507270002-src.zip 208903918 SHA256 522afa33b0389ef48a5deb3c91ba3c4aa1ca4acf710e2c316479e6892aa3d39a SHA512 078b84e423f0769fb1a2c14bb092c50dd2f1901126b5f3c7b11700858c71b43230281799c248eb4198a22fad17f5a7c34baedd3aac241e2d07d91c72a1aad861 WHIRLPOOL ae082652979d1ba8f26a6001e6402f587809b2586406f93e42eb9b7d38e4216e290167888ab5d6836ff9a712d555cec66c9f54afea7ca6171dee6cf56c7c0fdb
 DIST netbeans-trunk-nightly-201507280002-src.zip 208905091 SHA256 502a75b45a6d7c2421fa6629cede99d70bb69b19287083ee9ed9cbcd9540343c SHA512 b94b76f709f931ecc1414eb80c1791bada942e7a6a7b2cebe4749453de1c17f929ba497b961a7ea9837057986a463f1d335dc7f2ab460f99c1fb168604d07196 WHIRLPOOL 119f4bb30844c9655760a23c0a48ddbc5abf32c07652165d508061b70f37861c123127735d14be01f506da65d072701514d5a4adb678fe8748f62762bcda6052
 DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae2846b93e0836ed96caddf2d425df5bab2a004b0417879a36e4dd3 SHA512 04e2e8f58102752a45b089cb70c62e6b920b5397cb427179fb042604eec4a78d6380341ab700e70b9190313ea5fc10fb94471a072fa8ad567e4d652b1fa2c3b6 WHIRLPOOL 153cd8da3506e0e3397a06b4341e90b2dc55170bb432a21d66bf425895deef5bf0611bdb181beefc29fd18648d60b827d9e453bca827c26305f55ffb01319f18
+DIST netbeans-trunk-nightly-201507310002-src.zip 208736792 SHA256 f2794218686a678f2e826bb542663753c97f1b5cf839657ed6540b36d85e0eed SHA512 31cab9432e2668d4a90c99e561faa6a78c89210bd76625e4274c45ff634783967e9170bbd504e60fcd08df88c57b57f5c357f30c9c8dc06d6d0c0ae72f3ef0a3 WHIRLPOOL fccf16a822b7d43c1dd709c2357cb2fa6ec518e291f4f306c5c2aa4838f734ef9d2c800795dde592d17b3685826e00d26611e8b3cc4c68e6ee5332cff9aa7129
 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
@@ -66,5 +67,6 @@ EBUILD netbeans-profiler-9999_p20150720.ebuild 3478 SHA256 c0888c3929788a7d0242e
 EBUILD netbeans-profiler-9999_p20150727.ebuild 3478 SHA256 239113d4d50fab0fdfa954ceba9e26a35882f0cb93a9fbf5e686e2875cbdda90 SHA512 3a4f9f61c65feefee9cdfee70d3672b38d090d966b38c1239bcb020d81f3c78805185084e915f96d57317d74572c2277a466e09fb8756a071505916b5641711a WHIRLPOOL 3537f6229c9c1f72dfe8ada1081c0ebacb844bd3e45720182720f7b9c292830070f66e713e3c5fc33137a0fc3adf57e366fc274ac2fa125646864e21d49e5962
 EBUILD netbeans-profiler-9999_p20150728.ebuild 3478 SHA256 27dc4756600f70970b5433e3bf97f380c9cb8f848bbfe8a871ec4726e6ab13c0 SHA512 1334884b28e90a0d1cb0651cb6df12447b5e623ac56922ab326f79a82b0bffcf1b5bedae4486547cbf11cad35c50eedc3f8d821143c8c3cf50d7d47e479188f3 WHIRLPOOL 81a3290fbee37ae9bf0e6cc9d43085efe5044e73728c611d27819d3e6db010a39e0429108d5dd9a7907d5b0f7092924832c625d7974e5e075c28ed37f889ddff
 EBUILD netbeans-profiler-9999_p20150730.ebuild 3478 SHA256 6cedf01725b36d273acbff3bdd6c5ed2e5192ac3aca58a4b34906120c2c3a508 SHA512 5a6a6452fd225b9e83f3918616e00469d2ef974842fa48ed1e47328ff19fd8042c3dea951219402a671d257f2a3bc1e5834d5d79e1d64ae7c7ef8704fb6c98a5 WHIRLPOOL 517675e0b9a26558914f968da5ef45a89a1b8b62053a5d9c59ba91c2549eeb1008788c04004d66ad0311e35048284393588f92882d92426fa487eb45be1f3231
-MISC ChangeLog 176606 SHA256 7780935eadf8d15d2a180e52e1374fb73dc88506e86197ff41731ba99ae2bacb SHA512 0f911989abc35b863923b512d68ab31286a96253e2098d4a1f47685835bbe12e5f509448115e98e0c0d602616a55e1b60f26e26e4c9ebc27fd8b46d8c60e7e9f WHIRLPOOL 32a2df538b23caa199286180ffa1529438cd02ed8796bd058d416a58f8db8105256b05794d7be40fded0f90011293fe592e2e1bd1902ee8940e7a06098b68206
+EBUILD netbeans-profiler-9999_p20150731.ebuild 3478 SHA256 0cda1df28839ad19e60f80856be8e94168c6f43ee56536d1b366ca7b3804f1f2 SHA512 69e9e4abacee44cff32164248268de2d4c6ad0e636050842be3633bc706210bf8261ce5a604652cd4f383ce73dee2e8717e12f6c8743d9ba4f40771927c1592b WHIRLPOOL 000ecfa2c2ad880ae3fbd56e61011e50a46ea4a9ee415499f2f3c89c10650a496425704e382971acb8f053554fc71388850f3ef8d8267ac73d9966c590d62276
+MISC ChangeLog 176784 SHA256 f36258cc9ec876e8267b04b90c658b518a0a551b52d67dafc3fb1a2d39eee403 SHA512 7a13c78e39f4e2c519a7eaad8c98a5a8155219a7d96cd9e987a33c07f3c7703d82f574d2cf0997a28cfc64c1c543a0c8c7dd14a303df1524de4aeb36ae425016 WHIRLPOOL 9395f86c0f24fcf6f8ffe23589d06c175359c51a77035872251631351712ffe30a598a9b994cd569aaa26ee263211183d044725d1882140d53f876d7780679cc
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150731.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150731.ebuild
new file mode 100644
index 0000000..5010677
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150731.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-07-31_00-02-28/zip/netbeans-trunk-nightly-201507310002-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 fb86aec..68325a8 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_p20150731 (31 Jul 2015)
+
+  31 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-webcommon-9999_p20150731.ebuild:
+  updated to the latest sources
+
 *netbeans-webcommon-9999_p20150730 (30 Jul 2015)
 
   30 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index 65db196..af256c5 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -42,6 +42,7 @@ DIST netbeans-trunk-nightly-201507200001-src.zip 208844011 SHA256 d913ef4e2aa53c
 DIST netbeans-trunk-nightly-201507270002-src.zip 208903918 SHA256 522afa33b0389ef48a5deb3c91ba3c4aa1ca4acf710e2c316479e6892aa3d39a SHA512 078b84e423f0769fb1a2c14bb092c50dd2f1901126b5f3c7b11700858c71b43230281799c248eb4198a22fad17f5a7c34baedd3aac241e2d07d91c72a1aad861 WHIRLPOOL ae082652979d1ba8f26a6001e6402f587809b2586406f93e42eb9b7d38e4216e290167888ab5d6836ff9a712d555cec66c9f54afea7ca6171dee6cf56c7c0fdb
 DIST netbeans-trunk-nightly-201507280002-src.zip 208905091 SHA256 502a75b45a6d7c2421fa6629cede99d70bb69b19287083ee9ed9cbcd9540343c SHA512 b94b76f709f931ecc1414eb80c1791bada942e7a6a7b2cebe4749453de1c17f929ba497b961a7ea9837057986a463f1d335dc7f2ab460f99c1fb168604d07196 WHIRLPOOL 119f4bb30844c9655760a23c0a48ddbc5abf32c07652165d508061b70f37861c123127735d14be01f506da65d072701514d5a4adb678fe8748f62762bcda6052
 DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae2846b93e0836ed96caddf2d425df5bab2a004b0417879a36e4dd3 SHA512 04e2e8f58102752a45b089cb70c62e6b920b5397cb427179fb042604eec4a78d6380341ab700e70b9190313ea5fc10fb94471a072fa8ad567e4d652b1fa2c3b6 WHIRLPOOL 153cd8da3506e0e3397a06b4341e90b2dc55170bb432a21d66bf425895deef5bf0611bdb181beefc29fd18648d60b827d9e453bca827c26305f55ffb01319f18
+DIST netbeans-trunk-nightly-201507310002-src.zip 208736792 SHA256 f2794218686a678f2e826bb542663753c97f1b5cf839657ed6540b36d85e0eed SHA512 31cab9432e2668d4a90c99e561faa6a78c89210bd76625e4274c45ff634783967e9170bbd504e60fcd08df88c57b57f5c357f30c9c8dc06d6d0c0ae72f3ef0a3 WHIRLPOOL fccf16a822b7d43c1dd709c2357cb2fa6ec518e291f4f306c5c2aa4838f734ef9d2c800795dde592d17b3685826e00d26611e8b3cc4c68e6ee5332cff9aa7129
 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
@@ -70,5 +71,6 @@ EBUILD netbeans-webcommon-9999_p20150720.ebuild 4997 SHA256 91e604769563217f79e1
 EBUILD netbeans-webcommon-9999_p20150727.ebuild 4997 SHA256 c442b3c0a0514d63910e087a46391b4c8ba4568ace1dfa4242a5653a1a24a343 SHA512 ebcc1e9fe14b2811cd2982cf8080d60d08e8abb648cb9d03660a45c8e560a32f26ade1601920f6db5d986d80901829352ecc4220c3521eb713ec954b0e3c6cde WHIRLPOOL 202ccea43c5c6f9044ceb6cc1e8e303f29445496199dfde3251d1ac2f019caece58735cdf2f46bc7547dec78e063dcba620a0d5d7e2c76e80008588966ebd351
 EBUILD netbeans-webcommon-9999_p20150728.ebuild 4997 SHA256 b203c75d68961f3909be3c8760862463f4c70aef82363d97360cf22c811f9ead SHA512 db5567323d1be210f756c72023462d165eb7c8c002e86d2a6a7bcbf92ea2a1da7feba65f1578bc2f74d98bc71c37c635b9b764d62c2e1f32770ec2db8b29ed7d WHIRLPOOL ed298101217ea0794f574e98886d842cf2010ad571898b0350dce223d0f8ebdde59cd344f52516d3243f9285634cf32d90222f619f2a8bf1c8d188e7847a38f2
 EBUILD netbeans-webcommon-9999_p20150730.ebuild 4997 SHA256 b8f8c9af064a8c03f3f208588350f36769d39dbc88586553cf370209c84f6d78 SHA512 3e0697243af0ade43e1b2fea73177221a3f2ebdece51d7e638343f027a5631ab8cd330252586d13fad8ff2ec1e9e492af6e7d82e4574c62735bf67c63b2b7fd4 WHIRLPOOL e36d77cb8044ac6550dd852d577b911a336a6e69f05327369468deca4291ebf8ce76c2d882a1af7a541257a2dd9303bfb2bb968840ecf12ebcbaad268eaabc52
-MISC ChangeLog 149795 SHA256 e095e7696f7c61aa57c3e35190e686a1927043853fdf2ee489cabe85bc9412cb SHA512 d015b56a767fbe22716a6059a3d3ae68298cef4b989750665e0c5e6e79e3fd9eecda119bd670789f9948c2d4911aa84eeafe74394ad3190251c9e21644388778 WHIRLPOOL 4265db09f3e159700bdccc0b08161c6f359d29dc7b8baf761314f1dc935da2695719cf6765bb81047dd68aec6979e6e24b701f74513831468b855a93b11bcf4d
+EBUILD netbeans-webcommon-9999_p20150731.ebuild 4997 SHA256 8b5a4d28edd985cddcfedaa17ae86bdba271b7a7a1ec7e80daaab38d27403cbe SHA512 c1a2a85d9a384fe7cfde5d5dad44f0987fd7034402a55ed62eae604fbe8b30147f571820cd40e70194dc47bf15b5723fbc455ad74ec62ed878eb6fb8eb05bb5b WHIRLPOOL c1f7e0cc8fe16a0097ee439e32982cc29ebf659c81d720261449e2e7504f3d106dccde70a29050a110f78f66ef10f7b8aaacbd09dcbfc553ae98904dec5c8cc2
+MISC ChangeLog 149975 SHA256 9cc5291f03dd5d9ab440ca0784d04a77a887d25ec1d2c0075aff5631bd8e2c31 SHA512 69980a20b0ef74db2fddf136e8c3045a355bded294b3b08d91208d2dcc6b50d61e66cbaa83b308cfb147cc991fcc93cbfc07831b8567ea843088f024f98c11f8 WHIRLPOOL 94512fe1c0ba478de7f34c39a5b8f7ea9ecc03d5b7df35f5cf5cd4fcb5e43988ea38302c1acaa8ba05b47c59a4193bedc848308dd44f3ba08fcfdab34c5b0000
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150731.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150731.ebuild
new file mode 100644
index 0000000..bd78a80
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150731.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-07-31_00-02-28/zip/netbeans-trunk-nightly-201507310002-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 b9ef848..df91d89 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_p20150731 (31 Jul 2015)
+
+  31 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-websvccommon-9999_p20150731.ebuild:
+  updated to the latest sources
+
 *netbeans-websvccommon-9999_p20150730 (30 Jul 2015)
 
   30 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 52af141..96fcb0c 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -36,6 +36,7 @@ DIST netbeans-trunk-nightly-201507200001-src.zip 208844011 SHA256 d913ef4e2aa53c
 DIST netbeans-trunk-nightly-201507270002-src.zip 208903918 SHA256 522afa33b0389ef48a5deb3c91ba3c4aa1ca4acf710e2c316479e6892aa3d39a SHA512 078b84e423f0769fb1a2c14bb092c50dd2f1901126b5f3c7b11700858c71b43230281799c248eb4198a22fad17f5a7c34baedd3aac241e2d07d91c72a1aad861 WHIRLPOOL ae082652979d1ba8f26a6001e6402f587809b2586406f93e42eb9b7d38e4216e290167888ab5d6836ff9a712d555cec66c9f54afea7ca6171dee6cf56c7c0fdb
 DIST netbeans-trunk-nightly-201507280002-src.zip 208905091 SHA256 502a75b45a6d7c2421fa6629cede99d70bb69b19287083ee9ed9cbcd9540343c SHA512 b94b76f709f931ecc1414eb80c1791bada942e7a6a7b2cebe4749453de1c17f929ba497b961a7ea9837057986a463f1d335dc7f2ab460f99c1fb168604d07196 WHIRLPOOL 119f4bb30844c9655760a23c0a48ddbc5abf32c07652165d508061b70f37861c123127735d14be01f506da65d072701514d5a4adb678fe8748f62762bcda6052
 DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae2846b93e0836ed96caddf2d425df5bab2a004b0417879a36e4dd3 SHA512 04e2e8f58102752a45b089cb70c62e6b920b5397cb427179fb042604eec4a78d6380341ab700e70b9190313ea5fc10fb94471a072fa8ad567e4d652b1fa2c3b6 WHIRLPOOL 153cd8da3506e0e3397a06b4341e90b2dc55170bb432a21d66bf425895deef5bf0611bdb181beefc29fd18648d60b827d9e453bca827c26305f55ffb01319f18
+DIST netbeans-trunk-nightly-201507310002-src.zip 208736792 SHA256 f2794218686a678f2e826bb542663753c97f1b5cf839657ed6540b36d85e0eed SHA512 31cab9432e2668d4a90c99e561faa6a78c89210bd76625e4274c45ff634783967e9170bbd504e60fcd08df88c57b57f5c357f30c9c8dc06d6d0c0ae72f3ef0a3 WHIRLPOOL fccf16a822b7d43c1dd709c2357cb2fa6ec518e291f4f306c5c2aa4838f734ef9d2c800795dde592d17b3685826e00d26611e8b3cc4c68e6ee5332cff9aa7129
 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
@@ -66,5 +67,6 @@ EBUILD netbeans-websvccommon-9999_p20150720.ebuild 2727 SHA256 1b440027dc51a19fc
 EBUILD netbeans-websvccommon-9999_p20150727.ebuild 2727 SHA256 d7dfba9ceedfa99cf0ef6d45862023a4ad4ff60749b5bdf271f3c18a6c183247 SHA512 ea69184b4a5fd1a7547539aff9e361f1ef6ef83bd694316a4c0e1b9ddfee0ecd6ab67cb5104bb8d869cd5ef1a430a9ae30729a1106b72a095dd2d56736302205 WHIRLPOOL 7cb790b171987ab256d2026f79ccb541a0994e1632fb53363e61d5804d1fcf436654698af07bf06b3da2719b6ab84791552993bd05185bcc3218967fc10dc7c8
 EBUILD netbeans-websvccommon-9999_p20150728.ebuild 2727 SHA256 2a38ad4d04d10d58d582461b6c8577a32c6d6aa53172cb7441a6f5340bb02067 SHA512 5d02593f62e1f499d8f0c75d038318874a6375a8c46ebbb29b54419943a57d3d6757d5bc00d0d586fcf040815653d089a277158c2fd8a6bb3357fd8a8a3fca21 WHIRLPOOL d233836407dd556bf6d809b8eced4d7a8690ddcdc01cc1672c4cd4e8d850b85edfb166bfee96f17457498960a84bfa080f7d120b521773aa66b1a7d7ac509cb4
 EBUILD netbeans-websvccommon-9999_p20150730.ebuild 2727 SHA256 8d99e2f17a20dd763fd0bc9672244399e1c6b596f0a0e99083192def8c411754 SHA512 10ded8ec821aa2c9dda659020a5e3da35b55079c205ca96ce2b82e8cf92a572e3f8b410c8e4d7668c635c6dff0ffda329f8b6844ac7fe5948ce9885a408f39b1 WHIRLPOOL c4764d1fa23c667e83d53ba9750d049ebc9fe0e33dd15569db2ce9635f7a3a503f64231ef105051a86d86450dab26c2197f9a75e77feffb55c92ffbdd86c2356
-MISC ChangeLog 185280 SHA256 392866922a4981a31753b84b53232803e8c89aa6932e5b3e7dd1713fa7e44dad SHA512 6b2d0a72e7555348412dc4653827d70306822fc7dd035f3c95813f82c6e8b179aaaf4184301b6d12b1af227f2a3e6aeaf4f23c35a3028a1aa191be2aa63cfa96 WHIRLPOOL df3d055b023a0c09c0ffa23fd4a9409c4c630e58b72c423ce34c410bdccba9961c884213c1e49e37b6ef7d4d39636d5d9464c07667d8a1f44d68609ba062305e
+EBUILD netbeans-websvccommon-9999_p20150731.ebuild 2727 SHA256 f4990095d5ded72f92c8dd78adbff2e4ae71103fc5468690f74cf2b3241628db SHA512 707b87df31116d4d9d1d1da552c15a9e41b6d3e667b550de966829b7716c4af810c061d411a31f2d385e7f54973a080afad280c20c951dc0c4ffbe0916aa247a WHIRLPOOL 0432cb9405cb7f43a166e4e12c800b659ec6ea79d8f885c6e28812c3a9e9cbc8bb65e191db1c8c459be556cc0ed794646d593727f56faf4f541b3b527ddcb9e5
+MISC ChangeLog 185466 SHA256 e3a26f33a812354ce1b1e305cf9ef4498d68678940c9336c7638e3f51e5a2985 SHA512 04bbdf600496f14001f8b8b398ccbfbd246453b79bc9ee60e8c05b818d02ff1c3a9b96080d7b2cdbec88905ac44a30be6c4c9aba495faadd4fc0b87654daffb6 WHIRLPOOL afd05b1d5d43c1614192edd19723f54cb6cc90597d6f97d601d1dec0ff4919249a9b6f5e747b0b99450e18e0bf7bcc7add3e43320727b43cd060a3d1dac043a1
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150731.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150731.ebuild
new file mode 100644
index 0000000..2080013
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150731.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-07-31_00-02-28/zip/netbeans-trunk-nightly-201507310002-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 062d0c1..e13f5d0 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_p20150731 (31 Jul 2015)
+
+  31 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-9999_p20150731.ebuild:
+  updated to the latest sources
+
 *netbeans-9999_p20150730 (30 Jul 2015)
 
   30 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 595b58e..327d565 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -44,6 +44,7 @@ DIST netbeans-trunk-nightly-201507200001-src.zip 208844011 SHA256 d913ef4e2aa53c
 DIST netbeans-trunk-nightly-201507270002-src.zip 208903918 SHA256 522afa33b0389ef48a5deb3c91ba3c4aa1ca4acf710e2c316479e6892aa3d39a SHA512 078b84e423f0769fb1a2c14bb092c50dd2f1901126b5f3c7b11700858c71b43230281799c248eb4198a22fad17f5a7c34baedd3aac241e2d07d91c72a1aad861 WHIRLPOOL ae082652979d1ba8f26a6001e6402f587809b2586406f93e42eb9b7d38e4216e290167888ab5d6836ff9a712d555cec66c9f54afea7ca6171dee6cf56c7c0fdb
 DIST netbeans-trunk-nightly-201507280002-src.zip 208905091 SHA256 502a75b45a6d7c2421fa6629cede99d70bb69b19287083ee9ed9cbcd9540343c SHA512 b94b76f709f931ecc1414eb80c1791bada942e7a6a7b2cebe4749453de1c17f929ba497b961a7ea9837057986a463f1d335dc7f2ab460f99c1fb168604d07196 WHIRLPOOL 119f4bb30844c9655760a23c0a48ddbc5abf32c07652165d508061b70f37861c123127735d14be01f506da65d072701514d5a4adb678fe8748f62762bcda6052
 DIST netbeans-trunk-nightly-201507300002-src.zip 208734301 SHA256 5c8317b65ae2846b93e0836ed96caddf2d425df5bab2a004b0417879a36e4dd3 SHA512 04e2e8f58102752a45b089cb70c62e6b920b5397cb427179fb042604eec4a78d6380341ab700e70b9190313ea5fc10fb94471a072fa8ad567e4d652b1fa2c3b6 WHIRLPOOL 153cd8da3506e0e3397a06b4341e90b2dc55170bb432a21d66bf425895deef5bf0611bdb181beefc29fd18648d60b827d9e453bca827c26305f55ffb01319f18
+DIST netbeans-trunk-nightly-201507310002-src.zip 208736792 SHA256 f2794218686a678f2e826bb542663753c97f1b5cf839657ed6540b36d85e0eed SHA512 31cab9432e2668d4a90c99e561faa6a78c89210bd76625e4274c45ff634783967e9170bbd504e60fcd08df88c57b57f5c357f30c9c8dc06d6d0c0ae72f3ef0a3 WHIRLPOOL fccf16a822b7d43c1dd709c2357cb2fa6ec518e291f4f306c5c2aa4838f734ef9d2c800795dde592d17b3685826e00d26611e8b3cc4c68e6ee5332cff9aa7129
 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
@@ -74,5 +75,6 @@ EBUILD netbeans-9999_p20150720.ebuild 7216 SHA256 9a2755db57eb691856925b8ec9eb7a
 EBUILD netbeans-9999_p20150727.ebuild 7216 SHA256 300cbb2876cddc1c505df00599323ea1f4445b385cdbd94d5573527ea388c76a SHA512 512a7a2710f000140bce1fa1d97e56da25ea51ff658f734c3e1455459e9aa4630b476b42f06038da52005c4ee8c0c2bf30eaaa872425ec8ebbc77d4465fa8d50 WHIRLPOOL a5875667dd786c4f3d23d39a6f198a043370998aa228da37c3c6acae086e191be1ebadfb7b7d3af2fbd79ea570c9219b6ce9f9a992e182dec6fbb6246266585f
 EBUILD netbeans-9999_p20150728.ebuild 7216 SHA256 c622194a12148dc8908b9e6c5e1921a38c11b05cf4871c62eca5288e4f8e0f61 SHA512 04a4b2314602cd924b0685b41806ad96b00bb77e3db49449651211ea5a2649ff8d72d23cd2d67c788c3c9d71e3844d459a7622afc321754674b39d03b67867c6 WHIRLPOOL 4e8ccbfcd6db7c1e217635d9a63977f222bfe1913b2545d7f79f610efd21dd6e67a62e850bf78fca5ec328ee4411a3df91d247f480678564b13d049a1557fc21
 EBUILD netbeans-9999_p20150730.ebuild 7216 SHA256 6a7ea3f6c1c5014f6d58ffe6acb1c1c0e716a4eabe3ae0a68dbebfd89c01cd40 SHA512 079c6fd61313f71288ed01fc34a9da1a03626a1ef0f234b73d001f1aced114bf3c8e3afeff09763497c7df43685f3af5fcc81992b23916cd65b353540964d3ac WHIRLPOOL ff26c1cb12ff64bd275c0bd98e1dd7f6fc081da7840a1b711a245caaf52f13bcd7c2574e5934f7fe5669b6ab66b9b43cb9d672b41fe5257996ec21794b7e1de1
-MISC ChangeLog 157214 SHA256 81bc6702ae7de52bfda8382582f49c03ff4bfabf01e8bfbef00e42981e80f553 SHA512 5a9c6cbbc3a8b4576d4608de9242872f25f4565b3e96b5494d2a3bddc768a72d682d3888b05e8d11c0f128cd57ffc7ca9702b92ceea572d982341e7747a7fc82 WHIRLPOOL ab165a09867189cc57149aeb0ee7e5795da6b966efb2a2952238d1b06b9d65bb34249eb594997df05fa65b4b2d99de9242815c4be18c882bc5e85916cc46d90b
+EBUILD netbeans-9999_p20150731.ebuild 7216 SHA256 aeb3458b2d66d1aa1f8a9458b1d1a023eeceaeeb55e374561df3c1df0c259844 SHA512 09867d773f8f6aa27871d650e1751b15571434843c84b85776285faf5e46bd113a60644586f0ac35ab969fa64766a802840a516387133c8cd6c3aac7a7f17e4b WHIRLPOOL bc2549b1562c8eaf6a6524051de25b4869e4564e1585eae5a218c7dd3991123af9ba106868e770566d8b2d91d73a1b6c210f62f71bed19b5936ca8dd31532ac5
+MISC ChangeLog 157374 SHA256 06bbcb90a91a9defe8befaf30d25751d38cf736d2d1769ed790f933cdb6970d3 SHA512 5140a2c087cb3f5ca330d66c905186291ab8105d3b806c6a3e85e0a6b087c090e6c354e6407be0ec4367d647bf1111b3dbc99c5c64a82b536cbc8470d65193f3 WHIRLPOOL 19c97bf1a9110bd7c7949a143cfa2596ee6a71ec5caaa5ddbe3453a016c175a87556d37bdef71a280bd0f458259b5234223f0ea22a0f9f138b6f34c23e63480e
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

diff --git a/dev-util/netbeans/netbeans-9999_p20150731.ebuild b/dev-util/netbeans/netbeans-9999_p20150731.ebuild
new file mode 100644
index 0000000..d26f585
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20150731.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-07-31_00-02-28/zip/netbeans-trunk-nightly-201507310002-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] 4+ messages in thread

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-javadoc/, dev-java/netbeans-websvccommon/, ...
@ 2016-03-01 10:07 Miroslav Šulc
  0 siblings, 0 replies; 4+ messages in thread
From: Miroslav Šulc @ 2016-03-01 10:07 UTC (permalink / raw
  To: gentoo-commits

commit:     d6454cb9ce824aa34d555b633dbee6ae6092484f
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  1 09:49:32 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Mar  1 09:49:32 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=d6454cb9

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.2.27

 dev-java/netbeans-apisupport/Manifest              |   2 +
 .../netbeans-apisupport-9999_p20160301.ebuild      | 111 ++++++
 dev-java/netbeans-cnd/Manifest                     |   2 +
 .../netbeans-cnd-9999_p20160301.ebuild             | 127 +++++++
 dev-java/netbeans-dlight/Manifest                  |   2 +
 .../netbeans-dlight-9999_p20160301.ebuild          | 101 ++++++
 dev-java/netbeans-enterprise/Manifest              |   2 +
 .../netbeans-enterprise-9999_p20160301.ebuild      | 266 +++++++++++++++
 dev-java/netbeans-ergonomics/Manifest              |   2 +
 .../netbeans-ergonomics-9999_p20160301.ebuild      | 101 ++++++
 dev-java/netbeans-extide/Manifest                  |   2 +
 .../netbeans-extide-9999_p20160301.ebuild          | 108 ++++++
 dev-java/netbeans-groovy/Manifest                  |   2 +
 .../netbeans-groovy-9999_p20160301.ebuild          | 111 ++++++
 dev-java/netbeans-harness/Manifest                 |   2 +
 .../netbeans-harness-9999_p20160301.ebuild         | 114 +++++++
 dev-java/netbeans-ide/Manifest                     |   2 +
 .../netbeans-ide-9999_p20160301.ebuild             | 378 +++++++++++++++++++++
 dev-java/netbeans-java/Manifest                    |   2 +
 .../netbeans-java-9999_p20160301.ebuild            | 274 +++++++++++++++
 dev-java/netbeans-javacard/Manifest                |   2 +
 .../netbeans-javacard-9999_p20160301.ebuild        | 134 ++++++++
 dev-java/netbeans-javadoc/Manifest                 |   2 +
 .../netbeans-javadoc-9999_p20160301.ebuild         | 168 +++++++++
 dev-java/netbeans-javafx/Manifest                  |   2 +
 .../netbeans-javafx-9999_p20160301.ebuild          | 124 +++++++
 dev-java/netbeans-mobility/Manifest                |   2 +
 .../netbeans-mobility-9999_p20160301.ebuild        | 126 +++++++
 dev-java/netbeans-nb/Manifest                      |   2 +
 .../netbeans-nb/netbeans-nb-9999_p20160301.ebuild  | 128 +++++++
 dev-java/netbeans-php/Manifest                     |   2 +
 .../netbeans-php-9999_p20160301.ebuild             | 127 +++++++
 dev-java/netbeans-platform/Manifest                |   2 +
 .../netbeans-platform-9999_p20160301.ebuild        | 165 +++++++++
 dev-java/netbeans-profiler/Manifest                |   2 +
 .../netbeans-profiler-9999_p20160301.ebuild        | 121 +++++++
 dev-java/netbeans-webcommon/Manifest               |   2 +
 .../netbeans-webcommon-9999_p20160301.ebuild       | 122 +++++++
 dev-java/netbeans-websvccommon/Manifest            |   2 +
 .../netbeans-websvccommon-9999_p20160301.ebuild    |  94 +++++
 dev-util/netbeans/Manifest                         |   2 +
 dev-util/netbeans/netbeans-9999_p20160301.ebuild   | 254 ++++++++++++++
 42 files changed, 3296 insertions(+)

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index dafc86f..a331da7 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201602260002-src.zip 209828915 SHA256 79e707455e36ff
 DIST netbeans-trunk-nightly-201602270002-src.zip 209831963 SHA256 20b41ce3e47c43d3e255e9833fa3f2c3bcd48876ff620c40ed93c878c7abd883 SHA512 980ab79ed39cea631f45d7609b5d3bd8e8310737d7934dbe6a3f93f9c31031d5b38c40370ef6d35898bb7f39eb7a72a00ea1715a77b12678eb5d3a2e2f12a76a WHIRLPOOL f4a058519c51572208225a141a6745583c6ce1019e4d4b2ae994e0b6dd000034e330113decdfc2a6589025e61d11583852e64e121dd42fd833552d35f9ba748a
 DIST netbeans-trunk-nightly-201602280002-src.zip 209832078 SHA256 9db7e895e76748c876558471306afbb5a6af856a8cb391248be4f8d700cb0fc0 SHA512 41bfbb29f4e9760e11336d13908703b13276dac95dd070945963a213969dbdfa844e96340a0ec7e32d721cda3bd11a7f940855a3b1ddccd3d3349b32efcf4c36 WHIRLPOOL e2ca8afcc4a6a1b5a8f19958df6015709542f0d896bd7f9b35fbb7671571732fb1931a5de6e1e0deb21ee86fdecdf2a013ff319d76e1569f8c0ba2b252e959d6
 DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf77015ad8c9ca15c1a54953eec0492be748fde20af0b464700c80f SHA512 56d79deda1cb4624b7136c0028d8786ee5f560aef52f305548654b873232a968b0bd25322c53caa44c61dd0557d177c5725eaed4b6b6e554920e9f5e8b8dcf85 WHIRLPOOL e0bd59c30e04b4a67b7924890f0e377bbb120564a155815b1aa64a28da7f835362e583333240672aeb2b39d63c5c37e2739d4a9e9f25488ce2cfb5ee1e475569
+DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
 EBUILD netbeans-apisupport-8.0.2.ebuild 3314 SHA256 b68fe791f275fe4fcc8b00888688949b8927cb39db2cf9ad7860017c6d20adee SHA512 35c4bbcd34ec0eaef8a2de86c13333d2bf092db61af48558c3e173bb17dbf8fcd15001307bd7c498f4ccdbaa4277e1ee42ff0909af6170039165b547f646c383 WHIRLPOOL 206fe8d5f64e76827d3eb958a629ba087e8a16c2797752f5d9e62dff4166653677587a81be19e0a2c6adcf49292255d532e1f542c02550b1cf6ffd51467bde3c
 EBUILD netbeans-apisupport-8.1.ebuild 3338 SHA256 d249a09cd1a527bfc4f0dc87b1768aad9f05fc7fe7079fad0094c27d416d030c SHA512 47e5db58581625b23157ef7a7b6e340fce1327db85e015369ac32791178a0836af3348397ac6ff4439ab246170d3318c2062994c81019ff361084f00d432c9c8 WHIRLPOOL 8e379c9219b7730a15c10216bed00c3ec104f84b252d32da629f066095897398a4d8818e07cda5afdf94b115b97ead8de6a9529f38c81c1c41144067f119e54e
 EBUILD netbeans-apisupport-9999_p20160129.ebuild 3384 SHA256 9890b1fb66a753a27a0a9b074b96312919ad16c9e9723d730022093648f4c5f2 SHA512 492d280abed8fdda1439921da9e8e9a7debe1be4d2166b778d411aa0bdd5160f6be82e6b3d2f70937d60ad37ed4e99b7a06aa421daf8c98e33c065e96dd06c5b WHIRLPOOL d2334241c23fdcd54fb9e436b9fa0f2eb4adf94fdd8ee1c7f52a55340913f762bdef385c74d0040794dc8064ace86cd8262b867fd906b0f2952458f1e1ad425d
@@ -57,4 +58,5 @@ EBUILD netbeans-apisupport-9999_p20160226.ebuild 3384 SHA256 18676f86e44d877da64
 EBUILD netbeans-apisupport-9999_p20160227.ebuild 3384 SHA256 2efccee0bd25f948ac65bda4752252dc59151d766968af7bb531bcaaf85483d1 SHA512 edec51a8c7b7d8ebedd69d32f90579a155dd144ef018e8d054b248fbb2f645d42b25b4829afed7b163e46ee46eca827f7ebd837a4c4a9129867e3bd8a5c7eb76 WHIRLPOOL 3570112194a7004dfefe0aa03225435ddafb43e3569e6f975d75a6ccd786d2253a7cfd8c80699ae0b13203a91befb863c2a889ff8b0f9e39d7f8236b5ce300fd
 EBUILD netbeans-apisupport-9999_p20160228.ebuild 3384 SHA256 4adc3912092c462be45c4fb7c2829bbe73ef96e8ebbaeb3d375416f46328a921 SHA512 a7f7bc4e3634e9a756b131557cf05d8514f59cefcb0a1a512dafce78443f7779fefd20c3231a6eaaf01616969555ce455871f94703ef196103770d0b2ed46d10 WHIRLPOOL b601297fb3e10c289b746ff2ff00381283c13416b8a9b838a8fbb8c795651956cb69d93e26205ce7ed31cec1f39f2e9d98fe59cf9922e391f15305b2bee5dbb2
 EBUILD netbeans-apisupport-9999_p20160229.ebuild 3384 SHA256 e4b8c6afc031afef4828e9a4773371fe40445b7409492fd53542b88e151c9b7c SHA512 d1f1eaa96a59e5aac0555191d2db5f4e924c31519f369e0d85b6aa7455800921721e9d558973b03e6bd9f13c5e0b620b61be426dc66d36f5b34e6888ff1c5b2e WHIRLPOOL 22d56c488a09149d69068bb776e1a90196583468307f522eb4b759f13a32905da9e9ec904b1dec82a53fd3855b88ad02cc541bfa072f588edb7e92bfc8d54173
+EBUILD netbeans-apisupport-9999_p20160301.ebuild 3384 SHA256 bc496d7d5faaa39aca9ad51b65c1c8c71d02d4b57a7ff6264db502aae696d776 SHA512 f04f8e72750c0f768a1647d649d3165389dfb9703f15b0693a2f71953e394fe7e3ee0f5cbecb9f49906020475b50e303f8f99afa54226d82dd506c10be54bfcd WHIRLPOOL dc92d3f9f6ecf88294c19fb822f5122896f137bb7085a72484cfee0af3e40946b8d2988cf01dc6e493655c89f16baed2e0517e0cdf8c623a0bcbc5105eaa594d
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160301.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160301.ebuild
new file mode 100644
index 0000000..9cc513c
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160301.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/2016-03-01_00-02-15/zip/netbeans-trunk-nightly-201603010002-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/Manifest b/dev-java/netbeans-cnd/Manifest
index 1827f6f..e44dd7f 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -41,6 +41,7 @@ DIST netbeans-trunk-nightly-201602260002-src.zip 209828915 SHA256 79e707455e36ff
 DIST netbeans-trunk-nightly-201602270002-src.zip 209831963 SHA256 20b41ce3e47c43d3e255e9833fa3f2c3bcd48876ff620c40ed93c878c7abd883 SHA512 980ab79ed39cea631f45d7609b5d3bd8e8310737d7934dbe6a3f93f9c31031d5b38c40370ef6d35898bb7f39eb7a72a00ea1715a77b12678eb5d3a2e2f12a76a WHIRLPOOL f4a058519c51572208225a141a6745583c6ce1019e4d4b2ae994e0b6dd000034e330113decdfc2a6589025e61d11583852e64e121dd42fd833552d35f9ba748a
 DIST netbeans-trunk-nightly-201602280002-src.zip 209832078 SHA256 9db7e895e76748c876558471306afbb5a6af856a8cb391248be4f8d700cb0fc0 SHA512 41bfbb29f4e9760e11336d13908703b13276dac95dd070945963a213969dbdfa844e96340a0ec7e32d721cda3bd11a7f940855a3b1ddccd3d3349b32efcf4c36 WHIRLPOOL e2ca8afcc4a6a1b5a8f19958df6015709542f0d896bd7f9b35fbb7671571732fb1931a5de6e1e0deb21ee86fdecdf2a013ff319d76e1569f8c0ba2b252e959d6
 DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf77015ad8c9ca15c1a54953eec0492be748fde20af0b464700c80f SHA512 56d79deda1cb4624b7136c0028d8786ee5f560aef52f305548654b873232a968b0bd25322c53caa44c61dd0557d177c5725eaed4b6b6e554920e9f5e8b8dcf85 WHIRLPOOL e0bd59c30e04b4a67b7924890f0e377bbb120564a155815b1aa64a28da7f835362e583333240672aeb2b39d63c5c37e2739d4a9e9f25488ce2cfb5ee1e475569
+DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
 EBUILD netbeans-cnd-8.0.2.ebuild 4510 SHA256 0a9a4e58e28f395b5bcb017016b6ddb1b77afe393d0e5bd81cc05e3a32076c71 SHA512 2b1fedfe292fa140920fd11829e77127f9535e08b8307886accfa37e6d11195a1204e6b71b2640937da0711c3ce0bbf80c0eaa3c248a64fd61b6a3d99d5de14e WHIRLPOOL 10b1518360ade5d6f1f27c79a10f630b94a2ec5062e18df11f9828d4b374e6cbdea0b9f770e01c117ca90fa194dff9bd3be6a468075c2d35167fb78a7bb32794
 EBUILD netbeans-cnd-8.1.ebuild 4744 SHA256 e008e92761489558e039a07d4858b5a9745aa38c38c57668cba8b5f6a28dbd9b SHA512 724af3f292851fa1a04ccc95fe0a4f9d0fab5503ce31d2ff11be73779d67bd0f38835b334684f628f8eea2dde44543e6b872611b2bd6c01191ccfe26e69f4ec2 WHIRLPOOL 59ddd65a105dafeb8b783f457ec7a8c67a5a3aceb78ca60ac7c4f45f330b28b429ba6236a643ca0023189a9ebdb1ca0182ec0546943ec2494693859aa8f95515
 EBUILD netbeans-cnd-9999_p20160129.ebuild 4790 SHA256 bde95da79ff2390d97a08cacd904acb99d86308259a8fdd6f5b26838f6c8568d SHA512 76d117b16bf36a22633b6ff9949a83b71dd2fb60010ecc994404c2bcbc5c2547833bb65f42f3d8cf182e9ffa8ce8aa743e2f5c00a1ce8522aa3909364f0d38dd WHIRLPOOL c41e0350be94b9cf48928a75365ed17718d369c61c5fecdeda04b83fc4b7f0f1d6bc6a222cfc3b48f1c8966def5bd427738bb72679724886aa2a9b019cfe1941
@@ -69,4 +70,5 @@ EBUILD netbeans-cnd-9999_p20160226.ebuild 4790 SHA256 3bf157310b9648255834e8329e
 EBUILD netbeans-cnd-9999_p20160227.ebuild 4790 SHA256 ef9657d75aa49cf78a681fb9659c0c2d1b7615e1b9b243055003a2a7ff57bbd7 SHA512 b79df91c064773512df2844a998776879ad5d546e3a3e40fb6a47203ef93d01980020f8ee02953ac3c69f1179a26f6aa5de2b053d13075302d01f5aac853f637 WHIRLPOOL 9092f73997e94df54b0af6233e82a8918ff94f73e73bb55e7f85f53807768450acd19891d1d5d324a448d521b760bcdc94f3c1486f850f569afeef1e16347b30
 EBUILD netbeans-cnd-9999_p20160228.ebuild 4790 SHA256 c11294caa490fabcd55224143363eb4715b9fec9f84637e3cc4995a17309c592 SHA512 f08c6dcd72b749486fd11371e41593c36fe7e8752f2094f4fe5f488ca6c082b8111fc33abb26066602475d701fcba5e3e357fb434dc146372a59898f5997c104 WHIRLPOOL c85b2014b20dd5aec2920dfbbd056ca9b6fbd6e9e92ca7e4f3279c91fa5c8dfc68e937a8f43543a6eea84be9f4f578fc90f2d0e599ede388099395105e9b3358
 EBUILD netbeans-cnd-9999_p20160229.ebuild 4790 SHA256 74b2157db3713934fab04ddde204329dae8247bbbb96c463da916439b274ee5e SHA512 d8bbf0f669e846f4d92e6acd540f239b677c697d9917a97d165205c4ef93d6e05f9dccf6bbaa162a833a49071dd81d66e8f7a1f67ef922d84935d338c0c465ce WHIRLPOOL 8e6f2c9e2f988e67e653ffdf22d0fcebd513c7703bbc3f3b2ef095a574e4b2cedb8f601cf73f978cade6b77a9e1b7141f73cc92ba39a3cb8ebcb6a8208a1cac0
+EBUILD netbeans-cnd-9999_p20160301.ebuild 4790 SHA256 c4ff4c63830e905be2de9225034efed5b779d9965419a772b2f8fb9dce52a28e SHA512 6ba447e36b0ae8cf00c52a9e499a38f0efdd15f18bc00636ac74052056c2a4bf9931a85213789037e91387108e9142bd3a7deb3e93018edaec1e73a2ca22f973 WHIRLPOOL 25545f3c8932f03c3a18ae359812009d3c28bd6afd94f34cd1e115c845dfafc219bfa99a65ad27a81b375a9cac3fa7aa022b688f993d404112930956ef2851a1
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160301.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160301.ebuild
new file mode 100644
index 0000000..2f58171
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160301.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/2016-03-01_00-02-15/zip/netbeans-trunk-nightly-201603010002-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/DD5ECBE848DDC19E34F4ABB74A7C1950C0F587CA-clank_0.3.6.zip
+	http://hg.netbeans.org/binaries/BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip
+	http://hg.netbeans.org/binaries/E59851B0E49C05D728D5C653E52750FA5B6A8F0E-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}"/DD5ECBE848DDC19E34F4ABB74A7C1950C0F587CA-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}"/E59851B0E49C05D728D5C653E52750FA5B6A8F0E-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/Manifest b/dev-java/netbeans-dlight/Manifest
index 19e14a3..02f106d 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -32,6 +32,7 @@ DIST netbeans-trunk-nightly-201602260002-src.zip 209828915 SHA256 79e707455e36ff
 DIST netbeans-trunk-nightly-201602270002-src.zip 209831963 SHA256 20b41ce3e47c43d3e255e9833fa3f2c3bcd48876ff620c40ed93c878c7abd883 SHA512 980ab79ed39cea631f45d7609b5d3bd8e8310737d7934dbe6a3f93f9c31031d5b38c40370ef6d35898bb7f39eb7a72a00ea1715a77b12678eb5d3a2e2f12a76a WHIRLPOOL f4a058519c51572208225a141a6745583c6ce1019e4d4b2ae994e0b6dd000034e330113decdfc2a6589025e61d11583852e64e121dd42fd833552d35f9ba748a
 DIST netbeans-trunk-nightly-201602280002-src.zip 209832078 SHA256 9db7e895e76748c876558471306afbb5a6af856a8cb391248be4f8d700cb0fc0 SHA512 41bfbb29f4e9760e11336d13908703b13276dac95dd070945963a213969dbdfa844e96340a0ec7e32d721cda3bd11a7f940855a3b1ddccd3d3349b32efcf4c36 WHIRLPOOL e2ca8afcc4a6a1b5a8f19958df6015709542f0d896bd7f9b35fbb7671571732fb1931a5de6e1e0deb21ee86fdecdf2a013ff319d76e1569f8c0ba2b252e959d6
 DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf77015ad8c9ca15c1a54953eec0492be748fde20af0b464700c80f SHA512 56d79deda1cb4624b7136c0028d8786ee5f560aef52f305548654b873232a968b0bd25322c53caa44c61dd0557d177c5725eaed4b6b6e554920e9f5e8b8dcf85 WHIRLPOOL e0bd59c30e04b4a67b7924890f0e377bbb120564a155815b1aa64a28da7f835362e583333240672aeb2b39d63c5c37e2739d4a9e9f25488ce2cfb5ee1e475569
+DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
 EBUILD netbeans-dlight-8.0.2.ebuild 2898 SHA256 08402481b573b90396431be03bda45904b2dd29f0086e09a111fe362e310c3f7 SHA512 3f6d6c9ea0043382562fbe47ad16e3273032407a74cb44ec7ff26736f96483835af4be8674361e910912a550b9fe592cc5a28c2b93b6b993076553195c35eac5 WHIRLPOOL 9d8706ccbc0d97b0f5d64ebf22c36316b08d8fbccd57408119ca5f5faef08c7f82677bf67488ff611eabeaa730e4c9a730c50966d94d738cfe79330ac147863d
 EBUILD netbeans-dlight-8.1.ebuild 2922 SHA256 f003a099e3f82f5ab53dcc56d86c00a662c98f47480feacac2a77ffea90ccd0f SHA512 94706ac4d8570deb8860236300cfeddfb2c3cbfd385ecb438a039991deeb018f292f6dbb2267d7c701b7f1b5b88d200f2c25696fb3204fcf205c15155b26d1fc WHIRLPOOL 1e44f40c8e2c03b7aa7385ef20a3247ea15a4d4705ce4b5f860bffe236eb578ab3d912f2cc2457e5906158ae747edc3b6b92463336c69af9cd58eca3fccb223d
 EBUILD netbeans-dlight-9999_p20160129.ebuild 2968 SHA256 cde3f9619c4a8083df8bc61014023d0e18f21676ae27dbd4a5f554930f4c69ea SHA512 1a47deed637e81a65f3deb2bd596693dafe97b128ef32ea410f95660fea5a3a9cd6eb8339c42411baee73014d45ffeb7e7108d39ba8419e2c34d36d300a7ee19 WHIRLPOOL 8e8ca7ed81a569ef438604899fcf2d70a47277dccde854c06001214a21494a1d38f8047e908f4382ed3a519b37d566ba88faf71cc7b3e3acad19147681d764c6
@@ -60,4 +61,5 @@ EBUILD netbeans-dlight-9999_p20160226.ebuild 2968 SHA256 4b6fb15fa3f63b94f65b14f
 EBUILD netbeans-dlight-9999_p20160227.ebuild 2968 SHA256 4d99e8510350e13b6c99f530d22d3c0a550682442a1488c6ef110f0c2fb043f5 SHA512 e9923afb997f4882628f3ff18bd62f1db3f5ff6952acd35b96475db07db359d49553ed8b3f63c5b16e67dc2ed1c49f16dbb7599b03b5b6111f7f43417dda93e7 WHIRLPOOL 172c4aa4c7807d834bb0ff5bc8ac739d0d43d18f13f6747d2f328459a0ec9d0a2d8e03673f672579a607c2cde3be932cce098880e2026e31ed4074de655b4e0f
 EBUILD netbeans-dlight-9999_p20160228.ebuild 2968 SHA256 7555125dde1124332a3c4cf423bbbeba04027e5c333116d27b8db0b1aa1ab33b SHA512 a415f56a5c5b7e2e1c85508cb8b8d464b4205e49aefc927ce648c094f5958ba7583ac3dffdddce64f9534523199798c7ca6a58c7bb1789fae037fdee307c16d9 WHIRLPOOL 0438dd5b7944528a8f8378ba75fd294a158096545a0a82a558d1c7aac7047f08c8ff28db79bb4d5922282d2e5720c2a62f08369a5b0b36d33207fbd030d7b9ea
 EBUILD netbeans-dlight-9999_p20160229.ebuild 2968 SHA256 d04df2ff784e14a7fb4d457d8b16170dee91d7b4eb55643ba3836e903bec2658 SHA512 3778557ed7751451b36218bf0a3d7c2c8d6083810a4b3f3d7fafcd34dc5f842da244bd028822e30d1ff2a1f51cd951a4ac354b75ad2b411556f4aee74cd3aa78 WHIRLPOOL e9a5d58c99d6647eeb8b018eaa76013cb4a2b753b1d92529143968fe6d19965802e41ffe5b1b71c67641fdc14d5bd7e5d630395746d1b8481cb1cb487789d3ed
+EBUILD netbeans-dlight-9999_p20160301.ebuild 2968 SHA256 09e3e5cbe876bb60c8261fd2fd6ff0e022982b4bfb8e96406fb08ace2d70ea6c SHA512 5c1b28f7cf971b955b4d382445c1d1dce529130a285db1a6742ea1807042e731f4c2b7bab8f1c16f284f2427f44aeefa9bca42d663d9bb49f6ad09724e1378ea WHIRLPOOL d8f2b7d66e101475a07cfdd377b44ba21b535a982d1721621d1e4bea15e74f1222f4f79d4e77a77bf36d3312c051a9bdb62908bf142b9a9d1ac64f37797d33e6
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160301.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160301.ebuild
new file mode 100644
index 0000000..2a1fc71
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160301.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/2016-03-01_00-02-15/zip/netbeans-trunk-nightly-201603010002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/0F89C62CA701D20BA9A9A526D4D017888C3B5A65-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}"/0F89C62CA701D20BA9A9A526D4D017888C3B5A65-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/Manifest b/dev-java/netbeans-enterprise/Manifest
index 90c5971..3873e0c 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -61,6 +61,7 @@ DIST netbeans-trunk-nightly-201602260002-src.zip 209828915 SHA256 79e707455e36ff
 DIST netbeans-trunk-nightly-201602270002-src.zip 209831963 SHA256 20b41ce3e47c43d3e255e9833fa3f2c3bcd48876ff620c40ed93c878c7abd883 SHA512 980ab79ed39cea631f45d7609b5d3bd8e8310737d7934dbe6a3f93f9c31031d5b38c40370ef6d35898bb7f39eb7a72a00ea1715a77b12678eb5d3a2e2f12a76a WHIRLPOOL f4a058519c51572208225a141a6745583c6ce1019e4d4b2ae994e0b6dd000034e330113decdfc2a6589025e61d11583852e64e121dd42fd833552d35f9ba748a
 DIST netbeans-trunk-nightly-201602280002-src.zip 209832078 SHA256 9db7e895e76748c876558471306afbb5a6af856a8cb391248be4f8d700cb0fc0 SHA512 41bfbb29f4e9760e11336d13908703b13276dac95dd070945963a213969dbdfa844e96340a0ec7e32d721cda3bd11a7f940855a3b1ddccd3d3349b32efcf4c36 WHIRLPOOL e2ca8afcc4a6a1b5a8f19958df6015709542f0d896bd7f9b35fbb7671571732fb1931a5de6e1e0deb21ee86fdecdf2a013ff319d76e1569f8c0ba2b252e959d6
 DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf77015ad8c9ca15c1a54953eec0492be748fde20af0b464700c80f SHA512 56d79deda1cb4624b7136c0028d8786ee5f560aef52f305548654b873232a968b0bd25322c53caa44c61dd0557d177c5725eaed4b6b6e554920e9f5e8b8dcf85 WHIRLPOOL e0bd59c30e04b4a67b7924890f0e377bbb120564a155815b1aa64a28da7f835362e583333240672aeb2b39d63c5c37e2739d4a9e9f25488ce2cfb5ee1e475569
+DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
 EBUILD netbeans-enterprise-8.0.2-r1.ebuild 15075 SHA256 41d376117ad1d8d59c8194debfd29dc42f5fd4de70aee12a2134ec143a604dda SHA512 4cd9de88e9a401cc0be88e3e2605abc411c47307818376b2bcc00f9ae570b21324f2bf00fd83e819bfa076da0fb07811fa1f0f9362a6cd0ee05b63221a199000 WHIRLPOOL 73f4518c14430fe7aa3614ebf1b11a06ba0e9bce7479af2770db3a114f149d575a16a655218f757ed416b5149228ac56dac700f5a8d5e034cc838bfa4092e636
 EBUILD netbeans-enterprise-8.1-r1.ebuild 15888 SHA256 d4c04ccfee01a46819020cb7cf8fd8297618f3c0431ae2d9dd7eec8131f988ab SHA512 6c7c39c378cb79d3f382cb80d07710a8c5233aaf0df8fb58889ee6aa6bde73624efa6aa49b43f84105685094a7aff89e4b6367ffd1fd113da27b42d50d07e983 WHIRLPOOL e678e2a6957e428c1b6e51469c0e7cc6a08da2c797f1575b6bb660a7f3281c00f071179de459e27c983304915b005baaf94ad4fae0a4c08162f218bf53b7d821
 EBUILD netbeans-enterprise-9999_p20160129.ebuild 15825 SHA256 11ac5af569d12ae7a164e2aa4c0eb0652215b1e209bee5b94f8b8de409b8d9ad SHA512 a7048b99b1e5d612ca0d112305a487db887ad326894b58b95be57fda80abf8992b9ec562cf28183699129cf87ccdef3c7b51f7ba3fde4c39f7708ca98ee4a153 WHIRLPOOL 0e3a8e58007ab8e966396a49bb44ebadb08f08d935a1b7a690feb8748fd1368986b6967b570460bcdd3d686dc5eb19a7ee20005db7416a3e9fb5c3187a2e235e
@@ -89,4 +90,5 @@ EBUILD netbeans-enterprise-9999_p20160226.ebuild 15825 SHA256 a6010d4c7134d83075
 EBUILD netbeans-enterprise-9999_p20160227.ebuild 15825 SHA256 a6978ba6760a4aa18696ba7ffc8db8a20cbf0d54c15461f618ba6ccd7c3945d8 SHA512 40bec434839368a7a841b0d618d9290b02f7e8d2b6ab8c44a986108ec63b75c4bba267ad58c19bcc475a8c13d22ef654c0ab57caa8c54e5b1cc127532633d185 WHIRLPOOL 7018584507806d021bccdafd11c87ffea60ba83926c0c1ea4eefe5f508da03f72dc2979f2c54539c00df2070a7e56d4b9710b8c3946e2d6fc19f16da3c46c674
 EBUILD netbeans-enterprise-9999_p20160228.ebuild 15825 SHA256 f36fa7423164bc3022c1598d9ec2cc97964586a6c73452e85a11d0fda19c357a SHA512 3edbe82b1ebcdfe7552e3f47031a10e608954c8c73dfc76383bf31be965b9a5aba935be5c1ffd1d3a298e3a510e58b8ff330857cd03eee6b4195a7d52ba499f0 WHIRLPOOL 56bcdef46148014718aadb02b86a90e49f574221fae082451d2a061b2b1b0891073f2cffee2ea7de93afd469d7378964a73a774f0c398c645321615b661f0da1
 EBUILD netbeans-enterprise-9999_p20160229.ebuild 15825 SHA256 e997eb76ab7b4b7e4ef88d67b72fc89553fadd27daf35c4c926a962371cd696d SHA512 6d185e0b5782013b9aa454d36b328da8c45be11de179b45762aaf46e29510c270bf3f490f01431b67889da1239b941186c1e2e9e1b6135d7754f0fd940963b99 WHIRLPOOL 96551ce5f5c1ce4ff6fd45c3612f0310fcb2f88073876c7707a2528a7b188277d10730d8eb931d9b58506f8ba8b64d6cbac73c73224acc4bcd8a3a6f935229e9
+EBUILD netbeans-enterprise-9999_p20160301.ebuild 15825 SHA256 9dcb22dd0e27b645e88cdca8645b0c145e20264b133cd31a397790fb45d028ad SHA512 ea8c729dc776ccca76ed44a8d0d10edcf0a8c1de06e1fe93779407f96f7a471526fbaceaf9f1cdfce6f9ddffbb42b184567487894d81d40268ae322c4227a3af WHIRLPOOL e285b41def59f48fb043b863e2cd4d19f4bee57d6f66591c841137483bf49942f1936556aca646fd23a815930af6796f7a596b0a491f9b9be68c7bd57817cab0
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160301.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160301.ebuild
new file mode 100644
index 0000000..0cde7f4
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160301.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/2016-03-01_00-02-15/zip/netbeans-trunk-nightly-201603010002-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
+	dev-java/jsr181:0"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	>=dev-java/junit-4.4:4
+	dev-java/tomcat-servlet-api:2.3"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}
+	>=dev-java/antlr-2.7.7-r7:0
+	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 --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="${D}"/${INSTALL_DIR}/modules/ext
+	pushd "${instdir}" >/dev/null || die
+	rm commons-fileupload-1.3.jar && java-pkg_jar-from --into "${instdir}" commons-fileupload commons-fileupload.jar commons-fileupload-1.3.jar
+	rm jsr88javax.jar && java-pkg_jar-from --into "${instdir}" glassfish-deployment-api-1.2 glassfish-deployment-api.jar jsr88javax.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/aws-sdk
+	pushd "${instdir}" >/dev/null || die
+	rm commons-codec-1.3.jar && java-pkg_jar-from --into "${instdir}" commons-codec commons-codec.jar commons-codec-1.3.jar
+	rm commons-logging-1.1.1.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar commons-logging-1.1.1.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/javaee7-endorsed
+	pushd "${instdir}" >/dev/null || die
+	rm jsr181-api.jar && java-pkg_jar-from --into "${instdir}" jsr181 jsr181.jar jsr181-api.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jersey2/ext
+	pushd "${instdir}" >/dev/null || die
+	rm cglib-2.2.0-b21.jar && java-pkg_jar-from --into "${instdir}" cglib-3 cglib.jar cglib-2.2.0-b21.jar
+	rm guava-14.0.1.jar && java-pkg_jar-from --into "${instdir}" guava-14 guava.jar guava-14.0.1.jar
+	rm org.osgi.core-4.2.0.jar && java-pkg_jar-from --into "${instdir}" osgi-core-api osgi-core-api.jar org.osgi.core-4.2.0.jar
+	rm persistence-api-1.0.jar && java-pkg_jar-from --into "${instdir}" glassfish-persistence glassfish-persistence.jar persistence-api-1.0.jar
+	rm validation-api-1.1.0.Final.jar && java-pkg_jar-from --into "${instdir}" validation-api-1.0 validation-api.jar validation-api-1.1.0.Final.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jsf-1_2
+	pushd "${instdir}" >/dev/null || die
+	rm commons-beanutils.jar && java-pkg_jar-from --into "${instdir}" commons-beanutils-1.7 commons-beanutils.jar
+	rm commons-collections.jar && java-pkg_jar-from --into "${instdir}" commons-collections commons-collections.jar
+	rm commons-digester.jar && java-pkg_jar-from --into "${instdir}" commons-digester commons-digester.jar
+	rm commons-logging.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/struts
+	pushd "${instdir}" >/dev/null || die
+	rm antlr-2.7.2.jar && java-pkg_jar-from --into "${instdir}" antlr antlr.jar antlr-2.7.2.jar
+	rm bsf-2.3.0.jar && java-pkg_jar-from --into "${instdir}" bsf-2.3 bsf.jar bsf-2.3.0.jar
+	rm commons-beanutils-1.8.0.jar && java-pkg_jar-from --into "${instdir}" commons-beanutils-1.7 commons-beanutils.jar commons-beanutils-1.8.0.jar
+	rm commons-digester-1.8.jar && java-pkg_jar-from --into "${instdir}" commons-digester commons-digester.jar commons-digester-1.8.jar
+	rm commons-fileupload-1.1.1.jar && java-pkg_jar-from --into "${instdir}" commons-fileupload commons-fileupload.jar commons-fileupload-1.1.1.jar
+	rm commons-io-1.1.jar && java-pkg_jar-from --into "${instdir}" commons-io-1 commons-io.jar commons-io-1.1.jar
+	rm commons-logging-1.0.4.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar commons-logging-1.0.4.jar
+	rm commons-validator-1.3.1.jar && java-pkg_jar-from --into "${instdir}" commons-validator commons-validator.jar commons-validator-1.3.1.jar
+	rm oro-2.0.8.jar && java-pkg_jar-from --into "${instdir}" jakarta-oro-2.0 jakarta-oro.jar oro-2.0.8.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/enterprise
+}

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index e488133..095340f 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201602260002-src.zip 209828915 SHA256 79e707455e36ff
 DIST netbeans-trunk-nightly-201602270002-src.zip 209831963 SHA256 20b41ce3e47c43d3e255e9833fa3f2c3bcd48876ff620c40ed93c878c7abd883 SHA512 980ab79ed39cea631f45d7609b5d3bd8e8310737d7934dbe6a3f93f9c31031d5b38c40370ef6d35898bb7f39eb7a72a00ea1715a77b12678eb5d3a2e2f12a76a WHIRLPOOL f4a058519c51572208225a141a6745583c6ce1019e4d4b2ae994e0b6dd000034e330113decdfc2a6589025e61d11583852e64e121dd42fd833552d35f9ba748a
 DIST netbeans-trunk-nightly-201602280002-src.zip 209832078 SHA256 9db7e895e76748c876558471306afbb5a6af856a8cb391248be4f8d700cb0fc0 SHA512 41bfbb29f4e9760e11336d13908703b13276dac95dd070945963a213969dbdfa844e96340a0ec7e32d721cda3bd11a7f940855a3b1ddccd3d3349b32efcf4c36 WHIRLPOOL e2ca8afcc4a6a1b5a8f19958df6015709542f0d896bd7f9b35fbb7671571732fb1931a5de6e1e0deb21ee86fdecdf2a013ff319d76e1569f8c0ba2b252e959d6
 DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf77015ad8c9ca15c1a54953eec0492be748fde20af0b464700c80f SHA512 56d79deda1cb4624b7136c0028d8786ee5f560aef52f305548654b873232a968b0bd25322c53caa44c61dd0557d177c5725eaed4b6b6e554920e9f5e8b8dcf85 WHIRLPOOL e0bd59c30e04b4a67b7924890f0e377bbb120564a155815b1aa64a28da7f835362e583333240672aeb2b39d63c5c37e2739d4a9e9f25488ce2cfb5ee1e475569
+DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
 EBUILD netbeans-ergonomics-8.0.2.ebuild 2843 SHA256 f9262f6ee7f2aed1fab9bf4cf756f565272e9894afa50b349735e39961e7acc3 SHA512 f158c27640541f7aef31da050e0811c07a251ae4797cc663b95a074a47eaf9d6bb7a9aa11ba38ea55e75c185f7dba74629ba6716a819e8ad68eb3db9ada71451 WHIRLPOOL 4fe9634fb673fb05dbba25996efc3a212ef3bb23ab6e7c732cb75de076feb930735e3901806fd9c801abc7ee8aa8eb800718065325d415371255a886474061d4
 EBUILD netbeans-ergonomics-8.1.ebuild 2867 SHA256 6d2c0b7221d47b64c77b243c8c5232c6d8c24d3199eae5799adafeac609b2e2a SHA512 6302c8c13d43ec51048e8b0439916746a01bb67f14e7cd21be95b4179df6106dcff1d3973b9191f7a36cf6f29d53b1d2308864f5f64d9f87f980ea264b1a97c0 WHIRLPOOL 63ceaad04323d9085dfb90d1e5075ad13f6e14e8991b13aafaf3fc174440152054f32498ac8d03f57917744887db3bc1efdfc30b473b8d1a33b514ec4960ea6f
 EBUILD netbeans-ergonomics-9999_p20160129.ebuild 2913 SHA256 69365d476dc57889d9bedeacd496e9d9eaff09788b022c7aaec8625b4bc85939 SHA512 bbbc2946db4e95374cabeef608d31454261143422e7910ac44eb837b1365cda9c9a0205d791a15f660a123f28a9b721db608cf2fa86be1bf2d86ad4e8d160d08 WHIRLPOOL 47ef0a7188b0697e8be4a6a41d394afa9b048b4a31b3bbd369dec63de9294bbf08e1baaad6c4254c106e057de8b2dea3b4606b39f144b2ac4c8ef84613d50144
@@ -57,4 +58,5 @@ EBUILD netbeans-ergonomics-9999_p20160226.ebuild 2913 SHA256 c18d3872c9c5e33c071
 EBUILD netbeans-ergonomics-9999_p20160227.ebuild 2913 SHA256 9dbaea5ab7fde77a21156561ead70a16da1c5385a64b241b888a342947cf881d SHA512 3cd03e2495e8e8f6ada21df9282c0bb3977e9979f398383712fbe1ffc162eae46b3e3a61644c1a5c694d80d562868b04dcb980c5376049c31f9a69a782fb8a39 WHIRLPOOL dcc2dc70e49408b5f1c9c351f109b050232ca966d4e0aa90a315faf68823c71c97f212d27b00d1f51f1adc09c3058409bb60354e05b6bf9480254c813b3be884
 EBUILD netbeans-ergonomics-9999_p20160228.ebuild 2913 SHA256 dbcf923511d8393e14134c805c4a47c5dedc693579c05b3242e05c4c099a380c SHA512 bf2c2446f39578a60c46ebb5bf0f4722551508bffeecb3270607d8dcfeed1389a9eb35660b203cfd0c447a08b7f86d54d010998d5711fcfeed2ac33723596937 WHIRLPOOL e6cca6d9087f1658e7b9caf204a999d4e1b42c37cce55cac5b7a7e6b0f40ee468ccbb20235f8a0b24757e850ae79477d4ac69a8ec1f82f22eeecc653dec6ddd3
 EBUILD netbeans-ergonomics-9999_p20160229.ebuild 2913 SHA256 035bc0839e8dea2ec2abaf94ef90ce9d3ea4eed01c505cfe665a5d79632e13c3 SHA512 d8080a42718a5598a2e26be9bf7f4dff4908d1630d3f6658ec7eeb37c0b28959df5e29a5dbe8375080d5b2b1969bd61bc1667a15f85a5183f737584ca5c0fd78 WHIRLPOOL 03fb169cc65147c4bf7e28b9ee10c69428425ef33ab1c30255a11b3e31b248f509f107d7cdc6c0b93862780e5b8b96aa4580e6c025729a1126a7086ca744cb1e
+EBUILD netbeans-ergonomics-9999_p20160301.ebuild 2913 SHA256 fcd33fd0b2bd4224e1d6565807c975008df9acfa52c2b712e3f0a91b2ba6f856 SHA512 9826b31f5a817a958dd528df88e29f1bbe551c621b8b5f224bb9d8605ddbf9f44040e1e97c1b75e2c69dad4c2cc1682bcc1d7c44e3265cff1aeaf570293b2731 WHIRLPOOL 71d9f1c3c2d7066e601cdcea5ca26c862e83fd36ac1c8256ce4c2c196fce673e503733595266b62262a9dac658d68cfbbb68b438e017b2a9cae2004dffdb933d
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160301.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160301.ebuild
new file mode 100644
index 0000000..aed49a6
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160301.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/2016-03-01_00-02-15/zip/netbeans-trunk-nightly-201603010002-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/Manifest b/dev-java/netbeans-extide/Manifest
index a4068fd..31d6df6 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201602260002-src.zip 209828915 SHA256 79e707455e36ff
 DIST netbeans-trunk-nightly-201602270002-src.zip 209831963 SHA256 20b41ce3e47c43d3e255e9833fa3f2c3bcd48876ff620c40ed93c878c7abd883 SHA512 980ab79ed39cea631f45d7609b5d3bd8e8310737d7934dbe6a3f93f9c31031d5b38c40370ef6d35898bb7f39eb7a72a00ea1715a77b12678eb5d3a2e2f12a76a WHIRLPOOL f4a058519c51572208225a141a6745583c6ce1019e4d4b2ae994e0b6dd000034e330113decdfc2a6589025e61d11583852e64e121dd42fd833552d35f9ba748a
 DIST netbeans-trunk-nightly-201602280002-src.zip 209832078 SHA256 9db7e895e76748c876558471306afbb5a6af856a8cb391248be4f8d700cb0fc0 SHA512 41bfbb29f4e9760e11336d13908703b13276dac95dd070945963a213969dbdfa844e96340a0ec7e32d721cda3bd11a7f940855a3b1ddccd3d3349b32efcf4c36 WHIRLPOOL e2ca8afcc4a6a1b5a8f19958df6015709542f0d896bd7f9b35fbb7671571732fb1931a5de6e1e0deb21ee86fdecdf2a013ff319d76e1569f8c0ba2b252e959d6
 DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf77015ad8c9ca15c1a54953eec0492be748fde20af0b464700c80f SHA512 56d79deda1cb4624b7136c0028d8786ee5f560aef52f305548654b873232a968b0bd25322c53caa44c61dd0557d177c5725eaed4b6b6e554920e9f5e8b8dcf85 WHIRLPOOL e0bd59c30e04b4a67b7924890f0e377bbb120564a155815b1aa64a28da7f835362e583333240672aeb2b39d63c5c37e2739d4a9e9f25488ce2cfb5ee1e475569
+DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
 EBUILD netbeans-extide-8.0.2.ebuild 3307 SHA256 084e952eae1708b0fab785fd34313985e864dbc74a8531a0d5cdcf906e88f85a SHA512 ade8dc37aa932d7ec20966199e521311716061c23df08d02635f78efd2776f1d7bf040b0f9c9488b947bbbdfb3e33fa764723e3dfffa2214892bc6d685428f6f WHIRLPOOL ad2c26b005675ebca7d902ff1e6caa28552f3fda6795e327cc3584cf109f0ad6efad6516e15af5e70d689be236298b0948003e09a3da4991b3e29a1c85607b2f
 EBUILD netbeans-extide-8.1.ebuild 3331 SHA256 7d81adb3cba102e13678052bfe288e8417753ebceb69f69ce528ede3fedcef04 SHA512 ae445552036799069f31b40c145879ac55cf0964e168f328ac84f2d434171de8c4848e3416ad7425563e8565c09f798c9520bb3cb7511348f5d6a7522b878e40 WHIRLPOOL 44142233d4d3047ebb5c152992b484e5fef1fddd04cf274cc370f00beece5a75a986e5fadedd4bc18a01559c4f6cb58289cefbfc24d8d098d70056707e8b8f57
 EBUILD netbeans-extide-9999_p20160129.ebuild 3377 SHA256 444f74315b5c815af87442a43d6e20ceb2ca03114525c6834bbbffca339d4004 SHA512 802147deee41e61d1298eb4c9c39a867853d22d5e6d8837dc36780261c14b9546cf391a26cb9d8443ed0b4233c61cd8a36ce636a79ddf73c88216024c9ab69e4 WHIRLPOOL 0cf78cf59ec428af8d76f3ff4bfbd883683e77cc01869e539144c4b4f40f6f5a589ce61fba09e27383effee8e0f1e5e9e5eeb1730cfb9122c2fa94d824bcbfeb
@@ -59,4 +60,5 @@ EBUILD netbeans-extide-9999_p20160226.ebuild 3377 SHA256 34af177610d5d508c3442dc
 EBUILD netbeans-extide-9999_p20160227.ebuild 3377 SHA256 444041a43b09c707a927c9e063e823207ddaa14e84abcf9684ac11f4fe6fb7e2 SHA512 523910f8d52dc62b5dd13c4eebd398dcd44e9fe648f5bc128e480ae8d1766f07faea7bdc581773a418409c1b18a789f6a09289e50c81dc43a21ab39801dfda1c WHIRLPOOL aa2429af6fa16ecd254e5de2e44ad51c796e9b7e579d0b31b7e89ae20f1ae8cc3a58a2ad7f40f33361d487f9e7880eea6cd344c91a97425b667e7e9901d2abb5
 EBUILD netbeans-extide-9999_p20160228.ebuild 3377 SHA256 181ec286dafad3c9f7542d238246a26f42b0a9932960c77d8d9c5df240751ac8 SHA512 d7d5b554dead77da59ab596b480934f851603ac0cfb61e8a56b33f274193c3d636bbf781e030d251e98fd010e9f1505606689cf71d85c21add21899127cc7fbf WHIRLPOOL 03eea17e5d0c0fa11bc5ecbee20f816dca991ba108b7e21de9b168c28f720e7c60c1989cb8a09eba616d1449adacda0d28d38d1a429e1a42d671cf177f41188a
 EBUILD netbeans-extide-9999_p20160229.ebuild 3377 SHA256 7c2cd59afc634141e05d70fe405b71d9d54773b1c20a533c3d75618881998bd3 SHA512 fba891194a0edb6b3f10b04811e3ffa531036e72404bd4eb799418814ff067b3edc7d7d39c2e599870ef53509879431e1c3194f5f7efcb93a478ee04bbe07d26 WHIRLPOOL 4f1319396615be09e607d174dbc270d9b08a0ec09b456703233d28731797539b2e8d690a7acb762af25ecd0ea77523250d149e958096831f0e5ff5a33a466133
+EBUILD netbeans-extide-9999_p20160301.ebuild 3377 SHA256 ec3927367ed2925d2980813be2a08a425c134d75387f42f9d573d234aa999774 SHA512 d82bd490ed27fe3f720d42faf93a9668d811d3f39b935e28c7462b9f35df1379ebd2df0112ba635fc38fd270b77ac4a0c570ede0cce987d86715b34e18756806 WHIRLPOOL 47612025db95886f3948cb5eff5e22d2110ae5ccbf192460cccd13bebae2612ea56fe620a1fa7779fa0a701adfc0d41ce4c9fb60d913c2c7a0978e00fa70eefa
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160301.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160301.ebuild
new file mode 100644
index 0000000..e70fc8f
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20160301.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/2016-03-01_00-02-15/zip/netbeans-trunk-nightly-201603010002-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/Manifest b/dev-java/netbeans-groovy/Manifest
index d3e9364..5e4e0e8 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201602260002-src.zip 209828915 SHA256 79e707455e36ff
 DIST netbeans-trunk-nightly-201602270002-src.zip 209831963 SHA256 20b41ce3e47c43d3e255e9833fa3f2c3bcd48876ff620c40ed93c878c7abd883 SHA512 980ab79ed39cea631f45d7609b5d3bd8e8310737d7934dbe6a3f93f9c31031d5b38c40370ef6d35898bb7f39eb7a72a00ea1715a77b12678eb5d3a2e2f12a76a WHIRLPOOL f4a058519c51572208225a141a6745583c6ce1019e4d4b2ae994e0b6dd000034e330113decdfc2a6589025e61d11583852e64e121dd42fd833552d35f9ba748a
 DIST netbeans-trunk-nightly-201602280002-src.zip 209832078 SHA256 9db7e895e76748c876558471306afbb5a6af856a8cb391248be4f8d700cb0fc0 SHA512 41bfbb29f4e9760e11336d13908703b13276dac95dd070945963a213969dbdfa844e96340a0ec7e32d721cda3bd11a7f940855a3b1ddccd3d3349b32efcf4c36 WHIRLPOOL e2ca8afcc4a6a1b5a8f19958df6015709542f0d896bd7f9b35fbb7671571732fb1931a5de6e1e0deb21ee86fdecdf2a013ff319d76e1569f8c0ba2b252e959d6
 DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf77015ad8c9ca15c1a54953eec0492be748fde20af0b464700c80f SHA512 56d79deda1cb4624b7136c0028d8786ee5f560aef52f305548654b873232a968b0bd25322c53caa44c61dd0557d177c5725eaed4b6b6e554920e9f5e8b8dcf85 WHIRLPOOL e0bd59c30e04b4a67b7924890f0e377bbb120564a155815b1aa64a28da7f835362e583333240672aeb2b39d63c5c37e2739d4a9e9f25488ce2cfb5ee1e475569
+DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
 EBUILD netbeans-groovy-8.0.2.ebuild 3346 SHA256 907e6cd11c222f15c826494b44929483803f0e4249de0d54db51e6855b574148 SHA512 8bb37121e7e32621959318d109b1d982e2c705a9deb7171f5fef1dcaed55fc5718b0bc9e6bbb2592cdaa5e96d874bb6e6bfa96d06fe09f14d5250c1485eb1da5 WHIRLPOOL d5e09fa1e975835f05c6132c091fee4ae9fc9dd671af9f5f88a9195d5cd4a93804f96687ed3f2bd741117fa65773f2c464b3cfd6697425039cc51a940efa2a31
 EBUILD netbeans-groovy-8.1.ebuild 3370 SHA256 ca32569d438060704e4d5d5e46be2ebf20bffdb0ae2471d8718ada8676f32082 SHA512 40555d2ffa0ddab1e55ca514eddbd98c6e721caa230cd174050fb56f144def46f389b0ac018068c9f509936c83235b2d3423cae8676db7c96e8782b0da73e4ad WHIRLPOOL 7b2b021581db21aa8ff90ea188ddeea0974ec84fdb064cf367a56a6fa53487affe89edb1880a83934a2cf0c586060a9192838687ffebf33b55e79d9ddc7ac986
 EBUILD netbeans-groovy-9999_p20160129.ebuild 3416 SHA256 6e2e45cd825c6f334e848a862a765f18efe7355d3eee27cfc6a886e83bea5db2 SHA512 b400a4c6b0a8ef603316971f6307b926d12963cc40f8227c1f3e9c407ef461becd6204554fdf94417d05d0ab00bd603b62d19edcc7e4399945f22fa8543a7958 WHIRLPOOL 1edf622031799dc8796325c3be952d099f549423aba76d968e6fc12b4c47ae332015692a89686e2ca3e834c1d6137aca481a075856e6589b98e501ef1b5fd688
@@ -59,4 +60,5 @@ EBUILD netbeans-groovy-9999_p20160226.ebuild 3416 SHA256 d148b14ff8d19271fd2b7f8
 EBUILD netbeans-groovy-9999_p20160227.ebuild 3416 SHA256 6ed026e82fb6db50c51773c547990f22ef77f52e6b3f03b64ef928d9b155ba34 SHA512 c0f84c51e8b93ba4966b66ac60dd93e92863ab485e1e7060c7ab2d48d684389983e67f54a244698952620a2b21d0e4962ead206d6c53ff66323a0353d17a4a25 WHIRLPOOL 48bdc1e918196c58d6f5a6fdf16b460a6aa13529109c4a4325289a16daef976e14e9fa6a1974fb51b53f24c21ef35fbcf72eea006738506c4d34cce064600403
 EBUILD netbeans-groovy-9999_p20160228.ebuild 3416 SHA256 9fec0bf0771de9dac16225e14edfdd4bb8e5ad6761859238e6acd7eb25e474e8 SHA512 559e5e91e4ea91cecd4dff58f551d72f9bd3673fe36f5346952ac587f859c6df2780ecb3d30a981ffd7f53c236307fe7eb19d869064a19a5e6c2db608123dc10 WHIRLPOOL 5539cfc816b5963a1ff656c8e9dcbe965d199826f30d76655f243c557c7adb6c8fb57ffd1994162d2a17483534ec6eca7b5a3cf7cefcf3a5818673fb734cb67c
 EBUILD netbeans-groovy-9999_p20160229.ebuild 3416 SHA256 82fec876a7973eccc1b30a39fa923812322326fbbb0cc218f68893f0212f0301 SHA512 7e0f1ead1b68f282094b7ae42b2b0e7299c19add6a6ad883dd7479fd1bc37d7654cf308401f6c922473c3591c15e0ee4897439aa5902775450773f146f2f0d09 WHIRLPOOL 268639858c3137efecccfd2269b6a83fe007e2cf9999d4dd13312c7d6d152c7123166146c45c54e386dd16ea4d4302e2d431d0248ff355c177b6be0a99e4d652
+EBUILD netbeans-groovy-9999_p20160301.ebuild 3416 SHA256 222201d0b0f2f22e234799d26f304ca696f3a9ba17e37f06e1ff901ddeda5dc5 SHA512 9bdb9dbdcc0f2903cffab2936ca7f8aaf206af0e6056734cadd5e4389785401eb8ef68cd629e4736047f2437e3a1ec70c614669e779185d87b5182c247e66e4c WHIRLPOOL 9ec6e2aed159cf0b2344a726e6578abfeb8c2cedb83c48f834e8f8804fc6777d4d945ef13f215cb1dd64c596e81a7449854138d42806e82544cf9a391c1c4a4f
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160301.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160301.ebuild
new file mode 100644
index 0000000..8e1d323
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160301.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/2016-03-01_00-02-15/zip/netbeans-trunk-nightly-201603010002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/01730F61E9C9E59FD1B814371265334D7BE0B8D2-groovy-all-2.4.5.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}"/01730F61E9C9E59FD1B814371265334D7BE0B8D2-groovy-all-2.4.5.jar libs.groovy/external/groovy-all-2.4.5.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/Manifest b/dev-java/netbeans-harness/Manifest
index 10afd0e..8160830 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201602260002-src.zip 209828915 SHA256 79e707455e36ff
 DIST netbeans-trunk-nightly-201602270002-src.zip 209831963 SHA256 20b41ce3e47c43d3e255e9833fa3f2c3bcd48876ff620c40ed93c878c7abd883 SHA512 980ab79ed39cea631f45d7609b5d3bd8e8310737d7934dbe6a3f93f9c31031d5b38c40370ef6d35898bb7f39eb7a72a00ea1715a77b12678eb5d3a2e2f12a76a WHIRLPOOL f4a058519c51572208225a141a6745583c6ce1019e4d4b2ae994e0b6dd000034e330113decdfc2a6589025e61d11583852e64e121dd42fd833552d35f9ba748a
 DIST netbeans-trunk-nightly-201602280002-src.zip 209832078 SHA256 9db7e895e76748c876558471306afbb5a6af856a8cb391248be4f8d700cb0fc0 SHA512 41bfbb29f4e9760e11336d13908703b13276dac95dd070945963a213969dbdfa844e96340a0ec7e32d721cda3bd11a7f940855a3b1ddccd3d3349b32efcf4c36 WHIRLPOOL e2ca8afcc4a6a1b5a8f19958df6015709542f0d896bd7f9b35fbb7671571732fb1931a5de6e1e0deb21ee86fdecdf2a013ff319d76e1569f8c0ba2b252e959d6
 DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf77015ad8c9ca15c1a54953eec0492be748fde20af0b464700c80f SHA512 56d79deda1cb4624b7136c0028d8786ee5f560aef52f305548654b873232a968b0bd25322c53caa44c61dd0557d177c5725eaed4b6b6e554920e9f5e8b8dcf85 WHIRLPOOL e0bd59c30e04b4a67b7924890f0e377bbb120564a155815b1aa64a28da7f835362e583333240672aeb2b39d63c5c37e2739d4a9e9f25488ce2cfb5ee1e475569
+DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
 EBUILD netbeans-harness-8.0.2.ebuild 4055 SHA256 2674d562adc57648c82cac9f714f74f9d29dd7b7ff7fa7f0ef37c43ef0975489 SHA512 7d72bed5b955b2365a4c11fcd97a2d6f2372ab939fb9a03b3ff7915053f24d695373c1aa154f6e6916d37ef3ace7b38864d575419460382760500576dae52e49 WHIRLPOOL 72f54a6cb83f282a75f0abb073109414a7b8bcd4e9263466281e68ff34148a7343ed3bd78ebdc8afd109b6b9f5b9f15bfd0e250f418fcaa4986a7c886b57b9f6
 EBUILD netbeans-harness-8.1.ebuild 4079 SHA256 116b90d6e6fd1b1ad8ce99c81104262a416a485b3a3110beed70e9381333cec2 SHA512 77ca4bbaf078adf6e13c0fea0a8e673262aaed60dd799ec161584589fb4c791d9bd758c87f4272297d863d3992b54a66b77b7bf05135cada530d111e1c428e68 WHIRLPOOL d385cd6292f31a5817a2c096f960330186a68242b51ed26e4272f33a690a98175e0b622a5d5309e1e6a72ff824662964785b7d235cf3a73ba4d715cd19e89dbb
 EBUILD netbeans-harness-9999_p20160129.ebuild 4126 SHA256 bfb690f231d6d06959ecf694bfc7c45b202c9be0ff08c430e3b2003e21680d6f SHA512 0de734d9e7acba11539ae2dc00ba34e9ea09f59e8897a49ee4aa1fe336343b844713d5df25cf472ec6ef9af698de0674a9cd21189d25ee2ce0ebba705366c0a3 WHIRLPOOL b6e86e710904426bd6b5d38cfb4020eee5abd9df8dd7b68c90cd26d5285ccacc31ebf98f599517404e503b3d7ff738c5a0d471536b5de1ced817b196574a3e8c
@@ -62,4 +63,5 @@ EBUILD netbeans-harness-9999_p20160226.ebuild 4126 SHA256 393417e9a8f381c0abf6ee
 EBUILD netbeans-harness-9999_p20160227.ebuild 4126 SHA256 8be58a3da5b91098408b2b6a3dc1359e7f7abdf8a907e659c103c7dc2480d1e4 SHA512 c2e1d3acd09ca7be12793daf16449777fd9d4e1e9cc71422b09eaab3fd3f8258d60cf01fe72f83d170253e810a9db274ed1f2c782dd8ebca55477a96eba33747 WHIRLPOOL d15584dcc84c39bfb2ad4ca7bfe88aa003e9b3da58691c313d46c326ff1808b6c8fdcd11f5f05472bb8d75479854e2a5b6afb0fb7a8f92836c2be61dd1de4bad
 EBUILD netbeans-harness-9999_p20160228.ebuild 4126 SHA256 ca80498874b6a43098dc1afcaae22a18448629b3c594e8bcf1a47f1f094cac5e SHA512 2bccebc537715fc4631da707f572efadc4e3837440f2346e58416cc528223a8ff95fb4adc4e9598260d5f3a0fdc0d98887c79d6d6378989705f5363ada496829 WHIRLPOOL 29d9760af9e421cb8f58b2c130d93c060efde1c5c7b8d07f91f4b04476ed86d9a5b3292cddbdaec4ff2b43bbaaaae0a9c066512f3ff4174349b508a59924d1b0
 EBUILD netbeans-harness-9999_p20160229.ebuild 4126 SHA256 ffe0b263afa15c034c8ab62c1714e3f19f3e0ae925f7e4722310402ff60b035e SHA512 719d7d89419c1bffde092b34f68e6f72972a399c7facdd720a4bb0665b0b74294eab91e302c7000422d9792122b5a8e55f109e98e922a219eddc47dd80bcd1da WHIRLPOOL 5f2ba33e86eb5578ee14fab6566d930b9396fec8d036733c110f2a19a36c977abbddd7e87656cc3b794f7657a1b608f2bfb991df853a2bdb13cfdeed7b7cb19e
+EBUILD netbeans-harness-9999_p20160301.ebuild 4126 SHA256 adbe68f7788578e49407bd5b154da110beabdcd82f582afde00400bab2689ed9 SHA512 174c5c867275168745a0a8f1c7ffed46eb497ff47ce94879a6b7531a49fceff18d86c53b14d92b7389595a159d4aa74a1e5b1fc336465a86d67afa871f618005 WHIRLPOOL dea01495640b785d503ccb79dfecec5b72b82437599133a0ae88494bb40a3b232a0752bef9aa3e402dcb0799b6ffbbc110f016b84211fbb79f786c7bd91ac985
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160301.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160301.ebuild
new file mode 100644
index 0000000..dcb05fd
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20160301.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/2016-03-01_00-02-15/zip/netbeans-trunk-nightly-201603010002-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="${D}"/${INSTALL_DIR}/antlib
+	pushd "${instdir}" >/dev/null || die
+	rm jsearch-2.0_05.jar && java-pkg_jar-from --into "${instdir}" javahelp jsearch.jar jsearch-2.0_05.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/harness
+}

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 826ce54..c5de4bf 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -161,6 +161,7 @@ DIST netbeans-trunk-nightly-201602260002-src.zip 209828915 SHA256 79e707455e36ff
 DIST netbeans-trunk-nightly-201602270002-src.zip 209831963 SHA256 20b41ce3e47c43d3e255e9833fa3f2c3bcd48876ff620c40ed93c878c7abd883 SHA512 980ab79ed39cea631f45d7609b5d3bd8e8310737d7934dbe6a3f93f9c31031d5b38c40370ef6d35898bb7f39eb7a72a00ea1715a77b12678eb5d3a2e2f12a76a WHIRLPOOL f4a058519c51572208225a141a6745583c6ce1019e4d4b2ae994e0b6dd000034e330113decdfc2a6589025e61d11583852e64e121dd42fd833552d35f9ba748a
 DIST netbeans-trunk-nightly-201602280002-src.zip 209832078 SHA256 9db7e895e76748c876558471306afbb5a6af856a8cb391248be4f8d700cb0fc0 SHA512 41bfbb29f4e9760e11336d13908703b13276dac95dd070945963a213969dbdfa844e96340a0ec7e32d721cda3bd11a7f940855a3b1ddccd3d3349b32efcf4c36 WHIRLPOOL e2ca8afcc4a6a1b5a8f19958df6015709542f0d896bd7f9b35fbb7671571732fb1931a5de6e1e0deb21ee86fdecdf2a013ff319d76e1569f8c0ba2b252e959d6
 DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf77015ad8c9ca15c1a54953eec0492be748fde20af0b464700c80f SHA512 56d79deda1cb4624b7136c0028d8786ee5f560aef52f305548654b873232a968b0bd25322c53caa44c61dd0557d177c5725eaed4b6b6e554920e9f5e8b8dcf85 WHIRLPOOL e0bd59c30e04b4a67b7924890f0e377bbb120564a155815b1aa64a28da7f835362e583333240672aeb2b39d63c5c37e2739d4a9e9f25488ce2cfb5ee1e475569
+DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
 EBUILD netbeans-ide-8.0.2-r1.ebuild 29314 SHA256 365d4077009861319e587dd898eed753e66756aaabaf114a5af2028342928bd8 SHA512 2a186b6ec5591f59f825dc27a6440ffeb1b96f35fcaed0a9783218d867b5a9f95378ec095b8697927fb244280c039b2afdc71d2bce2da0d7af2b06ebe1ce5cd9 WHIRLPOOL bf9a36b20188c86f70b4bd84ab6fdd7a5fcb25bf0d4793f0b8e44c10538c05ce085a29fa44673a3d78424d2276c2de6dca345e38b51887098c13a8929dc30634
 EBUILD netbeans-ide-8.1-r1.ebuild 30285 SHA256 6e42dd3e0e8d546d3187f2e894244951f93f2060b187f156ed7b97d7d23b9b9e SHA512 6219b1d4d6ffb0183cfa781b87d34c01cdff4f73d09811218c5390879ccf9281b23fa7c9c884da8877a3fb8181f660130687de942782db600da90fb7b709772d WHIRLPOOL e8ec3da7e2ee059b912094f704e1abfdec936117cf34beaaee1be9fd1659727c0c5330123dc33c959cbe08e45248f82b8418afa9ffcc18a0f3ca044f997ccbe1
 EBUILD netbeans-ide-9999_p20160129.ebuild 30238 SHA256 52ee72461891f54998b175db329c274d3de3c01d000a2b5197a2274ff00a8475 SHA512 8bc7b091db09a6f4cd625de0c10710addefc76b77780a60b8d1287641a663ff56ee35c22aec0437b27e3b6e4f112c397e3e7c195a1f9e4682a1b0d6e3ac68953 WHIRLPOOL dc63e87a596e9f0b420bcb1e90abc9716c9bbd1db65522dec2880ae14b0274cf00ef32d4c66603f7d4646db0a876a47ef60370b65573819b44d97c74c0d12e5d
@@ -189,4 +190,5 @@ EBUILD netbeans-ide-9999_p20160226.ebuild 30235 SHA256 0836616c278109eb1b3212474
 EBUILD netbeans-ide-9999_p20160227.ebuild 30250 SHA256 672392406ee7a7020e0a6081ea61f081013b06a022e1c2119da22bd476588584 SHA512 09bd47e3ee168aca0bbc5f17a0aede47055417c017928debd7acd89cc4a43f2cbe56d3caff5c8a0d62ece1a4decff7bde022029a0ff99f7168677448af10a8c7 WHIRLPOOL a15bf2072f4c6fee47a43e280de99a438d079737c41b97a8a367a19bfa4776a3474412323e3d8b2e825e0f2966b40973bb513cdd1292b4b61810a56680d11073
 EBUILD netbeans-ide-9999_p20160228.ebuild 30250 SHA256 20c33c2342adeb5ff72d4da522fd1db5b2c816d701b54c031548be91254f1acf SHA512 884a400439d3debf2811ed019a141ef241298e678b80cc81af8450c85b7085e9fd345b136eb5a4197bdc27ca94388c98d72a480edb0e89491ed13d90639dfdce WHIRLPOOL fbfb7d15b9de1ecf8947aa4da50c3e9c4ceb685fb7c89af00428c4a2d39ded9c312ee075759661f9036e6f0de76d8bc1e135fa83f2a77e41e0485a7e77b62250
 EBUILD netbeans-ide-9999_p20160229.ebuild 30250 SHA256 3813f312604f8529be6950a33f8a63a481517121b1bf29a4387684ef4e327b1d SHA512 e250a40d27873c8571f004880aee310ffd88effcb1762342b8e5e92a7b44f98041c4f7bb8f4f0068fffd033dd41992463523aecda945f85612a50edae8211182 WHIRLPOOL 434375df37a6f080b2800591aec8f2b81587eab0cae1d9553e0af8f81ea7ff07d48f5b6b90a0526f7c21641c65d7cd1de73e7d6376b718e55732e001b064e8e0
+EBUILD netbeans-ide-9999_p20160301.ebuild 30250 SHA256 fd104ea5963d5b4a14dbbaea49e1441925a6e796bf426f213c6fdf74b7372f7e SHA512 66dd3b743009045f006593d3fdf23cbeb181c9ef1f42c54a099d4733db660160e037664da1e6a0de2ccf558fdb0701dedaeb716c34716f47202e3adedf54b66d WHIRLPOOL b3b9ebafaaaa0011d111fcb0d1d90c1b16462608c4e25507300a6e1c9cc079dcbceb14a5b8bdaa2ff7d27dac6457be2b2ca7292428462c699cb8bfa5ee3184a0
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160301.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160301.ebuild
new file mode 100644
index 0000000..5b55557
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20160301.ebuild
@@ -0,0 +1,378 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/2016-03-01_00-02-15/zip/netbeans-trunk-nightly-201603010002-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/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.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/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar
+	http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
+	http://hg.netbeans.org/binaries/2541D025F428A361110C4D656CDD99B5C5C5DFCE-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/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/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.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/AA2671239EBB762FEEE8B908E9F35473A72AFE1B-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar
+	http://hg.netbeans.org/binaries/1605B38BB28EAE32C11EAB8F9E238A497754A5B8-org.eclipse.core.jobs-3.5.101_nosignature.jar
+	http://hg.netbeans.org/binaries/20800206EB8B490F3CE5BB8AC8A7C3B9E8004A30-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar
+	http://hg.netbeans.org/binaries/D2D2105B1E3C9E2FA6240AD088237A57590DDA8D-org.eclipse.core.runtime-3.7.0_nosignature.jar
+	http://hg.netbeans.org/binaries/16507EAFDC2B95121AA718895BDB54D616EE4B0F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar
+	http://hg.netbeans.org/binaries/BD55836AABD558DC643A7844B78866AD990544BC-org.eclipse.equinox.app-1.3.100_nosignature.jar
+	http://hg.netbeans.org/binaries/4EE275AE73A140A403903D7E4DBA68C8FBB07001-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar
+	http://hg.netbeans.org/binaries/B7001D9CC2E2AC4E167D22A13063F0350C71AAA9-org.eclipse.equinox.preferences-3.4.2_nosignature.jar
+	http://hg.netbeans.org/binaries/C647079E36A4EB7A24AED2C545E4F0F94194C4D1-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar
+	http://hg.netbeans.org/binaries/9267CF311F979078211A70C1B19AF8A8EE71DC8E-org.eclipse.equinox.security-1.1.1_nosignature.jar
+	http://hg.netbeans.org/binaries/B580E446B543A8DD2F5AA368B07F9C4C9C2E7029-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar
+	http://hg.netbeans.org/binaries/244560B99152F3F9BC75DF2D6FAFA8A5216B06B6-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar
+	http://hg.netbeans.org/binaries/8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar
+	http://hg.netbeans.org/binaries/D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar
+	http://hg.netbeans.org/binaries/4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar
+	http://hg.netbeans.org/binaries/8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar
+	http://hg.netbeans.org/binaries/50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar
+	http://hg.netbeans.org/binaries/4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar
+	http://hg.netbeans.org/binaries/11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar
+	http://hg.netbeans.org/binaries/A3FEF6144ED1622E4CDD506B9D745527CC675D8D-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar
+	http://hg.netbeans.org/binaries/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar
+	http://hg.netbeans.org/binaries/8307A44D3F150F1BB317532097A0C7D125C00F2D-org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar
+	http://hg.netbeans.org/binaries/6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.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/5C322A10E13FADE0451263035B7AA26B63AAFA47-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-compress:0
+	dev-java/commons-httpclient:3
+	dev-java/commons-logging:0
+	dev-java/icu4j:55
+	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/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/commons-lang:2.1 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/freemarker:2.3
+#	dev-java/guava:15 fails with "Missing manifest tag OpenIDE-Module"
+#	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/jzlib:0 fails with "Missing manifest tag OpenIDE-Module"
+#	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}"/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar o.apache.commons.lang/external/commons-lang-2.6.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}"/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar c.google.guava/external/guava-15.0.jar || die
+	ln -s "${DISTDIR}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || die
+	ln -s "${DISTDIR}"/2541D025F428A361110C4D656CDD99B5C5C5DFCE-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}"/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}"/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar c.jcraft.jzlib/external/jzlib-1.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}"/AA2671239EBB762FEEE8B908E9F35473A72AFE1B-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}"/1605B38BB28EAE32C11EAB8F9E238A497754A5B8-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}"/20800206EB8B490F3CE5BB8AC8A7C3B9E8004A30-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}"/D2D2105B1E3C9E2FA6240AD088237A57590DDA8D-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}"/16507EAFDC2B95121AA718895BDB54D616EE4B0F-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}"/BD55836AABD558DC643A7844B78866AD990544BC-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}"/4EE275AE73A140A403903D7E4DBA68C8FBB07001-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}"/B7001D9CC2E2AC4E167D22A13063F0350C71AAA9-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}"/C647079E36A4EB7A24AED2C545E4F0F94194C4D1-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}"/9267CF311F979078211A70C1B19AF8A8EE71DC8E-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}"/B580E446B543A8DD2F5AA368B07F9C4C9C2E7029-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}"/244560B99152F3F9BC75DF2D6FAFA8A5216B06B6-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}"/8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar || die
+	ln -s "${DISTDIR}"/D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar || die
+	ln -s "${DISTDIR}"/4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar || die
+	ln -s "${DISTDIR}"/8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar o.eclipse.mylyn.commons.repositories.core/external/org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar || die
+	ln -s "${DISTDIR}"/50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar || die
+	ln -s "${DISTDIR}"/4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar || die
+	ln -s "${DISTDIR}"/11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.confluence.core/external/org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar || die
+	ln -s "${DISTDIR}"/A3FEF6144ED1622E4CDD506B9D745527CC675D8D-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar || die
+	ln -s "${DISTDIR}"/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.textile.core/external/org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.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}"/6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar extexecution.process/external/processtreekiller-1.0.7.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}"/5C322A10E13FADE0451263035B7AA26B63AAFA47-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.53.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-55 icu4j.jar icu4j-4_4_2.jar
+	java-pkg_jar-from --into html.validation/external iso-relax iso-relax.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.commons_compress/external commons-compress commons-compress.jar commons-compress-1.8.1.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.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="${D}"/${INSTALL_DIR}/modules
+	pushd "${instdir}" >/dev/null || die
+	rm com-jcraft-jsch.jar && java-pkg_jar-from --into "${instdir}" jsch jsch.jar com-jcraft-jsch.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext
+	pushd "${instdir}" >/dev/null || die
+	rm commons-compress-1.8.1.jar && java-pkg_jar-from --into "${instdir}" commons-compress commons-compress.jar commons-compress-1.8.1.jar
+	# 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 && java-pkg_jar-from --into "${instdir}" icu4j-55 icu4j.jar icu4j-4_4_2.jar
+	rm isorelax.jar && java-pkg_jar-from --into "${instdir}" iso-relax iso-relax.jar isorelax.jar
+	rm json-simple-1.1.1.jar && java-pkg_jar-from --into "${instdir}" json-simple json-simple.jar json-simple-1.1.1.jar
+	rm jvyamlb-0.2.7.jar && java-pkg_jar-from --into "${instdir}" jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
+	rm log4j-1.2.15.jar && java-pkg_jar-from --into "${instdir}" log4j log4j.jar log4j-1.2.15.jar
+	rm lucene-core-3.5.0.jar && java-pkg_jar-from --into "${instdir}" lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
+	rm mysql-connector-java-5.1.23-bin.jar && java-pkg_jar-from --into "${instdir}" jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
+	rm postgresql-9.2-1002.jdbc4.jar && java-pkg_jar-from --into "${instdir}" jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar
+	rm saxon9B.jar && java-pkg_jar-from --into "${instdir}" saxon-9 saxon.jar saxon9B.jar
+	rm servlet-2.2.jar && java-pkg_jar-from --into "${instdir}" tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
+	rm smack.jar && java-pkg_jar-from --into "${instdir}" smack-2.2 smack.jar
+	rm smackx.jar && java-pkg_jar-from --into "${instdir}" smack-2.2 smackx.jar
+	# rm svnjavahl.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl.jar || die
+	rm xerces-2.8.0.jar && java-pkg_jar-from --into "${instdir}" xerces-2 xercesImpl.jar xerces-2.8.0.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxb
+	pushd "${instdir}" >/dev/null || die
+	rm activation.jar && java-pkg_jar-from --into "${instdir}" sun-jaf activation.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxb/api
+	pushd "${instdir}" >/dev/null || die
+	rm jsr173_1.0_api.jar && java-pkg_jar-from --into "${instdir}" jsr173 jsr173.jar jsr173_1.0_api.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ide
+}

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index b507284..8f462b4 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -58,6 +58,7 @@ DIST netbeans-trunk-nightly-201602260002-src.zip 209828915 SHA256 79e707455e36ff
 DIST netbeans-trunk-nightly-201602270002-src.zip 209831963 SHA256 20b41ce3e47c43d3e255e9833fa3f2c3bcd48876ff620c40ed93c878c7abd883 SHA512 980ab79ed39cea631f45d7609b5d3bd8e8310737d7934dbe6a3f93f9c31031d5b38c40370ef6d35898bb7f39eb7a72a00ea1715a77b12678eb5d3a2e2f12a76a WHIRLPOOL f4a058519c51572208225a141a6745583c6ce1019e4d4b2ae994e0b6dd000034e330113decdfc2a6589025e61d11583852e64e121dd42fd833552d35f9ba748a
 DIST netbeans-trunk-nightly-201602280002-src.zip 209832078 SHA256 9db7e895e76748c876558471306afbb5a6af856a8cb391248be4f8d700cb0fc0 SHA512 41bfbb29f4e9760e11336d13908703b13276dac95dd070945963a213969dbdfa844e96340a0ec7e32d721cda3bd11a7f940855a3b1ddccd3d3349b32efcf4c36 WHIRLPOOL e2ca8afcc4a6a1b5a8f19958df6015709542f0d896bd7f9b35fbb7671571732fb1931a5de6e1e0deb21ee86fdecdf2a013ff319d76e1569f8c0ba2b252e959d6
 DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf77015ad8c9ca15c1a54953eec0492be748fde20af0b464700c80f SHA512 56d79deda1cb4624b7136c0028d8786ee5f560aef52f305548654b873232a968b0bd25322c53caa44c61dd0557d177c5725eaed4b6b6e554920e9f5e8b8dcf85 WHIRLPOOL e0bd59c30e04b4a67b7924890f0e377bbb120564a155815b1aa64a28da7f835362e583333240672aeb2b39d63c5c37e2739d4a9e9f25488ce2cfb5ee1e475569
+DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
 EBUILD netbeans-java-8.0.2-r4.ebuild 13298 SHA256 d4172dfdec5afecb1cd099e18a21aa872c7822bff40b192b5f4ec4d35e6e0ef8 SHA512 48ae6f7141117fbf58123ded750d76f2e7311211a6be3b62bd491349817460da11f781ec5694da91584315547c32008f568fac3bfb406dbdb5ed7fd825ff694e WHIRLPOOL 73fb68aec003707c14b2b390c2de80f24e1e5413cf7e16cf7e661af47c908e2d559214580379e45e21d316767987ac906b5a119a61ae39f03c3d01dafad49b7c
 EBUILD netbeans-java-8.1-r2.ebuild 14814 SHA256 1f49212c90fcaa9a6483f19bb60c963520f20aa08c2a509aa19cc7fda12e4564 SHA512 2d6b225f5d32f0ce1801124808b0cc2101f16a703540877c4818be06694742cfa262c3a2e7018761254f9244a7992eb7fe9bc15cdb20f6f4cb83958789c0ef42 WHIRLPOOL 8557163a46ea91a47efec3c272b8a8a0f2acbf9eaa8f6c280d0ddaac6dd8b2185f06716ab12ebf76fb87fe6c05ab1a14bfd281875ebef586f1304d2162e5f2dc
 EBUILD netbeans-java-9999_p20160129.ebuild 14930 SHA256 067f7168197ccce48c3f005ce9709450e7d93ec4141fbc38ecf03f37a935fdf9 SHA512 1975c14bf537b80d6bb93f1a54c4fb3d54fd2988c1ef438ec39a62db8ea4ae004c29b8b108baa0d08bd81cf562881b49da68e2537391a60643e28c39723ca389 WHIRLPOOL 0a8abfde7fb1b0f0d785da0d0ffdb4839a26271b83f53e954d6b5ad465d37aeaeb3a49c546d72885451fb98514416b392ac1b990f84d8189444a68f8ae7222c8
@@ -86,4 +87,5 @@ EBUILD netbeans-java-9999_p20160226.ebuild 14930 SHA256 fc9c476d372a29d8699e21fc
 EBUILD netbeans-java-9999_p20160227.ebuild 14930 SHA256 2438fd3e258d595b01d76a464498a9a98f5b1e65e7cb85f0d52917c86815b6e2 SHA512 2985dc065805e4bd913443385eec8c8996445ca45f428e63c84b27cfb8ddf718d9e1c55c52896bf64bd0da024034da5c8b4ad7be69d190a54ef768bdd2903a79 WHIRLPOOL eecec8658bf855de6acb365b4d78bd8dcca08cdf13ef3fa2d75f748da3994fe113f812d095f6a4a0f2f6d68f1bf17df159813846ab70a9b9bda3cac7d30157e2
 EBUILD netbeans-java-9999_p20160228.ebuild 14930 SHA256 22fa74a31da327b39ae5874bf4f2bdeff14baea8013624d4797c5e1beb061f20 SHA512 85114afca7be5818741429fda4aad80551bae95418b3c1d7e836d8d7c5ef455b4f3682bcfb3e0a216a5165058bddc2de07cb7b20ea30b94a8134625f48a32df9 WHIRLPOOL ffe3fee26d028a908a7b46513d378994eb1b4886c8ed01a23288dfccafec3723c92c62a2dd4021a019e66de04212ad73473c1df1b071a297caa84438119a3960
 EBUILD netbeans-java-9999_p20160229.ebuild 14930 SHA256 d08bbb49f0a99f7d93a1b421c1a01efba287c1d27447e6329b9acbb8c41db1df SHA512 78e4f19cfc202a94bf6b418729424446b22fe9829723f0dda69548976de61b5704a9f337fa58051d8978adeb4f38032e3e3617614e77168f7c1226a521798054 WHIRLPOOL 0ed2df8e72c2cf69a217d239edc3df4eb9723fe1051ea10a2d984317ce537056e6acc13d9798b275ef454ef036d0943dfd31937050ad8826bd53a103fad154cb
+EBUILD netbeans-java-9999_p20160301.ebuild 14930 SHA256 dfd8e964af69f4b18011df7f4935e092ebc5a272345171afcdc7e83a0be674cf SHA512 03769dcf1cc8539e80faaac9fbf22ecd1ef8f9838b7001ff89f8b43c9aa5f5d9531480588df527cfa93146654ffb4e27a463bbe5f97d0b4289124b9b5088667d WHIRLPOOL 07871a6627db1cc93b1afc8760bf6e33d1cccb54611ba675f52ba3df0ef4ab5fc64bafb9e405e8e60deb76ce85b8adaa190a50abc935d00daccd4b4ddb6d9b96
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160301.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160301.ebuild
new file mode 100644
index 0000000..1cb4d04
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20160301.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/2016-03-01_00-02-15/zip/netbeans-trunk-nightly-201603010002-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/839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar
+	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/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar
+	http://hg.netbeans.org/binaries/37781101C4BAF40437CA4D1A16149647B4082F3B-nb-javac-impl.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-2.7.7-r7:0
+	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-1: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}"/839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar maven/external/aether-api-1.0.2.v20150114.jar || 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}"/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
+	ln -s "${DISTDIR}"/37781101C4BAF40437CA4D1A16149647B4082F3B-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="${D}"/${INSTALL_DIR}/maven/lib
+	pushd "${instdir}" >/dev/null || die
+	rm commons-cli-1.2.jar && java-pkg_jar-from --into "${instdir}" commons-cli-1 commons-cli.jar commons-cli-1.2.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext
+	pushd "${instdir}" >/dev/null || die
+	rm AbsoluteLayout.jar  && java-pkg_jar-from --into "${instdir}" absolutelayout absolutelayout.jar AbsoluteLayout.jar
+	rm beansbinding-1.2.1.jar && java-pkg_jar-from --into "${instdir}" beansbinding beansbinding.jar beansbinding-1.2.1.jar
+	rm cglib-2.2.jar && java-pkg_jar-from --into "${instdir}" cglib-3 cglib.jar cglib-2.2.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/hibernate4
+	pushd "${instdir}" >/dev/null || die
+	rm antlr-2.7.7.jar && java-pkg_jar-from --into "${instdir}" antlr antlr.jar antlr-2.7.7.jar
+	rm c3p0-0.9.2.1.jar && java-pkg_jar-from --into "${instdir}" c3p0 c3p0.jar c3p0-0.9.2.1.jar
+	rm cglib-2.2.jar && java-pkg_jar-from --into "${instdir}" cglib-3 cglib.jar cglib-2.2.jar
+	rm commons-collections-3.2.1.jar && java-pkg_jar-from --into "${instdir}" commons-collections commons-collections.jar commons-collections-3.2.1.jar
+	rm dom4j-1.6.1.jar && java-pkg_jar-from --into "${instdir}" dom4j-1 dom4j.jar dom4j-1.6.1.jar
+	rm javassist-3.18.1-GA.jar && java-pkg_jar-from --into "${instdir}" javassist-3 javassist.jar javassist-3.18.1-GA.jar
+	rm jboss-logging-3.1.3.GA.jar && java-pkg_jar-from --into "${instdir}" jboss-logging jboss-logging.jar jboss-logging-3.1.3.GA.jar
+	rm jboss-transaction-api_1.2_spec-1.0.0.Final.jar && java-pkg_jar-from --into "${instdir}" glassfish-transaction-api jta.jar jboss-transaction-api_1.2_spec-1.0.0.Final.jar
+	rm jtidy-r8-20060801.jar && java-pkg_jar-from --into "${instdir}" jtidy jtidy.jar jtidy-r8-20060801.jar
+	rm log4j-1.2.12.jar && java-pkg_jar-from --into "${instdir}" log4j log4j.jar log4j-1.2.12.jar
+	rm slf4j-api-1.6.1.jar && java-pkg_jar-from --into "${instdir}" slf4j-api slf4j-api.jar slf4j-api-1.6.1.jar
+	rm slf4j-log4j12-1.6.1.jar && java-pkg_jar-from --into "${instdir}" slf4j-log4j12 slf4j-log4j12.jar slf4j-log4j12-1.6.1.jar
+	rm slf4j-simple-1.6.1.jar && java-pkg_jar-from --into "${instdir}" slf4j-simple slf4j-simple.jar slf4j-simple-1.6.1.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxws22
+	pushd "${instdir}" >/dev/null || die
+	rm FastInfoset.jar && java-pkg_jar-from --into "${instdir}" fastinfoset fastinfoset.jar FastInfoset.jar
+	rm javax.mail_1.4.jar && java-pkg_jar-from --into "${instdir}" oracle-javamail mail.jar javax.mail_1.4.jar
+	rm mimepull.jar && java-pkg_jar-from --into "${instdir}" mimepull mimepull.jar
+	rm saaj-impl.jar && java-pkg_jar-from --into "${instdir}" saaj saaj.jar saaj-impl.jar
+	rm stax-ex.jar && java-pkg_jar-from --into "${instdir}" stax-ex stax-ex.jar
+	rm stax2-api.jar && java-pkg_jar-from --into "${instdir}" stax2-api stax2-api.jar
+	rm streambuffer.jar && java-pkg_jar-from --into "${instdir}" xmlstreambuffer xmlstreambuffer.jar streambuffer.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxws22/api
+	pushd "${instdir}" >/dev/null || die
+	rm jsr181-api.jar && java-pkg_jar-from --into "${instdir}" jsr181 jsr181.jar jsr181-api.jar
+	rm saaj-api.jar && java-pkg_jar-from --into "${instdir}" jsr67 jsr67.jar saaj-api.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/maven
+	pushd "${instdir}" >/dev/null || die
+	rm jdom-1.0.jar && java-pkg_jar-from --into "${instdir}" jdom jdom.jar jdom-1.0.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java
+}

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index 593f87e..4df80aa 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -32,6 +32,7 @@ DIST netbeans-trunk-nightly-201602260002-src.zip 209828915 SHA256 79e707455e36ff
 DIST netbeans-trunk-nightly-201602270002-src.zip 209831963 SHA256 20b41ce3e47c43d3e255e9833fa3f2c3bcd48876ff620c40ed93c878c7abd883 SHA512 980ab79ed39cea631f45d7609b5d3bd8e8310737d7934dbe6a3f93f9c31031d5b38c40370ef6d35898bb7f39eb7a72a00ea1715a77b12678eb5d3a2e2f12a76a WHIRLPOOL f4a058519c51572208225a141a6745583c6ce1019e4d4b2ae994e0b6dd000034e330113decdfc2a6589025e61d11583852e64e121dd42fd833552d35f9ba748a
 DIST netbeans-trunk-nightly-201602280002-src.zip 209832078 SHA256 9db7e895e76748c876558471306afbb5a6af856a8cb391248be4f8d700cb0fc0 SHA512 41bfbb29f4e9760e11336d13908703b13276dac95dd070945963a213969dbdfa844e96340a0ec7e32d721cda3bd11a7f940855a3b1ddccd3d3349b32efcf4c36 WHIRLPOOL e2ca8afcc4a6a1b5a8f19958df6015709542f0d896bd7f9b35fbb7671571732fb1931a5de6e1e0deb21ee86fdecdf2a013ff319d76e1569f8c0ba2b252e959d6
 DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf77015ad8c9ca15c1a54953eec0492be748fde20af0b464700c80f SHA512 56d79deda1cb4624b7136c0028d8786ee5f560aef52f305548654b873232a968b0bd25322c53caa44c61dd0557d177c5725eaed4b6b6e554920e9f5e8b8dcf85 WHIRLPOOL e0bd59c30e04b4a67b7924890f0e377bbb120564a155815b1aa64a28da7f835362e583333240672aeb2b39d63c5c37e2739d4a9e9f25488ce2cfb5ee1e475569
+DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
 EBUILD netbeans-javacard-8.0.2.ebuild 4906 SHA256 944fee40d693c2c287e748f70ba565f3cd84bb7c19110f8be716134ec20694a7 SHA512 1f66cd2756effbfde7d43f9da7d8d93cb6252c58a02ee3d821f6faeaf63bf3c63e28f80c6eb44689e3aa954452a2f3893c65e75de84158dff1da0d94cafea14a WHIRLPOOL 88197e03008b8acb1ce62f72783bb096d9a3fc2a289b83367841a8adbee2bf822031f9bd6051831515ee44b1d5d2a109c5646f98ca723506f27c874301fb4189
 EBUILD netbeans-javacard-8.1.ebuild 4930 SHA256 5342d0d3f4207da3d36eb19f0fa78015f33b4a6e6435fcf43b7f568afabb9d02 SHA512 5275ae0fd617e26cd8580f6256a766bdd9cc0299f5a488be5a97744ec6abddf262e5fb1db358b9ac00203bbedfe7ac152828b174856d9cf6fa06e1e2128e219b WHIRLPOOL 427bfed5b61a421340acf7ec0cfb5e88a8b4a68cb546b9d0546b7c69ab0e29700d03e2bf58641bde63a2a43579b0521c028cf57dbf25af280fb0732565a30617
 EBUILD netbeans-javacard-9999_p20160129.ebuild 4971 SHA256 210fcdbef8c1124a203608de6cd3396f43469dbf1904aa02901e16cfbe676422 SHA512 b9e992483af23ff78bf131398b00b26d34781000f643632df0f1f24410163a771ca59655970c2fd1ecfd71b3a120015231365c2edc93dfdf0310b7d73e72df6e WHIRLPOOL cb42f24122635a4f6686cfa87a85b5e7c23c0d31636dde12a01c7506ea8410ee557689751631a574fb36eb5674943068cf9371d265cc317ee2577de17cb00b32
@@ -60,4 +61,5 @@ EBUILD netbeans-javacard-9999_p20160226.ebuild 4971 SHA256 e47ba2e3e2ba7b1407b87
 EBUILD netbeans-javacard-9999_p20160227.ebuild 4971 SHA256 ec10c9a4e50173211dd3054814517b9813fd2e51a723fa9a8730ff8c23de7e87 SHA512 1c721c40df05c41006efd060e35b8ae981337b1a8470bc68b03d7a7831529cfd34f40c7291d4090277acb54f3f08abd1339f63746642a8ef9e88f3efd4011a82 WHIRLPOOL c3d97feffde552a9b2a67a3395a67aee56161460ffc1c2fe95331b6fb8e3947822b2ad7a3a2edbc4170f744961330d3c4f3184c2647347fd9da44f008054fb0b
 EBUILD netbeans-javacard-9999_p20160228.ebuild 4971 SHA256 7d637c93ed833b61b41396066da4aa00e58a82962552c313abd6a8522888dee6 SHA512 8d010318839e20cd7c9fe9d772612d3800ae082cea9e717b718ef315356229b2a1d10974dd6c4d692d2b8aedd40c92d9b973bef800d8bbe1c3aa0475753903be WHIRLPOOL b439e9b6968331d4fbed5cb31f095946c5ddb5842525cf87617734c7c62a698c9a7b5231e8bb6f9ac69ef8d0353d8576e41614ba35131950f752e24bfe7b91b9
 EBUILD netbeans-javacard-9999_p20160229.ebuild 4971 SHA256 5b979076158ab82cbe7b8cd478925c1abb8490bed352e18d2a314206c3b6c099 SHA512 f0703f432c0ed74cd3598ad393059682ec5f7932553266e4f959d9f69e4535817a18780c5e9da1e872b4ae48b8f9bc3d45ecc32d73179fd7f95000cc43224a77 WHIRLPOOL 776301820de6974c707a6ab77e7fd2ba92190bd93e4a70b2e05266f98b9145b998b4ba6e3a29b88e71eec65b53170c884056bf0bfd2a16da4a11ccbc43962331
+EBUILD netbeans-javacard-9999_p20160301.ebuild 4971 SHA256 38b2fd0b5d066080657ca0dcf55cf864a2459639de80ab42be9f84a659740364 SHA512 995680bfb4baa747d260ec775773204570e49ec28e1d43124bdb9ca935c807ffa4b64f27d0f9de08df31ceba21a983b3b1fd454802fefaffb271213e6d8b85d3 WHIRLPOOL 7ce1a3cf9c2fcdcf07f8a1940d6c7dc9cf3bbe60a3913c5e1b2a3ac00a769e74a5eea9835d44e559a1d7dc8047e6407ef41942fdfc05ae5abeec9f469b29656c
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160301.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160301.ebuild
new file mode 100644
index 0000000..ae41aae
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160301.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/2016-03-01_00-02-15/zip/netbeans-trunk-nightly-201603010002-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="${D}"/${INSTALL_DIR}/JCDK3.0.2_ConnectedEdition/lib
+	pushd "${instdir}" >/dev/null || die
+	rm ant-contrib-1.0b3.jar && java-pkg_jar-from --into "${instdir}" ant-contrib ant-contrib.jar ant-contrib-1.0b3.jar
+	rm asm-all-3.1.jar && java-pkg_jar-from --into "${instdir}" asm-3 asm.jar asm-all-3.1.jar
+	rm bcel-5.2.jar && java-pkg_jar-from --into "${instdir}" bcel bcel.jar bcel-5.2.jar
+	rm commons-cli-1.0.jar && java-pkg_jar-from --into "${instdir}" commons-cli-1 commons-cli.jar commons-cli-1.0.jar
+	rm commons-codec-1.3.jar && java-pkg_jar-from --into "${instdir}" commons-codec commons-codec.jar commons-codec-1.3.jar
+	rm commons-httpclient-3.0.jar && java-pkg_jar-from --into "${instdir}" commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.0.jar
+	rm commons-logging-1.1.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar commons-logging-1.1.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/javacard
+}

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index c7dadaa..fc09ed6 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201602260002-src.zip 209828915 SHA256 79e707455e36ff
 DIST netbeans-trunk-nightly-201602270002-src.zip 209831963 SHA256 20b41ce3e47c43d3e255e9833fa3f2c3bcd48876ff620c40ed93c878c7abd883 SHA512 980ab79ed39cea631f45d7609b5d3bd8e8310737d7934dbe6a3f93f9c31031d5b38c40370ef6d35898bb7f39eb7a72a00ea1715a77b12678eb5d3a2e2f12a76a WHIRLPOOL f4a058519c51572208225a141a6745583c6ce1019e4d4b2ae994e0b6dd000034e330113decdfc2a6589025e61d11583852e64e121dd42fd833552d35f9ba748a
 DIST netbeans-trunk-nightly-201602280002-src.zip 209832078 SHA256 9db7e895e76748c876558471306afbb5a6af856a8cb391248be4f8d700cb0fc0 SHA512 41bfbb29f4e9760e11336d13908703b13276dac95dd070945963a213969dbdfa844e96340a0ec7e32d721cda3bd11a7f940855a3b1ddccd3d3349b32efcf4c36 WHIRLPOOL e2ca8afcc4a6a1b5a8f19958df6015709542f0d896bd7f9b35fbb7671571732fb1931a5de6e1e0deb21ee86fdecdf2a013ff319d76e1569f8c0ba2b252e959d6
 DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf77015ad8c9ca15c1a54953eec0492be748fde20af0b464700c80f SHA512 56d79deda1cb4624b7136c0028d8786ee5f560aef52f305548654b873232a968b0bd25322c53caa44c61dd0557d177c5725eaed4b6b6e554920e9f5e8b8dcf85 WHIRLPOOL e0bd59c30e04b4a67b7924890f0e377bbb120564a155815b1aa64a28da7f835362e583333240672aeb2b39d63c5c37e2739d4a9e9f25488ce2cfb5ee1e475569
+DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
 EBUILD netbeans-javadoc-8.0.2.ebuild 5993 SHA256 baf9da38d87b86eb8ed10ef46017361f36ca8583dd90885c9d1667a51851bc52 SHA512 892bc25b30dc26e3ee7c8be9aaf8542c00a7fa1d1d8f883d82bebb816edfa93e1ee9abeac1b0c47ecc8b4169bcaded56c5c71f18151fdc22fe241fcee0fd4521 WHIRLPOOL 2012f28f3ba5074b4d262b20e9a1c8ddf590ce444339ec1a404c890867c1271e38f9f9e09717d0648fae061553f5c8da3d97a70c35c8e853fe4894fb6fd4ec96
 EBUILD netbeans-javadoc-8.1.ebuild 6247 SHA256 5f0ab01cbea85353ac471a46e341750785f4889732c9da111d77b87bbd1bcc2d SHA512 4a4636f4f58a9baba9d9f5bac4ee7d4f57c0e07d6790902d34974383660f2926c4c4b16a27bacc2a3a7a0a6d5b7699caae90bb2ac513ac8e0535e46d11ec345e WHIRLPOOL 9cbac0234b9f1a8122df116512d5154b7e85561fd9541e0a77dc5c2b5863cf3238400ac17d05499e950705309faa97caace6da00c912ea07d6a74b0076f683ed
 EBUILD netbeans-javadoc-9999_p20160129.ebuild 6293 SHA256 d60cd6e35e3a86f772f1b4ea7bb0fd329dd6eb4d903143c77d2470e3eed42d49 SHA512 11b191aa53331558c1d992b993214ca716e15d9e8753ee109508878dea9979baa024011733bd0091848ecc3aadf46e437a75c006e488f4724c232e72c5373f34 WHIRLPOOL 32ea16e15282396e8657b9a0410ad669d2a8d2afa684928e81ef90774b97e40078882bf2066ac9e4cdf4880c83c479dbe47bf26b102846b97d2a79fd00abc643
@@ -58,4 +59,5 @@ EBUILD netbeans-javadoc-9999_p20160226.ebuild 6293 SHA256 44dccd18e1094dd3bd7f93
 EBUILD netbeans-javadoc-9999_p20160227.ebuild 6293 SHA256 302140bcff4d2bcbeb2103cec340fe2ddc1b6e451844420a60b9efd4ef4af322 SHA512 e8ce4e814b0b3631e86e0603c0f40503934450212c02a6be2a31707cd609cd76d220ca69ed6fd32f41de746c4dc85407a527f6808583de683ad00abdb10335fa WHIRLPOOL 49a69a018363fafcb96bcab5dddea9c25e8720469cc5a30b419d41db8db757c70600c813a3ea3980615ce7f68da581b7c245babefc617d874af46543b9e82f83
 EBUILD netbeans-javadoc-9999_p20160228.ebuild 6293 SHA256 fadc8066a7863dfd365f84d05bb57f7cd1ac747dfd7dabf777cf833ccd0f5b9a SHA512 04e4ebc0f1102e0b84c2ffa4c73e6f409a891fd343c8b3b4fb8569b390c3874bc3f9fccbcc1f6d39a051a8ce6bdffb28f2c173253047f9b12b3e200db75e9611 WHIRLPOOL 3055249fc7feea4499846fb4738f4210180f1df16f9e146bd0826f988976b2154c9e664e81b59ef575ecba33f42c56aa8f68a9b7f6623b754f816b3fee538382
 EBUILD netbeans-javadoc-9999_p20160229.ebuild 6293 SHA256 b5fefe45bf0c0b0afdca35451b0d688aa540741071d1d258974d3337d1f2a37d SHA512 db5ec2f49ce245a3a7dc0f987abb4efe6ddd102731d67549b4a56e5eb3b85f255db529785954492bc50a796cf5272d70c26516398b978731eb61c3ec255d6801 WHIRLPOOL 3f328708209667b6abe0d72542acb330a199c0044de34bc45a19ea8f93dae2e7902932896723375bb6626d30afbb31bfb7ca1a37b630c33b0cbe2e91b5a4ac48
+EBUILD netbeans-javadoc-9999_p20160301.ebuild 6293 SHA256 02706fcb70b5981a1a9862c07086958512e3b7b3efcd63bd2b6c1e53750da2fb SHA512 32110531136e3ae855e53deba7de06cb1bc94162c0feb2da1c3464fed6b1a2bc11483aaca25cac5eed7dfaf269ae832bb888be55e54d3734dd51cf0bcefb5adb WHIRLPOOL 6e798a7b90802c29f8a2fdecc1f5692880b63c6a19b1392ec06e840fd155afdfe8e0abfe4d5a4d647922f89d0e911165d3622f93847516bcc51ee9e2c3571c98
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160301.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160301.ebuild
new file mode 100644
index 0000000..8f5d683
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160301.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/2016-03-01_00-02-15/zip/netbeans-trunk-nightly-201603010002-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 of javafx which is not currently packaged separately
+DEPEND="dev-java/oracle-jdk-bin:1.8[javafx]
+	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.8"
+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 -Dpermit.jdk8.builds=true -f nbbuild/build.xml bootstrap || die
+	ANT_OPTS="-Xmx1536m" eant -Dpermit.jdk8.builds=true -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/Manifest b/dev-java/netbeans-javafx/Manifest
index e769025..6d78e9f 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -37,6 +37,7 @@ DIST netbeans-trunk-nightly-201602260002-src.zip 209828915 SHA256 79e707455e36ff
 DIST netbeans-trunk-nightly-201602270002-src.zip 209831963 SHA256 20b41ce3e47c43d3e255e9833fa3f2c3bcd48876ff620c40ed93c878c7abd883 SHA512 980ab79ed39cea631f45d7609b5d3bd8e8310737d7934dbe6a3f93f9c31031d5b38c40370ef6d35898bb7f39eb7a72a00ea1715a77b12678eb5d3a2e2f12a76a WHIRLPOOL f4a058519c51572208225a141a6745583c6ce1019e4d4b2ae994e0b6dd000034e330113decdfc2a6589025e61d11583852e64e121dd42fd833552d35f9ba748a
 DIST netbeans-trunk-nightly-201602280002-src.zip 209832078 SHA256 9db7e895e76748c876558471306afbb5a6af856a8cb391248be4f8d700cb0fc0 SHA512 41bfbb29f4e9760e11336d13908703b13276dac95dd070945963a213969dbdfa844e96340a0ec7e32d721cda3bd11a7f940855a3b1ddccd3d3349b32efcf4c36 WHIRLPOOL e2ca8afcc4a6a1b5a8f19958df6015709542f0d896bd7f9b35fbb7671571732fb1931a5de6e1e0deb21ee86fdecdf2a013ff319d76e1569f8c0ba2b252e959d6
 DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf77015ad8c9ca15c1a54953eec0492be748fde20af0b464700c80f SHA512 56d79deda1cb4624b7136c0028d8786ee5f560aef52f305548654b873232a968b0bd25322c53caa44c61dd0557d177c5725eaed4b6b6e554920e9f5e8b8dcf85 WHIRLPOOL e0bd59c30e04b4a67b7924890f0e377bbb120564a155815b1aa64a28da7f835362e583333240672aeb2b39d63c5c37e2739d4a9e9f25488ce2cfb5ee1e475569
+DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
 EBUILD netbeans-javafx-8.0.2.ebuild 4647 SHA256 15e5e0b1c4729852dd55e5bfb2dcb520ba7c959bd9927d315c0abcb3f94e4ecc SHA512 520c60264fee67b0ccfd50ced0cc8586d5653d5186fa75c6b7cd8b400aae834de446b7e6145ad38df7e68207391fb360ef4834140e096d48add568fed387ac98 WHIRLPOOL 416a56ceb2ba85e3923ada0c8ef485cdd6fa16b3423b8fd0de523fa54dd082cbaedee5da4f1a92b50e440195f9256376f50e99a850d70ccdcb8c0ff370007f7c
 EBUILD netbeans-javafx-8.1.ebuild 4671 SHA256 2a12bebaca0ddbb03b84c33de7f5933f76a8381db3c40013fc4014687ded6cd4 SHA512 ff410f96e808c414e3e9485461866239080098e46e843ee771a78a0afffddc1c776697dccb276daf7f87dadf915a212bfe9c2a07b3a8a9057cb3ea19b77163fb WHIRLPOOL 51729142255a16d4cd949d4bf5f3b681d36bc83f30dad39aad9d1dd56f7dcec0dae4377817350e7947d518129a74eec7f227c3cb1600ac168ea90d056b87d195
 EBUILD netbeans-javafx-9999_p20160129.ebuild 4717 SHA256 977b401552e3ff424a6256a98de6dce278f3e5bc0d96111998ac46159aed79c6 SHA512 d12821bbe6bbe7835b9ce4b043b7d31993d66b040bf694bd9f2695e46716701614a2d4fcbdfaac8d2f4f13d154e988c08861244b3445cf498ea0691355ca32fa WHIRLPOOL 75d0353b0a8cfeef8c0aa8dd3190d3499a86b56550b9e13ea751cc7742e88c8592ea34158609b667dc4e1c3940e0c8c0c21cc96e115e8e3357fb88d89cd3051d
@@ -65,4 +66,5 @@ EBUILD netbeans-javafx-9999_p20160226.ebuild 4717 SHA256 65d06a481db89dc3734e1e0
 EBUILD netbeans-javafx-9999_p20160227.ebuild 4717 SHA256 dcaf0583089f0a9d0f887271226485c8f7c1c0149321fb7c93514929cd28fbfe SHA512 5e57c120b0d0faeb4a24c90f3cb8a3e1aa9b36124c1b4d38efadfa24c8a0115f99be701cf38cb1496178f4f2993915be192b10bf10c6e16e747f9ed84de85465 WHIRLPOOL ad848a3ffe376c7ad2e365d8a2b6a57b3090b22cfd5f67cccfdbdd260d39f43115701ece8d24c2088c5744e6c93d86289b056391a0bab7a4c682acf5661a5be8
 EBUILD netbeans-javafx-9999_p20160228.ebuild 4717 SHA256 a404421c29b60f801004496d00ee18e2ae539ace60c703cfa03e96cd29c3d69d SHA512 c6ca4d5d4a03b41c7e95d6e6f0558914661f002eee0cd875d38abb423d3e4b7c79184c04392d9048fa9c80c641bec14fd103415793cb55167525dcab2fc669b4 WHIRLPOOL 089f7d269e373b378f06fc9b80e8aa2e2c2a10516e12eba718a9b45f1196c1f2a7b754d4a844706ac198a45697c4654898d129e3ca826dac295a44da26cad7c1
 EBUILD netbeans-javafx-9999_p20160229.ebuild 4717 SHA256 8b5d9fecbdd2add9731cc48c9b394aa691dbae12bf56673d2685787560c5e9fb SHA512 a47fb9a4790c6fd6879697c3aeb1e491d6e762f8df1062e4d5d68392ce8e15ad5e1714a85ee584bc2bffba448ea04c6810e55ecfca57a81960e66519e0cfba7d WHIRLPOOL c9a8f2596a343c073386d19627290104561fb3c0daa1bd60082a43fbaa3d20f89240139ae70887a89ca5cc743a43e6884eb9772ed4806776b55919cdca27ebc3
+EBUILD netbeans-javafx-9999_p20160301.ebuild 4717 SHA256 a5316aefe4568fb967458b842cc383c5650e99f1accc07c06489f169abab5d07 SHA512 70cfd52efdd0dfceba0b70b4a217bbeedb534f7de0ae73411cdce3f760fdb981531bc9dac3db17ac6ff1adc2638705d6990dd87582551b04582731d42375ff2d WHIRLPOOL bada5a1667b69e1793a0f3ffd324e9aad52b32fdfa41d9c9301ac034cc24c832f05523a8f8033f37afee867d3190bff4162765642e724249cf40a90d3a27479e
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160301.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160301.ebuild
new file mode 100644
index 0000000..15cc6b2
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160301.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/2016-03-01_00-02-15/zip/netbeans-trunk-nightly-201603010002-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/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-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}"/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-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/Manifest b/dev-java/netbeans-mobility/Manifest
index 6f3402d..0ae184f 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201602260002-src.zip 209828915 SHA256 79e707455e36ff
 DIST netbeans-trunk-nightly-201602270002-src.zip 209831963 SHA256 20b41ce3e47c43d3e255e9833fa3f2c3bcd48876ff620c40ed93c878c7abd883 SHA512 980ab79ed39cea631f45d7609b5d3bd8e8310737d7934dbe6a3f93f9c31031d5b38c40370ef6d35898bb7f39eb7a72a00ea1715a77b12678eb5d3a2e2f12a76a WHIRLPOOL f4a058519c51572208225a141a6745583c6ce1019e4d4b2ae994e0b6dd000034e330113decdfc2a6589025e61d11583852e64e121dd42fd833552d35f9ba748a
 DIST netbeans-trunk-nightly-201602280002-src.zip 209832078 SHA256 9db7e895e76748c876558471306afbb5a6af856a8cb391248be4f8d700cb0fc0 SHA512 41bfbb29f4e9760e11336d13908703b13276dac95dd070945963a213969dbdfa844e96340a0ec7e32d721cda3bd11a7f940855a3b1ddccd3d3349b32efcf4c36 WHIRLPOOL e2ca8afcc4a6a1b5a8f19958df6015709542f0d896bd7f9b35fbb7671571732fb1931a5de6e1e0deb21ee86fdecdf2a013ff319d76e1569f8c0ba2b252e959d6
 DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf77015ad8c9ca15c1a54953eec0492be748fde20af0b464700c80f SHA512 56d79deda1cb4624b7136c0028d8786ee5f560aef52f305548654b873232a968b0bd25322c53caa44c61dd0557d177c5725eaed4b6b6e554920e9f5e8b8dcf85 WHIRLPOOL e0bd59c30e04b4a67b7924890f0e377bbb120564a155815b1aa64a28da7f835362e583333240672aeb2b39d63c5c37e2739d4a9e9f25488ce2cfb5ee1e475569
+DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
 EBUILD netbeans-mobility-8.0.2.ebuild 4342 SHA256 e9b4ff8fe38904346bc21a82219696e97322bf9df4e9d4cad2259b6f08bbe7f9 SHA512 338711fe61c469cee80e499ddf8c3ad70a3a38e6658311afcd1d24edd1a99b87566fafcbd392bb958b589796e0913d2574b07570870c8d3382a91a324227082f WHIRLPOOL 855b2817c36bea67c8fb368a0740be18b71dbebb2b98a154552f002a56eaff34f54eee2698379d7200a6042c1de699df23e7717b5b6c532776852d8757b74cb0
 EBUILD netbeans-mobility-8.1.ebuild 4366 SHA256 fe10d103a284b8f82b67179ea52d51d57b43cfc4a4084b97e3f9650526621497 SHA512 36bdf0948b41bfe4f9c66fe093030d5f27b90f5a89be94dfbd176e3887b249d5aa3eb9b0924df142291f0d693f274eef840ed3a7f658106847327befd0374710 WHIRLPOOL f9dd44e6401367b2df73c5f1428bff53547ac012068297667666d0241c29310aed4413a368e5350a996af37ad026e875325467b1a165cba6953d99a5da3a0d76
 EBUILD netbeans-mobility-9999_p20160129.ebuild 4412 SHA256 cc73307539e6630196425bbdc2f019ade2f35351458b73d051505132d201a74d SHA512 da8fcde42d65d34f77f8c8d5c51ef616d735b2fd5386bf91bcbdd190b8b9cd35093b95bb550ecc58dd0222c31fce69b52f5cbb244cc016c1ec0eb304723ac2d6 WHIRLPOOL 3c2262b85d9f92b8f93b84e4de621aa50cf991dbcd6f112c5911812589e9d4e48b0f8b696a5b981453451e05c216a9fd3a83757c27d0b385fc130be1d6243207
@@ -57,4 +58,5 @@ EBUILD netbeans-mobility-9999_p20160226.ebuild 4412 SHA256 bbec2e6c2e650d2fc08f5
 EBUILD netbeans-mobility-9999_p20160227.ebuild 4412 SHA256 58ce32ee3c6e8e0a907e159515b584f2be6533b97709b35895c6dfeefc9dae8f SHA512 e15addc7bee2138ff2063ced6c9b5678e9608e1cb278fa0003638f7c8effe15f7751cbc25d4111122b437d91e91ea7b297397384b2c25a500b823ab61f47fcc6 WHIRLPOOL a5647b8a32b231c474d1b67cf06917ae483317c2f56ef880544571c122b6626c1fd6ca56d76b9dc0feb6ac423ebfd3e948f3389a4983becaf7dd2e9a2acd70c6
 EBUILD netbeans-mobility-9999_p20160228.ebuild 4412 SHA256 a5050d8a8822caef1f0bbea40fa95c36d96bdfb4b591ed3a857f32d6884ee136 SHA512 3543fc6a6100e917e072138b1431e3836b3d07549a1528c2151b4f24582eff3987eeae09e0896c92f855c6f28c828c3b42e309ff84de72af91cd4d886862a7e5 WHIRLPOOL 9a1c12bf864ae69cffc1703ed14057ee3d6d6897ea5bf7c874245b65db3fb3bb31409f932ed82c1eb6180a9b0dcbbd3d6ac977d5621be665440d4f05ed86b378
 EBUILD netbeans-mobility-9999_p20160229.ebuild 4412 SHA256 c2c5d930e198b3ce95fa0a33324c4e45221e5875dee06fcd09bed779b738e79b SHA512 2e294c66578cbc8f99216338a06b7b3b5adf0bbe5ce8431ace989c5569f54047997e242041e476c4ef9db1b2b67117bf8cb2f9a98c8ed59d9052c4f1a6c931db WHIRLPOOL 274ce754ce8a48442e0d31b1f017396becfb424f33ded9b2deaac1e6888bd7e80e413c094b792ea834098d5f2afd122ee987ac1471555b16ebaa378370b570bf
+EBUILD netbeans-mobility-9999_p20160301.ebuild 4412 SHA256 ee5b93428590409d0512334645285aac845973ae391ecb4ddbcbd8f269122793 SHA512 078fd31b8be1245c32d2fa614c5e436cf865aa5eefd791c3ede91e01474c0efb8b19a4123be3f7fd3df5410341c4b608f6f0aaf6e1b297852a443dc5855ee2d9 WHIRLPOOL 05156331306daa211f0f2a55199eb59a9957614b1dbbd08ca43aeb25e6a6511ad69245c0f1dbbd75a6c7f26d78de058b38260f53a5e9157fe68ed4d06154a341
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160301.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160301.ebuild
new file mode 100644
index 0000000..1bdb61c
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160301.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/2016-03-01_00-02-15/zip/netbeans-trunk-nightly-201603010002-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/Manifest b/dev-java/netbeans-nb/Manifest
index 961ffb5..0b8a372 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -32,6 +32,7 @@ DIST netbeans-trunk-nightly-201602260002-src.zip 209828915 SHA256 79e707455e36ff
 DIST netbeans-trunk-nightly-201602270002-src.zip 209831963 SHA256 20b41ce3e47c43d3e255e9833fa3f2c3bcd48876ff620c40ed93c878c7abd883 SHA512 980ab79ed39cea631f45d7609b5d3bd8e8310737d7934dbe6a3f93f9c31031d5b38c40370ef6d35898bb7f39eb7a72a00ea1715a77b12678eb5d3a2e2f12a76a WHIRLPOOL f4a058519c51572208225a141a6745583c6ce1019e4d4b2ae994e0b6dd000034e330113decdfc2a6589025e61d11583852e64e121dd42fd833552d35f9ba748a
 DIST netbeans-trunk-nightly-201602280002-src.zip 209832078 SHA256 9db7e895e76748c876558471306afbb5a6af856a8cb391248be4f8d700cb0fc0 SHA512 41bfbb29f4e9760e11336d13908703b13276dac95dd070945963a213969dbdfa844e96340a0ec7e32d721cda3bd11a7f940855a3b1ddccd3d3349b32efcf4c36 WHIRLPOOL e2ca8afcc4a6a1b5a8f19958df6015709542f0d896bd7f9b35fbb7671571732fb1931a5de6e1e0deb21ee86fdecdf2a013ff319d76e1569f8c0ba2b252e959d6
 DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf77015ad8c9ca15c1a54953eec0492be748fde20af0b464700c80f SHA512 56d79deda1cb4624b7136c0028d8786ee5f560aef52f305548654b873232a968b0bd25322c53caa44c61dd0557d177c5725eaed4b6b6e554920e9f5e8b8dcf85 WHIRLPOOL e0bd59c30e04b4a67b7924890f0e377bbb120564a155815b1aa64a28da7f835362e583333240672aeb2b39d63c5c37e2739d4a9e9f25488ce2cfb5ee1e475569
+DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
 EBUILD netbeans-nb-8.0.2.ebuild 4927 SHA256 7531e50c4d76608bf925efdba4f54f522de3a8ceeef4d48807fb4ee48bfabdf6 SHA512 925734f331cf228066c5c9e614f48b756af31cac8b559cfe756347b6a2cb0ce362c7c41489a25084f2ed3f2e415baefd148a54f39fc00269fb14179efe056cb9 WHIRLPOOL e3224c5f22bb8e4792a5f98bbe819e071ff18c99533ce05a3fc1c5898ddcca1e3ce34487ba78159bb4d60155acdf15ae4fe81189ff2d5b1bc77ffd9ee4e20aca
 EBUILD netbeans-nb-8.1.ebuild 4065 SHA256 c1bfd704ecaa1fd62b149114b7391b4633a90a8a1d87645b833731920aa6efbb SHA512 56bda99c3d05522d5becb032177e4b4411d862d18a069e2d4343ddc8b08d05ed6c3199588e28aece7e583ccc9f95517621780a246bdd65c7d3edf072a61ef1cb WHIRLPOOL b9a43e6b4ada929bcf2aaed0bffe9cdfe0b9dbbf001e8ee4f2ab3cf8a08e27d318ea435d0580c80fd23cf921d261ca9b54d54a2b2e7a53173f955bde03aa0a12
 EBUILD netbeans-nb-9999_p20160129.ebuild 4111 SHA256 03eb8e599d256249d56bdbc2d4dc7ef83b1b36a1e8a147325c10b0758e5aa9e5 SHA512 7c1197c621c83695eb195e0ed840dcd64e89bbc0cc3e647a723af761d3558a32e9b878a99349022511902ee22b20442cc13f396656c411da0a13f2b1ba8b2146 WHIRLPOOL e99fea179c269515d6dad75f20d57e99232057833edc3cf95f57afe08ea05c68c073fc410744171b389a8d331521365edd189826b17c843718c487e98e46374e
@@ -60,4 +61,5 @@ EBUILD netbeans-nb-9999_p20160226.ebuild 4111 SHA256 459b48abe12e8b6aa8270805cd4
 EBUILD netbeans-nb-9999_p20160227.ebuild 4111 SHA256 296a708ea143d5a8bd89e37de45354d50ab910f6d473ef2080aa91716e501c98 SHA512 059ded1e6e0a0598d2b4d6a2b026ec327533820c6b22715af0e34d10db6eeda6af7cb4ac0e015ef674422db7ca0e581a6fad449e8eea0bb6e8cd33ac8dcd4619 WHIRLPOOL b37d95987b158dc6440e13d2e654e3b409bf9496e4ba52972ab13d3de91125b190ac287f24dd9155bd34fe84af73a4c6a1f30831b015ad9c86c9b142aedbb784
 EBUILD netbeans-nb-9999_p20160228.ebuild 4111 SHA256 6dfa77fa2deb2866c732f3c78a5593c6f8b84675c12d25056b440929e5f34226 SHA512 4efb1b78c63b1d6b43e1deb85e3b6de9ffe7e20a8ace4016119bd6a74b7aa378d7aaa80fefb4a515fde13c977bfcf140c70b19f63accc54154b98b86b67c148d WHIRLPOOL 63ed904d7db3f534b8727d5c74bfb5ce8a12a7afeb6ceb79abd4c735b14fe7eed18164d9885bc68ebe95fce4a2b0289794ba9329d88f36488a4c601e026c4bed
 EBUILD netbeans-nb-9999_p20160229.ebuild 4111 SHA256 b29764da4d9dd43e4b56c31379604756f8b7e37b4bb900dc6bb295285c39a5a3 SHA512 8bdff64a431f2095d1fc414f239d4f99f1843eea46d752904f444dadf942bf5df9b7341483f2e8123510e0d52ba9d9c2da9b298eebfa00bc224d0f0dfe86be8b WHIRLPOOL f1582f1bee9fc4a68ecbac8d83766fda9524e62351aca18dc14239c068320d5e499a6ea6601a0b5ba0c9fc5f5bf624593ef15eed06ae1ddc55f5e0439b92c6a6
+EBUILD netbeans-nb-9999_p20160301.ebuild 4111 SHA256 20da83bbd1ccd58874f3408b88f1887b49f3761731daa79f19c01b14c542b962 SHA512 80e2f7a685367b6b5af3b3173b727f20dadc293ea08e071ce9cec8213df1a58c58deb8ad24b388680a9ab34cb28d8e0414e89bb1fbddbe31966a84aafa5abb4e WHIRLPOOL 2dbfa48747b56e60ad5a926540aaa69f204399d1cb54e473f9954da7d9581a53d2e79fc0d0660363c49a5641947499f09ce18eecff035b2d08e2a82286e92d69
 MISC metadata.xml 392 SHA256 01cdbcc83099b97486bd7b8e813e5b19c1138eb0d8d3e8a5683aafd579820435 SHA512 4d2f9160baa022d6a48b61d5f42e71cfd411d244e7a36436629bc5ee4036e4ce19079134d9a6c704ebe942306c2e0199d0591c1e54f92f8f3c8835147e639246 WHIRLPOOL c1131764e1cec66c56b977ebe36014b29e5a68e35ccc326c0cbadd050a6c625cf191c85c212e0a733661c008dab0d99f9a4cdc4c4ae0cc9d775ba1de554795a9

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160301.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160301.ebuild
new file mode 100644
index 0000000..8ce1336
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20160301.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/2016-03-01_00-02-15/zip/netbeans-trunk-nightly-201603010002-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=""
+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}"
+
+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
+
+	# 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
+}

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index 84c25f3..4e58123 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201602260002-src.zip 209828915 SHA256 79e707455e36ff
 DIST netbeans-trunk-nightly-201602270002-src.zip 209831963 SHA256 20b41ce3e47c43d3e255e9833fa3f2c3bcd48876ff620c40ed93c878c7abd883 SHA512 980ab79ed39cea631f45d7609b5d3bd8e8310737d7934dbe6a3f93f9c31031d5b38c40370ef6d35898bb7f39eb7a72a00ea1715a77b12678eb5d3a2e2f12a76a WHIRLPOOL f4a058519c51572208225a141a6745583c6ce1019e4d4b2ae994e0b6dd000034e330113decdfc2a6589025e61d11583852e64e121dd42fd833552d35f9ba748a
 DIST netbeans-trunk-nightly-201602280002-src.zip 209832078 SHA256 9db7e895e76748c876558471306afbb5a6af856a8cb391248be4f8d700cb0fc0 SHA512 41bfbb29f4e9760e11336d13908703b13276dac95dd070945963a213969dbdfa844e96340a0ec7e32d721cda3bd11a7f940855a3b1ddccd3d3349b32efcf4c36 WHIRLPOOL e2ca8afcc4a6a1b5a8f19958df6015709542f0d896bd7f9b35fbb7671571732fb1931a5de6e1e0deb21ee86fdecdf2a013ff319d76e1569f8c0ba2b252e959d6
 DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf77015ad8c9ca15c1a54953eec0492be748fde20af0b464700c80f SHA512 56d79deda1cb4624b7136c0028d8786ee5f560aef52f305548654b873232a968b0bd25322c53caa44c61dd0557d177c5725eaed4b6b6e554920e9f5e8b8dcf85 WHIRLPOOL e0bd59c30e04b4a67b7924890f0e377bbb120564a155815b1aa64a28da7f835362e583333240672aeb2b39d63c5c37e2739d4a9e9f25488ce2cfb5ee1e475569
+DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
 EBUILD netbeans-php-8.0.2.ebuild 4347 SHA256 585b2488d748f3d0f87c17c951870e167aac7bf10847428add786e4a8a446583 SHA512 1431305d4f340cb0a2c7c896c54d45f6f02ef82a4201f82053278b98511a5a4a68210317530e9cdf5cf1f495996d3a3f9c4b2c3c479aa407abd375072ab3182f WHIRLPOOL af8476f2ff2d119f2657e6be03cfea1160f86e41bd791f40609f1bc8a8aada46ba1081e4f2417b0fddde931fa4e43d20956c0fe1d4fdf3617b78d01afd23f9b4
 EBUILD netbeans-php-8.1.ebuild 4371 SHA256 a9e7565a8cbcc5dfca4d9449f43b959911c47ad8da59648e383ecce55c4b0064 SHA512 67d43532ea43abf007adce73e7da2345d9cc42229189ba90d254d7764e19e3fd3c86b990ea2fe08cf52e49422def481046fe6e0e447fdc1de1680ac59f51d9d3 WHIRLPOOL 433275570fd81db477180e58909ebd50b83cde03bd5df807cc9ee213e2f3a44f65f3ec4877851aa6322e7752969aa72313ee7b35b8ee07446e8c22be4321d536
 EBUILD netbeans-php-9999_p20160129.ebuild 4418 SHA256 302d16d9851c39f872be18301dd10b74a015a13088ba754828e93a0735556144 SHA512 fc9dc6b3f043ea1407c6c054839926ff56b6894f1627c227abaaa3f26a8c7a4d139ffc65fbfd2739e5733aef6fbdf03b45e96fae6abdffa760f332b4b5026d3b WHIRLPOOL e1802f2521f4c5b3a4f6c437d67d99ecfd306156acabce996e9eb8f1e7e7ff0878f08c92e527902601bc2ede5ee30e8a8d9f43e2dd3b73705e257b87fe9229ef
@@ -61,4 +62,5 @@ EBUILD netbeans-php-9999_p20160226.ebuild 4418 SHA256 0b7f0264c328f605a440d95a92
 EBUILD netbeans-php-9999_p20160227.ebuild 4418 SHA256 fa28d7dc3c37bd2611c46bca589b09c61b784ec32337aa89354de0e63a88a7c0 SHA512 639c89ab60a0db8e38624258196ee418e0dc78eea853ca1239bdb8576a04902c77c0f10e5b0a641fbcfa900f65f6075e07c5fa2cdca56570855a8af0b754f712 WHIRLPOOL ce863b2c2559b6f217ea9cc9d2edc3c2120e36db301c8fe8ef393bfc4b620ee0b81b37fdca311875df01c2473cf0215b699a47c2baf2e19d0c8a7f9a107c1ad4
 EBUILD netbeans-php-9999_p20160228.ebuild 4418 SHA256 663133eab5f1f34f379804cbc7b50a7fa082d78ef44ebdffeac8f4e0814e1d75 SHA512 a90ab524efdd7292000b389ff40075843a7be9ff1eee226ead2dd2be96174481922405a7939b6741ab82ced4a7b93d6ffa8b32fa1e591fae0accecc0a87db515 WHIRLPOOL ec45144cafe63152ac712148c6bcd5fccec68383d35641132bff612a31a732501bea6bb592c7425581903fbe1d59f0ea84b4870d91508c48d403b6d71c8f933d
 EBUILD netbeans-php-9999_p20160229.ebuild 4418 SHA256 10ca3643744a20215b8a798fee2e2272e6c0661ba9e49a936a2be013c036e2ec SHA512 ef06a8cb5300a405b257071fb8e274df1311becce2739c98ed1d8e32cef18f5d6cdcbbdc4bd1ca6bf2f9527a9699919b47e265768383c692e9c0b13125c7dff6 WHIRLPOOL b28e54548217b9f4360341ea9039d0e59857ead2f538110ff6d74c6c231c8eef568792185315c6495430f420512c9ffeaaa912f454c82d56d30a02337bb4db5c
+EBUILD netbeans-php-9999_p20160301.ebuild 4418 SHA256 ab37f6d8a2875857293d07e99fe3782cc2836e4f167026c33cd77b554aa1b1d2 SHA512 42cc1fc8fc64a17e121fcf6fe444dc4c2f7237a41b419cf89ac5e2d0ea27ab96323d0868d730e2244bdeac9e1dbb0f60e50e2d804f5742e61bc13133da9cbc78 WHIRLPOOL 7c108704dc0e817fcc3cf5ec29a967f42b0f14fe39e36d1598e6ab4eea0107c5518c09b1768b66d1f076cd675b752925d536ea4699e18327fb274f6f88c0418d
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160301.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160301.ebuild
new file mode 100644
index 0000000..ac9975e
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20160301.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/2016-03-01_00-02-15/zip/netbeans-trunk-nightly-201603010002-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/73E9BC8A7AF36E0C95210F61A85AFEF212AEE1A9-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}"/73E9BC8A7AF36E0C95210F61A85AFEF212AEE1A9-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="${D}"/${INSTALL_DIR}/modules/ext
+	pushd "${instdir}" >/dev/null || die
+	rm java-cup-11a.jar && java-pkg_jar-from --into "${instdir}" javacup javacup.jar java-cup-11a.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/php
+}

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index f00ffa1..f83c9ec 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -46,6 +46,7 @@ DIST netbeans-trunk-nightly-201602260002-src.zip 209828915 SHA256 79e707455e36ff
 DIST netbeans-trunk-nightly-201602270002-src.zip 209831963 SHA256 20b41ce3e47c43d3e255e9833fa3f2c3bcd48876ff620c40ed93c878c7abd883 SHA512 980ab79ed39cea631f45d7609b5d3bd8e8310737d7934dbe6a3f93f9c31031d5b38c40370ef6d35898bb7f39eb7a72a00ea1715a77b12678eb5d3a2e2f12a76a WHIRLPOOL f4a058519c51572208225a141a6745583c6ce1019e4d4b2ae994e0b6dd000034e330113decdfc2a6589025e61d11583852e64e121dd42fd833552d35f9ba748a
 DIST netbeans-trunk-nightly-201602280002-src.zip 209832078 SHA256 9db7e895e76748c876558471306afbb5a6af856a8cb391248be4f8d700cb0fc0 SHA512 41bfbb29f4e9760e11336d13908703b13276dac95dd070945963a213969dbdfa844e96340a0ec7e32d721cda3bd11a7f940855a3b1ddccd3d3349b32efcf4c36 WHIRLPOOL e2ca8afcc4a6a1b5a8f19958df6015709542f0d896bd7f9b35fbb7671571732fb1931a5de6e1e0deb21ee86fdecdf2a013ff319d76e1569f8c0ba2b252e959d6
 DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf77015ad8c9ca15c1a54953eec0492be748fde20af0b464700c80f SHA512 56d79deda1cb4624b7136c0028d8786ee5f560aef52f305548654b873232a968b0bd25322c53caa44c61dd0557d177c5725eaed4b6b6e554920e9f5e8b8dcf85 WHIRLPOOL e0bd59c30e04b4a67b7924890f0e377bbb120564a155815b1aa64a28da7f835362e583333240672aeb2b39d63c5c37e2739d4a9e9f25488ce2cfb5ee1e475569
+DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
 EBUILD netbeans-platform-8.0.2.ebuild 5406 SHA256 98e9861da45ead0d2d975a0527315df5282870b2d7e71a089724d91c18852e81 SHA512 cadbe66132d3ad81f6d149e20731b558c11c529e2ec15b1fe47ff97d99a3f4b4612fa5c98c435c4ff979eaefab6702721db009a03162202c96b4b411cf9f872a WHIRLPOOL 9552948e8bbad308f4379eaae69d8c214da9fbfab87d75226949b69ddca3e68c2d36c4d05738196073e5b959ab0b764064c9186d421198937122aa4bdc4988dc
 EBUILD netbeans-platform-8.1.ebuild 9320 SHA256 4a03fc6a399aaab949edb3df7c629da5bc7ce6288d44dbc848097352c2b4ae3a SHA512 7015cb042dd4e371cdcad49838eb2e4109d1ec505ac618f3a6f98d4dce328ab34be90a3cb0820896bd75337a180a1bd9c91c842a143fdffdf033696d5f496402 WHIRLPOOL 8c5311df396a374bf9d8c994b37c5c9fe6aa3c82a9e9e0824a5caefb0006fd9b44f4fdddd387ee12da48592929d5c4dd7e7fb2d866c9ddaf76acf5b3adbe310e
 EBUILD netbeans-platform-9999_p20160129.ebuild 9360 SHA256 d76978cafa723f41383c7bf58e697249f96e876d3d8ef384010f3bd15e79e18c SHA512 9f4138852d200c4449b7caa29e7916c7262f94558a92e6865be407c13b8f4db68c923e758890dcf9be237610b3ce611352cde5ea3d64a5c7e17d4a60f2054c7d WHIRLPOOL 6204751ae7dee75ff21542e5aaca95be9b38c4a883f8cc1b537a7912e77dc5b628e9df0e78c11495f8b21085625d5b11b45a0d23570f6a0bc2984823af6436bf
@@ -74,4 +75,5 @@ EBUILD netbeans-platform-9999_p20160226.ebuild 9360 SHA256 acef938e46799002469a5
 EBUILD netbeans-platform-9999_p20160227.ebuild 9360 SHA256 9131a019a6e7b2fcb149d00256de15d218923005e03190d76516a9444ff4e89b SHA512 ddfbcb38ae855385c6ff2d0c37cbb6d6a35104bcf4979e5ea617f89ceb4922e55d23f7d6f90c66b7e1a37edd8b3d2a947bfe0ddea4a3ee0943052938041d3699 WHIRLPOOL 34d3313df7773fd0ffc73d49396369c1b7d05cfbf23639a2c79cc674d9c66262975ccdcff871fc6405193a82819ca8fc4e636648463aeee1987402f9107a532c
 EBUILD netbeans-platform-9999_p20160228.ebuild 9360 SHA256 2097241f363db2ed7fde819615b5139561982b4cafd86fe17ba31247c0e67805 SHA512 2b45bad7ad1f9bf1c40e261cbd8fe354f0651c3901ef471d75551cf0d683e0d849ed3bbc3936170048bb1d30e9cea9e90b6fe731afc32ee949e48a87245a1bd5 WHIRLPOOL 47007b58e3daddc13d4b9472e5e3cbdc0f389a4dc13bfd8d58f94f7b8bf9dd8fa05b290bc1fe0667a8b7d5ca77a8c378229f3fed5c9c8be0121fb73dc3999d7f
 EBUILD netbeans-platform-9999_p20160229.ebuild 9360 SHA256 2ce181db89643a2e45017fc2af6a6c303049bd8fe702253357a2761672754d8b SHA512 cf76e79f455dd82be9c43b77214612ee1920e5a16dd4c674f622a711ae2d1434f892d524e9979db15c3bd8a18d82c3dc4853668f0dcb1d2801470e34c7a195bc WHIRLPOOL 77ed37501a771fce6651d3a859f0ee0689800bb5f4143e949cfcfd170454f3f6a99e47d044ccb38cdb212200f95aeea5695faff2953fa427528927a4a9d203b8
+EBUILD netbeans-platform-9999_p20160301.ebuild 9360 SHA256 741766e920fb2bcdb0c1f2a72e022a1790861f5b8877549e31da1c0358c3b14f SHA512 c7453634255d0979684d294652033cf763b5d6a5f5a263b2d1e03b1f1095f8e04d6874a8441f37fb67200c4349b333f3762f4e726cd0b00d2c3cd63e347b89c1 WHIRLPOOL 0fea8af0680fc73d75ecab2e5a0e2ea4fcd751267b029ff33adce182c638aa0a524485d2ae2f0c3b4029d4f2ae482b402e27fb0dfb02e2dab4332efcbbb675d9
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160301.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160301.ebuild
new file mode 100644
index 0000000..eeeb1de
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20160301.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/2016-03-01_00-02-15/zip/netbeans-trunk-nightly-201603010002-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/A3432F57D9B3B4AD62CB0B294EEC43D12FCF3F62-ko4j-1.2.3.jar
+	http://hg.netbeans.org/binaries/78DD1C0B4EDC348FF4DCD0616597BB809AAE248D-net.java.html-1.2.3.jar
+	http://hg.netbeans.org/binaries/7BA1E1C450BCD0AD9D0D2F6797A2EB50A4822E0E-net.java.html.boot-1.2.3.jar
+	http://hg.netbeans.org/binaries/068B9902E65F2292C9EA30E5423E41FB6B30D8AA-net.java.html.boot.fx-1.2.3.jar
+	http://hg.netbeans.org/binaries/8621531E83EC4850DA61AA2266FE41105C304F40-net.java.html.boot.script-1.2.3.jar
+	http://hg.netbeans.org/binaries/24824B1E8C2A2D3A5C471F5875BF61F27E8916DB-net.java.html.geo-1.2.3.jar
+	http://hg.netbeans.org/binaries/F41518385DA4B5682C864F19B82C3BA4AF65AE83-net.java.html.json-1.2.3.jar
+	http://hg.netbeans.org/binaries/989A81454D4FA962EB1C158FE794D2EB060AB9F6-net.java.html.sound-1.2.3.jar
+	http://hg.netbeans.org/binaries/E5DDC5E827D3D62E7BE9F7E32927CA01F2839971-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}"
+
+# oracle-jdk-bin is needed for now because of javafx which is not packaged separately yet
+# [parseprojectxml] Distilling /var/tmp/portage/dev-java/netbeans-platform-9999_p20151108/work/nbbuild/build/public-package-jars/org-netbeans-libs-javafx.jar from [/var/tmp/portage/dev-java/netbeans-platform-9999_p20151108/work/nbbuild/netbeans/platform/modules/org-netbeans-libs-javafx.jar, /usr/lib64/icedtea8/jre/lib/ext/jfxrt.jar]
+# [parseprojectxml] Classpath entry /usr/lib64/icedtea8/jre/lib/ext/jfxrt.jar does not exist; skipping
+#  [nbmerge] Failed to build target: all-api.htmlui
+
+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"
+DEPEND="dev-java/oracle-jdk-bin:1.8[javafx]
+	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.8"
+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}"/A3432F57D9B3B4AD62CB0B294EEC43D12FCF3F62-ko4j-1.2.3.jar o.n.html.ko4j/external/ko4j-1.2.3.jar || die
+	ln -s "${DISTDIR}"/78DD1C0B4EDC348FF4DCD0616597BB809AAE248D-net.java.html-1.2.3.jar net.java.html/external/net.java.html-1.2.3.jar || die
+	ln -s "${DISTDIR}"/7BA1E1C450BCD0AD9D0D2F6797A2EB50A4822E0E-net.java.html.boot-1.2.3.jar net.java.html.boot/external/net.java.html.boot-1.2.3.jar || die
+	ln -s "${DISTDIR}"/068B9902E65F2292C9EA30E5423E41FB6B30D8AA-net.java.html.boot.fx-1.2.3.jar net.java.html.boot.fx/external/net.java.html.boot.fx-1.2.3.jar || die
+	ln -s "${DISTDIR}"/8621531E83EC4850DA61AA2266FE41105C304F40-net.java.html.boot.script-1.2.3.jar net.java.html.boot.script/external/net.java.html.boot.script-1.2.3.jar || die
+	ln -s "${DISTDIR}"/24824B1E8C2A2D3A5C471F5875BF61F27E8916DB-net.java.html.geo-1.2.3.jar net.java.html.geo/external/net.java.html.geo-1.2.3.jar || die
+	ln -s "${DISTDIR}"/F41518385DA4B5682C864F19B82C3BA4AF65AE83-net.java.html.json-1.2.3.jar net.java.html.json/external/net.java.html.json-1.2.3.jar || die
+	ln -s "${DISTDIR}"/989A81454D4FA962EB1C158FE794D2EB060AB9F6-net.java.html.sound-1.2.3.jar net.java.html.sound/external/net.java.html.sound-1.2.3.jar || die
+	ln -s "${DISTDIR}"/E5DDC5E827D3D62E7BE9F7E32927CA01F2839971-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="${D}"/${INSTALL_DIR}/modules/ext
+	pushd "${instdir}" >/dev/null || die
+	rm hamcrest-core-1.3.jar && java-pkg_jar-from --into "${instdir}" hamcrest-core-1.3 hamcrest-core.jar hamcrest-core-1.3.jar
+	rm jhall-2.0_05.jar && java-pkg_jar-from --into "${instdir}" javahelp jhall.jar jhall-2.0_05.jar
+	rm jna-4.1.0.jar && java-pkg_jar-from --into "${instdir}" jna jna.jar jna-4.1.0.jar
+	rm jna-platform-4.1.0.jar && java-pkg_jar-from --into "${instdir}" jna platform.jar jna-platform-4.1.0.jar
+	rm junit-4.12.jar && java-pkg_jar-from --into "${instdir}" junit-4 junit.jar junit-4.12.jar
+	rm osgi.cmpn-4.2.jar && java-pkg_jar-from --into "${instdir}" osgi-compendium osgi-compendium.jar osgi.cmpn-4.2.jar
+	rm osgi.core-5.0.0.jar && java-pkg_jar-from --into "${instdir}" osgi-core-api osgi-core-api.jar osgi.core-5.0.0.jar
+	rm swing-layout-1.0.4.jar && java-pkg_jar-from --into "${instdir}" swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
+	rm testng-6.8.1-dist.jar && java-pkg_jar-from --into "${instdir}" testng testng.jar testng-6.8.1-dist.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/platform
+}

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 7a03b05..6fac7d3 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201602260002-src.zip 209828915 SHA256 79e707455e36ff
 DIST netbeans-trunk-nightly-201602270002-src.zip 209831963 SHA256 20b41ce3e47c43d3e255e9833fa3f2c3bcd48876ff620c40ed93c878c7abd883 SHA512 980ab79ed39cea631f45d7609b5d3bd8e8310737d7934dbe6a3f93f9c31031d5b38c40370ef6d35898bb7f39eb7a72a00ea1715a77b12678eb5d3a2e2f12a76a WHIRLPOOL f4a058519c51572208225a141a6745583c6ce1019e4d4b2ae994e0b6dd000034e330113decdfc2a6589025e61d11583852e64e121dd42fd833552d35f9ba748a
 DIST netbeans-trunk-nightly-201602280002-src.zip 209832078 SHA256 9db7e895e76748c876558471306afbb5a6af856a8cb391248be4f8d700cb0fc0 SHA512 41bfbb29f4e9760e11336d13908703b13276dac95dd070945963a213969dbdfa844e96340a0ec7e32d721cda3bd11a7f940855a3b1ddccd3d3349b32efcf4c36 WHIRLPOOL e2ca8afcc4a6a1b5a8f19958df6015709542f0d896bd7f9b35fbb7671571732fb1931a5de6e1e0deb21ee86fdecdf2a013ff319d76e1569f8c0ba2b252e959d6
 DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf77015ad8c9ca15c1a54953eec0492be748fde20af0b464700c80f SHA512 56d79deda1cb4624b7136c0028d8786ee5f560aef52f305548654b873232a968b0bd25322c53caa44c61dd0557d177c5725eaed4b6b6e554920e9f5e8b8dcf85 WHIRLPOOL e0bd59c30e04b4a67b7924890f0e377bbb120564a155815b1aa64a28da7f835362e583333240672aeb2b39d63c5c37e2739d4a9e9f25488ce2cfb5ee1e475569
+DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
 EBUILD netbeans-profiler-8.0.2.ebuild 3402 SHA256 8021dea620d1bc26214ff0ec285f8061c24693dd28a62a97a48ac3223707e920 SHA512 2660390337a973256b1aac3a02b14e16782c230fa2714ae695213b0cabc0eb60621c6a1ae234f9e57259a19de22a87447f9a89ab846bd59bcedd2be313c35072 WHIRLPOOL 5d1053ded03143b2de05b64cfbe59b515cb786d60bfa65566be795567bfaf5feb88a2f8e7161a05da512fafd523f871778d5ddeb3c6b89fc95885096e379f65d
 EBUILD netbeans-profiler-8.1.ebuild 3426 SHA256 81f8b3b135f021a2dbe7b5ccb53fc7fcf79908ab83ef14ca0e912732b7fb4b53 SHA512 210bc0c5214aa8f79f559cccf69f1ed885dd2d14dc55cd17bd89c8a7f04f1a76de5b414426337b2ba6e99576850f0753f13e41e0f424b3f0adc58001dffc217a WHIRLPOOL 293d12a03294532dc9ce10503b030282cb636f08af6300ea796885eb6a3fe36c9d37c2a07138d03e9c4d45b31352ce160901a96f659f26d50a0fe5caee3bf0fa
 EBUILD netbeans-profiler-9999_p20160129.ebuild 3472 SHA256 0df50d640f1fd0a9185daa500488e0f8a1d1a9206baf747cbd392a3eb17dc24f SHA512 1835d77967e4069d36d7958daf78afe02f4810d4fe975ba4af610cd9366ac2096092daf107d8574a2aeda80b52b1f5fdb4615e751aa129b018e480f47bdfc505 WHIRLPOOL f9366d98ab835381428768ac222401abd65c9e73d189ce89dddeb901581786074b90a4638610466aed4013032b6598baafcef73d0af25cc72a02a301fd9862a7
@@ -57,4 +58,5 @@ EBUILD netbeans-profiler-9999_p20160226.ebuild 3472 SHA256 cf513aa4cac3a4780a032
 EBUILD netbeans-profiler-9999_p20160227.ebuild 3472 SHA256 2f0d19936dce4e57cd5de04f3e59281ac76057c3663f9701eabb739c3f6cb37e SHA512 f7a144f99387d0123a8b2fe7293d3a3fd25b96e0ed0c0eb90a02e17143df84f9cc1b49a5b635e80680b29daa412bfab69d641e0af2c3918e0ac5d70ba4bbddec WHIRLPOOL b27cc7bded31e6c3db5705218340c3e59744ed39061991585965fbe569ef3e72b8e039c97b877096aba6f57717ec68536f79aa4c7a2ef87d4f19cea2885b34ad
 EBUILD netbeans-profiler-9999_p20160228.ebuild 3472 SHA256 7b5d0787d219447df94434ffa84f3d59169ff3d7d21f9946c764ea025344bcc9 SHA512 fef7d5a49bed4f27db5780fb646da66d5cda175df05592ed24821e6979bc304a28ffe380a0aaa9ca16cefa3cbccc7a141eb015a0bfe707a703f27f07570fec9d WHIRLPOOL c68c7771335cd6c0663c4a9756d3bd7e57c494b9abfe28562bfde565efb3a4a11d57b2ef575eb9c2a5398e87ef3a8c502b7a803fa29ef1c55ae88e98cdcdb2ac
 EBUILD netbeans-profiler-9999_p20160229.ebuild 3472 SHA256 9a1e10f617be4eeceb35b4d5a9e85b7208a6c58b0f5a398c557998de39bc196f SHA512 0d919687c389c1a830215539c77f201c059322f7b5ede60db3c6b90d812c7c09d2450ae9b8ddf32821a9f7673ea6e166fc11de469a12adefb4ed119fd43247cd WHIRLPOOL 62db7875c57a661418ea9dbb0a1de395d996ccdd99d910c244c5d635897c7f23437bc8ea8b54d2fe40535e7c4f661a1135bec508b3b6d14fd51c85ea8cf71574
+EBUILD netbeans-profiler-9999_p20160301.ebuild 3472 SHA256 d867b5c68ed9c128746fadf09f9418cf0b4b446b3f0864c135d5df5a83d9b424 SHA512 6ef67732b4a43257a6494aba652afb3cfdbca8b80f8e9488cba691057677f46fcf0043dc155a6e63f96ec7f5ba7bfa6c6dc8a66b1e4fe47d506a38adc0ecf051 WHIRLPOOL 51ee7170c8926376e9a2d4fb418020b08426244201fafefcdb96ac1ff8366ffca49247b61e54c214e21d48c7e3046d48cafe1acec7f05afa0d7f42b0ba351703
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160301.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160301.ebuild
new file mode 100644
index 0000000..913c4bc
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160301.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/2016-03-01_00-02-15/zip/netbeans-trunk-nightly-201603010002-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/Manifest b/dev-java/netbeans-webcommon/Manifest
index 383e3ca..6826bff 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -44,6 +44,7 @@ DIST netbeans-trunk-nightly-201602260002-src.zip 209828915 SHA256 79e707455e36ff
 DIST netbeans-trunk-nightly-201602270002-src.zip 209831963 SHA256 20b41ce3e47c43d3e255e9833fa3f2c3bcd48876ff620c40ed93c878c7abd883 SHA512 980ab79ed39cea631f45d7609b5d3bd8e8310737d7934dbe6a3f93f9c31031d5b38c40370ef6d35898bb7f39eb7a72a00ea1715a77b12678eb5d3a2e2f12a76a WHIRLPOOL f4a058519c51572208225a141a6745583c6ce1019e4d4b2ae994e0b6dd000034e330113decdfc2a6589025e61d11583852e64e121dd42fd833552d35f9ba748a
 DIST netbeans-trunk-nightly-201602280002-src.zip 209832078 SHA256 9db7e895e76748c876558471306afbb5a6af856a8cb391248be4f8d700cb0fc0 SHA512 41bfbb29f4e9760e11336d13908703b13276dac95dd070945963a213969dbdfa844e96340a0ec7e32d721cda3bd11a7f940855a3b1ddccd3d3349b32efcf4c36 WHIRLPOOL e2ca8afcc4a6a1b5a8f19958df6015709542f0d896bd7f9b35fbb7671571732fb1931a5de6e1e0deb21ee86fdecdf2a013ff319d76e1569f8c0ba2b252e959d6
 DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf77015ad8c9ca15c1a54953eec0492be748fde20af0b464700c80f SHA512 56d79deda1cb4624b7136c0028d8786ee5f560aef52f305548654b873232a968b0bd25322c53caa44c61dd0557d177c5725eaed4b6b6e554920e9f5e8b8dcf85 WHIRLPOOL e0bd59c30e04b4a67b7924890f0e377bbb120564a155815b1aa64a28da7f835362e583333240672aeb2b39d63c5c37e2739d4a9e9f25488ce2cfb5ee1e475569
+DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
 EBUILD netbeans-webcommon-8.0.2.ebuild 4723 SHA256 e2ba39cb6f22c990acf9a492eac5707f130382d56f9bc1e3636e82cbe4d61938 SHA512 61955d38f829b3ed54bc5cb9a71da07f05676a2bf7219fa8073aeee0f0e2d0e73f7aa6ec1636be39fb071d3d2b9de7ceb813a247a61961874f4cc78697d4e568 WHIRLPOOL 1a272650fc2394716a790b79cb85a9322929c7cc96ea4776cc639fb869c5b536140dbdc632b1a8aa9cb1fc8e740050125c2ebe9390de7a8f4207e88e24924206
 EBUILD netbeans-webcommon-8.1.ebuild 4945 SHA256 55c57b638481134d659763154a7820467a9866707112cba0e60dbd9ba8cd2840 SHA512 a98987535f60b533bf0df701f83693a58584dfa9a10d5c8646186165d884fb7e8a3348ec77cbf25d1a8cc8cfd947bf54cdb30d251ae1a3fffb74947070d76579 WHIRLPOOL 36fe1b7b9b34a02fcda227aaeebed8a33562e6fe4a014c78e9a464d709bf5120322a35bd54a0ffa15c4dd4f3ae605cf6fc2d35c5652f7162ae646c61ad69210a
 EBUILD netbeans-webcommon-9999_p20160129.ebuild 5280 SHA256 7b5230211a95ba0ae2d6a12b0dc4971ff757d69e1ebd3f30ccee23b8e53d2329 SHA512 ad134f7bdea7ee60dcdf25e1b554e83e39ecade3b83caed134ddc16b3a5633f57f8733f93cef3f34f08bfadc5746a1cbc2a09d2689b39d0d4dedba8481c8f749 WHIRLPOOL e347a10ff1168fc9243f718cf9818bb45737ab69ea6daa0a47057397a62138638961668f304d53a5e61a3722d68a22dcc5f4914eee9a391b45c5c1b280a2585e
@@ -72,4 +73,5 @@ EBUILD netbeans-webcommon-9999_p20160226.ebuild 5280 SHA256 4def44255acf79f56ce8
 EBUILD netbeans-webcommon-9999_p20160227.ebuild 5280 SHA256 668a577f60298773af8af6e7004eb303f84b2a12a93e2be3151f49c125879a6b SHA512 48b970cd8bb7a8fa228797ecfae6db097ce0f2f478d78039d1ea56a0e4e79a9dd1d876b577c5b20e4d0a9b3bc494d90ae2e997e4b94cfe515c6b3df42f443f9a WHIRLPOOL 03b2fc093d42785eb55121932f28bd3605792a5e45cf8a8f65c90dbcc9e82868009e8f68279f09afb8b7bdd5514dab4ebed6382dddc1b1a7f884fd4cdf1bf2ce
 EBUILD netbeans-webcommon-9999_p20160228.ebuild 5280 SHA256 67d280637114364cb30a76e3b12ac4f33f51b80570aba43745e4f0ee4d4f3b72 SHA512 6cb3a4735325076f960fce347deef43f1199e3dd1a5d3c342fd6eea13012082d24cbdd20c41a06a985fe5f3cbf106009937d70d0ff62f09af8544e651809ef9a WHIRLPOOL 3d7c79ef509a3f08e3f09203e50f62aae725ff176227a4cf902f053e473df70ff25acc5597489b33e45d85270452cfbee1e4ba48eb13e4fd28182dd9f335bcda
 EBUILD netbeans-webcommon-9999_p20160229.ebuild 5280 SHA256 0d9c00f4200b2fd8d3810b14443a2b40b23068b9abc8032055d576ea467cdf38 SHA512 a81b22df0d6c2aef80f4a6b1c558a07479ac3a2aa198836221bd748ae0631214867f718cbb9bfbaa71ead5b56ce3bcfe5bdaa48d00c9b6c04fa9ca7096f9a392 WHIRLPOOL 2fdb85e3c3d5418b36b05ca815e80625855c60a879a13d1cbdcf42d9e3367d3fa3a4c163d91169ca0ec4b93ef6c11f8f6e14e850c60a937571d9336cbb8f7831
+EBUILD netbeans-webcommon-9999_p20160301.ebuild 5280 SHA256 a55abc8217e7993406b7d8eb7d15da92c1a301924170eeb12ada4096e1449a59 SHA512 ff4c59b659025560fbc99fb288586111f10f3f12383eb7b73d1678a93580db057a7ca646f93afbe3702d8ab94dcf6e412d6f9198e43c6be1596476024eb4b920 WHIRLPOOL 8037e38035ba4453ba7ba96c29170403fad5b12480c198eb394d9e35a9bc0f082ece40f071caf15555251e5c82bbbb45ded5dec079d7d18770bc37f486a0096c
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160301.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160301.ebuild
new file mode 100644
index 0000000..c541ba2
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160301.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/2016-03-01_00-02-15/zip/netbeans-trunk-nightly-201603010002-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/0929AC5F40B5A8667021408748D64F30F77B3165-libiDeviceNativeBinding.dylib
+	http://hg.netbeans.org/binaries/2A38DA3DB5D36DBBDC0B03990B46810F72430D5E-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/C1BB9FF4232248B0054E5A26A33474A251EA19CB-libusbmuxd.2.dylib
+	http://hg.netbeans.org/binaries/D4BD3F62EADB61216A47EF96B3152EDD35A56005-ojetdocs-1_0_0.zip
+	http://hg.netbeans.org/binaries/1EFED55F8C442E4DB1C2338A5C35D494364F9ECD-ojetdocs-1_1_2.zip
+	http://hg.netbeans.org/binaries/456736E6988B164BFC5C740605237A76A18A963E-ojetdocs-1_2_0-Dev10192015.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-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.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}"/0929AC5F40B5A8667021408748D64F30F77B3165-libiDeviceNativeBinding.dylib cordova.platforms.ios/external/libiDeviceNativeBinding.dylib || die
+	ln -s "${DISTDIR}"/2A38DA3DB5D36DBBDC0B03990B46810F72430D5E-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}"/C1BB9FF4232248B0054E5A26A33474A251EA19CB-libusbmuxd.2.dylib cordova.platforms.ios/external/libusbmuxd.2.dylib || die
+	ln -s "${DISTDIR}"/D4BD3F62EADB61216A47EF96B3152EDD35A56005-ojetdocs-1_0_0.zip html.ojet/external/ojetdocs-1_0_0.zip || die
+	ln -s "${DISTDIR}"/1EFED55F8C442E4DB1C2338A5C35D494364F9ECD-ojetdocs-1_1_2.zip html.ojet/external/ojetdocs-1_1_2.zip || die
+	ln -s "${DISTDIR}"/456736E6988B164BFC5C740605237A76A18A963E-ojetdocs-1_2_0-Dev10192015.zip html.ojet/external/ojetdocs-1_2_0-Dev10192015.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-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
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/webcommon
+}

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 23ccf2f..44c8044 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201602260002-src.zip 209828915 SHA256 79e707455e36ff
 DIST netbeans-trunk-nightly-201602270002-src.zip 209831963 SHA256 20b41ce3e47c43d3e255e9833fa3f2c3bcd48876ff620c40ed93c878c7abd883 SHA512 980ab79ed39cea631f45d7609b5d3bd8e8310737d7934dbe6a3f93f9c31031d5b38c40370ef6d35898bb7f39eb7a72a00ea1715a77b12678eb5d3a2e2f12a76a WHIRLPOOL f4a058519c51572208225a141a6745583c6ce1019e4d4b2ae994e0b6dd000034e330113decdfc2a6589025e61d11583852e64e121dd42fd833552d35f9ba748a
 DIST netbeans-trunk-nightly-201602280002-src.zip 209832078 SHA256 9db7e895e76748c876558471306afbb5a6af856a8cb391248be4f8d700cb0fc0 SHA512 41bfbb29f4e9760e11336d13908703b13276dac95dd070945963a213969dbdfa844e96340a0ec7e32d721cda3bd11a7f940855a3b1ddccd3d3349b32efcf4c36 WHIRLPOOL e2ca8afcc4a6a1b5a8f19958df6015709542f0d896bd7f9b35fbb7671571732fb1931a5de6e1e0deb21ee86fdecdf2a013ff319d76e1569f8c0ba2b252e959d6
 DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf77015ad8c9ca15c1a54953eec0492be748fde20af0b464700c80f SHA512 56d79deda1cb4624b7136c0028d8786ee5f560aef52f305548654b873232a968b0bd25322c53caa44c61dd0557d177c5725eaed4b6b6e554920e9f5e8b8dcf85 WHIRLPOOL e0bd59c30e04b4a67b7924890f0e377bbb120564a155815b1aa64a28da7f835362e583333240672aeb2b39d63c5c37e2739d4a9e9f25488ce2cfb5ee1e475569
+DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
 EBUILD netbeans-websvccommon-8.0.2.ebuild 2651 SHA256 a195b307847c466dbb5f46eb04240358ce3c92cadeecb8fda1562304de46820f SHA512 933626bd2073f58e3508180c042e237b9e61ba6f3c992cf37ea43978ac2fc972d2dcc3ef0b5c390b3867296e197ed2605c43452c98e36acf0982e7338b6d1eb7 WHIRLPOOL c3db8f0b50116d0129f50778e1961166e76601d8c165e20e73d75c91b02c8a095067e0f13e18178d849dd29adcedaeee7d3e0e62f99be592d7ce159fd6af632e
 EBUILD netbeans-websvccommon-8.1.ebuild 2675 SHA256 c9ff3d598c5f76c2b69dd5488a80c63025acc3cd0cc99321a0e84a493502df36 SHA512 89daec44b860aa8011d9e5533230f89dad7bcc50a119664122d2718db3e53501d1319ae4b27eac1d71596671e9a7c21315a641346e6cbab22edb3c7232bf5ce3 WHIRLPOOL 521521094b396c98687e2054742e4c019023045f19b01a6cc3a5f826f4cabe9448254db8b834448f3b33368c76dd667942554e1bae459c55de2c571bb5cfb4f5
 EBUILD netbeans-websvccommon-9999_p20160129.ebuild 2721 SHA256 b62f8ab2ebb4db8e62eb569fb1693b8e91f021cfebfd1ceaeaa59ab48610788b SHA512 bd626018daf04172c27fb75a01247a077ffbd8ad96b1305e4af561cb2e546a801e726244d47ae95a197dd2d90ec4b799b090dc7a2dbf28b276426c6aee4b78e8 WHIRLPOOL 3d06c1ffd8cd6082c4b8f315f3961170f4d06749cc398add1e00d7a7795b5e0c853e93d5ef50aae8bbc57b6dd35bfe841df0f1ec0537404a74f7648040b7b281
@@ -57,4 +58,5 @@ EBUILD netbeans-websvccommon-9999_p20160226.ebuild 2721 SHA256 69c6a48bc572ba9bc
 EBUILD netbeans-websvccommon-9999_p20160227.ebuild 2721 SHA256 6cf7f517a482c7f38c1cdfc998a53a644ef9aac9bcd69b5c6e00571c9f78a15a SHA512 6a78c5a15e8a8c129e056f2218fe7d328bf8ba398fdd1902b38c101cdb0fca3a03db10b48249d40eb272a6cc6908ccd16466dbfa1acc499d94f09aa4c94815ff WHIRLPOOL 1d35ecee50e04532634cd1294dd1b17fa0c73be3c9733282858ea492bd396cbf0ad42e5af334a7c20cf3b2cd53eaea79343cdc55eebe0716fdfe9cbc3f47b814
 EBUILD netbeans-websvccommon-9999_p20160228.ebuild 2721 SHA256 fc0757e8d75deb6892dac5699b2580b83a8d3c359a6288e2c9672a48d907243b SHA512 6d6ffbed9657b60edb4233601850354571fefb0a160ef55d8cedbabb319b7d615f9d2eaaf959bf13b16a3e4b0fb5f7a31f4b6e6a942ae9143ad3f2aa2e445c3f WHIRLPOOL cee3f73e9a38c80ebf589a5340208fe169a6ae7b88ec462e9c25bffcf732cf8e7ae2836ba7fe1d56b67ae18a07f243f13e80dd70079ca890f1c84f8a77ea18fa
 EBUILD netbeans-websvccommon-9999_p20160229.ebuild 2721 SHA256 29fe5abf4864d87ff2f78a6bc4ec95a8b130b212b0202ae5475b83a1a4bbae74 SHA512 1055e7f67e34a9d475e382fb2eacd038d6770a47e5a7ea68e189b9f8a5e3db55fd747345a208a76e3bbfc29a5daa256a57cf2283d9e3d418bb7b5aa793f13d99 WHIRLPOOL 9ed9ac8ffd62a3487c80c4b8135b0eb3052db0774570f23f0165a01613ce380476fb30e86799591f7248ced82700a0d65ce287cb12e8d112a0c70f851cbcc060
+EBUILD netbeans-websvccommon-9999_p20160301.ebuild 2721 SHA256 dd2f33ac0b715769f80caedca9b75712637778978b220ef81d967c32afbd6ebf SHA512 f1210d692f31917729e1c0d463b175c92588c465408d1517ae7283cdf447b61a52b46e1d7c80dd1871fd38d319c4eadf9ed6a170c4a2882fb4750d9e397618dd WHIRLPOOL 54605d7255504b43b23b3015101821b243fefe8b3d4c85e02d9add29ac6f9b422b5ffd0d08743aeaa55d709e4e644942703ee35ccf970eea4d380231b5763c5e
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160301.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160301.ebuild
new file mode 100644
index 0000000..3c42d79
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160301.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/2016-03-01_00-02-15/zip/netbeans-trunk-nightly-201603010002-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/Manifest b/dev-util/netbeans/Manifest
index fe3a860..f9af90b 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -32,6 +32,7 @@ DIST netbeans-trunk-nightly-201602260002-src.zip 209828915 SHA256 79e707455e36ff
 DIST netbeans-trunk-nightly-201602270002-src.zip 209831963 SHA256 20b41ce3e47c43d3e255e9833fa3f2c3bcd48876ff620c40ed93c878c7abd883 SHA512 980ab79ed39cea631f45d7609b5d3bd8e8310737d7934dbe6a3f93f9c31031d5b38c40370ef6d35898bb7f39eb7a72a00ea1715a77b12678eb5d3a2e2f12a76a WHIRLPOOL f4a058519c51572208225a141a6745583c6ce1019e4d4b2ae994e0b6dd000034e330113decdfc2a6589025e61d11583852e64e121dd42fd833552d35f9ba748a
 DIST netbeans-trunk-nightly-201602280002-src.zip 209832078 SHA256 9db7e895e76748c876558471306afbb5a6af856a8cb391248be4f8d700cb0fc0 SHA512 41bfbb29f4e9760e11336d13908703b13276dac95dd070945963a213969dbdfa844e96340a0ec7e32d721cda3bd11a7f940855a3b1ddccd3d3349b32efcf4c36 WHIRLPOOL e2ca8afcc4a6a1b5a8f19958df6015709542f0d896bd7f9b35fbb7671571732fb1931a5de6e1e0deb21ee86fdecdf2a013ff319d76e1569f8c0ba2b252e959d6
 DIST netbeans-trunk-nightly-201602290002-src.zip 209832078 SHA256 371b75aa9cf77015ad8c9ca15c1a54953eec0492be748fde20af0b464700c80f SHA512 56d79deda1cb4624b7136c0028d8786ee5f560aef52f305548654b873232a968b0bd25322c53caa44c61dd0557d177c5725eaed4b6b6e554920e9f5e8b8dcf85 WHIRLPOOL e0bd59c30e04b4a67b7924890f0e377bbb120564a155815b1aa64a28da7f835362e583333240672aeb2b39d63c5c37e2739d4a9e9f25488ce2cfb5ee1e475569
+DIST netbeans-trunk-nightly-201603010002-src.zip 209836314 SHA256 6c47ad11abc972a0e9a1f754940e6c42d6a5452ee78997b6fe251e817503ef1a SHA512 ffeda60270a4085f1fe86b973e4a947e5c24ddd4934dd18488f9a8be331f96e52aac6a225b0ff6d6a8177a56f8d3dcd4f54b273e71657d53cdfb143186e460cf WHIRLPOOL ae3669c51d5fcc01098855a9b7d9a7482b4f4f0987572d9f068f82020bf4b01efdec9655928fc24401c7487ff08bef3b9edd35ffec5d0eec384aab217840caf9
 EBUILD netbeans-8.0.2.ebuild 7167 SHA256 80e31382a0ceb680c2a055dc5c78c1dce8edf32c50bbae6a1c14a2c568492519 SHA512 0ab466ca247ec953896ef0ab3b01b43ffea3a9f37e9bcdacecfc0476226d45cef35e4ddf27f2b85628d9512ed304e6cc6cfe963a5e547217d08cad400eefc4b9 WHIRLPOOL d09668e669f4f8d7987ab02cf26104fc6e54ba29b8b497fe0013cc8816a2d7560c99e6e1b02db77ead872d5240b84c09e3fabbc3465587d1d1ca7d6fcae114c1
 EBUILD netbeans-8.1.ebuild 6891 SHA256 22a19f05bdcea85475c0451df867367b69363bfbc6280f78b087248d9f8e9513 SHA512 812b6cdae3e5feaf37db5ca8b5efa1b374d5492f11cfa1df2adbd3617986cdca6a79d2d4dffd024c8c48492fc8a21704190242f5741c5699b12070620cea2c87 WHIRLPOOL baf5f750574c01effa0d02c72194139fb2757be932054f4900ceb0534607064af10f2b5b38063ff2cca34e75ab5be23d00c7e5d90d1c724339666d20f1bb10d3
 EBUILD netbeans-9999_p20160129.ebuild 6938 SHA256 39bf449ae0a9d02dbd6529eb9f6801dbd01c85bd5e0c1ca7642bba0e9867a918 SHA512 a07198a37c408ab0f8a2a7a9fca779f53bdd91c895329b51b90159a084e4707ca09bfe2f08252f6c2fbc59c75620e9f2f4e0ad012c8e6b71058ff764cf20bf65 WHIRLPOOL 70a1cae05909f5109c5f315a5e86c5a835707886a6da0a13323e1d2ef771b3d210a05b35d482fc703bb691ee0fe3d187f402805f922d3704abd3739b32d5c5f6
@@ -60,4 +61,5 @@ EBUILD netbeans-9999_p20160226.ebuild 6939 SHA256 26aaa8f427926fe184550a8f602527
 EBUILD netbeans-9999_p20160227.ebuild 6939 SHA256 92a1edf460e2135f0f878672e63cba0842d4e4ef777a20e51752127f627dbe86 SHA512 b1b551e2c15be7056394afc1c15d64531deba8e6f2df35c2ccd9969cffd9b5a937a4625018ab90a0f64b3abc536479fc016272d026361f38d14670dadbf57adb WHIRLPOOL 855b7f713e7259d25375157c2757f7d62d22e8f3652217e3c5f62ded36c29b54ec8639e468064e0f60e1f8a4f4f71ef86a330711bd7b11f210ef3da9bc78c8ac
 EBUILD netbeans-9999_p20160228.ebuild 6939 SHA256 0c6d6f1a1550161392e57c92c6223d70a0f42ad01dbe84b81f1321529757133c SHA512 90f4be6ec1de0c1fd12bd3b25def02b3ea25daa90118f62e284b522012c7418b07d4b0ff218d96a50cc29da96473f12c2ad32755e81af586cbfd2c6a855968fb WHIRLPOOL 8a24365a3c4a279c49c25d9a928d4708f54cab0868174bef47166b94ef578d0c805c714ff1c80fa6329f52a9f10c3f0347977d189f583a0b129d24b5df1042e1
 EBUILD netbeans-9999_p20160229.ebuild 6939 SHA256 249c77ed591f56126a2b41d6a66e53e7539a362f55536a43a4992ddc81367b93 SHA512 6ea19f01ba7f2d149dc1e652448d867eb0b694c4bb8528f1adfdcb5cf7f8020d600a282d8e1f6d89c5b86659c9e885270a7ad5d7d6f9d9c9afb1c6609e30380e WHIRLPOOL dcc2c5f6e97759e0880cfb4e77960e0c238df5a38061b1ff99253ed2b9643d67cf3f2e3335df6755788cf0ef27c0c003d448309dcf5aba4a6262ae7aac94ce54
+EBUILD netbeans-9999_p20160301.ebuild 6939 SHA256 0746fa2f895092887f0f2065610bbeedd61a4493a7f27a290b7473df9bdb2738 SHA512 80e6412b4da453b524d2221a2e851becd45c7090132607561cc510fa323fafd2d8b65d3687a4f3b69ddc8ed924aafcb69d2318755f5e2d95bc24ad6725890e87 WHIRLPOOL b4913ff2bed53f5cc3aeba4ffae37c41a7443653a0a08982885fb74eb2b61bd5340e7edff400628b294da2c36892aeb031ec565af58455e8b0d7c3ece1d507dd
 MISC metadata.xml 329 SHA256 8aeaf2a0228f15c2e4140f401b30f083509bd99d0a578873069f3595cd8555f3 SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640 WHIRLPOOL 799a9b79b1b447bda9631f67e2dfaf722376740e1d2037796528a05f9745eeed00d9990a74a65ce09f74bc5e1d60a887abde540c3c62487d7dd49b8377c15834

diff --git a/dev-util/netbeans/netbeans-9999_p20160301.ebuild b/dev-util/netbeans/netbeans-9999_p20160301.ebuild
new file mode 100644
index 0000000..88410c4
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20160301.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/2016-03-01_00-02-15/zip/netbeans-trunk-nightly-201603010002-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_ar_SA? ( ${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_es_CO? ( ${ALL_URLS} )
+	linguas_fil? ( ${ALL_URLS} )
+	linguas_fr? ( ${ALL_URLS} )
+	linguas_gl? ( ${ALL_URLS} )
+	linguas_hi_IN? ( ${ALL_URLS} )
+	linguas_id_ID? ( ${ALL_URLS} )
+	linguas_it? ( ${ALL_URLS} )
+	linguas_ja? ( ${ALL_URLS} )
+	linguas_ko? ( ${ALL_URLS} )
+	linguas_lt? ( ${ALL_URLS} )
+	linguas_nl_BE? ( ${ALL_URLS} )
+	linguas_nl_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_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_ar_SA
+	linguas_bg
+	linguas_ca
+	linguas_cs
+	linguas_de
+	linguas_el
+	linguas_es
+	linguas_es_CO
+	linguas_fil
+	linguas_fr
+	linguas_gl
+	linguas_hi_IN
+	linguas_id_ID
+	linguas_it
+	linguas_ja
+	linguas_ko
+	linguas_lt
+	linguas_nl_BE
+	linguas_nl_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_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}" = "fil" ]] ; then
+			lang="fil_PH"
+		elif [[ "${lang}" = "gl" ]] ; then
+			lang="gl_ES"
+		elif [[ "${lang}" = "id_ID" ]] ; then
+			lang="in_ID"
+		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_id_ID ; then
+		einfo
+		einfo "You selected Indonesian locale which has locale code in:ID in Netbeans."
+	fi
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2016-03-01 10:07 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-29 10:38 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-javadoc/, dev-java/netbeans-websvccommon/, Miroslav Šulc
  -- strict thread matches above, loose matches on Subject: below --
2015-06-24  8:44 Miroslav Šulc
2015-07-31 17:27 Miroslav Šulc
2016-03-01 10:07 Miroslav Šulc

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