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-javacard/, ...
@ 2015-05-27 11:04 Miroslav Šulc
  0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2015-05-27 11:04 UTC (permalink / raw
  To: gentoo-commits

commit:     9e86f6068a1522dd08347e4927cfe85d23727cfd
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed May 27 11:04:28 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed May 27 11:04:28 2015 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=9e86f606

netbeans: bumped to the latest sources

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

diff --git a/dev-java/netbeans-apisupport/ChangeLog b/dev-java/netbeans-apisupport/ChangeLog
index 56a4146..d5ef23b 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_p20150527 (27 May 2015)
+
+  27 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-apisupport-9999_p20150527.ebuild:
+  bumped to the latest sources
+
 *netbeans-apisupport-9999_p20150526 (26 May 2015)
 
   26 May 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index ef19e90..c1c50c3 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -41,6 +41,7 @@ DIST netbeans-trunk-nightly-201505210001-src.zip 207608451 SHA256 9fa52c9803d3f8
 DIST netbeans-trunk-nightly-201505220001-src.zip 207626858 SHA256 e27cf8eadddfd2d5e24b105ca06a914050603c6d23b090d938e1971e6938c36b SHA512 7534fe3130d3dd938e45c667180bb988000b9d2ae3aff444653e9f8686586e90795858c7c7c8ed86f3332254938299f6602643b1be5a360d581f447a58f56a39 WHIRLPOOL 924743463f4c43211348d7dddbb99325fca891d3c1cd762f502e9ffe7b55476aab8f755877bdbcdeca179e4b77c1a019fa70049864e8153ca648d41c5308ae3f
 DIST netbeans-trunk-nightly-201505250001-src.zip 207630778 SHA256 711c94bb4a4d097e850cb3b19f94e26429badd6d2f063ebfee7b2710efbfa751 SHA512 dab391072215ce84673ea5ce3f1938cdd933e23f781737780e80e9f2a94d39e878548e8f4d5834c5e3b14c476659ff8917f37683888cc657dc08e9156c7070b5 WHIRLPOOL d6aab8dcf268510126406635bfea7c2334b7eb9fc9a6aa4b8dc0fa6fe7a1c2c9a04fc630e9dd1cbbaa0e3b4402ae792b7edc853a922a2271ebed6b5a5e7a2ee6
 DIST netbeans-trunk-nightly-201505260001-src.zip 207634232 SHA256 15df00f2440c7d3f409b49614426f87049fdc18fd2966a506bd58a6a50e83f46 SHA512 640a9fed76d660329c73819a41d74a7de86c4d7ff66ffbd8a340bcbf8e5d1fa33c65d6683c295d0f13175bb2e253a93dde9a41f987afdc58dbfdf125bcf3d734 WHIRLPOOL 12920de6710a1e49176284c68955212e97a35404741cc7c94eab2ceac9c8dbb89dfa8ba08db33ccd25e5851aa79e5f1f8c608dfc85ae0ff512f1fcb8c5596e11
+DIST netbeans-trunk-nightly-201505270357-src.zip 207634435 SHA256 894cd7284081fbb41d7295c08015bf7f6c7578023cb3b2c7488413c19a389f9b SHA512 a273255018cfae2335cffc1ccae90cfc42ec700d4051e03418f2b914e4978ae1aaf85f2b699c0b89cd8b19dfb43d9513fe3f6ace9eff569575e896f82e6eb2d8 WHIRLPOOL b5c5d6f9c166d3129864f830fa33b3c3ab5c6b03b4b5f0f96e2b8871c6f8bbceb0789bad8b7d045e717faa30ef29de2d07f5fdf415a2f65ac65ebe31866d6b60
 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
@@ -76,5 +77,6 @@ EBUILD netbeans-apisupport-9999_p20150521.ebuild 3390 SHA256 2d39d29216e743922c3
 EBUILD netbeans-apisupport-9999_p20150522.ebuild 3390 SHA256 e08ecd8d3aa1465f81280e172bc2fd59fc647cbdb0aaaaa4db7ae1b409017b1d SHA512 6c1dcc7c249b64a72346c46034c38f6ab9e4864950c62db15637be6365ce45b0771e9ef6f0a25f2ff4e227dae1fdd018567acab2c018b8c771d5938e2a73701f WHIRLPOOL 83ffdd13929a80401a07e99887f3214637c979aae0702f2fd62c3735f904d6eb7e4c913bf66737f3f37a3c7a020a26883ae7c6c1267698f024ed97b6b5ac1a03
 EBUILD netbeans-apisupport-9999_p20150525.ebuild 3390 SHA256 2794ea148477865de729358fc1f2e53c966aeae6db93e63a3b2bee4041d7bc6c SHA512 611c02631aecba0976c756fb25ca1cce8c430be62fa4553ff6c7b18c06f7d227ca0267c694d5c755c811b9efcecc76b87e0970d8532b3df5bf74433bb8b98105 WHIRLPOOL 01db5065d16614af16fdbf3e4e8787ed8508ec9bb802ba5a3881360470abbfd966723d2f1a3ce459e51a60f9a6a6f62eeb60df214aab86be909ce755529a02fb
 EBUILD netbeans-apisupport-9999_p20150526.ebuild 3390 SHA256 db5beaba7533c5009c1d8d0d68ef4ca902eff7f12f582d7eac8d4ba054ddc88f SHA512 06e6dcdaefe81c2c5bdde851f309ce7eb2b16c28f6d3885b407bc7df91a455ce1acb934857f512d2bbd190c25002f5a4864acb6a50825ff79d0c334451ae60d3 WHIRLPOOL 969770fea235d84094ce5244ad87589a67d12d5f88e09f680178360bf8242fe908980f60b123717d7fb8a0d98cf90cd83e003295651320ca7f20edc9934d2041
-MISC ChangeLog 172112 SHA256 3fc6ce9c55a2704add48a1b559797d8dd90ce857914f31be201dfe3b16bf82cd SHA512 e9ab82ab5ea6ab838e1fa50e335f15efcfcb4e19f2074e037f57723fb84e36ae3d63cb68815d3975ec1271f1e29ade7c0bc6ea7d25c2abc64573030fc4e2d00f WHIRLPOOL 20a9fd77509091b090b124b47d22d137560bf9657fe25a036418f65a8963a50a473a3abe247a273639412eebc3efe5311d5163bfd571fe57475c87cabe03e0b2
+EBUILD netbeans-apisupport-9999_p20150527.ebuild 3390 SHA256 22249e81cd80b39dc80b23ad08a3c6447db319053abd7ed97682f0498d365dae SHA512 d5c69388128622c25505c2b0c85a0302e178b1757954fc59c9e65e45d3088642bcb60767f5b7575efc0b250f9891f8ffbae10df89e37b90dffef281c31c89ed0 WHIRLPOOL 964ee5e857aa2097ef4f180d9cee769afbd2d2cc0b1f430124988e0ed84cdd09badfec58a6b1f10df4a7ee77df16da0a6e3d22dd05880ea7e846fcc5d02acf39
+MISC ChangeLog 172293 SHA256 929cbceabb6210a0d82674df6c3711ad33f2544e429171d303f8a7f5938c0516 SHA512 1435aac383fda60a5292081c9292c8579f3d006b981fef98c50bc5bf6e37a47287db2ac4365ea0aa9517d407e352279af47cb0e9e1526cebc6a5669e39299be2 WHIRLPOOL fef8ff0fbc67f76ddfc955354eec720736c7a4394198d60d2abeafc4575be7351f6aadb93cc3d0821bc76176c2156dc9af9a9d69c7082a1e5b5c69c7b9f787af
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150527.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150527.ebuild
new file mode 100644
index 0000000..b74615e
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150527.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-05-27_03-57-25/zip/netbeans-trunk-nightly-201505270357-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 6e8a46f..837a0b0 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_p20150527 (27 May 2015)
+
+  27 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-cnd-9999_p20150527.ebuild:
+  bumped to the latest sources
+
 *netbeans-cnd-9999_p20150526 (26 May 2015)
 
   26 May 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index 7d6a0a1..cd4041e 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -56,6 +56,7 @@ DIST netbeans-trunk-nightly-201505210001-src.zip 207608451 SHA256 9fa52c9803d3f8
 DIST netbeans-trunk-nightly-201505220001-src.zip 207626858 SHA256 e27cf8eadddfd2d5e24b105ca06a914050603c6d23b090d938e1971e6938c36b SHA512 7534fe3130d3dd938e45c667180bb988000b9d2ae3aff444653e9f8686586e90795858c7c7c8ed86f3332254938299f6602643b1be5a360d581f447a58f56a39 WHIRLPOOL 924743463f4c43211348d7dddbb99325fca891d3c1cd762f502e9ffe7b55476aab8f755877bdbcdeca179e4b77c1a019fa70049864e8153ca648d41c5308ae3f
 DIST netbeans-trunk-nightly-201505250001-src.zip 207630778 SHA256 711c94bb4a4d097e850cb3b19f94e26429badd6d2f063ebfee7b2710efbfa751 SHA512 dab391072215ce84673ea5ce3f1938cdd933e23f781737780e80e9f2a94d39e878548e8f4d5834c5e3b14c476659ff8917f37683888cc657dc08e9156c7070b5 WHIRLPOOL d6aab8dcf268510126406635bfea7c2334b7eb9fc9a6aa4b8dc0fa6fe7a1c2c9a04fc630e9dd1cbbaa0e3b4402ae792b7edc853a922a2271ebed6b5a5e7a2ee6
 DIST netbeans-trunk-nightly-201505260001-src.zip 207634232 SHA256 15df00f2440c7d3f409b49614426f87049fdc18fd2966a506bd58a6a50e83f46 SHA512 640a9fed76d660329c73819a41d74a7de86c4d7ff66ffbd8a340bcbf8e5d1fa33c65d6683c295d0f13175bb2e253a93dde9a41f987afdc58dbfdf125bcf3d734 WHIRLPOOL 12920de6710a1e49176284c68955212e97a35404741cc7c94eab2ceac9c8dbb89dfa8ba08db33ccd25e5851aa79e5f1f8c608dfc85ae0ff512f1fcb8c5596e11
+DIST netbeans-trunk-nightly-201505270357-src.zip 207634435 SHA256 894cd7284081fbb41d7295c08015bf7f6c7578023cb3b2c7488413c19a389f9b SHA512 a273255018cfae2335cffc1ccae90cfc42ec700d4051e03418f2b914e4978ae1aaf85f2b699c0b89cd8b19dfb43d9513fe3f6ace9eff569575e896f82e6eb2d8 WHIRLPOOL b5c5d6f9c166d3129864f830fa33b3c3ab5c6b03b4b5f0f96e2b8871c6f8bbceb0789bad8b7d045e717faa30ef29de2d07f5fdf415a2f65ac65ebe31866d6b60
 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
@@ -91,5 +92,6 @@ EBUILD netbeans-cnd-9999_p20150521.ebuild 4586 SHA256 4f7b2d2b0904aaf62cbb11d197
 EBUILD netbeans-cnd-9999_p20150522.ebuild 4586 SHA256 6e645f32d3d3ed023d7c4200f42830acf444531260e498606cbc35d0786b874c SHA512 d04760c4d989e73f782dcd79c72c1c7e2f6cec6208a4ece98c5e667d9e6b098d55e53eb61ce2b18fa3c0cdd4781299452933cbfcefad8caf6237838b5b94e479 WHIRLPOOL cc847b6b3022f63bb695b8dbe7dd2d7dd57315be1ffa2f5318226554ee4c2feae0600432373f2aec6679d6a0f530a8ca5417b9c934af60c4010f5b71128d9aa3
 EBUILD netbeans-cnd-9999_p20150525.ebuild 4586 SHA256 8a70063d2cd7496486e0d81161d44f85252274c361a41703566bbbbf47cc57b1 SHA512 8b37b0bd121c940c08f8971be32c638bfc1ec1d4f85381758da857588a9795f48723c217dbee0ecd6ed6dbcf74b006815acb92236e703cbd4b872dc81f4ef460 WHIRLPOOL 7c9ff0857c58a61498e51aa76abe4896da61925166b4c4186568844fb39d4649b23bced00e0bce5ada457b903291f43899d6204fa3ad8448d0b511f1b6a06c5f
 EBUILD netbeans-cnd-9999_p20150526.ebuild 4586 SHA256 796a4f9ee19d9ff185f4edea7328283b9364c4234c1cc71df535dead7542f12b SHA512 99ff901dfaaf046cce520bded0812b084ce8db04e71cd2625b1fc25b22dcf55f05e364e673365423a03433f2894575ebeb2e400284ced8470b13df9662d13269 WHIRLPOOL 2b55bebe9d89b1c92c58dae1709a5b96939a8a0a3a746a1ed66e4565fc6b5919d30f147f5e58c41fb44976838f06bdace40eea046241a58de32b50afb8660e12
-MISC ChangeLog 157117 SHA256 d6454eb875f45e7f2e013f99a707584b564cf10d5b489024d44eabba9c1afe33 SHA512 6fcb76f8c2febd312e811cee2004ca49d6571f164728586b1d95f9470f5fa2399e830964fc4ecdd0e4d3c3919f1b3650b17c7c7901e07cf54d5043e9201cbd9b WHIRLPOOL 42194bf29de5ff3876ef3ae9effe260d753ed4337631d9003af542ed0bc873bc851197ea69f9e45ad4fd84a17fdd31779ce55910c430f2699a30e996cf3679cb
+EBUILD netbeans-cnd-9999_p20150527.ebuild 4586 SHA256 48b0e7ade9674de4605e240d2ffeed3ca7611ae92a79404fc243f99b46d7422c SHA512 e08f74cce6ebdeb5df8e4e94d65f7595ded6dc5c3c286e5dfcbb82d186bd623e85f1f896ebf7f12e9cb87421fa20e54ea4d34d6d31a9eff1a4dbd32f96b41179 WHIRLPOOL 45636e70632198358c39cb1ebeba157be9400f077cb7830581383372c45017ba032a34eb480e101901be1c6110c56cd80c8aefabb2e985c5b3c0e5e56b0e2228
+MISC ChangeLog 157284 SHA256 bbf61eeb61188d28e3e4cb67247875cd9ddb48de7a78dd23441406394b9c0cc0 SHA512 eadfb91b036c1eec888211c4e24991b50c0635944cb6668b4aad8f6fa08006d6948c31920b626128624b78414303bfe102de9e1dfde84183f47e8adca843b03d WHIRLPOOL 903dae2a5062eea767b99029ef89ba9f7a0b176da83336bf47eca4087b6b6d7e4f03d8cf3ee58b5c65d05cda5311a73644176d412ca6fa9352fb0c65d23ec0fc
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-dlight/ChangeLog b/dev-java/netbeans-dlight/ChangeLog
index 8a224c5..6c4d29d 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_p20150527 (27 May 2015)
+
+  27 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-dlight-9999_p20150527.ebuild:
+  bumped to the latest sources
+
 *netbeans-dlight-9999_p20150526 (26 May 2015)
 
   26 May 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index cf4fa18..f7fa372 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -49,6 +49,7 @@ DIST netbeans-trunk-nightly-201505210001-src.zip 207608451 SHA256 9fa52c9803d3f8
 DIST netbeans-trunk-nightly-201505220001-src.zip 207626858 SHA256 e27cf8eadddfd2d5e24b105ca06a914050603c6d23b090d938e1971e6938c36b SHA512 7534fe3130d3dd938e45c667180bb988000b9d2ae3aff444653e9f8686586e90795858c7c7c8ed86f3332254938299f6602643b1be5a360d581f447a58f56a39 WHIRLPOOL 924743463f4c43211348d7dddbb99325fca891d3c1cd762f502e9ffe7b55476aab8f755877bdbcdeca179e4b77c1a019fa70049864e8153ca648d41c5308ae3f
 DIST netbeans-trunk-nightly-201505250001-src.zip 207630778 SHA256 711c94bb4a4d097e850cb3b19f94e26429badd6d2f063ebfee7b2710efbfa751 SHA512 dab391072215ce84673ea5ce3f1938cdd933e23f781737780e80e9f2a94d39e878548e8f4d5834c5e3b14c476659ff8917f37683888cc657dc08e9156c7070b5 WHIRLPOOL d6aab8dcf268510126406635bfea7c2334b7eb9fc9a6aa4b8dc0fa6fe7a1c2c9a04fc630e9dd1cbbaa0e3b4402ae792b7edc853a922a2271ebed6b5a5e7a2ee6
 DIST netbeans-trunk-nightly-201505260001-src.zip 207634232 SHA256 15df00f2440c7d3f409b49614426f87049fdc18fd2966a506bd58a6a50e83f46 SHA512 640a9fed76d660329c73819a41d74a7de86c4d7ff66ffbd8a340bcbf8e5d1fa33c65d6683c295d0f13175bb2e253a93dde9a41f987afdc58dbfdf125bcf3d734 WHIRLPOOL 12920de6710a1e49176284c68955212e97a35404741cc7c94eab2ceac9c8dbb89dfa8ba08db33ccd25e5851aa79e5f1f8c608dfc85ae0ff512f1fcb8c5596e11
+DIST netbeans-trunk-nightly-201505270357-src.zip 207634435 SHA256 894cd7284081fbb41d7295c08015bf7f6c7578023cb3b2c7488413c19a389f9b SHA512 a273255018cfae2335cffc1ccae90cfc42ec700d4051e03418f2b914e4978ae1aaf85f2b699c0b89cd8b19dfb43d9513fe3f6ace9eff569575e896f82e6eb2d8 WHIRLPOOL b5c5d6f9c166d3129864f830fa33b3c3ab5c6b03b4b5f0f96e2b8871c6f8bbceb0789bad8b7d045e717faa30ef29de2d07f5fdf415a2f65ac65ebe31866d6b60
 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
@@ -84,5 +85,6 @@ EBUILD netbeans-dlight-9999_p20150521.ebuild 2995 SHA256 9594f4335c8b23f42c26c2f
 EBUILD netbeans-dlight-9999_p20150522.ebuild 2995 SHA256 b7145d043c449ca0cfcffdabd94c1c5cc359c5193b2f9fa62187603829f4ab24 SHA512 3893c0a8942fbe25c9746e79900ef4c7448e76ceb9419f5adc3c45cabf54b0ff0d88dc95ffd37d8a8cfd502cc4a07fc625232b798bf3751bf810256cead482bf WHIRLPOOL c55bf065597767d931e4746ca215e1019a04fa58937342f0b79b9892fceae697784e26e47cc3b701e7fd2cc9746fe3aee3e21455cd1e64d6d3fb194c561ba91e
 EBUILD netbeans-dlight-9999_p20150525.ebuild 2995 SHA256 eb5064ad394420a69323fa278175711cc3b563e98a21a7843e77153f643f1a42 SHA512 33fac4cbf72e9d6d6ffad6dedd0fbde6cc4fada74c05bca52791badcb61ba5e04eac5befe8a31ed130394059d1ea8f01dc84e2ba4fcff824c94b743fa0183fd3 WHIRLPOOL 858499af47bcde5366495374c90123bf8422c9a09c4b7e9e02b21ef668b137c4bacd453f10f8859957e487811021e4b5fb80f4aeb03b6bd3b7f2e0a40f422956
 EBUILD netbeans-dlight-9999_p20150526.ebuild 2995 SHA256 e60324fc3045ae2252e20f8714992a891705502e1bf6092fea2b5ead3457bad4 SHA512 a60215443265112b342ad08b4e8a349e85aa9d09d13d50edcb099823206037c85bc8468efb21c9e55d98690d8e0116e2c89547a49b7d1db32262f591cafc812f WHIRLPOOL 810b7bca03ec725776d064ca95529917dc4ab4eb6e160c653f40b484d4d202f29aa7275f008c5fd3f05ffd093f67377124cccdab6e2cf7ce99f1c846c4aa3867
-MISC ChangeLog 163969 SHA256 56ac32c81f3b0677ef70d8a44165e7143bdcab45becf3ea0266d4cd5038b2d13 SHA512 6bf18b269708d24f4cb9fab2f7b5ccf9c2fec3f824c5ea6ff8bbc9323fb322aafa15c7dcd665204df141bbb19cfe2ae1fbbeffddb9911a9f63e0febccd836382 WHIRLPOOL 7acafa7c2dc4863b37be9010e8bc723125d80b1cac2c190b77fa9d89991fc0a8d577625d1c97199dee6b7085a7b8e77cf7768af2b24b64ac4cfdfc4489acb0ff
+EBUILD netbeans-dlight-9999_p20150527.ebuild 2995 SHA256 e6c8b3b9a8abd52c7415b96a8ff50c292235f61c5a0f3a269d899e9f2d027404 SHA512 5f58ecb37035e73304353a25eea7477206ff69e4269dc14c3b8537245e866c79b953c416a5c5ac42342659a21ba3669f8731bca0efe3bf860e790f1c52fe0204 WHIRLPOOL 0ed55303aae1dbb747eb5e2931c30e050c5cae12afbabea524650648ed0629b8448f1945e872c4fa7b9f0d20007a1ef0b1ac6840bfd40e24a42ceafecd2abf63
+MISC ChangeLog 164142 SHA256 1e9ec881725cd7ea8da8210edf4aa1e9e94985def2d3168100b042c6ac226ff9 SHA512 f61515335cec2be434f0d022d3db5afe88d2ffc711f40a1ba0d1bd01789a2dfb5935bd3e7d8a46e774419dc5dbceb29a47000d384a1d0deb089707fbb829d8bc WHIRLPOOL ebe0ed49b4b0541e9be38b476ee09fd4c654996513c43a9b3fdbb1a46874a9042b8c9530d0cd2cd4d62302fad0c4ce78d322f29523a3a6fb79f32fc6c377a4e1
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150527.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150527.ebuild
new file mode 100644
index 0000000..c9b234f
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150527.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-05-27_03-57-25/zip/netbeans-trunk-nightly-201505270357-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 486a4a0..56bad5a 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_p20150527 (27 May 2015)
+
+  27 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-enterprise-9999_p20150527.ebuild:
+  bumped to the latest sources
+
 *netbeans-enterprise-9999_p20150526 (26 May 2015)
 
   26 May 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index b76208c..62d2646 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -130,6 +130,7 @@ DIST netbeans-trunk-nightly-201505210001-src.zip 207608451 SHA256 9fa52c9803d3f8
 DIST netbeans-trunk-nightly-201505220001-src.zip 207626858 SHA256 e27cf8eadddfd2d5e24b105ca06a914050603c6d23b090d938e1971e6938c36b SHA512 7534fe3130d3dd938e45c667180bb988000b9d2ae3aff444653e9f8686586e90795858c7c7c8ed86f3332254938299f6602643b1be5a360d581f447a58f56a39 WHIRLPOOL 924743463f4c43211348d7dddbb99325fca891d3c1cd762f502e9ffe7b55476aab8f755877bdbcdeca179e4b77c1a019fa70049864e8153ca648d41c5308ae3f
 DIST netbeans-trunk-nightly-201505250001-src.zip 207630778 SHA256 711c94bb4a4d097e850cb3b19f94e26429badd6d2f063ebfee7b2710efbfa751 SHA512 dab391072215ce84673ea5ce3f1938cdd933e23f781737780e80e9f2a94d39e878548e8f4d5834c5e3b14c476659ff8917f37683888cc657dc08e9156c7070b5 WHIRLPOOL d6aab8dcf268510126406635bfea7c2334b7eb9fc9a6aa4b8dc0fa6fe7a1c2c9a04fc630e9dd1cbbaa0e3b4402ae792b7edc853a922a2271ebed6b5a5e7a2ee6
 DIST netbeans-trunk-nightly-201505260001-src.zip 207634232 SHA256 15df00f2440c7d3f409b49614426f87049fdc18fd2966a506bd58a6a50e83f46 SHA512 640a9fed76d660329c73819a41d74a7de86c4d7ff66ffbd8a340bcbf8e5d1fa33c65d6683c295d0f13175bb2e253a93dde9a41f987afdc58dbfdf125bcf3d734 WHIRLPOOL 12920de6710a1e49176284c68955212e97a35404741cc7c94eab2ceac9c8dbb89dfa8ba08db33ccd25e5851aa79e5f1f8c608dfc85ae0ff512f1fcb8c5596e11
+DIST netbeans-trunk-nightly-201505270357-src.zip 207634435 SHA256 894cd7284081fbb41d7295c08015bf7f6c7578023cb3b2c7488413c19a389f9b SHA512 a273255018cfae2335cffc1ccae90cfc42ec700d4051e03418f2b914e4978ae1aaf85f2b699c0b89cd8b19dfb43d9513fe3f6ace9eff569575e896f82e6eb2d8 WHIRLPOOL b5c5d6f9c166d3129864f830fa33b3c3ab5c6b03b4b5f0f96e2b8871c6f8bbceb0789bad8b7d045e717faa30ef29de2d07f5fdf415a2f65ac65ebe31866d6b60
 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
@@ -165,5 +166,6 @@ EBUILD netbeans-enterprise-9999_p20150521.ebuild 15937 SHA256 51ce24ee5f54a473a1
 EBUILD netbeans-enterprise-9999_p20150522.ebuild 15937 SHA256 79bb9c70d998a2543ed30210733dafb310ce6d82558dd71860c5d82c2be5dae0 SHA512 f9e9a0975aa012a3b5fe4b0a5020ffa97b2eca9a8f169abfd9c15c426f55b30360a7e4a436b9902bdf2dc932cddfec47d2e02455a8f90bf8f28507c8ef476d63 WHIRLPOOL 04f27392323acad6911c3dfe0e910d07606b27405c549c1f529a90d3411730aeda29f73c83b8153923f3a6d5a244db04ab23e85a19b55e68619b4660ec261436
 EBUILD netbeans-enterprise-9999_p20150525.ebuild 15937 SHA256 1af247ed5118cba6c7abb0a097899f3c41a3d0e30854d1f838d0a02cb4f96ac0 SHA512 c9faaf20e58f6732b669c01cfdae79faadd29d7134d8b5f0907f8a6b211b6ad74334fd04034abf5fb4a3569465f6b35e90da2d9caae2799335ecbf17eb426c3e WHIRLPOOL 36939c5f5407221ede5338230525ff54ba3d5654833f689afbf0cde8c0e4e18e8a408b3dd15f07b123d8a6626a96b635c7c19588bef2954a6e6e221067d8e007
 EBUILD netbeans-enterprise-9999_p20150526.ebuild 15937 SHA256 277c387ea3d3b8a30f24db57703dcc792a8a99b4157b0b86c585be55eac3d5e0 SHA512 9d0b37e04c53dd83f569c7988fd6ff7c6a44d073925395abcbc0a4492a78d8d798d5aaa47cb78d7b0e84796a4165d98f59f2a7662763e98cea9a4fdb094943a3 WHIRLPOOL 9cbc608b22eefc26b2c265016baa7a48e12d2591cd9093f7248568faa537714256d2ac9f90c98929be98e7454e59a7e635df21298a07c6a0aac61e428c39ead1
-MISC ChangeLog 172637 SHA256 217d6cc465f242a37b7c3ea83f1d1e824139d43b4ae3752ffa53d17d332bbe76 SHA512 f336f39040eee144119e3bf84d062b5d1128428bd7985d0e5e58a2c6a7b05306edb9f6023fa0f89fd5c127854d725b43f2cf6ab82aa47247268c18dbde2c2482 WHIRLPOOL 2198062e7eea936820eed9f7040de4ad84eb95e1f73340013c37e89d1988155969071db7a85e2894935d4da0dfec455a3a76b3689f35d4e798d7204d19e4d8d1
+EBUILD netbeans-enterprise-9999_p20150527.ebuild 15937 SHA256 8df2473fbb494511e7ef8c852b1ef75fe96ff27a8c40e45328f0b9a8d1ded084 SHA512 80302e80e38503a8a47bd182c3ae924adf574dfbf91f57d3fa875a4791fd3eb90043507b9c72182af455c5455eca936c70572a9f079f3398fe789c6173de149d WHIRLPOOL 9c643964fdd5778e5aae6f7325e9768858d8c7014edbb1982b3f35cc27dc83d11ec5c8c26f22131d12ba06f54769969aa47a3777f6126379814be5336a0be268
+MISC ChangeLog 172818 SHA256 aa5308380fb9e8f2c102bcdf7085e7b8d35ed720e15fc86f4fcb1118bf0658b0 SHA512 b7a723febfe2c69c0188d1e8c15f2e6dba1e92fa11ee6a20ed45c11c039957df80e89e2432db6d8454117d8d5c16b9c7c1dadff2774ef64648f045d9f57292ba WHIRLPOOL 7e3c1e5b9ec84f416012be32cc415935a79e66fb07bddd42b4865c8615279448523cdc1c8e7030db474ddcc7a83dc2d33716a7061f307e2d1733de04e7142aed
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150527.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150527.ebuild
new file mode 100644
index 0000000..0ea501e
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150527.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-05-27_03-57-25/zip/netbeans-trunk-nightly-201505270357-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 7b71a57..ba37a0b 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_p20150527 (27 May 2015)
+
+  27 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ergonomics-9999_p20150527.ebuild:
+  bumped to the latest sources
+
 *netbeans-ergonomics-9999_p20150526 (26 May 2015)
 
   26 May 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 64e5cbe..60ded99 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -41,6 +41,7 @@ DIST netbeans-trunk-nightly-201505210001-src.zip 207608451 SHA256 9fa52c9803d3f8
 DIST netbeans-trunk-nightly-201505220001-src.zip 207626858 SHA256 e27cf8eadddfd2d5e24b105ca06a914050603c6d23b090d938e1971e6938c36b SHA512 7534fe3130d3dd938e45c667180bb988000b9d2ae3aff444653e9f8686586e90795858c7c7c8ed86f3332254938299f6602643b1be5a360d581f447a58f56a39 WHIRLPOOL 924743463f4c43211348d7dddbb99325fca891d3c1cd762f502e9ffe7b55476aab8f755877bdbcdeca179e4b77c1a019fa70049864e8153ca648d41c5308ae3f
 DIST netbeans-trunk-nightly-201505250001-src.zip 207630778 SHA256 711c94bb4a4d097e850cb3b19f94e26429badd6d2f063ebfee7b2710efbfa751 SHA512 dab391072215ce84673ea5ce3f1938cdd933e23f781737780e80e9f2a94d39e878548e8f4d5834c5e3b14c476659ff8917f37683888cc657dc08e9156c7070b5 WHIRLPOOL d6aab8dcf268510126406635bfea7c2334b7eb9fc9a6aa4b8dc0fa6fe7a1c2c9a04fc630e9dd1cbbaa0e3b4402ae792b7edc853a922a2271ebed6b5a5e7a2ee6
 DIST netbeans-trunk-nightly-201505260001-src.zip 207634232 SHA256 15df00f2440c7d3f409b49614426f87049fdc18fd2966a506bd58a6a50e83f46 SHA512 640a9fed76d660329c73819a41d74a7de86c4d7ff66ffbd8a340bcbf8e5d1fa33c65d6683c295d0f13175bb2e253a93dde9a41f987afdc58dbfdf125bcf3d734 WHIRLPOOL 12920de6710a1e49176284c68955212e97a35404741cc7c94eab2ceac9c8dbb89dfa8ba08db33ccd25e5851aa79e5f1f8c608dfc85ae0ff512f1fcb8c5596e11
+DIST netbeans-trunk-nightly-201505270357-src.zip 207634435 SHA256 894cd7284081fbb41d7295c08015bf7f6c7578023cb3b2c7488413c19a389f9b SHA512 a273255018cfae2335cffc1ccae90cfc42ec700d4051e03418f2b914e4978ae1aaf85f2b699c0b89cd8b19dfb43d9513fe3f6ace9eff569575e896f82e6eb2d8 WHIRLPOOL b5c5d6f9c166d3129864f830fa33b3c3ab5c6b03b4b5f0f96e2b8871c6f8bbceb0789bad8b7d045e717faa30ef29de2d07f5fdf415a2f65ac65ebe31866d6b60
 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
@@ -76,5 +77,6 @@ EBUILD netbeans-ergonomics-9999_p20150521.ebuild 2919 SHA256 bd0a0139c009e6f86ec
 EBUILD netbeans-ergonomics-9999_p20150522.ebuild 2919 SHA256 b8cc1152841905ccee4ba19059ce88d8323094e8cd3459547e38b2f39fd6f8ce SHA512 8003eadc2d3f398a09193fcccdb303d281563939ad786be310a748842f2cfab3e3caa412ec84fdeeb3085c8a1a4e54daa0a303709ae1f3028f22531013221157 WHIRLPOOL 28841a04b914a507dc5c4a1f12aa05612edc4a2a8bb47875073bd5628e9b78baef3779e5cd102ab3780364203d239b7cc6892254cff92e1bd6f74305ee6bf5a0
 EBUILD netbeans-ergonomics-9999_p20150525.ebuild 2919 SHA256 2ebab65379f9297e0028244918784d58e910b82420ca7d109a2d84287699d2ff SHA512 4d590e500499597878f945c5ed0aa259cf3ddc2b66553eec06e6b08cab9367d3103f78c4b4e6fa0d480ee6d12522ac9e63fd745ba17986d244958bb269b59c3b WHIRLPOOL d9a4912a12cb5a9e3547037d8d7d534f87a723c2e799da07bf50c701691b4aed2cac8e8f7825ed5b05ee397a0f7988ddcc9ae81a3e981b7e28400853871b1011
 EBUILD netbeans-ergonomics-9999_p20150526.ebuild 2919 SHA256 0bee6f48b662c0188e9a89e10f283596ae35ffc562dbbe14bfdbd313e33a5619 SHA512 269fe31f93025e7b67d66b2d6924fe1bdf238477c33eec923fb4345a66ec1ad930a3bd11d4c045b7b6db6343eaf85eec5e38b2c6760fed39ec8e14f8bc64fa81 WHIRLPOOL 3d5d2ad6355f425dff1d78ae23df1800361a22e87ae21420a42d17ebc2163ed56e508e0e15bfe63a4662709c68d7353625539d2eee137f654ab2108a2fdec751
-MISC ChangeLog 172112 SHA256 c17c471d35d0b7a2cb0085928128decebad4ffb6ccea84c84472d74a2df4e0d1 SHA512 4f423b529b881a59b22e77d2dce65fb9170ff439f4b17d3188ab5bbb9f0f3b9ba3969ee6f540aafe6c202ecf6e508110a28e61d920fcc107d5464506484a14c7 WHIRLPOOL e71a331f20822f763749a6614f827245fa6401dca8278dbb15bb03333126a2113f806604f925de9edb257944e3ac8de42ca4749593dd855d4eae2347660347cf
+EBUILD netbeans-ergonomics-9999_p20150527.ebuild 2919 SHA256 9adbf2e8d753b1d3b048132f5caa64593e29a67e419a6f263babfe98fd4fdb09 SHA512 7b257cb2fb0de48c7800909bc66f046e26d7ee6d33887c88f7017f030a4d4fadbd5b4b03c8a7d4a1d1ae7c07608bf8e7819cb536ef561a251f0127910bfd9c11 WHIRLPOOL c4981d646e6de588f2757315ce3138654ea92648f27eb8352ccc298df45f359d12a9a3c31a1a85eac6034a17ecc73a11beee802b6ee3d6e2122020f5c2c57b33
+MISC ChangeLog 172293 SHA256 d73f7debfb071f5a0c40b4f93f4411febf9bc5a10f0c26352e9a20d2443210fa SHA512 48ca3eabd31e5ecf61360508cdcf7efc0c86b21c8337d8294d25efc26e94580e801963cac6f779f51daf5097bdd6e9e025440f1bf94a117a1e4eadee927ee11a WHIRLPOOL bba9038e634f3b97b57e2c74411c64025bb9800a8ebbb0ba525c2c6967f6f3250a97a7277d97a9d62c640178c2e50f5717bc8b10b44c5b7234c20b6a3e6989b3
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150527.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150527.ebuild
new file mode 100644
index 0000000..11bb923
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150527.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-05-27_03-57-25/zip/netbeans-trunk-nightly-201505270357-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 349982e..883e6c1 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_p20150527 (27 May 2015)
+
+  27 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-extide-9999_p20150527.ebuild:
+  bumped to the latest sources
+
 *netbeans-extide-9999_p20150526 (26 May 2015)
 
   26 May 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index a77dd49..318855b 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -39,6 +39,7 @@ DIST netbeans-trunk-nightly-201505210001-src.zip 207608451 SHA256 9fa52c9803d3f8
 DIST netbeans-trunk-nightly-201505220001-src.zip 207626858 SHA256 e27cf8eadddfd2d5e24b105ca06a914050603c6d23b090d938e1971e6938c36b SHA512 7534fe3130d3dd938e45c667180bb988000b9d2ae3aff444653e9f8686586e90795858c7c7c8ed86f3332254938299f6602643b1be5a360d581f447a58f56a39 WHIRLPOOL 924743463f4c43211348d7dddbb99325fca891d3c1cd762f502e9ffe7b55476aab8f755877bdbcdeca179e4b77c1a019fa70049864e8153ca648d41c5308ae3f
 DIST netbeans-trunk-nightly-201505250001-src.zip 207630778 SHA256 711c94bb4a4d097e850cb3b19f94e26429badd6d2f063ebfee7b2710efbfa751 SHA512 dab391072215ce84673ea5ce3f1938cdd933e23f781737780e80e9f2a94d39e878548e8f4d5834c5e3b14c476659ff8917f37683888cc657dc08e9156c7070b5 WHIRLPOOL d6aab8dcf268510126406635bfea7c2334b7eb9fc9a6aa4b8dc0fa6fe7a1c2c9a04fc630e9dd1cbbaa0e3b4402ae792b7edc853a922a2271ebed6b5a5e7a2ee6
 DIST netbeans-trunk-nightly-201505260001-src.zip 207634232 SHA256 15df00f2440c7d3f409b49614426f87049fdc18fd2966a506bd58a6a50e83f46 SHA512 640a9fed76d660329c73819a41d74a7de86c4d7ff66ffbd8a340bcbf8e5d1fa33c65d6683c295d0f13175bb2e253a93dde9a41f987afdc58dbfdf125bcf3d734 WHIRLPOOL 12920de6710a1e49176284c68955212e97a35404741cc7c94eab2ceac9c8dbb89dfa8ba08db33ccd25e5851aa79e5f1f8c608dfc85ae0ff512f1fcb8c5596e11
+DIST netbeans-trunk-nightly-201505270357-src.zip 207634435 SHA256 894cd7284081fbb41d7295c08015bf7f6c7578023cb3b2c7488413c19a389f9b SHA512 a273255018cfae2335cffc1ccae90cfc42ec700d4051e03418f2b914e4978ae1aaf85f2b699c0b89cd8b19dfb43d9513fe3f6ace9eff569575e896f82e6eb2d8 WHIRLPOOL b5c5d6f9c166d3129864f830fa33b3c3ab5c6b03b4b5f0f96e2b8871c6f8bbceb0789bad8b7d045e717faa30ef29de2d07f5fdf415a2f65ac65ebe31866d6b60
 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
@@ -70,5 +71,6 @@ EBUILD netbeans-extide-9999_p20150521.ebuild 3383 SHA256 7ee7a02accee7f8bfe692e6
 EBUILD netbeans-extide-9999_p20150522.ebuild 3383 SHA256 fe007f1f1a3e9a3c4be5ad2afbed1bf7b761a385def12dd36a684d4a1cd6a015 SHA512 88093c2df90e44bce9fcd037c56ef83903627f34826dceabb7f692d755b7f5c0940a0e79538593be67e89049675a57090a82effa30a6082b9d51e73484d52b62 WHIRLPOOL 06b103a9ac404d2b1ccc5185522509feba3dc51f1a98c32dfa7632bd2256c0dde10b11af0a48e5213ff2f6fd32718a2547d057a5b797f0f3c3a9c497c9c861f3
 EBUILD netbeans-extide-9999_p20150525.ebuild 3383 SHA256 695184fb54a44dfdf3761a8fe92c73567c3837b1ad19870dbfaf2be3be0f0c19 SHA512 0897fb060f2e963ac30e7b827e02f49d88e030fa5160366ac29b46554ae663a34c076aab5e54a6aebb3e60fc64d553f088068857d8dd272704f89f7cbfeaa615 WHIRLPOOL b1c29149fd97e2749c8047812ca6deb7e2c56fb25f198489b3ddaf65d1bf1189993e3960b3cba93ca019e5c8fdb832c05eb1ad84fc5639ac279213c4f9da04df
 EBUILD netbeans-extide-9999_p20150526.ebuild 3383 SHA256 cc603dd5da234966a7562ae9e15c2d2c0849afd49151010b2ff3264f820dce1b SHA512 a2eae3877c331aa76a4681256db22f7c80cd0c20302cfad381895c48b858b0ee0cf8f65ba73c0fcbb100727909be5672767cda3e44a4a4058dbab9a0de4d66a1 WHIRLPOOL b1f266d2f1b963d7b1e76e05d0f40a619a5db886379ad1271a37d58be51c27cd847d6adc8e42cf121c1715452eaed8a1519f2aa794d5a3e149e43c7a6f527673
-MISC ChangeLog 95879 SHA256 7704f60c27b84c491da75dd3bbf45912293460064d20770ec2e9e1b5735fc2dd SHA512 56a99a584e7866ccd284358c506528bbcb7a33bcb3f63cb408d53306ae6a3a0d32adf34f81faaae492777b46fb7e728176f3992bbdb889629d33b6d1552f2527 WHIRLPOOL aab2ce987369833d58440ad8706e298285e71e169570150040ca8c1123912b33b5238eacb98c83334338bacec07b3f20ef073987f1c145ba59bd4924bef8022e
+EBUILD netbeans-extide-9999_p20150527.ebuild 3383 SHA256 c1a497f306c466dc44fed3672b4fa0995aa5086d2104da533223593dc80a734b SHA512 efdd37dbb263ea211de9a874f54295143402310d181c98aefe457dbceed304ae4c62cf7356ab028d8ddbbe805ec28ef4ca86973084158e1074f5e76d889e54d7 WHIRLPOOL 473dfced7d0159c32a7710f4eab58f47021a5b6ca2b5183bc40e530f391e3b32a80271b589e200125cebd4ef66f81d79a8594a84b93527c61fb3637157a0b9e2
+MISC ChangeLog 96052 SHA256 7d450f1831bfd75ab23f25065abcc9f24eca628b0f8a2b5d7b53ab7663261dd3 SHA512 c4f7ae2f872167c446a86f4037aa654d435b16a87cce37b98b888a70bafb5523cc618440cb8335f73eb134b810bc02804cf56fd6fccdfd56e212ff4ecce5ad27 WHIRLPOOL 3c538eae88fdb1f8dad93113bef3869098071c922afc0a793b4a29bfeb5eb2e76ae64a611a549a6a6dc6638f88a109f519d46f152df9c9bdd6c5f40fa580abc7
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20150527.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20150527.ebuild
new file mode 100644
index 0000000..5af9db3
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20150527.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-05-27_03-57-25/zip/netbeans-trunk-nightly-201505270357-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 7482a48..1712315 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_p20150527 (27 May 2015)
+
+  27 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-groovy-9999_p20150527.ebuild:
+  bumped to the latest sources
+
 *netbeans-groovy-9999_p20150526 (26 May 2015)
 
   26 May 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index e7a8695..31b839e 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -45,6 +45,7 @@ DIST netbeans-trunk-nightly-201505210001-src.zip 207608451 SHA256 9fa52c9803d3f8
 DIST netbeans-trunk-nightly-201505220001-src.zip 207626858 SHA256 e27cf8eadddfd2d5e24b105ca06a914050603c6d23b090d938e1971e6938c36b SHA512 7534fe3130d3dd938e45c667180bb988000b9d2ae3aff444653e9f8686586e90795858c7c7c8ed86f3332254938299f6602643b1be5a360d581f447a58f56a39 WHIRLPOOL 924743463f4c43211348d7dddbb99325fca891d3c1cd762f502e9ffe7b55476aab8f755877bdbcdeca179e4b77c1a019fa70049864e8153ca648d41c5308ae3f
 DIST netbeans-trunk-nightly-201505250001-src.zip 207630778 SHA256 711c94bb4a4d097e850cb3b19f94e26429badd6d2f063ebfee7b2710efbfa751 SHA512 dab391072215ce84673ea5ce3f1938cdd933e23f781737780e80e9f2a94d39e878548e8f4d5834c5e3b14c476659ff8917f37683888cc657dc08e9156c7070b5 WHIRLPOOL d6aab8dcf268510126406635bfea7c2334b7eb9fc9a6aa4b8dc0fa6fe7a1c2c9a04fc630e9dd1cbbaa0e3b4402ae792b7edc853a922a2271ebed6b5a5e7a2ee6
 DIST netbeans-trunk-nightly-201505260001-src.zip 207634232 SHA256 15df00f2440c7d3f409b49614426f87049fdc18fd2966a506bd58a6a50e83f46 SHA512 640a9fed76d660329c73819a41d74a7de86c4d7ff66ffbd8a340bcbf8e5d1fa33c65d6683c295d0f13175bb2e253a93dde9a41f987afdc58dbfdf125bcf3d734 WHIRLPOOL 12920de6710a1e49176284c68955212e97a35404741cc7c94eab2ceac9c8dbb89dfa8ba08db33ccd25e5851aa79e5f1f8c608dfc85ae0ff512f1fcb8c5596e11
+DIST netbeans-trunk-nightly-201505270357-src.zip 207634435 SHA256 894cd7284081fbb41d7295c08015bf7f6c7578023cb3b2c7488413c19a389f9b SHA512 a273255018cfae2335cffc1ccae90cfc42ec700d4051e03418f2b914e4978ae1aaf85f2b699c0b89cd8b19dfb43d9513fe3f6ace9eff569575e896f82e6eb2d8 WHIRLPOOL b5c5d6f9c166d3129864f830fa33b3c3ab5c6b03b4b5f0f96e2b8871c6f8bbceb0789bad8b7d045e717faa30ef29de2d07f5fdf415a2f65ac65ebe31866d6b60
 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
@@ -80,5 +81,6 @@ EBUILD netbeans-groovy-9999_p20150521.ebuild 3422 SHA256 e79e6467026466eb82034d2
 EBUILD netbeans-groovy-9999_p20150522.ebuild 3422 SHA256 2a5728aeda37a84fc41d75bdda05eb895675ea67f5e181da3fbab5f070b8f5d6 SHA512 3965f6574a40c2663e384afa5cb0bc2a13d7c12ceaaa7b4cc4ffea7edad56b82d342189710fb8594fe85ead1148a16b79c7e030468739d413a85a79dc9e03db1 WHIRLPOOL 9cc320fc3ff77200b3c12f6502e880c82a63724a1ea1c455d4c36a9a4d5fd981c6d6b86b048ffa5e6da67e505c1e4959c1de6fd0aa2c2ace8c80d22249a88f87
 EBUILD netbeans-groovy-9999_p20150525.ebuild 3422 SHA256 3e811c72deb101ce37b7386b4e71f80464ee5a7652a863f9168957cc34634360 SHA512 214bd9c94969fb7a6650954fa0ea27e505db16ab62c0167ecedc6a45dc0328f29be84c8da03e0bae0a31f9310ef4b48d39268e3eff1809749544e94aaa358e44 WHIRLPOOL 06c8280d94fa886848264a24801d6d2e035d9c981af9c09bbc28f9dfd70e9ae8cfb3775426a4115983812f2a51bd7b62c8272ccd772b86e2b57db3d273316fe1
 EBUILD netbeans-groovy-9999_p20150526.ebuild 3422 SHA256 49ddc4517e76440e12192e4050047c975139c838cb7fae8324abb006e4da7686 SHA512 ca57034bc284d63eb8d37a1877ce40babc1c1b1f1e2eb51dd5f34a4a9861d51ded648f4182d3e8269cab31aba3db96489d1615321f41859cdf1737ad21d792d6 WHIRLPOOL 422bda75ae1b4e666b30847b98751d262e6f5e703f7b026585f7334a65685ea2a4e48947d4d636354c38b6cd99c94351614db6cfc5c9dfed398236690ad22050
-MISC ChangeLog 163859 SHA256 faa91a4aa49e53d272f3f5c21d752f741820a860da7ffad693a61b8aaf2c3359 SHA512 e7e6915906ef0c551c065645b3d30863ec2cf61da121021bf514663257258a11f94552a062c704d93fb4a7a5ede73a1f6475515f1f2820e407281a5b1b7580a9 WHIRLPOOL dd2a6ce4678b546d8bc8a997f3073cc727e2cc14e7ebc195cd59244bebaa7d719008788d0ba2a2bc7fe80c44503ab270158fc4a04de4fa0bdee46e9707a58798
+EBUILD netbeans-groovy-9999_p20150527.ebuild 3422 SHA256 613b269a7608e93b205f1f97caee55081de7ec53459767c25344e36fd4305a1e SHA512 861526d4a21e2a01bdbf6af42074dbe5f5923bd2414693cf13cf26b3124f1a3043f441708df68a8d1b35e22d6affbc927d84ceeee6fecd319c3b19028b6cd41c WHIRLPOOL 8d3d8814e182e0232f2c73e0ea5c5763d1b2533d2a054d1791d98bdcf268cc5a5d54babdaca9302af5aa784ddf21cc21dc38d5801d701f3578757c150935c804
+MISC ChangeLog 164032 SHA256 b341dea27ffba5529a921f3eb4c1797e9f00fb55ff5c2126b710301f26ae55b4 SHA512 c9af1172161ffdcc18de0ece893836b7d6bd3b822f1a63ceb3bd2270014b589029e9cb703614b48f585d87c14f780848523eb7dc9457586528fc02ea4fb1f411 WHIRLPOOL 0a8f3ab00e73caed5064bb426efca7859cf5a0c8fd26ff4dfdf06b1229475bac035a6ab45ce40b8a82bd546832b37be5d8262c6bb430482e59dd7d514ea18ba0
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150527.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150527.ebuild
new file mode 100644
index 0000000..61cc14f
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150527.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-05-27_03-57-25/zip/netbeans-trunk-nightly-201505270357-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 b47c6cd..677b89a 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_p20150527 (27 May 2015)
+
+  27 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-harness-9999_p20150527.ebuild:
+  bumped to the latest sources
+
 *netbeans-harness-9999_p20150526 (26 May 2015)
 
   26 May 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index b1efdee..34e1dc7 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -47,6 +47,7 @@ DIST netbeans-trunk-nightly-201505210001-src.zip 207608451 SHA256 9fa52c9803d3f8
 DIST netbeans-trunk-nightly-201505220001-src.zip 207626858 SHA256 e27cf8eadddfd2d5e24b105ca06a914050603c6d23b090d938e1971e6938c36b SHA512 7534fe3130d3dd938e45c667180bb988000b9d2ae3aff444653e9f8686586e90795858c7c7c8ed86f3332254938299f6602643b1be5a360d581f447a58f56a39 WHIRLPOOL 924743463f4c43211348d7dddbb99325fca891d3c1cd762f502e9ffe7b55476aab8f755877bdbcdeca179e4b77c1a019fa70049864e8153ca648d41c5308ae3f
 DIST netbeans-trunk-nightly-201505250001-src.zip 207630778 SHA256 711c94bb4a4d097e850cb3b19f94e26429badd6d2f063ebfee7b2710efbfa751 SHA512 dab391072215ce84673ea5ce3f1938cdd933e23f781737780e80e9f2a94d39e878548e8f4d5834c5e3b14c476659ff8917f37683888cc657dc08e9156c7070b5 WHIRLPOOL d6aab8dcf268510126406635bfea7c2334b7eb9fc9a6aa4b8dc0fa6fe7a1c2c9a04fc630e9dd1cbbaa0e3b4402ae792b7edc853a922a2271ebed6b5a5e7a2ee6
 DIST netbeans-trunk-nightly-201505260001-src.zip 207634232 SHA256 15df00f2440c7d3f409b49614426f87049fdc18fd2966a506bd58a6a50e83f46 SHA512 640a9fed76d660329c73819a41d74a7de86c4d7ff66ffbd8a340bcbf8e5d1fa33c65d6683c295d0f13175bb2e253a93dde9a41f987afdc58dbfdf125bcf3d734 WHIRLPOOL 12920de6710a1e49176284c68955212e97a35404741cc7c94eab2ceac9c8dbb89dfa8ba08db33ccd25e5851aa79e5f1f8c608dfc85ae0ff512f1fcb8c5596e11
+DIST netbeans-trunk-nightly-201505270357-src.zip 207634435 SHA256 894cd7284081fbb41d7295c08015bf7f6c7578023cb3b2c7488413c19a389f9b SHA512 a273255018cfae2335cffc1ccae90cfc42ec700d4051e03418f2b914e4978ae1aaf85f2b699c0b89cd8b19dfb43d9513fe3f6ace9eff569575e896f82e6eb2d8 WHIRLPOOL b5c5d6f9c166d3129864f830fa33b3c3ab5c6b03b4b5f0f96e2b8871c6f8bbceb0789bad8b7d045e717faa30ef29de2d07f5fdf415a2f65ac65ebe31866d6b60
 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
@@ -82,5 +83,6 @@ EBUILD netbeans-harness-9999_p20150521.ebuild 4131 SHA256 71e234c370e00e7d38ce48
 EBUILD netbeans-harness-9999_p20150522.ebuild 4131 SHA256 4d7cb6fc7d5804d3e66259b88ef78350958386de366ea3640e010312afe39342 SHA512 50f714342bbaf2f16d9a3595f84aeddbbfc43937a15b1b624c092d3ab04121920326689cfaf2c0bfd3079a0131dd410098043db35f9f0fe0b66ff5f20ff75941 WHIRLPOOL 10f53d9deb323ef3ea29a5a9e3e4deb3e8779d2e818aed6afca47dcdf4f99dc91fbc06519077a48a9662d697a266b6da95aac93f7ea477eea7ecac86689a6c54
 EBUILD netbeans-harness-9999_p20150525.ebuild 4131 SHA256 19b2c078445275f267ec8c424fbab5cf7b8bbe6544ec6c1b075deab463d6d5fe SHA512 955605dc56876bb6c76e9e513341c83f71df8f8198d3054e36d0627dc626f760715672b7a1e11daae0b02687576b0df806c0d858fd51e714bb4398518b0ff3a7 WHIRLPOOL bf0b9526732ac3d2d2b6e4fb0773b8a0f8b2198f08c2c79404f8c13d7532c36399d422a9a607ce25e8aacdde3792265bdb268495d5235f35ab895df30543f68c
 EBUILD netbeans-harness-9999_p20150526.ebuild 4131 SHA256 7a9162cf78e09d163abc801620cc764a1f150c20477b473b22452a9568ac2859 SHA512 1ac2a18a4d6feee80033fb0040163285696902c3fbc9bd4355cd571d400c02a5d99e762ebb0767be3992987310373c86c740c3551fd708d91da8621a5096d367 WHIRLPOOL cef798507803efeaacf0611c78af911197af66f251e7ded120fb45a59a8ece7f73f6bd53b5e17bf34bf3b1e2997f5cefb3a0b8e618c8f00d1c587eb4916fe722
-MISC ChangeLog 165951 SHA256 20237a496d5c97f4818cc2d70dfd4fa0b05d2aa747fdf2a1e3599d536276a669 SHA512 cb106fd142593c8c1929c391c0189c386bf6bdbfa80aa7df7fedbb44ddf8c0d8d406d25f9e072c508af5c0dcc5b0332164b9d2cc7053e870aa0b9f4b15d49a50 WHIRLPOOL 4adaead7573b079676cea682b4727b2d82a278c329c6f5d57f4d7446c02f894ad629c5588e9503cf56bd9ece6450438a0ef537dbd7e06223548c5ab15f7c3206
+EBUILD netbeans-harness-9999_p20150527.ebuild 4131 SHA256 ba0fa9bda3d428ad671a914c415863239c7d42cd37bcf86c361de9fb53958d41 SHA512 dcd2f4c17b10bea4c70eb6b846ff913d3c1d733e9ed335c9089df1604339d4c7f2535d4bf46a9ab378cd20a55ccdf468349c18733d5e2d1ea141ccec9f2934b8 WHIRLPOOL ab29bce35e64b966e9801f7eef168c38a1972dfde02eb01ca3ce94ab4d4e0921f2fd16fc6796f96eb483f8133b94c506b409c156626ec28b91caaefd5f9fea12
+MISC ChangeLog 166126 SHA256 0d858d06d3227095f047b2c277d15410cdfb5542cf303c2af5b41d023dfa6b3e SHA512 eb72d5a5276251adc26b823f3e1d11424bf66338220e10b6351dd71db43400c6affe06b11e626f4d9a68f290a3f4c896e138b456b2f055a2df85871f3eff1632 WHIRLPOOL 222dc9a4632171f65c6d3e008d97a875e6e37381d3f6a8cd077ba071498a750c68822d705b42cefca8f146a7e412c8a88c3b9977017581de8a40958ef92655de
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20150527.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20150527.ebuild
new file mode 100644
index 0000000..366834c
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20150527.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-05-27_03-57-25/zip/netbeans-trunk-nightly-201505270357-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 88b2734..997aba5 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_p20150527 (27 May 2015)
+
+  27 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ide-9999_p20150527.ebuild:
+  bumped to the latest sources
+
 *netbeans-ide-9999_p20150526 (26 May 2015)
 
   26 May 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 2d353c9..9e92ab8 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -252,6 +252,7 @@ DIST netbeans-trunk-nightly-201505210001-src.zip 207608451 SHA256 9fa52c9803d3f8
 DIST netbeans-trunk-nightly-201505220001-src.zip 207626858 SHA256 e27cf8eadddfd2d5e24b105ca06a914050603c6d23b090d938e1971e6938c36b SHA512 7534fe3130d3dd938e45c667180bb988000b9d2ae3aff444653e9f8686586e90795858c7c7c8ed86f3332254938299f6602643b1be5a360d581f447a58f56a39 WHIRLPOOL 924743463f4c43211348d7dddbb99325fca891d3c1cd762f502e9ffe7b55476aab8f755877bdbcdeca179e4b77c1a019fa70049864e8153ca648d41c5308ae3f
 DIST netbeans-trunk-nightly-201505250001-src.zip 207630778 SHA256 711c94bb4a4d097e850cb3b19f94e26429badd6d2f063ebfee7b2710efbfa751 SHA512 dab391072215ce84673ea5ce3f1938cdd933e23f781737780e80e9f2a94d39e878548e8f4d5834c5e3b14c476659ff8917f37683888cc657dc08e9156c7070b5 WHIRLPOOL d6aab8dcf268510126406635bfea7c2334b7eb9fc9a6aa4b8dc0fa6fe7a1c2c9a04fc630e9dd1cbbaa0e3b4402ae792b7edc853a922a2271ebed6b5a5e7a2ee6
 DIST netbeans-trunk-nightly-201505260001-src.zip 207634232 SHA256 15df00f2440c7d3f409b49614426f87049fdc18fd2966a506bd58a6a50e83f46 SHA512 640a9fed76d660329c73819a41d74a7de86c4d7ff66ffbd8a340bcbf8e5d1fa33c65d6683c295d0f13175bb2e253a93dde9a41f987afdc58dbfdf125bcf3d734 WHIRLPOOL 12920de6710a1e49176284c68955212e97a35404741cc7c94eab2ceac9c8dbb89dfa8ba08db33ccd25e5851aa79e5f1f8c608dfc85ae0ff512f1fcb8c5596e11
+DIST netbeans-trunk-nightly-201505270357-src.zip 207634435 SHA256 894cd7284081fbb41d7295c08015bf7f6c7578023cb3b2c7488413c19a389f9b SHA512 a273255018cfae2335cffc1ccae90cfc42ec700d4051e03418f2b914e4978ae1aaf85f2b699c0b89cd8b19dfb43d9513fe3f6ace9eff569575e896f82e6eb2d8 WHIRLPOOL b5c5d6f9c166d3129864f830fa33b3c3ab5c6b03b4b5f0f96e2b8871c6f8bbceb0789bad8b7d045e717faa30ef29de2d07f5fdf415a2f65ac65ebe31866d6b60
 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
@@ -289,5 +290,6 @@ EBUILD netbeans-ide-9999_p20150521.ebuild 30352 SHA256 23cf38db6e09fac78d7115113
 EBUILD netbeans-ide-9999_p20150522.ebuild 30352 SHA256 8d37b6988aff4ffaf131a04e3601354e7c9a07a73e87101e26b911e99f4856d9 SHA512 147500b71053015bdd4e87ccba5aa96c31ea1926497d5be5cac21ea364e8224de18eca0a2aa48e916ff88dc6a504f0f72a38e08557d1fa6453216186fc2ec017 WHIRLPOOL 0a9e1eda28b130f24b76cdfac627326fb2769f7584fa364ab245836b681a702baaa1e1fc452158296a0b925b5bb08f17438d60c8e6c419bc90d648fa20efd000
 EBUILD netbeans-ide-9999_p20150525.ebuild 30352 SHA256 c208c87fa2889f7b847316f098d02409b9d0ff86dd0ad8c854b2e5053ae1e94e SHA512 3f5977985828b482fc10cc5bae13b548747a549ac8a8a385f08f4ac699e30ee3984f2b6219b6f1f77b3e5a019245374f439169a4aa433408ba95546a43615b12 WHIRLPOOL eee7942531da3cfdf43bb68fb4f29c62f40725cf512a81ced6be411881a86a1d43185a872fc965cf03c06f3eb21a7795cb6a76e71ad620a363dcf5ef5bd7095c
 EBUILD netbeans-ide-9999_p20150526.ebuild 30352 SHA256 2001ad7ad713af39539f0d9c8f39bacd3a5562345a67333ae76fac786afdaa62 SHA512 825a15b04327d27385208bd9b056babd9c5f02e21ebb744e8b2b98826ac0185d6f04dd608cd8dd804ce503bfc78c224c149bd7e82fc42a7c2dcab0453f98d2dc WHIRLPOOL 250a54b417292fa314813f95ecbcca824154f1cc358554a0b231c88ded06ad457ffaf59c8fa650ca8db176cf6a4b1de0417a86c0624e55125c556cef2f0146d7
-MISC ChangeLog 158031 SHA256 037e83b5817fe837906a352de6558397e883fd4263c309c5e270952aee3018c7 SHA512 84361423df2ce7cdcafae71087a98b49dd41173353793cb98de832cc352d238ca5662d2b076d30c7bada0a5b46f1e9373fc6a3a48b0ee910ca5eea1dbc250041 WHIRLPOOL 5c8d57d69761b0af630413f0065f4ef8715ff6e96b18916c5e833fcf6287001aae3805efe0a8ef0ec48d16742b19378415aa846735a9f908f6f8dc9c6284c905
+EBUILD netbeans-ide-9999_p20150527.ebuild 30352 SHA256 c72e65773b670a4e03638f486a972274c7e50ec3c22e4149c16e154f0fa413ad SHA512 f14eee55617a25efa334eff7a7a7196155d9bd8f3620f05c92946c70482eaf9ec5e57cea88392f5b604fe21c7f80dc175dc645d3728fb3b9f212d6018e9fc183 WHIRLPOOL 742a85c38d96f80d8877482945bef1332b0273181e65e274586dd656813634da06a69d103d348b7917acb29e0e2956ece738744635ba8071f9716e336745c97f
+MISC ChangeLog 158198 SHA256 82790cd81c8b4fbb7988d237f2a36c1f42486363822943e93c2ded3ab82b27d9 SHA512 a4f08edc177efda2c5f191f47808d4cb2948d9abcaa64c8e839927472ae540ec8c506442067822814a6e6a9d88d194fb3dfb62a74832d8c30d3ffb6bafaaa3ea WHIRLPOOL 286dedab3d5e278eb4cf7a2f162c847a67ad0c513ef5fb8f5990954ef11e1fad01dab968b00ea323fdb7ed0e831fa591ba3128d4c6ffc0cc1f6d15e54ece276e
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20150527.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20150527.ebuild
new file mode 100644
index 0000000..ff62783
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20150527.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-05-27_03-57-25/zip/netbeans-trunk-nightly-201505270357-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
+	http://hg.netbeans.org/binaries/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar
+	http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
+	http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar
+	http://hg.netbeans.org/binaries/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar
+	http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip
+	http://hg.netbeans.org/binaries/53AFD6CAA1B476204557B0626E7D673FBD5D245C-css3-spec.zip
+	http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip
+	http://hg.netbeans.org/binaries/73F57D396790C8D36678CB25654EA936B91AB5E4-exechlp-1.0.zip
+	http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar
+	http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
+	http://hg.netbeans.org/binaries/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar
+	http://hg.netbeans.org/binaries/4388C34B9F085A42FBEA06C5B00FDF0A251171EC-html5doc.zip
+	http://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar
+	http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar
+	http://hg.netbeans.org/binaries/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar
+	http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar
+	http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip
+	http://hg.netbeans.org/binaries/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar
+	http://hg.netbeans.org/binaries/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar
+	http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip
+	http://hg.netbeans.org/binaries/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar
+	http://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar
+	http://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar
+	http://hg.netbeans.org/binaries/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar
+	http://hg.netbeans.org/binaries/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar
+	http://hg.netbeans.org/binaries/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-js-corestubs.zip
+	http://hg.netbeans.org/binaries/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip
+	http://hg.netbeans.org/binaries/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip
+	http://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar
+	http://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar
+	http://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar
+	http://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar
+	http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
+	http://hg.netbeans.org/binaries/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar
+	http://hg.netbeans.org/binaries/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar
+	http://hg.netbeans.org/binaries/F27BF427BE72709F3094BF76ECA8C5A2B9AC6DA9-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar
+	http://hg.netbeans.org/binaries/9BC512C5BB9A9F5276B9E8672F6B30AD0BD97D88-org.eclipse.core.jobs-3.5.101_nosignature.jar
+	http://hg.netbeans.org/binaries/105DC9A1A93E6EA9A6CD368AD12897B1F247D6AE-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar
+	http://hg.netbeans.org/binaries/E99C3C29A90F8AB29078A38CF8EBC3860249640C-org.eclipse.core.runtime-3.7.0_nosignature.jar
+	http://hg.netbeans.org/binaries/84FC6D443CD0816FA87093B6B7AD6876ADFC4207-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar
+	http://hg.netbeans.org/binaries/74069BFD03B2C66A9EBB4370C0B8064E3F5B6594-org.eclipse.equinox.app-1.3.100_nosignature.jar
+	http://hg.netbeans.org/binaries/A7953EEE9D4D7CD896C7D0AD6D21902E6259979B-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar
+	http://hg.netbeans.org/binaries/3FB169C95F095B70F05B96BE9496DA63FAE7F707-org.eclipse.equinox.preferences-3.4.2_nosignature.jar
+	http://hg.netbeans.org/binaries/CD5919A707EB6B5C1FC29964C8EF5E2CF3F5A3D4-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar
+	http://hg.netbeans.org/binaries/A4634373DC60650C49CC98AEA2090889F7ADC68F-org.eclipse.equinox.security-1.1.1_nosignature.jar
+	http://hg.netbeans.org/binaries/278049664FFA5447191BD5FE96B0B62B0CFD15D1-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar
+	http://hg.netbeans.org/binaries/9039A0C1FA0E56CB56A1A192908814478FA747C5-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar
+	http://hg.netbeans.org/binaries/DAA45A7EE529A7532F5DC08625A5A3E81DB2D4CB-org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar
+	http://hg.netbeans.org/binaries/F5AC8FBA216A8C52F319EC2CB455B44FFD734B38-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar
+	http://hg.netbeans.org/binaries/B43E7CE55F0DECA3BE1A6E695A3E3ABC6D62567F-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar
+	http://hg.netbeans.org/binaries/1B9CBEC0FCB47C279519E52D360199C24EC99B01-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar
+	http://hg.netbeans.org/binaries/6B0A6E9F9179E314944E4ADB831A9D6FCADED3DC-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar
+	http://hg.netbeans.org/binaries/B28B8EE777232102471EA5334FD70E20851845DD-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar
+	http://hg.netbeans.org/binaries/24A15BD37950663933CC4975EE6E518BEB2C28A3-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar
+	http://hg.netbeans.org/binaries/01CD242F06F6F7E4E61C9E05ABBE07318E501D51-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar
+	http://hg.netbeans.org/binaries/75928E4368CA748131A6767BA1A97D9DA643C306-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar
+	http://hg.netbeans.org/binaries/934DCAB9534B8FE12FD9C90759B26B6B0D442837-org.tmatesoft.svnkit_1.8.7.r10376_v20141223_2131.jar
+	http://hg.netbeans.org/binaries/E90EF50215FFD23928B3308DC76A17B7DADE5F33-processtreekiller-1.0.5.jar
+	http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar
+	http://hg.netbeans.org/binaries/D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar
+	http://hg.netbeans.org/binaries/2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar
+	http://hg.netbeans.org/binaries/5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar
+	http://hg.netbeans.org/binaries/24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.jar
+	http://hg.netbeans.org/binaries/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar
+	http://hg.netbeans.org/binaries/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar
+	http://hg.netbeans.org/binaries/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar
+	http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar
+	http://hg.netbeans.org/binaries/CE9A1C96875443F2FDD5127B750DA39CF4CE818B-com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.jar
+	http://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar
+	http://hg.netbeans.org/binaries/6FC6098C230D7CBA5730106D379CBBB42F6EC48A-validator.jar
+	http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar
+	http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar
+	http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar
+	http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-platform-${PV}
+	dev-java/commons-httpclient:3
+	dev-java/commons-lang:2.1
+	dev-java/commons-logging:0
+	dev-java/icu4j:4.4
+	dev-java/iso-relax:0
+	dev-java/jdbc-mysql:0
+	dev-java/jdbc-postgresql:0
+	>=dev-java/jsch-0.1.46:0
+	>=dev-java/json-simple-1.1:0
+	dev-java/jsr173:0
+	dev-java/jzlib:0
+	dev-java/jvyamlb:0
+	dev-java/log4j:0
+	dev-java/lucene:3.5
+	dev-java/rhino:1.6
+	dev-java/saxon:9
+	dev-java/smack:2.2
+	dev-java/sun-jaf:0
+	dev-java/tomcat-servlet-api:2.2
+	dev-java/ws-commons-util:0
+	dev-java/xerces:2"
+#	dev-vcs/subversion>=1.8.4:0[java] missing from the tree
+#	app-text/jing:0 our version is probably too old
+#	dev-java/commons-io:1 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/freemarker:2.3
+#	dev-java/ini4j:0 our version is too old
+#	dev-java/jaxb:2 upstream version contains more stuff so websvccommon does not compile with ours
+#	dev-java/trilead-ssh2:0 in overlay
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	dev-java/commons-codec:0
+	${CDEPEND}
+	dev-java/javacc:0
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ide -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+JAVA_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
+	ln -s "${DISTDIR}"/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar libs.nashorn/external/asm-all-4.0.jar || die
+	ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die
+	ln -s "${DISTDIR}"/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar o.apache.commons.io/external/commons-io-1.4.jar || die
+	ln -s "${DISTDIR}"/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar libs.commons_net/external/commons-net-3.3.jar || die
+	ln -s "${DISTDIR}"/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip css.editor/external/css21-spec.zip || die
+	ln -s "${DISTDIR}"/53AFD6CAA1B476204557B0626E7D673FBD5D245C-css3-spec.zip css.editor/external/css3-spec.zip || die
+	ln -s "${DISTDIR}"/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip derby/external/derbysampledb.zip || die
+	ln -s "${DISTDIR}"/73F57D396790C8D36678CB25654EA936B91AB5E4-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 2a47137..11964cc 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_p20150527 (27 May 2015)
+
+  27 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-java-9999_p20150527.ebuild:
+  bumped to the latest sources
+
 *netbeans-java-9999_p20150526 (26 May 2015)
 
   26 May 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index d5f941a..cf87d10 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -126,6 +126,7 @@ DIST netbeans-trunk-nightly-201505210001-src.zip 207608451 SHA256 9fa52c9803d3f8
 DIST netbeans-trunk-nightly-201505220001-src.zip 207626858 SHA256 e27cf8eadddfd2d5e24b105ca06a914050603c6d23b090d938e1971e6938c36b SHA512 7534fe3130d3dd938e45c667180bb988000b9d2ae3aff444653e9f8686586e90795858c7c7c8ed86f3332254938299f6602643b1be5a360d581f447a58f56a39 WHIRLPOOL 924743463f4c43211348d7dddbb99325fca891d3c1cd762f502e9ffe7b55476aab8f755877bdbcdeca179e4b77c1a019fa70049864e8153ca648d41c5308ae3f
 DIST netbeans-trunk-nightly-201505250001-src.zip 207630778 SHA256 711c94bb4a4d097e850cb3b19f94e26429badd6d2f063ebfee7b2710efbfa751 SHA512 dab391072215ce84673ea5ce3f1938cdd933e23f781737780e80e9f2a94d39e878548e8f4d5834c5e3b14c476659ff8917f37683888cc657dc08e9156c7070b5 WHIRLPOOL d6aab8dcf268510126406635bfea7c2334b7eb9fc9a6aa4b8dc0fa6fe7a1c2c9a04fc630e9dd1cbbaa0e3b4402ae792b7edc853a922a2271ebed6b5a5e7a2ee6
 DIST netbeans-trunk-nightly-201505260001-src.zip 207634232 SHA256 15df00f2440c7d3f409b49614426f87049fdc18fd2966a506bd58a6a50e83f46 SHA512 640a9fed76d660329c73819a41d74a7de86c4d7ff66ffbd8a340bcbf8e5d1fa33c65d6683c295d0f13175bb2e253a93dde9a41f987afdc58dbfdf125bcf3d734 WHIRLPOOL 12920de6710a1e49176284c68955212e97a35404741cc7c94eab2ceac9c8dbb89dfa8ba08db33ccd25e5851aa79e5f1f8c608dfc85ae0ff512f1fcb8c5596e11
+DIST netbeans-trunk-nightly-201505270357-src.zip 207634435 SHA256 894cd7284081fbb41d7295c08015bf7f6c7578023cb3b2c7488413c19a389f9b SHA512 a273255018cfae2335cffc1ccae90cfc42ec700d4051e03418f2b914e4978ae1aaf85f2b699c0b89cd8b19dfb43d9513fe3f6ace9eff569575e896f82e6eb2d8 WHIRLPOOL b5c5d6f9c166d3129864f830fa33b3c3ab5c6b03b4b5f0f96e2b8871c6f8bbceb0789bad8b7d045e717faa30ef29de2d07f5fdf415a2f65ac65ebe31866d6b60
 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
@@ -163,5 +164,6 @@ EBUILD netbeans-java-9999_p20150521.ebuild 14590 SHA256 3bb0290583540d0b6e112ab4
 EBUILD netbeans-java-9999_p20150522.ebuild 14590 SHA256 2e47fc0e23f6a65326f38f3eb0b43bce2b8b05278b4b8e64c3f454a29032b108 SHA512 ebfa39f1c9b43de2d8f4915db58a11731d8e5ea646191ef229e2eba72fa95e5361149bc4ea09642630f78201fb86e0fc23e6baf8c459445e6b13fdb00cd511f0 WHIRLPOOL 44d2edc22cdecb4d72d2b0c4d47c612799afc61fbf1da257e57ef607239213f39ce45d62a680c523d90d66dfd70f826b28d5a7915b218a4036a324e77ba03893
 EBUILD netbeans-java-9999_p20150525.ebuild 14590 SHA256 61efb10200b78e87706844759c3ca8f61b088cd786b41c2eaa070082c9da9fde SHA512 d0386321b234d6782722cae3d22d022def6c4ad835190c81a1953ca7ea5263df7036d86032b216e44344c4450fe8da0f562c9f721c768cb30c0b0234d83737c7 WHIRLPOOL 80ba441314258504e3a9d618d605ce56b878b846665b54c6c1cd781e9262331135067f011d37d688ce381f4bb6bc0e0fe9b2e108106d75f78ff9b6edbb44c4c6
 EBUILD netbeans-java-9999_p20150526.ebuild 14590 SHA256 8936e3ef0f88d7d015c42ef0bbdb25447513e2be106baa20b4b6cbdb21d8451a SHA512 7e88146e0eb7c8293bac8630de6f26302200658c732dd2cc9ea07a7cda2774b6a5628491fc20522010d4f7cd0eda31bad2710b4bed2dae5cdac0c32d84c043cd WHIRLPOOL 4fda5728e53d3f5f2d3b4b7291df9290d8f9466247ef51f71ee228ee8da284290b192a5e4df7bbf63d4fc19f27ab4a628e66318ebac7c0add9468ae342f7413e
-MISC ChangeLog 161225 SHA256 e7d4a39190e2a9b372a5ceb9e9c723f501a98dd528a26f7f84ff6908f7e34136 SHA512 3354142a7fae1c63c9c47358bf0dee6321b860abf169f2e234c4c90cefbf37904642a0e4adfd55b4f238d44625a7c430a8dc4a3a718ed23601f77e7cb89ad0df WHIRLPOOL abc0b03ea5f697db209d95c24aff4e35d89632d76a73a4f9494d72845d453333ed4d79415caa293b5f60120f2b65b7060848f90f0c4c4f4822d839fea112472d
+EBUILD netbeans-java-9999_p20150527.ebuild 14590 SHA256 031554463ef7577123736b9a9d0efa2c05d01e60d6c3655ae75799b5750e2553 SHA512 79d2ff5155c2a974c0501012288b7531abb7604c467fb5094201ed9e2e9c6874223995e7c797a7d534cbea0d4e3fb915ba385018690a130106c43da42bb62c31 WHIRLPOOL 20259ed1e87035c965e67f31bcfa4d85860da6acf5ec9122133c7d09aa1e40d583515f07a965645aed78fb6d0c640555a5470e4fa2394f1a0a9dafd85074fbf5
+MISC ChangeLog 161394 SHA256 f97cb77c0b7117371d21c9bba0c7ea104ec2e7c4c1135cf764fbe6ea8d1ae3e9 SHA512 8062d6516321c60ed49fd62f3d687f3dbee310ca83d6639653e5ab6187cbeb43c80c77f86694384f21ddfb7784870ae3644e69f1ea8955fd079c5735bd98f247 WHIRLPOOL edc9f9138bfc6c13689e5c3d0aa233cb458e5fd9866ea29edca6f3bb505e8bc337ad69e37d6be199bfe2b5f9a675bc9ec13aac10f02646a5163e2168b074ffe9
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-javacard/ChangeLog b/dev-java/netbeans-javacard/ChangeLog
index e05832e..41b8973 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_p20150527 (27 May 2015)
+
+  27 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javacard-9999_p20150527.ebuild:
+  bumped to the latest sources
+
 *netbeans-javacard-9999_p20150526 (26 May 2015)
 
   26 May 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index bb09329..8c0bb55 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -44,6 +44,7 @@ DIST netbeans-trunk-nightly-201505210001-src.zip 207608451 SHA256 9fa52c9803d3f8
 DIST netbeans-trunk-nightly-201505220001-src.zip 207626858 SHA256 e27cf8eadddfd2d5e24b105ca06a914050603c6d23b090d938e1971e6938c36b SHA512 7534fe3130d3dd938e45c667180bb988000b9d2ae3aff444653e9f8686586e90795858c7c7c8ed86f3332254938299f6602643b1be5a360d581f447a58f56a39 WHIRLPOOL 924743463f4c43211348d7dddbb99325fca891d3c1cd762f502e9ffe7b55476aab8f755877bdbcdeca179e4b77c1a019fa70049864e8153ca648d41c5308ae3f
 DIST netbeans-trunk-nightly-201505250001-src.zip 207630778 SHA256 711c94bb4a4d097e850cb3b19f94e26429badd6d2f063ebfee7b2710efbfa751 SHA512 dab391072215ce84673ea5ce3f1938cdd933e23f781737780e80e9f2a94d39e878548e8f4d5834c5e3b14c476659ff8917f37683888cc657dc08e9156c7070b5 WHIRLPOOL d6aab8dcf268510126406635bfea7c2334b7eb9fc9a6aa4b8dc0fa6fe7a1c2c9a04fc630e9dd1cbbaa0e3b4402ae792b7edc853a922a2271ebed6b5a5e7a2ee6
 DIST netbeans-trunk-nightly-201505260001-src.zip 207634232 SHA256 15df00f2440c7d3f409b49614426f87049fdc18fd2966a506bd58a6a50e83f46 SHA512 640a9fed76d660329c73819a41d74a7de86c4d7ff66ffbd8a340bcbf8e5d1fa33c65d6683c295d0f13175bb2e253a93dde9a41f987afdc58dbfdf125bcf3d734 WHIRLPOOL 12920de6710a1e49176284c68955212e97a35404741cc7c94eab2ceac9c8dbb89dfa8ba08db33ccd25e5851aa79e5f1f8c608dfc85ae0ff512f1fcb8c5596e11
+DIST netbeans-trunk-nightly-201505270357-src.zip 207634435 SHA256 894cd7284081fbb41d7295c08015bf7f6c7578023cb3b2c7488413c19a389f9b SHA512 a273255018cfae2335cffc1ccae90cfc42ec700d4051e03418f2b914e4978ae1aaf85f2b699c0b89cd8b19dfb43d9513fe3f6ace9eff569575e896f82e6eb2d8 WHIRLPOOL b5c5d6f9c166d3129864f830fa33b3c3ab5c6b03b4b5f0f96e2b8871c6f8bbceb0789bad8b7d045e717faa30ef29de2d07f5fdf415a2f65ac65ebe31866d6b60
 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
@@ -79,5 +80,6 @@ EBUILD netbeans-javacard-9999_p20150521.ebuild 4982 SHA256 5a6a58510721cf188414e
 EBUILD netbeans-javacard-9999_p20150522.ebuild 4982 SHA256 66b8eaa9049f04bd50db4e0c726fc55ccbec6427bfe0176a468533d13463b80f SHA512 24879d77e771ddac32aea0ec2fa29f76120e760d5440eb4d00df05ecb648ffa39d355d6215c844ba76203e57a565b61f1a26a950edbebb62466ebb4b8794d44f WHIRLPOOL 3bdad2fd42ab4e4458854d89009a626472c50562fff95f9bbee7d31f7bf0fdf1f8316a0798c1c959b6e5cc8bb32a0819f4849f61dc1b80fc13489d1e09688f5c
 EBUILD netbeans-javacard-9999_p20150525.ebuild 4982 SHA256 dc5c7bdb4742ddeefb804347d5a97fba1ca3f3191441b62b1e57a33efeef596f SHA512 d3edbdc35caa23d41da07f316d6c7baf18e089b091360048309208b28ab8c2ec4fd55f8f4b0dd17d3602a07b08410b15cb7363f4ab95bfdf0f4cd7374255ed93 WHIRLPOOL 014ac97edc8359c07dfae0af6254344e854927d8d5569ef66556a5ea3c37560521640f4830f924df812f72dc0b0eaffcb1241b555bac2a05c993b8b6c590f29b
 EBUILD netbeans-javacard-9999_p20150526.ebuild 4982 SHA256 01d71b6163de428cd0bd1513a546c2bfcd2311b369ebbd9bb2ae7bbadc1c7023 SHA512 b675ab68a477ab1f46314228891a2b8c250e07564affb99098fb22bae64681e947a1ecf7da0d9c59051dafd66113404ac702f0ebdbd62bd2bf7793f55200176e WHIRLPOOL 0a69a8fcf7d837c6b6ac9731e3bfbe863ab3d54c76f5dc5c28bfb531f8f9b77a324b78e328099cda10d6ef8fd02fa81eb1263a428476ad06e12b1e1c916be7a1
-MISC ChangeLog 168043 SHA256 b9d8f2fec93759caeb9534b53e19ffb0b9d9a688508cb6630555cac5c4511608 SHA512 8f6a82ad9f93473f3fc8ff8f8eaf3145aa1f71b2df16ca854f298ed6f4460ee99e94018725f1e0d3e2db56203d40dc9d0062313dabac55d1ebcbba9005d849f1 WHIRLPOOL a3bfc23318b7526792cffe28bf341c7a7bc2e2ceedf2d980b19b0d34901ae80adb619515a8a296ebaa1d60cc32638f0c7f24e80c91fa4932654033acbebaeb01
+EBUILD netbeans-javacard-9999_p20150527.ebuild 4982 SHA256 b72e62b4d8edb057f19a9491dce4971a0f37d4eb14d9f58578b4d055282d09aa SHA512 430842ed6aa8a7baf5f93b22fca4e1f11aa686c28fb86d5897f76873050487e565605d7d946acab81eb2b5c645ab87e6d0fc69d18187e35065124f4bea1d5538 WHIRLPOOL cd8b3bd8c8408d7084cfdc7758f007f64124f53d1ffe3adc3b72a34489d498c2174fb8deeb73e5ea03165fa29429dfc6c3496b06d9eacedd6f986ffcead34549
+MISC ChangeLog 168220 SHA256 f54b21426b5a50fa709b4fdb34abdb2be41cd9064e66a59187b582d4b2bcf0f7 SHA512 4710af6ca90f366bd974dad65b810087ed1d6be7eeca5c116aae6a2c714df53fb6054c43c1dd893dc10fbe7510d0f63a6ed62167a4183dca83294dc3646737f6 WHIRLPOOL 7666e0c929a9855509e95df3ddd4b9adc23ce723216047fc34012155c8e32a773b2001889f52a4289d23d59ce1aeda51a7317c77962bb5c7383cfbbaa5502502
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150527.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150527.ebuild
new file mode 100644
index 0000000..78f316c
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150527.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-05-27_03-57-25/zip/netbeans-trunk-nightly-201505270357-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 812cbc0..b03710a 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_p20150527 (27 May 2015)
+
+  27 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javadoc-9999_p20150527.ebuild:
+  bumped to the latest sources
+
 *netbeans-javadoc-9999_p20150526 (26 May 2015)
 
   26 May 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index b71b1ff..8256b22 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -47,6 +47,7 @@ DIST netbeans-trunk-nightly-201505210001-src.zip 207608451 SHA256 9fa52c9803d3f8
 DIST netbeans-trunk-nightly-201505220001-src.zip 207626858 SHA256 e27cf8eadddfd2d5e24b105ca06a914050603c6d23b090d938e1971e6938c36b SHA512 7534fe3130d3dd938e45c667180bb988000b9d2ae3aff444653e9f8686586e90795858c7c7c8ed86f3332254938299f6602643b1be5a360d581f447a58f56a39 WHIRLPOOL 924743463f4c43211348d7dddbb99325fca891d3c1cd762f502e9ffe7b55476aab8f755877bdbcdeca179e4b77c1a019fa70049864e8153ca648d41c5308ae3f
 DIST netbeans-trunk-nightly-201505250001-src.zip 207630778 SHA256 711c94bb4a4d097e850cb3b19f94e26429badd6d2f063ebfee7b2710efbfa751 SHA512 dab391072215ce84673ea5ce3f1938cdd933e23f781737780e80e9f2a94d39e878548e8f4d5834c5e3b14c476659ff8917f37683888cc657dc08e9156c7070b5 WHIRLPOOL d6aab8dcf268510126406635bfea7c2334b7eb9fc9a6aa4b8dc0fa6fe7a1c2c9a04fc630e9dd1cbbaa0e3b4402ae792b7edc853a922a2271ebed6b5a5e7a2ee6
 DIST netbeans-trunk-nightly-201505260001-src.zip 207634232 SHA256 15df00f2440c7d3f409b49614426f87049fdc18fd2966a506bd58a6a50e83f46 SHA512 640a9fed76d660329c73819a41d74a7de86c4d7ff66ffbd8a340bcbf8e5d1fa33c65d6683c295d0f13175bb2e253a93dde9a41f987afdc58dbfdf125bcf3d734 WHIRLPOOL 12920de6710a1e49176284c68955212e97a35404741cc7c94eab2ceac9c8dbb89dfa8ba08db33ccd25e5851aa79e5f1f8c608dfc85ae0ff512f1fcb8c5596e11
+DIST netbeans-trunk-nightly-201505270357-src.zip 207634435 SHA256 894cd7284081fbb41d7295c08015bf7f6c7578023cb3b2c7488413c19a389f9b SHA512 a273255018cfae2335cffc1ccae90cfc42ec700d4051e03418f2b914e4978ae1aaf85f2b699c0b89cd8b19dfb43d9513fe3f6ace9eff569575e896f82e6eb2d8 WHIRLPOOL b5c5d6f9c166d3129864f830fa33b3c3ab5c6b03b4b5f0f96e2b8871c6f8bbceb0789bad8b7d045e717faa30ef29de2d07f5fdf415a2f65ac65ebe31866d6b60
 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
@@ -82,5 +83,6 @@ EBUILD netbeans-javadoc-9999_p20150521.ebuild 6234 SHA256 546dd87ee4eea7f0725053
 EBUILD netbeans-javadoc-9999_p20150522.ebuild 6234 SHA256 bd63b5996996895512206e272916c7c3c3e00ef7bdc165d9117d963cf7d8c582 SHA512 9710e4b79b493add37e53835b2934afb71c115a18e49bf9b34dd171c92356cc842b1180cc468b44e015df7ebd762bb264150caeb8ad4615b4edc866023801a25 WHIRLPOOL b02cd924989ee17ad5320585b2790b253d3a8f5e4a819909b8833e8a10522efe1d8fbb71d6fe497aa315dfbe59d4ccb8a3d493a112ba50e242dcc85efbc019dc
 EBUILD netbeans-javadoc-9999_p20150525.ebuild 6234 SHA256 bd5fce5a595db42307b7e8362fd03954b2803ec00dcd58dfcab64881726bad09 SHA512 0cc6c8b8950c2aa7b4fc93311321ad1c9be4f6c8de827a50f9e4e6e7e82910f295761ba1616128eedb7c640fb24ff6eca1405ca7ebcc44866bb8a891d6bb66bd WHIRLPOOL 063fee8033242c5ffcac91c7f4af18c809889feff9520677fa502d8fe6ca0ecb20cd523b479729732e8a50798bb644a8a77d5f8c978879e9039eaba6f2f71d70
 EBUILD netbeans-javadoc-9999_p20150526.ebuild 6234 SHA256 0b5b71284ea5ab2f48c38e631711f365c1d696de0d2398e6daadc87af19c9908 SHA512 7ec6f4e892732d18f792b066f3382139e29d794f11b665d8064aa83328349095e58cb8dd60099575e18fd38b77482c547d949a3fc11f35b4cac7602a5f109b1c WHIRLPOOL 40105ab821d0a4de0d77e03f195390da05d2b4b972b5624d2a824880210f444fa6bef66ce65915ad38b32ee113745e55de4bc1f39a2fd28bb05d2079cfb26a01
-MISC ChangeLog 165777 SHA256 3b88af6f7fcb52a13ba90356e20db1aac126a950f8f452ce92e5f4cc55da4cf4 SHA512 75ae25c5b50b511e35ed9d99efcb29da9b019954a815fe4a3c00d3afc96ef4ad9aee428cebae0cabd925fd6f9526d9289d2ea411ad0214872bbf4fbeec7e7181 WHIRLPOOL 37f04a7058eed77fe50a61a578f91bd618ca227d6649b3b7e66ab36326a856bf307872c1c2ccbca58cbb14606aa3687935cc71b10b26d28e03650f6537a99a81
+EBUILD netbeans-javadoc-9999_p20150527.ebuild 6234 SHA256 1d28b5e50aea158b8fcf19f55d10167d2c45bb59c6d2ce197bc83b1d80318061 SHA512 5fd4743e9701d0445c609faea9ce1f2a13f01c344c6838f9111217d6e1b919dc864146ddd01863f34960ec2442de150d3dc4299f41d6165a354902d30ed6f0d9 WHIRLPOOL 8d1cd126820aaf3a974f869fac048e3e0faf7b3c86b338496651de5be4a8577a26c5dae9f04de0069920172f2e432eb7335e0585c0bd44a9b9fcde464d1926ee
+MISC ChangeLog 165952 SHA256 27a4a0021545066b5a9ed94bbac7665736f7adefa37bcf7212a8760f9c348c5b SHA512 4066661bfbf4ccb41538e973d6ea7a252b2e8e8de25f5f309095821f203c67a3779fbb7b2b452f772a6e7fc1ba2e0ec526cc0ebecb7f73ac7c12647cf27cb8ed WHIRLPOOL a32e135492d19473f472b99920df281fcbe1b6ba7bc802233850499147b368afeac9729a46ae1020585f087477ae0b1621a1db13345917c9df661f393c035458
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150527.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150527.ebuild
new file mode 100644
index 0000000..227f4ff
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150527.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-05-27_03-57-25/zip/netbeans-trunk-nightly-201505270357-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 d63ed2c..183c71e 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_p20150527 (27 May 2015)
+
+  27 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javafx-9999_p20150527.ebuild:
+  bumped to the latest sources
+
 *netbeans-javafx-9999_p20150526 (26 May 2015)
 
   26 May 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index 1acb294..67eb2f4 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -47,6 +47,7 @@ DIST netbeans-trunk-nightly-201505210001-src.zip 207608451 SHA256 9fa52c9803d3f8
 DIST netbeans-trunk-nightly-201505220001-src.zip 207626858 SHA256 e27cf8eadddfd2d5e24b105ca06a914050603c6d23b090d938e1971e6938c36b SHA512 7534fe3130d3dd938e45c667180bb988000b9d2ae3aff444653e9f8686586e90795858c7c7c8ed86f3332254938299f6602643b1be5a360d581f447a58f56a39 WHIRLPOOL 924743463f4c43211348d7dddbb99325fca891d3c1cd762f502e9ffe7b55476aab8f755877bdbcdeca179e4b77c1a019fa70049864e8153ca648d41c5308ae3f
 DIST netbeans-trunk-nightly-201505250001-src.zip 207630778 SHA256 711c94bb4a4d097e850cb3b19f94e26429badd6d2f063ebfee7b2710efbfa751 SHA512 dab391072215ce84673ea5ce3f1938cdd933e23f781737780e80e9f2a94d39e878548e8f4d5834c5e3b14c476659ff8917f37683888cc657dc08e9156c7070b5 WHIRLPOOL d6aab8dcf268510126406635bfea7c2334b7eb9fc9a6aa4b8dc0fa6fe7a1c2c9a04fc630e9dd1cbbaa0e3b4402ae792b7edc853a922a2271ebed6b5a5e7a2ee6
 DIST netbeans-trunk-nightly-201505260001-src.zip 207634232 SHA256 15df00f2440c7d3f409b49614426f87049fdc18fd2966a506bd58a6a50e83f46 SHA512 640a9fed76d660329c73819a41d74a7de86c4d7ff66ffbd8a340bcbf8e5d1fa33c65d6683c295d0f13175bb2e253a93dde9a41f987afdc58dbfdf125bcf3d734 WHIRLPOOL 12920de6710a1e49176284c68955212e97a35404741cc7c94eab2ceac9c8dbb89dfa8ba08db33ccd25e5851aa79e5f1f8c608dfc85ae0ff512f1fcb8c5596e11
+DIST netbeans-trunk-nightly-201505270357-src.zip 207634435 SHA256 894cd7284081fbb41d7295c08015bf7f6c7578023cb3b2c7488413c19a389f9b SHA512 a273255018cfae2335cffc1ccae90cfc42ec700d4051e03418f2b914e4978ae1aaf85f2b699c0b89cd8b19dfb43d9513fe3f6ace9eff569575e896f82e6eb2d8 WHIRLPOOL b5c5d6f9c166d3129864f830fa33b3c3ab5c6b03b4b5f0f96e2b8871c6f8bbceb0789bad8b7d045e717faa30ef29de2d07f5fdf415a2f65ac65ebe31866d6b60
 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
@@ -81,5 +82,6 @@ EBUILD netbeans-javafx-9999_p20150521.ebuild 4723 SHA256 29e8027c8388b27e97257db
 EBUILD netbeans-javafx-9999_p20150522.ebuild 4723 SHA256 b2020504afd9659c85ae5823633eb9c99af573570438a8dc2211fa9c5cf47acf SHA512 073cf7466d356b8ca43d4dcb5be8f9218e594d9806183e0c47caad4a8fc9aba3753af1f5ae25de78a00df7c2a8fe279638b8395ed7c747be23bafdf3dbf881d9 WHIRLPOOL 9883a17726abd4cfa4c15ff168fb2a2732587e3cf56b1703f014989ea371bcddf805646af7bfe5ca69098472907d83531873865ed6000afc031404594b232ff0
 EBUILD netbeans-javafx-9999_p20150525.ebuild 4723 SHA256 e8867e2e16f793f71b7c9038ad39b28592f983d821b18b443429517b1121e128 SHA512 0156cfa0bad7b3c1ab25f42fdc39f30f82a43891ec77ed71a0b09604b8b0ca2f9abed755426452160613b3abc9c9c857f1e559be2c84ee3219b683bdbb12e4df WHIRLPOOL 47503ce191bb6d68d17c3289103ec4a55c6ead54282f9ca2f44af72c8ce60df0a153bfb636a3b6e31486c0d47c7a64567c848fac67b19e8fc6e552edbf29752e
 EBUILD netbeans-javafx-9999_p20150526.ebuild 4723 SHA256 5fd5e50e0f1f7b9e0bc2743c1494d96f86f667f92de8ca6dc9dde813ffd8ea8c SHA512 e1cdc9815a234a96948696668604ae136b7c9f992e8518f297446823d7dedaaf624f7c1f2885321dd9ba42616f817013e36950df67e91e3ff4966e9638091e44 WHIRLPOOL 4d119812b52eb025683cd78acda89cd2716deccbe657547d4f3f64501aae457fca716bbaae768a561e0af991f7315b5b60644ffcc26a49bb4fb86181bd1479df
-MISC ChangeLog 150378 SHA256 73fe245f79950c2522cc7f64fcb9dae9cde608af0578ce28aea742195c056595 SHA512 d758dc537563f1365d789a1decc1775f8ea9594193d2935d63d596139ab2b9871c9bb74ccdab8435b4824992bb3f3bd04eaaf26f3b76b63ad230433e85599623 WHIRLPOOL fcc030f12c07f944eb6823a1235b5cad6c18432cd454a7b3ee57114c111147de4b9e130e09dbc25298601059125eee371c18b05625c369a33e0de6cf2e55f4ba
+EBUILD netbeans-javafx-9999_p20150527.ebuild 4723 SHA256 b9bbdb6ad3d9fa95849acbf2fdbf92bfedfb1048cb5445697b1686e07a9071a3 SHA512 dc104b962cce46e9eb7c03ca0e0eef3c86bccd061368b9420ebbac176f1d197be1f04fd6f58a99c05182e48e65856e79aea320c0111e9589d97ebc08771fedf8 WHIRLPOOL d634cab1593930a9d1c4a0bed905b8a103438004ceda2bd8799ce621b05b5bd037b73e6ca78d44e6cbeaca0cf9264f7bd9be4cf7884ac59d07304c1724bee4ee
+MISC ChangeLog 150551 SHA256 fba53365ec4c60f317d66ac3f5c860ada98ba8aac4dd1ad5c7652fc12d77664c SHA512 a519e491a9e03baa401d6fa75d7077a20512979f12f5ee4314b76de84f02e926542dc1ce681eb06d7f44e7d56d5d4cf67a909abf36b138ddcb4a72fabac8ace6 WHIRLPOOL 2196c189bade7cfe577e92abee83762584eec0c68a69b684a283e3994d75a1a98220215f81a92c905ba8a7a5e39bf1a0af4881cfbf2eda7d05b6d31c59ce2fa4
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150527.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150527.ebuild
new file mode 100644
index 0000000..1b8718f
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20150527.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-05-27_03-57-25/zip/netbeans-trunk-nightly-201505270357-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 f6c8b80..99d5b1b 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_p20150527 (27 May 2015)
+
+  27 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-mobility-9999_p20150527.ebuild:
+  bumped to the latest sources
+
 *netbeans-mobility-9999_p20150526 (26 May 2015)
 
   26 May 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 6a3dfb4..ec8e931 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -50,6 +50,7 @@ DIST netbeans-trunk-nightly-201505210001-src.zip 207608451 SHA256 9fa52c9803d3f8
 DIST netbeans-trunk-nightly-201505220001-src.zip 207626858 SHA256 e27cf8eadddfd2d5e24b105ca06a914050603c6d23b090d938e1971e6938c36b SHA512 7534fe3130d3dd938e45c667180bb988000b9d2ae3aff444653e9f8686586e90795858c7c7c8ed86f3332254938299f6602643b1be5a360d581f447a58f56a39 WHIRLPOOL 924743463f4c43211348d7dddbb99325fca891d3c1cd762f502e9ffe7b55476aab8f755877bdbcdeca179e4b77c1a019fa70049864e8153ca648d41c5308ae3f
 DIST netbeans-trunk-nightly-201505250001-src.zip 207630778 SHA256 711c94bb4a4d097e850cb3b19f94e26429badd6d2f063ebfee7b2710efbfa751 SHA512 dab391072215ce84673ea5ce3f1938cdd933e23f781737780e80e9f2a94d39e878548e8f4d5834c5e3b14c476659ff8917f37683888cc657dc08e9156c7070b5 WHIRLPOOL d6aab8dcf268510126406635bfea7c2334b7eb9fc9a6aa4b8dc0fa6fe7a1c2c9a04fc630e9dd1cbbaa0e3b4402ae792b7edc853a922a2271ebed6b5a5e7a2ee6
 DIST netbeans-trunk-nightly-201505260001-src.zip 207634232 SHA256 15df00f2440c7d3f409b49614426f87049fdc18fd2966a506bd58a6a50e83f46 SHA512 640a9fed76d660329c73819a41d74a7de86c4d7ff66ffbd8a340bcbf8e5d1fa33c65d6683c295d0f13175bb2e253a93dde9a41f987afdc58dbfdf125bcf3d734 WHIRLPOOL 12920de6710a1e49176284c68955212e97a35404741cc7c94eab2ceac9c8dbb89dfa8ba08db33ccd25e5851aa79e5f1f8c608dfc85ae0ff512f1fcb8c5596e11
+DIST netbeans-trunk-nightly-201505270357-src.zip 207634435 SHA256 894cd7284081fbb41d7295c08015bf7f6c7578023cb3b2c7488413c19a389f9b SHA512 a273255018cfae2335cffc1ccae90cfc42ec700d4051e03418f2b914e4978ae1aaf85f2b699c0b89cd8b19dfb43d9513fe3f6ace9eff569575e896f82e6eb2d8 WHIRLPOOL b5c5d6f9c166d3129864f830fa33b3c3ab5c6b03b4b5f0f96e2b8871c6f8bbceb0789bad8b7d045e717faa30ef29de2d07f5fdf415a2f65ac65ebe31866d6b60
 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
@@ -85,5 +86,6 @@ EBUILD netbeans-mobility-9999_p20150521.ebuild 4418 SHA256 ecf379ec6ad0685bc2494
 EBUILD netbeans-mobility-9999_p20150522.ebuild 4418 SHA256 dc7977e1bd651bfe0627ad12c814a3a6692f0cad65fe36130dc39a92905f13ba SHA512 0b9fe8aa9e8e26d631e486eae679834b31b6b7ea8f2dd5eb210d19e1e017d0f0f99b38722f9e7cf177a82d4e05319faadbed5ea8fbe4db902acfa7ed15b3e663 WHIRLPOOL 3dd9996673f1e77c8f6edd6378c5ddfd1ceb5a9d0d34faab7a37bad12fec8fb83ee7d127caa2f42a34fe1f773e9876b0e4bdc029706ceea0b6cca9fa9f935529
 EBUILD netbeans-mobility-9999_p20150525.ebuild 4418 SHA256 b08b94c48ec874c229ff2396d73a4be9113b152921080b8aac53ab899b9920c3 SHA512 533e69ce4530d0ca0457e1f1e698e3db3329ee8c49f52b071a410a3265b2b44e9159c1cbe87c4e2c975f20bdd7d3c0297be583e8e3092590e4514d878f7dd226 WHIRLPOOL ec88ea51dc5791b9e41aff4f3a5a10b0099dc49a1f24f9ebc6b144ae5e03eddf5d60e8f30013c4bea9d21752ae7422246483e4c2cffb21e19149ae4f6bc37631
 EBUILD netbeans-mobility-9999_p20150526.ebuild 4418 SHA256 4ef87b8a8eb1efe14a318dba1efb798732a842b0a970961dd54ce8c925890f5d SHA512 9f2992c3c93d8adc0df8547bab22c1e1f360562396fa1634f523d02c26bc626f25d6cd9ff8c1eb4595c47bb2cd186f95ea89f00908f87da73a4ed7f4762ace56 WHIRLPOOL b1a37da9daaaf496eedf4a4c296a1f49b654354c768ad17f3ef15f8527be19ca41adce70dbec161f573e4eac5000e9cd0ed75ceb0af243d2f10ec2a24a8dc0b4
-MISC ChangeLog 168184 SHA256 0031a74a13b032f8058717418ea324436efe188cc1be76ff4f11a4acc122270b SHA512 4f6e8d1412ecc5e9f2e6df16d4b921e1260b8ffb861e94807c1ee4be51485fa190fbaa6f5ff2fd3c5dc2e5fed70fe37583c7fd38bf46167a48e025275feec2c0 WHIRLPOOL 2874f7662cc4d8634250c2fc3a30919a8f90f8e5fe739de51c0de20cd356db90d8a605d21b347e42a64f4041ee5f923127b5b248ae280fe471babbc0892e0f1e
+EBUILD netbeans-mobility-9999_p20150527.ebuild 4418 SHA256 4e26c1af556951b0931ddc1773f6e53c7858b7db3203fafce73ebf568f481244 SHA512 5914caf94d35b6ad05621b00b52054b50406c985952a0c8eb1b5ee5a82b22f4644e0e5323ffaef90bb8df7d196409633aa1293bfa6a7893890d7e2bb1d13eb98 WHIRLPOOL 1223734174fcebfd49308cf842753a6fc8e3c07c29962dac3c72df4aef21d2bf88afdf3e31c7457aeaab87d123edb764498fad4a12e35a79351ad79a817ced19
+MISC ChangeLog 168361 SHA256 a28f1fd73d3ed08c2ecdc556aed1e41306ad61757c73ea15be687fd11a3ec270 SHA512 607f74865480b6f885b1b173a0e724ef551025efe2cfc35f06ef5fe305ac7eec20323e569d511cd3b10faa003544c81d096509d9235c4c31fc0c7d4e02629b79 WHIRLPOOL 21bee982e567761468ddc48d2bf285a233df7ab5c5a361c6dc35cdc390b44149932a7948f2bd6c72cb84f87b007ce7cfe2decb6554a8abea1c034eed0dad5118
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150527.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150527.ebuild
new file mode 100644
index 0000000..658fe68
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150527.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-05-27_03-57-25/zip/netbeans-trunk-nightly-201505270357-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 ac14190..d3e27a1 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_p20150527 (27 May 2015)
+
+  27 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-nb-9999_p20150527.ebuild:
+  bumped to the latest sources
+
 *netbeans-nb-9999_p20150526 (26 May 2015)
 
   26 May 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index dfe4ffe..445bdbc 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -49,6 +49,7 @@ DIST netbeans-trunk-nightly-201505210001-src.zip 207608451 SHA256 9fa52c9803d3f8
 DIST netbeans-trunk-nightly-201505220001-src.zip 207626858 SHA256 e27cf8eadddfd2d5e24b105ca06a914050603c6d23b090d938e1971e6938c36b SHA512 7534fe3130d3dd938e45c667180bb988000b9d2ae3aff444653e9f8686586e90795858c7c7c8ed86f3332254938299f6602643b1be5a360d581f447a58f56a39 WHIRLPOOL 924743463f4c43211348d7dddbb99325fca891d3c1cd762f502e9ffe7b55476aab8f755877bdbcdeca179e4b77c1a019fa70049864e8153ca648d41c5308ae3f
 DIST netbeans-trunk-nightly-201505250001-src.zip 207630778 SHA256 711c94bb4a4d097e850cb3b19f94e26429badd6d2f063ebfee7b2710efbfa751 SHA512 dab391072215ce84673ea5ce3f1938cdd933e23f781737780e80e9f2a94d39e878548e8f4d5834c5e3b14c476659ff8917f37683888cc657dc08e9156c7070b5 WHIRLPOOL d6aab8dcf268510126406635bfea7c2334b7eb9fc9a6aa4b8dc0fa6fe7a1c2c9a04fc630e9dd1cbbaa0e3b4402ae792b7edc853a922a2271ebed6b5a5e7a2ee6
 DIST netbeans-trunk-nightly-201505260001-src.zip 207634232 SHA256 15df00f2440c7d3f409b49614426f87049fdc18fd2966a506bd58a6a50e83f46 SHA512 640a9fed76d660329c73819a41d74a7de86c4d7ff66ffbd8a340bcbf8e5d1fa33c65d6683c295d0f13175bb2e253a93dde9a41f987afdc58dbfdf125bcf3d734 WHIRLPOOL 12920de6710a1e49176284c68955212e97a35404741cc7c94eab2ceac9c8dbb89dfa8ba08db33ccd25e5851aa79e5f1f8c608dfc85ae0ff512f1fcb8c5596e11
+DIST netbeans-trunk-nightly-201505270357-src.zip 207634435 SHA256 894cd7284081fbb41d7295c08015bf7f6c7578023cb3b2c7488413c19a389f9b SHA512 a273255018cfae2335cffc1ccae90cfc42ec700d4051e03418f2b914e4978ae1aaf85f2b699c0b89cd8b19dfb43d9513fe3f6ace9eff569575e896f82e6eb2d8 WHIRLPOOL b5c5d6f9c166d3129864f830fa33b3c3ab5c6b03b4b5f0f96e2b8871c6f8bbceb0789bad8b7d045e717faa30ef29de2d07f5fdf415a2f65ac65ebe31866d6b60
 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
@@ -84,5 +85,6 @@ EBUILD netbeans-nb-9999_p20150521.ebuild 5003 SHA256 ee6c89123308e36b466264efc54
 EBUILD netbeans-nb-9999_p20150522.ebuild 5003 SHA256 caaacf73d014548965973630d7432038a6a0a83a75db05dd252ba0f891b111dd SHA512 bd8ba2afc7fd109e4567180ed7376645f103e8d1e6546ee60742e5e4f1ddc2140d4c84207b7b0ebebf85e338f32c5b244d8569cdbecc326514b628481bc6eeca WHIRLPOOL b222fee2be7d94a8739cf4964abdc693ff3be9fdd0a9b70fb4a6174774c6c6a41c62d2a2d931b3a69c6316e371f5d4130b5e7bb916df08a9436c803c754e47dc
 EBUILD netbeans-nb-9999_p20150525.ebuild 5003 SHA256 887bc523f16fc1878e4bb6f32b0d6038c999034821025cd44f3c02910041e8d8 SHA512 657088929d66c75360b67aa3f78b81bdf9b6110a7ca72a5e21b1dae1639d5ede45863dbe9c6b2cfe7299b880dc52ab726030e5141ff3d94b570f397b1bf897f9 WHIRLPOOL 5c7e427625b88fd915c49f76df75ae8199d66f70cff97ed02655382d3512c95712472aba849921a4a19907a0263b6c054c94fab87b8fbd81f70472458748fb51
 EBUILD netbeans-nb-9999_p20150526.ebuild 5003 SHA256 8193593c6fe34905284cafa542e2fe058bd809b01235bf79f3edd6218cabb565 SHA512 867402b0cc08139667edecfa4a847352de35739f54db801afe7316f0817e2cacc84a82287e7ba6af2b06b241511a2495b23a04baf36cd21931a8707a15e8e1a8 WHIRLPOOL 5186355f074fd3f27f80810bb012c33ef14f14c6364f52108b4ce13bdae9210ed4c33bcc8314ea4e2724bbfffde3e2efc91a351eca0be64b37752481b14d97a5
-MISC ChangeLog 157136 SHA256 1e2e931d3e59c4bca5a08b54efcda113ee44d5de8cc0ff135d0c50e245b9a45f SHA512 1e1b464c8988d9670f0ef130c7f74e527582f4794c91d01ce96cec5b52a7e72b56d97766d5e8c8ab0232137cc82f491e1d512a027c3cc3cbadcbf932331d189e WHIRLPOOL f91303e788e05b0ec607e7fd5fcd096e1cb28cc78bfb3a1fe55033257fc0f16f2aeed5673d2312fae3a0819d324695101174e9cd0b1080704cac89932b747841
+EBUILD netbeans-nb-9999_p20150527.ebuild 5003 SHA256 6c129f9b5cb991211ee1ee1d43e8d2fc2a590f39e35210df603e5dc24843012b SHA512 90483821e94dde6724f37d7dd8d34b08bd0d63efaa8b8d75db114978647ba95911cd29af8b709aedc78850fa66b26a8ad7c213925cf79d630e1ae2440e52510d WHIRLPOOL d5fb2763fb64d3775afa351d5586df8c0e1574f67ec4231651b2f394dc3a401425e99a8f951945904ae4fe05667430c94ff796b0249fe86fd8c8b47bec988729
+MISC ChangeLog 157301 SHA256 d5186f90449bf25fe838155f994986d4488ca8aa26a7b0731e90090f18bd9885 SHA512 964faa5fb21d965d063cd7504608e7cdd16426841649b919054758280f5a9cad62ef50128871d4fff224e975f220960bfda5cab4ba0d4a64d9eb8a70c808101d WHIRLPOOL 7ce4ab72af69ba0b6b95774289819da13ea731df2c23a4942e6c1593f181f9f759770c62d64c64aa34b023afaa7a0589f2574e3c5edd514d9a0489b492c96cea
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20150527.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20150527.ebuild
new file mode 100644
index 0000000..e2edb15
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20150527.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-05-27_03-57-25/zip/netbeans-trunk-nightly-201505270357-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 7c5ea2a..cdc6b8b 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_p20150527 (27 May 2015)
+
+  27 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-php-9999_p20150527.ebuild:
+  bumped to the latest sources
+
 *netbeans-php-9999_p20150526 (26 May 2015)
 
   26 May 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index 72a9e47..ea22cfe 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -54,6 +54,7 @@ DIST netbeans-trunk-nightly-201505210001-src.zip 207608451 SHA256 9fa52c9803d3f8
 DIST netbeans-trunk-nightly-201505220001-src.zip 207626858 SHA256 e27cf8eadddfd2d5e24b105ca06a914050603c6d23b090d938e1971e6938c36b SHA512 7534fe3130d3dd938e45c667180bb988000b9d2ae3aff444653e9f8686586e90795858c7c7c8ed86f3332254938299f6602643b1be5a360d581f447a58f56a39 WHIRLPOOL 924743463f4c43211348d7dddbb99325fca891d3c1cd762f502e9ffe7b55476aab8f755877bdbcdeca179e4b77c1a019fa70049864e8153ca648d41c5308ae3f
 DIST netbeans-trunk-nightly-201505250001-src.zip 207630778 SHA256 711c94bb4a4d097e850cb3b19f94e26429badd6d2f063ebfee7b2710efbfa751 SHA512 dab391072215ce84673ea5ce3f1938cdd933e23f781737780e80e9f2a94d39e878548e8f4d5834c5e3b14c476659ff8917f37683888cc657dc08e9156c7070b5 WHIRLPOOL d6aab8dcf268510126406635bfea7c2334b7eb9fc9a6aa4b8dc0fa6fe7a1c2c9a04fc630e9dd1cbbaa0e3b4402ae792b7edc853a922a2271ebed6b5a5e7a2ee6
 DIST netbeans-trunk-nightly-201505260001-src.zip 207634232 SHA256 15df00f2440c7d3f409b49614426f87049fdc18fd2966a506bd58a6a50e83f46 SHA512 640a9fed76d660329c73819a41d74a7de86c4d7ff66ffbd8a340bcbf8e5d1fa33c65d6683c295d0f13175bb2e253a93dde9a41f987afdc58dbfdf125bcf3d734 WHIRLPOOL 12920de6710a1e49176284c68955212e97a35404741cc7c94eab2ceac9c8dbb89dfa8ba08db33ccd25e5851aa79e5f1f8c608dfc85ae0ff512f1fcb8c5596e11
+DIST netbeans-trunk-nightly-201505270357-src.zip 207634435 SHA256 894cd7284081fbb41d7295c08015bf7f6c7578023cb3b2c7488413c19a389f9b SHA512 a273255018cfae2335cffc1ccae90cfc42ec700d4051e03418f2b914e4978ae1aaf85f2b699c0b89cd8b19dfb43d9513fe3f6ace9eff569575e896f82e6eb2d8 WHIRLPOOL b5c5d6f9c166d3129864f830fa33b3c3ab5c6b03b4b5f0f96e2b8871c6f8bbceb0789bad8b7d045e717faa30ef29de2d07f5fdf415a2f65ac65ebe31866d6b60
 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
@@ -89,5 +90,6 @@ EBUILD netbeans-php-9999_p20150521.ebuild 4423 SHA256 3c257c39a2c1d2df5f92ecfd3d
 EBUILD netbeans-php-9999_p20150522.ebuild 4423 SHA256 a768d908bafc2ab4e973344c0be73497912010ae49098c9687bffb80121f766d SHA512 e4a6140e4c10665058ef28db37a6dc8317674266d223a14dd1938dd293e07c97aaa9ab061fa468f806bd112251443409a001c501b751bb5a9519c0c2bcf60f72 WHIRLPOOL 33487beff5cc1030ea340efb7771b81a8739f8dedcd2e6a5c8f6279808204103cd9150610e0ad009d38df34a8a8c126fcb5c67e6b49cc25fedfae8fde9b5afa1
 EBUILD netbeans-php-9999_p20150525.ebuild 4423 SHA256 5c9c10bf42979e7bc3023ff3ddcde70e9f4653a34f0c213b52a778b9c73eb5ad SHA512 ff1f693b41b0f17ed8a88568a05c728a5915f0e4bf1130628aa325ec9634a9461416661fde9bee5e655c87a0c100bec527ac5499028ef3fd87a8e76725729f40 WHIRLPOOL 02ad7bdba012b810d36e55851652587f46b7cca301a021b9ead1f609118b82bdb6cde5cf0514d021811fde980bddc16bd5d9cfcc7dd2d779d7decfb86f11c9cf
 EBUILD netbeans-php-9999_p20150526.ebuild 4423 SHA256 d76da63a424b08d8b2677a3bd56c50dd37678b050891d22bd128f7a3d2aeecbe SHA512 0e0ce08f13a453ef4e2b68b722f1ece88b880d0f90751460b335ccc99043cb1b2d8a4d4f515eac21fd38b6e8f64251d556ec1132f44448773db7aa0280cea53a WHIRLPOOL 4ebc040b97876d75514a3b14f24a7969d2ddfa77cec689f9462ca1cf6964f2917190fb539c1793906cadb4f28a08854156592aa613e6e6127e95943d5700e3e6
-MISC ChangeLog 156860 SHA256 ee159b952040bc8443f8d864bba8dd54ed231cf12fa3f4b784421ec28f75a945 SHA512 f3b4475d3a7d6fcda5b752295153e78b5af81f959903589c38e60a9bd60ed623e8d3bdb99d2a3ec91c4557d0d9b885c3917f4d9218127d29993724dda81d49e3 WHIRLPOOL d0fd181a9051bff1acd80513893d83feb77f30b32e97decd852832f5229613533543f6a63aa7605bde38a3f6b32e88ccf443565104ba0979c014d9a3c5cddb26
+EBUILD netbeans-php-9999_p20150527.ebuild 4423 SHA256 2d3d91dc9c1a6ecdd882edbd9715cb764055c91db5da7d0a718fc77d0486c032 SHA512 f45bf54265968808d23aac6743a584b35a77695e102a149f37cab846a6670c0a5e44b81ec685ace1b1e817e5695ea1248790d82db98b7a42d61e1eea54b18d3b WHIRLPOOL cabfba72950d5c3b4c66599e47ed8675be8993be18d5e7968c650bfe61b24a6f75085a476d7821f04d1f9b4843a4d8cf825e73b6588e15c1d15dbdff9be50cdd
+MISC ChangeLog 157027 SHA256 7077f4933192deca2ee3d0782cd8a6a708d8c53e24bb7b5aab4f56e5907163de SHA512 84527ee96715cdf7ceb0ed281f4805a2ef726d07363df3eb23f8465e80d988bc78e5e901b3153f4225597e318ee415e783aa697f74b14d028064584c7ece1766 WHIRLPOOL c02530efaab250bc58de92e1902dc2efaec40be7234fd4c5794bcb3253a8e9d17152cd16b57b546f47ae4f51587a7736bade8254d6288748ab35fc9b81d5c3a5
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20150527.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20150527.ebuild
new file mode 100644
index 0000000..71cdbad
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20150527.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-05-27_03-57-25/zip/netbeans-trunk-nightly-201505270357-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 741a27f..050d88e 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_p20150527 (27 May 2015)
+
+  27 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-platform-9999_p20150527.ebuild:
+  bumped to the latest sources
+
 *netbeans-platform-9999_p20150526 (26 May 2015)
 
   26 May 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index 4d6a5ac..2be7003 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -68,6 +68,7 @@ DIST netbeans-trunk-nightly-201505210001-src.zip 207608451 SHA256 9fa52c9803d3f8
 DIST netbeans-trunk-nightly-201505220001-src.zip 207626858 SHA256 e27cf8eadddfd2d5e24b105ca06a914050603c6d23b090d938e1971e6938c36b SHA512 7534fe3130d3dd938e45c667180bb988000b9d2ae3aff444653e9f8686586e90795858c7c7c8ed86f3332254938299f6602643b1be5a360d581f447a58f56a39 WHIRLPOOL 924743463f4c43211348d7dddbb99325fca891d3c1cd762f502e9ffe7b55476aab8f755877bdbcdeca179e4b77c1a019fa70049864e8153ca648d41c5308ae3f
 DIST netbeans-trunk-nightly-201505250001-src.zip 207630778 SHA256 711c94bb4a4d097e850cb3b19f94e26429badd6d2f063ebfee7b2710efbfa751 SHA512 dab391072215ce84673ea5ce3f1938cdd933e23f781737780e80e9f2a94d39e878548e8f4d5834c5e3b14c476659ff8917f37683888cc657dc08e9156c7070b5 WHIRLPOOL d6aab8dcf268510126406635bfea7c2334b7eb9fc9a6aa4b8dc0fa6fe7a1c2c9a04fc630e9dd1cbbaa0e3b4402ae792b7edc853a922a2271ebed6b5a5e7a2ee6
 DIST netbeans-trunk-nightly-201505260001-src.zip 207634232 SHA256 15df00f2440c7d3f409b49614426f87049fdc18fd2966a506bd58a6a50e83f46 SHA512 640a9fed76d660329c73819a41d74a7de86c4d7ff66ffbd8a340bcbf8e5d1fa33c65d6683c295d0f13175bb2e253a93dde9a41f987afdc58dbfdf125bcf3d734 WHIRLPOOL 12920de6710a1e49176284c68955212e97a35404741cc7c94eab2ceac9c8dbb89dfa8ba08db33ccd25e5851aa79e5f1f8c608dfc85ae0ff512f1fcb8c5596e11
+DIST netbeans-trunk-nightly-201505270357-src.zip 207634435 SHA256 894cd7284081fbb41d7295c08015bf7f6c7578023cb3b2c7488413c19a389f9b SHA512 a273255018cfae2335cffc1ccae90cfc42ec700d4051e03418f2b914e4978ae1aaf85f2b699c0b89cd8b19dfb43d9513fe3f6ace9eff569575e896f82e6eb2d8 WHIRLPOOL b5c5d6f9c166d3129864f830fa33b3c3ab5c6b03b4b5f0f96e2b8871c6f8bbceb0789bad8b7d045e717faa30ef29de2d07f5fdf415a2f65ac65ebe31866d6b60
 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
@@ -103,5 +104,6 @@ EBUILD netbeans-platform-9999_p20150521.ebuild 9652 SHA256 c2209c4f1b253cf061d57
 EBUILD netbeans-platform-9999_p20150522.ebuild 9652 SHA256 ae680e381be85e3641d3f3481833916ac1e33c6c1fb1ca01da654cf6787af512 SHA512 597bac0a3401132c66d9566ae903118ba3b6c5d8a09bf2792ddd73ebe1c2e241b7f2e5eba608ce81f0f2887cff1e17d478802f72fdaec76a56e1ad8c20bbb03f WHIRLPOOL 3380948ef04d187fe76f310360717f23dbe64baf6d4105d9427a913946c92a6ed7e95d0f99f074ad11e190b8920194131a9f05326c19315fdc00bb7cfd53fc9f
 EBUILD netbeans-platform-9999_p20150525.ebuild 9652 SHA256 271e1790f9a2b6e143a29616a2ad964a719f65418b4dcd06e308790727a27416 SHA512 ff99f1cbe548a68795f7cbafa69935a771080ebcf82d374343fd4f0d2ed733d6c1b3338664b74135127f2442c08e5557e0975ee2b671b9524a6189ad410a99ef WHIRLPOOL 415177bb1be9e01feb51020b61b606e27702395497bc8dccbe4b167e5c426fe95b7a736fee8d812a0b71e38a359ee9d5accee6f1cd964e7348b9afe68933195a
 EBUILD netbeans-platform-9999_p20150526.ebuild 9652 SHA256 7a34da20da52ee7793d72c854101a1368eecd5b7fcbca5774962be8eca35d9ad SHA512 b0caa9111159043c10eb820a51254cd634c3792390ef121c081d632030e3064d0b3e4a681f15175c164e6609270838331ba4d9a9e143527f458da3e8af280cfd WHIRLPOOL 0b9c15f9f70bff7206f23ca5f28b54fbb890748896e2cc599022bd73d9fcce01210bda6523fbce9300e1be03086e00fbfc179d0df616c23973e2dc56e50fc02d
-MISC ChangeLog 168780 SHA256 ed2b07425daeaf3e2c1233f276276368d0008905a5486fe2ee1cf5dfc6899b94 SHA512 88d189fd8425ef105eea6ddd4a7e496849d98b93080bb20086b3e5f449fe4fe3184b8bb2ca9325546248851bc35bc0226f41df103e45bf45c2452741f71a199a WHIRLPOOL d3aa104456027c07d35155c9f9a2592535f03e6771582a322d2b181d33660cf78716ae686ae1c4508ad60a8395a0c390f87ad1e2102daf608fdd8fc759c8803c
+EBUILD netbeans-platform-9999_p20150527.ebuild 9652 SHA256 fbfb2254e1347e4c8507e6a7127ba407e1aa5f7da893d9bdd41dd9aa313843cc SHA512 dbdcaf2058d207ad3dd10eafb9d9c1ff77fc2b5c5e62faa0dd422e49cf33fb289a6357a3ca86048f51b604639b16518951875e4a56801b985b55515cc2b5a3fa WHIRLPOOL 95d429dada6ab9c7cb616feda0cfcf75571895d7eca5a358970fa8a5f446c31a2c7a1d2e9f2d2b461e5f4ea0c434270a895827e61e593ab386ca183975b4b470
+MISC ChangeLog 168957 SHA256 64f1b132b2816c9b67c75502e847d53b3d765ac94d858e5e11c6a42655b028e4 SHA512 eb4035a5b67cb9c4078c0b4f0268955d11536a73d519481947809a290356c8d8c36507af28ca816a7059d77f339c96b0811c19e12b6afb00e41f13609b366a3d WHIRLPOOL de74355ea532a9881dd26ef617d9cc0cff2ee9b52d3e9bf5ca7c22af9ff3608558c5d855534f68664468e756fb7f38a6b2234542a35fecf7a3a4537af474fa90
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20150527.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20150527.ebuild
new file mode 100644
index 0000000..4c788fb
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20150527.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Platform"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-05-27_03-57-25/zip/netbeans-trunk-nightly-201505270357-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r14-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar
+	http://hg.netbeans.org/binaries/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar
+	http://hg.netbeans.org/binaries/0027BC49CBF5E88B68CCD58BD1EEB2EA7188D069-junit-3.8.2-api.zip
+	http://hg.netbeans.org/binaries/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar
+	http://hg.netbeans.org/binaries/B250509C67194E89C3A27F96933DB7EB0E027E56-ko4j.jar
+	http://hg.netbeans.org/binaries/E556F74DF0942B304F94D9F82CAA8102FED6356E-net-java-html.jar
+	http://hg.netbeans.org/binaries/C74AC1ED160379872826FDC4A3C0CA924A3A0A83-net-java-html-boot.jar
+	http://hg.netbeans.org/binaries/03FE10857B0689B1F98B8D96DE87E80DF5D87A69-net-java-html-boot-fx.jar
+	http://hg.netbeans.org/binaries/31C9329E78A222E38CB86716ACFCEF81EF0BA1FD-net-java-html-boot-script.jar
+	http://hg.netbeans.org/binaries/24ED356FF3C72665CB5FB972B428824FABBC1987-net-java-html-geo.jar
+	http://hg.netbeans.org/binaries/432EDFB05C0F44E6ADAC4B1F3E08C67D1F52FB4B-net-java-html-json.jar
+	http://hg.netbeans.org/binaries/A7B6C3470DB8821A3587CE04844FF504A7C62354-net-java-html-sound.jar
+	http://hg.netbeans.org/binaries/B27F1304F18FEDE876F940AEFA6C9EB5632619D7-org.eclipse.osgi_3.9.1.v20140110-1610.jar
+	http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip
+	http://hg.netbeans.org/binaries/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="dev-java/hamcrest-core:1.3
+	dev-java/javahelp:0
+	>=dev-java/jna-3.4:0
+	dev-java/junit:0
+	dev-java/junit:4[source]
+	>=dev-java/osgi-core-api-5:0
+	dev-java/osgi-compendium:0
+	dev-java/swing-layout:1[source]
+	dev-java/testng:0"
+# oracle-jdk-bin is needed because other jdks do not contain file jre/lib/ext/jfxrt.jar
+# the error:
+#  [parseprojectxml] Distilling /var/tmp/portage/dev-java/netbeans-platform-9999_p20140922/work/nbbuild/build/public-package-jars/org-netbeans-libs-javafx.jar from [/var/tmp/portage/dev-java/netbeans-platform-9999_p20140922/work/nbbuild/netbeans/platform/modules/org-netbeans-libs-javafx.jar, /opt/icedtea-bin-7.2.4.7/jre/lib/ext/jfxrt.jar]
+#  [parseprojectxml] Classpath entry /opt/icedtea-bin-7.2.4.7/jre/lib/ext/jfxrt.jar does not exist; skipping
+#  [nbmerge] Failed to build target: all-api.html4j
+
+DEPEND="dev-java/oracle-jdk-bin:1.7
+	app-arch/unzip
+	${CDEPEND}"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.platform -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+JAVA_PKG_WANT_BUILD_VM="oracle-jdk-bin-1.7"
+JAVA_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r14-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar libs.asm/external/asm-all-5.0.1.jar || die
+	ln -s "${DISTDIR}"/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar libs.felix/external/felix-4.2.1.jar || die
+	ln -s "${DISTDIR}"/0027BC49CBF5E88B68CCD58BD1EEB2EA7188D069-junit-3.8.2-api.zip junitlib/external/junit-3.8.2-api.zip || die
+	ln -s "${DISTDIR}"/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar junitlib/external/junit-4.12-javadoc.jar || die
+	ln -s "${DISTDIR}"/B250509C67194E89C3A27F96933DB7EB0E027E56-ko4j.jar o.n.html.ko4j/external/ko4j.jar || die
+	ln -s "${DISTDIR}"/E556F74DF0942B304F94D9F82CAA8102FED6356E-net-java-html.jar net.java.html/external/net-java-html.jar || die
+	ln -s "${DISTDIR}"/C74AC1ED160379872826FDC4A3C0CA924A3A0A83-net-java-html-boot.jar net.java.html.boot/external/net-java-html-boot.jar || die
+	ln -s "${DISTDIR}"/03FE10857B0689B1F98B8D96DE87E80DF5D87A69-net-java-html-boot-fx.jar net.java.html.boot.fx/external/net-java-html-boot-fx.jar || die
+	ln -s "${DISTDIR}"/31C9329E78A222E38CB86716ACFCEF81EF0BA1FD-net-java-html-boot-script.jar net.java.html.boot.script/external/net-java-html-boot-script.jar || die
+	ln -s "${DISTDIR}"/24ED356FF3C72665CB5FB972B428824FABBC1987-net-java-html-geo.jar net.java.html.geo/external/net-java-html-geo.jar || die
+	ln -s "${DISTDIR}"/432EDFB05C0F44E6ADAC4B1F3E08C67D1F52FB4B-net-java-html-json.jar net.java.html.json/external/net-java-html-json.jar || die
+	ln -s "${DISTDIR}"/A7B6C3470DB8821A3587CE04844FF504A7C62354-net-java-html-sound.jar net.java.html.sound/external/net-java-html-sound.jar || die
+	ln -s "${DISTDIR}"/B27F1304F18FEDE876F940AEFA6C9EB5632619D7-org.eclipse.osgi_3.9.1.v20140110-1610.jar netbinox/external/org.eclipse.osgi_3.9.1.v20140110-1610.jar || die
+	ln -s "${DISTDIR}"/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip o.jdesktop.layout/external/swing-layout-1.0.4-doc.zip || die
+	ln -s "${DISTDIR}"/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip libs.testng/external/testng-6.8.1-javadoc.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	# upstream jna jar contains bundled binary libraries so we disable that feature
+	epatch netbeans-9999-r14-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --into libs.junit4/external hamcrest-core-1.3 hamcrest-core.jar hamcrest-core-1.3.jar
+	java-pkg_jar-from --into libs.jna.platform/external jna platform.jar jna-platform-4.1.0.jar
+	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.jna/external jna jna.jar jna-4.1.0.jar
+	java-pkg_jar-from --into junitlib/external junit junit.jar junit-3.8.2.jar
+	java-pkg_jar-from --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+	ln -s /usr/share/junit-4/sources/junit-src.zip junitlib/external/junit-4.12-sources.jar || die
+	java-pkg_jar-from --into libs.osgi/external osgi-core-api osgi-core-api.jar osgi.core-5.0.0.jar
+	java-pkg_jar-from --into libs.osgi/external osgi-compendium osgi-compendium.jar osgi.cmpn-4.2.jar
+	java-pkg_jar-from --into o.jdesktop.layout/external swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
+	ln -s /usr/share/swing-layout-1/sources/swing-layout-src.zip o.jdesktop.layout/external/swing-layout-1.0.4-src.zip || die
+	java-pkg_jar-from --into libs.testng/external testng testng.jar testng-6.8.1-dist.jar
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	unset DISPLAY
+	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+	pushd nbbuild/netbeans/platform >/dev/null || die
+
+	java-pkg_dojar lib/*.jar
+	grep -E "/platform$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	insinto ${INSTALL_DIR}
+	doins -r *
+	rm "${D}"/${INSTALL_DIR}/docs/junit-4.12-sources.jar || die
+	dosym /usr/share/junit-4/sources/junit-src.zip ${INSTALL_DIR}/docs/junit-4.12-sources.jar
+	rm "${D}"/${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip || die
+	dosym /usr/share/swing-layout-1/sources/swing-layout-src.zip ${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip
+	find "${D}"/${INSTALL_DIR} -name "*.exe" -delete
+	find "${D}"/${INSTALL_DIR} -name "*.dll" -delete
+	rm -fr "${D}"/modules/lib || die
+
+	popd >/dev/null || die
+
+	fperms 775 ${INSTALL_DIR}/lib/nbexec
+	dosym ${INSTALL_DIR}/lib/nbexec /usr/bin/nbexec-${SLOT}
+
+	local instdir=${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm hamcrest-core-1.3.jar && dosym /usr/share/hamcrest-core-1.3/lib/hamcrest-core.jar ${instdir}/hamcrest-core-1.3.jar || die
+	rm jhall-2.0_05.jar && dosym /usr/share/javahelp/lib/jhall.jar ${instdir}/jhall-2.0_05.jar || die
+	rm jna-4.1.0.jar && dosym /usr/share/jna/lib/jna.jar ${instdir}/jna-4.1.0.jar || die
+	rm jna-platform-4.1.0.jar && dosym /usr/share/jna/lib/platform.jar ${instdir}/jna-platform-4.1.0.jar || die
+	rm junit-3.8.2.jar && dosym /usr/share/junit/lib/junit.jar ${instdir}/junit-3.8.2.jar || die
+	rm junit-4.12.jar && dosym /usr/share/junit-4/lib/junit.jar ${instdir}/junit-4.12.jar || die
+	rm osgi.cmpn-4.2.jar && dosym /usr/share/osgi-compendium/lib/osgi-compendium.jar ${instdir}/osgi.cmpn-4.2.jar || die
+	rm osgi.core-5.0.0.jar && dosym /usr/share/osgi-core-api/lib/osgi-core-api.jar ${instdir}/osgi.core-5.0.0.jar || die
+	rm swing-layout-1.0.4.jar && dosym /usr/share/swing-layout-1/lib/swing-layout.jar ${instdir}/swing-layout-1.0.4.jar || die
+	rm testng-6.8.1-dist.jar && dosym /usr/share/testng/lib/testng.jar ${instdir}/testng-6.8.1-dist.jar || die
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/platform
+}

diff --git a/dev-java/netbeans-profiler/ChangeLog b/dev-java/netbeans-profiler/ChangeLog
index 9ac8a5b..780b863 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_p20150527 (27 May 2015)
+
+  27 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-profiler-9999_p20150527.ebuild:
+  bumped to the latest sources
+
 *netbeans-profiler-9999_p20150526 (26 May 2015)
 
   26 May 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 077a7ea..937a3cd 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -41,6 +41,7 @@ DIST netbeans-trunk-nightly-201505210001-src.zip 207608451 SHA256 9fa52c9803d3f8
 DIST netbeans-trunk-nightly-201505220001-src.zip 207626858 SHA256 e27cf8eadddfd2d5e24b105ca06a914050603c6d23b090d938e1971e6938c36b SHA512 7534fe3130d3dd938e45c667180bb988000b9d2ae3aff444653e9f8686586e90795858c7c7c8ed86f3332254938299f6602643b1be5a360d581f447a58f56a39 WHIRLPOOL 924743463f4c43211348d7dddbb99325fca891d3c1cd762f502e9ffe7b55476aab8f755877bdbcdeca179e4b77c1a019fa70049864e8153ca648d41c5308ae3f
 DIST netbeans-trunk-nightly-201505250001-src.zip 207630778 SHA256 711c94bb4a4d097e850cb3b19f94e26429badd6d2f063ebfee7b2710efbfa751 SHA512 dab391072215ce84673ea5ce3f1938cdd933e23f781737780e80e9f2a94d39e878548e8f4d5834c5e3b14c476659ff8917f37683888cc657dc08e9156c7070b5 WHIRLPOOL d6aab8dcf268510126406635bfea7c2334b7eb9fc9a6aa4b8dc0fa6fe7a1c2c9a04fc630e9dd1cbbaa0e3b4402ae792b7edc853a922a2271ebed6b5a5e7a2ee6
 DIST netbeans-trunk-nightly-201505260001-src.zip 207634232 SHA256 15df00f2440c7d3f409b49614426f87049fdc18fd2966a506bd58a6a50e83f46 SHA512 640a9fed76d660329c73819a41d74a7de86c4d7ff66ffbd8a340bcbf8e5d1fa33c65d6683c295d0f13175bb2e253a93dde9a41f987afdc58dbfdf125bcf3d734 WHIRLPOOL 12920de6710a1e49176284c68955212e97a35404741cc7c94eab2ceac9c8dbb89dfa8ba08db33ccd25e5851aa79e5f1f8c608dfc85ae0ff512f1fcb8c5596e11
+DIST netbeans-trunk-nightly-201505270357-src.zip 207634435 SHA256 894cd7284081fbb41d7295c08015bf7f6c7578023cb3b2c7488413c19a389f9b SHA512 a273255018cfae2335cffc1ccae90cfc42ec700d4051e03418f2b914e4978ae1aaf85f2b699c0b89cd8b19dfb43d9513fe3f6ace9eff569575e896f82e6eb2d8 WHIRLPOOL b5c5d6f9c166d3129864f830fa33b3c3ab5c6b03b4b5f0f96e2b8871c6f8bbceb0789bad8b7d045e717faa30ef29de2d07f5fdf415a2f65ac65ebe31866d6b60
 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
@@ -76,5 +77,6 @@ EBUILD netbeans-profiler-9999_p20150521.ebuild 3478 SHA256 bb492cd22dc68d629eab6
 EBUILD netbeans-profiler-9999_p20150522.ebuild 3478 SHA256 b48d2244d333aa4d20e64f3f68d3837155b81ef7d43772f8f16dbfb2ec2dffb2 SHA512 b10496b95fcbe222987286dd2b20b6b6ca06fbd197f071c66aecc2b5d900807aa055556ecd5e5c7aeb6fa641dafc5f66d4acd0a44a678088845457ff0299b218 WHIRLPOOL 86c0722a0038a1769bd5bc5646a665ab1c31d5baae7f708b1e59ae80043472e278b3c662027095f23191f2561d3791bbb130ef1803b7e6bfd448fcf3a098b9b5
 EBUILD netbeans-profiler-9999_p20150525.ebuild 3478 SHA256 04fb57e8d2927173823f4770428f9d0527f36d4a1f3e7dbdd16fbedbc6be8d85 SHA512 86e7e24d0a728903424139225560fa4a335f7f532845dc47783881735c255cb23ba15ab884ec04e348389e56376366848f55f547bc58607ae1e592429b51a20b WHIRLPOOL 25efccf8b24c950ee7cd86c7ca52cea13c3d846f70f89e226197f7dcf0e8af0ab287934a95649e24b87783359709a9332ddbab32c79776ef1e4aa4f9292dfe98
 EBUILD netbeans-profiler-9999_p20150526.ebuild 3478 SHA256 6a0d7a0bff7da9e920be1e7c7597c53f7a3b4d314d2a8bcb3bcb2a17044bb942 SHA512 19dc8c470e988ac98d2afaea60395ca28834d495ca3f68f6af56cfabbac0662624dda3fdc5c309bf531c981033bcbf83f79c69ce5bf0a6be327a34771ce380e7 WHIRLPOOL aaafd8cd66c44368ac79ad164b3044ea6934c15adb8cba8f9e709dcd5a3925f635adff895902fc74867c9bd4e6a76d15063224d779f3eb52cc0cf96455a2493d
-MISC ChangeLog 168241 SHA256 cf2d57cb3b6b735837bddacb34e1c8d9a9808d0e8fb83066e5bc389381de2e13 SHA512 633a6527959048b16fa3e8da4c4446f4d41bd73a3fb11999f2fda29dc10c3f0d6f157be7b1a5625071d9c885c5ee34badbf357d5210b721d83924b72ce0d7322 WHIRLPOOL c85089ff420e9f22becbce22c7d5189c73e866a341337c805a3d1800aa80ff38fee6ca8dbc2dfc4934361c94b7f2c7d64851472a856ab5de732e30855e91661b
+EBUILD netbeans-profiler-9999_p20150527.ebuild 3478 SHA256 58d72c35b942ed7a20dd4cedfed9474835c362a96c3cf5f652f7824f4f2b53bb SHA512 36f89aa9fd864193bfefcb3fa9ed4d87a53d6791648a3de40d8b331ca3e601c0b55d2eaa913e35e1bea3dbed4c5c6a2a809cf848624828be7cd45e48e7db23cc WHIRLPOOL 4de3e76f205bb0697d8b848f4accb5673354aa0fa68e7231d4da412453ad914f11a90e93e475fe33ae4f6606d8318b71650aa8b485d3d27527152f69618f0fb9
+MISC ChangeLog 168418 SHA256 80edfe49daed6255f18ac26a943a9530f736502b2efafefa4ef27d7a6cb831bd SHA512 4808acc23984f4266dc3efc49da021c6a27ce5965d0511b80735e95ef2b55ce09666ffc0548fc3a15c1c3fdc982d7277b183f263dc1e13e67b1cf75633732727 WHIRLPOOL 780edfb7a6f5199bd0c1b7f445a50d53315f2b016e52b690115929350d194a4a2b86d1eaefea58ff3513e13765750c20667f245d9ba0bbed375177624b35a543
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150527.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150527.ebuild
new file mode 100644
index 0000000..81475f6
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20150527.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-05-27_03-57-25/zip/netbeans-trunk-nightly-201505270357-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 7c9c463..a97c75f 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_p20150527 (27 May 2015)
+
+  27 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-webcommon-9999_p20150527.ebuild:
+  bumped to the latest sources
+
 *netbeans-webcommon-9999_p20150526 (26 May 2015)
 
   26 May 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index 908e773..3105435 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -47,6 +47,7 @@ DIST netbeans-trunk-nightly-201505210001-src.zip 207608451 SHA256 9fa52c9803d3f8
 DIST netbeans-trunk-nightly-201505220001-src.zip 207626858 SHA256 e27cf8eadddfd2d5e24b105ca06a914050603c6d23b090d938e1971e6938c36b SHA512 7534fe3130d3dd938e45c667180bb988000b9d2ae3aff444653e9f8686586e90795858c7c7c8ed86f3332254938299f6602643b1be5a360d581f447a58f56a39 WHIRLPOOL 924743463f4c43211348d7dddbb99325fca891d3c1cd762f502e9ffe7b55476aab8f755877bdbcdeca179e4b77c1a019fa70049864e8153ca648d41c5308ae3f
 DIST netbeans-trunk-nightly-201505250001-src.zip 207630778 SHA256 711c94bb4a4d097e850cb3b19f94e26429badd6d2f063ebfee7b2710efbfa751 SHA512 dab391072215ce84673ea5ce3f1938cdd933e23f781737780e80e9f2a94d39e878548e8f4d5834c5e3b14c476659ff8917f37683888cc657dc08e9156c7070b5 WHIRLPOOL d6aab8dcf268510126406635bfea7c2334b7eb9fc9a6aa4b8dc0fa6fe7a1c2c9a04fc630e9dd1cbbaa0e3b4402ae792b7edc853a922a2271ebed6b5a5e7a2ee6
 DIST netbeans-trunk-nightly-201505260001-src.zip 207634232 SHA256 15df00f2440c7d3f409b49614426f87049fdc18fd2966a506bd58a6a50e83f46 SHA512 640a9fed76d660329c73819a41d74a7de86c4d7ff66ffbd8a340bcbf8e5d1fa33c65d6683c295d0f13175bb2e253a93dde9a41f987afdc58dbfdf125bcf3d734 WHIRLPOOL 12920de6710a1e49176284c68955212e97a35404741cc7c94eab2ceac9c8dbb89dfa8ba08db33ccd25e5851aa79e5f1f8c608dfc85ae0ff512f1fcb8c5596e11
+DIST netbeans-trunk-nightly-201505270357-src.zip 207634435 SHA256 894cd7284081fbb41d7295c08015bf7f6c7578023cb3b2c7488413c19a389f9b SHA512 a273255018cfae2335cffc1ccae90cfc42ec700d4051e03418f2b914e4978ae1aaf85f2b699c0b89cd8b19dfb43d9513fe3f6ace9eff569575e896f82e6eb2d8 WHIRLPOOL b5c5d6f9c166d3129864f830fa33b3c3ab5c6b03b4b5f0f96e2b8871c6f8bbceb0789bad8b7d045e717faa30ef29de2d07f5fdf415a2f65ac65ebe31866d6b60
 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
@@ -80,5 +81,6 @@ EBUILD netbeans-webcommon-9999_p20150521.ebuild 4997 SHA256 67f301f2313770bc9213
 EBUILD netbeans-webcommon-9999_p20150522.ebuild 4997 SHA256 9ec3e1a38e4b338d5b4b9aa553c4830a6e7f9ae12ded52058685c0458388da8f SHA512 eb33bf960724ae21ebce7a7a8e4e2c460aa333b87facaa76cfd1858d95aaac3673610a8b2f1ee77c1fa22a18d5787be94be9ec7c46f7295872af95fd3ae72ebe WHIRLPOOL 3a8a1a7c20912ea70a58b45d18a174607a64ddd45f03b81d47bf73e05938bdecb7e6d75203434745918fe284c5c6faf52c4539cabadb44abf522c285f02d5699
 EBUILD netbeans-webcommon-9999_p20150525.ebuild 4997 SHA256 4c23ba5b60fdd43e7051bbe872bdbfa41b0e8c10a12f2ac717df4573fc803954 SHA512 1eca5d459c7d9ca1541deb33a77007f1c029aa0232c5c722e3a229f69c3d123258d3d26be81b4674a8576000807ef05ac9c375d2efedd6845655a3a77303fe0c WHIRLPOOL da20536f489ae49095480b9093851569a1a84e1e565b5e2d8271021c63cbfb3d37ead6d2b3d9d6698d19e25d8fe82d1ba80ff7f50d753e9a4ab6188d96935c0a
 EBUILD netbeans-webcommon-9999_p20150526.ebuild 4997 SHA256 1afc82db4dadb5c61e0fbe2b83f191bbef6534c5aaf4247832f38ba1e4edacad SHA512 89caa35ce1dda2a40ee4b1c4a79310a9316be8cdada516e73d6da6e08a6799266b54e6bf7f51ebbc6c45379e781c0d2eb5ef7696bf767fac07b7550f5efe5e73 WHIRLPOOL 8da6b9de56a01c33119265d3dfab8386da85be255916a171fdc5ba4ae10f3b469b12052c1265845dfb21a3e40be20cfc1370dc6a33d5087fb487ede8c62c0f3e
-MISC ChangeLog 141320 SHA256 db1eaeb6f1ffc4505c2f584105f328c5d2747a216b1dc2b74cedbdb95bd9db51 SHA512 f96682143a2faf0bf1f1c6024149a31ca7f226eb3624533cbde201702e0d2426558e7141e3809c2ec0dbbff2a6c542e4db0fc67b9432e029d71c56388bf256b5 WHIRLPOOL bfca802b7808ec49c6353ccbda342094693adbe74b2493718371b02b483d9437565a01e3274ae5239473840800bf4524f3f706f607aaa9ea9b313184318daf5e
+EBUILD netbeans-webcommon-9999_p20150527.ebuild 4997 SHA256 1650c4a13f34f26f4aca4c7daa8aa0f6b896ba95d4861ac1a6130e8cc794e442 SHA512 f695b89914acf620c677579f4000f8fb12e60598e211bcc4424e12719325e67486ca6ebd2b7ddd88c757c9cdaad10445395c8ea08e7cf99ae4fb04dcef560338 WHIRLPOOL a2187326f0d114f4c8407e75c452a7fd15d130c9c4085f33c805b8ee4d13083bff830f324572081893976a494b2f78fd7340ee70da66b585fbabdb3860ec3065
+MISC ChangeLog 141499 SHA256 5874f90c7ce1f84a078588deee24002270f3584cde80cf18779a8ded4cacc150 SHA512 1240cd9d4ea6be539eed09344ae7ff660ad91fb3d597dc3f1397e5f8a1b317534318662ede33f938ca32b1180f12e0fadb9d5f025801835d5440b0db98084541 WHIRLPOOL 8ebf9d38534ffadf7bb4886a4af3ac2d1dbb633e307f20e50801b52b6345d46a42c23832a47476a7dbb8be94fb5abbfa574f772289b2be6193d1cc03faa3d80b
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150527.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150527.ebuild
new file mode 100644
index 0000000..a2da958
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20150527.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-05-27_03-57-25/zip/netbeans-trunk-nightly-201505270357-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 5ec1622..bcbaf31 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_p20150527 (27 May 2015)
+
+  27 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-websvccommon-9999_p20150527.ebuild:
+  bumped to the latest sources
+
 *netbeans-websvccommon-9999_p20150526 (26 May 2015)
 
   26 May 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 90ae939..fdbeb09 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -41,6 +41,7 @@ DIST netbeans-trunk-nightly-201505210001-src.zip 207608451 SHA256 9fa52c9803d3f8
 DIST netbeans-trunk-nightly-201505220001-src.zip 207626858 SHA256 e27cf8eadddfd2d5e24b105ca06a914050603c6d23b090d938e1971e6938c36b SHA512 7534fe3130d3dd938e45c667180bb988000b9d2ae3aff444653e9f8686586e90795858c7c7c8ed86f3332254938299f6602643b1be5a360d581f447a58f56a39 WHIRLPOOL 924743463f4c43211348d7dddbb99325fca891d3c1cd762f502e9ffe7b55476aab8f755877bdbcdeca179e4b77c1a019fa70049864e8153ca648d41c5308ae3f
 DIST netbeans-trunk-nightly-201505250001-src.zip 207630778 SHA256 711c94bb4a4d097e850cb3b19f94e26429badd6d2f063ebfee7b2710efbfa751 SHA512 dab391072215ce84673ea5ce3f1938cdd933e23f781737780e80e9f2a94d39e878548e8f4d5834c5e3b14c476659ff8917f37683888cc657dc08e9156c7070b5 WHIRLPOOL d6aab8dcf268510126406635bfea7c2334b7eb9fc9a6aa4b8dc0fa6fe7a1c2c9a04fc630e9dd1cbbaa0e3b4402ae792b7edc853a922a2271ebed6b5a5e7a2ee6
 DIST netbeans-trunk-nightly-201505260001-src.zip 207634232 SHA256 15df00f2440c7d3f409b49614426f87049fdc18fd2966a506bd58a6a50e83f46 SHA512 640a9fed76d660329c73819a41d74a7de86c4d7ff66ffbd8a340bcbf8e5d1fa33c65d6683c295d0f13175bb2e253a93dde9a41f987afdc58dbfdf125bcf3d734 WHIRLPOOL 12920de6710a1e49176284c68955212e97a35404741cc7c94eab2ceac9c8dbb89dfa8ba08db33ccd25e5851aa79e5f1f8c608dfc85ae0ff512f1fcb8c5596e11
+DIST netbeans-trunk-nightly-201505270357-src.zip 207634435 SHA256 894cd7284081fbb41d7295c08015bf7f6c7578023cb3b2c7488413c19a389f9b SHA512 a273255018cfae2335cffc1ccae90cfc42ec700d4051e03418f2b914e4978ae1aaf85f2b699c0b89cd8b19dfb43d9513fe3f6ace9eff569575e896f82e6eb2d8 WHIRLPOOL b5c5d6f9c166d3129864f830fa33b3c3ab5c6b03b4b5f0f96e2b8871c6f8bbceb0789bad8b7d045e717faa30ef29de2d07f5fdf415a2f65ac65ebe31866d6b60
 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
@@ -76,5 +77,6 @@ EBUILD netbeans-websvccommon-9999_p20150521.ebuild 2727 SHA256 aa2362617427fba9e
 EBUILD netbeans-websvccommon-9999_p20150522.ebuild 2727 SHA256 1c5cfea30b18c5d9df06dc0b15c9348fe59354dfad041f950c8697d88eea8c04 SHA512 ce4b961ef00cd37fa14404e57baefef32640193c70bb7a3a8bef8dd7bc7662893380c4074ae8cba9f428d99df1bb2561e76b444f2464d1b346ab201fcb09e4eb WHIRLPOOL 2a103df1d2ba51892a4a60d8c661d66553ac2e268c222bd7f40895617bbb5bf9bed56abec0b9896a6109cbbf622eb56113a7c130fa74c6fa66458a20b2249ec5
 EBUILD netbeans-websvccommon-9999_p20150525.ebuild 2727 SHA256 b94cd5d08bd97d3b8966f32dd0bbc0ab33a0dcd857be11b37f7b95915571125e SHA512 eb7332b480d2cacbff4ae4a7e338576a3fd0066d5a2beb113b1d45528e9cee67c85a38419597ef5302fc2b77019ea76f158bde631a517a0eb56b337374ecc16b WHIRLPOOL 29a00cee89ce3f3970b05a3bb973f25365ca6445c5762a768bd89ad099a771d8cd3bc004568a5eb8026b411575372201fd9fd595cdaaaa4d2a5922497d631c9e
 EBUILD netbeans-websvccommon-9999_p20150526.ebuild 2727 SHA256 4cd4985cb0de645e2e9a767f6c178a74acb1a875a6bd34cc3351f4f5030aaba6 SHA512 3a7407e34d0539fd06c2353d8edd4d1b8ccc0d65c5fd4a06498ff940c0f6bb0d901ec345811a6b07435d15c9cbe61263324af28f9b4a627d3db1adba2df498f5 WHIRLPOOL 74ab05b1f00467702fe30d50fa0138db53d411ab6dff1e0c6bb7e332ea0dfe3b39c9625b21cfae3be0d3243cc30ce02af3265c9a80feacead5d7eab43e8d6a7a
-MISC ChangeLog 176298 SHA256 29def172e65df3a953953864abe21fd5e456cd0560ff8c406151840d6318f689 SHA512 b32b68cb7e1e0f673c91cc3677c6cd234d64d550f2296cad6537106d69e1acb470c9c893199d7a1e8fcb31fb8820409687a6e7b8defcb1935bfba1a8247c437b WHIRLPOOL 83252574ddf6f4bfd0ba8c124aeb8c2ef6f97639b9eb23e904fb1290e9454c7d76bea8e809a94abe10b502544f335170c33f65afa70ddb31cd40f6707800563c
+EBUILD netbeans-websvccommon-9999_p20150527.ebuild 2727 SHA256 af31d7a94dd03ee9ef39a0baaa18c83ec7be1ce298dbae2df0ec9b6179abb6b4 SHA512 220725660b158811b472ce6ae1606409a83503790e3014013a3d93191b05e7b4b65631c2e0d9324c1b22681f4be8b15bdb19661db5994a46a5abeccd16c74a0d WHIRLPOOL d453f1022353a454e6390ff75323e6799bb29a0ffb0e6c9539eddfb76877752d950e668712c9be6a4f5bcd3de95505902c700571de25149b2b50bdf02493bd2c
+MISC ChangeLog 176483 SHA256 52581459b221ebc1a7b766662ee53f01d1bf6d515886006fad59a25d4388bb4f SHA512 d07bfbbe68bfb8bc1a27fe589d27d7db370b805279c59baebea55535c563e90d0a4c936558ef9441fe8abea8dca5ec01ec3e05e6e2e5d409913e733513df02b3 WHIRLPOOL 4cfc6109a5c539ae0bc72a15c33d413f495a1bb9edc09615fbe788edc817dcdf8458de181b3ce02f00acba897bc2d982c1f4dea542d75db871271bbbb0ca5a1d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150527.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150527.ebuild
new file mode 100644
index 0000000..d9682b5
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150527.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-05-27_03-57-25/zip/netbeans-trunk-nightly-201505270357-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 ef7bf34..453bbd7 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_p20150527 (27 May 2015)
+
+  27 May 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-9999_p20150527.ebuild:
+  bumped to the latest sources
+
 *netbeans-9999_p20150526 (26 May 2015)
 
   26 May 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 55ecc30..1dcb390 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -49,6 +49,7 @@ DIST netbeans-trunk-nightly-201505210001-src.zip 207608451 SHA256 9fa52c9803d3f8
 DIST netbeans-trunk-nightly-201505220001-src.zip 207626858 SHA256 e27cf8eadddfd2d5e24b105ca06a914050603c6d23b090d938e1971e6938c36b SHA512 7534fe3130d3dd938e45c667180bb988000b9d2ae3aff444653e9f8686586e90795858c7c7c8ed86f3332254938299f6602643b1be5a360d581f447a58f56a39 WHIRLPOOL 924743463f4c43211348d7dddbb99325fca891d3c1cd762f502e9ffe7b55476aab8f755877bdbcdeca179e4b77c1a019fa70049864e8153ca648d41c5308ae3f
 DIST netbeans-trunk-nightly-201505250001-src.zip 207630778 SHA256 711c94bb4a4d097e850cb3b19f94e26429badd6d2f063ebfee7b2710efbfa751 SHA512 dab391072215ce84673ea5ce3f1938cdd933e23f781737780e80e9f2a94d39e878548e8f4d5834c5e3b14c476659ff8917f37683888cc657dc08e9156c7070b5 WHIRLPOOL d6aab8dcf268510126406635bfea7c2334b7eb9fc9a6aa4b8dc0fa6fe7a1c2c9a04fc630e9dd1cbbaa0e3b4402ae792b7edc853a922a2271ebed6b5a5e7a2ee6
 DIST netbeans-trunk-nightly-201505260001-src.zip 207634232 SHA256 15df00f2440c7d3f409b49614426f87049fdc18fd2966a506bd58a6a50e83f46 SHA512 640a9fed76d660329c73819a41d74a7de86c4d7ff66ffbd8a340bcbf8e5d1fa33c65d6683c295d0f13175bb2e253a93dde9a41f987afdc58dbfdf125bcf3d734 WHIRLPOOL 12920de6710a1e49176284c68955212e97a35404741cc7c94eab2ceac9c8dbb89dfa8ba08db33ccd25e5851aa79e5f1f8c608dfc85ae0ff512f1fcb8c5596e11
+DIST netbeans-trunk-nightly-201505270357-src.zip 207634435 SHA256 894cd7284081fbb41d7295c08015bf7f6c7578023cb3b2c7488413c19a389f9b SHA512 a273255018cfae2335cffc1ccae90cfc42ec700d4051e03418f2b914e4978ae1aaf85f2b699c0b89cd8b19dfb43d9513fe3f6ace9eff569575e896f82e6eb2d8 WHIRLPOOL b5c5d6f9c166d3129864f830fa33b3c3ab5c6b03b4b5f0f96e2b8871c6f8bbceb0789bad8b7d045e717faa30ef29de2d07f5fdf415a2f65ac65ebe31866d6b60
 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
@@ -84,5 +85,6 @@ EBUILD netbeans-9999_p20150521.ebuild 7216 SHA256 95ebca1429fcdf16ef1efac7b614a4
 EBUILD netbeans-9999_p20150522.ebuild 7216 SHA256 a5cc3ee09bbcb71bb9169a25485f0979595d53eb36c6c9beb1d8576347de5365 SHA512 d2eb1818d6fdf390e2fc995a69988623813e09712a4213d517c740a7af9876e225d2d284059b841d6279ac24e3496b6d0c1d4086052f4925df6378734b80469f WHIRLPOOL 107635796765e14f6b1b089209246e0628a188595bd04cdd1625c266768fcecf8515618cbadb7e4ba846bcb2f0c29413957a0a474a4faf137689c9ab5f21105d
 EBUILD netbeans-9999_p20150525.ebuild 7216 SHA256 fdbdfea3a0b375a364f0bc38bb777ffb7f8e521a03cc024ff22291cf3251f9cc SHA512 77b132e31ffb5dd296c8afb4ff419e7dc15d2afcd18c6c0dade01ee5c7577ff9f5dccff3e2f3878e31aabaeee0e86538b4ba5bcf52bf319a4b2186d89a0bbbb3 WHIRLPOOL ec2dcd1e39fe49d69ecd604903d28dfc7b1f84ec12e6796b5a27afba70a7a5a0bbfa52333d05fadcc1b925556fe3cff915cbc3fa74cb059cbf12495b99db3ca8
 EBUILD netbeans-9999_p20150526.ebuild 7216 SHA256 29a649e44af7b653ea2c50e273c59825bf4d51c5698c8b382f29eaaf47b50500 SHA512 2c2c8c03606ec1f4828e29b18ff36cd3035de91ce24fd97cc11e1f560c76aeb403e5f19025b8efb5774ae1ec10724d907f72750fb9fde3101150937dafbc8b1f WHIRLPOOL 82d3a1a32087e472d73ccc5e3f81c4e6560eac7c2c5d40c0063b118193cbc649f35cd2549fcf5c3d59645c59278df94a4b689bf066ceccc9a772be94cbba803b
-MISC ChangeLog 149877 SHA256 115c37d6ef7cd53ea932063eebf6b6fa05cba6f1511d4ffb88b8a8b5ccbc2a60 SHA512 f70d89e540ddb19ea22246d4cc85acbe1ad4ad0e86441d264c7a9bcf79855993702761e0bbf800fe4783d436407672817878c43f2b9304cce3df341820949a8f WHIRLPOOL b1c5fa3c8178f7dae3199881a11deff7943e0705afe17a85812bbaeb235ebebeaf8788c6b0189c656a52969dfb38b1fd2edf21fa73e4d20045d8fbd85e279227
+EBUILD netbeans-9999_p20150527.ebuild 7216 SHA256 05e0a57c17edfeea65a6a8eddde859c594510e7376783119899f8d3faa877c3e SHA512 b2f7880f40e87b1e6c35459c3b96add5e51407263ac413bf73b9e3fef19199d1c779f62c1cafd27edb13356a09f2ae4b661d31fab32d0fc319bce1c6ce030ffc WHIRLPOOL 2e8b69bb782e2512433ddd6a1e2ed5f42702252d06aa32660fd85b25af5ca782238921cd5a28826fb4e4c76fc9c488002f54bbe98d941245aa85b90659c60c3d
+MISC ChangeLog 150036 SHA256 e9116d894872d662db7d12b37c379a0c410d2c684d00a09bb0723fc67e5f10d2 SHA512 76033e323c304553aef2c1d6a0083e06a660d09b1208e33c214a429cd3529c9188e1ae99aa253593a52cfcad395367fd59bc9dd8a591e7880dd377e7fa6f265c WHIRLPOOL 850143d473315aa36e1a56e5e795efd5f6dd70a1e0281433e102182468e2a13d72bd030f1b509542a57ac8e33babb6a79ba6a0af134601c4a30aa325678a1b4d
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

diff --git a/dev-util/netbeans/netbeans-9999_p20150527.ebuild b/dev-util/netbeans/netbeans-9999_p20150527.ebuild
new file mode 100644
index 0000000..cf580ea
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20150527.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-05-27_03-57-25/zip/netbeans-trunk-nightly-201505270357-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-javacard/, ...
@ 2016-05-02  7:31 Miroslav Šulc
  0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2016-05-02  7:31 UTC (permalink / raw
  To: gentoo-commits

commit:     690b7837ca8490ec28f1d6ee7d28212a0171a9da
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon May  2 07:31:05 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon May  2 07:31:05 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=690b7837

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.2.28

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 282d955..326ce03 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -7,10 +7,12 @@ DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247b
 DIST netbeans-trunk-nightly-201604290002-src.zip 213411377 SHA256 d0ac79f9aceaaf246c9b20cd612472e6ecc4abc9bf6add0d61fadfca3ba85a79 SHA512 ac78733d4248f6fc6ff23705f1db5e001eca8e05c2dae7c3e2e59a60dd8afbe9e6a363188e17cb78492da6e1fe35cf5bcd87a0b0c1fc4e0d91129f0812db0bd6 WHIRLPOOL 4a704f8a4aa16130c84fd481f7e1ff45f87adb589e71955857b0342927dfe960b73adde97ba12022d265169cd4b736baa48f4bb4e10d8311bab787cbeefa28b9
 DIST netbeans-trunk-nightly-201604300002-src.zip 213455252 SHA256 8ac717a944d58471d4ceb9a22a21deaf0d1f51f4eca622ebaa8f4f100f7a5338 SHA512 32a07261706f944f02b161d687998395a588c060b2e59311b2e3e08a84237e1635df2af75d523da87845e794a906283ceae26b17d88b2c649d542ba525c94429 WHIRLPOOL da034854b495fc9d685d34a181fcdba320f58718a0a2ab939ae3bba9049941b405555db173a314f4881eac31e7d42d78641d96f7e097d68ecc2fe06a0c2133df
 DIST netbeans-trunk-nightly-201605010002-src.zip 213455252 SHA256 a7b4106579fbeddedac626ccd40f58b1ddc18259470a5166bde4959c25a346e9 SHA512 a10b319508becdd5af6e11db80443099997276faad942d22f24513d131c4627d38fcfa1facc74ad3d7ebe2625592e1797de1cbc1988e4d5eb75f2fad178f947a WHIRLPOOL 46c57850d95b3329747584e59389560dc678f1124bf5ff438068c1a04116970342fae1aa34e5ccb3607e068f91e7e6e0f45f7749b8c5a67fec0da55e885ab746
+DIST netbeans-trunk-nightly-201605020002-src.zip 213470717 SHA256 8c1cde7797484c52ae985c6530de6c6974c57d161647a32f642477c86801b3b4 SHA512 b0bdaf6d39d979a1b8bb41088ffe3780630daf3eeb7729b705a09a522bf91717ea4bd5e658aa8d144da96f98a0ea52747f15f9f073c22b67f8ddffb2a2bcf474 WHIRLPOOL 20909f886215edac9c8377d3ee7d1270942848eb94a083f0601d6c328e004f6a1bf87c2d153d739a63278274a71cebb2de00d9bf4b05707c60557cb400bfbc06
 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_p20160428.ebuild 3384 SHA256 e866d9fd43d85c959d598d6111e061a3138aea2a9133f516f547a15370086e3a SHA512 cdf600716d69e7b50162f7556e2f70c6cfe9c998c94529be32305cb6bcf732ff568cdb7a3529478c12c72693a8aaa3edd10b2e752f875f6a40ef9599daff9bc1 WHIRLPOOL 5571ecd51924a63326a4759bdd584da6e7c2e5f9b33b7eeea01e4afbd58d6bdf6360e964896112aab5dde57c7b52d136e37e35f35883f3762543afb28a84cd42
 EBUILD netbeans-apisupport-9999_p20160429.ebuild 3384 SHA256 d1a11151cc917d31f5a6608d63a033b074dd10bda127ddd01ec2de154d69a28c SHA512 cfa61439a98941c4b9faf9fb0ba9ccb45a917b235323f737cdfe054f1c0931974977cb653f8383264f4e39874d6bee6a1777ac00386e1f591acb4d55ec9b6ad4 WHIRLPOOL 96d46a8e752361a06cc369251c2acdfb65dafd405d33fec1f1a13991831dd6c5f2fb24a3404f1702c6daa4faef85b74aa2c3efb332cc2a2e62eef16be40c6f1f
 EBUILD netbeans-apisupport-9999_p20160430.ebuild 3384 SHA256 f7125ac081a85a5ce6c28d2bbffbb4db19dd56fbdb7e8d191916ebf182b43c28 SHA512 6a99a95d020859118839f6ab0a6fb90456bb4815720824171c7fbd98588e5a896655e2c3e8e69c0ba3b5a3ef76996e9cc3de6134a3f5d812316cb9d7ffbc3d49 WHIRLPOOL fadf22cefdcb71f65ab8888229e90104b0f965f0ba620d63646dffea7692726ded287536af6f7dd30f98f7b31a0f13f048d66107396c47660c2697f339827303
 EBUILD netbeans-apisupport-9999_p20160501.ebuild 3384 SHA256 68a8f3a6cdb09fa119f1d6ebe29cfb94ce84c132f16b51e16f87639df1520485 SHA512 5a77a93c31edafb59e9032b7496aafe032e93a9eb5fcbf1a33feeb878f409b0dc1681ff481604cf1dd4e0ad4ff53617add481e31f7c9dbce7d3364c5acd64937 WHIRLPOOL 4e1582856bdc4d46fe8bc635d92d7b7a5c62191ac77543d9eb8fe3239e8280f3d8616919d94956c249d894359749552a3ccbf79c2bc82dfa48ef5f1a62192508
+EBUILD netbeans-apisupport-9999_p20160502.ebuild 3384 SHA256 214bebcbf3fd1f73dd51995e6afc1df39c338a64c3153a256213414f684b426e SHA512 fce2da6103e7e2578762a1e13fef9ef438e5505b8d46e87621b7e3b72b45962ec3d86244692613a5f69f1a22beae5815d9a44016db7f454aef1def0b7458c9e5 WHIRLPOOL 12908a5203ce6ddbab9392cc12451588103f553ac0ad83011cab5e8a85ac933c2b13f4ec41ae7ed210c40285b02358fe342f1fe0e6b83bf6291df75cbace7f16
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160502.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160502.ebuild
new file mode 100644
index 0000000..fa87194
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160502.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-05-02_00-02-33/zip/netbeans-trunk-nightly-201605020002-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 b628460..ba42f4e 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -17,10 +17,12 @@ DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247b
 DIST netbeans-trunk-nightly-201604290002-src.zip 213411377 SHA256 d0ac79f9aceaaf246c9b20cd612472e6ecc4abc9bf6add0d61fadfca3ba85a79 SHA512 ac78733d4248f6fc6ff23705f1db5e001eca8e05c2dae7c3e2e59a60dd8afbe9e6a363188e17cb78492da6e1fe35cf5bcd87a0b0c1fc4e0d91129f0812db0bd6 WHIRLPOOL 4a704f8a4aa16130c84fd481f7e1ff45f87adb589e71955857b0342927dfe960b73adde97ba12022d265169cd4b736baa48f4bb4e10d8311bab787cbeefa28b9
 DIST netbeans-trunk-nightly-201604300002-src.zip 213455252 SHA256 8ac717a944d58471d4ceb9a22a21deaf0d1f51f4eca622ebaa8f4f100f7a5338 SHA512 32a07261706f944f02b161d687998395a588c060b2e59311b2e3e08a84237e1635df2af75d523da87845e794a906283ceae26b17d88b2c649d542ba525c94429 WHIRLPOOL da034854b495fc9d685d34a181fcdba320f58718a0a2ab939ae3bba9049941b405555db173a314f4881eac31e7d42d78641d96f7e097d68ecc2fe06a0c2133df
 DIST netbeans-trunk-nightly-201605010002-src.zip 213455252 SHA256 a7b4106579fbeddedac626ccd40f58b1ddc18259470a5166bde4959c25a346e9 SHA512 a10b319508becdd5af6e11db80443099997276faad942d22f24513d131c4627d38fcfa1facc74ad3d7ebe2625592e1797de1cbc1988e4d5eb75f2fad178f947a WHIRLPOOL 46c57850d95b3329747584e59389560dc678f1124bf5ff438068c1a04116970342fae1aa34e5ccb3607e068f91e7e6e0f45f7749b8c5a67fec0da55e885ab746
+DIST netbeans-trunk-nightly-201605020002-src.zip 213470717 SHA256 8c1cde7797484c52ae985c6530de6c6974c57d161647a32f642477c86801b3b4 SHA512 b0bdaf6d39d979a1b8bb41088ffe3780630daf3eeb7729b705a09a522bf91717ea4bd5e658aa8d144da96f98a0ea52747f15f9f073c22b67f8ddffb2a2bcf474 WHIRLPOOL 20909f886215edac9c8377d3ee7d1270942848eb94a083f0601d6c328e004f6a1bf87c2d153d739a63278274a71cebb2de00d9bf4b05707c60557cb400bfbc06
 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_p20160428.ebuild 4790 SHA256 af153a0e0435678331a5a5a43c3f393786a0f804dedbc7fbccc3b539cea583bf SHA512 cae08e9b98753c358da559fdf3387c860fd8ba8a4dd5d787f843b4cfe8f1aacf9bb1d57be5b7e52849abcfcc219262b8bcc338a6ff05451aefd2e434a4d86eee WHIRLPOOL bfaf9faa4bbed952d542ec45d51daa200bb307a922889ad6b586fec4f3386ca995ca1dac974e789a072abb4d69b58ae7c0056086966329af07244a23c0924370
 EBUILD netbeans-cnd-9999_p20160429.ebuild 4790 SHA256 6e5892e3a3ad901398a0322715d859a3b2fc67af991fa1a99a137ff04d4a4db0 SHA512 c4ae7bc81d6440e92dc9fbaf3e822f9bc6ebecf318536fff6f8fa76844cef0b88110291d4c708dea269c4c02294d9ffcd8dd57e06284fb936bb9cf89791f8e58 WHIRLPOOL 4925c7fe9a30fe47eb88dd492b39ffc057f8a2581918bc6637e73c7b67a2ab0df8b6022c396b4dcf57630b0dbaaafaa1d81e04e1a39a8907f5434960f4534cc0
 EBUILD netbeans-cnd-9999_p20160430.ebuild 4790 SHA256 af49eb045691ba158c4f3d1bd0df4daa8b901fb31ff87929ab5aab41718f738e SHA512 b45ed427c74adc932a16199e6bc5a2abc0ec28b2be58a0b08f0e98b8ea1227540d405c1272103a462332c42c28b412c27b39c2c8fa742988e4590aeaaa979ca5 WHIRLPOOL 4f6d02207ae1cf4f8d20e8d2bd78a7711c41ed0ec64dcd78d1ca4fa2fb08e860bd5225aaa6a91d9ff0ce951c108197dc6979ab095f6d75e096152712bb01a637
 EBUILD netbeans-cnd-9999_p20160501.ebuild 4790 SHA256 106e18d8bae472755b6b484dba062791771d9c90023b1de8706c18b25cc2c18d SHA512 57e42c2b267200710a7e0d03944fcf3c117c3cd911c753dd4b8ab944d6c1bd2d0f3e75995839861fb744b9a61c05e1fa62ea4e5f792f3636a99ff0a3cf7bf5db WHIRLPOOL 8850c1511c78ea26076d385e4d5af769ca88b677d8251c99bd730010227ff56165961daa950541c3b1be540d02ab0d1c1bdbca6b6ffc9ef8236dbc37a90db807
+EBUILD netbeans-cnd-9999_p20160502.ebuild 4790 SHA256 50484dbfa4ec3b2fc7611cdd0eb16591a941b9851411341b141aa00864183e5b SHA512 db113f00466e1a6721088ba42af682f60d38c65f332775afba701682a5279f5fb54299374e1046072bda78667b3386924624098549ab77a37a035fa5d3f9a87d WHIRLPOOL 2afdc8cbcc3e49f2a42ef76d490e52fa1f21f992f62fe21a3357e98927d8b135e75b9c52eb8d7b4f2d5f1631b936a528fdcf57c08882f48bdc8e3cd47961836e
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160502.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160502.ebuild
new file mode 100644
index 0000000..a9db48b
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160502.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-05-02_00-02-33/zip/netbeans-trunk-nightly-201605020002-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/BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip
+	http://hg.netbeans.org/binaries/E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip
+	http://hg.netbeans.org/binaries/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+# These files are for remote development and debugging
+QA_PREBUILT="usr/share/netbeans-cnd-${SLOT}/bin/*"
+
+CDEPEND="~dev-java/netbeans-dlight-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	>=dev-java/jna-3.4.0
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.cnd -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-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}"/BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip cnd.discovery/external/cnd-build-trace-1.0.zip || die
+	ln -s "${DISTDIR}"/E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip cnd.remote/external/cnd-rfs-1.0.zip || die
+	ln -s "${DISTDIR}"/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip cnd.modelimpl/external/open-fortran-parser-0.7.1.2.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-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 9bfb6f6..ebd76aa 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -10,10 +10,12 @@ DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247b
 DIST netbeans-trunk-nightly-201604290002-src.zip 213411377 SHA256 d0ac79f9aceaaf246c9b20cd612472e6ecc4abc9bf6add0d61fadfca3ba85a79 SHA512 ac78733d4248f6fc6ff23705f1db5e001eca8e05c2dae7c3e2e59a60dd8afbe9e6a363188e17cb78492da6e1fe35cf5bcd87a0b0c1fc4e0d91129f0812db0bd6 WHIRLPOOL 4a704f8a4aa16130c84fd481f7e1ff45f87adb589e71955857b0342927dfe960b73adde97ba12022d265169cd4b736baa48f4bb4e10d8311bab787cbeefa28b9
 DIST netbeans-trunk-nightly-201604300002-src.zip 213455252 SHA256 8ac717a944d58471d4ceb9a22a21deaf0d1f51f4eca622ebaa8f4f100f7a5338 SHA512 32a07261706f944f02b161d687998395a588c060b2e59311b2e3e08a84237e1635df2af75d523da87845e794a906283ceae26b17d88b2c649d542ba525c94429 WHIRLPOOL da034854b495fc9d685d34a181fcdba320f58718a0a2ab939ae3bba9049941b405555db173a314f4881eac31e7d42d78641d96f7e097d68ecc2fe06a0c2133df
 DIST netbeans-trunk-nightly-201605010002-src.zip 213455252 SHA256 a7b4106579fbeddedac626ccd40f58b1ddc18259470a5166bde4959c25a346e9 SHA512 a10b319508becdd5af6e11db80443099997276faad942d22f24513d131c4627d38fcfa1facc74ad3d7ebe2625592e1797de1cbc1988e4d5eb75f2fad178f947a WHIRLPOOL 46c57850d95b3329747584e59389560dc678f1124bf5ff438068c1a04116970342fae1aa34e5ccb3607e068f91e7e6e0f45f7749b8c5a67fec0da55e885ab746
+DIST netbeans-trunk-nightly-201605020002-src.zip 213470717 SHA256 8c1cde7797484c52ae985c6530de6c6974c57d161647a32f642477c86801b3b4 SHA512 b0bdaf6d39d979a1b8bb41088ffe3780630daf3eeb7729b705a09a522bf91717ea4bd5e658aa8d144da96f98a0ea52747f15f9f073c22b67f8ddffb2a2bcf474 WHIRLPOOL 20909f886215edac9c8377d3ee7d1270942848eb94a083f0601d6c328e004f6a1bf87c2d153d739a63278274a71cebb2de00d9bf4b05707c60557cb400bfbc06
 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_p20160428.ebuild 2968 SHA256 a78d9fe846d94ed422c84a3dd06ff9b4eba872d64ffd217817f93f3bface22ba SHA512 c8ba6923704e00c0da015c99217c078e2eb3b548fa80f0a17d6189e94e7781ae57cb5c9a67e3921fb1c4dbba717b73cb0b56542ad247c0ec740578cf981ed78d WHIRLPOOL 6828cb5cd0d0669bf1114d12f86dbc386cb3f49df002501b61bfc518c507882f961ebc63cce7e9d3382961189be71e51ca4acedcbc93c9d7547bcd93b9f36750
 EBUILD netbeans-dlight-9999_p20160429.ebuild 2968 SHA256 d7b752d8514d47164b82939771de005a6723136317c7e774e9db0975af18635e SHA512 acf6e11e9ac3436b22429a219275afe0ef0015722cf5a6bbd90ff918149be44f84eb3f0d899d8a77ff873a7dd44178d58f26f2351ffc3e48d50cd4d896be161d WHIRLPOOL 9351914c1a73125ef093de24488e865dad522354114249611d351e2c8134ec3eb0d72e1466c686f5208a46db19a4a167735d4aaa162f09a16adcb14c9a298337
 EBUILD netbeans-dlight-9999_p20160430.ebuild 2968 SHA256 e9fef6100fd02fb343207a77f1e6eeea0c86d3eb48f26d7f657712da84900539 SHA512 274625dfb516afe3226a643964804944304dd6b9ce160bf29d15667375f9ab353f24b75be488f882c9b5b8194de21c29743ee7f1f49741fc5093520d1c8853b0 WHIRLPOOL 005eafc551e71307197b230dee99c598d1e3ad6f0ef0baab0345a330b2c446de9ca576a2eb3fdc46d82cac33dbc5e9b9bfe850200ab593eda55d61411aacf210
 EBUILD netbeans-dlight-9999_p20160501.ebuild 2968 SHA256 78ee1b5c317b1288f6e63e0752979c923c55a3d5e355ad52db584d7da816df37 SHA512 c04363b86d6cea9f0fdb33c2db54ecdf85b8826cbbb4959049b184b06ca36fa73cfe0380e8920276a36cfc4dc5def5ac0c780358983f2add9a39f436104110aa WHIRLPOOL b1e6a5396fe257456c51e9d4827d36964a087d949ac07af5e44d981b6318e95cf000d0fc20375a8137e2a1b9fadab455bf7b482221b0915d4b4be5e873c8354a
+EBUILD netbeans-dlight-9999_p20160502.ebuild 2968 SHA256 6b0688c0c02b9397c37f08495552c6091db7e42558de933140dd7df07ff32b7a SHA512 6a3df2e403dc9f4b4eb4ff2ae141174cf1a452beedc45c4d4425ec84c9538ce05ad584be69105c6471695e4adbc5921f440c0178ddab8ddaeffd9560e4224eca WHIRLPOOL 65e37182cdecc4726d9d0afd205247669e551c68c9d11279d186b898af0b62c256427e43646068fff7c78ac1721c45071ddad5220a2ad74ba178631a8925f4a6
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160502.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160502.ebuild
new file mode 100644
index 0000000..5b52134
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160502.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-05-02_00-02-33/zip/netbeans-trunk-nightly-201605020002-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 858de21..e1210d3 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -39,10 +39,12 @@ DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247b
 DIST netbeans-trunk-nightly-201604290002-src.zip 213411377 SHA256 d0ac79f9aceaaf246c9b20cd612472e6ecc4abc9bf6add0d61fadfca3ba85a79 SHA512 ac78733d4248f6fc6ff23705f1db5e001eca8e05c2dae7c3e2e59a60dd8afbe9e6a363188e17cb78492da6e1fe35cf5bcd87a0b0c1fc4e0d91129f0812db0bd6 WHIRLPOOL 4a704f8a4aa16130c84fd481f7e1ff45f87adb589e71955857b0342927dfe960b73adde97ba12022d265169cd4b736baa48f4bb4e10d8311bab787cbeefa28b9
 DIST netbeans-trunk-nightly-201604300002-src.zip 213455252 SHA256 8ac717a944d58471d4ceb9a22a21deaf0d1f51f4eca622ebaa8f4f100f7a5338 SHA512 32a07261706f944f02b161d687998395a588c060b2e59311b2e3e08a84237e1635df2af75d523da87845e794a906283ceae26b17d88b2c649d542ba525c94429 WHIRLPOOL da034854b495fc9d685d34a181fcdba320f58718a0a2ab939ae3bba9049941b405555db173a314f4881eac31e7d42d78641d96f7e097d68ecc2fe06a0c2133df
 DIST netbeans-trunk-nightly-201605010002-src.zip 213455252 SHA256 a7b4106579fbeddedac626ccd40f58b1ddc18259470a5166bde4959c25a346e9 SHA512 a10b319508becdd5af6e11db80443099997276faad942d22f24513d131c4627d38fcfa1facc74ad3d7ebe2625592e1797de1cbc1988e4d5eb75f2fad178f947a WHIRLPOOL 46c57850d95b3329747584e59389560dc678f1124bf5ff438068c1a04116970342fae1aa34e5ccb3607e068f91e7e6e0f45f7749b8c5a67fec0da55e885ab746
+DIST netbeans-trunk-nightly-201605020002-src.zip 213470717 SHA256 8c1cde7797484c52ae985c6530de6c6974c57d161647a32f642477c86801b3b4 SHA512 b0bdaf6d39d979a1b8bb41088ffe3780630daf3eeb7729b705a09a522bf91717ea4bd5e658aa8d144da96f98a0ea52747f15f9f073c22b67f8ddffb2a2bcf474 WHIRLPOOL 20909f886215edac9c8377d3ee7d1270942848eb94a083f0601d6c328e004f6a1bf87c2d153d739a63278274a71cebb2de00d9bf4b05707c60557cb400bfbc06
 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_p20160428.ebuild 15825 SHA256 d36265c231f1f56c998acc0e6268f1c61be91492a9243785066dbbfc6ff3053f SHA512 c7c3a2ab27a93d457f5f95341b6e740e66ee57dca0998cadb6f97842084a2450669fefb0bf3611c52df23b266bef5004b916e769e2fd6886915705729d79e91f WHIRLPOOL 8e461fad4f405bda6a70b1024fd9ef18b8070deda66b328838cd1eb6b0665727553075222d489c2f657eb286da8c33b48f1de347efd514f28860c8aa397c076c
 EBUILD netbeans-enterprise-9999_p20160429.ebuild 15825 SHA256 05bc437093193e88924bb2dcbca61368af02579e7a53154ef547a705c962b66f SHA512 bbe9514bf02b5ae617f9c69b123e5014d60728905f08ab805623fda11a9055a73874155dccdfcbefe771780447fb6fad6ec92e005b1668e8e54bae4f7df420f5 WHIRLPOOL a7be814db2696fb17b0bf2942a8a4f5e03e47d3727d91b2b09384c18b3930bb0930d92026a29babfbb46aef695ba1f08af07443fb053fb4280b7fc67e62161e2
 EBUILD netbeans-enterprise-9999_p20160430.ebuild 15825 SHA256 05ed24b0672dcb4a88c8e9889164a33ac27d3904c22c1e6bbd315e3f9980dc4f SHA512 1e0991ea492824ca929b3b250c4857034065aed3a2ae50c4b261f43a01313fd69a917ee609cdf5449c7f63299589aa2f824d13f25a46bbf643a7e647e027d64e WHIRLPOOL c8fc088951776e6c0f722464829b81f6a535d4630df0cf155b96fdf0bca964ace6686cf8538c49c9b65308b8eb9761aac09efbbe1871dfb32985147eb5e06a1d
 EBUILD netbeans-enterprise-9999_p20160501.ebuild 15825 SHA256 da6a8bb97d6dcc17d3a30da220b5b38579082570111bbdaac3abe7e57c08a882 SHA512 742531a849d707e64e5f04d560e5b5536a0fff22c82cb96201a40467efc958c46af1c3680e2f79b46727ee2ebe68f45299b66c6ea95a794bf4ea1468bf9fb4b3 WHIRLPOOL fbaac1438eceda2fd45990778182870daabb05c7b2cd057646a2810a5b72401f81bfa343fcd6c0c19328c0a5661ede8f0fbe9ca0638f4d72ca25f39862f577d6
+EBUILD netbeans-enterprise-9999_p20160502.ebuild 15825 SHA256 f7236ab1725ae3ca7ec685e6c5fb620472fad87e7b9dff827c6e650b9916a9c1 SHA512 5b876a8cc1a495f8093d0736459c740abe9c22d44c689eb97ba84879a33197b38954822712d96409efeeaca76a80cc511ddeeb05052d5ff08c12928efbf8a565 WHIRLPOOL 2d8f0e257a613af5fd245a56282138cf418b7dde25d2171a187f337a21f44ea7472ff6711fbf0a0e433bd8baa67acc8cfdd643e477a4a52021c1341ae8f0cd0c
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160502.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160502.ebuild
new file mode 100644
index 0000000..4f7e93f
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160502.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-05-02_00-02-33/zip/netbeans-trunk-nightly-201605020002-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 a941a88..cd4e191 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -7,10 +7,12 @@ DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247b
 DIST netbeans-trunk-nightly-201604290002-src.zip 213411377 SHA256 d0ac79f9aceaaf246c9b20cd612472e6ecc4abc9bf6add0d61fadfca3ba85a79 SHA512 ac78733d4248f6fc6ff23705f1db5e001eca8e05c2dae7c3e2e59a60dd8afbe9e6a363188e17cb78492da6e1fe35cf5bcd87a0b0c1fc4e0d91129f0812db0bd6 WHIRLPOOL 4a704f8a4aa16130c84fd481f7e1ff45f87adb589e71955857b0342927dfe960b73adde97ba12022d265169cd4b736baa48f4bb4e10d8311bab787cbeefa28b9
 DIST netbeans-trunk-nightly-201604300002-src.zip 213455252 SHA256 8ac717a944d58471d4ceb9a22a21deaf0d1f51f4eca622ebaa8f4f100f7a5338 SHA512 32a07261706f944f02b161d687998395a588c060b2e59311b2e3e08a84237e1635df2af75d523da87845e794a906283ceae26b17d88b2c649d542ba525c94429 WHIRLPOOL da034854b495fc9d685d34a181fcdba320f58718a0a2ab939ae3bba9049941b405555db173a314f4881eac31e7d42d78641d96f7e097d68ecc2fe06a0c2133df
 DIST netbeans-trunk-nightly-201605010002-src.zip 213455252 SHA256 a7b4106579fbeddedac626ccd40f58b1ddc18259470a5166bde4959c25a346e9 SHA512 a10b319508becdd5af6e11db80443099997276faad942d22f24513d131c4627d38fcfa1facc74ad3d7ebe2625592e1797de1cbc1988e4d5eb75f2fad178f947a WHIRLPOOL 46c57850d95b3329747584e59389560dc678f1124bf5ff438068c1a04116970342fae1aa34e5ccb3607e068f91e7e6e0f45f7749b8c5a67fec0da55e885ab746
+DIST netbeans-trunk-nightly-201605020002-src.zip 213470717 SHA256 8c1cde7797484c52ae985c6530de6c6974c57d161647a32f642477c86801b3b4 SHA512 b0bdaf6d39d979a1b8bb41088ffe3780630daf3eeb7729b705a09a522bf91717ea4bd5e658aa8d144da96f98a0ea52747f15f9f073c22b67f8ddffb2a2bcf474 WHIRLPOOL 20909f886215edac9c8377d3ee7d1270942848eb94a083f0601d6c328e004f6a1bf87c2d153d739a63278274a71cebb2de00d9bf4b05707c60557cb400bfbc06
 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_p20160428.ebuild 2913 SHA256 03be7f911ef9e0cc84ae0c302552ce8755cfb31022c087e620b214d4becdef0a SHA512 4961338b8b363a36000ab2ee47d567bf8bf7fdd7e10d63c046f9b1d00ea415390e1cfeae5d02d6090afaa5ab45f7c05b1aa3fc071f1c073eaacb288eddad4832 WHIRLPOOL 110c80e66dfd1e0f880f50fbbc8795445dfb62f6c6b7424b0791067b9b28c58979bd7e56f4df31d3da8f86aa33df43529c3d3f1c795ff14424e8530176c7db46
 EBUILD netbeans-ergonomics-9999_p20160429.ebuild 2913 SHA256 e2df6fa486e4018403d50f9e0292c0a0a6e6c00b881624c1587a0a559e513a3d SHA512 706690ab6b186bfbda0f93fdd826eee100479a8ac2517e05ff1b4f00828ff49083196fdf34cf1a8ee9ce5a2a872979de67e02bcc076ea46b6ba7a4955de7acf3 WHIRLPOOL c68ebc9c4578ec5fee9bca56e56cffff9a209c6593cc4fc9f6c7e47abf89dbf2e305d0068f8a3ebadc2aeb38362df7d4a95af18ba58fbacd4d397b384ab0dedb
 EBUILD netbeans-ergonomics-9999_p20160430.ebuild 2913 SHA256 d29ce3ce54570a70417a7b25e238f24328a5edbfd17e31c1dd53888916cd0fab SHA512 9b5fd6e536ede818074a59112991402a614983e439a253d7af296ca1188f0fd3a52c0e06078b0b1c4f17e50bb1fb1dd5d4234ecb8410bc42b3ca1da8658ef4b5 WHIRLPOOL 74b6d0121d10eac421cd68a00c62d348d7f7a8040b2861232125ff6183fadab3eb608641cc55f73c6c9896a57ce46961f446cd67a3206fed9633cde2e5ebb5dd
 EBUILD netbeans-ergonomics-9999_p20160501.ebuild 2913 SHA256 ac7710547368074d006c5558ce163d75477b28f85a98415844d61babdc75b791 SHA512 cd0075cbae29c1b1777f84e01e7bbaa84c57cb247802ed7cd626c194b397a57677736744e999285c57017fbb356b27029a05ab6af90d0247686519b7032f6890 WHIRLPOOL 081c837f76a58adfff586ab83d26c99c5f4b1aa568f23e7fbd0016f98298f127418b09c96bfa65aa5feb026f625380a0a928598120b371134f86031b945e95d0
+EBUILD netbeans-ergonomics-9999_p20160502.ebuild 2913 SHA256 4dcb3f09f8ea8392d231fc3c4ecc2db848cad4e988a655549d0e831f96a36c6e SHA512 dc03aba5e2e43e4989c4d44dbb9655d674fdfe7aa742e347c04d1fd44bfac6a56e68942cc9714a2be5e4aaf30c4d643bce2ec0155fa885df110ebd5430a5e0b7 WHIRLPOOL e58c83dbb90d92a22c8c70f40fe28ff041ac9d3d152ee189237a1c31a85689bd0d42e6a545ae4ea3ed9e05f4c8df8a0079ea20f1310243c39703c7f025d09221
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160502.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160502.ebuild
new file mode 100644
index 0000000..a0c0def
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160502.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-05-02_00-02-33/zip/netbeans-trunk-nightly-201605020002-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 9c68f69..c876f34 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -11,10 +11,12 @@ DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247b
 DIST netbeans-trunk-nightly-201604290002-src.zip 213411377 SHA256 d0ac79f9aceaaf246c9b20cd612472e6ecc4abc9bf6add0d61fadfca3ba85a79 SHA512 ac78733d4248f6fc6ff23705f1db5e001eca8e05c2dae7c3e2e59a60dd8afbe9e6a363188e17cb78492da6e1fe35cf5bcd87a0b0c1fc4e0d91129f0812db0bd6 WHIRLPOOL 4a704f8a4aa16130c84fd481f7e1ff45f87adb589e71955857b0342927dfe960b73adde97ba12022d265169cd4b736baa48f4bb4e10d8311bab787cbeefa28b9
 DIST netbeans-trunk-nightly-201604300002-src.zip 213455252 SHA256 8ac717a944d58471d4ceb9a22a21deaf0d1f51f4eca622ebaa8f4f100f7a5338 SHA512 32a07261706f944f02b161d687998395a588c060b2e59311b2e3e08a84237e1635df2af75d523da87845e794a906283ceae26b17d88b2c649d542ba525c94429 WHIRLPOOL da034854b495fc9d685d34a181fcdba320f58718a0a2ab939ae3bba9049941b405555db173a314f4881eac31e7d42d78641d96f7e097d68ecc2fe06a0c2133df
 DIST netbeans-trunk-nightly-201605010002-src.zip 213455252 SHA256 a7b4106579fbeddedac626ccd40f58b1ddc18259470a5166bde4959c25a346e9 SHA512 a10b319508becdd5af6e11db80443099997276faad942d22f24513d131c4627d38fcfa1facc74ad3d7ebe2625592e1797de1cbc1988e4d5eb75f2fad178f947a WHIRLPOOL 46c57850d95b3329747584e59389560dc678f1124bf5ff438068c1a04116970342fae1aa34e5ccb3607e068f91e7e6e0f45f7749b8c5a67fec0da55e885ab746
+DIST netbeans-trunk-nightly-201605020002-src.zip 213470717 SHA256 8c1cde7797484c52ae985c6530de6c6974c57d161647a32f642477c86801b3b4 SHA512 b0bdaf6d39d979a1b8bb41088ffe3780630daf3eeb7729b705a09a522bf91717ea4bd5e658aa8d144da96f98a0ea52747f15f9f073c22b67f8ddffb2a2bcf474 WHIRLPOOL 20909f886215edac9c8377d3ee7d1270942848eb94a083f0601d6c328e004f6a1bf87c2d153d739a63278274a71cebb2de00d9bf4b05707c60557cb400bfbc06
 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_p20160428.ebuild 3377 SHA256 b69e4995f884a7524e29274702b2eb3851dca8a7c74a618d98725fe26f951332 SHA512 c8fc3c04d1fc7b2586bcaa5972b1f40ac94b09097f4ad0333d50e9c494f2b2e131dd504c5a274d0b130b1887e2ace51eecca46f20fab32198a123591e6fde228 WHIRLPOOL d921c10e7a80ac065dea04ff546b5635eb8d251a37cc0d8b7533097cc4fc28683d3a60b1b9bb8459b1abc4878fdb306f07db6d80ca65e92dba9543b32866f412
 EBUILD netbeans-extide-9999_p20160429.ebuild 3377 SHA256 4d5556da92053e67624a244760528d32090ec8baa5c0e83787500397b5f67a44 SHA512 30790e951ff824bbe98582ec0ae700e9a413d8c18b92fd9cbf99fcb6911e3d2201a8af88b048771aa52d2d05ec2884e3781b0d3db45c33f36fde8892bd462f5f WHIRLPOOL e52cadc8a91ad84e20a1a8066b8cee19a4ec9debbb63db6cc360d15f74e65e72b51a5bb310b8e92a2b0f26168d55bc51fc955057ca343a7cdec5cb08e920e9e8
 EBUILD netbeans-extide-9999_p20160430.ebuild 3377 SHA256 cf5564f3b737c12c4713beca1a239d6d8fc5f845f1058fcf2787655b99c8ed55 SHA512 69a5c32e599601fca96d30b523ba283d4259c0a1f414bd7a536fe5141a3ab7829fff4cc40501aac13f5a12ca480406ea3742ef7818dba8e567430fe5d6e0dcec WHIRLPOOL 2e9945deea2f787f923646e27806bd66deafd323bc8bdc37ce738c8419388ba1070b1b6df1afe53d70baa8f80e02cd2fdfe67e7ed854915b3f8f7f01d27c0fac
 EBUILD netbeans-extide-9999_p20160501.ebuild 3377 SHA256 54096e2821e78144d5ccb7b2a32097002c51681f508d030f71e54c92f62f42a5 SHA512 989d2116603d36c65e171a5e552c1168e745fea8fdf5cdcbef46f440a4ce16c98912e8fee19953fb47014399182361853c1a277ce93ef81c09fbd9f779615328 WHIRLPOOL 82ee705f172002f145c9dda634177fd6fb39b59e7a5f3efa793afb7ba3d8233a47ea00992a81ff2f12930f8c0892a15fc1561aae5a90f58885de76e062b4ddff
+EBUILD netbeans-extide-9999_p20160502.ebuild 3377 SHA256 824a3444608ebcd9334e2fc674e7f83d5d1bd445cc9100eb5f259e4b8f7fd29b SHA512 9a75c4eaba16f1faa69fe6cb55ef3c52c78162c2ec7dc5f86c74a3880b64e2e9f5c5051f83d999e5a578c22cbb13ed789c12e6e4a40a931c03c80e7381511c44 WHIRLPOOL f7e4670adc48cccb4cf57fdc45698a805b854600d9b12400fab912fd381df2af078d8035c611afe15032cc7628b890aab531833491e0da009c1ad08fa86c8f04
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160502.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160502.ebuild
new file mode 100644
index 0000000..f7d4ff7
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20160502.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-05-02_00-02-33/zip/netbeans-trunk-nightly-201605020002-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 8a4b69e..551daef 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -9,10 +9,12 @@ DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247b
 DIST netbeans-trunk-nightly-201604290002-src.zip 213411377 SHA256 d0ac79f9aceaaf246c9b20cd612472e6ecc4abc9bf6add0d61fadfca3ba85a79 SHA512 ac78733d4248f6fc6ff23705f1db5e001eca8e05c2dae7c3e2e59a60dd8afbe9e6a363188e17cb78492da6e1fe35cf5bcd87a0b0c1fc4e0d91129f0812db0bd6 WHIRLPOOL 4a704f8a4aa16130c84fd481f7e1ff45f87adb589e71955857b0342927dfe960b73adde97ba12022d265169cd4b736baa48f4bb4e10d8311bab787cbeefa28b9
 DIST netbeans-trunk-nightly-201604300002-src.zip 213455252 SHA256 8ac717a944d58471d4ceb9a22a21deaf0d1f51f4eca622ebaa8f4f100f7a5338 SHA512 32a07261706f944f02b161d687998395a588c060b2e59311b2e3e08a84237e1635df2af75d523da87845e794a906283ceae26b17d88b2c649d542ba525c94429 WHIRLPOOL da034854b495fc9d685d34a181fcdba320f58718a0a2ab939ae3bba9049941b405555db173a314f4881eac31e7d42d78641d96f7e097d68ecc2fe06a0c2133df
 DIST netbeans-trunk-nightly-201605010002-src.zip 213455252 SHA256 a7b4106579fbeddedac626ccd40f58b1ddc18259470a5166bde4959c25a346e9 SHA512 a10b319508becdd5af6e11db80443099997276faad942d22f24513d131c4627d38fcfa1facc74ad3d7ebe2625592e1797de1cbc1988e4d5eb75f2fad178f947a WHIRLPOOL 46c57850d95b3329747584e59389560dc678f1124bf5ff438068c1a04116970342fae1aa34e5ccb3607e068f91e7e6e0f45f7749b8c5a67fec0da55e885ab746
+DIST netbeans-trunk-nightly-201605020002-src.zip 213470717 SHA256 8c1cde7797484c52ae985c6530de6c6974c57d161647a32f642477c86801b3b4 SHA512 b0bdaf6d39d979a1b8bb41088ffe3780630daf3eeb7729b705a09a522bf91717ea4bd5e658aa8d144da96f98a0ea52747f15f9f073c22b67f8ddffb2a2bcf474 WHIRLPOOL 20909f886215edac9c8377d3ee7d1270942848eb94a083f0601d6c328e004f6a1bf87c2d153d739a63278274a71cebb2de00d9bf4b05707c60557cb400bfbc06
 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_p20160428.ebuild 3416 SHA256 e79a68a525a8e7b9929f6099fcd1e18066daf75b72d06556c2fa24ad49c5b998 SHA512 3d2b217ce426091f0f3cbc1f3ea8881fa21c5bb482da2830349d1283ab9192354100b994b1a3ce4cb86265356035b417e1855d3a50e88e13cd41154bfc00c83d WHIRLPOOL 72d71a968c86d7f7033c35b624852e32dfce945c6711a74b30ef71f3f017a6fc9ff1dfce9c57e1c4ccb273f60c7263dc221fcd7a26a0ffd2acaa4b5f44c05450
 EBUILD netbeans-groovy-9999_p20160429.ebuild 3416 SHA256 193f5e06ec560c2d94389cc828b04cb05259fd242a3ebd90c1ee6eb2ddc5b11a SHA512 e20d0f708d52ae85dfe8701afaa8eb8254538af7f4ac16e1fbdf84539e35a83d4a014fae8e69f9e569325f2d7f0deca72f57fae72fab9fb807f395026b49504f WHIRLPOOL 99681523978447b901a033a70db7de97ee5039d9a47f86bc6dfc61aa0d4bb56c9dc9c89e4d25bf1ede85490793dcb8756a3c15b4491adc52bf4a517a658a7930
 EBUILD netbeans-groovy-9999_p20160430.ebuild 3416 SHA256 24dc8d153b36f64517cf87056fcb8caef9f7f5b7d2c817af9f845176c547a2ee SHA512 316853d127b31c7e0a0f510ac2d287713b1d8d4919dfe53af579b408583818661a0cbf41b84f3a86a97266ef4c36cde9193adca15515edc681d6915f6f648ec4 WHIRLPOOL 8d1e3af73a61806c153ff1470926c7d2e2c529fa42d8789bf71b78f69fa127e39baec1c0cb8f95c62a03c5ef6f2b9c9488dccf8845570dc99726f3d49ee29d4c
 EBUILD netbeans-groovy-9999_p20160501.ebuild 3416 SHA256 e16cff40a4e8cfaf026dc9ec4b60785b3527bcf5a6e3bf4bb8c60a762a69217a SHA512 1082e3cd464ec748ae2f6fb4420ee15be6f6b8ccdc29386054bb65dea4952aeca7d1c90869d121c266ab4d20404dba155aeff67fe14799ffa81ed7491cb34a22 WHIRLPOOL 287e39c154ca8d8cb7272df94cbd231a89dd3e84edbb4653b304ee2bc324f57fde45625d2136843a7264961b8d0e349907d10b6cb5f188052de90ea313f96d26
+EBUILD netbeans-groovy-9999_p20160502.ebuild 3416 SHA256 8e02a0a76c89245aa3b97661eb199279b714901b7d9ea4d6265160470d3365af SHA512 208ed92226c68fbf8521fa30ca60adcbf80c8823ed585667423d93a8d0ebcb7882907487a743363e64999ad7ef6fb59af0e90d086397f9577da78b7134308e95 WHIRLPOOL 8138a1b03ad6eb5567f36d7fa5e799fbc434277e5bc6ab2be0b1d0d0ac4ec160f727c59fe0217b63495f38b2d29b499d45dab32a04d01d906e022642fa3d9150
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160502.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160502.ebuild
new file mode 100644
index 0000000..b4336d2
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160502.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-05-02_00-02-33/zip/netbeans-trunk-nightly-201605020002-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 ae6eed9..51dbc31 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -12,10 +12,12 @@ DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247b
 DIST netbeans-trunk-nightly-201604290002-src.zip 213411377 SHA256 d0ac79f9aceaaf246c9b20cd612472e6ecc4abc9bf6add0d61fadfca3ba85a79 SHA512 ac78733d4248f6fc6ff23705f1db5e001eca8e05c2dae7c3e2e59a60dd8afbe9e6a363188e17cb78492da6e1fe35cf5bcd87a0b0c1fc4e0d91129f0812db0bd6 WHIRLPOOL 4a704f8a4aa16130c84fd481f7e1ff45f87adb589e71955857b0342927dfe960b73adde97ba12022d265169cd4b736baa48f4bb4e10d8311bab787cbeefa28b9
 DIST netbeans-trunk-nightly-201604300002-src.zip 213455252 SHA256 8ac717a944d58471d4ceb9a22a21deaf0d1f51f4eca622ebaa8f4f100f7a5338 SHA512 32a07261706f944f02b161d687998395a588c060b2e59311b2e3e08a84237e1635df2af75d523da87845e794a906283ceae26b17d88b2c649d542ba525c94429 WHIRLPOOL da034854b495fc9d685d34a181fcdba320f58718a0a2ab939ae3bba9049941b405555db173a314f4881eac31e7d42d78641d96f7e097d68ecc2fe06a0c2133df
 DIST netbeans-trunk-nightly-201605010002-src.zip 213455252 SHA256 a7b4106579fbeddedac626ccd40f58b1ddc18259470a5166bde4959c25a346e9 SHA512 a10b319508becdd5af6e11db80443099997276faad942d22f24513d131c4627d38fcfa1facc74ad3d7ebe2625592e1797de1cbc1988e4d5eb75f2fad178f947a WHIRLPOOL 46c57850d95b3329747584e59389560dc678f1124bf5ff438068c1a04116970342fae1aa34e5ccb3607e068f91e7e6e0f45f7749b8c5a67fec0da55e885ab746
+DIST netbeans-trunk-nightly-201605020002-src.zip 213470717 SHA256 8c1cde7797484c52ae985c6530de6c6974c57d161647a32f642477c86801b3b4 SHA512 b0bdaf6d39d979a1b8bb41088ffe3780630daf3eeb7729b705a09a522bf91717ea4bd5e658aa8d144da96f98a0ea52747f15f9f073c22b67f8ddffb2a2bcf474 WHIRLPOOL 20909f886215edac9c8377d3ee7d1270942848eb94a083f0601d6c328e004f6a1bf87c2d153d739a63278274a71cebb2de00d9bf4b05707c60557cb400bfbc06
 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_p20160428.ebuild 4126 SHA256 6fa78ddd6b86962f5c5ddadd1493edf1f6545863f195b3bf390c970a07cb0b30 SHA512 6a9dc57df3f90fc79d5d372454fbabfa86ae4fbe951896018dfc6682663617721e3cbff4e68c051bf22c5d0764840ab2abf993f3754f7d6c27c44fe20125bc2e WHIRLPOOL 81e8cbac2a7fb4b976bdf5c6764f619f3b9130cf3c1d0f9ea80eebf3c58bba95aa61a8e5c10c2d52122a138c58fc51f5ce63fb36a1462e98577e64bed9e8637a
 EBUILD netbeans-harness-9999_p20160429.ebuild 4126 SHA256 fbc8a05c691e4b9d7e9d1fd8b952aec66d98b7dfc2de71e7068b1e0d151f39b1 SHA512 bf486a03dd2bb9740a67fc49aeaf0eaf02ec5284c0d162a25609d53ce27e31041d4bc369467e44c97088cb56e320f03987186597e326ab2bc2ca7995c7d3a787 WHIRLPOOL 9290445142f4b0fb2f629cfe9f45de6818166780540f479680853b539969cc35baf7e53276217c81fbd625d99c032127895d1ea01b699ed95b41f5de95d41f97
 EBUILD netbeans-harness-9999_p20160430.ebuild 4126 SHA256 63e4b6d886348f7f39077305292df0ad29183de98d727035ecb3ef85531d5f10 SHA512 db0f8c1b25cd93d77dab0c65fb4acd11af91dbc665014acf0aeed05c608103aae62b099f4be5a96a7d19f17c12f11b8b9436f05a2a25202889c2cdf283ec798e WHIRLPOOL 00b6fd7f9e4eecb2ac1c58a26cff2e70b9bad1268661aa598d525e41135a4e6d2ca9facff3961a44e4fb6a17561e4410c640bb48bfa2b6b59b1fd4c5b07ff172
 EBUILD netbeans-harness-9999_p20160501.ebuild 4126 SHA256 96e9b8bbef35ea075a2e363a0f46aa0bd52441dbe5ab95868ff537732d6bc2a7 SHA512 f402b5c1f86f2591dc0098ead7c5a44d305fd4c4e3f1463fcd7aa9a766b5915110d281c8756c792aaec5b5edeeaef740660e9c583b75e714c239093299909002 WHIRLPOOL 4a750dc8472779a49d49c510a7c96a45973462b6c299df6a1dfecb6c77ff907b624cb1ff9c56a3b3d1d0a86b5388c8d14aafd93a00e50672a5d6f77a563a3880
+EBUILD netbeans-harness-9999_p20160502.ebuild 4126 SHA256 7a8289b781c50aae8effb6dfeff1b2bea2e251243bde6eb3a48c47ec2b49cda5 SHA512 d7852472f6ac16f2535b48d735883ce59c566074b5ed0a27095b8444740fa11bdfb9e874fc357a2d958c14875c4b3f3d94b4e66f70a134b233f38b72849c6c5a WHIRLPOOL 361e97f07907d5c86a161b24e21aaacd92151db684c0f369feeb8df4e5f736c90251b5542bc87af14c08be788d976b35a317172ce810f9b0958035b592b366dd
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160502.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160502.ebuild
new file mode 100644
index 0000000..d8e2d09
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20160502.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-05-02_00-02-33/zip/netbeans-trunk-nightly-201605020002-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 986531c..33f9994 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -146,10 +146,12 @@ DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247b
 DIST netbeans-trunk-nightly-201604290002-src.zip 213411377 SHA256 d0ac79f9aceaaf246c9b20cd612472e6ecc4abc9bf6add0d61fadfca3ba85a79 SHA512 ac78733d4248f6fc6ff23705f1db5e001eca8e05c2dae7c3e2e59a60dd8afbe9e6a363188e17cb78492da6e1fe35cf5bcd87a0b0c1fc4e0d91129f0812db0bd6 WHIRLPOOL 4a704f8a4aa16130c84fd481f7e1ff45f87adb589e71955857b0342927dfe960b73adde97ba12022d265169cd4b736baa48f4bb4e10d8311bab787cbeefa28b9
 DIST netbeans-trunk-nightly-201604300002-src.zip 213455252 SHA256 8ac717a944d58471d4ceb9a22a21deaf0d1f51f4eca622ebaa8f4f100f7a5338 SHA512 32a07261706f944f02b161d687998395a588c060b2e59311b2e3e08a84237e1635df2af75d523da87845e794a906283ceae26b17d88b2c649d542ba525c94429 WHIRLPOOL da034854b495fc9d685d34a181fcdba320f58718a0a2ab939ae3bba9049941b405555db173a314f4881eac31e7d42d78641d96f7e097d68ecc2fe06a0c2133df
 DIST netbeans-trunk-nightly-201605010002-src.zip 213455252 SHA256 a7b4106579fbeddedac626ccd40f58b1ddc18259470a5166bde4959c25a346e9 SHA512 a10b319508becdd5af6e11db80443099997276faad942d22f24513d131c4627d38fcfa1facc74ad3d7ebe2625592e1797de1cbc1988e4d5eb75f2fad178f947a WHIRLPOOL 46c57850d95b3329747584e59389560dc678f1124bf5ff438068c1a04116970342fae1aa34e5ccb3607e068f91e7e6e0f45f7749b8c5a67fec0da55e885ab746
+DIST netbeans-trunk-nightly-201605020002-src.zip 213470717 SHA256 8c1cde7797484c52ae985c6530de6c6974c57d161647a32f642477c86801b3b4 SHA512 b0bdaf6d39d979a1b8bb41088ffe3780630daf3eeb7729b705a09a522bf91717ea4bd5e658aa8d144da96f98a0ea52747f15f9f073c22b67f8ddffb2a2bcf474 WHIRLPOOL 20909f886215edac9c8377d3ee7d1270942848eb94a083f0601d6c328e004f6a1bf87c2d153d739a63278274a71cebb2de00d9bf4b05707c60557cb400bfbc06
 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_p20160428.ebuild 30761 SHA256 d6735e6e8cf412cbfb9dd4a2f0f68f8296b74e03fe87b12150506f7c063f281d SHA512 d3c49f4a00823801049688170c461ebcc5de106f30fa11e232d953a56cf196c946610cbda0216f393c28923efd5017a28d8fc5870d90e98c6a5fd347a400711d WHIRLPOOL ba3d111337fd5e21e3a4e97457c1f00f2b53b0af20991833203c6f68301520853731f63b291d6adc55d6a96b42d52e13e6d65bd6dcf529c39bc40f30d334155a
 EBUILD netbeans-ide-9999_p20160429.ebuild 30761 SHA256 2ae3370291b5d623f905e5c713209050e57b45445f3fe4f7d44ec9a74e69422f SHA512 f1110a99d0e4b9f94019cab2169aa99932d1361377c7f709372a85a2aaf07c3b56f37c8c0e5d7a7f3c3198ee1e76ed565eccb56d44a82d75de733950e853cbe0 WHIRLPOOL f2a2b549b4ed393af308a9dd52d57ff8172dc246c1535440bff99004e605fd41525ba7ca02cd6afe87e43a997fc4f4ece380bd6ebe3f7947894914a57fd45510
 EBUILD netbeans-ide-9999_p20160430.ebuild 30761 SHA256 57128e51bcebcdf8c0e950ec6e6681b7c496388c9e2bc60d6ee78e3edd9cf06f SHA512 d6373d9c2c0359ff491aa30e227332abdfabf35eaf76a64ad1aa6994d33a9ac916d1733b95530b296203e20f9b5f11cea26019776b2341834b0b08ab0fafecaf WHIRLPOOL 21d6ce2570a3992f30a0b445b5a577f3a871fe04368170ff29c1d7bf600b434e273d541880ad66d0100fb4d71c1ba92082f73f49abb26abae5285fe1b4332bc1
 EBUILD netbeans-ide-9999_p20160501.ebuild 30761 SHA256 387b3567dd88289998240cc82c47ca3585118914f01b36299c41dad8653f4199 SHA512 e28a3e8a7fed74b1ddeff8b1703e52b1a3bcf9e4ddd15b4f7b1a5343596af97c604dcb1f62d7c15ecbfad5330f6d8b6557d16075695c9dc61c2411ad9a63182b WHIRLPOOL 351e707de107ed9d6681c6ab5d9d8e8886a7aa8aaac44875dbafa29ecb5e1b516360c576f195ff55e29d8600268a919d4ea71935fdc828a986de40fc5cb321ab
+EBUILD netbeans-ide-9999_p20160502.ebuild 30761 SHA256 f64670c6c87c7a53f309c7cd818235923301a460da60d03e2c75eb28004172c9 SHA512 ffc0a8b6ff8ab2f986cfc989b01654ae9e99c3ddbdc98ae765f32196f5dbf6ef55e29f92bb208dc9c956370a2512f3ca6fdf34ca1ef36927c47f34bcebc8bd65 WHIRLPOOL a8534e14c92440b3a0fdcbf3ac5c3641c1bc589011d939c4f4053dc2a95fb9515f39bbaa7de686469f1719272d9a2186566627b5c1b93487f881162758eaf7e0
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160502.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160502.ebuild
new file mode 100644
index 0000000..8fffb5c
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20160502.ebuild
@@ -0,0 +1,382 @@
+# 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-05-02_00-02-33/zip/netbeans-trunk-nightly-201605020002-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/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.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/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-js-corestubs.zip
+	http://hg.netbeans.org/binaries/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip
+	http://hg.netbeans.org/binaries/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip
+	http://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar
+	http://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar
+	http://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar
+	http://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar
+	http://hg.netbeans.org/binaries/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar
+	http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
+	http://hg.netbeans.org/binaries/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar
+	http://hg.netbeans.org/binaries/AA2671239EBB762FEEE8B908E9F35473A72AFE1B-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar
+	http://hg.netbeans.org/binaries/1605B38BB28EAE32C11EAB8F9E238A497754A5B8-org.eclipse.core.jobs-3.5.101_nosignature.jar
+	http://hg.netbeans.org/binaries/20800206EB8B490F3CE5BB8AC8A7C3B9E8004A30-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar
+	http://hg.netbeans.org/binaries/D2D2105B1E3C9E2FA6240AD088237A57590DDA8D-org.eclipse.core.runtime-3.7.0_nosignature.jar
+	http://hg.netbeans.org/binaries/16507EAFDC2B95121AA718895BDB54D616EE4B0F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar
+	http://hg.netbeans.org/binaries/BD55836AABD558DC643A7844B78866AD990544BC-org.eclipse.equinox.app-1.3.100_nosignature.jar
+	http://hg.netbeans.org/binaries/4EE275AE73A140A403903D7E4DBA68C8FBB07001-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar
+	http://hg.netbeans.org/binaries/B7001D9CC2E2AC4E167D22A13063F0350C71AAA9-org.eclipse.equinox.preferences-3.4.2_nosignature.jar
+	http://hg.netbeans.org/binaries/C647079E36A4EB7A24AED2C545E4F0F94194C4D1-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar
+	http://hg.netbeans.org/binaries/9267CF311F979078211A70C1B19AF8A8EE71DC8E-org.eclipse.equinox.security-1.1.1_nosignature.jar
+	http://hg.netbeans.org/binaries/B580E446B543A8DD2F5AA368B07F9C4C9C2E7029-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar
+	http://hg.netbeans.org/binaries/244560B99152F3F9BC75DF2D6FAFA8A5216B06B6-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar
+	http://hg.netbeans.org/binaries/8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar
+	http://hg.netbeans.org/binaries/D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar
+	http://hg.netbeans.org/binaries/4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar
+	http://hg.netbeans.org/binaries/8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar
+	http://hg.netbeans.org/binaries/50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar
+	http://hg.netbeans.org/binaries/4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar
+	http://hg.netbeans.org/binaries/11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar
+	http://hg.netbeans.org/binaries/A3FEF6144ED1622E4CDD506B9D745527CC675D8D-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar
+	http://hg.netbeans.org/binaries/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/5C322A10E13FADE0451263035B7AA26B63AAFA47-validator.jar
+	http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar
+	http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar
+	http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar
+	http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-platform-${PV}
+	dev-java/commons-compress:0
+	dev-java/commons-httpclient:3
+	dev-java/commons-logging:0
+	dev-java/icu4j:55
+	dev-java/iso-relax:0
+	dev-java/jdbc-mysql:0
+	dev-java/jdbc-postgresql:0
+	>=dev-java/jsch-0.1.46:0
+	>=dev-java/json-simple-1.1:0
+	dev-java/jsr173:0
+	dev-java/jvyamlb:0
+	dev-java/log4j:0
+	dev-java/lucene:3.5
+	dev-java/rhino:1.6
+	dev-java/saxon:9
+	dev-java/smack:2.2
+	dev-java/sun-jaf:0
+	dev-java/tomcat-servlet-api:2.2
+	dev-java/ws-commons-util:0
+	dev-java/xerces:2"
+#	dev-vcs/subversion>=1.8.4:0[java] missing from the tree
+#	app-text/jing:0 our version is probably too old
+#	dev-java/commons-io:1 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/commons-lang:2.1 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/freemarker:2.3
+#	dev-java/guava:15 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/ini4j:0 our version is too old
+#	dev-java/jaxb:2 upstream version contains more stuff so websvccommon does not compile with ours
+#	dev-java/jzlib:0 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/trilead-ssh2:0 in overlay
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	dev-java/commons-codec:0
+	${CDEPEND}
+	dev-java/javacc:0
+	dev-java/javahelp:0
+	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}"/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}"/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}"/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-js-corestubs.zip javascript2.editor/external/js-corestubs.zip || die
+	ln -s "${DISTDIR}"/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip javascript2.editor/external/js-domstubs.zip || die
+	ln -s "${DISTDIR}"/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip javascript2.editor/external/js-reststubs.zip || die
+	ln -s "${DISTDIR}"/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.core-0.0.7.jar || die
+	ln -s "${DISTDIR}"/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.sshagent-0.0.7.jar || die
+	ln -s "${DISTDIR}"/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.pageant-0.0.7.jar || die
+	ln -s "${DISTDIR}"/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.usocket-jna-0.0.7.jar || die
+	ln -s "${DISTDIR}"/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar c.jcraft.jzlib/external/jzlib-1.0.7.jar || die
+	ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.process/external/libpam4j-1.1.jar || die
+	ln -s "${DISTDIR}"/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar libs.nashorn/external/nashorn-02f810c26ff9-patched.jar || die
+	ln -s "${DISTDIR}"/AA2671239EBB762FEEE8B908E9F35473A72AFE1B-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar o.eclipse.core.contenttype/external/org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar || die
+	ln -s "${DISTDIR}"/1605B38BB28EAE32C11EAB8F9E238A497754A5B8-org.eclipse.core.jobs-3.5.101_nosignature.jar o.eclipse.core.jobs/external/org.eclipse.core.jobs-3.5.101_nosignature.jar || die
+	ln -s "${DISTDIR}"/20800206EB8B490F3CE5BB8AC8A7C3B9E8004A30-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar o.eclipse.core.net/external/org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar || die
+	ln -s "${DISTDIR}"/D2D2105B1E3C9E2FA6240AD088237A57590DDA8D-org.eclipse.core.runtime-3.7.0_nosignature.jar o.eclipse.core.runtime/external/org.eclipse.core.runtime-3.7.0_nosignature.jar || die
+	ln -s "${DISTDIR}"/16507EAFDC2B95121AA718895BDB54D616EE4B0F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar o.eclipse.core.runtime.compatibility.auth/external/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar || die
+	ln -s "${DISTDIR}"/BD55836AABD558DC643A7844B78866AD990544BC-org.eclipse.equinox.app-1.3.100_nosignature.jar o.eclipse.equinox.app/external/org.eclipse.equinox.app-1.3.100_nosignature.jar || die
+	ln -s "${DISTDIR}"/4EE275AE73A140A403903D7E4DBA68C8FBB07001-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar o.eclipse.equinox.common/external/org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar || die
+	ln -s "${DISTDIR}"/B7001D9CC2E2AC4E167D22A13063F0350C71AAA9-org.eclipse.equinox.preferences-3.4.2_nosignature.jar o.eclipse.equinox.preferences/external/org.eclipse.equinox.preferences-3.4.2_nosignature.jar || die
+	ln -s "${DISTDIR}"/C647079E36A4EB7A24AED2C545E4F0F94194C4D1-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar o.eclipse.equinox.registry/external/org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar || die
+	ln -s "${DISTDIR}"/9267CF311F979078211A70C1B19AF8A8EE71DC8E-org.eclipse.equinox.security-1.1.1_nosignature.jar o.eclipse.equinox.security/external/org.eclipse.equinox.security-1.1.1_nosignature.jar || die
+	ln -s "${DISTDIR}"/B580E446B543A8DD2F5AA368B07F9C4C9C2E7029-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit/external/org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar || die
+	ln -s "${DISTDIR}"/244560B99152F3F9BC75DF2D6FAFA8A5216B06B6-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit.java7/external/org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar || die
+	ln -s "${DISTDIR}"/8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar || die
+	ln -s "${DISTDIR}"/D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar || die
+	ln -s "${DISTDIR}"/4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar || die
+	ln -s "${DISTDIR}"/8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar o.eclipse.mylyn.commons.repositories.core/external/org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar || die
+	ln -s "${DISTDIR}"/50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar || die
+	ln -s "${DISTDIR}"/4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar || die
+	ln -s "${DISTDIR}"/11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.confluence.core/external/org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar || die
+	ln -s "${DISTDIR}"/A3FEF6144ED1622E4CDD506B9D745527CC675D8D-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar || die
+	ln -s "${DISTDIR}"/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}"/5C322A10E13FADE0451263035B7AA26B63AAFA47-validator.jar html.validation/external/validator.jar || die
+	ln -s "${DISTDIR}"/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar extexecution.process/external/winp-1.14-patched.jar || die
+	ln -s "${DISTDIR}"/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar o.apache.xmlrpc/external/xmlrpc-client-3.0.jar || die
+	ln -s "${DISTDIR}"/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar o.apache.xmlrpc/external/xmlrpc-common-3.0.jar || die
+	ln -s "${DISTDIR}"/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar o.apache.xmlrpc/external/xmlrpc-server-3.0.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-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.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	popd >/dev/null || die
+
+	java-pkg_jar-from --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.53.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar
+	java-pkg_jar-from --build-only --into db.sql.visualeditor/external javacc javacc.jar javacc-3.2.jar
+	java-pkg_jar-from --into html.parser/external icu4j-55 icu4j.jar icu4j-4_4_2.jar
+	java-pkg_jar-from --into html.validation/external iso-relax iso-relax.jar isorelax.jar
+	java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar
+	java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar
+	java-pkg_jar-from --into libs.commons_compress/external commons-compress commons-compress.jar commons-compress-1.8.1.jar
+	# java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.19.jar
+	java-pkg_jar-from --build-only --into libs.jna/external jna jna.jar jna-4.2.2.jar
+	java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
+	java-pkg_jar-from --into libs.lucene/external lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
+	java-pkg_jar-from --into libs.smack/external smack-2.2 smack.jar smack.jar
+	java-pkg_jar-from --into libs.smack/external smack-2.2 smackx.jar smackx.jar
+	# java-pkg_jar-from --into libs.svnClientAdapter.javahl/external subversion svn-javahl.jar svnjavahl-1.8.4.jar
+	java-pkg_jar-from --into libs.xerces/external xerces-2 xercesImpl.jar xerces-2.8.0.jar
+	java-pkg_jar-from --build-only --into o.apache.commons.codec/external commons-codec commons-codec.jar apache-commons-codec-1.3.jar
+	java-pkg_jar-from --into o.apache.commons.httpclient/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.1.jar
+	java-pkg_jar-from --into o.apache.commons.logging/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
+	java-pkg_jar-from --into o.apache.ws.commons.util/external ws-commons-util ws-commons-util.jar ws-commons-util-1.0.1.jar
+	java-pkg_jar-from --into servletapi/external tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
+	java-pkg_jar-from --into xml.jaxb.api/external sun-jaf activation.jar activation.jar
+	java-pkg_jar-from --into xml.jaxb.api/external jsr173 jsr173.jar jsr173_1.0_api.jar
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	unset DISPLAY
+	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+	pushd nbbuild/netbeans/ide >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/ide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	rm -fr "${D}"/${INSTALL_DIR}/bin/nativeexecution || die
+	rm -fr "${D}"/${INSTALL_DIR}/modules/lib || die
+
+	insinto ${INSTALL_DIR}/bin/nativeexecution
+	doins bin/nativeexecution/*
+
+	pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution >/dev/null || die
+	for file in *.sh ; do
+		fperms 755 ${file}
+	done
+	popd >/dev/null || die
+
+	if use x86 ; then
+		doins -r bin/nativeexecution/Linux-x86
+		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86 >/dev/null || die
+		for file in * ; do
+			fperms 755 ${file}
+		done
+		popd >/dev/null || die
+	elif use amd64 ; then
+		doins -r bin/nativeexecution/Linux-x86_64
+		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86_64 >/dev/null || die
+		for file in * ; do
+			fperms 755 ${file}
+		done
+		popd >/dev/null || die
+	fi
+
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules
+	pushd "${instdir}" >/dev/null || die
+	rm com-jcraft-jsch.jar && java-pkg_jar-from --into "${instdir}" jsch jsch.jar com-jcraft-jsch.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext
+	pushd "${instdir}" >/dev/null || die
+	rm commons-compress-1.8.1.jar && java-pkg_jar-from --into "${instdir}" commons-compress commons-compress.jar commons-compress-1.8.1.jar
+	# rm freemarker-2.3.19.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.19.jar || die
+	rm icu4j-4_4_2.jar && java-pkg_jar-from --into "${instdir}" icu4j-55 icu4j.jar icu4j-4_4_2.jar
+	rm isorelax.jar && java-pkg_jar-from --into "${instdir}" iso-relax iso-relax.jar isorelax.jar
+	rm json-simple-1.1.1.jar && java-pkg_jar-from --into "${instdir}" json-simple json-simple.jar json-simple-1.1.1.jar
+	rm jvyamlb-0.2.7.jar && java-pkg_jar-from --into "${instdir}" jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
+	rm log4j-1.2.15.jar && java-pkg_jar-from --into "${instdir}" log4j log4j.jar log4j-1.2.15.jar
+	rm lucene-core-3.5.0.jar && java-pkg_jar-from --into "${instdir}" lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
+	rm mysql-connector-java-5.1.23-bin.jar && java-pkg_jar-from --into "${instdir}" jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
+	rm postgresql-9.2-1002.jdbc4.jar && java-pkg_jar-from --into "${instdir}" jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar
+	rm saxon9B.jar && java-pkg_jar-from --into "${instdir}" saxon-9 saxon.jar saxon9B.jar
+	rm servlet-2.2.jar && java-pkg_jar-from --into "${instdir}" tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
+	rm smack.jar && java-pkg_jar-from --into "${instdir}" smack-2.2 smack.jar
+	rm smackx.jar && java-pkg_jar-from --into "${instdir}" smack-2.2 smackx.jar
+	# rm svnjavahl.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl.jar || die
+	rm xerces-2.8.0.jar && java-pkg_jar-from --into "${instdir}" xerces-2 xercesImpl.jar xerces-2.8.0.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxb
+	pushd "${instdir}" >/dev/null || die
+	rm activation.jar && java-pkg_jar-from --into "${instdir}" sun-jaf activation.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxb/api
+	pushd "${instdir}" >/dev/null || die
+	rm jsr173_1.0_api.jar && java-pkg_jar-from --into "${instdir}" jsr173 jsr173.jar jsr173_1.0_api.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ide
+}

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index a5b90dc..d320197 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -40,10 +40,12 @@ DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247b
 DIST netbeans-trunk-nightly-201604290002-src.zip 213411377 SHA256 d0ac79f9aceaaf246c9b20cd612472e6ecc4abc9bf6add0d61fadfca3ba85a79 SHA512 ac78733d4248f6fc6ff23705f1db5e001eca8e05c2dae7c3e2e59a60dd8afbe9e6a363188e17cb78492da6e1fe35cf5bcd87a0b0c1fc4e0d91129f0812db0bd6 WHIRLPOOL 4a704f8a4aa16130c84fd481f7e1ff45f87adb589e71955857b0342927dfe960b73adde97ba12022d265169cd4b736baa48f4bb4e10d8311bab787cbeefa28b9
 DIST netbeans-trunk-nightly-201604300002-src.zip 213455252 SHA256 8ac717a944d58471d4ceb9a22a21deaf0d1f51f4eca622ebaa8f4f100f7a5338 SHA512 32a07261706f944f02b161d687998395a588c060b2e59311b2e3e08a84237e1635df2af75d523da87845e794a906283ceae26b17d88b2c649d542ba525c94429 WHIRLPOOL da034854b495fc9d685d34a181fcdba320f58718a0a2ab939ae3bba9049941b405555db173a314f4881eac31e7d42d78641d96f7e097d68ecc2fe06a0c2133df
 DIST netbeans-trunk-nightly-201605010002-src.zip 213455252 SHA256 a7b4106579fbeddedac626ccd40f58b1ddc18259470a5166bde4959c25a346e9 SHA512 a10b319508becdd5af6e11db80443099997276faad942d22f24513d131c4627d38fcfa1facc74ad3d7ebe2625592e1797de1cbc1988e4d5eb75f2fad178f947a WHIRLPOOL 46c57850d95b3329747584e59389560dc678f1124bf5ff438068c1a04116970342fae1aa34e5ccb3607e068f91e7e6e0f45f7749b8c5a67fec0da55e885ab746
+DIST netbeans-trunk-nightly-201605020002-src.zip 213470717 SHA256 8c1cde7797484c52ae985c6530de6c6974c57d161647a32f642477c86801b3b4 SHA512 b0bdaf6d39d979a1b8bb41088ffe3780630daf3eeb7729b705a09a522bf91717ea4bd5e658aa8d144da96f98a0ea52747f15f9f073c22b67f8ddffb2a2bcf474 WHIRLPOOL 20909f886215edac9c8377d3ee7d1270942848eb94a083f0601d6c328e004f6a1bf87c2d153d739a63278274a71cebb2de00d9bf4b05707c60557cb400bfbc06
 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_p20160428.ebuild 15656 SHA256 197082a052d63c9aea66f8595e7a2cdc28ef3a0c3e662f4dbf215d794e2b8129 SHA512 5658fd47bd0582945b333a666e47eab9d358fe92277725edfdedde5ae5572b51aed6a63808e13c5d27bb788738fcd263baf36c6b1ff8740153fd89605a5aa9f4 WHIRLPOOL ac7ecbd6bea378255961f986f2998bc6bfdd6bff3343df76ad4f3445bf2d8a0815437cf547dd50a9b4ed4c80b57c027e77b9c39b22ed3d9769dce35672ec02fa
 EBUILD netbeans-java-9999_p20160429.ebuild 15656 SHA256 69aba6e099a96f071eef4d03dc3367aeb36f4f9d8d82808d894cbb3d64b5ee06 SHA512 9e1949638884d3e6cf46fdf79bf21afb0afe3fd5859cac1127f6d2ea2d3304746378e76c674c0031a4b372dff7badc8848aab5e8866e459c00c0f67574beec80 WHIRLPOOL bc9a0704a355e727d352475388e7424f166a48a74af8be4de0725a45ca3e4f00434802d6e3a59ef7372fc4484adb08879af320f12b6fc52e4c1f8a52cc10bdb5
 EBUILD netbeans-java-9999_p20160430.ebuild 15656 SHA256 25fd51247bc67e579554cd2fe817c5ff4bedcd3ca431f5a7f7d4a4cbf54825a8 SHA512 063bb5fc4cacdfda1609193fe6a34fc1f5d39e84745ec2c2cec8d9bf151d0f49a41ebd042b47a73e33651b112abe8801d59f798a5f0051d37a6ffebab19d4605 WHIRLPOOL 2414a92762c16f3e3ccb08d8e9882dba4de2cce320dbd28b086f95ee8ac485ab516532705f778becbc9cc38898288bef3dbab97a57cae10b53d71f03b63079d3
 EBUILD netbeans-java-9999_p20160501.ebuild 15656 SHA256 45141da1515612357276a060d43b1ac5c4b0aa01b202d5f71e241af562e4eba0 SHA512 fba12750ea2567c34568ff2743003afcf12a1e0f536b48ae6273087848072befb00a63caf734d111a568a30578add8f8b2f065bdbdce77c471b857085882ed1a WHIRLPOOL f6d0f280d5124438be05a9ba3ababc59e293c5fcb765d133009ba18cbb98cf0e13d4e179b3e0c577e0227f5ca7cf3de59fb4057128fd45a45a6e9ed01693c7c9
+EBUILD netbeans-java-9999_p20160502.ebuild 15656 SHA256 3ef21fbc7acea311b72f58ee2aa7cbda5af4827118d1c1ce384c214878deb651 SHA512 586f3d93d53a6420ef3745ad4778bbf596599bd7f248864a11bcc8f6776e2de52a18510867acd4ecdd1e9335bdc5c3c60bb3b0ea2f9107816fce111768b14b1b WHIRLPOOL 627642892a4f2a16f5ff23405f57cc83b1ec6ec5d191eb9ad5ac977f9445a230637d74105f5e8800ade110097eebbf3f6fe65e1be1b39bbe9a5f254ac7d30dc6
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160502.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160502.ebuild
new file mode 100644
index 0000000..73384f2
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20160502.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-05-02_00-02-33/zip/netbeans-trunk-nightly-201605020002-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/E3764E0AB4F9F9ED16AEB6A68B8E3F2442DDCCB6-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}"/E3764E0AB4F9F9ED16AEB6A68B8E3F2442DDCCB6-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 9257600..6d8df5c 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -10,10 +10,12 @@ DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247b
 DIST netbeans-trunk-nightly-201604290002-src.zip 213411377 SHA256 d0ac79f9aceaaf246c9b20cd612472e6ecc4abc9bf6add0d61fadfca3ba85a79 SHA512 ac78733d4248f6fc6ff23705f1db5e001eca8e05c2dae7c3e2e59a60dd8afbe9e6a363188e17cb78492da6e1fe35cf5bcd87a0b0c1fc4e0d91129f0812db0bd6 WHIRLPOOL 4a704f8a4aa16130c84fd481f7e1ff45f87adb589e71955857b0342927dfe960b73adde97ba12022d265169cd4b736baa48f4bb4e10d8311bab787cbeefa28b9
 DIST netbeans-trunk-nightly-201604300002-src.zip 213455252 SHA256 8ac717a944d58471d4ceb9a22a21deaf0d1f51f4eca622ebaa8f4f100f7a5338 SHA512 32a07261706f944f02b161d687998395a588c060b2e59311b2e3e08a84237e1635df2af75d523da87845e794a906283ceae26b17d88b2c649d542ba525c94429 WHIRLPOOL da034854b495fc9d685d34a181fcdba320f58718a0a2ab939ae3bba9049941b405555db173a314f4881eac31e7d42d78641d96f7e097d68ecc2fe06a0c2133df
 DIST netbeans-trunk-nightly-201605010002-src.zip 213455252 SHA256 a7b4106579fbeddedac626ccd40f58b1ddc18259470a5166bde4959c25a346e9 SHA512 a10b319508becdd5af6e11db80443099997276faad942d22f24513d131c4627d38fcfa1facc74ad3d7ebe2625592e1797de1cbc1988e4d5eb75f2fad178f947a WHIRLPOOL 46c57850d95b3329747584e59389560dc678f1124bf5ff438068c1a04116970342fae1aa34e5ccb3607e068f91e7e6e0f45f7749b8c5a67fec0da55e885ab746
+DIST netbeans-trunk-nightly-201605020002-src.zip 213470717 SHA256 8c1cde7797484c52ae985c6530de6c6974c57d161647a32f642477c86801b3b4 SHA512 b0bdaf6d39d979a1b8bb41088ffe3780630daf3eeb7729b705a09a522bf91717ea4bd5e658aa8d144da96f98a0ea52747f15f9f073c22b67f8ddffb2a2bcf474 WHIRLPOOL 20909f886215edac9c8377d3ee7d1270942848eb94a083f0601d6c328e004f6a1bf87c2d153d739a63278274a71cebb2de00d9bf4b05707c60557cb400bfbc06
 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_p20160428.ebuild 4971 SHA256 953faa9ef469c397ce24d47c608926a014b50202ec5197261f4d7118a5a2be0c SHA512 a14dc4090bef622fd3b13dcf19d2f692996d541b54ee156c2bd7cc87da5a5273c955fa829026f88e3d04be09f4275e41be797eee29a64c0b5af13eb7955b9527 WHIRLPOOL fed09a4d12a7adb2ac2de781f5452df9764cd56ae26e8396d516c06e739af88f34b44135f1a7a136d972ff545fb807d69fd6ed2fb82370eb09020a4f822e8a8e
 EBUILD netbeans-javacard-9999_p20160429.ebuild 4971 SHA256 e92b8594afb8fd58ca38c9683807acf8e9c5a6cc2a2bc69410ebb7d3ed5aa1bc SHA512 385c1488c84c2b2370c9c0e0a927fc40a2be234be6bd3a9c6d213ca02b1a7a2bd091443adff4924d09accb891a01c10eaa27e8b29e1b7dfbf3c5d493893c45bf WHIRLPOOL 952b838e8ae795bc46118c119385fbafcf32d7e4f513f5232680f6db17dd6d2e670aaaa319467baad0dd5ff9eef3f1c35f11a2b8e614a131dd05cb4f5c72e17d
 EBUILD netbeans-javacard-9999_p20160430.ebuild 4971 SHA256 20462176c170768faffa16b9eac3f2349caea337dafeacbf58ad9778924ec032 SHA512 347b7f5473f750d9a57149e9ab317a1be360ed0d27007d521920867de1c1ceac62343fb79f05589d6132bc42c447e00f9821bf139955a52344cb43ce30741ea2 WHIRLPOOL c188dcc97df4ea053513e7ebce5c513609ca87301bd7f326e78433c1827dfc70ff7caf470a01cfc2dccaa5389ac64c2c0b6d7939c6f3b7c10eb7e91c70e7d401
 EBUILD netbeans-javacard-9999_p20160501.ebuild 4971 SHA256 5722deb49657c676c3040740712276c1fede746cbe0fb0e44b8912529bd67773 SHA512 7d4d4b53f3b31a02a84fea8ce24ac6f2176ebd15cf9244003a26e79f43b5b33c7301c33a0fcce4c9440429aa8f7273794c66545cf9b3eb1fba1d9e6ee34bc52e WHIRLPOOL a3ba0163bd0006728a42398e083024681fed9dd54462cb17bbf99387df1be63e6d82b84cc65afa9292cca5b3bab7a4f1b81a935ecedeaacb6c92e75d5d0510d2
+EBUILD netbeans-javacard-9999_p20160502.ebuild 4971 SHA256 d4c54a7e87cde2af0fd17108e8cfc4f933aa15d5e7b1f34adc671c3f4f7ec478 SHA512 1aa7adc347a44202db854badd85b130de772b1522cb7a73cc7a94b00116f981fc96e42eb8514eb7ff9abe5c9c4ff5e29aeaaf7962e654a9867c78bc8d0eca10a WHIRLPOOL de2590ca0950e87fdfab77866c0dab7b4a7b3513aef59c10fce23a69bdad1a417347fd6afc695d7bbc4be561c9ce7f799aa22af171d066deeb3c3475786251ca
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160502.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160502.ebuild
new file mode 100644
index 0000000..4e8eb87
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160502.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-05-02_00-02-33/zip/netbeans-trunk-nightly-201605020002-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 cd1a008..1fa0605 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -9,10 +9,12 @@ DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247b
 DIST netbeans-trunk-nightly-201604290002-src.zip 213411377 SHA256 d0ac79f9aceaaf246c9b20cd612472e6ecc4abc9bf6add0d61fadfca3ba85a79 SHA512 ac78733d4248f6fc6ff23705f1db5e001eca8e05c2dae7c3e2e59a60dd8afbe9e6a363188e17cb78492da6e1fe35cf5bcd87a0b0c1fc4e0d91129f0812db0bd6 WHIRLPOOL 4a704f8a4aa16130c84fd481f7e1ff45f87adb589e71955857b0342927dfe960b73adde97ba12022d265169cd4b736baa48f4bb4e10d8311bab787cbeefa28b9
 DIST netbeans-trunk-nightly-201604300002-src.zip 213455252 SHA256 8ac717a944d58471d4ceb9a22a21deaf0d1f51f4eca622ebaa8f4f100f7a5338 SHA512 32a07261706f944f02b161d687998395a588c060b2e59311b2e3e08a84237e1635df2af75d523da87845e794a906283ceae26b17d88b2c649d542ba525c94429 WHIRLPOOL da034854b495fc9d685d34a181fcdba320f58718a0a2ab939ae3bba9049941b405555db173a314f4881eac31e7d42d78641d96f7e097d68ecc2fe06a0c2133df
 DIST netbeans-trunk-nightly-201605010002-src.zip 213455252 SHA256 a7b4106579fbeddedac626ccd40f58b1ddc18259470a5166bde4959c25a346e9 SHA512 a10b319508becdd5af6e11db80443099997276faad942d22f24513d131c4627d38fcfa1facc74ad3d7ebe2625592e1797de1cbc1988e4d5eb75f2fad178f947a WHIRLPOOL 46c57850d95b3329747584e59389560dc678f1124bf5ff438068c1a04116970342fae1aa34e5ccb3607e068f91e7e6e0f45f7749b8c5a67fec0da55e885ab746
+DIST netbeans-trunk-nightly-201605020002-src.zip 213470717 SHA256 8c1cde7797484c52ae985c6530de6c6974c57d161647a32f642477c86801b3b4 SHA512 b0bdaf6d39d979a1b8bb41088ffe3780630daf3eeb7729b705a09a522bf91717ea4bd5e658aa8d144da96f98a0ea52747f15f9f073c22b67f8ddffb2a2bcf474 WHIRLPOOL 20909f886215edac9c8377d3ee7d1270942848eb94a083f0601d6c328e004f6a1bf87c2d153d739a63278274a71cebb2de00d9bf4b05707c60557cb400bfbc06
 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_p20160428.ebuild 6293 SHA256 a45afe043254c2596f50568a88fe8e61738ee230c369fdc09e583b1898af2b35 SHA512 4a06b6abae4513a4fc810f735546777ff7f68f63f49def5a210dad83e09a75c44b59c80afb5bb6a22f6bcaa28ff97021ac2b987cbb2d4f4715abf7e3ac5d090b WHIRLPOOL a8a400e470bcab256c606583faa300745e3fc8f604c0788e3a37d6015c7f1e6781d4444472dfa6359a1b6001d2769ab175da299c783c5e5f6e8261890c41f407
 EBUILD netbeans-javadoc-9999_p20160429.ebuild 6293 SHA256 cb61a015c4205943ace21756e668f17d4620951e0e9756877b59208b2ab73a38 SHA512 733c75c7b490d08181ddbcd1ae491ae79a3268edd5f4d876084c77160ad3056ee45efa0aceea5069d37637f47b4ba84600dab944c0b348dfe0dcd18c56f42f9a WHIRLPOOL a5715202a53a24bd9c18c046b46ff2139abb39b4eb84fa0b20550832663947f321e68ae58344e6e2f8a2910f18f207d03fc6000f1e206a1eb126d4f5e5edc75a
 EBUILD netbeans-javadoc-9999_p20160430.ebuild 6293 SHA256 b13f5fa58347a57d13391a3b465d4cd480c1b9c53ca3ca4769d8b06d5e7c31a6 SHA512 dfa6d5e3a2b64054c64c2943672eb5b65a70762aab2ce38ddc33d6c5febab3c8c647bdc9dfa27cd421788d437ea50849e34e621250c3b98a0997ba949dc13471 WHIRLPOOL cb506843d1adc9ee7c12f991f2bd83f2408705202945e4335944d980f7cbf318be1f2ace525b2a0f9c081c122b8dc8b0111424bf1ad27d369e98f8085905432e
 EBUILD netbeans-javadoc-9999_p20160501.ebuild 6293 SHA256 14a2b8104c6610ccfe87e304b13c2cdfedc0930fe86859785f068d39f2fe6a59 SHA512 8bd214c082b67f02d54685afcfe14b9866ec97b73a32a33491b5a578a7e29fbb1f7f920c0f7256fec423d73877185a344a439fc1b71a104ff2232337b5d30177 WHIRLPOOL 1568e72c7205e3c5d21f65039dee6f279fb00c930844b4a49dc2ef73efd2944bbd63e5c82e070d5521ee171f5eea5a1e852b5e802575f5d841d812b7ad80f5fa
+EBUILD netbeans-javadoc-9999_p20160502.ebuild 6293 SHA256 321fa1be64ee5a4c557a387b8d010ce48d45c0c468866fc353c5c42a5f54aaec SHA512 40afac19230235d3cca267cb50be701b252d05410088904873973cf876a643087317252736b169e806000ef374f0d44dc3758571a1781f8b9ce745f5b91fe3a8 WHIRLPOOL 746ca31c1475cd802ee70fc03748d0e90c6c6d71e3687a2ddc4f79a268e6775a7cb06f4e80a176f715a902729d612b843b875ccc1d5ad7793146398cc50794a6
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160502.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160502.ebuild
new file mode 100644
index 0000000..0c1004b
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160502.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-05-02_00-02-33/zip/netbeans-trunk-nightly-201605020002-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 521205d..4f1856f 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -15,10 +15,12 @@ DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247b
 DIST netbeans-trunk-nightly-201604290002-src.zip 213411377 SHA256 d0ac79f9aceaaf246c9b20cd612472e6ecc4abc9bf6add0d61fadfca3ba85a79 SHA512 ac78733d4248f6fc6ff23705f1db5e001eca8e05c2dae7c3e2e59a60dd8afbe9e6a363188e17cb78492da6e1fe35cf5bcd87a0b0c1fc4e0d91129f0812db0bd6 WHIRLPOOL 4a704f8a4aa16130c84fd481f7e1ff45f87adb589e71955857b0342927dfe960b73adde97ba12022d265169cd4b736baa48f4bb4e10d8311bab787cbeefa28b9
 DIST netbeans-trunk-nightly-201604300002-src.zip 213455252 SHA256 8ac717a944d58471d4ceb9a22a21deaf0d1f51f4eca622ebaa8f4f100f7a5338 SHA512 32a07261706f944f02b161d687998395a588c060b2e59311b2e3e08a84237e1635df2af75d523da87845e794a906283ceae26b17d88b2c649d542ba525c94429 WHIRLPOOL da034854b495fc9d685d34a181fcdba320f58718a0a2ab939ae3bba9049941b405555db173a314f4881eac31e7d42d78641d96f7e097d68ecc2fe06a0c2133df
 DIST netbeans-trunk-nightly-201605010002-src.zip 213455252 SHA256 a7b4106579fbeddedac626ccd40f58b1ddc18259470a5166bde4959c25a346e9 SHA512 a10b319508becdd5af6e11db80443099997276faad942d22f24513d131c4627d38fcfa1facc74ad3d7ebe2625592e1797de1cbc1988e4d5eb75f2fad178f947a WHIRLPOOL 46c57850d95b3329747584e59389560dc678f1124bf5ff438068c1a04116970342fae1aa34e5ccb3607e068f91e7e6e0f45f7749b8c5a67fec0da55e885ab746
+DIST netbeans-trunk-nightly-201605020002-src.zip 213470717 SHA256 8c1cde7797484c52ae985c6530de6c6974c57d161647a32f642477c86801b3b4 SHA512 b0bdaf6d39d979a1b8bb41088ffe3780630daf3eeb7729b705a09a522bf91717ea4bd5e658aa8d144da96f98a0ea52747f15f9f073c22b67f8ddffb2a2bcf474 WHIRLPOOL 20909f886215edac9c8377d3ee7d1270942848eb94a083f0601d6c328e004f6a1bf87c2d153d739a63278274a71cebb2de00d9bf4b05707c60557cb400bfbc06
 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_p20160428.ebuild 4717 SHA256 d66d24fd69cf70db58c771a8022cbd16fe687b8fa04fad227460c9c4c16a282f SHA512 a8eadadc1e636c9a3907909fdc8f39af3c3f789dadd440f3717f183e28489b6f6d07e82ef1665b06dba6f2d7d750482c7f22b55ee8a38356d8208ba3e5c27ff5 WHIRLPOOL 2a938d9fde09ab500cb042026520f13f99c6d74452a230f146bf6d69930a6d4e1e3d108fa7e1d459712e6c6893b758d4f42025e0d5e32dc24db26b97b980194b
 EBUILD netbeans-javafx-9999_p20160429.ebuild 4717 SHA256 6772e6b5c12f9c149045a69a1e57c8fd4ca22482fb4c7387b84ffb1c71da1b9e SHA512 1f728784aeea95ad25621f6aeff0dcb6172e769356e48ee9b2fcaa9323c7c1e7f5a31f8c018dfaffd9a5158bb92d1592f4d3f1a3b01f318013dd19c21e00cdfb WHIRLPOOL 122f3cf88996a77894f361dd9bff5721b009134c9e6974cb24d2ddc56f95f1e997e59c46d312468ad51ca3ecb4daf1742290adaa4e4a57945952849a7b329fd2
 EBUILD netbeans-javafx-9999_p20160430.ebuild 4717 SHA256 e20cf78022aaa6abd1a010ec306c78a44b18e131aafb29f76dc85bdc3cb4f137 SHA512 4de45170fb042c9442bbf9a21219e19f65cad2949ba6d8d7b69b150945a435dd884ae477f3a495b7d9ab48f5ebf27351da5f6b63d80fd3506655ef867d181ae0 WHIRLPOOL 8d3254d2ca5e60befa50dbe28b34e32b637112f4c2dba4ce74bd41895c68eeca5ab446f06a4833c036f32b68ebc857bda23d81ef0b5d7ab394391737a84bafc5
 EBUILD netbeans-javafx-9999_p20160501.ebuild 4717 SHA256 f0ecd168349409c2dd21a4a45fa112ad5b83d5b7cd3561675e6869d4eca7ce64 SHA512 c8d52fa78e6ffdda9405f23d294b266fa2da681ffdc8e87b069d9ec0821b35bf7c5ed6b3a35ac07306c04360d6a15a258e42d3287a78c582c71aec70527f9331 WHIRLPOOL db49db9187b1ea76a565c537571a0c724b0eebe2cd001e7df0277f779ccf5b7601339a33b47224371fb7fa2f96144a6dc77a7a481b4a8befb8373d68eb930d9d
+EBUILD netbeans-javafx-9999_p20160502.ebuild 4717 SHA256 99cba31b312ffcbdd073b3ebc0d85cd4e770e1e30975b595aae575d24773659a SHA512 79138d2667d91ae4420874a215aa43c0d9792ce6486a680517f452ac4a89fbec8365fbe5cfde95bb76aa734fd8097578f2c1b988b2854688eb601075f935687f WHIRLPOOL 8e70e46837ac60433e87eefba59bc211fc9a731037c5b2882d39ed9df3f38a439d4143e5758dfd3ac55c427a662d054fef3fb6f85b5fe712d03466e8d37afb5a
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160502.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160502.ebuild
new file mode 100644
index 0000000..36e25e2
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160502.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-05-02_00-02-33/zip/netbeans-trunk-nightly-201605020002-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 55dd26e..d0ee2cc 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -7,10 +7,12 @@ DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247b
 DIST netbeans-trunk-nightly-201604290002-src.zip 213411377 SHA256 d0ac79f9aceaaf246c9b20cd612472e6ecc4abc9bf6add0d61fadfca3ba85a79 SHA512 ac78733d4248f6fc6ff23705f1db5e001eca8e05c2dae7c3e2e59a60dd8afbe9e6a363188e17cb78492da6e1fe35cf5bcd87a0b0c1fc4e0d91129f0812db0bd6 WHIRLPOOL 4a704f8a4aa16130c84fd481f7e1ff45f87adb589e71955857b0342927dfe960b73adde97ba12022d265169cd4b736baa48f4bb4e10d8311bab787cbeefa28b9
 DIST netbeans-trunk-nightly-201604300002-src.zip 213455252 SHA256 8ac717a944d58471d4ceb9a22a21deaf0d1f51f4eca622ebaa8f4f100f7a5338 SHA512 32a07261706f944f02b161d687998395a588c060b2e59311b2e3e08a84237e1635df2af75d523da87845e794a906283ceae26b17d88b2c649d542ba525c94429 WHIRLPOOL da034854b495fc9d685d34a181fcdba320f58718a0a2ab939ae3bba9049941b405555db173a314f4881eac31e7d42d78641d96f7e097d68ecc2fe06a0c2133df
 DIST netbeans-trunk-nightly-201605010002-src.zip 213455252 SHA256 a7b4106579fbeddedac626ccd40f58b1ddc18259470a5166bde4959c25a346e9 SHA512 a10b319508becdd5af6e11db80443099997276faad942d22f24513d131c4627d38fcfa1facc74ad3d7ebe2625592e1797de1cbc1988e4d5eb75f2fad178f947a WHIRLPOOL 46c57850d95b3329747584e59389560dc678f1124bf5ff438068c1a04116970342fae1aa34e5ccb3607e068f91e7e6e0f45f7749b8c5a67fec0da55e885ab746
+DIST netbeans-trunk-nightly-201605020002-src.zip 213470717 SHA256 8c1cde7797484c52ae985c6530de6c6974c57d161647a32f642477c86801b3b4 SHA512 b0bdaf6d39d979a1b8bb41088ffe3780630daf3eeb7729b705a09a522bf91717ea4bd5e658aa8d144da96f98a0ea52747f15f9f073c22b67f8ddffb2a2bcf474 WHIRLPOOL 20909f886215edac9c8377d3ee7d1270942848eb94a083f0601d6c328e004f6a1bf87c2d153d739a63278274a71cebb2de00d9bf4b05707c60557cb400bfbc06
 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_p20160428.ebuild 4412 SHA256 92ec38e61718089a7a0f048629e2390b138113cfd286ba1e8168edd9ac86aae1 SHA512 0b0b3e80376fecf0af36478252595774af197c427a8162cd2394e43d3e1772a730434cf07de1680be0bd7c3777d826c822334ce4f36c42d7a05e8aae306c4a3e WHIRLPOOL 2b317f045489273543ccd76df12009bf2b9230912a5ba4814ad5e1dab25dbe92cd0b317d4458835ed64d6386bb5216b328e1afc53d60fb9b07848397581c6bdf
 EBUILD netbeans-mobility-9999_p20160429.ebuild 4412 SHA256 2581c442b7a708410dc8f381b252888e9424f1ed75e5a831a0bf1e6015e4b790 SHA512 3e02833fe7a549c351d29f406bacb6eb06f96194624c5cfc695d90197e44e855fba7b15f5f561c44ab1da2a9f677baaf991704940451f60cf976e2797e2b18e8 WHIRLPOOL 436365e52d16d06b5cb7cf18228b97a361bf4b64d188d64294cbc2c20969a844546d13583f9213aab5ce66b34b06697e122f9c9ca60aaf216847d5d4660aee93
 EBUILD netbeans-mobility-9999_p20160430.ebuild 4412 SHA256 ab0ad76afa579cadd04c3606a41f74b8a3cbc15d621d4f3172edef54bc8be63f SHA512 d43d44e48d7e1259bec1aec7d1d508b594f1f4abe9e2e227726596e52ded3ad9b92982f1b054c8a88bd25bc77c34b0d5cf891d734ae943db10e514dd75bcec77 WHIRLPOOL 2767ed53a47cad2dbdcb39755247485b37bf4cbd3d6f4caba24ba5dfe4d3730780594e1e8327a9dfcb73fb8937d1fc8880e48e11279b4c6b0d7c8afd185cf36e
 EBUILD netbeans-mobility-9999_p20160501.ebuild 4412 SHA256 61dc15ad1cd7fe38074f69ce55dabbe21c9411b0b0b6c7ecf66cdd0a010c5b60 SHA512 3d2680d61f56b9b68199753404f44a963d422160afdda7506b0870b86779a111c752e813ccc5268424065873912dee94b888afc68a1f7da1e5b041a41f3d7b1d WHIRLPOOL 042a22ced9beea19b7b69c467e82af1204460a609d711c4eee9a23bb9739cb9e895d9a5a4fc298ee4dfc0fba8bfd67210272fabfbf95114371d7651a45de1e01
+EBUILD netbeans-mobility-9999_p20160502.ebuild 4412 SHA256 ec1973a0bf6c6ae42c6ad3b37676d2b359a614f7060b8d46cd66ace048b8d4fe SHA512 d71101f52819dd13cf5d8d5ee98a0c8b51dbcacb2c5ff9e080fc6c125945e82f3ffb1f798286123085ae32785f180ac2edd04a096d15ce88162669a48a8c2d6e WHIRLPOOL cd2bb026d60172cbbb40f20e36965b45db61ee4441e7dac57b1042f5f29eb0b7be32d5f94b3a19ad0dd0782fa9aed3dedf3342c177265b0b3eb5f91020589283
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160502.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160502.ebuild
new file mode 100644
index 0000000..6aedc1e
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160502.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-05-02_00-02-33/zip/netbeans-trunk-nightly-201605020002-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 f9dc7ac..2061cb9 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -10,10 +10,12 @@ DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247b
 DIST netbeans-trunk-nightly-201604290002-src.zip 213411377 SHA256 d0ac79f9aceaaf246c9b20cd612472e6ecc4abc9bf6add0d61fadfca3ba85a79 SHA512 ac78733d4248f6fc6ff23705f1db5e001eca8e05c2dae7c3e2e59a60dd8afbe9e6a363188e17cb78492da6e1fe35cf5bcd87a0b0c1fc4e0d91129f0812db0bd6 WHIRLPOOL 4a704f8a4aa16130c84fd481f7e1ff45f87adb589e71955857b0342927dfe960b73adde97ba12022d265169cd4b736baa48f4bb4e10d8311bab787cbeefa28b9
 DIST netbeans-trunk-nightly-201604300002-src.zip 213455252 SHA256 8ac717a944d58471d4ceb9a22a21deaf0d1f51f4eca622ebaa8f4f100f7a5338 SHA512 32a07261706f944f02b161d687998395a588c060b2e59311b2e3e08a84237e1635df2af75d523da87845e794a906283ceae26b17d88b2c649d542ba525c94429 WHIRLPOOL da034854b495fc9d685d34a181fcdba320f58718a0a2ab939ae3bba9049941b405555db173a314f4881eac31e7d42d78641d96f7e097d68ecc2fe06a0c2133df
 DIST netbeans-trunk-nightly-201605010002-src.zip 213455252 SHA256 a7b4106579fbeddedac626ccd40f58b1ddc18259470a5166bde4959c25a346e9 SHA512 a10b319508becdd5af6e11db80443099997276faad942d22f24513d131c4627d38fcfa1facc74ad3d7ebe2625592e1797de1cbc1988e4d5eb75f2fad178f947a WHIRLPOOL 46c57850d95b3329747584e59389560dc678f1124bf5ff438068c1a04116970342fae1aa34e5ccb3607e068f91e7e6e0f45f7749b8c5a67fec0da55e885ab746
+DIST netbeans-trunk-nightly-201605020002-src.zip 213470717 SHA256 8c1cde7797484c52ae985c6530de6c6974c57d161647a32f642477c86801b3b4 SHA512 b0bdaf6d39d979a1b8bb41088ffe3780630daf3eeb7729b705a09a522bf91717ea4bd5e658aa8d144da96f98a0ea52747f15f9f073c22b67f8ddffb2a2bcf474 WHIRLPOOL 20909f886215edac9c8377d3ee7d1270942848eb94a083f0601d6c328e004f6a1bf87c2d153d739a63278274a71cebb2de00d9bf4b05707c60557cb400bfbc06
 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_p20160428.ebuild 4111 SHA256 8e968459df586e6fc8b27eb683e2b0936dba423cccdb334af64c3918d2749843 SHA512 9ca5684d63d1efe7b5158014375752449fbce3a3fb86acfcd12a14f7c9195fefca83d11379906cbd707a48a60ae24a5312c9823acf337811e1d00e9711dbe126 WHIRLPOOL 8ddbc652a3ef6a2fa079498f3d59900f7a507d4494a2aa514cfaae3a1b67fba2880d80a9d285a9513fb9e00e6c3c842b3e8faf6060d1b545706cb2c871443f2d
 EBUILD netbeans-nb-9999_p20160429.ebuild 4111 SHA256 98a293723d524ae4ade9784dcc1beeb75cac0637286e99121a734a1d2d09f027 SHA512 fefbf9da1aaf1d74fd74af7e92664200351fef93122ed21da6273c5583aff493fa70d45a80766afd546f6420ed5e04017d0c6bd55fd9179d80b5794b0f68d8f0 WHIRLPOOL 0d5454f43a641e355e073e41ebd49896b430cb962cb6a4bd80a8a4cddeefa865500ea278f6952be14fbe895123f55739024b3b8c111d817e3fd76b517e041a98
 EBUILD netbeans-nb-9999_p20160430.ebuild 4111 SHA256 a8877d3574e8c1bf748bf75cf5be70f0e1b5e1c3a1fd5c34a8492e7bf01a4f3a SHA512 44727305d56021bf57a8302ba2deedd34538ec72b602b485cd0900b9030e3635e7330b1440f88478ec0112610cf646dc464f03a7dc53975975ab78ecd967cd74 WHIRLPOOL 47329420a5768e92f153f99de5588bd1aa709b652ce93281775beb64c11ba9ba07985a552dd0ae776a786157157d1c7de2ece5a52095b0cc499e89fb84963e80
 EBUILD netbeans-nb-9999_p20160501.ebuild 4111 SHA256 c1614bfd761c708c87b954056fa11b5c2b6bac87ce8968726083c85e69f6e4f5 SHA512 d226c25458c4c4f39e91cf096d6a359f7e98d94ec7e7c62c9d5f4476de1376e7a8d1b2161e7a82d1bfda8517ec56161a6795ec0bd306ca07f30223bc1609477f WHIRLPOOL bb89de7317da7399c0cb5a61605b4f0c27f7b88408280e76ece221188ab56a3cfe7cb5666e29177797c98f307511fba312b955b2ce55215e812da8f7cb0a1053
+EBUILD netbeans-nb-9999_p20160502.ebuild 4111 SHA256 d8fd57a5a3dd88f2094a9907d366860628b7fdefbac46f963646904fdcb0525a SHA512 ab61d3d17e69af1022a790d29bab39ca7e09f397cc9865490dd3695612b5ebf5e247e4ccd8896b7ff20b90267835c0a97d388a50337e53787f782c8cab3f7281 WHIRLPOOL 4fb9a0859e77a96d1da9ad9095355f345a3874cc67a3e319abdab82f1c67f82f513ed308b079ca208d220b03466ce9f5e0ca370e6bf7d799f5bfc78948c1bd10
 MISC metadata.xml 392 SHA256 01cdbcc83099b97486bd7b8e813e5b19c1138eb0d8d3e8a5683aafd579820435 SHA512 4d2f9160baa022d6a48b61d5f42e71cfd411d244e7a36436629bc5ee4036e4ce19079134d9a6c704ebe942306c2e0199d0591c1e54f92f8f3c8835147e639246 WHIRLPOOL c1131764e1cec66c56b977ebe36014b29e5a68e35ccc326c0cbadd050a6c625cf191c85c212e0a733661c008dab0d99f9a4cdc4c4ae0cc9d775ba1de554795a9

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160502.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160502.ebuild
new file mode 100644
index 0000000..844e5e3
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20160502.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-05-02_00-02-33/zip/netbeans-trunk-nightly-201605020002-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 53a24ca..39956b0 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -11,10 +11,12 @@ DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247b
 DIST netbeans-trunk-nightly-201604290002-src.zip 213411377 SHA256 d0ac79f9aceaaf246c9b20cd612472e6ecc4abc9bf6add0d61fadfca3ba85a79 SHA512 ac78733d4248f6fc6ff23705f1db5e001eca8e05c2dae7c3e2e59a60dd8afbe9e6a363188e17cb78492da6e1fe35cf5bcd87a0b0c1fc4e0d91129f0812db0bd6 WHIRLPOOL 4a704f8a4aa16130c84fd481f7e1ff45f87adb589e71955857b0342927dfe960b73adde97ba12022d265169cd4b736baa48f4bb4e10d8311bab787cbeefa28b9
 DIST netbeans-trunk-nightly-201604300002-src.zip 213455252 SHA256 8ac717a944d58471d4ceb9a22a21deaf0d1f51f4eca622ebaa8f4f100f7a5338 SHA512 32a07261706f944f02b161d687998395a588c060b2e59311b2e3e08a84237e1635df2af75d523da87845e794a906283ceae26b17d88b2c649d542ba525c94429 WHIRLPOOL da034854b495fc9d685d34a181fcdba320f58718a0a2ab939ae3bba9049941b405555db173a314f4881eac31e7d42d78641d96f7e097d68ecc2fe06a0c2133df
 DIST netbeans-trunk-nightly-201605010002-src.zip 213455252 SHA256 a7b4106579fbeddedac626ccd40f58b1ddc18259470a5166bde4959c25a346e9 SHA512 a10b319508becdd5af6e11db80443099997276faad942d22f24513d131c4627d38fcfa1facc74ad3d7ebe2625592e1797de1cbc1988e4d5eb75f2fad178f947a WHIRLPOOL 46c57850d95b3329747584e59389560dc678f1124bf5ff438068c1a04116970342fae1aa34e5ccb3607e068f91e7e6e0f45f7749b8c5a67fec0da55e885ab746
+DIST netbeans-trunk-nightly-201605020002-src.zip 213470717 SHA256 8c1cde7797484c52ae985c6530de6c6974c57d161647a32f642477c86801b3b4 SHA512 b0bdaf6d39d979a1b8bb41088ffe3780630daf3eeb7729b705a09a522bf91717ea4bd5e658aa8d144da96f98a0ea52747f15f9f073c22b67f8ddffb2a2bcf474 WHIRLPOOL 20909f886215edac9c8377d3ee7d1270942848eb94a083f0601d6c328e004f6a1bf87c2d153d739a63278274a71cebb2de00d9bf4b05707c60557cb400bfbc06
 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_p20160428.ebuild 4418 SHA256 ff39622b2f582fb73f069ddea76fcb846f2fdbdce6559af061a13ead577d4a47 SHA512 3f71b975e8316433510e89914be7a1ffe7837a39d42a4c8f25a033b82d54bee62cafe0a28d45cada322594dfc328f43c2a1a05abbec1e43e207f73fcb225e128 WHIRLPOOL 696cf1a13fe113a7156da0fa4db41802052c5885a1cde7eb5eac17431ca31792576d22d4cecc6b2bd5ead506abb0e3a3d0dee62183b346aed1aa146234c7df8a
 EBUILD netbeans-php-9999_p20160429.ebuild 4418 SHA256 91eaccc7404ed5c4c703fb4197631b10b5583508204c73363016ad110184269f SHA512 028e58926a853219e866edf3f872a67d546d32839306867921527c81ebef5ab004da018aab014994f3fecca79506267dcdcdcf06054f90c6a457b68bfa0bf6b7 WHIRLPOOL e9ad76bdecfff67dd851e31c4356278547b6da7ed73649f36e5233b78cc05f4295dd6460560b4613abf226afa5826b5cd6d7d4270f482e28a9996f78a7152048
 EBUILD netbeans-php-9999_p20160430.ebuild 4418 SHA256 c46eba4967a823c3b5a26edf651faedf16bdc9459ddd64b7874c8fa3a6af11ce SHA512 35cc623e4374520ea6305a7bcd247ced8b78c7e827c1f541e3678503fa1bc7b5008cc45e7137bd521d19c5c1287219b8dbc7999edc87e84d9a07e96938dc56b7 WHIRLPOOL 8a3252e718c3c4bb07399ed1f5a41e3ec93de0757120ec9798325742dd52cac8b07c69028516aa0a9b757ec794b7d2f4f1ccf0a1d504c4f58ea3f62086ac6254
 EBUILD netbeans-php-9999_p20160501.ebuild 4418 SHA256 ad569b03a531d0e4eaccd190d7a2dcd9f8b434985d15a2bc99ffe64cc979ea7d SHA512 97c89219d690002189730eac296bce7d6311562fbfef7e001bd5ce4db7ab33a22bfc221878333a6578bff0807871b8f91072c0c5583e24693d22064baa42b20b WHIRLPOOL 8064da38ce3b23eec056056d88db7a24b4af20798913b57c8c1b6c7af2c1c12a3a1ca8d88dcdae751bf211fd2488f66cf99cbfd401ef99d38a946c02b63b16ea
+EBUILD netbeans-php-9999_p20160502.ebuild 4418 SHA256 70762ccc0f5198382ab91dfcf9990dce6a258b307287b0a745d3b68581fdbb95 SHA512 bc25db57ba7a2b6abadc1f857522a3e1f87f8a429f4d9f673f64357ccc063b75bbbcb2db4474112dc9926a73485ab9bc27b3fb4de59550156c5ea683e759c647 WHIRLPOOL 18faef17cf35b46ecab383dd703f2fa5aca559546ab0090d1bc157b1517e6a578ad0a255bfaf12d275efa2c0444fa9abf28a6c68e157b63f26f6dc3edbbbf6dc
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160502.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160502.ebuild
new file mode 100644
index 0000000..054f9df
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20160502.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-05-02_00-02-33/zip/netbeans-trunk-nightly-201605020002-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/73E9BC8A7AF36E0C95210F61A85AFEF212AEE1A9-phpsigfiles.zip
+	http://hg.netbeans.org/binaries/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-webcommon-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/javacup:0"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+	${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.php -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-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}"/73E9BC8A7AF36E0C95210F61A85AFEF212AEE1A9-phpsigfiles.zip php.project/external/phpsigfiles.zip || die
+	ln -s "${DISTDIR}"/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip php.editor/external/predefined_vars.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-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 c4bc87a..c0c8151 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -33,10 +33,12 @@ DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247b
 DIST netbeans-trunk-nightly-201604290002-src.zip 213411377 SHA256 d0ac79f9aceaaf246c9b20cd612472e6ecc4abc9bf6add0d61fadfca3ba85a79 SHA512 ac78733d4248f6fc6ff23705f1db5e001eca8e05c2dae7c3e2e59a60dd8afbe9e6a363188e17cb78492da6e1fe35cf5bcd87a0b0c1fc4e0d91129f0812db0bd6 WHIRLPOOL 4a704f8a4aa16130c84fd481f7e1ff45f87adb589e71955857b0342927dfe960b73adde97ba12022d265169cd4b736baa48f4bb4e10d8311bab787cbeefa28b9
 DIST netbeans-trunk-nightly-201604300002-src.zip 213455252 SHA256 8ac717a944d58471d4ceb9a22a21deaf0d1f51f4eca622ebaa8f4f100f7a5338 SHA512 32a07261706f944f02b161d687998395a588c060b2e59311b2e3e08a84237e1635df2af75d523da87845e794a906283ceae26b17d88b2c649d542ba525c94429 WHIRLPOOL da034854b495fc9d685d34a181fcdba320f58718a0a2ab939ae3bba9049941b405555db173a314f4881eac31e7d42d78641d96f7e097d68ecc2fe06a0c2133df
 DIST netbeans-trunk-nightly-201605010002-src.zip 213455252 SHA256 a7b4106579fbeddedac626ccd40f58b1ddc18259470a5166bde4959c25a346e9 SHA512 a10b319508becdd5af6e11db80443099997276faad942d22f24513d131c4627d38fcfa1facc74ad3d7ebe2625592e1797de1cbc1988e4d5eb75f2fad178f947a WHIRLPOOL 46c57850d95b3329747584e59389560dc678f1124bf5ff438068c1a04116970342fae1aa34e5ccb3607e068f91e7e6e0f45f7749b8c5a67fec0da55e885ab746
+DIST netbeans-trunk-nightly-201605020002-src.zip 213470717 SHA256 8c1cde7797484c52ae985c6530de6c6974c57d161647a32f642477c86801b3b4 SHA512 b0bdaf6d39d979a1b8bb41088ffe3780630daf3eeb7729b705a09a522bf91717ea4bd5e658aa8d144da96f98a0ea52747f15f9f073c22b67f8ddffb2a2bcf474 WHIRLPOOL 20909f886215edac9c8377d3ee7d1270942848eb94a083f0601d6c328e004f6a1bf87c2d153d739a63278274a71cebb2de00d9bf4b05707c60557cb400bfbc06
 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_p20160428.ebuild 9520 SHA256 43ab2d84807ce29e75b611c4aee4269e1cd2ab9bcd41220e572d68f2095280a1 SHA512 698447f4e5a9dbe05337a59966f05fe7f4bc8517dd463571b65d6ab777239191ee341fb56b1c9c1b479b3fad247c5284c3712f3b142839d930214f36d75e194b WHIRLPOOL b38abccc36b868f0f07607a2d487335d134554c44e085418dd4e15b6dbdbca18337fd1dc50729bc92e2e076210fb6be7caf1502c76e3100d4e0fdd8d56e3fe1f
 EBUILD netbeans-platform-9999_p20160429.ebuild 9520 SHA256 f7ad9dddcef0aa421a8ef4cbcb85216906fabe21268d243501c740903c515ba2 SHA512 922a98b6b78b7f59e673d36e0aecdc9caf80b0cf53bcd3a73ab6e7b598da514c49809944d84759471d0a895fb9aa5e5a40b6c8af2f0f0e41017e885015a3f69f WHIRLPOOL 1ab4034ff5ff03e5d12f38dcfe358ff5c9fcd924f55400ee5954c0b339dcf291766460eb3eaea55fe5355c17659d0f4e42a7429128972346adfebd50e94d0099
 EBUILD netbeans-platform-9999_p20160430.ebuild 9520 SHA256 92dc097df1540dd297899d2751f6b292a77dde24e6a1b8ccb21a6d9fd47223eb SHA512 e1f7e6d14ec0f7a6acf33f18d98a44b7eab25d69ebc21dd24abcb63819157727b7f47835d1839c30d4ae6abba20241fef94e1da4da93faf2a9a36c41b179b79d WHIRLPOOL b157f4184a6577fb4438258517b92761b7b15456e4912ac017072ce5e7564a35e95baaba2627e8ba7a1839b550cccaaaec417cf69a15a7d6b813ccea1eb1b07e
 EBUILD netbeans-platform-9999_p20160501.ebuild 9520 SHA256 912f5c47542f2ba7bd1346560e45a1ca3907cc170f7e1cae4b52fbdd6718b0d4 SHA512 eadb5d0993bcb3d967ed896be1ec6ed4027b3e4c5f58c8b5ed16c904f935c7d96ce0d8c9c2020fa59ed6930f9d51c79fc02ed5cf83ccd695cc9a1462f26738f7 WHIRLPOOL f4db4d1809e6864dbcb998146e76f960af1194a86fe7980a957aa74f6fa9d9ef5fa0f2e0e2bbcafe07eaa34b1463dc0ff801ff5f021adb3f741c08ecf43479da
+EBUILD netbeans-platform-9999_p20160502.ebuild 9520 SHA256 120ce8ceb2ea1911763bdeb73e92a2457162758eb96a2c86ebcbee33e0de22e7 SHA512 3ced85584823ec88387296c00218d059f3ff0e85c6ccf4c2ec52961b97de2df33aee86e93e65001fbb5acd1f716dc4125bb4995327b945e77e94c7a73a173aef WHIRLPOOL b34bab9a4495e3af2e94f00b29c64dcd77d0d9be093ce81173badd33e158eeffd4a482e89bf9272570193415b12600946fd27eba36cc297a2cceecf48a60cc47
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160502.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160502.ebuild
new file mode 100644
index 0000000..a647078
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20160502.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-05-02_00-02-33/zip/netbeans-trunk-nightly-201605020002-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 9b05f55..ce4a0e6 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -7,10 +7,12 @@ DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247b
 DIST netbeans-trunk-nightly-201604290002-src.zip 213411377 SHA256 d0ac79f9aceaaf246c9b20cd612472e6ecc4abc9bf6add0d61fadfca3ba85a79 SHA512 ac78733d4248f6fc6ff23705f1db5e001eca8e05c2dae7c3e2e59a60dd8afbe9e6a363188e17cb78492da6e1fe35cf5bcd87a0b0c1fc4e0d91129f0812db0bd6 WHIRLPOOL 4a704f8a4aa16130c84fd481f7e1ff45f87adb589e71955857b0342927dfe960b73adde97ba12022d265169cd4b736baa48f4bb4e10d8311bab787cbeefa28b9
 DIST netbeans-trunk-nightly-201604300002-src.zip 213455252 SHA256 8ac717a944d58471d4ceb9a22a21deaf0d1f51f4eca622ebaa8f4f100f7a5338 SHA512 32a07261706f944f02b161d687998395a588c060b2e59311b2e3e08a84237e1635df2af75d523da87845e794a906283ceae26b17d88b2c649d542ba525c94429 WHIRLPOOL da034854b495fc9d685d34a181fcdba320f58718a0a2ab939ae3bba9049941b405555db173a314f4881eac31e7d42d78641d96f7e097d68ecc2fe06a0c2133df
 DIST netbeans-trunk-nightly-201605010002-src.zip 213455252 SHA256 a7b4106579fbeddedac626ccd40f58b1ddc18259470a5166bde4959c25a346e9 SHA512 a10b319508becdd5af6e11db80443099997276faad942d22f24513d131c4627d38fcfa1facc74ad3d7ebe2625592e1797de1cbc1988e4d5eb75f2fad178f947a WHIRLPOOL 46c57850d95b3329747584e59389560dc678f1124bf5ff438068c1a04116970342fae1aa34e5ccb3607e068f91e7e6e0f45f7749b8c5a67fec0da55e885ab746
+DIST netbeans-trunk-nightly-201605020002-src.zip 213470717 SHA256 8c1cde7797484c52ae985c6530de6c6974c57d161647a32f642477c86801b3b4 SHA512 b0bdaf6d39d979a1b8bb41088ffe3780630daf3eeb7729b705a09a522bf91717ea4bd5e658aa8d144da96f98a0ea52747f15f9f073c22b67f8ddffb2a2bcf474 WHIRLPOOL 20909f886215edac9c8377d3ee7d1270942848eb94a083f0601d6c328e004f6a1bf87c2d153d739a63278274a71cebb2de00d9bf4b05707c60557cb400bfbc06
 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_p20160428.ebuild 3472 SHA256 c01c6eaecbc72dff72adbdd14940ae8935b207096293026b94bc2e3f620e934d SHA512 9a0cfbe6a0e5b27611f4817889d3b102ecbf07c05987b558e17013711c3f40a2239a07c340effe846d54b14bd4f4987adef4c290563bfa461e56762d99f8c2bf WHIRLPOOL 4c47981cf634b924f82b4c9b8cd2fac84006454beb9d7923757b0eb5d82512b58090245fa068f66b6760ac83681106ab659ca036907d40faf9709274a99dccaf
 EBUILD netbeans-profiler-9999_p20160429.ebuild 3472 SHA256 063a30427397a12cb94b03b26813b8dc5485b10d9b495b8860bf35dfb4b0224f SHA512 111527419ab1021308548d5c2f2d9a9576a43c5915125a14a9c6d030ac18dfe2e8771e5ef1e3f8310cc995b652d21a4d73671983e246a871a3606dc775a4a044 WHIRLPOOL 40ca2771efd02e39629b29577feafe59a9e0d5eef67f29a25037ce1317ae0c7b9499933ab66a5cafb8a89d2cdda07d1e5e05c04ca7c4077de88286e3e2d2f1ff
 EBUILD netbeans-profiler-9999_p20160430.ebuild 3472 SHA256 1fc86d7b980203ff0b59dae607a92117db2379423c096014fb67d897b75080eb SHA512 c6e234e3d8356a57e3e45a2318a12de2891a288bf8342b4cb12379df6885fa935cbb7c84539c5176c018ac3b2451d8d140846451e4a553a0a761b8dad120fd0f WHIRLPOOL 1127184708d513d8bb6c689a02ea508101e5892e229a773be8b5628cce6aedae75ea56e15677cda93c394904578a8bab145ee4c16197363600107e6503a7d434
 EBUILD netbeans-profiler-9999_p20160501.ebuild 3472 SHA256 794b895163a115d66300b5244d187bb69561c68a70f897c343543fe71a4388a1 SHA512 1ae2b824b9bdea9144ede93766731e14fa6da3a0ab31564a7cd804131d91e057a28f8c7c17bb6a1d2c8e28a9aa07c32178ac2371ec8a17f59eab7eab593f369a WHIRLPOOL e279409b9f9524718c2f5f054e8eb4e11d6684bf8aabe1bcfa69fffe48afa3d57490a2c29e898c5db7037707274707905485200c0805f1fcec509df1f5e05c11
+EBUILD netbeans-profiler-9999_p20160502.ebuild 3472 SHA256 81bcae6670d7e2aeecf9c201b2575f0c00541e55ecc13e50ebbc94cd9510edd4 SHA512 bc2c582baa2520f4564efb2ffbb772a088a4c9f1868dec6f87d8bc04a249325dcad1d4de896bed48d4dd52ad32776e7b7cd1d3b45e06f3e710ea33e4b8a37465 WHIRLPOOL 5e301f57535532fb52a19642a74454b288caa3a2e4a40e04d3133665e5849217ed65f12095c47fe3cbf9dd239774adb7f8e47085df73c76ab74ab6b8cf319ee0
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160502.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160502.ebuild
new file mode 100644
index 0000000..c1c785f
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160502.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-05-02_00-02-33/zip/netbeans-trunk-nightly-201605020002-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 b78a1f5..9880266 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -22,10 +22,12 @@ DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247b
 DIST netbeans-trunk-nightly-201604290002-src.zip 213411377 SHA256 d0ac79f9aceaaf246c9b20cd612472e6ecc4abc9bf6add0d61fadfca3ba85a79 SHA512 ac78733d4248f6fc6ff23705f1db5e001eca8e05c2dae7c3e2e59a60dd8afbe9e6a363188e17cb78492da6e1fe35cf5bcd87a0b0c1fc4e0d91129f0812db0bd6 WHIRLPOOL 4a704f8a4aa16130c84fd481f7e1ff45f87adb589e71955857b0342927dfe960b73adde97ba12022d265169cd4b736baa48f4bb4e10d8311bab787cbeefa28b9
 DIST netbeans-trunk-nightly-201604300002-src.zip 213455252 SHA256 8ac717a944d58471d4ceb9a22a21deaf0d1f51f4eca622ebaa8f4f100f7a5338 SHA512 32a07261706f944f02b161d687998395a588c060b2e59311b2e3e08a84237e1635df2af75d523da87845e794a906283ceae26b17d88b2c649d542ba525c94429 WHIRLPOOL da034854b495fc9d685d34a181fcdba320f58718a0a2ab939ae3bba9049941b405555db173a314f4881eac31e7d42d78641d96f7e097d68ecc2fe06a0c2133df
 DIST netbeans-trunk-nightly-201605010002-src.zip 213455252 SHA256 a7b4106579fbeddedac626ccd40f58b1ddc18259470a5166bde4959c25a346e9 SHA512 a10b319508becdd5af6e11db80443099997276faad942d22f24513d131c4627d38fcfa1facc74ad3d7ebe2625592e1797de1cbc1988e4d5eb75f2fad178f947a WHIRLPOOL 46c57850d95b3329747584e59389560dc678f1124bf5ff438068c1a04116970342fae1aa34e5ccb3607e068f91e7e6e0f45f7749b8c5a67fec0da55e885ab746
+DIST netbeans-trunk-nightly-201605020002-src.zip 213470717 SHA256 8c1cde7797484c52ae985c6530de6c6974c57d161647a32f642477c86801b3b4 SHA512 b0bdaf6d39d979a1b8bb41088ffe3780630daf3eeb7729b705a09a522bf91717ea4bd5e658aa8d144da96f98a0ea52747f15f9f073c22b67f8ddffb2a2bcf474 WHIRLPOOL 20909f886215edac9c8377d3ee7d1270942848eb94a083f0601d6c328e004f6a1bf87c2d153d739a63278274a71cebb2de00d9bf4b05707c60557cb400bfbc06
 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_p20160428.ebuild 5343 SHA256 3b6415155ed76a64dbed48af896dcb00fde8f49f53248bd544305bd6bbe01577 SHA512 d3a549390972da7e210c839116f2a9f0607b6bef416d3169493b00b525fb7280b5fbd9d633ca23d21168303ddb16e51af92272e9296d1dd9d6ca7437dfe7e4fe WHIRLPOOL b4d34bf8241733789c989859edb61d235868465a3362488b4a28dc66c7a4b866f97cf8a1178bf92c90078514d8b102a41bfcb2d6addd44b389277e7fb1436b2d
 EBUILD netbeans-webcommon-9999_p20160429.ebuild 5343 SHA256 4aaa259fb8747fa6e21b30f9dfbf95745818745ac05da1fb24f6baadb2379009 SHA512 38a79d64caad82da5af1f1a854a12a2d8c50e18497fbf613658aa594e065f1e26737baac660b261dc2dcafdd70bbc5c65e3996881d33a6fefeb106df09848498 WHIRLPOOL b4d6f760f875df5779822b9322fbfff389c886988a85aac482c5b3557f9a2c481d41d3c51c04c1fce4d7bed461a3e689ac6c03730b2ae9095f23a8100125e44f
 EBUILD netbeans-webcommon-9999_p20160430.ebuild 5343 SHA256 a83105795953f4a336d19ac139a95984dca2a9d08dafcf44eba142f09f1ec340 SHA512 8588b4af4197bcc3958840bb3700fffce2d67750216f92bacb70e9131ca54d0ceb3340bf1282355ff9c68de50872236446909cfedf779c72bbcc922fbed91aac WHIRLPOOL 60246009e21b3e7e14d5cb36ff2711c3a9ae79257beee5f033080720cec4d8df06bab3c1b40c4587c0acbf1e8ae6f8f19c1e62418b9a0c234ac9699a7e062d7a
 EBUILD netbeans-webcommon-9999_p20160501.ebuild 5343 SHA256 bef5fcc213310d5b1df7c0a0d2af6a28cc3035944d00843247ecec53d41e9dcb SHA512 ed0de8ae761c24b315048af1e6c72f566fa5313da7c869d869ff135f24f74bcc954a70ca67bb2661352bb71dbb825ffc593f77d5fa01b9d382639e2a64c972e4 WHIRLPOOL 39ddca6c2fc8ba1af6ea708d383dfee193da6c65c8f1a769755e98776b19b29ae38be100ea082cc224a9f6c977e5b2a7901aa4dcc49b125a8b8a20072341a334
+EBUILD netbeans-webcommon-9999_p20160502.ebuild 5343 SHA256 a863a5358e781c3e039804720a2268b41b39e286b0fd86dc6aa0338c5d4f8c10 SHA512 cbc21112d353fc78a14420a9946ec8dedf011a891d54af666a47b1d49c90d47c0023c075dd1cda3f686364a3828c2a31595ca088bc870b78e81a2914db7e054a WHIRLPOOL 7592c0b2074343a4a769258265c7a4bf461449b0fa193447b72af0d2135ee59602584361873f6f25bf91d4be87bf63367d290622008f7f35da9a6235f970fceb
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160502.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160502.ebuild
new file mode 100644
index 0000000..469c9ce
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160502.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 Web Services Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2016-05-02_00-02-33/zip/netbeans-trunk-nightly-201605020002-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar
+	http://hg.netbeans.org/binaries/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim
+	http://hg.netbeans.org/binaries/0929AC5F40B5A8667021408748D64F30F77B3165-libiDeviceNativeBinding.dylib
+	http://hg.netbeans.org/binaries/2A38DA3DB5D36DBBDC0B03990B46810F72430D5E-libimobiledevice.4.dylib
+	http://hg.netbeans.org/binaries/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib
+	http://hg.netbeans.org/binaries/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar
+	http://hg.netbeans.org/binaries/C1BB9FF4232248B0054E5A26A33474A251EA19CB-libusbmuxd.2.dylib
+	http://hg.netbeans.org/binaries/D4BD3F62EADB61216A47EF96B3152EDD35A56005-ojetdocs-1_0_0.zip
+	http://hg.netbeans.org/binaries/1EFED55F8C442E4DB1C2338A5C35D494364F9ECD-ojetdocs-1_1_2.zip
+	http://hg.netbeans.org/binaries/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}"/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar libs.plist/external/dd-plist.jar || die
+	ln -s "${DISTDIR}"/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim cordova.platforms.ios/external/ios-sim || die
+	ln -s "${DISTDIR}"/0929AC5F40B5A8667021408748D64F30F77B3165-libiDeviceNativeBinding.dylib cordova.platforms.ios/external/libiDeviceNativeBinding.dylib || die
+	ln -s "${DISTDIR}"/2A38DA3DB5D36DBBDC0B03990B46810F72430D5E-libimobiledevice.4.dylib cordova.platforms.ios/external/libimobiledevice.4.dylib || die
+	ln -s "${DISTDIR}"/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib cordova.platforms.ios/external/libplist.1.dylib || die
+	ln -s "${DISTDIR}"/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar libs.jstestdriver/external/libs.jstestdriver-ext.jar || die
+	ln -s "${DISTDIR}"/C1BB9FF4232248B0054E5A26A33474A251EA19CB-libusbmuxd.2.dylib cordova.platforms.ios/external/libusbmuxd.2.dylib || die
+	ln -s "${DISTDIR}"/D4BD3F62EADB61216A47EF96B3152EDD35A56005-ojetdocs-1_0_0.zip html.ojet/external/ojetdocs-1_0_0.zip || die
+	ln -s "${DISTDIR}"/1EFED55F8C442E4DB1C2338A5C35D494364F9ECD-ojetdocs-1_1_2.zip html.ojet/external/ojetdocs-1_1_2.zip || die
+	ln -s "${DISTDIR}"/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 d1d2eb3..814dfea 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -7,10 +7,12 @@ DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247b
 DIST netbeans-trunk-nightly-201604290002-src.zip 213411377 SHA256 d0ac79f9aceaaf246c9b20cd612472e6ecc4abc9bf6add0d61fadfca3ba85a79 SHA512 ac78733d4248f6fc6ff23705f1db5e001eca8e05c2dae7c3e2e59a60dd8afbe9e6a363188e17cb78492da6e1fe35cf5bcd87a0b0c1fc4e0d91129f0812db0bd6 WHIRLPOOL 4a704f8a4aa16130c84fd481f7e1ff45f87adb589e71955857b0342927dfe960b73adde97ba12022d265169cd4b736baa48f4bb4e10d8311bab787cbeefa28b9
 DIST netbeans-trunk-nightly-201604300002-src.zip 213455252 SHA256 8ac717a944d58471d4ceb9a22a21deaf0d1f51f4eca622ebaa8f4f100f7a5338 SHA512 32a07261706f944f02b161d687998395a588c060b2e59311b2e3e08a84237e1635df2af75d523da87845e794a906283ceae26b17d88b2c649d542ba525c94429 WHIRLPOOL da034854b495fc9d685d34a181fcdba320f58718a0a2ab939ae3bba9049941b405555db173a314f4881eac31e7d42d78641d96f7e097d68ecc2fe06a0c2133df
 DIST netbeans-trunk-nightly-201605010002-src.zip 213455252 SHA256 a7b4106579fbeddedac626ccd40f58b1ddc18259470a5166bde4959c25a346e9 SHA512 a10b319508becdd5af6e11db80443099997276faad942d22f24513d131c4627d38fcfa1facc74ad3d7ebe2625592e1797de1cbc1988e4d5eb75f2fad178f947a WHIRLPOOL 46c57850d95b3329747584e59389560dc678f1124bf5ff438068c1a04116970342fae1aa34e5ccb3607e068f91e7e6e0f45f7749b8c5a67fec0da55e885ab746
+DIST netbeans-trunk-nightly-201605020002-src.zip 213470717 SHA256 8c1cde7797484c52ae985c6530de6c6974c57d161647a32f642477c86801b3b4 SHA512 b0bdaf6d39d979a1b8bb41088ffe3780630daf3eeb7729b705a09a522bf91717ea4bd5e658aa8d144da96f98a0ea52747f15f9f073c22b67f8ddffb2a2bcf474 WHIRLPOOL 20909f886215edac9c8377d3ee7d1270942848eb94a083f0601d6c328e004f6a1bf87c2d153d739a63278274a71cebb2de00d9bf4b05707c60557cb400bfbc06
 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_p20160428.ebuild 2721 SHA256 e06e7fe1eeda962aff7fbc12e4c46d0d1b20c20c2c312ae0ce8958a832ad6055 SHA512 00b42a7ffa32ea8488086b9ab2ca09610d920ff325e640077159ad4c08418e43855aacc741d094304a891e665c46be785997cd857c0607de49955e8475369404 WHIRLPOOL 5b30492d9257888e1ca4b45e092e2c7fe7548b4160939ac8f1f32dbe625b9534a669d62727abcd80be9809071973d27ea403fb1a765665a09c21dcd112485443
 EBUILD netbeans-websvccommon-9999_p20160429.ebuild 2721 SHA256 dd72b0f89e52883a2576d505ff65ff4c1738ff6ff14bff97ec310ffbb1028078 SHA512 c32f1d75eae0c1a25d4ed235221e41974e0a6a82a3c10439a0e162f9724a0ee98d1b3f83294f157f562f550c476833ec54591f63ea4a9afa9753d88d7933c33a WHIRLPOOL 69eb0df8f2a1f6a895079162ce3ef78728bad9d2de67efeba27ef15348aaacdec51c6d851f7b69fa058b5fadd2e9735c443356a1f115850a2613b2d057998ccb
 EBUILD netbeans-websvccommon-9999_p20160430.ebuild 2721 SHA256 5cb3f0753abebe6fc55cf19b018f2e7f21ac0d613a24ce9e53c5c5ca3c36543e SHA512 c62813c1fc37c309d8a632fb0c91093251ec797248f283d0d6593c01db064e987859abdabf39465eb569af650645eb00af6b3612dd9d1c246ad01b4e68375243 WHIRLPOOL f70e684ef198cab020efb56835819a47f3c714c68b6bdf3da261b7c1208bd799134ea16062a16fa3bd635234822cc66905125afe71350e6e824c10a5c4d93ec8
 EBUILD netbeans-websvccommon-9999_p20160501.ebuild 2721 SHA256 501e07a6c138fd4e9715930b8d2956e13546e0258fa110a9159adad86826a562 SHA512 6ff1d7136df2e779f98365cabb6a7238bef9b7a23ff6d18d867eebd2e7166fc3622128b8238f1efe736ac053d498379230e9c366bd8d1cf9026abb93d2a54b58 WHIRLPOOL 3ceb05b176db00e27c98020c5a21b45d804063bc59b8af46a68582a841ab32e0856aa95b67ad07b48339556bd95b2365dfbc36c32972d2958631d647bcefa843
+EBUILD netbeans-websvccommon-9999_p20160502.ebuild 2721 SHA256 6e6c12f345d828034981c7c6e064c924d9d213370be49fccb2e30071e5078764 SHA512 c215041638073f32f57303f8ee474afa3c01402b9471d1e4248a0f3354aaa684e2944762b5c2427cc24cfb40d1ca41878b0d744df9d630ed7477c00faec37a69 WHIRLPOOL e2f5f0e90ec30ea6f6b7fcaa4c505653794286b19699cdf880d235a4f0a55abb7b7a6911d171bcb79042bce3fd366ecb6a3da39b2ec9cc150e97c503ea3de6dd
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160502.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160502.ebuild
new file mode 100644
index 0000000..688b806
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160502.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-05-02_00-02-33/zip/netbeans-trunk-nightly-201605020002-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 3e01f89..531e492 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -10,10 +10,12 @@ DIST netbeans-trunk-nightly-201604280002-src.zip 213399703 SHA256 50e4eeddd7247b
 DIST netbeans-trunk-nightly-201604290002-src.zip 213411377 SHA256 d0ac79f9aceaaf246c9b20cd612472e6ecc4abc9bf6add0d61fadfca3ba85a79 SHA512 ac78733d4248f6fc6ff23705f1db5e001eca8e05c2dae7c3e2e59a60dd8afbe9e6a363188e17cb78492da6e1fe35cf5bcd87a0b0c1fc4e0d91129f0812db0bd6 WHIRLPOOL 4a704f8a4aa16130c84fd481f7e1ff45f87adb589e71955857b0342927dfe960b73adde97ba12022d265169cd4b736baa48f4bb4e10d8311bab787cbeefa28b9
 DIST netbeans-trunk-nightly-201604300002-src.zip 213455252 SHA256 8ac717a944d58471d4ceb9a22a21deaf0d1f51f4eca622ebaa8f4f100f7a5338 SHA512 32a07261706f944f02b161d687998395a588c060b2e59311b2e3e08a84237e1635df2af75d523da87845e794a906283ceae26b17d88b2c649d542ba525c94429 WHIRLPOOL da034854b495fc9d685d34a181fcdba320f58718a0a2ab939ae3bba9049941b405555db173a314f4881eac31e7d42d78641d96f7e097d68ecc2fe06a0c2133df
 DIST netbeans-trunk-nightly-201605010002-src.zip 213455252 SHA256 a7b4106579fbeddedac626ccd40f58b1ddc18259470a5166bde4959c25a346e9 SHA512 a10b319508becdd5af6e11db80443099997276faad942d22f24513d131c4627d38fcfa1facc74ad3d7ebe2625592e1797de1cbc1988e4d5eb75f2fad178f947a WHIRLPOOL 46c57850d95b3329747584e59389560dc678f1124bf5ff438068c1a04116970342fae1aa34e5ccb3607e068f91e7e6e0f45f7749b8c5a67fec0da55e885ab746
+DIST netbeans-trunk-nightly-201605020002-src.zip 213470717 SHA256 8c1cde7797484c52ae985c6530de6c6974c57d161647a32f642477c86801b3b4 SHA512 b0bdaf6d39d979a1b8bb41088ffe3780630daf3eeb7729b705a09a522bf91717ea4bd5e658aa8d144da96f98a0ea52747f15f9f073c22b67f8ddffb2a2bcf474 WHIRLPOOL 20909f886215edac9c8377d3ee7d1270942848eb94a083f0601d6c328e004f6a1bf87c2d153d739a63278274a71cebb2de00d9bf4b05707c60557cb400bfbc06
 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_p20160428.ebuild 6939 SHA256 1b8ffc29323b7fe1c2308f75240c295e475626a7232fe70c6a6d096adce971fa SHA512 232be1939cb9767558f9befc29f085962d978b508940a093850602dd10a4ad49e801cb526d1ced56da3654bdf31f447619ac1bab2ae4c712fe858a475baffcc7 WHIRLPOOL 2e4d5265c0870bda91523777b9ddc9383e83a81befa8a86beb9c3f99990fa3ff6a22770d621a4120f8e891e607b61300308f5f3c433446e6bd59944fad8617c7
 EBUILD netbeans-9999_p20160429.ebuild 6939 SHA256 3786836b8a6ba5f705fe7e398484f3c5d7a16ef279b6254071f9798725c67e06 SHA512 ea8ae8704dd3c5942f1169905af21a51a5b095a8870464638f6d0e2c614e5208a0ae78f4bfec0c3d50ae78c163473b59b675e590faf4dd7bf3205281acd93a7f WHIRLPOOL 56418ec0d95bfc02d8587b1ab24562a7368943941ec1c36245b9db54a9b1535b7673f5df4400e56b8b45ff4d5fef004b76e3e8fdd474bd1cccc6cd7bb07d1526
 EBUILD netbeans-9999_p20160430.ebuild 6939 SHA256 81709213df88f28f223141977ebff2e25ee16f55b9d556f8b7be3fcce60bbe1c SHA512 865fa8b987017317fe66302e838c0d62c8914705666ec1aec7a0133f174981b1178dd925d66b337a5d4bbc4d0c3185cad8882e3e207655932fb40a5940e973f3 WHIRLPOOL f6f854fd7c39ba3be9e00e7ba5e2b771d4641238c71845c5605b83c8b19fcbc93cd6de2fcf738586deb97fffd943fdd748845582ff928ceaeaaa043f235e2dea
 EBUILD netbeans-9999_p20160501.ebuild 6939 SHA256 1bdd1f5c7b30de8b6f63cbd53511be3d582e6f2fffc633a2d4c2705a418cc346 SHA512 8d3eb1c918965ada9e9616b02702ff99720924d90efb54ee18c6fa2bb607ddc5c0b6ec1b6901a86899f0c7f5a7a01b57c626a056c5478ae8d4c316c9912b78c3 WHIRLPOOL 06046d1514f4506cd4e21497828b50954d50b2090f8be7b881b814e454d2fc1e00bd6666afef7d1157cc90e256fa93f5c87d4088b694a32b186d74ee3d7d1b02
+EBUILD netbeans-9999_p20160502.ebuild 6939 SHA256 46d0e665741d74a91a5e0bbef743895431a32f3cd1d4feffbbaf3199594f55eb SHA512 983e1fd8bfd97f66250a76d1eb403d15ff05bc9bbdabc3282c013b1f61aaac818d60b43706aafa73f3ce6087a489fc312ab93e942d33434335c81431f72c9ae7 WHIRLPOOL 04db2f46ec42d8b60085b34ab2970b443890c9bb46dd7e7d6fd2b5834d0ca8517cb53541315414eef8e63788287ec361a5e8ae5e350621a622002f20d12fbf27
 MISC metadata.xml 329 SHA256 8aeaf2a0228f15c2e4140f401b30f083509bd99d0a578873069f3595cd8555f3 SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640 WHIRLPOOL 799a9b79b1b447bda9631f67e2dfaf722376740e1d2037796528a05f9745eeed00d9990a74a65ce09f74bc5e1d60a887abde540c3c62487d7dd49b8377c15834

diff --git a/dev-util/netbeans/netbeans-9999_p20160502.ebuild b/dev-util/netbeans/netbeans-9999_p20160502.ebuild
new file mode 100644
index 0000000..5617b75
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20160502.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-05-02_00-02-33/zip/netbeans-trunk-nightly-201605020002-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-05-02  7:31 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-02  7:31 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-webcommon/, dev-java/netbeans-javacard/, Miroslav Šulc
  -- strict thread matches above, loose matches on Subject: below --
2015-05-27 11:04 Miroslav Šulc

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