public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-ergonomics/, dev-java/netbeans-dlight/, ...
@ 2015-06-26 11:21 Miroslav Šulc
  0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2015-06-26 11:21 UTC (permalink / raw
  To: gentoo-commits

commit:     9546113fa5216f1d943958d3284e475e56c22e34
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 26 11:21:41 2015 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Jun 26 11:21:41 2015 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=9546113f

netbeans: bumped to the latest sources

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

diff --git a/dev-java/netbeans-apisupport/ChangeLog b/dev-java/netbeans-apisupport/ChangeLog
index 074644d..0dacada 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_p20150627 (26 Jun 2015)
+
+  26 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-apisupport-9999_p20150627.ebuild:
+  bumped to the latest sources
+
 *netbeans-apisupport-9999_p20150625 (25 Jun 2015)
 
   25 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index cad1f8f..232d207 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -40,6 +40,7 @@ DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d647
 DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
 DIST netbeans-trunk-nightly-201506240001-src.zip 207969165 SHA256 c59efebe690e08dd20cf83322141bb5b984755b67ab400fa87e9ec0fdcfe1d15 SHA512 1b6007d583cb82f0380736c57048fa0ab77944fd066cf8d643e7dc016049ea73f811b440386631ac8c50d08016d1d1bee015ccfed452c12e504518f1005cfeb9 WHIRLPOOL 8d0a362d61f5e8f57e9bad9c11add5ffc0bae4321302c4a5ab17786a3443d68041211db7f4cafe1f20c174e54b9e0525a7b85fea163751ae4a6efa4386109679
 DIST netbeans-trunk-nightly-201506250001-src.zip 207980912 SHA256 8f38be3f803587401b64e01f00f77a305a862683ebe2d63a1d8b1a57b6162276 SHA512 84383852000cafff1aee8933b47d43bb6479b7894073d21c4c6c86e7b19d39aecae7b5b6b92d9205177febe2c9c96905a3596e47dfe8f0060ecc8997a0dc7822 WHIRLPOOL f44711cda5c720b6d8844c5076ac231acf6939aa697bb1e48aa7ce41b3bec09e69e644aae22151280d288ed5d3db3167822efaa071d0629ec529ca0323c045b9
+DIST netbeans-trunk-nightly-201506260309-src.zip 208000407 SHA256 319162679323bd7d133b22e16af2fc09d95b5b07b11962d72de3e71fb257222f SHA512 5d9710eaf21aaddea69c4241b1b249936066caa156b72532ff05f41efbfaf3219c3d7eb47be74b0f55ab571e3f2cc7e73ef232e55806ce42c6580862f6e5b676 WHIRLPOOL 721eb340d7c9e73c8a620f6ea20a54782a390259c21bb53798de9c4c942d935c99a0aa70ac871320f7182b2c699e708cd3bc647fc5cea4a65bc62c9cb3f6e9d3
 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
@@ -74,5 +75,6 @@ EBUILD netbeans-apisupport-9999_p20150622.ebuild 3390 SHA256 6d1d7e7e42fe9fca915
 EBUILD netbeans-apisupport-9999_p20150623.ebuild 3390 SHA256 e9a13e3ae0b7ab31ca13547e691979ad55fbd1f0f94d0b0ca6290cfb20ced4a4 SHA512 dbffb75be14f63efb3af802443e850765d380c28bb0293e577fa5b369adfa231912fe6749057788f80883710a8ece8da8ca606d1031f21e70f07cfc6f85eac74 WHIRLPOOL 3031f2cbd256fe6101d6f4d096634c7b8fb0a80677820c02e9021406cee9aef36057a4d86afe418515b7dddba1de8b7eff39db5594284b5c3460ae0235417785
 EBUILD netbeans-apisupport-9999_p20150624.ebuild 3390 SHA256 976c4217f4930420bff614346bf558cbf90c83bd8a2846dc42f3b4c18c7522da SHA512 53f333e6719f291d35417b610767209377699c5c510dcd53c14bfefe5722399ea377d2160d31b27e9707366f955cbd56f0e685e1d1f7f2980a488c4e1830a59d WHIRLPOOL 4cb98b1b95e5f0662e43929692c9834971ed1cc9edb906a92125a2d71b56c6a575c58535cba36672c2cdea7c2e004799278e1aeb4f49df739abe7334293135e9
 EBUILD netbeans-apisupport-9999_p20150625.ebuild 3390 SHA256 1b280a5a07600cddbf1b85d5521f761c253a815a05b043f26655bccbaf187a64 SHA512 f2dd996877ad9076fd67009399a77f3adc61183c0479ada295805ded1c0d1083231fe57e56c1a3424fa1b7f2beb0e8a383fe15db6ac9fefe947356e1077aea16 WHIRLPOOL 538bd1613b8f6232a9bc691652d0a7c22871d2f961fcf3040c5865a433995102e8ec197ea9a08537df6913d1b022ed657000b1fd052c692b80c3b788676b28e6
-MISC ChangeLog 176938 SHA256 d7091dcf1f7eba0c3c02be8b437ea8e9322a6f1a34fde55a55c6018e3d03ac21 SHA512 f930ac818f651e60deb544875021c8c7dff01db1565c707d64d2eea8ec89d6f78da719982fff41db782f452dde450b45f99e32486fbc5cf8e2b35b781028746f WHIRLPOOL 36acbf2a4d2b39e78ec5a97a51987af4cc00e8b2b82ba8bf379c44647f07da07aa94b325cdb6d1ec23491aaba73300455321785a2a96e50a8d8ac0244bf7c251
+EBUILD netbeans-apisupport-9999_p20150627.ebuild 3390 SHA256 00d631af5173a6daa1deb1bcd7f9809ab64ba352acd14d77f49c97368e17c74f SHA512 54c5a0f4b1b95ce6dfc385675628070b92474ed001daa668c8e7b2ff0a5722e28df91b7522ac82ed2257c3453ea81ffea699c7d6320cbea60220a4b72e2b19c6 WHIRLPOOL c56f3636de58df7c77827f8cc747138fb4997b3591b12844b78f0b758484516eadeccfb0443b959f01f8f2304bb2727fb015c394da44c7dd80997c3b5151584d
+MISC ChangeLog 177119 SHA256 99ed1c877010b6f9e04e6ead03d3b2e2c2d8641ffc53c03e52d69485b744ee78 SHA512 806958ea9ca767597896122ad8b347035f2151157e9056f0893e0aeccd5069d353f622681666d7baf5d85a0d9483cf634689bb2d85771f39758746e10e5757eb WHIRLPOOL 8ae41c334a53707fddf768047125e7d3fb2095ba92702e6d2b2f57c8d61b70651a223768e469bedfc821b5203af640338df7e278fc08aa2177e10151fc5e0016
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150627.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150627.ebuild
new file mode 100644
index 0000000..0fd02f6
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20150627.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans API Support Cluster"
+HOMEPAGE="http://netbeans.org/projects/apisupport"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-06-26_03-09-04/zip/netbeans-trunk-nightly-201506260309-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 6ed96de..0e8c657 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_p20150627 (26 Jun 2015)
+
+  26 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-cnd-9999_p20150627.ebuild:
+  bumped to the latest sources
+
 *netbeans-cnd-9999_p20150625 (25 Jun 2015)
 
   25 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index 5f52d46..bf736a1 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -63,6 +63,7 @@ DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d647
 DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
 DIST netbeans-trunk-nightly-201506240001-src.zip 207969165 SHA256 c59efebe690e08dd20cf83322141bb5b984755b67ab400fa87e9ec0fdcfe1d15 SHA512 1b6007d583cb82f0380736c57048fa0ab77944fd066cf8d643e7dc016049ea73f811b440386631ac8c50d08016d1d1bee015ccfed452c12e504518f1005cfeb9 WHIRLPOOL 8d0a362d61f5e8f57e9bad9c11add5ffc0bae4321302c4a5ab17786a3443d68041211db7f4cafe1f20c174e54b9e0525a7b85fea163751ae4a6efa4386109679
 DIST netbeans-trunk-nightly-201506250001-src.zip 207980912 SHA256 8f38be3f803587401b64e01f00f77a305a862683ebe2d63a1d8b1a57b6162276 SHA512 84383852000cafff1aee8933b47d43bb6479b7894073d21c4c6c86e7b19d39aecae7b5b6b92d9205177febe2c9c96905a3596e47dfe8f0060ecc8997a0dc7822 WHIRLPOOL f44711cda5c720b6d8844c5076ac231acf6939aa697bb1e48aa7ce41b3bec09e69e644aae22151280d288ed5d3db3167822efaa071d0629ec529ca0323c045b9
+DIST netbeans-trunk-nightly-201506260309-src.zip 208000407 SHA256 319162679323bd7d133b22e16af2fc09d95b5b07b11962d72de3e71fb257222f SHA512 5d9710eaf21aaddea69c4241b1b249936066caa156b72532ff05f41efbfaf3219c3d7eb47be74b0f55ab571e3f2cc7e73ef232e55806ce42c6580862f6e5b676 WHIRLPOOL 721eb340d7c9e73c8a620f6ea20a54782a390259c21bb53798de9c4c942d935c99a0aa70ac871320f7182b2c699e708cd3bc647fc5cea4a65bc62c9cb3f6e9d3
 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
@@ -97,5 +98,6 @@ EBUILD netbeans-cnd-9999_p20150622.ebuild 4796 SHA256 6d8ca45394764d4e89e818f597
 EBUILD netbeans-cnd-9999_p20150623.ebuild 4796 SHA256 ba2734186171529a127344d87d65fadc502e27a5a973b70cf39956d646dc5d90 SHA512 34cd5fbc07751b7367e2ed410161dcd160780dad4f886f188169c352c65b80ab9fb531c4b920d840543194d272d86df12bedaba2fb21d54a308a8bf5c871fe67 WHIRLPOOL cd4d29828acc8526e218f1b90f306746e9bcfb253d6010437c9121a6c8e322bfb539b1aa98b2cc1c191ec1b27b2fbe560736e8537cfe814886d2b39d0ccdaf42
 EBUILD netbeans-cnd-9999_p20150624.ebuild 4796 SHA256 ff08bb313f32497f9a5c8a8b55661a9109cb8228b247008f3c540572db742ce8 SHA512 9c03107d6d756e80856293037ff2f3b4737bbc2aee0a728460f99f9b0013acd3062bf6dfa0c784eadac7e35d995cdff7f416bd76537cfb9d0a4e4512a2ec988f WHIRLPOOL a95d1928c419693899587f3c22db14d4944603f14ef45f659d3c39814b619dc57b4cb756c93939bfba65a2b879784d42cd6d0a9d39a8682e5c716ffb577b4644
 EBUILD netbeans-cnd-9999_p20150625.ebuild 4796 SHA256 b3a1480ba9e7b5431d2eb6b10ce4f817761808ad6cf9a691663e86d7b0ccbe6d SHA512 b580803992894e8d794a9d15be32228fc3c3a23e31c74e2612043a2094fa7994317a1d9539dc03b6ab9301ef2859984c25e1882ed78169356ad8d70b73e64b6f WHIRLPOOL 57cb4b76042aaa1d46b25e315b63b3151f7e3b2452d0934fa39ada8e113abf7c648806b0eaa8477f1ae86aa32eb0a2782992f380613131a8166df907bbe01083
-MISC ChangeLog 161488 SHA256 cc2aa85c3eabb38152ca54073b1a0338ba60cfdf43c098c436356c57e9834b1c SHA512 e8deb230341524d2de29364bfd3176c093b2ca0b5bba8b6b10d591918f9558992055a067563c7d10ec03c48546aaaefa0fe73ee2aa8a55032bf770bf18d7bed7 WHIRLPOOL 1b162dadc45e5b8d2fea37eff802a033fb30226bbb2bf18332309732c126dc0335e6689b47c5a8b68a751790b2eec8ef26aae5402522598c2a8e4c6cf2c4d9b8
+EBUILD netbeans-cnd-9999_p20150627.ebuild 4796 SHA256 f2b71c7bd8b7af26359d53e72274acf8caac1437f6b43ceca8bd09b79be4d2f7 SHA512 0c03b148015bc4905c6af90f7fe922367017aa5f234fc460fc2575bec3f74d14bb7d8d706c6d9ca3c72555caba313dd9e71f9a82bb741c6d0458fa6d60910d58 WHIRLPOOL 2ea31ede34bcdd409a3110faf41cd3d3eb1afe52a7a566b494b35251c0e3cf0a97bcc09f73ac7a5b9deccbd1b253130695882916d84ebc7865b59ff5db6e406d
+MISC ChangeLog 161655 SHA256 c1bcf4cced62e95272059f3f2e2fce0b11890254fefc2544b57bd665c1c0dbb6 SHA512 5bc7d2a23846fb44dd7e430ad8eca23756a8558d8a8ea822c3b26c6b63eaead31daa3998fa10bb1c5b1bc3ce7d367604d192d96a0a6576518c468dfc228f4849 WHIRLPOOL 57533c8a08f9dad0523ad1687caddec1c4cb844326766e4a435e4d14a359c0bc93cac60c03cb6434104e65391eab880cc3dd1652d798f7f80f98e2bfeeff8b5d
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-dlight/ChangeLog b/dev-java/netbeans-dlight/ChangeLog
index 20a815f..2e9c98a 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_p20150627 (26 Jun 2015)
+
+  26 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-dlight-9999_p20150627.ebuild:
+  bumped to the latest sources
+
 *netbeans-dlight-9999_p20150625 (25 Jun 2015)
 
   25 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index c53ac43..f5fe514 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -46,6 +46,7 @@ DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d647
 DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
 DIST netbeans-trunk-nightly-201506240001-src.zip 207969165 SHA256 c59efebe690e08dd20cf83322141bb5b984755b67ab400fa87e9ec0fdcfe1d15 SHA512 1b6007d583cb82f0380736c57048fa0ab77944fd066cf8d643e7dc016049ea73f811b440386631ac8c50d08016d1d1bee015ccfed452c12e504518f1005cfeb9 WHIRLPOOL 8d0a362d61f5e8f57e9bad9c11add5ffc0bae4321302c4a5ab17786a3443d68041211db7f4cafe1f20c174e54b9e0525a7b85fea163751ae4a6efa4386109679
 DIST netbeans-trunk-nightly-201506250001-src.zip 207980912 SHA256 8f38be3f803587401b64e01f00f77a305a862683ebe2d63a1d8b1a57b6162276 SHA512 84383852000cafff1aee8933b47d43bb6479b7894073d21c4c6c86e7b19d39aecae7b5b6b92d9205177febe2c9c96905a3596e47dfe8f0060ecc8997a0dc7822 WHIRLPOOL f44711cda5c720b6d8844c5076ac231acf6939aa697bb1e48aa7ce41b3bec09e69e644aae22151280d288ed5d3db3167822efaa071d0629ec529ca0323c045b9
+DIST netbeans-trunk-nightly-201506260309-src.zip 208000407 SHA256 319162679323bd7d133b22e16af2fc09d95b5b07b11962d72de3e71fb257222f SHA512 5d9710eaf21aaddea69c4241b1b249936066caa156b72532ff05f41efbfaf3219c3d7eb47be74b0f55ab571e3f2cc7e73ef232e55806ce42c6580862f6e5b676 WHIRLPOOL 721eb340d7c9e73c8a620f6ea20a54782a390259c21bb53798de9c4c942d935c99a0aa70ac871320f7182b2c699e708cd3bc647fc5cea4a65bc62c9cb3f6e9d3
 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
@@ -80,5 +81,6 @@ EBUILD netbeans-dlight-9999_p20150622.ebuild 2995 SHA256 e3ee6b5e9e27eb097d2a4a1
 EBUILD netbeans-dlight-9999_p20150623.ebuild 2995 SHA256 023ef7005d8efab5f4208b7f7783605b97016f74d3f0aa5f3c31da67b45927d5 SHA512 8625f5579bf7ca840f841537a4816082a3bbf49811994b34c3a8d4321b18b6c9b60a1ce8411ea8292643ea274eceff803fd1b28541cb814f901911f5b3ccaec5 WHIRLPOOL 326dae952cea6ac05ce6acff903f2452731615fbe1a7f937012d072cf168f5a620a10dbdd3cdd54c1ed1617eea0bb21fceab4d12cfae67b923ebebd920083f95
 EBUILD netbeans-dlight-9999_p20150624.ebuild 2995 SHA256 1ae59bdb2ab86f999aa943942de0bc5337c54c82702fe8e8ab9f6276e77c55ad SHA512 7fe4532dcdbde4e5ee65266c3744d3236f3145f701a9177ca15c7da6adf3d0eb7a782db79ff039961c64a5f19a59d0b49d9ce40bcb4251da49ac4edd32f263ee WHIRLPOOL 1c3a6f5796fd98ebb1eb40234ed7a26b245bbe1d85041f296dd322a0dff75fba99b29e873f6899d4d1c807f5500f38a71649457382fe02ff9b5e9eaef4f71080
 EBUILD netbeans-dlight-9999_p20150625.ebuild 2995 SHA256 c8008ac700e2a60fe2956ec2691595dce22f52f51ccc53eca522f33ca08cf60e SHA512 727090e7d5e46cd5e8263b35d8d788187105384cdabbd9dc761228f80e6429e4f7f3d052082256ca3b7a4885e82576d5e5835bc657cb2d22f96c270549b3f71e WHIRLPOOL 66e03270248e66d8b74f2c5f9b6488c24b751d8c705e6c1152789e9dbb7cec2ad8493ed03f111a1560c32c1f672dd596e02869f2566a8c082f51b44f3d8eb855
-MISC ChangeLog 168551 SHA256 812c61139db1254dc9a33da4e5a13d087230b359579d65355cd4d98479e7cc75 SHA512 7d2cd0c285caf7bc04082cb51a1215a428e6dab5de3026f96e613dd51ef081883b961a836aa470cb81b911f405430b31a7555f2869df2d045d97bed8a67bb4f9 WHIRLPOOL 6eb5dedc606bb6bd80d6835ac7d3facbab25585c076ec3ab16b493d281c643eacb6149c6e4353065edf21419979dc09437d25397103f368c503f70c1784868a7
+EBUILD netbeans-dlight-9999_p20150627.ebuild 2995 SHA256 ba2970908a93d7a67f1a3278d344ee3813553482b9104014be05cdabdfcbd15f SHA512 2b5fa3642272aefbe2b17f2bfe080add4f9f9976fa1b11179d34f9d638431720ec6dca8f3ade005ab9c0d2ec50d7dd476d06fa57d65b1d862a2b337337bb1803 WHIRLPOOL cb5684448a962f365587204c70864f15e7b24ff5f1f1ce0134aaa8f5d3c0318cbddc6827423743844b0e3ee9ed73df324f83480310b807f6fba0297a883a6aa4
+MISC ChangeLog 168724 SHA256 64c750e796bd01726f063a72caa0261ac90d75915f14ac7006c1b136af346786 SHA512 0327a6e3843a4392951df8345ed1c95fd7abe691190d67fb27870b6b384dcc1d5b056348b1b95fd239881a7c9b293534e56cea2cc3be10a491d13132d89195e6 WHIRLPOOL cf111adb73315ae703693db546dc25174906d248dba7b5c984b1b33a5eda1f1895482e2747bb2b671d3818cb10ac4928e8495bc9719a1eab887818bd21877ade
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150627.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150627.ebuild
new file mode 100644
index 0000000..6b7e6c3
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20150627.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans D-Light Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-06-26_03-09-04/zip/netbeans-trunk-nightly-201506260309-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 d34926b..e2efe3b 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_p20150627 (26 Jun 2015)
+
+  26 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-enterprise-9999_p20150627.ebuild:
+  bumped to the latest sources
+
 *netbeans-enterprise-9999_p20150625 (25 Jun 2015)
 
   25 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index f8a0c7a..9c54372 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -129,6 +129,7 @@ DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d647
 DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
 DIST netbeans-trunk-nightly-201506240001-src.zip 207969165 SHA256 c59efebe690e08dd20cf83322141bb5b984755b67ab400fa87e9ec0fdcfe1d15 SHA512 1b6007d583cb82f0380736c57048fa0ab77944fd066cf8d643e7dc016049ea73f811b440386631ac8c50d08016d1d1bee015ccfed452c12e504518f1005cfeb9 WHIRLPOOL 8d0a362d61f5e8f57e9bad9c11add5ffc0bae4321302c4a5ab17786a3443d68041211db7f4cafe1f20c174e54b9e0525a7b85fea163751ae4a6efa4386109679
 DIST netbeans-trunk-nightly-201506250001-src.zip 207980912 SHA256 8f38be3f803587401b64e01f00f77a305a862683ebe2d63a1d8b1a57b6162276 SHA512 84383852000cafff1aee8933b47d43bb6479b7894073d21c4c6c86e7b19d39aecae7b5b6b92d9205177febe2c9c96905a3596e47dfe8f0060ecc8997a0dc7822 WHIRLPOOL f44711cda5c720b6d8844c5076ac231acf6939aa697bb1e48aa7ce41b3bec09e69e644aae22151280d288ed5d3db3167822efaa071d0629ec529ca0323c045b9
+DIST netbeans-trunk-nightly-201506260309-src.zip 208000407 SHA256 319162679323bd7d133b22e16af2fc09d95b5b07b11962d72de3e71fb257222f SHA512 5d9710eaf21aaddea69c4241b1b249936066caa156b72532ff05f41efbfaf3219c3d7eb47be74b0f55ab571e3f2cc7e73ef232e55806ce42c6580862f6e5b676 WHIRLPOOL 721eb340d7c9e73c8a620f6ea20a54782a390259c21bb53798de9c4c942d935c99a0aa70ac871320f7182b2c699e708cd3bc647fc5cea4a65bc62c9cb3f6e9d3
 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
@@ -163,5 +164,6 @@ EBUILD netbeans-enterprise-9999_p20150622.ebuild 15937 SHA256 553cc4267b2f764078
 EBUILD netbeans-enterprise-9999_p20150623.ebuild 15937 SHA256 1d8efdc54fa71fa498bf6d070fe69d7ad632ce9039e2ca560633809e94096866 SHA512 51cf05407054872aaed969d6834da649e61edcd3d6fad0189e9674b54ce5692dc71710e883aca6c5550602710632c095289fd3884cfd3176edb9a399a6191fe8 WHIRLPOOL c65b5aaefaf0126dbee18ef36e2c00e56adf97fc46e821688001b800ab08c156b2fb56f6b3990ff5cf4bf7740b8d1dcf5ed7cf79e16eee70d7cb965d385efa3b
 EBUILD netbeans-enterprise-9999_p20150624.ebuild 15937 SHA256 142179795f1fb1362d22ded2b54001440426d2feefa4573d5cee586e4c293705 SHA512 eba2296b17f1b2baf76c86dc8fc100a78eb9095adf3b6fb7474835de132f8c2a80151e97e9879bb964986bd03da7a2f84df4aa0d5c86fa0bbf6b6e38cd9e3de6 WHIRLPOOL 67be4e1c22f13fe3970ed186c682bc7e74e37a4a4ad91e9db24af3a3860f0993f3ee964d0f278ee51ea5fb00527cd4e2e8f24c135821a9e9ce4fcefd094af76f
 EBUILD netbeans-enterprise-9999_p20150625.ebuild 15937 SHA256 4e50c067e23d3b609aeb2dff813c2d976f791b782bfe1431651ca8060ee58e0a SHA512 152d8e973a2fd4d3e3dac12a813249251c8451c1212f174fba90e1f752887a55ff7f4550369e956454fe9bbfe15948ae80ad34ca41b2f8eb5d12e51c94c367b0 WHIRLPOOL 430ec6f97bd1ed4e4983e50dd7400072d15ca9fb5d35a1943e54328ea43a5d775cb6e795e954c779e4c83143ccbf331b4afece2a8c0573918601483accffecfd
-MISC ChangeLog 177463 SHA256 695cb5a4a34df8bed4223f6a883ec69f7141aea40838b21be968718c52b8a0bb SHA512 2a1d4878a76d75fdb7f7ede228a9afb0106cc1a93a26ce1fb2bfe09a77ff41ae6f8ce7892e8f1eed30fe8b10e4876fd5506595de4a22f762e12dae4ef1fae57b WHIRLPOOL 76733156e7f5445790cde092766138cccb911db6e1f885a07acd2c5c0717dbe6fcefae391a83ea4932a068e659984eb62a2a8b324c0e2f6ea4fda3ea39e63664
+EBUILD netbeans-enterprise-9999_p20150627.ebuild 15937 SHA256 09001b8d8b7671fe5ceb34753c279215498d8fbf6f5846658b5564cf632cc246 SHA512 4eee45826e514c112c64682b6d5e4b618c25b7c2d8769204ac28537652f5f64924a90f8db3b2afc71f6e57e86a051560da88b244d5e03933b822769a75426b94 WHIRLPOOL 63d1651862ecb68c974fc33ccb7c6f7d227bee70df4cfead569a1f27114948076ae1aa2a81a61f26f11f40654d6eafee94f653eba1c5a421e039a9fc6a0a7ada
+MISC ChangeLog 177644 SHA256 5ee6276c614d51e13e7c9a63fedff90c9599d5d6e0d916d69addfc48b8ae0e67 SHA512 c40ac52acc746c881e0099bd58d76c1af872dd0f0dfdc184bcb891e7e3501195c230a2de1d27eb78094018026ee33f5972d80e85ffa499e42435d9b504fae569 WHIRLPOOL 3f6407f0456b7ae4a4f61b5b8ad146df02745e046c33819221bf0d383b65ba6fcf67be041c19ac9db8b2f57d8a5fe8259742e0e6e065d736a014443095ca5587
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150627.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150627.ebuild
new file mode 100644
index 0000000..1ce4f60
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20150627.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Enterprise cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-06-26_03-09-04/zip/netbeans-trunk-nightly-201506260309-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 3149a1f..878fe3d 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_p20150627 (26 Jun 2015)
+
+  26 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ergonomics-9999_p20150627.ebuild:
+  bumped to the latest sources
+
 *netbeans-ergonomics-9999_p20150625 (25 Jun 2015)
 
   25 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index ae9e73f..704ca5c 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -40,6 +40,7 @@ DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d647
 DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
 DIST netbeans-trunk-nightly-201506240001-src.zip 207969165 SHA256 c59efebe690e08dd20cf83322141bb5b984755b67ab400fa87e9ec0fdcfe1d15 SHA512 1b6007d583cb82f0380736c57048fa0ab77944fd066cf8d643e7dc016049ea73f811b440386631ac8c50d08016d1d1bee015ccfed452c12e504518f1005cfeb9 WHIRLPOOL 8d0a362d61f5e8f57e9bad9c11add5ffc0bae4321302c4a5ab17786a3443d68041211db7f4cafe1f20c174e54b9e0525a7b85fea163751ae4a6efa4386109679
 DIST netbeans-trunk-nightly-201506250001-src.zip 207980912 SHA256 8f38be3f803587401b64e01f00f77a305a862683ebe2d63a1d8b1a57b6162276 SHA512 84383852000cafff1aee8933b47d43bb6479b7894073d21c4c6c86e7b19d39aecae7b5b6b92d9205177febe2c9c96905a3596e47dfe8f0060ecc8997a0dc7822 WHIRLPOOL f44711cda5c720b6d8844c5076ac231acf6939aa697bb1e48aa7ce41b3bec09e69e644aae22151280d288ed5d3db3167822efaa071d0629ec529ca0323c045b9
+DIST netbeans-trunk-nightly-201506260309-src.zip 208000407 SHA256 319162679323bd7d133b22e16af2fc09d95b5b07b11962d72de3e71fb257222f SHA512 5d9710eaf21aaddea69c4241b1b249936066caa156b72532ff05f41efbfaf3219c3d7eb47be74b0f55ab571e3f2cc7e73ef232e55806ce42c6580862f6e5b676 WHIRLPOOL 721eb340d7c9e73c8a620f6ea20a54782a390259c21bb53798de9c4c942d935c99a0aa70ac871320f7182b2c699e708cd3bc647fc5cea4a65bc62c9cb3f6e9d3
 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
@@ -74,5 +75,6 @@ EBUILD netbeans-ergonomics-9999_p20150622.ebuild 2919 SHA256 8da3e419b1d99804f3d
 EBUILD netbeans-ergonomics-9999_p20150623.ebuild 2919 SHA256 087ceaa07b425a532efc2bd8ccd971c06ff9d296775cbb6e68758734e2516bc9 SHA512 9c22ca4638195e1fb3c5a6d142487bada6abbbb99983627fc9d5b94f0dcc6a97e247474fe64d82b8337c7e284ec809c88aac6f86e7ee6b6ecbcef3bb642ca34a WHIRLPOOL 87cd7d8bac43a7dacacee6c5785233ccf683242e9adb597e5d84fc1ecdc14892bea44be82fbea626239dcd780a9af2e8b1421b77f18a957db67737becdad1c72
 EBUILD netbeans-ergonomics-9999_p20150624.ebuild 2919 SHA256 a47078ed54d952c1fa788a6c88aef504950d2cbc3fd2fcdd55ec0b5a23b8e192 SHA512 ea0a10f09c1af3a0ae649f6d6398f195261ca616a692bdd1a716257c0957df08a958f4dc45012afdef0d422427d1887182931e2c7e42a4502d60cf0ff856f3f4 WHIRLPOOL c93bd19ad2930925ec10eef2e19cf5738c1e6402432345f3ba4591054f24fca7fe8b99e7c144a3a7cb362d00c00ea2f46b57e184d6905cd4e3fb38710d8741b3
 EBUILD netbeans-ergonomics-9999_p20150625.ebuild 2919 SHA256 cf33afe0803700bd2a768ac68e987bc341f4973cd66e38be42dc95d5b88846de SHA512 1dda7d03dff8dca5ce5c52793a96e5507e4c19b474271e186123eb7176d8c6998929bbf9cd2bab4537f042b0d909581ccce0be4ef9d537b915118a7124af5263 WHIRLPOOL 6660c0a3cc4e46bc9845e1023e8733d799bfd5016829599bb20e225f42de680e941a4f2cbb8cdf68c7dd140b5a7b89c18bc0013854cdb5df66c53b52efa28212
-MISC ChangeLog 176938 SHA256 2965c1255e926a763b57a58c15af99797d43608ca7c8bd1c5372e8d4298891a6 SHA512 1b4999b660b7acf57d43062041dbe440c2de8ab10c19f9d7940d4d3dbd97795f54383c493132fa0a74685d320cd70587da27652b634e24f8dcb7114e5c44f951 WHIRLPOOL 20e60fb30b7ab6f0302f16bf8e0867bb8bdf3e435df07dc3dad790e56dadb70dcbcea73037e1a90f228b7c49cbab51416d29723c25581eb88746aaaf0dc00903
+EBUILD netbeans-ergonomics-9999_p20150627.ebuild 2919 SHA256 9f9555f57aa1437575d9c3a10b5ffb7345daa1d30a199331f92ae941724edcef SHA512 9cd1c62425cfcfa348c3c9f94e6b31434e12ee65b07eb113fe3e007652ae9476e070bc4312233412656fea76e9aded48f3f9686683c5b683926b726d7509787a WHIRLPOOL 04367fa6600dde11ce68c079d64f9d2d8f087980e1e92693ea42a8a222a92e8629a5e2f0b566411bcc46cc00b59624a31ab6d44eb760a383dbca4215d5f29eab
+MISC ChangeLog 177119 SHA256 2221758b2fea4bc2cbad15046affac66baa612c3fcb1f4fb9f46e60921c94e21 SHA512 adad5a66dd53c233371179923091f37a6c8d19e3639d39baf8fe750fa7b13a1c6ba8209354713939b15c5fb895f7256bd0b468eb2ee307b89749655f32898c21 WHIRLPOOL 725efc92f7f640c96b320a04f80b16a82d3b7e5299f9d2daa73b37e7e47ad3926eb7ea90d8055505a390c74b5fca3af9858375be48db98c3a359533e28e9e4cb
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150627.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150627.ebuild
new file mode 100644
index 0000000..88f7b34
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20150627.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Ergonomics Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-06-26_03-09-04/zip/netbeans-trunk-nightly-201506260309-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 73f48d0..14a0026 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_p20150627 (26 Jun 2015)
+
+  26 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-extide-9999_p20150627.ebuild:
+  bumped to the latest sources
+
 *netbeans-extide-9999_p20150625 (25 Jun 2015)
 
   25 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index 3281422..4789877 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -38,6 +38,7 @@ DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d647
 DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
 DIST netbeans-trunk-nightly-201506240001-src.zip 207969165 SHA256 c59efebe690e08dd20cf83322141bb5b984755b67ab400fa87e9ec0fdcfe1d15 SHA512 1b6007d583cb82f0380736c57048fa0ab77944fd066cf8d643e7dc016049ea73f811b440386631ac8c50d08016d1d1bee015ccfed452c12e504518f1005cfeb9 WHIRLPOOL 8d0a362d61f5e8f57e9bad9c11add5ffc0bae4321302c4a5ab17786a3443d68041211db7f4cafe1f20c174e54b9e0525a7b85fea163751ae4a6efa4386109679
 DIST netbeans-trunk-nightly-201506250001-src.zip 207980912 SHA256 8f38be3f803587401b64e01f00f77a305a862683ebe2d63a1d8b1a57b6162276 SHA512 84383852000cafff1aee8933b47d43bb6479b7894073d21c4c6c86e7b19d39aecae7b5b6b92d9205177febe2c9c96905a3596e47dfe8f0060ecc8997a0dc7822 WHIRLPOOL f44711cda5c720b6d8844c5076ac231acf6939aa697bb1e48aa7ce41b3bec09e69e644aae22151280d288ed5d3db3167822efaa071d0629ec529ca0323c045b9
+DIST netbeans-trunk-nightly-201506260309-src.zip 208000407 SHA256 319162679323bd7d133b22e16af2fc09d95b5b07b11962d72de3e71fb257222f SHA512 5d9710eaf21aaddea69c4241b1b249936066caa156b72532ff05f41efbfaf3219c3d7eb47be74b0f55ab571e3f2cc7e73ef232e55806ce42c6580862f6e5b676 WHIRLPOOL 721eb340d7c9e73c8a620f6ea20a54782a390259c21bb53798de9c4c942d935c99a0aa70ac871320f7182b2c699e708cd3bc647fc5cea4a65bc62c9cb3f6e9d3
 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
@@ -68,5 +69,6 @@ EBUILD netbeans-extide-9999_p20150622.ebuild 3383 SHA256 aa494307b06e0be42731c46
 EBUILD netbeans-extide-9999_p20150623.ebuild 3383 SHA256 c498b22167a52f98b69b8e53d5547c90f0177228f85252465c386a63e57fab0a SHA512 47ac2a62be72a52965445738587b87e484c292f983e6d87f7002bec85018135fce7bde09304f7a05bdf2fdbbca87f39477f37ea15e9f43c5c0564b9992b6a418 WHIRLPOOL af11dbf88874e0599d597733fee1f8f5465d4f9a40cb09de832b634cea6016267cd244e4ac77abb14ea554ef4365421ff8e0443799dba582ebf526b38920fcf8
 EBUILD netbeans-extide-9999_p20150624.ebuild 3383 SHA256 9380c0d85ba704aa097dd7a0b15ca94706ca4ab173aa875df9cc871787d24cb3 SHA512 6e65e77276adbeda5d3472b92a74d98b05f5485deab91be53dab4aea76004672409bb19561b329f32f96fdac0041b694bc44c0b7679941190387717e03c2aa50 WHIRLPOOL 00a7f25bf809100ffccaabc3db87c2d5788fa107f2054e329c11d9d1c1f24019175a8555850ef479bce04f8a7c8514ec5ac9c7331abb4b5a6e109a4c4baf72c1
 EBUILD netbeans-extide-9999_p20150625.ebuild 3383 SHA256 7e39a9d45ee00985d6c69bbb0b17429cc76d1dbe19b7dbbc79a9fd606b2380bc SHA512 3d2e8b54d08e0874505144c7b5a8885b4da0f34fcb1b52f28abc5992f5a97556cda0acbc497ed013d7cee30a4a628363c1557e474172f8ed5166e6c5cb235681 WHIRLPOOL f2eed8af46b9bf2b0a580b9b6aa9662df87044354fe835236f970cd370992a4672ddcf12a1838afc4de5ffcb232f0203ab6d4ce280a2ca5dccaf21ea92a539e9
-MISC ChangeLog 100461 SHA256 f9787185529bf0ff4add0310a653a040384f7b2e36e23cdc723e4329ba808803 SHA512 f638243d3cac3df9dad0a642b4107de432a29c7a74eef2b9ab81c4ee0a8d4f3603e41c917d343bc0c99ebc5983c9a4addeb2f38611aa50c4ebe6b8d3805637e9 WHIRLPOOL f8fef7767ed176c03a93aa134e13526a1d958510c86086301533c9f4bd1ccababac1c95c53ce98832497e3a7e5fc0b99473ea7a6ba5993222fe0c75e16cc8793
+EBUILD netbeans-extide-9999_p20150627.ebuild 3383 SHA256 61c4dbf3698ddbfe9f8db87e508f5879c3b424a899ba184a52ef7555711137e0 SHA512 f76cae44215e0b39aaa56805e47d934b38797936d7e156ce2720578a7a298410468504b85c13217ea7a5d7e9876ee7754f638e8129beb7d1ee8324de1fd13205 WHIRLPOOL 4e75c7bf97b21f8642b09296e26590cb61982462abd2a84f624728a3c42f7aa59d996afd2f28d538e1de1e4a76c617911bd959ceb4f7262e7eb5cb9c44b1800a
+MISC ChangeLog 100634 SHA256 0e5a72fe5f46e6b3a31c525b4da15beb0c8af42c8f2bafffb9376027fb9cedfa SHA512 19ea845fd842139c38a050a3276c9f5013dd5ce331e2fdcbb790a9d70fbf80fea84da950fc676a96d9a047b834236b11343535dfa2d4383f559a1ab1350f8158 WHIRLPOOL 51818a1f02b0f33626806436b449e7f69911261ca5bb9f2cd37be88e1eb64fcf0bb6494c593861184c1b1ea2f7f795d7a32f4862954b36a4c5347be22640485f
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20150627.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20150627.ebuild
new file mode 100644
index 0000000..fb75b78
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20150627.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans ExtIDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-06-26_03-09-04/zip/netbeans-trunk-nightly-201506260309-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 9a431f8..1133f08 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_p20150627 (26 Jun 2015)
+
+  26 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-groovy-9999_p20150627.ebuild:
+  bumped to the latest sources
+
 *netbeans-groovy-9999_p20150625 (25 Jun 2015)
 
   25 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index e1efeb7..0080e74 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -44,6 +44,7 @@ DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d647
 DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
 DIST netbeans-trunk-nightly-201506240001-src.zip 207969165 SHA256 c59efebe690e08dd20cf83322141bb5b984755b67ab400fa87e9ec0fdcfe1d15 SHA512 1b6007d583cb82f0380736c57048fa0ab77944fd066cf8d643e7dc016049ea73f811b440386631ac8c50d08016d1d1bee015ccfed452c12e504518f1005cfeb9 WHIRLPOOL 8d0a362d61f5e8f57e9bad9c11add5ffc0bae4321302c4a5ab17786a3443d68041211db7f4cafe1f20c174e54b9e0525a7b85fea163751ae4a6efa4386109679
 DIST netbeans-trunk-nightly-201506250001-src.zip 207980912 SHA256 8f38be3f803587401b64e01f00f77a305a862683ebe2d63a1d8b1a57b6162276 SHA512 84383852000cafff1aee8933b47d43bb6479b7894073d21c4c6c86e7b19d39aecae7b5b6b92d9205177febe2c9c96905a3596e47dfe8f0060ecc8997a0dc7822 WHIRLPOOL f44711cda5c720b6d8844c5076ac231acf6939aa697bb1e48aa7ce41b3bec09e69e644aae22151280d288ed5d3db3167822efaa071d0629ec529ca0323c045b9
+DIST netbeans-trunk-nightly-201506260309-src.zip 208000407 SHA256 319162679323bd7d133b22e16af2fc09d95b5b07b11962d72de3e71fb257222f SHA512 5d9710eaf21aaddea69c4241b1b249936066caa156b72532ff05f41efbfaf3219c3d7eb47be74b0f55ab571e3f2cc7e73ef232e55806ce42c6580862f6e5b676 WHIRLPOOL 721eb340d7c9e73c8a620f6ea20a54782a390259c21bb53798de9c4c942d935c99a0aa70ac871320f7182b2c699e708cd3bc647fc5cea4a65bc62c9cb3f6e9d3
 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
@@ -78,5 +79,6 @@ EBUILD netbeans-groovy-9999_p20150622.ebuild 3422 SHA256 539222c0376c3e77a018775
 EBUILD netbeans-groovy-9999_p20150623.ebuild 3422 SHA256 5d01889ef49edb266f8cd09946311a055f512f9b1f6a26b55339a19f0f532797 SHA512 3e071072ec9d3e495d51a991888e1efd6386d8375ed4516f5c5b7466bd79660c3b031f5efeabc3de1e0aac93273f5cf44fed583952d3f314da8c83df577e0aba WHIRLPOOL f9a34054f588fc90c5ad4ca4f90866121a3b7f4add9e38e5ce41652fdeb75ff61d488d3906568e23187734cefd3c889ea4fb8b26c62b3aa6173921ac578edb9e
 EBUILD netbeans-groovy-9999_p20150624.ebuild 3422 SHA256 f18870c680fccc5852bae13ca1801de412585cd601ab042a48e71a1d63d89301 SHA512 8cf356216fd2779a436e436b72cf14898c743978227bc16ca10192e86b6f32f889589292733d02771a9470cde5ca68933b997fe42526fb86ba568e4ce4eb1884 WHIRLPOOL cf02068a23430e551ffd9b3244635a7db1244510f3004912bfc87cbef6800d1bc8c15ed94fc0ab3b0169336a57e635685a6c48034d66defcff7e5dbd4ef47427
 EBUILD netbeans-groovy-9999_p20150625.ebuild 3422 SHA256 744ec358f8a9a6bd04a08baebc0aa55abc87d01241395feda773f8006785eed4 SHA512 335d97d8d16192cc4acb2a7507b0fdc9e197e869611be5dc1e1d62b59a2ead7249fee77608a8bdd7e511a0d905716af0eb5a5ea53ba2c0680a921922f4450c1b WHIRLPOOL 4a9f53d9503fcc95f3457bc728b647755e1407a56508534b3dabeef165bcae6c1208f5f1f7c4ad77c560b26110107bf21241b3c50e20191e00eb63e5c8d3f9b0
-MISC ChangeLog 168441 SHA256 480d3729974fc3bead7da72406597997fbd3f807d068a811515188cc0fe415dc SHA512 3c3f0a2ab37024dcf738ce7b7d06e864e901aa964a8298e6b0cf411799c1232600af5dfe896ee6c4b241fdc930f1695aae6b0b081e03e503be8f200193408379 WHIRLPOOL f10da87e2afb50450bb3b25d9ee442e8f24992f2047c59a6b51a7a1a8c9d601ebe8c041d83db45db92b2880844d12028eca08e7c6776a393fc630b7eb08e37cc
+EBUILD netbeans-groovy-9999_p20150627.ebuild 3422 SHA256 9eb31f8fd3d61ca559136787e31d7d1605d89a9f6aa7ee8e422478f94a744fcc SHA512 c59c5f65f9c7bc271b7c78af8793d4f715131ba501c5347c29aff8f72cf1c3e443ffcb30fd8df6f8c9e19d3fdf8a3b2bfa9174762def061fde4f206add6cad29 WHIRLPOOL 253d36050e965d9693b0f4d5abede81ad9f9c58bb45b3ec41f570c31b844d965e0034f9dc2f049ba912d499ab8076a2a962483ccd80fb1a4923631fbb18d83b6
+MISC ChangeLog 168614 SHA256 fe567df226b14205d645aba39d7cd009ccb0be5d8c22957d43236dcc17467b92 SHA512 210ff6e6833da22ec278ffef74cfb24f5c72206f695ffc73d83f2494c28aea1269a9744af9432e6d4cd9b3a8155f7bfe3eb25706cc56c819f74cff8102ff778f WHIRLPOOL c609f4fe5e004d73a24548176a07dc6fda4bb72b58e6c2d23043a222009ae654d51f647f5c35c4f5334f47bd6551088729c20adbb79ee393eecdd29d14031597
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150627.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150627.ebuild
new file mode 100644
index 0000000..acfe339
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20150627.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Groovy Cluster"
+HOMEPAGE="http://netbeans.org/projects/groovy"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-06-26_03-09-04/zip/netbeans-trunk-nightly-201506260309-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 c64dd20..b9ae6ec 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_p20150627 (26 Jun 2015)
+
+  26 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-harness-9999_p20150627.ebuild:
+  bumped to the latest sources
+
 *netbeans-harness-9999_p20150625 (25 Jun 2015)
 
   25 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index a85a5bb..09dda07 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -46,6 +46,7 @@ DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d647
 DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
 DIST netbeans-trunk-nightly-201506240001-src.zip 207969165 SHA256 c59efebe690e08dd20cf83322141bb5b984755b67ab400fa87e9ec0fdcfe1d15 SHA512 1b6007d583cb82f0380736c57048fa0ab77944fd066cf8d643e7dc016049ea73f811b440386631ac8c50d08016d1d1bee015ccfed452c12e504518f1005cfeb9 WHIRLPOOL 8d0a362d61f5e8f57e9bad9c11add5ffc0bae4321302c4a5ab17786a3443d68041211db7f4cafe1f20c174e54b9e0525a7b85fea163751ae4a6efa4386109679
 DIST netbeans-trunk-nightly-201506250001-src.zip 207980912 SHA256 8f38be3f803587401b64e01f00f77a305a862683ebe2d63a1d8b1a57b6162276 SHA512 84383852000cafff1aee8933b47d43bb6479b7894073d21c4c6c86e7b19d39aecae7b5b6b92d9205177febe2c9c96905a3596e47dfe8f0060ecc8997a0dc7822 WHIRLPOOL f44711cda5c720b6d8844c5076ac231acf6939aa697bb1e48aa7ce41b3bec09e69e644aae22151280d288ed5d3db3167822efaa071d0629ec529ca0323c045b9
+DIST netbeans-trunk-nightly-201506260309-src.zip 208000407 SHA256 319162679323bd7d133b22e16af2fc09d95b5b07b11962d72de3e71fb257222f SHA512 5d9710eaf21aaddea69c4241b1b249936066caa156b72532ff05f41efbfaf3219c3d7eb47be74b0f55ab571e3f2cc7e73ef232e55806ce42c6580862f6e5b676 WHIRLPOOL 721eb340d7c9e73c8a620f6ea20a54782a390259c21bb53798de9c4c942d935c99a0aa70ac871320f7182b2c699e708cd3bc647fc5cea4a65bc62c9cb3f6e9d3
 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
@@ -80,5 +81,6 @@ EBUILD netbeans-harness-9999_p20150622.ebuild 4131 SHA256 9aa81d2a5ba42bd4060f6b
 EBUILD netbeans-harness-9999_p20150623.ebuild 4131 SHA256 1f68cc88fca77963b04400e450bd2d646f6919a5c2a106574549f00434c7aee0 SHA512 4e71bd35b514815874db23b330871c93bc4c0a82dff398e54d62386b5520646dd35c51056ddf3335912834d6f3c00310eb505eeee13ae2d589f7e6b65b732e9c WHIRLPOOL 1ce0b289e93d33b9a112ee42d1379c5d1eca05c7ad0975af2d5a32fad0a8f7a49e27cd7e85da678dc8466476ad4763278fa44147369e8fedd9f7f92d8d004b18
 EBUILD netbeans-harness-9999_p20150624.ebuild 4131 SHA256 87e6e72d89be5c1bbac5af87f8aaadac17359956402ae021c00c39fffbcf2820 SHA512 09c8145c007f3d7f06fccfcbce5841bdd2788142ca2b42267348eb544af79b4746d92d022bb1bfaa571357427404d741aa9fe4816cd168bcc20fa03c86affbba WHIRLPOOL 8b213dccc2030a34633d68c7facad25e16e7554c24d492ce07797a3d92d517047aec09fec374bd54ef1d6dd706db0f3c40fd9b29fc31dd013d6d6efd71806f43
 EBUILD netbeans-harness-9999_p20150625.ebuild 4131 SHA256 c9d804cb48ac33975f46152363107b39e2211cafd1541bca72ce9f8d762ec6ec SHA512 994fcb963b9a3e2624e3a9752563775b4217545c2ca9bef8a2025bd3170bf5efbc2d39aa469cb567519a02de639000d679117ee380042fe18d412c34d1a21e8b WHIRLPOOL 84c29e7d1581b857a44dabf799530405fe1855e9334ccd343dc0fdff1972f8e5eb0b02483cc7d418c3ec568b4ee510203f135c5226e32a8d7608f81a52f69817
-MISC ChangeLog 170594 SHA256 385de01f9c6544e82d2b00bcfcca2a31ae394d7a834c321666b3b8aef56e77bd SHA512 46e841f8ce99f0a2f2d8a615d1b339e6f51eccea12f4cf76f5b172fb7194a9e7ca926ae1199e7519500547f8fdc278b07d57dab524e2ae0254e4faa795044bb0 WHIRLPOOL 14bd87be54e98c51eb827682eb68c9ccfd9b2929f7ddfa88236821185c5c1cfa677cd3a1694291aa6ca3279f80120b8389f763607388b62d95f3b054f231c89a
+EBUILD netbeans-harness-9999_p20150627.ebuild 4131 SHA256 c1dbe6fb7cc42c67c170f77cc93f23cbadabf2cb08f66cfa8fc2e61450780fd1 SHA512 c423c012ff2c4ed40cba0a1845d8ed31dfe4c2251da55d9501e03a1c7a9a4e86fbdc1ff0df8d3f5e6671544c1d91ec3b2caed1924d1e515671c373269b9b2c96 WHIRLPOOL f0ce0658af2782e25af44c96bc2c2e87c1e5ee57123aef66976458fef0f569d826684f827ac5cbb0809cf33565e50e64cd3cb6fd8294c3d1905918645dd99139
+MISC ChangeLog 170769 SHA256 18fc9d174dbd0b8f50b433fe2585ebfb1cd5b5dbac2639f1b7f67154ea123993 SHA512 1a92895162d12a9181d8583da367126dde77fcbf3328b1e0ac1d3df0e22e0f4cba7db4903e2029e8a282ab9fa18598fe01f20dda56601c35e788949a22cb917a WHIRLPOOL c08d2d12018c2a65de2a385a79efd3bc32e5abe210baa5e08c342aca2399df20b9970c9a7e73bf73dd916d91719bdcc2dd1346a9e635a88f24ada8eba5423923
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20150627.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20150627.ebuild
new file mode 100644
index 0000000..6d26dbb
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20150627.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Harness"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-06-26_03-09-04/zip/netbeans-trunk-nightly-201506260309-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 784f7d7..47e705e 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_p20150627 (26 Jun 2015)
+
+  26 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-ide-9999_p20150627.ebuild:
+  bumped to the latest sources
+
 *netbeans-ide-9999_p20150625 (25 Jun 2015)
 
   25 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 1550ad8..0463479 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -250,6 +250,7 @@ DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d647
 DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
 DIST netbeans-trunk-nightly-201506240001-src.zip 207969165 SHA256 c59efebe690e08dd20cf83322141bb5b984755b67ab400fa87e9ec0fdcfe1d15 SHA512 1b6007d583cb82f0380736c57048fa0ab77944fd066cf8d643e7dc016049ea73f811b440386631ac8c50d08016d1d1bee015ccfed452c12e504518f1005cfeb9 WHIRLPOOL 8d0a362d61f5e8f57e9bad9c11add5ffc0bae4321302c4a5ab17786a3443d68041211db7f4cafe1f20c174e54b9e0525a7b85fea163751ae4a6efa4386109679
 DIST netbeans-trunk-nightly-201506250001-src.zip 207980912 SHA256 8f38be3f803587401b64e01f00f77a305a862683ebe2d63a1d8b1a57b6162276 SHA512 84383852000cafff1aee8933b47d43bb6479b7894073d21c4c6c86e7b19d39aecae7b5b6b92d9205177febe2c9c96905a3596e47dfe8f0060ecc8997a0dc7822 WHIRLPOOL f44711cda5c720b6d8844c5076ac231acf6939aa697bb1e48aa7ce41b3bec09e69e644aae22151280d288ed5d3db3167822efaa071d0629ec529ca0323c045b9
+DIST netbeans-trunk-nightly-201506260309-src.zip 208000407 SHA256 319162679323bd7d133b22e16af2fc09d95b5b07b11962d72de3e71fb257222f SHA512 5d9710eaf21aaddea69c4241b1b249936066caa156b72532ff05f41efbfaf3219c3d7eb47be74b0f55ab571e3f2cc7e73ef232e55806ce42c6580862f6e5b676 WHIRLPOOL 721eb340d7c9e73c8a620f6ea20a54782a390259c21bb53798de9c4c942d935c99a0aa70ac871320f7182b2c699e708cd3bc647fc5cea4a65bc62c9cb3f6e9d3
 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
@@ -286,5 +287,6 @@ EBUILD netbeans-ide-9999_p20150622.ebuild 30352 SHA256 8e4d2e4f4f33361adff639a0b
 EBUILD netbeans-ide-9999_p20150623.ebuild 30352 SHA256 a957ba66af43cb0590a9545d2ca9e99925a7d3e859bfa29ba15e77106f4263e7 SHA512 28e92e6f5d489bcb4b149f5b8a731cfb6b41413f76f2e1c13fd97bffd7cb25d9bae762f543e55f1e4d3f154172f23dcffb41a842eff52a9edce2f0e7eb0fd1a3 WHIRLPOOL 6fa6a8cada06684bb43d96c3936d4942fd963d5cbb0b2824e482bf5bff1db2e17eb0dcb4680a9ee6647f8311fd9d3cae607969467c96f1317d95e87d7c81df0a
 EBUILD netbeans-ide-9999_p20150624.ebuild 30352 SHA256 3dbbc95fcd8e1449f100eac6863d19d72a99ff84aa7a444a27b8d4087f97b110 SHA512 f731fa250e913c3effff9825f9c4f92062855653067c7a3700b9991bd00ac6b0de5ea21048ce0e250fefcdeadb095f929eb2e99856c621bde9cdec60871dbca7 WHIRLPOOL ec084429be657cadcc83e15c8f01e484707e686d780b6e4bf272f330f3b3d6b81424ad248bdad5ef2abde18069cb370b8102e0fd94cd3c1335e95fe33d1f3f67
 EBUILD netbeans-ide-9999_p20150625.ebuild 30352 SHA256 4ab5765479cfb6f3e69539b8077114621433201a83e6b158823d5fe8e0f95fe1 SHA512 488d2fb5ae5fee76022a35dd194257fb176d388866cb9b0a75aa3edcf10077045bb371a50023a597e57c9ccaaab6e614e26d19ea9ce7511433668dd8d6e98adc WHIRLPOOL 6906015835d52c5691b160911abd3b9a1619f7d5220c7c1ad903a349b8d8ade52a61a9ed4f5bd76a66c979ef9fb883d7ef37c78a7920e3399f4f02172573cc27
-MISC ChangeLog 162410 SHA256 c4211ba2701983ec9a4457050d83ccfbd82a91b8f1e90406ac529ef1d23f54ee SHA512 c8847dc2b6b0cf01477f4c21fc940bfc90f88ab7f3f6259b92183c9f20b2320870aa20ed7b8d03b349f17e4250222e27c0e939473953d5ab63fcafddfb021deb WHIRLPOOL 7e5e595a68559375940bf884c72247c64a3bbad754ffa15d154178d965bcf454337070cf17416feb8ae0078ed303d8528aa7eee040c12e782e3665f2762c7d4b
+EBUILD netbeans-ide-9999_p20150627.ebuild 30352 SHA256 bb16b9b037ed15d918def384aeed90241e2ef5e15415da4e9e65708a6c9b4dec SHA512 282193f588e37f4596d284253f34103ee6d2e5c3c3e88bb749cc17281264caab98e58a241e43f77c2ad3828eb70adc154990916e0ad1f7dd4ef69e77130573c3 WHIRLPOOL 3c21e41809065fcd2361d68dc6ccac0db45083d42507a51301691164a2202dc10402b4a10b3d9f0dea00d8a2db16ec4004fd320f95d8dc2a947e31509995fb0d
+MISC ChangeLog 162577 SHA256 11d763e245197531ef33d6c0d8db7ede0f9b9260b7ccbbdd364c40551f6371ec SHA512 9ba41c72b4f592dddc5e8d5f04e47e4ccd5be2419a66fc9356c56100714efe39b9f3488aea3c4fb804466cf624a727786871f4933cf9a7f48fefb1381bccda4f WHIRLPOOL 49cea4448e95673179a33006b8bc80dd149b050fc6e634702b672c57f0daf38a2caf9d19e04b054e5d5f16191a394bbfd3c33d72c1243e0c6b8b259d830b39ac
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-java/ChangeLog b/dev-java/netbeans-java/ChangeLog
index f67412a..e802401 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_p20150627 (26 Jun 2015)
+
+  26 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-java-9999_p20150627.ebuild:
+  bumped to the latest sources
+
 *netbeans-java-9999_p20150625 (25 Jun 2015)
 
   25 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index c5cf535..352a70f 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -121,6 +121,7 @@ DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d647
 DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
 DIST netbeans-trunk-nightly-201506240001-src.zip 207969165 SHA256 c59efebe690e08dd20cf83322141bb5b984755b67ab400fa87e9ec0fdcfe1d15 SHA512 1b6007d583cb82f0380736c57048fa0ab77944fd066cf8d643e7dc016049ea73f811b440386631ac8c50d08016d1d1bee015ccfed452c12e504518f1005cfeb9 WHIRLPOOL 8d0a362d61f5e8f57e9bad9c11add5ffc0bae4321302c4a5ab17786a3443d68041211db7f4cafe1f20c174e54b9e0525a7b85fea163751ae4a6efa4386109679
 DIST netbeans-trunk-nightly-201506250001-src.zip 207980912 SHA256 8f38be3f803587401b64e01f00f77a305a862683ebe2d63a1d8b1a57b6162276 SHA512 84383852000cafff1aee8933b47d43bb6479b7894073d21c4c6c86e7b19d39aecae7b5b6b92d9205177febe2c9c96905a3596e47dfe8f0060ecc8997a0dc7822 WHIRLPOOL f44711cda5c720b6d8844c5076ac231acf6939aa697bb1e48aa7ce41b3bec09e69e644aae22151280d288ed5d3db3167822efaa071d0629ec529ca0323c045b9
+DIST netbeans-trunk-nightly-201506260309-src.zip 208000407 SHA256 319162679323bd7d133b22e16af2fc09d95b5b07b11962d72de3e71fb257222f SHA512 5d9710eaf21aaddea69c4241b1b249936066caa156b72532ff05f41efbfaf3219c3d7eb47be74b0f55ab571e3f2cc7e73ef232e55806ce42c6580862f6e5b676 WHIRLPOOL 721eb340d7c9e73c8a620f6ea20a54782a390259c21bb53798de9c4c942d935c99a0aa70ac871320f7182b2c699e708cd3bc647fc5cea4a65bc62c9cb3f6e9d3
 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
@@ -158,5 +159,6 @@ EBUILD netbeans-java-9999_p20150622.ebuild 14580 SHA256 24604e42d0e9d1ce1ee2e898
 EBUILD netbeans-java-9999_p20150623.ebuild 14580 SHA256 258048e7ed2f6925e14d13d83338ed5970912586e8c2e13deb2ef1d4db0a6f4b SHA512 d4adc703a66552021ad1925903c95b9a2f5eab412183a123eaee91b192d2dc0ab0402b50891a9005ce5dbf8428c1c69e343493bab7cfebb3ad871e010d390ba8 WHIRLPOOL 5cd318fb121c31154a952550d85b2e861903a49e32622795ecabbca254ac1e33dde849d9ebd4b597b604cb52d6230dda0635d86cf2ca8301eae2f7ca31af63e7
 EBUILD netbeans-java-9999_p20150624.ebuild 14580 SHA256 e8ef9d13edc37950e8ea0949975ac1bae293fbea560003df00e8dc1d209d34df SHA512 3014719f5165651feae3a0058fb260235ef37b26d6bc2b4f438155cfca1df4cca92bb9303dada57e8fdf4128fed822a9c6b571885a626ed68ed8117e8742aa8d WHIRLPOOL 6db38828a839ade2d3bbc6d13c86fb970b94369e3db895c6012d7313526ae1a230d29e0e04ba8f1f1574a2d093cb73d7f8d82750dfa7fd9dcaeca0e01296e135
 EBUILD netbeans-java-9999_p20150625.ebuild 14580 SHA256 8b8305f66805edb8869e221edeb8c5a6592ec9055326b4d1b14ea8b41bee926e SHA512 450b8f8b59574b22083e6f8d1533df7671186c385358986f8d8534561c3ac6e1f83e5e7bb0296a9d646e6737d15731bf67d2c9ddcb3497cd7500fd2bcc027a0f WHIRLPOOL 40506fdbd0e7f3c92749601d318b84ded8988e22a98454b8a467362d438d248a1af339654a6972ecd7648a719b618b8c8afa39bf8c86dcbf2bf2f1fdf11c8a66
-MISC ChangeLog 165828 SHA256 b5b98c0043583cbc4973c216625c20ffa49ede5b6119e5721d509f73bd40eaea SHA512 ee40a724e757fe1ef19d11e824cffc52f49249e3eb639821f71220e16036514d5a79d885c22de743ed712a8498846da715ee8fffe0d4e4db8162b47bcc2f087b WHIRLPOOL 961c9cf3f1c0a90a68f0eef270fa1f0bd46a757670641d9fc14c3c83b6a8ee4938aca137462a6ea987acb08422910b0769e50f557bec08b8d61c6b3fb52b3023
+EBUILD netbeans-java-9999_p20150627.ebuild 14580 SHA256 16dd19ab2508bf4d7cef27c938d943299aad862389529a17c6701fefc0fc6a3a SHA512 8fff297aebc62758fc8395dff647e73106d16d823ff3f823fe1de9957630d608a108eef2411cf02f747675d54e0027a6692f27f4c15356cca514bf90adc0db5d WHIRLPOOL 5dc5485284936024e6ac7afb5563ee2a955cba9751215888a9cac9ef434c890fa461bab59576fedb15157a576fa769c80b2e23280e066e5b5e3ec294c0d966e9
+MISC ChangeLog 165997 SHA256 c32c2b3491b079545b42ac0941ac9bf8a860dc461889ffdc5da2b1f3b645c258 SHA512 db7adf1b6f5d823cb2581dd4bbcbc5b21243eff6aea187a092b486cf30f34cd94308fe2c65d82c75f03027d4a0e80ea9a55df567611d8fa5b1bf8be11b69122d WHIRLPOOL 2d64bca824946adc2bcf64e99ce700c4bb5ab80872f9d2f902d0d31ac3a9197c2d4c9bcc0d131b0103310ef2366aa826ebce3a00d2af1edb89675debefff51ec
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-javacard/ChangeLog b/dev-java/netbeans-javacard/ChangeLog
index ad56162..922659a 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_p20150627 (26 Jun 2015)
+
+  26 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javacard-9999_p20150627.ebuild:
+  bumped to the latest sources
+
 *netbeans-javacard-9999_p20150625 (25 Jun 2015)
 
   25 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index c86cef4..7ed2c21 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -43,6 +43,7 @@ DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d647
 DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
 DIST netbeans-trunk-nightly-201506240001-src.zip 207969165 SHA256 c59efebe690e08dd20cf83322141bb5b984755b67ab400fa87e9ec0fdcfe1d15 SHA512 1b6007d583cb82f0380736c57048fa0ab77944fd066cf8d643e7dc016049ea73f811b440386631ac8c50d08016d1d1bee015ccfed452c12e504518f1005cfeb9 WHIRLPOOL 8d0a362d61f5e8f57e9bad9c11add5ffc0bae4321302c4a5ab17786a3443d68041211db7f4cafe1f20c174e54b9e0525a7b85fea163751ae4a6efa4386109679
 DIST netbeans-trunk-nightly-201506250001-src.zip 207980912 SHA256 8f38be3f803587401b64e01f00f77a305a862683ebe2d63a1d8b1a57b6162276 SHA512 84383852000cafff1aee8933b47d43bb6479b7894073d21c4c6c86e7b19d39aecae7b5b6b92d9205177febe2c9c96905a3596e47dfe8f0060ecc8997a0dc7822 WHIRLPOOL f44711cda5c720b6d8844c5076ac231acf6939aa697bb1e48aa7ce41b3bec09e69e644aae22151280d288ed5d3db3167822efaa071d0629ec529ca0323c045b9
+DIST netbeans-trunk-nightly-201506260309-src.zip 208000407 SHA256 319162679323bd7d133b22e16af2fc09d95b5b07b11962d72de3e71fb257222f SHA512 5d9710eaf21aaddea69c4241b1b249936066caa156b72532ff05f41efbfaf3219c3d7eb47be74b0f55ab571e3f2cc7e73ef232e55806ce42c6580862f6e5b676 WHIRLPOOL 721eb340d7c9e73c8a620f6ea20a54782a390259c21bb53798de9c4c942d935c99a0aa70ac871320f7182b2c699e708cd3bc647fc5cea4a65bc62c9cb3f6e9d3
 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
@@ -77,5 +78,6 @@ EBUILD netbeans-javacard-9999_p20150622.ebuild 4982 SHA256 f735867bccfea50fc245b
 EBUILD netbeans-javacard-9999_p20150623.ebuild 4982 SHA256 ae8d81378ae0a749b093e2f6e49f3984cc5c2b3c4e6ae24c95de411c2cd6bddf SHA512 c6936e4f97efeab5411090b008a404a633c25fdc08a573435a7e97cdcf4ab8dc067a8bbd129053ecb902e5bb5e0147a89b43b553cdb094458578003eae6f3788 WHIRLPOOL 202e6e3b8fc63ef22e328fce638b5d0db90869d57f24c1c7cb86b9d040d39324d6e6dc4596aae57735ed4f78b45defd9311ad22b9af826db07e3f21f2a5888b1
 EBUILD netbeans-javacard-9999_p20150624.ebuild 4982 SHA256 776dbe8f2e26e665a09b7a54ebd9ac107778e83b7dc5896ed8e049f773d665fa SHA512 26da13dff0ab0ad1f28723397fb1a4c80b93720dd015c0be35bdbfb77632f1e9fbba7b072b91d2a6ba9b5e59128ed436ddc0e8ad3e3276e15b7f05c498174e6f WHIRLPOOL cacc99ef79140a470e9fe118156d6981c54ce8a9bfd60bee81c4abddbb75e382a2ca4cefd37ec155b5bde55cee9d4f2c1b3226130d601638bce35a578f2a8fd4
 EBUILD netbeans-javacard-9999_p20150625.ebuild 4982 SHA256 f2bbc7a87c25c738c717c4217ee6428cc5b057297aed702f492a8f9c8d3d87eb SHA512 0f91fef520176f49443350c4e39d6ee8d852cba26c6b686a90b0f427a90e25ea1fe23a7449c22735ba51d9276788a12af9c273f2cb542d40f9ce7029116ad12f WHIRLPOOL 7bbec2515bd4fb06fb62cf753f3698c8d3b5a43387524ef39cd8d115c131bed7601b0aeaff2f6c519a15cf712b5df73452a4c79f2f9d410fc2fc65f7f89548ba
-MISC ChangeLog 172747 SHA256 ceab628d38e43d48c37d33bd07436345d37296cdfc1e67d1d26627ab5a3e31b7 SHA512 4325187c6b05583c47da40a7dd2c239ca96845d1f1086156b12044b9faa5131c545cebbab0ed31c2b0dfbe9d71733c2af1e4dd502c796e811890717f59c939e9 WHIRLPOOL 397081e21030b2f7818aac02b4199d43fdc803c8b27c03748ae72403813fd061b8e66cd18cb50a7ad1748417e27eee2d7fdef7286bdb3b57df191b952507fe8b
+EBUILD netbeans-javacard-9999_p20150627.ebuild 4982 SHA256 8e3d7dc61c7c7cbab3778c912431a5d1fff8fc2fdb159ded66e552ad9af056cb SHA512 2a7fae78b445f02443ba5df360fb0b84edb203a0560a38c5c8d387bd5cc10de96a8c6e9ed754c78d2e1b5a36bc04d5b676f268a2b95df0c909a1e0358e7c4860 WHIRLPOOL a2d1705c2e8a28c0379dfc99f8aa6c19322622b9ebca92f12e840d8e6dd5ec50f81a5df0a98a34a31c9990fca2b19c04892d9cb40ae11abab03951eb2ae9f404
+MISC ChangeLog 172924 SHA256 fbb1805fc6ad75cacc6cf17f7107b24ad6039018c9de7dac872fe159313f6b0f SHA512 aa40aaa24c26624487e5c10df052533a20bd5e5f63609dadc6736b4ad8bf2fa7985e85fcbb300d551786e75ebce9a3abb2205e812530b34bcf6c81a704b45758 WHIRLPOOL 481707f7ebbb4d19f37bae6d4f03c8be638979905e1209fe63b9939b87a4fcf83a48ba920264d17c472c39c56d19a5ab3787660bf53cbe93f5cf96706553f391
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150627.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150627.ebuild
new file mode 100644
index 0000000..8feadce
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20150627.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaCard Cluster"
+HOMEPAGE="http://netbeans.org/projects/javacard"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-06-26_03-09-04/zip/netbeans-trunk-nightly-201506260309-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 ad24cc0..4d04190 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_p20150627 (26 Jun 2015)
+
+  26 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javadoc-9999_p20150627.ebuild:
+  bumped to the latest sources
+
 *netbeans-javadoc-9999_p20150625 (25 Jun 2015)
 
   25 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index 7ad283b..036aedd 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -46,6 +46,7 @@ DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d647
 DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
 DIST netbeans-trunk-nightly-201506240001-src.zip 207969165 SHA256 c59efebe690e08dd20cf83322141bb5b984755b67ab400fa87e9ec0fdcfe1d15 SHA512 1b6007d583cb82f0380736c57048fa0ab77944fd066cf8d643e7dc016049ea73f811b440386631ac8c50d08016d1d1bee015ccfed452c12e504518f1005cfeb9 WHIRLPOOL 8d0a362d61f5e8f57e9bad9c11add5ffc0bae4321302c4a5ab17786a3443d68041211db7f4cafe1f20c174e54b9e0525a7b85fea163751ae4a6efa4386109679
 DIST netbeans-trunk-nightly-201506250001-src.zip 207980912 SHA256 8f38be3f803587401b64e01f00f77a305a862683ebe2d63a1d8b1a57b6162276 SHA512 84383852000cafff1aee8933b47d43bb6479b7894073d21c4c6c86e7b19d39aecae7b5b6b92d9205177febe2c9c96905a3596e47dfe8f0060ecc8997a0dc7822 WHIRLPOOL f44711cda5c720b6d8844c5076ac231acf6939aa697bb1e48aa7ce41b3bec09e69e644aae22151280d288ed5d3db3167822efaa071d0629ec529ca0323c045b9
+DIST netbeans-trunk-nightly-201506260309-src.zip 208000407 SHA256 319162679323bd7d133b22e16af2fc09d95b5b07b11962d72de3e71fb257222f SHA512 5d9710eaf21aaddea69c4241b1b249936066caa156b72532ff05f41efbfaf3219c3d7eb47be74b0f55ab571e3f2cc7e73ef232e55806ce42c6580862f6e5b676 WHIRLPOOL 721eb340d7c9e73c8a620f6ea20a54782a390259c21bb53798de9c4c942d935c99a0aa70ac871320f7182b2c699e708cd3bc647fc5cea4a65bc62c9cb3f6e9d3
 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
@@ -80,5 +81,6 @@ EBUILD netbeans-javadoc-9999_p20150622.ebuild 6234 SHA256 741fc0a8d00bcd19850f4f
 EBUILD netbeans-javadoc-9999_p20150623.ebuild 6234 SHA256 945e7480a12bb433530b2cbe347b1e07c7195ddda1e593ab802921ae8e0cf4da SHA512 64ef41fa0e67ad8f3939b82c154403f162bc14bf1932945ea4896ae0411dd6c04bafc33e3fffc376993c525c851bbf396ec3af854c16da36a747045c857f9a81 WHIRLPOOL 15d361ffecf902fbf5e3b55a94678c706a675311a665d0eaef2f5aaeec0bea179f362cb777290345765290ff3134afd21e4da677c8ab33fb6764e2f7e8842f74
 EBUILD netbeans-javadoc-9999_p20150624.ebuild 6234 SHA256 fed8acf863c0d0f58d2009c03183444ee55539c08a79c595fe869846269cf419 SHA512 55d029f0c6d3c30aacb15a244a08532c7030ba96a781651f36ef8fefcf92bc632613ad6578fdc6d709513ce9e83b80e721f29fa9b2907cc00ca4658d058c46af WHIRLPOOL 86c2d11f307a963b1b299393073eca1607a7b6f1ccfbad28a0ee14b787fa51ef8c3e33a5fc027d04169b95b0e5b6c4df39202d434793acbc72691771719b981e
 EBUILD netbeans-javadoc-9999_p20150625.ebuild 6234 SHA256 9b2aae75badadbeec40fef3da782de271ebeb23fdd2f0a5db2e2b1917c475d9d SHA512 51703e57ea1b8e13cae4d08c08bcf1ea7b0f1a22cd97117c5c20f57657e3fe956012571e125e27394210eb1cf9aadec8aaac7fc347a82b13fe7e0f74f2e64f8a WHIRLPOOL f08e17140304336f206711b3887914c542c84017981a4801c36e3db01471ceee512fc95b394ca977d8a3fc3abeef744cd2281ce22f4c9e47c62adfbc1eea96a1
-MISC ChangeLog 170420 SHA256 d9f60b0f019daecf5bcb57f187f286a4317bdb6e52bef2ef43f16736c067f17f SHA512 1e27b75fd82608e4960788f43bde5bcbb09b59af3806c777dfdfa994b0df9e7c351d5be4caa344624d3579c0122465628f080398e74fec22e1b94ec102ad61b1 WHIRLPOOL ba21de8e249b3750a620e926c01609200c8c475015c7a164c844a83c1b329b74f328718cbc778f5bed56651f482b72edec050ff61f132cf349b6656248472de0
+EBUILD netbeans-javadoc-9999_p20150627.ebuild 6234 SHA256 11449196981a5c31dc7e1b3f3357d0c3ed19621e923694150cc308a8d2d80486 SHA512 35b0715bf9f4b45b400300b1d3f6390c8c4d6f8409c09bee6f773f87e7343a3f9c3c7b04c553ce97d3f67af861f343f2b1d37e59ebecb8559f8d1ffc4838a20b WHIRLPOOL 63b35ab2eccf6b08c574d0707c23ec6cc125f2029f1279c6749481b82b1dc16cf825dbd02329280b67ac6ff582b45ff1784fd42df986885d47db8b1dab838886
+MISC ChangeLog 170595 SHA256 5f25a74bca4acc72965e0e67ee8ff42fcc445b77045d97018afb69471858caed SHA512 220c336bb38203df61fd7a84221ea7afa061606bdf542aef7f5e558f70b89ec9ebbffeb3e8cc43b9fe7f609e81ecd1cc21bc2b6d1e0c433fba0171c355bfd74c WHIRLPOOL 9d7975b50d8d8b291bdc591252944615c664b0af9bb763aaf142b702d1484091d33204cdb992629300a2e0464b4a39a27fc3784b8cd86b1cc332527e41c513e3
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150627.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150627.ebuild
new file mode 100644
index 0000000..f03539d
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20150627.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaDocs"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-06-26_03-09-04/zip/netbeans-trunk-nightly-201506260309-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 a3a4296..dc58c4b 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_p20150627 (26 Jun 2015)
+
+  26 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-javafx-9999_p20150627.ebuild:
+  bumped to the latest sources
+
 *netbeans-javafx-9999_p20150625 (25 Jun 2015)
 
   25 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index 6190338..68b719a 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -46,6 +46,7 @@ DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d647
 DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
 DIST netbeans-trunk-nightly-201506240001-src.zip 207969165 SHA256 c59efebe690e08dd20cf83322141bb5b984755b67ab400fa87e9ec0fdcfe1d15 SHA512 1b6007d583cb82f0380736c57048fa0ab77944fd066cf8d643e7dc016049ea73f811b440386631ac8c50d08016d1d1bee015ccfed452c12e504518f1005cfeb9 WHIRLPOOL 8d0a362d61f5e8f57e9bad9c11add5ffc0bae4321302c4a5ab17786a3443d68041211db7f4cafe1f20c174e54b9e0525a7b85fea163751ae4a6efa4386109679
 DIST netbeans-trunk-nightly-201506250001-src.zip 207980912 SHA256 8f38be3f803587401b64e01f00f77a305a862683ebe2d63a1d8b1a57b6162276 SHA512 84383852000cafff1aee8933b47d43bb6479b7894073d21c4c6c86e7b19d39aecae7b5b6b92d9205177febe2c9c96905a3596e47dfe8f0060ecc8997a0dc7822 WHIRLPOOL f44711cda5c720b6d8844c5076ac231acf6939aa697bb1e48aa7ce41b3bec09e69e644aae22151280d288ed5d3db3167822efaa071d0629ec529ca0323c045b9
+DIST netbeans-trunk-nightly-201506260309-src.zip 208000407 SHA256 319162679323bd7d133b22e16af2fc09d95b5b07b11962d72de3e71fb257222f SHA512 5d9710eaf21aaddea69c4241b1b249936066caa156b72532ff05f41efbfaf3219c3d7eb47be74b0f55ab571e3f2cc7e73ef232e55806ce42c6580862f6e5b676 WHIRLPOOL 721eb340d7c9e73c8a620f6ea20a54782a390259c21bb53798de9c4c942d935c99a0aa70ac871320f7182b2c699e708cd3bc647fc5cea4a65bc62c9cb3f6e9d3
 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
@@ -79,5 +80,6 @@ EBUILD netbeans-javafx-9999_p20150622.ebuild 4723 SHA256 a958c7c5ed32d17a2f8a7ae
 EBUILD netbeans-javafx-9999_p20150623.ebuild 4723 SHA256 43d90e935df3e49353f9b86d4aee56b1c8972e755e552254d92738acf61b1a3c SHA512 86355dcad9b925c8d78578e531c163e4eec7b840165c8dd2aad6b79d363e25b0a5359428c2cfb6467514ee9ab653210a4eaa62aee78440541ef4a92349f1d413 WHIRLPOOL ae78143d619ad69aa10693e99035c17f96c864ee011cdc59f180e4cab7a8efe93d312611b324f432ef32f6b89cf940f2761321bfc7921be4ba840d23bf1662e4
 EBUILD netbeans-javafx-9999_p20150624.ebuild 4723 SHA256 4dc7fe4498885efa5d412eb1f8a676c7fc6e65aa24172a55dc2f286129c1bc25 SHA512 846221261b11a6b71eeeb8d68c4159547c29a73d823c7763764a5b9c59eb6aa2e126c691841415fdd5dec474f8ca4bbe25ed736ff15254cfdab2a5b2783d8541 WHIRLPOOL 1a13976ca97db2e523f64503d604df1807fd71a70c1a41b1786d6849e176894659dfa7a250ecc12e9a78f57d517659ce2e094e9f9a513201b9fe81d16df0ffdf
 EBUILD netbeans-javafx-9999_p20150625.ebuild 4723 SHA256 fde8a5cc9775b292184067e17bc5ac753de81b51fcedec960b5ae02abb0eb3f8 SHA512 ca5ab00f055929a0ba39b6d18db8a3942bf1703934377462a4f0059c397312d9ed496998fb16693a4a36af37c3bde59d7f1a3e27f75322353027b549030eac4b WHIRLPOOL 5d2db722ebc2e45011e15eaab123ad0ad36dc15aad9fc131da42e0c1014c78426139c3902d8d15640501d556fe2509128d9f2601d8ecc295d9a0f35b48587cc6
-MISC ChangeLog 154960 SHA256 69d457ba0bd08d9d07618e135d8392e040c2779a02a69f7f34f0891e8917ee81 SHA512 5505290f3ef08ba40951c7a9292257caac782ad8a446c88959e4f1a0167ea1f153239eb2fbd79e426ff944259e0d3c9c99fcb30f46d8282b7774763ff681c1d3 WHIRLPOOL e377e8276059a06b7a26b7f3602d0d46ec6ad283e351709bd5d13528219d63fdd15b9da1c913631451944f656d61bee87725fb8cc7d4a6b0c4baacfb431b3395
+EBUILD netbeans-javafx-9999_p20150627.ebuild 4723 SHA256 d0cf8d6b3cb3c1ddddb06455a4ed73dd39a4488de7e3cf298d4bba2ca43da43c SHA512 8bf39997e3fa5b275fa1e8f13c0545aecbbd902d52f45f3e0b42f0f084870242741fca55f6a2a011fce91d10b7a57696396e025fb5459ec93b91b8fbdbfb14e6 WHIRLPOOL c674c7fbf75a5941aee4154a877e7b0feaa452e8f197d122ba533e560302a0a01fd4ec55381637fe74f96987f0741dc00d50e0ddeb3bf09a24fb93160a2d9974
+MISC ChangeLog 155133 SHA256 418a1c3a914715f629ddc1bedda480641563e19042e44387c5cc0051037e99dd SHA512 e4fa56280a29d15cca19c8d416fe4d0e5cbd97e8dad31002cdba600461829dadb3472c66a11fb49f46a380c88f1224ae0222485a064dcbb5cb22578a8ff70ae3 WHIRLPOOL 11e851dac543cf215cf341d2583ad5d5b4f9600d97eba3ee59e222815df5cea22a23d60df60b9cb2211b5c49f84be81e10cdd8fd3efdcefc387525e374d82cb8
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index edaa483..935b452 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -49,6 +49,7 @@ DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d647
 DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
 DIST netbeans-trunk-nightly-201506240001-src.zip 207969165 SHA256 c59efebe690e08dd20cf83322141bb5b984755b67ab400fa87e9ec0fdcfe1d15 SHA512 1b6007d583cb82f0380736c57048fa0ab77944fd066cf8d643e7dc016049ea73f811b440386631ac8c50d08016d1d1bee015ccfed452c12e504518f1005cfeb9 WHIRLPOOL 8d0a362d61f5e8f57e9bad9c11add5ffc0bae4321302c4a5ab17786a3443d68041211db7f4cafe1f20c174e54b9e0525a7b85fea163751ae4a6efa4386109679
 DIST netbeans-trunk-nightly-201506250001-src.zip 207980912 SHA256 8f38be3f803587401b64e01f00f77a305a862683ebe2d63a1d8b1a57b6162276 SHA512 84383852000cafff1aee8933b47d43bb6479b7894073d21c4c6c86e7b19d39aecae7b5b6b92d9205177febe2c9c96905a3596e47dfe8f0060ecc8997a0dc7822 WHIRLPOOL f44711cda5c720b6d8844c5076ac231acf6939aa697bb1e48aa7ce41b3bec09e69e644aae22151280d288ed5d3db3167822efaa071d0629ec529ca0323c045b9
+DIST netbeans-trunk-nightly-201506260309-src.zip 208000407 SHA256 319162679323bd7d133b22e16af2fc09d95b5b07b11962d72de3e71fb257222f SHA512 5d9710eaf21aaddea69c4241b1b249936066caa156b72532ff05f41efbfaf3219c3d7eb47be74b0f55ab571e3f2cc7e73ef232e55806ce42c6580862f6e5b676 WHIRLPOOL 721eb340d7c9e73c8a620f6ea20a54782a390259c21bb53798de9c4c942d935c99a0aa70ac871320f7182b2c699e708cd3bc647fc5cea4a65bc62c9cb3f6e9d3
 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
@@ -83,5 +84,6 @@ EBUILD netbeans-mobility-9999_p20150622.ebuild 4418 SHA256 a49264104713680b693f0
 EBUILD netbeans-mobility-9999_p20150623.ebuild 4418 SHA256 64ff0aedcbbdad5d1895a0f51cd57d7ba46654a67ae8828254983c6a94064202 SHA512 785272cb0b97308b13bc086403c7a6e87454c7e8878261ab5382c95e42583d89fc3f70cd30913a18ab068cb6743c24c0b9089d174239115ca7ae5cee74728c12 WHIRLPOOL d8fb9c890728f7670b317e36908b656d7c40e693d0b8ff1f1a228b0f64670bfb5db9c3e478015362373208fd85f6c9bd6ac95dce888eb5052fef57eb923558b5
 EBUILD netbeans-mobility-9999_p20150624.ebuild 4418 SHA256 171aa21974b15d2d764a76690ccd02d3db1060a0e50f4ba0db6bbe64a96c129e SHA512 4894aaadcafc2a5a2d3539bb2d5d0cc987d7417147d8da006b65f239d26fb79ed0a8179626dbdf74456bac179e6597396515d7e4860ac617386f561f5ca019c0 WHIRLPOOL 4ddbee5633ab50c145d03c843b670f95b6b5f566219d40be358017a10330f0bce087d63c661c0eb433f8a130458237b9fe755152428bfb1c6b2c5baab72956e3
 EBUILD netbeans-mobility-9999_p20150625.ebuild 4418 SHA256 b68ceee381580f48bb9ba616ce27b33b6d3bed51865088d81ebdbe576c5b004a SHA512 4ddd3fb24ec4ff62f2ddb75a43de9944f9709039c2792d6cb21af5727c222fac157c32efe2fc26646ba3ac4c786bd26e9b49d781a2b17de689cc17609fff1e39 WHIRLPOOL 92b27fe9f38d49067d3fbe7787fc7d7728567efcd3dcd584f43084b54c6673066de03ff1dd30e519e781008c0d329391a3e7ae5bc3ad3d2e1f64b8e13683df82
-MISC ChangeLog 172888 SHA256 b24267f8058e37a5c4365502540c4c01f5555c60d202fa3e9b92217fe8e2c341 SHA512 1a7f11317760497eb1bc9613d882848f5cfc5a9bbec1ba75a9d93d013930de50bc27aa3ff267fb317a4025d9c4c9753176021794f534ec5b5ba541fc98ebe4f3 WHIRLPOOL e6e563c562bbab9b7f1249c35e5756828c8284dc61bc184e4192b7445990d32ab85f1136533db82bd4800df80062dcda7c50f891b3a3d9014fd3647263cc3b83
+EBUILD netbeans-mobility-9999_p20150627.ebuild 4418 SHA256 220cf6dc2857061c46e22433f288e8283d8c91c3e018d482525660eb5888c00c SHA512 b7ef496e92d680ab4ecc1ff4469047068f9a82b77b88a1b4182a9b7ab89225c2de306f049b550efe94c704cdc035be37aad7932e941e9eda9bd06b529b7ae56a WHIRLPOOL 37954051876e9b6bc6c04b4e5212aad1efa82dea73bce24775ccc4d5ecbadc5264cfe3451b932c931281a0a8165c4a09b4956936712a3b5e21b36e023b990b70
+MISC ChangeLog 173065 SHA256 b763d8352ed18a8ea4b00dd1e7415a1c45813a60cbabe1d187f3131ecb0ade73 SHA512 6791987a7f0b63cbbdcf35c50e29b45534f984fa0276e1ab3ef0f65f7d1491f4f060ab4e4da551427951fb7920a9316efffc4f1e7ff51ae5cef094213889dbd9 WHIRLPOOL 193558cc7bfad8e6d3ffc000c6cdec3379671158202e99eb3ffa71631d370bdbd39833fe48f218086b05bb641aaea7c83272f19c4813f4aae025195bff2ac9ef
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150627.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150627.ebuild
new file mode 100644
index 0000000..71ea8f8
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20150627.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Mobility Cluster"
+HOMEPAGE="http://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-06-26_03-09-04/zip/netbeans-trunk-nightly-201506260309-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 bb6c0d7..7d081f6 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_p20150627 (26 Jun 2015)
+
+  26 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-nb-9999_p20150627.ebuild:
+  bumped to the latest sources
+
 *netbeans-nb-9999_p20150625 (25 Jun 2015)
 
   25 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index c6bce9e..921e4f5 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -48,6 +48,7 @@ DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d647
 DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
 DIST netbeans-trunk-nightly-201506240001-src.zip 207969165 SHA256 c59efebe690e08dd20cf83322141bb5b984755b67ab400fa87e9ec0fdcfe1d15 SHA512 1b6007d583cb82f0380736c57048fa0ab77944fd066cf8d643e7dc016049ea73f811b440386631ac8c50d08016d1d1bee015ccfed452c12e504518f1005cfeb9 WHIRLPOOL 8d0a362d61f5e8f57e9bad9c11add5ffc0bae4321302c4a5ab17786a3443d68041211db7f4cafe1f20c174e54b9e0525a7b85fea163751ae4a6efa4386109679
 DIST netbeans-trunk-nightly-201506250001-src.zip 207980912 SHA256 8f38be3f803587401b64e01f00f77a305a862683ebe2d63a1d8b1a57b6162276 SHA512 84383852000cafff1aee8933b47d43bb6479b7894073d21c4c6c86e7b19d39aecae7b5b6b92d9205177febe2c9c96905a3596e47dfe8f0060ecc8997a0dc7822 WHIRLPOOL f44711cda5c720b6d8844c5076ac231acf6939aa697bb1e48aa7ce41b3bec09e69e644aae22151280d288ed5d3db3167822efaa071d0629ec529ca0323c045b9
+DIST netbeans-trunk-nightly-201506260309-src.zip 208000407 SHA256 319162679323bd7d133b22e16af2fc09d95b5b07b11962d72de3e71fb257222f SHA512 5d9710eaf21aaddea69c4241b1b249936066caa156b72532ff05f41efbfaf3219c3d7eb47be74b0f55ab571e3f2cc7e73ef232e55806ce42c6580862f6e5b676 WHIRLPOOL 721eb340d7c9e73c8a620f6ea20a54782a390259c21bb53798de9c4c942d935c99a0aa70ac871320f7182b2c699e708cd3bc647fc5cea4a65bc62c9cb3f6e9d3
 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
@@ -82,5 +83,6 @@ EBUILD netbeans-nb-9999_p20150622.ebuild 5003 SHA256 2c2cc6f5fea254e9637db5c649c
 EBUILD netbeans-nb-9999_p20150623.ebuild 5003 SHA256 5695da21b2b81c3cf587294c90f190564e16a59184ef46144041e70990e3678d SHA512 6b1233a76d69cbe1a32a7e5a11658144a59f2d2d89245560e00ccfb72dd3a60f7e765e6b55eb1a31b7e5dff1e2d416889725cb2aaccc418807e029df7957ec95 WHIRLPOOL 1b67799dfb54da0133e18e0515ceb192156e5771beb6f39a618d8397f7cfc10f5b5ad492db0062983cbc4b06dcafec4ae2711f94b2c84211dcda62cf4f68afde
 EBUILD netbeans-nb-9999_p20150624.ebuild 5003 SHA256 db488ed91884a6f8533af7c5c85c43ca26d6759bcca9b189319fb782ceba76a9 SHA512 be68e3139ab585eb230e76326eccddf7fa5a2d60cd6ff5f9c2e37fd0934e6054134137838593e222c2db59c5fd5c7c0b38c3bf28be974e57008068189bd0f42f WHIRLPOOL 94ba7afa747719a7831c64c59e8f9c8884c635d07c69fcc43e8868c6b2c4b906ffc058461db34fdd6e5d10c384e8da1aacf7e2524f1978f4b64dbd5d5ff69c0d
 EBUILD netbeans-nb-9999_p20150625.ebuild 5003 SHA256 d5ca2f06480076823a2b048ea655078325da3465bdff3ebf38ca5510efa7570f SHA512 0034e912a6fa380a4401bbcd7809423524949c6538a596c7e6c4eb09d218f5b0bcdf373fc41765a2edefbe8cc54e9d8a06b30ea40c6517e69efc0fb666f856d2 WHIRLPOOL 1196a01f8ea31255e2710ba3b86b50704258576b154fe4890c3805e043a0a74a627d6f8e87817d81d539a2b82afc1b463c6d6eec3bc295d493bbaa9027261f68
-MISC ChangeLog 161454 SHA256 981c61a4e4f3c19fbdfc5d77ced28e8788aafd229147a3bdb4f006ff3a48c8ca SHA512 eb31e1d6ee6958975b95a4551265dd6ec405a5a47643ab3a133af2cd3a71810c0db3b0821a6bc3a4867cd3b0698dc327a89473213b979e144f9a3a1349060c1d WHIRLPOOL 67bfcb9ee080c6748ebe0eff11db105021186b8332793d1fa8a2dfd4ff657fb6b9ef615b8fe6427bacc1bb8ba0ccc9f14920cd495f16a7ee54800479c7f8a1dc
+EBUILD netbeans-nb-9999_p20150627.ebuild 5003 SHA256 b12f8ddf0f73d72be0accda6706b467aa11f4e9a42cf59a9ff032de20dfcee14 SHA512 bfaeac13711b1a99c7e535f892a908f243ef685718a8c5411b8ff8800f8ca61f122557fce6ce31aec007478fa0475265e258d1f98a50d0fe84718743bb02fc95 WHIRLPOOL 395e64ab067ee563d275fe980441a9aa0ff7d758e4e067f16e21c3aae67877981b25a868de40e57c01b829c9cb7568dc6774d3895ce6526e8eb3dfe5273680ba
+MISC ChangeLog 161619 SHA256 1807c1a26145d9742f839422e53ee4c0e985a55d733a790f5dc48ae167fe0b67 SHA512 3b0874c75161cc29779190cc744c6dc549a540fef1c08195208253fe5598e8429c58aabf8b99033c9316632c00f34f69b31253a00f5cd6fb252d72071792ae2e WHIRLPOOL 8b2832d21d7441cdf9e1fc10706993cf748fb74e2b23ea105d744ebf77cb342d8f3766e362b4fafc89b1e49e9e85d8f75f7689563a6a099eb4ee2b0747b4897b
 MISC metadata.xml 396 SHA256 5083064ed2246a84e2aedbc326d56cc8bf571fd8e7c24af0e4bc14c50f1ebb49 SHA512 a0b2171264f1ea6ba33b184ef802589d679eaba5c4a1753e149d7cd93c2c31aace934eddf5dffed6be341d9e4061c843c849e464afb7b4417c6c2dff3e9ff1c7 WHIRLPOOL 1be3a1a3c2b64d8818108de191db834395ee4ab3cf7994914c9331d6e42ca9015dd2493b9516db20990cb30b4dea385a3dde08b75df956ca39ad65e3fa721cb7

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20150627.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20150627.ebuild
new file mode 100644
index 0000000..1324982
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20150627.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Branding"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-06-26_03-09-04/zip/netbeans-trunk-nightly-201506260309-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 beb12e9..4c61c31 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_p20150627 (26 Jun 2015)
+
+  26 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-php-9999_p20150627.ebuild:
+  bumped to the latest sources
+
 *netbeans-php-9999_p20150625 (25 Jun 2015)
 
   25 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index 1a454df..034a85e 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -53,6 +53,7 @@ DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d647
 DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
 DIST netbeans-trunk-nightly-201506240001-src.zip 207969165 SHA256 c59efebe690e08dd20cf83322141bb5b984755b67ab400fa87e9ec0fdcfe1d15 SHA512 1b6007d583cb82f0380736c57048fa0ab77944fd066cf8d643e7dc016049ea73f811b440386631ac8c50d08016d1d1bee015ccfed452c12e504518f1005cfeb9 WHIRLPOOL 8d0a362d61f5e8f57e9bad9c11add5ffc0bae4321302c4a5ab17786a3443d68041211db7f4cafe1f20c174e54b9e0525a7b85fea163751ae4a6efa4386109679
 DIST netbeans-trunk-nightly-201506250001-src.zip 207980912 SHA256 8f38be3f803587401b64e01f00f77a305a862683ebe2d63a1d8b1a57b6162276 SHA512 84383852000cafff1aee8933b47d43bb6479b7894073d21c4c6c86e7b19d39aecae7b5b6b92d9205177febe2c9c96905a3596e47dfe8f0060ecc8997a0dc7822 WHIRLPOOL f44711cda5c720b6d8844c5076ac231acf6939aa697bb1e48aa7ce41b3bec09e69e644aae22151280d288ed5d3db3167822efaa071d0629ec529ca0323c045b9
+DIST netbeans-trunk-nightly-201506260309-src.zip 208000407 SHA256 319162679323bd7d133b22e16af2fc09d95b5b07b11962d72de3e71fb257222f SHA512 5d9710eaf21aaddea69c4241b1b249936066caa156b72532ff05f41efbfaf3219c3d7eb47be74b0f55ab571e3f2cc7e73ef232e55806ce42c6580862f6e5b676 WHIRLPOOL 721eb340d7c9e73c8a620f6ea20a54782a390259c21bb53798de9c4c942d935c99a0aa70ac871320f7182b2c699e708cd3bc647fc5cea4a65bc62c9cb3f6e9d3
 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
@@ -87,5 +88,6 @@ EBUILD netbeans-php-9999_p20150622.ebuild 4423 SHA256 4682fce5e05fd39786fd8be2b4
 EBUILD netbeans-php-9999_p20150623.ebuild 4423 SHA256 7ec2838526999ec4a59673776212f11a5ed6d9fd0e2000c52764c8bedfd56112 SHA512 70436da36c54c95ed8fe02d45d8b8c3db82d52b76e287e90e176edfb309b5d0096426e54d2df88abd518d89c5d7effa381ef76f18ba184b8c94d0bf89d85f181 WHIRLPOOL d15018ef173c28788d6be8e3e86f28c7d4841bb9b5f0d42690e585c22665710f735cdbc6e073b9a1e627110e37d4c34053f2ce86583cdf5d01037e91ec8d9fe4
 EBUILD netbeans-php-9999_p20150624.ebuild 4423 SHA256 7fc5e83a789b0c5c06ecbdb99589899ab369ba999e89a8880c1c96014a6b1937 SHA512 07144c39232951721782d1fed6270e2b1f64ae590cd3fd94ed51f94b482547a5ad49dd3753c2bd87a554ff9fa4956a63de006fe4386dc444ea606dc2d29ee85b WHIRLPOOL 366994d7d3500fd744d12815a5a2136e0d121c069dcd36eb1bc804ee3ab10d4cf14aa5c083109d3fb5dfdda4f84441150c1af5a26578b40586d84e939dc44246
 EBUILD netbeans-php-9999_p20150625.ebuild 4423 SHA256 c5d3789d8be16570ab76e4b2c5d7537a9c804a9d7b61973f15d8fe93f2f0193d SHA512 dd39b2fb4aeea29a7ed7edcdf7225eee4dc9be9f8e0d4accf69b9c511cacf4d8d88b4910b2ac6d5e7e70bd90af40d2951f6b8ba1bc8bad8f7db84c6dca89f910 WHIRLPOOL 5bbb24879dffdfb4150a18212c5b1ef74f179a1ca1280c358189a213766e06e92db26ded1214b227d4906524a26c9585c589c5f28a8f9484571488407f740a7b
-MISC ChangeLog 161239 SHA256 aa3d6a47404013996d1c6d9d80fb04c74d34ebe5709776f0da434ce5296df44d SHA512 fe1695dd20fc90843049fdcac88964a5b487303f86bbb2db1cc5364a5ce293bbbc408b75ab13463f81226432c97663457297fc618aebecc7a09990043bd95a2d WHIRLPOOL 94196890b0e1a2407525641827818d2de0b88db086f9cd03b8af6244b09ad3bac1d5568bf46385fad7cc2dd4a5cf573ffdb6b928de93d2315f291d36724f88ee
+EBUILD netbeans-php-9999_p20150627.ebuild 4423 SHA256 ccc7b6972b1436c7decbc7b6cffd107b93faa70ae3d4f38f56dbce0c944ca3d7 SHA512 b6bc2c95f6ffed24d06f945e03afae82bc7bc274a9a7d6e1430a85d881ecc232614dfd9c66e19f28fc9c9ff16941ec57d90ee0695337769e4ff26a39c72b3c9d WHIRLPOOL 57c1ae7c15f4dab455def04f02502764c833c88c92c3388f87c1644cc79d75ae713c9c2305907a0202bf12d44106e54a911734caaff6b68017990aa23839f2f9
+MISC ChangeLog 161406 SHA256 ad8beff4aff0bd6f9092255bd827b06f0e7cdb8261647b6c74b9fefb25110dad SHA512 6928705ffeaa96c9386d597dbe5ed173039ae8f5d66e29a96f28dc36ef4102adab9da24747a8d39b73d89ee573d1f60474d83bfe131d89eca2f0b3c1776761a6 WHIRLPOOL 62001808b3fda7835723d632a9f938dc27e892fc55dea1c787702f89db6f8ea0c9cdc2caabe3dcd88f02e5a6dafcfe14220ff0542a13b39fb46d4b471b4314df
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20150627.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20150627.ebuild
new file mode 100644
index 0000000..4a7705c
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20150627.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans PHP Cluster"
+HOMEPAGE="http://netbeans.org/projects/php"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-06-26_03-09-04/zip/netbeans-trunk-nightly-201506260309-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 92579b0..f851be0 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_p20150627 (26 Jun 2015)
+
+  26 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-platform-9999_p20150627.ebuild:
+  bumped to the latest sources
+
 *netbeans-platform-9999_p20150625 (25 Jun 2015)
 
   25 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index 4af635f..24b9f14 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -67,6 +67,7 @@ DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d647
 DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
 DIST netbeans-trunk-nightly-201506240001-src.zip 207969165 SHA256 c59efebe690e08dd20cf83322141bb5b984755b67ab400fa87e9ec0fdcfe1d15 SHA512 1b6007d583cb82f0380736c57048fa0ab77944fd066cf8d643e7dc016049ea73f811b440386631ac8c50d08016d1d1bee015ccfed452c12e504518f1005cfeb9 WHIRLPOOL 8d0a362d61f5e8f57e9bad9c11add5ffc0bae4321302c4a5ab17786a3443d68041211db7f4cafe1f20c174e54b9e0525a7b85fea163751ae4a6efa4386109679
 DIST netbeans-trunk-nightly-201506250001-src.zip 207980912 SHA256 8f38be3f803587401b64e01f00f77a305a862683ebe2d63a1d8b1a57b6162276 SHA512 84383852000cafff1aee8933b47d43bb6479b7894073d21c4c6c86e7b19d39aecae7b5b6b92d9205177febe2c9c96905a3596e47dfe8f0060ecc8997a0dc7822 WHIRLPOOL f44711cda5c720b6d8844c5076ac231acf6939aa697bb1e48aa7ce41b3bec09e69e644aae22151280d288ed5d3db3167822efaa071d0629ec529ca0323c045b9
+DIST netbeans-trunk-nightly-201506260309-src.zip 208000407 SHA256 319162679323bd7d133b22e16af2fc09d95b5b07b11962d72de3e71fb257222f SHA512 5d9710eaf21aaddea69c4241b1b249936066caa156b72532ff05f41efbfaf3219c3d7eb47be74b0f55ab571e3f2cc7e73ef232e55806ce42c6580862f6e5b676 WHIRLPOOL 721eb340d7c9e73c8a620f6ea20a54782a390259c21bb53798de9c4c942d935c99a0aa70ac871320f7182b2c699e708cd3bc647fc5cea4a65bc62c9cb3f6e9d3
 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
@@ -101,5 +102,6 @@ EBUILD netbeans-platform-9999_p20150622.ebuild 9244 SHA256 e59792820ed01a99633a9
 EBUILD netbeans-platform-9999_p20150623.ebuild 9244 SHA256 3060bfc11247e766c63404bee34ceee585a08819292e436adfe341c9d0114afa SHA512 9261cef23c879d621008eee6b316cf7b5e02b2f629d8cf58c3dd60a6a676523d42eff848706093a115653832f8c1ce17d3d76542252130167b1f1c27838b7799 WHIRLPOOL 474db05f46a19c92dd747e1bf8a6471e864d399331cb6a4fd4ceb085fe88b7b5a6415106f61bdf5fd2172421d2a738187ded9eb9e4a8f3e068e183f9572102ed
 EBUILD netbeans-platform-9999_p20150624.ebuild 9244 SHA256 10ce4c9aff5422430bda74e5660b34f5b3b0d60dc2d8611baaa7fd447a76547e SHA512 9f19ce7d77a95409d04dbdb82dcdab6e799eb8a9b01e94414e7854e069bd4e621ec6be4c76d84b70056cf3113c7e97faced035e5e68988e8eb8b51b26efba64d WHIRLPOOL f4f01c508d3f8c97a59d85233152490e6fc75f58f48c5cd39cd6d632ef1005bc464885a11376485233ee1114a67c979d877636dbbe7febca9bebf980140dc6e5
 EBUILD netbeans-platform-9999_p20150625.ebuild 9244 SHA256 41b5b8e0aab7c167bad75a320a3c7242f1d0e8144e2e53cf411df4ad12c1289e SHA512 e50e9bc4f8dea3d805a7d5ddc68978df3dbbce2f3ff6802d65fd983c414505d5d73a4f0e979b483c39b88db7f68b247b8bc7fc86ebbb36beeb96a0d29534df24 WHIRLPOOL b6d2f03389fb7330a8fb4f65c21fb2665397542dc3da843320579f0327080ac37bcf74fec724e64349d2e97cc45d30cc978cf85b3a063bbea16caeb5e3b0f27c
-MISC ChangeLog 173484 SHA256 ed1011da2aa8a2d110f38fba8a4e0f75e2fdfb9d91966495f2de15091f8e8c80 SHA512 0a139998c122c3bf4399d3dea6076d9dae0a08db5b8aab3e8714538ec843b729f1239e6c30e23de03b1604c9c611ca786550552896202de1986c5283caf99afb WHIRLPOOL f6f60628c397103233d30813b7ad7cd717c6bb902a87909172c9313187f3227fd1677b77faab4fa3b5a2b415a25a928010734aa967c2cd44a6c5659d529246b8
+EBUILD netbeans-platform-9999_p20150627.ebuild 9244 SHA256 1e5cbdc9a6fcc17ffbe5bc0d1d6a7014187cd18355956b15410f5ccd09a67e55 SHA512 890314488ad2018188ec03d872f6fcb3adc72c5830ca697046cc211da35bda7a1a57113a27d1ca7e5dde7c21f92fbb213e96cb43f9fdb9bcccaf47c9d663f7e3 WHIRLPOOL ed4b8f5841496bb20c07f0665756b33d0f3296e9be294e8f77547b3e7553d95e880b4eb2a7ef10b47ced90419e2875854e30b65e9db1e3fca13a288ebc3d8e82
+MISC ChangeLog 173661 SHA256 04b13aa32d6cf6516cfe6e390e16cb8e21fb76ba55c709f6325ba99554816436 SHA512 330fcff172c47016ebfeacfffb05e3f645d99a16cefd153c4d1f0151a825c4d363bfeea7a43773b8d24dfe62ff080ca2e4b0ff63509e9cca23f626a89e7d8fee WHIRLPOOL 0149f0d082d181f981e643a2ede35e6203d378e26db134cb549fa007adce9056e423aa00fe4edd5e232c72a1874fa911d055e7190e1fbc76abae3458cd9c453c
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-profiler/ChangeLog b/dev-java/netbeans-profiler/ChangeLog
index 8e72aaf..73c96f6 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_p20150627 (26 Jun 2015)
+
+  26 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-profiler-9999_p20150627.ebuild:
+  bumped to the latest sources
+
 *netbeans-profiler-9999_p20150625 (25 Jun 2015)
 
   25 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 8c71871..e6fd26b 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -40,6 +40,7 @@ DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d647
 DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
 DIST netbeans-trunk-nightly-201506240001-src.zip 207969165 SHA256 c59efebe690e08dd20cf83322141bb5b984755b67ab400fa87e9ec0fdcfe1d15 SHA512 1b6007d583cb82f0380736c57048fa0ab77944fd066cf8d643e7dc016049ea73f811b440386631ac8c50d08016d1d1bee015ccfed452c12e504518f1005cfeb9 WHIRLPOOL 8d0a362d61f5e8f57e9bad9c11add5ffc0bae4321302c4a5ab17786a3443d68041211db7f4cafe1f20c174e54b9e0525a7b85fea163751ae4a6efa4386109679
 DIST netbeans-trunk-nightly-201506250001-src.zip 207980912 SHA256 8f38be3f803587401b64e01f00f77a305a862683ebe2d63a1d8b1a57b6162276 SHA512 84383852000cafff1aee8933b47d43bb6479b7894073d21c4c6c86e7b19d39aecae7b5b6b92d9205177febe2c9c96905a3596e47dfe8f0060ecc8997a0dc7822 WHIRLPOOL f44711cda5c720b6d8844c5076ac231acf6939aa697bb1e48aa7ce41b3bec09e69e644aae22151280d288ed5d3db3167822efaa071d0629ec529ca0323c045b9
+DIST netbeans-trunk-nightly-201506260309-src.zip 208000407 SHA256 319162679323bd7d133b22e16af2fc09d95b5b07b11962d72de3e71fb257222f SHA512 5d9710eaf21aaddea69c4241b1b249936066caa156b72532ff05f41efbfaf3219c3d7eb47be74b0f55ab571e3f2cc7e73ef232e55806ce42c6580862f6e5b676 WHIRLPOOL 721eb340d7c9e73c8a620f6ea20a54782a390259c21bb53798de9c4c942d935c99a0aa70ac871320f7182b2c699e708cd3bc647fc5cea4a65bc62c9cb3f6e9d3
 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
@@ -74,5 +75,6 @@ EBUILD netbeans-profiler-9999_p20150622.ebuild 3478 SHA256 c3273743b4847a79771db
 EBUILD netbeans-profiler-9999_p20150623.ebuild 3478 SHA256 033f524b6223f24efab778cddff8bb79d2ffde04deec10ff1af7a5bf9293690d SHA512 2813514a6163309d082908aa3c109286d97cab9db096140463920cd54e5e3f70e97b7c963c6278bd41e692360cbecbe0dee44b4bbbdfaf843c079ea13aff69c8 WHIRLPOOL b60265f79b33cd5edbe05251661f40ac29a0fb4edba8ad935ec74e12476f36652fef5730a79bbed6bc0b09ae9835efb6b13a6e4ea5102a274a8fe0fc9812fdd8
 EBUILD netbeans-profiler-9999_p20150624.ebuild 3478 SHA256 ba0406e4c2db0c8a9e283cd6b5b6ccdc8b60aea9b1b5904c99f1b45f5dffcd4f SHA512 58d17574521261368c90188a99a478ad2d9d2ba4867ec5b6676f5e3d2b7644ebb095536672c309682e3c06e1be2c17395342d79407c14a05ba6e86ebc2422fcc WHIRLPOOL d7cf8f7aa81c7a6637e384b34576c8d7d92c0b921525ddfd7f54ddc519b3882d5ea845f0c4293a522d7abaca2a171a1c6de08dca119afa20514b8f838ef1a001
 EBUILD netbeans-profiler-9999_p20150625.ebuild 3478 SHA256 d0b7c73c40dcc8e424251b34c76a43ca74929b40fc38941c445e3ceb775cb067 SHA512 77015f6024ae952c298e60887f3a092f5a7b7f5c741a03a1d9f4dd3180d636d8a96fe81b73e9bf1a480f42e48c67e641cae26f2f52003db534c118f45b5da0e7 WHIRLPOOL e1e4a91b1ed700f155bfa9d196babeb1257883adecc10e392a16dcfe64a60b01232e156689c27727b940459bc8fc0114ce63625a83a77f3c590b2900592980c4
-MISC ChangeLog 172945 SHA256 87288c857d6ac1f3868890058500dc001c4c1c7280e19785bc9e5b49d6ad15d0 SHA512 fb5cfc5c9f2955d4acb7b3b92747bb386ff3d4717d0c6c6daf237847288f82d1f1ff5d60ef9df1f90ac620f19f4ba9e88eca33d731f3403c98bbe83bb2ed6f14 WHIRLPOOL f2f01fb3b89e50fa2371c96faf1b48eef3ba062c97871afeab61949aed95cf63b00a9def7d37b4e201f214e328acc4e7728e5d391c7d23f2a64d1768f1fc8b1d
+EBUILD netbeans-profiler-9999_p20150627.ebuild 3478 SHA256 7bf8aa3bc526ef2d2643b180d326a352e08591e1b198d5e64b4c2db431c1a72e SHA512 098e36d3a3457316ee6566c6e9d5600d0aad6679cc310ec2836fe0b2c25b520285067e092929f67aaa1ed1b0c21b37de1d944f73edffed17416782e2b0457e78 WHIRLPOOL f6004524332196fbba132c8431577c9cd7c8627337ae8ff832648cde4f20b0f38d4b8731b8d5301569e5b9ecbf034b350140f94156c35cd76f0b78712af39f7b
+MISC ChangeLog 173122 SHA256 062e6a531da09b165002fa8ea353ed358d08bd48a9bb4d16793496be0f8e27df SHA512 0fc773fe5f600137551a80faae06cb923ef3f209297d449956bc1a7dcba0938afc5449c17fe590947ef796fd19b10056b49056606717d8eeaa6c28f121e9dcf0 WHIRLPOOL e49af007701b13a697c092a9a578a8d7c1ea1787911cfb56a2ef48460acb2092a19a7f221c6ee8c41f593b22a907ead00128f03a8d6d5aba6ea1341479c18240
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index 1079348..a984d76 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -46,6 +46,7 @@ DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d647
 DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
 DIST netbeans-trunk-nightly-201506240001-src.zip 207969165 SHA256 c59efebe690e08dd20cf83322141bb5b984755b67ab400fa87e9ec0fdcfe1d15 SHA512 1b6007d583cb82f0380736c57048fa0ab77944fd066cf8d643e7dc016049ea73f811b440386631ac8c50d08016d1d1bee015ccfed452c12e504518f1005cfeb9 WHIRLPOOL 8d0a362d61f5e8f57e9bad9c11add5ffc0bae4321302c4a5ab17786a3443d68041211db7f4cafe1f20c174e54b9e0525a7b85fea163751ae4a6efa4386109679
 DIST netbeans-trunk-nightly-201506250001-src.zip 207980912 SHA256 8f38be3f803587401b64e01f00f77a305a862683ebe2d63a1d8b1a57b6162276 SHA512 84383852000cafff1aee8933b47d43bb6479b7894073d21c4c6c86e7b19d39aecae7b5b6b92d9205177febe2c9c96905a3596e47dfe8f0060ecc8997a0dc7822 WHIRLPOOL f44711cda5c720b6d8844c5076ac231acf6939aa697bb1e48aa7ce41b3bec09e69e644aae22151280d288ed5d3db3167822efaa071d0629ec529ca0323c045b9
+DIST netbeans-trunk-nightly-201506260309-src.zip 208000407 SHA256 319162679323bd7d133b22e16af2fc09d95b5b07b11962d72de3e71fb257222f SHA512 5d9710eaf21aaddea69c4241b1b249936066caa156b72532ff05f41efbfaf3219c3d7eb47be74b0f55ab571e3f2cc7e73ef232e55806ce42c6580862f6e5b676 WHIRLPOOL 721eb340d7c9e73c8a620f6ea20a54782a390259c21bb53798de9c4c942d935c99a0aa70ac871320f7182b2c699e708cd3bc647fc5cea4a65bc62c9cb3f6e9d3
 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
@@ -78,5 +79,6 @@ EBUILD netbeans-webcommon-9999_p20150622.ebuild 4997 SHA256 dc2258582fc740f4b2a2
 EBUILD netbeans-webcommon-9999_p20150623.ebuild 4997 SHA256 faf8e44b97ccb871c2ec2ea2d37587bfe06c3a614beff0f680a7d893c009c698 SHA512 07720be89dfae00530e9268323e48a1c137cdd2d41c1e3041c38be61ae153757a64ee029651be6583ddc0701e74fbb50928f4ab4f4c2cacf4c31e1a3f7dd25f2 WHIRLPOOL 7e82597c9ef5bfbc11edc02882ed51d13a2a5d19354b3440e41db0b13213281b892bd480137c61d1794ec5cee73cdb459701ffb2201120a158dc1ef1710bb55f
 EBUILD netbeans-webcommon-9999_p20150624.ebuild 4997 SHA256 be62498e5a59abead95fd875a9d56b00da18780a84ddf10d640e0173ddefb405 SHA512 0c10a25f7f4d52c4c14fba154553aecd236a20a24ad4ad8b399bf71e75b9da7b97f98a493e2a5af567f271970af8628bc0364aeb0813b1cde1fdd64f6907bcdb WHIRLPOOL b3455776fd01e5ed39d754a4e1157f79b3efdad882abf82698aa5a0d47a2a01bc83c7e29a1d08093b3dfdae4e9378c5000bb426c39bf27c10f34855677f60395
 EBUILD netbeans-webcommon-9999_p20150625.ebuild 4997 SHA256 b839edd52cf6b7ffba4c43036e96e96ef9912613fda9e3482ddd1933012a1bcf SHA512 7f049a9d403d6e3f00eae94cbca1ad8e08d346eaa2498381176e6879b35c12325c1296e0740ee513dcf635befdd6d7f8e56254036791ee91d7e61ce8f5bffc7c WHIRLPOOL 3ce306bed3ac57bbf8325f3ae4f979c3df80ac71823765429d024c77806640feb06e015f24a7de574497b07a6e069d559b536cf9b6596c1cab45ae0bbbcfdf36
-MISC ChangeLog 146085 SHA256 51e0606c265b72a381632deb599638add7189b985ab8d57e5a8116d9f4b13412 SHA512 bbde7a7a91f43330c6049ee731f949c761074cb5082e5861ae77e036b8b1bb080a9ea193a5c528726be026851ffd95c0fbe0256b0e667041463798ebb6868364 WHIRLPOOL ec38716824534c5973b61e5b1d5649b54de50f655a0a13898d53acaecf5fe351342b815a6a954acc1151875fac1be38d422c8017be9a378881273e421be3d69d
+EBUILD netbeans-webcommon-9999_p20150627.ebuild 4997 SHA256 0b76febe860e560cca8854fcdea1942368e45e40edf35e566f54797b2e741aa3 SHA512 35bd9722bcd4402a9a3bde611e3f50b69c25f463475e381dcd0a04d514f146695580166c7401f75c19097785e2d237966b58d0b29c05075925c5e2c1d2c78329 WHIRLPOOL fffb3ee84c15ab662b3232df29ca09b913c648a3ae4dabae46ee5019de756d4d3326a7171fa74d2e15ac48bb07cdcc8983368ae815d83292f7748265151c7ed8
+MISC ChangeLog 146264 SHA256 2cc403c81d53980ee15370366dfb0730a629a57bff83ea218340fb11f00a2064 SHA512 b85965c3769939f4d96b10de9011e18be118eb6ca1692ebdd07cc05361cb63da59f8eb37a579b62dead92857e14e330fdde4423d83912d3f2e743783559a80f2 WHIRLPOOL 917ef63b7503cf303687c70fd81a619f3a74284ddbd7f758c1ddf479909edd7e9a146cb2adc165ffd1831cf2f7fc0719438cccddd399041104d68c3bd744dde2
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

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

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 0bd140f..43186a3 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -41,6 +41,7 @@ DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d647
 DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
 DIST netbeans-trunk-nightly-201506240001-src.zip 207969165 SHA256 c59efebe690e08dd20cf83322141bb5b984755b67ab400fa87e9ec0fdcfe1d15 SHA512 1b6007d583cb82f0380736c57048fa0ab77944fd066cf8d643e7dc016049ea73f811b440386631ac8c50d08016d1d1bee015ccfed452c12e504518f1005cfeb9 WHIRLPOOL 8d0a362d61f5e8f57e9bad9c11add5ffc0bae4321302c4a5ab17786a3443d68041211db7f4cafe1f20c174e54b9e0525a7b85fea163751ae4a6efa4386109679
 DIST netbeans-trunk-nightly-201506250001-src.zip 207980912 SHA256 8f38be3f803587401b64e01f00f77a305a862683ebe2d63a1d8b1a57b6162276 SHA512 84383852000cafff1aee8933b47d43bb6479b7894073d21c4c6c86e7b19d39aecae7b5b6b92d9205177febe2c9c96905a3596e47dfe8f0060ecc8997a0dc7822 WHIRLPOOL f44711cda5c720b6d8844c5076ac231acf6939aa697bb1e48aa7ce41b3bec09e69e644aae22151280d288ed5d3db3167822efaa071d0629ec529ca0323c045b9
+DIST netbeans-trunk-nightly-201506260309-src.zip 208000407 SHA256 319162679323bd7d133b22e16af2fc09d95b5b07b11962d72de3e71fb257222f SHA512 5d9710eaf21aaddea69c4241b1b249936066caa156b72532ff05f41efbfaf3219c3d7eb47be74b0f55ab571e3f2cc7e73ef232e55806ce42c6580862f6e5b676 WHIRLPOOL 721eb340d7c9e73c8a620f6ea20a54782a390259c21bb53798de9c4c942d935c99a0aa70ac871320f7182b2c699e708cd3bc647fc5cea4a65bc62c9cb3f6e9d3
 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
@@ -75,5 +76,6 @@ EBUILD netbeans-websvccommon-9999_p20150622.ebuild 2727 SHA256 626b4908237c30b41
 EBUILD netbeans-websvccommon-9999_p20150623.ebuild 2727 SHA256 3cb41c7858bb52b2f7462c8c9d28cc2472c050a5aaf36d5e2f1dc97b253cd8cb SHA512 eaa443502c3b782894767bdf3d5cb62bcaa136e716326f4e62379c4f74217badd1637f3fb5ba5684d54eeec99c579030027391bbaa9018aac072308bfe726d90 WHIRLPOOL b7d38514410ea3e385cec2210ef6ce3177efed4772d97bfeab6c0dc37114fba8ed2bc44e86945654b91c22a803510e08ce0afbe2e9cffc632004ff18954fac35
 EBUILD netbeans-websvccommon-9999_p20150624.ebuild 2727 SHA256 8b927ec218b16e9b193d82c3901b79465911878d4b25bfb9de13460de51b4c73 SHA512 ab34bffcfedb23cbd15078b8ae274ef9b89f60a8a1ea11409514c167eec1c499bbd63a222a422a5458f5acb84884aaee140dc2473b0d08573ba2f486b18daeb1 WHIRLPOOL c4fda4e9d64543219984869322c00c3b32bd91c0736f93333b9c8f447c91ef9595ee14e3f467b7e7f49cf42aa7ada8c38d3e3351f6dc62ca68f2bedcc049b30f
 EBUILD netbeans-websvccommon-9999_p20150625.ebuild 2727 SHA256 cf2d029d32680b016c2bfa55afcc0343669d2c74e93693bc92a4cd5c5a1a83b4 SHA512 2a05a101a83c41be7ea2881d1283bfe3d5f4e403f40f647433a99a9e224838b9d8237fda672ae68fdd2a51d70aea5495efde907c67353247127c0cdaecc97f58 WHIRLPOOL 70c99a680e36f1a98d2e53e7395758f27a3af0fa3a113edc5e2226040a83787011a5f0e23cfb3e45ea84d8a0e6fa6c06f6d2e6d74e82abaae6190dcd8b1a0e49
-MISC ChangeLog 181259 SHA256 c1785e0277130b653a35f5873c8e408679447da667c3ef1570b7e81a58a3a8c8 SHA512 505f07cf94f22ddb703a8a7ab33cbba79358800557084b1df50db8dea6b53c5faf96f0b62c576d883559447f66a0c8064b1a4783a93cb1c54f03260eb118c3e0 WHIRLPOOL 3b40e07b408b0a95a77dd8e7550e0276304034f520c801cd26c2c3c03050b41c90c1eac57a91be4685c0533698a629e9be3b9e9a70c974f54fee6f0926ace8b8
+EBUILD netbeans-websvccommon-9999_p20150627.ebuild 2727 SHA256 14f0738371a82efdee181f6836bb61f7654f4cfb287429fc5c7c942d659f3a16 SHA512 8e818555573b84d3f98497a87e35dc961da260595860b8d002d0d7d31c9a72bba97716b78a9a50871de6e82803936d670fcb15ad8830334b8fd300a7fd363395 WHIRLPOOL 66664c10213a993de58e0dd3f1fb4f175ac91d3d296f267446e9d3532556e6a31a3558b634a9478bfcacdaf9b9335e345e0aacc9ebfc1eed52deb3d3dab68281
+MISC ChangeLog 181444 SHA256 a14039a20fe46fe0ae7861429e8c61b491f61ec258bee48f99dccf04e8cd2932 SHA512 93aeba04066c79cac62840cd3b8deb11c4749fe7c31c11fd8f0daff2cd54b83c252bbad772d34b7f8905295d7f2719b828ebf4693028fccd1f61e41d59589c4d WHIRLPOOL cecb4fa152b1b7ead5953132662524dca94ea1488bae2f16f5422fd42548cefcbcd997807044af917216f6255c8bcf200031293bdad9e4798998f27a39cbeb1b
 MISC metadata.xml 251 SHA256 5a4ff53a9862390a48d45c79be24086646e7a6ff0c5bdf0fcb799d0871299003 SHA512 04153cbd9776ad56a94d6a47d043df15d082d8888df8658f18d0d4b659c6c0526ab3a9b22ccbe2471091bf2d8165f224854bc99c51f3664aaf350ccb93532a7c WHIRLPOOL 2ee8a646c6e23bc46c72cac0ecb5cfe43720ec42404ddaeed8ab1b59d139b3d5c1a94764de847f979da978c001c9f02f709d663a68eeea64d19e88f1fefbca43

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150627.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150627.ebuild
new file mode 100644
index 0000000..bec95d4
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20150627.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Common Cluster"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-06-26_03-09-04/zip/netbeans-trunk-nightly-201506260309-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 499db2b..11f58b5 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_p20150627 (26 Jun 2015)
+
+  26 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +netbeans-9999_p20150627.ebuild:
+  bumped to the latest sources
+
 *netbeans-9999_p20150625 (25 Jun 2015)
 
   25 Jun 2015; Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 764c417..4444c80 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -48,6 +48,7 @@ DIST netbeans-trunk-nightly-201506220001-src.zip 207948798 SHA256 9c93a22a31d647
 DIST netbeans-trunk-nightly-201506230001-src.zip 207952483 SHA256 1af133a19d5c6d4a4ebba68524070951bfb01fb957a820d0e6145729435e0622 SHA512 5e8e98984ae236cfb096bde226cbe99c993e41bef97b8c66e61105180559832e7a668ea0d8f7dbae2c3a96e7637f3b3e523a309289bfb6222011e9df25464284 WHIRLPOOL 1d3b32c490ababbdc00784b10c5a8c8b18a880c640c9abcc9e039b293c1a64e4fe326628e02bb9e19d396ddfe9bb85733cb90b12ecc8f7c5396edddb31152ea4
 DIST netbeans-trunk-nightly-201506240001-src.zip 207969165 SHA256 c59efebe690e08dd20cf83322141bb5b984755b67ab400fa87e9ec0fdcfe1d15 SHA512 1b6007d583cb82f0380736c57048fa0ab77944fd066cf8d643e7dc016049ea73f811b440386631ac8c50d08016d1d1bee015ccfed452c12e504518f1005cfeb9 WHIRLPOOL 8d0a362d61f5e8f57e9bad9c11add5ffc0bae4321302c4a5ab17786a3443d68041211db7f4cafe1f20c174e54b9e0525a7b85fea163751ae4a6efa4386109679
 DIST netbeans-trunk-nightly-201506250001-src.zip 207980912 SHA256 8f38be3f803587401b64e01f00f77a305a862683ebe2d63a1d8b1a57b6162276 SHA512 84383852000cafff1aee8933b47d43bb6479b7894073d21c4c6c86e7b19d39aecae7b5b6b92d9205177febe2c9c96905a3596e47dfe8f0060ecc8997a0dc7822 WHIRLPOOL f44711cda5c720b6d8844c5076ac231acf6939aa697bb1e48aa7ce41b3bec09e69e644aae22151280d288ed5d3db3167822efaa071d0629ec529ca0323c045b9
+DIST netbeans-trunk-nightly-201506260309-src.zip 208000407 SHA256 319162679323bd7d133b22e16af2fc09d95b5b07b11962d72de3e71fb257222f SHA512 5d9710eaf21aaddea69c4241b1b249936066caa156b72532ff05f41efbfaf3219c3d7eb47be74b0f55ab571e3f2cc7e73ef232e55806ce42c6580862f6e5b676 WHIRLPOOL 721eb340d7c9e73c8a620f6ea20a54782a390259c21bb53798de9c4c942d935c99a0aa70ac871320f7182b2c699e708cd3bc647fc5cea4a65bc62c9cb3f6e9d3
 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
@@ -82,5 +83,6 @@ EBUILD netbeans-9999_p20150622.ebuild 7216 SHA256 85df1dfe57fb936b3049e70447d6c2
 EBUILD netbeans-9999_p20150623.ebuild 7216 SHA256 abaaff082baac7e72c50d5f9846bad7bfa0fea7f87b2b5a0e623805015330d8e SHA512 eef668f3660ba12027e253008f9bc85af466fe30516f44ffc16e87540f22bda7ab6ebf0a0a3950293738478c7a978c1e2695d55bd55a417862cc99533037bffa WHIRLPOOL 637186f87d1642260245436386a7fa5b40f1d910b74d931cd0224ed886f9d005086f5b25e604ece385bd2652f294b6ceee169538b46e4f38e8f60633e2c0f9a2
 EBUILD netbeans-9999_p20150624.ebuild 7216 SHA256 693d8d02a4e3e0cc3d4082521bd51f545b537cc094ebeec9929860787ddf382b SHA512 f1b08410cf3255f699ab0e92ccfb97174f19dfde7ad252af6270bd216c4445d9eb1da6d79372a5097f7c5932c661308963d0f88681111545797028d068ef60cb WHIRLPOOL 209f5e268e8e652db5391d806d832b282c37dc99ccfb398c35f10f132fc6e634778b1db6d526f00b82cec5ffa86fe340d059a3bbdaa4e27232a8092c9370b1c7
 EBUILD netbeans-9999_p20150625.ebuild 7216 SHA256 8cacf70a03ccfbf1312d97d77213adee8371c36041af89dc9ebd1d5b8d53b5a3 SHA512 73d126f7df86f0ed3e9562da68feef156d066901c9143aeb51424af94d8102769ea8a0aa2944a4c2a433c787bd16c18ef5e5748951e7e7a8eaa86a17b36578b4 WHIRLPOOL dc99083111ccbdc175102c8fa43a2b97a1ae8a129bedc0a09dd748175f273866687267b031b28f4e019b4d5a503b13b3e624060b1518c820cec67315f3fbaf40
-MISC ChangeLog 154012 SHA256 8643687b298c68fde9bf9b66b09b1283fdc59b25e2bada4c3feda9ad8e13894f SHA512 eee415eb4c34714389449d62c8c5bdb7ab8a928278fc69e13e172a96e66378f09339d6ef51bddf64d67b1ecda0f3a41c633aee33917eb764a64977395a7b8e55 WHIRLPOOL f32769ade5bfe578dcb8508b27975e693c3154949a2e31d39ceb63218307db677db3caa68c7918a99cff7e53e861c210897c1ccc9d2060a56c4e3e8719f7f355
+EBUILD netbeans-9999_p20150627.ebuild 7216 SHA256 5a93e95f705fe4bbcec7ddbef3622df0b9b96162047c1988a55906d397d5fd22 SHA512 bf1bdb38229c4d382d7ecbc013e5c7f203b15b04198b2f05659ad345f5e876e693339d0a2c20bf75a14db7f3e127e171d282ed4438fa60843412ac38f3b2578b WHIRLPOOL 6f68404b9f34f7f481c5fe1ba082b8dd5235ab580fae75821bc91228b6b23a14466d50606416713e2056113e52c468593a12b4f5b123e8027ecb52c230eb99e8
+MISC ChangeLog 154171 SHA256 a9d626c610f27d10c83bc83dad22a36a751e6c374f7ef98eb5f15f5cac2ec65a SHA512 cda23f12b5c90fdff0046e4c5ce927806e7055c1241567c6b48133c727051a37b147e67cb0e047e9ed9c784382a99142b6df271fada373f89e0cb81d19cbcb75 WHIRLPOOL 0521532f01c4e7389201e776b26a6568a11905c428765368950d57ce4d78defe7dfd4e2d32b2272e8c4aa87a2b6265b55e38fb4aaa29da9da123b4d147ba7ad1
 MISC metadata.xml 333 SHA256 a7c289d7be537b4c51bd8100bca0d8a40ceb5fb011942bbd1b286841cf3c1d0a SHA512 3f730fc27f893489524053e81a465519037a68e297f02a5d6400f85f8bfd8a20006e5515a135b8a5779ebf5951a661d99aaa8bf3b9b96141f863e134dba2265e WHIRLPOOL d37106234351185946f6dc870e9b77babd38bed88673771949d26d176d8dad4071be5f2c59bf72b139a6a35c899c2c7ac9ffde1c7b4885135d52c821780cf3d2

diff --git a/dev-util/netbeans/netbeans-9999_p20150627.ebuild b/dev-util/netbeans/netbeans-9999_p20150627.ebuild
new file mode 100644
index 0000000..4edc70b
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20150627.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE"
+HOMEPAGE="http://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2015-06-26_03-09-04/zip/netbeans-trunk-nightly-201506260309-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-ergonomics/, dev-java/netbeans-dlight/, ...
@ 2016-06-08  9:27 Miroslav Šulc
  0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2016-06-08  9:27 UTC (permalink / raw
  To: gentoo-commits

commit:     361908fc946a0033906f7c408fb93a61640133ad
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  8 07:52:28 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Jun  8 07:52:28 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=361908fc

netbeans: removed obsolete ebuilds

Package-Manager: portage-2.3.0_rc1

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index fc7f596..b0abf14 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 DIST netbeans-trunk-nightly-201605090002-src.zip 213540102 SHA256 66971c1eef81c99ed06f84dcd00acef703867637d7d475a27fc29fdf6e6c71d0 SHA512 70dd67358e41754eb9e39769e6a2eade6a3af8893c7faaa57fb1766f189d70b12b6871a90661e1362f42a6cefe586fd618a963c4afa5487220ffa9ab8e64ade3 WHIRLPOOL 736e2d0b824d5a22b988cc687c96da61e867401ff68a835f95c2af078f563d39a4a8e713b76f7f9c50759c1e6dac2785d006d66b3ff23d71e9cefe07aabca58d
 DIST netbeans-trunk-nightly-201605100002-src.zip 213543139 SHA256 81799ceebdbc9c8614a4779961c5345676bd39a980325298b109cb3e36f85b90 SHA512 5a77c688669d44b4ad162a36153bb04a0a3ee9743b68266fc64ecce415821105e9dedadfa2d4d0a6a91702f2f4f3cf0cd239e0f71197d9e0fa343ad493f8d64d WHIRLPOOL ca281b37a4b16fb6ae9dcbbc209ad3a28d39a4743a73ad2314b0378e0c91a911c9b3235ce7e22f443cb56482ae568955b1c5d7c67058422168f0ca0ebc870e16
 DIST netbeans-trunk-nightly-201605110002-src.zip 213548255 SHA256 602c5f93b24a7212efb02eba11e61862131118057aa66799bb9cd23ae7c6e71a SHA512 e55665a6cc61259e31c9c35f75c23bfdd3b59e30cd9bc4a3edd03d5ae844f8aca3afcf09b668802406e0c2d18d1779089abd92c36c7624ad80d840713ceba8b4 WHIRLPOOL 54331cd70301fe4b4a5763a0a9af007dad396b0674799f3c755093da3bc59d3c43cbf8d5845948c6aa2bee4014e8b865cd63a16c8704dcffc268efe55caa368d
@@ -27,7 +26,6 @@ DIST netbeans-trunk-nightly-201606060002-src.zip 213364709 SHA256 1a79c71748ce65
 DIST netbeans-trunk-nightly-201606070002-src.zip 213362540 SHA256 c75366669710c7a350710285f5fe420a60739fd03fb00b1a1c597c604917a6ee SHA512 72e0b0bc2e387e9d3d5fff28dbd04c6a9ca4d857b9fa65a001b717913d5cf7d1fc2d37e7a270a5b3a7839a9ade61ffacbbbec406709da133639c819dda71e9aa WHIRLPOOL bdd02855a99902180a54981e24012c66357f739679046757e81d811052704a2ab2cf68f3da2c963aaf360c621e4d816ddff1dfe14d3034151d296adf0803251f
 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_p20160508.ebuild 3384 SHA256 61ba5483e2004475b2c7bea0f45961c63233cf5d9fc23226ea238999e0c61711 SHA512 1962ce40f3ba4505b0c80562a6e9a1267d2d0c1d3b2051b54b5b5977223093e2f760e699784ecb19421074b52b5a112281dbd6a9ef617e0cb88f537288c06586 WHIRLPOOL fa0de9ba1ab7043f95017b86763b56558d6e2b6c2379992fd55653196489be8fa8e1f38dc306476ba395d0b24ddf104b7c2574a6c419ca740084c86e4fef5123
 EBUILD netbeans-apisupport-9999_p20160509.ebuild 3384 SHA256 7fd79fba6602bf3ae00ded8da0944ba86fd86904278e1bc8a981cb6fd64dde4c SHA512 d917c9a8c2760c76ee852ce5a26e437b4efa67ce74cab34658eddd300a53cee6badb6713e914f9051a3382e7e5814d515a47c06019bda2f31ef42e4100c22ae8 WHIRLPOOL 41154cbb10a8b1e20f4e4835a31a233b49bedc76545d16a3ea4214d7871c3936ce0ede94670fc25ac7474ca8c33f092ea9afb575bf8932729763dc75be499e1f
 EBUILD netbeans-apisupport-9999_p20160510.ebuild 3384 SHA256 76b9d11c82033fdcf4465323f498d17e155d9458966062d0e5044fd318bece58 SHA512 12232f9cf1e96f68a1ff2cb90e17fa8170f1536d0b41edf00228d2471e9e66ba6a6331e5a034cd7b4710b9f91e80e0ebe6c1a68f7b0fb210f08da18681417037 WHIRLPOOL fe0f74bdcbef9cfbcc1c7deff9e67487c7ab828c68caedbd5b9b5b257af4ddd07d1cd871922d33209c105f8a8020a761fa8ecd4d93be6ca04f1e19e6f77850d3
 EBUILD netbeans-apisupport-9999_p20160511.ebuild 3384 SHA256 6070a2de2af04898326ab6d065867bf3c5201caf67826be3e66fa58f5cd2adb3 SHA512 71aea3177881b3d91396d8641b45b85169330c57a9cb1d243358576f5cbe47751ec1a1eb6e12739793fb839d254f9f37be1c8238382a394a5bcd2652ad81a3e5 WHIRLPOOL 10bd79ac2fb2ee3eb9dd27a19df195519cf4f18b94defbd8e29dedb2d627fc285564f1d6e1affec7e46a850e991c8ba96498c6c6a58f8d2e109f87b33885352f

diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160508.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160508.ebuild
deleted file mode 100644
index f88ef98..0000000
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20160508.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# 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-08_00-02-33/zip/netbeans-trunk-nightly-201605080002-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 127b47f..543bcd7 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -16,7 +16,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 DIST netbeans-trunk-nightly-201605090002-src.zip 213540102 SHA256 66971c1eef81c99ed06f84dcd00acef703867637d7d475a27fc29fdf6e6c71d0 SHA512 70dd67358e41754eb9e39769e6a2eade6a3af8893c7faaa57fb1766f189d70b12b6871a90661e1362f42a6cefe586fd618a963c4afa5487220ffa9ab8e64ade3 WHIRLPOOL 736e2d0b824d5a22b988cc687c96da61e867401ff68a835f95c2af078f563d39a4a8e713b76f7f9c50759c1e6dac2785d006d66b3ff23d71e9cefe07aabca58d
 DIST netbeans-trunk-nightly-201605100002-src.zip 213543139 SHA256 81799ceebdbc9c8614a4779961c5345676bd39a980325298b109cb3e36f85b90 SHA512 5a77c688669d44b4ad162a36153bb04a0a3ee9743b68266fc64ecce415821105e9dedadfa2d4d0a6a91702f2f4f3cf0cd239e0f71197d9e0fa343ad493f8d64d WHIRLPOOL ca281b37a4b16fb6ae9dcbbc209ad3a28d39a4743a73ad2314b0378e0c91a911c9b3235ce7e22f443cb56482ae568955b1c5d7c67058422168f0ca0ebc870e16
 DIST netbeans-trunk-nightly-201605110002-src.zip 213548255 SHA256 602c5f93b24a7212efb02eba11e61862131118057aa66799bb9cd23ae7c6e71a SHA512 e55665a6cc61259e31c9c35f75c23bfdd3b59e30cd9bc4a3edd03d5ae844f8aca3afcf09b668802406e0c2d18d1779089abd92c36c7624ad80d840713ceba8b4 WHIRLPOOL 54331cd70301fe4b4a5763a0a9af007dad396b0674799f3c755093da3bc59d3c43cbf8d5845948c6aa2bee4014e8b865cd63a16c8704dcffc268efe55caa368d
@@ -40,7 +39,6 @@ DIST netbeans-trunk-nightly-201606060002-src.zip 213364709 SHA256 1a79c71748ce65
 DIST netbeans-trunk-nightly-201606070002-src.zip 213362540 SHA256 c75366669710c7a350710285f5fe420a60739fd03fb00b1a1c597c604917a6ee SHA512 72e0b0bc2e387e9d3d5fff28dbd04c6a9ca4d857b9fa65a001b717913d5cf7d1fc2d37e7a270a5b3a7839a9ade61ffacbbbec406709da133639c819dda71e9aa WHIRLPOOL bdd02855a99902180a54981e24012c66357f739679046757e81d811052704a2ab2cf68f3da2c963aaf360c621e4d816ddff1dfe14d3034151d296adf0803251f
 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_p20160508.ebuild 4790 SHA256 fc7ea76cdc4b24eba4336f573331143c12dc1293b8b71de66c16575b7733e54e SHA512 ad209f568643a44e3f06050b1be9717213d0c7829e30913f1d8b4c165e87d25ca00a4d11fd7b6d724041a5e37cd9e215ff1d4352bd0a6e0f4b5354e0c96e9fec WHIRLPOOL 4a529fe1254fe901404fd4234bccf0a43b5e26cee5a33c074c7a3096c2331adfc1ab8706d63924b2f5e384261578936595fbb106c4f61d625fa86771f83182dc
 EBUILD netbeans-cnd-9999_p20160509.ebuild 4790 SHA256 634a93714f06a487e3616ebe16d3c1028198e4067ff5a7c5e372d14219ff92e5 SHA512 4ebfc36d849ecf51c3878b755b11447a521bb94569ffa5e58018c6f282c6abcb39f275c52f53197dc6cfa40834842a702815ba27440853ea8c2fdf410c9d6bb6 WHIRLPOOL 4c518d23d4b50187d632b6fba4e6f426245ca274283e437db230f569a799792b9513da0cc8e5270d77db7b1a8bf78a29e8a1176bda362ab8abb7020e2ce24f09
 EBUILD netbeans-cnd-9999_p20160510.ebuild 4790 SHA256 2cfe6b0c56b1b1335fa8b8d77fafb90335414d8291f145b2f925998f9895f6b4 SHA512 16a93a47f3eb1b0d3de84bdc366c20ad265571ef8ea9f4fd1ee014176fa9896c7fcc5d88fd2c0a2999929ff5c988f3286a95572e0e4d698c0e5ca6f4859d0954 WHIRLPOOL 00c6ecc4991d2cdd9cf08619c59b452eb8fc018ea57a46cb9de5b6bc25a1ba0dfbf04243e7ca097823c7a2e46676842fd2cc9c519eb184e7c0f596ef0a8469b3
 EBUILD netbeans-cnd-9999_p20160511.ebuild 4790 SHA256 c15dbed6ccf54ea834a0d253b074f3e621dc72481d223b03538146f522e64921 SHA512 e411410e397f7a5683861367d82ec3dfc708055db58c36963d5cbcfbc5b85f870c580567cbb0c00d7e726494ff7254db59cf52b8d5da8447222084a3b2624c98 WHIRLPOOL 7c343567a085eed7e0acef09bee47115ba605547e9381e38bbc1ee731771e3d32cd56c624fc44ab112188fb50a798a2f4634e200e9ecc3f19ccaf2cebd6162f7

diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160508.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160508.ebuild
deleted file mode 100644
index c43eaca..0000000
--- a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20160508.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# 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-08_00-02-33/zip/netbeans-trunk-nightly-201605080002-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/4E984D00D9ABA25E7C9F65B2CD3BBA56DE82B648-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}"/4E984D00D9ABA25E7C9F65B2CD3BBA56DE82B648-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 a8632aa..8202e09 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 DIST netbeans-trunk-nightly-201605090002-src.zip 213540102 SHA256 66971c1eef81c99ed06f84dcd00acef703867637d7d475a27fc29fdf6e6c71d0 SHA512 70dd67358e41754eb9e39769e6a2eade6a3af8893c7faaa57fb1766f189d70b12b6871a90661e1362f42a6cefe586fd618a963c4afa5487220ffa9ab8e64ade3 WHIRLPOOL 736e2d0b824d5a22b988cc687c96da61e867401ff68a835f95c2af078f563d39a4a8e713b76f7f9c50759c1e6dac2785d006d66b3ff23d71e9cefe07aabca58d
 DIST netbeans-trunk-nightly-201605100002-src.zip 213543139 SHA256 81799ceebdbc9c8614a4779961c5345676bd39a980325298b109cb3e36f85b90 SHA512 5a77c688669d44b4ad162a36153bb04a0a3ee9743b68266fc64ecce415821105e9dedadfa2d4d0a6a91702f2f4f3cf0cd239e0f71197d9e0fa343ad493f8d64d WHIRLPOOL ca281b37a4b16fb6ae9dcbbc209ad3a28d39a4743a73ad2314b0378e0c91a911c9b3235ce7e22f443cb56482ae568955b1c5d7c67058422168f0ca0ebc870e16
 DIST netbeans-trunk-nightly-201605110002-src.zip 213548255 SHA256 602c5f93b24a7212efb02eba11e61862131118057aa66799bb9cd23ae7c6e71a SHA512 e55665a6cc61259e31c9c35f75c23bfdd3b59e30cd9bc4a3edd03d5ae844f8aca3afcf09b668802406e0c2d18d1779089abd92c36c7624ad80d840713ceba8b4 WHIRLPOOL 54331cd70301fe4b4a5763a0a9af007dad396b0674799f3c755093da3bc59d3c43cbf8d5845948c6aa2bee4014e8b865cd63a16c8704dcffc268efe55caa368d
@@ -30,7 +29,6 @@ DIST netbeans-trunk-nightly-201606060002-src.zip 213364709 SHA256 1a79c71748ce65
 DIST netbeans-trunk-nightly-201606070002-src.zip 213362540 SHA256 c75366669710c7a350710285f5fe420a60739fd03fb00b1a1c597c604917a6ee SHA512 72e0b0bc2e387e9d3d5fff28dbd04c6a9ca4d857b9fa65a001b717913d5cf7d1fc2d37e7a270a5b3a7839a9ade61ffacbbbec406709da133639c819dda71e9aa WHIRLPOOL bdd02855a99902180a54981e24012c66357f739679046757e81d811052704a2ab2cf68f3da2c963aaf360c621e4d816ddff1dfe14d3034151d296adf0803251f
 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_p20160508.ebuild 2968 SHA256 4e995c8c7dad8e19189296675718454986ed6bf2d864ea87f9728a6fe23e52e9 SHA512 42ae7bb92998312e3c9473751421e32381aec11859cb4666bf5ae4177947d7c7b83e3e1444c76e6dfc6f2f42f378d5ed3df1c1f77cb701f57943f22a4f4122c2 WHIRLPOOL 85b6bb59f0ac646919204db6651c344b4aebc8c6cf6767bcad21024128959f12eaa7cc4ee8fb08de5e0bcdfca387243b9054af9abf2955fe80895c83abbb57ee
 EBUILD netbeans-dlight-9999_p20160509.ebuild 2968 SHA256 4460f0f9ef9a1a6c049136b56233d609ee2f0a78ead9bbd52713e79d617afdad SHA512 ad8357c3c82598ad5212eda45fa7a42bbb860b2c42dac93dd3f20a89fb386739b78bd167c1a0a73e62bd55fe7a46300bf2c8d096f87dfe51538a87324f7e769e WHIRLPOOL 1040259e3c2bc6e8460e8008e510ef6f79f1398280c52286e734db598685c0118da7f40401f2cc989c9d21c55807775aec36aafd1023494ee3d72edc3e50a7a6
 EBUILD netbeans-dlight-9999_p20160510.ebuild 2968 SHA256 7c1f062ccb88f21de8d65b72d0048e562b611da602fb9d2ccf68b23813ff4638 SHA512 4ebd0285cf6c2d49ba5d03a0a2f6f059eea277cce1c076c495b671e0b32eda8c81101599bc8083e660633483d16e2bb29e335dc27355e9692127f2901420e842 WHIRLPOOL 91e164e7c4129a72854f2b4754ec5355f17e77d97683741f8799dfe8dbea698bbbf45e436319aeb7bba2da3c064ecd94789875aebe92b0325ff1de7ee3439149
 EBUILD netbeans-dlight-9999_p20160511.ebuild 2968 SHA256 1cf186f526e836a00f33cbd51bf9e6b572585856fb7cf2a19785b1b1db77ae54 SHA512 cf27d3917e972a447701e5dd7a9a66fcda7e290fc43517429ef861a2ea4d2a11f8e84dc93abde07e4b2e9fdc5d28ae87d3685e4e391725d8582af2e1b8db6ff2 WHIRLPOOL 8fa46fc978044792790551755aa3fda7e5d6bf470cf8e2dbc2d62a26b646488e97ccd75c96eca1a9163dc5289e17d7e9307f477a358da764b80e025d1de48314

diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160508.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160508.ebuild
deleted file mode 100644
index 09fa69b..0000000
--- a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20160508.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# 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-08_00-02-33/zip/netbeans-trunk-nightly-201605080002-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 a0a505b..7ff8901 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -35,7 +35,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 DIST netbeans-trunk-nightly-201605090002-src.zip 213540102 SHA256 66971c1eef81c99ed06f84dcd00acef703867637d7d475a27fc29fdf6e6c71d0 SHA512 70dd67358e41754eb9e39769e6a2eade6a3af8893c7faaa57fb1766f189d70b12b6871a90661e1362f42a6cefe586fd618a963c4afa5487220ffa9ab8e64ade3 WHIRLPOOL 736e2d0b824d5a22b988cc687c96da61e867401ff68a835f95c2af078f563d39a4a8e713b76f7f9c50759c1e6dac2785d006d66b3ff23d71e9cefe07aabca58d
 DIST netbeans-trunk-nightly-201605100002-src.zip 213543139 SHA256 81799ceebdbc9c8614a4779961c5345676bd39a980325298b109cb3e36f85b90 SHA512 5a77c688669d44b4ad162a36153bb04a0a3ee9743b68266fc64ecce415821105e9dedadfa2d4d0a6a91702f2f4f3cf0cd239e0f71197d9e0fa343ad493f8d64d WHIRLPOOL ca281b37a4b16fb6ae9dcbbc209ad3a28d39a4743a73ad2314b0378e0c91a911c9b3235ce7e22f443cb56482ae568955b1c5d7c67058422168f0ca0ebc870e16
 DIST netbeans-trunk-nightly-201605110002-src.zip 213548255 SHA256 602c5f93b24a7212efb02eba11e61862131118057aa66799bb9cd23ae7c6e71a SHA512 e55665a6cc61259e31c9c35f75c23bfdd3b59e30cd9bc4a3edd03d5ae844f8aca3afcf09b668802406e0c2d18d1779089abd92c36c7624ad80d840713ceba8b4 WHIRLPOOL 54331cd70301fe4b4a5763a0a9af007dad396b0674799f3c755093da3bc59d3c43cbf8d5845948c6aa2bee4014e8b865cd63a16c8704dcffc268efe55caa368d
@@ -59,7 +58,6 @@ DIST netbeans-trunk-nightly-201606060002-src.zip 213364709 SHA256 1a79c71748ce65
 DIST netbeans-trunk-nightly-201606070002-src.zip 213362540 SHA256 c75366669710c7a350710285f5fe420a60739fd03fb00b1a1c597c604917a6ee SHA512 72e0b0bc2e387e9d3d5fff28dbd04c6a9ca4d857b9fa65a001b717913d5cf7d1fc2d37e7a270a5b3a7839a9ade61ffacbbbec406709da133639c819dda71e9aa WHIRLPOOL bdd02855a99902180a54981e24012c66357f739679046757e81d811052704a2ab2cf68f3da2c963aaf360c621e4d816ddff1dfe14d3034151d296adf0803251f
 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_p20160508.ebuild 15825 SHA256 bcf66354128206178639fcf4bb5bea1d5f466ad468bee9c12dc84ccfc965fd42 SHA512 fc599048d57451c2a79f6a463b4c0cc19070dad376f178281803f514e035b03c5d85be7598e08b7ac0712793e0766bfdeb08a51b7d03531883e7a29d1bdb7492 WHIRLPOOL 6f08fe9672954cba7c98092f18cc6ead68865f2bc6606fce04fceec261007e50539974c3a395d74fc2f44117cc1ccc882aa116cb18d331eb150171e57d106e0a
 EBUILD netbeans-enterprise-9999_p20160509.ebuild 15825 SHA256 57272ad6abf2862106d6af1a32ee5bec73e1b5293096e2e77c455f9ff8eb02fb SHA512 b257bd37e6258371baf5db70c474b19efc53eb776de945da1daff86359e09b0f537652212aae5270a7dde8854487828ee80881c4602c96513bfab5750395020b WHIRLPOOL 9181fd49e46ac1c95f02965c54532d5ea885069ca3f64cedffcdbeaf7e192764f510bd208e787729a68901a9916eea65bef15e7bc6a05c479ba1642b00097b98
 EBUILD netbeans-enterprise-9999_p20160510.ebuild 15825 SHA256 303d63c900c112cd20f95e4da156c4d2ec200fd4fb6eed31f2175faac8a4ad3d SHA512 e2e5d7d65b95408327d53c12d32dc195a784884336fbc1d902f410a36e041ba42c7e98d58e7cbfb795506624c2cb5c389ca85188e60cff0bc0f433eacb602746 WHIRLPOOL be26870ba7e71c14e7fe720bd405b29b4c148ee432eb88a56fd477d577ccf789bbea70cf02e2fd3065e10c42f0e46fcbdc9c5a519ccad44661683bad8531b9a9
 EBUILD netbeans-enterprise-9999_p20160511.ebuild 15825 SHA256 645a69d650ae079fc3612c5cffbe4c5d269c315363b6d427756c459912527413 SHA512 e6dd392b0bdd09b9525fa50977080a8a8152cf3415c9d41ab77a3f18af3a18daecea3510d51f9396a070f22541d99266a92c6ea03a2a7379f5cc7b56649eedfb WHIRLPOOL 718a31c3190cfce5f1c7c424fe6d7094e8fcd69feb1a8daaf7f323a83710e6c6aaa8444cf057d3a173eaa4c8ab01304435b0374e25377e2bbc096e18d46ce91a

diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160508.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160508.ebuild
deleted file mode 100644
index 49767c6..0000000
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20160508.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# 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-08_00-02-33/zip/netbeans-trunk-nightly-201605080002-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 e9f7fbf..389234c 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 DIST netbeans-trunk-nightly-201605090002-src.zip 213540102 SHA256 66971c1eef81c99ed06f84dcd00acef703867637d7d475a27fc29fdf6e6c71d0 SHA512 70dd67358e41754eb9e39769e6a2eade6a3af8893c7faaa57fb1766f189d70b12b6871a90661e1362f42a6cefe586fd618a963c4afa5487220ffa9ab8e64ade3 WHIRLPOOL 736e2d0b824d5a22b988cc687c96da61e867401ff68a835f95c2af078f563d39a4a8e713b76f7f9c50759c1e6dac2785d006d66b3ff23d71e9cefe07aabca58d
 DIST netbeans-trunk-nightly-201605100002-src.zip 213543139 SHA256 81799ceebdbc9c8614a4779961c5345676bd39a980325298b109cb3e36f85b90 SHA512 5a77c688669d44b4ad162a36153bb04a0a3ee9743b68266fc64ecce415821105e9dedadfa2d4d0a6a91702f2f4f3cf0cd239e0f71197d9e0fa343ad493f8d64d WHIRLPOOL ca281b37a4b16fb6ae9dcbbc209ad3a28d39a4743a73ad2314b0378e0c91a911c9b3235ce7e22f443cb56482ae568955b1c5d7c67058422168f0ca0ebc870e16
 DIST netbeans-trunk-nightly-201605110002-src.zip 213548255 SHA256 602c5f93b24a7212efb02eba11e61862131118057aa66799bb9cd23ae7c6e71a SHA512 e55665a6cc61259e31c9c35f75c23bfdd3b59e30cd9bc4a3edd03d5ae844f8aca3afcf09b668802406e0c2d18d1779089abd92c36c7624ad80d840713ceba8b4 WHIRLPOOL 54331cd70301fe4b4a5763a0a9af007dad396b0674799f3c755093da3bc59d3c43cbf8d5845948c6aa2bee4014e8b865cd63a16c8704dcffc268efe55caa368d
@@ -27,7 +26,6 @@ DIST netbeans-trunk-nightly-201606060002-src.zip 213364709 SHA256 1a79c71748ce65
 DIST netbeans-trunk-nightly-201606070002-src.zip 213362540 SHA256 c75366669710c7a350710285f5fe420a60739fd03fb00b1a1c597c604917a6ee SHA512 72e0b0bc2e387e9d3d5fff28dbd04c6a9ca4d857b9fa65a001b717913d5cf7d1fc2d37e7a270a5b3a7839a9ade61ffacbbbec406709da133639c819dda71e9aa WHIRLPOOL bdd02855a99902180a54981e24012c66357f739679046757e81d811052704a2ab2cf68f3da2c963aaf360c621e4d816ddff1dfe14d3034151d296adf0803251f
 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_p20160508.ebuild 2913 SHA256 8705444f8ef6951d5917790f0917e6bb9b12e0c0208794b5dd3085c6233cc494 SHA512 c36eec83394e3c84ba830163b4c412c13e0869c2cff3f298f986efb4dadf0b78465964f4d4cdd319845f423f135b2d115230d039f2f78dacb7a84bc175cf1469 WHIRLPOOL c40f6a6100f1927303d309d7230c13ab661bbd47f02ed250e8a5613feae60a0429952908b218bfcd4c085b8fb800efd4caaf2bc24ca14b3ff033aad8c0152b86
 EBUILD netbeans-ergonomics-9999_p20160509.ebuild 2913 SHA256 71e01b8d234bcf0470e5b2cf33995dcc26082a49c6aab77bffa6499155379c86 SHA512 58206b2168c5bd84dd1b8cd68b49b14a6c818393af70c5300e610a94f7ecf1e7e356655eea9470bad51024f6765dead7af62ec6492ee84709665cc5c84cb985f WHIRLPOOL febbc831909999c3a07ab5c95df7d3591030be8e1b358b5b2b3f8a708310807ba340be8950b083a248cdddf23fae4e75607196125d9acdda5a21ceae73454652
 EBUILD netbeans-ergonomics-9999_p20160510.ebuild 2913 SHA256 360fc8a455dadf9f48501e7647ea782c8b21292ddb872c88ccf2d5739c1428d7 SHA512 85078ba666ef13fe169040d5d1034badf7eae24f3ae18283aa2826a977e873d2fef4afb9546f6620bd0afa69fe4ff5d8a1292ac5bc089da72d5e069cbe07b773 WHIRLPOOL 4bcdda2ad20409e2c5505f580eae23b8ef1da9123d22c6ad5e841fc08d4664922aa2e53621777f0240c0e11f089b7acd241d277f41e5325a42e24434737b8bf1
 EBUILD netbeans-ergonomics-9999_p20160511.ebuild 2913 SHA256 c72252d2952b197e10bf796fd8060b0115a1e5c78feff14fd6dbb45aeba55661 SHA512 ff365ffe9346d4515f7606cb4a8a0183a69c8ae2d3b2312f66af32e9db16cc43105d90930165597dead1522e1cb417ba3089a2924f35ce3ccdf13330708eb82d WHIRLPOOL b84c163ee2d5cdec6b22e6bdf3b369442985a4cdbd34d961a1c9c4707602e27361fd9fd589b52dadc4c4f83d55a2f826128f9e4d608e490a9dc3fe8734307ef1

diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160508.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160508.ebuild
deleted file mode 100644
index b57d24c..0000000
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20160508.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# 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-08_00-02-33/zip/netbeans-trunk-nightly-201605080002-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 253ebd4..c601f64 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -7,7 +7,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 DIST netbeans-trunk-nightly-201605090002-src.zip 213540102 SHA256 66971c1eef81c99ed06f84dcd00acef703867637d7d475a27fc29fdf6e6c71d0 SHA512 70dd67358e41754eb9e39769e6a2eade6a3af8893c7faaa57fb1766f189d70b12b6871a90661e1362f42a6cefe586fd618a963c4afa5487220ffa9ab8e64ade3 WHIRLPOOL 736e2d0b824d5a22b988cc687c96da61e867401ff68a835f95c2af078f563d39a4a8e713b76f7f9c50759c1e6dac2785d006d66b3ff23d71e9cefe07aabca58d
 DIST netbeans-trunk-nightly-201605100002-src.zip 213543139 SHA256 81799ceebdbc9c8614a4779961c5345676bd39a980325298b109cb3e36f85b90 SHA512 5a77c688669d44b4ad162a36153bb04a0a3ee9743b68266fc64ecce415821105e9dedadfa2d4d0a6a91702f2f4f3cf0cd239e0f71197d9e0fa343ad493f8d64d WHIRLPOOL ca281b37a4b16fb6ae9dcbbc209ad3a28d39a4743a73ad2314b0378e0c91a911c9b3235ce7e22f443cb56482ae568955b1c5d7c67058422168f0ca0ebc870e16
 DIST netbeans-trunk-nightly-201605110002-src.zip 213548255 SHA256 602c5f93b24a7212efb02eba11e61862131118057aa66799bb9cd23ae7c6e71a SHA512 e55665a6cc61259e31c9c35f75c23bfdd3b59e30cd9bc4a3edd03d5ae844f8aca3afcf09b668802406e0c2d18d1779089abd92c36c7624ad80d840713ceba8b4 WHIRLPOOL 54331cd70301fe4b4a5763a0a9af007dad396b0674799f3c755093da3bc59d3c43cbf8d5845948c6aa2bee4014e8b865cd63a16c8704dcffc268efe55caa368d
@@ -31,7 +30,6 @@ DIST netbeans-trunk-nightly-201606060002-src.zip 213364709 SHA256 1a79c71748ce65
 DIST netbeans-trunk-nightly-201606070002-src.zip 213362540 SHA256 c75366669710c7a350710285f5fe420a60739fd03fb00b1a1c597c604917a6ee SHA512 72e0b0bc2e387e9d3d5fff28dbd04c6a9ca4d857b9fa65a001b717913d5cf7d1fc2d37e7a270a5b3a7839a9ade61ffacbbbec406709da133639c819dda71e9aa WHIRLPOOL bdd02855a99902180a54981e24012c66357f739679046757e81d811052704a2ab2cf68f3da2c963aaf360c621e4d816ddff1dfe14d3034151d296adf0803251f
 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_p20160508.ebuild 3377 SHA256 4679473bbf738c87c3dffab2d96be9970dfb13034435bf02441631128289dc30 SHA512 7e04a176ec96a1425664e04c30a609e4f26482cb59e00fb3fb4308f9c11a8480d700ff790a4390adfdf9e1d19be57f9430b95c5bf61c75f97c1f5f6f4723f4fe WHIRLPOOL abfd7d9833403f9bce91ed9d80f46c7aa046b7e2f78447ff7d096e40937e497b61d6e3fc4939af471f27ffc7dbd065d88fbc5daab2fe323d21e17c06df44b166
 EBUILD netbeans-extide-9999_p20160509.ebuild 3377 SHA256 1040b9896b856e87ec46cfce82908ea4c16d62d398d313009bf6ba5dbfd368ca SHA512 02f9e4e7e57054891730959ff3103836920ca6a5ebeaa055a06f2c385be99e2a727b06718d5d31bfc4ba61bf18f0ad5caa8dde68519167bec27f11eddf7c8500 WHIRLPOOL 24c82564d6d04f0edd5c586e0b58c94565495110bbf8f5a3f0500c60dbd03c4ed4d000031db3a218381dc137d12c67a8f392dcf8cb0480f5ac776fec4cbe9143
 EBUILD netbeans-extide-9999_p20160510.ebuild 3377 SHA256 a3ebdb9887966afcd21d554d11e875fa9d504362f40c391a8baf5d3c6f7bb73d SHA512 28a546bef6f79e19e93e28e78594234a2e785e865a309242052bc23df29d7b60c5ccd4f0daecd64b4792b26307deb8a837642fb0a252ca671fc1944ff4f2838c WHIRLPOOL 74ad1a28f18703c6ebd73de0cd4a9c864908c460fb8fcda8d2986513802d468a714051c066544d980a2179d3b7202818d8984219f9f87842af59c036c7c8a9e0
 EBUILD netbeans-extide-9999_p20160511.ebuild 3377 SHA256 e15c6258909dbbd8adfd16f373d1f55e61b5bbab1cd2c7d766dbeb181bc17aaa SHA512 42ebebbedde871043c4777344fcb874c2ef09dcfcd3abb30785c3ce032062d11bdf9e8eb7b1cb3abf20ba74ad0714abde1d20f3c09c6a56e3b579dc5ea904039 WHIRLPOOL 7296c24aa2bf953ff49fba8159c0e3ecdb04461c77e64d9c914f5eae8706165bb4a34cbd18db99fdf6039eaa71539848cce06c970122bd7ad8dccd20d15dddc3

diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20160508.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20160508.ebuild
deleted file mode 100644
index 013be61..0000000
--- a/dev-java/netbeans-extide/netbeans-extide-9999_p20160508.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# 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-08_00-02-33/zip/netbeans-trunk-nightly-201605080002-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 90a1959..bd62352 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -5,7 +5,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 DIST netbeans-trunk-nightly-201605090002-src.zip 213540102 SHA256 66971c1eef81c99ed06f84dcd00acef703867637d7d475a27fc29fdf6e6c71d0 SHA512 70dd67358e41754eb9e39769e6a2eade6a3af8893c7faaa57fb1766f189d70b12b6871a90661e1362f42a6cefe586fd618a963c4afa5487220ffa9ab8e64ade3 WHIRLPOOL 736e2d0b824d5a22b988cc687c96da61e867401ff68a835f95c2af078f563d39a4a8e713b76f7f9c50759c1e6dac2785d006d66b3ff23d71e9cefe07aabca58d
 DIST netbeans-trunk-nightly-201605100002-src.zip 213543139 SHA256 81799ceebdbc9c8614a4779961c5345676bd39a980325298b109cb3e36f85b90 SHA512 5a77c688669d44b4ad162a36153bb04a0a3ee9743b68266fc64ecce415821105e9dedadfa2d4d0a6a91702f2f4f3cf0cd239e0f71197d9e0fa343ad493f8d64d WHIRLPOOL ca281b37a4b16fb6ae9dcbbc209ad3a28d39a4743a73ad2314b0378e0c91a911c9b3235ce7e22f443cb56482ae568955b1c5d7c67058422168f0ca0ebc870e16
 DIST netbeans-trunk-nightly-201605110002-src.zip 213548255 SHA256 602c5f93b24a7212efb02eba11e61862131118057aa66799bb9cd23ae7c6e71a SHA512 e55665a6cc61259e31c9c35f75c23bfdd3b59e30cd9bc4a3edd03d5ae844f8aca3afcf09b668802406e0c2d18d1779089abd92c36c7624ad80d840713ceba8b4 WHIRLPOOL 54331cd70301fe4b4a5763a0a9af007dad396b0674799f3c755093da3bc59d3c43cbf8d5845948c6aa2bee4014e8b865cd63a16c8704dcffc268efe55caa368d
@@ -29,7 +28,6 @@ DIST netbeans-trunk-nightly-201606060002-src.zip 213364709 SHA256 1a79c71748ce65
 DIST netbeans-trunk-nightly-201606070002-src.zip 213362540 SHA256 c75366669710c7a350710285f5fe420a60739fd03fb00b1a1c597c604917a6ee SHA512 72e0b0bc2e387e9d3d5fff28dbd04c6a9ca4d857b9fa65a001b717913d5cf7d1fc2d37e7a270a5b3a7839a9ade61ffacbbbec406709da133639c819dda71e9aa WHIRLPOOL bdd02855a99902180a54981e24012c66357f739679046757e81d811052704a2ab2cf68f3da2c963aaf360c621e4d816ddff1dfe14d3034151d296adf0803251f
 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_p20160508.ebuild 3416 SHA256 a964cc414b4db6f6e4940c71c72528d8baca5cb2270e945cdc4a928ede5c35ef SHA512 c683321445908e24df00614f8c74b68aaca339134ef898849483cce09dbc22e620c3875aeb740c728a77feafda65e013b0284598a00dfc912c64e21417e69a0b WHIRLPOOL ec6e1db72ae421a4caa1fdd13100a712c5fce27f6ea964dad2ffa6e23b55e9747a4d1b33725ac556d749d5b86198a5dd7fb661febb998762e92b959ea6192fc7
 EBUILD netbeans-groovy-9999_p20160509.ebuild 3416 SHA256 76bb4cdde0d9d0c7a01e02beb81438ead229733703dd192f38a5885f4c7ac9a8 SHA512 c544ef26165bad73786a4d5baa27624e26e737e0da45fb7f5ba976ef23f0ab63e54cc46c51fb9a5ebcc0a10f715b5fd7eb44b23055965fbbd4aa1c347811a3e8 WHIRLPOOL 77dac0b7d3e1bcce877efda4dbbc3a4e26026ce716f897f3009d8594230c9608b502984ef6beb4b1fcf1799dc5cd98c7d8bdbd8635b7e73b7cd59b3fd6ab433a
 EBUILD netbeans-groovy-9999_p20160510.ebuild 3416 SHA256 3ecd8385016d957b337ccc63aa3a7fab0e210fd1131e4ac54ac6cf2d4462ae54 SHA512 60186be2c12b3550d4c518fac428da8d049097990e360e5c685b4bbcdbd097e773e327066113cf708797bf02c0458c8ebc66e1040d9549ec76cd4e050779c169 WHIRLPOOL e4a4e2eb58acfebe3cdf3498b087a0d44cfb07917a78ba4a3dc9fa306d370f9f5c53bdc03e674c496bdacc17542d0c7df20d98f5025c56e477153a89237f4ca1
 EBUILD netbeans-groovy-9999_p20160511.ebuild 3416 SHA256 868387fa9981a95cb8c7535f5985eec54200363ef18d04f5574747256659d213 SHA512 8d72554edefb4241b0eb76cce3c447d46bb4f58cb17cf95b585cf091f4ed01ebc7f6a4a6692c2abf4a42c5db3fcb43b08425fb89db6efa5874615ee000594261 WHIRLPOOL 760d27ce2458408ff76fb066eefe6f0298aa3c9a84fe6bbbec06d35cad1c7e5dfbe65a155b9acc6f703df497d140e370829a9652d6f58948e073ec04e92a5ae8

diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160508.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160508.ebuild
deleted file mode 100644
index 63daad6..0000000
--- a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20160508.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# 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-08_00-02-33/zip/netbeans-trunk-nightly-201605080002-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 1be30f7..69e2853 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -8,7 +8,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 DIST netbeans-trunk-nightly-201605090002-src.zip 213540102 SHA256 66971c1eef81c99ed06f84dcd00acef703867637d7d475a27fc29fdf6e6c71d0 SHA512 70dd67358e41754eb9e39769e6a2eade6a3af8893c7faaa57fb1766f189d70b12b6871a90661e1362f42a6cefe586fd618a963c4afa5487220ffa9ab8e64ade3 WHIRLPOOL 736e2d0b824d5a22b988cc687c96da61e867401ff68a835f95c2af078f563d39a4a8e713b76f7f9c50759c1e6dac2785d006d66b3ff23d71e9cefe07aabca58d
 DIST netbeans-trunk-nightly-201605100002-src.zip 213543139 SHA256 81799ceebdbc9c8614a4779961c5345676bd39a980325298b109cb3e36f85b90 SHA512 5a77c688669d44b4ad162a36153bb04a0a3ee9743b68266fc64ecce415821105e9dedadfa2d4d0a6a91702f2f4f3cf0cd239e0f71197d9e0fa343ad493f8d64d WHIRLPOOL ca281b37a4b16fb6ae9dcbbc209ad3a28d39a4743a73ad2314b0378e0c91a911c9b3235ce7e22f443cb56482ae568955b1c5d7c67058422168f0ca0ebc870e16
 DIST netbeans-trunk-nightly-201605110002-src.zip 213548255 SHA256 602c5f93b24a7212efb02eba11e61862131118057aa66799bb9cd23ae7c6e71a SHA512 e55665a6cc61259e31c9c35f75c23bfdd3b59e30cd9bc4a3edd03d5ae844f8aca3afcf09b668802406e0c2d18d1779089abd92c36c7624ad80d840713ceba8b4 WHIRLPOOL 54331cd70301fe4b4a5763a0a9af007dad396b0674799f3c755093da3bc59d3c43cbf8d5845948c6aa2bee4014e8b865cd63a16c8704dcffc268efe55caa368d
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201606060002-src.zip 213364709 SHA256 1a79c71748ce65
 DIST netbeans-trunk-nightly-201606070002-src.zip 213362540 SHA256 c75366669710c7a350710285f5fe420a60739fd03fb00b1a1c597c604917a6ee SHA512 72e0b0bc2e387e9d3d5fff28dbd04c6a9ca4d857b9fa65a001b717913d5cf7d1fc2d37e7a270a5b3a7839a9ade61ffacbbbec406709da133639c819dda71e9aa WHIRLPOOL bdd02855a99902180a54981e24012c66357f739679046757e81d811052704a2ab2cf68f3da2c963aaf360c621e4d816ddff1dfe14d3034151d296adf0803251f
 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_p20160508.ebuild 4126 SHA256 5caa0e368ffa4302371570aa1bb29fb6b66f0ab056bad9681ecd1b6624a5a8c7 SHA512 77db748695ea1956a94f95a02d7764e5540cba76475b425e8b63cdc206f96e8e0dc4f4bbad60f940e69ca394eeb0ee56dd41eb517d3409c981b38817c5183642 WHIRLPOOL 64be326d31bc967f5a1138e8e71813f0b047a39cdc5b58726371ea755264fecea2d4ee61d8072607ba7fcd906812f9004e31e9a094963f08a3497e7979560f1b
 EBUILD netbeans-harness-9999_p20160509.ebuild 4126 SHA256 dabda08ea807f55eca94d3ec782a20336150e6c4d3679beb183b1c2434e13966 SHA512 968330628521993bfe8eb1e5fb38a29378f460b1ab52241e8f3d80bc7b62a072e9f256864674ec86c6d1b1f321cdf527f559fad360a064b020e5814c67b1b7e6 WHIRLPOOL 165298507056a96a1b763994eb1e8d82386035a2eeb064bf9a36432cca14f5810e619b424c723e7e6956aae8b5c18364654686e08241ccfb5b65e8d3f4a9e5e0
 EBUILD netbeans-harness-9999_p20160510.ebuild 4126 SHA256 cab1554305c46a4fee506be36c9ae969df880e21c6e6117ddb0d1cf74bc759c3 SHA512 1d995fc37b5073effb84a2df29904fb2f4d980bd86b4731c892ae8be2e84cbba0da1725848b4bfb1e8f9f64b0da779c1fc36ece2bb89997e23df0e55fcb77780 WHIRLPOOL 84c84d4c34c2ad7fdf71f11c2d99b5ea16f5aaaf36bb6d1f906a0bb6721aa5b992cd7b003e90c1a62023d91813e3c311c5f28d4719d2f7205f0e917147814f9c
 EBUILD netbeans-harness-9999_p20160511.ebuild 4126 SHA256 54b12a89b78e95faa67bbde903dc3135b8a402b907eb460ab8768cff2dc6f8d0 SHA512 81db5d811cd380407c1da06dc0488c34318b57aa81d18a06e25dd9fef3ef474dbf38b9d98790362e5e7595a560511458764aa2cfedc767bfc4c2fce8a6de5ea4 WHIRLPOOL 6737c403bbd45fdcd97cf3a551df43f7509fee46d230f65900cef8b31431a1eec8cce903a3def2ea96a69cb28cbd5f183d195de5a95c9572a19291a5e58aa930

diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20160508.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20160508.ebuild
deleted file mode 100644
index e49666c..0000000
--- a/dev-java/netbeans-harness/netbeans-harness-9999_p20160508.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# 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-08_00-02-33/zip/netbeans-trunk-nightly-201605080002-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 c1b5f4e..a8fe62d 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -142,7 +142,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 DIST netbeans-trunk-nightly-201605090002-src.zip 213540102 SHA256 66971c1eef81c99ed06f84dcd00acef703867637d7d475a27fc29fdf6e6c71d0 SHA512 70dd67358e41754eb9e39769e6a2eade6a3af8893c7faaa57fb1766f189d70b12b6871a90661e1362f42a6cefe586fd618a963c4afa5487220ffa9ab8e64ade3 WHIRLPOOL 736e2d0b824d5a22b988cc687c96da61e867401ff68a835f95c2af078f563d39a4a8e713b76f7f9c50759c1e6dac2785d006d66b3ff23d71e9cefe07aabca58d
 DIST netbeans-trunk-nightly-201605100002-src.zip 213543139 SHA256 81799ceebdbc9c8614a4779961c5345676bd39a980325298b109cb3e36f85b90 SHA512 5a77c688669d44b4ad162a36153bb04a0a3ee9743b68266fc64ecce415821105e9dedadfa2d4d0a6a91702f2f4f3cf0cd239e0f71197d9e0fa343ad493f8d64d WHIRLPOOL ca281b37a4b16fb6ae9dcbbc209ad3a28d39a4743a73ad2314b0378e0c91a911c9b3235ce7e22f443cb56482ae568955b1c5d7c67058422168f0ca0ebc870e16
 DIST netbeans-trunk-nightly-201605110002-src.zip 213548255 SHA256 602c5f93b24a7212efb02eba11e61862131118057aa66799bb9cd23ae7c6e71a SHA512 e55665a6cc61259e31c9c35f75c23bfdd3b59e30cd9bc4a3edd03d5ae844f8aca3afcf09b668802406e0c2d18d1779089abd92c36c7624ad80d840713ceba8b4 WHIRLPOOL 54331cd70301fe4b4a5763a0a9af007dad396b0674799f3c755093da3bc59d3c43cbf8d5845948c6aa2bee4014e8b865cd63a16c8704dcffc268efe55caa368d
@@ -166,7 +165,6 @@ DIST netbeans-trunk-nightly-201606060002-src.zip 213364709 SHA256 1a79c71748ce65
 DIST netbeans-trunk-nightly-201606070002-src.zip 213362540 SHA256 c75366669710c7a350710285f5fe420a60739fd03fb00b1a1c597c604917a6ee SHA512 72e0b0bc2e387e9d3d5fff28dbd04c6a9ca4d857b9fa65a001b717913d5cf7d1fc2d37e7a270a5b3a7839a9ade61ffacbbbec406709da133639c819dda71e9aa WHIRLPOOL bdd02855a99902180a54981e24012c66357f739679046757e81d811052704a2ab2cf68f3da2c963aaf360c621e4d816ddff1dfe14d3034151d296adf0803251f
 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_p20160508.ebuild 30761 SHA256 62d2935857bc57848e7eb87dbfa621cad343d4544d2742cc3c6ccc5dc399f286 SHA512 0851eddfe367bca706a34fe7314500a6299cb900e379664eb9013ad083c3059221356a9af7770ad0118502a97fe61924925cf7f82a4598a9268794d5e40ccf7b WHIRLPOOL 4abc9e4e34567a1799489cc118415d84d2ac07c6c70307073d550ba536cc95ca54f736179a745d0be282c9e8e231c23d9d400c6d27e3b9081f2ec0951c8ac152
 EBUILD netbeans-ide-9999_p20160509.ebuild 30761 SHA256 0e5ff720a23204dcceb35db8c534d6e10192a31fc55fd6e581acf2cfaa9af7b4 SHA512 bd577769ecde9579a7afaf127d0f2e65e9ee0022656298a3bea39b10d643e13530f25290e682eea71bfd63b68d3a53c42ca6eb7f80dde73ec57ab3bb81bec16f WHIRLPOOL 4afa4fc84856b4709a6129db4be187b20b7cbcc990706994d83d591f61a4eda2b0f302f8f77fb111ac2007e2f458f08e925a3a8115076b9664bb59d6e35dd8f6
 EBUILD netbeans-ide-9999_p20160510.ebuild 30761 SHA256 9b3d5cb28dab6a86db7618f9a887ba56d109a84b3daa13e5b752046a60669ad9 SHA512 a76e0ee014e1e6e0b93a5030d0dc608303df1e897800ebf798b68edf287cb5d3c81c867c1e5e5477bfa1204f307d880a95792e54472fb282bdc90152fd8dddd3 WHIRLPOOL 8ae1a82ae0fbf399469cca313ca3d2371b0c83a3531bda958372a92a752e37d27b0fce1ddd650478e44bf2f95e5e5aca261db72752072f1796295316dc1ac4cd
 EBUILD netbeans-ide-9999_p20160511.ebuild 30761 SHA256 3ed771326781d266a28f271deb473e1d2cc6dd437765fab0687171363c563f40 SHA512 0857109270ac223dc95e75cc1cecd6192b1e721ea059073b4b567ed38c380f9b07e45531e496ce9cd7d189ce18671d2ec5365d781d1b7bd79e0223084b722bff WHIRLPOOL a138a6a9cd235a9a7a27b4bebc6231ad4e23092b7c36a22574cab555190e42fce73c712af4c97f226cc44fc6f328a612b7d0d31a9807f3a03bf4c616c63769c2

diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20160508.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20160508.ebuild
deleted file mode 100644
index d9ace42..0000000
--- a/dev-java/netbeans-ide/netbeans-ide-9999_p20160508.ebuild
+++ /dev/null
@@ -1,382 +0,0 @@
-# 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-08_00-02-33/zip/netbeans-trunk-nightly-201605080002-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 b8b369f..3f79427 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -40,7 +40,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 DIST netbeans-trunk-nightly-201605090002-src.zip 213540102 SHA256 66971c1eef81c99ed06f84dcd00acef703867637d7d475a27fc29fdf6e6c71d0 SHA512 70dd67358e41754eb9e39769e6a2eade6a3af8893c7faaa57fb1766f189d70b12b6871a90661e1362f42a6cefe586fd618a963c4afa5487220ffa9ab8e64ade3 WHIRLPOOL 736e2d0b824d5a22b988cc687c96da61e867401ff68a835f95c2af078f563d39a4a8e713b76f7f9c50759c1e6dac2785d006d66b3ff23d71e9cefe07aabca58d
 DIST netbeans-trunk-nightly-201605100002-src.zip 213543139 SHA256 81799ceebdbc9c8614a4779961c5345676bd39a980325298b109cb3e36f85b90 SHA512 5a77c688669d44b4ad162a36153bb04a0a3ee9743b68266fc64ecce415821105e9dedadfa2d4d0a6a91702f2f4f3cf0cd239e0f71197d9e0fa343ad493f8d64d WHIRLPOOL ca281b37a4b16fb6ae9dcbbc209ad3a28d39a4743a73ad2314b0378e0c91a911c9b3235ce7e22f443cb56482ae568955b1c5d7c67058422168f0ca0ebc870e16
 DIST netbeans-trunk-nightly-201605110002-src.zip 213548255 SHA256 602c5f93b24a7212efb02eba11e61862131118057aa66799bb9cd23ae7c6e71a SHA512 e55665a6cc61259e31c9c35f75c23bfdd3b59e30cd9bc4a3edd03d5ae844f8aca3afcf09b668802406e0c2d18d1779089abd92c36c7624ad80d840713ceba8b4 WHIRLPOOL 54331cd70301fe4b4a5763a0a9af007dad396b0674799f3c755093da3bc59d3c43cbf8d5845948c6aa2bee4014e8b865cd63a16c8704dcffc268efe55caa368d
@@ -64,7 +63,6 @@ DIST netbeans-trunk-nightly-201606060002-src.zip 213364709 SHA256 1a79c71748ce65
 DIST netbeans-trunk-nightly-201606070002-src.zip 213362540 SHA256 c75366669710c7a350710285f5fe420a60739fd03fb00b1a1c597c604917a6ee SHA512 72e0b0bc2e387e9d3d5fff28dbd04c6a9ca4d857b9fa65a001b717913d5cf7d1fc2d37e7a270a5b3a7839a9ade61ffacbbbec406709da133639c819dda71e9aa WHIRLPOOL bdd02855a99902180a54981e24012c66357f739679046757e81d811052704a2ab2cf68f3da2c963aaf360c621e4d816ddff1dfe14d3034151d296adf0803251f
 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_p20160508.ebuild 15656 SHA256 e89c743f36445b911e302574b328c168da74cd5920b5c89f3478862d80ffcfb2 SHA512 3021aa13c5d6cc1dba386ac4108a3954ec85f4ecd1019a06cf7df90f7efec8c648faf546b960ae8f3a3816b18f68664868c12cea2198312d84c19eb3a1b71fa9 WHIRLPOOL a63e996040b157d3abb68929e7625c27e43b8f23cb80c4debef879c961556e8197ecf357912b4047c415ec2fd8342c74a7546d5daa1bfa59df36e6e49096ad05
 EBUILD netbeans-java-9999_p20160509.ebuild 15656 SHA256 29ab60ca56e7a1f926dd9b8013516e61e668279c9d092061472b27adeec2b09b SHA512 a83845713dc7919a243a4ebab81cbeae8715e3fb502009662806bd28add7d6e6be1fb08d840ceb94ca4a8e2d0975c9d8914737a2aa21026f2d701494cfac9e3e WHIRLPOOL c523e6aa4853a01c5a68f33dc756b226df57af528dd79e3cbf8ce1606201250ef206bb636163e84638cbe57ff6755e030f3913427367052dbcb9334214bce0c3
 EBUILD netbeans-java-9999_p20160510.ebuild 15656 SHA256 ca144b73521fbf96be99aec0478c194d1cdb17bf59c8d8d01cfacc077a9a7001 SHA512 51dee47abb633c6843b78c26efbfa21b92a29d977c0f6bcac7500706bf1259eaadafe4ec257d259deba2f42e72821cf6125ca0528b7922cb11a6354e147d9dbf WHIRLPOOL 6fa1212823c8bda91a011282d8ff7fc85b8cd6129413218569e1a625bbe10e26c29a75adf79cff947ba93dfdd71c9315c3fbcd318f7ad6b1544ac21bd8daea0c
 EBUILD netbeans-java-9999_p20160511.ebuild 15656 SHA256 9d7e0689f23ec7106fee4140a07a5c8ebf534cb72a9c90eabbb3ee563a0e2ef2 SHA512 3a6142f32ee93ffa527e2697a194aafc65045455e7f3ef74bc0c2d1eedbaa18a7d3a5c0fba4a5f566880ce33972300b1a1b7ef7a738f64bee1ed63f1f8db5b92 WHIRLPOOL 0dcf0186d20906f6bc6d3fe661a2b9570ceb00961496a3d27dbe92c23d2b0e5a640c477d6947fe0526883a4d010ec4ed7bd164215cd5e621b15d66f7d5bb141a

diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20160508.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20160508.ebuild
deleted file mode 100644
index 1b056c9..0000000
--- a/dev-java/netbeans-java/netbeans-java-9999_p20160508.ebuild
+++ /dev/null
@@ -1,280 +0,0 @@
-# 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-08_00-02-33/zip/netbeans-trunk-nightly-201605080002-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 c83591f..143cedf 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 DIST netbeans-trunk-nightly-201605090002-src.zip 213540102 SHA256 66971c1eef81c99ed06f84dcd00acef703867637d7d475a27fc29fdf6e6c71d0 SHA512 70dd67358e41754eb9e39769e6a2eade6a3af8893c7faaa57fb1766f189d70b12b6871a90661e1362f42a6cefe586fd618a963c4afa5487220ffa9ab8e64ade3 WHIRLPOOL 736e2d0b824d5a22b988cc687c96da61e867401ff68a835f95c2af078f563d39a4a8e713b76f7f9c50759c1e6dac2785d006d66b3ff23d71e9cefe07aabca58d
 DIST netbeans-trunk-nightly-201605100002-src.zip 213543139 SHA256 81799ceebdbc9c8614a4779961c5345676bd39a980325298b109cb3e36f85b90 SHA512 5a77c688669d44b4ad162a36153bb04a0a3ee9743b68266fc64ecce415821105e9dedadfa2d4d0a6a91702f2f4f3cf0cd239e0f71197d9e0fa343ad493f8d64d WHIRLPOOL ca281b37a4b16fb6ae9dcbbc209ad3a28d39a4743a73ad2314b0378e0c91a911c9b3235ce7e22f443cb56482ae568955b1c5d7c67058422168f0ca0ebc870e16
 DIST netbeans-trunk-nightly-201605110002-src.zip 213548255 SHA256 602c5f93b24a7212efb02eba11e61862131118057aa66799bb9cd23ae7c6e71a SHA512 e55665a6cc61259e31c9c35f75c23bfdd3b59e30cd9bc4a3edd03d5ae844f8aca3afcf09b668802406e0c2d18d1779089abd92c36c7624ad80d840713ceba8b4 WHIRLPOOL 54331cd70301fe4b4a5763a0a9af007dad396b0674799f3c755093da3bc59d3c43cbf8d5845948c6aa2bee4014e8b865cd63a16c8704dcffc268efe55caa368d
@@ -30,7 +29,6 @@ DIST netbeans-trunk-nightly-201606060002-src.zip 213364709 SHA256 1a79c71748ce65
 DIST netbeans-trunk-nightly-201606070002-src.zip 213362540 SHA256 c75366669710c7a350710285f5fe420a60739fd03fb00b1a1c597c604917a6ee SHA512 72e0b0bc2e387e9d3d5fff28dbd04c6a9ca4d857b9fa65a001b717913d5cf7d1fc2d37e7a270a5b3a7839a9ade61ffacbbbec406709da133639c819dda71e9aa WHIRLPOOL bdd02855a99902180a54981e24012c66357f739679046757e81d811052704a2ab2cf68f3da2c963aaf360c621e4d816ddff1dfe14d3034151d296adf0803251f
 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_p20160508.ebuild 4971 SHA256 362fd2ccc9f3d6392a5a673fbc5f7b8a7cadfceb50791306688d220851f95876 SHA512 cbbd1f4f446862cc19adf06f4ff4633d205cea6feabf112fccbdb8559728bfc641523ee88eaff859d6a893414b5bacaa04aee5203a748a076ee066004b0911c3 WHIRLPOOL a0f9f8373cb8624927fe0856b25071ac7731fde1419845dd8211064bf6d5490da1f02595c338a0ddd814e4430747efd23d155100396264a01c3261ce4b9ecc06
 EBUILD netbeans-javacard-9999_p20160509.ebuild 4971 SHA256 0238fbffa6366316bfd4a329a6b0ec5c4c1d5adfb219fbc6edaea5871e48c160 SHA512 5b0b689144a904ce7e2a3db7c1f7868d38385fddf70c0f4f217a0be8ab0d6cae9b736bcb3a8e4874de9fafa0ed7f40a5a9c07eb30951cfd16d3e24cab1ce77ca WHIRLPOOL e98c3bba882f9233adc5f759d4c37bfbd0c064898cc71aebea4d7f18f0fd54ee8681bc50e9d862d92966394e6d66c1686894c6a52db6d7fb38cb3f387ff3ddd3
 EBUILD netbeans-javacard-9999_p20160510.ebuild 4971 SHA256 af902405d2d6c0892eb97018a1e9fa3b10f5ee79f64bc9a7f528bab25a204176 SHA512 aedd15b6efad6872ed18ffd6186e41974375bc9d663b209974d014b1926ea932e9129d5e07a6113dc4a9855d64227a5a4c782fd166ff2858b93453ee0d885deb WHIRLPOOL 59be59f2258588d04620088ba7b3dfb7c111fdbbf205f0c0409eafe7bc28401f1580e06a46717cece830475c2581ceec2f99c0ec5e7bdba95e20dbb3145b2cfe
 EBUILD netbeans-javacard-9999_p20160511.ebuild 4971 SHA256 8bc59d3bb1421e53c510876cabe72b5c51aa8b45564faf6217c27955b29c30f8 SHA512 7806989664244038dea36ad18d4ac37cf1d7d6b4c8f191882a1fe61b36b20d92f2473f43bb145c181c87b1be88a9f00b6736cefc9642e07209855396246f632d WHIRLPOOL 7d8a84978940273fca96c147560bc882356ec18fd1570306ec50f3e4766e212e8db8a08a1635f4066938e2094c38f86a35f0cb11726509ac5a95cedf864fd495

diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160508.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160508.ebuild
deleted file mode 100644
index c496891..0000000
--- a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20160508.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# 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-08_00-02-33/zip/netbeans-trunk-nightly-201605080002-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 1c0f907..245e882 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -5,7 +5,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 DIST netbeans-trunk-nightly-201605090002-src.zip 213540102 SHA256 66971c1eef81c99ed06f84dcd00acef703867637d7d475a27fc29fdf6e6c71d0 SHA512 70dd67358e41754eb9e39769e6a2eade6a3af8893c7faaa57fb1766f189d70b12b6871a90661e1362f42a6cefe586fd618a963c4afa5487220ffa9ab8e64ade3 WHIRLPOOL 736e2d0b824d5a22b988cc687c96da61e867401ff68a835f95c2af078f563d39a4a8e713b76f7f9c50759c1e6dac2785d006d66b3ff23d71e9cefe07aabca58d
 DIST netbeans-trunk-nightly-201605100002-src.zip 213543139 SHA256 81799ceebdbc9c8614a4779961c5345676bd39a980325298b109cb3e36f85b90 SHA512 5a77c688669d44b4ad162a36153bb04a0a3ee9743b68266fc64ecce415821105e9dedadfa2d4d0a6a91702f2f4f3cf0cd239e0f71197d9e0fa343ad493f8d64d WHIRLPOOL ca281b37a4b16fb6ae9dcbbc209ad3a28d39a4743a73ad2314b0378e0c91a911c9b3235ce7e22f443cb56482ae568955b1c5d7c67058422168f0ca0ebc870e16
 DIST netbeans-trunk-nightly-201605110002-src.zip 213548255 SHA256 602c5f93b24a7212efb02eba11e61862131118057aa66799bb9cd23ae7c6e71a SHA512 e55665a6cc61259e31c9c35f75c23bfdd3b59e30cd9bc4a3edd03d5ae844f8aca3afcf09b668802406e0c2d18d1779089abd92c36c7624ad80d840713ceba8b4 WHIRLPOOL 54331cd70301fe4b4a5763a0a9af007dad396b0674799f3c755093da3bc59d3c43cbf8d5845948c6aa2bee4014e8b865cd63a16c8704dcffc268efe55caa368d
@@ -29,7 +28,6 @@ DIST netbeans-trunk-nightly-201606060002-src.zip 213364709 SHA256 1a79c71748ce65
 DIST netbeans-trunk-nightly-201606070002-src.zip 213362540 SHA256 c75366669710c7a350710285f5fe420a60739fd03fb00b1a1c597c604917a6ee SHA512 72e0b0bc2e387e9d3d5fff28dbd04c6a9ca4d857b9fa65a001b717913d5cf7d1fc2d37e7a270a5b3a7839a9ade61ffacbbbec406709da133639c819dda71e9aa WHIRLPOOL bdd02855a99902180a54981e24012c66357f739679046757e81d811052704a2ab2cf68f3da2c963aaf360c621e4d816ddff1dfe14d3034151d296adf0803251f
 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_p20160508.ebuild 6293 SHA256 a461652ca3d47c9a85410ab1643ba0e39cdc0180c20d603dd103d73d9d8e98f2 SHA512 03c07c187d736659715ed8dbfdf5f155a1e80cf90b58427e4148813ef2a78958a8c23962842bbd19086c95725c1ba76430fbce6e93fa42adfff68b6c5a834c6a WHIRLPOOL a23386c2d77323529aff85fb3d10ff0af93a4abc404feafdc341cdbb9fdca99349ea8e29f3c49d0b131142e19194e18838908ca8be815eb40f471e185c601a38
 EBUILD netbeans-javadoc-9999_p20160509.ebuild 6293 SHA256 6fb3b5cbe7c9d001009a2ce8777b9241e13e59a90745d81a409fae865e97ed28 SHA512 a89ad8e4983f57ca2da8003debc737b6bd602e50d35fbd74fbc800bfed63a3fc3cea1ceea5db1d27e0f25e930c691b91ab64536892acd46a9e281cffa9079744 WHIRLPOOL 6db001498bec7bef8061ee03e1b0f37ff40a4c315ffb0dcc5855032eb45a31c4448d65a97d90692e07c3f354c7e8f7eae418a6c79a13a1f39f3025ffadbbc89e
 EBUILD netbeans-javadoc-9999_p20160510.ebuild 6293 SHA256 01df95a9d9ad7909dded384ca922ff5477af48ed18dfa0ea150f7f138cd9cfea SHA512 a8d9e94f8d9f88dabdbfb4ac48b41bcebfd1c85bf13eda8560711165fb99a210674556031f91292193979dd858ae4b2b9c7977f4f4a5957787ce8750d0a0daf8 WHIRLPOOL 90955d532f9aacf30d1914e8ef1fe6bb066e4dfd3aad69ab3159fbb102c55bf1093b58b60e68c38975643175feac9505af89938780029a541eb005f2ae17f31a
 EBUILD netbeans-javadoc-9999_p20160511.ebuild 6293 SHA256 a985a54a64b18b3aa56405fc46ff67df8e115804a66d0d96484e2b3247c2732b SHA512 9452fb6085001a698382dd13e6ec9a1b364f5499e700bfb6f4d4a6ad82b1182aaeffc32ae4df976245a86f2878b936a106f591299e2e89f4b809005f303e6e50 WHIRLPOOL 79e63943b9616cd4e2140b3f928587174234bb522b05a8831eea963c085b7f1a0db39d525ffc6bb698ce68021381ec415dce866a4d3a60fc5edc4ff9d6651ec7

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160508.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160508.ebuild
deleted file mode 100644
index 30580d9..0000000
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20160508.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# 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-08_00-02-33/zip/netbeans-trunk-nightly-201605080002-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 6edf3de..f6f7a6a 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -11,7 +11,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 DIST netbeans-trunk-nightly-201605090002-src.zip 213540102 SHA256 66971c1eef81c99ed06f84dcd00acef703867637d7d475a27fc29fdf6e6c71d0 SHA512 70dd67358e41754eb9e39769e6a2eade6a3af8893c7faaa57fb1766f189d70b12b6871a90661e1362f42a6cefe586fd618a963c4afa5487220ffa9ab8e64ade3 WHIRLPOOL 736e2d0b824d5a22b988cc687c96da61e867401ff68a835f95c2af078f563d39a4a8e713b76f7f9c50759c1e6dac2785d006d66b3ff23d71e9cefe07aabca58d
 DIST netbeans-trunk-nightly-201605100002-src.zip 213543139 SHA256 81799ceebdbc9c8614a4779961c5345676bd39a980325298b109cb3e36f85b90 SHA512 5a77c688669d44b4ad162a36153bb04a0a3ee9743b68266fc64ecce415821105e9dedadfa2d4d0a6a91702f2f4f3cf0cd239e0f71197d9e0fa343ad493f8d64d WHIRLPOOL ca281b37a4b16fb6ae9dcbbc209ad3a28d39a4743a73ad2314b0378e0c91a911c9b3235ce7e22f443cb56482ae568955b1c5d7c67058422168f0ca0ebc870e16
 DIST netbeans-trunk-nightly-201605110002-src.zip 213548255 SHA256 602c5f93b24a7212efb02eba11e61862131118057aa66799bb9cd23ae7c6e71a SHA512 e55665a6cc61259e31c9c35f75c23bfdd3b59e30cd9bc4a3edd03d5ae844f8aca3afcf09b668802406e0c2d18d1779089abd92c36c7624ad80d840713ceba8b4 WHIRLPOOL 54331cd70301fe4b4a5763a0a9af007dad396b0674799f3c755093da3bc59d3c43cbf8d5845948c6aa2bee4014e8b865cd63a16c8704dcffc268efe55caa368d
@@ -35,7 +34,6 @@ DIST netbeans-trunk-nightly-201606060002-src.zip 213364709 SHA256 1a79c71748ce65
 DIST netbeans-trunk-nightly-201606070002-src.zip 213362540 SHA256 c75366669710c7a350710285f5fe420a60739fd03fb00b1a1c597c604917a6ee SHA512 72e0b0bc2e387e9d3d5fff28dbd04c6a9ca4d857b9fa65a001b717913d5cf7d1fc2d37e7a270a5b3a7839a9ade61ffacbbbec406709da133639c819dda71e9aa WHIRLPOOL bdd02855a99902180a54981e24012c66357f739679046757e81d811052704a2ab2cf68f3da2c963aaf360c621e4d816ddff1dfe14d3034151d296adf0803251f
 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_p20160508.ebuild 4717 SHA256 d6774497eca22aee6fe81b14e15c98ee7757ae8857d0d759e976f967e464fabb SHA512 fcc85e62aae48f322f2e0d8efb259e3cae587598e01675549fb279eec4149e0972018574fac90f8b9312db4f058d84dc4fa90a1f562e3b33f67421695e728521 WHIRLPOOL 0eb76d3bb1e15bb8592031c20d37a9dfd50f28550282ca2aa49cf2b311d21b687de6c0de9a6bcd6ac76bbaa8c6478360174cca919320a87b5920b4810099f127
 EBUILD netbeans-javafx-9999_p20160509.ebuild 4717 SHA256 312a897fa784c1682001ccaae74dcb2abc0c9829f9f134456fe875c19e23d5c6 SHA512 41c1acb48e92bb6395404878b5e5b542b1cf4e871a4c3e2c0e6ba15290346ffab8ee5740effedc770936d72f02e83ffda1eb4903306a9c4dd1806a2a6e637ee8 WHIRLPOOL 6100b951087cd8df0c2bdc615e7e0f199a6edccb50dd488f46d6c4143e3cd6ee460148763742b01f0240359ec9bed790e3100b101a8b81afa584e1871523adc6
 EBUILD netbeans-javafx-9999_p20160510.ebuild 4717 SHA256 f4d5ac25dcdfd6b6ce57c98b83269ec95e9b2159b99e5263a5b9147db1d6f9ca SHA512 cf0ed54acdcaa414b8acaa5140adc5eb45d73c27bfb7899a4e32f54e8bb10c75e532c46ffbd95bc6d52fc70e87ff56104e57fb518ae0068a7b2d64dd20df9874 WHIRLPOOL 0409e77bcf017e2aa3c8970eb7415c371aec82fad142a171866be5b6d9361b740928b3b4e514c439133633cfa9ceb95b59cf8e87a0296d65ebfb3c23f84c0817
 EBUILD netbeans-javafx-9999_p20160511.ebuild 4717 SHA256 bb19bfb3f21d21966888ff6048b4ce114f7c9e1375ec9f159a8fce3b33ad240f SHA512 b69faa17df8b1112007fe69c9165b7c30852c4353e9e93eef4568b55b581549f643dca32a64055324261f5a4d8e3337c1a27d58e8a754201bff04948195b3b55 WHIRLPOOL 3647afada75f82d0016bcd01f97ac5218af82efab6cf4a4da0bd2b8c780dc1818c33ae6e8615f182f0110c7b71a02f40f890fb2e542a639670eeaf2a0066d1c0

diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160508.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160508.ebuild
deleted file mode 100644
index cc6da82..0000000
--- a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20160508.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# 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-08_00-02-33/zip/netbeans-trunk-nightly-201605080002-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 44b95ce..0a5f4a5 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 DIST netbeans-trunk-nightly-201605090002-src.zip 213540102 SHA256 66971c1eef81c99ed06f84dcd00acef703867637d7d475a27fc29fdf6e6c71d0 SHA512 70dd67358e41754eb9e39769e6a2eade6a3af8893c7faaa57fb1766f189d70b12b6871a90661e1362f42a6cefe586fd618a963c4afa5487220ffa9ab8e64ade3 WHIRLPOOL 736e2d0b824d5a22b988cc687c96da61e867401ff68a835f95c2af078f563d39a4a8e713b76f7f9c50759c1e6dac2785d006d66b3ff23d71e9cefe07aabca58d
 DIST netbeans-trunk-nightly-201605100002-src.zip 213543139 SHA256 81799ceebdbc9c8614a4779961c5345676bd39a980325298b109cb3e36f85b90 SHA512 5a77c688669d44b4ad162a36153bb04a0a3ee9743b68266fc64ecce415821105e9dedadfa2d4d0a6a91702f2f4f3cf0cd239e0f71197d9e0fa343ad493f8d64d WHIRLPOOL ca281b37a4b16fb6ae9dcbbc209ad3a28d39a4743a73ad2314b0378e0c91a911c9b3235ce7e22f443cb56482ae568955b1c5d7c67058422168f0ca0ebc870e16
 DIST netbeans-trunk-nightly-201605110002-src.zip 213548255 SHA256 602c5f93b24a7212efb02eba11e61862131118057aa66799bb9cd23ae7c6e71a SHA512 e55665a6cc61259e31c9c35f75c23bfdd3b59e30cd9bc4a3edd03d5ae844f8aca3afcf09b668802406e0c2d18d1779089abd92c36c7624ad80d840713ceba8b4 WHIRLPOOL 54331cd70301fe4b4a5763a0a9af007dad396b0674799f3c755093da3bc59d3c43cbf8d5845948c6aa2bee4014e8b865cd63a16c8704dcffc268efe55caa368d
@@ -27,7 +26,6 @@ DIST netbeans-trunk-nightly-201606060002-src.zip 213364709 SHA256 1a79c71748ce65
 DIST netbeans-trunk-nightly-201606070002-src.zip 213362540 SHA256 c75366669710c7a350710285f5fe420a60739fd03fb00b1a1c597c604917a6ee SHA512 72e0b0bc2e387e9d3d5fff28dbd04c6a9ca4d857b9fa65a001b717913d5cf7d1fc2d37e7a270a5b3a7839a9ade61ffacbbbec406709da133639c819dda71e9aa WHIRLPOOL bdd02855a99902180a54981e24012c66357f739679046757e81d811052704a2ab2cf68f3da2c963aaf360c621e4d816ddff1dfe14d3034151d296adf0803251f
 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_p20160508.ebuild 4412 SHA256 9ebe4871b1ca45bbb0f4fed226041933c682b8b639c4de2f53be9a144851aa03 SHA512 900a839a97f4a2bc1584753e6d6665735cc746b9f07b38e54d69d102fb9bf8cc26071df41f174c926c873d6c4941a3e9dc28e09efc7960a9c83016707666a354 WHIRLPOOL 4afa0a3e00c4a26f3d38e5aa0542483a1a4a833b980f92d65a4c90320abb39b12be0871fa7e8a61d98d49eac9596821e00656e77e41b421107e20399aa22efcc
 EBUILD netbeans-mobility-9999_p20160509.ebuild 4412 SHA256 908e7de5175f0903aaa1e8cacc061bfb2ed56ce70efbab9669a426e8723453c1 SHA512 0707fbfa9561e460ad4f51505670b68740d6b33af383c63d5d7ac7c6685a9987af50f412a9750722be33dc1341b21ef31334a66be805b6778162c849fc7247c3 WHIRLPOOL 30a391e4c491ec8022ec9c6aa96f9544b8986fef724a1725862f9408fa5e9b5b64a56558e59001b2d011c6e70935271d0070828402d8c613487c0649643900d1
 EBUILD netbeans-mobility-9999_p20160510.ebuild 4412 SHA256 372d496a60f7ceacd63f092483026a966229bb2d2b66e247198aaca86fc88963 SHA512 f8982330341776ea63768a7d68bb2318685774c42bdfc349f6ffbc529e7f1a92b6d8b15480c42b204e712ac4bda241fec4681fab690a15d0da31c2aee3b4824b WHIRLPOOL f021c760072c90531eebc35791a03f85ffb429957de45f4d39bcbbeed5f181851e67a9cb1681e498891d0cc84c04cfd5056b4a191306ca6c58d548b108f5b531
 EBUILD netbeans-mobility-9999_p20160511.ebuild 4412 SHA256 1bd7a1fcd4968ea853a332d57efa7b44093d35d56a3543bdbde884d2a6251816 SHA512 17d41e3f7e8a890bfbecc34c68e47f205a8749dd4919bf0cb341aba53af15f3e185a2a877eb685dcbf093afb2318fe11abb9ae91e2b7b85313d29809d7e86481 WHIRLPOOL 4afe1b3fb655f6627f0db9312f2599fecc8f5198f304fbadc50d94d37c94cad93ef72e5760288ba6c5178c9b26a28576f5f183bfb4c948c9db77abbea24b3a34

diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160508.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160508.ebuild
deleted file mode 100644
index 49cbde8..0000000
--- a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20160508.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# 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-08_00-02-33/zip/netbeans-trunk-nightly-201605080002-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 3dcca86..1aaaf1d 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 DIST netbeans-trunk-nightly-201605090002-src.zip 213540102 SHA256 66971c1eef81c99ed06f84dcd00acef703867637d7d475a27fc29fdf6e6c71d0 SHA512 70dd67358e41754eb9e39769e6a2eade6a3af8893c7faaa57fb1766f189d70b12b6871a90661e1362f42a6cefe586fd618a963c4afa5487220ffa9ab8e64ade3 WHIRLPOOL 736e2d0b824d5a22b988cc687c96da61e867401ff68a835f95c2af078f563d39a4a8e713b76f7f9c50759c1e6dac2785d006d66b3ff23d71e9cefe07aabca58d
 DIST netbeans-trunk-nightly-201605100002-src.zip 213543139 SHA256 81799ceebdbc9c8614a4779961c5345676bd39a980325298b109cb3e36f85b90 SHA512 5a77c688669d44b4ad162a36153bb04a0a3ee9743b68266fc64ecce415821105e9dedadfa2d4d0a6a91702f2f4f3cf0cd239e0f71197d9e0fa343ad493f8d64d WHIRLPOOL ca281b37a4b16fb6ae9dcbbc209ad3a28d39a4743a73ad2314b0378e0c91a911c9b3235ce7e22f443cb56482ae568955b1c5d7c67058422168f0ca0ebc870e16
 DIST netbeans-trunk-nightly-201605110002-src.zip 213548255 SHA256 602c5f93b24a7212efb02eba11e61862131118057aa66799bb9cd23ae7c6e71a SHA512 e55665a6cc61259e31c9c35f75c23bfdd3b59e30cd9bc4a3edd03d5ae844f8aca3afcf09b668802406e0c2d18d1779089abd92c36c7624ad80d840713ceba8b4 WHIRLPOOL 54331cd70301fe4b4a5763a0a9af007dad396b0674799f3c755093da3bc59d3c43cbf8d5845948c6aa2bee4014e8b865cd63a16c8704dcffc268efe55caa368d
@@ -30,7 +29,6 @@ DIST netbeans-trunk-nightly-201606060002-src.zip 213364709 SHA256 1a79c71748ce65
 DIST netbeans-trunk-nightly-201606070002-src.zip 213362540 SHA256 c75366669710c7a350710285f5fe420a60739fd03fb00b1a1c597c604917a6ee SHA512 72e0b0bc2e387e9d3d5fff28dbd04c6a9ca4d857b9fa65a001b717913d5cf7d1fc2d37e7a270a5b3a7839a9ade61ffacbbbec406709da133639c819dda71e9aa WHIRLPOOL bdd02855a99902180a54981e24012c66357f739679046757e81d811052704a2ab2cf68f3da2c963aaf360c621e4d816ddff1dfe14d3034151d296adf0803251f
 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_p20160508.ebuild 4111 SHA256 e9d9fb384d3788ac7c4a42932975bf98c90414d825c09c370d2c3e99cebba7e2 SHA512 627f46cdf769caa505ff05762655445b2611483152cc63847ba60e5e79ba3eeb58f0fd8edf07d4facde87bf0833f7f73f466b3822222a9605705ba3c26a109b1 WHIRLPOOL 7fa12467be9dea5143b7daf39dc69c453c0ccd51ddb34250f9ffcdc2414c714b1f3d8a6d7ca95beff3316bcc5a51506ee2f3ea4cf985c35137032d05e6e39a39
 EBUILD netbeans-nb-9999_p20160509.ebuild 4111 SHA256 0da6fd134a9596bf761a7da79fcfdcdc083f04310fccfdb9ecc0deed3fdfb5a4 SHA512 143a840bb6d1754db31ea6237e92bc6c047efbb9e1a23f3fda5efb6021ed3e7ff20baacd5a5acebe0dcc5512e583c1ea017cb11b6464f28017ec0993393c3b50 WHIRLPOOL fade0bd6525e3c53ba22ff2442a25756022970631b792057545813d11c9f921810357000e56edaf54a6ad18ad4ad5010a00b61c560af04707bef8a76ad2e397d
 EBUILD netbeans-nb-9999_p20160510.ebuild 4111 SHA256 fc5001e76ac33f16ad0d92e33b527ed6ce38da8225593b2c769a396def33442d SHA512 55349e47dbeeadb1362d25832043cd843f89b6ffe0fd5db0c1b25fc5bd9ef40f8d71190193c7446d1108d3515f876d04f5c00c32c227642ad58433f5f0ad87ca WHIRLPOOL 2fac6f8ec2d542fbd497c6bab4a9807e158dc39f707005007c1505c48e5caa43e4843593fcf2540dfccb24c6af5125fe75fa18c00a9f6b2687dec8d75840563f
 EBUILD netbeans-nb-9999_p20160511.ebuild 4111 SHA256 a36478096c6f3a2dc0b239167376e914ac52dfe294de5607e974a25135018647 SHA512 d3499e5f1300a73f02ac22f24f404028c559439183ea1b82af93e01c6655b7a68a2c1c195a840cd8409576dca33b94a89937e8a66d9445d79807bc39ad811716 WHIRLPOOL 058a05b678fff23fc335b2db82f0dbce1f8a69a2c2dd27ceab8792e2a17b8ea7997e2926a12a553d5efd3a3698d0fd4e6d728946d3c891e9625142f8c6853780

diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20160508.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20160508.ebuild
deleted file mode 100644
index 88f2a20..0000000
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20160508.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# 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-08_00-02-33/zip/netbeans-trunk-nightly-201605080002-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 99911bd..c218129 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -8,7 +8,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 DIST netbeans-trunk-nightly-201605090002-src.zip 213540102 SHA256 66971c1eef81c99ed06f84dcd00acef703867637d7d475a27fc29fdf6e6c71d0 SHA512 70dd67358e41754eb9e39769e6a2eade6a3af8893c7faaa57fb1766f189d70b12b6871a90661e1362f42a6cefe586fd618a963c4afa5487220ffa9ab8e64ade3 WHIRLPOOL 736e2d0b824d5a22b988cc687c96da61e867401ff68a835f95c2af078f563d39a4a8e713b76f7f9c50759c1e6dac2785d006d66b3ff23d71e9cefe07aabca58d
 DIST netbeans-trunk-nightly-201605100002-src.zip 213543139 SHA256 81799ceebdbc9c8614a4779961c5345676bd39a980325298b109cb3e36f85b90 SHA512 5a77c688669d44b4ad162a36153bb04a0a3ee9743b68266fc64ecce415821105e9dedadfa2d4d0a6a91702f2f4f3cf0cd239e0f71197d9e0fa343ad493f8d64d WHIRLPOOL ca281b37a4b16fb6ae9dcbbc209ad3a28d39a4743a73ad2314b0378e0c91a911c9b3235ce7e22f443cb56482ae568955b1c5d7c67058422168f0ca0ebc870e16
 DIST netbeans-trunk-nightly-201605110002-src.zip 213548255 SHA256 602c5f93b24a7212efb02eba11e61862131118057aa66799bb9cd23ae7c6e71a SHA512 e55665a6cc61259e31c9c35f75c23bfdd3b59e30cd9bc4a3edd03d5ae844f8aca3afcf09b668802406e0c2d18d1779089abd92c36c7624ad80d840713ceba8b4 WHIRLPOOL 54331cd70301fe4b4a5763a0a9af007dad396b0674799f3c755093da3bc59d3c43cbf8d5845948c6aa2bee4014e8b865cd63a16c8704dcffc268efe55caa368d
@@ -32,7 +31,6 @@ DIST netbeans-trunk-nightly-201606060002-src.zip 213364709 SHA256 1a79c71748ce65
 DIST netbeans-trunk-nightly-201606070002-src.zip 213362540 SHA256 c75366669710c7a350710285f5fe420a60739fd03fb00b1a1c597c604917a6ee SHA512 72e0b0bc2e387e9d3d5fff28dbd04c6a9ca4d857b9fa65a001b717913d5cf7d1fc2d37e7a270a5b3a7839a9ade61ffacbbbec406709da133639c819dda71e9aa WHIRLPOOL bdd02855a99902180a54981e24012c66357f739679046757e81d811052704a2ab2cf68f3da2c963aaf360c621e4d816ddff1dfe14d3034151d296adf0803251f
 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_p20160508.ebuild 4418 SHA256 e87d5f34e2875998b5038f80e156c8f3ad130e61f72d91e85a324f2e00fbec32 SHA512 1d017ecf250e196514c5468257cc9a2c023ddf66248dadbd6ea9a3b2a5f7c98cb2e59ef0d28724b9be98deb1ae29311b6ef2a75a77a190ea24a4eb6552b024ca WHIRLPOOL 9842c381b442ca55052871a8e64932caceb5a0cb361b81f13add5e6bf1f34a7d4ae14df439928e7fef8468cb2add3bf6c4f9a774ce7b7d7ba8656f5abf0e2eff
 EBUILD netbeans-php-9999_p20160509.ebuild 4418 SHA256 5b2baf69a3b790eac3b19a542cf542ffe89e37ab7239287af42b3189ecee994b SHA512 884281622fe327e8c76bb9f2766594cba315a9c026f820e9b6d28c4ec89de0a67893fbef36c90bf0fabe2b4fa84329c5a8ce73e61282d59abb85699e90cb0b3b WHIRLPOOL fdbac22e21975dde85ec735e099987f0e17f4fda989ba543664d5923988503df96b306f0f64c606cacac8dd363a868020fd2a73a7ba684249c8745fe4edde55a
 EBUILD netbeans-php-9999_p20160510.ebuild 4418 SHA256 541e67e102ba3bb94d6e25f8d1cf6fdfdc65d606765c6690af4728219260de80 SHA512 821a43e67f4368f16e6a478256d27ba994c3533309c64afacb505e91f2df48b557d882fc1f301db5e534a7cf82281ad516f1a5b085cf6cbb2ffaf75fe8422635 WHIRLPOOL 9f47a6856fc3eee9382e038b1bda23676416ae1ecd4d78ce287e18f881e3a228dcc3fba32657a92f4b27f813745541a4853fbdd5504360dc8a1c5fd5c7f65a6e
 EBUILD netbeans-php-9999_p20160511.ebuild 4418 SHA256 ce5c87a721bd9553c68330155afe63cdc77470837fb9d4958bb73163fc6dd60d SHA512 4092b344571aa183c51c26621f459ffc4a7d2a80c56a38d2b86e2796aedcf8b3d583245f1731e518925f21882901c304e3933148faa27da40219a05ebbbd1fc5 WHIRLPOOL b9ee6f0e2ce417efd5d797a3684d698c71009f634ff19ea03886c2f78a2738263f234b3571f3fdddcbb7ed06f1a755ff35197468ba9b7320a8c7b2f776b0ce79

diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20160508.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20160508.ebuild
deleted file mode 100644
index 3f985d6..0000000
--- a/dev-java/netbeans-php/netbeans-php-9999_p20160508.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# 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-08_00-02-33/zip/netbeans-trunk-nightly-201605080002-src.zip"
-SRC_URI="${SOURCE_URL}
-	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip
-	http://hg.netbeans.org/binaries/472A52636BE09823B4E5F707071B31FB990A7375-phpsigfiles.zip
-	http://hg.netbeans.org/binaries/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-webcommon-${PV}
-	~dev-java/netbeans-websvccommon-${PV}
-	dev-java/javacup:0"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip
-	${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.php -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r16-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip php.phpdoc.documentation/external/phpdocdesc.zip || die
-	ln -s "${DISTDIR}"/472A52636BE09823B4E5F707071B31FB990A7375-phpsigfiles.zip php.project/external/phpsigfiles.zip || die
-	ln -s "${DISTDIR}"/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip php.editor/external/predefined_vars.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r16-build.xml.patch
-
-	# Support for custom patches
-	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-		if [ -n "${files}" ] ; then
-			einfo "Applying custom patches:"
-
-			for file in ${files} ; do
-				epatch "${file}"
-			done
-		fi
-	fi
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into libs.javacup/external javacup javacup.jar java-cup-11a.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-webcommon-${SLOT} webcommon || die
-	cat /usr/share/netbeans-webcommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.webcommon.built
-
-	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
-	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.websvccommon.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	pushd nbbuild/netbeans/php >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/php$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext
-	pushd "${instdir}" >/dev/null || die
-	rm java-cup-11a.jar && java-pkg_jar-from --into "${instdir}" javacup javacup.jar java-cup-11a.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/php
-}

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index 9c90f50..84c4115 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -29,7 +29,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 DIST netbeans-trunk-nightly-201605090002-src.zip 213540102 SHA256 66971c1eef81c99ed06f84dcd00acef703867637d7d475a27fc29fdf6e6c71d0 SHA512 70dd67358e41754eb9e39769e6a2eade6a3af8893c7faaa57fb1766f189d70b12b6871a90661e1362f42a6cefe586fd618a963c4afa5487220ffa9ab8e64ade3 WHIRLPOOL 736e2d0b824d5a22b988cc687c96da61e867401ff68a835f95c2af078f563d39a4a8e713b76f7f9c50759c1e6dac2785d006d66b3ff23d71e9cefe07aabca58d
 DIST netbeans-trunk-nightly-201605100002-src.zip 213543139 SHA256 81799ceebdbc9c8614a4779961c5345676bd39a980325298b109cb3e36f85b90 SHA512 5a77c688669d44b4ad162a36153bb04a0a3ee9743b68266fc64ecce415821105e9dedadfa2d4d0a6a91702f2f4f3cf0cd239e0f71197d9e0fa343ad493f8d64d WHIRLPOOL ca281b37a4b16fb6ae9dcbbc209ad3a28d39a4743a73ad2314b0378e0c91a911c9b3235ce7e22f443cb56482ae568955b1c5d7c67058422168f0ca0ebc870e16
 DIST netbeans-trunk-nightly-201605110002-src.zip 213548255 SHA256 602c5f93b24a7212efb02eba11e61862131118057aa66799bb9cd23ae7c6e71a SHA512 e55665a6cc61259e31c9c35f75c23bfdd3b59e30cd9bc4a3edd03d5ae844f8aca3afcf09b668802406e0c2d18d1779089abd92c36c7624ad80d840713ceba8b4 WHIRLPOOL 54331cd70301fe4b4a5763a0a9af007dad396b0674799f3c755093da3bc59d3c43cbf8d5845948c6aa2bee4014e8b865cd63a16c8704dcffc268efe55caa368d
@@ -53,7 +52,6 @@ DIST netbeans-trunk-nightly-201606060002-src.zip 213364709 SHA256 1a79c71748ce65
 DIST netbeans-trunk-nightly-201606070002-src.zip 213362540 SHA256 c75366669710c7a350710285f5fe420a60739fd03fb00b1a1c597c604917a6ee SHA512 72e0b0bc2e387e9d3d5fff28dbd04c6a9ca4d857b9fa65a001b717913d5cf7d1fc2d37e7a270a5b3a7839a9ade61ffacbbbec406709da133639c819dda71e9aa WHIRLPOOL bdd02855a99902180a54981e24012c66357f739679046757e81d811052704a2ab2cf68f3da2c963aaf360c621e4d816ddff1dfe14d3034151d296adf0803251f
 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_p20160508.ebuild 9520 SHA256 2af3567fecb758a6da54c9ee47a357e9afaa73fed0c0f264a4d7651a6cbeb8fd SHA512 881e9129a0997690c01b118cbabc24ab4a80f590c1265d1126585a0c4ed40ea71e1b4320f1b9879e38c59f18637797015ec53e0ba122bd2d9717fbf717fc4b84 WHIRLPOOL faa4a3f8a1d11445e6e8008f112d690ad5c10b7b49aa66d747aac05bc934636ec93ce13bd4c4096716b46a8231a954720c4f6f2cc6b5d334fb3e352fd935ed76
 EBUILD netbeans-platform-9999_p20160509.ebuild 9520 SHA256 2e1e0ed8a20746dcbf2db69a4ff19ba100f9d6d79b4e8a017258c8b9377bc367 SHA512 4a9b8cf87c46237d3e5eeeb733b9e054759a9f5acc2ced3a5d22f171436528b75c5e2043905c391afdfacc2b46fbb93c3d2eab8557e0a681879f604e4bb5586d WHIRLPOOL bd5c8fa8c03d11d1c9ad52ae50de51b30dab2d2e35d9f25d27844e5b97c2b06184cd46018e13d8b69b44e769399d3720511b2fbca1f17d7fb63b6a24c392fd51
 EBUILD netbeans-platform-9999_p20160510.ebuild 9520 SHA256 d4a7b7220c868433ab675486c7e702248f59f870e86a78383ae0e060a2efbb3d SHA512 1a49b99d6e5865199225dc778fdf23fb40581df367526aa4a99d78f21404d5da014450888397d73395e366c79190dc5d2dde789141e0a7fdbb941bd7cdc87039 WHIRLPOOL 24f3c407cb5becdf0fb3906bc9c9351de2f33c9a8122c5cbfe1463437becd0384d0bc04840cab98d9cd636fc9258083145bd0634f045fd8cee3667cdfa20a6bf
 EBUILD netbeans-platform-9999_p20160511.ebuild 9520 SHA256 170eaa78be86dd1debe818bc761ebfddf7989afdaeff1853e043c456beed3052 SHA512 ada83a92d17ace4ebef21aeddda270751328cb43c2e05640006a3feb985a60744b6f23139abd9e72e3184443ed2d60610bd606470c182f8cf2e18f067be59c17 WHIRLPOOL 149167d212223f905ca1acdc9fd03f2fd8d4e3ed16edb4a3877c8096a02554aa9100cf22aa00ec3cbd49f240cd10799abd175f4a823ebaa3b9d100a1c5298ccf

diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20160508.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20160508.ebuild
deleted file mode 100644
index c0c7ae9..0000000
--- a/dev-java/netbeans-platform/netbeans-platform-9999_p20160508.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# 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-08_00-02-33/zip/netbeans-trunk-nightly-201605080002-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 dc05b99..d01d9de 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 DIST netbeans-trunk-nightly-201605090002-src.zip 213540102 SHA256 66971c1eef81c99ed06f84dcd00acef703867637d7d475a27fc29fdf6e6c71d0 SHA512 70dd67358e41754eb9e39769e6a2eade6a3af8893c7faaa57fb1766f189d70b12b6871a90661e1362f42a6cefe586fd618a963c4afa5487220ffa9ab8e64ade3 WHIRLPOOL 736e2d0b824d5a22b988cc687c96da61e867401ff68a835f95c2af078f563d39a4a8e713b76f7f9c50759c1e6dac2785d006d66b3ff23d71e9cefe07aabca58d
 DIST netbeans-trunk-nightly-201605100002-src.zip 213543139 SHA256 81799ceebdbc9c8614a4779961c5345676bd39a980325298b109cb3e36f85b90 SHA512 5a77c688669d44b4ad162a36153bb04a0a3ee9743b68266fc64ecce415821105e9dedadfa2d4d0a6a91702f2f4f3cf0cd239e0f71197d9e0fa343ad493f8d64d WHIRLPOOL ca281b37a4b16fb6ae9dcbbc209ad3a28d39a4743a73ad2314b0378e0c91a911c9b3235ce7e22f443cb56482ae568955b1c5d7c67058422168f0ca0ebc870e16
 DIST netbeans-trunk-nightly-201605110002-src.zip 213548255 SHA256 602c5f93b24a7212efb02eba11e61862131118057aa66799bb9cd23ae7c6e71a SHA512 e55665a6cc61259e31c9c35f75c23bfdd3b59e30cd9bc4a3edd03d5ae844f8aca3afcf09b668802406e0c2d18d1779089abd92c36c7624ad80d840713ceba8b4 WHIRLPOOL 54331cd70301fe4b4a5763a0a9af007dad396b0674799f3c755093da3bc59d3c43cbf8d5845948c6aa2bee4014e8b865cd63a16c8704dcffc268efe55caa368d
@@ -27,7 +26,6 @@ DIST netbeans-trunk-nightly-201606060002-src.zip 213364709 SHA256 1a79c71748ce65
 DIST netbeans-trunk-nightly-201606070002-src.zip 213362540 SHA256 c75366669710c7a350710285f5fe420a60739fd03fb00b1a1c597c604917a6ee SHA512 72e0b0bc2e387e9d3d5fff28dbd04c6a9ca4d857b9fa65a001b717913d5cf7d1fc2d37e7a270a5b3a7839a9ade61ffacbbbec406709da133639c819dda71e9aa WHIRLPOOL bdd02855a99902180a54981e24012c66357f739679046757e81d811052704a2ab2cf68f3da2c963aaf360c621e4d816ddff1dfe14d3034151d296adf0803251f
 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_p20160508.ebuild 3472 SHA256 4ec2a490ee4bdeaeb6d9cb5d243a1bda6cd04f3f1ddc4632b4247b5356d2fe7a SHA512 09d16b0dca1ebed31c18cb71032e9173a49c9bbffd046356d7da5ee4dc51f9d364fca9bf50ba9338942dcc79022850db551d733fca977040548a03a21e026c07 WHIRLPOOL 48437ada44ee16604ee5783cc955d07e17402b19c792bc8a57f9436feedcc036469b26db985378b1845c51f37b8a2ce8c4c98c6b18dfd6d85c4ead117706bccb
 EBUILD netbeans-profiler-9999_p20160509.ebuild 3472 SHA256 8259f7253fd6bd19fbf8457cdfc5d26e15cc933e7c1347e2f4afd38a01a7bbc3 SHA512 8c082a543f42cee90077478b15bfc6b31f3d43ccf612c6499b7f3c7277b7546927e1c90724f323ef1fe5fbcf50af515234ef1fd83a7a65b3648c58029fcc88f3 WHIRLPOOL ebd0ae80bb189db4ffc4cc3503328a2715ba79596555dad86fe15b3444db9cfa0249d2332ecf68388e5d73703541401d62ec13fc844ed20fc7a836a0207cec3a
 EBUILD netbeans-profiler-9999_p20160510.ebuild 3472 SHA256 6a2f06df6cac68032fa709368f479f7904b1bf07ef13a7b18e1e8da2cd34ea6f SHA512 9ea986bf126b637f9a086d9ff8e7ea8a58ebffd39f3ead8f6ebf86cef64686f732a0e847576cde80457fe9ac6b741a004726e8970173cfc1d31f540c1f15c9b1 WHIRLPOOL db55685cfbb27298a65cd093d30f1fd4e61d0e317539e88b23cee17b4bd23ce4667e300f3e400eb16a8e1f501aea4436ce21f71b17d22d4dcd9cf2f98c4d0a74
 EBUILD netbeans-profiler-9999_p20160511.ebuild 3472 SHA256 d57d428de93905d147dc6bd767dff8a24a8b048cdb795f3e800c1bf84d9f5d9c SHA512 0ed02e2b538f5af7bb9930e36a813d5828e2b34e0749f9b944a015eeae0b7d238563edf5785c64b391e7e19c21e826c6a631f8fb9ab441b02596bd08071f0e69 WHIRLPOOL 9b0a78678df7807467557ec72ab1efb6b103d0fccd2dd673e52909b91ba128372540bf911185cf4ecd23a6c4ccf5da449a96c691af8359890528f2fc49486b9d

diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160508.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160508.ebuild
deleted file mode 100644
index 1e306e5..0000000
--- a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20160508.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# 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-08_00-02-33/zip/netbeans-trunk-nightly-201605080002-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 cfb45c8..b2a7584 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -18,7 +18,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 DIST netbeans-trunk-nightly-201605090002-src.zip 213540102 SHA256 66971c1eef81c99ed06f84dcd00acef703867637d7d475a27fc29fdf6e6c71d0 SHA512 70dd67358e41754eb9e39769e6a2eade6a3af8893c7faaa57fb1766f189d70b12b6871a90661e1362f42a6cefe586fd618a963c4afa5487220ffa9ab8e64ade3 WHIRLPOOL 736e2d0b824d5a22b988cc687c96da61e867401ff68a835f95c2af078f563d39a4a8e713b76f7f9c50759c1e6dac2785d006d66b3ff23d71e9cefe07aabca58d
 DIST netbeans-trunk-nightly-201605100002-src.zip 213543139 SHA256 81799ceebdbc9c8614a4779961c5345676bd39a980325298b109cb3e36f85b90 SHA512 5a77c688669d44b4ad162a36153bb04a0a3ee9743b68266fc64ecce415821105e9dedadfa2d4d0a6a91702f2f4f3cf0cd239e0f71197d9e0fa343ad493f8d64d WHIRLPOOL ca281b37a4b16fb6ae9dcbbc209ad3a28d39a4743a73ad2314b0378e0c91a911c9b3235ce7e22f443cb56482ae568955b1c5d7c67058422168f0ca0ebc870e16
 DIST netbeans-trunk-nightly-201605110002-src.zip 213548255 SHA256 602c5f93b24a7212efb02eba11e61862131118057aa66799bb9cd23ae7c6e71a SHA512 e55665a6cc61259e31c9c35f75c23bfdd3b59e30cd9bc4a3edd03d5ae844f8aca3afcf09b668802406e0c2d18d1779089abd92c36c7624ad80d840713ceba8b4 WHIRLPOOL 54331cd70301fe4b4a5763a0a9af007dad396b0674799f3c755093da3bc59d3c43cbf8d5845948c6aa2bee4014e8b865cd63a16c8704dcffc268efe55caa368d
@@ -42,7 +41,6 @@ DIST netbeans-trunk-nightly-201606060002-src.zip 213364709 SHA256 1a79c71748ce65
 DIST netbeans-trunk-nightly-201606070002-src.zip 213362540 SHA256 c75366669710c7a350710285f5fe420a60739fd03fb00b1a1c597c604917a6ee SHA512 72e0b0bc2e387e9d3d5fff28dbd04c6a9ca4d857b9fa65a001b717913d5cf7d1fc2d37e7a270a5b3a7839a9ade61ffacbbbec406709da133639c819dda71e9aa WHIRLPOOL bdd02855a99902180a54981e24012c66357f739679046757e81d811052704a2ab2cf68f3da2c963aaf360c621e4d816ddff1dfe14d3034151d296adf0803251f
 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_p20160508.ebuild 5343 SHA256 8fb9d1fbd8ccd487072f542502f11963eaa593ada43e25dc423bc07c147086a3 SHA512 ca2e204fb95fb5163aaa50efad8fb543de6ab4fb6278c8366be53e5ee733f68d36fdb699e3add7f889a055fa004af375191b4dece7c3a1085468a830c76c0a87 WHIRLPOOL 4558220e141f3e7f4e204297f264e07eee13aee6e1164914046446a4a2d377314a1ef1848e8e173fdc183706a9acdb0561d087bc0b46badcf358952b35a73d94
 EBUILD netbeans-webcommon-9999_p20160509.ebuild 5343 SHA256 26d2b3a57ab81ee140e2d00392eeee8c3e02fe0730fd73c90a1a33bad1e16b2f SHA512 0f0b9e4379035b95e01ea308c240cb800aebc4ac345340b3c8c4c2ad69c5d4a8512c85f708dcddf58c00fadda20b512ebad5cfd3a387f89b8fb24f5c1c80fab5 WHIRLPOOL 3e93ad64eda81ee987bfc513816e187f20a92f6f957ef151906238e56a5692dc3b095c25148d614e21504df81e3b42cc1d823bb610d6d53bd599851f409dda43
 EBUILD netbeans-webcommon-9999_p20160510.ebuild 5343 SHA256 94beeb871a46f2793e16c5f18ae3502fa79af0708705fbb68737188826d9139b SHA512 fb6c775d0e72fd46691852a46287c3b13ccfa4d4bd837b35f4a38b91865c757ebc463cba1ad8a388ba04c521a750e17fa841906bed6b92f569a9a69d86abd1c8 WHIRLPOOL 8fab8bcd044f72127c8587c57be069679a2f46b401ebd52217fc45036768c873519cf0d790e5122052345c55f6b202bfbbc249ebec02dc1f23b9773f2bebfa37
 EBUILD netbeans-webcommon-9999_p20160511.ebuild 5343 SHA256 bceb0c2dcdacc78d4fa11e1bf1bf36e0c88a80fd58e6a5fccebd4379fd1537c6 SHA512 58d686961da7c3360f7307b55f84e8621d65cc8fb5dd43a4319a2ae99d1c9d2b11189212accae1813b25e6040c0869296d1b269f64bd8e7bc066592d4639a7c1 WHIRLPOOL 5a54837ea2a1aa9f7180bee822e008886636037d962c0fd8a586d288714c8cb41ff1dfc015b8301d2f6dc390cc08d90543b0a401858238ab54760eaa02187dd3

diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160508.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160508.ebuild
deleted file mode 100644
index 5d3a383..0000000
--- a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20160508.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# 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-08_00-02-33/zip/netbeans-trunk-nightly-201605080002-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 4ae93d0..a019d68 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -3,7 +3,6 @@ DIST netbeans-8.0.2-build.xml.patch.bz2 2678 SHA256 cf120f7fd8b4ad40e9abdcb09e77
 DIST netbeans-8.1-201510222201-src.zip 208692973 SHA256 e8dd9b73304bc7e546150629f7555624b405e8a7af2cd5d616e7a91a0655f463 SHA512 c3ed9e8c9444b1685e3ed7e1a2525d8be43953994aebed962d39f8eae35b6ab0dcab0093b7eeb287e3c74e0620ceded1956ef93205837bb7749db49f53c1c285 WHIRLPOOL 7ff7c3441dbc8f1ebd6f5441c8371ef0ef392f45eef65e06efec3201f417e228fb32879df83ec23ae61898840eadcde43caa66d54182bf3aae2f44c683916268
 DIST netbeans-8.1-build.xml.patch.bz2 2671 SHA256 b5384db6533d41c7d3fdaffd3cd296d156ac99f0a026e3d74c4ac5b5d388a70f SHA512 1dd5dcf02fd81691b0f9c531470379138484dcbc271f65ba53a3844a1e697719e47cb98c90f92f92c5980a577d27370efc800297525f62da7211393ea0a18915 WHIRLPOOL c77621b5f4eea9e688d9714be9268d05f7c1e792d9d46d3a082418d8c1cb52c35f76d59f0befddc73f30a0e0e12c0af25b4b31c1cb69b68dd90e48638d7da509
 DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
-DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 DIST netbeans-trunk-nightly-201605090002-src.zip 213540102 SHA256 66971c1eef81c99ed06f84dcd00acef703867637d7d475a27fc29fdf6e6c71d0 SHA512 70dd67358e41754eb9e39769e6a2eade6a3af8893c7faaa57fb1766f189d70b12b6871a90661e1362f42a6cefe586fd618a963c4afa5487220ffa9ab8e64ade3 WHIRLPOOL 736e2d0b824d5a22b988cc687c96da61e867401ff68a835f95c2af078f563d39a4a8e713b76f7f9c50759c1e6dac2785d006d66b3ff23d71e9cefe07aabca58d
 DIST netbeans-trunk-nightly-201605100002-src.zip 213543139 SHA256 81799ceebdbc9c8614a4779961c5345676bd39a980325298b109cb3e36f85b90 SHA512 5a77c688669d44b4ad162a36153bb04a0a3ee9743b68266fc64ecce415821105e9dedadfa2d4d0a6a91702f2f4f3cf0cd239e0f71197d9e0fa343ad493f8d64d WHIRLPOOL ca281b37a4b16fb6ae9dcbbc209ad3a28d39a4743a73ad2314b0378e0c91a911c9b3235ce7e22f443cb56482ae568955b1c5d7c67058422168f0ca0ebc870e16
 DIST netbeans-trunk-nightly-201605110002-src.zip 213548255 SHA256 602c5f93b24a7212efb02eba11e61862131118057aa66799bb9cd23ae7c6e71a SHA512 e55665a6cc61259e31c9c35f75c23bfdd3b59e30cd9bc4a3edd03d5ae844f8aca3afcf09b668802406e0c2d18d1779089abd92c36c7624ad80d840713ceba8b4 WHIRLPOOL 54331cd70301fe4b4a5763a0a9af007dad396b0674799f3c755093da3bc59d3c43cbf8d5845948c6aa2bee4014e8b865cd63a16c8704dcffc268efe55caa368d
@@ -27,7 +26,6 @@ DIST netbeans-trunk-nightly-201606060002-src.zip 213364709 SHA256 1a79c71748ce65
 DIST netbeans-trunk-nightly-201606070002-src.zip 213362540 SHA256 c75366669710c7a350710285f5fe420a60739fd03fb00b1a1c597c604917a6ee SHA512 72e0b0bc2e387e9d3d5fff28dbd04c6a9ca4d857b9fa65a001b717913d5cf7d1fc2d37e7a270a5b3a7839a9ade61ffacbbbec406709da133639c819dda71e9aa WHIRLPOOL bdd02855a99902180a54981e24012c66357f739679046757e81d811052704a2ab2cf68f3da2c963aaf360c621e4d816ddff1dfe14d3034151d296adf0803251f
 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_p20160508.ebuild 2721 SHA256 90693d0cdc122c82c9865090846c4efe9d310247693749002bb4176925fe6da4 SHA512 19f49b6c7a5afd4ae1355e9e0b431346b41cbd22369743f224e715743fc5df24288579ca2eea3531612d9344e3e33d0b976b696fc777485a5f6b02ddc0f7b914 WHIRLPOOL 5bb4bf8cf213a6c5563b7c92da1b6f56568e6a8e09c030db316f68741b57f3a33d1187babfe241912dea2b8e2d357872203cd2590df733509384b94705e08cf7
 EBUILD netbeans-websvccommon-9999_p20160509.ebuild 2721 SHA256 30f1ee7d8937f1882c9f9c4022620438806f893b08135f5d83ae80366342aeee SHA512 44fdc7066c7335cb56f1f3b7d555291aa0049aada881cb4858e2209e22e4758089fbc4c91c78ce0053c70b8e37ebca011f4c67eb1c9fcef52e62df5e7f19354b WHIRLPOOL b97d0d7a680cb528337f0dbef7ab60be959f547606050b419b8bdfbf78f63189d2c3f4ad134372d2adc75c8ba7a5352b85299569c115a492938cbdd46eb443d7
 EBUILD netbeans-websvccommon-9999_p20160510.ebuild 2721 SHA256 21a38dec4e28d33543f9b6a3cd6b806512956c865d17139c7757844d6639d431 SHA512 7cdb41d1b8551acac87afb54d4f94437972e562d076a672289dc6b0eeb2db49d6db66e2a475f994e9e0d5d09e268b81f34dcfd17a76eb44ed6cdd75ac119cd91 WHIRLPOOL ecdead77d310cef99581c0edacb8179698eac73293babb5cd4917ba8ec08107aafbaf870310b65b8eaaba6abf97b343146edc76a177d8e5f94051e506796e448
 EBUILD netbeans-websvccommon-9999_p20160511.ebuild 2721 SHA256 293fcfa18f47e56012f2a962e24216acf08647fc1ce20b8564ab02c56e12a03f SHA512 c1a7334ec24aaed2d99ef4c1e55c9dbc1578ccfbea3539b273a7b9e2af7ce6a7e2fe1df477a9173a81492df7945913f6834cfb19b9775ad321d7925056c228f1 WHIRLPOOL f902524ffbdff5fa4018603288dbaaa1b029ca15b58c4980e82b3efb2af0b8542845b31c928ec6c7c90db91b63d2dafdae5432be3f03e5dcb6be6cf84380c35e

diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160508.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160508.ebuild
deleted file mode 100644
index dcdcd37..0000000
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20160508.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# 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-08_00-02-33/zip/netbeans-trunk-nightly-201605080002-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 48c505a..e5eabca 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -6,7 +6,6 @@ DIST netbeans-9999-r16-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99e
 DIST netbeans-l10n-8.0.1-20141110.tar.bz2 12065358 SHA256 542d325cbc6e0e617f6076e964e37803ec322b6d0ee4724a6d2127f2f480fb24 SHA512 28242dcbe7bcbc6a9abce15dfe6fd6140a275a417d96ff28228315bdc0ce8110ede899a1815e2fdf9115b48221d50cd3ff5b71a15d36316d04d81f66e9c0cac4 WHIRLPOOL 0318caea3463d3f7bb8876774b1cc9467dadd9bc36497a9304ed12900e2fabdc4dcdfec0b9eaee27bb36c39e9caff3743c5a42ad4c3a432205a716832688c4d6
 DIST netbeans-l10n-8.1-20151105.tar.bz2 11945028 SHA256 33e86aa7315021d28fdb64790233327d7599c98bcf3ab9d936b6fe924884325a SHA512 eb3163eaa8add417a0e8ac3ed4923a6e4992a80eaac00a01eed24e0e1ceb8a5cbd308659bcf0e5e1192ac8e84a79ea36744ad6b2589d60891b03b37102e9435d WHIRLPOOL f214a865bfd8c54341fb9d538da6db4d9b24906b0d94b3ee6cbf4a525e8842d28e852febb2f34c4c31f989d1b6baf750480bc2f04d94bcd7a8bdb8c9553ef590
 DIST netbeans-l10n-9999-20131010.tar.bz2 12440242 SHA256 64c48605820ec1f35e38c34b48cc16cd40c053d085d50819d4b4e9a80453dfa9 SHA512 7d4d61fa61710186fefd90721598ec635db7c6249ce6fc484fd5813636220f163b60230349c984c398c87e083d2d629c531fe5b4cea3752ebbcaa9823b701a02 WHIRLPOOL 10506e3a3004d6c0ab17b05507f72db2c25d2713c3233a7f5478da27d3b1261b5fb6d5f71cbf369858668ca2d1219dad1900c6c42d3f250adcc935e846e56b09
-DIST netbeans-trunk-nightly-201605080002-src.zip 213540102 SHA256 30987831b268838086ae64f67a283c364caf7860977d43209c19d4ec8d59b20e SHA512 4e15da381faa0f8c45b251fadc252715395cc6a731e5ac5d678c76a361e3816e36422dd22644384284ae4bb6a219aa52566ddb649ac3473507d69f2feccbd034 WHIRLPOOL 72b37dd463b81323f4dd5b25de725ac284fdb1846aedcb10cbd62a1508648bc518ff166da6ad5f1787c7674758ab0c2221426a593c11a6fc44968e273e340028
 DIST netbeans-trunk-nightly-201605090002-src.zip 213540102 SHA256 66971c1eef81c99ed06f84dcd00acef703867637d7d475a27fc29fdf6e6c71d0 SHA512 70dd67358e41754eb9e39769e6a2eade6a3af8893c7faaa57fb1766f189d70b12b6871a90661e1362f42a6cefe586fd618a963c4afa5487220ffa9ab8e64ade3 WHIRLPOOL 736e2d0b824d5a22b988cc687c96da61e867401ff68a835f95c2af078f563d39a4a8e713b76f7f9c50759c1e6dac2785d006d66b3ff23d71e9cefe07aabca58d
 DIST netbeans-trunk-nightly-201605100002-src.zip 213543139 SHA256 81799ceebdbc9c8614a4779961c5345676bd39a980325298b109cb3e36f85b90 SHA512 5a77c688669d44b4ad162a36153bb04a0a3ee9743b68266fc64ecce415821105e9dedadfa2d4d0a6a91702f2f4f3cf0cd239e0f71197d9e0fa343ad493f8d64d WHIRLPOOL ca281b37a4b16fb6ae9dcbbc209ad3a28d39a4743a73ad2314b0378e0c91a911c9b3235ce7e22f443cb56482ae568955b1c5d7c67058422168f0ca0ebc870e16
 DIST netbeans-trunk-nightly-201605110002-src.zip 213548255 SHA256 602c5f93b24a7212efb02eba11e61862131118057aa66799bb9cd23ae7c6e71a SHA512 e55665a6cc61259e31c9c35f75c23bfdd3b59e30cd9bc4a3edd03d5ae844f8aca3afcf09b668802406e0c2d18d1779089abd92c36c7624ad80d840713ceba8b4 WHIRLPOOL 54331cd70301fe4b4a5763a0a9af007dad396b0674799f3c755093da3bc59d3c43cbf8d5845948c6aa2bee4014e8b865cd63a16c8704dcffc268efe55caa368d
@@ -30,7 +29,6 @@ DIST netbeans-trunk-nightly-201606060002-src.zip 213364709 SHA256 1a79c71748ce65
 DIST netbeans-trunk-nightly-201606070002-src.zip 213362540 SHA256 c75366669710c7a350710285f5fe420a60739fd03fb00b1a1c597c604917a6ee SHA512 72e0b0bc2e387e9d3d5fff28dbd04c6a9ca4d857b9fa65a001b717913d5cf7d1fc2d37e7a270a5b3a7839a9ade61ffacbbbec406709da133639c819dda71e9aa WHIRLPOOL bdd02855a99902180a54981e24012c66357f739679046757e81d811052704a2ab2cf68f3da2c963aaf360c621e4d816ddff1dfe14d3034151d296adf0803251f
 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_p20160508.ebuild 6939 SHA256 2e50741e1ddfb89297434a83c69a769b601c45e09b997e3949c6cb8bda7ba684 SHA512 c8bbd7235c751d7cbdd95fbe8cc06aca2359200e5e169f6d3072935c521b35505215c8f617811136b1d7b1ad22c899c8aea4836f5b7d5db33a022607087f706a WHIRLPOOL 03d5ca811132b3722078021f761478deeec336e01a833746fa556751a8429c5c7b1fad004695a20b61667ab748e50772f4785a3ca1633ee71e983c99ae96f261
 EBUILD netbeans-9999_p20160509.ebuild 6939 SHA256 abe5a2962b4043176a0b26eaed49db7ece4dbec81cefa0e651b11dafa7ac80ff SHA512 6826783a09cff2b8021ed29d70b5879418b961c497fcadf2de23c461d4c46607cc9cfb3e814fdd56c006bb74153805244563383cea81627199725bdd9b1a623b WHIRLPOOL b44c82ce5fa313a24e9e86103fac7dee5f8eb517dfe663386e337c9fe3c86ecc359774d548eb64a67c428b27498245984952835658b832ba50103dfb4584ff67
 EBUILD netbeans-9999_p20160510.ebuild 6939 SHA256 a3de05224d72877b2fa7d83175e7f32ea60b26cd8e8f3002776f84b8e77e4cbc SHA512 2af928ace0e29672e58d403e703170bebbb0c187e9a230d7fa2722b9e792bee9580905d1ed5974591e7b8fad2d84fd0b459bcf9b977b0423f2fec8467cd08459 WHIRLPOOL 15810136f4d402abd54888cda84ac877f55792bf86f1ec98eba064cefc16778a2ead6729834b2a546bde66054965b8e5b233b54eba89d479fc16a63e159c3c2f
 EBUILD netbeans-9999_p20160511.ebuild 6939 SHA256 9a7ce5c0d336ebc54d0e46570bc3d39a6c33886fd6e955d9f6c3d486822f6d33 SHA512 eef8cea51bd6e267218031d9214b9c14b8a83ffa7c44f7c51033f87112eb87508f42b80fdd93224919e7634d18d0a593fea0e84395bbcb6cfade1c6863c926e9 WHIRLPOOL 52fa84c4ec21559ae3892ccad11bd1fbf390d299118b89266ff4a5e8611f7d05c8ad41b4d4942e12a270f8cb3bdc2cdac27d3b32bf36e3fb4ccfc4fe4246dc02

diff --git a/dev-util/netbeans/netbeans-9999_p20160508.ebuild b/dev-util/netbeans/netbeans-9999_p20160508.ebuild
deleted file mode 100644
index 3b3e496..0000000
--- a/dev-util/netbeans/netbeans-9999_p20160508.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# 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-08_00-02-33/zip/netbeans-trunk-nightly-201605080002-src.zip"
-PATCHES_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r16-build.xml.patch.bz2"
-L10N_URL="http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-9999-20131010.tar.bz2"
-ALL_URLS="${SOURCE_URL} ${PATCHES_URL} ${L10N_URL}"
-SRC_URI="linguas_af? ( ${ALL_URLS} )
-	linguas_ar? ( ${ALL_URLS} )
-	linguas_ar_SA? ( ${ALL_URLS} )
-	linguas_bg? ( ${ALL_URLS} )
-	linguas_ca? ( ${ALL_URLS} )
-	linguas_cs? ( ${ALL_URLS} )
-	linguas_de? ( ${ALL_URLS} )
-	linguas_el? ( ${ALL_URLS} )
-	linguas_es? ( ${ALL_URLS} )
-	linguas_es_CO? ( ${ALL_URLS} )
-	linguas_fil? ( ${ALL_URLS} )
-	linguas_fr? ( ${ALL_URLS} )
-	linguas_gl? ( ${ALL_URLS} )
-	linguas_hi_IN? ( ${ALL_URLS} )
-	linguas_id_ID? ( ${ALL_URLS} )
-	linguas_it? ( ${ALL_URLS} )
-	linguas_ja? ( ${ALL_URLS} )
-	linguas_ko? ( ${ALL_URLS} )
-	linguas_lt? ( ${ALL_URLS} )
-	linguas_nl_BE? ( ${ALL_URLS} )
-	linguas_nl_NL? ( ${ALL_URLS} )
-	linguas_pl? ( ${ALL_URLS} )
-	linguas_pt_BR? ( ${ALL_URLS} )
-	linguas_pt_PT? ( ${ALL_URLS} )
-	linguas_ro? ( ${ALL_URLS} )
-	linguas_ru? ( ${ALL_URLS} )
-	linguas_si? ( ${ALL_URLS} )
-	linguas_sq? ( ${ALL_URLS} )
-	linguas_sr? ( ${ALL_URLS} )
-	linguas_sv? ( ${ALL_URLS} )
-	linguas_ta_IN? ( ${ALL_URLS} )
-	linguas_tr? ( ${ALL_URLS} )
-	linguas_vi? ( ${ALL_URLS} )
-	linguas_zh_CN? ( ${ALL_URLS} )
-	linguas_zh_TW? ( ${ALL_URLS} )
-"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE_NETBEANS_MODULES="
-	+netbeans_modules_apisupport
-	netbeans_modules_cnd
-	netbeans_modules_dlight
-	netbeans_modules_enterprise
-	netbeans_modules_ergonomics
-	netbeans_modules_extide
-	netbeans_modules_groovy
-	+netbeans_modules_java
-	netbeans_modules_javacard
-	+netbeans_modules_javafx
-	netbeans_modules_mobility
-	netbeans_modules_php
-	+netbeans_modules_profiler
-	netbeans_modules_webcommon
-	+netbeans_modules_websvccommon"
-IUSE_LINGUAS="
-	linguas_af
-	linguas_ar
-	linguas_ar_SA
-	linguas_bg
-	linguas_ca
-	linguas_cs
-	linguas_de
-	linguas_el
-	linguas_es
-	linguas_es_CO
-	linguas_fil
-	linguas_fr
-	linguas_gl
-	linguas_hi_IN
-	linguas_id_ID
-	linguas_it
-	linguas_ja
-	linguas_ko
-	linguas_lt
-	linguas_nl_BE
-	linguas_nl_NL
-	linguas_pl
-	linguas_pt_BR
-	linguas_pt_PT
-	linguas_ro
-	linguas_ru
-	linguas_si
-	linguas_sq
-	linguas_sr
-	linguas_sv
-	linguas_ta_IN
-	linguas_tr
-	linguas_vi
-	linguas_zh_CN
-	linguas_zh_TW"
-IUSE="doc ${IUSE_NETBEANS_MODULES} ${IUSE_LINGUAS}"
-S="${WORKDIR}"
-
-DEPEND=">=virtual/jdk-1.7
-	dev-java/javahelp:0"
-RDEPEND=">=virtual/jdk-1.7
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-nb-${PV}
-	~dev-java/netbeans-platform-${PV}
-	netbeans_modules_apisupport? ( ~dev-java/netbeans-apisupport-${PV} )
-	netbeans_modules_cnd? ( ~dev-java/netbeans-cnd-${PV} )
-	netbeans_modules_dlight? ( ~dev-java/netbeans-dlight-${PV} )
-	netbeans_modules_enterprise? ( ~dev-java/netbeans-enterprise-${PV} )
-	netbeans_modules_ergonomics? ( ~dev-java/netbeans-ergonomics-${PV} )
-	netbeans_modules_extide? ( ~dev-java/netbeans-extide-${PV} )
-	netbeans_modules_groovy? ( ~dev-java/netbeans-groovy-${PV} )
-	netbeans_modules_java? ( ~dev-java/netbeans-java-${PV} )
-	netbeans_modules_javacard? ( ~dev-java/netbeans-javacard-${PV} )
-	netbeans_modules_javafx? ( ~dev-java/netbeans-javafx-${PV} )
-	netbeans_modules_mobility? ( ~dev-java/netbeans-mobility-${PV} )
-	netbeans_modules_php? ( ~dev-java/netbeans-php-${PV} )
-	netbeans_modules_profiler? ( ~dev-java/netbeans-profiler-${PV} )
-	netbeans_modules_webcommon? ( ~dev-java/netbeans-webcommon-${PV} )
-	netbeans_modules_websvccommon? ( ~dev-java/netbeans-websvccommon-${PV} )
-	doc? ( ~dev-java/netbeans-javadoc-${PV} )"
-
-JAVA_PKG_BSFIX="off"
-NBLOCALES=""
-
-pkg_setup() {
-	for lingua in ${IUSE_LINGUAS} ; do
-		local lang=${lingua/linguas_/}
-
-		if [[ "${lang}" = "ar" ]] ; then
-			lang="ar_EG,ar_SA"
-		elif [[ "${lang}" = "es" ]] ; then
-			lang="es,es_CO"
-		elif [[ "${lang}" = "fil" ]] ; then
-			lang="fil_PH"
-		elif [[ "${lang}" = "gl" ]] ; then
-			lang="gl_ES"
-		elif [[ "${lang}" = "id_ID" ]] ; then
-			lang="in_ID"
-		fi
-
-		if use ${lingua} ; then
-			if [ -z "${NBLOCALES}" ] ; then
-				NBLOCALES="${lang}"
-			else
-				NBLOCALES="${NBLOCALES},${lang}"
-			fi
-		fi
-	done
-
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	if [ -n "${NBLOCALES}" ] ; then
-		unpack $(basename ${SOURCE_URL})
-		unpack $(basename ${L10N_URL})
-
-		einfo "Deleting bundled jars..."
-		find -name "*.jar" -type f -delete
-
-		unpack netbeans-9999-r16-build.xml.patch.bz2
-	fi
-}
-
-src_prepare() {
-	if [ -n "${NBLOCALES}" ] ; then
-		einfo "Deleting bundled class files..."
-		find -name "*.class" -type f | xargs rm -vf
-
-		epatch netbeans-9999-r16-build.xml.patch
-
-		# Support for custom patches
-		if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
-			local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
-
-			if [ -n "${files}" ] ; then
-				einfo "Applying custom patches:"
-
-				for file in ${files} ; do
-					epatch "${file}"
-				done
-			fi
-		fi
-
-		einfo "Symlinking external libraries..."
-		java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	fi
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	if [ -n "${NBLOCALES}" ] ; then
-		einfo "Compiling support for locales: ${NBLOCALES}"
-		eant -f nbbuild/build.xml bootstrap || die
-		eant -Dlocales=${NBLOCALES} -Ddist.dir=../nbbuild/netbeans -Dnbms.dir="" -Dnbms.dist.dir="" \
-			-Dpermit.jdk7.builds=true -f l10n/build.xml build || die
-	fi
-}
-
-src_install() {
-	if [ -n "${NBLOCALES}" ] ; then
-		pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-		for cluster in apisupport cnd dlight enterprise ergonomics groovy harness ide java javacard javafx mobility php platform profiler webcommon websvccommon ; do
-			if [ -d "${cluster}" ] ; then
-				insinto /usr/share/netbeans-${cluster}-${SLOT}
-				doins -r ${cluster}/*
-			fi
-		done
-
-		if [ -d nb ] ; then
-			insinto /usr/share/netbeans-nb-${SLOT}/nb
-			doins -r nb/*
-		fi
-
-		popd >/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	if [ -n "${NBLOCALES}" ] ; then
-		einfo "Netbeans automatically starts with the locale you have set in your user profile, if"
-		einfo "the locale is built for Netbeans."
-		einfo "If you want to force specific locale, use --locale argument, for example:"
-		einfo "${PN}-${SLOT} --locale de"
-		einfo "${PN}-${SLOT} --locale pt:BR"
-	fi
-
-	if use linguas_ar ; then
-		einfo
-		einfo "You selected Arabic locale so you can choose either ar:EG or ar:SA variant."
-	fi
-
-	if use linguas_es ; then
-		einfo
-		einfo "You selected Spanish locale so you can choose either es or es:CO variant."
-	fi
-
-	if use linguas_id_ID ; then
-		einfo
-		einfo "You selected Indonesian locale which has locale code in:ID in Netbeans."
-	fi
-}


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

end of thread, other threads:[~2016-06-08  9:27 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-08  9:27 [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-ergonomics/, dev-java/netbeans-dlight/, Miroslav Šulc
  -- strict thread matches above, loose matches on Subject: below --
2015-06-26 11:21 Miroslav Šulc

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