public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-webcommon/, dev-java/netbeans-javadoc/, dev-java/netbeans-nb/, ...
@ 2015-07-14  9:19 Miroslav Šulc
  0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2015-07-14  9:19 UTC (permalink / raw
  To: gentoo-commits

commit:     f9993acdc5a619467b71cdb541c2b0c48ff37bf5
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 14 09:19:27 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Jul 14 09:19:27 2015 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=f9993acd

netbeans: bumped to the latest sources

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

diff --git a/dev-java/netbeans-apisupport/ChangeLog b/dev-java/netbeans-apisupport/ChangeLog
index 70ac8a0..0dd95bb 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_p20150714 (14 Jul 2015)
+
+  14 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-apisupport-9999_p20150714.ebuild:
+  updated to the latest sources
+
 *netbeans-apisupport-9999_p20150713 (13 Jul 2015)
 
   13 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index bbcf3be..d49282b 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -37,6 +37,7 @@ DIST netbeans-trunk-nightly-201507020001-src.zip 208088424 SHA256 1dde0fd1452c74
 DIST netbeans-trunk-nightly-201507090001-src.zip 208130931 SHA256 5d73ccaddac610b27ab8aecaa95f5ef920a833291d2573daeb29f1f79eef1864 SHA512 6405717c46d506dbaa744fd33ba88daf3037e9d388482d808a6eeab292a42d99e76eea4494639725568239dc939444b0357a3f55b364a57256e93f5252efb7d5 WHIRLPOOL 9bddee309d416454d25c497074ad9e2ff23b1e52de90975bbea12412524fcf44e384eed0b14ee7f0f1ae1988523a74281bef1de58c14321aaefa4f9ef1bd9ba5
 DIST netbeans-trunk-nightly-201507100001-src.zip 208139985 SHA256 ede6f00ad37a28f1fa7c825e0f86ada8e314a969db3ea1884d21b6cced8dd527 SHA512 49c255eefd2affd8206082b04cb2127138b841d9ffa5f175aabfdec0703a81da0299bfc7bf55404829b493cd530e2db5570f4a19e66cf5af83b2081ed90a43ee WHIRLPOOL 6f1dd8b72445a31428e310cba1de99f0223c57c6b24f178d9cf5855633d5da23d1a87a130267b9da9697fbf28d7dc7fca2a0a341af9936f443cb9e1dc6bf89c2
 DIST netbeans-trunk-nightly-201507130001-src.zip 208143364 SHA256 f6a745a4112c25988071e5add63f52b567ea416e56eb1c5ac1f0caa40b2fa47d SHA512 2a01dde8445619c79b837bc51d1eb5fb9136dc0ad74d1e73df9d45748baa7b41032c10a76d26505fcf783193978c25907dbb2fc93a0e54f8b470ca2a6d7b9a8c WHIRLPOOL 095f94bb313aa828e0d0e972e2ccd69015e300023d7ce51569963eefba61146421f5a1a015c28fa8885445bbf42987367d18ed57da98e3b7f6521bddd3a4aaa5
+DIST netbeans-trunk-nightly-201507140001-src.zip 208144479 SHA256 9daca7bafaeb7d4e4eed58ecec4ba487f11fd6fd4b6790c719d4f428929588d4 SHA512 96adc2194d3f005216677ccdffc1ac51ecac1c2a13ec3f29b177e553ea9f5a36d9c9010c7f6454612b78a7dcb5f5ef08197e1113701bdaa0c727b9c352422c3f WHIRLPOOL 4fecb0c62019a2fc3522db07513eba2b877c01c856ac2b727329cca7ff86d573ef493a813b943558c06da3d6bc3109b5082e7ccb356318e6aef374eadeddee51
 EBUILD netbeans-apisupport-7.0.1.ebuild 3134 SHA256 41c32033c9945a39c0aebb6b0271767031d53a47e5c8365d9e3a7c86712e24cd SHA512 dd4bdde9574a87b46b02fd7204b1e90394bd87dc572dfa015b601203b026b35571f20323db834a310f90aefe6e4a822044b0d71d535a7351137219b50ecb2aa8 WHIRLPOOL f3721521a33b337d7dc24d6b49b0b2fe723f5ec446a5a4befb085051140a41bfd2d3081876e9f02f8b9932a3a0997b92211cd964fe372e40b42813df5db5170e
 EBUILD netbeans-apisupport-7.1.2.ebuild 3143 SHA256 cf24048c0ecca98a7d6371624bb0ddfb78663bead073d515a7c84229dbec00a8 SHA512 ec44c263e786210fd64c9ebb253bc9d4fc34d3be9493157dad06007c19734672bfd767765c003393d1e5cc6755fd5d1eda956b00c2092e98592a73ec1af4e729 WHIRLPOOL d619c304a994a2b818d892fb6315d092588f2ebf95e566f7a909f92daf21bb368a28c4e1af876ae585980dc82996e62aba30b12c41461103c23620a215480b76
 EBUILD netbeans-apisupport-7.2.ebuild 3126 SHA256 b0d64795b8403a932e3e20721a116c755c4de66fc36f7191476fcb4a226bad13 SHA512 cea062a72a8e75a9c2fe91c323f83d542a70149336360e1c41479f401fcae5ead6a301c8a7d5704d5beb27f7810b5d1e3cff0196cce7a26890a001c570179f6a WHIRLPOOL c286f4e4d3a02cbeb1a6e13b2005dc5435a6e9ec026a98fcc00bb83222014b800cd83f437c69352b48d16bdf442a6c7ebbed6aff86f10b3c5e6cdfb7edd9e184
@@ -68,5 +69,6 @@ EBUILD netbeans-apisupport-9999_p20150702.ebuild 3390 SHA256 81c039173f24cc76444
 EBUILD netbeans-apisupport-9999_p20150709.ebuild 3390 SHA256 e844ae5f57b4ee91aa7bba6821180e1b51f45d74dae52dac6f5a29a575001dd3 SHA512 8d3e19978f42d85ffcb11cbc30fc68d422d4460c8a46655b154ec82bd049be0020c843d9783c460435e4ea7d9ee67b6105760aae64aa67d25f231c0ba7269d7f WHIRLPOOL b587a4db104436b7d54a2fae2226dff13fb119f986f60acea450b2c8d0d3bc6a91887bc3dbaa7ff5201ece343530225d1cda5a40777032dabcb62266ce0e307a
 EBUILD netbeans-apisupport-9999_p20150710.ebuild 3390 SHA256 e57b8bb7294f6b9ee865a676298f501de9247c9eec18fd0df12c660cb5dc2127 SHA512 bba385ef6e398812cc2a9249e69ceb69023f68d94c20038205628038c19a8b97977d3cd03da697ae3cefa215f04be1f56de4712af9d7fc9889b7ca8c2d4e3be7 WHIRLPOOL 2fe17c98105f6ed84d0da1e3dca2d6b6ba8a8d4f92514a7772dc2b1f6f8945d477fa4c99ff34798edefdcd759857ec0cbcd5b664d31c52a49225df41598544df
 EBUILD netbeans-apisupport-9999_p20150713.ebuild 3390 SHA256 ec9958b49b7dca8d57b0ee972ef28513fdef9e5286f1c2a0a2384a0e4e5e476d SHA512 324e8ef128df793847570665042daa236a9596a74eb32e8d31c29814128144a14e92016b8f29ecda438b182ca4cd26971025f4517890f5b6c046fc51da73d25c WHIRLPOOL 560227ba70dc309e07f6c48eb37a93f5072dacd325a720aa6c9f4bc4b45d9ab76dde2981d6277fd4b9d63582a5cb2c6e185287de5c2341b4cd800bd5b94a3ce7
-MISC ChangeLog 178975 SHA256 c43249a8a40d7f277a8f12664950941ebc3608728e2f5db0a747c78dcb7584bb SHA512 3c21258986891893a7fde5496646b1a512455db21ceef19a2d2a9874aac28e84fcf3b201c9ed3fb8d945348451b38ca2fee08752e413c8d2ef7a67dde1b1dfac WHIRLPOOL 86e71371f794fe287cc25f921185842f59da4480e7098dcf8c211001aa188ac230da01971f1b7728571cefa466313bef8261abe8930fd6d9074bcbdc7fb6e5e0
+EBUILD netbeans-apisupport-9999_p20150714.ebuild 3390 SHA256 c9c104e19509f9aea688de43a4eaf31daf831dd7d31f787dbee29e62acfe4f14 SHA512 b67420d7f0cc7692f9e5a563f3a7bb05f0821a905317f4f751a74cd396ac6e8b1d6bf0d3753ee599811c5bff35a3425ba1190577114d41a2f9732f4759279ae5 WHIRLPOOL 67d17b81c673822a26f82382aaebc8f7d1f2073b17b9c25c9ab54a659c575fafb132be5dc556a54d51aab8451c87e1ff54b575dd7b01992e0e1b160b6bc5729b
+MISC ChangeLog 179157 SHA256 79a9398a5e671536907a0758442fa9c543a6fbd7b6eca32f8be8b3cc07e38e8e SHA512 633796f2732605bcf60d3d0a62d5bd063f778a4c566713e849412c46573387e0b95144a85a762072eef799ed53dc08d04183226607e5b8ad46c8ce814b27c4eb WHIRLPOOL ccbc49ac11ea614973d76ed65f7da42aa28de5f42622aba84bbb42aa46d6cc0af6ab080c7e91164219f15e16e52caf5e91ef5898f0c773bc2140021ed8515689
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150714.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150714.ebuild
new file mode 100644
index 0000000..01155e5
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150714.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-14_00-01-56/zip/netbeans-trunk-nightly-201507140001-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 59ab16d..8f950b9 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_p20150714 (14 Jul 2015)
+
+  14 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-cnd-9999_p20150714.ebuild:
+  updated to the latest sources
+
 *netbeans-cnd-9999_p20150713 (13 Jul 2015)
 
   13 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index 629705a..50f4def 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -63,6 +63,7 @@ DIST netbeans-trunk-nightly-201507020001-src.zip 208088424 SHA256 1dde0fd1452c74
 DIST netbeans-trunk-nightly-201507090001-src.zip 208130931 SHA256 5d73ccaddac610b27ab8aecaa95f5ef920a833291d2573daeb29f1f79eef1864 SHA512 6405717c46d506dbaa744fd33ba88daf3037e9d388482d808a6eeab292a42d99e76eea4494639725568239dc939444b0357a3f55b364a57256e93f5252efb7d5 WHIRLPOOL 9bddee309d416454d25c497074ad9e2ff23b1e52de90975bbea12412524fcf44e384eed0b14ee7f0f1ae1988523a74281bef1de58c14321aaefa4f9ef1bd9ba5
 DIST netbeans-trunk-nightly-201507100001-src.zip 208139985 SHA256 ede6f00ad37a28f1fa7c825e0f86ada8e314a969db3ea1884d21b6cced8dd527 SHA512 49c255eefd2affd8206082b04cb2127138b841d9ffa5f175aabfdec0703a81da0299bfc7bf55404829b493cd530e2db5570f4a19e66cf5af83b2081ed90a43ee WHIRLPOOL 6f1dd8b72445a31428e310cba1de99f0223c57c6b24f178d9cf5855633d5da23d1a87a130267b9da9697fbf28d7dc7fca2a0a341af9936f443cb9e1dc6bf89c2
 DIST netbeans-trunk-nightly-201507130001-src.zip 208143364 SHA256 f6a745a4112c25988071e5add63f52b567ea416e56eb1c5ac1f0caa40b2fa47d SHA512 2a01dde8445619c79b837bc51d1eb5fb9136dc0ad74d1e73df9d45748baa7b41032c10a76d26505fcf783193978c25907dbb2fc93a0e54f8b470ca2a6d7b9a8c WHIRLPOOL 095f94bb313aa828e0d0e972e2ccd69015e300023d7ce51569963eefba61146421f5a1a015c28fa8885445bbf42987367d18ed57da98e3b7f6521bddd3a4aaa5
+DIST netbeans-trunk-nightly-201507140001-src.zip 208144479 SHA256 9daca7bafaeb7d4e4eed58ecec4ba487f11fd6fd4b6790c719d4f428929588d4 SHA512 96adc2194d3f005216677ccdffc1ac51ecac1c2a13ec3f29b177e553ea9f5a36d9c9010c7f6454612b78a7dcb5f5ef08197e1113701bdaa0c727b9c352422c3f WHIRLPOOL 4fecb0c62019a2fc3522db07513eba2b877c01c856ac2b727329cca7ff86d573ef493a813b943558c06da3d6bc3109b5082e7ccb356318e6aef374eadeddee51
 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_p20150702.ebuild 4796 SHA256 4afa87b8026cab529cf593cdde
 EBUILD netbeans-cnd-9999_p20150709.ebuild 4796 SHA256 77eb8517b79df3e097d120121e45426a13cb89af25cae3c9aedc8167f013a495 SHA512 5444db95eead8a764113a4ecf895dafc0d2b5e6d7780725b0e6bde08737b679f747f5c8cedf9cea88cf712b83c618c8accaeed707825611175a8465202a1a287 WHIRLPOOL a2ff3b9504128566eee1a18ed0fe9abe6cdea873badc0869a415fb1a6899a0d81fa54961ab7fb10b14237e621b625e4fd6c8c28ae11d1a8d9d0ef33bb621c212
 EBUILD netbeans-cnd-9999_p20150710.ebuild 4796 SHA256 a3df9b198db497a616fac8bf8744189ba80f24177c21b67c3029333ba55f77a7 SHA512 7a8d68b81f0575b188c613761453e4f08db47398a071a94c0652799ee6682db913d027d7ec482a531a081a2e77466344b370f19daeed27d474f1b154405cfa95 WHIRLPOOL b67ad31d066b8be211aeed7cd9459ab52fa43243148e8f3ff7fd9474d0413280dd8aa3823805689d84ed0650433fe7e166928c029e76f60f5af0eddec62504ae
 EBUILD netbeans-cnd-9999_p20150713.ebuild 4796 SHA256 035ef2ba92b66b1d1086bb336e4854e315a1c47b79db7df0a0a1bdae8682e0ab SHA512 a3008d850ef9c7e4a75f19a320b7bd4626bfc9a415d8808f5f410f662c136ee19adf75026665cd961ba2d41c662a479c15541769cbd04471f5a107b7f754286e WHIRLPOOL 956ba7e0bc79ff8c5937d4ae074f3153e6c46819a0d0137e27231e9f2c63164a85583ca9b10ae961781b6bfc61747f19228e9e50d74e8e7dc5c53c825deb4911
-MISC ChangeLog 163326 SHA256 32668a45d3d407a20b3f0c9b11a3df64dfd1593a387a6457d4730092b98ec9a6 SHA512 a513de44a6d9f273ed008c56bac32045ae1b2e0bda4d626074cc7dd1f8ffb334a54c147ee4302b5bb26f7cb68267e4a885a84c60f6cfae5f9f3eba6d2b724d1d WHIRLPOOL 920a8566f4225cd17123f6e6db3e8322f71cdee4f2bc14b68f4921721d29cdc89ace057458e6cf6f0006a2831042e26b3e0e2d577d573f100d21fb6f808946be
+EBUILD netbeans-cnd-9999_p20150714.ebuild 4796 SHA256 8fc0db063174cf8ff29adc574501965831cd95745e3043567f613dd79d52b359 SHA512 f9452c4333eb5efdc6fa9df818c57b67cc6f04873df2ee7dfe0cf42b12b68b09445f28621a6ab582f21c7b51ba8e8cbc12cda7ebbc79350885bd6dbc88940496 WHIRLPOOL f5ab5f9fc5ba51f763a676d6d5140a08942773045c46b02bd751cf16915715ed1c8c03db41b171627a03d3934a832ac36f794fb497b4fde7d2ad63022202c7e1
+MISC ChangeLog 163494 SHA256 13ac5686e5366b741b86fb02472ba9fd8eb9e52112fed4646e550c1efa67d8b1 SHA512 2477706780b26619ca79fcd27e1d6e533bf2e6310c2a7c94711a3b186c88487388c87bc43a979307845fbdbd29232bcb9e2a04db5b5574d7028764671bbed4e7 WHIRLPOOL 58e64a1376f1cf0995370acf81a271ea47e7dad7e2a2260af2586658d35a4300af8528ea1badde645ac539f02d70b344fc6362fc2d2699ced123715e3b60685b
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150714.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150714.ebuild
new file mode 100644
index 0000000..c0ca5a8
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20150714.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-14_00-01-56/zip/netbeans-trunk-nightly-201507140001-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/38733D0432C0C5CBE3AF36465AB7DE2B6170E98D-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}"/38733D0432C0C5CBE3AF36465AB7DE2B6170E98D-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 e100cea..5f6faad 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_p20150714 (14 Jul 2015)
+
+  14 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-dlight-9999_p20150714.ebuild:
+  updated to the latest sources
+
 *netbeans-dlight-9999_p20150713 (13 Jul 2015)
 
   13 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 40683aa..6dab8c3 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -43,6 +43,7 @@ DIST netbeans-trunk-nightly-201507020001-src.zip 208088424 SHA256 1dde0fd1452c74
 DIST netbeans-trunk-nightly-201507090001-src.zip 208130931 SHA256 5d73ccaddac610b27ab8aecaa95f5ef920a833291d2573daeb29f1f79eef1864 SHA512 6405717c46d506dbaa744fd33ba88daf3037e9d388482d808a6eeab292a42d99e76eea4494639725568239dc939444b0357a3f55b364a57256e93f5252efb7d5 WHIRLPOOL 9bddee309d416454d25c497074ad9e2ff23b1e52de90975bbea12412524fcf44e384eed0b14ee7f0f1ae1988523a74281bef1de58c14321aaefa4f9ef1bd9ba5
 DIST netbeans-trunk-nightly-201507100001-src.zip 208139985 SHA256 ede6f00ad37a28f1fa7c825e0f86ada8e314a969db3ea1884d21b6cced8dd527 SHA512 49c255eefd2affd8206082b04cb2127138b841d9ffa5f175aabfdec0703a81da0299bfc7bf55404829b493cd530e2db5570f4a19e66cf5af83b2081ed90a43ee WHIRLPOOL 6f1dd8b72445a31428e310cba1de99f0223c57c6b24f178d9cf5855633d5da23d1a87a130267b9da9697fbf28d7dc7fca2a0a341af9936f443cb9e1dc6bf89c2
 DIST netbeans-trunk-nightly-201507130001-src.zip 208143364 SHA256 f6a745a4112c25988071e5add63f52b567ea416e56eb1c5ac1f0caa40b2fa47d SHA512 2a01dde8445619c79b837bc51d1eb5fb9136dc0ad74d1e73df9d45748baa7b41032c10a76d26505fcf783193978c25907dbb2fc93a0e54f8b470ca2a6d7b9a8c WHIRLPOOL 095f94bb313aa828e0d0e972e2ccd69015e300023d7ce51569963eefba61146421f5a1a015c28fa8885445bbf42987367d18ed57da98e3b7f6521bddd3a4aaa5
+DIST netbeans-trunk-nightly-201507140001-src.zip 208144479 SHA256 9daca7bafaeb7d4e4eed58ecec4ba487f11fd6fd4b6790c719d4f428929588d4 SHA512 96adc2194d3f005216677ccdffc1ac51ecac1c2a13ec3f29b177e553ea9f5a36d9c9010c7f6454612b78a7dcb5f5ef08197e1113701bdaa0c727b9c352422c3f WHIRLPOOL 4fecb0c62019a2fc3522db07513eba2b877c01c856ac2b727329cca7ff86d573ef493a813b943558c06da3d6bc3109b5082e7ccb356318e6aef374eadeddee51
 EBUILD netbeans-dlight-7.0.1.ebuild 3624 SHA256 499a9303a1972ee89dfa2685e1dc1e4511c7531ff3b29caadd1136ba25dee82e SHA512 ad60adc5d64f93d03e27170311ce7bd0a6952c8b41cdc51385f8efc9140593201064d162b3130bff7a003570de11963d375d3676476115b1129ac74632d4a227 WHIRLPOOL d68dcdba50b2565d40e1adc484b51c1ed0171c2fcf99fbee08a221e6d9767f96d161d45eda612eb4c4d62e0db6826e2cd124b83e11ee2f7c9bfb6a440ec6821d
 EBUILD netbeans-dlight-7.1.2.ebuild 2935 SHA256 dc7d110b80174b1baeaca9c005e2cc9167540f186c7794067cfb45d335251b9a SHA512 7dc2db63ee40a3e64375eb49e669c54f88cc532d7ac8c7320329f8378a3be15ebc4536208ea2975c7fe4a9b3f2ac60d0ec5b8c9a9da392587fb04838f101e0ec WHIRLPOOL 1801653d9e146eba02642dbdb0a39c235a40e5d3d5ac8d4d5b8d2a570aa62330638355ee8df76693db177c58bbf31271342215c70d7e198e4b6bd905984ed9c7
 EBUILD netbeans-dlight-7.2.ebuild 2650 SHA256 9b0c0049b7cf6894cd44327c3697d4ddfb0dba2aebd6aabc1821b550932cd69d SHA512 0584c2a1cc65193673bded284c454b430fa3f5774c33d704922977d25ed26bf88d090670e330299c85ada2e897e5f124ae9f635a6f8be7d7fd10740482df7eae WHIRLPOOL 1c27b0c84a34865cb8a84062127f49aefcd245fa16fb825d7ee57d24c3f5841935242c16b3250319078762ce4e8aa5bc8dbd8dbe497b39af8e027b9e39ee585f
@@ -74,5 +75,6 @@ EBUILD netbeans-dlight-9999_p20150702.ebuild 2995 SHA256 1c034e629e00f8dfe3b3192
 EBUILD netbeans-dlight-9999_p20150709.ebuild 2995 SHA256 d586ac52ad2470df138084b7550f6046f8c7c13184a374b2c739275174e60a91 SHA512 2c86c416093bc318c88047357682e1da0603c8b0779bbd521b40ebf68961ee9fa9fa2d48e25a9dcf5296fb21fb6c90a36ca8134925f391716d159ac6d4bdb52f WHIRLPOOL daebb33a1867583f75af3bc71307a5a65c2603d609b4be4e4f6db8a0cfe10a461cc7abb16bc5b42b7066c3e5bbaa8d30f69a2534734e432a58db614742259c47
 EBUILD netbeans-dlight-9999_p20150710.ebuild 2995 SHA256 0eb4ea181336fda35c4339f4b1ce3122b7f09b5531fa179839da53fa02252f56 SHA512 4e7df7ab53f48e932e723aa7e5032da4eea1b0073addb742e14d812dcbc5b23c412e936dd4a10a467385c47980a86c5770f1f0f975f51f63640ac8ae5fc2a86f WHIRLPOOL dd49e641ee734e6f73b822b23b1d4c8f3e6c74dfc2b3b68bde06e663f90a1694edeae81d666ac64c59d0d6dfcaa4a843c7b678c5dbf7b530411bae9ff94788b5
 EBUILD netbeans-dlight-9999_p20150713.ebuild 2995 SHA256 2ca21f72070814b72461e12df121e8de6f270338b56fd42f8839efbdf6e6353f SHA512 2626e667e648f48fa30fc6b60fd25671416d73ea2898ffa3ed0060da14d106d13cc8cb41815f94d5d675e81c6b64164ddcbcaf8112a962e97bdc043b08b759a3 WHIRLPOOL f31108ca8ff22d1b73d2ffc149f8b8945077d958fa7e55755ad968a49c40cb925f451ee3d8e4309a881093cf08bbb5ce1a0514b26e6bd24bcef80dd1ee227ece
-MISC ChangeLog 170480 SHA256 444bfce0ce56ef5c66e386b534890cf668bd5e85d3e68cd10598da5d7f7b49f6 SHA512 5d059fe7cecc9dfd0e5df2defd98733fddb8f94127b59b0f9820be1970e672461906a4befa92270b791cc58b1a250959a8496483475f7bebc66c354d9215937a WHIRLPOOL 4f541cf5d54361a73d7460b8d8fd072872ed0e1d81d41727087c9079598fc2316a55cb9f007858ad312268d09e61b327751d89a7bb953e6e8c848fefed7b6c4e
+EBUILD netbeans-dlight-9999_p20150714.ebuild 2995 SHA256 72a3464d5a634a1da3f4e18dc9b16bfef1e3b541cf5a1f2914d94e0c73b7c6e2 SHA512 be9dc1c5eeebb7d0e5e063d05dd702c9f4863e49eaad8efda65581cd06b7d6c878826a7104328902a10dc7a646c818c8160804fda1860348d64cd34c31c818fb WHIRLPOOL 7a0e9bd842d835441596d6ef89f32b47d11204d648b1037cdc2b0de053f57b93f1e4130c7aa46d4813bb6a21dc748671c1bb7ce7243514884ee37573813ac7f1
+MISC ChangeLog 170654 SHA256 dbf4f5d56064cdfd2bfe5d4006803626ef42e8ff0d5852abde3a95f4ca411097 SHA512 e754728f07a2ad02204a5907545f20b782729c9bb42a5116ffab266b860401f394142f7b30ec6a6d4fc46075538f92c4312fade8e7af00986f8e05263670fdb3 WHIRLPOOL 3ba762c3b6a2165be6c708789db29a0ccb54b07e159a48d2ea6f2ca961fcf3ffa00983ede790bb328e4f559edc7bedf921882203608848683e095f3148a9268c
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150714.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150714.ebuild
new file mode 100644
index 0000000..5b0f008
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150714.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-14_00-01-56/zip/netbeans-trunk-nightly-201507140001-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 371d304..54ba6d7 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_p20150714 (14 Jul 2015)
+
+  14 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-enterprise-9999_p20150714.ebuild:
+  updated to the latest sources
+
 *netbeans-enterprise-9999_p20150713 (13 Jul 2015)
 
   13 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 024315e..f6cd539 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -126,6 +126,7 @@ DIST netbeans-trunk-nightly-201507020001-src.zip 208088424 SHA256 1dde0fd1452c74
 DIST netbeans-trunk-nightly-201507090001-src.zip 208130931 SHA256 5d73ccaddac610b27ab8aecaa95f5ef920a833291d2573daeb29f1f79eef1864 SHA512 6405717c46d506dbaa744fd33ba88daf3037e9d388482d808a6eeab292a42d99e76eea4494639725568239dc939444b0357a3f55b364a57256e93f5252efb7d5 WHIRLPOOL 9bddee309d416454d25c497074ad9e2ff23b1e52de90975bbea12412524fcf44e384eed0b14ee7f0f1ae1988523a74281bef1de58c14321aaefa4f9ef1bd9ba5
 DIST netbeans-trunk-nightly-201507100001-src.zip 208139985 SHA256 ede6f00ad37a28f1fa7c825e0f86ada8e314a969db3ea1884d21b6cced8dd527 SHA512 49c255eefd2affd8206082b04cb2127138b841d9ffa5f175aabfdec0703a81da0299bfc7bf55404829b493cd530e2db5570f4a19e66cf5af83b2081ed90a43ee WHIRLPOOL 6f1dd8b72445a31428e310cba1de99f0223c57c6b24f178d9cf5855633d5da23d1a87a130267b9da9697fbf28d7dc7fca2a0a341af9936f443cb9e1dc6bf89c2
 DIST netbeans-trunk-nightly-201507130001-src.zip 208143364 SHA256 f6a745a4112c25988071e5add63f52b567ea416e56eb1c5ac1f0caa40b2fa47d SHA512 2a01dde8445619c79b837bc51d1eb5fb9136dc0ad74d1e73df9d45748baa7b41032c10a76d26505fcf783193978c25907dbb2fc93a0e54f8b470ca2a6d7b9a8c WHIRLPOOL 095f94bb313aa828e0d0e972e2ccd69015e300023d7ce51569963eefba61146421f5a1a015c28fa8885445bbf42987367d18ed57da98e3b7f6521bddd3a4aaa5
+DIST netbeans-trunk-nightly-201507140001-src.zip 208144479 SHA256 9daca7bafaeb7d4e4eed58ecec4ba487f11fd6fd4b6790c719d4f428929588d4 SHA512 96adc2194d3f005216677ccdffc1ac51ecac1c2a13ec3f29b177e553ea9f5a36d9c9010c7f6454612b78a7dcb5f5ef08197e1113701bdaa0c727b9c352422c3f WHIRLPOOL 4fecb0c62019a2fc3522db07513eba2b877c01c856ac2b727329cca7ff86d573ef493a813b943558c06da3d6bc3109b5082e7ccb356318e6aef374eadeddee51
 EBUILD netbeans-enterprise-7.0.1.ebuild 16338 SHA256 03ea08daaf5d4c5592937929bac33b4af3bac00a23f2167a7ef7b3c172a72abe SHA512 4d24162c7920b9a1c65e6c6753900ead387a4941c2db98b522631bb09889c281bce048a74e2e584f8b5732cfaad1d7125e0cfd37aa2dc81fe85160b0e123ccd8 WHIRLPOOL 35eb648c37cb6e59aca7969c1074c2c280814529aa7ec3c3191b0d3f2a92fa24e1a8d981f343e4217fff52f6100b4884b970df734c45145759889aa6e6661ff2
 EBUILD netbeans-enterprise-7.1.2.ebuild 18060 SHA256 f63721b8ce5e1afbc58f783348f66f1e3501be519a1c9c1287ef860acc64ceda SHA512 2ca89ec8f89f106a284136d4d0ed52fe3bcf49c650d56ded6e62306c531e5e41f62b8aa923cb544842cf6e34e5f433fecb278bc1515abac987e2d00fb68ffa26 WHIRLPOOL 879067d72285aa6c7273e84ddc3dfef7d09c7cb9f9a6c279fddfbd3eea6439dea053d3c648fcd56d47ef2292db14d101307eb1aa8b3081dfcdbc3dac4d0c3ed9
 EBUILD netbeans-enterprise-7.2.ebuild 17752 SHA256 2f46916df731fe33c5d4626ae580a77686c392932a3388f755324bc3184bd636 SHA512 3543d033b971108fa2b8e6633ed640e812a83b34807e1cb5a69d425823d1fec1c13ecba3cc36fa4504fbfd6297e7eff1ecabe07d01725d9f13c99ffd70d220ba WHIRLPOOL 512753153bbf714ae3fbf9c580f350234d88bd5ce5690e7bc0fadd1c355bd38c2a5c1e9adb7993c3678d759661bbfb1654b0630e3535a2fb9198742fa7fd2c1e
@@ -157,5 +158,6 @@ EBUILD netbeans-enterprise-9999_p20150702.ebuild 15937 SHA256 8fc6c97ea596f42c52
 EBUILD netbeans-enterprise-9999_p20150709.ebuild 15937 SHA256 87eaff639766d1ec927aca3b4758989c738f8b5c529f2236b16c36a0427798fa SHA512 943beddac0e8980f0746ea806e7483416619560e9af749c284fd4c9c450f240c84cdc6e3c7d5e00353ef6dd75bfdb7cec52bb7bcebcfe04b932f4a1245c70b41 WHIRLPOOL 9b6660891729b22094b1fa6349c7325853e8aa050930e0105f867c972cb404976d0cd8d351aa144e96c06e3f458ae0678aa60a6b758017de4e9e9daf02d7317c
 EBUILD netbeans-enterprise-9999_p20150710.ebuild 15937 SHA256 940138b52dea154460d664d394f99c868629283fa095fa62252b6fcb3f00ee70 SHA512 f3c5a16541eebb6ae57d2ecbdf4e24481f1c1e1933cea3d285779095ccecaf68366395c2f37e23cd9c65ce7e7ebd1ed0d8cd45662dad72e438f73ca1db71365e WHIRLPOOL 4d6fa155471356fb572c33892d29a46ec502f14bbbdc89cf187498a98a90a6d66c6e73b841d623b881beaafdf5ff649ec5522d66f9013f4e18db29533bb329ca
 EBUILD netbeans-enterprise-9999_p20150713.ebuild 15937 SHA256 6419377f3996100986931eb270a7a70d615e33aee66495be2ff18842d42c62c1 SHA512 eac97c64bf7d0cc218c2d011e3cd459f2fe0a4b8c38110c10c8d7daf20833fbabacd02da9340088d8eab78701212df4e47d1ba9437864ebd3722191175ce214e WHIRLPOOL f32ed24f489d4924dec03db81d55231db3c2683e61c6ef4e640bfdc049ff106d33c938fa2fd88160e654855d5177ae95a74e6e5360732cc728be67d2a4872095
-MISC ChangeLog 179500 SHA256 f75539f71f9c56e9d3ee6d37d56da1d3822e3c97797825a8c5b069324cfdd796 SHA512 a14df869e8a70bab28a0cc7d643ab79378d613fe06bc5ac7f845f09b14665c853cf18696da0f21b5abaf268fb4cbfa25874d310d88ca9c315f0b419baf3293fb WHIRLPOOL ee923d77dba04faa3f5988bf8433da68a37cd9b8722f4421e5991b771918f68c67918000d423cb6f8b35ad6f967d915e28e37e39165b444a10c15895312fe90a
+EBUILD netbeans-enterprise-9999_p20150714.ebuild 15937 SHA256 fe0f28e98967b40a9024b173aa965998f049ab6bc0c4f13b649ad0e22de7d4a8 SHA512 2d399e70148ff113c07813e8b9c1a957d8e4690c35d0694acaba78d58ce77f4aa7d73492fee02f52944d141f3dab0b187a44f8ee85370a7a21a8c4f6894c748d WHIRLPOOL 3c4316b96f61c3ff9ec1ab10e7761f8163d6b584a616b7051f9ffc5566f99851dea703ef65ca628c0748df0d445883c0824f42931f0807e0d947df9ce0a0704a
+MISC ChangeLog 179682 SHA256 3c127f58e1203503e6846b15618ec49b7e3cac30fed08aa482bf32e085cf3f90 SHA512 670374feb6e0547d9f48e45929fe2fb6cf00e47a448247e19e85c656b955679c2ec1f29248a820a051cadc306f92928c3de46c30b1e00616686ecc3f0a4bd2bc WHIRLPOOL acdaf1423369e3cdb1737947242a7d2df36cf63e9aa3332f901568e8556577572b16fcb9157632bcd189189bbf710059a9558e377b1c9f3085255318431cb7d1
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150714.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150714.ebuild
new file mode 100644
index 0000000..decd815
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150714.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-14_00-01-56/zip/netbeans-trunk-nightly-201507140001-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 9d878c6..25b6171 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_p20150714 (14 Jul 2015)
+
+  14 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ergonomics-9999_p20150714.ebuild:
+  updated to the latest sources
+
 *netbeans-ergonomics-9999_p20150713 (13 Jul 2015)
 
   13 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index e145242..341a272 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -37,6 +37,7 @@ DIST netbeans-trunk-nightly-201507020001-src.zip 208088424 SHA256 1dde0fd1452c74
 DIST netbeans-trunk-nightly-201507090001-src.zip 208130931 SHA256 5d73ccaddac610b27ab8aecaa95f5ef920a833291d2573daeb29f1f79eef1864 SHA512 6405717c46d506dbaa744fd33ba88daf3037e9d388482d808a6eeab292a42d99e76eea4494639725568239dc939444b0357a3f55b364a57256e93f5252efb7d5 WHIRLPOOL 9bddee309d416454d25c497074ad9e2ff23b1e52de90975bbea12412524fcf44e384eed0b14ee7f0f1ae1988523a74281bef1de58c14321aaefa4f9ef1bd9ba5
 DIST netbeans-trunk-nightly-201507100001-src.zip 208139985 SHA256 ede6f00ad37a28f1fa7c825e0f86ada8e314a969db3ea1884d21b6cced8dd527 SHA512 49c255eefd2affd8206082b04cb2127138b841d9ffa5f175aabfdec0703a81da0299bfc7bf55404829b493cd530e2db5570f4a19e66cf5af83b2081ed90a43ee WHIRLPOOL 6f1dd8b72445a31428e310cba1de99f0223c57c6b24f178d9cf5855633d5da23d1a87a130267b9da9697fbf28d7dc7fca2a0a341af9936f443cb9e1dc6bf89c2
 DIST netbeans-trunk-nightly-201507130001-src.zip 208143364 SHA256 f6a745a4112c25988071e5add63f52b567ea416e56eb1c5ac1f0caa40b2fa47d SHA512 2a01dde8445619c79b837bc51d1eb5fb9136dc0ad74d1e73df9d45748baa7b41032c10a76d26505fcf783193978c25907dbb2fc93a0e54f8b470ca2a6d7b9a8c WHIRLPOOL 095f94bb313aa828e0d0e972e2ccd69015e300023d7ce51569963eefba61146421f5a1a015c28fa8885445bbf42987367d18ed57da98e3b7f6521bddd3a4aaa5
+DIST netbeans-trunk-nightly-201507140001-src.zip 208144479 SHA256 9daca7bafaeb7d4e4eed58ecec4ba487f11fd6fd4b6790c719d4f428929588d4 SHA512 96adc2194d3f005216677ccdffc1ac51ecac1c2a13ec3f29b177e553ea9f5a36d9c9010c7f6454612b78a7dcb5f5ef08197e1113701bdaa0c727b9c352422c3f WHIRLPOOL 4fecb0c62019a2fc3522db07513eba2b877c01c856ac2b727329cca7ff86d573ef493a813b943558c06da3d6bc3109b5082e7ccb356318e6aef374eadeddee51
 EBUILD netbeans-ergonomics-7.0.1.ebuild 2884 SHA256 e8e4a785fc11b6d0d3c722826761581b8c9c779c5460dc7d1487b3154f4402ab SHA512 3ba2810e650726f48fbdb1bc0c58b6ee1e7d9d29d4be3b27c00bc981b773f26d979fd90154184276e044eafd1d4d8940b47d6f0f58589f9cff7fbadef5fbb05f WHIRLPOOL 5fab7fe6492f91bd0e97a8a95c0652266d771e9b60957e16ce6ff683c1e38081372151cd8c7bea44ee1f1dd7bf435f8b00b9a1a23e4c6106c990794c6093ba10
 EBUILD netbeans-ergonomics-7.1.2.ebuild 2893 SHA256 cd56250980429160b8fa9deb17f15050d016394d5fdef19bf772cf29988c86d8 SHA512 32d4556218791a32efb8cf8ec8303f7e8f27bfb03b97af0c66cee717563c7e02fcd9e350b0425ec0cec28ab09865d4815aba1471ee958e05e7c42e421a7f71c2 WHIRLPOOL 318c8528c2338c1e2f6e342c263be52753fa74c9ac934b0ee60fe0fff2146e86d1761fef8eaeca8eab844709bea2196fbe181fad1f689a9d5b9994da3271b4db
 EBUILD netbeans-ergonomics-7.2.ebuild 2876 SHA256 ca7184ac24c255941c4ec3e686c4237ef0af4be7242c44417fa799813083515e SHA512 c6537bedf2fed4ea914c74a208124fe692af837ab2c81c98b8aa0347cb9d5af496378a8c042437facced26d3b42b101225dfa8b81dfc3d6ec4e3e5613e359f72 WHIRLPOOL c7e4c08ace118690f454dbf6a9040bff3e7013c646947fd02b05bca2b4d802393b6eca3234c6228f8e4df4da1ed193ecfd93c848038e4dd9ae3f50959692aa15
@@ -68,5 +69,6 @@ EBUILD netbeans-ergonomics-9999_p20150702.ebuild 2919 SHA256 eeeac4f5bab4f2917e2
 EBUILD netbeans-ergonomics-9999_p20150709.ebuild 2919 SHA256 be57696d7eeb2cd77d0f4750831f0edc0ec9b69beb8bd87ce817e7d1169e093b SHA512 8e7556bc408d60c877cc4f69c7bba76e2c90adb21c0959c6aa67a7c2b2125e5ede2d3f4603b81e8cc25e92b14cbaf2c6e5822ef4d44e33a3e2f81bd40a5251bd WHIRLPOOL 1a3ace9d5820ee62d9616f2a13e874a69e6f61fb81954d5ef5c74d7e740f32487df9bd300ee8a0acf6f041d7175e5b36f9f734962222635a2bc10c0cd66280e3
 EBUILD netbeans-ergonomics-9999_p20150710.ebuild 2919 SHA256 7d115315ccffd2471b3cab0e9c8acaa499b5f3faac565bd5f1b25b6339fe06a1 SHA512 f1b7d351b549a0086bf4e087f07aec3d56b0b63b810f4f90c0f187e0460a0830df8f73a5826cd1bbea61880f16c15a5b45e037eab9717c8163806c689ec5373c WHIRLPOOL db8bdcc1b22d9dbe2ea95f0d7a53a1bdc4462e01215e3ba1750b7072124c3c09bf5394f1c14a4b27e4aea6d859076314d24bacd59e04dadfaa6e42f9e8c28ebb
 EBUILD netbeans-ergonomics-9999_p20150713.ebuild 2919 SHA256 dac80babfd9636a1992b41fa7e9b488fe7255026651d9de0aee99a39673bde15 SHA512 d86dedf389aa58faf5d32392b86e0e12063762199bf578323f917a0a2a97f8b3f964086e85682ca4cff09abb66083749753b3350bdce7381906675f692cfa014 WHIRLPOOL 01c574fe6d98092d5687c69bb2a6f38261a2a4ac58a9662915a402784f41d095b423e20b87c03b8c9def1ed9537a2a193af5cf12d0273f96957d091ded9e85a9
-MISC ChangeLog 178975 SHA256 627d5129745d1e5101880df9f0a2ab9558dcff31ca9de935561bbf2cf8d37567 SHA512 82d88d7a6ba5c92fe3e01893af96ce0468ccd6fb3c2cc9ed5e8e8396c5c40e8ae64f2ee3c80af9ed7b01c52327d1fd48b8e43c10d8aad4ede55763756294092d WHIRLPOOL 747c18d25f6d866b3f1bf412fc8340d7d663a4a85a4d97b1f5f577927b91896bc8df62e8250d824ba38df76deb362892ea2cb1eb0c9a74bdbb5aa92f0c85c28e
+EBUILD netbeans-ergonomics-9999_p20150714.ebuild 2919 SHA256 98bad55d138c7051aefc238ce2d10f48df49bc87602ab62269f97a7935b22a62 SHA512 342415c67c9fc8adc7611d2051850238a6dc7d350f4cc4ba5ef356c12596704b062d058955754d5216f0de47db8a644c2ed10c7014040216f4d97089ef3eec8f WHIRLPOOL 27a8fce0e19bf9ed9559b39e2ea507194564de25258912f8359d9100c57a7990ea301c21fe78a9efcec35118fd5eededb6c6e85e6e3fa32636fa3ea1bf76a58b
+MISC ChangeLog 179157 SHA256 b37ca5b46997d8e55abede7dd0b285260cac7549995b8b94ee71be3190d152e3 SHA512 7ff96f18127f4e6572b7f6eed577ce471b6a30a951854544a76ffd935cfd938ceffa1ac93c22fc781fac1f23e32b6c1c041c92f951e5351ea3036887d33c9c8e WHIRLPOOL 2d333d5f3e8e896bffe1e38319fd470b7aa21d794fbe6bfff335eec561896bc8347727f0fcef8df2abd694d9ed15ec9f0a0d6e1cf2f9cdf114f26fd9488af21f
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150714.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150714.ebuild
new file mode 100644
index 0000000..bb174cc
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150714.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-14_00-01-56/zip/netbeans-trunk-nightly-201507140001-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 11cdd91..14d94f1 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_p20150714 (14 Jul 2015)
+
+  14 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-extide-9999_p20150714.ebuild:
+  updated to the latest sources
+
 *netbeans-extide-9999_p20150713 (13 Jul 2015)
 
   13 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index a872929..4cf56c8 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -35,6 +35,7 @@ DIST netbeans-trunk-nightly-201507020001-src.zip 208088424 SHA256 1dde0fd1452c74
 DIST netbeans-trunk-nightly-201507090001-src.zip 208130931 SHA256 5d73ccaddac610b27ab8aecaa95f5ef920a833291d2573daeb29f1f79eef1864 SHA512 6405717c46d506dbaa744fd33ba88daf3037e9d388482d808a6eeab292a42d99e76eea4494639725568239dc939444b0357a3f55b364a57256e93f5252efb7d5 WHIRLPOOL 9bddee309d416454d25c497074ad9e2ff23b1e52de90975bbea12412524fcf44e384eed0b14ee7f0f1ae1988523a74281bef1de58c14321aaefa4f9ef1bd9ba5
 DIST netbeans-trunk-nightly-201507100001-src.zip 208139985 SHA256 ede6f00ad37a28f1fa7c825e0f86ada8e314a969db3ea1884d21b6cced8dd527 SHA512 49c255eefd2affd8206082b04cb2127138b841d9ffa5f175aabfdec0703a81da0299bfc7bf55404829b493cd530e2db5570f4a19e66cf5af83b2081ed90a43ee WHIRLPOOL 6f1dd8b72445a31428e310cba1de99f0223c57c6b24f178d9cf5855633d5da23d1a87a130267b9da9697fbf28d7dc7fca2a0a341af9936f443cb9e1dc6bf89c2
 DIST netbeans-trunk-nightly-201507130001-src.zip 208143364 SHA256 f6a745a4112c25988071e5add63f52b567ea416e56eb1c5ac1f0caa40b2fa47d SHA512 2a01dde8445619c79b837bc51d1eb5fb9136dc0ad74d1e73df9d45748baa7b41032c10a76d26505fcf783193978c25907dbb2fc93a0e54f8b470ca2a6d7b9a8c WHIRLPOOL 095f94bb313aa828e0d0e972e2ccd69015e300023d7ce51569963eefba61146421f5a1a015c28fa8885445bbf42987367d18ed57da98e3b7f6521bddd3a4aaa5
+DIST netbeans-trunk-nightly-201507140001-src.zip 208144479 SHA256 9daca7bafaeb7d4e4eed58ecec4ba487f11fd6fd4b6790c719d4f428929588d4 SHA512 96adc2194d3f005216677ccdffc1ac51ecac1c2a13ec3f29b177e553ea9f5a36d9c9010c7f6454612b78a7dcb5f5ef08197e1113701bdaa0c727b9c352422c3f WHIRLPOOL 4fecb0c62019a2fc3522db07513eba2b877c01c856ac2b727329cca7ff86d573ef493a813b943558c06da3d6bc3109b5082e7ccb356318e6aef374eadeddee51
 EBUILD netbeans-extide-7.4.ebuild 3311 SHA256 8585e0b9eac3b9bb35d5b5e0152936f84708a824d76831930a3dfd3d196556b0 SHA512 19eceec7a634923b4712eb277a1ff9900a2eb4d9ac0a2c699175333c263f0c02baaf24eb30bd7919444f5c9df751186689b2d4359ca1c88dca02884d7c18c3cd WHIRLPOOL e64509f198c4d09851f98d5bd2ddd5b469b0a7c0f3122f391c17833e5d6d77b7a6c2fd9e942e34f2df42047504ad40593f97af9b2898450e769c7b012355c316
 EBUILD netbeans-extide-8.0.2.ebuild 3313 SHA256 d147df43b8e55de81e0429604a2497a82861864ae50fbb85368a3070e1c266c9 SHA512 8f2722ce12c1582ca6e9ed348fcb37b9969585037b5432e592e5dd6ef4b3e49c58783da5fe20f088bee07514e3b42de7aa36607900b285c32c4b91fa218df90c WHIRLPOOL 0fb074484787a5e0e688dc734efe027ff6dfd082dd63bc9bccc612f915fbbe33a4f93db6c43d345abc9c191e22ec196aada1e889d1240968916d54c69497a2d6
 EBUILD netbeans-extide-8.0.ebuild 3305 SHA256 b2d57e2e2d92760ead3d383fe4dd5b4fb9fc2807a9b58c6f40b44fc24072b8bb SHA512 6e7f12758188a564ef6b5cf8b0ffdf79e30d1021172d10f215d04e727bc4001e4385fd0961a26a6bb42638089e0919b1d4628a13ba11a3deac94d4693c7210d5 WHIRLPOOL adac8461de43669b7bb98ea8920c0a2944837211a37503b957221149d4b91c4bd92b6db160191990b838c474495c65f62c8a4bb9fdbcaa371b4648a335b1afa9
@@ -62,5 +63,6 @@ EBUILD netbeans-extide-9999_p20150702.ebuild 3383 SHA256 483d88479bf812b2f619fbf
 EBUILD netbeans-extide-9999_p20150709.ebuild 3383 SHA256 4e46ebdbf5d44146a8d2a0697c6b7b70e124d4047cd1d9309461c9792dc3cffd SHA512 21fc9880cda402061c98284fdacca0345ef373f61cb6ebfc92dfbd6cc700749f17e614725b312cbcd0dec2073749bf1a087ac017a7f9cac8dea026d48a500d13 WHIRLPOOL 8aa10cc790d9288b21303fc8dc446e18d97bc701143fd5bb8d04baf1b903e793984fa7bf7c81fe5beed131eb713cbfa8794b2d22ff1ae0b1771fe9df5cf3576c
 EBUILD netbeans-extide-9999_p20150710.ebuild 3383 SHA256 6a2fb625791eb9a5b76a4efab549d5bb3cba35f51ebe54f8b9851b354f40f492 SHA512 d3f47368f8b34c6757f15b6c2cd5ddd9581eb577c57e702a87b434859ad2d444d46faf71f3c6785f733a1a98c4e0419d5d5f471d882a6515802858a4b297f4f1 WHIRLPOOL 3f041fa8fea108ee71589dd1483f4626606f3fc766cda8a4ceb615a310d704bfbe4e70edb551ee93febc7e3da5fd272c36a6158a7c8ef0e20ea1712de701367c
 EBUILD netbeans-extide-9999_p20150713.ebuild 3383 SHA256 1036262272ddff7c603345733196b96291ee29eb140b1fea1bb10002bdc3a41b SHA512 a52708af15086d5a643191cddfa5970ef6b4e1277f354689b61842288fdd00ba8ae6e883c7fd084ab355b136b542c9a86b0becbb0f4e00bd0833c6f70d75f202 WHIRLPOOL 7c2c2906cb6bf483002566834552f237bfe11b28f8aba77740292c2fe2110d68b091b50bb0ec7829d56ff64718d3f2424763e3b56ad123f6dcc119eb077e65df
-MISC ChangeLog 102390 SHA256 95ed3a5d02f4261e67ded21c7fdfb4ba433556b9728c6a6934d3086b86496b0d SHA512 7f605e7ca8282bedae73953ae3354d708e2e763a61371654330907212dcb8ea6d9548680c1ff98eb09071284b9d76468a672b0b3b10236233b975978e28d25b8 WHIRLPOOL 09cdf57aa53ed984a9e66558e3e00042b5b10d5be3ee2d2c2da64af691d320d4da4da6bd1420fdda4621f34e5a6b9bbe1bc4737d3fcdb60e235776a5f2179b2d
+EBUILD netbeans-extide-9999_p20150714.ebuild 3383 SHA256 2d5c9033e8b180757698e13050eaeb9df1a8ab86f9579335021b213b7923ed38 SHA512 c9f632904d97f959fbe73ae7fcaeec6e3fcecbe21cf9ea7ba4f6247165479362b5a8ba32eb99b8b88007442ebfbe783489bf7616bf616dbb0145e120811515d6 WHIRLPOOL d77d32d4945f3aa4946e47d5e088c7860eb1a6c67a26e15f42f2b4169b766b20506bec614f646ea1087ac3718336a203a0ce383bf86ceabb3ce713ee973d1a5b
+MISC ChangeLog 102564 SHA256 72debc678a77150df00a558c5fdea83865e01753c6350fc868ebc699c8528c26 SHA512 9dd467a40726257e3c324684c57f6723c8df79e1e618f4386e0d9200822725c370921a9685e6d6d887eea5af8c2a9b1db9f2b51948ceea1f06ccd1d815d2af37 WHIRLPOOL cae2717bf3d4d583bb78ae24a079c24ce9e5cc922deeb4e3fc1f5fea70d16083ce56235562ce0cec6bffb3ace820b57241550eedd1a16130dc025d3d34369386
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20150714.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20150714.ebuild
new file mode 100644
index 0000000..e9db608
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20150714.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-14_00-01-56/zip/netbeans-trunk-nightly-201507140001-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 aa08eed..53fa512 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_p20150714 (14 Jul 2015)
+
+  14 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-groovy-9999_p20150714.ebuild:
+  updated to the latest sources
+
 *netbeans-groovy-9999_p20150713 (13 Jul 2015)
 
   13 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index 8ea594c..4d6fefc 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -41,6 +41,7 @@ DIST netbeans-trunk-nightly-201507020001-src.zip 208088424 SHA256 1dde0fd1452c74
 DIST netbeans-trunk-nightly-201507090001-src.zip 208130931 SHA256 5d73ccaddac610b27ab8aecaa95f5ef920a833291d2573daeb29f1f79eef1864 SHA512 6405717c46d506dbaa744fd33ba88daf3037e9d388482d808a6eeab292a42d99e76eea4494639725568239dc939444b0357a3f55b364a57256e93f5252efb7d5 WHIRLPOOL 9bddee309d416454d25c497074ad9e2ff23b1e52de90975bbea12412524fcf44e384eed0b14ee7f0f1ae1988523a74281bef1de58c14321aaefa4f9ef1bd9ba5
 DIST netbeans-trunk-nightly-201507100001-src.zip 208139985 SHA256 ede6f00ad37a28f1fa7c825e0f86ada8e314a969db3ea1884d21b6cced8dd527 SHA512 49c255eefd2affd8206082b04cb2127138b841d9ffa5f175aabfdec0703a81da0299bfc7bf55404829b493cd530e2db5570f4a19e66cf5af83b2081ed90a43ee WHIRLPOOL 6f1dd8b72445a31428e310cba1de99f0223c57c6b24f178d9cf5855633d5da23d1a87a130267b9da9697fbf28d7dc7fca2a0a341af9936f443cb9e1dc6bf89c2
 DIST netbeans-trunk-nightly-201507130001-src.zip 208143364 SHA256 f6a745a4112c25988071e5add63f52b567ea416e56eb1c5ac1f0caa40b2fa47d SHA512 2a01dde8445619c79b837bc51d1eb5fb9136dc0ad74d1e73df9d45748baa7b41032c10a76d26505fcf783193978c25907dbb2fc93a0e54f8b470ca2a6d7b9a8c WHIRLPOOL 095f94bb313aa828e0d0e972e2ccd69015e300023d7ce51569963eefba61146421f5a1a015c28fa8885445bbf42987367d18ed57da98e3b7f6521bddd3a4aaa5
+DIST netbeans-trunk-nightly-201507140001-src.zip 208144479 SHA256 9daca7bafaeb7d4e4eed58ecec4ba487f11fd6fd4b6790c719d4f428929588d4 SHA512 96adc2194d3f005216677ccdffc1ac51ecac1c2a13ec3f29b177e553ea9f5a36d9c9010c7f6454612b78a7dcb5f5ef08197e1113701bdaa0c727b9c352422c3f WHIRLPOOL 4fecb0c62019a2fc3522db07513eba2b877c01c856ac2b727329cca7ff86d573ef493a813b943558c06da3d6bc3109b5082e7ccb356318e6aef374eadeddee51
 EBUILD netbeans-groovy-7.0.1.ebuild 3296 SHA256 29c3d304eca5999e78550fd715dbcbef9d15639d4e4f17fa0e45a46803080729 SHA512 43a0ddb43354bb3c0b8e29004ab547da508662d037b0006dfd24250c49470ddc0384bfffb6423f1e3eeaca98410c5de8b314a69970189306869a16380ab098a1 WHIRLPOOL bf626cecf6dec0c51e7e0b95ac4ff26a795e44a5dabd25719eeb2244742d96d33cb20ebbd9a68728dc27d28b8e558a7e2a3ee318c2e4fde234e0b5e8d32e6a58
 EBUILD netbeans-groovy-7.1.2.ebuild 3305 SHA256 1e00f335b8cc1e90deec3c3251629ba699286b25be5b6945d135d271004dc34b SHA512 3a1d67d02054478ed15e11789292fcce3fcfd343b8feebde5e07a9463c380c644310603a3f9f984e8071b0b097075809dce423b888e1f2aed316cb90a562d20e WHIRLPOOL a790c1e186c4d1949de6b4dd975b929c132e3e7b7c455c7867bd1445f59fb6ace72b5c9adf09d0c6079718fdc6c34a0c5f0c9c437517b55b7ae109ce3e20b064
 EBUILD netbeans-groovy-7.2.ebuild 3160 SHA256 6d709b7cc07d7ebb59c3ede0a19c9890ca3230144d7f455cf24d984ac2f633b0 SHA512 e30c8d58165b87a39a356f8b813c593910cd2c247de41420369fee21157c2f2881db34612711f77c9ecd9501aa6d7235ab7bc41d4092be1e68fab778c16d8288 WHIRLPOOL 4a6495ca077f3c374105b25698c8251aaa89daf56c2749bdc73867b0ea1ae404cfc7b2a8b435ef7b19f00aee8128be051c04d6a24fb631379fbe98d6854a507b
@@ -72,5 +73,6 @@ EBUILD netbeans-groovy-9999_p20150702.ebuild 3422 SHA256 a9f09dcabe21702577cde7f
 EBUILD netbeans-groovy-9999_p20150709.ebuild 3422 SHA256 9eb2fceafbbb1552a8157ec06946b133a281b90a2f6727d2659fbc3152bd39b1 SHA512 8bf867e11181ca38b4bb244f83357b6bf0d629a2a91da5ab4c4066502568d3ee888903562742e5cd1acc893f550f6e6f834329de2535905b80c61e6001d1d9c9 WHIRLPOOL a7bd3bb8fd838ac044d06bc9e5f9a512338f8744e60f23cb80237266efb00c7e432d159536ffd7d33ce4405096207c265ef8540f5f16c5b1d140687e1975c042
 EBUILD netbeans-groovy-9999_p20150710.ebuild 3422 SHA256 25549c6857ae96f2e32e283ad4022af57c940d2e69cce17b48d9a63e0400ba25 SHA512 00d997c349fe3c544977aa34392361fe236b63b60912d778559a07a9ebb0d3cee302edb169b9ba74a664946e5a91ed21d951effbd77933f65eda3bf1363f2b25 WHIRLPOOL 76544694760ac653c14c753abeb9f456ba4903504c615b19f6ebb50c5b399c7bf6343ab653e9476009bae148e362571065017d228bfac8c9d79bbf78d0b39d28
 EBUILD netbeans-groovy-9999_p20150713.ebuild 3422 SHA256 37ae1eddf9463bd2081a67109d061e5055e1b7764df68615ada2e2157a6de8d1 SHA512 9fe2b671f4909060a960b6c1b57cc48f3964580e507edba73e763a547877cc91776486aed575a3c7617b2db39bce3b96d07637f10d56aaa178e27c4f63b35f78 WHIRLPOOL 3258b5230a2fc9a13d343b10a011aba79f04fc215eeb4f50f2aa9918c204530dac0e81252be5384b73cc8c6ce52de2a963a1579eac1aa918c188dbd3ee91b46b
-MISC ChangeLog 170370 SHA256 67a498b1eb767aade4b7eb82828effd65e57c4df2797e30f5ec4f00b0131ce3f SHA512 afcbe41b19a558a0de94b048cb48f64cdc435db9d0a474cca0c9fa6afcf102aea5e41f6c0a439116d7e3a0ff9e6268f1f1502a164378d3111c977c8282414a35 WHIRLPOOL 68831eaebfad045723fec5eb153b0ccdcb1bff269b3a736420a150cfaeccdbfd5fe57f41bc4d64a53996b26a3a9f61285f6ab5a5504c1a654921deca2f8b99f9
+EBUILD netbeans-groovy-9999_p20150714.ebuild 3422 SHA256 45646c294842bd53576f66ade7d0a1448acdb919fae089dcd5ce9b8d3bbf4af9 SHA512 051b5043174fd271085366aa6bcc25a26e94700284f4ef15a34c53695b5131a52ac31078cea75ba2c688f85a7b03ed8af0c77d8c595f8c0b96ad28a274fb4e6e WHIRLPOOL 4ddca9d186ffe0f8907609b39143e1a375df6bb91c7d440587a4d77891e4ca31f8315e09212860faca3a1978fc3bba7181dd2f25e2a9b1f6b9b7d41ac0641b92
+MISC ChangeLog 170544 SHA256 6ba3a226574ef8e20a97f7c2d0c42fe2b8a5af57bc9d741ac9650c7b00389f9e SHA512 712eef315fcdf525e2068b0e53b0c3a497ed3b83f823df2eac69c7b69eb568d42502c45ec859b9c589b1b13c547b1be430fa5c73792c4ab33548f9067afa6584 WHIRLPOOL c02e6d20af61c68a81ab11555969b8568368a791e959209ba13551ad9b0ffbd20285eab7e0cb364d1fec930b74fc56e4fcdbd2c9e10292d8f0d9d5d376c90026
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150714.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150714.ebuild
new file mode 100644
index 0000000..99f724f
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150714.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-14_00-01-56/zip/netbeans-trunk-nightly-201507140001-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 24fb081..307c3cc 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_p20150714 (14 Jul 2015)
+
+  14 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-harness-9999_p20150714.ebuild:
+  updated to the latest sources
+
 *netbeans-harness-9999_p20150713 (13 Jul 2015)
 
   13 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 84e4666..2d9781e 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -43,6 +43,7 @@ DIST netbeans-trunk-nightly-201507020001-src.zip 208088424 SHA256 1dde0fd1452c74
 DIST netbeans-trunk-nightly-201507090001-src.zip 208130931 SHA256 5d73ccaddac610b27ab8aecaa95f5ef920a833291d2573daeb29f1f79eef1864 SHA512 6405717c46d506dbaa744fd33ba88daf3037e9d388482d808a6eeab292a42d99e76eea4494639725568239dc939444b0357a3f55b364a57256e93f5252efb7d5 WHIRLPOOL 9bddee309d416454d25c497074ad9e2ff23b1e52de90975bbea12412524fcf44e384eed0b14ee7f0f1ae1988523a74281bef1de58c14321aaefa4f9ef1bd9ba5
 DIST netbeans-trunk-nightly-201507100001-src.zip 208139985 SHA256 ede6f00ad37a28f1fa7c825e0f86ada8e314a969db3ea1884d21b6cced8dd527 SHA512 49c255eefd2affd8206082b04cb2127138b841d9ffa5f175aabfdec0703a81da0299bfc7bf55404829b493cd530e2db5570f4a19e66cf5af83b2081ed90a43ee WHIRLPOOL 6f1dd8b72445a31428e310cba1de99f0223c57c6b24f178d9cf5855633d5da23d1a87a130267b9da9697fbf28d7dc7fca2a0a341af9936f443cb9e1dc6bf89c2
 DIST netbeans-trunk-nightly-201507130001-src.zip 208143364 SHA256 f6a745a4112c25988071e5add63f52b567ea416e56eb1c5ac1f0caa40b2fa47d SHA512 2a01dde8445619c79b837bc51d1eb5fb9136dc0ad74d1e73df9d45748baa7b41032c10a76d26505fcf783193978c25907dbb2fc93a0e54f8b470ca2a6d7b9a8c WHIRLPOOL 095f94bb313aa828e0d0e972e2ccd69015e300023d7ce51569963eefba61146421f5a1a015c28fa8885445bbf42987367d18ed57da98e3b7f6521bddd3a4aaa5
+DIST netbeans-trunk-nightly-201507140001-src.zip 208144479 SHA256 9daca7bafaeb7d4e4eed58ecec4ba487f11fd6fd4b6790c719d4f428929588d4 SHA512 96adc2194d3f005216677ccdffc1ac51ecac1c2a13ec3f29b177e553ea9f5a36d9c9010c7f6454612b78a7dcb5f5ef08197e1113701bdaa0c727b9c352422c3f WHIRLPOOL 4fecb0c62019a2fc3522db07513eba2b877c01c856ac2b727329cca7ff86d573ef493a813b943558c06da3d6bc3109b5082e7ccb356318e6aef374eadeddee51
 EBUILD netbeans-harness-7.0.1.ebuild 3579 SHA256 f4d09cb7bd5e8485caf75a3020ddb8102d3ea326878ac384ef4aecb011a1f6a5 SHA512 390c26b4a3dbc81ad1ef210b3ea668926398cb38ea13fa37dceb6782b4478b1ceb7a49e9db300f691fb8b31c21c56b25f4c3237c0890f0c637ca45f596c88294 WHIRLPOOL ae1e34af6dd61c30f645f39a825b6235e3eb1f9a42dd23431225513733209a2eb225a741b75342f827a4be0ffbf41b9786a6a6430051f543c321abe3c20da6bd
 EBUILD netbeans-harness-7.1.2.ebuild 3587 SHA256 e0adc470109009641bf48569623bf0fc51a400ac1ba686475c7dae1a5b561c96 SHA512 e4157a6b294c17fd7430802b33253d473120dc16173557e0d7840078f4043a383d5e3672af64f124509e54cc85d590abfa4375f181a32ab8b49e976cb6613cea WHIRLPOOL 423a5844a2c55ea99db4ac78e1c605a55a04f634601c0ac054e739c0ab4a3e9c765778dbd81ccf4a1e50e9d9e4cc29ecfad2ec64b483197927f434b67cd4d773
 EBUILD netbeans-harness-7.2.ebuild 3421 SHA256 47a5281d140b47e0235592c58657a9065d1827175ccca7d0c73fd81e90710090 SHA512 403fd1f49e11b27ef8002c4066fc911dbeadcccc7adddcdded86c6cd95e8bddaf0603c0ccafd0e91ef31a0909508deab1eb326e98e621bcbae7304413acca291 WHIRLPOOL fe3c5f95a606db39861a80201c185cb5a25e2d80698ac78ff724587b54e859f861b834b89aa79aac22f2c5da700532eaafae67fbcc33259ee07d578ba5c7f9ee
@@ -74,5 +75,6 @@ EBUILD netbeans-harness-9999_p20150702.ebuild 4131 SHA256 1b70e300dea64efb955d8c
 EBUILD netbeans-harness-9999_p20150709.ebuild 4131 SHA256 af48ec9e2e964ed81b3862511d41a2c14f5ce69e60151f1dd65111f71e422912 SHA512 b33ea7862f3a30f4fd57a669aafbdf78075c0eb8e614991fe9da35c0428889fee4744df399bd8023feb603dc8d07705e2742be624b1348d9aa351eea7ceef25f WHIRLPOOL 5fdb86550e260dd3cf587b163796a5184b1188c9896d4380668ccb6e211096fa4edfe92d408f6c7b74c455e7e8a2f5cb6aa5a12cdf9e7d4decd3b35467448824
 EBUILD netbeans-harness-9999_p20150710.ebuild 4131 SHA256 a7f3be19f579f33027eea530d500835482b8993616f5f89d09ff596009daf089 SHA512 b466d4a1d9f40faabfdb0354b487eea8fde21a11556c72936bd39030f86597c8895e4eafed47e8d868ad8df2c520c49c8ab3b05000f68a80aa4112eff3d85bc4 WHIRLPOOL 1f9d09cdadb568cd9994abbe500e99ec7423705c4bf04634db2c0bfb700bfb0515a6dbbe80893a5a266528d0a80d86cccc788452174c9c9664ad37d06d3fd461
 EBUILD netbeans-harness-9999_p20150713.ebuild 4131 SHA256 91051678ad76b7484c51135e65281081c4e0a9c61886be5b0e28e22b7d7f1507 SHA512 9bf95469cc493a30270839a8a3b7c44060ddbc4c260f0a6e2e1f10c96d7e43099f407aa8cce591c7d937e1688d010abaaf5e35d5657b26bfc2e70bc379de6cd7 WHIRLPOOL 0a8876f748476579a421f56ef6616dd9a780ebf7801b46b7c812d041f2df9ac02c14b29d486b133f433b5aed88f603f8363599f6e639c8dabdfc7b2bbd8aef4a
-MISC ChangeLog 172550 SHA256 0aa2264c750ccc87c6cae7ef419c1c3057a5d17d3f1b10ff19965c976fe30343 SHA512 d4b5a0e6e6a9b74797d25a6132405554f201e23d641810ab68af824b4723ea0cc5ffe7e0ef7fcf62061da37bdc3b8a118312ca8714b6d86e8507ee1f3a100827 WHIRLPOOL f9d573863a3eb4caf3ba1f918c8d9395d60a3190a38d015324ecc4f73ba557e054f4b99696a28766380463a4fd856b875b14e08e06ecb7d87b870465ac4e5768
+EBUILD netbeans-harness-9999_p20150714.ebuild 4131 SHA256 964c34cb15f1645baaff655b205c76b6969914bb877d6c7dc5299ab3280ecedc SHA512 a36460dda89f8c628ad3ad01a8bf55849c0001fcff42d18b42f2254c428c2d438da2e3bc756150ed310f5bb8a633bf321c24cd5abc2885738a5d920c940ff4e4 WHIRLPOOL 8e5d7fb5925984e77b5a6615cebfd05ebc6d7228e384f657e9c234cb57a9d3c70a4f728f5b06a5ef7fcd1544dfe0bfaf339499a8934217c11c09a3cb92e60ce7
+MISC ChangeLog 172726 SHA256 609b4063018f07cb97f26a181b229b7ea1494d4493fe8c488717ed10ba9b4796 SHA512 c17dd49db19fe3a63a693242c0433a9f4740f7e1ac8d7b570b04680d8cba02798fa5fbb3a1411831ba2e9e3d97e90587ed1afbfef082c98eb862054e2a42d57b WHIRLPOOL 39d2748f77713b543044c994613661c20419726a3dce61ab729ce34bdb3422ef4d5a2c8063a650d2e7f042911cd89b3e7de34a6011876590b5330911fd650521
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20150714.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20150714.ebuild
new file mode 100644
index 0000000..e88d8b3
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20150714.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-14_00-01-56/zip/netbeans-trunk-nightly-201507140001-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 2d1a56e..7245ef4 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_p20150714 (14 Jul 2015)
+
+  14 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ide-9999_p20150714.ebuild:
+  updated to the latest sources
+
 *netbeans-ide-9999_p20150713 (13 Jul 2015)
 
   13 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index af5d286..ae500e2 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -246,6 +246,7 @@ DIST netbeans-trunk-nightly-201507020001-src.zip 208088424 SHA256 1dde0fd1452c74
 DIST netbeans-trunk-nightly-201507090001-src.zip 208130931 SHA256 5d73ccaddac610b27ab8aecaa95f5ef920a833291d2573daeb29f1f79eef1864 SHA512 6405717c46d506dbaa744fd33ba88daf3037e9d388482d808a6eeab292a42d99e76eea4494639725568239dc939444b0357a3f55b364a57256e93f5252efb7d5 WHIRLPOOL 9bddee309d416454d25c497074ad9e2ff23b1e52de90975bbea12412524fcf44e384eed0b14ee7f0f1ae1988523a74281bef1de58c14321aaefa4f9ef1bd9ba5
 DIST netbeans-trunk-nightly-201507100001-src.zip 208139985 SHA256 ede6f00ad37a28f1fa7c825e0f86ada8e314a969db3ea1884d21b6cced8dd527 SHA512 49c255eefd2affd8206082b04cb2127138b841d9ffa5f175aabfdec0703a81da0299bfc7bf55404829b493cd530e2db5570f4a19e66cf5af83b2081ed90a43ee WHIRLPOOL 6f1dd8b72445a31428e310cba1de99f0223c57c6b24f178d9cf5855633d5da23d1a87a130267b9da9697fbf28d7dc7fca2a0a341af9936f443cb9e1dc6bf89c2
 DIST netbeans-trunk-nightly-201507130001-src.zip 208143364 SHA256 f6a745a4112c25988071e5add63f52b567ea416e56eb1c5ac1f0caa40b2fa47d SHA512 2a01dde8445619c79b837bc51d1eb5fb9136dc0ad74d1e73df9d45748baa7b41032c10a76d26505fcf783193978c25907dbb2fc93a0e54f8b470ca2a6d7b9a8c WHIRLPOOL 095f94bb313aa828e0d0e972e2ccd69015e300023d7ce51569963eefba61146421f5a1a015c28fa8885445bbf42987367d18ed57da98e3b7f6521bddd3a4aaa5
+DIST netbeans-trunk-nightly-201507140001-src.zip 208144479 SHA256 9daca7bafaeb7d4e4eed58ecec4ba487f11fd6fd4b6790c719d4f428929588d4 SHA512 96adc2194d3f005216677ccdffc1ac51ecac1c2a13ec3f29b177e553ea9f5a36d9c9010c7f6454612b78a7dcb5f5ef08197e1113701bdaa0c727b9c352422c3f WHIRLPOOL 4fecb0c62019a2fc3522db07513eba2b877c01c856ac2b727329cca7ff86d573ef493a813b943558c06da3d6bc3109b5082e7ccb356318e6aef374eadeddee51
 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_p20150702.ebuild 30352 SHA256 f377b8cc68dc734e743874788
 EBUILD netbeans-ide-9999_p20150709.ebuild 30352 SHA256 b2effb44600cc7c959692d3b06cad4e8f9122c915732c73aa1537f934be1e175 SHA512 862dab56df0d502391b8e6f5687ec7a13980c338a19a67f252deff806b559ab0254a19962ecfbeed39d3623f674eba0a21fc9b0f0d77968eb1082cb697af9b9a WHIRLPOOL 62e457f6328cb47890bff2972e8b5322cc38c9f772eeceb36fbcf9264795e05733c40f54ceedf226126c3748503a5c4503c1bca9f3bcfc41c061d6c75b8824aa
 EBUILD netbeans-ide-9999_p20150710.ebuild 30352 SHA256 3fbbc679e3c3847bc3499c78ed41224ea2deae2cc3e633e0d2477515330a875c SHA512 c64fde46ed91aa9cad2e13c08e9072266e5986703e46e9f4d1aded37c45f99c2d7f8eda1b6854bd2307cd3ec4b02f96e582d80004218229e620dda4985f58c56 WHIRLPOOL df5f5f5ed32157f4917f5a8bdb6faaa49b1651def6bad4538ee9635cf8e47fd50056468b17d82d9dabc30452e7949d6bd61b09ef8e2b3270e9042198f9467fd0
 EBUILD netbeans-ide-9999_p20150713.ebuild 30352 SHA256 f02ceb79baa242817f1359bd2f8102685121825f0525a47f3e30c91c63a57f0f SHA512 5317ba24e3da7310870d019caf9112049644cd60ce47b2e18a1e46e69aa3b26455c6474fc780f3262d41f56500754d3a7c5c570c33966ce64b6d1b2c1ac08281 WHIRLPOOL 529d3909df23fbfc63d6367ec67a9334add060a7701717d651e944fe6b55b659a10dd38c27c708c35e6f0df60af718c7f26a3525473634431a1f198172135c6a
-MISC ChangeLog 164248 SHA256 9c4fb12729b37df12dbe705374dad6d22b362c7d702ad984097805b87396f685 SHA512 ee1a0280c5ed6a09efceaa2ad13ac354a62130e83bd21081ac8c15aa1d5fcd58620122ae1e9a48efe43616f6ba9b0b155c7ffe2c2a0e21cbddf5734a0ffc1dca WHIRLPOOL 1001fc6822fe25988e63be617daaf696ae63e8720e0f95dc69c8320a4d8a04af7a4e8956cd3dc33e11046559a80fa7160ff95daaa776790017eb812fcbda7fb9
+EBUILD netbeans-ide-9999_p20150714.ebuild 30352 SHA256 aed02267974ff1f1c83b422576994ab5c8260e5b416a176ad73043edd41186bb SHA512 70fed3332f085a7c62610685732d65d419d933f81207581988434f0db905abdf76fb5625a1a2e1b230367dca8998daea7a87153c242e08ec5ab4f49b2a1db26d WHIRLPOOL f085b37af0f1df7085576827202c57b91b3df2f08d6f563a44e301663748cab976a290dcaeb9f28a44c0a308e8cec735e693214055b205363cd03c0d10bc8ece
+MISC ChangeLog 164416 SHA256 a99d5fe270b11ce6b1523570b49ad88252921b85c59c7ed2c135fa4fbfed89d5 SHA512 a84a17882762bde57a07f87637a1b1c09cff04060ab389e565b2a061845adf28a81609805b67772fb52684b6af1ef08b50127174df08a3b5a9b9e2204eb9958d WHIRLPOOL f84a5ee107067a79a59300a6b24d4217cb8ebe568d1a4ebef714bd74da66e5521b7eeb066fb439d75059f5086acd60ff3c5573284af4ab87970df2edaeae2c70
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20150714.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20150714.ebuild
new file mode 100644
index 0000000..1f208b2
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20150714.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-14_00-01-56/zip/netbeans-trunk-nightly-201507140001-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 9761898..fd186c7 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_p20150714 (14 Jul 2015)
+
+  14 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-java-9999_p20150714.ebuild:
+  updated to the latest sources
+
 *netbeans-java-9999_p20150713 (13 Jul 2015)
 
   13 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index b620490..2422e5a 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -118,6 +118,7 @@ DIST netbeans-trunk-nightly-201507020001-src.zip 208088424 SHA256 1dde0fd1452c74
 DIST netbeans-trunk-nightly-201507090001-src.zip 208130931 SHA256 5d73ccaddac610b27ab8aecaa95f5ef920a833291d2573daeb29f1f79eef1864 SHA512 6405717c46d506dbaa744fd33ba88daf3037e9d388482d808a6eeab292a42d99e76eea4494639725568239dc939444b0357a3f55b364a57256e93f5252efb7d5 WHIRLPOOL 9bddee309d416454d25c497074ad9e2ff23b1e52de90975bbea12412524fcf44e384eed0b14ee7f0f1ae1988523a74281bef1de58c14321aaefa4f9ef1bd9ba5
 DIST netbeans-trunk-nightly-201507100001-src.zip 208139985 SHA256 ede6f00ad37a28f1fa7c825e0f86ada8e314a969db3ea1884d21b6cced8dd527 SHA512 49c255eefd2affd8206082b04cb2127138b841d9ffa5f175aabfdec0703a81da0299bfc7bf55404829b493cd530e2db5570f4a19e66cf5af83b2081ed90a43ee WHIRLPOOL 6f1dd8b72445a31428e310cba1de99f0223c57c6b24f178d9cf5855633d5da23d1a87a130267b9da9697fbf28d7dc7fca2a0a341af9936f443cb9e1dc6bf89c2
 DIST netbeans-trunk-nightly-201507130001-src.zip 208143364 SHA256 f6a745a4112c25988071e5add63f52b567ea416e56eb1c5ac1f0caa40b2fa47d SHA512 2a01dde8445619c79b837bc51d1eb5fb9136dc0ad74d1e73df9d45748baa7b41032c10a76d26505fcf783193978c25907dbb2fc93a0e54f8b470ca2a6d7b9a8c WHIRLPOOL 095f94bb313aa828e0d0e972e2ccd69015e300023d7ce51569963eefba61146421f5a1a015c28fa8885445bbf42987367d18ed57da98e3b7f6521bddd3a4aaa5
+DIST netbeans-trunk-nightly-201507140001-src.zip 208144479 SHA256 9daca7bafaeb7d4e4eed58ecec4ba487f11fd6fd4b6790c719d4f428929588d4 SHA512 96adc2194d3f005216677ccdffc1ac51ecac1c2a13ec3f29b177e553ea9f5a36d9c9010c7f6454612b78a7dcb5f5ef08197e1113701bdaa0c727b9c352422c3f WHIRLPOOL 4fecb0c62019a2fc3522db07513eba2b877c01c856ac2b727329cca7ff86d573ef493a813b943558c06da3d6bc3109b5082e7ccb356318e6aef374eadeddee51
 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
@@ -152,5 +153,6 @@ EBUILD netbeans-java-9999_p20150702.ebuild 14580 SHA256 963e065d302ec0a2424c8dfe
 EBUILD netbeans-java-9999_p20150709.ebuild 14580 SHA256 1aa26a48cb7c86aeb5114308aaa52118e88107dceaddf0860f3a99272e5ad709 SHA512 8809784ed2515db2a4caf9ad5b84cdbe93c34cb66f0714eef73a05f8d7181c1d244ab8c120ea40d999bf786f171d42cf52305d641a5732697a37dfae0609692b WHIRLPOOL 7c196aadfb1bfacc592983fe9f954445109440437456e53d3d420e623591e63662f8e785e3b1a9494017ff5fd2ca6c8ccd69963bf2b809ac3545ac21301fea0c
 EBUILD netbeans-java-9999_p20150710.ebuild 14580 SHA256 3b5aa4d265d569bf22ea9988af4dd40cd1d8dea44e36b3b56856a7dbf2e47dcb SHA512 aed5c69a36ecfa0e2347405405b89a93e80728015a16731f1692d615c5f7991d69b3885e9ba7e53bd6a0d7122dec2a331642ba603e9f122c77ca1e8997fec3e4 WHIRLPOOL 784763cde3a10fc277753011c29b13256310f1d5661af518ddce2b783ef288cd94c8a40bceb418ed9c893c728a1db4cb2778306c326b63ba182d10bc0623e6ba
 EBUILD netbeans-java-9999_p20150713.ebuild 14580 SHA256 912d0ec2fb4772cb46599232e91732d71294609af3c389b531cff6dd82517864 SHA512 cb87acf1b4c479c59edf38b06ea843ab0c8fbccae41f563a6338468a6ffa512a2bebd37991011efdebb4e7f4ab970cfdc2ba66336ebb2b3cf2851dd040c80a0f WHIRLPOOL 3ae0d03711b3f2b1e7192136edf43726d92b0bc2ca7b6efaf95f07e68c6697e71d4d18b5f25107972df2776041aedf59be241c573f5ded64a2005bd8bbc88cf3
-MISC ChangeLog 167693 SHA256 9de29cbee44069a88f44c5e4175811242eee2d3880eabf2a666049168ec2e7a1 SHA512 d5abc787608cc75d2aa1e60cc5f1d1f3b3656a07bc1b31076a8191b4af839262e79ceacd6ad61e3929f07a7c4a951ba53d517f4a713c19fe9ddee2acfe26d026 WHIRLPOOL 9ed28b1cf428233fbec2ed626dcea4c0bb127da8b55206006babd7911dbb80969542626172c288355ba9de73f96a57565becb30bd56fd78afe40e5d63fabfaca
+EBUILD netbeans-java-9999_p20150714.ebuild 14580 SHA256 01a89bd34825d5743d818f36e9949eb6500b760e19e1ad9119c1c044654f705e SHA512 813c2ce7c73d93042f2db954879283dd35d24ea2afc2f9b5a3dd38642bef9198b3add4a6c1f95c7cfdd9f4e6195d6148a6152896deab606f49a5d2f5810bea29 WHIRLPOOL 3df8adcead15eb18ba580b0d628964883542e9413f5277d7a180a186a77d252a01f866eddf61b7fd109d8cf0e79c0fdbc4cc8a3db52be5e31954ba505fe87a75
+MISC ChangeLog 167863 SHA256 40a2ddb83b9ba3973455c73607ff0f4b6601e7431235a46fc558fb8d016699d8 SHA512 e6bf51d36f51a5bbbc97d2b4d92eef4964f112e3d68449732456a329a3f53aca949b6a07c3592634059e19631856c6170ca437376a5690571635eb148152f5d6 WHIRLPOOL 3a732b47391f5612ffece2af4983bec904bed00a61b22fcdb11780d925e3dff0d023c2ec04bcd0d844a1f23b46a15ea17422cb126fac134e0a6f2c92f447e8c9
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20150714.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20150714.ebuild
new file mode 100644
index 0000000..8d54632
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20150714.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-07-14_00-01-56/zip/netbeans-trunk-nightly-201507140001-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 ea594e0..e3278e6 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_p20150714 (14 Jul 2015)
+
+  14 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javacard-9999_p20150714.ebuild:
+  updated to the latest sources
+
 *netbeans-javacard-9999_p20150713 (13 Jul 2015)
 
   13 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index 470ff62..b01be0d 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -40,6 +40,7 @@ DIST netbeans-trunk-nightly-201507020001-src.zip 208088424 SHA256 1dde0fd1452c74
 DIST netbeans-trunk-nightly-201507090001-src.zip 208130931 SHA256 5d73ccaddac610b27ab8aecaa95f5ef920a833291d2573daeb29f1f79eef1864 SHA512 6405717c46d506dbaa744fd33ba88daf3037e9d388482d808a6eeab292a42d99e76eea4494639725568239dc939444b0357a3f55b364a57256e93f5252efb7d5 WHIRLPOOL 9bddee309d416454d25c497074ad9e2ff23b1e52de90975bbea12412524fcf44e384eed0b14ee7f0f1ae1988523a74281bef1de58c14321aaefa4f9ef1bd9ba5
 DIST netbeans-trunk-nightly-201507100001-src.zip 208139985 SHA256 ede6f00ad37a28f1fa7c825e0f86ada8e314a969db3ea1884d21b6cced8dd527 SHA512 49c255eefd2affd8206082b04cb2127138b841d9ffa5f175aabfdec0703a81da0299bfc7bf55404829b493cd530e2db5570f4a19e66cf5af83b2081ed90a43ee WHIRLPOOL 6f1dd8b72445a31428e310cba1de99f0223c57c6b24f178d9cf5855633d5da23d1a87a130267b9da9697fbf28d7dc7fca2a0a341af9936f443cb9e1dc6bf89c2
 DIST netbeans-trunk-nightly-201507130001-src.zip 208143364 SHA256 f6a745a4112c25988071e5add63f52b567ea416e56eb1c5ac1f0caa40b2fa47d SHA512 2a01dde8445619c79b837bc51d1eb5fb9136dc0ad74d1e73df9d45748baa7b41032c10a76d26505fcf783193978c25907dbb2fc93a0e54f8b470ca2a6d7b9a8c WHIRLPOOL 095f94bb313aa828e0d0e972e2ccd69015e300023d7ce51569963eefba61146421f5a1a015c28fa8885445bbf42987367d18ed57da98e3b7f6521bddd3a4aaa5
+DIST netbeans-trunk-nightly-201507140001-src.zip 208144479 SHA256 9daca7bafaeb7d4e4eed58ecec4ba487f11fd6fd4b6790c719d4f428929588d4 SHA512 96adc2194d3f005216677ccdffc1ac51ecac1c2a13ec3f29b177e553ea9f5a36d9c9010c7f6454612b78a7dcb5f5ef08197e1113701bdaa0c727b9c352422c3f WHIRLPOOL 4fecb0c62019a2fc3522db07513eba2b877c01c856ac2b727329cca7ff86d573ef493a813b943558c06da3d6bc3109b5082e7ccb356318e6aef374eadeddee51
 EBUILD netbeans-javacard-7.0.1.ebuild 4961 SHA256 566bc7e3275c97d0fe3d68c843b53aee641548ec39a8143aebd56d248da3c32c SHA512 5973c8d4254943473209b0881c0fbe40ac6b61563d508e58adc248dd40c8c2d6b742bd6c1667ee11fb404f9d2e62f08a8e4d822a2a3db9fccab254f73828c3b0 WHIRLPOOL fd1e08943ce754a2abfe8c8b83954399287500ce574a46fe0d76f94b300fd2a5978957f94a3ac1d85781330248a46fefacfbae25db95669c3de910145ef96424
 EBUILD netbeans-javacard-7.1.2.ebuild 4970 SHA256 15ff13152b140edaa549ea6515949d99cdb2a4656918566179836ab2277f01b8 SHA512 b7e52b477f6ba645084034eb27e848fb48361351937fc45455bf4b7d74acbdd257427ec589286f0edc71cc98c8cdb114e55988b6d3dc92143e13f407e3b45a52 WHIRLPOOL 85ab6dc2c230ea89fd19d7602ac24e3d2b0f226590998e6a6e277c24ef60a7e86874f7e95e90921d255e84f05e04ad1998ee7361b4d26c6f14828076792a933c
 EBUILD netbeans-javacard-7.2.ebuild 4718 SHA256 d173c848e825b342a52073ba16b7784016f92124d4bc3b5ad8beebb7a7dda772 SHA512 019183c236c59ec2b961445c49643c6da0b376048f1be1d58677a753890bcb03db126f6441221c7572a74fe45c4c27aeee4acb38db620f9203ad04ae8ff2c426 WHIRLPOOL f2a10183045edd22ef4419b630cedafc093b326eb593178a0f50e8d82ebb25ab732fb8c561d49969073d9fce551c5b9150fb1900b49458ed53f0234baa29a78e
@@ -71,5 +72,6 @@ EBUILD netbeans-javacard-9999_p20150702.ebuild 4982 SHA256 0cfb451c1fb18b4c88134
 EBUILD netbeans-javacard-9999_p20150709.ebuild 4982 SHA256 96aaf28d604086d1f77bd6c4eeb58f0eca2ac385104c8162ff119f87ad79f2c2 SHA512 058a9df0e75e40647ec2bc15f793330625935eddca739c4dd32597835c67449f42d0db2890875a3b7bf2445c9d485078f2ff415719a04b56260221a2fd90934d WHIRLPOOL 8116a423abeaa9991c63c17868acdb0a18d04e54c8a1df376cb452d7086f28de4b0a85d8013573c26d23a5fd2a7e97f955129ebc727ad7ee93e701fd717257b0
 EBUILD netbeans-javacard-9999_p20150710.ebuild 4982 SHA256 13619333e6fe3a01609ab4ca9dfaef98b3708e20b09d8e327fc9ee9bc8293e58 SHA512 990124c81061b2f2512b6652a34d275def2953a3890f2a350bfd221f090021227c74d1ac39ed31a4a00224cf4128119ae6f6bdbd5706426e3eff15ed633ce099 WHIRLPOOL 818ba93f81bceb9d15b6362923aa7e6049530875093de182c236f3e642c59f703fb62f6e75a9ae7b7dcf76433717e73ef96d25f1f05fa37d45d80c5b029147fa
 EBUILD netbeans-javacard-9999_p20150713.ebuild 4982 SHA256 88dc45e51432c1f945fed2026f81f9b068f671d2ba882a479a4d4f5743e217dc SHA512 873e0483c727ef24e2ffd5023a2686d834c246fc35f9caf5daaf7fdfb783b9962cf56e9e656c3d98611bf67977c9ef30e9e7d28ea086660898573ddf4f0e6a5c WHIRLPOOL d1cbf5a9ce0ccfd944523a749b2c6bca39fa237575b060c8ae25338dfdc863908397bd06fa74919f54fc19bdfeb81b4f80e0a2b6e634f946930886036c6b4b28
-MISC ChangeLog 174730 SHA256 ac93ad32ded19d5034ac2e049192a5dfd8c3657a06bd939902ecef7edc9163c2 SHA512 558945d185146733225a2f6866ba06029b3aa1d81891572c9b9629a012ac2904a106fca465af9452b9febcad13e28fd26e828cdec6fe374ff8edab12c2164a22 WHIRLPOOL 60ff0ae10996225a81d69440583612355edbcb767787087f7db901136297388b65d4e517d581b96a34187a4fdbe7bceed43129bed5f7b296b2e46f7fe8a3070e
+EBUILD netbeans-javacard-9999_p20150714.ebuild 4982 SHA256 491e775bdb913bdefe19db2f52d707b520bb7adc90075186c149eefa53d06172 SHA512 1c5e042804dc50398318580aba8d7b91769daa1b47ef3fdc2cfcf8f008ef11802fea85d8090f2a2156c2c1a6496919220d800ef2b3bd75e400390b44278c7d53 WHIRLPOOL 83f2c129751b8905714b0c556ccfdef14f8f7e9a526fe94d551d2fd0603e32863eb6a3bc7ba5dad4a235a453c43cb09413947f7587a37116991e9a8a52642642
+MISC ChangeLog 174908 SHA256 fabf2ee415f78928fbdbfaeac14e6538ae9e1d2cc3d69925009e4c0603b4ddaa SHA512 a2ced61ff527a7363072db8a06e5e83835b892da84e1b46cd03518225d6407f969737074c216a0272c72f515ef2bcf0e41cb34b2034649ba09b81147e57a4a0c WHIRLPOOL 3adfe1930246206888cf4ba3dc1cb0f67a1eb0b9b6735e678dfa4aedd5cfc7fa02eee9b61a934ca05a6d97c72fc52873e315271733fe8210ae594f2c03dd4b36
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150714.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150714.ebuild
new file mode 100644
index 0000000..d592777
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150714.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-14_00-01-56/zip/netbeans-trunk-nightly-201507140001-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 5c84aa4..a8e3d33 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_p20150714 (14 Jul 2015)
+
+  14 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javadoc-9999_p20150714.ebuild:
+  updated to the latest sources
+
 *netbeans-javadoc-9999_p20150713 (13 Jul 2015)
 
   13 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index 2d45c5f..9a7a2f1 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -43,6 +43,7 @@ DIST netbeans-trunk-nightly-201507020001-src.zip 208088424 SHA256 1dde0fd1452c74
 DIST netbeans-trunk-nightly-201507090001-src.zip 208130931 SHA256 5d73ccaddac610b27ab8aecaa95f5ef920a833291d2573daeb29f1f79eef1864 SHA512 6405717c46d506dbaa744fd33ba88daf3037e9d388482d808a6eeab292a42d99e76eea4494639725568239dc939444b0357a3f55b364a57256e93f5252efb7d5 WHIRLPOOL 9bddee309d416454d25c497074ad9e2ff23b1e52de90975bbea12412524fcf44e384eed0b14ee7f0f1ae1988523a74281bef1de58c14321aaefa4f9ef1bd9ba5
 DIST netbeans-trunk-nightly-201507100001-src.zip 208139985 SHA256 ede6f00ad37a28f1fa7c825e0f86ada8e314a969db3ea1884d21b6cced8dd527 SHA512 49c255eefd2affd8206082b04cb2127138b841d9ffa5f175aabfdec0703a81da0299bfc7bf55404829b493cd530e2db5570f4a19e66cf5af83b2081ed90a43ee WHIRLPOOL 6f1dd8b72445a31428e310cba1de99f0223c57c6b24f178d9cf5855633d5da23d1a87a130267b9da9697fbf28d7dc7fca2a0a341af9936f443cb9e1dc6bf89c2
 DIST netbeans-trunk-nightly-201507130001-src.zip 208143364 SHA256 f6a745a4112c25988071e5add63f52b567ea416e56eb1c5ac1f0caa40b2fa47d SHA512 2a01dde8445619c79b837bc51d1eb5fb9136dc0ad74d1e73df9d45748baa7b41032c10a76d26505fcf783193978c25907dbb2fc93a0e54f8b470ca2a6d7b9a8c WHIRLPOOL 095f94bb313aa828e0d0e972e2ccd69015e300023d7ce51569963eefba61146421f5a1a015c28fa8885445bbf42987367d18ed57da98e3b7f6521bddd3a4aaa5
+DIST netbeans-trunk-nightly-201507140001-src.zip 208144479 SHA256 9daca7bafaeb7d4e4eed58ecec4ba487f11fd6fd4b6790c719d4f428929588d4 SHA512 96adc2194d3f005216677ccdffc1ac51ecac1c2a13ec3f29b177e553ea9f5a36d9c9010c7f6454612b78a7dcb5f5ef08197e1113701bdaa0c727b9c352422c3f WHIRLPOOL 4fecb0c62019a2fc3522db07513eba2b877c01c856ac2b727329cca7ff86d573ef493a813b943558c06da3d6bc3109b5082e7ccb356318e6aef374eadeddee51
 EBUILD netbeans-javadoc-7.0.1.ebuild 5814 SHA256 68531c51838c95012830f5ae09e2386ea3179c2b31bfd5191f67993e3b3dbe2f SHA512 3bfe0ecc46f371d2553b031a5699229fb874dad1e94415635558b7d46b6764c31337d03444753e687b19a7c0976c68cb72007ccc82df7d1e5848a81f241f80c3 WHIRLPOOL 6571f7a73c262b3b67407840523b79eecc14bad9678cff05fb32a2811049158400870de51bbcef97ecb3f18f8ff59f965bdca8e788918d53822b92e2f20f75f5
 EBUILD netbeans-javadoc-7.1.2.ebuild 5855 SHA256 af28efb956ac3b7147e254ca3083dfaab11b84ea42e20677ebdd18aa29ff87e0 SHA512 ee06c552782170b51cfe70d603792b4240aef6064ba0a5074f394701a43285ed1e4030f539622c616be3175dab013e791c1a3a1193ad379193f5fa3e92eefa40 WHIRLPOOL dfcc63d6c9fcf094e2998ce1c08e29b4d4acbefbe9bea6498c2e28f84576f628da50164a1e0ab3ff5528720fe54cae71f2f5e6f84aedca5b639f13053464e6c1
 EBUILD netbeans-javadoc-7.2.ebuild 5805 SHA256 20d01deae745a7e8d84ffe55ca63ad74342bd8528c0dd15a20aac6570a1a83e3 SHA512 3947f1ab3efc236b8faa14736406ee3e537bbdbe377ea1bbd4f1eafa06a36d2863f8700dc7c84e6c8501abdf130a78e87ad6a0f52c5172bf0ab52f288617bc86 WHIRLPOOL 8301cce0679ed5f68a09e2e968ab2ba0955547f438758b042a04744539324fd79d83d853dfb8b48421f6dac616362cf1a9dd2a0e0ff8763dc2e12a470d16b95f
@@ -74,5 +75,6 @@ EBUILD netbeans-javadoc-9999_p20150702.ebuild 6234 SHA256 165661aeb36c4b2178c14f
 EBUILD netbeans-javadoc-9999_p20150709.ebuild 6234 SHA256 c0134551280a238215bf57112cc6b7b9a57f61b3feff5e48b02bb70efd0d5559 SHA512 dc785596591c8d929c9be9bafa75efb58a708cc773ad8259120d816d9b7ece6c59edf93d3835b601d36393c3e958b5b7911ba80cfa4c3061a7fbeaa01348f0c1 WHIRLPOOL 7c87b4947a7c6f03734d4abaf13dc3099584f3f6de5c0c8be774994d77f8a5324bb5bcdb7ae5bd1c05953e9694d1b21b6ff6f06cc72a23c53b443fcd5c87cc72
 EBUILD netbeans-javadoc-9999_p20150710.ebuild 6234 SHA256 75813ed0dabc345582ba7add7685a037ec1c010a3b1fcb30e77873b568ea93af SHA512 56363fe0b1cd36ed9ad9bfba754e73a59142afbd5a7d913713330322530df3341ae2852be54f42fe758481bebe57ec0e4c07a941e1140540d9937f791245da69 WHIRLPOOL 8a55e4b2f147783293ebe347d347dc500b26af6af919f3657938212c430261c883b513172c20a31b150ea341cbe7c0425faad9328651d77f318bf30930c74e14
 EBUILD netbeans-javadoc-9999_p20150713.ebuild 6234 SHA256 d7f32d5901579f4684f82c3efe9841611bbc8b9ad5aaf077fcfef35164b62eb8 SHA512 b95bcca57f370dc15c9607548db631093ce0e6360b5044246ebbce05710a145af5aca54a9e878f515b23c616fe148915416651e9d2e5ab4a2573d799d2acf72f WHIRLPOOL 8bc5d92895554d62d00d52fe4c84b372f29075de33ec88b2e624a691a36b545e6443893a684085a9568c32f16f638452fb698e155e37669d52ecb0543c210cbf
-MISC ChangeLog 172376 SHA256 6301e52ac2b2ecae040c2bdc04b134ab398e23a6562b56c40f44f251c3039dcb SHA512 5e0260818265d3f104d69c5b12c4dad6e7299a3c2cf3a6711cb44e26a0638729b2848a4e10087d62d6570313798df5123ac336a72bb5deb14bbb3c813889b8f9 WHIRLPOOL 42a89608f3faa1ee94b84686fcf4c1a6b31ac256434469ae453d903efb8ca7af69a85afff05c126e0d3e55eaac278b7edb571c9977670574b6bcb01077bb0cd0
+EBUILD netbeans-javadoc-9999_p20150714.ebuild 6234 SHA256 7ed8fd273b741c757cde62ac41aff768456b852e570eff40e78952265b0f8b01 SHA512 2ddc0f89391fa4a32f02d62d87a861e38572af2b9bd6eb1f55c9c9a47845cdfd0d38efef5b56977b9baa7ef446741ce16958652b88bb6b396ba9ce7382ffea1b WHIRLPOOL 61034c700e3b22f5e73fe6fd0cb7af4f2824e78706e68999587908d4e96b2653f617a0c63887e0e7379d3693f5704296153c178ac7cee4d2505777456968e676
+MISC ChangeLog 172552 SHA256 104496df3e00454c07cfcc34285493a529c5ea863e7d36ede5721533eaef1057 SHA512 15b1d2e5743e88d6b9e47ed80ed62639b0f58e9115a56daecc48741113738196390bdf3182c7eebfebcb84ae5556e9e93ca931ccf87fe05c403bd06dc91a2279 WHIRLPOOL ccb7bdde60ab92976da8dd62eadc54c56a3ca4381141a0e37c9a81a673a843d86c22ac2637eb46311bcd55c5303731838f274683a32c3d7f25d9d3e0bd226e27
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150714.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150714.ebuild
new file mode 100644
index 0000000..9100464
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150714.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-14_00-01-56/zip/netbeans-trunk-nightly-201507140001-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 6c37da3..138841d 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_p20150714 (14 Jul 2015)
+
+  14 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javafx-9999_p20150714.ebuild:
+  updated to the latest sources
+
 *netbeans-javafx-9999_p20150713 (13 Jul 2015)
 
   13 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index 69c839f..639be8d 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -43,6 +43,7 @@ DIST netbeans-trunk-nightly-201507020001-src.zip 208088424 SHA256 1dde0fd1452c74
 DIST netbeans-trunk-nightly-201507090001-src.zip 208130931 SHA256 5d73ccaddac610b27ab8aecaa95f5ef920a833291d2573daeb29f1f79eef1864 SHA512 6405717c46d506dbaa744fd33ba88daf3037e9d388482d808a6eeab292a42d99e76eea4494639725568239dc939444b0357a3f55b364a57256e93f5252efb7d5 WHIRLPOOL 9bddee309d416454d25c497074ad9e2ff23b1e52de90975bbea12412524fcf44e384eed0b14ee7f0f1ae1988523a74281bef1de58c14321aaefa4f9ef1bd9ba5
 DIST netbeans-trunk-nightly-201507100001-src.zip 208139985 SHA256 ede6f00ad37a28f1fa7c825e0f86ada8e314a969db3ea1884d21b6cced8dd527 SHA512 49c255eefd2affd8206082b04cb2127138b841d9ffa5f175aabfdec0703a81da0299bfc7bf55404829b493cd530e2db5570f4a19e66cf5af83b2081ed90a43ee WHIRLPOOL 6f1dd8b72445a31428e310cba1de99f0223c57c6b24f178d9cf5855633d5da23d1a87a130267b9da9697fbf28d7dc7fca2a0a341af9936f443cb9e1dc6bf89c2
 DIST netbeans-trunk-nightly-201507130001-src.zip 208143364 SHA256 f6a745a4112c25988071e5add63f52b567ea416e56eb1c5ac1f0caa40b2fa47d SHA512 2a01dde8445619c79b837bc51d1eb5fb9136dc0ad74d1e73df9d45748baa7b41032c10a76d26505fcf783193978c25907dbb2fc93a0e54f8b470ca2a6d7b9a8c WHIRLPOOL 095f94bb313aa828e0d0e972e2ccd69015e300023d7ce51569963eefba61146421f5a1a015c28fa8885445bbf42987367d18ed57da98e3b7f6521bddd3a4aaa5
+DIST netbeans-trunk-nightly-201507140001-src.zip 208144479 SHA256 9daca7bafaeb7d4e4eed58ecec4ba487f11fd6fd4b6790c719d4f428929588d4 SHA512 96adc2194d3f005216677ccdffc1ac51ecac1c2a13ec3f29b177e553ea9f5a36d9c9010c7f6454612b78a7dcb5f5ef08197e1113701bdaa0c727b9c352422c3f WHIRLPOOL 4fecb0c62019a2fc3522db07513eba2b877c01c856ac2b727329cca7ff86d573ef493a813b943558c06da3d6bc3109b5082e7ccb356318e6aef374eadeddee51
 EBUILD netbeans-javafx-7.1.2.ebuild 3593 SHA256 76a29b37765000745794e6ae20c6b8528d8637507a257ffef3bef2ce648f05cc SHA512 a04618bda036e6652c7208f90a4dd91e07e75b85243580263f6ec846425ab907a87c318117990d4e8d9044bcd7a0ca8b63bc32bdd0d84e5373a10e67a77b79c0 WHIRLPOOL 11acad585f7315ae6b4edd53c764167567a948cb0e2037d95f2f4de34765909b71d095540c054f4cef3ba70224d294b42720536566e445cbdd06ebf2ad903841
 EBUILD netbeans-javafx-7.2.ebuild 3576 SHA256 3441b901a5074013351bc6c7ba6c424455e2affe52e448f2cfac0058c82345e2 SHA512 ee384d6e4ac767ade82b5d337d7a1c5d2b463c15a7596d91e1a850b37349f88d7867a0ffa11a118c48e2ed463f38dcfa791ec42b3fe85ea1e6bf7c4b27f9b073 WHIRLPOOL 15c7d20f2caa39c6cfcba2f846736754b049483f135ac90ced399672932a6a73467f0b4016550c3b2d8583be20d1467486f5652111893ec16111095a3e9c941c
 EBUILD netbeans-javafx-7.3.ebuild 4476 SHA256 9f268a852d45f37f9d22c3bb58d36be17f438e4b4cb5105d88ac4404731facb3 SHA512 3fa0e48e949d0df0a4404c04379623529f73ff15259f4164fddd10afb9faa046ceed16aac1a7b14728af89bf3a4ed7037638fb7e7e932a64cc71e84f7ecaa44a WHIRLPOOL 0395ca679fa41610c61dceb6ac018d7a76b62c08ca740de2fa2d98523f8e5f840a2d0a8c357b674d171841f93d980b536a671a1f12b5261d402c03b691ac6504
@@ -73,5 +74,6 @@ EBUILD netbeans-javafx-9999_p20150702.ebuild 4723 SHA256 9c38bed451f98d3c3c952df
 EBUILD netbeans-javafx-9999_p20150709.ebuild 4723 SHA256 4e3a4c9bde5fa4b70c02516a9e05a048f7451ad70e72d460c5799a0c4fcd1b1a SHA512 a9aba9556990b758b604aef5f45214bbd2c75fee3f7eb20002cf86a30be3c07581f737723db12d0cc3357d8776d6de93a674aff6564b14fe7277b992417de583 WHIRLPOOL 6bd00d7f4ca89017d4231c46d965638cd9e4782a2397a331a36382805a7b4dd5fb65449e764f6c22088958cb2b99d70e45c80a399bde4ae3f5340d3cf3d91312
 EBUILD netbeans-javafx-9999_p20150710.ebuild 4723 SHA256 dfa7a3bcfb3d7152a652f36e1512b424f753d1d6c8c3f14841c389d9e872fb0d SHA512 1bb06607efcf0e2939a1720137fdda4a2035b383e228deebb417f58b20bea2adfe838b07e24f2c2d2045a40d6224e416bfa3aaca9bc4a5efbfee8a0bd7b3b25b WHIRLPOOL 4ba9b6f97a67a93cf53dae911c4877b9c1f73e12b242f44dab26352ba6ed221cc05addac82435ee07411b6a4315133a3c90f9b0fa0f9c1c2d8bdbb328511d66a
 EBUILD netbeans-javafx-9999_p20150713.ebuild 4723 SHA256 f788ece5211545ceddc483da60950d46ae68a0d12924521b9a21397e0c0e2a77 SHA512 5c2727a377d2cbd22c54cda29927be22bb1887170ec5cbf2794e91bf0f086e6e965ab38fbf611935530a5e776bdcacd6310cf6e6bf360d3554fb0b276753cdd6 WHIRLPOOL e49e6735a7f99dad66a8e47a29cce514c9294643ff6dd7df1d6d068ecd3b359f76593f2956fbb7d72f9d47ebc408652c7ae2f4dd9fb145757fae2dcc032b9bc0
-MISC ChangeLog 156889 SHA256 a899255e4a230108d2879346c8d4f9f394de79472c7b0afcc2bd496e4e6c4b30 SHA512 ba20ab4273953a220404f5d3e8d51f8381b71a7ae8c9d0cc5e90ad215e90dcf308c3d304bb67e8ccaaa54d654bc7eadd3cbd1fa16627a4d7be94413d846502d2 WHIRLPOOL 9eb27153a37d33ebb62f593b602128f430eb9e67932574d4cf147b25b040fd66aa4a3886b2191a3c1d616092d86a3f54ce72964b5c72f09fceffbfaf5169c7e9
+EBUILD netbeans-javafx-9999_p20150714.ebuild 4723 SHA256 b85437783827d4fe028019280d380d0002db6005819fcd88a36a936f6f05f5b1 SHA512 54493d2b51fabd89256cad63c58eaefb4a911ed0bc21ab7f4122be5a6970ffb3a52e0657a2a0e7b1cddf2e264b50acbd5e881407872319756026ae3b6083f79b WHIRLPOOL d4b06765c9f499001921f0f0c0d44bb4e4f015f20f502e6686508bf80fb3b0e1e9f1a6870bbb30a0bf3de93c8f26fee0c7a61cdfe8020d9fa0edd496db5ef174
+MISC ChangeLog 157063 SHA256 9e4f6d079367c26a92cdc42cf9a0f1eacfa90b143149548ae4c01613d90350bf SHA512 f59b42262f907ab432d3912bfc15e2e65bef05cfc3391e0dca0938b66eb5640f792a8398df105de19b37ac94b46bed45bbb5d708be7b28bacc7c3fdd456bafcc WHIRLPOOL a2e5fd70a75822285b1b19c24871fd03f071afa9292bb66f9bfcfc9a165433e2332a6bfe6fdfa5afbbb7130bbaa8e1366e0071fb053b5988a9919b40f3acde72
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150714.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150714.ebuild
new file mode 100644
index 0000000..b1084ac
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150714.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-14_00-01-56/zip/netbeans-trunk-nightly-201507140001-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 f7ff456..d900575 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_p20150714 (14 Jul 2015)
+
+  14 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-mobility-9999_p20150714.ebuild:
+  updated to the latest sources
+
 *netbeans-mobility-9999_p20150713 (13 Jul 2015)
 
   13 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 1721c02..9f59638 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -46,6 +46,7 @@ DIST netbeans-trunk-nightly-201507020001-src.zip 208088424 SHA256 1dde0fd1452c74
 DIST netbeans-trunk-nightly-201507090001-src.zip 208130931 SHA256 5d73ccaddac610b27ab8aecaa95f5ef920a833291d2573daeb29f1f79eef1864 SHA512 6405717c46d506dbaa744fd33ba88daf3037e9d388482d808a6eeab292a42d99e76eea4494639725568239dc939444b0357a3f55b364a57256e93f5252efb7d5 WHIRLPOOL 9bddee309d416454d25c497074ad9e2ff23b1e52de90975bbea12412524fcf44e384eed0b14ee7f0f1ae1988523a74281bef1de58c14321aaefa4f9ef1bd9ba5
 DIST netbeans-trunk-nightly-201507100001-src.zip 208139985 SHA256 ede6f00ad37a28f1fa7c825e0f86ada8e314a969db3ea1884d21b6cced8dd527 SHA512 49c255eefd2affd8206082b04cb2127138b841d9ffa5f175aabfdec0703a81da0299bfc7bf55404829b493cd530e2db5570f4a19e66cf5af83b2081ed90a43ee WHIRLPOOL 6f1dd8b72445a31428e310cba1de99f0223c57c6b24f178d9cf5855633d5da23d1a87a130267b9da9697fbf28d7dc7fca2a0a341af9936f443cb9e1dc6bf89c2
 DIST netbeans-trunk-nightly-201507130001-src.zip 208143364 SHA256 f6a745a4112c25988071e5add63f52b567ea416e56eb1c5ac1f0caa40b2fa47d SHA512 2a01dde8445619c79b837bc51d1eb5fb9136dc0ad74d1e73df9d45748baa7b41032c10a76d26505fcf783193978c25907dbb2fc93a0e54f8b470ca2a6d7b9a8c WHIRLPOOL 095f94bb313aa828e0d0e972e2ccd69015e300023d7ce51569963eefba61146421f5a1a015c28fa8885445bbf42987367d18ed57da98e3b7f6521bddd3a4aaa5
+DIST netbeans-trunk-nightly-201507140001-src.zip 208144479 SHA256 9daca7bafaeb7d4e4eed58ecec4ba487f11fd6fd4b6790c719d4f428929588d4 SHA512 96adc2194d3f005216677ccdffc1ac51ecac1c2a13ec3f29b177e553ea9f5a36d9c9010c7f6454612b78a7dcb5f5ef08197e1113701bdaa0c727b9c352422c3f WHIRLPOOL 4fecb0c62019a2fc3522db07513eba2b877c01c856ac2b727329cca7ff86d573ef493a813b943558c06da3d6bc3109b5082e7ccb356318e6aef374eadeddee51
 EBUILD netbeans-mobility-7.0.1.ebuild 8655 SHA256 992e214ff2926e2f0db623d96b717bf8f8e4ceb47e96e69b3c6b8f67d6a8d130 SHA512 d51bc003f4b637cfe71c9f49a96427e535596542ac195a9621bc4f92c04a6f720a87fac6eb267732f869ba105f263d9d36f848b54a89c734b6a68a78ed323808 WHIRLPOOL 515da7153b12c3b5779cfad16e3800b4d26ba4b174027d9a7b06a26754fad065751c7eda137ba6199315d024a322d59e7ea39a1b2f4244ea75b30770ac505791
 EBUILD netbeans-mobility-7.1.2.ebuild 7543 SHA256 bb3f1245ad68133798fa507f06dd1ffbc1d55f6ba38f4cccc29ff0240e5b5f22 SHA512 41f663977a0716c5449db597d5f90054717ff3579a9137a910d1943d3e0b39379c34c0d9aa9c98d231037a042074c8ecf5fc62c018cd7cd5e8680734ff854c51 WHIRLPOOL c3c6feb41ce3df356f617ca80530673ac653cdf50da0aead00518854d0850d6420333529aa6591e15ddd4053249191fcb47100c5f39a804352722e54f802bae4
 EBUILD netbeans-mobility-7.2.ebuild 6571 SHA256 58af97ca9a6adc56fa6abe91777a1ac35a3a9b7d68af1e73c23a45dc5631abb2 SHA512 ac42c3a3daa7d55c9c13d1c99dd6880d5d99741f80cfceb683da27e30c70d6228d9434571f2405d0dbbf27d2203e3f877da6347794b07b98331edd1631d3a69d WHIRLPOOL 5a6af3cbcd08180dcdf708a038f3119faacb9c78532b4bb1945c7260fb0a8232af57745e41a73311fafffe185c969e0c88ac34970caab7708313f53417695374
@@ -77,5 +78,6 @@ EBUILD netbeans-mobility-9999_p20150702.ebuild 4418 SHA256 daada9a6c890a99e9dc74
 EBUILD netbeans-mobility-9999_p20150709.ebuild 4418 SHA256 6d7c572355535683ebe1acb28c6bf63351faa8d1ef663cabd23690dfbfa8b7e5 SHA512 6e781fb7618562dde0b9174db4e09fb581d058d40b66a26552e4ca5aa516731dc33bf8c8c615cc6d44c933eb71d6fbc627bddb977f35f38f5504fdd39972c488 WHIRLPOOL 9e358eecb564c42b6b8863827bb621af455dd636a47d73db4f2eba2febd2c13323eca22d08a4b7e1b0aa0a3527a0d58d256fc3fb0c175c0bf104ccd530ca3139
 EBUILD netbeans-mobility-9999_p20150710.ebuild 4418 SHA256 d97a5673eae484d19b71b857a4bd9a0ddc0e56aa9cc3b326d12e5d21733d0ca6 SHA512 e8f1685cb67817e36ea2f909cb410ed23316572f6d94507875d197bbb4cd382678209bc5ec3c2a1bc86437a6fb9910f8c8844656c6e91b7454dd86b7ec21d957 WHIRLPOOL 2b09ec49ebf40549c0b7f64def7ebdf01afd0dfb88214d82adb038406d048ec55afdd40dff9100f3a739f54d1af693d96630d0fc6c15a054f1195fcf91dbfd27
 EBUILD netbeans-mobility-9999_p20150713.ebuild 4418 SHA256 85c501f8affa91f212a6e89a95c33eb649f9296ee001cf93ac5cfcdf8d66011a SHA512 be544ceaa221fcb0acce7ccc336d3f798861ec1cf103cc4d9f49953f0333240969c2de94d9f0fb5b73156c7a3ade279065c51881ca761e6dcfedbd36acc2ead6 WHIRLPOOL ab6f093abff54fd0d432911a2ff6e1115740ac22f9394017d4a8b3a0d337f9c4d3146008faed705cde0ff10bccdc14e59eb25fd07102d4263fee40ae1679dd42
-MISC ChangeLog 174871 SHA256 b3f01363c46f75ab538798ac7d3737612c705b7ac5483a08f660132dfbd0a19e SHA512 1c5296d26816e4f809c3de2a34a1ce5e355f721d9654bb46228260b391e49425c9609fbf4769cfee6a57d68804afa7f564c516e42b3cf935f00d9fdd20bf5961 WHIRLPOOL 28f433915e6ce921b61349e983ccee4b0fc2dcd6b46d35a00a4f6a144e73a80707febe83b38f804aa69f11d59f93bdfbe1865a9037963d3c1455113f1110274d
+EBUILD netbeans-mobility-9999_p20150714.ebuild 4418 SHA256 020d806add4ae47a9411296f1021d483e75e914d0be2681380b2c0b6a95703aa SHA512 71100f3e5bd74bfffa5d5a5ccf5cde493f95b54a74c3e7a3afa87499ae881038c620e95b15a5c44230d064e327fb7b98541f96d47c2d8eec982f054caf662c7d WHIRLPOOL 3294af44cfd1154ceefbda9b5920368f272710071e69c2d7598ac754f3892e3be775add3c00f53cf6a1dfbc5310d9ffd9a86ee0db1f26efb22a7aa0c0b7bbc0b
+MISC ChangeLog 175049 SHA256 e920757b8b60456340250c892a1d70a6b65059306d54db010c6325e05765950d SHA512 e5232456dba73b28f5316abdc4fb8877d07b44bb640c9bc438af0cdc2d54f2017bc3c97cf11610f1916f7624899464711ad1748838b8014ab00e9c6d05b6ca94 WHIRLPOOL 0acc718685c32cfba2ce64986a259110c4bf40e48b663670d4b4437e2bc1189ce3c6211688422301dad51c2b0b7522fea8c87eeae2c5c8423bb34f085e0f69ef
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150714.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150714.ebuild
new file mode 100644
index 0000000..11b66de
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150714.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-14_00-01-56/zip/netbeans-trunk-nightly-201507140001-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 e4b507c..dca5e32 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_p20150714 (14 Jul 2015)
+
+  14 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-nb-9999_p20150714.ebuild:
+  updated to the latest sources
+
 *netbeans-nb-9999_p20150713 (13 Jul 2015)
 
   13 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index 8ec7c0c..2943b36 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -45,6 +45,7 @@ DIST netbeans-trunk-nightly-201507020001-src.zip 208088424 SHA256 1dde0fd1452c74
 DIST netbeans-trunk-nightly-201507090001-src.zip 208130931 SHA256 5d73ccaddac610b27ab8aecaa95f5ef920a833291d2573daeb29f1f79eef1864 SHA512 6405717c46d506dbaa744fd33ba88daf3037e9d388482d808a6eeab292a42d99e76eea4494639725568239dc939444b0357a3f55b364a57256e93f5252efb7d5 WHIRLPOOL 9bddee309d416454d25c497074ad9e2ff23b1e52de90975bbea12412524fcf44e384eed0b14ee7f0f1ae1988523a74281bef1de58c14321aaefa4f9ef1bd9ba5
 DIST netbeans-trunk-nightly-201507100001-src.zip 208139985 SHA256 ede6f00ad37a28f1fa7c825e0f86ada8e314a969db3ea1884d21b6cced8dd527 SHA512 49c255eefd2affd8206082b04cb2127138b841d9ffa5f175aabfdec0703a81da0299bfc7bf55404829b493cd530e2db5570f4a19e66cf5af83b2081ed90a43ee WHIRLPOOL 6f1dd8b72445a31428e310cba1de99f0223c57c6b24f178d9cf5855633d5da23d1a87a130267b9da9697fbf28d7dc7fca2a0a341af9936f443cb9e1dc6bf89c2
 DIST netbeans-trunk-nightly-201507130001-src.zip 208143364 SHA256 f6a745a4112c25988071e5add63f52b567ea416e56eb1c5ac1f0caa40b2fa47d SHA512 2a01dde8445619c79b837bc51d1eb5fb9136dc0ad74d1e73df9d45748baa7b41032c10a76d26505fcf783193978c25907dbb2fc93a0e54f8b470ca2a6d7b9a8c WHIRLPOOL 095f94bb313aa828e0d0e972e2ccd69015e300023d7ce51569963eefba61146421f5a1a015c28fa8885445bbf42987367d18ed57da98e3b7f6521bddd3a4aaa5
+DIST netbeans-trunk-nightly-201507140001-src.zip 208144479 SHA256 9daca7bafaeb7d4e4eed58ecec4ba487f11fd6fd4b6790c719d4f428929588d4 SHA512 96adc2194d3f005216677ccdffc1ac51ecac1c2a13ec3f29b177e553ea9f5a36d9c9010c7f6454612b78a7dcb5f5ef08197e1113701bdaa0c727b9c352422c3f WHIRLPOOL 4fecb0c62019a2fc3522db07513eba2b877c01c856ac2b727329cca7ff86d573ef493a813b943558c06da3d6bc3109b5082e7ccb356318e6aef374eadeddee51
 EBUILD netbeans-nb-7.0.1.ebuild 5106 SHA256 3c68751bf5face5f80e2d7dcedb7466e69343f2d06c0a4dd30a722a987fbb207 SHA512 d79343e0ca8655b074a8f96b9898e4bc0123d60e346602ba8d7a239597993cadb33a036b43862ef1a39630e4f0ba7e79892d8b2eed8b30535f12a5d0b9f4b581 WHIRLPOOL 9f2cd645e34fbcfa8f0059fbda4f355f411aaff7966121360dfe5b3c769966c5a4586bbc04142b279e3a3fa323bc4b51a6349cf3eafe89063db44fcae58ef119
 EBUILD netbeans-nb-7.1.2.ebuild 4977 SHA256 265f9e4a9490937a65632ddaef48e3a731154b07b9ee5f9536a991181fc2fcbd SHA512 65d1065993dba3b1fece428beb1b75f17d89eddb08aacd2cbf5ecd3ee5ca844e75e9100c324ecdeeed5b138b1da4ab8cd5a4598e584a17545ffc2c52ea763779 WHIRLPOOL 9b63f2b5671bd38d24ff6b280de37fc19c74170bf80c22818da5e8af415a85211c6cfcf690e68d7697c41a1b749a3c7b48ec9b362782df140856f892d381e360
 EBUILD netbeans-nb-7.2.ebuild 4960 SHA256 bef2020a6e0d722ca77c0931b9a06014cedc822f14a21d8d916200e358dcdfb8 SHA512 988d902bbef52e123b5800e56049210d69c4dd6dbeca80396aeac58c70d90b76da65b338e664368ea3f9a3973b7b94ffd0a47a77b01be53452c2cc04c4067442 WHIRLPOOL a27fa8a1a066499a3fc2cb82e955b6b18b1725889b088ea1e94528cde3ec58f3b46c1e757fa597af6ad4ba96218dacfacff9561799f46add316e233d46127d28
@@ -76,5 +77,6 @@ EBUILD netbeans-nb-9999_p20150702.ebuild 5003 SHA256 a660946eb32c5efe5e09eb4bf71
 EBUILD netbeans-nb-9999_p20150709.ebuild 5003 SHA256 f61c71b64613e64cfc044b558336faca697d18e74334c5dc7a0fd2db6532897e SHA512 1c17e96dd925159ba5fc7937e8485abd9b5c3d1df33451164dc5e429365869b8291bca56c9ffe619df8f9730e16fced36419bc805ab0abcf43f6a9831f6e1456 WHIRLPOOL 1f37aff488839e25af8cf7e166a4c450f9ec644917c97490d2dbdca821cd1c462a1a9163acf96badf4a7801554e49814feaf0109a5a34b04d864444f916bbbad
 EBUILD netbeans-nb-9999_p20150710.ebuild 5003 SHA256 c4b42e26ca3c5fd191f771a0850d513ed2e54ce01be652211099567562b312ac SHA512 67f6c2ec60669fbcc2c7fece6d66d7a2ca9ce2f047b46ea996a20d7a4f6adf916b56d8b1736c2ce85c3cd0927f6ed95c22eed648843767ff845ff63bcfe69145 WHIRLPOOL fa2ade397b80bcb9ef22a6b82db74364d4a2fdc74ef11abe5cb7a71b1a8b0030893ce5f33bac951394af8c2f8eb336ac6c0829ba8bc8c11ac355d4811a650bb5
 EBUILD netbeans-nb-9999_p20150713.ebuild 5003 SHA256 8867f681a33bec35cc65f6a0cb67693d2dbb657dc22be20470d4bf9e01e3db01 SHA512 9477c40162f9ed38b66e22925000bbe8e993ddd42c052a3f11208c6b9613ab4545e9fe8a6183dbff4ae8bd24d49af34c24bfd9b432b5b3e393a0a0f053714e8e WHIRLPOOL efaea908a825979bf37f4c95092cf95a8c43b87dd02189aa8f42f6a1069d1bf5b32ff8a3e2829a81c6e138a75d094f184b92e70c6f48f18b9dc9158bc57dfa15
-MISC ChangeLog 163265 SHA256 161ef7625332ed3c784a8330ee01ba232c711831465fef282e600aec4d3d45ee SHA512 b6635009518a48a8bdc972654b701f89b0b5415a4770fd4c887906bb77e6a9d8cee4c101ce854e7d634888ed7c9c709551ae389114b0cb4217dc377b4e9fa7c0 WHIRLPOOL a5c23934fbb331af4850ee73d41c88c37fde5be056f0d0ec5c60714a147bfb4441eeb4eaa7f08c6a1eedd2aaa5e4635384776bc8b42c04bc6e033a2d6ce579f0
+EBUILD netbeans-nb-9999_p20150714.ebuild 5003 SHA256 325c749cd45ae91ecb0ab0e8b83d92f353de9c69116775f7ff417b60871db4bb SHA512 92b7263bcf6761669e9d4f20824446d84a4948c4c8cb22b80308de8bf6c0fe390d6dbcf38ac66f2cf98c2dc8bf00d9bd47c87ead651541f0615278d2554c6610 WHIRLPOOL e292de0c5970303fb2354e42a3dbfc3e01adcee1e8b072727ee7bcf420275485812b917f23d6b66c1abd670dd1fd56c6b1b8fa800146f4bd49c02fb0dd8ca4cd
+MISC ChangeLog 163431 SHA256 4f7762d162c9c95181d99ef3c2e3f5b8f09092b7bcd1a82876dd0655ae98afed SHA512 5dd9556cebd8335a568081ca8d5e894be9b2833a656749f642dbf99cc85eaa5ff63923659bf66702f630e4b0bb0ac20b7dc9a1215c6aa09d69a53ce38d6a943a WHIRLPOOL 283131f8e6e91401154ce61782b2100b784928c10f42043c91e717033366ea2ac8219abb2aa502370d2f093d6537e8c284f9d9365a91d28e0b32cc54073d0516
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20150714.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20150714.ebuild
new file mode 100644
index 0000000..1ec3fb0
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20150714.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-14_00-01-56/zip/netbeans-trunk-nightly-201507140001-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 962afb7..66dea21 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_p20150714 (14 Jul 2015)
+
+  14 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-php-9999_p20150714.ebuild:
+  updated to the latest sources
+
 *netbeans-php-9999_p20150713 (13 Jul 2015)
 
   13 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index 3301873..d635f86 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -49,6 +49,7 @@ DIST netbeans-trunk-nightly-201507020001-src.zip 208088424 SHA256 1dde0fd1452c74
 DIST netbeans-trunk-nightly-201507090001-src.zip 208130931 SHA256 5d73ccaddac610b27ab8aecaa95f5ef920a833291d2573daeb29f1f79eef1864 SHA512 6405717c46d506dbaa744fd33ba88daf3037e9d388482d808a6eeab292a42d99e76eea4494639725568239dc939444b0357a3f55b364a57256e93f5252efb7d5 WHIRLPOOL 9bddee309d416454d25c497074ad9e2ff23b1e52de90975bbea12412524fcf44e384eed0b14ee7f0f1ae1988523a74281bef1de58c14321aaefa4f9ef1bd9ba5
 DIST netbeans-trunk-nightly-201507100001-src.zip 208139985 SHA256 ede6f00ad37a28f1fa7c825e0f86ada8e314a969db3ea1884d21b6cced8dd527 SHA512 49c255eefd2affd8206082b04cb2127138b841d9ffa5f175aabfdec0703a81da0299bfc7bf55404829b493cd530e2db5570f4a19e66cf5af83b2081ed90a43ee WHIRLPOOL 6f1dd8b72445a31428e310cba1de99f0223c57c6b24f178d9cf5855633d5da23d1a87a130267b9da9697fbf28d7dc7fca2a0a341af9936f443cb9e1dc6bf89c2
 DIST netbeans-trunk-nightly-201507130001-src.zip 208143364 SHA256 f6a745a4112c25988071e5add63f52b567ea416e56eb1c5ac1f0caa40b2fa47d SHA512 2a01dde8445619c79b837bc51d1eb5fb9136dc0ad74d1e73df9d45748baa7b41032c10a76d26505fcf783193978c25907dbb2fc93a0e54f8b470ca2a6d7b9a8c WHIRLPOOL 095f94bb313aa828e0d0e972e2ccd69015e300023d7ce51569963eefba61146421f5a1a015c28fa8885445bbf42987367d18ed57da98e3b7f6521bddd3a4aaa5
+DIST netbeans-trunk-nightly-201507140001-src.zip 208144479 SHA256 9daca7bafaeb7d4e4eed58ecec4ba487f11fd6fd4b6790c719d4f428929588d4 SHA512 96adc2194d3f005216677ccdffc1ac51ecac1c2a13ec3f29b177e553ea9f5a36d9c9010c7f6454612b78a7dcb5f5ef08197e1113701bdaa0c727b9c352422c3f WHIRLPOOL 4fecb0c62019a2fc3522db07513eba2b877c01c856ac2b727329cca7ff86d573ef493a813b943558c06da3d6bc3109b5082e7ccb356318e6aef374eadeddee51
 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
@@ -80,5 +81,6 @@ EBUILD netbeans-php-9999_p20150702.ebuild 4423 SHA256 9af0cafe1341fbbdf8b1c56c75
 EBUILD netbeans-php-9999_p20150709.ebuild 4423 SHA256 7b7b28eb39566140a3e2d2eb1e35a934a5b11756d83ab955b9347af50662f4c4 SHA512 ef3f24db46c38210b19f1dffa04e078f5af53c918efd0f8684ed5b5317058a6ace5b5fd580df8b2d46859f9a523d67d471de77083a1edb4b282da1b7ef534648 WHIRLPOOL 01baee4920b970b9c5b8f8ef285c8cb6afbb35b3401dd6f37c2555e5c88e57715a1910f479bb35149de895fb2b32b917f4bcd22a230378c27dde23e11809559e
 EBUILD netbeans-php-9999_p20150710.ebuild 4423 SHA256 096464e002d7269ee1e91937b17b9528c31a7dd6eaffd21e652a1544cacebe0c SHA512 4337870f6ae5a15da316146c864939596b99984c238890179eb9e7e63d968108611be0243d83b7e8d9ea466b668f27cf4ece426ed59eef924d2f7c9af4ae3951 WHIRLPOOL 675e823f1129691fd8f10fa2279bbe21c6fe3dcecc9eeb895a12a27e6acc245dccc5956acce3e2045acae978575f9695f54d677f15185ca97ee2c1718495ee1c
 EBUILD netbeans-php-9999_p20150713.ebuild 4423 SHA256 ee7b48a5ba7a114cb4e1dca98b3c556aff76b3488c017bdbe4dab8d786ce851c SHA512 42a2cc4386ddbe920b9d384024eccca037dbf156fbd18d4e95ed38be7c9a63c8cbad17dea8d895d732f34ebb7a5ad56f4ed78882357488f58298559c023ce9b7 WHIRLPOOL deb2763b60ebaabdafac26d1baa763b1a3e8830b4b4611256724cf0d034c81a4c697b2ea19b335061c14c8fa358c4cfd56c0a7f27b9d07d10545cfda000433c4
-MISC ChangeLog 163077 SHA256 497dddf18247d12ee445f6cbd437ce64a6963ebcc9adb7d7945c06497cd06036 SHA512 efbc03b0a9f36c95662b45981d097bba0962bb6d56b8739af31eaea1ba08c680a9bab0a630370b3def8b618c8f920aef91a3d3932151ad55884fa573233dc62f WHIRLPOOL 3b25c65905bc6671695f956dca744b07f728d488392111a95784c898d4312b510c2cb732a38f7a14b0cfdcbbaca697bbb9cd644dae2dc88aff7c49a0c02b1bbf
+EBUILD netbeans-php-9999_p20150714.ebuild 4423 SHA256 2089d90cac7f4a343fe840b203f10bf504cb21d92400f5fea31cc882262b4353 SHA512 e072047322e782d86d9309734f9c1a992d3e00c7d0daf73d1fb1338dcef7cbfd6bd3d3888c39b0f041ddca5d14d1a6a8f757fdaaf890a29038e7127865740535 WHIRLPOOL aae9719590b84c0293ae73baf6df4941f0f421e319d4c88172e8058000e254befaa63b46ae4033873b90e2a672af50ce0fd22045eaa4ab5c0093932d2461615b
+MISC ChangeLog 163245 SHA256 6d8fe08a5038534fb9386e636e1d8890dd0f1358e2d5e1ad868b8908c8d83652 SHA512 5127e63c8573b93ea101e304a7296d9600bb1def0bab867033c7b443a3174eb6fca03706b6c382323c6e0c3bf2391d04aa1af0c3202ed350c4ff77762d6156a8 WHIRLPOOL e8468598c501ca5fd247c7932798fb440e38b286e1f76c18fd188eba74068d996f2166ab52ebadf77e4d5687fa887ea3ba421a17b76d3c48f29e843ed8043c52
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20150714.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20150714.ebuild
new file mode 100644
index 0000000..90c9e82
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20150714.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-14_00-01-56/zip/netbeans-trunk-nightly-201507140001-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 5718131..1a0230a 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_p20150714 (14 Jul 2015)
+
+  14 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-platform-9999_p20150714.ebuild:
+  updated to the latest sources
+
 *netbeans-platform-9999_p20150713 (13 Jul 2015)
 
   13 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index 0e2de7e..a6be256 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -63,6 +63,7 @@ DIST netbeans-trunk-nightly-201507020001-src.zip 208088424 SHA256 1dde0fd1452c74
 DIST netbeans-trunk-nightly-201507090001-src.zip 208130931 SHA256 5d73ccaddac610b27ab8aecaa95f5ef920a833291d2573daeb29f1f79eef1864 SHA512 6405717c46d506dbaa744fd33ba88daf3037e9d388482d808a6eeab292a42d99e76eea4494639725568239dc939444b0357a3f55b364a57256e93f5252efb7d5 WHIRLPOOL 9bddee309d416454d25c497074ad9e2ff23b1e52de90975bbea12412524fcf44e384eed0b14ee7f0f1ae1988523a74281bef1de58c14321aaefa4f9ef1bd9ba5
 DIST netbeans-trunk-nightly-201507100001-src.zip 208139985 SHA256 ede6f00ad37a28f1fa7c825e0f86ada8e314a969db3ea1884d21b6cced8dd527 SHA512 49c255eefd2affd8206082b04cb2127138b841d9ffa5f175aabfdec0703a81da0299bfc7bf55404829b493cd530e2db5570f4a19e66cf5af83b2081ed90a43ee WHIRLPOOL 6f1dd8b72445a31428e310cba1de99f0223c57c6b24f178d9cf5855633d5da23d1a87a130267b9da9697fbf28d7dc7fca2a0a341af9936f443cb9e1dc6bf89c2
 DIST netbeans-trunk-nightly-201507130001-src.zip 208143364 SHA256 f6a745a4112c25988071e5add63f52b567ea416e56eb1c5ac1f0caa40b2fa47d SHA512 2a01dde8445619c79b837bc51d1eb5fb9136dc0ad74d1e73df9d45748baa7b41032c10a76d26505fcf783193978c25907dbb2fc93a0e54f8b470ca2a6d7b9a8c WHIRLPOOL 095f94bb313aa828e0d0e972e2ccd69015e300023d7ce51569963eefba61146421f5a1a015c28fa8885445bbf42987367d18ed57da98e3b7f6521bddd3a4aaa5
+DIST netbeans-trunk-nightly-201507140001-src.zip 208144479 SHA256 9daca7bafaeb7d4e4eed58ecec4ba487f11fd6fd4b6790c719d4f428929588d4 SHA512 96adc2194d3f005216677ccdffc1ac51ecac1c2a13ec3f29b177e553ea9f5a36d9c9010c7f6454612b78a7dcb5f5ef08197e1113701bdaa0c727b9c352422c3f WHIRLPOOL 4fecb0c62019a2fc3522db07513eba2b877c01c856ac2b727329cca7ff86d573ef493a813b943558c06da3d6bc3109b5082e7ccb356318e6aef374eadeddee51
 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
@@ -94,5 +95,6 @@ EBUILD netbeans-platform-9999_p20150702.ebuild 9244 SHA256 db71d52a3cde54e511289
 EBUILD netbeans-platform-9999_p20150709.ebuild 9244 SHA256 f94aa0c55c865916abbe68b8cb8e2c68c31a90fdca8df836ad1cbb638846fcd1 SHA512 34ed91a69e0763ce61e16b6f320278a84cd5bf66bdccb665ab0d643ba975112b50a135ae3b13d05cc8bf18d2aba8c1fbfa580cfbfc7961dedcffc48dc56e062c WHIRLPOOL 5368d66c9f9ffab477250befcdb664b480fe71ed4939c74d22eadaa7e309370689eb97f7c83057d7e97e3470535da0f01262baae14260371f19785f3e42b92fa
 EBUILD netbeans-platform-9999_p20150710.ebuild 9244 SHA256 2c2f12786809911c4c12311b999647fe77519450c60236420c0633e851ced2bd SHA512 f28469839edb1bd8df14b512cb59385ab406243900e8cbbec97b7f857bd0c1399d1d773d72ee26b0255115ecfdc926d31c778c93ac491bad7353ee9d68e7d102 WHIRLPOOL 32ebed23ba1806b565e3797ee9d2ac6fa51cc3301e588bd96679bfb4e19a7c42da1a947240c89b252366a1aea35471f172e308133657d6301e29e96f6975d4cb
 EBUILD netbeans-platform-9999_p20150713.ebuild 9244 SHA256 866bab76fe85ae683f4c7f204574ecea1efaeee7ef300762e2c6bd3aa38d793e SHA512 35984c6bcfbb17711b39bace4b1cc844da9f2147e0803e2ceb44def2e84a10609f55e4c692bd069bfea6f4700689b5806479bd3d3ce713608f0944c4c19c2992 WHIRLPOOL 879539e8ace8d5f6077dd6e7e818b9bf1c0458d03019bdd64f7325935fbb4e466d5afdb76eef06c6551dba46a6921bb5f6f3e6100dcbdb15c8c0a384985c3b67
-MISC ChangeLog 175467 SHA256 93c212e48fa39b56dfa083e813378e9d44d14fc16f737b0a3996c11df0827405 SHA512 972c0415a172637cd6acbfd23d5cbfe816715dc6d40229f1e5e4e959fca221493b33d0490ddfcb15d3ffd81039d19ccb027f4ab0e747c585468133fff3be3374 WHIRLPOOL 917e6892da8ae6a51c291b694740647b5b7530aa8cd10d480c27d8f159bec1f4420185c5ac899b6a52092ccd502902f6487928a585e1acc1c8c3f460589f652e
+EBUILD netbeans-platform-9999_p20150714.ebuild 9244 SHA256 a24b98615e35ef05b1169011ddc3df192ad60859c6ee3e9ff76efab5ab762e47 SHA512 f32fd118f14a137663cb458a7ec799f274081db4c99dd7ce5c9f6afe57a34a34d36f9adb63d25b4e74eeea7ba107444aa902df7deffb86acf69cd06bb5f6a2e5 WHIRLPOOL 1aeb317ce1f28c2986f0f5de7ab07eb104e8f123a3148aa9ed16b950111c5e5496f809d4a0b352df5bd61f3b4d8a362ec25127377e8f1456504c649009d57136
+MISC ChangeLog 175645 SHA256 68f7329d1f245ce3a98b0267b9b480a3a66b75be4cb9eaaf0a3e86551198fc04 SHA512 c3d3a20b0d332d36d8f473cde74bbb8b2cd76336394c5b9e5cd24b481149619d2f43f211ca5096a918efca5fe6126f4845fd537af344fe38cb7b0fbdaa670e0f WHIRLPOOL 574bf4b89f671e7ddcba481912639884f9222a8530d91e410ae57f664f70b5b930defe63bfedb2462eb3bc089a47308448928b9fa48a55060bda7143740da910
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20150714.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20150714.ebuild
new file mode 100644
index 0000000..f9386a8
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20150714.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-14_00-01-56/zip/netbeans-trunk-nightly-201507140001-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 cb94562..e1f9f21 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_p20150714 (14 Jul 2015)
+
+  14 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-profiler-9999_p20150714.ebuild:
+  updated to the latest sources
+
 *netbeans-profiler-9999_p20150713 (13 Jul 2015)
 
   13 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index a345126..2e3e88f 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -37,6 +37,7 @@ DIST netbeans-trunk-nightly-201507020001-src.zip 208088424 SHA256 1dde0fd1452c74
 DIST netbeans-trunk-nightly-201507090001-src.zip 208130931 SHA256 5d73ccaddac610b27ab8aecaa95f5ef920a833291d2573daeb29f1f79eef1864 SHA512 6405717c46d506dbaa744fd33ba88daf3037e9d388482d808a6eeab292a42d99e76eea4494639725568239dc939444b0357a3f55b364a57256e93f5252efb7d5 WHIRLPOOL 9bddee309d416454d25c497074ad9e2ff23b1e52de90975bbea12412524fcf44e384eed0b14ee7f0f1ae1988523a74281bef1de58c14321aaefa4f9ef1bd9ba5
 DIST netbeans-trunk-nightly-201507100001-src.zip 208139985 SHA256 ede6f00ad37a28f1fa7c825e0f86ada8e314a969db3ea1884d21b6cced8dd527 SHA512 49c255eefd2affd8206082b04cb2127138b841d9ffa5f175aabfdec0703a81da0299bfc7bf55404829b493cd530e2db5570f4a19e66cf5af83b2081ed90a43ee WHIRLPOOL 6f1dd8b72445a31428e310cba1de99f0223c57c6b24f178d9cf5855633d5da23d1a87a130267b9da9697fbf28d7dc7fca2a0a341af9936f443cb9e1dc6bf89c2
 DIST netbeans-trunk-nightly-201507130001-src.zip 208143364 SHA256 f6a745a4112c25988071e5add63f52b567ea416e56eb1c5ac1f0caa40b2fa47d SHA512 2a01dde8445619c79b837bc51d1eb5fb9136dc0ad74d1e73df9d45748baa7b41032c10a76d26505fcf783193978c25907dbb2fc93a0e54f8b470ca2a6d7b9a8c WHIRLPOOL 095f94bb313aa828e0d0e972e2ccd69015e300023d7ce51569963eefba61146421f5a1a015c28fa8885445bbf42987367d18ed57da98e3b7f6521bddd3a4aaa5
+DIST netbeans-trunk-nightly-201507140001-src.zip 208144479 SHA256 9daca7bafaeb7d4e4eed58ecec4ba487f11fd6fd4b6790c719d4f428929588d4 SHA512 96adc2194d3f005216677ccdffc1ac51ecac1c2a13ec3f29b177e553ea9f5a36d9c9010c7f6454612b78a7dcb5f5ef08197e1113701bdaa0c727b9c352422c3f WHIRLPOOL 4fecb0c62019a2fc3522db07513eba2b877c01c856ac2b727329cca7ff86d573ef493a813b943558c06da3d6bc3109b5082e7ccb356318e6aef374eadeddee51
 EBUILD netbeans-profiler-7.0.1.ebuild 3222 SHA256 b1bab800a27c30aaea26b8ff5ab21abdd1bec16b9890133429eca9ea77c018fe SHA512 d6198f44a06561b7e2598fdd6a37f8a3dc13c38f63dfbf6a86a083adbf71e9c62af87cb4e1b5b8dd2dc99feeeb99a7afcbb8f7747c378ad92c71263cc91a6c54 WHIRLPOOL c62613f511636b1f0393ac32c6b50641cdf7df9f9fdc95fd5acbe1a602ffe42fdabb556f989552b05b0607a5ad9d324a2019440c3ae66c50995ef3fc8775f385
 EBUILD netbeans-profiler-7.1.2.ebuild 3231 SHA256 94d87bf6f86add3bdc27f9f20084f35fe584fc2bd697acafa8c23cce16a0d1ee SHA512 dcc8da918a6b6e07ccae513fb4296d16891e205b49098fb8269d16beb9b1367b1920797cc78053b83f4321c1b69faa393365265c72213bb2abfb9d3f84f66319 WHIRLPOOL 18325a1df836e7242838920483c41d43f37b9dae8322d36a2a562b414baa0dc76971f581204ce76a6d64196dd60643089e8704da69617590cda61ce54ce82e8d
 EBUILD netbeans-profiler-7.2.ebuild 3214 SHA256 ddcba9ba672ad566ef256538fc8631ae691aa7c6574269199f26df5382c37f4b SHA512 1bb7eb95381861b8265ab366fe3c7a9b99971d1c4600eb6c7bffb521f4cebb32bcf3d662f82c811d47fe95e77cd39e48f3665f0fcabf9145eb171c2746d89684 WHIRLPOOL 7f74c2be9ec4e7ff419086f1da3b1a12b1c187102def004316ef89ed28f30da62542ed3409a51473a8d9d68d18a30de36b1d0307cd8eeb7e580668fe896c5aa5
@@ -68,5 +69,6 @@ EBUILD netbeans-profiler-9999_p20150702.ebuild 3478 SHA256 dc9889a9e8ec967f23823
 EBUILD netbeans-profiler-9999_p20150709.ebuild 3478 SHA256 ee0b7000e1730b10961fc50db6ac4463dcc475e0438ea17130a3392f19b36df2 SHA512 c8726e695e2143ec63bf7a43c6d8e85b67fa50b0b3a37564572deabf20cc96d6afb6bf120e9fc49582257550d06f62c119912a2410d891e0fda01144093c4010 WHIRLPOOL a08f709f66c683d02fe4943edbc59d438865c9843dcbb75ad3c4a357113395dbbd67ca1666272f14d7b583ab6d2d4bf1f42f1966981be6eae62329780eaa2000
 EBUILD netbeans-profiler-9999_p20150710.ebuild 3478 SHA256 3b5a8418be05b89c4baa61dee826387e5604340c9bdd404a4f676ce9f7942eee SHA512 31f01a417cfc6ddf2a03510d923ba20643f4a4a1d2f0bc13a6bda40abe00efb75286e2952dd9f83613ab030db4ba6190e8d03e73fe7d1a2e0f8f5df290eb4420 WHIRLPOOL aa09ca1ec7428c9ff80b01ff3391d0a1fe347e5d6f59f56c7832b7df14fd0475cee8443c01bc1ff924e15cb1da5a1b44004232df667bc17d7348c5600fb7f1f2
 EBUILD netbeans-profiler-9999_p20150713.ebuild 3478 SHA256 c9deb5043e222551a77450d02eca261a916a773eeba316e9555500e8111754f7 SHA512 a568c60e895ee778bca2458876a9ac5fc07333cffc02abdcaa2f12ba2e1d79e17dc0292c0b6bfa009c49f9878077c4a2756dbae405de3fd51be1c23139943fc8 WHIRLPOOL 08442e86f306d06a9831c2d5a314be3f4f24e6f14b8b80159ed7e006f9525a4718706623f17331e109d297e4809af9130118f9d4aad13a94d919e448c19ab456
-MISC ChangeLog 174928 SHA256 0eb4e8f0cd07ea83036bdb53ae65db8e2829de7e7ab10a853b6142e855bb4526 SHA512 b3e7f316e2c771f8727754d38c99082d3f311c50993d57f31cca268d9ef18168d5f2dea2c8bd572422b0a76120a306612e96fb5a30ba8161783f0fc5304175e7 WHIRLPOOL 4708bc055eca4373440ab320a831e24add72621cc5b368c2c386c5054e9c582d805808c852d5087632715c8601d5bb381280f91cf61b0cd70b74d7ec4e738bab
+EBUILD netbeans-profiler-9999_p20150714.ebuild 3478 SHA256 c0663e2c9b2730569a5a5081aa4f953bec108be28bc5c7c4eb7cc87ada89dc9e SHA512 36f752167cb59701c6d73b769f3c4c1fb21b74d0e8dba59db4bbb9bbd5527c55516bcb0f12172c0de3ee2f6a1d2574b574540685dc70513e11ff4e099f518559 WHIRLPOOL a21176f491f4571052b58a5ab52650e4405c8c0ab2240c3388553aa05765744fd0f75e076860495b640f323fc2defa381bc9036e7a7bb2191b66b06f6a4b58ac
+MISC ChangeLog 175106 SHA256 be27aefb79ce8d9fb33087d56a4d5542da8c4a26a6179fdbcb9f4ab16fa40b00 SHA512 910482410095891433aa6782edd2c798536a0c4035c76399c181e947708e7ee78ccf65d3247c3c448f38bbd52f5a98ab20a004fdcfac6e336a5792432a56e6bb WHIRLPOOL 579b736c5c29b3cfd41cfb1e52f65177992e8eb1162ffd403275a18a05795eef4e67fc82cc3fcfc33ced0038684fc78764509f85096c7b8997ab5b0225b83b9d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150714.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150714.ebuild
new file mode 100644
index 0000000..315fb99
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150714.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-14_00-01-56/zip/netbeans-trunk-nightly-201507140001-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 79a2908..82ef7ca 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_p20150714 (14 Jul 2015)
+
+  14 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-webcommon-9999_p20150714.ebuild:
+  updated to the latest sources
+
 *netbeans-webcommon-9999_p20150713 (13 Jul 2015)
 
   13 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index a94f52a..6a933b5 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -43,6 +43,7 @@ DIST netbeans-trunk-nightly-201507020001-src.zip 208088424 SHA256 1dde0fd1452c74
 DIST netbeans-trunk-nightly-201507090001-src.zip 208130931 SHA256 5d73ccaddac610b27ab8aecaa95f5ef920a833291d2573daeb29f1f79eef1864 SHA512 6405717c46d506dbaa744fd33ba88daf3037e9d388482d808a6eeab292a42d99e76eea4494639725568239dc939444b0357a3f55b364a57256e93f5252efb7d5 WHIRLPOOL 9bddee309d416454d25c497074ad9e2ff23b1e52de90975bbea12412524fcf44e384eed0b14ee7f0f1ae1988523a74281bef1de58c14321aaefa4f9ef1bd9ba5
 DIST netbeans-trunk-nightly-201507100001-src.zip 208139985 SHA256 ede6f00ad37a28f1fa7c825e0f86ada8e314a969db3ea1884d21b6cced8dd527 SHA512 49c255eefd2affd8206082b04cb2127138b841d9ffa5f175aabfdec0703a81da0299bfc7bf55404829b493cd530e2db5570f4a19e66cf5af83b2081ed90a43ee WHIRLPOOL 6f1dd8b72445a31428e310cba1de99f0223c57c6b24f178d9cf5855633d5da23d1a87a130267b9da9697fbf28d7dc7fca2a0a341af9936f443cb9e1dc6bf89c2
 DIST netbeans-trunk-nightly-201507130001-src.zip 208143364 SHA256 f6a745a4112c25988071e5add63f52b567ea416e56eb1c5ac1f0caa40b2fa47d SHA512 2a01dde8445619c79b837bc51d1eb5fb9136dc0ad74d1e73df9d45748baa7b41032c10a76d26505fcf783193978c25907dbb2fc93a0e54f8b470ca2a6d7b9a8c WHIRLPOOL 095f94bb313aa828e0d0e972e2ccd69015e300023d7ce51569963eefba61146421f5a1a015c28fa8885445bbf42987367d18ed57da98e3b7f6521bddd3a4aaa5
+DIST netbeans-trunk-nightly-201507140001-src.zip 208144479 SHA256 9daca7bafaeb7d4e4eed58ecec4ba487f11fd6fd4b6790c719d4f428929588d4 SHA512 96adc2194d3f005216677ccdffc1ac51ecac1c2a13ec3f29b177e553ea9f5a36d9c9010c7f6454612b78a7dcb5f5ef08197e1113701bdaa0c727b9c352422c3f WHIRLPOOL 4fecb0c62019a2fc3522db07513eba2b877c01c856ac2b727329cca7ff86d573ef493a813b943558c06da3d6bc3109b5082e7ccb356318e6aef374eadeddee51
 EBUILD netbeans-webcommon-7.2.ebuild 2665 SHA256 9328ea550dfeca5be5c2b03aa5f512d451f1673e49a40994155fca0b2fb2f79d SHA512 d8b80b79e78769a70d01605a79a8a91f7e839d4138b4cbf28cafca6f56ae3d7003c2f5f40aff77bbe3f2882f43a7d7dca3f0428f0f2723a42ae5b49e4c71ffff WHIRLPOOL 31254cbd2fc6cfb2d1bed4d22958595dbbf73032439f19e684463efbe466ee80c144f77ab00ced7a07815b1cdc1d45a87ceda83e7a2fd20ac2ce65e45d30a093
 EBUILD netbeans-webcommon-7.3.ebuild 2986 SHA256 327c0a73fb20778d9fbe4a12024fa065e4102a7aff3fcbda7448874656a46420 SHA512 3d270e940424b3bcdc8c7f8ff2016d33eb55420ac4037f4e406b688c2acea1b07a04625772265ac293d80c0d1afe3bbe6f865051ed9234b700619bd0781d8b39 WHIRLPOOL 5bc288949ed3aa9c3c4cd4cd33b817fe317754229ad30e80da8cfea817bfb77e988a1d6d3280aaef90619968e0309fad212deff0f7970f04438494a893a30a5b
 EBUILD netbeans-webcommon-7.4.ebuild 4727 SHA256 54a0b63527001da34a21ae3ed69c2cfbf9a446ee69bda4bb6ac5ebb939ebb68d SHA512 96895c972cf7092426ec8bc06dccc6ab4f33334da4e67fd4da01e586801110bda8d955f2f29ecd93b8bb58ae64c4af4139e9954a784c10dec925e2beaeab2394 WHIRLPOOL aa7b3b59d315bd37553052470b1f56f435979569e5ef033493cf6f93c29827f2ecd30f6b874f07a0cd8824469c6546982ac3ed360bf3b6cbf211d95943a3398a
@@ -72,5 +73,6 @@ EBUILD netbeans-webcommon-9999_p20150702.ebuild 4997 SHA256 e4808322c8bf5f22f4cd
 EBUILD netbeans-webcommon-9999_p20150709.ebuild 4997 SHA256 6be8ae78858bb344611615fbb4a1255ae32d9d4017ada26de19cf71d4b66d755 SHA512 42421c943ace360c91b1dd4f19f1bbb7ba13cfb5db17c1590688641254f62d077e7df78773b7306b83fb2012d7d32fb6d52bf530ab8a0246db63979522faf8d1 WHIRLPOOL 1034f4bdff957059de2caf7e487ee9aaad353f074a8011d97c6304ac3cb5524706b6c622e37cc103bb531535c822761841655380b78910a415a4a67f61ba22c9
 EBUILD netbeans-webcommon-9999_p20150710.ebuild 4997 SHA256 d19cba438920ce918796867950f1927190eeb77f059a29464d0efdcf8b2c7fc1 SHA512 76dfa73e78caa00e6de09b99ac1629dcce228896b21bf30a53f6b75b0716997c82583f0a665e8aeb595ed1ff9aa3cb835fb555bf586cca4c6039415841fc3ffa WHIRLPOOL ed9e09be8e749520de31f4e931fba005c919a947f2f0083ad7d2cd6463ea7547231cc21cc794d6f27c0fbb65b78fbbdb31bee77ee39475a2a107d72472b9e2fa
 EBUILD netbeans-webcommon-9999_p20150713.ebuild 4997 SHA256 6266c8c9a418811fc6d3a5b3173bb06e89a9f08d75d40c15a2c8554a60044d6e SHA512 0ae9dfdec0362e65a50e5d976b240e555bdcd56c62bff16188228d057a8455bac068c4bf0fa7b502286ed54a107b78fc61dfa97751a9927c83cc9705987f49fd WHIRLPOOL bee3074f4e52494b5f4ca7d4f99acf11bd54136ce07e4d03470d083a703f4c3f8abe90520b4924da292d3aa173b159d11cf0b87b917395f16e22fbf8baec7d8e
-MISC ChangeLog 148095 SHA256 8e38c7adb6e1cd87f0b62ca93a7c60df643417b001a21f49736487b28981dd50 SHA512 aec3b682e109ce7ec262162205f03c3b68ad7c0159eaae3bdf6218341aa70578806fc1c4dc4ebfa4157b19d12859f98bfb5c70f970f1a57ab513b5d4ea01589a WHIRLPOOL 4a0b24e5714fe4239b1b36741a2f2fa40ac524f2f7df4ea847fd198cfba316fa5eec2454e52d3b4a9545372d7643c1aff037f4bee3fd74a8b9fbca0ddeb12820
+EBUILD netbeans-webcommon-9999_p20150714.ebuild 4997 SHA256 7ac39d3df9aabe4642b16a206138470031eaa768a11a5d2d9cbdcd867db1d131 SHA512 38eb4db4430a5da425f7c965cc1024dd70928b97848b4633bf605d71b17900da05a43f40fb82ad24c14a082458370ab4ce237c89fe41da44e17473aecec2cab5 WHIRLPOOL 7f55ceeabef1db1ec6a6bf706c32f5098896f12042a6187e47be1f93213024437e192071ecff524916bee3540f925b8945d2df1474daa582a81f708b563193af
+MISC ChangeLog 148275 SHA256 5caf3493d3d8ea831f370490a4e4f7a49145431ddf08a8b3f97f9229432dcab1 SHA512 9bf45cdd73013a6b53cccc5b988e8a83d6530c577929158b13892164a7c8ee2518a5d2b36501d80bcd07a61c56b19291bafeb47a035c3600890cd496ed65357f WHIRLPOOL f1e6d7b0e5e5fe35a47085c6e7068728db258fed376a4e7ee472332769c8754a35f38556dd97b063d09f346420f23a177288bce816621a0a3e842c310aafcad0
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150714.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150714.ebuild
new file mode 100644
index 0000000..c856f7b
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150714.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-14_00-01-56/zip/netbeans-trunk-nightly-201507140001-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 ab54b68..511618c 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_p20150714 (14 Jul 2015)
+
+  14 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-websvccommon-9999_p20150714.ebuild:
+  updated to the latest sources
+
 *netbeans-websvccommon-9999_p20150713 (13 Jul 2015)
 
   13 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index b1d4846..93d82dd 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201507020001-src.zip 208088424 SHA256 1dde0fd1452c74
 DIST netbeans-trunk-nightly-201507090001-src.zip 208130931 SHA256 5d73ccaddac610b27ab8aecaa95f5ef920a833291d2573daeb29f1f79eef1864 SHA512 6405717c46d506dbaa744fd33ba88daf3037e9d388482d808a6eeab292a42d99e76eea4494639725568239dc939444b0357a3f55b364a57256e93f5252efb7d5 WHIRLPOOL 9bddee309d416454d25c497074ad9e2ff23b1e52de90975bbea12412524fcf44e384eed0b14ee7f0f1ae1988523a74281bef1de58c14321aaefa4f9ef1bd9ba5
 DIST netbeans-trunk-nightly-201507100001-src.zip 208139985 SHA256 ede6f00ad37a28f1fa7c825e0f86ada8e314a969db3ea1884d21b6cced8dd527 SHA512 49c255eefd2affd8206082b04cb2127138b841d9ffa5f175aabfdec0703a81da0299bfc7bf55404829b493cd530e2db5570f4a19e66cf5af83b2081ed90a43ee WHIRLPOOL 6f1dd8b72445a31428e310cba1de99f0223c57c6b24f178d9cf5855633d5da23d1a87a130267b9da9697fbf28d7dc7fca2a0a341af9936f443cb9e1dc6bf89c2
 DIST netbeans-trunk-nightly-201507130001-src.zip 208143364 SHA256 f6a745a4112c25988071e5add63f52b567ea416e56eb1c5ac1f0caa40b2fa47d SHA512 2a01dde8445619c79b837bc51d1eb5fb9136dc0ad74d1e73df9d45748baa7b41032c10a76d26505fcf783193978c25907dbb2fc93a0e54f8b470ca2a6d7b9a8c WHIRLPOOL 095f94bb313aa828e0d0e972e2ccd69015e300023d7ce51569963eefba61146421f5a1a015c28fa8885445bbf42987367d18ed57da98e3b7f6521bddd3a4aaa5
+DIST netbeans-trunk-nightly-201507140001-src.zip 208144479 SHA256 9daca7bafaeb7d4e4eed58ecec4ba487f11fd6fd4b6790c719d4f428929588d4 SHA512 96adc2194d3f005216677ccdffc1ac51ecac1c2a13ec3f29b177e553ea9f5a36d9c9010c7f6454612b78a7dcb5f5ef08197e1113701bdaa0c727b9c352422c3f WHIRLPOOL 4fecb0c62019a2fc3522db07513eba2b877c01c856ac2b727329cca7ff86d573ef493a813b943558c06da3d6bc3109b5082e7ccb356318e6aef374eadeddee51
 EBUILD netbeans-websvccommon-7.0.1.ebuild 2692 SHA256 a18cf7fe0a1e38749826cb12651be06c210b038be50117647496ee6cbd184cda SHA512 32b32894713d7235ebd03446c5c411d22eb8701b96e3d3ac54eca78b2abc833babf279085cea3b74bb7bddc6d89a283a21c58a0b0462042ddd10e22dfcadeb84 WHIRLPOOL 59c18168245767acd1f8e53046f8942698237aa6fd903a669c626b7f17cf3d39247b7ae57f2984562230267885a4b6a62be43dc8a330f1dfeb2cc7acbbd7d3c6
 EBUILD netbeans-websvccommon-7.1.2.ebuild 2701 SHA256 3b2a1cf0d32db3c55b66d1c6b8c4ae2ad5487d3fdb27752468ce5c860f9b9515 SHA512 b9be64755f00157c2d6984887b8c0fdc1e34470f21df1fd72b3e399d3ec894af01c9b79fd604778213ac2086a6c96bf66366e8c2c8bf97f7fee23d16ceb36974 WHIRLPOOL 91559de8c8f6391c3c69888854778a91a1a7e0052ae69eb9762bcbd64d8bc5587fb84ebb55d7d0375da5a7855aa8672abfd035b6a38b3eeb5c23a4cd59b3cdce
 EBUILD netbeans-websvccommon-7.2.ebuild 2684 SHA256 8bf8cad1e0469713c63280620fed089600191230f501a78b834b010f8fa9b3e9 SHA512 fe885f92a7c6cfac532c8e40e4df6283253c43294e9d82ee4d0d070425496eee3792479c268b46bf1fd484f753ca1f21e7ca38a5d71816b6d4fd219082e8e276 WHIRLPOOL 9d2d622d4a800470c874d8751e9c2055e0a4ef72ad01a01aefda4e95a7f295d55fc95fdb55fdd1f631212e1f610bdc7a6b4ee631b92492bb85f73b0d9fb4ba26
@@ -69,5 +70,6 @@ EBUILD netbeans-websvccommon-9999_p20150702.ebuild 2727 SHA256 de03556edecbcb00a
 EBUILD netbeans-websvccommon-9999_p20150709.ebuild 2727 SHA256 64f3c9d0e68e2cdf974bfbb729df357e79b4123b0da1945751a2a6d998453c95 SHA512 ef336e95e690f05c6aad1e5e3050dc78cd75ac4c04f0478727d73b9250fc278a8bc03aaf2e47872cf26e270e5aa274fa073c2af1447e10a2ce5e395c9ce90acf WHIRLPOOL a45d45c61b8763a58d21bf84cee9c3849aee7652898d0e59607d8133d95424242b19971260effe45c0bd429681f249ed16cf4e9538287eaa68e56fb29777eec2
 EBUILD netbeans-websvccommon-9999_p20150710.ebuild 2727 SHA256 04349a5344b4b0783b84d3dd6e3bce7387d6b741ce496dd270bb27dab0af2022 SHA512 daa0e76c339bf052d857acc9880ae5b3312b8bac716da00977c2be7b3bee89a11d245dd7f0a9cc940cb0505fbe0b3208c02adbed1d4824c9e44cccabc02da0cb WHIRLPOOL 50b84a8f5acb980cc296291134f6c532bdef4d7cd923a1ac975a898ac672820863b35c7a737b8255ff0507d766a878476c79a319facffd4ace94c1fd0da7b68c
 EBUILD netbeans-websvccommon-9999_p20150713.ebuild 2727 SHA256 c226e2e2e457f30c71b57f0cfa66a42ff4c201e829c80258976ef25751d1162f SHA512 3fd48b40c9535449aa69ee82a83652eca072db212eeb6991a32af812939c6748095345291cc8f3b07f2120dcdc26d0255296c4fa28a577fcf432ba3fb87fed7a WHIRLPOOL 8636e04ed2a9fc13823f138e5f9823e7a3004f6f7eda9e509ce23a301e9c7297a5a4ec58300ad7ec5aafe9b0c431e8196d7f06397c95dd65df787385f3beee96
-MISC ChangeLog 183350 SHA256 bcce5b6f56706ab32138e1386f8168773a0ea4c156e4fa4ab33176ed13aee014 SHA512 130423bef6853b951c1f0f44e7b04221d52a4e4de17bf3ad23592c80eb97b934ec400dab869c1d040150978d47eee114c2cf4b59ee97bd7f242c0b357f3ac3fc WHIRLPOOL a691bcc6628f8a56ac4bb42e2a9f82a80aecb19e071e99fcce01a9625facfe7927f8670a1b3533a28f0fbdf01491829e0fd45af0e5759134e245ff5d657d11bc
+EBUILD netbeans-websvccommon-9999_p20150714.ebuild 2727 SHA256 9a8d5ef6a459d446230c5cf08c349469b294ea0f0a8d70a94397980664d5a689 SHA512 bd0aad3718d939a4fd28390f89e816bfe459ce9c138849d5e8aa7b9fb3470270afaa044c16c39be9995549d4631a8bb7a611733980f9e6b6fedf35b6ccfa2199 WHIRLPOOL 19020433a5cb3010fa491e38cf041f9851f81fe6fccbc4da57ff25bfd69bb72177607d8f81b44a834e306eec1b1ae670a8df4cec7f0de894f3e5a6e3d1ea138e
+MISC ChangeLog 183536 SHA256 1b9b8c72f77d54f5801b334f2e2118cecb1f5e3ae2e47b2bc0dda3e051f3838a SHA512 78077efeed6d0740538b0a95bbc594e2218a86e27cf9f5dc57c76f7943f9b9ef36edeefb894d900e86f7d906851a51080f27a4fa1d7450271791c6cb6ee8a987 WHIRLPOOL a3ad58ec3775e884c6e4bdab000c485bd7f7020d8604b165659d6caf293293239aae03a9af747c55aafa5365eb0b16fbc1c630ad647a04da0c3f80c9449f24d9
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150714.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150714.ebuild
new file mode 100644
index 0000000..f77c3d7
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150714.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-14_00-01-56/zip/netbeans-trunk-nightly-201507140001-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 81acddd..6cfe6d9 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_p20150714 (14 Jul 2015)
+
+  14 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-9999_p20150714.ebuild:
+  updated to the latest sources
+
 *netbeans-9999_p20150713 (13 Jul 2015)
 
   13 Jul 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 02200c8..d0726fb 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -45,6 +45,7 @@ DIST netbeans-trunk-nightly-201507020001-src.zip 208088424 SHA256 1dde0fd1452c74
 DIST netbeans-trunk-nightly-201507090001-src.zip 208130931 SHA256 5d73ccaddac610b27ab8aecaa95f5ef920a833291d2573daeb29f1f79eef1864 SHA512 6405717c46d506dbaa744fd33ba88daf3037e9d388482d808a6eeab292a42d99e76eea4494639725568239dc939444b0357a3f55b364a57256e93f5252efb7d5 WHIRLPOOL 9bddee309d416454d25c497074ad9e2ff23b1e52de90975bbea12412524fcf44e384eed0b14ee7f0f1ae1988523a74281bef1de58c14321aaefa4f9ef1bd9ba5
 DIST netbeans-trunk-nightly-201507100001-src.zip 208139985 SHA256 ede6f00ad37a28f1fa7c825e0f86ada8e314a969db3ea1884d21b6cced8dd527 SHA512 49c255eefd2affd8206082b04cb2127138b841d9ffa5f175aabfdec0703a81da0299bfc7bf55404829b493cd530e2db5570f4a19e66cf5af83b2081ed90a43ee WHIRLPOOL 6f1dd8b72445a31428e310cba1de99f0223c57c6b24f178d9cf5855633d5da23d1a87a130267b9da9697fbf28d7dc7fca2a0a341af9936f443cb9e1dc6bf89c2
 DIST netbeans-trunk-nightly-201507130001-src.zip 208143364 SHA256 f6a745a4112c25988071e5add63f52b567ea416e56eb1c5ac1f0caa40b2fa47d SHA512 2a01dde8445619c79b837bc51d1eb5fb9136dc0ad74d1e73df9d45748baa7b41032c10a76d26505fcf783193978c25907dbb2fc93a0e54f8b470ca2a6d7b9a8c WHIRLPOOL 095f94bb313aa828e0d0e972e2ccd69015e300023d7ce51569963eefba61146421f5a1a015c28fa8885445bbf42987367d18ed57da98e3b7f6521bddd3a4aaa5
+DIST netbeans-trunk-nightly-201507140001-src.zip 208144479 SHA256 9daca7bafaeb7d4e4eed58ecec4ba487f11fd6fd4b6790c719d4f428929588d4 SHA512 96adc2194d3f005216677ccdffc1ac51ecac1c2a13ec3f29b177e553ea9f5a36d9c9010c7f6454612b78a7dcb5f5ef08197e1113701bdaa0c727b9c352422c3f WHIRLPOOL 4fecb0c62019a2fc3522db07513eba2b877c01c856ac2b727329cca7ff86d573ef493a813b943558c06da3d6bc3109b5082e7ccb356318e6aef374eadeddee51
 EBUILD netbeans-7.0.1-r2.ebuild 6736 SHA256 e808fba2ddb516270d93b5cf67cff60d98b37ca58a158878f2e3b3ad696cfc82 SHA512 653fb585d9eaa20fcf88d778a7f34d63c9f29f2af2153a432fcab6d977ef9619c699b19587a48b148ccf717f4b31a43859b81cff80d5d84ad273c5fa16e8f565 WHIRLPOOL 257f2466c3ad198a05db9d5e377cad2707f8a4daf1f421e516d7435670a85fd4bb5f6b3ab657ebda8cc23937e1b4e1f4acce8cccd85bccddc5a7b1f9abbde0ce
 EBUILD netbeans-7.1.2.ebuild 6976 SHA256 4222e248dfb664ccfea85d4938ad691d3685f32d8e9b33289d1dda088057261b SHA512 cc0a20bd542b61621fe08d5413611f7bcbbebf0c37d5f67c590c31324e74eb5594e72efacc86d843ff3abffc98c4859c2733c63ce6f993baf51e24d69197b64d WHIRLPOOL 30fb7b0cbf22fc39a8dabefd27a0073ce73e62ef082d55839fb7f815bb73bc5c3c24c3418ce175f355d7c64138ef7e9616da41c68b3b57a70353d16c6113daf7
 EBUILD netbeans-7.2.ebuild 7057 SHA256 29140b2779f1a24722499605101c286d05415b4f97d2363afedef711cc586067 SHA512 0776f530f9530c533b13019f7b34fc664990a16926bcff768d0a9f3b9035de82dcd2ed66425ad8da27c65aa69fe3e6be966e0a1ee1bc222949e5d42e14f7f7f1 WHIRLPOOL 9fcb95348171fb0bd8d794b80b51b2e3ce36fd84ccc81653bdd0172cbfa99791e527b33c895ebf7b4d81c228f17d4afab367eb55ceffe28df835b2d09dc8f778
@@ -76,5 +77,6 @@ EBUILD netbeans-9999_p20150702.ebuild 7216 SHA256 18f8a7c718657f023b2c124491d788
 EBUILD netbeans-9999_p20150709.ebuild 7216 SHA256 be1f77984016bf0ae981d31f3474e862db9b85f537548fd9766cdaef8e0f8251 SHA512 261719d70ee2938bb0d9e1e8d89a754c91f6d70cff3e1bc2d1eed36919ba568abd32d13d81cb74650f69df4bab372dc1b87613ec3cdbff6b7b26532112560100 WHIRLPOOL 610aeceeeee34dc90fdcea15278d14a7ee23cbcd3117f593391a457259264a8251da8d9fe9fd934bac119d722948e17dbdc98f3bacd586aad8bd0772771e0aa1
 EBUILD netbeans-9999_p20150710.ebuild 7216 SHA256 149d2d23b0c15050b63ea55e775cb5737bcb50880a13329298ee6e1911fc68bd SHA512 50690e18425634fe87b3f26f29d678ef6fbc488d9ae37b0b27c39ff50ebc34049d53197adffdd9a1b058a47eae979529150869ea13169052b2f8b05a8da53ec7 WHIRLPOOL da33cf14950a1c330e8d1931a5ea11f8d40153341d341ddb634ff923cd790e3aad50720b8b10cd9d5e74f1cbd73a611d8dfdc06c77f231297d2cd1da0f3c3062
 EBUILD netbeans-9999_p20150713.ebuild 7216 SHA256 6c112ec6c95fcb5b0521a230a4f603594217d17450ba67503374c3c1a727e04c SHA512 ac7ab94f454d03f3ffa944d113cdc8f5419dd1021247ac267cb5e99d120dc0a8ad67aaef33f664c1dee1761a53a28db4867b21d72c8a628e0f95ceba02629d2e WHIRLPOOL 4f050168b862a5543adc6d62cf40c90605b9e156937497d4a9f1027795bb25af256995aa0e64b7ef27fd765482a6ecd757b169271ed554d963125a0489cfda93
-MISC ChangeLog 155742 SHA256 520c91c7ef8e57e72783dd349323256bdbf28bbd228582383708a03e18cef4e8 SHA512 2635b93dbffb6bdf30aec840b875886034c91c9da0971f83b3dfcddf0d94c1ec45ce2ae1a03b262e551e4d668c759599ca10a362bbe0bf23f5d2104dde1c4c43 WHIRLPOOL ad1b7523d2c7b34e21c9f6f779338cb70d5328805b2c35635d0d4be3190e2db3387e38b031d5082d405ad49d5811bd778e2033a05a91b5361da3cb023e552bb6
+EBUILD netbeans-9999_p20150714.ebuild 7216 SHA256 9551cde3d63dc073cf76ca02687e119393c4f119e49be3a3ca1f264bd53e9b22 SHA512 99ba41300091b49e5a3ff398957b5bdfe6d1f60e0a8bfca56099b785ee4e54db6447b21bcf956f52fb5c8c94a570acfb13cf5cd12bf154336400c0ce68879dee WHIRLPOOL ea9ded01627b442057471ddde25f541cc8fc67a178a39925ed87609adabeebf706721b47f2b9e3d5518298479077761afa231ec8b894165d9a540562da3d4b5a
+MISC ChangeLog 155902 SHA256 633d241cee4ed8b3570fd44cf352df6d8a983783ac304bf5065fb8b554991318 SHA512 ed325471220d4b8121861ac13fa49976106cfa298d4486a049f572ea6ac110e6be85b316b85bbb45058fdd4c71e36facc95fe8a2db16b282ff07efa72e3153da WHIRLPOOL 58bf2abf0e4d404ece8002b434fb48f3974849b50d5ef6d7a42f6daf3c47f8334383d024a82bcddebaeadf20666cbbc5060ab7c2af61ebb1e540258aeabf6a4f
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

diff --git a/dev-util/netbeans/netbeans-9999_p20150714.ebuild b/dev-util/netbeans/netbeans-9999_p20150714.ebuild
new file mode 100644
index 0000000..f234b26
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20150714.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-14_00-01-56/zip/netbeans-trunk-nightly-201507140001-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] 2+ messages in thread

* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-webcommon/, dev-java/netbeans-javadoc/, dev-java/netbeans-nb/, ...
@ 2016-06-17 10:29 Miroslav Šulc
  0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2016-06-17 10:29 UTC (permalink / raw
  To: gentoo-commits

commit:     4b6d08fb12a78c33e19a32df7542e58e2be75ab0
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 17 10:29:25 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Jun 17 10:29:25 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=4b6d08fb

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.3.0_rc1

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 228f7d8..fdbdb3a 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201606130002-src.zip 215706858 SHA256 1bb9ee5b464b0d
 DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
+DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 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_p20160519.ebuild 3384 SHA256 90000e5a2f6eeefa4ea55ee337d49bb047dd93ce6412ef6929354469993861f8 SHA512 8953404b069bc9e80c2c4bf9052798469fc607c00a23ad6421039834b897609d06dcbfce90a76d1828a8363ef8e47ca8ffe54ea1bc7e81f75c20357a4b7ad643 WHIRLPOOL 726e91e8d991604f30352033f9017833730167c5a40b00421d8d2a6749f96799c108e736ca6a08dd73a6c55bf765cc7651055539cf8ca9be5a4f71e509b18bfd
@@ -49,4 +50,5 @@ EBUILD netbeans-apisupport-9999_p20160613.ebuild 3384 SHA256 9416630550f93aaae17
 EBUILD netbeans-apisupport-9999_p20160614.ebuild 3384 SHA256 dbe70b440097697475f0437a79bd2e49084ed5ef06b83942923c9644c77397df SHA512 170f9342d1ac1fb191c99b726f489c18c88c74695fdf2687c9259e86e8ffdae7ec6afb2ab38d4f8ba9460177352f51b2650d52e051a5b136cf389c325b362986 WHIRLPOOL 191e8b000a1f0383d4100e3cb3f0f7f1866550b5a27707174b6b9f676a84927e9515385c98f586a9356ac45646ac06fd580bc487b34688d0c7634351c4a8998c
 EBUILD netbeans-apisupport-9999_p20160615.ebuild 3384 SHA256 de31ccbcdeeba9d8d40a157baa24b6dd6ca5225e548bea0a8cbe266f6d55d2f7 SHA512 22c669ec757606e538630f99d779c2bb36bc72776352a64a53446ab5cbad913851996e72edd770d58e5657a5805ea5a1b49c29bf4b3359c4c7085dbec3d229be WHIRLPOOL 3c9998371f14697acdc37052ab4b2046e2d9b25e2db3860fd4f901bef2c2f44c45ceeb01fc927bd0fe6d0a5f82423c9c713a10bfec73954e09e0d962f1713f9e
 EBUILD netbeans-apisupport-9999_p20160616.ebuild 3384 SHA256 bc49b6a8adc59bad429c2eb36d051e35f84001396efc0f0f408e283c74ed3a40 SHA512 90f065ec7fb3b165c2fde3a74a75a403e484fce94e1a06b1fedb213955177c8ef405289f6f9a4fa9b082ad00ac8ff3918c4c5c7eb2cd6e0789cc72db844bbc78 WHIRLPOOL 5d754d206a00ea0688b06d70711d91a9e4a3f342f27f846e46810c8cb5c1af60a2956bc0c838b84c9ecdc1f36d0bc897f2a5f811897290a5ada6f8298ab38129
+EBUILD netbeans-apisupport-9999_p20160617.ebuild 3384 SHA256 a5b5da4b2f4bbac2539b0c0ef9f57e8a7db48468102979be697a9e73573570da SHA512 9d57fdb21863821bc5115d8dffb776045e752f2f74ecbd1db29cc377e21f29ed5a3c7b8e469e0b7532d1218eb75e7d25ed1f95cc680785cee64486ed1e7cb60b WHIRLPOOL be4d9ea7fb35426d8a00fff91dd1f9c8ec6906b9b2ed4e49e23ab592cb3345a066541b58f3b8b4bfe5b26907096253a6a08b977b13c82ade9cacab05126215e4
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160617.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160617.ebuild
new file mode 100644
index 0000000..03e958e
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160617.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-06-17_00-02-33/zip/netbeans-trunk-nightly-201606170002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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-r16-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-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 df3eda1..423a370 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -37,6 +37,7 @@ DIST netbeans-trunk-nightly-201606130002-src.zip 215706858 SHA256 1bb9ee5b464b0d
 DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
+DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 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_p20160519.ebuild 4790 SHA256 e2a672de5b157a3ab126cc42fd59bfa56703888a0959fbfa7908650357f4f2fc SHA512 6c6956066ee4d0872f0b3dd531ae5dc98b2449a387eba1110fb11313b93f977aa80cb85bf8a9a2decdf468003780d5627c34d21f6a24ec2c5bccfa9c5f2d51b0 WHIRLPOOL 5f15749e2dac09c830dca6a9c68ab000f00ebd2d3d3319e62469ac8f801c76508eed678383c07f669032d8b5419a59147998cf476d4d3ce14885e5bef01161de
@@ -61,4 +62,5 @@ EBUILD netbeans-cnd-9999_p20160613.ebuild 4790 SHA256 0e11e1c172fba8176220ed0dad
 EBUILD netbeans-cnd-9999_p20160614.ebuild 4790 SHA256 f910b56ea3f91aa0fb754e8299f13e6631bd18da7fc8e9c3f00831b89a0df2f0 SHA512 7b45e035b786cf35794cbb0c85c86093059a7e2c92b34d9e971ce000e115de24ca4406e251cd0ffff4595db77cded21fafa1b97145cec498e90de36987d3f734 WHIRLPOOL fea295483894adf1bab479af2bab61fd2e3e39178a830f11dbe9344d3f7a3c1824ce6c2d6ef8572864330650cb6bde24f74ad06de9fb9a92a2fe9428c916f189
 EBUILD netbeans-cnd-9999_p20160615.ebuild 4790 SHA256 38f8572e229753c2eabed5ff296b679373810d8e323042e8d49e24085cbd3bb6 SHA512 415b919ee8c2b67260497f46ff2ab743651869cdef9ca572c1560b6a18e8cd5593b96c72c501d235817231e575dcb5c90e6073cf6a645396e334acf39b210779 WHIRLPOOL 65a20532a537e9d5901188a73797c14f554437c113ce0c2e1ea9d20862bc1eb13df54110c395c03d2d003d0acf364cad0e4578ff69da0f7548ad5197475840d8
 EBUILD netbeans-cnd-9999_p20160616.ebuild 4790 SHA256 8e81c1d6df927f8e816c79073c2d50464893b359e1fa7353f81f9d29817544dd SHA512 07297874102c79c5c1e5d7e5d7f52ac3f9964912a937a5b0294656a13f0c93b5757ad684b688960b6b795439bd4cc3bf5ea69b56cc2b1b685a73035f083a646c WHIRLPOOL e03629cd10ec0ff49252650cc82046d95f90e54178a1cc74ffd116000f55deb4a84cc96491d68bf11781f9b1f0ed9c819c7cc7544ce607b591265ad916b30fb8
+EBUILD netbeans-cnd-9999_p20160617.ebuild 4790 SHA256 6f942202ab23b8565f06d1c53671d371ed9c41d106507746e3632255b1832e22 SHA512 975cefa161f05caa12a81afeeb413969351e73d43b207e8a1920302baed8e3cd65c6a3b7839c8955153538e04d8f5bb9ff7d5f7bfc022491d405bd415aef6761 WHIRLPOOL ea58a42c90e4050eebc95891602bb07b7c0c212318c9bbf773e69c8e84bd9ba459e2875fc7c3e68e56764d3e7fb336abab1e26a373940a6f2ab89b2e3f79b912
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160617.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160617.ebuild
new file mode 100644
index 0000000..fb1048b
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160617.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-06-17_00-02-33/zip/netbeans-trunk-nightly-201606170002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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/85FD13415B0553D6421F4BBA5FE0F587B9748B20-clank_0.3.6.zip
+	http://hg.netbeans.org/binaries/43A82EB3CE61B9B0B1C60586C7D84729BD5BE3E0-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-r16-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}"/85FD13415B0553D6421F4BBA5FE0F587B9748B20-clank_0.3.6.zip libs.clank/external/clank_0.3.6.zip || die
+	ln -s "${DISTDIR}"/43A82EB3CE61B9B0B1C60586C7D84729BD5BE3E0-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-r16-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.2.2.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 bbd4144..3950d9f 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201606130002-src.zip 215706858 SHA256 1bb9ee5b464b0d
 DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
+DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 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_p20160519.ebuild 2968 SHA256 a93f4a71adf17b40ce1fd6a980d1d199bee17864982b98005845d03206603c62 SHA512 57ebcf464b5a9721bc0a8c2bb0bb035e65fd171a57c41b594f76e70ecd63117a928c43741466bc4391ced9d8ac61c3139bdae076b79c1ec00d4ce0452df1827b WHIRLPOOL 70d9c4571af85e0437d0237b5d60e2e5f5f2962279b6e797f536e3971cb0308a744c85691fe01e8bade6b16203b354d750166a6ca7ff4490af35bf53f208f969
@@ -52,4 +53,5 @@ EBUILD netbeans-dlight-9999_p20160613.ebuild 2968 SHA256 11e6bad1a8fb318d3fc74c3
 EBUILD netbeans-dlight-9999_p20160614.ebuild 2968 SHA256 d9fb867992793fee5e3b85f4ddb5cb978e3ac10769c027379bace490e21147e0 SHA512 a9fddb6baadb4a8de720821b224a14181e4e6c22f3a86762715084d350d3fadeffd3af5f1019acb8d0f3b3011985469b1959663203d12a1e520026c1b250761d WHIRLPOOL a97207fbc04bbd0be11bb873dce959dee17efe580ae9b2227c99dc5259d8c3d8679946ea85a047bba0a64720488a21e271410393a84c3f80e422f3a67d8354b7
 EBUILD netbeans-dlight-9999_p20160615.ebuild 2968 SHA256 13d25ae9bbe7ad583f2ce72c81401572196e7c1815e938d7cee740af7b2a9d03 SHA512 e2c9882371a4213af2b9a21c406e8cb2a466fdae19a2d009e21a5d87e1aea4f3acaea75feb0be54c7d4c9ddc0a865c21331385ec0a0cf016b88b234e4e7ec8fb WHIRLPOOL ec3edc855681661988eb21a0a5ef3f1a5eeeb556b63fff360e20f494a8f52a8753e7bb1724a9c45e87a3ec2ea9c3dc347039e7172c0b9361c3b75cc489cb2d10
 EBUILD netbeans-dlight-9999_p20160616.ebuild 2968 SHA256 97e12ba216fa4cc3724ae0ecd226dd8193562c10109bef67d11ab13f25bf772c SHA512 dff90f1f42c224a0118393227edc0cf29b6c46bc8dbe8a147c30f66a6b7bcf3913387f4b3bf563a52de2f1a2e26677e6ade96bf3286bd5cce08b20430ff54047 WHIRLPOOL 91c2a62d695a76d9fef57c9cc0fe4aeaf2c911aab4114a62f7f9bad1bd40d5871608c00fb0eef449bdaee32feee39ec847f69b9e0cf98cd1e49315a88299c318
+EBUILD netbeans-dlight-9999_p20160617.ebuild 2968 SHA256 62289c46af8720570469a22d8bcfa34f84504175a00cf3f95c2f603e28f1774c SHA512 b58ead7b51fc5c991d221438b13ba3980b0097b3663c3b8067198f591906dcedcab594dce486cd3908fb3b62b54e4e471361ceab70b4034249025b9593b2505c WHIRLPOOL 4e26a77ad6964911923c11556b86552bbbcbb87676dc6bfa6a6858ab77bd06e3b1ddc47143085b559dd52e1662d2643f760eec8cd5a79268e79d47c023150bf2
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160617.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160617.ebuild
new file mode 100644
index 0000000..f63126c
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160617.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-06-17_00-02-33/zip/netbeans-trunk-nightly-201606170002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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-r16-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-r16-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 aaefb6e..b319586 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -57,6 +57,7 @@ DIST netbeans-trunk-nightly-201606130002-src.zip 215706858 SHA256 1bb9ee5b464b0d
 DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
+DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 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_p20160519.ebuild 15825 SHA256 b3bf6d4c2f299784918ff67ff5bac4c5dbbccd481ff9da37e3d1f0675c81bcc0 SHA512 c950dd3f86e354896343398284cd4106870725141f1f864a64eea3d21139f549df885bc5d26b9726b4ce65e48fc318fac63fb0ad98beb32033356fbc69354147 WHIRLPOOL 7be3c3e0c7e017590408bed0afef0ca006dd3ec18592efc6219f1650f78bfe348e929e63d7cbab06526f8b84eaa9645c8eaada9145bf5f0fb76492520173704b
@@ -81,4 +82,5 @@ EBUILD netbeans-enterprise-9999_p20160613.ebuild 15825 SHA256 db8298c11c3aa38e73
 EBUILD netbeans-enterprise-9999_p20160614.ebuild 15825 SHA256 d45bebf7efdd045025a381bcedca4eda37cecdf22d691de1cd2e7977323ecb9c SHA512 cbd1cbb9c1dcd385ae77c37397b5c7fc5f127341ace488426f07652a480d42b538ce717149c8127de6f40993c45cd9be63b89b1435bff23e40c962e55b255f5d WHIRLPOOL f0f3c2622970c8a6096be2be4191a3fc3844c1ae06e48bb4b1e3de36d0f5576b4022a53cca6328298e5c76af0c8be28d1878ad53656f205c782cd81d0be15e96
 EBUILD netbeans-enterprise-9999_p20160615.ebuild 15825 SHA256 77130d68e119327f47c3e16278b052ac6e00ddc71921fe1908239d257bc08e4c SHA512 e075f331c8fa7e4b571b55a3b0fe38bc6a22936c427e4b021202c2b988636480afefe02a3090b8e674db16e7e2f6977fea8b71298a91d735ec801edf1607129a WHIRLPOOL de35a519d1ce77e7250d09db059f605bf056b43e8826309160f171c03f2c26131fc8cbcd653c20a157a57d993363853461c9dab68b3dad8bc5466d975e267992
 EBUILD netbeans-enterprise-9999_p20160616.ebuild 15825 SHA256 67dc65afc49bae33892ba44c72db823f25ec47f1334f36dadaf31b979d9b601d SHA512 33f20491ea4b39b6f82a6ff0c2df31d58b4b462aa0c3c9b151ea1bad1854ca3653a4f9369bf926d7368b33c88cbb42b696ecfe099d6ac7b165a4c61e56eab5e9 WHIRLPOOL e6c6ccf8b36c2ad1f4349cd37a08c0b656e9204617d8b8b94ae29e2ea37ab6bfb8fab9c8c6421783a51db36d6a25e33d9e3dd3ed78060224e6a5c14b9fe32a4f
+EBUILD netbeans-enterprise-9999_p20160617.ebuild 15825 SHA256 56780f670a4888f18674202b112a3edc91e7787b20c32d56eb4674ec628202e4 SHA512 80c5ee109a86bd4602e78595465fbe6c7bb90eb68a6a37fd56a7555524edd9119c9f9a5e429ba26c6889355f736822b6b8c66b7ce6e05424743c1931f791d372 WHIRLPOOL 933df05eee623d68126fcca4d3cfb503edc2f9934e9e1edfb36bd0b9a189b1b46e39dc6f771dc00ee1d03b12122fa1dfadcaea46d3ce8c86dc6a9757b81a52f9
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160617.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160617.ebuild
new file mode 100644
index 0000000..40e659d
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160617.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-06-17_00-02-33/zip/netbeans-trunk-nightly-201606170002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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-r16-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-r16-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 05f1eb8..32e0137 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201606130002-src.zip 215706858 SHA256 1bb9ee5b464b0d
 DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
+DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 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_p20160519.ebuild 2913 SHA256 ee161ee6b2f4f1c6b5c034771ddbb1b446adaeb8506ff139c3da612729a3717d SHA512 beee8b4c69c6ff2b052af504f4fc72a059e6d7e981e696a8442cab2306d9a11164634a966db737d205948e399706fc11b87b8de4fb1bf5cd7ae077d560d5e313 WHIRLPOOL bd8754b5d5b0f12cd7a5845b6f1522bb3e21f7a2ff0472ee7f06b963b2b28c17ca22f78d0e3fad3bbb47f9f957d1f67bf1ede61f268e5e2bc6dee94cb3c2d934
@@ -49,4 +50,5 @@ EBUILD netbeans-ergonomics-9999_p20160613.ebuild 2913 SHA256 c0b9a98b4bb571960ff
 EBUILD netbeans-ergonomics-9999_p20160614.ebuild 2913 SHA256 a09074eac38df267941db2bbe9e4257e31c00eb1c11836eddd3385dec43545d5 SHA512 72cb8b2542a77a2f74be708f94da431dac6fbbc44d8b4ad710f5030567650b1b17c6f51382f4d42d12b836b6f516ec6cbd18484ebb66b91a07454dbaead4bf06 WHIRLPOOL fa239076a01850a48e0b8aa3e977aeb604369e13c74daab5750452fcbd8e0684fcde631ecda9d30c49ca2e6bcb844a8c90156625165e127f18004b3545d219ea
 EBUILD netbeans-ergonomics-9999_p20160615.ebuild 2913 SHA256 3c42247c47f213d0c42462475abd5af56ec3f9613cf6644ce22568b14f16bce3 SHA512 a0447f785548e62ff069fb34ad869e9ae6b215a297106bddc92c8fc730e89b1ede3c89aa826f6dc241d055a930b633036f59824a1a625cd5df0f2159fcaaf9ca WHIRLPOOL f69500e7df23bdd63a1de8b8f857ab285ff6c209e07cf0c212cd98758030c375bc23059a782c6ab6d65134007835a47a4f2350567a12890e2ab37c0f7d185f27
 EBUILD netbeans-ergonomics-9999_p20160616.ebuild 2913 SHA256 fce9bb6e0222b4c2fc245c634bd247addb6268179796cf6811c5db1a12f5d31f SHA512 4111d7b14ef8c95dace4acb4cea3ae38b1bdde6d99ec2f86d44c96ba17fcf4edbf6414bc0937785571eebd9c3ed1fdf077845d8e6a7efafd9417afd3b2365563 WHIRLPOOL 85b439aac7d6ca7415407c8d5d43a39c7cdbcdd3796d712eb7a4d21d256ef584b045c47c49c80ce11ea068a1598df7874c81595054836d6e9b897c123d01fc24
+EBUILD netbeans-ergonomics-9999_p20160617.ebuild 2913 SHA256 c46bb6c3ff85b87c2a108179e3769a714563e11aedf9bff5ae40aee92ef79cce SHA512 4ebc0b801d5893ace81523940ccd7346e83c6c72ee042ab3d9456ca79a7270e808df1e79208dc2f17a9812572788406ed1cd855e00b3392c2a30c60d90fbe9a0 WHIRLPOOL ee4d9e994d314909b195c20c87f4e27d850d98f45bd70e77d78c425bd6a68fe20ba7857c59ea235e8bab371bd3e9a77efb0974c461431ba94f20e8ddcb58c360
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160617.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160617.ebuild
new file mode 100644
index 0000000..17772d4
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160617.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-06-17_00-02-33/zip/netbeans-trunk-nightly-201606170002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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-r16-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-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 32d8555..3a8564b 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201606130002-src.zip 215706858 SHA256 1bb9ee5b464b0d
 DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
+DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 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_p20160519.ebuild 3377 SHA256 bbbc8c1d19a9283821c233d79dfcecbee4c8e69aecfd3ca6ea49d32bab9fff7a SHA512 2622f9c010f2827a822452116dfce190412bdb3216e9667656b355e9fe17fda7d01d2abc720e821153666625439f8c36b837b5e24e6299818b0bcf7ceb9cc513 WHIRLPOOL bec016e47bf1ff9eccba0b5db14e1d92236ceb80c96c5d0aac2d39c6200e9ec59227b49e37a8d66c9023d13cdd16df6ed744415f1747efc15a43e86ddfffc132
@@ -53,4 +54,5 @@ EBUILD netbeans-extide-9999_p20160613.ebuild 3377 SHA256 72ebf1a82e030a3401c1051
 EBUILD netbeans-extide-9999_p20160614.ebuild 3377 SHA256 d522cbcac07c2ede87676cc6cec8de2e0ec79ab2cf7a9af63e9037e79dbac8cd SHA512 22e12e42ca768088bafd4de682787ac99c5e25d7263a17a6d94f6c3674175e8524e1dd6f0d474649a68db752c6f4f4cf0bb7860bc7bf2d57ae37f78964224ce0 WHIRLPOOL c1d657889ab53d84bd893e7569a33788ba6aa805d13822784a3809b6446619cd4c51ed464202c4815ba7c1a25739d13065df03207e8c7d2d201957700ba4718d
 EBUILD netbeans-extide-9999_p20160615.ebuild 3377 SHA256 8d94127171b624564fd15690bf330653ab9776df1870ae3bf93ddbe7fd0574a7 SHA512 b76381372c6c69d566550314e9874d31022bcd45cbceb7ba92b9545fcd4a2d33d283d9a49cf96da87ef944f5d986da7e9eede27b65fa01fa283aea3ab592696f WHIRLPOOL 665d893795540a46647b7617287abfdf494e30ab2d0bf17d60dd1b38cbcc3411701ffa0de858f17bf7d18a161e9505531eab6f0366e47b7fd1d0a0040a972cee
 EBUILD netbeans-extide-9999_p20160616.ebuild 3377 SHA256 447b2b78d1f38e712a2c7d503718b2dd0e3cbe8b4d541519b4be7e4c483403db SHA512 f83bd4312fbeeec6d9c092372338f5d26006b4c4b751912a1ceeccb0f9c9775cc6aa4492d7cdd7fe4437a980a02a404ddc0c7c820e4a20b09bc73a65e3073d96 WHIRLPOOL 906bb9f17627a4c7a65fb3d3dd6b4a40db770f3af0dac7d4a999c9ef08b925e39a03d147eece3ba98b23f79e1a488e4a3f2a7aafc8794de22bbc9bf359e1825f
+EBUILD netbeans-extide-9999_p20160617.ebuild 3377 SHA256 650a3c69d5596d9f9267c7bef4ba1c4828f29d5844034cd53c5a56ba62764808 SHA512 f289b63b0acb3ca9bb0b6a0a62e7f59c0d785abde50e4956d852cd3e96b4fa48c70aa527f3a51f66f1d7873126e47e5020869974d477c3fabb8040a28a226c48 WHIRLPOOL 69eb2225d12d239a936ac012fade59ab8c0ca1db87598b15bb4697ad2bb1c18a9caeb0b2e0cc629a2321f432a417808599941ba184ea19a1f494b8d9b6e8450e
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160617.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160617.ebuild
new file mode 100644
index 0000000..ee5ac99
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20160617.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-06-17_00-02-33/zip/netbeans-trunk-nightly-201606170002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip
+	http://hg.netbeans.org/binaries/545E2B7AB1BD579CC76E3836055877982C5CD0C6-ant-misc-1.9.7.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-r16-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip o.apache.tools.ant.module/external/ant-libs-1.9.7.zip || die
+	ln -s "${DISTDIR}"/545E2B7AB1BD579CC76E3836055877982C5CD0C6-ant-misc-1.9.7.zip o.apache.tools.ant.module/external/ant-misc-1.9.7.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-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 ff57365..c6343bc 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201606130002-src.zip 215706858 SHA256 1bb9ee5b464b0d
 DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
+DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 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_p20160519.ebuild 3416 SHA256 9d7a60f6d3707f3ad9eb11152d1b176d1dfe4321a6f6aa8d008ed9a581d35e3a SHA512 89360fc8c1ca0250b72b5c48883333c2f6168dfd038da473717c92067ed353d8f3f2875db735ee0e74758111444dba30a59410d98ba0d622f4a6784b81f70ddf WHIRLPOOL 20d494a8d7132955e1f6b9ace408bbd00bc32d1afa9a5d3ac68c457dc82afcbf2bb194356859bc886aedd1cbd1cf8c5f3ae229f91ce83da66a6b8b3074ad3535
@@ -51,4 +52,5 @@ EBUILD netbeans-groovy-9999_p20160613.ebuild 3416 SHA256 92e9be489c1b2a7ddaca715
 EBUILD netbeans-groovy-9999_p20160614.ebuild 3416 SHA256 bb3506928773eff23710b353e022829d16908261b90296859d14195a074e23ed SHA512 a62ded04dfe943cdc45b6ba665667e6af3c69d79bc4f79131fb494b6c8103b6e27ea0a61da5e6120bc2e20af899bf98650f856884bc4955fe672d457ff6eb3f2 WHIRLPOOL 5261a809c997890f47f4cf1d284052236396c3c44a038cecdf3621cccea71b212e60c61c3cd011909231666a8919b5da5339e28e6d8929fc0bf530008aba12a3
 EBUILD netbeans-groovy-9999_p20160615.ebuild 3416 SHA256 9ad41132854e17cae83f0c6cc0ec2604bb4d368ed9b195efa27ccc5b7b961b27 SHA512 de54af5750d40b878cff37bd4348be7f3cc28d7eb5bb0893cc337e42e0a53aff96f74b7890e49dab89e848f3ce2f1bd59d634732c9765361b022d85530942a23 WHIRLPOOL 2a8be1c11da9c54ce93d646a7a4bb51470c04f4fe708ec07196fa25d81691bbe1d09466b611021b876804af1acc57bd51caab06d81ae6de37736ed200ed2d4fa
 EBUILD netbeans-groovy-9999_p20160616.ebuild 3416 SHA256 42300c18c16b927900009b2318221ea59ce65006f0b4e99198fa587cfb3a24e6 SHA512 2701a9599d82a38687a322ab46269314d6048c763e85f0f51baa4401c6cdc46543e61555ab50899e9fab0685b34f0a5ea5028bb55bf228771bf586043882b5f6 WHIRLPOOL e0a9fc0909903b0bb78f98981f99c1cf49816ef9f0848f6bc0837378651805e43b3b5bd649def230421215663aa0491c704e5975828e190e52e0b79997232af7
+EBUILD netbeans-groovy-9999_p20160617.ebuild 3416 SHA256 2cce6a5f1d074a83eacba1e5bf12d0ed5fd9d0edf2f194942e0774da0df25067 SHA512 9783839e20b93290f354823135874a736dcee8fe48eac63819dfaa13d1dc05f10f2be1e663dc4b6120408adae3ff994e7d443897ed8fe280062e0b21908824d6 WHIRLPOOL c8d6418b606dca59de0bb60606fb182d69ba9829731276a42201d612c4537338ef19b75c837fbd3c916204701f7a7c179786fc35048a4c76063947725d04ba67
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160617.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160617.ebuild
new file mode 100644
index 0000000..7c87e1b
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160617.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-06-17_00-02-33/zip/netbeans-trunk-nightly-201606170002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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-r16-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-r16-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 b77d59e..42c6629 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201606130002-src.zip 215706858 SHA256 1bb9ee5b464b0d
 DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
+DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 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_p20160519.ebuild 4126 SHA256 ae15ce092c7f8741a13d8b14bfc0b9353d51a010049773bec68a70ae82561515 SHA512 1cad3a0f7a597496e151ac316486e077c58d972bac574f9ac0baa30fbd3027f5a55b1ab5a5abb5c76049c5d139465a2dea32fc4bd62f129e110953ad2197f82a WHIRLPOOL bbd0f93bf8a2fd9ae45bcfacc87fa4b1b9b764d183ef001392df50090c8b87d9ed7a486e2bd98c82d007a2da5132eab3d72d79efacbaf2eac59168434687207b
@@ -54,4 +55,5 @@ EBUILD netbeans-harness-9999_p20160613.ebuild 4126 SHA256 066ec33bede8251f94d066
 EBUILD netbeans-harness-9999_p20160614.ebuild 4126 SHA256 c7e7e97ed46d14108eeea2887caf99c3fcee44b1964ad7ad2b76c052c5b820c2 SHA512 4603e234af04f12ced14c9f918e0433de9d6c1a0fb6c20b75b30c7ae27565995e5b20674ff4b9a30cbbbca6a2939dd0b4d17fc02a8c82f7a4ba9aa58bb7edd9f WHIRLPOOL 9bf9e2d84ac48c7cbe85cda87bd3147ad1903f391cac071dbb6391d3e79b2f3b1654077e3eb5b93aedd2304ac1b511eb94cf89c9989c0efcdf103f7ae1388757
 EBUILD netbeans-harness-9999_p20160615.ebuild 4126 SHA256 45d0d3cd6ef47cbe49111aa6cb0d58b0514fa0c13e0a2225b25153042a52b1fc SHA512 bc058ad6920b0e7eaaa4e55fe0174a450b6eb92e5b1602ed18bddedf5a90f62d231bf8d9651296fe92d97c6a4565a47130ac139d54fceed2f6ba4ff71328ec1a WHIRLPOOL f0c579b1403ad36e660b6f7759b231067163a3cd268b927457b2903daadb33c2c38801cc9775a750d6d39662b7afe2c56acd590a072138787fd4ab1dda023438
 EBUILD netbeans-harness-9999_p20160616.ebuild 4126 SHA256 ba685f70140f5011e7cfb66445933d498b4686d1cc897a52fb32d69cead6c63c SHA512 24f7d1debcbe39415a24d1adf8caca164eb1f8e83db091b67b169b8651ac72d16f5e3e32f7bad1b90e21bb80e533c0c7ce9da42255afec1813244a251746d428 WHIRLPOOL 45a2272c65a31ecf8762970c943c173272857b9529d2e18180fac419a58125bdb248a14bbd7cca38efa64cdcc4d50d927efa45f0f1a5f3223964bf0b51a77082
+EBUILD netbeans-harness-9999_p20160617.ebuild 4126 SHA256 54c77b47df014cdd74a352e0884110d11db27744e0725b26ad90c408d748ff5f SHA512 c4389f5c8c005b220f27e7fc7f4f607a92780f476946cfcf6e8108f44b263c73c48fcd30dcafb87e801e1c7ce5365d3888591ed170b85550cabc0086511a2036 WHIRLPOOL 8925bae5a670d7ebb456e15614d74e548ae37728039541cf8242ccc151ab2c4dc729ba01179ed68d21d447d229acba1b2f77312fec119a7940a91264c4706408
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160617.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160617.ebuild
new file mode 100644
index 0000000..a57f3a4
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20160617.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-06-17_00-02-33/zip/netbeans-trunk-nightly-201606170002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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-r16-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-r16-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 a691dff..5d2679f 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -165,6 +165,7 @@ DIST netbeans-trunk-nightly-201606130002-src.zip 215706858 SHA256 1bb9ee5b464b0d
 DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
+DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 EBUILD netbeans-ide-8.0.2-r2.ebuild 29330 SHA256 4822cbe26fc19685164c35d69e75bc20578ca8a5ce3394fe97bde6acc721fd2d SHA512 552f35cb1aa5429beb70c72a0cd2a3aa3a006f5870ec4084e88632a39e2ccdc05d0b2b15a87f26c72cdffb3c9a6fa0a124a8d501edeef9aa9580396922071e8d WHIRLPOOL 4c9bce3ca21d5ae61ef9392b9282c2dff9de7f82f2e83d2944a2906ca2180ef0ffab59489bdbb6afc7ba88d5143d77b47a0cf6b219a5a4d385b68afcacd3fe6d
 EBUILD netbeans-ide-8.1-r2.ebuild 30301 SHA256 892f20531352d85b5b72b1c85352eefa444917b515b0b564f04c4f91d1e654f9 SHA512 50af4873fd3ea7755b0d33b086be7e07766b6c009a46ec3954a67a1da9930378bcf9da6d18b7e60078b31af4b36ccf060f22378a8ef26b3829ccf30a529dd023 WHIRLPOOL 1024af16e7cae7f4728dd37f88031be33253b7c62548a095d3e827abeccb6c183d34ce312bd1a0f808f0d107aff217e4b81b7a17eecc6842e1d914d7061df2c9
 EBUILD netbeans-ide-9999_p20160519.ebuild 30761 SHA256 b69cc0a862c5027fd30739320e9a86d56478e6a51c6136fbaf1e4d0fb18ae7b8 SHA512 5576580d77346fd6d8766a5bcce456392f3a4a19a6f3a1435f9c872e25d865f61db103bf2560b9083d7981e0598890c02a7e65c4cc3a14a7f85d641492f62d25 WHIRLPOOL 6f68616c3fdc4273278208e2f5062efcb32bc6bb94e7bfb0dfef9ffb7898cbab95bfcf7d44d2889c0ab2c9b72bb0c127be47a1adeff06a6e1e8bea12b65be411
@@ -189,4 +190,5 @@ EBUILD netbeans-ide-9999_p20160613.ebuild 30761 SHA256 050aad9267fa2571aa93c3d82
 EBUILD netbeans-ide-9999_p20160614.ebuild 30761 SHA256 30b50c2919bada65db42cf59d9aec1f5504b737328841f732a6303409588e5e5 SHA512 d17a89889482a47a4adc1ba4591326b0d636003e9072e10cfd44cd2db3ca9776a75a60f1e05f885112a2b455747305221e6294ee8f0c7c0913990ae7d341dcb6 WHIRLPOOL 5f22361aa02682952e56470cd7b25002d8df215b496d5f88cd6bc822f3f1b50980efc98dfeeab1b9695c3804313ebae8351457c5f78065fcfb4355ae6e5be88a
 EBUILD netbeans-ide-9999_p20160615.ebuild 29867 SHA256 deefa732a92c591d90b9f66e4fe8b45d5271fe7bfded15548739333d1e38dfef SHA512 37585bd9ab2835d224d7bc29dcb94f507ade86bce65252e392fce238a43e9f599c8f0cb5b20d417cdc472b52454b7beee2c8787eacc265d83ff9640860c36b94 WHIRLPOOL 629899b8ad623ea8f2106e4cfe35dd8c1b29c8ca0e302bf71f7193eeeb6030a4bc3ab3ad224f0334478ddd02adb16419075f818d8e67f3a42261462bf6650b09
 EBUILD netbeans-ide-9999_p20160616.ebuild 29867 SHA256 8b9b24d96cfb1fdbcb17529ba0a216216a7ce3dde5bc7e76415fb10990696e1f SHA512 d96b51929d51e09d911d60a847313e1b06769985ce8490a7fc43cd83ceab0fee33b3e86836c9752585e5b2334d8b5db5501f3a50bee4b4a357ca6ab33f55b8ed WHIRLPOOL febf90375b1aa59cbaa5747b03973cda730f8826c36eb6528dc6491a0ef029bad1b40b5ad3e486edf1cbfd76ffbbfe7294a9ea7a41cdf378045e7b1687d5d70d
+EBUILD netbeans-ide-9999_p20160617.ebuild 29867 SHA256 53d1bb1a38af2096acc8bcac092971c9ebd87550525700a860154b2bcfc09544 SHA512 c49056bf2adeac686404a08dfc22b73016c74ea5318358c4e43f890f8ebd8ec3d7c97f1727706b39a7a9c17ee8a2869b42f4beba95dcb2f57a314d85f7da31c3 WHIRLPOOL 99eb56bea610a3694210d633255efaaca9e6511d7ac1045a2e161875e347220bd0222baeb46772d1fa2252303b99af92f5240977fbfeb84b7280bd707c221f45
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160617.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160617.ebuild
new file mode 100644
index 0000000..31edc00
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20160617.ebuild
@@ -0,0 +1,374 @@
+# 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-06-17_00-02-33/zip/netbeans-trunk-nightly-201606170002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
+	http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
+	http://hg.netbeans.org/binaries/DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8-com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.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/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/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/825DC870D1D423E347F4F8229A211A2C297BB15D-org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar
+	http://hg.netbeans.org/binaries/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar
+	http://hg.netbeans.org/binaries/17C0C8D6DEBF5EBE734881C131888D8088BD9E7D-org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.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/DAAEFA7A5F3AF75FE4CDC86A1B5904C9F3B5BBF8-svnClientAdapter-javahl-1.10.12.jar
+	http://hg.netbeans.org/binaries/C47ED3BCD8CEAECDE3BDEEB7D8D14B577B26F9C8-svnClientAdapter-main-1.10.12.jar
+	http://hg.netbeans.org/binaries/AD4A88D99AB7C5B64C8893CA2FF2CBCFCEFC51C8-svnClientAdapter-svnkit-1.10.12.jar
+	http://hg.netbeans.org/binaries/5C47A97F05F761F190D87ED5FCBB08D1E05A7FB5-svnjavahl-1.9.3.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/15ACB06E2E3A70FC188782BA51369CA81ACFE860-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/antlr:4
+	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
+	dev-java/jna: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-r16-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}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die
+	ln -s "${DISTDIR}"/DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8-com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.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}"/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}"/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}"/825DC870D1D423E347F4F8229A211A2C297BB15D-org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.markdown.core/external/org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.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}"/17C0C8D6DEBF5EBE734881C131888D8088BD9E7D-org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.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}"/DAAEFA7A5F3AF75FE4CDC86A1B5904C9F3B5BBF8-svnClientAdapter-javahl-1.10.12.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-javahl-1.10.12.jar || die
+	ln -s "${DISTDIR}"/C47ED3BCD8CEAECDE3BDEEB7D8D14B577B26F9C8-svnClientAdapter-main-1.10.12.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.10.12.jar || die
+	ln -s "${DISTDIR}"/AD4A88D99AB7C5B64C8893CA2FF2CBCFCEFC51C8-svnClientAdapter-svnkit-1.10.12.jar libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.10.12.jar || die
+	ln -s "${DISTDIR}"/5C47A97F05F761F190D87ED5FCBB08D1E05A7FB5-svnjavahl-1.9.3.jar libs.svnClientAdapter.javahl/external/svnjavahl-1.9.3.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}"/15ACB06E2E3A70FC188782BA51369CA81ACFE860-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-r16-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 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 --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.antlr4.runtime/external antlr-4 antlr-runtime.jar antlr-runtime-4.5.3.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 --build-only --into libs.jna/external jna jna.jar jna-4.2.2.jar
+	java-pkg_jar-from --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.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
+
+	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-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 antlr-runtime-4.5.3.jar && java-pkg_jar-from --into "${instdir}" antlr-4 antlr-runtime.jar antlr-runtime-4.5.3.jar
+	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 4052151..0c3c785 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -28,6 +28,7 @@ DIST B732870DED6CCA71896B0D8913C7035E396550D9-nb-javac-impl.jar 3035583 SHA256 6
 DIST BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar 56032 SHA256 817762baeabb24daf8a41a9716e31f85a7659147d09264a499f4d35b0fe04115 SHA512 c84d4066b9519cf2c00d5d4f054865693cd1665e5db3b30f6e77b44a7c0d3055cc40a1641b805ea38d2294e2cab1a27fab85035950ff0d94960a4de185bcc76b WHIRLPOOL aae6bc05d3b441443b9f0d80e65fde81614b0206eee5714f4e51ceaa0adb778758a5d65efb3a4963111f3b258753e0154447914a5586251883d22b0c1e09f9f3
 DIST BFCC4C322190D6E3DD2FA9F191C0359D380D87C5-wagon-file-2.10.jar 11429 SHA256 bf363540ede1db9782511d5ddcfcc6871d5026946ba4d214061ca992f064e128 SHA512 f7a69e5622153a3f6568a7b28b753ab0d19adea6c34a265b5efeaf95a9961dd0af711d0719956e0859fa3c63a1c06237381c35f20fb14e1fc9d9894f09f3522a WHIRLPOOL 4d223e3c256956d05ebf7d5e58ae3276027f0ff2effa8b54a3a8badf480029e19b8cb1b880139bde75167d886daaa6bc9c1d27c68d3b5bab01babbe607f56b54
 DIST C09FC722275CC8A84C455660B15E41CDC1654FE5-nb-javac-impl.jar 3035581 SHA256 e9debda04e078947905ea08cb6ab524b9f7d519bdcf1dd4fc7d22be4d5c745d8 SHA512 45970388501473540b4b70378f99f97c89ee56d2a0b86fe07cbc56263973014286597c48deb08fb22d4f562ba4cd5a8cc738db267d96f4df5248643105ef72ef WHIRLPOOL 5c86935599c5767b424c5255988e33941606a78a4dc5611eb098488ddbc9fe1568a5b889b1ef5bcc8365623d02adf12691a5e004bb793ac5afd27e23ba60377f
+DIST C18DD5F684329A62D6CFC738E7DD2966B053CE78-nb-javac-impl.jar 3043225 SHA256 526825b6ba5507761ec243034407ddccb220dd7b97d9831b5277f97706b61dca SHA512 8635bc271efe7cad723e0794e524e0638cfddf2f341dbaaf854d0c8ebafea3811ac123caede02372acac8a91947c279e26e17cbc4cc0c9f301d42a826163dcd8 WHIRLPOOL fbebd4aabe45c89b3472a481ec2106c5558fb5cd81ede7ca3576b1e3287e34fd428fd41aede8e7df639c88df81a1a6b907b11349ec433fefa17de8bd237da4ff
 DIST CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.jar 10121 SHA256 c229a949b35bacebe798971b05b1fa6bdee4e923fcc08f02a7ae0a71fc6de4c7 SHA512 22333aab9419fafc86544492d384683a14c7f5feb313d9555f424ed4db46dd82c5a53b74b6e41221cf7d48d640145a63a653b4a05575df8ab2a2fba1b85815fa WHIRLPOOL 18dbad03b5cbcaa76ab528b2af074f566b3cd0a786e3e8bf2b56b8e0e265461fc15527a41e013f8685d1c824f48e28607833f30e02143a09be360574be38f3d3
 DIST CAA3DA01AA82FCD617CD3247DFA82D619273B450-nb-javac-impl.jar 3036268 SHA256 2916acdac225f55fcc06344ac91917f32f564b0b1f111a1c521823b4c4ddeffa SHA512 bc7fe7751e9eb85bead3df69f15df27bdfbef3af12a177e847e343cda82e9d00d888d1e8159106028d2f6a2c970e17bdfffba5cf87121efc0f962ab338e8e024 WHIRLPOOL bff4d349a672047cdaaaab42750f4a2cc145a4a6fb6d7c7d8a844bfadab0b5607673c9d1d2a738a2911089c0d98cd4c041ffc85b7a85812bc10d7fde4712072a
 DIST CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar 8632395 SHA256 67d175c1858005308ae9a02ff85c0bc7efc9a2a3c058a6838d51769f417f5247 SHA512 56559a40532fa42775a92d82296a86033a587116870d8201dd42f07e29990a28de5b1547e3fb59ddedadfe6b4fc3dd109b108cc65cf7b253ac1b0fbb9cc03fcc WHIRLPOOL fc40cf8d49919d3ef38f6c3473736f56ee5ac1d4db848681536c3bd3532cb112e9490e76c1ef7b15d88b2ab87ed54e58dbf1227c173a3256194b5887d37f8a84
@@ -66,6 +67,7 @@ DIST netbeans-trunk-nightly-201606130002-src.zip 215706858 SHA256 1bb9ee5b464b0d
 DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
+DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 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_p20160519.ebuild 15656 SHA256 c6050357e7a89e920d34e6604b77e915a3cf470acff1bca35fb2d78762a437e9 SHA512 d97175fc0d3448abe7081f645a2b2bc04a61d69c1c9d740310a99098293a36f24c29dadc2fdd804308f1cb8aa37747ebe0f1ea01caa4eca6c110fc00889c10c5 WHIRLPOOL 15222b125ee2dd73c451f3abde721ced94ce799a66dc4e5327f4c656178dfe81a3e66b0748ad00cf4eb088c3ce7a28b720d747e109f78a076d896aaa1a190bf8
@@ -90,4 +92,5 @@ EBUILD netbeans-java-9999_p20160613.ebuild 15656 SHA256 8e14cffceab0b957ddd700f8
 EBUILD netbeans-java-9999_p20160614.ebuild 15656 SHA256 1ba3f88c10129a6a5281b5f86325b61db5b1e7442ce489646ad58fbee45304c6 SHA512 df6debc471a80eb2072d8ea47c202fb7b252337ac35430d7129ce677d3784a7b40f60dbf4f4dd51245681a19b42015a61d381051aa13ceae314441aeb6634a08 WHIRLPOOL f7292f71a19506b6c07770284fafa3847b9c838ca7637e10c5a2f3cb16eae1de5ef87d12b0c2fa037e24b6e495d8bbd0cb8b2204777d243c088610cd3b9fc080
 EBUILD netbeans-java-9999_p20160615.ebuild 15656 SHA256 a0ea8d9fc4cf1291523171539a231d4cbd07648322e17581a7d791c6445b2f0d SHA512 ff9e71cd78220f7bdb3d4e440df486ab9ed9098d0fc9b0fabfc16e72d7ccc8c854220f8f5a398d7b0bf72bdeba3217371159e5b8341be7b8cdddee2efd0bbff2 WHIRLPOOL 8c466b554976cfc879fa45bfa2c2b92e60351fae6956d1b6ed3937d1899cb5c36b2c6d00e50adca89c3b69a97f4fe361b3c2f6de3e9aed14b8706442b56d95a8
 EBUILD netbeans-java-9999_p20160616.ebuild 15656 SHA256 08c0f6f91c18424f71499886f549d99a9f4f21e83864a1211adcc7001376140e SHA512 911161fedfb54ac9de79add222f1aa548907163cdb845302c8f720ec68009485c1b1c042c36e92dac1246b645d3c5c6bb4a7ba694c3dfb66b1374e257ace34e3 WHIRLPOOL 951e258428cbe2c789709c064c5bbd1bd8fed80551b0b37ce31749cdc13c10a618a16d89196123e18147f53a0cbb2714961fae0f48affe122089a000728df34e
+EBUILD netbeans-java-9999_p20160617.ebuild 15656 SHA256 f1ba76130306bd36c5597fc7c8740a77a8c0e1fa792ec156d09bf6f9f10c2d5d SHA512 b939e5395a6dd40732b6c3cb77ea268d85b2b8d770b51c548c338199bcb465da3f62d61dc5be92b6334407caffad7eb38b78a6ac4a949903f4b5a44d821aaebc WHIRLPOOL 511e61adb044b844b4b94d77b688805542a56183e8246033a98209e3da291101c7b0d0327f3aaef9c3d5e490647f2d43bd99a1bc3db7edbaa4458d01136b3e21
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160617.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160617.ebuild
new file mode 100644
index 0000000..ccb5964
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20160617.ebuild
@@ -0,0 +1,280 @@
+# 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-06-17_00-02-33/zip/netbeans-trunk-nightly-201606170002-src.zip"
+# jarjar-1.4 contains also asm libraries
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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/C18DD5F684329A62D6CFC738E7DD2966B053CE78-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/BFCC4C322190D6E3DD2FA9F191C0359D380D87C5-wagon-file-2.10.jar
+	http://hg.netbeans.org/binaries/4EF309C09ABB5F8B2D0C6A4010205DB185729CDC-wagon-http-2.10-shaded.jar
+	http://hg.netbeans.org/binaries/3B96251214DF697E902C849EB0B4A0EFA2CD1A53-wagon-http-shared-2.10.jar
+	http://hg.netbeans.org/binaries/0CD9CDDE3F56BB5250D87C54592F04CBC24F03BF-wagon-provider-api-2.10.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-r16-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}"/C18DD5F684329A62D6CFC738E7DD2966B053CE78-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}"/BFCC4C322190D6E3DD2FA9F191C0359D380D87C5-wagon-file-2.10.jar maven.embedder/external/wagon-file-2.10.jar || die
+	ln -s "${DISTDIR}"/4EF309C09ABB5F8B2D0C6A4010205DB185729CDC-wagon-http-2.10-shaded.jar maven.embedder/external/wagon-http-2.10-shaded.jar || die
+	ln -s "${DISTDIR}"/3B96251214DF697E902C849EB0B4A0EFA2CD1A53-wagon-http-shared-2.10.jar maven.embedder/external/wagon-http-shared-2.10.jar || die
+	ln -s "${DISTDIR}"/0CD9CDDE3F56BB5250D87C54592F04CBC24F03BF-wagon-provider-api-2.10.jar maven.embedder/external/wagon-provider-api-2.10.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-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 39cc413..bf97b3d 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201606130002-src.zip 215706858 SHA256 1bb9ee5b464b0d
 DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
+DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 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_p20160519.ebuild 4971 SHA256 62f205454d9863f90a376586f299a808dc9c4b696ba5635c7e6476ecd8e4363c SHA512 68863cbffe1365a426065a0ab32f45be10f745e04f0ef2b8f845bc4f8c44ee14b436baad7602472cc6587c1f686c333f37ee7d2bbf52a0c77b7291b7d63847aa WHIRLPOOL 6532b2571de4bad6588d4e0282ce35cb0cd131a0684fa72dd56477fc119c0cd61d908570b8a77eb23ed3ee0c0e8f44883cd59b441a7842145ca51c219678d86f
@@ -52,4 +53,5 @@ EBUILD netbeans-javacard-9999_p20160613.ebuild 4971 SHA256 5483e0c2de8069a5e7084
 EBUILD netbeans-javacard-9999_p20160614.ebuild 4971 SHA256 a5f78b5059b09a0f38537ac49de89254f02395395513f1bac38b95bbb2151694 SHA512 80f779b18a7590db2aa2eead52a365a156c0cf18eeb678241cfa9ec1be54f63e8e76a1b95fb090a9c5bc15fbb1ce7272eba84665199d84fe910269ae135af253 WHIRLPOOL dfb6c912706f4df2e57f01f92e0e0bcc93f175455863987ed86144d12b8c60605ce98c35c8ea0dfbba1d0ab1d61eda22fdd147a93ea2cb923ae14ccd7475643a
 EBUILD netbeans-javacard-9999_p20160615.ebuild 4971 SHA256 ec2ef842558671cca4b85256ba7691093d68be09be62cb83961a6916c3ea64a9 SHA512 29f73d3b8f17bb7aedd4a53aa835c32f9a9cb121b421b770bd120bfba565bf27a2f056ce774ca49a6304943cff4f5bc3c4f59fae2208aa1d16fb7f89537a858a WHIRLPOOL ef4f09d20f2578209cf02d5409b04a70a3c6a9b60ce41c63c409e0cc13cccddd52f792e70329ae1daa44eb32c53e45472fdb8260e88cb5a748deec33c269e1a0
 EBUILD netbeans-javacard-9999_p20160616.ebuild 4971 SHA256 07f957fa622b72df3ad275babb74f734076fb2a83c6a5b5329ba29ca80743f1c SHA512 ebb4663e2e49a6966d4bc4cc83a9d34f689e857504e096f834c5b6d63379427d2860e2c14f668e528fc1f5a4d1818524a0e62f07c4231acb38bf0c1bdf3e9ec8 WHIRLPOOL 94ad39967a7f66f3bef4f6a14233f3729a1cfd356ee2a533e3f519bf3d1bbf87f574d19fdec4ae284ea2798a1a78b21092058637b93a56389a6475d232a8486c
+EBUILD netbeans-javacard-9999_p20160617.ebuild 4971 SHA256 7a35bfa0469c5816d703c6257b7709a94cec814e9de015fc4a28784853450f2b SHA512 0d5b689b13a8411fe202633106f1cd01c9256aaff08830f02fea57a71d74c2b7fbf0fa5149cac6981b15d6e8e9249f67866112caf82d711d3842509f22e19126 WHIRLPOOL ff6ada3f72944ae39de506eb7408fcbe8e856301660e9dcb463d66223b031462693690d8de8bc63d1330eebc5fdab921c708244b9d77292012f3606bed342b6b
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160617.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160617.ebuild
new file mode 100644
index 0000000..4094035
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160617.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-06-17_00-02-33/zip/netbeans-trunk-nightly-201606170002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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-r16-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-r16-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 5e53b9a..1f966cd 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -27,6 +27,7 @@ DIST netbeans-trunk-nightly-201606130002-src.zip 215706858 SHA256 1bb9ee5b464b0d
 DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
+DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 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_p20160519.ebuild 6293 SHA256 84144efc921bb561f023d8d6d65d5101cad8705358753235dd2640ae2409a357 SHA512 d4956830e87e4d28b4e52a7e55eec978d6a13663797bde4bb1e0e359ced5d216e35f041422717f4e667744a640be0fcde85af56da602dfe29b6af356e248ea4d WHIRLPOOL c489e2e556d72fe6c16b69a2e8b0997ebbea8a75001f0a37865e813561ef9b60781d04b4995e92a096f0a6faea8a4bbcb3e9ad7b9ae35a8133ddfc6db3c041a4
@@ -51,4 +52,5 @@ EBUILD netbeans-javadoc-9999_p20160613.ebuild 6293 SHA256 7350990790e9615b04686d
 EBUILD netbeans-javadoc-9999_p20160614.ebuild 6293 SHA256 fb96bef4686e43ad7801343e059ba7f214662c0ed37a0afece60c0214be66afe SHA512 0255b3ec42bf7deb1e44b50b1eb9982214979112c844b635be23fdc2bd0a72f2baa4ea5819620deddf42f9f828f846e8c232df91def62b2a3512a4a9596ad176 WHIRLPOOL c1341eb9644a5606e8dada9b702a112c9fdb71d7b8df80b22530a6917d7661cb55291838cebe8aed28028634b7fb71aa6c7bc18fb278ca63bc8929425954a609
 EBUILD netbeans-javadoc-9999_p20160615.ebuild 6293 SHA256 e663d34186e5722da7122ab2e9f9c663e79c3852c279722f87e824fc5d83ddf0 SHA512 0bc4681fe0e5a4235123854ca7cffb8ae4b61293efe4a91037ac070db05b6c457daffe525db4e0b3a92ecb11afc430057e9b9fde24ec4ad15e113928286dc6a4 WHIRLPOOL 3fd1e201f5b55b95156f1fbdc109320547fb7fc6973ecf935d274d456fea07deb54a2d894d5e7116a4e21c4f2353bdcdf59fb4e64fdf43fd9b7e0ced39696877
 EBUILD netbeans-javadoc-9999_p20160616.ebuild 6293 SHA256 2c773464b6cd2f9afd9556359c8867d46da873a0d451c14b9b7ded53bba33c0f SHA512 9a960a89b1cc5e6057cdc1e4e4c61b563221aa08321c5465a10883315d4d5b57b07cc3b6baeda3725489ae8f2bc776492003f73218327d2559000c31a3d71593 WHIRLPOOL 25a47193598296e46ba636bd2025ff31fcb9a9f24b6c54c1237710d641485024b7c807b5c6b6d2a8c7010c138b5494f0dc0766ccd3fb0470ff8cef05321f6110
+EBUILD netbeans-javadoc-9999_p20160617.ebuild 6293 SHA256 504582e3479edad515e71f6b756148a2395a200c29afd83421ae0d6dbf16de7e SHA512 c3d760188110a73276340eec8fd34325f1534643eab08b204aa0e2ed3499f6b7c24380748e6f954f7e3c256e32308b4b2c89205af9e293518ef8017942c99f39 WHIRLPOOL 3627b38ebb65fb3026d78047d7237907c25812d61af56a251b4c18ac83904c3fd69e2a83f26cba47f0b8db42fa28a4ae2e7a3f79863ad85710e10d9116fa7313
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160617.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160617.ebuild
new file mode 100644
index 0000000..55f9ec2
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160617.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-06-17_00-02-33/zip/netbeans-trunk-nightly-201606170002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.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-r16-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip o.apache.tools.ant.module/external/ant-libs-1.9.7.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-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 230d111..7f54700 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201606130002-src.zip 215706858 SHA256 1bb9ee5b464b0d
 DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
+DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 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_p20160519.ebuild 4717 SHA256 8d8087b4bee7bcb841e215964d9186da50fc3720d1cf4ec2e1168ef22b988d67 SHA512 ea43150fec3c7b4f00ab2e0e7f30dc4d3c01b4bc73a1c24328f7e902d77a2fe58f9a2460591ce9e568afc534047ad10b7bcc8f4bf2c65d10342b7f93f6c04264 WHIRLPOOL a69a8bbe5cee84bb0d527038636ecccd1cc4930b02924bd57057352e8d8ce3e867cb6ac3404383dd51a29d2720d5d784549b3e45c82b36fb2b21870985b504c4
@@ -57,4 +58,5 @@ EBUILD netbeans-javafx-9999_p20160613.ebuild 4717 SHA256 a6e4bb5e4cf5be13abf3a40
 EBUILD netbeans-javafx-9999_p20160614.ebuild 4717 SHA256 2cd838ed81c37b4fc5d18f884908c7edbbbe4302fd0fb54d665f49b5552f3c70 SHA512 67027e9d8a697355c9cfe54f7177f47bfd81fd19c4e78f1176c0cb3edaa1b0858dfb741e532aed0c0b4010eef026e41c0b65407e2f7384328d4b7e1e1c385e0a WHIRLPOOL 44d6f03da201d4716bfda59086ec9514525f42c7978356d331e0d01222ec217944f375ed57eb0fb1d5ee479b8fe9626b3284273c56d087e538e500d693fbf8db
 EBUILD netbeans-javafx-9999_p20160615.ebuild 4717 SHA256 7c25503a4f1a7cfeed68365182858e64c56d3a0d637edd767d014d29479ba363 SHA512 a162349dc2231c53afe41b0423d9a43234546e85a4b65197d3dd10dd21e802d3fb82bb125dac7bd09855e87ba016eb0b5b34fc27f546e631ab19257434fc5700 WHIRLPOOL 4df48ff0bf2c2b4c6abd11a92e42b32542cebb8aa3eb3bea9ced715f8226917bc5e97b5be5e23b5ee70b586ad1465e96840b123388a1804d83dd458748a41fb3
 EBUILD netbeans-javafx-9999_p20160616.ebuild 4717 SHA256 e628c45fab98d8ca675391b8e46fce8c880eef550762477ee056bfef8a79f02f SHA512 6fb2fec0939dcbca63afca2983ea2112abfe87664cd79c82c66e6a9c8d3a0f25494674818b11c8462c6a0a1e3b8a4ba9320f34f885aa80d374cb40059110ea7f WHIRLPOOL 716244f2d572cd2426fa104e85b70ba6540ad49e4b26dbede8520fb3f0c233d2fe7239df61bbfaddc75f36ce1f5bf142542629ae96192a480924ae70b8379ef1
+EBUILD netbeans-javafx-9999_p20160617.ebuild 4717 SHA256 bec98089dd32623bb722f0e5fae1d1093eed93c6328724890acc3840721ff82b SHA512 943cb92b0edc45a56437fb965548f23459a01d566dcb770a6447abacea000006239383e18762e02350d3a0d82dea58c8cd28c495f04ff5410f44dafa6c9ce31b WHIRLPOOL 2014ca5abde56477180de6eea17d521304da913e46fa85b149bdb58d856b435235a8a142110cff3c3632b20846f064b340622b657d52f6c420e6d02394cd2cbe
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160617.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160617.ebuild
new file mode 100644
index 0000000..ed894e8
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160617.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-06-17_00-02-33/zip/netbeans-trunk-nightly-201606170002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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-r16-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-r16-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 9fa55bc..feff56b 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201606130002-src.zip 215706858 SHA256 1bb9ee5b464b0d
 DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
+DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 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_p20160519.ebuild 4412 SHA256 ed528e27cce2eb68a1d44e421319b84d49e910f0bd966c6e3e4a89cbf53734a3 SHA512 437033d9b80911f91f34210f38c70199a3e11ee70cae6f3ad0e3e3a6795bf6bae3d8be512dbe902fcb97c9b372e4333846c540d2b9b51f4945a63ad127c886a1 WHIRLPOOL 5d75deef3f43dd3e1784fb401699bcb78512997fbd8f358bd896d2df203433489d42329552a5d74853a661f266c3daac5d937f8859e298710752747eb93c4f48
@@ -49,4 +50,5 @@ EBUILD netbeans-mobility-9999_p20160613.ebuild 4412 SHA256 6ccd41153952144112178
 EBUILD netbeans-mobility-9999_p20160614.ebuild 4412 SHA256 05399dedeac13996dd0aa1666e129cedf066d7f785438005cf7aff67e78bd966 SHA512 f9695296f0d06105faf5ca02cbe9884373ea585fec0a6f6eb3d1727ae608c84c83b5abaef7f4a5b742ebf358e9e43860b9400d08af529c71b74453337648e271 WHIRLPOOL 8a8f9950d746d6382e1f3af3f8650de708c376307245c7dad88c06976e02e33d2c009b15ebb38095711ad9a7013682794f000871c7c4a34acc139d9f2171e3a4
 EBUILD netbeans-mobility-9999_p20160615.ebuild 4412 SHA256 2b9b9dfcb8549b1d1d8032067c58c92638f1a7213b79c19a134bf0ccb519beab SHA512 06499a42dcdccc30faf8c54bbd76571c25002cf604471098cde9895c6a910d0fa78a2ca685280de1df9c50731c5798acf25e536651bad72a354c7387f9e5740b WHIRLPOOL 2c60b0549f413c6336ad5f05c13e0dc69111f0e0f68eac72c8e87f99b184e53d429ae7afabbf106086fab21e116d9a550ae14786089bbce3d8b423b194a5fb5b
 EBUILD netbeans-mobility-9999_p20160616.ebuild 4412 SHA256 7d70a21c94bfbe2ac070fef47455ef64eecf7c40149c5ea98bc8ab092c761dd6 SHA512 8fdfbc149f0623305cf695524c9df1be32f719e88cdfd2b8e962ae0509f38e1d42830f2c3b21c9975857beee640f0002fa783913c4718225cbb889fe17e63592 WHIRLPOOL 8803909f1ae5ce69df65943aefb944a58fd5cdccc4bc38b2da98eabfd5d66b0239a288b874903ca461cafb133f48caef7b362b846dd91bff5af1fd0eb66dde8a
+EBUILD netbeans-mobility-9999_p20160617.ebuild 4412 SHA256 0d0804132eda64caaf465327c65f1e8de1e775a0f976c66a22578cb9c9189751 SHA512 27af844d92d75ae3ebc7687986962cc540e7ae54fcb9c2652e59ed97e9c1733c5f403bdcae6574264e3b697244389240c38b12f6497119ce262cec0270bb4a1d WHIRLPOOL 06d75b57a0038cd40d309888cec18f6c599b5efe9f386d8965527c169013470ac77940372195dc1f38bfa31940be23925d5e661f5cf4d267a48cf012b561ace7
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160617.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160617.ebuild
new file mode 100644
index 0000000..b65bb73
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160617.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-06-17_00-02-33/zip/netbeans-trunk-nightly-201606170002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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-r16-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-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 8b1ab3f..3012930 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201606130002-src.zip 215706858 SHA256 1bb9ee5b464b0d
 DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
+DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 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_p20160519.ebuild 4111 SHA256 92cabb88bc3ad0e781b0f128d1f6598ec8fa2cd06de0d663e67c21c37b0943d0 SHA512 a27e6f1468479e3c52d2f99aedfbeb2a555030c109a1c360738f38ca00b65a51e6f9753975b8ec6a4e9f1b349caf8e0af6d6a55a3e99d96874c6562d69edf243 WHIRLPOOL 93207be9ccbd200600f71d466fe2b93c854d74196b8ac1cb4e052870a4bdba8d5ef6154050da1778c8f5e56e7cdbe661ddb6ee0654d2149954f070ad379c2017
@@ -52,4 +53,5 @@ EBUILD netbeans-nb-9999_p20160613.ebuild 4111 SHA256 88f1338cfbd639272d59683e42e
 EBUILD netbeans-nb-9999_p20160614.ebuild 4111 SHA256 168a3c8ffa6c109af93f44dd247c652e7156cd763c3019553593d972a8e7498f SHA512 4d244ab7198d01106cabd4fa91729b93560b88a1430e11fff80507963e8cfebcf5a97ea42bd3486646f885634956eeb65440a045b9bc31fe817c29cd9e12382f WHIRLPOOL 71092e3fee7de0b4f2c99959d6e8b3967441913322de20a69216020d5c718850dcd95bf7b17b30b99f031b2752c7619720b909751674ed7a020cccca20138782
 EBUILD netbeans-nb-9999_p20160615.ebuild 4111 SHA256 cbd3ccf2f982bd007679f72177c71708d3e4affff56b5caf182d230678a39268 SHA512 617801fe4c79ca5b04f1c3c789006cc7abcf60bc941a89aab9199ef6c748659f671facea943daccdadef98e60b5bd9fffb924370388e4ec249c5857c5a29074d WHIRLPOOL 0bb78210d9985dc2381c61d247db93ee31af441f7a6dd835efbb787836673ae3492f8447ed4a8ea6f52786cf38c83b9a19198de405698aeda7054fc1344339a3
 EBUILD netbeans-nb-9999_p20160616.ebuild 4111 SHA256 9c0a7c74d266bb8aa461bfed36528139ac313badb56474aef83def63b132e2fa SHA512 da8ccb62f620a11f03eb5328963fbc4ba0d27da3b804571153e972ed764c6c074db06d0716a36864de29dfad096417324ef2bc90f191d302a3dfad4b0f0c36e7 WHIRLPOOL dc8c22b7a0eaf9d1d39cfee2d3c309b9670728a0c70bb791ac7de88c9a62d67c47a5ae581e1f6cfcded486d906953b968523a6a5ba95963165159c6aca8f86f7
+EBUILD netbeans-nb-9999_p20160617.ebuild 4111 SHA256 58aecc413430db5e6e3b57a4df8c5a41df696e8ee65a02d47b3b47bd5d7dbc36 SHA512 b1f801278966dd6dca307bfdcd1869fe3ea0bf57b6d659796a5b621dc45383f494169fe4720385bea686fdac25b79d66b7d340cff24b2e913ac4b0f324c99374 WHIRLPOOL aac34438f88088635720a759f8e52d313f226a6ab6d4b7b048504122e3db0dd8e8dfd85c124bb8005edc81b89b8b5c337ed2b093222b82240010cf6b8c47b08f
 MISC metadata.xml 392 SHA256 01cdbcc83099b97486bd7b8e813e5b19c1138eb0d8d3e8a5683aafd579820435 SHA512 4d2f9160baa022d6a48b61d5f42e71cfd411d244e7a36436629bc5ee4036e4ce19079134d9a6c704ebe942306c2e0199d0591c1e54f92f8f3c8835147e639246 WHIRLPOOL c1131764e1cec66c56b977ebe36014b29e5a68e35ccc326c0cbadd050a6c625cf191c85c212e0a733661c008dab0d99f9a4cdc4c4ae0cc9d775ba1de554795a9

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160617.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160617.ebuild
new file mode 100644
index 0000000..5a14994
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20160617.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-06-17_00-02-33/zip/netbeans-trunk-nightly-201606170002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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-r16-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-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 079163f..b20584d 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -30,6 +30,7 @@ DIST netbeans-trunk-nightly-201606130002-src.zip 215706858 SHA256 1bb9ee5b464b0d
 DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
+DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 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_p20160519.ebuild 4418 SHA256 ae7a836757077ae6c43b5edf8cf317526d6c91a61eb55d8adfe6ed78802ed705 SHA512 c6020d38478f9862876d7ecb05b2b12bd4730b6f8d1fb2c9c5e1ad2339d07755377495713b8267dec5a72e449589b8253cad41574093e8de2c3038d27fef91c7 WHIRLPOOL 0cbf0b52b41f141d1ec3daf0d6e92938aa8d0f7aa3181c2cfc614bf118556ed3b7515188e33fca5ccd881469a52a788d46deee65eb07d47bc3846ec612f440ef
@@ -54,4 +55,5 @@ EBUILD netbeans-php-9999_p20160613.ebuild 4418 SHA256 0576a98b6ec0dde28ac3299fc2
 EBUILD netbeans-php-9999_p20160614.ebuild 4418 SHA256 e7ef557d65dcde17857e167cc87bf0b35ee7d093964b2b4d663d4f70a8b30ea1 SHA512 77177aad36984e7bd6122386a03c73744364dd133b9f802a04dcf86352852f3ad6babb95c821b500bee80468edb069cf7fcbc465012bc6fff264e5b326bac693 WHIRLPOOL e37568e6e866c28d778a5ee9b391155706f57351d45d84104a8522035d7da01c12e9d7e8f63a7df4dff86123fd8159bc408ff17a6c4877a670dd15b78becc8e6
 EBUILD netbeans-php-9999_p20160615.ebuild 4418 SHA256 51ea0af18c35dfdc1290c76c2445def40a5922a7190c6a227ed9551e848815b8 SHA512 74e8867810f6e532ee878a89084093945300be7be7017f59ef12e117bb78c9b95a8b0a87094b9336e655553e8343d907228aefcb54984c79f3168463c339637f WHIRLPOOL 7d649f3a2c96d096debd7d5d388d48b3c69e599d4ae6e391e0beff2aef6d548780335975b976a9a6f50c4f64a8297f1951f62547bc0a9c2df23952cd17bb19c5
 EBUILD netbeans-php-9999_p20160616.ebuild 4418 SHA256 be0e2c81d9c13822532e29b2affdb4aeffc939c1ec71b4fcdf370cd4b02a5906 SHA512 70f69ca728886934fab8b04c42313811bbd816cd61ae44e37fee858ee12340ba58aa04a6fd279013fb98cd6ecf76d4a9b01fb57420cbbfc9bcbd4e3718576748 WHIRLPOOL eacc775c4342a397bcbbd735fd96c7077ac9a7681ac0bbcd26c982cc878cd042bc952a24fdf15d5077563571a9bf83563fe606839bca4460423b77166ceb4bf4
+EBUILD netbeans-php-9999_p20160617.ebuild 4418 SHA256 4f6fac16dfa6338a6c58f16b8bd57d0c3db7d4367e3f40c4d1b45fd7fa7c3c96 SHA512 e986bdc678f578913778b2de557e7699813260e63995b85924ac86a5e51d89cada43ae73e0c84be88d564359d37b65d609d9a4bcb5eb25d06ccb3ac68ec82d7b WHIRLPOOL b4f901927295c97ece9b6488b3db7023fc173fdebb371eff84943ac7b008daabcf2885350e0efa26c9a9faea28570d6324eda75bc5abf42169ac6548e970f195
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160617.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160617.ebuild
new file mode 100644
index 0000000..522279b
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20160617.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-06-17_00-02-33/zip/netbeans-trunk-nightly-201606170002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip
+	http://hg.netbeans.org/binaries/472A52636BE09823B4E5F707071B31FB990A7375-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-r16-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}"/472A52636BE09823B4E5F707071B31FB990A7375-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-r16-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 fcf3b9f..deecbc2 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -51,6 +51,7 @@ DIST netbeans-trunk-nightly-201606130002-src.zip 215706858 SHA256 1bb9ee5b464b0d
 DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
+DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 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_p20160519.ebuild 9520 SHA256 f99a1cea0581d82d62d05c3fabc4d7dfd894709b71657fcd9f52502904ab4aaf SHA512 672b28c0ee2b94c80a6e83a18bce24bbb0153addbace46f2183581e07f3be791e1ce8000010858b8018962b7fcbf8d558100a02c579591e4ab6869195fe926d9 WHIRLPOOL e40167cac1e2188b74c6ee791f86588207d378d86e6c5277672cc3eade50ba9c93220ed2a777e60f518cd271606942b1bb5d4631410c5409b145b95c74049f13
@@ -75,4 +76,5 @@ EBUILD netbeans-platform-9999_p20160613.ebuild 9520 SHA256 fbdbf00bead6c9e4fbe65
 EBUILD netbeans-platform-9999_p20160614.ebuild 9520 SHA256 34c12f5c7aa190b190167e66abd35129889b96aeb20bac129d928376fd779d52 SHA512 beb785b098ee1d071e04100149652b597035da0ed399d42221e9a1c3cd9685b2235d2e981bc483b7adb436fefdbab0c5ba82440ce5afdad5d2f6e5551c1b1547 WHIRLPOOL b070f13d5e28fdb2efccbfbc38910ddb210a63e029cb746e6e3e0832157bcec51d12f2a7ddcfee0479c9f8dc35ee2c6edd86c5f2f911cd58cb0fad170628578c
 EBUILD netbeans-platform-9999_p20160615.ebuild 9520 SHA256 1d1ed4c8dce312810a9e608d5ab1b7f77e69f34a74a65baa6d85e39a50ba46ee SHA512 49874508e382242f2a795978cf9f53eb1f727bf57e3d7d8f1a9cf30bbc4664b62fc50126c95a8ebc92a006b3319be04631ba98d3d51073d817542efb2baa0c5a WHIRLPOOL 22c4f8f6910c84eff5e90740429f249af9d71d5353dfedadffeb18e2c71e6c1739192bd301b36bbb5677e0ed3d10a5671056715aa15bde6955a21ab920944fb2
 EBUILD netbeans-platform-9999_p20160616.ebuild 9520 SHA256 f83b9f7c44432d294cf8560514c6280f9df7a22a64fca6a3f69157a1273716ae SHA512 930a7cb047b4b92df4aff7510c2893f9e99071f716533aef2c3b8d56335788b16f6d1d3840fff4f76972aeddbc92a28ccf0cf55432216cb0e38e88017194c353 WHIRLPOOL 9cf1d9a31d4509ded199cf19ba04f237421d2b5c8cd14d209db9bc1e02d9dc3e6548c167be1569c058d40aa64982742ee65bdc5bf8cdb3bcad14aef45bed9e3c
+EBUILD netbeans-platform-9999_p20160617.ebuild 9520 SHA256 ff87e2a2d5058688522f5c1106ba3628ec611e76fb4da967f593b4a867ac0026 SHA512 fc57543271cfbf583fc9308570bd7e9a851567228f13a5b8cb088f65a3678758e6da91394a9a9b16f511fe12656350b3e3dfd13f664e5455ae637947cb5bcb8d WHIRLPOOL 14443637c8b536d3adc1ca73b9efcf10f4cdb52caa884f0aeb2645779ec0c14a60e9e18ed6b070f3d6151bdedde8b08a34cf18bfb32c6c1dd1d49ffbb3841b1c
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160617.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160617.ebuild
new file mode 100644
index 0000000..0328d06
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20160617.ebuild
@@ -0,0 +1,167 @@
+# 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-06-17_00-02-33/zip/netbeans-trunk-nightly-201606170002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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/771CDCA0A3F2F3CE818E20CC2D707A3592422485-ko4j-1.3.jar
+	http://hg.netbeans.org/binaries/A3085BAA78C8EE7F55081E70C79ABE04CA38CE93-net.java.html-1.3.jar
+	http://hg.netbeans.org/binaries/7FC91530F4395FA0D58F9539F3B40858E766BFA3-net.java.html.boot-1.3.jar
+	http://hg.netbeans.org/binaries/5C992BAEC0111EE293BD44173140A9D8EC860765-net.java.html.boot.fx-1.3.jar
+	http://hg.netbeans.org/binaries/BF6C9BB0FFB78A6B846ECAEB880C460D883B4F72-net.java.html.boot.script-1.3.jar
+	http://hg.netbeans.org/binaries/10E4214A89082C70FCF9F721953001C0932037BA-net.java.html.geo-1.3.jar
+	http://hg.netbeans.org/binaries/D97314CE1869DD3B8B8942256A70673E2991C9DD-net.java.html.json-1.3.jar
+	http://hg.netbeans.org/binaries/6BDCE8349F83CD02F2942D4FBFA86A81A129F42A-net.java.html.sound-1.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
+	http://hg.netbeans.org/binaries/CEC2829EC391CB404AD32EB2D08F879C418B745B-xhr4j-1.3.jar"
+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-r16-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}"/771CDCA0A3F2F3CE818E20CC2D707A3592422485-ko4j-1.3.jar o.n.html.ko4j/external/ko4j-1.3.jar || die
+	ln -s "${DISTDIR}"/A3085BAA78C8EE7F55081E70C79ABE04CA38CE93-net.java.html-1.3.jar net.java.html/external/net.java.html-1.3.jar || die
+	ln -s "${DISTDIR}"/7FC91530F4395FA0D58F9539F3B40858E766BFA3-net.java.html.boot-1.3.jar net.java.html.boot/external/net.java.html.boot-1.3.jar || die
+	ln -s "${DISTDIR}"/5C992BAEC0111EE293BD44173140A9D8EC860765-net.java.html.boot.fx-1.3.jar net.java.html.boot.fx/external/net.java.html.boot.fx-1.3.jar || die
+	ln -s "${DISTDIR}"/BF6C9BB0FFB78A6B846ECAEB880C460D883B4F72-net.java.html.boot.script-1.3.jar net.java.html.boot.script/external/net.java.html.boot.script-1.3.jar || die
+	ln -s "${DISTDIR}"/10E4214A89082C70FCF9F721953001C0932037BA-net.java.html.geo-1.3.jar net.java.html.geo/external/net.java.html.geo-1.3.jar || die
+	ln -s "${DISTDIR}"/D97314CE1869DD3B8B8942256A70673E2991C9DD-net.java.html.json-1.3.jar net.java.html.json/external/net.java.html.json-1.3.jar || die
+	ln -s "${DISTDIR}"/6BDCE8349F83CD02F2942D4FBFA86A81A129F42A-net.java.html.sound-1.3.jar net.java.html.sound/external/net.java.html.sound-1.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
+	ln -s "${DISTDIR}"/CEC2829EC391CB404AD32EB2D08F879C418B745B-xhr4j-1.3.jar o.n.html.xhr4j/external/xhr4j-1.3.jar || 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-r16-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 javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.jna/external jna jna.jar jna-4.2.2.jar
+	java-pkg_jar-from --into libs.jna.platform/external jna platform.jar jna-platform-4.2.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="${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.2.2.jar && java-pkg_jar-from --into "${instdir}" jna jna.jar jna-4.2.2.jar
+	rm jna-platform-4.2.2.jar && java-pkg_jar-from --into "${instdir}" jna platform.jar jna-platform-4.2.2.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 9ee33c5..e1f3ca3 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201606130002-src.zip 215706858 SHA256 1bb9ee5b464b0d
 DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
+DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 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_p20160519.ebuild 3472 SHA256 7ba42261bd26c21e2ef9a600cc94cb6425e364620c12171a39fb2e16a46224d2 SHA512 ddf6566d83e05c348395e3f3dbdd486b8225bd2bba4001681ef3596803f1b0b7ec930603de146db2fe2ae5b066412ba2d84cb57436c0e8a06eaddbb68475dee1 WHIRLPOOL 2371e04e397188d7f3e2bcfb16f2f7a04791f3f21be450762f61162c6d5ad4db91e27df230db2ac9268b176e4ca27ca764406089ee3863bc4417d258ee8bfe71
@@ -49,4 +50,5 @@ EBUILD netbeans-profiler-9999_p20160613.ebuild 3472 SHA256 60400b046e007007ee02d
 EBUILD netbeans-profiler-9999_p20160614.ebuild 3472 SHA256 65c683a2ef961b65bfc2599f294282b07fe90feb73e51683b91f789c673f1cec SHA512 8f50dbed2ee3ac960959dfd3c60a2bdcb850df700106ff217300f1b69bd228b1cdaa7d1f2d3f4c4c6105b77baf94e103838aa14886a444df755a92498ee884ba WHIRLPOOL 87092590a879d7d7b85b3d50a01683446f6be47e4c9ebfb5e3bb61ae5d5de9787464be90ba0f5f3941dc8544e2a83bf8cc1f87d63de89394def145d3751f6940
 EBUILD netbeans-profiler-9999_p20160615.ebuild 3472 SHA256 b62578b82c4f0349d88f66fbc2b80aa3e63fbaddb6df027ece9faaa5ecf4d8de SHA512 b2aa116ca625e88af4d40480c58279d9a95db1b59429ecf77b51bef4e77bcef90ea9e61caa5e914f7fcfdec2d95305009aa465c1229ace5013340bc2a505b62a WHIRLPOOL 87778ff56273c20f89e8823bd9af1f73937dac33f2f1d8c36d9ed0f8f63a676059b87940893604e0c2c523b73f17e6812a40c66552b3b626651b1c82c0ab6a32
 EBUILD netbeans-profiler-9999_p20160616.ebuild 3472 SHA256 0a79f7add54314b7297739d89959b9ef694a02b25cc05fbd58d1ecabc897c478 SHA512 7da2bdc3361d044e5598b39620afb5e3f0ae819704a9f216a1e976898acdfdf780ab4b3665d0de2ccc63cd07cc8def0c893d55341d4f2c0e80bdf597d2ebc0a2 WHIRLPOOL 3fffc019f02cdb1f7bf7e95e5535e880d0734387225f51c8254ec10aa5c1a30faa8fee470d77b99519552347c585ff033aa9adeec583c9025396c82a50aa6b30
+EBUILD netbeans-profiler-9999_p20160617.ebuild 3472 SHA256 164f0b9ed984dc7e5151268f12e5870b162da4a943b97c06b7a1de70b78926bd SHA512 7dc16e0c9aa0bde8a5b412fe12b075ca0dc540f8e032041cc4ccf0bb8e372138cd6079efaf492da9c7944ad013283dedc2ac68c9c4f567de62a7b3e719f8af8f WHIRLPOOL 0d8bddb982b919887499350d7c1233b1d7aa4987ac3b5b5cd51291e8200e3a24916058036898fb73a270c27be0aab70b60237d482cc8ceb4b3521bfbf800ac9c
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160617.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160617.ebuild
new file mode 100644
index 0000000..993cfdf
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160617.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-06-17_00-02-33/zip/netbeans-trunk-nightly-201606170002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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-r16-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-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 1af1739..8453f29 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -44,6 +44,7 @@ DIST netbeans-trunk-nightly-201606130002-src.zip 215706858 SHA256 1bb9ee5b464b0d
 DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
+DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 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_p20160519.ebuild 5343 SHA256 68e9720448627be4a697b4e33e0e458162e5d0ae1bd3cf604a239403e5ac1c92 SHA512 7bc8a0c0baeacac63cabf701020f018322bf7f47d0b3094ac841e41a55070662872021e10da88abfa3723dfb12ff952b476f374f5f696ae78df9a0b5a37b53dd WHIRLPOOL fc96986e0da9374eaa073ec6c2a87010b033737b129e8f4e03e39094dcf6397eca26eb72cbfa0ace5f3abf0816649887dda271fbf62d4961bdce8815858ed340
@@ -68,4 +69,5 @@ EBUILD netbeans-webcommon-9999_p20160613.ebuild 5343 SHA256 a2caf56e2a7a519a9e3c
 EBUILD netbeans-webcommon-9999_p20160614.ebuild 5343 SHA256 fa14ab0bdff82d49cdc43b56e9be63884e409653e63863a09643683f92728e69 SHA512 70eac3c9ada4f71141995b3bd9d45406f501209f78e3122d9a28945f58d1d6c94596799859773c14d2330b99b80d2ae00162fed2b1d97eb75a9d37bbdd571160 WHIRLPOOL 54c802c71a488301d00830f372314b8cd856110d5bf9be28c83ff5fddf1c92e9c23cbe936777cf5b50ba0e566e12b3abfa5a63a53b0dc993c5bbfeabf16389ae
 EBUILD netbeans-webcommon-9999_p20160615.ebuild 6242 SHA256 4029ad34c29e02d5318199b04385bdc4b7422dc64be5be72ce201ec564b24b84 SHA512 a66ed0318446484412dae4f8e68fa09e68ce88d5a5c2ca61947922db72c17374f15298466642eceb519ba57cbdde32763554c0f75b0561105146e46f98dea8cc WHIRLPOOL 9c1a7ea661c1fed670b08ca4366f2b7f7204a78964b9fc7429aabad70b4c08784190ce17caa9fd74ce447bc0d606a74182af16aad1fb443d59cef855aed4fb93
 EBUILD netbeans-webcommon-9999_p20160616.ebuild 6242 SHA256 97916f4e9a9fdec59e7b691d3bfd060cdd27ad063603917748f4633600d3bf22 SHA512 eb0c50d2b5d5c9ef0b7c5eebf65f1b49f47fd3b5c7993c58edc6ddebb311a6786cbd106a22ee3a3d0f2f09d511e50fd8f57373fbee6f6131695d6a414d6f21b9 WHIRLPOOL 8dc26451a04a6e954adafd15eb1e0da5684964ce603ca59806df7e88141d439c52dc224ca83019ed4146781e9ad0089a9c1729ec9144abe308a2c88a349b54ce
+EBUILD netbeans-webcommon-9999_p20160617.ebuild 6242 SHA256 5f72901783a18ff4ed6b3fac43340f96891e0ceaa356b5789326f5750f451b91 SHA512 3c839a28bfea0387458fc11fb519f295b16af57a3cdb9f7697dc421740d51deb0e2741682a20d48857f145d84b061a4a9caad636eaa5c1935ed0694e3ac9e02c WHIRLPOOL 0668921f14ca28ef06d4e242f5b2703b6c6f948dc0a4e923cd4976c06b5f6b62723e57b8170aa9dcd5739fa774da250129aa06e3d277a84b297cc12cf20c6632
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160617.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160617.ebuild
new file mode 100644
index 0000000..bc86ac9
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160617.ebuild
@@ -0,0 +1,132 @@
+# 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-06-17_00-02-33/zip/netbeans-trunk-nightly-201606170002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/092933967C86940E386EA1799F1CDE4A4E56F0F7-com.oracle.js.parser.jar
+	http://hg.netbeans.org/binaries/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar
+	http://hg.netbeans.org/binaries/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim
+	http://hg.netbeans.org/binaries/070F24B74BF12B52351FF7A9B3F7A074E5117BC8-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/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/CA8F6968FED0BE20E786C70CF9B603F4D7B66C68-ojetdocs-2_0_0.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
+	dev-java/jna: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-r16-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/092933967C86940E386EA1799F1CDE4A4E56F0F7-com.oracle.js.parser.jar libs.nashorn/external/com.oracle.js.parser.jar || 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}"/070F24B74BF12B52351FF7A9B3F7A074E5117BC8-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}"/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}"/CA8F6968FED0BE20E786C70CF9B603F4D7B66C68-ojetdocs-2_0_0.zip html.ojet/external/ojetdocs-2_0_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-r16-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.2.2.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 c9fa653..4485731 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201606130002-src.zip 215706858 SHA256 1bb9ee5b464b0d
 DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
+DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 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_p20160519.ebuild 2721 SHA256 f81d6de60da9a5ad1fc222332286a475d38b3b9317774928d782b3ac49e50c59 SHA512 137bac07422427f888a85734cbf4e9949925f331468ed00c49bc00f8065c4e0f36c95dd66c7fdd521539cda57a6684c1d1961ac0b30611b893fe0b325f980ac1 WHIRLPOOL 921ed6c6e320d91d356add4a5b10b57beff4140696f97cc2e3ee832f31e174a63455d3f9183e7e5b33329819b195903954c65299e3615333af70d93ac30643bb
@@ -49,4 +50,5 @@ EBUILD netbeans-websvccommon-9999_p20160613.ebuild 2721 SHA256 7b193c5a1db4eda96
 EBUILD netbeans-websvccommon-9999_p20160614.ebuild 2721 SHA256 43c6c3327630f57e63eb4f8467ffd7471564c361db7efd919880eabfa4c36c55 SHA512 9f7a1df1b4db9a3bb9a596f4b39271d8f67d0946daf66c2202c2eb2c938ad75522aacb22f0fc4e7e663187c76d7fe8e104abb573234543f9ef6d742ff775f40f WHIRLPOOL 697a9ae0f0bd427cb98d7df3f59c896f42fde5c8bfaa0fc1202a0a0aaffa8baf8ca2dbc1eb9bd8dc49085233c0c2408b922cbfc9e776cd1e5293416dcaa3c6ef
 EBUILD netbeans-websvccommon-9999_p20160615.ebuild 2721 SHA256 21d8538d3d06d7b2ace4ec26f90c713af219f8deedf537c553d08093e540c140 SHA512 0c457d3d4894878dc046c1b0f1d463189749397370fbbe82d1f117d7b8cbb5467f4648c792f0b3165e57df40c43beead1e1e408a897ea69b4b98e67a7e1b4b85 WHIRLPOOL 0f9d06a4122427fa3674b2c43d7078adc57580ab1bca2011a3053402ab8aa39bd2e2c788c05bb90a3005f490ed7a2da59016218d0fe4e9ef73b645b669bf503f
 EBUILD netbeans-websvccommon-9999_p20160616.ebuild 2721 SHA256 81077dd1a92ffef3a8c864094861350ddc3229ffd21168d8b74220047368ee6f SHA512 4a854355fac57d38b25fcd580a31fbda039cbb56265b39f2302773c13063be0df4d26140a9c3f8182488a8e8263ccba4cd495ccdb6fa9a9e2281cef5e0a0c1e2 WHIRLPOOL a04413646aeef0b1ec4f5f4434db18da805a1e1a970081797e94882cd58b8de1457911b134422e09f108098d4c2f66e7995024434fb1b5fbea5a3e430f378cbd
+EBUILD netbeans-websvccommon-9999_p20160617.ebuild 2721 SHA256 186fef19c7a144fa1510325c057f4cab763b4ea4621c262a158427137cddab11 SHA512 95a2e8994cf1b1edd76b4edba9f7fd097847c01e05be8c6ac4fabb4542784f4fc9717c6d1792387d88d62f9c4b1db5df08c28199c174e328942a247735b37657 WHIRLPOOL 6b1ae669c3ba7bd5bd912edc957f85b878f1d7674978313e9d58462ef554d605062d1523f359380d73069ada48b9705325a69e231773c2bf5db693d597381838
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160617.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160617.ebuild
new file mode 100644
index 0000000..1769bb1
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160617.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-06-17_00-02-33/zip/netbeans-trunk-nightly-201606170002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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-r16-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r16-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 9251b40..dbc2b00 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -28,6 +28,7 @@ DIST netbeans-trunk-nightly-201606130002-src.zip 215706858 SHA256 1bb9ee5b464b0d
 DIST netbeans-trunk-nightly-201606140002-src.zip 215725212 SHA256 67cfa298b60bf2be908280c4c30f1748db134bd7cba8480c0fd4571c56a7e416 SHA512 590b9018ca2db4ffa8d1690fa04114655a49593ec918c6f0b1c6cf5f57e5ec9024f2e5ae9bfa1e3abcb2822d16c4211c3ad3f5380958a81a8a2d4dc475b090af WHIRLPOOL 14be3731b9b2f6ecff7ba90d5b2d3eeaedc62d08e66cb537d9cec48077e167c163b7d8a844277a17cfc7282d0393c218198591f16f719564d04eb9c046550b79
 DIST netbeans-trunk-nightly-201606150002-src.zip 216564521 SHA256 c99e372117f14d17c0dc83c7aa44c750e33686a0f7168d7ac3ddcd656d51e522 SHA512 f23deebfeda62265adfed6a9a371e13aae7559abb9667e11d4378f7295012ce543276997b0951a48abf5ffb011c649aa577c090a18a5c5890712de675318173f WHIRLPOOL e60eb1a1c52132f2bdbb48d4be66e65dbf6e3631c0f24c5d1a3ab74b6850d6f14e90b142f26cfac5640748786dd3299c8db295732e546efc613d8af48e520adf
 DIST netbeans-trunk-nightly-201606160002-src.zip 216551465 SHA256 72506101e2792920a9eb0078fced1a3c1a5017eff44d176a279b9a1777e87478 SHA512 776c483f9333a59693a567f38b91237c354031af0a611c1bb65114795397e2812b5e4198779c742e1475db69aee435b9cf36fe4a8f92bccf363c7ba68b877d69 WHIRLPOOL ded802cd7956ad163004f259421735fe19f5841ee77fd81f3630710eedc3beb123086451b9a75a51ad05c73fa9aee1a887159cec606539eaaa244753c8dba16a
+DIST netbeans-trunk-nightly-201606170002-src.zip 216567329 SHA256 e0391bb66b4f3462beb364c339eeb12e72acbdd41dc3b6a92b0e94ebe06c11aa SHA512 ee43cc97d757beaf83339ae42c4b675c89514b94c9e911bca307bcbe18a5cf4e4346d5de45e00667ab7764fdc318e969a7a19dd4c7dc706b2d4db4fb40505db5 WHIRLPOOL 56e4233600c7ccb726e85923203739cc8ef0d52602dd14d79d5882755c6b2e85049298169356f5288a3bdae37c4eebb44790f0873f9e541a04cdfaa9379b00f6
 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_p20160519.ebuild 6939 SHA256 69fdddb9c104704ae5afd77fd7fde56a79a0e5552d3dcc4dc4c2bce9aa137efc SHA512 a3fca55562f27915bf1456b25b90c2c21f9627c98ff1eb7199b21bdb38bcf7116dea7349c15b6906bd35ca9014aa0c61104a981b08ed29807febf4cf2e4c9971 WHIRLPOOL cdc4a93778ccce5972ec7be4143dfbba62210ba1ea14fc140da4807aa4299d7149fc0c0ac5e16ca18efe5862378b0638bcef0e0a878921e436eab6c2dde8775c
@@ -52,4 +53,5 @@ EBUILD netbeans-9999_p20160613.ebuild 6939 SHA256 b21acedb1e3f8a7386609c006bb201
 EBUILD netbeans-9999_p20160614.ebuild 6939 SHA256 cb99d4d210d9182f615ea6efccfa8d1f554819868d90546b2cb6b63943d18f07 SHA512 750df96437c696707693d497459d78be7a17612a9ce6a05101c89c1fc22e1c0f10e9873365927752d4c176c6afbee3bf23831c4fd2d9756d7e7b16e2a7b1ad34 WHIRLPOOL 2988a435623d33ad4556ba94fc0d20f2c0b58d07209527e8f7a19cc803d5d564bac16377046f2232e712ffe514b26467ffbb3a9a0998176dfedeee05cfb9e33a
 EBUILD netbeans-9999_p20160615.ebuild 6939 SHA256 4e9b67afb9bedbbdeaeb62ddd37ec86c7835b355ce8d4bd5c6b83168ad579a66 SHA512 ee04262337546be1262b1681c06b0b3a6bd3e14cca8a1302e9c893692cbaa89fba8aa987e1b2b486c975c3bafa752ba058d3778859a66549706fba3c13e17972 WHIRLPOOL 08104a8ee13a828a46627c9b65d2d73fa7ad4c75d86d9e88594dfd8c14ca8296c00d3c69832aa703d92949039f8e1283aae71c5ef5b87208a5382d121f8d0866
 EBUILD netbeans-9999_p20160616.ebuild 6939 SHA256 d9ed9644003dfe397e89f927b0377b4b22a64925bb0d020b468bd8ccc9022a8c SHA512 ad6e3c3edb1895a91803a3f4d4c778db104e639d599cc454efbca25b9290dd47e0b1a7ddf8a5b727518482a7013030fdeaa0664d3da4f7ddfe144d75a3c3fb17 WHIRLPOOL 2bc6c33a2bfa39f3194590bfcc4e187bf0e1cc0c36b4a17e9a8cc82512f44c051690b411ef270d8ddc7bc63cf6688c0ecb83ecaf8da68ae7a760675c326fa6b5
+EBUILD netbeans-9999_p20160617.ebuild 6939 SHA256 9ec68f98e1a55cbdbef4c612cb04ceb415be5a934090bff531861141cab85511 SHA512 526c74f5d20aafdd5aa2c52bb5915608c4d9c89be5c3b1db37b29602ca8dc2ae8a6012c14ff13099e63a5b2356dd04b5d185f2eda68c6ac182c1c7e014db7482 WHIRLPOOL 8479fda2e78eb352c65d9618a5f9b0abf70e40c186010530d275d72df9a031b5591483fffdbfa108759c7de3134e162bae814e34be1b62a63b948f553124bd4d
 MISC metadata.xml 329 SHA256 8aeaf2a0228f15c2e4140f401b30f083509bd99d0a578873069f3595cd8555f3 SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640 WHIRLPOOL 799a9b79b1b447bda9631f67e2dfaf722376740e1d2037796528a05f9745eeed00d9990a74a65ce09f74bc5e1d60a887abde540c3c62487d7dd49b8377c15834

diff --git a/dev-util/netbeans/netbeans-9999_p20160617.ebuild b/dev-util/netbeans/netbeans-9999_p20160617.ebuild
new file mode 100644
index 0000000..f6dddd5
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20160617.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-06-17_00-02-33/zip/netbeans-trunk-nightly-201606170002-src.zip"
+PATCHES_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-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-r16-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-r16-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] 2+ messages in thread

end of thread, other threads:[~2016-06-17 10:29 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-17 10:29 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-webcommon/, dev-java/netbeans-javadoc/, dev-java/netbeans-nb/, Miroslav Šulc
  -- strict thread matches above, loose matches on Subject: below --
2015-07-14  9:19 Miroslav Šulc

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